refactor for easier diff

Author: nicktrn

packages/cli-v3/src/entryPoints/dev-run-worker.ts

@@ -104,12 +104,12 @@ const heartbeatIntervalMs = getEnvVar("HEARTBEAT_INTERVAL_MS");
 const standardLocalsManager = new StandardLocalsManager();
 localsAPI.setGlobalLocalsManager(standardLocalsManager);
 
-const standardRunTimelineMetricsManager = new StandardRunTimelineMetricsManager();
-runTimelineMetrics.setGlobalManager(standardRunTimelineMetricsManager);
-
 const standardLifecycleHooksManager = new StandardLifecycleHooksManager();
 lifecycleHooks.setGlobalLifecycleHooksManager(standardLifecycleHooksManager);
 
+const standardRunTimelineMetricsManager = new StandardRunTimelineMetricsManager();
+runTimelineMetrics.setGlobalManager(standardRunTimelineMetricsManager);
+
 const devUsageManager = new DevUsageManager();
 usage.setGlobalUsageManager(devUsageManager);
 timeout.setGlobalManager(new UsageTimeoutManager(devUsageManager));

packages/cli-v3/src/entryPoints/managed-run-worker.ts

@@ -460,10 +460,7 @@ const zodIpc = new ZodIpcConnection({
         });
       }
     },
-    FLUSH: async ({ timeoutInMs }, sender) => {
-      await flushAll(timeoutInMs);
-    },
-    CANCEL: async ({ timeoutInMs }, sender) => {
+    CANCEL: async ({ timeoutInMs }) => {
       _isCancelled = true;
       cancelController.abort("run cancelled");
       await callCancelHooks(timeoutInMs);
@@ -472,6 +469,9 @@ const zodIpc = new ZodIpcConnection({
       }
       await flushAll(timeoutInMs);
     },
+    FLUSH: async ({ timeoutInMs }) => {
+      await flushAll(timeoutInMs);
+    },
     RESOLVE_WAITPOINT: async ({ waitpoint }) => {
       sharedWorkerRuntime.resolveWaitpoints([waitpoint]);
     },