rushd: WS3/WS4 integration with Reporter prerequisites

README.md

@@ -56,6 +56,7 @@ These GitHub repositories provide supplementary resources for Rush Stack:
 | [/apps/playwright-browser-tunnel](./apps/playwright-browser-tunnel/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Fplaywright-browser-tunnel.svg)](https://badge.fury.io/js/%40rushstack%2Fplaywright-browser-tunnel) | [changelog](./apps/playwright-browser-tunnel/CHANGELOG.md) | [@rushstack/playwright-browser-tunnel](https://www.npmjs.com/package/@rushstack/playwright-browser-tunnel) |
 | [/apps/rundown](./apps/rundown/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Frundown.svg)](https://badge.fury.io/js/%40rushstack%2Frundown) | [changelog](./apps/rundown/CHANGELOG.md) | [@rushstack/rundown](https://www.npmjs.com/package/@rushstack/rundown) |
 | [/apps/rush](./apps/rush/) | [![npm version](https://badge.fury.io/js/%40microsoft%2Frush.svg)](https://badge.fury.io/js/%40microsoft%2Frush) | [changelog](./apps/rush/CHANGELOG.md) | [@microsoft/rush](https://www.npmjs.com/package/@microsoft/rush) |
+| [/apps/rush-cli-client](./apps/rush-cli-client/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Frush-cli-client.svg)](https://badge.fury.io/js/%40rushstack%2Frush-cli-client) | [changelog](./apps/rush-cli-client/CHANGELOG.md) | [@rushstack/rush-cli-client](https://www.npmjs.com/package/@rushstack/rush-cli-client) |
 | [/apps/rush-mcp-server](./apps/rush-mcp-server/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Fmcp-server.svg)](https://badge.fury.io/js/%40rushstack%2Fmcp-server) | [changelog](./apps/rush-mcp-server/CHANGELOG.md) | [@rushstack/mcp-server](https://www.npmjs.com/package/@rushstack/mcp-server) |
 | [/apps/trace-import](./apps/trace-import/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Ftrace-import.svg)](https://badge.fury.io/js/%40rushstack%2Ftrace-import) | [changelog](./apps/trace-import/CHANGELOG.md) | [@rushstack/trace-import](https://www.npmjs.com/package/@rushstack/trace-import) |
 | [/apps/zipsync](./apps/zipsync/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Fzipsync.svg)](https://badge.fury.io/js/%40rushstack%2Fzipsync) | [changelog](./apps/zipsync/CHANGELOG.md) | [@rushstack/zipsync](https://www.npmjs.com/package/@rushstack/zipsync) |
@@ -98,6 +99,7 @@ These GitHub repositories provide supplementary resources for Rush Stack:
 | [/libraries/problem-matcher](./libraries/problem-matcher/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Fproblem-matcher.svg)](https://badge.fury.io/js/%40rushstack%2Fproblem-matcher) | [changelog](./libraries/problem-matcher/CHANGELOG.md) | [@rushstack/problem-matcher](https://www.npmjs.com/package/@rushstack/problem-matcher) |
 | [/libraries/reporter](./libraries/reporter/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Frush-reporter.svg)](https://badge.fury.io/js/%40rushstack%2Frush-reporter) | [changelog](./libraries/reporter/CHANGELOG.md) | [@rushstack/rush-reporter](https://www.npmjs.com/package/@rushstack/rush-reporter) |
 | [/libraries/rig-package](./libraries/rig-package/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Frig-package.svg)](https://badge.fury.io/js/%40rushstack%2Frig-package) | [changelog](./libraries/rig-package/CHANGELOG.md) | [@rushstack/rig-package](https://www.npmjs.com/package/@rushstack/rig-package) |
+| [/libraries/rush-client-core](./libraries/rush-client-core/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Frush-client-core.svg)](https://badge.fury.io/js/%40rushstack%2Frush-client-core) | [changelog](./libraries/rush-client-core/CHANGELOG.md) | [@rushstack/rush-client-core](https://www.npmjs.com/package/@rushstack/rush-client-core) |
 | [/libraries/rush-daemon](./libraries/rush-daemon/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Frush-daemon.svg)](https://badge.fury.io/js/%40rushstack%2Frush-daemon) | [changelog](./libraries/rush-daemon/CHANGELOG.md) | [@rushstack/rush-daemon](https://www.npmjs.com/package/@rushstack/rush-daemon) |
 | [/libraries/rush-daemon-protocol](./libraries/rush-daemon-protocol/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Frush-daemon-protocol.svg)](https://badge.fury.io/js/%40rushstack%2Frush-daemon-protocol) | [changelog](./libraries/rush-daemon-protocol/CHANGELOG.md) | [@rushstack/rush-daemon-protocol](https://www.npmjs.com/package/@rushstack/rush-daemon-protocol) |
 | [/libraries/rush-daemon-transport](./libraries/rush-daemon-transport/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Frush-daemon-transport.svg)](https://badge.fury.io/js/%40rushstack%2Frush-daemon-transport) | [changelog](./libraries/rush-daemon-transport/CHANGELOG.md) | [@rushstack/rush-daemon-transport](https://www.npmjs.com/package/@rushstack/rush-daemon-transport) |

apps/heft/src/cli/HeftActionRunner.ts

@@ -26,6 +26,7 @@ import type {
 import type { InternalHeftSession } from '../pluginFramework/InternalHeftSession';
 import type { HeftConfiguration } from '../configuration/HeftConfiguration';
 import type { LoggingManager } from '../pluginFramework/logging/LoggingManager';
+import type { HeftChildReporter } from '../pluginFramework/logging/HeftChildReporter';
 import type { MetricsCollector } from '../metrics/MetricsCollector';
 import { HeftParameterManager } from '../pluginFramework/HeftParameterManager';
 import { TaskOperationRunner } from '../operations/runners/TaskOperationRunner';
@@ -71,9 +72,13 @@ export function initializeHeft(
 ): void {
   // Ensure that verbose is enabled on the terminal if requested. terminalProvider.verboseEnabled
   // should already be `true` if the `--debug` flag was provided. This is set in HeftCommandLineParser
-  if (heftConfiguration.terminalProvider instanceof ConsoleTerminalProvider) {
-    heftConfiguration.terminalProvider.verboseEnabled =
-      heftConfiguration.terminalProvider.verboseEnabled || isVerbose;
+  if (
+    heftConfiguration.terminalProvider instanceof ConsoleTerminalProvider ||
+    'verboseEnabled' in heftConfiguration.terminalProvider
+  ) {
+    const terminalProvider: ConsoleTerminalProvider | HeftChildReporter =
+      heftConfiguration.terminalProvider as ConsoleTerminalProvider | HeftChildReporter;
+    terminalProvider.verboseEnabled = terminalProvider.verboseEnabled || isVerbose;
   }
 
   // Log some information about the execution

apps/heft/src/cli/HeftCommandLineParser.ts

@@ -10,7 +10,12 @@ import {
   type CommandLineAction
 } from '@rushstack/ts-command-line';
 import { InternalError, AlreadyReportedError } from '@rushstack/node-core-library';
-import { Terminal, ConsoleTerminalProvider, type ITerminal } from '@rushstack/terminal';
+import {
+  Terminal,
+  ConsoleTerminalProvider,
+  type ITerminal,
+  type ITerminalProvider
+} from '@rushstack/terminal';
 
 import { MetricsCollector } from '../metrics/MetricsCollector';
 import { HeftConfiguration } from '../configuration/HeftConfiguration';
@@ -23,6 +28,7 @@ import type { IHeftActionOptions } from './actions/IHeftAction';
 import { AliasAction } from './actions/AliasAction';
 import { getToolParameterNamesFromArgs } from '../utilities/CliUtilities';
 import { Constants } from '../utilities/Constants';
+import { HeftChildReporter } from '../pluginFramework/logging/HeftChildReporter';
 
 /**
  * This interfaces specifies values for parameters that must be parsed before the CLI
@@ -41,7 +47,8 @@ export class HeftCommandLineParser extends CommandLineParser {
   readonly #debugFlag: CommandLineFlagParameter;
   readonly #unmanagedFlag: CommandLineFlagParameter;
   readonly #debug: boolean;
-  readonly #terminalProvider: ConsoleTerminalProvider;
+  readonly #terminalProvider: ITerminalProvider;
+  readonly #childReporter: HeftChildReporter | undefined;
   readonly #loggingManager: LoggingManager;
   readonly #metricsCollector: MetricsCollector;
   readonly #heftConfiguration: HeftConfiguration;
@@ -77,12 +84,22 @@ export class HeftCommandLineParser extends CommandLineParser {
     this.#debug = !!preInitializationArgumentValues.debug;
 
     // Enable debug and verbose logging if the "--debug" flag is set
-    this.#terminalProvider = new ConsoleTerminalProvider({
-      debugEnabled: this.#debug,
-      verboseEnabled: this.#debug
-    });
+    this.#childReporter = HeftChildReporter.tryInitialize();
+    this.#terminalProvider =
+      this.#childReporter ??
+      new ConsoleTerminalProvider({
+        debugEnabled: this.#debug,
+        verboseEnabled: this.#debug
+      });
+    if (this.#debug && this.#childReporter) {
+      this.#childReporter.debugEnabled = true;
+      this.#childReporter.verboseEnabled = true;
+    }
     this.globalTerminal = new Terminal(this.#terminalProvider);
-    this.#loggingManager = new LoggingManager({ terminalProvider: this.#terminalProvider });
+    this.#loggingManager = new LoggingManager({
+      terminalProvider: this.#terminalProvider,
+      childReporter: this.#childReporter
+    });
     if (this.#debug) {
       // Enable printing stacktraces if the "--debug" flag is set
       this.#loggingManager.enablePrintStacks();
@@ -197,6 +214,7 @@ export class HeftCommandLineParser extends CommandLineParser {
         commandName,
         unaliasedCommandName
       };
+      this.#childReporter?.setCommandName(commandName);
       await super.onExecuteAsync();
     } catch (e) {
       await this.#reportErrorAndSetExitCodeAsync(e as Error);
@@ -224,7 +242,7 @@ export class HeftCommandLineParser extends CommandLineParser {
     args: string[] = process.argv
   ): IPreInitializationArgumentValues {
     if (!this.#debugFlag) {
-      // The `this._debugFlag` parameter (the parameter itself, not its value)
+      // The `this.#debugFlag` parameter (the parameter itself, not its value)
       // has not yet been defined. Parameters need to be defined before we
       // try to evaluate any parameters. This is to ensure that the
       // `--debug` flag is defined correctly before we do this not-so-rigorous
@@ -241,7 +259,11 @@ export class HeftCommandLineParser extends CommandLineParser {
 
   async #reportErrorAndSetExitCodeAsync(error: Error): Promise<void> {
     if (!(error instanceof AlreadyReportedError)) {
-      this.globalTerminal.writeErrorLine(error.toString());
+      if (this.#childReporter) {
+        this.#childReporter.emitDiagnostic(Constants.heftPackageName, error, 'error');
+      } else {
+        this.globalTerminal.writeErrorLine(error.toString());
+      }
     }
 
     if (this.#debug) {