rebase fixes

Signed-off-by: Aramis Sennyey <[email protected]>

Author: aramissennyeydd

build-tests/rush-redis-cobuild-plugin-integration-test/sandbox/sharded-repo/projects/e/config/rush-project.json

@@ -4,16 +4,13 @@
     {
       "operationName": "_phase:build",
       "outputFolderNames": ["dist"],
-      "allowCobuildOrchestration": true,
-      "disableBuildCacheForOperation": true,
       "sharding": {
         "count": 75
       }
     },
     {
       "operationName": "_phase:build:shard",
-      "weight": 10,
-      "allowCobuildOrchestration": true
+      "weight": 10
     }
   ]
 }

libraries/rush-lib/src/logic/operations/OperationExecutionRecord.ts

@@ -323,8 +323,8 @@ export class OperationExecutionRecord implements IOperationRunnerContext, IOpera
     beforeResult: (record: OperationExecutionRecord) => Promise<void>;
     onResult: (record: OperationExecutionRecord) => Promise<void> | void;
   }): Promise<void> {
-    if (!this.isTerminal) {
-      this.stopwatch.reset();
+    if (this.stopwatch.startTime === undefined) {
+      this.stopwatch.start();
     }
     this.status = OperationStatus.Executing;
 
@@ -349,8 +349,6 @@ export class OperationExecutionRecord implements IOperationRunnerContext, IOpera
       // We may need to clean up and finalize resources (_operationMetadataManager for example needs to be saved by CacheableOperationPlugin)
       await beforeResult(this);
       if (this.isTerminal) {
-        this._collatedWriter?.close();
-        this.stdioSummarizer.close();
         this.stopwatch.stop();
         if (
           !this.executedOnThisAgent &&
@@ -367,6 +365,11 @@ export class OperationExecutionRecord implements IOperationRunnerContext, IOpera
           }
         }
       }
+      await onResult(this);
+      if (this.isTerminal) {
+        this._collatedWriter?.close();
+        this.stdioSummarizer.close();
+      }
     }
   }
 }