gsd-pi 2.33.1 → 2.34.0-dev.6769913

package/src/resources/extensions/bg-shell/index.ts

@@ -1,59 +1,54 @@
 /**
  * Background Shell Extension v2
  *
- * A next-generation background process manager designed for agentic workflows.
- * Provides intelligent process lifecycle management, structured output digests,
- * event-driven readiness detection, and context-efficient communication.
- *
- * Key capabilities:
- * - Multi-tier output: digest (30 tokens) → highlights → raw (full context)
- * - Readiness detection: port probing, pattern matching, auto-classification
- * - Process lifecycle events: starting → ready → error → exited
- * - Output diffing & dedup: detect novel errors vs. repeated noise
- * - Process groups: manage related processes as a unit
- * - Cross-session persistence: survive context resets
- * - Expect-style interactions: send_and_wait for interactive CLIs
- * - Context injection: proactive alerts for crashes and state changes
- *
- * Tools:
- *   bg_shell — start, output, digest, wait_for_ready, send, send_and_wait, run,
- *              signal, list, kill, restart, group_status
- *
- * Commands:
- *   /bg — interactive process manager overlay
+ * Command/tool registration is deferred in interactive mode so startup does not
+ * block on the full background-process stack before the TUI paints.
  */
 
-import type { ExtensionAPI, ExtensionContext } from "@gsd/pi-coding-agent";
-
-import { registerBgShellTool } from "./bg-shell-tool.js";
-import { registerBgShellCommand } from "./bg-shell-command.js";
+import { importExtensionModule, type ExtensionAPI, type ExtensionContext } from "@gsd/pi-coding-agent";
 import { registerBgShellLifecycle } from "./bg-shell-lifecycle.js";
 
-// ── Re-exports for consumers ───────────────────────────────────────────────
-
-export type { ProcessStatus, ProcessType, BgProcess, BgProcessInfo, OutputDigest, OutputLine, ProcessEvent } from "./types.js";
-export { processes, startProcess, killProcess, restartProcess, cleanupAll, cleanupSessionProcesses } from "./process-manager.js";
-export { generateDigest, getHighlights, getOutput, formatDigestText } from "./output-formatter.js";
-export { waitForReady, probePort } from "./readiness-detector.js";
-export { sendAndWait, runOnSession, queryShellEnv } from "./interaction.js";
-export { BgManagerOverlay } from "./overlay.js";
-
-// ── Shared State ────────────────────────────────────────────────────────────
-
 export interface BgShellSharedState {
-	latestCtx: ExtensionContext | null;
-	refreshWidget: () => void;
+  latestCtx: ExtensionContext | null;
+  refreshWidget: () => void;
 }
 
-// ── Extension Entry Point ──────────────────────────────────────────────────
+let featuresPromise: Promise<void> | null = null;
+
+async function registerBgShellFeatures(pi: ExtensionAPI, state: BgShellSharedState): Promise<void> {
+  if (!featuresPromise) {
+    featuresPromise = (async () => {
+      const [{ registerBgShellTool }, { registerBgShellCommand }] = await Promise.all([
+        importExtensionModule<typeof import("./bg-shell-tool.js")>(import.meta.url, "./bg-shell-tool.js"),
+        importExtensionModule<typeof import("./bg-shell-command.js")>(import.meta.url, "./bg-shell-command.js"),
+      ]);
+      registerBgShellTool(pi, state);
+      registerBgShellCommand(pi, state);
+    })().catch((error) => {
+      featuresPromise = null;
+      throw error;
+    });
+  }
+
+  return featuresPromise;
+}
 
 export default function (pi: ExtensionAPI) {
-	const state: BgShellSharedState = {
-		latestCtx: null,
-		refreshWidget: () => {},
-	};
-
-	registerBgShellLifecycle(pi, state);
-	registerBgShellTool(pi, state);
-	registerBgShellCommand(pi, state);
+  const state: BgShellSharedState = {
+    latestCtx: null,
+    refreshWidget: () => {},
+  };
+
+  registerBgShellLifecycle(pi, state);
+
+  pi.on("session_start", async (_event, ctx) => {
+    if (ctx.hasUI) {
+      void registerBgShellFeatures(pi, state).catch((error) => {
+        ctx.ui.notify(`bg-shell failed to load: ${error instanceof Error ? error.message : String(error)}`, "warning");
+      });
+      return;
+    }
+
+    await registerBgShellFeatures(pi, state);
+  });
 }

