fix(diagnostics): scope ensured log directories

Author: thymikee

packages/platform-apple/src/runner/__tests__/runner-session-stale-bundles.test.ts

@@ -69,19 +69,17 @@ vi.mock('../runner-io.ts', async () => {
 });
 
 vi.mock('../runner-transport.ts', async () => {
-  const actual = await vi.importActual<typeof import('../runner-transport.ts')>(
-    '../runner-transport.ts',
-  );
+  const actual =
+    await vi.importActual<typeof import('../runner-transport.ts')>('../runner-transport.ts');
   return {
     ...actual,
     sendRunnerCommandOnce: mockSendRunnerCommandOnce,
   };
 });
 
 vi.mock('../runner-xctestrun.ts', async () => {
-  const actual = await vi.importActual<typeof import('../runner-xctestrun.ts')>(
-    '../runner-xctestrun.ts',
-  );
+  const actual =
+    await vi.importActual<typeof import('../runner-xctestrun.ts')>('../runner-xctestrun.ts');
   return {
     ...actual,
     acquireXcodebuildSimulatorSetRedirect: mockAcquireXcodebuildSimulatorSetRedirect,

src/utils/__tests__/diagnostics.test.ts

@@ -151,3 +151,26 @@ test('appendDiagnosticLine ensures the log directory once across appended lines'
     mkdirSpy.mockRestore();
   }
 });
+
+test('a later diagnostics scope recreates a removed log directory', async () => {
+  const rootDir = mkdtempForTestSync('agent-device-diag-recreate-');
+  const logDir = path.join(rootDir, 'nested');
+  const logPath = path.join(logDir, 'request.ndjson');
+  const mkdirSpy = vi.spyOn(fs, 'mkdirSync');
+  try {
+    await withDiagnosticsScope({ command: 'first', logPath, debug: true }, () => {
+      emitDiagnostic({ phase: 'first_scope' });
+    });
+    fs.rmSync(logDir, { recursive: true, force: true });
+
+    await withDiagnosticsScope({ command: 'second', logPath, debug: true }, () => {
+      emitDiagnostic({ phase: 'second_scope' });
+    });
+
+    const callsForLogDir = mkdirSpy.mock.calls.filter(([dir]) => dir === logDir);
+    assert.equal(callsForLogDir.length, 2);
+    assert.match(fs.readFileSync(logPath, 'utf8'), /second_scope/);
+  } finally {
+    mkdirSpy.mockRestore();
+  }
+});

src/utils/diagnostics.ts

@@ -46,6 +46,7 @@ type DiagnosticsScope = DiagnosticsScopeOptions & {
   // events are streamed out and reset mid-flight.
   phaseCounts: Map<string, number>;
   sensitiveValues: Set<string>;
+  ensuredDirectories: Set<string>;
   // Sorted-longest-first view of `sensitiveValues`, recomputed lazily after a
   // registration invalidates it so replacement order stays deterministic.
   sortedSensitiveValues?: string[];
@@ -72,6 +73,7 @@ export async function withDiagnosticsScope<T>(
     liveWrittenEventCount: 0,
     phaseCounts: new Map(),
     sensitiveValues: new Set(),
+    ensuredDirectories: new Set(),
   };
   return await diagnosticsStorage.run(scope, fn);
 }
@@ -145,11 +147,11 @@ export function emitDiagnostic(event: {
   const fileLine = `${JSON.stringify(payload)}\n`;
   try {
     if (scope.debug && scope.logPath) {
-      appendDiagnosticLine(scope.logPath, fileLine);
+      appendDiagnosticLine(scope, scope.logPath, fileLine);
       scope.liveWrittenEventCount = scope.events.length;
     }
     if (scope.traceLogPath) {
-      appendDiagnosticLine(scope.traceLogPath, fileLine);
+      appendDiagnosticLine(scope, scope.traceLogPath, fileLine);
     }
     if (scope.debug && !scope.logPath && !scope.traceLogPath) {
       process.stderr.write(`[agent-device][diag] ${fileLine}`);
@@ -221,7 +223,7 @@ export function flushDiagnosticsToSessionFile(
         const lines = pendingEvents.map((entry) =>
           JSON.stringify(replaceSensitiveValues(entry, values)),
         );
-        appendDiagnosticLine(scope.logPath, `${lines.join('\n')}\n`);
+        appendDiagnosticLine(scope, scope.logPath, `${lines.join('\n')}\n`);
       }
       const logRecord = scope.logRecord;
       scope.events = [];
@@ -283,14 +285,11 @@ function sanitizePathPart(value: string): string {
   return value.replace(/[^a-zA-Z0-9._-]/g, '_');
 }
 
-// Directories already ensured by appendDiagnosticLine; debug mode would mkdir per line otherwise.
-const ensuredDiagnosticDirs = new Set<string>();
-
-function appendDiagnosticLine(logPath: string, line: string): void {
+function appendDiagnosticLine(scope: DiagnosticsScope, logPath: string, line: string): void {
   const dir = path.dirname(logPath);
-  if (!ensuredDiagnosticDirs.has(dir)) {
+  if (!scope.ensuredDirectories.has(dir)) {
     fs.mkdirSync(dir, { recursive: true });
-    ensuredDiagnosticDirs.add(dir);
+    scope.ensuredDirectories.add(dir);
   }
   fs.appendFileSync(logPath, line, 'utf8');
 }