@swmansion/argent 0.20.0 → 0.20.1-next.1

package/dist/tool-server.cjs

@@ -133964,6 +133964,98 @@ async function runPipeline(input, options) {
   };
 }
 
+// ../tool-server/src/utils/react-profiler/component-names.ts
+var WRAPPER_PATTERNS = [/^Forget\((.+)\)$/, /^Memo\((.+)\)$/, /^ForwardRef\((.+)\)$/];
+var MAX_WRAPPER_DEPTH = 4;
+function stripComponentWrappers(raw) {
+  let name = raw;
+  let hasForget = false;
+  let hasMemo = false;
+  let hasForwardRef = false;
+  for (let i = 0; i < MAX_WRAPPER_DEPTH; i++) {
+    const m = WRAPPER_PATTERNS.map((re) => name.match(re)).find(Boolean);
+    if (!m) break;
+    if (name.startsWith("Forget(")) hasForget = true;
+    else if (name.startsWith("Memo(")) hasMemo = true;
+    else if (name.startsWith("ForwardRef(")) hasForwardRef = true;
+    name = m[1];
+  }
+  return { baseName: name, hasForget, hasMemo, hasForwardRef };
+}
+function annotateComponentName(raw) {
+  const { baseName, hasForget, hasMemo, hasForwardRef } = stripComponentWrappers(raw);
+  const parts2 = [];
+  if (hasMemo) parts2.push("React.memo");
+  if (hasForget) parts2.push("React Compiler");
+  if (hasForwardRef) parts2.push("forwardRef");
+  const tag3 = parts2.length > 0 ? ` [${parts2.join(" + ")}]` : "";
+  return { displayName: baseName, tag: tag3, rawName: raw };
+}
+function resolveComponentName(query, recordedNames) {
+  const names = [...new Set(recordedNames)];
+  const sharingDisplayName = (raw) => {
+    const display = annotateComponentName(raw).displayName;
+    return names.filter((n) => n !== raw && annotateComponentName(n).displayName === display);
+  };
+  if (names.includes(query)) {
+    return { kind: "exact", rawName: query, alsoMatching: sharingDisplayName(query) };
+  }
+  const candidates = names.filter((n) => annotateComponentName(n).displayName === query);
+  if (candidates.length === 1) {
+    return { kind: "display", rawName: candidates[0], query };
+  }
+  if (candidates.length > 1) {
+    return { kind: "ambiguous", query, candidates };
+  }
+  return { kind: "missing", query, suggestions: suggestNames(query, names) };
+}
+function suggestNames(query, names, limit = 5) {
+  const needle = query.toLowerCase();
+  if (needle.length < 2) return [];
+  return names.filter((n) => {
+    const hay = `${n} ${annotateComponentName(n).displayName}`.toLowerCase();
+    return hay.includes(needle) || needle.includes(annotateComponentName(n).displayName.toLowerCase());
+  }).slice(0, limit);
+}
+function describeResolution(resolution) {
+  if (resolution.kind === "display") {
+    const { tag: tag3 } = annotateComponentName(resolution.rawName);
+    const why = tag3 ? ` (${tag3.trim().slice(1, -1)})` : "";
+    return `> Resolved \`${resolution.query}\` to the recorded component \`${resolution.rawName}\`${why}. Either name works here.`;
+  }
+  if (resolution.alsoMatching.length > 0) {
+    const others = resolution.alsoMatching.map((n) => `\`${n}\``).join(", ");
+    return `> Showing \`${resolution.rawName}\` only. ${others} also appear${resolution.alsoMatching.length === 1 ? "s" : ""} under this name once wrappers are stripped; they are separate fibers, so pass the exact name to target one.`;
+  }
+  return "";
+}
+function renderComponentNameMiss(resolution, context = {}) {
+  if (resolution.kind === "ambiguous") {
+    const list = resolution.candidates.map((c) => `- \`${c}\``).join("\n");
+    return `_Component \`${resolution.query}\` is ambiguous: ${resolution.candidates.length} recorded components share this name once \`Memo(...)\` / \`ForwardRef(...)\` / \`Forget(...)\` wrappers are stripped. They are separate fibers and are not merged, because a combined total would not describe any real component. Re-run with one of these exact \`component_name\` values:_
+
+${list}`;
+  }
+  const recorded = context.fiberRenders != null && context.commits != null ? ` The session recorded ${context.fiberRenders} fiber renders across ${context.commits} commits.` : "";
+  const suggestions = resolution.suggestions.length > 0 ? `
+
+Closest recorded names \u2014 pass one verbatim as \`component_name\`:
+` + resolution.suggestions.map((s) => `- \`${s}\``).join("\n") : "";
+  return `_Component \`${resolution.query}\` not found in this profiling session \u2014 no exact match, and no component whose displayed name is \`${resolution.query}\` once \`Memo(...)\` / \`ForwardRef(...)\` / \`Forget(...)\` wrappers are stripped.${recorded}_${suggestions}
+
+To list every component in a commit instead, run \`profiler-commit-query mode=by_index commit_index=<n>\`.`;
+}
+function astLookupCandidates(raw) {
+  const keys = [raw];
+  const { baseName } = stripComponentWrappers(raw);
+  if (baseName !== raw) keys.push(baseName);
+  const withoutSuffix = baseName.replace(/\(.*\)$/, "");
+  if (withoutSuffix !== baseName && /^[A-Za-z_$][\w$]*$/.test(withoutSuffix)) {
+    keys.push(withoutSuffix);
+  }
+  return keys;
+}
+
 // ../tool-server/src/utils/react-profiler/pipeline/06-resolve/ast-index.ts
 var import_fs3 = require("fs");
 var import_path6 = require("path");