package/src/resources/extensions/browser-tools/index.ts

@@ -1,71 +1,160 @@
 /** browser-tools — pi extension: full browser interaction via Playwright. */
-import type { ExtensionAPI } from "@gsd/pi-coding-agent";
-import type { ToolDeps } from "./state.js";
-import { ensureBrowser, closeBrowser, getActivePage, getActiveTarget, getActivePageOrNull, attachPageListeners } from "./lifecycle.js";
-import { captureCompactPageState, postActionSummary, constrainScreenshot, captureErrorScreenshot } from "./capture.js";
-import { settleAfterActionAdaptive, ensureMutationCounter } from "./settle.js";
-import { buildRefSnapshot, resolveRefTarget } from "./refs.js";
-import * as u from "./utils.js";
-import { registerNavigationTools } from "./tools/navigation.js";
-import { registerScreenshotTools } from "./tools/screenshot.js";
-import { registerInteractionTools } from "./tools/interaction.js";
-import { registerInspectionTools } from "./tools/inspection.js";
-import { registerSessionTools } from "./tools/session.js";
-import { registerAssertionTools } from "./tools/assertions.js";
-import { registerRefTools } from "./tools/refs.js";
-import { registerWaitTools } from "./tools/wait.js";
-import { registerPageTools } from "./tools/pages.js";
-import { registerFormTools } from "./tools/forms.js";
-import { registerIntentTools } from "./tools/intent.js";
-import { registerPdfTools } from "./tools/pdf.js";
-import { registerStatePersistenceTools } from "./tools/state-persistence.js";
-import { registerNetworkMockTools } from "./tools/network-mock.js";
-import { registerDeviceTools } from "./tools/device.js";
-import { registerExtractTools } from "./tools/extract.js";
-import { registerVisualDiffTools } from "./tools/visual-diff.js";
-import { registerZoomTools } from "./tools/zoom.js";
-import { registerCodegenTools } from "./tools/codegen.js";
-import { registerActionCacheTools } from "./tools/action-cache.js";
-import { registerInjectionDetectionTools } from "./tools/injection-detect.js";
+import { importExtensionModule, type ExtensionAPI } from "@gsd/pi-coding-agent";
+
+let registrationPromise: Promise<void> | null = null;
+
+async function registerBrowserTools(pi: ExtensionAPI): Promise<void> {
+  if (!registrationPromise) {
+    registrationPromise = (async () => {
+      const [
+        lifecycle,
+        capture,
+        settle,
+        refs,
+        utils,
+        navigation,
+        screenshot,
+        interaction,
+        inspection,
+        session,
+        assertions,
+        refTools,
+        wait,
+        pages,
+        forms,
+        intent,
+        pdf,
+        statePersistence,
+        networkMock,
+        device,
+        extract,
+        visualDiff,
+        zoom,
+        codegen,
+        actionCache,
+        injectionDetection,
+      ] = await Promise.all([
+        importExtensionModule<typeof import("./lifecycle.js")>(import.meta.url, "./lifecycle.js"),
+        importExtensionModule<typeof import("./capture.js")>(import.meta.url, "./capture.js"),
+        importExtensionModule<typeof import("./settle.js")>(import.meta.url, "./settle.js"),
+        importExtensionModule<typeof import("./refs.js")>(import.meta.url, "./refs.js"),
+        importExtensionModule<typeof import("./utils.js")>(import.meta.url, "./utils.js"),
+        importExtensionModule<typeof import("./tools/navigation.js")>(import.meta.url, "./tools/navigation.js"),
+        importExtensionModule<typeof import("./tools/screenshot.js")>(import.meta.url, "./tools/screenshot.js"),
+        importExtensionModule<typeof import("./tools/interaction.js")>(import.meta.url, "./tools/interaction.js"),
+        importExtensionModule<typeof import("./tools/inspection.js")>(import.meta.url, "./tools/inspection.js"),
+        importExtensionModule<typeof import("./tools/session.js")>(import.meta.url, "./tools/session.js"),
+        importExtensionModule<typeof import("./tools/assertions.js")>(import.meta.url, "./tools/assertions.js"),
+        importExtensionModule<typeof import("./tools/refs.js")>(import.meta.url, "./tools/refs.js"),
+        importExtensionModule<typeof import("./tools/wait.js")>(import.meta.url, "./tools/wait.js"),
+        importExtensionModule<typeof import("./tools/pages.js")>(import.meta.url, "./tools/pages.js"),
+        importExtensionModule<typeof import("./tools/forms.js")>(import.meta.url, "./tools/forms.js"),
+        importExtensionModule<typeof import("./tools/intent.js")>(import.meta.url, "./tools/intent.js"),
+        importExtensionModule<typeof import("./tools/pdf.js")>(import.meta.url, "./tools/pdf.js"),
+        importExtensionModule<typeof import("./tools/state-persistence.js")>(import.meta.url, "./tools/state-persistence.js"),
+        importExtensionModule<typeof import("./tools/network-mock.js")>(import.meta.url, "./tools/network-mock.js"),
+        importExtensionModule<typeof import("./tools/device.js")>(import.meta.url, "./tools/device.js"),
+        importExtensionModule<typeof import("./tools/extract.js")>(import.meta.url, "./tools/extract.js"),
+        importExtensionModule<typeof import("./tools/visual-diff.js")>(import.meta.url, "./tools/visual-diff.js"),
+        importExtensionModule<typeof import("./tools/zoom.js")>(import.meta.url, "./tools/zoom.js"),
+        importExtensionModule<typeof import("./tools/codegen.js")>(import.meta.url, "./tools/codegen.js"),
+        importExtensionModule<typeof import("./tools/action-cache.js")>(import.meta.url, "./tools/action-cache.js"),
+        importExtensionModule<typeof import("./tools/injection-detect.js")>(import.meta.url, "./tools/injection-detect.js"),
+      ]);
+
+      const deps = {
+        ensureBrowser: lifecycle.ensureBrowser,
+        closeBrowser: lifecycle.closeBrowser,
+        getActivePage: lifecycle.getActivePage,
+        getActiveTarget: lifecycle.getActiveTarget,
+        getActivePageOrNull: lifecycle.getActivePageOrNull,
+        attachPageListeners: lifecycle.attachPageListeners,
+        captureCompactPageState: capture.captureCompactPageState,
+        postActionSummary: capture.postActionSummary,
+        constrainScreenshot: capture.constrainScreenshot,
+        captureErrorScreenshot: capture.captureErrorScreenshot,
+        formatCompactStateSummary: utils.formatCompactStateSummary,
+        getRecentErrors: utils.getRecentErrors,
+        settleAfterActionAdaptive: settle.settleAfterActionAdaptive,
+        ensureMutationCounter: settle.ensureMutationCounter,
+        buildRefSnapshot: refs.buildRefSnapshot,
+        resolveRefTarget: refs.resolveRefTarget,
+        parseRef: utils.parseRef,
+        formatVersionedRef: utils.formatVersionedRef,
+        staleRefGuidance: utils.staleRefGuidance,
+        beginTrackedAction: utils.beginTrackedAction,
+        finishTrackedAction: utils.finishTrackedAction,
+        truncateText: utils.truncateText,
+        verificationFromChecks: utils.verificationFromChecks,
+        verificationLine: utils.verificationLine,
+        collectAssertionState: (page: any, checks: any, target?: any) =>
+          utils.collectAssertionState(page, checks, capture.captureCompactPageState, target),
+        formatAssertionText: utils.formatAssertionText,
+        formatDiffText: utils.formatDiffText,
+        getUrlHash: utils.getUrlHash,
+        captureClickTargetState: utils.captureClickTargetState,
+        readInputLikeValue: utils.readInputLikeValue,
+        firstErrorLine: utils.firstErrorLine,
+        captureAccessibilityMarkdown: (selector?: string) =>
+          utils.captureAccessibilityMarkdown(lifecycle.getActiveTarget(), selector),
+        resolveAccessibilityScope: utils.resolveAccessibilityScope,
+        getLivePagesSnapshot: utils.createGetLivePagesSnapshot(lifecycle.ensureBrowser),
+        getSinceTimestamp: utils.getSinceTimestamp,
+        getConsoleEntriesSince: utils.getConsoleEntriesSince,
+        getNetworkEntriesSince: utils.getNetworkEntriesSince,
+        writeArtifactFile: utils.writeArtifactFile,
+        copyArtifactFile: utils.copyArtifactFile,
+        ensureSessionArtifactDir: utils.ensureSessionArtifactDir,
+        buildSessionArtifactPath: utils.buildSessionArtifactPath,
+        getSessionArtifactMetadata: utils.getSessionArtifactMetadata,
+        sanitizeArtifactName: utils.sanitizeArtifactName,
+        formatArtifactTimestamp: utils.formatArtifactTimestamp,
+      };
+
+      navigation.registerNavigationTools(pi, deps);
+      screenshot.registerScreenshotTools(pi, deps);
+      interaction.registerInteractionTools(pi, deps);
+      inspection.registerInspectionTools(pi, deps);
+      session.registerSessionTools(pi, deps);
+      assertions.registerAssertionTools(pi, deps);
+      refTools.registerRefTools(pi, deps);
+      wait.registerWaitTools(pi, deps);
+      pages.registerPageTools(pi, deps);
+      forms.registerFormTools(pi, deps);
+      intent.registerIntentTools(pi, deps);
+      pdf.registerPdfTools(pi, deps);
+      statePersistence.registerStatePersistenceTools(pi, deps);
+      networkMock.registerNetworkMockTools(pi, deps);
+      device.registerDeviceTools(pi, deps);
+      extract.registerExtractTools(pi, deps);
+      visualDiff.registerVisualDiffTools(pi, deps);
+      zoom.registerZoomTools(pi, deps);
+      codegen.registerCodegenTools(pi, deps);
+      actionCache.registerActionCacheTools(pi, deps);
+      injectionDetection.registerInjectionDetectionTools(pi, deps);
+    })().catch((error) => {
+      registrationPromise = null;
+      throw error;
+    });
+  }
+
+  return registrationPromise;
+}
 
 export default function (pi: ExtensionAPI) {
-	pi.on("session_shutdown", async () => { await closeBrowser(); });
-	const deps: ToolDeps = {
-		ensureBrowser, closeBrowser, getActivePage, getActiveTarget, getActivePageOrNull, attachPageListeners,
-		captureCompactPageState, postActionSummary, constrainScreenshot, captureErrorScreenshot,
-		formatCompactStateSummary: u.formatCompactStateSummary, getRecentErrors: u.getRecentErrors,
-		settleAfterActionAdaptive, ensureMutationCounter, buildRefSnapshot, resolveRefTarget,
-		parseRef: u.parseRef, formatVersionedRef: u.formatVersionedRef, staleRefGuidance: u.staleRefGuidance,
-		beginTrackedAction: u.beginTrackedAction, finishTrackedAction: u.finishTrackedAction,
-		truncateText: u.truncateText, verificationFromChecks: u.verificationFromChecks,
-		verificationLine: u.verificationLine, collectAssertionState: (p, checks, target?) => u.collectAssertionState(p, checks, captureCompactPageState, target),
-		formatAssertionText: u.formatAssertionText, formatDiffText: u.formatDiffText,
-		getUrlHash: u.getUrlHash,
-		captureClickTargetState: u.captureClickTargetState, readInputLikeValue: u.readInputLikeValue,
-		firstErrorLine: u.firstErrorLine, captureAccessibilityMarkdown: (selector?) => u.captureAccessibilityMarkdown(getActiveTarget(), selector),
-		resolveAccessibilityScope: u.resolveAccessibilityScope,
-		getLivePagesSnapshot: u.createGetLivePagesSnapshot(ensureBrowser),
-		getSinceTimestamp: u.getSinceTimestamp, getConsoleEntriesSince: u.getConsoleEntriesSince,
-		getNetworkEntriesSince: u.getNetworkEntriesSince, writeArtifactFile: u.writeArtifactFile,
-		copyArtifactFile: u.copyArtifactFile, ensureSessionArtifactDir: u.ensureSessionArtifactDir,
-		buildSessionArtifactPath: u.buildSessionArtifactPath, getSessionArtifactMetadata: u.getSessionArtifactMetadata,
-		sanitizeArtifactName: u.sanitizeArtifactName, formatArtifactTimestamp: u.formatArtifactTimestamp,
-	};
-	registerNavigationTools(pi, deps);  registerScreenshotTools(pi, deps);
-	registerInteractionTools(pi, deps); registerInspectionTools(pi, deps);
-	registerSessionTools(pi, deps);     registerAssertionTools(pi, deps);
-	registerRefTools(pi, deps);         registerWaitTools(pi, deps);
-	registerPageTools(pi, deps);
-	registerFormTools(pi, deps);
-	registerIntentTools(pi, deps);
-	registerPdfTools(pi, deps);
-	registerStatePersistenceTools(pi, deps);
-	registerNetworkMockTools(pi, deps);
-	registerDeviceTools(pi, deps);
-	registerExtractTools(pi, deps);
-	registerVisualDiffTools(pi, deps);
-	registerZoomTools(pi, deps);
-	registerCodegenTools(pi, deps);
-	registerActionCacheTools(pi, deps);
-	registerInjectionDetectionTools(pi, deps);
+  pi.on("session_start", async (_event, ctx) => {
+    if (ctx.hasUI) {
+      void registerBrowserTools(pi).catch((error) => {
+        ctx.ui.notify(`browser-tools failed to load: ${error instanceof Error ? error.message : String(error)}`, "warning");
+      });
+      return;
+    }
+
+    await registerBrowserTools(pi);
+  });
+
+  pi.on("session_shutdown", async () => {
+    const { closeBrowser } = await importExtensionModule<typeof import("./lifecycle.js")>(import.meta.url, "./lifecycle.js");
+    await closeBrowser();
+  });
 }

