@opengsd/gsd-pi 1.5.0 → 1.6.0

package/src/resources/extensions/gsd/uat-dispatch.ts

@@ -0,0 +1,176 @@
+// Project/App: gsd-pi
+// File Purpose: Resolve whether a completed slice needs run-uat dispatch.
+
+import { loadFile } from "./files.js";
+import type { GSDPreferences } from "./preferences.js";
+import { resolveSliceFile } from "./paths.js";
+import {
+  classifyUatContentForRun,
+  shouldDispatchUatForContent,
+  type UatType,
+} from "./uat-policy.js";
+import { hasVerdict } from "./verdict-parser.js";
+import { logWarning } from "./workflow-logger.js";
+
+export interface UatDispatchCandidate {
+  sliceId: string;
+}
+
+export type RunUatDispatch = { sliceId: string; uatType: UatType };
+
+async function loadSliceFileContent(
+  base: string,
+  milestoneId: string,
+  sliceId: string,
+  kind: "UAT" | "ASSESSMENT" | "SUMMARY",
+): Promise<string> {
+  const filePath = resolveSliceFile(base, milestoneId, sliceId, kind);
+  return filePath ? ((await loadFile(filePath)) ?? "") : "";
+}
+
+async function resolveRunUatEffectiveType(
+  base: string,
+  milestoneId: string,
+  sliceId: string,
+  uatContent: string,
+): Promise<UatType> {
+  let summaryContent = "";
+  try {
+    summaryContent = await loadSliceFileContent(
+      base,
+      milestoneId,
+      sliceId,
+      "SUMMARY",
+    );
+  } catch (err) {
+    logWarning(
+      "prompt",
+      `resolveRunUatEffectiveType SUMMARY load failed: ${err instanceof Error ? err.message : String(err)}`,
+    );
+  }
+  return classifyUatContentForRun(uatContent, summaryContent).effectiveType;
+}
+
+async function resolveCandidateRunUatDispatch(
+  base: string,
+  milestoneId: string,
+  candidate: UatDispatchCandidate,
+  prefs: GSDPreferences | undefined,
+): Promise<RunUatDispatch | null> {
+  const uatContent = await loadSliceFileContent(
+    base,
+    milestoneId,
+    candidate.sliceId,
+    "UAT",
+  );
+  if (!uatContent) return null;
+  if (hasVerdict(uatContent)) return null;
+
+  const assessmentContent = await loadSliceFileContent(
+    base,
+    milestoneId,
+    candidate.sliceId,
+    "ASSESSMENT",
+  );
+  if (assessmentContent && hasVerdict(assessmentContent)) return null;
+  if (!shouldDispatchUatForContent(uatContent, prefs)) return null;
+
+  return {
+    sliceId: candidate.sliceId,
+    uatType: await resolveRunUatEffectiveType(
+      base,
+      milestoneId,
+      candidate.sliceId,
+      uatContent,
+    ),
+  };
+}
+
+async function getDbCompletedSliceCandidates(
+  milestoneId: string,
+): Promise<UatDispatchCandidate[] | null> {
+  const { isDbAvailable, getMilestoneSlices } = await import("./gsd-db.js");
+  if (!isDbAvailable()) return null;
+
+  const slices = getMilestoneSlices(milestoneId);
+  // No DB slice rows for this milestone: the DB has no authoritative view, so
+  // return null to let the caller defer to the roadmap fallback.
+  if (slices.length === 0) return null;
+
+  // The DB has slice rows and is therefore authoritative for this milestone.
+  // Return a (possibly empty) array rather than null: an empty result must NOT
+  // fall through to the roadmap fallback, because the DB, not stale roadmap
+  // checkboxes, is the source of truth for which slices are complete.
+  return slices
+    .filter((slice) => slice.status === "complete")
+    .map((slice) => ({ sliceId: slice.id }))
+    .reverse();
+}
+
+export async function findRunUatDispatchFromCandidates(
+  base: string,
+  milestoneId: string,
+  candidates: readonly UatDispatchCandidate[],
+  prefs: GSDPreferences | undefined,
+): Promise<RunUatDispatch | null> {
+  for (const candidate of candidates) {
+    const dispatch = await resolveCandidateRunUatDispatch(
+      base,
+      milestoneId,
+      candidate,
+      prefs,
+    );
+    if (dispatch) return dispatch;
+  }
+  return null;
+}
+
+/**
+ * Check if the most recently completed slice needs a UAT run.
+ * Returns { sliceId, uatType } if UAT should be dispatched, null otherwise.
+ *
+ * When the DB has slice rows for the milestone it is authoritative: only its
+ * completed slices are considered and the `fallbackCandidates` (roadmap-derived)
+ * are ignored, even when no DB slice is complete. The fallback candidates are
+ * only consulted when the DB has no slice rows for the milestone, is
+ * unavailable, or errors.
+ *
+ * Skips when:
+ * - No completed slices exist in DB or the caller-provided fallback candidates
+ * - uat_dispatch is not enabled and the UAT spec does not require runtime/browser evidence
+ * - No UAT file exists for the slice
+ * - UAT result already exists in the UAT or ASSESSMENT file
+ */
+export async function checkNeedsRunUat(
+  base: string,
+  milestoneId: string,
+  prefs: GSDPreferences | undefined,
+  fallbackCandidates: readonly UatDispatchCandidate[] = [],
+): Promise<RunUatDispatch | null> {
+  try {
+    const dbCandidates = await getDbCompletedSliceCandidates(milestoneId);
+    // A non-null result (including an empty array) means the DB is authoritative
+    // for this milestone; only fall through to the roadmap fallback when the DB
+    // has no slice rows at all (null).
+    if (dbCandidates !== null) {
+      return findRunUatDispatchFromCandidates(
+        base,
+        milestoneId,
+        dbCandidates,
+        prefs,
+      );
+    }
+  } catch (err) {
+    logWarning(
+      "prompt",
+      `checkNeedsRunUat DB lookup failed: ${err instanceof Error ? err.message : String(err)}`,
+    );
+  }
+
+  return findRunUatDispatchFromCandidates(
+    base,
+    milestoneId,
+    fallbackCandidates,
+    prefs,
+  );
+}

