Merge branch 'master' into fix/e2e-timeout-diagnostics

The timeout dump hand-rolled a 50-line tail, which on a daemon log is mostly
plugin-worker chatter and can push the restart/error/graph-recompute lines that
actually explain a stall out of view. log-utils already has trimDaemonLog for
exactly this — it keeps the signal lines plus a tail and marks what it dropped.

It also hardcoded .nx/workspace-data, so a test that relocates the daemon's data
dir via NX_WORKSPACE_DATA_DIRECTORY / NX_PROJECT_GRAPH_CACHE_DIRECTORY (watch.test.ts
does) would report the log as missing. Resolve the same way
workspaceDataDirectoryForWorkspace does, from the command's own env.

e2e/utils/command-utils.ts

@@ -7,6 +7,7 @@ import {
 import { ChildProcess, exec, execSync, ExecSyncOptions } from 'child_process';
 import { existsSync } from 'fs-extra';
 import * as isCI from 'is-ci';
+import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { stripVTControlCharacters } from 'node:util';
 import { gte } from 'semver';
@@ -25,7 +26,7 @@ import {
   getYarnMajorVersion,
   isVerboseE2ERun,
 } from './get-env-info';
-import { logError, logInfo } from './log-utils';
+import { logError, logInfo, trimDaemonLog } from './log-utils';
 
 export interface RunCmdOpts {
   silenceError?: boolean;
@@ -445,6 +446,50 @@ export function normalizePerformanceReport(output: string): string {
   );
 }
 
+/**
+ * Extra context for a `Command timed out` failure. A wedged daemon outlives our kill —
+ * `sendMessageToDaemon` waits 20 minutes on a reply — and leaves no trace in the killed
+ * command's own output, so the daemon log and the surviving processes are the only
+ * evidence of where the run stopped. Best-effort: never throws.
+ */
+function timeoutDiagnostics(cwd: string, env: RunCmdOpts['env']): string {
+  const sections: string[] = [];
+
+  // Mirrors workspaceDataDirectoryForWorkspace: a test that relocates the daemon's
+  // data dir (e.g. watch.test.ts) puts daemon.log somewhere other than the default.
+  const dataDir =
+    env?.NX_WORKSPACE_DATA_DIRECTORY ??
+    env?.NX_PROJECT_GRAPH_CACHE_DIRECTORY ??
+    join(cwd, '.nx', 'workspace-data');
+  const daemonLog = join(dataDir, 'd', 'daemon.log');
+  try {
+    sections.push(
+      `Daemon log (trimmed, ${daemonLog}):\n${trimDaemonLog(
+        readFileSync(daemonLog, 'utf-8')
+      )}`
+    );
+  } catch (e) {
+    sections.push(`Daemon log unavailable (${daemonLog}): ${e.message}`);
+  }
+
+  try {
+    // The timeout kills the shell, not its descendants, so the nx client, the daemon and
+    // any task process are all still listed here.
+    const processes = execSync('ps -eo pid,ppid,etime,args', {
+      encoding: 'utf-8',
+    })
+      .split('\n')
+      .filter((line) => line.includes('nx'))
+      .slice(0, 40)
+      .join('\n');
+    sections.push(`Surviving nx processes:\n${processes}`);
+  } catch (e) {
+    sections.push(`Process list unavailable: ${e.message}`);
+  }
+
+  return sections.join('\n\n');
+}
+
 export function runCLI(
   command: string,
   opts: RunCmdOpts = {
@@ -500,7 +545,10 @@ export function runCLI(
       const processOutput = stripVTControlCharacters(
         `${e.stdout ?? ''}\n\n${e.stderr ?? ''}`
       ).trim();
-      const msg = `Command timed out after ${timeoutSec}s: ${command}\n\nProcess output:\n${processOutput}`;
+      const msg = `Command timed out after ${timeoutSec}s: ${command}\n\nProcess output:\n${processOutput}\n\n${timeoutDiagnostics(
+        opts.cwd || tmpProjPath(),
+        opts.env
+      )}`;
       logError(`Command timed out`, msg);
       throw new Error(msg);
     }
@@ -556,7 +604,10 @@ export function runLernaCLI(
       const processOutput = stripVTControlCharacters(
         `${e.stdout ?? ''}\n\n${e.stderr ?? ''}`
       ).trim();
-      const msg = `Command timed out after ${timeoutSec}s: ${command}\n\nProcess output:\n${processOutput}`;
+      const msg = `Command timed out after ${timeoutSec}s: ${command}\n\nProcess output:\n${processOutput}\n\n${timeoutDiagnostics(
+        opts.cwd || tmpProjPath(),
+        opts.env
+      )}`;
       logError(`Command timed out`, msg);
       throw new Error(msg);
     }

nx.json

@@ -388,7 +388,7 @@
   "nxCloudId": "62d013ea0852fe0a2df74438",
   "nxCloudUrl": "https://staging.nx.app",
   "parallel": 1,
-  "bust": 3237,
+  "bust": 3238,
   "defaultBase": "master",
   "sync": {
     "applyChanges": true