@runfusion/fusion 0.75.1-beta.1 → 0.75.1-beta.2

package/dist/bin.js

@@ -1183,6 +1183,9 @@ function isFusionSiblingBranch(branch) {
 function resolveEffectiveAutoMerge(task, settings) {
   return task.autoMerge ?? settings.autoMerge;
 }
+function hasUserAutoMergeHold(task) {
+  return task.autoMerge === false && task.autoMergeProvenance === "user";
+}
 function allowsAutoMergeProcessing(task, settings) {
   return (settings.autoMerge !== false || task.autoMerge === true) && !taskHasManualOpenPullRequest(task);
 }
@@ -63423,7 +63426,7 @@ function rowToTask(row) {
     executionStartBranch: row.executionStartBranch || void 0,
     branch: row.branch || void 0,
     autoMerge: row.autoMerge === null ? void 0 : row.autoMerge === 1,
-    autoMergeProvenance: row.autoMergeProvenance === "user" || row.autoMergeProvenance === "legacy-stamp" ? row.autoMergeProvenance : void 0,
+    autoMergeProvenance: row.autoMergeProvenance === "user" || row.autoMergeProvenance === "mission" || row.autoMergeProvenance === "legacy-stamp" ? row.autoMergeProvenance : void 0,
     baseCommitSha: row.baseCommitSha || void 0,
     scopeOverride: row.scopeOverride ? true : void 0,
     scopeOverrideReason: row.scopeOverrideReason || void 0,
@@ -72939,10 +72942,10 @@ ${feature.acceptanceCriteria}`);
               Apply the selected Missions header workflow atomically during TaskStore.createTask so newly triaged features land in the intended workflow lane. Duplicate-guard reuses skip this create path, preserving existing duplicate tasks without workflow mutation.
               */
               /*
-              FNXC:MissionAutoMerge 2026-07-18-12:00:
-              An autoMerge:false mission stamps each newly triaged task so its shared branch produces one PR instead of per-task auto-merges. Duplicate reuse intentionally bypasses this create-only override.
+              FNXC:MissionAutoMerge 2026-08-05-22:50:
+              An autoMerge:false mission stamps each newly triaged task as mission policy so its shared branch produces one PR instead of per-task auto-merges. Duplicate reuse intentionally bypasses this create-only override; policy must not impersonate an operator manual-hold choice.
               */
-              ...mission?.autoMerge === false ? { autoMerge: false } : {},
+              ...mission?.autoMerge === false ? { autoMerge: false, autoMergeProvenance: "mission" } : {},
               // FNXC:MissionTaskPrefix 2026-07-26-12:00: thread the mission's optional taskPrefix into TaskCreateInput for distributed id minting.
               ...mission?.taskPrefix ? { taskPrefix: mission.taskPrefix } : {},
               ...branchOptions?.workflowId !== void 0 ? { workflowId: branchOptions.workflowId } : {}
@@ -76120,10 +76123,10 @@ ${feature.acceptanceCriteria}`);
                 }
               } : {},
               /*
-              FNXC:MissionAutoMerge 2026-07-18-12:00:
-              An autoMerge:false mission stamps each newly triaged task so its shared branch produces one PR instead of per-task auto-merges. Duplicate reuse intentionally bypasses this create-only override.
+              FNXC:MissionAutoMerge 2026-08-05-22:50:
+              An autoMerge:false mission stamps each newly triaged task as mission policy so its shared branch produces one PR instead of per-task auto-merges. Duplicate reuse intentionally bypasses this create-only override; policy must not impersonate an operator manual-hold choice.
               */
-              ...mission?.autoMerge === false ? { autoMerge: false } : {},
+              ...mission?.autoMerge === false ? { autoMerge: false, autoMergeProvenance: "mission" } : {},
               // FNXC:MissionTaskPrefix 2026-07-26-12:00: thread the mission's optional taskPrefix into TaskCreateInput so the distributed allocator mints ERR-N (etc.) instead of the project prefix.
               ...mission?.taskPrefix ? { taskPrefix: mission.taskPrefix } : {},
               ...branchOptions?.workflowId !== void 0 ? { workflowId: branchOptions.workflowId } : {}