package/src/resources/extensions/gsd/unit-registry.ts

@@ -21,8 +21,8 @@
 // Not yet declared here (remaining ADR-033 steps): the manifest data
 // (`UNIT_MANIFESTS` stays in unit-context-manifest.ts, already type-enforced
 // against the registry's `UnitType`). Prompt-template association is declared
-// for direct one-template units; conditional/composite prompt selection stays
-// with the prompt builders until it has a richer registry shape.
+// for direct one-template units and verified conditional template sets;
+// composition logic stays with prompt builders.
 
 import type { CanonicalWorkflowToolName } from "@opengsd/contracts";
 import { BROWSER_CONTRACT_TOOL_NAMES } from "../shared/browser-contract.js";
@@ -68,6 +68,11 @@ export interface UnitDescriptor {
    * verified prompt associations.
    */
   readonly promptTemplate?: string;
+  /**
+   * Prompt template ids a conditional or composite builder may choose from.
+   * Omitted unless every listed association is verified against the builder.
+   */
+  readonly promptTemplates?: readonly string[];
   /** `null` = the unit has no scoped gsd-tool contract. */
   readonly toolContract: UnitToolSurfaceContract | null;
 }
@@ -137,6 +142,7 @@ export const UNIT_REGISTRY = {
     kind: "primary",
     scopeClass: "standard",
     phaseChain: ["discuss", "planning"],
+    promptTemplates: ["discuss", "discuss-headless", "guided-discuss-milestone"],
     toolContract: {
       allowedGsdTools: [
         "gsd_summary_save",
@@ -526,3 +532,11 @@ export function getUnitPhaseChain(unitType: string): readonly GSDModelPhaseKey[]
 export function getUnitPromptTemplate(unitType: string): string | undefined {
   return getUnitDescriptor(unitType)?.promptTemplate;
 }
+
+/** Prompt template ids for any verified direct or conditional prompt builder. */
+export function getUnitPromptTemplates(unitType: string): readonly string[] {
+  const descriptor = getUnitDescriptor(unitType);
+  if (!descriptor) return [];
+  if (descriptor.promptTemplates) return descriptor.promptTemplates;
+  return descriptor.promptTemplate ? [descriptor.promptTemplate] : [];
+}

package/src/resources/extensions/gsd/unmerged-milestone-guard.ts

@@ -9,7 +9,7 @@ import {
   nativeDiffNumstat,
   nativeIsAncestor,
 } from "./native-git-bridge.js";
-import { autoWorktreeBranch } from "./auto-worktree.js";
+import { autoWorktreeBranch } from "./auto-worktree-branch-lifecycle.js";
 import { ensureDbOpen } from "./bootstrap/dynamic-tools.js";
 import { getAllMilestones } from "./gsd-db.js";
 import { resolveMilestoneIntegrationBranch } from "./git-service.js";

package/src/resources/extensions/gsd/uok/audit-toggle.ts

@@ -1,9 +1,39 @@
 const AUDIT_ENV_KEY = "GSD_UOK_AUDIT_UNIFIED";
+const suppressedBasePaths = new Set<string>();
 
 export function setUnifiedAuditEnabled(enabled: boolean): void {
   process.env[AUDIT_ENV_KEY] = enabled ? "1" : "0";
 }
 
-export function isUnifiedAuditEnabled(): boolean {
-  return process.env[AUDIT_ENV_KEY] === "1";
+export function setUnifiedAuditSuppressedForBasePath(basePath: string, suppressed: boolean): void {
+  if (suppressed) {
+    suppressedBasePaths.add(basePath);
+    return;
+  }
+  suppressedBasePaths.delete(basePath);
+}
+
+export function isUnifiedAuditEnabled(basePath?: string): boolean {
+  if (basePath && suppressedBasePaths.has(basePath)) return false;
+  return process.env[AUDIT_ENV_KEY] !== "0";
+}
+
+export function getUnifiedAuditOverride(): boolean | undefined {
+  const raw = process.env[AUDIT_ENV_KEY];
+  if (raw === "0") return false;
+  if (raw === "1") return true;
+  return undefined;
+}
+
+export function restoreUnifiedAuditOverride(override: boolean | undefined): void {
+  if (override === undefined) {
+    delete process.env[AUDIT_ENV_KEY];
+    return;
+  }
+  setUnifiedAuditEnabled(override);
+}
+
+export function clearUnifiedAuditOverrideForTests(): void {
+  delete process.env[AUDIT_ENV_KEY];
+  suppressedBasePaths.clear();
 }

package/src/resources/extensions/gsd/uok/audit.ts

@@ -9,6 +9,7 @@ import { withFileLockSync } from "../file-lock.js";
 import { gsdRoot } from "../paths.js";
 import { isDbAvailable, insertAuditEvent } from "../gsd-db.js";
 import { CURRENT_UOK_CONTRACT_VERSION, validateAuditEvent, type AuditEventEnvelope } from "./contracts.js";
+import { isUnifiedAuditEnabled } from "./audit-toggle.js";
 
 function auditLogPath(basePath: string): string {
   return join(gsdRoot(basePath), "audit", "events.jsonl");
@@ -42,6 +43,7 @@ export function buildAuditEnvelope(args: {
 export function emitUokAuditEvent(basePath: string, event: AuditEventEnvelope): void {
   // Drop writes from a turn superseded by timeout recovery / cancellation.
   if (isStaleWrite("uok-audit")) return;
+  if (!isUnifiedAuditEnabled(basePath)) return;
   const validation = validateAuditEvent(event);
   if (!validation.ok) {
     throw new Error(`Invalid UOK audit event: ${validation.issues.map((issue) => `${issue.path}: ${issue.message}`).join("; ")}`);

package/src/resources/extensions/gsd/uok/gate-runner.ts

@@ -1,6 +1,7 @@
 import type { FailureClass, GateResult } from "./contracts.js";
 import { insertGateRun } from "../gsd-db.js";
 import { buildAuditEnvelope, emitUokAuditEvent } from "./audit.js";
+import { isUnifiedAuditEnabled } from "./audit-toggle.js";
 
 export interface GateRunnerContext {
   basePath: string;
@@ -38,6 +39,29 @@ const RETRY_MATRIX: Record<FailureClass, number> = {
   unknown: 0,
 };
 
+function emitGateAuditIfEnabled(ctx: GateRunnerContext, result: GateResult): void {
+  if (!isUnifiedAuditEnabled(ctx.basePath)) return;
+
+  emitUokAuditEvent(
+    ctx.basePath,
+    buildAuditEnvelope({
+      traceId: ctx.traceId,
+      turnId: ctx.turnId,
+      category: "gate",
+      type: "gate-run",
+      payload: {
+        gateId: result.gateId,
+        gateType: result.gateType,
+        outcome: result.outcome,
+        failureClass: result.failureClass,
+        attempt: result.attempt,
+        maxAttempts: result.maxAttempts,
+        retryable: result.retryable,
+      },
+    }),
+  );
+}
+
 export class UokGateRunner {
   private readonly registry = new Map<string, GateExecutionInput>();
 
@@ -85,24 +109,7 @@ export class UokGateRunner {
         evaluatedAt: unknownResult.evaluatedAt,
       });
 
-      emitUokAuditEvent(
-        ctx.basePath,
-        buildAuditEnvelope({
-          traceId: ctx.traceId,
-          turnId: ctx.turnId,
-          category: "gate",
-          type: "gate-run",
-          payload: {
-            gateId: unknownResult.gateId,
-            gateType: unknownResult.gateType,
-            outcome: unknownResult.outcome,
-            failureClass: unknownResult.failureClass,
-            attempt: unknownResult.attempt,
-            maxAttempts: unknownResult.maxAttempts,
-            retryable: unknownResult.retryable,
-          },
-        }),
-      );
+      emitGateAuditIfEnabled(ctx, unknownResult);
 
       return unknownResult;
     }
@@ -170,24 +177,7 @@ export class UokGateRunner {
         evaluatedAt: final.evaluatedAt,
       });
 
-      emitUokAuditEvent(
-        ctx.basePath,
-        buildAuditEnvelope({
-          traceId: ctx.traceId,
-          turnId: ctx.turnId,
-          category: "gate",
-          type: "gate-run",
-          payload: {
-            gateId: final.gateId,
-            gateType: final.gateType,
-            outcome: final.outcome,
-            failureClass: final.failureClass,
-            attempt: final.attempt,
-            maxAttempts: final.maxAttempts,
-            retryable: final.retryable,
-          },
-        }),
-      );
+      emitGateAuditIfEnabled(ctx, final);
 
       if (!retryable) break;
     }

package/src/resources/extensions/gsd/uok/gitops.ts

@@ -1,6 +1,7 @@
 import { isDbAvailable, upsertTurnGitTransaction } from "../gsd-db.js";
 import type { TurnCloseoutRecord } from "./contracts.js";
 import { buildAuditEnvelope, emitUokAuditEvent } from "./audit.js";
+import { isUnifiedAuditEnabled } from "./audit-toggle.js";
 
 export type TurnGitStage = "turn-start" | "stage" | "checkpoint" | "publish" | "record";
 
@@ -34,24 +35,26 @@ export function writeTurnGitTransaction(args: GitTxArgs): void {
     updatedAt: new Date().toISOString(),
   });
 
-  emitUokAuditEvent(
-    args.basePath,
-    buildAuditEnvelope({
-      traceId: args.traceId,
-      turnId: args.turnId,
-      category: "gitops",
-      type: `turn-git-${args.stage}`,
-      payload: {
-        unitType: args.unitType,
-        unitId: args.unitId,
-        action: args.action,
-        push: args.push,
-        status: args.status,
-        error: args.error,
-        ...(args.metadata ?? {}),
-      },
-    }),
-  );
+  if (isUnifiedAuditEnabled(args.basePath)) {
+    emitUokAuditEvent(
+      args.basePath,
+      buildAuditEnvelope({
+        traceId: args.traceId,
+        turnId: args.turnId,
+        category: "gitops",
+        type: `turn-git-${args.stage}`,
+        payload: {
+          unitType: args.unitType,
+          unitId: args.unitId,
+          action: args.action,
+          push: args.push,
+          status: args.status,
+          error: args.error,
+          ...(args.metadata ?? {}),
+        },
+      }),
+    );
+  }
 }
 
 export function writeTurnCloseoutGitRecord(

package/src/resources/extensions/gsd/uok/kernel.ts

@@ -8,10 +8,16 @@ import type { AutoSession } from "../auto/session.js";
 import type { LoopDeps } from "../auto/loop-deps.js";
 import { gsdRoot } from "../paths.js";
 import { buildAuditEnvelope, emitUokAuditEvent } from "./audit.js";
-import { setUnifiedAuditEnabled } from "./audit-toggle.js";
-import { resolveUokFlags } from "./flags.js";
+import {
+  getUnifiedAuditOverride,
+  restoreUnifiedAuditOverride,
+  setUnifiedAuditEnabled,
+  setUnifiedAuditSuppressedForBasePath,
+} from "./audit-toggle.js";
+import { resolveUokFlags, type UokFlags } from "./flags.js";
 import { createTurnObserver } from "./loop-adapter.js";
 import { incrementLegacyTelemetry } from "../legacy-telemetry.js";
+import { logWarning } from "../workflow-logger.js";
 
 interface RunAutoLoopWithUokArgs {
   ctx: ExtensionContext;
@@ -45,80 +51,195 @@ function writeParityEvent(basePath: string, event: Record<string, unknown>): voi
   }
 }
 
+type UokKernelPathLabel = "uok-kernel" | "legacy-wrapper" | "legacy-fallback";
+
+interface UokKernelRunPlan {
+  flags: UokFlags;
+  pathLabel: UokKernelPathLabel;
+  traceId: string;
+  useKernel: boolean;
+}
+
 function resolveKernelPathLabel(
-  flags: ReturnType<typeof resolveUokFlags>,
-): "uok-kernel" | "legacy-wrapper" | "legacy-fallback" {
+  flags: UokFlags,
+): UokKernelPathLabel {
   if (flags.legacyFallback) return "legacy-fallback";
   return flags.enabled ? "uok-kernel" : "legacy-wrapper";
 }
 
-export async function runAutoLoopWithUok(args: RunAutoLoopWithUokArgs): Promise<void> {
-  const { ctx, pi, s, deps, runKernelLoop, runLegacyLoop } = args;
-  const prefs = deps.loadEffectiveGSDPreferences()?.preferences;
-  const flags = resolveUokFlags(prefs);
-  setUnifiedAuditEnabled(flags.auditUnified);
+function createUokKernelRunPlan(input: {
+  preferences: ReturnType<LoopDeps["loadEffectiveGSDPreferences"]> | undefined;
+  autoStartTime?: unknown;
+}): UokKernelRunPlan {
+  const flags = resolveUokFlags(input.preferences?.preferences);
   const pathLabel = resolveKernelPathLabel(flags);
-  if (pathLabel !== "uok-kernel") {
-    incrementLegacyTelemetry("legacy.uokFallbackUsed");
-  }
-
-  writeParityEvent(s.basePath, {
-    ts: new Date().toISOString(),
-    path: pathLabel,
+  return {
     flags,
-    phase: "enter",
-  });
+    pathLabel,
+    traceId: `session:${String(input.autoStartTime || Date.now())}`,
+    useKernel: flags.enabled,
+  };
+}
+
+interface KernelAuditStateController {
+  apply(enabled: boolean): void;
+  restore(): void;
+}
+
+function createKernelAuditStateController(basePath: string): KernelAuditStateController {
+  const previousAuditOverride = getUnifiedAuditOverride();
+  return {
+    apply(enabled): void {
+      setUnifiedAuditSuppressedForBasePath(basePath, !enabled);
+      setUnifiedAuditEnabled(enabled);
+    },
+    restore(): void {
+      restoreUnifiedAuditOverride(previousAuditOverride);
+    },
+  };
+}
 
-  if (flags.auditUnified) {
+function emitKernelEnterAudit(input: {
+  basePath: string;
+  plan: UokKernelRunPlan;
+  sessionId?: string;
+}): boolean {
+  if (!input.plan.flags.auditUnified) return true;
+
+  try {
     emitUokAuditEvent(
-      s.basePath,
+      input.basePath,
       buildAuditEnvelope({
-        traceId: `session:${String(s.autoStartTime || Date.now())}`,
+        traceId: input.plan.traceId,
         category: "orchestration",
         type: "uok-kernel-enter",
         payload: {
-          flags,
-          sessionId: ctx.sessionManager?.getSessionId?.(),
+          flags: input.plan.flags,
+          sessionId: input.sessionId,
         },
       }),
     );
+    return true;
+  } catch (err) {
+    const errorMessage = err instanceof Error ? err.message : String(err);
+    writeParityEvent(input.basePath, {
+      ts: new Date().toISOString(),
+      path: input.plan.pathLabel,
+      flags: input.plan.flags,
+      phase: "telemetry-error",
+      telemetry: "uok-kernel-enter",
+      error: errorMessage,
+    });
+    logWarning("db", `uok-kernel-enter audit emit failed (non-fatal): ${errorMessage}`);
+    return false;
   }
+}
 
-  const decoratedDeps: LoopDeps = flags.enabled
-    ? {
-        ...deps,
-        uokObserver: createTurnObserver({
-          basePath: s.basePath,
-          gitAction: flags.gitopsTurnAction,
-          gitPush: flags.gitopsTurnPush,
-          enableAudit: flags.auditUnified,
-          enableGitops: flags.gitops,
-        }),
-      }
-    : deps;
+function decorateLoopDepsForKernel(input: {
+  deps: LoopDeps;
+  basePath: string;
+  plan: UokKernelRunPlan;
+  auditHealthy: boolean;
+}): LoopDeps {
+  if (!input.plan.useKernel) return input.deps;
+
+  return {
+    ...input.deps,
+    uokObserver: createTurnObserver({
+      basePath: input.basePath,
+      gitAction: input.plan.flags.gitopsTurnAction,
+      gitPush: input.plan.flags.gitopsTurnPush,
+      enableAudit: input.plan.flags.auditUnified && input.auditHealthy,
+      enableGitops: input.plan.flags.gitops,
+    }),
+  };
+}
+
+async function executeKernelRunPlan(input: {
+  plan: UokKernelRunPlan;
+  ctx: ExtensionContext;
+  pi: ExtensionAPI;
+  s: AutoSession;
+  deps: LoopDeps;
+  kernelDeps: LoopDeps;
+  runKernelLoop: RunAutoLoopWithUokArgs["runKernelLoop"];
+  runLegacyLoop: RunAutoLoopWithUokArgs["runLegacyLoop"];
+}): Promise<void> {
+  if (input.plan.useKernel) {
+    await input.runKernelLoop(input.ctx, input.pi, input.s, input.kernelDeps);
+    return;
+  }
+  await input.runLegacyLoop(input.ctx, input.pi, input.s, input.deps);
+}
+
+export async function runAutoLoopWithUok(args: RunAutoLoopWithUokArgs): Promise<void> {
+  const { ctx, pi, s, deps, runKernelLoop, runLegacyLoop } = args;
+  const auditState = createKernelAuditStateController(s.basePath);
+  let plan: UokKernelRunPlan | null = null;
 
   try {
-    if (flags.enabled) {
-      await runKernelLoop(ctx, pi, s, decoratedDeps);
-    } else {
-      await runLegacyLoop(ctx, pi, s, deps);
+    plan = createUokKernelRunPlan({
+      preferences: deps.loadEffectiveGSDPreferences(),
+      autoStartTime: s.autoStartTime,
+    });
+    auditState.apply(plan.flags.auditUnified);
+
+    if (plan.pathLabel !== "uok-kernel") {
+      incrementLegacyTelemetry("legacy.uokFallbackUsed");
     }
+
     writeParityEvent(s.basePath, {
       ts: new Date().toISOString(),
-      path: pathLabel,
-      flags,
-      phase: "exit",
-      status: "ok",
+      path: plan.pathLabel,
+      flags: plan.flags,
+      phase: "enter",
     });
-  } catch (err) {
+
+    const auditHealthy = emitKernelEnterAudit({
+      basePath: s.basePath,
+      plan,
+      sessionId: ctx.sessionManager?.getSessionId?.(),
+    });
+    auditState.apply(plan.flags.auditUnified && auditHealthy);
+
+    const kernelDeps = decorateLoopDepsForKernel({
+      deps,
+      basePath: s.basePath,
+      plan,
+      auditHealthy,
+    });
+
+    await executeKernelRunPlan({
+      plan,
+      ctx,
+      pi,
+      s,
+      deps,
+      kernelDeps,
+      runKernelLoop,
+      runLegacyLoop,
+    });
+
     writeParityEvent(s.basePath, {
       ts: new Date().toISOString(),
-      path: pathLabel,
-      flags,
+      path: plan.pathLabel,
+      flags: plan.flags,
       phase: "exit",
-      status: "error",
-      error: err instanceof Error ? err.message : String(err),
+      status: "ok",
     });
+  } catch (err) {
+    if (plan) {
+      writeParityEvent(s.basePath, {
+        ts: new Date().toISOString(),
+        path: plan.pathLabel,
+        flags: plan.flags,
+        phase: "exit",
+        status: "error",
+        error: err instanceof Error ? err.message : String(err),
+      });
+    }
     throw err;
+  } finally {
+    auditState.restore();
   }
 }