package/src/resources/extensions/gsd/auto/session.ts

@@ -52,16 +52,28 @@ export interface PendingVerificationRetry {
   attempt: number;
 }
 
+/**
+ * A typed item enqueued by postUnitPostVerification for the main loop to
+ * drain via the standard runUnit path. Replaces inline dispatch
+ * (pi.sendMessage / s.cmdCtx.newSession()) for hooks, triage, and quick-tasks.
+ */
+export interface SidecarItem {
+  kind: "hook" | "triage" | "quick-task";
+  unitType: string;
+  unitId: string;
+  prompt: string;
+  /** Model override for hook units (e.g. "anthropic/claude-3-5-sonnet"). */
+  model?: string;
+  /** Capture ID for quick-task items (already marked executed at enqueue time). */
+  captureId?: string;
+}
+
 // ─── Constants ───────────────────────────────────────────────────────────────
 
 export const MAX_UNIT_DISPATCHES = 3;
 export const STUB_RECOVERY_THRESHOLD = 2;
 export const MAX_LIFETIME_DISPATCHES = 6;
-export const MAX_CONSECUTIVE_SKIPS = 3;
-export const DISPATCH_GAP_TIMEOUT_MS = 5_000;
-export const MAX_SKIP_DEPTH = 20;
 export const NEW_SESSION_TIMEOUT_MS = 30_000;
