refactor: gate stderr message override to process-exit errors

Author: thymikee

src/utils/__tests__/errors.test.ts

@@ -34,13 +34,41 @@ test('normalizeError falls back to context metadata', () => {
 
 test('normalizeError enriches generic command-failed message with stderr excerpt', () => {
   const err = new AppError('COMMAND_FAILED', 'xcrun exited with code 1', {
+    exitCode: 1,
+    processExitError: true,
     stderr: '\nOperation not permitted\nUnderlying error details',
   });
   const normalized = normalizeError(err);
-  assert.equal(normalized.message, 'xcrun exited with code 1: Operation not permitted');
+  assert.equal(normalized.message, 'Operation not permitted');
 });
 
-test('normalizeError does not alter non-generic command-failed message', () => {
+test('normalizeError skips simctl boilerplate wrappers in stderr', () => {
+  const err = new AppError('COMMAND_FAILED', 'xcrun exited with code 1', {
+    exitCode: 1,
+    processExitError: true,
+    stderr: [
+      'An error was encountered processing the command (domain=NSPOSIXErrorDomain, code=1):',
+      'Simulator device failed to complete the requested operation.',
+      'Operation not permitted',
+      'Underlying error (domain=NSPOSIXErrorDomain, code=1):',
+      '\tFailed to reset access',
+      '\tOperation not permitted',
+    ].join('\n'),
+  });
+  const normalized = normalizeError(err);
+  assert.equal(normalized.message, 'Operation not permitted');
+});
+
+test('normalizeError does not alter generic command-failed message without process-exit marker', () => {
+  const err = new AppError('COMMAND_FAILED', 'xcrun exited with code 1', {
+    exitCode: 1,
+    stderr: 'Operation not permitted',
+  });
+  const normalized = normalizeError(err);
+  assert.equal(normalized.message, 'xcrun exited with code 1');
+});
+
+test('normalizeError does not alter non-generic command-failed message without exitCode details', () => {
   const err = new AppError('COMMAND_FAILED', 'Failed to reset access', {
     stderr: 'Operation not permitted',
   });

src/utils/errors.ts

@@ -86,17 +86,24 @@ function maybeEnrichCommandFailedMessage(
   details: Record<string, unknown> | undefined,
 ): string {
   if (code !== 'COMMAND_FAILED') return message;
-  if (!/\bexited with code\b/i.test(message)) return message;
+  if (details?.processExitError !== true) return message;
   const stderr = typeof details?.stderr === 'string' ? details.stderr : '';
   const excerpt = firstStderrLine(stderr);
   if (!excerpt) return message;
-  return `${message}: ${excerpt}`;
+  return excerpt;
 }
 
 function firstStderrLine(stderr: string): string | null {
+  const skipPatterns = [
+    /^an error was encountered processing the command/i,
+    /^underlying error\b/i,
+    /^simulator device failed to complete the requested operation/i,
+  ];
+
   for (const rawLine of stderr.split('\n')) {
     const line = rawLine.trim();
     if (!line) continue;
+    if (skipPatterns.some((pattern) => pattern.test(line))) continue;
     return line.length > 200 ? `${line.slice(0, 200)}...` : line;
   }
   return null;

src/utils/exec.ts

@@ -111,6 +111,7 @@ export async function runCmd(
             stdout,
             stderr,
             exitCode,
+            processExitError: true,
           }),
         );
         return;
@@ -176,6 +177,7 @@ export function runCmdSync(cmd: string, args: string[], options: ExecOptions = {
       stdout,
       stderr,
       exitCode,
+      processExitError: true,
     });
   }
 
@@ -256,6 +258,7 @@ export async function runCmdStreaming(
             stdout,
             stderr,
             exitCode,
+            processExitError: true,
           }),
         );
         return;
@@ -309,6 +312,7 @@ export function runCmdBackground(
             stdout,
             stderr,
             exitCode,
+            processExitError: true,
           }),
         );
         return;