@@ -86474,7 +86477,9 @@ async function _createTaskInternalBackendImpl(store, input, title2, resolvedWork
     sourceMetadata: withTaskBranchContextInSourceMetadata(input.source?.sourceMetadata, input.branchContext),
     branchContext: input.branchContext,
     autoMerge: input.autoMerge,
-    autoMergeProvenance: input.autoMerge === void 0 ? void 0 : "user",
+    // FNXC:SharedBranchMemberHold 2026-08-05-22:50: trusted mission creation
+    // preserves policy provenance; operator/API create requests retain user provenance.
+    autoMergeProvenance: input.autoMerge === void 0 ? void 0 : input.autoMergeProvenance ?? "user",
     // FNXC:CodingIdeasWorkflow 2026-07-05-19:45: land the task in its
     // workflow's manual intake column (e.g. Coding (Ideas) → "ideas") when
     // no explicit column is given (main FN-7591 parity).
@@ -127352,6 +127357,7 @@ var init_task_timing = __esm({
 });
 
 // ../core/src/session-identity-registry.ts
+import { AsyncLocalStorage } from "node:async_hooks";
 import { resolve as resolve21 } from "node:path";
 import { realpathSync as realpathSync5 } from "node:fs";
 function getRegistry() {
@@ -127363,6 +127369,16 @@ function getRegistry() {
   }
   return registry3;
 }
+function getActiveInvocationStorage() {
+  const holder = globalThis;
+  const existing = holder[ACTIVE_INVOCATION_KEY];
+  if (existing instanceof AsyncLocalStorage) {
+    return existing;
+  }
+  const storage = new AsyncLocalStorage();
+  holder[ACTIVE_INVOCATION_KEY] = storage;
+  return storage;
+}
 function canonicalizeCwd(cwd) {
   const resolved = resolve21(cwd);
   try {
@@ -127390,8 +127406,13 @@ function registerFusionSessionIdentity(cwd, identity) {
   };
 }
 function resolveFusionSessionPrincipal(cwd) {
+  const canonicalCwd = canonicalizeCwd(cwd);
+  const activeInvocation = getActiveInvocationStorage().getStore();
+  if (activeInvocation?.cwdKeys.has(canonicalCwd)) {
+    return { kind: "agent", identity: activeInvocation.identity };
+  }
   const registry3 = getRegistry();
-  const list = registry3.get(canonicalizeCwd(cwd));
+  const list = registry3.get(canonicalCwd);
   if (!list || list.length === 0) {
     return { kind: "operator" };
   }
@@ -127400,14 +127421,24 @@ function resolveFusionSessionPrincipal(cwd) {
   }
   return { kind: "ambiguous", identities: [...list] };
 }
+function runWithFusionSessionIdentity(cwdKeys, identity, callback) {
+  const invocation = {
+    identity: { ...identity, registeredAt: Date.now() },
+    cwdKeys: new Set(cwdKeys.map(canonicalizeCwd))
+  };
+  return getActiveInvocationStorage().run(invocation, callback);
+}
 function __clearFusionSessionIdentityRegistryForTests() {
-  globalThis[REGISTRY_KEY] = /* @__PURE__ */ new Map();
+  const holder = globalThis;
+  holder[REGISTRY_KEY] = /* @__PURE__ */ new Map();
+  holder[ACTIVE_INVOCATION_KEY] = new AsyncLocalStorage();
 }
-var REGISTRY_KEY;
+var REGISTRY_KEY, ACTIVE_INVOCATION_KEY;
 var init_session_identity_registry = __esm({
   "../core/src/session-identity-registry.ts"() {
     "use strict";
     REGISTRY_KEY = "__FUSION_SESSION_IDENTITY_REGISTRY_V1__";
+    ACTIVE_INVOCATION_KEY = "__FUSION_SESSION_IDENTITY_ACTIVE_INVOCATION_V1__";
   }
 });
 
@@ -128378,6 +128409,7 @@ __export(src_exports, {
   hasRoleOverrides: () => hasRoleOverrides,
   hasSyncPassphraseConfigured: () => hasSyncPassphraseConfigured,
   hasTitleIdDrift: () => hasTitleIdDrift,
+  hasUserAutoMergeHold: () => hasUserAutoMergeHold,
   hashWorkflowIr: () => hashWorkflowIr,
   healSchemaDrift: () => healSchemaDrift,
   importMcpServersJson: () => importMcpServersJson,
@@ -128838,6 +128870,7 @@ __export(src_exports, {
   runMemoryBackupCommand: () => runMemoryBackupCommand,
   runReconciliationAbort: () => runReconciliationAbort,
   runScheduledEvalBatch: () => runScheduledEvalBatch,
+  runWithFusionSessionIdentity: () => runWithFusionSessionIdentity,
   sanitizeBranchSegment: () => sanitizeBranchSegment,
   sanitizeCliAgentSettings: () => sanitizeCliAgentSettings,
   sanitizeCliAgentsSettings: () => sanitizeCliAgentsSettings,
@@ -158229,6 +158262,7 @@ import { existsSync as existsSync43, readFileSync as readFileSync15, realpathSyn
 import { exec as exec2, execFile as execFile7 } from "node:child_process";
 import { promisify as promisify6 } from "node:util";
 import { createRequire as createRequire5 } from "node:module";
+import { randomUUID as randomUUID43 } from "node:crypto";
 import { basename as basename13, dirname as dirname21, join as join56, relative as relative6, isAbsolute as isAbsolute8, resolve as resolve24 } from "node:path";
 import {
   createAgentSession,
@@ -159939,7 +159973,8 @@ async function createFnAgent2(options) {
     });
   };
   const sessionIdentity = (() => {
-    const principalAgentId = options.actionGateContext?.agentId ?? options.permanentAgentGating?.requester?.actorId ?? "engine-session";
+    const namedAgentId = options.actionGateContext?.agentId ?? options.permanentAgentGating?.requester?.actorId;
+    const principalAgentId = namedAgentId ?? `engine-session-${randomUUID43()}`;
     const principalAgentName = options.actionGateContext?.agentName ?? options.permanentAgentGating?.requester?.actorName;
     return {
       agentId: principalAgentId,
@@ -159951,6 +159986,14 @@ async function createFnAgent2(options) {
   const sessionIdentityKeys = [...new Set([options.cwd, resolvedProjectRoot].filter((key) => Boolean(key)))];
   const attachSessionIdentity = (session) => {
     const identityDisposers = sessionIdentityKeys.map((key) => registerFusionSessionIdentity(key, sessionIdentity));
+    const sessionInvocations = session;
+    const wrapInvocation = (methodName) => {
+      const original = sessionInvocations[methodName];
+      if (typeof original !== "function") return;
+      sessionInvocations[methodName] = (...args) => runWithFusionSessionIdentity(sessionIdentityKeys, sessionIdentity, () => original.apply(session, args));
+    };
+    wrapInvocation("prompt");
+    wrapInvocation("promptWithFallback");
     const disposeBeforeIdentity = typeof session.dispose === "function" ? session.dispose.bind(session) : () => void 0;
     session.dispose = async () => {
       for (const disposeIdentity of identityDisposers) {
@@ -168150,10 +168193,11 @@ function createMergeAttemptHandler(deps) {
     );
   };
 }
-function createMergeGateHandler() {
+function createMergeGateHandler(deps = {}) {
   return async (_node, ctx) => {
     const settingsAutoMerge = ctx.settings?.autoMerge;
-    const autoMerge = ctx.task.autoMerge !== false && settingsAutoMerge !== false;
+    const settings = { autoMerge: settingsAutoMerge ?? true };
+    const autoMerge = !hasUserAutoMergeHold(ctx.task) && (await deps.isLiveSharedBranchMember?.(ctx.task, settings) === true || ctx.task.autoMerge !== false && settings.autoMerge !== false);
     return {
       outcome: "success",
       value: autoMerge ? "auto-on" : "auto-off"
@@ -168163,6 +168207,7 @@ function createMergeGateHandler() {
 var init_merge_runner = __esm({
   "../engine/src/workflow-node-runners/merge-runner.ts"() {
     "use strict";
+    init_src2();
     init_workflow_merge_nodes();
   }
 });
@@ -168506,7 +168551,7 @@ function createDefaultNodeHandlers(seams, runCustomNode, deps) {
     "parse-steps": parseSteps,
     code: createCodeNodeHandler(deps?.runCode),
     notify: createNotifyHandler(deps?.notifyDispatch),
-    "merge-gate": createMergeGateHandler(),
+    "merge-gate": createMergeGateHandler({ isLiveSharedBranchMember: deps?.isLiveSharedBranchMember }),
     "merge-attempt": createMergeAttemptHandler({
       primitives: deps?.primitives,
       seams,
@@ -168904,7 +168949,7 @@ var init_code_node_runner = __esm({
 // ../engine/src/agent-tools.ts
 import { appendFile as appendFile3, mkdir as mkdir26, readFile as readFile32, readdir as readdir9, realpath, stat as stat9, writeFile as writeFile24 } from "node:fs/promises";
 import { existsSync as existsSync50 } from "node:fs";
-import { createHash as createHash19, randomUUID as randomUUID43 } from "node:crypto";
+import { createHash as createHash19, randomUUID as randomUUID44 } from "node:crypto";
 import { tmpdir as tmpdir5 } from "node:os";
 import { extname as extname3, isAbsolute as isAbsolute12, join as join62, relative as relative11, resolve as resolve33, sep as sep9 } from "node:path";
 import { Type as Type2 } from "@earendil-works/pi-ai";
@@ -169550,7 +169595,7 @@ function createTaskCreateTool(store, provenance, options) {
               toType: "user",
               type: "agent-to-user",
               content: `Task proposal awaiting validation: ${title2}`,
-              metadata: { kind: "task-proposal", proposalStatus: "pending", proposalIdempotencyKey: randomUUID43(), taskId: options.sourceTaskId, proposedTask: { title: title2, description: params.description, priority: params.priority, workflowId: params.workflow_id, dependencies: params.dependencies } }
+              metadata: { kind: "task-proposal", proposalStatus: "pending", proposalIdempotencyKey: randomUUID44(), taskId: options.sourceTaskId, proposedTask: { title: title2, description: params.description, priority: params.priority, workflowId: params.workflow_id, dependencies: params.dependencies } }
             });
             return { content: [{ type: "text", text: "Task proposal submitted to the operator for validation; no task was created." }], details: { proposed: true } };
           }
@@ -203127,16 +203172,29 @@ var init_self_healing = __esm({
           activeWork: await this.resolveActiveWorkColumnsFor(taskId, cache7)
         };
       }
-      classifyPausedAbortWorkflowRecovery(task, settings, isExecuting, columns) {
+      /*
+      FNXC:SharedBranchMemberHold 2026-08-05-23:35:
+      Pause-abort recovery must resolve the same live intermediate-group predicate as
+      merge admission. Shared metadata alone is stale after group closure or a
+      default-branch collision, so it cannot suppress that task's standalone hold.
+      */
+      async isLiveSharedMemberIntegration(task, settings) {
+        const groupId = task.branchContext?.groupId?.trim();
+        const group = groupId ? await this.store.getBranchGroup?.(groupId) : null;
+        const defaultBranch = await resolveIntegrationBranch(this.options.rootDir, settings);
+        return isLiveSharedBranchGroupMemberIntegration(task, group, defaultBranch);
+      }
+      async classifyPausedAbortWorkflowRecovery(task, settings, isExecuting, columns) {
         const isPausedAbortPark = task.status === "failed" && typeof task.error === "string" && task.error.includes(PAUSE_ABORT_PARK_OPERATOR_MARKER) && task.error.includes(PAUSE_ABORT_PARK_ERROR_MARKER);
         if (!isPausedAbortPark) return { kind: "no-action", reason: "not-pause-abort" };
         if (task.paused || task.userPaused || isExecuting) return { kind: "no-action", reason: "unsafe-or-not-routable" };
         const errorText = typeof task.error === "string" ? task.error.toLowerCase() : "";
         const isTerminalMergePark = errorText.includes("conflict") || errorText.includes("contamination") || errorText.includes("foreign") || errorText.includes("retry-exhausted") || errorText.includes("retries exhausted") || errorText.includes("max retries");
         const completedSteps = task.steps.length > 0 && task.steps.every((step) => step.status === "done" || step.status === "skipped");
-        const sharedBranchMember = isSharedBranchGroupMemberIntegration(task);
-        const hasReviewProgress = columns.review.has(task.column) && allowsAutoMergeProcessing(task, settings) && task.mergeDetails?.mergeConfirmed !== true && !isTerminalMergePark && completedSteps;
-        const hasManualMergeHoldProgress = columns.review.has(task.column) && (!allowsAutoMergeProcessing(task, settings) || resolveEffectiveAutoMerge(task, settings) === false) && !sharedBranchMember && task.mergeDetails?.mergeConfirmed !== true && !isTerminalMergePark && completedSteps;
+        const liveSharedBranchMember = await this.isLiveSharedMemberIntegration(task, settings);
+        const autoMergeProcessing = allowsAutoMergeProcessing(task, settings) || liveSharedBranchMember;
+        const hasReviewProgress = columns.review.has(task.column) && autoMergeProcessing && task.mergeDetails?.mergeConfirmed !== true && !isTerminalMergePark && completedSteps;
+        const hasManualMergeHoldProgress = columns.review.has(task.column) && (hasUserAutoMergeHold(task) || !allowsAutoMergeProcessing(task, settings) || resolveEffectiveAutoMerge(task, settings) === false) && (!liveSharedBranchMember || hasUserAutoMergeHold(task)) && task.mergeDetails?.mergeConfirmed !== true && !isTerminalMergePark && completedSteps;
         if (hasManualMergeHoldProgress) {
           return { kind: "work-item-resume", reason: "pause-abort-manual-merge-hold" };
         }
@@ -208804,8 +208862,23 @@ var init_self_healing = __esm({
             return own.length > 0 ? new Set(own) : /* @__PURE__ */ new Set(["in-review"]);
           };
           const executingIds = this.options.getExecutingTaskIds?.() ?? /* @__PURE__ */ new Set();
+          const canRecoverMergeableReviewTask = async (task) => {
+            if (hasUserAutoMergeHold(task)) return false;
+            const groupId = task.branchContext?.groupId?.trim();
+            const branchGroup = groupId ? await this.store.getBranchGroup(groupId) : null;
+            const projectDefaultBranch = await resolveIntegrationBranch(this.options.rootDir, settings);
+            if (isLiveSharedBranchGroupMemberIntegration(task, branchGroup, projectDefaultBranch)) {
+              return true;
+            }
+            return allowsAutoMergeProcessing(task, settings) && resolveEffectiveAutoMerge(task, settings) !== false;
+          };
+          const mergeAdmission = await Promise.all(tasks2.map(async (task) => [
+            task.id,
+            await canRecoverMergeableReviewTask(task)
+          ]));
+          const mergeAdmissionByTaskId = new Map(mergeAdmission);
           const mergeable = tasks2.filter(
-            (t) => allowsAutoMergeProcessing(t, settings) && !t.paused && !executingIds.has(t.id) && t.status !== "failed" && // Exclude transient merge statuses. Active merges should be left alone;
+            (t) => mergeAdmissionByTaskId.get(t.id) === true && !t.paused && !executingIds.has(t.id) && t.status !== "failed" && // Exclude transient merge statuses. Active merges should be left alone;
             // stale ones are handled by recoverStaleMergingStatus().
             t.status !== "merging" && t.status !== "merging-pr" && // FNXC:Workspace 2026-06-22-09:30 (Phase D U1, KTD1 — admit workspace tasks):
             // A workspace task has task.worktree===null (its worktrees live per-repo in
@@ -211852,7 +211925,7 @@ var init_self_healing = __esm({
           for (const t of tasks2) {
             if (!this.isPauseAbortParkCandidate(t)) continue;
             const columns = await this.resolvePauseAbortColumnsFor(t.id, columnCache);
-            if (this.classifyPausedAbortWorkflowRecovery(t, settings, executingIds.has(t.id), columns).kind !== "no-action") {
+            if ((await this.classifyPausedAbortWorkflowRecovery(t, settings, executingIds.has(t.id), columns)).kind !== "no-action") {
               parked.push(t);
             }
           }
@@ -211869,7 +211942,7 @@ var init_self_healing = __esm({
                 continue;
               }
               const freshColumns = await this.resolvePauseAbortColumnsFor(fresh.id, columnCache);
-              const route = this.classifyPausedAbortWorkflowRecovery(fresh, settings, latestExecutingIds.has(fresh.id), freshColumns);
+              const route = await this.classifyPausedAbortWorkflowRecovery(fresh, settings, latestExecutingIds.has(fresh.id), freshColumns);
               if (route.kind === "no-action") {
                 continue;
               }
@@ -218920,7 +218993,8 @@ var init_workflow_graph_executor = __esm({
             parseSteps: deps.parseStepsDeps,
             runCode: deps.runCode,
             notifyDispatch: deps.notifyDispatch,
-            prNodes: deps.prNodes
+            prNodes: deps.prNodes,
+            isLiveSharedBranchMember: deps.isLiveSharedBranchMember
           }),
           ...deps.runnerRegistry?.toHandlers() ?? {},
           ...deps.handlers ?? {}
@@ -220156,6 +220230,10 @@ var init_workflow_graph_task_runner = __esm({
             runCode: this.deps.runCode,
             notifyDispatch: this.deps.notifyDispatch,
             prNodes: this.deps.prNodes,
+            // FNXC:SharedBranchMemberHold 2026-08-06-00:24: carry the executor's
+            // live group resolver into the graph merge gate; omitting it turns
+            // mission-policy members into manual holds before integration.
+            isLiveSharedBranchMember: this.deps.isLiveSharedBranchMember,
             /*
             FNXC:WorkflowResume 2026-06-29-08:49:
             Production graph runs must fetch live task steps during foreach replay. The runner is the workflow boundary that has store access, so it supplies the fresh projection seam instead of making executor self-healing guess after a stale step node fails.
@@ -228268,6 +228346,7 @@ ${feedback}`,
         if (info.phase !== "pre-merge") return false;
         if (info.status !== "advisory_failure" && info.status !== "failed") return false;
         const liveTask = await this.store.getTask(taskId).catch(() => fallbackTask);
+        if (hasUserAutoMergeHold(liveTask)) return false;
         const missingArtifactKeys = parseRequiredArtifactMissingValue(info.failureValue);
         if (missingArtifactKeys) {
           await this.recoverMissingRequiredArtifacts(liveTask, missingArtifactKeys, {
@@ -228524,6 +228603,7 @@ ${info.feedback}`, revisionKey),
        */
       async recoverFailedPreMergeWorkflowStep(task) {
         try {
+          if (hasUserAutoMergeHold(task)) return false;
           const failed = (task.workflowStepResults ?? []).filter((r) => (r.phase || "pre-merge") === "pre-merge" && r.status === "failed").sort((a, b3) => {
             const aTs = Date.parse(a.completedAt || a.startedAt || "");
             const bTs = Date.parse(b3.completedAt || b3.startedAt || "");
@@ -229050,6 +229130,7 @@ ${info.feedback}`, revisionKey),
               getTask: (taskId) => this.store.getTask(taskId)
             },
             runId: resolvedRunId,
+            isLiveSharedBranchMember: (nodeTask) => this.isLiveSharedBranchGroupMember(nodeTask),
             primitives: this.createAuthoritativeWorkflowPrimitives(settings),
             seams: this.createAuthoritativeWorkflowSeams(settings),
             prepareNodeExecution: (node, nodeTask, requirement) => this.prepareGraphNodeExecution(node, nodeTask, settings, requirement),
@@ -231991,6 +232072,7 @@ Graph value: ${failureValue}` : ""}`, budget.key),
         } catch {
           return false;
         }
+        if (hasUserAutoMergeHold(live)) return false;
         const sharedBranchMember = await this.isLiveSharedBranchGroupMember(live);
         if (!sharedBranchMember && !allowsAutoMergeProcessing(live, settings)) return false;
         if (!sharedBranchMember && resolveEffectiveAutoMerge(live, settings) === false) return false;
@@ -232052,8 +232134,8 @@ Graph value: ${failureValue}` : ""}`, budget.key),
         } catch {
           return false;
         }
-        if (await this.isLiveSharedBranchGroupMember(live)) return false;
-        return !allowsAutoMergeProcessing(live, settings) || resolveEffectiveAutoMerge(live, settings) === false;
+        if (await this.isLiveSharedBranchGroupMember(live) && !hasUserAutoMergeHold(live)) return false;
+        return hasUserAutoMergeHold(live) || !allowsAutoMergeProcessing(live, settings) || resolveEffectiveAutoMerge(live, settings) === false;
       }
       async handleStaleInReviewPlanPauseAbortReplay(live, result2, abortProvenance, pausedAborted, userCanceled, resumeLanesMemo) {
         if (!pausedAborted) return false;
@@ -232217,9 +232299,9 @@ Graph value: ${failureValue}` : ""}`, budget.key),
           if (settings.globalPause === true) return false;
         }
         if (live.column === resumeLanes.review) {
-          if (live.autoMerge === false) return false;
           if (!settings) return false;
           const sharedBranchMember = await this.isLiveSharedBranchGroupMember(live);
+          if (hasUserAutoMergeHold(live) || live.autoMerge === false && !sharedBranchMember) return false;
           if (!sharedBranchMember && !allowsAutoMergeProcessing(live, settings)) return false;
           if (live.mergeDetails?.mergeConfirmed === true) return false;
         }
@@ -249294,7 +249376,7 @@ var init_metric_parser = __esm({
 });
 
 // ../engine/src/eval/experiment-executor.ts
-import { randomUUID as randomUUID44 } from "node:crypto";
+import { randomUUID as randomUUID45 } from "node:crypto";
 var ExperimentMaxIterationsError, ExperimentGitNotConfiguredError, ExperimentExecutor;
 var init_experiment_executor = __esm({
   "../engine/src/eval/experiment-executor.ts"() {
@@ -249362,7 +249444,7 @@ var init_experiment_executor = __esm({
         }
         await this.semaphore.acquire();
         const controller = new AbortController();
-        const runHandle = randomUUID44();
+        const runHandle = randomUUID45();
         if (opts?.abortSignal) {
           opts.abortSignal.addEventListener("abort", () => controller.abort(), { once: true });
         }
@@ -258369,6 +258451,7 @@ var init_in_process_runtime = __esm({
             }
           }
           const prNodeGithubOps = this.config.prNodeGithubOps;
+          const secretsStore = await this.taskStore.getSecretsStore();
           const executorOptions = {
             /*
             FNXC:PlanReviewLease 2026-07-26-21:12:
@@ -258384,6 +258467,7 @@ var init_in_process_runtime = __esm({
             cliAgentRuntime: this.cliAgentRuntime?.bundle,
             pluginRunner: this.pluginRunner,
             messageStore: this.messageStore,
+            secretsStore,
             missionStore,
             reflectionService,
             // PR-entity nodes (U3): assemble the handler deps from the CLI-injected
@@ -258485,6 +258569,7 @@ var init_in_process_runtime = __esm({
               reflectionService,
               selfImproveService,
               credentialRotator: this.credentialRotator,
+              secretsStore,
               snapshotManager: autoClaimSnapshotManager,
               onMissed: (agentId, reason) => {
                 runtimeLog.warn(`Agent ${agentId} missed heartbeat: ${reason}`);
@@ -262346,7 +262431,21 @@ var init_project_engine = __esm({
       Cleared on the first non-busy outcome (success path resets it).
       */
       workspaceBusyReenqueues = /* @__PURE__ */ new Map();
+      workspaceBusyReenqueueTimers = /* @__PURE__ */ new Set();
       static WORKSPACE_BUSY_MAX_REENQUEUES = 10;
+      /*
+      FNXC:WorkspaceMergeDispatch 2026-08-05-23:56:
+      Workspace lease-contention retries are engine-owned lifecycle work, not detached callbacks.
+      Track only these busy re-enqueue timers so stop() can cancel them and tests can measure the
+      capped workspace ladder without confusing it with merge-body or maintenance timers.
+      */
+      scheduleWorkspaceBusyReenqueue(taskId, delayMs) {
+        const timer2 = setTimeout(() => {
+          this.workspaceBusyReenqueueTimers.delete(timer2);
+          if (!this.shuttingDown) this.internalEnqueueMerge(taskId);
+        }, delayMs);
+        this.workspaceBusyReenqueueTimers.add(timer2);
+      }
       /**
        * Pending manual merge resolvers — keyed by taskId.
        * When `onMerge` is called, the task is enqueued like auto-merge but a
@@ -262881,6 +262980,10 @@ ${detail}`);
           clearInterval(this.mergeActiveReconcileTimer);
           this.mergeActiveReconcileTimer = null;
         }
+        for (const timer2 of this.workspaceBusyReenqueueTimers) {
+          clearTimeout(timer2);
+        }
+        this.workspaceBusyReenqueueTimers.clear();
         for (const [taskId, deferred] of this.capacityDeferredMerges) {
           clearTimeout(deferred.timer);
           for (const resolver of deferred.resolvers) {
@@ -264180,16 +264283,15 @@ ${detail}`);
        * older low-priority task would start before a later urgent one.
        */
       async allowInReviewMergeProcessing(task, settings, store = this.runtime.getTaskStore()) {
-        if (allowsAutoMergeProcessing(task, settings)) {
-          return true;
-        }
+        if (hasUserAutoMergeHold(task)) return false;
         const groupId = task.branchContext?.groupId?.trim();
         const branchGroup = groupId ? await store.getBranchGroup?.(groupId) : null;
-        if (!branchGroup || branchGroup.status !== "open" || !branchGroup.branchName.trim()) {
-          return false;
-        }
         const projectDefaultBranch = await resolveIntegrationBranch(this.config.workingDirectory, settings);
-        return isLiveSharedBranchGroupMemberIntegration(task, branchGroup, projectDefaultBranch);
+        if (isLiveSharedBranchGroupMemberIntegration(task, branchGroup, projectDefaultBranch)) {
+          return true;
+        }
+        if (task.autoMerge === false && groupId) return false;
+        return allowsAutoMergeProcessing(task, settings);
       }
       async emitLegacyAutoMergeStampAdvisory(store) {
         if (this.legacyAutoMergeStampAdvisoryEmitted) {
@@ -265142,9 +265244,7 @@ ${detail}`);
                   runtimeLog.log(
                     `Workspace land busy re-enqueue ${busyCount + 1}/${_ProjectEngine.WORKSPACE_BUSY_MAX_REENQUEUES} for ${taskId} in ${delayMs / 1e3}s (no mergeRetry consumed \u2014 pure lease contention)`
                   );
-                  setTimeout(() => {
-                    if (!this.shuttingDown) this.internalEnqueueMerge(taskId);
-                  }, delayMs);
+                  this.scheduleWorkspaceBusyReenqueue(taskId, delayMs);
                 } else {
                   this.workspaceBusyReenqueues.delete(taskId);
                   await store.updateTask(taskId, { status: "failed", error: errorMsg }).catch(() => void 0);
@@ -268782,7 +268882,7 @@ __export(planning_exports, {
   updatePlanningSessionTitle: () => updatePlanningSessionTitle,
   validateSession: () => validateSession
 });
-import { randomUUID as randomUUID45 } from "node:crypto";
+import { randomUUID as randomUUID46 } from "node:crypto";
 import { EventEmitter as EventEmitter34 } from "node:events";
 async function createPlanningRuntimeSession(options) {
   const { pluginRunner, runtimeHint, settings, ...runtimeOptions } = options ?? {};
@@ -269246,7 +269346,7 @@ async function createSession(ip, initialPlan, store, rootDir, promptOverrides, p
   if (!store) {
     throw new Error("store is required for AI-powered planning sessions");
   }
-  const sessionId = randomUUID45();
+  const sessionId = randomUUID46();
   const session = {
     id: sessionId,
     ip,
@@ -269461,7 +269561,7 @@ async function createDraftSession(ip, initialPlan, _rootDir, modelProvider, mode
       `Rate limit exceeded. Maximum ${MAX_SESSIONS_PER_IP_PER_HOUR} planning sessions per hour. Reset at ${resetTime?.toISOString() || "unknown"}`
     );
   }
-  const sessionId = randomUUID45();
+  const sessionId = randomUUID46();
   const title2 = DRAFT_PLACEHOLDER_TITLE;
   const hasModelOverride = Boolean(modelProvider && modelId);
   const session = {
@@ -269637,7 +269737,7 @@ async function createSessionWithAgent(ip, initialPlan, rootDir, store, modelProv
       `Rate limit exceeded. Maximum ${MAX_SESSIONS_PER_IP_PER_HOUR} planning sessions per hour. Reset at ${resetTime?.toISOString() || "unknown"}`
     );
   }
-  const sessionId = randomUUID45();
+  const sessionId = randomUUID46();
   const session = {
     id: sessionId,
     ip,
@@ -270147,7 +270247,7 @@ function normalizePlanningQuestion(input, userInput = "") {
   const type = source.type === "multi_select" || source.type === "single_select" ? source.type : "single_select";
   const question = typeof source.question === "string" && source.question.trim() ? source.question.trim() : fallback2.question;
   const normalized = {
-    id: typeof source.id === "string" && source.id.trim() ? source.id : randomUUID45(),
+    id: typeof source.id === "string" && source.id.trim() ? source.id : randomUUID46(),
     type,
     question,
     ...typeof source.description === "string" && source.description.trim() ? { description: source.description.trim() } : {}
@@ -270173,7 +270273,7 @@ function normalizePlanningQuestion(input, userInput = "") {
 }
 function coerceQuestionResponse(response, session) {
   if (response.type === "question") return normalizePlanningQuestion(response.data, session.initialPlan);
-  return normalizePlanningQuestion({ id: randomUUID45(), type: "single_select", question: planningFallbackCopy(session.initialPlan).question }, session.initialPlan);
+  return normalizePlanningQuestion({ id: randomUUID46(), type: "single_select", question: planningFallbackCopy(session.initialPlan).question }, session.initialPlan);
 }
 async function validateSession(sessionId) {
   const session = await getSession(sessionId);
@@ -271115,7 +271215,7 @@ async function createTaskFromPlanSession(sessionId, store, options) {
       throw new InvalidSessionStateError("PLANNING_CREATED_TASK_MISSING");
     }
   }
-  const claimOwnerToken = randomUUID45();
+  const claimOwnerToken = randomUUID46();
   let claimed = await claimPlanningTaskCreation(sessionId, claimOwnerToken, (/* @__PURE__ */ new Date()).toISOString(), claimEpoch);
   if (!claimed) {
     session = await getDurablePlanningSession(sessionId).catch(() => void 0) ?? session;
@@ -271784,7 +271884,7 @@ __export(subtask_breakdown_exports, {
   stopSubtaskGeneration: () => stopSubtaskGeneration,
   subtaskStreamManager: () => subtaskStreamManager
 });
-import { randomUUID as randomUUID46 } from "node:crypto";
+import { randomUUID as randomUUID47 } from "node:crypto";
 import { EventEmitter as EventEmitter35 } from "node:events";
 function __getSubtaskBreakdownDiagnostics() {
   return diagnostics3;
@@ -271959,7 +272059,7 @@ async function decomposeForTriage(description, rootDir, promptOverrides, store)
   }
 }
 async function createSubtaskSession(initialDescription, store, rootDir, promptOverrides, projectId) {
-  const sessionId = randomUUID46();
+  const sessionId = randomUUID47();
   const session = {
     sessionId,
     projectId,
@@ -272396,7 +272496,7 @@ __export(mission_interview_exports, {
   stopMissionInterviewGeneration: () => stopMissionInterviewGeneration,
   submitMissionInterviewResponse: () => submitMissionInterviewResponse
 });
-import { randomUUID as randomUUID47 } from "node:crypto";
+import { randomUUID as randomUUID48 } from "node:crypto";
 import { EventEmitter as EventEmitter36 } from "node:events";
 function __getMissionInterviewDiagnostics() {
   return diagnostics4;
@@ -273139,7 +273239,7 @@ async function createMissionInterviewSession(ip, missionTitle, rootDir, store, p
       `Rate limit exceeded. Maximum ${MAX_SESSIONS_PER_IP_PER_HOUR2} sessions per hour. Reset at ${resetTime?.toISOString() || "unknown"}`
     );
   }
-  const sessionId = randomUUID47();
+  const sessionId = randomUUID48();
   const session = {
     id: sessionId,
     ip,
@@ -273602,7 +273702,7 @@ __export(milestone_slice_interview_exports, {
   stopMilestoneSliceInterviewGeneration: () => stopMilestoneSliceInterviewGeneration,
   submitTargetInterviewResponse: () => submitTargetInterviewResponse
 });
-import { randomUUID as randomUUID48 } from "node:crypto";
+import { randomUUID as randomUUID49 } from "node:crypto";
 import { EventEmitter as EventEmitter37 } from "node:events";
 function parseTargetInterviewResponseImpl(text3) {
   const candidate = extractJsonCandidate3(text3);
@@ -274231,7 +274331,7 @@ async function createTargetInterviewSession(ip, targetType, targetId, targetTitl
       `Rate limit exceeded. Maximum ${MAX_SESSIONS_PER_IP_PER_HOUR3} sessions per hour. Reset at ${resetTime?.toISOString() || "unknown"}`
     );
   }
-  const sessionId = randomUUID48();
+  const sessionId = randomUUID49();
   const session = {
     id: sessionId,
     ip,
@@ -293375,6 +293475,7 @@ function registerTaskWorkflowRoutes(ctx, deps) {
         reviewLevel,
         executionMode,
         autoMerge,
+        autoMergeProvenance,
         priority,
         source,
         branch,
@@ -293424,6 +293525,9 @@ function registerTaskWorkflowRoutes(ctx, deps) {
       if (autoMerge !== void 0 && typeof autoMerge !== "boolean") {
         throw badRequest("autoMerge must be a boolean");
       }
+      if (autoMergeProvenance !== void 0) {
+        throw badRequest("autoMergeProvenance is server-managed");
+      }
       if (priority !== void 0 && priority !== null && !isTaskPriority(priority)) {
         throw badRequest(`priority must be one of: ${TASK_PRIORITIES.join(", ")}`);
       }
@@ -296122,6 +296226,9 @@ See \`GET /api/tasks/${task.id}/diff\` for the landed diff being reverted.
       if (hasBodyField("autoMerge") && autoMerge !== void 0 && autoMerge !== null && typeof autoMerge !== "boolean") {
         throw new Error("autoMerge must be a boolean");
       }
+      if (hasBodyField("autoMergeProvenance")) {
+        throw badRequest("autoMergeProvenance is server-managed");
+      }
       let validatedSourceIssue;
       if (hasBodyField("sourceIssue")) {
         if (sourceIssue === null) {
@@ -296343,7 +296450,7 @@ See \`GET /api/tasks/${task.id}/diff\` for the landed diff being reverted.
       if (dependencies !== void 0) updates.dependencies = dependencies;
       if (enabledWorkflowSteps !== void 0) updates.enabledWorkflowSteps = enabledWorkflowSteps;
       if (hasBodyField("noCommitsExpected")) updates.noCommitsExpected = noCommitsExpected;
-      if (hasBodyField("autoMerge")) updates.autoMerge = autoMerge === null ? void 0 : autoMerge;
+      if (hasBodyField("autoMerge")) updates.autoMerge = autoMerge;
       if (hasBodyField("modelProvider")) updates.modelProvider = validatedModelProvider;
       if (hasBodyField("modelId")) updates.modelId = validatedModelId;
       if (hasBodyField("validatorModelProvider")) updates.validatorModelProvider = validatedValidatorModelProvider;
@@ -297941,7 +298048,7 @@ at this boundary regardless.`;
 });
 
 // ../dashboard/src/routes/register-planning-subtask-routes.ts
-import { randomUUID as randomUUID49 } from "node:crypto";
+import { randomUUID as randomUUID50 } from "node:crypto";
 async function acquirePlanningCreateLock(sessionId) {
   const previous = planningCreateLocks.get(sessionId);
   let releaseGate;
@@ -298922,7 +299029,7 @@ function registerPlanningSubtaskRoutes(ctx, deps) {
       }
       session = await getDurablePlanningSession2(sessionId) ?? session;
       if (await returnLinkedTask(session)) return;
-      const claimOwnerToken = randomUUID49();
+      const claimOwnerToken = randomUUID50();
       claimedOwnerToken = claimOwnerToken;
       claimedSessionId = sessionId;
       const claimStartedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -300098,7 +300205,7 @@ __export(chat_exports, {
   resolveFileReferences: () => resolveFileReferences
 });
 import { EventEmitter as EventEmitter40 } from "node:events";
-import { randomUUID as randomUUID50 } from "node:crypto";
+import { randomUUID as randomUUID51 } from "node:crypto";
 import { existsSync as existsSync71 } from "node:fs";
 import { join as join90, resolve as resolve48, relative as relative20 } from "node:path";
 import { SessionManager as SessionManager3 } from "@earendil-works/pi-coding-agent";
@@ -300310,7 +300417,7 @@ function createTaskVerificationTools(taskStore, actionGateContext) {
       const settings = await taskStore.getSettings();
       const command = profile === "verify:fast" ? "pnpm verify:fast" : typeof settings.testCommand === "string" ? settings.testCommand : "";
       if (!command) return { content: [{ type: "text", text: "ERROR: the selected verification profile is not configured." }], isError: true, details: {} };
-      const created = await taskStore.createTaskVerificationRequest({ taskId, requestId: randomUUID50(), profile, command, scope: "workspace", requestedBy: "chat" });
+      const created = await taskStore.createTaskVerificationRequest({ taskId, requestId: randomUUID51(), profile, command, scope: "workspace", requestedBy: "chat" });
       if (created.inFlightRequestId) return { content: [{ type: "text", text: `ERROR: verification request ${created.inFlightRequestId} is already in flight.` }], isError: true, details: created };
       return { content: [{ type: "text", text: `Queued verification request ${created.request.requestId} for ${taskId}.` }], details: created.request };
     }
@@ -302470,7 +302577,7 @@ var init_rate_limit = __esm({
 });
 
 // ../dashboard/src/routes/register-chat-routes.ts
-import { randomUUID as randomUUID51 } from "node:crypto";
+import { randomUUID as randomUUID52 } from "node:crypto";
 import { createReadStream as createReadStream2 } from "node:fs";
 import { mkdir as mkdir30, rm as rm16, writeFile as writeFile32 } from "node:fs/promises";
 import { basename as basename22, join as join91, resolve as resolve49 } from "node:path";
@@ -302529,7 +302636,7 @@ function registerChatRoutes(ctx, deps) {
     const filePath = join91(sessionDir, filename);
     await writeFile32(filePath, file.buffer);
     return {
-      id: `att-${randomUUID51().slice(0, 8)}`,
+      id: `att-${randomUUID52().slice(0, 8)}`,
       filename,
       originalName: file.originalname,
       mimeType: file.mimetype,
@@ -303296,7 +303403,7 @@ var init_register_chat_routes = __esm({
 });
 
 // ../dashboard/src/routes/register-chat-room-routes.ts
-import { randomUUID as randomUUID52 } from "node:crypto";
+import { randomUUID as randomUUID53 } from "node:crypto";
 import { createReadStream as createReadStream3 } from "node:fs";
 import { mkdir as mkdir31, writeFile as writeFile33 } from "node:fs/promises";
 import { basename as basename23, join as join92, resolve as resolve50 } from "node:path";
@@ -303637,7 +303744,7 @@ function registerChatRoomRoutes(ctx, deps) {
       const filePath = join92(roomDir, filename);
       await writeFile33(filePath, file.buffer);
       const attachment = {
-        id: `att-${randomUUID52().slice(0, 8)}`,
+        id: `att-${randomUUID53().slice(0, 8)}`,
         filename,
         originalName: file.originalname,
         mimeType: file.mimetype,
@@ -310152,6 +310259,17 @@ function assertObject(value) {
     throw badRequest("body must be an object");
   }
 }
+function getExplicitProjectId(req, ctx) {
+  const projectId = ctx.getProjectIdFromRequest(req);
+  if (!projectId) throw badRequest("projectId is required");
+  return projectId;
+}
+async function getExplicitSecretsStore(req, ctx) {
+  const requestedProjectId = getExplicitProjectId(req, ctx);
+  const { store, projectId } = await ctx.getProjectContext(req);
+  if (projectId !== requestedProjectId) throw badRequest("project context does not match projectId");
+  return store.getSecretsStore();
+}
 function emitSecretsAudit(req, ctx, type, metadata) {
   const requestWithAuditor = req;
   if (requestWithAuditor.runAuditor?.filesystem) {
@@ -310167,11 +310285,10 @@ var init_register_secrets_routes = __esm({
     init_src2();
     init_api_error();
     registerSecretsRoutes = (ctx) => {
-      const { router, getProjectContext: getProjectContext2, rethrowAsApiError: rethrowAsApiError8 } = ctx;
+      const { router, rethrowAsApiError: rethrowAsApiError8 } = ctx;
       router.get("/secrets", async (req, res) => {
         try {
-          const { store: scopedStore } = await getProjectContext2(req);
-          const secretsStore = await scopedStore.getSecretsStore();
+          const secretsStore = await getExplicitSecretsStore(req, ctx);
           const secrets2 = await secretsStore.listSecrets();
           const visibleSecrets = secrets2.filter(
             (secret) => !(secret.scope === "global" && secret.key === RESERVED_SYNC_PASSPHRASE_KEY)
@@ -310185,8 +310302,7 @@ var init_register_secrets_routes = __esm({
       });
       router.get("/secrets/sync-passphrase", async (req, res) => {
         try {
-          const { store: scopedStore } = await getProjectContext2(req);
-          const secretsStore = await scopedStore.getSecretsStore();
+          const secretsStore = await getExplicitSecretsStore(req, ctx);
           const configured = await hasSyncPassphraseConfigured(secretsStore);
           res.json({ configured });
         } catch (err) {
@@ -310197,14 +310313,14 @@ var init_register_secrets_routes = __esm({
       });
       router.put("/secrets/sync-passphrase", async (req, res) => {
         try {
+          getExplicitProjectId(req, ctx);
           assertObject(req.body);
           const passphrase = req.body.passphrase;
           if (typeof passphrase !== "string" || passphrase.trim().length === 0) {
             res.status(400).json({ error: "invalid-passphrase" });
             return;
           }
-          const { store: scopedStore } = await getProjectContext2(req);
-          const secretsStore = await scopedStore.getSecretsStore();
+          const secretsStore = await getExplicitSecretsStore(req, ctx);
           const hadConfiguredPassphrase = await hasSyncPassphraseConfigured(secretsStore);
           await setSyncPassphrase(secretsStore, passphrase);
           emitSecretsAudit(req, ctx, hadConfiguredPassphrase ? "secret:update" : "secret:create", {
@@ -310220,8 +310336,7 @@ var init_register_secrets_routes = __esm({
       });
       router.delete("/secrets/sync-passphrase", async (req, res) => {
         try {
-          const { store: scopedStore } = await getProjectContext2(req);
-          const secretsStore = await scopedStore.getSecretsStore();
+          const secretsStore = await getExplicitSecretsStore(req, ctx);
           await clearSyncPassphrase(secretsStore);
           emitSecretsAudit(req, ctx, "secret:delete", { key: RESERVED_SYNC_PASSPHRASE_KEY, scope: "global" });
           res.json({ success: true });
@@ -310233,6 +310348,7 @@ var init_register_secrets_routes = __esm({
       });
       router.post("/secrets", async (req, res) => {
         try {
+          getExplicitProjectId(req, ctx);
           assertObject(req.body);
           const { scope, key, value, description, accessPolicy, envExportable, envExportKey } = req.body;
           const parsedScope = parseScope(scope);
@@ -310249,8 +310365,7 @@ var init_register_secrets_routes = __esm({
             }
             parsedAccessPolicy = accessPolicy;
           }
-          const { store: scopedStore } = await getProjectContext2(req);
-          const secretsStore = await scopedStore.getSecretsStore();
+          const secretsStore = await getExplicitSecretsStore(req, ctx);
           const secret = await secretsStore.createSecret({
             scope: parsedScope,
             key,
@@ -310269,6 +310384,7 @@ var init_register_secrets_routes = __esm({
       });
       router.patch("/secrets/:scope/:id", async (req, res) => {
         try {
+          getExplicitProjectId(req, ctx);
           const scope = parseScope(req.params.scope);
           const id = String(req.params.id ?? "").trim();
           if (!id) throw badRequest("id is required");
@@ -310312,8 +310428,7 @@ var init_register_secrets_routes = __esm({
               patch.plaintextValue = req.body.value;
             }
           }
-          const { store: scopedStore } = await getProjectContext2(req);
-          const secretsStore = await scopedStore.getSecretsStore();
+          const secretsStore = await getExplicitSecretsStore(req, ctx);
           const secret = await secretsStore.updateSecret(id, scope, patch);
           res.json(secret);
         } catch (err) {
@@ -310324,11 +310439,11 @@ var init_register_secrets_routes = __esm({
       });
       router.delete("/secrets/:scope/:id", async (req, res) => {
         try {
+          getExplicitProjectId(req, ctx);
           const scope = parseScope(req.params.scope);
           const id = String(req.params.id ?? "").trim();
           if (!id) throw badRequest("id is required");
-          const { store: scopedStore } = await getProjectContext2(req);
-          const secretsStore = await scopedStore.getSecretsStore();
+          const secretsStore = await getExplicitSecretsStore(req, ctx);
           await secretsStore.deleteSecret(id, scope);
           res.status(204).send();
         } catch (err) {
@@ -310339,11 +310454,11 @@ var init_register_secrets_routes = __esm({
       });
       router.post("/secrets/:scope/:id/reveal", async (req, res) => {
         try {
+          getExplicitProjectId(req, ctx);
           const scope = parseScope(req.params.scope);
           const id = String(req.params.id ?? "").trim();
           if (!id) throw badRequest("id is required");
-          const { store: scopedStore } = await getProjectContext2(req);
-          const secretsStore = await scopedStore.getSecretsStore();
+          const secretsStore = await getExplicitSecretsStore(req, ctx);
           const secret = await secretsStore.revealSecret(id, scope, {
             userId: null
           });
@@ -311942,7 +312057,7 @@ var init_register_gitlab = __esm({
 
 // ../dashboard/src/terminal.ts
 import { spawn as spawn11 } from "node:child_process";
-import { randomUUID as randomUUID53 } from "node:crypto";
+import { randomUUID as randomUUID54 } from "node:crypto";
 import { EventEmitter as EventEmitter42 } from "node:events";
 function extractBaseCommand(command) {
   let trimmed = command.trim();
@@ -312102,7 +312217,7 @@ var init_terminal = __esm({
         if (!validation.valid) {
           return { sessionId: "", error: validation.error };
         }
-        const sessionId = randomUUID53();
+        const sessionId = randomUUID54();
         const childProcess6 = spawn11(command, [], {
           cwd,
           shell: true,
@@ -340912,7 +341027,7 @@ var init_register_node_routes = __esm({
 });
 
 // ../dashboard/src/routes/register-docker-node-routes.ts
-import { randomUUID as randomUUID54 } from "node:crypto";
+import { randomUUID as randomUUID55 } from "node:crypto";
 function sanitizeHostConfig(input) {
   const host = input ?? {};
   return {
@@ -341291,7 +341406,7 @@ var init_register_docker_node_routes = __esm({
             if (!managedNode) {
               throw notFound("Managed Docker node not found");
             }
-            const newKey = randomUUID54().replace(/-/g, "");
+            const newKey = randomUUID55().replace(/-/g, "");
             await central.updateManagedDockerNode(managedId, { apiKey: newKey });
             if (managedNode.nodeId) {
               await central.updateNode(managedNode.nodeId, { apiKey: newKey });
@@ -350159,7 +350274,7 @@ var init_register_agent_reflection_rating_routes = __esm({
 });
 
 // ../dashboard/src/agent-generation.ts
-import { randomUUID as randomUUID55 } from "node:crypto";
+import { randomUUID as randomUUID56 } from "node:crypto";
 async function initPromptCatalog() {
   if (promptCatalogReady) return;
   try {
@@ -350365,7 +350480,7 @@ async function startAgentGeneration(ip, roleDescription) {
       `Rate limit exceeded. Maximum ${MAX_SESSIONS_PER_IP_PER_HOUR4} generation sessions per hour. Reset at ${resetTime?.toISOString() || "unknown"}`
     );
   }
-  const sessionId = randomUUID55();
+  const sessionId = randomUUID56();
   const session = {
     id: sessionId,
     ip,
@@ -350564,7 +350679,7 @@ __export(agent_onboarding_exports, {
   startAgentOnboardingSession: () => startAgentOnboardingSession,
   stopAgentOnboardingGeneration: () => stopAgentOnboardingGeneration
 });
-import { randomUUID as randomUUID56 } from "node:crypto";
+import { randomUUID as randomUUID57 } from "node:crypto";
 import { EventEmitter as EventEmitter43 } from "node:events";
 function extractJsonCandidate6(text3) {
   const codeBlockMatch = text3.match(/```(?:json)?\s*([\s\S]*?)\s*```/);
@@ -350664,7 +350779,7 @@ Current agent configuration:
 ${currentConfigLines}`;
 }
 async function startAgentOnboardingSession(ip, initialContext, rootDir, modelProvider, modelId, promptOverrides, pluginRunner, store) {
-  const id = randomUUID56();
+  const id = randomUUID57();
   const mode = initialContext.mode ?? "create";
   const session = {
     id,
@@ -353446,7 +353561,7 @@ var init_src8 = __esm({
 
 // ../../plugins/fusion-plugin-openclaw-runtime/src/pi-module.ts
 import { spawn as spawn15 } from "node:child_process";
-import { randomUUID as randomUUID57 } from "node:crypto";
+import { randomUUID as randomUUID58 } from "node:crypto";
 import { readFile as readFile51 } from "node:fs/promises";
 function asString2(v2) {
   return typeof v2 === "string" && v2.trim() !== "" ? v2.trim() : void 0;
@@ -353506,7 +353621,7 @@ function extractStderrError(stderr, stdout) {
 }
 function createCliSession(opts) {
   return {
-    sessionId: randomUUID57(),
+    sessionId: randomUUID58(),
     agentId: opts.agentId ?? DEFAULT_AGENT_ID,
     systemPrompt: opts.systemPrompt,
     messages: [{ role: "developer", content: opts.systemPrompt }],
@@ -353701,7 +353816,7 @@ var init_mcp_config2 = __esm({
 });
 
 // ../../plugins/fusion-plugin-openclaw-runtime/src/runtime-adapter.ts
-import { randomUUID as randomUUID58 } from "node:crypto";
+import { randomUUID as randomUUID59 } from "node:crypto";
 var OpenClawRuntimeAdapter;
 var init_runtime_adapter2 = __esm({
   "../../plugins/fusion-plugin-openclaw-runtime/src/runtime-adapter.ts"() {
@@ -353724,8 +353839,8 @@ var init_runtime_adapter2 = __esm({
         let mcpProfile;
         let mcpConfigPath;
         if (toolDefs.length > 0) {
-          const bridge = writeOpenClawMcpBridgeFiles(toolDefs, randomUUID58());
-          mcpProfile = `fusion-${randomUUID58()}`;
+          const bridge = writeOpenClawMcpBridgeFiles(toolDefs, randomUUID59());
+          mcpProfile = `fusion-${randomUUID59()}`;
           mcpConfigPath = bridge.serverConfigPath;
           await configureOpenClawMcpServer({
             binaryPath: this.config.binaryPath,
@@ -357780,7 +357895,7 @@ import { existsSync as existsSync77, writeFileSync as writeFileSync15 } from "no
 import { tmpdir as tmpdir17 } from "node:os";
 import { dirname as dirname45, join as join104 } from "node:path";
 import { fileURLToPath as fileURLToPath11 } from "node:url";
-import { randomUUID as randomUUID59 } from "node:crypto";
+import { randomUUID as randomUUID60 } from "node:crypto";
 function toolsToMcpToolDefs2(tools) {
   if (!Array.isArray(tools)) return [];
   return tools.filter((tool) => tool && typeof tool.name === "string" && tool.name.trim().length > 0 && !BUILT_IN_TOOL_NAMES2.has(tool.name)).map((tool) => ({
@@ -357831,7 +357946,7 @@ async function startFusionToolBridge(tools) {
       byName.set(tool.name, tool);
     }
   }
-  const schemaPath = join104(tmpdir17(), `fusion-grok-mcp-schemas-${process.pid}-${randomUUID59()}.json`);
+  const schemaPath = join104(tmpdir17(), `fusion-grok-mcp-schemas-${process.pid}-${randomUUID60()}.json`);
   writeFileSync15(schemaPath, JSON.stringify(defs));
   const server = createServer2(async (req, res) => {
     if (req.method !== "POST" || req.url !== "/tool-call") {
@@ -357857,7 +357972,7 @@ async function startFusionToolBridge(tools) {
       return;
     }
     try {
-      const result2 = await tool.execute(`grok-mcp-${randomUUID59()}`, parsed.arguments ?? {}, void 0, void 0, void 0);
+      const result2 = await tool.execute(`grok-mcp-${randomUUID60()}`, parsed.arguments ?? {}, void 0, void 0, void 0);
       res.statusCode = 200;
       res.setHeader("content-type", "application/json");
       res.end(
@@ -359901,7 +360016,7 @@ import { existsSync as existsSync81, rmSync as rmSync13, writeFileSync as writeF
 import { tmpdir as tmpdir19 } from "node:os";
 import { dirname as dirname50, join as join109 } from "node:path";
 import { fileURLToPath as fileURLToPath15 } from "node:url";
-import { randomBytes as randomBytes8, randomUUID as randomUUID60 } from "node:crypto";
+import { randomBytes as randomBytes8, randomUUID as randomUUID61 } from "node:crypto";
 function toolsToMcpToolDefs3(tools) {
   if (!Array.isArray(tools)) return [];
   return tools.filter((tool) => tool && typeof tool.name === "string" && tool.name.trim().length > 0 && !BUILT_IN_TOOL_NAMES3.has(tool.name)).map((tool) => ({
@@ -359952,7 +360067,7 @@ async function startFusionToolBridge2(tools, options = {}) {
       byName.set(tool.name, tool);
     }
   }
-  const schemaPath = join109(tmpdir19(), `fusion-claude-mcp-schemas-${process.pid}-${randomUUID60()}.json`);
+  const schemaPath = join109(tmpdir19(), `fusion-claude-mcp-schemas-${process.pid}-${randomUUID61()}.json`);
   writeFileSync17(schemaPath, JSON.stringify(defs));
   const capabilityToken = randomBytes8(32).toString("base64url");
   const server = createServer3(async (req, res) => {
@@ -360017,7 +360132,7 @@ async function startFusionToolBridge2(tools, options = {}) {
       return;
     }
     try {
-      const result2 = await tool.execute(`claude-mcp-${randomUUID60()}`, parsed.arguments ?? {}, void 0, void 0, void 0);
+      const result2 = await tool.execute(`claude-mcp-${randomUUID61()}`, parsed.arguments ?? {}, void 0, void 0, void 0);
       res.statusCode = 200;
       res.setHeader("content-type", "application/json");
       res.end(
@@ -362094,7 +362209,7 @@ import { existsSync as existsSync83, unlinkSync as unlinkSync5, writeFileSync as
 import { tmpdir as tmpdir20 } from "node:os";
 import { dirname as dirname53, join as join112 } from "node:path";
 import { fileURLToPath as fileURLToPath17 } from "node:url";
-import { randomUUID as randomUUID61 } from "node:crypto";
+import { randomUUID as randomUUID62 } from "node:crypto";
 function toolsToMcpToolDefs4(tools) {
   if (!Array.isArray(tools)) return [];
   return tools.filter(
@@ -362151,7 +362266,7 @@ async function startFusionToolBridge3(tools) {
       byName.set(tool.name, tool);
     }
   }
-  const schemaPath = join112(tmpdir20(), `fusion-omp-mcp-schemas-${process.pid}-${randomUUID61()}.json`);
+  const schemaPath = join112(tmpdir20(), `fusion-omp-mcp-schemas-${process.pid}-${randomUUID62()}.json`);
   writeFileSync18(schemaPath, JSON.stringify(defs));
   const server = createServer4(async (req, res) => {
     if (req.method !== "POST" || req.url !== "/tool-call") {
@@ -362178,7 +362293,7 @@ async function startFusionToolBridge3(tools) {
     }
     try {
       const result2 = await tool.execute(
-        `omp-mcp-${randomUUID61()}`,
+        `omp-mcp-${randomUUID62()}`,
         parsed.arguments ?? {},
         void 0,
         void 0,
@@ -363274,7 +363389,7 @@ var init_paperclip_client = __esm({
 });
 
 // ../../plugins/fusion-plugin-paperclip-runtime/src/runtime-adapter.ts
-import { randomUUID as randomUUID62 } from "node:crypto";
+import { randomUUID as randomUUID63 } from "node:crypto";
 function sleep7(ms2) {
   return new Promise((resolve104) => setTimeout(resolve104, ms2));
 }
@@ -363403,7 +363518,7 @@ var init_runtime_adapter10 = __esm({
           apiKey: effectiveApiKey,
           agentId,
           companyId,
-          sessionId: randomUUID62(),
+          sessionId: randomUUID63(),
           systemPrompt: options.systemPrompt,
           cwd: options.cwd,
           mode: normalizeMode3(this.config.mode),
@@ -366903,7 +367018,7 @@ var init_command_center_csv = __esm({
 });
 
 // ../dashboard/src/monitor-store.ts
-import { randomUUID as randomUUID63 } from "node:crypto";
+import { randomUUID as randomUUID64 } from "node:crypto";
 function monitorProjectId(layer) {
   if (!layer.projectId) {
     throw new Error("PostgreSQL monitor writes require asyncLayer.projectId");
@@ -366935,7 +367050,7 @@ async function recordDeployment(db, input) {
     return recordDeploymentAsync(layer.db, input, monitorProjectId(layer));
   }
   const sqliteDb = db;
-  const deploymentId = input.deploymentId?.trim() || `dep-${randomUUID63()}`;
+  const deploymentId = input.deploymentId?.trim() || `dep-${randomUUID64()}`;
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const deployedAt = input.deployedAt ?? now;
   const meta2 = input.meta ? JSON.stringify(input.meta) : null;
@@ -367001,7 +367116,7 @@ async function ingestIncidentSignal(db, input) {
     const updated = getIncident(sqliteDb, existing.incidentId);
     return { incident: updated ?? existing, created: false };
   }
-  const incidentId = `inc-${randomUUID63()}`;
+  const incidentId = `inc-${randomUUID64()}`;
   const meta2 = {
     ...input.meta ?? {},
     [OCCURRENCES_META_KEY2]: 1,
@@ -371602,7 +371717,7 @@ var init_types6 = __esm({
 });
 
 // ../dashboard/src/stt/model-manager.ts
-import { createHash as createHash31, randomUUID as randomUUID64 } from "node:crypto";
+import { createHash as createHash31, randomUUID as randomUUID65 } from "node:crypto";
 import { mkdir as mkdir38, open as open4, readFile as readFile56, readdir as readdir14, rename as rename10, rm as rm21, stat as stat16, writeFile as writeFile37 } from "node:fs/promises";
 import { join as join118, relative as relative22, resolve as resolve68, sep as sep18 } from "node:path";
 function parseSafeTarListing(listing) {
@@ -371683,8 +371798,8 @@ function createVoiceModelManager(options = {}) {
       if (!current(g2, signal)) return state;
       await mkdir38(cacheDir(), { recursive: true });
       if (!current(g2, signal)) return state;
-      partial2 = join118(cacheDir(), `.partial-${g2}-${randomUUID64()}`);
-      staging = join118(cacheDir(), `.staging-${g2}-${randomUUID64()}`);
+      partial2 = join118(cacheDir(), `.partial-${g2}-${randomUUID65()}`);
+      staging = join118(cacheDir(), `.staging-${g2}-${randomUUID65()}`);
       const file = await open4(partial2, "wx");
       try {
         const response = await (options.fetch ?? globalThis.fetch)(asset.url, { signal });
@@ -371732,7 +371847,7 @@ function createVoiceModelManager(options = {}) {
       await writeFile37(join118(staging, "manifest.json"), JSON.stringify({ filename: asset.filename, sha256: asset.sha256, installedAt: (/* @__PURE__ */ new Date()).toISOString(), expectedFiles: asset.expectedFiles }));
       await options.beforePromote?.(signal);
       if (!current(g2, signal)) return state;
-      const backup = join118(cacheDir(), `.backup-${g2}-${randomUUID64()}`);
+      const backup = join118(cacheDir(), `.backup-${g2}-${randomUUID65()}`);
       let movedPrevious = false;
       try {
         try {
@@ -371953,7 +372068,7 @@ var init_parakeet_service = __esm({
 });
 
 // ../dashboard/src/routes/register-voice-routes.ts
-import { randomUUID as randomUUID65 } from "node:crypto";
+import { randomUUID as randomUUID66 } from "node:crypto";
 import express from "express";
 async function settingsFor(ctx, req) {
   const scoped = await ctx.getScopedStore(req);
@@ -372032,7 +372147,7 @@ function createRegisterVoiceRoutes(deps = {}) {
           recognizer.close();
           return error2(res, 409, { error: "unavailable", reason: "model-removed" });
         }
-        const id = randomUUID65();
+        const id = randomUUID66();
         const now = Date.now();
         sessions7.set(id, { projectId, recognizer, next: 0, bytes: 0, last: now, expires: now + 3e5 });
         res.status(201).json({ sessionId: id, expiresAt: new Date(now + 3e5).toISOString(), modelId: model.id, language: language.language });
@@ -372503,7 +372618,7 @@ var init_fn_binary_local_install = __esm({
 });
 
 // ../dashboard/src/routes/register-system-routes.ts
-import { randomUUID as randomUUID66 } from "node:crypto";
+import { randomUUID as randomUUID67 } from "node:crypto";
 import { existsSync as existsSync87 } from "node:fs";
 import { join as join120 } from "node:path";
 function rejectCrossOrigin(req, res) {
@@ -372700,7 +372815,7 @@ function registerSystemRoutes(ctx, deps) {
       throw new ApiError(409, `Build script missing: ${scriptPath}`);
     }
     const job = {
-      id: randomUUID66(),
+      id: randomUUID67(),
       kind: "rebuild",
       scope,
       restartAfter,
@@ -372990,7 +373105,7 @@ function registerSystemRoutes(ctx, deps) {
       throw new ApiError(409, `A ${activeJob.kind}/${activeJob.scope} job is already running`);
     }
     const job = {
-      id: randomUUID66(),
+      id: randomUUID67(),
       kind,
       scope,
       restartAfter,
@@ -373278,7 +373393,7 @@ var init_cli_agent_settings = __esm({
 
 // ../dashboard/src/mission-routes.ts
 import { Router as Router5 } from "express";
-import { AsyncLocalStorage } from "node:async_hooks";
+import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
 function resolveMissionInterviewThinkingLevel(settings, thinkingLevel) {
   return resolvePlanningThinkingLevel(settings, thinkingLevel);
 }
@@ -373462,7 +373577,7 @@ function replayBufferedSSE(res, bufferedEvents) {
 }
 function createMissionRouter(store, missionAutopilot, aiSessionStore, missionExecutionLoop, engineManager, pluginRunner, options) {
   const router = Router5();
-  const requestContext = new AsyncLocalStorage();
+  const requestContext = new AsyncLocalStorage2();
   function getScopedStore2() {
     return requestContext.getStore() ?? store;
   }
@@ -375973,11 +376088,11 @@ var init_mission_routes = __esm({
 });
 
 // ../dashboard/src/ideation-routes.ts
-import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
+import { AsyncLocalStorage as AsyncLocalStorage3 } from "node:async_hooks";
 import { Router as Router6 } from "express";
 function createIdeationRouter(store, options) {
   const router = Router6();
-  const requestContext = new AsyncLocalStorage2();
+  const requestContext = new AsyncLocalStorage3();
   const ideation = () => (requestContext.getStore() ?? store).getIdeationStore();
   router.use(async (req, _res, next) => {
     try {
@@ -376161,7 +376276,7 @@ var init_insight_run_sweeper = __esm({
 
 // ../dashboard/src/insights-routes.ts
 import { Router as Router7 } from "express";
-import { AsyncLocalStorage as AsyncLocalStorage3 } from "node:async_hooks";
+import { AsyncLocalStorage as AsyncLocalStorage4 } from "node:async_hooks";
 function rethrowAsApiError4(error3, fallbackMessage = "Internal server error") {
   if (error3 instanceof ApiError) throw error3;
   if (error3 instanceof Error) throw new ApiError(500, error3.message);
@@ -376305,7 +376420,7 @@ function toInsightTitle(content) {
 }
 function createInsightsRouter(store, options) {
   const router = Router7();
-  const requestContext = new AsyncLocalStorage3();
+  const requestContext = new AsyncLocalStorage4();
   let rootInsightStore;
   if (typeof store.getInsightStore === "function") {
     try {
@@ -376809,7 +376924,7 @@ var init_insights_routes = __esm({
 
 // ../dashboard/src/evals-routes.ts
 import { Router as Router8 } from "express";
-import { AsyncLocalStorage as AsyncLocalStorage4 } from "node:async_hooks";
+import { AsyncLocalStorage as AsyncLocalStorage5 } from "node:async_hooks";
 function rethrowAsApiError5(error3, fallbackMessage = "Internal server error") {
   if (error3 instanceof ApiError) throw error3;
   if (error3 instanceof Error) throw new ApiError(500, error3.message);
@@ -376836,7 +376951,7 @@ function normalizeEvalText(result2) {
 }
 function createEvalsRouter(store, options) {
   const router = Router8();
-  const requestContext = new AsyncLocalStorage4();
+  const requestContext = new AsyncLocalStorage5();
   router.use((req, _res, next) => {
     getScopedStore(req, store, options).then((scopedStore) => requestContext.run(scopedStore, () => next())).catch((err) => {
       try {
@@ -376920,7 +377035,7 @@ var init_evals_routes = __esm({
 
 // ../dashboard/src/research-routes.ts
 import { Router as Router9 } from "express";
-import { AsyncLocalStorage as AsyncLocalStorage5 } from "node:async_hooks";
+import { AsyncLocalStorage as AsyncLocalStorage6 } from "node:async_hooks";
 function rethrowAsApiError6(error3, fallback2 = "Internal server error") {
   if (error3 instanceof ApiError) throw error3;
   if (error3 instanceof ResearchLifecycleError) {
@@ -377012,7 +377127,7 @@ async function addFindingAttachment(scopedStore, taskId, filename, markdown) {
 }
 function createResearchRouter(store, options) {
   const router = Router9();
-  const requestContext = new AsyncLocalStorage5();
+  const requestContext = new AsyncLocalStorage6();
   router.use((req, _res, next) => {
     getScopedStore(req, store, options).then((scopedStore) => requestContext.run(scopedStore, () => next())).catch((error3) => {
       try {
@@ -377515,7 +377630,7 @@ var init_experiment_routes = __esm({
 
 // ../dashboard/src/goals-routes.ts
 import { Router as Router11 } from "express";
-import { AsyncLocalStorage as AsyncLocalStorage6 } from "node:async_hooks";
+import { AsyncLocalStorage as AsyncLocalStorage7 } from "node:async_hooks";
 function getGoalStore(store) {
   return store.getGoalStore();
 }
@@ -377571,7 +377686,7 @@ function rethrowGoalCapError(error3) {
 }
 function createGoalsRouter(store, options) {
   const router = Router11();
-  const requestContext = new AsyncLocalStorage6();
+  const requestContext = new AsyncLocalStorage7();
   function getScopedStore2() {
     return requestContext.getStore() ?? store;
   }
@@ -384244,7 +384359,7 @@ var init_provider_health_monitor = __esm({
 
 // ../dashboard/src/server.ts
 import express3 from "express";
-import { randomUUID as randomUUID67 } from "node:crypto";
+import { randomUUID as randomUUID68 } from "node:crypto";
 import { join as join125, dirname as dirname57 } from "node:path";
 import { existsSync as existsSync89, readFileSync as readFileSync32, statSync as statSync16 } from "node:fs";
 import { fileURLToPath as fileURLToPath18 } from "node:url";
@@ -385709,7 +385824,7 @@ function setupBadgeWebSocket(app, server, store, options) {
   const dashboardApp = app;
   const wsManager = new WebSocketManager();
   const badgeSnapshots = /* @__PURE__ */ new Map();
-  const serverId = randomUUID67();
+  const serverId = randomUUID68();
   const badgePubSub = options?.badgePubSub ?? createBadgePubSub({ sourceId: serverId });
   void badgePubSub.start();
   const scopedStores = /* @__PURE__ */ new Map();
@@ -385851,7 +385966,7 @@ function setupBadgeWebSocket(app, server, store, options) {
     const url2 = new URL(req.url || "", `http://${req.headers.host}`);
     const projectId = url2.searchParams.get("projectId") ?? "default";
     void ensureScopedListeners(projectId);
-    wsManager.addClient(ws2, randomUUID67(), projectId);
+    wsManager.addClient(ws2, randomUUID68(), projectId);
   });
   server.once("close", async () => {
     for (const cleanup of scopedCleanups.values()) {
@@ -386683,7 +386798,7 @@ import { Type as Type9 } from "typebox";
 import { StringEnum } from "@earendil-works/pi-ai";
 import { resolve as resolve75, relative as relative25, isAbsolute as isAbsolute33, sep as sep22, basename as basename36, extname as extname5, join as join127 } from "node:path";
 import { existsSync as existsSync90 } from "node:fs";
-import { AsyncLocalStorage as AsyncLocalStorage7 } from "node:async_hooks";
+import { AsyncLocalStorage as AsyncLocalStorage8 } from "node:async_hooks";
 function resolveProjectRoot2(cwd) {
   const worktreeProjectRoot = typeof getProjectRootFromWorktree === "function" ? getProjectRootFromWorktree(cwd) : null;
   if (typeof getProjectRootFromWorktree !== "function" && !warnedMissingProjectRootResolver) {
@@ -386749,7 +386864,7 @@ var init_extension = __esm({
     storeCache2 = extensionStoreState.cache;
     storeBootInflight = extensionStoreState.bootInflight;
     storeBootFailureCooldown = extensionStoreState.bootFailureCooldown;
-    extensionToolSignal = new AsyncLocalStorage7();
+    extensionToolSignal = new AsyncLocalStorage8();
   }
 });
 
@@ -397152,6 +397267,7 @@ var init_dev_source_restart = __esm({
 var dashboard_exports = {};
 __export(dashboard_exports, {
   StreamedLogBuffer: () => StreamedLogBuffer,
+  buildUiOnlyHeartbeatMonitorOptions: () => buildUiOnlyHeartbeatMonitorOptions,
   classifyDashboardFatalExit: () => classifyDashboardFatalExit,
   countActiveTasks: () => countActiveTasks,
   hasLiveSupervisingParent: () => hasLiveSupervisingParent,
@@ -397180,6 +397296,15 @@ async function countActiveTasks(store, tasks2) {
   }
   return active;
 }
+function buildUiOnlyHeartbeatMonitorOptions(input) {
+  return {
+    store: input.agentStore,
+    agentStore: input.agentStore,
+    taskStore: input.taskStore,
+    rootDir: input.rootDir,
+    secretsStore: input.secretsStore
+  };
+}
 function formatRuntimeContext(context) {
   if (context === void 0) {
     return "";
@@ -398664,11 +398789,14 @@ async function runDashboard(port, opts = {}) {
       logSink.warn(`Failed to initialize mesh networking: ${message}`, "dashboard");
     }
     try {
+      const secretsStore = await store.getSecretsStore();
       heartbeatMonitorImpl = new HeartbeatMonitor({
-        store: agentStore,
-        agentStore,
-        taskStore: store,
-        rootDir: cwd,
+        ...buildUiOnlyHeartbeatMonitorOptions({
+          agentStore,
+          taskStore: store,
+          rootDir: cwd,
+          secretsStore
+        }),
         onMissed: (agentId, reason) => {
           logSink.warn(`Agent ${agentId} missed heartbeat: ${reason}`, "engine");
         },