@@ -134160,26 +134252,6 @@ var import_fs4 = require("fs");
 var import_path7 = require("path");
 var MAX_INLINE_COMMITS = 10;
 var REPORT_FILENAME = "react-profiler-report.md";
-function annotateComponentName(raw) {
-  let name = raw;
-  let hasForget = false;
-  let hasMemo = false;
-  let hasForwardRef = false;
-  for (let i = 0; i < 4; i++) {
-    const m = name.match(/^Forget\((.+)\)$/) || name.match(/^Memo\((.+)\)$/) || name.match(/^ForwardRef\((.+)\)$/);
-    if (!m) break;
-    if (name.startsWith("Forget(")) hasForget = true;
-    else if (name.startsWith("Memo(")) hasMemo = true;
-    else if (name.startsWith("ForwardRef(")) hasForwardRef = true;
-    name = m[1];
-  }
-  const parts2 = [];
-  if (hasMemo) parts2.push("React.memo");
-  if (hasForget) parts2.push("React Compiler");
-  if (hasForwardRef) parts2.push("forwardRef");
-  const tag3 = parts2.length > 0 ? ` [${parts2.join(" + ")}]` : "";
-  return { displayName: name, tag: tag3, rawName: raw };
-}
 async function renderProfilingReport(input) {
   const reportFile = (0, import_path7.join)(input.debugDir, REPORT_FILENAME);
   if (input.allClear) {
@@ -134696,7 +134768,7 @@ Fails if react-profiler-stop has not been called or no profiling data is stored.
     try {
       const astIndex = await buildAstIndexWithDiagnostics(params.project_root);
       for (const finding of pipelineOutput.componentFindings) {
-        const entry = astIndex.index.get(finding.component);
+        const entry = astLookupCandidates(finding.component).map((k) => astIndex.index.get(k)).find(Boolean);
         if (entry) {
           finding.sourceLocation = {
             file: entry.file,
@@ -134789,7 +134861,9 @@ When several files define a component with the same name (e.g. platform variants
   services: () => ({}),
   async execute(_services, params) {
     const astIndex = await buildAstIndexWithDiagnostics(params.project_root);
-    const entry = astIndex.index.get(params.component_name);
+    const lookupKeys = astLookupCandidates(params.component_name);
+    const matchedKey = lookupKeys.find((k) => astIndex.index.has(k));
+    const entry = matchedKey ? astIndex.index.get(matchedKey) : void 0;
     if (!entry) {
       if (!astIndex.treeSitterAvailable) {
         return {
@@ -134801,7 +134875,7 @@ When several files define a component with the same name (e.g. platform variants
       return {
         found: false,
         component: params.component_name,
-        message: `Component "${params.component_name}" not found in ${params.project_root} (searched ${astIndex.indexedFiles} files).`
+        message: `Component "${params.component_name}" not found in ${params.project_root} (searched ${astIndex.indexedFiles} files; also tried ${lookupKeys.slice(1).map((k) => `"${k}"`).join(", ") || "no variants"}).`
       };
     }
     let source = "";
@@ -134815,7 +134889,10 @@ When several files define a component with the same name (e.g. platform variants
     }
     return {
       found: true,
-      component: params.component_name,
+      // The key that actually matched, so the caller can tell which name hit
+      // when a wrapped name resolved through to a bare source identifier.
+      component: matchedKey ?? params.component_name,
+      requested: params.component_name,
       file: entry.file,
       line: entry.line,
       col: entry.col,
@@ -140414,9 +140491,21 @@ function renderComponentCpu(index, commitTree, componentName, topN2) {
   if (!commitTree || commitTree.commits.length === 0) {
     return "_No commit data available. Run react-profiler-analyze first._";
   }
-  const componentCommits = commitTree.commits.filter((c) => c.componentName === componentName);
+  const resolution = resolveComponentName(
+    componentName,
+    commitTree.commits.map((c) => c.componentName)
+  );
+  if (resolution.kind === "ambiguous" || resolution.kind === "missing") {
+    return renderComponentNameMiss(resolution, {
+      fiberRenders: commitTree.commits.length,
+      commits: new Set(commitTree.commits.map((c) => c.commitIndex)).size
+    });
+  }
+  const resolvedName = resolution.rawName;
+  const resolutionNote = describeResolution(resolution);
+  const componentCommits = commitTree.commits.filter((c) => c.componentName === resolvedName);
   if (componentCommits.length === 0) {
-    return `_Component \`${componentName}\` not found in commit data._`;
+    return `_Component \`${resolvedName}\` not found in commit data._`;
   }
   const commitWindows = /* @__PURE__ */ new Map();
   for (const c of componentCommits) {
@@ -140448,12 +140537,13 @@ function renderComponentCpu(index, commitTree, componentName, topN2) {
   }
   const sorted = [...aggregated.entries()].sort((a, b) => b[1].selfMs - a[1].selfMs).slice(0, topN2);
   if (sorted.length === 0) {
-    return `_No CPU samples found during \`${componentName}\` commits._`;
+    return `_No CPU samples found during \`${resolvedName}\` commits._`;
   }
   const totalCommitMs = [...commitWindows.values()].reduce((sum, w) => sum + w.duration, 0);
   const lines = [
-    `## CPU During \`${componentName}\` Commits`,
+    `## CPU During \`${resolvedName}\` Commits`,
     "",
+    ...resolutionNote ? [resolutionNote, ""] : [],
     `**Commits:** ${commitWindows.size}  **Total commit time:** ${totalCommitMs.toFixed(1)}ms`,
     "",
     "| Function | Self (ms) | Total (ms) | Location |",
@@ -140628,9 +140718,21 @@ function formatReason2(commit) {
   return parts2.join(" ");
 }
 function renderByComponent(commits, componentName, topN2) {
-  const matching = commits.filter((c) => c.componentName === componentName);
+  const resolution = resolveComponentName(
+    componentName,
+    commits.map((c) => c.componentName)
+  );
+  if (resolution.kind === "ambiguous" || resolution.kind === "missing") {
+    return renderComponentNameMiss(resolution, {
+      fiberRenders: commits.length,
+      commits: new Set(commits.map((c) => c.commitIndex)).size
+    });
+  }
+  const resolvedName = resolution.rawName;
+  const resolutionNote = describeResolution(resolution);
+  const matching = commits.filter((c) => c.componentName === resolvedName);
   if (matching.length === 0) {
-    return `_Component \`${componentName}\` not found in commit data._`;
+    return `_Component \`${resolvedName}\` not found in commit data._`;
   }
   const byCommit = /* @__PURE__ */ new Map();
   for (const c of matching) {
@@ -140651,8 +140753,9 @@ function renderByComponent(commits, componentName, topN2) {
     parentName: entries[0].parentName ?? "\u2014"
   })).sort((a, b) => b.totalDuration - a.totalDuration).slice(0, topN2);
   const lines = [
-    `## Commits for \`${componentName}\``,
+    `## Commits for \`${resolvedName}\``,
     "",
+    ...resolutionNote ? [resolutionNote, ""] : [],
     `**Total occurrences:** ${matching.length} across ${byCommit.size} commits`,
     "",
     "| Commit | Instances | Duration (ms) | Commit Total (ms) | Time (ms) | Reason | Parent |",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/argent",
-  "version": "0.20.0",
+  "version": "0.20.1-next.1",
   "mcpName": "io.github.software-mansion/argent",
   "description": "MCP server for iOS Simulator and Android Emulator control",
   "license": "Apache-2.0",

package/skills/argent-react-native-profiler/references/diagnostic-tools.md

@@ -45,6 +45,13 @@ Call `profiler-cpu-query`. Modes:
 - `call_tree` — callers and callees of a specific `function_name`.
 - `component_cpu` — aggregate CPU during all commits of a `component_name`.
 
+> **Component names:** pass the name exactly as the report shows it. The report strips
+> `Forget(...)` / `Memo(...)` / `ForwardRef(...)` wrappers and marks them with a
+> `[React Compiler]` / `[React.memo] `/ `[forwardRef]` tag; both that displayed name and the
+> underlying wrapped name resolve. If a name maps to several distinct fibers the tool lists
+> the exact names to retry with rather than merging them — a combined total would not describe
+> any real component.
+
 ## Commit query
 
 ```json