@swmansion/argent 0.6.0 → 0.6.1

package/dist/installer.mjs

@@ -10392,7 +10392,7 @@ ${l}
 var import_picocolors2 = __toESM(require_picocolors(), 1);
 import { existsSync as existsSync3 } from "node:fs";
 import { resolve as resolve2 } from "node:path";
-import { execSync as execSync2, spawn } from "node:child_process";
+import { spawn } from "node:child_process";
 
 // ../argent-installer/src/mcp-configs.ts
 import * as fs2 from "node:fs";
@@ -12813,6 +12813,18 @@ function getInstalledVersion() {
     return null;
   }
 }
+function getGloballyInstalledVersion() {
+  const binaryPath = getGlobalBinaryPath();
+  if (!binaryPath) return null;
+  try {
+    const realPath = fs.realpathSync(binaryPath);
+    const pkgRoot = resolvePackageRoot(path.dirname(realPath));
+    const pkg = JSON.parse(fs.readFileSync(path.join(pkgRoot, "package.json"), "utf8"));
+    return pkg.version ?? null;
+  } catch {
+    return null;
+  }
+}
 var PROBE_TIMEOUT_MS = 3e3;
 function getLatestVersion() {
   const result = execSync(`npm view ${PACKAGE_NAME} version --registry ${NPM_REGISTRY}`, {
@@ -12825,6 +12837,31 @@ function isNewerVersion(candidate, current) {
   if (!import_semver.default.valid(candidate) || !import_semver.default.valid(current)) return false;
   return import_semver.default.gt(candidate, current);
 }
+var TEMP_RUNNER_MARKERS = [
+  "_npx",
+  "/dlx-",
+  "\\dlx-",
+  "bun/install/cache",
+  ".bun\\install\\cache"
+];
+function isTempRunnerPath(binaryPath) {
+  return TEMP_RUNNER_MARKERS.some((marker) => binaryPath.includes(marker));
+}
+function getGlobalBinaryPath() {
+  try {
+    const cmd = process.platform === "win32" ? "where" : "which -a";
+    const output = execSync(`${cmd} ${MCP_BINARY_NAME}`, {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+    return output.split(/\r?\n/).map((line) => line.trim()).filter(Boolean).find((line) => !isTempRunnerPath(line)) ?? null;
+  } catch {
+    return null;
+  }
+}
+function isGloballyInstalled() {
+  return getGlobalBinaryPath() !== null;
+}
 function isSkillsCliAvailable() {
   try {
     execSync("npx --no-install skills --version", {
@@ -13700,25 +13737,6 @@ function formatSkillRefreshSummary(results) {
 }
 
 // ../argent-installer/src/init.ts
-var TEMP_RUNNER_MARKERS = [
-  "_npx",
-  "/dlx-",
-  "\\dlx-",
-  "bun/install/cache",
-  ".bun\\install\\cache"
-];
-function isGloballyInstalled() {
-  try {
-    const cmd = process.platform === "win32" ? "where" : "which";
-    const binaryPath = execSync2(`${cmd} ${MCP_BINARY_NAME}`, {
-      encoding: "utf8",
-      stdio: ["ignore", "pipe", "ignore"]
-    }).trim();
-    return !TEMP_RUNNER_MARKERS.some((marker) => binaryPath.includes(marker));
-  } catch {
-    return false;
-  }
-}
 function runShellCommand(cmd) {
   return new Promise((resolve3, reject) => {
     const isWin = process.platform === "win32";
@@ -14246,8 +14264,9 @@ async function killToolServer() {
 async function update(args) {
   const nonInteractive = args.includes("--yes") || args.includes("-y");
   Wt2(import_picocolors3.default.bgCyan(import_picocolors3.default.black(" argent update ")));
-  const installed = getInstalledVersion();
-  if (!installed) {
+  const globallyInstalled = isGloballyInstalled();
+  const installed = globallyInstalled ? getGloballyInstalledVersion() : null;
+  if (globallyInstalled && !installed) {
     R2.error("Could not determine installed version.");
     process.exit(1);
   }
@@ -14262,21 +14281,28 @@ async function update(args) {
     process.exit(1);
   }
   spinner.stop("Version check complete.");
-  R2.info(`Installed: ${import_picocolors3.default.cyan(`v${installed}`)}`);
+  if (installed) {
+    R2.info(`Installed: ${import_picocolors3.default.cyan(`v${installed}`)}`);
+  } else {
+    R2.warn(`${PACKAGE_NAME} is not installed globally.`);
+  }
   R2.info(`Latest:    ${import_picocolors3.default.cyan(`v${latest}`)}`);
-  if (isNewerVersion(latest, installed)) {
-    R2.warn(`Update available: ${import_picocolors3.default.yellow(`v${installed}`)} -> ${import_picocolors3.default.green(`v${latest}`)}`);
+  const needsInstall = !installed || isNewerVersion(latest, installed);
+  if (needsInstall) {
+    if (installed) {
+      R2.warn(`Update available: ${import_picocolors3.default.yellow(`v${installed}`)} -> ${import_picocolors3.default.green(`v${latest}`)}`);
+    }
     const pm = detectPackageManager();
     const cmd = globalInstallCommand(pm, `${PACKAGE_NAME}@${latest}`);
     const cmdStr = formatShellCommand(cmd);
     if (!nonInteractive) {
       R2.message(import_picocolors3.default.dim("  Press y for yes, n for no, enter to confirm."));
       const proceed = await Rt({
-        message: `Update to v${latest}?`,
+        message: installed ? `Update to v${latest}?` : `Install ${PACKAGE_NAME}@${latest} globally?`,
         initialValue: true
       });
       if (Ct(proceed) || !proceed) {
-        Nt("Update cancelled.");
+        Nt(installed ? "Update cancelled." : "Install cancelled.");
         process.exit(0);
       }
     }
@@ -14288,7 +14314,7 @@ async function update(args) {
         env: { ...process.env, ARGENT_SKIP_POSTINSTALL: "1" }
       });
     } catch (err) {
-      R2.error(`Update failed: ${err}`);
+      R2.error(`${installed ? "Update" : "Install"} failed: ${err}`);
       process.exit(1);
     }
   } else {
@@ -14684,6 +14710,7 @@ export {
   MCP_BINARY_NAME,
   MCP_SERVER_KEY,
   PACKAGE_NAME,
+  getGloballyInstalledVersion,
   getInstalledVersion,
   init,
   uninstall,

package/dist/tool-server.cjs

@@ -41850,7 +41850,7 @@ var import_node_https = __toESM(require("node:https"));
 var import_semver = __toESM(require_semver2());
 
 // ../tool-server/package.json
-var version = "0.6.0";
+var version = "0.6.1";
 
 // ../tool-server/src/utils/update-checker.ts
 var PACKAGE_NAME = "@swmansion/argent";
@@ -45373,7 +45373,7 @@ var gestureTapTool = {
 Sends a Down event followed by an Up event at the same point.
 Use when you need to tap a button, link, or any tappable element on the simulator screen.
 Returns { tapped: true, timestampMs }. Fails if the simulator server is not running for the given UDID.
-Before tapping, determine the correct coordinates by using discovery tools: describe, native-describe-screen, debugger-component-tree. More information in \`simulator-interact\` skill`,
+Before tapping, determine the correct coordinates by using discovery tools: describe, native-describe-screen, debugger-component-tree. More information in \`argent-simulator-interact\` skill`,
   alwaysLoad: true,
   searchHint: "tap press button element simulator touch down up",
   zodSchema: zodSchema15,
@@ -47005,7 +47005,7 @@ full-screen transparent wrappers, and implementation-detail components are prune
 Each visible component is listed with its name, text content, and normalized
 tap coordinates in [0,1] space (fractions of the screen, not pixels\u2014same space as tap/swipe/gesture and simulator-server touch).
 
-This is the preferred element discovery tool for React Native apps. More information in react-native-app-workflow skill.
+This is the preferred element discovery tool for React Native apps. More information in argent-react-native-app-workflow skill.
 
 Workflow:
   1. Call this tool to get the component tree.
@@ -50440,11 +50440,55 @@ Fails if the React DevTools hook is not present or no fiber roots have been comm
 };
 
 // ../tool-server/src/tools/profiler/ios-profiler/ios-profiler-start.ts
-var import_child_process = require("child_process");
+var import_child_process2 = require("child_process");
 var path6 = __toESM(require("path"));
 
+// ../tool-server/src/utils/ios-profiler/lifecycle.ts
+function waitForChildExit(child, ms) {
+  if (child.exitCode !== null || child.signalCode !== null) {
+    return Promise.resolve(true);
+  }
+  return new Promise((resolve2) => {
+    const onExit = () => {
+      clearTimeout(timer);
+      resolve2(true);
+    };
+    const timer = setTimeout(() => {
+      child.removeListener("exit", onExit);
+      resolve2(false);
+    }, ms);
+    child.once("exit", onExit);
+  });
+}
+async function shutdownChild(child, t) {
+  if (child.exitCode !== null || child.signalCode !== null) {
+    return { clean: true, signalUsed: "SIGINT" };
+  }
+  try {
+    child.kill("SIGINT");
+  } catch {
+  }
+  if (await waitForChildExit(child, t.graceMs)) {
+    return { clean: true, signalUsed: "SIGINT" };
+  }
+  try {
+    child.kill("SIGTERM");
+  } catch {
+  }
+  if (await waitForChildExit(child, t.termMs)) {
+    return { clean: false, signalUsed: "SIGTERM" };
+  }
+  try {
+    child.kill("SIGKILL");
+  } catch {
+  }
+  await waitForChildExit(child, t.killMs);
+  return { clean: false, signalUsed: "SIGKILL" };
+}
+
 // ../tool-server/src/blueprints/ios-profiler-session.ts
 var IOS_PROFILER_SESSION_NAMESPACE = "IosProfilerSession";
+var DISPOSE_REAP_MS = 1e3;
 var iosInstrumentsSessionBlueprint = {
   namespace: IOS_PROFILER_SESSION_NAMESPACE,
   getURN(deviceId) {
@@ -50455,12 +50499,16 @@ var iosInstrumentsSessionBlueprint = {
       deviceId: _payload,
       appProcess: null,
       xctracePid: null,
+      xctraceProcess: null,
       traceFile: null,
       exportedFiles: null,
       profilingActive: false,
       wallClockStartMs: null,
       parsedData: null,
-      recordingTimeout: null
+      recordingTimeout: null,
+      recordingTimedOut: false,
+      recordingExitedUnexpectedly: false,
+      lastExitInfo: null
     };
     const events = new TypedEventEmitter();
     return {
@@ -50470,12 +50518,16 @@ var iosInstrumentsSessionBlueprint = {
           clearTimeout(state2.recordingTimeout);
           state2.recordingTimeout = null;
         }
-        if (state2.profilingActive && state2.xctracePid) {
+        const child = state2.xctraceProcess;
+        if (state2.profilingActive && child) {
           try {
-            process.kill(state2.xctracePid, "SIGINT");
+            child.kill("SIGKILL");
           } catch {
           }
+          await waitForChildExit(child, DISPOSE_REAP_MS);
           state2.profilingActive = false;
+          state2.xctracePid = null;
+          state2.xctraceProcess = null;
         }
       },
       events
@@ -50483,8 +50535,121 @@ var iosInstrumentsSessionBlueprint = {
   }
 };
 
+// ../tool-server/src/utils/ios-profiler/notify.ts
+var import_child_process = require("child_process");
+var NOTIFYUTIL_PATH = "/usr/bin/notifyutil";
+var REGISTRATION_DELAY_MS = 300;
+function listenForDarwinNotification(name) {
+  const proc = (0, import_child_process.spawn)(NOTIFYUTIL_PATH, ["-v", "-1", name]);
+  let firedResolve = () => {
+  };
+  let fired = false;
+  const fired$ = new Promise((r) => {
+    firedResolve = r;
+  });
+  let readyResolve = () => {
+  };
+  let readyReject = () => {
+  };
+  let readySettled = false;
+  const ready = new Promise((res, rej) => {
+    readyResolve = () => {
+      if (readySettled) return;
+      readySettled = true;
+      res();
+    };
+    readyReject = (e) => {
+      if (readySettled) return;
+      readySettled = true;
+      rej(e);
+    };
+  });
+  const registrationTimer = setTimeout(readyResolve, REGISTRATION_DELAY_MS);
+  proc.on("exit", (code) => {
+    if (!fired && code === 0) {
+      fired = true;
+      firedResolve();
+    }
+  });
+  proc.on("error", (err) => {
+    clearTimeout(registrationTimer);
+    readyReject(err);
+  });
+  return {
+    ready,
+    fired: fired$,
+    cancel: () => {
+      clearTimeout(registrationTimer);
+      try {
+        proc.kill("SIGTERM");
+      } catch {
+      }
+    }
+  };
+}
+
+// ../tool-server/src/utils/ios-profiler/startup.ts
+function waitForXctraceReady(child, { notify, timeoutMs }) {
+  return new Promise((resolve2, reject) => {
+    let settled = false;
+    let stderrBuffer = "";
+    const settle = (run) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(startupTimer);
+      if (notify) notify.cancel();
+      run();
+    };
+    child.stdout?.on("data", (data) => {
+      const text = data.toString();
+      if (text.includes("Ctrl-C to stop") || text.includes("Starting recording")) {
+        settle(() => resolve2({ stderrBuffer }));
+      }
+    });
+    child.stderr?.on("data", (data) => {
+      stderrBuffer += data.toString();
+    });
+    child.on("exit", (code, signal) => {
+      settle(
+        () => reject(
+          new Error(
+            `xctrace record exited before recording started (code=${code}, signal=${signal}). stderr: ${stderrBuffer.trim() || "<empty>"}`
+          )
+        )
+      );
+    });
+    child.on("error", (err) => {
+      settle(() => reject(new Error(`Failed to start xctrace: ${err.message}`)));
+    });
+    const startupTimer = setTimeout(() => {
+      settle(() => {
+        try {
+          child.kill("SIGKILL");
+        } catch {
+        }
+        reject(
+          new Error(
+            `xctrace record did not start within ${timeoutMs} ms. Last stderr: ${stderrBuffer.trim() || "<empty>"}`
+          )
+        );
+      });
+    }, timeoutMs);
+    if (notify) {
+      notify.fired.then(() => settle(() => resolve2({ stderrBuffer }))).catch(() => {
+      });
+    }
+  });
+}
+
 // ../tool-server/src/tools/profiler/ios-profiler/ios-profiler-start.ts
 var DEFAULT_TEMPLATE_PATH = path6.resolve(__dirname, "Argent.tracetemplate");
+var STARTUP_TIMEOUT_MS = 1e4;
+var DETECT_RUNNING_APP_TIMEOUT_MS = 1e4;
+var NOTIFY_REGISTER_TIMEOUT_MS = 2e3;
+var RECORDING_CAP_MS = 10 * 60 * 1e3;
+var MAX_START_ATTEMPTS = 2;
+var RETRY_DELAY_MS = 1200;
+var COLD_START_SIGNATURE = "Cannot find process matching name:";
 var zodSchema42 = external_exports.object({
   device_id: external_exports.string().describe("iOS Simulator or device UDID"),
   app_process: external_exports.string().optional().describe(
@@ -50493,9 +50658,18 @@ var zodSchema42 = external_exports.object({
   template_path: external_exports.string().optional().describe("Path to an Instruments .tracetemplate file (defaults to bundled Argent template)")
 });
 function detectRunningApp(udid) {
-  const launchctlOutput = (0, import_child_process.execSync)(`xcrun simctl spawn ${udid} launchctl list`, {
-    encoding: "utf-8"
-  });
+  let launchctlOutput;
+  try {
+    launchctlOutput = (0, import_child_process2.execSync)(`xcrun simctl spawn ${udid} launchctl list`, {
+      encoding: "utf-8",
+      timeout: DETECT_RUNNING_APP_TIMEOUT_MS
+    });
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    throw new Error(
+      `Failed to enumerate running processes on simulator ${udid} within ${DETECT_RUNNING_APP_TIMEOUT_MS} ms. Verify the simulator is booted and responsive, then retry. Underlying error: ${msg}`
+    );
+  }
   const runningBundleIds = /* @__PURE__ */ new Set();
   for (const line of launchctlOutput.split("\n")) {
     const match = line.match(/UIKitApplication:([^\[]+)/);
@@ -50508,9 +50682,18 @@ function detectRunningApp(udid) {
       "No running apps detected on the simulator. Launch the app first using `launch-app`, then retry."
     );
   }
-  const listAppsOutput = (0, import_child_process.execSync)(`xcrun simctl listapps ${udid} | plutil -convert json -o - -`, {
-    encoding: "utf-8"
-  });
+  let listAppsOutput;
+  try {
+    listAppsOutput = (0, import_child_process2.execSync)(`xcrun simctl listapps ${udid} | plutil -convert json -o - -`, {
+      encoding: "utf-8",
+      timeout: DETECT_RUNNING_APP_TIMEOUT_MS
+    });
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    throw new Error(
+      `Failed to list installed apps on simulator ${udid} within ${DETECT_RUNNING_APP_TIMEOUT_MS} ms. Verify the simulator is booted and responsive, then retry. Underlying error: ${msg}`
+    );
+  }
   const installedApps = JSON.parse(listAppsOutput);
   const runningUserApps = [];
   for (const [, appInfo] of Object.entries(installedApps)) {
@@ -50535,6 +50718,50 @@ Specify \`app_process\` with the CFBundleExecutable of the app you want to profi
   }
   return runningUserApps[0].CFBundleExecutable;
 }
+async function registerStartupNotify(name) {
+  let handle;
+  try {
+    handle = listenForDarwinNotification(name);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    process.stderr.write(
+      `[ios-profiler] failed to spawn notifyutil (${msg}); falling back to stdout substring match.
+`
+    );
+    return null;
+  }
+  const ready = await Promise.race([
+    handle.ready.then(() => true),
+    new Promise((r) => setTimeout(() => r(false), NOTIFY_REGISTER_TIMEOUT_MS))
+  ]);
+  if (ready) return handle;
+  handle.cancel();
+  process.stderr.write(
+    `[ios-profiler] notifyutil did not register within ${NOTIFY_REGISTER_TIMEOUT_MS} ms; falling back to stdout substring match.
+`
+  );
+  return null;
+}
+function resetStartState(api) {
+  api.xctracePid = null;
+  api.xctraceProcess = null;
+  api.traceFile = null;
+  api.appProcess = null;
+}
+function handleXctraceExit(api, code, signal) {
+  if (!api.profilingActive) return;
+  if (api.recordingTimeout) {
+    clearTimeout(api.recordingTimeout);
+    api.recordingTimeout = null;
+  }
+  api.xctracePid = null;
+  api.xctraceProcess = null;
+  api.profilingActive = false;
+  if (!api.recordingTimedOut) {
+    api.recordingExitedUnexpectedly = true;
+  }
+  api.lastExitInfo = { code, signal };
+}
 var iosInstrumentsStartTool = {
   id: "ios-profiler-start",
   description: `Start iOS Instruments profiling via xctrace on a booted simulator or connected device.
@@ -50557,10 +50784,15 @@ Fails if no app is running on the simulator or xctrace cannot attach to the proc
     const debugDir = await getDebugDir();
     const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[-:T]/g, (m) => m === "T" ? "-" : "").slice(0, 15);
     const outputFile = path6.join(debugDir, `ios-profiler-${timestamp}.trace`);
-    api.appProcess = appProcess;
-    api.traceFile = outputFile;
-    return new Promise((resolve2, reject) => {
-      const xctraceProcess = (0, import_child_process.spawn)("xctrace", [
+    api.recordingTimedOut = false;
+    api.recordingExitedUnexpectedly = false;
+    api.lastExitInfo = null;
+    const attemptStart = async () => {
+      api.appProcess = appProcess;
+      api.traceFile = outputFile;
+      const notifyName = `com.argent.ios-profiler.started.${process.pid}.${Date.now()}`;
+      const notify = await registerStartupNotify(notifyName);
+      const xctraceArgs = [
         "record",
         "--template",
         templatePath,
@@ -50569,58 +50801,92 @@ Fails if no app is running on the simulator or xctrace cannot attach to the proc
         "--attach",
         appProcess,
         "--output",
-        outputFile
-      ]);
-      api.xctracePid = xctraceProcess.pid ?? null;
-      xctraceProcess.stdout.on("data", (data) => {
-        const output = data.toString();
-        if (output.includes("Ctrl-C to stop") || output.includes("Starting recording")) {
-          api.profilingActive = true;
-          api.wallClockStartMs = Date.now();
-          if (api.xctracePid) {
-            api.recordingTimeout = setTimeout(
-              () => {
-                xctraceProcess.kill("SIGINT");
-                api.profilingActive = false;
-                api.xctracePid = null;
-                api.recordingTimeout = null;
-              },
-              10 * 60 * 1e3
-            );
-            resolve2({
-              status: "recording",
-              pid: api.xctracePid,
-              traceFile: outputFile
-            });
-          }
-        }
+        outputFile,
+        "--no-prompt"
+      ];
+      if (notify) {
+        xctraceArgs.push("--notify-tracing-started", notifyName);
+      }
+      const xctraceProcess2 = (0, import_child_process2.spawn)("xctrace", xctraceArgs, {
+        stdio: ["ignore", "pipe", "pipe"]
       });
-      xctraceProcess.stderr.on("data", (data) => {
-        const errorOutput = data.toString();
-        if (errorOutput.includes("Target failed to run") || errorOutput.includes("failed with errors")) {
-          api.xctracePid = null;
-          if (api.recordingTimeout) {
-            clearTimeout(api.recordingTimeout);
-            api.recordingTimeout = null;
-          }
-          reject(new Error(`Failed to attach to iOS process: ${errorOutput}`));
+      api.xctracePid = xctraceProcess2.pid ?? null;
+      api.xctraceProcess = xctraceProcess2;
+      try {
+        await waitForXctraceReady(xctraceProcess2, { notify, timeoutMs: STARTUP_TIMEOUT_MS });
+      } catch (err) {
+        resetStartState(api);
+        throw err;
+      }
+      if (!xctraceProcess2.pid) {
+        try {
+          xctraceProcess2.kill("SIGKILL");
+        } catch {
         }
-      });
-      xctraceProcess.on("error", (err) => {
-        api.xctracePid = null;
-        if (api.recordingTimeout) {
-          clearTimeout(api.recordingTimeout);
-          api.recordingTimeout = null;
+        resetStartState(api);
+        throw new Error("xctrace process has no pid; cannot resolve start.");
+      }
+      return { child: xctraceProcess2, pid: xctraceProcess2.pid };
+    };
+    const startMs = Date.now();
+    const startWithRetry = async () => {
+      for (let attempt = 1; attempt <= MAX_START_ATTEMPTS; attempt++) {
+        try {
+          return await attemptStart();
+        } catch (err) {
+          const msg = err instanceof Error ? err.message : String(err);
+          const isColdStart = msg.includes(COLD_START_SIGNATURE);
+          if (!isColdStart) throw err;
+          if (attempt >= MAX_START_ATTEMPTS) break;
+          process.stderr.write(
+            `[ios-profiler] xctrace could not find "${appProcess}" on attempt ${attempt}/${MAX_START_ATTEMPTS}; waiting ${RETRY_DELAY_MS} ms for cold-start to settle, then retrying.
+`
+          );
+          await new Promise((r) => setTimeout(r, RETRY_DELAY_MS));
         }
-        reject(new Error(`Failed to start xctrace: ${err.message}`));
-      });
-    });
+      }
+      const totalMs = Date.now() - startMs;
+      throw new Error(
+        `xctrace could not find process "${appProcess}" after ${MAX_START_ATTEMPTS} attempts within ${totalMs} ms. The app appears to be cold-launching \u2014 its bundle is registered with launchd, but xctrace's process resolver hasn't seen it yet. Wait 1\u20132 seconds for the app to finish launching and retry. If the wrong app is being detected, pass app_process explicitly with the CFBundleExecutable.`
+      );
+    };
+    const { child: xctraceProcess, pid: xctracePid } = await startWithRetry();
+    api.profilingActive = true;
+    api.wallClockStartMs = Date.now();
+    api.recordingTimeout = setTimeout(() => {
+      try {
+        xctraceProcess.kill("SIGINT");
+      } catch {
+      }
+      api.profilingActive = false;
+      api.xctracePid = null;
+      api.xctraceProcess = null;
+      api.recordingTimeout = null;
+      api.recordingTimedOut = true;
+    }, RECORDING_CAP_MS);
+    xctraceProcess.on("exit", (code, signal) => handleXctraceExit(api, code, signal));
+    return {
+      status: "recording",
+      pid: xctracePid,
+      traceFile: outputFile
+    };
   }
 };
 
 // ../tool-server/src/utils/ios-profiler/export.ts
-var import_child_process2 = require("child_process");
 var path7 = __toESM(require("path"));
+
+// ../tool-server/src/utils/ios-profiler/run-with-timeout.ts
+var import_child_process3 = require("child_process");
+var DEFAULT_EXEC_TIMEOUT_MS = 6e4;
+function execSyncWithTimeout(command, options = {}) {
+  return (0, import_child_process3.execSync)(command, {
+    timeout: DEFAULT_EXEC_TIMEOUT_MS,
+    ...options
+  });
+}
+
+// ../tool-server/src/utils/ios-profiler/export.ts
 var CPU_SCHEMA_CANDIDATES = ["time-profile", "cpu-profile", "time-sample"];
 var EXPORTS = {
   cpu: {
@@ -50638,7 +50904,7 @@ var EXPORTS = {
 };
 function getXctraceVersion() {
   try {
-    const output = (0, import_child_process2.execSync)("xctrace version 2>&1 || true", {
+    const output = execSyncWithTimeout("xctrace version 2>&1 || true", {
       encoding: "utf-8"
     });
     const match = output.match(/(\d+)\./);
@@ -50649,7 +50915,7 @@ function getXctraceVersion() {
 }
 function discoverTraceSchemas(traceFile) {
   try {
-    const toc = (0, import_child_process2.execSync)(`xctrace export --input "${traceFile}" --toc`, {
+    const toc = execSyncWithTimeout(`xctrace export --input "${traceFile}" --toc`, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -50684,9 +50950,12 @@ function tryCpuExportFallback(traceFile, outPath, diagnostics) {
   for (const candidate of CPU_SCHEMA_CANDIDATES) {
     const xpath = `/trace-toc/run[@number="1"]/data/table[@schema="${candidate}"]`;
     try {
-      (0, import_child_process2.execSync)(`xctrace export --input "${traceFile}" --output "${outPath}" --xpath '${xpath}'`, {
-        stdio: "pipe"
-      });
+      execSyncWithTimeout(
+        `xctrace export --input "${traceFile}" --output "${outPath}" --xpath '${xpath}'`,
+        {
+          stdio: "pipe"
+        }
+      );
       diagnostics.cpuSchemaUsed = candidate;
       return true;
     } catch {
@@ -50711,7 +50980,7 @@ function exportIosTraceData(traceFile) {
       const resolvedXpath = resolveCpuXpath(traceFile, diagnostics);
       if (resolvedXpath) {
         try {
-          (0, import_child_process2.execSync)(
+          execSyncWithTimeout(
             `xctrace export --input "${traceFile}" --output "${outPath}" --xpath '${resolvedXpath}'`,
             { stdio: "pipe" }
           );
@@ -50734,7 +51003,7 @@ function exportIosTraceData(traceFile) {
       const xcVersion = getXctraceVersion();
       const halFlag = xcVersion >= 15 ? " --hal" : "";
       try {
-        (0, import_child_process2.execSync)(
+        execSyncWithTimeout(
           `xctrace export --input "${traceFile}" --output "${outPath}" --xpath '${config.xpath}'${halFlag}`,
           { stdio: "pipe" }
         );
@@ -50742,7 +51011,7 @@ function exportIosTraceData(traceFile) {
       } catch {
         if (halFlag) {
           try {
-            (0, import_child_process2.execSync)(
+            execSyncWithTimeout(
               `xctrace export --input "${traceFile}" --output "${outPath}" --xpath '${config.xpath}'`,
               { stdio: "pipe" }
             );
@@ -50759,7 +51028,7 @@ function exportIosTraceData(traceFile) {
       continue;
     }
     try {
-      (0, import_child_process2.execSync)(
+      execSyncWithTimeout(
         `xctrace export --input "${traceFile}" --output "${outPath}" --xpath '${config.xpath}'`,
         { stdio: "pipe" }
       );
@@ -50774,6 +51043,9 @@ function exportIosTraceData(traceFile) {
 }
 
 // ../tool-server/src/tools/profiler/ios-profiler/ios-profiler-stop.ts
+var STOP_GRACE_MS = 3e4;
+var STOP_TERM_MS = 5e3;
+var STOP_KILL_MS = 5e3;
 var zodSchema43 = external_exports.object({
   device_id: external_exports.string().describe("iOS Simulator or device UDID")
 });
@@ -50791,34 +51063,52 @@ Fails if no active ios-profiler-start session exists for the given device_id.`,
   }),
   async execute(services) {
     const api = services.session;
-    if (!api.profilingActive || !api.xctracePid || !api.traceFile) {
+    if ((api.recordingTimedOut || api.recordingExitedUnexpectedly) && api.traceFile) {
+      const traceFile = api.traceFile;
+      const wasTimeout = api.recordingTimedOut;
+      const exitInfo = api.lastExitInfo;
+      api.recordingTimedOut = false;
+      api.recordingExitedUnexpectedly = false;
+      api.lastExitInfo = null;
+      const { files: exportedFiles2, diagnostics: diagnostics2 } = exportIosTraceData(traceFile);
+      api.exportedFiles = exportedFiles2;
+      const warning2 = wasTimeout ? "Recording timed out at 10 min cap; exported the partial trace. Call ios-profiler-start again for a fresh recording." : `xctrace exited before stop was called (code=${exitInfo?.code ?? "?"}, signal=${exitInfo?.signal ?? "?"}); exported the partial trace. Common causes: attached app terminated, simulator daemon restart. Call ios-profiler-start again for a fresh recording.`;
+      process.stderr.write(`[ios-profiler] ${warning2}
+`);
+      return { traceFile, exportedFiles: exportedFiles2, exportDiagnostics: diagnostics2, warning: warning2 };
+    }
+    if (!api.profilingActive || !api.xctraceProcess || !api.traceFile) {
       throw new Error("No active iOS profiling session found. Call ios-profiler-start first.");
     }
     if (api.recordingTimeout) {
       clearTimeout(api.recordingTimeout);
       api.recordingTimeout = null;
     }
-    const pidToKill = api.xctracePid;
-    process.kill(pidToKill, "SIGINT");
-    await new Promise((resolve2) => {
-      const checkInterval = setInterval(() => {
-        try {
-          process.kill(pidToKill, 0);
-        } catch {
-          clearInterval(checkInterval);
-          resolve2();
-        }
-      }, 1e3);
+    const result = await shutdownChild(api.xctraceProcess, {
+      graceMs: STOP_GRACE_MS,
+      termMs: STOP_TERM_MS,
+      killMs: STOP_KILL_MS
     });
+    let warning;
+    if (!result.clean) {
+      warning = `xctrace did not respond to SIGINT${result.signalUsed === "SIGKILL" ? "/SIGTERM" : ""}; ${result.signalUsed} was used. Trace bundle may be incomplete.`;
+      process.stderr.write(`[ios-profiler] ${warning}
+`);
+    }
     api.profilingActive = false;
     api.xctracePid = null;
+    api.xctraceProcess = null;
+    api.recordingExitedUnexpectedly = false;
+    api.lastExitInfo = null;
     const { files: exportedFiles, diagnostics } = exportIosTraceData(api.traceFile);
     api.exportedFiles = exportedFiles;
-    return {
+    const stopResult = {
       traceFile: api.traceFile,
       exportedFiles,
       exportDiagnostics: diagnostics
     };
+    if (warning) stopResult.warning = warning;
+    return stopResult;
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/argent",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "MCP server for iOS Simulator control",
   "license": "Apache-2.0",
   "repository": {

package/rules/argent.md

@@ -48,7 +48,7 @@ Before starting to interact with the app, read the `argent-simulator-interact` s
 - Interaction tools (`gesture-tap`, `gesture-swipe`, `gesture-pinch`, `gesture-rotate`, `gesture-custom`, `launch-app`, etc.) return a screenshot automatically.
   Call `screenshot` separately only for a baseline before any action or after a delay.
 - Always open apps with `launch-app` or `open-url` — never tap home screen icons.
-- Always use `run-sequence` when performing multiple sequential simulator actions where you don't need to observe the screen between steps. More in `simulator-interact` skill.
+- Always use `run-sequence` when performing multiple sequential simulator actions where you don't need to observe the screen between steps. More in `argent-simulator-interact` skill.
 - When the session ends or the user says they are done: call `stop-all-simulator-servers`.
   If the user started Metro separately, ask whether to call `stop-metro` (specify the port if not 8081).
 - If tools provided by mcp-server are not sufficient and action can be done using `xcrun` or other commands, use the command. Examples: changing simulator options, performing simulator action such as lock, shake, etc.

package/skills/argent-react-native-optimization/SKILL.md

@@ -1,19 +1,19 @@
 ---
 name: argent-react-native-optimization
-description: Optimizes a React Native app by profiling first to find real bottlenecks, then sweeping for mechanical issues. Entry-point for all performance work. Use when the app feels slow, user asks to optimize, fix re-renders, reduce jank, or improve startup. Delegates to react-native-profiler for measurement.
+description: Optimizes a React Native app by profiling first to find real bottlenecks, then sweeping for mechanical issues. Entry-point for all performance work. Use when the app feels slow, user asks to optimize, fix re-renders, reduce jank, or improve startup. Delegates to argent-react-native-profiler for measurement.
 ---
 
 ## Rules
 
 - Do not apply shotgun optimizations. Measure first, define what "good enough" looks like (target metric + threshold), fix the top offender, re-measure honestly.
 - **Quick scan** — `react-profiler-renders` for a live render count table. Identifies hot components instantly.
-- **Deep measure** — load `react-native-profiler` skill. `react-profiler-start` → interact → `react-profiler-stop` → `react-profiler-analyze`.
+- **Deep measure** — load `argent-react-native-profiler` skill. `react-profiler-start` → interact → `react-profiler-stop` → `react-profiler-analyze`.
 - **Inspect** — `react-profiler-component-source` per finding. `react-profiler-fiber-tree` to trace component ancestry and render cost.
 - **Verify correctness** - before fixing, recollect information from steps above and make a logical conclusion whether the approach is worth undertaking.
 - **Fix** — apply one fix. Validate with `debugger-evaluate` before committing.
 - **Re-measure** — report whether the target metric improved, regressed, or stayed flat. Check for regressions in other areas. If no net benefit or unacceptable tradeoffs, revert.
 - **Profile for discovery, not only verification.** Use the profiler to find issues static analysis missed, not only to confirm fixes.
-- **One fix per cycle for architectural changes.** Mechanical batch fixes (inline styles, index keys) can be grouped — re-profile once after the batch. When the measurement involves simulator interaction, record it as a flow (`create-flow` skill) before the first run so all subsequent cycles replay identical steps.
+- **One fix per cycle for architectural changes.** Mechanical batch fixes (inline styles, index keys) can be grouped — re-profile once after the batch. When the measurement involves simulator interaction, record it as a flow (`argent-create-flow` skill) before the first run so all subsequent cycles replay identical steps.
 - **React Compiler**: if `react-profiler-analyze` reports `reactCompilerEnabled: true`, do NOT propose `useCallback`/`useMemo`/`React.memo` unless you confirmed compiler bail-out via `react-profiler-fiber-tree` (absent `useMemoCache`).
 - **Sub-agents**: Phases 1–2 dispatch sub-agents — one per file for lint results, one per checklist item for semantic. Sub-agents CANNOT touch the simulator - all profiling and E2E verification must happen in the main agent.
 
@@ -43,15 +43,15 @@ See [references/semantic-checklist.md](references/semantic-checklist.md) for ful
 
 ### Phase 3: Visual profiling
 
-1. Load `react-native-profiler` skill, start dual profiling
+1. Load `argent-react-native-profiler` skill, start dual profiling
 2. Exercise key user flows (navigate screens the user specified, or all major flows)
 3. Analyze with `react-profiler-analyze` + `ios-profiler-analyze` + `profiler-combined-report`
 4. Cross-reference profiling results with Phase 1–2 findings
-5. Fix highest-impact issues. Re-profile after architectural changes; batch mechanical fixes. If a recorded flow breaks after a fix (e.g., UI layout changed), follow `create-flow` skill to repair the flow rather than silently discarding it.
+5. Fix highest-impact issues. Re-profile after architectural changes; batch mechanical fixes. If a recorded flow breaks after a fix (e.g., UI layout changed), follow `argent-create-flow` skill to repair the flow rather than silently discarding it.
 
 ### Phase 4: Verify no regressions
 
-Navigate every screen and UI flow within scope, confirm each renders without errors. If no scope was specified, verify the entire app — cover all reachable screens via `simulator-interact`. Use `debugger-log-registry` to check for runtime errors and take screenshots to check for red/yellow error screens. Check for regressions introduced by fixes (e.g., fewer re-renders but higher CPU, or new jank in a different screen). Main agent only.
+Navigate every screen and UI flow within scope, confirm each renders without errors. If no scope was specified, verify the entire app — cover all reachable screens via `argent-simulator-interact`. Use `debugger-log-registry` to check for runtime errors and take screenshots to check for red/yellow error screens. Check for regressions introduced by fixes (e.g., fewer re-renders but higher CPU, or new jank in a different screen). Main agent only.
 
 ## App-wide optimization