-export const DISPATCH_HANG_TIMEOUT_MS = 60_000;
 
 // ─── AutoSession ─────────────────────────────────────────────────────────────
 
@@ -69,7 +81,6 @@ export class AutoSession {
   // ── Lifecycle ────────────────────────────────────────────────────────────
   active = false;
   paused = false;
-  pausedForSecrets = false;
   stepMode = false;
   verbose = false;
   cmdCtx: ExtensionCommandContext | null = null;
@@ -83,15 +94,12 @@ export class AutoSession {
   readonly unitDispatchCount = new Map<string, number>();
   readonly unitLifetimeDispatches = new Map<string, number>();
   readonly unitRecoveryCount = new Map<string, number>();
-  readonly unitConsecutiveSkips = new Map<string, number>();
-  readonly completedKeySet = new Set<string>();
 
   // ── Timers ───────────────────────────────────────────────────────────────
   unitTimeoutHandle: ReturnType<typeof setTimeout> | null = null;
   wrapupWarningHandle: ReturnType<typeof setTimeout> | null = null;
   idleWatchdogHandle: ReturnType<typeof setInterval> | null = null;
   continueHereHandle: ReturnType<typeof setInterval> | null = null;
-  dispatchGapHandle: ReturnType<typeof setTimeout> | null = null;
 
   // ── Current unit ─────────────────────────────────────────────────────────
   currentUnit: CurrentUnit | null = null;
@@ -113,12 +121,8 @@ export class AutoSession {
   resourceVersionOnStart: string | null = null;
   lastStateRebuildAt = 0;
 
-  // ── Guards ───────────────────────────────────────────────────────────────
-  handlingAgentEnd = false;
-  pendingAgentEndRetry = false;
-  dispatching = false;
-  skipDepth = 0;
-  readonly recentlyEvictedKeys = new Set<string>();
+  // ── Sidecar queue ─────────────────────────────────────────────────────
+  sidecarQueue: SidecarItem[] = [];
 
   // ── Metrics ──────────────────────────────────────────────────────────────
   autoStartTime = 0;
@@ -129,6 +133,29 @@ export class AutoSession {
   // ── Signal handler ───────────────────────────────────────────────────────
   sigtermHandler: (() => void) | null = null;
 
+  // ── Loop promise state ──────────────────────────────────────────────────
+  /**
+   * True only while runUnit is rotating into a fresh session. agent_end events
+   * emitted from the previous session's abort during this window must be
+   * ignored; they do not belong to the new unit.
+   */
+  sessionSwitchInFlight = false;
+
+  /**
+   * One-shot resolver for the current unit's agent_end promise.
+   * Non-null only while a unit is in-flight (between sendMessage and agent_end).
+   * Scoped to the session to prevent concurrent session corruption.
+   */
+  pendingResolve: ((result: { status: "completed" | "cancelled" | "error"; event?: { messages: unknown[] } }) => void) | null = null;
+
+  /**
+   * Queue for agent_end events that arrive when no pendingResolve exists.
+   * This happens when error-recovery sendMessage retries produce agent_end
+   * events between loop iterations. The next runUnit drains this queue
+   * instead of waiting for a new event.
+   */
+  pendingAgentEndQueue: Array<{ messages: unknown[] }> = [];
+
   // ── Methods ──────────────────────────────────────────────────────────────
 
   clearTimers(): void {
@@ -136,13 +163,11 @@ export class AutoSession {
     if (this.wrapupWarningHandle) { clearTimeout(this.wrapupWarningHandle); this.wrapupWarningHandle = null; }
     if (this.idleWatchdogHandle) { clearInterval(this.idleWatchdogHandle); this.idleWatchdogHandle = null; }
     if (this.continueHereHandle) { clearInterval(this.continueHereHandle); this.continueHereHandle = null; }
-    if (this.dispatchGapHandle) { clearTimeout(this.dispatchGapHandle); this.dispatchGapHandle = null; }
   }
 
   resetDispatchCounters(): void {
     this.unitDispatchCount.clear();
     this.unitLifetimeDispatches.clear();
-    this.unitConsecutiveSkips.clear();
   }
 
   get lockBasePath(): string {
@@ -163,7 +188,6 @@ export class AutoSession {
     // Lifecycle
     this.active = false;
     this.paused = false;
-    this.pausedForSecrets = false;
     this.stepMode = false;
     this.verbose = false;
     this.cmdCtx = null;
@@ -177,9 +201,6 @@ export class AutoSession {
     this.unitDispatchCount.clear();
     this.unitLifetimeDispatches.clear();
     this.unitRecoveryCount.clear();
-    this.unitConsecutiveSkips.clear();
-    // Note: completedKeySet is intentionally NOT cleared — it persists
-    // across restarts to prevent re-dispatching completed units.
 
     // Unit
     this.currentUnit = null;
@@ -201,21 +222,20 @@ export class AutoSession {
     this.resourceVersionOnStart = null;
     this.lastStateRebuildAt = 0;
 
-    // Guards
-    this.handlingAgentEnd = false;
-    this.pendingAgentEndRetry = false;
-    this.dispatching = false;
-    this.skipDepth = 0;
-    this.recentlyEvictedKeys.clear();
-
     // Metrics
     this.autoStartTime = 0;
     this.lastPromptCharCount = undefined;
     this.lastBaselineCharCount = undefined;
     this.pendingQuickTasks = [];
+    this.sidecarQueue = [];
 
     // Signal handler
     this.sigtermHandler = null;
+
+    // Loop promise state
+    this.sessionSwitchInFlight = false;
+    this.pendingResolve = null;
+    this.pendingAgentEndQueue = [];
   }
 
   toJSON(): Record<string, unknown> {
@@ -227,10 +247,7 @@ export class AutoSession {
       currentMilestoneId: this.currentMilestoneId,
       currentUnit: this.currentUnit,
       completedUnits: this.completedUnits.length,
-      completedKeySet: this.completedKeySet.size,
       unitDispatchCount: Object.fromEntries(this.unitDispatchCount),
-      dispatching: this.dispatching,
-      skipDepth: this.skipDepth,
     };
   }
 }