@moda-ai/cli 1.55.84 → 1.55.85

package/dist/{cli-pjat0vfe.js → cli-7vywvw8v.js}

@@ -3947,6 +3947,121 @@ import {
 import { basename as basename6, delimiter, dirname as dirname8, join as join11, relative as relative9, resolve as resolve9, sep as sep5 } from "node:path";
 import { confirm, select } from "@inquirer/prompts";
 
+// ../../packages/harness-bundle/src/agent-identity.ts
+var normalizeName = (value) => (value ?? "").split(/\s*\(/)[0].replace(/[^a-z0-9]/gi, "").toLowerCase();
+var normalizePath2 = (value) => value.replace(/\\/g, "/").replace(/^\.\//, "").replace(/\/$/, "");
+var sourceFile = (value) => /\.[cm]?[jt]sx?$|\.py$/.test(value);
+var DECLARATION = /^\s*(?:export\s+)?(?:default\s+)?(?:(?:abstract|async)\s+)?(class|function)\s+([\w$]+)(?=\s*(?:extends\b|implements\b|[{(<]))/i;
+var isDefinitionEvidence = (reason) => /^\s*(?:class|entrypoint)\s*$|(?:class|function|route) (?:definition|declaration)|concrete agent|function or route owns|entrypoint definition/i.test(reason ?? "") || DECLARATION.test(reason ?? "");
+function definingEvidence(agent) {
+  const root = agent.root && sourceFile(agent.root) ? normalizePath2(agent.root) : undefined;
+  let definitions = (agent.evidence ?? []).filter((entry) => isDefinitionEvidence(entry.reason) && entry.path && sourceFile(entry.path) && (!root || normalizePath2(entry.path) === root));
+  const ownNames = new Set([agent.name, agent.className ?? ""].map(normalizeName).filter(Boolean));
+  const named = definitions.filter((entry) => {
+    const symbol = DECLARATION.exec(entry.reason ?? "")?.[2];
+    return symbol && ownNames.has(normalizeName(symbol));
+  });
+  if (named.length)
+    definitions = named;
+  const files = new Set(definitions.map((entry) => normalizePath2(entry.path)));
+  const lines = new Set(definitions.flatMap((entry) => entry.line !== undefined ? [entry.line] : []));
+  const symbols = new Set(definitions.flatMap((entry) => DECLARATION.exec(entry.reason ?? "")?.[2] ?? []));
+  if (files.size > 1 || lines.size > 1 || symbols.size > 1)
+    return;
+  return definitions;
+}
+function definitionKinds(agent) {
+  const kinds = new Set;
+  for (const evidence of definingEvidence(agent) ?? []) {
+    const reason = evidence.reason?.trim() ?? "";
+    const declared = DECLARATION.exec(reason)?.[1]?.toLowerCase();
+    if (declared)
+      kinds.add(declared);
+    else if (/^class\b|^concrete agent.*class\b/i.test(reason))
+      kinds.add("class");
+    else if (/^(?:function|route)\b/i.test(reason))
+      kinds.add("function");
+  }
+  return kinds;
+}
+function identityNames(agent) {
+  return new Set([agent.name, agent.className ?? ""].map(normalizeName).filter(Boolean));
+}
+function paths(agent) {
+  const definitions = definingEvidence(agent);
+  if (!definitions)
+    return new Set;
+  if (agent.root && sourceFile(agent.root))
+    return new Set([normalizePath2(agent.root)]);
+  return new Set(definitions.flatMap((entry) => entry.path ? [normalizePath2(entry.path)] : []));
+}
+function matchHarnessAgentIds(source, target) {
+  const mapping = new Map;
+  const sourcePaths = new Map(source.map((agent) => [agent.id, paths(agent)]));
+  const targetPaths = new Map(target.map((agent) => [agent.id, paths(agent)]));
+  const targetIds = new Set(target.map((agent) => agent.id));
+  const kinds = new Map([...source, ...target].map((agent) => [agent, definitionKinds(agent)]));
+  const names = new Map([...source, ...target].map((agent) => [agent, identityNames(agent)]));
+  for (const agent of source) {
+    if (targetIds.has(agent.id)) {
+      mapping.set(agent.id, agent.id);
+      continue;
+    }
+    const ownPaths = sourcePaths.get(agent.id);
+    const ownKinds = kinds.get(agent);
+    const overlapping = target.filter((candidate) => {
+      const otherKinds = kinds.get(candidate);
+      const compatible = ownKinds.size === 0 || otherKinds.size === 0 || [...ownKinds].some((kind) => otherKinds.has(kind));
+      return compatible && [...targetPaths.get(candidate.id)].some((path) => ownPaths.has(path));
+    });
+    const ownNames = names.get(agent);
+    const named = overlapping.filter((candidate) => [...names.get(candidate)].some((name) => ownNames.has(name)));
+    if (named.length === 1 && source.filter((other) => [...names.get(other)].some((name) => ownNames.has(name)) && [...sourcePaths.get(other.id)].some((path) => targetPaths.get(named[0].id).has(path))).length === 1) {
+      mapping.set(agent.id, named[0].id);
+      continue;
+    }
+    const anchored = overlapping.filter((candidate) => (definingEvidence(agent) ?? []).some((entry) => isDefinitionEvidence(entry.reason) && entry.path && entry.line !== undefined && (definingEvidence(candidate) ?? []).some((other) => isDefinitionEvidence(other.reason) && other.line === entry.line && other.path && normalizePath2(other.path) === normalizePath2(entry.path)) && source.filter((identity) => (definingEvidence(identity) ?? []).some((definition) => isDefinitionEvidence(definition.reason) && definition.path && definition.line === entry.line && normalizePath2(definition.path) === normalizePath2(entry.path))).length === 1));
+    if (anchored.length === 1) {
+      mapping.set(agent.id, anchored[0].id);
+      continue;
+    }
+    if (named.length > 1)
+      continue;
+    const coordinateConflict = overlapping.length === 1 && (definingEvidence(agent) ?? []).some((entry) => entry.line !== undefined) && (definingEvidence(overlapping[0]) ?? []).some((entry) => entry.line !== undefined) && !(definingEvidence(agent) ?? []).some((entry) => entry.path && entry.line !== undefined && (definingEvidence(overlapping[0]) ?? []).some((other) => other.path && other.line === entry.line && normalizePath2(other.path) === normalizePath2(entry.path)));
+    if (!coordinateConflict && overlapping.length === 1 && overlapping[0].root && sourceFile(overlapping[0].root) && [...ownPaths].some((path) => targetPaths.get(overlapping[0].id).has(path) && source.filter((other) => sourcePaths.get(other.id).has(path)).length === 1)) {
+      mapping.set(agent.id, overlapping[0].id);
+    }
+  }
+  return mapping;
+}
+function harnessAgentIdentities(value) {
+  if (!Array.isArray(value))
+    return [];
+  return value.flatMap((entry) => {
+    if (!entry || typeof entry !== "object")
+      return [];
+    const item = entry;
+    if (typeof item.id !== "string" || typeof item.name !== "string")
+      return [];
+    return [{
+      id: item.id,
+      name: item.name,
+      ...typeof item.root === "string" ? { root: item.root } : {},
+      ...typeof item.className === "string" ? { className: item.className } : {},
+      evidence: Array.isArray(item.evidence) ? item.evidence.flatMap((raw) => {
+        if (!raw || typeof raw !== "object")
+          return [];
+        const ev = raw;
+        return typeof ev.path === "string" ? [{
+          path: ev.path,
+          ...typeof ev.line === "number" ? { line: ev.line } : {},
+          ...typeof ev.reason === "string" ? { reason: ev.reason } : {}
+        }] : [];
+      }) : []
+    }];
+  });
+}
+
 // src/analyst-tui.ts
 class AnalystTui {
   state;
@@ -6017,10 +6132,10 @@ function ignoredPaths(root) {
 }
 function locallyIgnored(root, entries) {
   const out = new Map;
-  const paths = entries.map((entry) => entry.replace(/\/+$/, "")).filter((entry) => entry !== "");
-  if (paths.length === 0)
+  const paths2 = entries.map((entry) => entry.replace(/\/+$/, "")).filter((entry) => entry !== "");
+  if (paths2.length === 0)
     return out;
-  const result = git(root, ["check-ignore", "--verbose", "-z", "--stdin"], `${paths.join("\x00")}\x00`);
+  const result = git(root, ["check-ignore", "--verbose", "-z", "--stdin"], `${paths2.join("\x00")}\x00`);
   if (result.status === 1)
     return out;
   if (result.status !== 0)
@@ -7458,17 +7573,17 @@ var LANGUAGE_BY_EXT = {
   sol: "solidity",
   gleam: "gleam"
 };
-function detectToolchain(paths, readText, harnessRoot) {
-  const pathSet = new Set(paths);
+function detectToolchain(paths2, readText, harnessRoot) {
+  const pathSet = new Set(paths2);
   return {
-    languages: detectLanguages(paths),
-    packageManagers: detectPackageManagers(paths, pathSet, readText),
-    ...detectVersions(paths, readText, harnessRoot)
+    languages: detectLanguages(paths2),
+    packageManagers: detectPackageManagers(paths2, pathSet, readText),
+    ...detectVersions(paths2, readText, harnessRoot)
   };
 }
-function detectLanguages(paths) {
+function detectLanguages(paths2) {
   const counts = new Map;
-  for (const path of paths) {
+  for (const path of paths2) {
     const categories = categorize({ path, encoding: "text" });
     if (categories.includes("generated"))
       continue;
@@ -7544,10 +7659,10 @@ function resolveMembers(rootDir, patterns, manifestDirs) {
   }
   return [...members].sort();
 }
-function detectPackageManagers(paths, pathSet, readText) {
+function detectPackageManagers(paths2, pathSet, readText) {
   const out = [];
   const memberOf = new Set;
-  const byName = (name) => paths.filter((p) => basenameOf(p) === name).map(dirnameOf).sort((a, b) => a.length - b.length || (a < b ? -1 : 1));
+  const byName = (name) => paths2.filter((p) => basenameOf(p) === name).map(dirnameOf).sort((a, b) => a.length - b.length || (a < b ? -1 : 1));
   const firstExisting = (dir, names) => names.map((n) => join3(dir, n)).find((p) => pathSet.has(p));
   const nodeDirs = byName("package.json");
   for (const dir of nodeDirs) {
@@ -7604,7 +7719,7 @@ function detectPackageManagers(paths, pathSet, readText) {
     for (const dir of byName(name))
       pyDirs.add(dir);
   }
-  for (const path of paths) {
+  for (const path of paths2) {
     if (/^requirements([-_.].+)?\.txt$/i.test(basenameOf(path)))
       pyDirs.add(dirnameOf(path));
   }
@@ -7615,7 +7730,7 @@ function detectPackageManagers(paths, pathSet, readText) {
       continue;
     const pyproject = readText(join3(dir, "pyproject.toml"));
     let kind = "pip";
-    let manifest = firstExisting(dir, ["pyproject.toml", "Pipfile", "requirements.txt", "setup.py", "environment.yml", "environment.yaml"]) ?? paths.find((p) => dirnameOf(p) === dir && /^requirements([-_.].+)?\.txt$/i.test(basenameOf(p)));
+    let manifest = firstExisting(dir, ["pyproject.toml", "Pipfile", "requirements.txt", "setup.py", "environment.yml", "environment.yaml"]) ?? paths2.find((p) => dirnameOf(p) === dir && /^requirements([-_.].+)?\.txt$/i.test(basenameOf(p)));
     let lockfile;
     if (pathSet.has(join3(dir, "uv.lock")) || /^\[tool\.uv/m.test(pyproject ?? "")) {
       kind = "uv";
@@ -7706,7 +7821,7 @@ function detectPackageManagers(paths, pathSet, readText) {
       out.push({ kind, root: rootLabel(dir), manifest, ...lockfile ? { lockfile } : {} });
     }
   }
-  for (const path of paths) {
+  for (const path of paths2) {
     if (/\.(csproj|fsproj)$/i.test(path)) {
       const dir = dirnameOf(path);
       const lockfile = firstExisting(dir, ["packages.lock.json"]);
@@ -7782,7 +7897,7 @@ function flowSequence(src) {
 function cleanVersion(raw) {
   return raw.trim().replace(/^["']|["']$/g, "").replace(/^v(?=\d)/, "");
 }
-function detectVersions(paths, readText, harnessRoot) {
+function detectVersions(paths2, readText, harnessRoot) {
   const candidates = [];
   const push = (key, value, source, priority) => {
     if (!value)
@@ -7793,7 +7908,7 @@ function detectVersions(paths, readText, harnessRoot) {
       candidates.push({ key, value: cleaned, source, priority });
     }
   };
-  for (const path of paths) {
+  for (const path of paths2) {
     const name = basenameOf(path).toLowerCase();
     const isWorkflow = /^\.github\/workflows\/[^/]+\.ya?ml$/.test(path);
     const isDocker = /^(dockerfile|containerfile)([.-].+)?$/.test(name) || /\.dockerfile$/.test(name);
@@ -14485,8 +14600,8 @@ function inferAgentEntrypoints(input, map, roots) {
     set.add(hit.path);
     byRoot.set(root, set);
   }
-  for (const [root, paths] of [...byRoot.entries()].sort(([a], [b]) => cmp(a, b))) {
-    const files = [...paths].sort();
+  for (const [root, paths2] of [...byRoot.entries()].sort(([a], [b]) => cmp(a, b))) {
+    const files = [...paths2].sort();
     const mains = files.filter((f) => MAIN_FILE.test(f));
     const pick = mains.sort((a, b) => a.split("/").length - b.split("/").length)[0] ?? (files.length === 1 ? files[0] : undefined);
     const isPy = (pick ?? files[0]).endsWith(".py");
@@ -14784,8 +14899,8 @@ function moduleSpecifiers(source, braceStartsRegex = false) {
   }
   return out;
 }
-function readOptions(cfg, paths, read, depth = 0) {
-  if (depth > 8 || !paths.has(cfg))
+function readOptions(cfg, paths2, read, depth = 0) {
+  if (depth > 8 || !paths2.has(cfg))
     return null;
   const json = parseJsonLoose(read(cfg) ?? "");
   if (!isRecord(json))
@@ -14795,7 +14910,7 @@ function readOptions(cfg, paths, read, depth = 0) {
   const extendsList = (Array.isArray(json.extends) ? json.extends : [json.extends]).filter((e) => typeof e === "string" && e.startsWith("."));
   for (const e of extendsList) {
     const target = joinPath(dir, e);
-    const parent = readOptions(target.endsWith(".json") ? target : `${target}.json`, paths, read, depth + 1);
+    const parent = readOptions(target.endsWith(".json") ? target : `${target}.json`, paths2, read, depth + 1);
     if (parent?.baseUrl !== undefined)
       merged.baseUrl = parent.baseUrl;
     if (parent?.paths !== undefined)
@@ -14820,36 +14935,36 @@ function readOptions(cfg, paths, read, depth = 0) {
   }
   return merged;
 }
-function readTsconfig(cfg, paths, read) {
-  const options = readOptions(cfg, paths, read);
+function readTsconfig(cfg, paths2, read) {
+  const options = readOptions(cfg, paths2, read);
   if (!options || options.baseUrl === undefined && options.paths === undefined)
     return null;
   return { baseUrl: options.baseUrl, pathsBase: options.paths?.base ?? options.baseUrl ?? dirname5(cfg), paths: options.paths?.list ?? [] };
 }
-function aliasesFor(dir, paths, read, cache) {
+function aliasesFor(dir, paths2, read, cache) {
   for (let d = dir;; d = dirname5(d)) {
     const cfg = joinPath(d, "tsconfig.json");
     if (!cache.has(cfg))
-      cache.set(cfg, readTsconfig(cfg, paths, read));
+      cache.set(cfg, readTsconfig(cfg, paths2, read));
     const hit = cache.get(cfg);
     if (hit)
       return hit;
-    if (paths.has(cfg))
+    if (paths2.has(cfg))
       return null;
     if (d === "." || d === "")
       return null;
   }
 }
-function resolveFile(candidate, paths) {
+function resolveFile(candidate, paths2) {
   const base = candidate.replace(/\?.*$/, "");
-  if (paths.has(base))
+  if (paths2.has(base))
     return base;
   const stem = base.replace(/\.(?:[cm]?js|jsx)$/, "");
   for (const ext of EXTENSIONS)
-    if (paths.has(`${stem}${ext}`))
+    if (paths2.has(`${stem}${ext}`))
       return `${stem}${ext}`;
   for (const ext of EXTENSIONS)
-    if (paths.has(`${base}/index${ext}`))
+    if (paths2.has(`${base}/index${ext}`))
       return `${base}/index${ext}`;
   return;
 }
@@ -14862,7 +14977,7 @@ function exportTargets(value) {
     return Object.values(value).flatMap(exportTargets);
   return [];
 }
-function packageEntry(dir, sub, paths, read) {
+function packageEntry(dir, sub, paths2, read) {
   const json = parseJsonLoose(read(joinPath(dir, "package.json")) ?? "");
   const fields = [];
   if (isRecord(json)) {
@@ -14892,20 +15007,20 @@ function packageEntry(dir, sub, paths, read) {
           fields.push(json[k]);
     }
   }
-  const found = fields.map((f) => resolveFile(joinPath(dir, f), paths)).filter((f) => f !== undefined);
+  const found = fields.map((f) => resolveFile(joinPath(dir, f), paths2)).filter((f) => f !== undefined);
   if (found.length > 0)
     return [...new Set(found)];
-  const fallback = sub ? resolveFile(joinPath(dir, sub), paths) ?? resolveFile(joinPath(dir, "src", sub), paths) : resolveFile(joinPath(dir, "src/index"), paths) ?? resolveFile(joinPath(dir, "index"), paths);
+  const fallback = sub ? resolveFile(joinPath(dir, sub), paths2) ?? resolveFile(joinPath(dir, "src", sub), paths2) : resolveFile(joinPath(dir, "src/index"), paths2) ?? resolveFile(joinPath(dir, "index"), paths2);
   return fallback ? [fallback] : [];
 }
 function dynamicImports(source) {
   const text = stripJsComments(source);
   return [...text.matchAll(CALL_RE)].map((m) => m[1].trim()).filter((arg) => arg !== "" && !STATIC_ARG.test(arg));
 }
-function packageImportTargets(spec, from, paths, read) {
+function packageImportTargets(spec, from, paths2, read) {
   for (let d = dirname5(from);; d = dirname5(d)) {
     const manifest = joinPath(d, "package.json");
-    if (paths.has(manifest)) {
+    if (paths2.has(manifest)) {
       const json = parseJsonLoose(read(manifest) ?? "");
       const imports = isRecord(json) && isRecord(json.imports) ? json.imports : undefined;
       if (imports) {
@@ -14947,13 +15062,13 @@ function packageImport(spec, from, input) {
   return [];
 }
 function importClosure(input) {
-  const { paths, read } = input;
+  const { paths: paths2, read } = input;
   const max = input.maxFiles ?? 20000;
   const files = new Set;
   const unresolved = [];
   const dynamic = [];
   const aliasCache = new Map;
-  const queue = input.entries.filter((e) => paths.has(e));
+  const queue = input.entries.filter((e) => paths2.has(e));
   let imports = 0;
   while (queue.length > 0 && files.size < max) {
     const file = queue.shift();
@@ -14991,28 +15106,28 @@ function importClosure(input) {
   return { entries: input.entries, files, unresolved, imports, dynamic, truncated };
 }
 function resolveSpecifier(spec, from, input, aliasCache) {
-  const { paths, read } = input;
+  const { paths: paths2, read } = input;
   if (spec.startsWith(".")) {
-    const hit = resolveFile(joinPath(dirname5(from), spec), paths);
+    const hit = resolveFile(joinPath(dirname5(from), spec), paths2);
     return hit ? [hit] : [];
   }
   if (spec.startsWith("/") || /^(?:node|bun|cloudflare|workers|https?|data):/.test(spec))
     return;
-  const aliases = aliasesFor(dirname5(from), paths, read, aliasCache);
+  const aliases = aliasesFor(dirname5(from), paths2, read, aliasCache);
   for (const alias of aliases?.paths ?? []) {
     const matches = alias.wildcard ? spec.startsWith(alias.prefix) && spec.endsWith(alias.suffix) : spec === alias.prefix;
     if (!matches)
       continue;
     const middle = alias.wildcard ? spec.slice(alias.prefix.length, spec.length - alias.suffix.length) : "";
     for (const target of alias.targets) {
-      const hit = resolveFile(joinPath(aliases.pathsBase, target.replace("*", middle)), paths);
+      const hit = resolveFile(joinPath(aliases.pathsBase, target.replace("*", middle)), paths2);
       if (hit)
         return [hit];
     }
     return [];
   }
   if (aliases?.baseUrl) {
-    const hit = resolveFile(joinPath(aliases.baseUrl, spec), paths);
+    const hit = resolveFile(joinPath(aliases.baseUrl, spec), paths2);
     if (hit)
       return [hit];
   }
@@ -15024,7 +15139,7 @@ function resolveSpecifier(spec, from, input, aliasCache) {
   if (dir === undefined)
     return /^(?:@\/|~\/)/.test(spec) ? [] : undefined;
   const sub = parts.slice(spec.startsWith("@") ? 2 : 1).join("/");
-  const entry = packageEntry(dir, sub, paths, read);
+  const entry = packageEntry(dir, sub, paths2, read);
   return entry.length > 0 ? entry : [];
 }
 function isRuntimeConfigFile(path, root) {
@@ -15045,7 +15160,7 @@ var DOC_DIR2 = /(^|\/)(docs?|documentation|website)(\/|$)/;
 var AUXILIARY_DIR = /(^|\/)(vendor|third_party|examples?|samples?|demos?|\.devops|cloud-deployments|hack|playground)(\/|$)/;
 var BUNDLED_KINDS = new Set(["cloudflare_workers"]);
 function runtimeFiles(ctx, runtimes, packageJsons, harnessRoot, launchedScript) {
-  const paths = new Set(ctx.files.map((f) => f.path));
+  const paths2 = new Set(ctx.files.map((f) => f.path));
   const read = (p2) => ctx.byPath.get(p2)?.text;
   const workspacePackages = new Map;
   for (const p2 of packageJsons)
@@ -15056,10 +15171,10 @@ function runtimeFiles(ctx, runtimes, packageJsons, harnessRoot, launchedScript)
   for (const rt of runtimes) {
     if (!BUNDLED_KINDS.has(rt.kind))
       continue;
-    const entries = uniqSorted(rt.entrypoints.map((e) => (e.handler ?? "").split("#")[0]).filter((p2) => paths.has(p2) && languageOf(p2) === "js"));
+    const entries = uniqSorted(rt.entrypoints.map((e) => (e.handler ?? "").split("#")[0]).filter((p2) => paths2.has(p2) && languageOf(p2) === "js"));
     if (entries.length === 0)
       continue;
-    const closure = importClosure({ entries, paths, read, workspacePackages });
+    const closure = importClosure({ entries, paths: paths2, read, workspacePackages });
     const relative6 = closure.unresolved.length;
     if (closure.files.size <= entries.length && relative6 > 0)
       continue;
@@ -15077,7 +15192,7 @@ function runtimeFiles(ctx, runtimes, packageJsons, harnessRoot, launchedScript)
         if (!/^[./~#]/.test(spec))
           pkgs.add(npmPackageOf(spec));
         else if (spec.startsWith("#")) {
-          for (const t of packageImportTargets(spec, f, paths, read)?.targets ?? [])
+          for (const t of packageImportTargets(spec, f, paths2, read)?.targets ?? [])
             if (!t.startsWith(".") && !t.startsWith("#"))
               pkgs.add(npmPackageOf(t));
         }
@@ -15865,16 +15980,16 @@ function detectDependencies(input) {
   if (loaded.skipped.length > 0) {
     const byReason = new Map;
     for (const sk of loaded.skipped) {
-      let paths = byReason.get(sk.reason);
-      if (!paths)
-        byReason.set(sk.reason, paths = []);
-      paths.push(sk.path);
+      let paths2 = byReason.get(sk.reason);
+      if (!paths2)
+        byReason.set(sk.reason, paths2 = []);
+      paths2.push(sk.path);
     }
-    for (const [reason, paths] of [...byReason.entries()].sort(([a], [b]) => cmp(a, b))) {
+    for (const [reason, paths2] of [...byReason.entries()].sort(([a], [b]) => cmp(a, b))) {
       ctx.gaps.push({
         kind: "skipped_files",
-        message: `${paths.length} file(s) not analyzed (${reason}): ${paths.slice(0, 5).map(redact).join(", ")}${paths.length > 5 ? ", ..." : ""}`,
-        evidence: paths.slice(0, 3).map((path) => ({ path: redact(path), detector: "files" }))
+        message: `${paths2.length} file(s) not analyzed (${reason}): ${paths2.slice(0, 5).map(redact).join(", ")}${paths2.length > 5 ? ", ..." : ""}`,
+        evidence: paths2.slice(0, 3).map((path) => ({ path: redact(path), detector: "files" }))
       });
     }
   }
@@ -16063,7 +16178,7 @@ var RUNTIME_CATEGORIES = new Set(["prompt", "schema", "migration", "seed_data",
 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));
+  const paths2 = new Set(manifest.files.map((f) => f.path));
   const root = map?.harness?.root ?? (manifest.harness.root || ".");
   const runtime = map?.runtimes.find((r) => r.root === root && r.kind === map.harness?.runtimeKind);
   const reached = new Set;
@@ -16073,27 +16188,27 @@ function harnessFiles(manifest, map, read) {
     if (d === "." || d === "")
       break;
   }
-  for (const p2 of paths)
+  for (const p2 of paths2)
     if (ancestors.has(dirname5(p2)) && dirname5(p2) !== root && WORKSPACE_INPUT.test(basename3(p2)))
       reached.add(p2);
   for (const config of runtime?.kind === "cloudflare_workers" ? runtime.configFiles : []) {
     for (const dir of wranglerAssetDirs(config, read(config) ?? ""))
-      for (const p2 of paths)
+      for (const p2 of paths2)
         if (isUnder2(p2, dir))
           reached.add(p2);
   }
   if (runtime?.kind === "cloudflare_workers") {
-    const entries = runtime.entrypoints.map((e) => (e.handler ?? "").split("#")[0]).filter((p2) => paths.has(p2));
+    const entries = runtime.entrypoints.map((e) => (e.handler ?? "").split("#")[0]).filter((p2) => paths2.has(p2));
     if (entries.length > 0) {
       const workspacePackages = new Map;
-      for (const p2 of paths) {
+      for (const p2 of paths2) {
         if (basename3(p2) !== "package.json")
           continue;
         const json = parseJsonLoose(read(p2) ?? "");
         if (isRecord(json) && typeof json.name === "string")
           workspacePackages.set(json.name, dirname5(p2));
       }
-      for (const f of importClosure({ entries, paths, read, workspacePackages }).files)
+      for (const f of importClosure({ entries, paths: paths2, read, workspacePackages }).files)
         reached.add(f);
     }
   }
@@ -17769,6 +17884,8 @@ var TEXT_PRESERVING_METHODS = new Set([
 ]);
 var ARRAY_ASSEMBLY_METHODS = new Set(["join", "concat", "flat", "filter", "slice", "reverse", "sort", "toSorted"]);
 var CALLBACK_METHODS = new Set(["map", "flatMap", "then", "catch"]);
+var ARRAY_ELEMENT = "<array-element>";
+var FLATMAP_ELEMENT = "<flatmap-element>";
 var TEST_SOURCE = /(?:^|\/)(?:__tests__|__mocks__|fixtures?|test-fixtures)\/|(?:^|\/)[^/]*\.(?:test|spec)\.[^/]+$/i;
 var TEXT_MODULE = /\.(?:md|mdx|txt|prompt)(?:\?raw)?$/;
 var LOCAL_ONLY_SITE = /^(?:scripts|evals?)\//;
@@ -18072,6 +18189,9 @@ class PromptResolver {
       return;
     }
     const expr = unwrap2(node);
+    if (walk.project[0] === FLATMAP_ELEMENT && (import_typescript8.default.isStringLiteral(expr) || import_typescript8.default.isNoSubstitutionTemplateLiteral(expr) || import_typescript8.default.isTemplateExpression(expr) || import_typescript8.default.isObjectLiteralExpression(expr))) {
+      walk = { ...walk, project: walk.project.slice(1) };
+    }
     if (walk.project.length > 0 && (import_typescript8.default.isStringLiteral(expr) || import_typescript8.default.isNoSubstitutionTemplateLiteral(expr) || import_typescript8.default.isTemplateExpression(expr) || import_typescript8.default.isBinaryExpression(expr) && expr.operatorToken.kind === import_typescript8.default.SyntaxKind.PlusToken)) {
       return;
     }
@@ -18106,6 +18226,16 @@ class PromptResolver {
       return;
     }
     if (import_typescript8.default.isArrayLiteralExpression(expr)) {
+      if (walk.project[0] === ARRAY_ELEMENT || walk.project[0] === FLATMAP_ELEMENT) {
+        const inner = { ...walk, project: walk.project.slice(1) };
+        for (const element of expr.elements) {
+          if (import_typescript8.default.isSpreadElement(element))
+            this.value(element.expression, owner, walk);
+          else
+            this.value(element, owner, inner);
+        }
+        return;
+      }
       if (/^\d+$/.test(walk.project[0] ?? "")) {
         const [index, ...rest] = walk.project;
         const selected = Number(index);
@@ -18300,7 +18430,7 @@ class PromptResolver {
     }
     const table = this.objectLiteralOf(access.expression);
     if (!table) {
-      this.value(access.expression, owner, walk);
+      this.value(access.expression, owner, literalKey === undefined ? walk : { ...flag(walk, "projected"), project: [literalKey, ...walk.project] });
       return;
     }
     const next = this.step(literalKey ? walk : flag(walk, "dynamic-key"), access, literalKey ? `table field ${literalKey}` : "every field of a table read with a dynamic key");
@@ -18332,6 +18462,49 @@ class PromptResolver {
         this.value(callee.expression, owner, walk);
         return;
       }
+      const checker = this.context.checkerFor(this.relative(callee.expression.getSourceFile().fileName));
+      const receiverType = checker?.getTypeAtLocation(callee.expression);
+      const arrayReceiver = import_typescript8.default.isArrayLiteralExpression(this.objectLiteralOf(callee.expression) ?? callee.expression) || !!checker && !!receiverType && (receiverType.isUnion() ? receiverType.types : [receiverType]).every((type) => checker.isArrayType(type) || checker.isTupleType(type));
+      if ((method === "find" || method === "findLast") && arrayReceiver) {
+        this.value(callee.expression, owner, { ...flag(walk, "dynamic-key"), project: [ARRAY_ELEMENT, ...walk.project] });
+        return;
+      }
+      if ((method === "map" || method === "flatMap") && arrayReceiver && call.arguments[0]) {
+        const callback = unwrap2(call.arguments[0]);
+        const functions2 = import_typescript8.default.isArrowFunction(callback) || import_typescript8.default.isFunctionExpression(callback) ? [callback] : this.declarationsOf(callback).map(functionOf).filter((fn) => !!fn?.body);
+        const output = walk.project[0];
+        const indexed = /^\d+$/.test(output ?? "");
+        if (method === "flatMap" && indexed) {
+          this.markUnresolved(call, "dynamic-key", walk);
+          return;
+        }
+        const eachOutput = output === ARRAY_ELEMENT || output === FLATMAP_ELEMENT;
+        const callbackProject = eachOutput ? method === "flatMap" ? [FLATMAP_ELEMENT, ...walk.project.slice(1)] : walk.project.slice(1) : indexed ? walk.project.slice(1) : walk.project;
+        const sourceProject = method === "map" && indexed ? output : ARRAY_ELEMENT;
+        for (const fn of functions2) {
+          const next = this.step({ ...walk, project: callbackProject }, fn, `array callback at ${this.where(call)}`);
+          if (!next || walk.seen.has(fn))
+            continue;
+          next.bindings = new Map(next.bindings);
+          bindParameters(fn, [callee.expression], walk.bindings, next.bindings);
+          const first2 = fn.parameters[0];
+          if (first2 && import_typescript8.default.isArrayBindingPattern(first2.name)) {
+            first2.name.elements.forEach((element, index) => {
+              if (import_typescript8.default.isBindingElement(element) && !element.dotDotDotToken && !element.initializer) {
+                next.bindings.set(element, { expr: callee.expression, bindings: walk.bindings, project: [String(index)] });
+              }
+            });
+          }
+          for (const [declaration, binding] of next.bindings) {
+            if (declaration === first2 || import_typescript8.default.isBindingElement(declaration) && parameterOf(declaration) === first2) {
+              next.bindings.set(declaration, { ...binding, project: [sourceProject, ...binding.project ?? []] });
+            }
+          }
+          this.builderBody(fn, owner ?? { node: fn, kind: "builder" }, next);
+        }
+        if (functions2.length)
+          return;
+      }
       if (CALLBACK_METHODS.has(method)) {
         const callbacks = call.arguments.map(unwrap2).filter((a) => import_typescript8.default.isArrowFunction(a) || import_typescript8.default.isFunctionExpression(a));
         for (const callback of callbacks)
@@ -18343,6 +18516,10 @@ class PromptResolver {
           this.value(callee.expression, owner, walk);
         return;
       }
+      if (ARRAY_ASSEMBLY_METHODS.has(method) && /^\d+$/.test(walk.project[0] ?? "")) {
+        this.markUnresolved(call, "dynamic-key", walk);
+        return;
+      }
       if (TEXT_PRESERVING_METHODS.has(method) || ARRAY_ASSEMBLY_METHODS.has(method)) {
         this.value(callee.expression, owner, walk);
         if (method === "concat")
@@ -18755,7 +18932,19 @@ class PromptResolver {
   parameter(declaration, at, owner, walk) {
     const bound = walk.bindings.get(declaration);
     if (bound) {
-      this.value(bound.expr, undefined, { ...walk, bindings: bound.bindings, project: [...bound.project ?? [], ...walk.project] });
+      const project = [...bound.project ?? [], ...walk.project];
+      if (bound.rest) {
+        const each = project[0] === ARRAY_ELEMENT;
+        const index2 = /^\d+$/.test(project[0] ?? "") ? Number(project[0]) : undefined;
+        const values = index2 === undefined ? bound.rest : bound.rest.slice(index2, index2 + 1);
+        for (const value of values)
+          this.value(value, undefined, {
+            ...walk,
+            bindings: bound.bindings,
+            project: each || index2 !== undefined ? project.slice(1) : project
+          });
+      } else
+        this.value(bound.expr, undefined, { ...walk, bindings: bound.bindings, project });
       return;
     }
     const parameter = import_typescript8.default.isParameter(declaration) ? declaration : parameterOf(declaration);
@@ -19141,6 +19330,10 @@ function bindingField(element) {
 function bindParameters(fn, args, outer, into) {
   fn.parameters.forEach((parameter, index) => {
     const argument = args[index];
+    if (parameter.dotDotDotToken && import_typescript8.default.isIdentifier(parameter.name)) {
+      into.set(parameter, { expr: argument ?? parameter.name, bindings: outer, rest: args.slice(index) });
+      return;
+    }
     if (!argument)
       return;
     if (import_typescript8.default.isIdentifier(parameter.name)) {
@@ -19484,7 +19677,7 @@ async function runHarnessCommand(context) {
           report: {
             reportId: report.reportId,
             reportHash,
-            path: normalizePath2(relative9(rootDir, reportPath)) || ".moda/harness-report.json"
+            path: normalizePath3(relative9(rootDir, reportPath)) || ".moda/harness-report.json"
           },
           validation,
           approval: {
@@ -19630,7 +19823,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-gt4qawvp.js");
+        const { runGithubActionsAnalyze } = await import("./harness-github-actions-ma33g263.js");
         const result = await runGithubActionsAnalyze(rootDir, {
           writeReport: (report2) => {
             const normalized = normalizeHarnessReport(report2);
@@ -19757,7 +19950,7 @@ async function runHarnessCommand(context) {
         report: {
           reportId: approval.report.reportId,
           reportHash: hashHarnessReport(approval.report),
-          path: normalizePath2(relative9(rootDir, reportPath)) || ".moda/harness-report.json"
+          path: normalizePath3(relative9(rootDir, reportPath)) || ".moda/harness-report.json"
         },
         validation: approval.validation,
         approval: approval.approval
@@ -19779,17 +19972,17 @@ async function runHarnessCommand(context) {
         if (promoteOut === "true") {
           throw new CliInputError("Missing output path for --out.", "Usage: moda harness candidates --promote=<concern|all> --out=<file>");
         }
-        const { artifacts, unknowns } = deterministicGraphItems(rootDir, promote === "all" ? undefined : promote);
+        const { artifacts, unknowns, canonicalAgentIdentities } = deterministicGraphItems(rootDir, promote === "all" ? undefined : promote);
         tagComponentStatus({ runtimeAgents: [], artifacts }, rootDir);
-        const { extractHarnessWithContext: extractHarnessWithContext2 } = await import("./index-xhcqg43k.js");
-        const { enumerateHarnessComponents, mergeEnumeratedComponents } = await import("./index-n43wbr24.js");
+        const { extractHarnessWithContext: extractHarnessWithContext2 } = await import("./index-2bctz222.js");
+        const { enumerateHarnessComponents, mergeEnumeratedComponents } = await import("./index-jvs3ksx6.js");
         let components = { runtimeAgents: [], artifacts: [], warnings: [] };
         if (promote === "all" || promote === "topology" || promote === "tools") {
           const { result, ctx } = extractHarnessWithContext2(rootDir);
           const found = enumerateHarnessComponents(result, ctx);
           components = promote === "tools" ? { ...found, artifacts: found.artifacts.filter((entry) => entry.type === "tool") } : promote === "topology" ? { ...found, artifacts: found.artifacts.filter((entry) => entry.type !== "tool") } : found;
         }
-        const promoted = { concern: promote, unknowns, ...mergeEnumeratedComponents(artifacts, components) };
+        const promoted = { concern: promote, unknowns, canonicalAgentIdentities, ...mergeEnumeratedComponents(artifacts, components) };
         const promoteWritten = [];
         if (promoteOut && !context.dryRun) {
           const target = resolve9(context.cwd, promoteOut);
@@ -19816,8 +20009,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-xhcqg43k.js");
-      const { enumerateHarnessComponents, mergeEnumeratedComponents } = await import("./index-n43wbr24.js");
+      const { extractHarnessWithContext: extractHarnessWithContext2, serializeExtractResult } = await import("./index-2bctz222.js");
+      const { enumerateHarnessComponents, mergeEnumeratedComponents } = await import("./index-jvs3ksx6.js");
       const { result, ctx } = extractHarnessWithContext2(rootDir, { fresh: true });
       const artifacts = deterministicArtifacts(rootDir);
       tagComponentStatus({ runtimeAgents: [], artifacts }, rootDir);
@@ -20379,7 +20572,7 @@ function modelIdsUsedInSource(rootDir, ids) {
   const walk = (current) => {
     if (pending.size === 0)
       return false;
-    const rel2 = normalizePath2(relative9(rootReal, current)) || ".";
+    const rel2 = normalizePath3(relative9(rootReal, current)) || ".";
     let stat;
     try {
       stat = lstatSync7(current);
@@ -20463,9 +20656,9 @@ function mergeDeterministicReplacement(report, rootDir, options) {
   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))));
+    const paths2 = artifactPaths(artifact);
+    const exact = report.graph.artifacts.filter((candidate) => candidate.type === artifact.type && artifactPaths(candidate).some((path) => paths2.includes(path)));
+    const matches = exact.length ? exact : report.graph.artifacts.filter((candidate) => candidate.type === artifact.type && candidate.type === "eval" && artifactPaths(candidate).some((path) => paths2.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)
@@ -20537,6 +20730,7 @@ function repairExternalAnalystReport(report, rootDir, options = {}) {
   mergeDeterministicReplacement(normalized, rootDir, options);
   if (!options.concern || options.concern === "topology")
     mergeBoundRuntimeClasses(normalized.graph, rootDir);
+  remapCanonicalArtifactAgents(normalized.graph, normalized.graph.artifacts, !options.concern);
   tagComponentStatus(normalized.graph, rootDir);
   hydratePromptAndToolBodies(normalized.graph, rootDir);
   const unverified = new Set;
@@ -20570,8 +20764,8 @@ function repairExternalAnalystReport(report, rootDir, options = {}) {
   const testOnlyModels = normalized.graph.artifacts.filter((artifact) => {
     if (artifact.type !== "model_config" || unverified.has(artifact.id))
       return false;
-    const paths = artifact.evidence.map((entry) => entry.path).filter((path) => typeof path === "string" && path.length > 0);
-    return paths.length > 0 && paths.every((path) => TEST_PATH3.test(path));
+    const paths2 = artifact.evidence.map((entry) => entry.path).filter((path) => typeof path === "string" && path.length > 0);
+    return paths2.length > 0 && paths2.every((path) => TEST_PATH3.test(path));
   });
   const usedInSource = testOnlyModels.length > 0 ? modelIdsUsedInSource(rootDir, testOnlyModels.map((artifact) => (artifact.name ?? "").trim())) : new Set;
   for (const artifact of testOnlyModels) {
@@ -20601,6 +20795,29 @@ function repairExternalAnalystReport(report, rootDir, options = {}) {
   if (unverified.size > 0)
     removeArtifacts(normalized, unverified);
   deriveRelationshipsFromGraph(normalized.graph);
+  if (!options.concern) {
+    const knownAgents = new Set(normalized.graph.runtimeAgents.map((agent) => agent.id));
+    for (const artifact of normalized.graph.artifacts) {
+      if (artifact.type !== "tool" || !["in_prod", "reachable"].includes(artifact.status ?? ""))
+        continue;
+      const owners = [
+        ...artifact.usedByAgentIds ?? [],
+        ...artifact.ownedByAgentId ? [artifact.ownedByAgentId] : [],
+        ...normalized.graph.runtimeAgents.filter((agent) => agent.artifactIds?.includes(artifact.id)).map((agent) => agent.id),
+        ...normalized.graph.relationships.filter((edge) => edge.to === artifact.id && ["uses_artifact", "owns_artifact"].includes(edge.type)).map((edge) => edge.from)
+      ];
+      if (owners.some((owner) => knownAgents.has(owner)))
+        continue;
+      const id = `unresolved_tool_owner_${createHash7("sha256").update(artifact.id).digest("hex").slice(0, 16)}`;
+      if (!normalized.graph.unknowns.some((unknown) => unknown.id === id))
+        normalized.graph.unknowns.push({
+          id,
+          question: `Tool ${artifact.name} has a source definition but no source-proven owner in the hosted topology; trace evidence is required to resolve its agent.`,
+          candidateIds: [artifact.id],
+          evidence: artifact.evidence
+        });
+    }
+  }
   dropUnlocatedAgentCitations(normalized);
   if ((normalized.claims?.length ?? 0) === 0 && deterministicOnlyArtifactTypes().has("eval")) {
     const grounded = createHarnessReport({ graph: {
@@ -20696,8 +20913,8 @@ var CONCERN_PROMOTED_ARTIFACT_TYPES = {
   evals: new Set(["model_config", "eval"])
 };
 async function deterministicFloorGraph(rootDir, options = {}) {
-  const { extractHarnessWithContext: extractHarnessWithContext2 } = await import("./index-xhcqg43k.js");
-  const { enumerateHarnessComponents, mergeEnumeratedComponents } = await import("./index-n43wbr24.js");
+  const { extractHarnessWithContext: extractHarnessWithContext2 } = await import("./index-2bctz222.js");
+  const { enumerateHarnessComponents, mergeEnumeratedComponents } = await import("./index-jvs3ksx6.js");
   const { result, ctx } = extractHarnessWithContext2(rootDir);
   const items = deterministicGraphItems(rootDir);
   const components = mergeEnumeratedComponents(items.artifacts, enumerateHarnessComponents(result, ctx));
@@ -20726,7 +20943,7 @@ function deterministicGraphItems(rootDir, concern) {
   const graph = { artifacts: [], unknowns: [] };
   mergeDeterministicArtifacts(graph, rootDir, { concern });
   hydratePromptAndToolBodies(graph, rootDir);
-  return { artifacts: graph.artifacts, unknowns: graph.unknowns };
+  return { artifacts: graph.artifacts, unknowns: graph.unknowns, canonicalAgentIdentities: graph.scan?.canonicalAgentIdentities ?? [] };
 }
 var extractedModelsCache = new WeakMap;
 function extractedModelItems(rootDir) {
@@ -20861,9 +21078,16 @@ function mergeDeterministicArtifacts(graph, rootDir, options = {}) {
     } catch {}
   }
   const extractedIds = new Set(extracted.artifacts.map((artifact) => artifact.id));
+  try {
+    const { result, ctx } = extractHarnessWithContext(rootDir);
+    const identities = harnessAgentIdentities(enumerateAgents(result, ctx).runtimeAgents);
+    graph.scan ??= {};
+    graph.scan.canonicalAgentIdentities = identities;
+    remapCanonicalArtifactAgents(graph, promoted);
+  } catch {}
   backfillRefutationEvidenceReasons(graph);
   const refuted = analystRefutations(graph);
-  const candidatePaths = new Set(promoted.flatMap((artifact) => artifact.evidence.map((entry) => typeof entry.path === "string" ? normalizePath2(entry.path) : "").filter(Boolean)));
+  const candidatePaths = new Set(promoted.flatMap((artifact) => artifact.evidence.map((entry) => typeof entry.path === "string" ? normalizePath3(entry.path) : "").filter(Boolean)));
   const modelLineCounts = new Map;
   for (const artifact of promoted) {
     if (artifact.type !== "model_config")
@@ -20888,6 +21112,26 @@ function mergeDeterministicArtifacts(graph, rootDir, options = {}) {
       added += 1;
       continue;
     }
+    if (artifact.type === "prompt" && artifact.usedByAgentIds.length > 0) {
+      const existing = graph.artifacts.find((candidate) => candidate.type === "prompt" && candidate.id === artifact.id);
+      if (existing && !isRefutedByAnalyst(artifact, refuted, candidatePaths)) {
+        const definition = artifact.evidence[0];
+        const stored = existing.evidence?.[0];
+        if (definition && (!stored || stored.path === definition.path && stored.line === definition.line)) {
+          existing.usedByAgentIds = [...new Set([...existing.usedByAgentIds ?? [], ...artifact.usedByAgentIds])];
+          if (Array.isArray(existing.staticUsedByAgentIds))
+            existing.staticUsedByAgentIds = [...new Set([...existing.staticUsedByAgentIds, ...artifact.usedByAgentIds])];
+          if (existing.usedByAgentIds.length > 1)
+            existing.scope = "shared";
+          existing.evidence ??= [];
+          for (const entry of artifact.evidence) {
+            if (!existing.evidence.some((known) => known.path === entry.path && known.line === entry.line && known.reason === entry.reason))
+              existing.evidence.push(entry);
+          }
+          continue;
+        }
+      }
+    }
     if (graphCoversPromotedArtifact(graph, artifact, sharedModelLines))
       continue;
     if ((artifact.type === "model_config" || artifact.type === "eval") && artifact.evidence.length > 1 && !refuted.candidateIds.has(artifact.id)) {
@@ -20915,6 +21159,50 @@ function mergeDeterministicArtifacts(graph, rootDir, options = {}) {
   }
   return { added };
 }
+function remapCanonicalArtifactAgents(graph, artifacts = graph.artifacts, dropUnmapped = false) {
+  const identities = harnessAgentIdentities(graph.scan?.canonicalAgentIdentities);
+  const mapping = matchHarnessAgentIds(identities, graph.runtimeAgents ?? []);
+  const canonical = new Map(identities.map((identity2) => [identity2.id, identity2]));
+  const unresolved = new Map;
+  const translate = (id, artifactId) => {
+    const mapped = mapping.get(id);
+    if (mapped || !dropUnmapped || !canonical.has(id))
+      return mapped ?? id;
+    const affected = unresolved.get(id) ?? [];
+    if (!affected.includes(artifactId))
+      affected.push(artifactId);
+    unresolved.set(id, affected);
+    return;
+  };
+  for (const artifact of artifacts) {
+    artifact.usedByAgentIds = [...new Set((artifact.usedByAgentIds ?? []).flatMap((id) => translate(id, artifact.id) ?? []))];
+    for (const field of ["staticUsedByAgentIds", "traceUsedByAgentIds"]) {
+      if (Array.isArray(artifact[field]))
+        artifact[field] = [...new Set(artifact[field].flatMap((id) => translate(id, artifact.id) ?? []))];
+    }
+    if (artifact.ownedByAgentId) {
+      const owner = translate(artifact.ownedByAgentId, artifact.id);
+      if (owner)
+        artifact.ownedByAgentId = owner;
+      else {
+        delete artifact.ownedByAgentId;
+        artifact.scope = "shared";
+      }
+    }
+  }
+  for (const [agentId, artifactIds] of unresolved) {
+    const identity2 = canonical.get(agentId);
+    const id = `unresolved_agent_links_${createHash7("sha256").update(agentId).digest("hex").slice(0, 16)}`;
+    if (graph.unknowns.some((unknown) => unknown.id === id))
+      continue;
+    graph.unknowns.push({
+      id,
+      question: `Ownership for ${identity2.name} could not be matched uniquely to the hosted topology; its unresolved artifact links were omitted.`,
+      candidateIds: artifactIds,
+      evidence: (identity2.evidence ?? []).flatMap((entry) => entry.path ? [{ path: entry.path, ...entry.line !== undefined ? { line: entry.line } : {}, reason: entry.reason ?? "Extractor agent identity" }] : [])
+    });
+  }
+}
 function withCallSitePrompts(rootDir, promoted) {
   if (process.env.MODA_HARNESS_CALLSITE_PROMPTS === "0")
     return promoted;
@@ -20985,11 +21273,11 @@ function analystRefutations(graph) {
       if (typeof entry?.path !== "string" || !entry.path)
         continue;
       const line = typeof entry.line === "number" ? entry.line : undefined;
-      result.locations.push({ path: normalizePath2(entry.path), start: line, end: line, types: refutedTypes(entry.reason, question) });
+      result.locations.push({ path: normalizePath3(entry.path), start: line, end: line, types: refutedTypes(entry.reason, question) });
     }
     for (const match of question.matchAll(/([\w./-]+\.[a-z0-9]{1,5})(?::|\s+(?:lines?\s+)?)(\d+)(?:\s*[-\u2013]\s*(\d+))?/gi)) {
       const start = Number(match[2]);
-      result.locations.push({ path: normalizePath2(match[1]), start, end: match[3] ? Number(match[3]) : start, types: refutedTypes(question) });
+      result.locations.push({ path: normalizePath3(match[1]), start, end: match[3] ? Number(match[3]) : start, types: refutedTypes(question) });
     }
   }
   return result;
@@ -21008,7 +21296,7 @@ function isRefutedByAnalyst(artifact, refuted, candidatePaths) {
   return artifact.evidence.some((entry) => {
     if (typeof entry.path !== "string")
       return false;
-    const path = normalizePath2(entry.path);
+    const path = normalizePath3(entry.path);
     return refuted.locations.some((location) => {
       if (location.types && !location.types.has(artifact.type))
         return false;
@@ -21024,9 +21312,9 @@ function isRefutedByAnalyst(artifact, refuted, candidatePaths) {
 }
 function artifactSourceKey(artifact) {
   if (artifact.sourcePath)
-    return normalizePath2(artifact.sourcePath);
+    return normalizePath3(artifact.sourcePath);
   const pinned = Array.isArray(artifact.evidence) ? artifact.evidence.find((entry) => typeof entry.path === "string" && entry.path.length > 0) : undefined;
-  return pinned ? normalizePath2(pinned.path) : undefined;
+  return pinned ? normalizePath3(pinned.path) : undefined;
 }
 function mentionsModelId(text, id) {
   if (!id)
@@ -21035,8 +21323,8 @@ function mentionsModelId(text, id) {
   return new RegExp(`(?<![\\w./@-])${escaped}(?![\\w/-]|\\.\\w)`, "i").test(text);
 }
 function artifactPaths(artifact) {
-  const paths = Array.isArray(artifact.evidence) ? artifact.evidence.map((entry) => typeof entry.path === "string" ? normalizePath2(entry.path) : "").filter(Boolean) : [];
-  return artifact.sourcePath ? [normalizePath2(artifact.sourcePath), ...paths] : paths;
+  const paths2 = Array.isArray(artifact.evidence) ? artifact.evidence.map((entry) => typeof entry.path === "string" ? normalizePath3(entry.path) : "").filter(Boolean) : [];
+  return artifact.sourcePath ? [normalizePath3(artifact.sourcePath), ...paths2] : paths2;
 }
 function graphCoversPromotedArtifact(graph, promoted, sharedModelLines = new Set) {
   if (promoted.type === "model_config" && graph.artifacts.some((existing) => existing.type === "model_config" && mentionsModelId(`${existing.name ?? ""}
@@ -21044,7 +21332,7 @@ ${existing.body ?? ""}`, promoted.name)))
     return true;
   if (promoted.type === "eval") {
     const suite = new Set(artifactPaths(promoted));
-    const suiteKey = promoted.sourcePath ? evalSuiteKey(normalizePath2(promoted.sourcePath)) : undefined;
+    const suiteKey = promoted.sourcePath ? evalSuiteKey(normalizePath3(promoted.sourcePath)) : undefined;
     if (graph.artifacts.some((existing) => existing.type === "eval" && artifactPaths(existing).some((path) => suite.has(path) || suiteKey !== undefined && evalSuiteKey(path.replace(/\/+$/, "")) === suiteKey)))
       return true;
   }
@@ -22042,15 +22330,15 @@ function renderExternalAnalystProtocol(concern) {
 function renderAnalystPreflightSection(rootDir) {
   if (process.env.MODA_HARNESS_ANALYST_PREFLIGHT === "0")
     return "";
-  const paths = listAnalystPreflightPaths(rootDir);
-  if (paths.length === 0)
+  const paths2 = listAnalystPreflightPaths(rootDir);
+  if (paths2.length === 0)
     return "";
   const groups = {
-    manifests: paths.filter((path) => isManifestLikePath(path)).slice(0, 60),
-    docs: paths.filter((path) => isDocLikePath(path)).slice(0, 40),
-    source: paths.filter((path) => isAgentNavigationPath(path)).slice(0, 160),
-    deploy: paths.filter((path) => isPreflightDeployLikePath(path)).slice(0, 50),
-    evals: paths.filter((path) => isPreflightEvalLikePath(path)).slice(0, 50)
+    manifests: paths2.filter((path) => isManifestLikePath(path)).slice(0, 60),
+    docs: paths2.filter((path) => isDocLikePath(path)).slice(0, 40),
+    source: paths2.filter((path) => isAgentNavigationPath(path)).slice(0, 160),
+    deploy: paths2.filter((path) => isPreflightDeployLikePath(path)).slice(0, 50),
+    evals: paths2.filter((path) => isPreflightEvalLikePath(path)).slice(0, 50)
   };
   const lines = [
     "",
@@ -22065,10 +22353,10 @@ function renderAnalystPreflightSection(rootDir) {
   return lines.join(`
 `);
 }
-function renderPreflightGroup(label, paths) {
-  if (paths.length === 0)
+function renderPreflightGroup(label, paths2) {
+  if (paths2.length === 0)
     return [];
-  return [`${label}:`, ...paths.map((path) => `- ${path}`)];
+  return [`${label}:`, ...paths2.map((path) => `- ${path}`)];
 }
 var MAX_SEED_ARTIFACT_LINES = 150;
 function renderAnalystSeedSection(rootDir, concern) {
@@ -22172,8 +22460,8 @@ function renderAnalystSeedLines(graph) {
 }
 function listAnalystPreflightPaths(rootDir) {
   const gitPaths = readGitTrackedPaths(rootDir);
-  const paths = gitPaths.length > 0 ? gitPaths : readDirectoryPreflightPaths(rootDir);
-  return [...new Set(paths.map(normalizePath2))].filter((path) => path && !shouldSkipPreflightPath(path)).sort();
+  const paths2 = gitPaths.length > 0 ? gitPaths : readDirectoryPreflightPaths(rootDir);
+  return [...new Set(paths2.map(normalizePath3))].filter((path) => path && !shouldSkipPreflightPath(path)).sort();
 }
 function readGitTrackedPaths(rootDir) {
   try {
@@ -22187,9 +22475,9 @@ function readGitTrackedPaths(rootDir) {
   }
 }
 function readDirectoryPreflightPaths(rootDir) {
-  const paths = [];
+  const paths2 = [];
   const stack = ["."];
-  while (stack.length > 0 && paths.length < 2000) {
+  while (stack.length > 0 && paths2.length < 2000) {
     const current = stack.pop() ?? ".";
     const absolute = current === "." ? rootDir : join11(rootDir, current);
     let entries;
@@ -22214,14 +22502,14 @@ function readDirectoryPreflightPaths(rootDir) {
       if (stat.isDirectory()) {
         stack.push(child);
       } else {
-        paths.push(child);
+        paths2.push(child);
       }
     }
   }
-  return paths;
+  return paths2;
 }
 function shouldSkipPreflightPath(path) {
-  const normalized = normalizePath2(path);
+  const normalized = normalizePath3(path);
   if (!normalized || normalized.startsWith(".moda/"))
     return true;
   const parts = normalized.split("/");
@@ -22346,7 +22634,7 @@ function collectSnapshotInputs(rootDir, maxFiles, maxTextBytes) {
   let inventoryFileCount = 0;
   let inventoryTextBytes = 0;
   function walk(current) {
-    const path = normalizePath2(relative9(rootDir, current)) || ".";
+    const path = normalizePath3(relative9(rootDir, current)) || ".";
     let stat;
     try {
       stat = lstatSync7(current);
@@ -22417,7 +22705,7 @@ function buildSourceSnapshot(rootDir) {
 }
 function buildCommandScanPlan(context, rootDir) {
   const explicitPath = context.flags.path !== undefined;
-  const rel2 = normalizePath2(relative9(context.cwd, rootDir)) || ".";
+  const rel2 = normalizePath3(relative9(context.cwd, rootDir)) || ".";
   const scope = explicitPath && rel2 !== "." ? "narrow" : "broad";
   const machineReadable = context.outputMode !== "human";
   const approvalRequired = context.positional === "analyze" && scope === "broad" && !context.yes;
@@ -22502,7 +22790,7 @@ function writeHumanBlock(context, message) {
 function buildHarnessReadPlan(rootDir, pathWasExplicit) {
   return {
     scope: pathWasExplicit ? "narrow" : "broad",
-    rootPaths: [normalizePath2(relative9(rootDir, rootDir)) || "."],
+    rootPaths: [normalizePath3(relative9(rootDir, rootDir)) || "."],
     willRead: [
       "package manifests",
       "source files under the selected path",
@@ -22715,7 +23003,7 @@ function findFresherHarnessReports(rootDir) {
         const candidate = lstatSync7(join11(child, HARNESS_REPORT_PATH));
         if (candidate.isFile() && candidate.mtimeMs > rootMtimeMs) {
           fresher.push({
-            path: normalizePath2(relative9(rootDir, join11(child, HARNESS_REPORT_PATH))),
+            path: normalizePath3(relative9(rootDir, join11(child, HARNESS_REPORT_PATH))),
             mtimeMs: candidate.mtimeMs
           });
         }
@@ -22727,8 +23015,8 @@ function findFresherHarnessReports(rootDir) {
   return fresher.sort((a, b) => b.mtimeMs - a.mtimeMs);
 }
 function warnFresherSubdirHarnessReports(context, rootDir, explicitReport) {
-  const explicitReportPath = explicitReport && explicitReport !== "true" ? normalizePath2(relative9(rootDir, resolve9(rootDir, explicitReport))) : undefined;
-  if (explicitReportPath && explicitReportPath !== normalizePath2(HARNESS_REPORT_PATH))
+  const explicitReportPath = explicitReport && explicitReport !== "true" ? normalizePath3(relative9(rootDir, resolve9(rootDir, explicitReport))) : undefined;
+  if (explicitReportPath && explicitReportPath !== normalizePath3(HARNESS_REPORT_PATH))
     return;
   let fresher;
   try {
@@ -22739,7 +23027,7 @@ function warnFresherSubdirHarnessReports(context, rootDir, explicitReport) {
   if (fresher.length === 0)
     return;
   const newest = fresher[0];
-  const subdir = normalizePath2(dirname8(dirname8(newest.path)));
+  const subdir = normalizePath3(dirname8(dirname8(newest.path)));
   const rootState = existsSync8(join11(rootDir, HARNESS_REPORT_PATH)) ? `older ${HARNESS_REPORT_PATH}` : `no ${HARNESS_REPORT_PATH}`;
   writeHarnessNotice(context, `A fresher harness report exists at ${newest.path} (this directory has ${rootState}). If you meant that report, re-run with --path=${subdir}.`);
 }
@@ -22934,7 +23222,7 @@ function inventoryFiles(rootDir, skipped, options = {}) {
   const maxTextBytes = numericEnv("MODA_HARNESS_MAX_TEXT_BYTES", DEFAULT_MAX_INVENTORY_TEXT_BYTES);
   let textBytes = 0;
   function walk(current) {
-    const rel2 = normalizePath2(relative9(rootReal, current)) || ".";
+    const rel2 = normalizePath3(relative9(rootReal, current)) || ".";
     let stat;
     try {
       stat = lstatSync7(current);
@@ -23150,7 +23438,7 @@ function runtimeAgentFromAnnotation(annotation) {
     kind: "runtime_agent",
     purpose: first2(values.purpose) ?? first2(values.description),
     familyId: first2(values.family),
-    root: normalizePath2(first2(values.root) ?? dirname8(annotation.evidence.path)),
+    root: normalizePath3(first2(values.root) ?? dirname8(annotation.evidence.path)),
     entrypointIds: values.entrypoint ?? [stableId("entry", annotation.evidence.path)],
     channelAdapterIds: values.channel ?? [],
     artifactIds: [...values.artifact ?? [], ...values.prompt ?? [], ...values.tool ?? []],
@@ -23386,7 +23674,7 @@ function inferRuntimeAgent(file, graph) {
     name: titleFromId(file.path.replace(/\.(ts|tsx|js|mjs|py)$/i, "")),
     kind: "runtime_agent",
     purpose: inferAgentPurpose(file),
-    root: normalizePath2(dirname8(file.path)),
+    root: normalizePath3(dirname8(file.path)),
     entrypointIds: [entryId],
     channelAdapterIds: channelIds,
     artifactIds,
@@ -24285,7 +24573,7 @@ function contentHashForAnnotatedSource(sourcePath, annotation) {
 function readSmallTextFileForHash(absPath, rootDir) {
   if (!existsSync8(absPath))
     return;
-  const rel2 = normalizePath2(relative9(rootDir, absPath));
+  const rel2 = normalizePath3(relative9(rootDir, absPath));
   if (isSecretishPath(rel2))
     return;
   let stat;
@@ -24386,7 +24674,7 @@ function titleFromId(id) {
 function promptNameFromPath(path) {
   return titleFromId(basename6(path).replace(/\.(prompt\.)?(md|json|ya?ml)$/i, ""));
 }
-function normalizePath2(path) {
+function normalizePath3(path) {
   return path.split(sep5).join("/");
 }
 function hashText(text) {
@@ -27112,8 +27400,8 @@ function collectModels(result, ctx) {
   const context = modelPathContext(result.rootDir);
   const harnessPath = (path) => isHarnessModelPath(path, context);
   for (const [id, entry] of byId) {
-    const paths = [...entry.definitions.map((at) => at.path), ...entry.sites.map((site) => site.path)];
-    if (!paths.some(harnessPath))
+    const paths2 = [...entry.definitions.map((at) => at.path), ...entry.sites.map((site) => site.path)];
+    if (!paths2.some(harnessPath))
       byId.delete(id);
   }
   const kept = unresolved.filter((entry) => harnessPath(entry.path));
@@ -27430,7 +27718,7 @@ function enumerationRepository(ctx) {
   };
   walk(ctx.rootDir);
   const workers = [];
-  const paths = new Set(files.map((file) => file.path));
+  const paths2 = new Set(files.map((file) => file.path));
   const closure = (main) => {
     const found = new Set, pending = [main];
     for (let index = 0;index < pending.length; index++) {
@@ -27445,7 +27733,7 @@ function enumerationRepository(ctx) {
         if (!ref.fileName.startsWith("."))
           continue;
         const base = posix2.normalize(posix2.join(posix2.dirname(path), ref.fileName)).replace(/\.[cm]?js$/, "");
-        const target = [base, ...[".ts", ".tsx", ".js", ".mjs", "/index.ts", "/index.js"].map((suffix) => base + suffix)].find((candidate) => paths.has(candidate));
+        const target = [base, ...[".ts", ".tsx", ".js", ".mjs", "/index.ts", "/index.js"].map((suffix) => base + suffix)].find((candidate) => paths2.has(candidate));
         if (target)
           pending.push(target);
       }
@@ -29046,7 +29334,7 @@ function runExtract(rootDir, options) {
     return /\.svelte$/i.test(abs) ? svelteVirtualName(abs) : abs;
   };
   const lookup = (path) => repo?.owner.get(fileKey(path));
-  const sourceFile = (path) => lookup(path)?.program.getSourceFile(fileKey(path));
+  const sourceFile2 = (path) => lookup(path)?.program.getSourceFile(fileKey(path));
   let files;
   const ctx = {
     rootDir,
@@ -29055,7 +29343,7 @@ function runExtract(rootDir, options) {
     checkerFor: (path) => lookup(path)?.checker(),
     sourceFiles: () => files ??= [...repo?.owner.entries() ?? []].filter(([file]) => !isTestPath(relPath(rootDir, file))).map(([file, entry]) => entry.program.getSourceFile(file)).filter((file) => Boolean(file)),
     nodeAt: (ref) => {
-      const source = sourceFile(ref.path);
+      const source = sourceFile2(ref.path);
       return source ? nodeSpanning(source, ref.start, ref.end) : undefined;
     }
   };
@@ -30009,8 +30297,8 @@ function mergeEnumeratedComponents(artifacts, components) {
     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];
+    const paths2 = new Set([item.sourcePath, ...item.evidence.map((entry) => entry.path)].filter(Boolean));
+    const target = candidates.find((candidate) => candidate.sourcePath && paths2.has(candidate.sourcePath) || candidate.definitionVariants?.some((variant) => variant.sourcePath && paths2.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))]) {