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

package/dist/extension.js

@@ -16765,8 +16765,34 @@ function didFallBackToDefault(ir2) {
 async function resolveWorkflowIrForTaskWithProvenance(store, taskId, irCache, selectionCache) {
   let workflowId;
   try {
-    const selection = selectionCache?.has(taskId) ? selectionCache.get(taskId) : store.getTaskWorkflowSelectionAsync ? await store.getTaskWorkflowSelectionAsync(taskId) : store.getTaskWorkflowSelection(taskId);
-    if (!selectionCache?.has(taskId)) selectionCache?.set(taskId, selection);
+    const isSelectionCached = selectionCache?.has(taskId) ?? false;
+    let selection = isSelectionCached && selectionCache ? selectionCache.get(taskId) : void 0;
+    if (!isSelectionCached) {
+      let inflight;
+      let coalesced = false;
+      if (selectionCache) {
+        inflight = inflightSelectionReads.get(selectionCache);
+        if (!inflight) {
+          inflight = /* @__PURE__ */ new Map();
+          inflightSelectionReads.set(selectionCache, inflight);
+        }
+        const pending = inflight.get(taskId);
+        if (pending) {
+          selection = await pending;
+          coalesced = true;
+        }
+      }
+      if (!coalesced) {
+        const readPromise = store.getTaskWorkflowSelectionAsync ? store.getTaskWorkflowSelectionAsync(taskId) : Promise.resolve(store.getTaskWorkflowSelection(taskId));
+        if (inflight) inflight.set(taskId, readPromise);
+        try {
+          selection = await readPromise;
+        } finally {
+          inflight?.delete(taskId);
+        }
+      }
+      selectionCache?.set(taskId, selection);
+    }
     workflowId = selection?.workflowId;
   } catch {
     return { ir: defaultCodingWorkflowIr(), source: "default" };
@@ -16790,13 +16816,14 @@ async function isTaskTerminalNodeIdAsync(store, taskId, nodeId) {
   }
   return nodeId === "end";
 }
-var FELL_BACK_TO_DEFAULT;
+var inflightSelectionReads, FELL_BACK_TO_DEFAULT;
 var init_workflow_ir_resolver = __esm({
   "../core/src/workflows/workflow-ir-resolver.ts"() {
     "use strict";
     init_builtin_workflows();
     init_workflow_ir();
     init_workflow_prompt_overrides();
+    inflightSelectionReads = /* @__PURE__ */ new WeakMap();
     FELL_BACK_TO_DEFAULT = /* @__PURE__ */ Symbol.for("fusion.workflowIr.fellBackToDefault");
   }
 });
@@ -36417,9 +36444,12 @@ async function markApprovalRequestCompleted(layer, requestId, input) {
   });
 }
 async function getApprovalAuditHistory(handle2, requestId, projectId2) {
-  const rows = await handle2.select().from(project_exports.approvalRequestAuditEvents).where(and(eq(project_exports.approvalRequestAuditEvents.requestId, requestId), projectScopeFor(project_exports.approvalRequestAuditEvents.projectId, projectId2))).orderBy(
-    sql`${project_exports.approvalRequestAuditEvents.createdAt} ASC, ${project_exports.approvalRequestAuditEvents.id} ASC`
-  );
+  const eventType = project_exports.approvalRequestAuditEvents.eventType;
+  const lifecycleRank = sql`CASE ${eventType} ${sql.join(
+    APPROVAL_REQUEST_AUDIT_EVENT_TYPES.map((type, rank) => sql`WHEN ${type} THEN ${rank}`),
+    sql` `
+  )} ELSE ${APPROVAL_REQUEST_AUDIT_EVENT_TYPES.length} END`;
+  const rows = await handle2.select().from(project_exports.approvalRequestAuditEvents).where(and(eq(project_exports.approvalRequestAuditEvents.requestId, requestId), projectScopeFor(project_exports.approvalRequestAuditEvents.projectId, projectId2))).orderBy(sql`${project_exports.approvalRequestAuditEvents.createdAt} ASC, ${lifecycleRank} ASC, ${project_exports.approvalRequestAuditEvents.id} ASC`);
   return rows.map((row) => rowToAuditEvent(row));
 }
 var init_async_approval_request_store = __esm({
@@ -139941,17 +139971,40 @@ var init_auth_storage = __esm({
       async getApiKey(provider, instance) {
         return resolveStoredCredentialApiKey(provider, instance ? this.getInstance(instance) : this.get(provider));
       }
+      /*
+        FNXC:ProviderAuth 2026-08-18-04:40:
+        MODIFY MUST BE ABLE TO CREATE. This is the seam pi persists a COMPLETED LOGIN through
+        (`Models.login` -> `credentials.modify(provider.id, ...)` in pi-ai's models.js), not just the seam
+        it refreshes an existing token through.
+      
+        It used to resolve its write target with `creating: false` and then bail —
+        `if (!target || !this.credential(target, current)) return { changed: false }` — whenever the
+        provider had no credential row yet. The callback was never invoked, nothing was written, and pi's
+        login resolved as a SUCCESS. So a first-ever login for a provider could not be saved: the browser
+        flow completed, the token exchange succeeded, the lock file was taken and released, `auth.json`
+        stayed `{}`, and the dashboard's poll saw `authenticated: false` and reported the useless "Login
+        did not complete. Please try again."
+      
+        It looked provider-specific and environment-specific for the worst possible reason: it only
+        reproduces on a store with NO existing row, so every developer and every long-lived install — where
+        a row already exists and this path is a plain refresh — works flawlessly, while every fresh install
+        (a new container, a new machine, a wiped `~/.fusion`) can never complete its first login.
+      
+        Create when absent, update when present. A callback returning undefined still writes nothing, so
+        pi's refresh-bails-out behaviour is unchanged.
+        */
       async modify(provider, fn2) {
         this.assertRefFromKey(provider);
         return this.withLock(async (current) => {
-          const target = this.resolveWriteTarget(provider, current, false);
-          if (!target || !this.credential(target, current)) return { result: void 0, changed: false };
-          const next = await fn2(this.credential(target, current));
+          const target = this.resolveWriteTarget(provider, current, true);
+          if (!target) return { result: void 0, changed: false };
+          const existing = this.credential(target, current);
+          const next = await fn2(existing);
           if (next !== void 0) {
             current[formatProviderInstanceKey(target)] = next;
             return { result: next, changed: true };
           }
-          return { result: this.credential(target, current), changed: false };
+          return { result: existing, changed: false };
         });
       }
       getOAuthProviders() {
@@ -139964,11 +140017,24 @@ var init_auth_storage = __esm({
         if (!this.modelRuntime) throw new Error("OAuth login requires a ModelRuntime-backed Fusion auth storage");
         const executionProvider = toExecutionModelProviderId(provider);
         const legacy = callbacks;
-        const interaction = { signal: legacy.signal, prompt: async (prompt) => legacy.onPrompt?.({ message: prompt.message, placeholder: "placeholder" in prompt ? prompt.placeholder : void 0 }) ?? "", notify: (event) => {
-          if (event.type === "auth_url") legacy.onAuth?.({ url: event.url, instructions: event.instructions });
-          else if (event.type === "device_code") legacy.onDeviceCode?.(event);
-          else if (event.type === "progress") legacy.onProgress?.(event.message);
-        } };
+        const interaction = {
+          signal: legacy.signal,
+          prompt: async (prompt) => {
+            if (prompt.type === "select") {
+              const chosen = await legacy.onSelect?.({ message: prompt.message, options: prompt.options });
+              return chosen ?? prompt.options[0]?.id ?? "";
+            }
+            if (prompt.type === "manual_code" && legacy.onManualCodeInput) {
+              return await legacy.onManualCodeInput();
+            }
+            return await legacy.onPrompt?.({ message: prompt.message, placeholder: "placeholder" in prompt ? prompt.placeholder : void 0 }) ?? "";
+          },
+          notify: (event) => {
+            if (event.type === "auth_url") legacy.onAuth?.({ url: event.url, instructions: event.instructions });
+            else if (event.type === "device_code") legacy.onDeviceCode?.(event);
+            else if (event.type === "progress") legacy.onProgress?.(event.message);
+          }
+        };
         await this.modelRuntime.login(executionProvider, "oauth", interaction);
         this.reload();
       }
@@ -177671,9 +177737,9 @@ function mergeParkedColumns(base, lanes) {
     terminal: /* @__PURE__ */ new Set([...base.terminal, ...lanes.terminal ?? [], complete, archived])
   };
 }
-async function resolveTaskParkedColumns(store, taskId) {
+async function resolveTaskParkedColumns(store, taskId, selectionCache) {
   try {
-    const ir2 = await resolveWorkflowIrForTask(store, taskId);
+    const ir2 = await resolveWorkflowIrForTask(store, taskId, void 0, selectionCache);
     const l = resolveLifecycleColumns(ir2);
     const complete = l?.complete ?? LEGACY_PARKED_COLUMNS2.complete;
     const archived = l?.archived ?? LEGACY_PARKED_COLUMNS2.archived;
@@ -177918,6 +177984,7 @@ var init_scheduler = __esm({
           }
         });
         this.store.on("task:moved", async ({ task, from, to: to2, source, lanes }) => {
+          const movedSelectionCache = /* @__PURE__ */ new Map();
           this.lastAutoClaimFingerprint.set(task.id, computeAutoClaimFingerprint(task));
           const parked = mergeParkedColumns(LEGACY_PARKED_COLUMNS2, lanes);
           if (from === parked.hold || to2 === parked.hold) {
@@ -177973,7 +178040,7 @@ var init_scheduler = __esm({
               });
             }
           }
-          const resolvedParked = mergeParkedColumns(await resolveTaskParkedColumns(this.store, task.id), lanes);
+          const resolvedParked = mergeParkedColumns(await resolveTaskParkedColumns(this.store, task.id, movedSelectionCache), lanes);
           if (resolvedParked.terminal.has(to2)) {
             try {
               const settings = await this.store.getSettings();
@@ -178039,6 +178106,7 @@ var init_scheduler = __esm({
           }
         });
         this.store.on("task:updated", (task, meta2) => {
+          const updatedSelectionCache = /* @__PURE__ */ new Map();
           const nextFingerprint = computeAutoClaimFingerprint(task);
           const previousFingerprint = this.lastAutoClaimFingerprint.get(task.id);
           if (!previousFingerprint || previousFingerprint !== nextFingerprint) {
@@ -178069,7 +178137,7 @@ var init_scheduler = __esm({
               });
             }
             void (async () => {
-              const unpausedParked = await resolveTaskParkedColumns(this.store, task.id);
+              const unpausedParked = await resolveTaskParkedColumns(this.store, task.id, updatedSelectionCache);
               if (this.running && unpausedParked.wake.has(task.column)) {
                 schedulerLog.log(`Task ${task.id} unpaused \u2014 triggering scheduling`);
                 void this.schedule();
@@ -178081,7 +178149,7 @@ var init_scheduler = __esm({
           } else if (this.planningTaskIds.has(task.id)) {
             this.planningTaskIds.delete(task.id);
             void (async () => {
-              const planningParked = await resolveTaskParkedColumns(this.store, task.id);
+              const planningParked = await resolveTaskParkedColumns(this.store, task.id, updatedSelectionCache);
               if (this.running && !task.status && !task.paused && !task.userPaused && planningParked.wake.has(task.column)) {
                 schedulerLog.log(`Task ${task.id} finished planning \u2014 triggering scheduling`);
                 void this.schedule();
@@ -178094,7 +178162,7 @@ var init_scheduler = __esm({
           } else if (!task.status && !task.paused && !task.userPaused && (this.approvalHeldTaskIds.delete(task.id) || (Boolean(task.approvedPlanFingerprint) || task.workflowStepResults?.some(isPlanReviewSatisfied) === true) && !this.approvalReleasedTaskIds.has(task.id))) {
             this.approvalReleasedTaskIds.add(task.id);
             void (async () => {
-              const approvalParked = await resolveTaskParkedColumns(this.store, task.id);
+              const approvalParked = await resolveTaskParkedColumns(this.store, task.id, updatedSelectionCache);
               if (this.running && !task.status && !task.paused && !task.userPaused && approvalParked.wake.has(task.column)) {
                 schedulerLog.log(`Task ${task.id} plan approval cleared \u2014 triggering scheduling`);
                 void this.schedule();
@@ -178133,7 +178201,8 @@ var init_scheduler = __esm({
               if (settings.globalPause || settings.enginePaused) {
                 return;
               }
-              const deletedParked = await resolveTaskParkedColumns(this.store, task.id);
+              const deletedSelectionCache = /* @__PURE__ */ new Map();
+              const deletedParked = await resolveTaskParkedColumns(this.store, task.id, deletedSelectionCache);
               const deletedWipColumns = await resolveProjectColumnsForRoles(this.store, ["countsTowardWip"]);
               const todoTasks = await this.store.listTasks({ column: deletedParked.hold, slim: true });
               const inProgressById = /* @__PURE__ */ new Map();
@@ -178342,7 +178411,16 @@ var init_scheduler = __esm({
         }
       }
       async transitionQueuedEpisode(task, input) {
-        return (await this.store.transitionQueuedEpisode(task.id, input)).appended;
+        if (typeof this.store.transitionQueuedEpisode === "function") {
+          return (await this.store.transitionQueuedEpisode(task.id, input)).appended;
+        }
+        await this.store.updateTask(task.id, {
+          status: "queued",
+          blockedBy: input.blockedBy ?? null,
+          overlapBlockedBy: input.overlapBlockedBy ?? null
+        });
+        await this.logDispatchQueuedReason(task.id, input.action);
+        return true;
       }
       async logDispatchQueuedReason(taskId, reason, memoKey) {
         const key = `${taskId}:${memoKey ?? reason}`;
@@ -178394,13 +178472,14 @@ var init_scheduler = __esm({
       }
       async emitHighOverlapFanoutWarnings(tasks2) {
         const escalationIrCache = /* @__PURE__ */ new Map();
+        const escalationSelectionCache = /* @__PURE__ */ new Map();
         const escalationByTaskId = /* @__PURE__ */ new Map();
         const escalationColumns = /* @__PURE__ */ new Set();
         const holdByTaskId = /* @__PURE__ */ new Map();
         const terminalByTaskId = /* @__PURE__ */ new Map();
         const blockerReviewColumns = /* @__PURE__ */ new Set();
         for (const task of tasks2) {
-          const ir2 = await resolveWorkflowIrForTask(this.store, task.id, escalationIrCache).catch(() => void 0);
+          const ir2 = await resolveWorkflowIrForTask(this.store, task.id, escalationIrCache, escalationSelectionCache).catch(() => void 0);
           if (!ir2) continue;
           for (const id of columnsWithFlag(ir2, "countsTowardWip")) escalationColumns.add(id);
           for (const id of columnsWithFlag(ir2, "mergeOrchestration")) escalationColumns.add(id);
@@ -178470,9 +178549,10 @@ var init_scheduler = __esm({
         if (!agentStore) return;
         const runningAgents = await agentStore.listAgents({ state: "running", includeEphemeral: false });
         const linkedAgents = runningAgents.filter((agent) => agent.taskId === taskId);
+        const rollbackSelectionCache = /* @__PURE__ */ new Map();
         for (const agent of linkedAgents) {
           const activeRun = await agentStore.getActiveHeartbeatRun?.(agent.id);
-          const rollbackParked = await resolveTaskParkedColumns(this.store, taskId);
+          const rollbackParked = await resolveTaskParkedColumns(this.store, taskId, rollbackSelectionCache);
           const proof = evaluateParkedAgentTaskLink({
             agent,
             linkedTask: { column: rollbackParked.hold },
@@ -178520,11 +178600,12 @@ var init_scheduler = __esm({
           const repo = getCurrentRepo(this.store.getRootDir());
           if (!repo) return;
           const hydrationIrCache = /* @__PURE__ */ new Map();
+          const hydrationSelectionCache = /* @__PURE__ */ new Map();
           for (const task of tasks2) {
             if (!task.prInfo) continue;
             let flags;
             try {
-              const ir2 = await resolveWorkflowIrForTask(this.store, task.id, hydrationIrCache);
+              const ir2 = await resolveWorkflowIrForTask(this.store, task.id, hydrationIrCache, hydrationSelectionCache);
               const column = ir2.columns?.find((candidate) => candidate.id === task.column);
               if (column) flags = resolveColumnFlags(column);
             } catch {
@@ -179453,19 +179534,20 @@ var init_scheduler = __esm({
             return;
           }
           const sliceIdBeforeUpdate = feature.sliceId;
-          const featureSlice = await missionStore.getSlice(feature.sliceId);
-          const milestone = featureSlice ? await missionStore.getMilestone(featureSlice.milestoneId) : void 0;
-          const missionId = task.missionId ?? milestone?.missionId;
-          if (!missionId) {
-            schedulerLog.warn(`Task ${taskId} feature ${feature.id} has no resolvable mission; skipping reconciliation`);
-            return;
-          }
-          if (missionId !== task.missionId) {
-            try {
+          let missionId = task.missionId;
+          try {
+            if (!missionId && typeof missionStore.getSlice === "function") {
+              const featureSlice = await missionStore.getSlice(feature.sliceId);
+              const milestone = featureSlice && typeof missionStore.getMilestone === "function" ? await missionStore.getMilestone(featureSlice.milestoneId) : void 0;
+              missionId = milestone?.missionId;
+            }
+            if (!missionId) {
+              schedulerLog.warn(`Task ${taskId} feature ${feature.id} has no resolvable mission; skipping reconciliation`);
+            } else if (missionId !== task.missionId) {
               await reconcileMissionState({ taskStore: this.store, missionStore }, { missionId, source: "task-move" });
-            } catch (error3) {
-              schedulerLog.warn(`Mission reconciliation failed after resolving task ${taskId}; continuing mission completion handling:`, error3);
             }
+          } catch (error3) {
+            schedulerLog.warn(`Task ${taskId} feature ${feature.id} mission reconcile skipped (${String(error3)}); continuing to completion check`);
           }
           let completionFlags;
           try {
@@ -187134,7 +187216,6 @@ var init_notifier = __esm({
       }
       notifyGridlock(event) {
         if (event === null) {
-          this.lastGridlockNotificationAt = null;
           return;
         }
         if (!this.config.enabled || !this.config.topic || !this.isEventEnabled("gridlock")) return;
@@ -197950,6 +198031,63 @@ var init_agent_user_comments = __esm({
   }
 });
 
+// ../engine/src/git-identity.ts
+function slugifyAgentEmailLocalPart(value) {
+  return value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 64);
+}
+function resolveCommitIdentity(input = {}) {
+  const { agent, settings } = input;
+  if (settings?.commitAuthorEnabled === false) {
+    return void 0;
+  }
+  const configuredName = settings?.commitAuthorName?.trim();
+  const configuredEmail = settings?.commitAuthorEmail?.trim();
+  if (configuredName && configuredEmail) {
+    return { name: configuredName, email: configuredEmail };
+  }
+  const agentName = agent?.name?.trim() || agent?.id?.trim() || "";
+  if (agentName) {
+    const localPart = slugifyAgentEmailLocalPart(agentName);
+    if (localPart) {
+      return {
+        name: configuredName || `${agentName} (Fusion)`,
+        email: configuredEmail || `${localPart}@agents.fusion.local`
+      };
+    }
+  }
+  return {
+    name: configuredName || FUSION_FALLBACK_IDENTITY.name,
+    email: configuredEmail || FUSION_FALLBACK_IDENTITY.email
+  };
+}
+function commitIdentityEnv(identity) {
+  if (!identity) {
+    return {};
+  }
+  return {
+    GIT_AUTHOR_NAME: identity.name,
+    GIT_AUTHOR_EMAIL: identity.email,
+    GIT_COMMITTER_NAME: identity.name,
+    GIT_COMMITTER_EMAIL: identity.email
+  };
+}
+function commitIdentityArgs(identity) {
+  if (!identity) {
+    return [];
+  }
+  return ["-c", `user.name=${identity.name}`, "-c", `user.email=${identity.email}`];
+}
+var FUSION_FALLBACK_IDENTITY;
+var init_git_identity = __esm({
+  "../engine/src/git-identity.ts"() {
+    "use strict";
+    FUSION_FALLBACK_IDENTITY = {
+      name: "Fusion",
+      email: "noreply@runfusion.ai"
+    };
+  }
+});
+
 // ../engine/src/sandbox/bubblewrap-detect.ts
 import { exec as exec20 } from "node:child_process";
 import { promisify as promisify30 } from "node:util";
@@ -203187,8 +203325,12 @@ import { createHash as createHash29 } from "node:crypto";
 import { join as join73, resolve as resolve44 } from "node:path";
 import { hostname as hostname3 } from "node:os";
 import { Type as Type4 } from "typebox";
-function mergerCommitEnv() {
-  return { ...process.env, [IDENTITY_GUARD_BYPASS_ENV]: "1" };
+function mergerCommitEnv(identity) {
+  return {
+    ...process.env,
+    [IDENTITY_GUARD_BYPASS_ENV]: "1",
+    ...commitIdentityEnv(identity ?? resolveCommitIdentity())
+  };
 }
 async function resolveMergerLifecycleColumn(store, taskId, which) {
   const fallback = which === "complete" ? "done" : which === "merge" ? "in-review" : "todo";
@@ -211164,6 +211306,7 @@ var init_merger = __esm({
     init_worktree_hooks();
     init_effective_settings();
     init_agent_user_comments();
+    init_git_identity();
     init_verification_utils();
     init_sandbox();
     init_verification_utils();
@@ -211359,7 +211502,7 @@ function hasTerminalInvalidDoneTransition(task) {
 function isPrincipalHeldPlanningStatusOwned(status) {
   return status === null || status === void 0;
 }
-var log34, worktreeMetadataReconcileLog, yieldEventLoop2, DONE_TASK_INTEGRITY_SWEEP_LIMIT, BOARD_STALL_NOTIFICATION_COOLDOWN_MS, DB_CORRUPTION_NOTIFICATION_COOLDOWN_MS, PHANTOM_EXECUTOR_BINDING_AGE_MULTIPLIER, MAX_NO_PROGRESS_RESUME_ATTEMPTS, PRE_EXECUTION_WORKTREE_MAX_IDLE_MS, APPROVED_TRIAGE_RECOVERY_GRACE_MS, STARVED_REFINEMENT_RECOVERY_GRACE_MS, STARVED_PEER_PROGRESS_THRESHOLD, STARVED_REFINEMENT_ESCALATION_COOLDOWN_MS, ORPHANED_EXECUTION_RECOVERY_GRACE_MS, STALLED_CARD_WATCHDOG_MS, LEAKED_WORKTREE_SLOT_GRACE_MS, NON_TERMINAL_STEP_STATUSES2, STRANDED_COMPLETED_TODO_ACTIVE_STATUSES, GHOST_REVIEW_PRESERVED_STATUSES, ORPHANED_WITH_WORKTREE_GRACE_MS, MAX_TASK_DONE_RETRIES, RECONCILE_SCOPE_OVERRIDE_MERGE_ACTIVE_STATUS_SET, MAX_STARVATION_DROPS, TERMINAL_WORKSPACE_WORKTREE_TEARDOWN_MIN_IDLE_MS, DEADLOCK_RECOVERY_COOLDOWN_MS, DEFAULT_STALE_MERGING_FANOUT_MIN_AGE_MS, DEFAULT_UNBACKED_MERGING_FANOUT_GRACE_MS, DURABLE_ERROR_RECOVERY_BASE_COOLDOWN_MS, DURABLE_ERROR_RECOVERY_MAX_COOLDOWN_MS, RUNNING_ON_INACTIVE_TASK_STALE_RUN_MS, UNREADABLE_WORKFLOW_SELECTION, SelfHealingManager;
+var log34, worktreeMetadataReconcileLog, yieldEventLoop2, DONE_METADATA_REPAIR_CAP, DONE_TASK_INTEGRITY_SWEEP_LIMIT, GIT_WORKTREE_CHURN_INTERVAL_MS, BOARD_STALL_NOTIFICATION_COOLDOWN_MS, DB_CORRUPTION_NOTIFICATION_COOLDOWN_MS, PHANTOM_EXECUTOR_BINDING_AGE_MULTIPLIER, MAX_NO_PROGRESS_RESUME_ATTEMPTS, PRE_EXECUTION_WORKTREE_MAX_IDLE_MS, APPROVED_TRIAGE_RECOVERY_GRACE_MS, STARVED_REFINEMENT_RECOVERY_GRACE_MS, STARVED_PEER_PROGRESS_THRESHOLD, STARVED_REFINEMENT_ESCALATION_COOLDOWN_MS, ORPHANED_EXECUTION_RECOVERY_GRACE_MS, STALLED_CARD_WATCHDOG_MS, LEAKED_WORKTREE_SLOT_GRACE_MS, NON_TERMINAL_STEP_STATUSES2, STRANDED_COMPLETED_TODO_ACTIVE_STATUSES, GHOST_REVIEW_PRESERVED_STATUSES, ORPHANED_WITH_WORKTREE_GRACE_MS, MAX_TASK_DONE_RETRIES, RECONCILE_SCOPE_OVERRIDE_MERGE_ACTIVE_STATUS_SET, MAX_STARVATION_DROPS, TERMINAL_WORKSPACE_WORKTREE_TEARDOWN_MIN_IDLE_MS, DEADLOCK_RECOVERY_COOLDOWN_MS, DEFAULT_STALE_MERGING_FANOUT_MIN_AGE_MS, DEFAULT_UNBACKED_MERGING_FANOUT_GRACE_MS, DURABLE_ERROR_RECOVERY_BASE_COOLDOWN_MS, DURABLE_ERROR_RECOVERY_MAX_COOLDOWN_MS, RUNNING_ON_INACTIVE_TASK_STALE_RUN_MS, UNREADABLE_WORKFLOW_SELECTION, SelfHealingManager;
 var init_self_healing = __esm({
   "../engine/src/self-healing.ts"() {
     "use strict";
@@ -211422,7 +211565,9 @@ var init_self_healing = __esm({
     log34 = createLogger2("self-healing");
     worktreeMetadataReconcileLog = createLogger2("worktree-metadata-reconcile");
     yieldEventLoop2 = () => new Promise((resolve61) => setImmediateCb2(resolve61));
+    DONE_METADATA_REPAIR_CAP = 25;
     DONE_TASK_INTEGRITY_SWEEP_LIMIT = 50;
+    GIT_WORKTREE_CHURN_INTERVAL_MS = 60 * 60 * 1e3;
     BOARD_STALL_NOTIFICATION_COOLDOWN_MS = 60 * 6e4;
     DB_CORRUPTION_NOTIFICATION_COOLDOWN_MS = 60 * 60 * 1e3;
     PHANTOM_EXECUTOR_BINDING_AGE_MULTIPLIER = 3;
@@ -211478,7 +211623,10 @@ var init_self_healing = __esm({
       lastUnpauseAt = 0;
       // ── Maintenance timer ───────────────────────────────────────────────
       maintenanceInterval = null;
+      maintenanceStarting = false;
       maintenanceRunning = false;
+      /** Last wall-clock a batch-1 git-churn pass ran on this manager (coarse-cadence gate). */
+      lastGitWorktreeChurnAt = 0;
       /** In-process belt only; the durable apply token remains the cross-process fence. */
       autoRecoverTerminalFailuresInFlight = false;
       // ── Event listener cleanup ──────────────────────────────────────────
@@ -212376,6 +212524,7 @@ var init_self_healing = __esm({
       }
       // ── Auto-unpause ───────────────────────────────────────────────────
       onSettingsUpdated(settings, previous) {
+        this.syncMaintenanceOnRefresh(settings);
         if (!previous.globalPause && settings.globalPause) {
           if (!settings.autoUnpauseEnabled) {
             log34.log("Global pause activated \u2014 auto-unpause disabled, requires manual intervention");
@@ -212559,6 +212708,7 @@ var init_self_healing = __esm({
               try {
                 await this.store.moveTask(taskId, await resolveReboundTargetForTask(this.store, taskId), {
                   preserveProgress: true,
+                  preserveWorktree: true,
                   preserveStatus: true,
                   // #1411: backward recovery — skip order-derived adjacency.
                   moveSource: "engine",
@@ -212639,7 +212789,23 @@ var init_self_healing = __esm({
       }
       // ── Periodic maintenance ──────────────────────────────────────────
       async startMaintenance() {
+        if (this.maintenanceInterval) return;
+        if (this.maintenanceStarting) return;
+        this.maintenanceStarting = true;
+        try {
+          await this.armMaintenanceInternal();
+        } finally {
+          this.maintenanceStarting = false;
+        }
+      }
+      async armMaintenanceInternal() {
+        if (this.maintenanceInterval) return;
         const settings = await this.store.getSettings();
+        if (this.maintenanceInterval) return;
+        if (settings.globalPause || settings.enginePaused) {
+          log34.debug("Periodic maintenance not armed \u2014 engine/global pause is active");
+          return;
+        }
         const intervalMs = settings.maintenanceIntervalMs ?? 9e5;
         if (intervalMs <= 0) {
           log34.debug("Periodic maintenance disabled (maintenanceIntervalMs <= 0)");
@@ -212650,6 +212816,38 @@ var init_self_healing = __esm({
           void this.runMaintenance();
         }, intervalMs);
       }
+      /*
+       * FNXC:PauseGatedMaintenance 2026-08-13-03:08 (RUFU-076):
+       * Keep the periodic maintenance timer in sync with the engine/global pause state. `onSettingsUpdated`
+       * calls this on every settings:updated event; pausing clears the armed timer (stopping the git churn),
+       * unpausing (re)arms it idempotently via `startMaintenance`'s guard. This is the only writer of the
+       * pause->stop-maintenance transition besides `stop()` teardown.
+       */
+      /*
+       * FNXC:GitWorktreeChurnCadenceCoarsen 2026-08-13-04:05 (RUFU-076):
+       * Coarse-cadence gate for batch-1 git-churn steps. Returns true only when a full coarse window
+       * (hourly) has elapsed since the last batch-1 git-worktree pass, so an idle/healthy active project
+       * does not re-run `git worktree prune` / `git worktree list` / `git branch` on every maintenance
+       * interval. Note the shared timestamp also bounds cleanup-orphaned-branches and enforce-worktree-cap
+       * even though they live further down batch-1.
+       */
+      isGitWorktreeChurnDue() {
+        return Date.now() - this.lastGitWorktreeChurnAt >= GIT_WORKTREE_CHURN_INTERVAL_MS;
+      }
+      syncMaintenanceOnRefresh(settings) {
+        const paused = settings.globalPause || settings.enginePaused;
+        if (paused) {
+          if (this.maintenanceInterval) {
+            clearInterval(this.maintenanceInterval);
+            this.maintenanceInterval = null;
+            log34.debug("Periodic maintenance paused \u2014 cleared maintenance timer");
+          }
+          return;
+        }
+        if (!this.maintenanceInterval) {
+          void this.startMaintenance();
+        }
+      }
       /*
       FNXC:CrossProcessDeleteObservation 2026-08-01-11:39:
       Periodic self-healing owns outbox retention. Each already-open PostgreSQL project is gated to
@@ -212986,17 +213184,26 @@ var init_self_healing = __esm({
         log34.debug("Maintenance cycle starting");
         try {
           const settings = await this.store.getSettings();
+          const maintenancePaused = settings.globalPause || settings.enginePaused;
+          const gitWorktreeChurnDue = this.isGitWorktreeChurnDue();
+          if (!maintenancePaused && gitWorktreeChurnDue) {
+            this.lastGitWorktreeChurnAt = Date.now();
+          }
           const batch1Fns = [
-            { name: "prune-worktrees", fn: () => this.pruneWorktrees() },
+            {
+              name: "prune-worktrees",
+              fn: () => maintenancePaused || !gitWorktreeChurnDue ? Promise.resolve(0) : this.pruneWorktrees()
+            },
             {
               name: "prune-task-lifecycle-events",
               fn: async () => this.pruneTaskLifecycleEventsForMaintenance()
             },
             { name: "prune-github-check-states", fn: async () => this.pruneGitHubCheckStatesForMaintenance() },
-            { name: "cleanup-orphans", fn: () => this.cleanupOrphans() },
+            { name: "cleanup-orphans", fn: () => maintenancePaused || !gitWorktreeChurnDue ? Promise.resolve(0) : this.cleanupOrphans() },
             {
               name: "cleanup-stale-temp-merge-worktrees",
               fn: async () => {
+                if (maintenancePaused || !gitWorktreeChurnDue) return 0;
                 const cleaned = await this.cleanupStaleTempMergeWorktrees();
                 if (cleaned > 0) {
                   log34.debug(`Cleaned ${cleaned} stale AI merge temp worktree(s)`);
@@ -213004,7 +213211,10 @@ var init_self_healing = __esm({
                 return cleaned;
               }
             },
-            { name: "cleanup-orphaned-branches", fn: () => this.cleanupOrphanedBranches() },
+            {
+              name: "cleanup-orphaned-branches",
+              fn: () => maintenancePaused || !gitWorktreeChurnDue ? Promise.resolve(0) : this.cleanupOrphanedBranches()
+            },
             {
               name: "reconcile-orphaned-task-dirs",
               fn: async () => {
@@ -213112,7 +213322,7 @@ var init_self_healing = __esm({
             },
             { name: "fts-maintenance", fn: () => this.maintainTaskFts() },
             { name: "checkpoint-wal", fn: () => Promise.resolve(this.checkpointWal()) },
-            { name: "enforce-worktree-cap", fn: () => this.enforceWorktreeCap() }
+            { name: "enforce-worktree-cap", fn: () => maintenancePaused || !gitWorktreeChurnDue ? Promise.resolve(0) : this.enforceWorktreeCap() }
           ];
           for (const fn2 of batch1Fns) {
             try {
@@ -214394,6 +214604,7 @@ var init_self_healing = __esm({
                         moveSource: "engine",
                         // #1411: backward recovery — skip order-derived adjacency.
                         recoveryRehome: true,
+                        // worktree-discard-intended: reclaim proved the branch already merged / has zero unique commits; the checkout holds nothing worth keeping and worktree was explicitly nulled above.
                         preserveProgress: true,
                         preserveResumeState: true
                       });
@@ -214484,6 +214695,7 @@ var init_self_healing = __esm({
                           moveSource: "engine",
                           // #1411: backward recovery — skip order-derived adjacency.
                           recoveryRehome: true,
+                          // worktree-discard-intended: reclaim proved the branch already merged / has zero unique commits; the checkout holds nothing worth keeping and worktree was explicitly nulled above.
                           preserveProgress: true,
                           preserveResumeState: true
                         });
@@ -215280,7 +215492,18 @@ var init_self_healing = __esm({
             const withUniqueWork = existingCandidates.filter((candidate) => candidate.aheadCount > 0);
             if (withUniqueWork.length === 1) {
               const selected = withUniqueWork[0];
-              const patch = { branch: selected.branch, worktree: null };
+              let preservedWorktree = false;
+              if (task.worktree && existsSync59(task.worktree)) {
+                try {
+                  const { stdout } = await execAsync18("git rev-parse --abbrev-ref HEAD", {
+                    cwd: task.worktree,
+                    timeout: 3e4
+                  });
+                  preservedWorktree = stdout.trim() === selected.branch;
+                } catch {
+                }
+              }
+              const patch = preservedWorktree ? { branch: selected.branch } : { branch: selected.branch, worktree: null };
               if (!task.baseCommitSha) {
                 const derivedBaseCommit = (await execAsync18(
                   `git merge-base ${shellQuote2(integrationBase)} ${shellQuote2(selected.branch)}`,
@@ -215319,7 +215542,8 @@ var init_self_healing = __esm({
                   aheadCount: selected.aheadCount,
                   integrationBase,
                   source: "auto-rebind-in-review",
-                  previousBranch: task.branch ?? null
+                  previousBranch: task.branch ?? null,
+                  preservedWorktree
                 }
               });
               result2.repaired++;
@@ -215329,7 +215553,8 @@ var init_self_healing = __esm({
                 branch: selected.branch,
                 aheadCount: selected.aheadCount,
                 integrationBase,
-                previousBranch: task.branch ?? null
+                previousBranch: task.branch ?? null,
+                preservedWorktree
               });
               continue;
             }
@@ -216861,7 +217086,8 @@ var init_self_healing = __esm({
                   */
                   recoveryRehome: true,
                   bypassGuards: true,
-                  preserveProgress: true
+                  preserveProgress: true,
+                  preserveWorktree: true
                 });
                 rehomed += 1;
                 await createRunAuditor(this.store, {
@@ -217499,7 +217725,7 @@ var init_self_healing = __esm({
                 await this.emitBackwardMoveNoAction(task, "finalize-no-op-review", "task:finalize-no-op-review-no-action", proof);
                 continue;
               }
-              await this.store.moveTask(task.id, await resolveReboundTargetForTask(this.store, task.id), { preserveProgress: true, moveSource: "engine", recoveryRehome: true });
+              await this.store.moveTask(task.id, await resolveReboundTargetForTask(this.store, task.id), { preserveProgress: true, preserveWorktree: true, moveSource: "engine", recoveryRehome: true });
               continue;
             }
             const mergedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -217549,7 +217775,7 @@ var init_self_healing = __esm({
                   baseRef: classification.baseRef,
                   lane: "self-healing-finalize-no-op-review"
                 });
-                await this.store.moveTask(task.id, await resolveReboundTargetForTask(this.store, task.id), { preserveProgress: true, moveSource: "engine", recoveryRehome: true });
+                await this.store.moveTask(task.id, await resolveReboundTargetForTask(this.store, task.id), { preserveProgress: true, preserveWorktree: true, moveSource: "engine", recoveryRehome: true });
                 recovered++;
                 continue;
               }
@@ -217568,7 +217794,7 @@ var init_self_healing = __esm({
                   classification: "proven-no-op",
                   baseRef: classification.baseRef
                 });
-                await this.store.moveTask(task.id, await resolveReboundTargetForTask(this.store, task.id), { preserveProgress: true, moveSource: "engine", recoveryRehome: true });
+                await this.store.moveTask(task.id, await resolveReboundTargetForTask(this.store, task.id), { preserveProgress: true, preserveWorktree: true, moveSource: "engine", recoveryRehome: true });
                 recovered++;
                 continue;
               }
@@ -218111,7 +218337,7 @@ var init_self_healing = __esm({
                 task.id,
                 "Auto-recovered: in-review task still had incomplete steps \u2014 moved back to todo for retry"
               );
-              await this.store.moveTask(task.id, await resolveReboundTargetForTask(this.store, task.id), { preserveProgress: true, moveSource: "engine", recoveryRehome: true });
+              await this.store.moveTask(task.id, await resolveReboundTargetForTask(this.store, task.id), { preserveProgress: true, preserveWorktree: true, moveSource: "engine", recoveryRehome: true });
               log34.log(`Recovered stale incomplete review task ${task.id}: moved back to todo`);
               recovered++;
             } catch (err) {
@@ -218505,7 +218731,7 @@ var init_self_healing = __esm({
                 task.id,
                 "Auto-recovered: in-review task idle past stuck-task timeout \u2014 kicked back to todo"
               );
-              await this.store.moveTask(task.id, await resolveReboundTargetForTask(this.store, task.id), { preserveProgress: true, moveSource: "engine", recoveryRehome: true });
+              await this.store.moveTask(task.id, await resolveReboundTargetForTask(this.store, task.id), { preserveProgress: true, preserveWorktree: true, moveSource: "engine", recoveryRehome: true });
               log34.log(`Kicked ghost review task ${task.id} back to todo`);
               recovered++;
             } catch (err) {
@@ -219429,8 +219655,9 @@ var init_self_healing = __esm({
             return Boolean(task.baseCommitSha);
           });
           if (candidates.length === 0) return 0;
+          const batch = candidates.slice(0, DONE_METADATA_REPAIR_CAP);
           let repaired = 0;
-          for (const task of candidates) {
+          for (const task of batch) {
             if (isWorkspaceTask(task)) continue;
             if (task.mergeDetails?.landedFilesAttributionRestricted || task.mergeDetails?.noOpVerifiedShortCircuit) {
               log34.debug(`recoverDoneTaskMergeMetadata: skipped ${task.id} \u2014 attribution-restricted`);
@@ -221087,7 +221314,7 @@ var init_self_healing = __esm({
                 nextRecoveryAt: new Date(Date.now() + delayMs).toISOString()
               },
               targetColumn: await resolveReboundTargetForTask(this.store, task.id),
-              moveOptions: { preserveProgress: true, moveSource: "engine" }
+              moveOptions: { preserveProgress: true, preserveWorktree: true, moveSource: "engine" }
             });
             if (applied.outcome === "applied") {
               await this.store.logEntry(task.id, `Auto-recovered generic terminal failure (attempt ${claim.attempt}/${MAX_TERMINAL_FAILURE_AUTO_RETRIES})`);
@@ -221229,6 +221456,7 @@ var init_self_healing = __esm({
               if (route.kind === "node-requeue" && fresh.column !== requeueTarget) {
                 await this.store.moveTask(task.id, requeueTarget, {
                   preserveProgress: true,
+                  preserveWorktree: true,
                   moveSource: "engine",
                   recoveryRehome: true
                 });
@@ -221462,6 +221690,7 @@ var init_self_healing = __esm({
                   const leaseRecovered = await this.options.leaseManager.recoverAbandonedLease(
                     task.id,
                     `in-progress limbo: ${describeWorktreeState(task)} + null branch`,
+                    // worktree-discard-intended: limbo recovery — the worktree is already missing or its metadata cleared; there is no live checkout to hold.
                     { preserveProgress: true }
                   );
                   if (!leaseRecovered) {
@@ -222647,7 +222876,7 @@ var init_self_healing = __esm({
                 task.id,
                 `Auto-retry ${nextCount}/${MAX_TASK_DONE_RETRIES}: agent finished without fn_task_done \u2014 requeuing to todo to resume partial work`
               );
-              await this.store.moveTask(task.id, await resolveReboundTargetForTask(this.store, task.id), { preserveProgress: true, moveSource: "engine", recoveryRehome: true });
+              await this.store.moveTask(task.id, await resolveReboundTargetForTask(this.store, task.id), { preserveProgress: true, preserveWorktree: true, moveSource: "engine", recoveryRehome: true });
               recovered++;
             } catch (err) {
               const errorMessage2 = err instanceof Error ? err.message : String(err);
@@ -260484,7 +260713,7 @@ async function ensureCommitTaskMetadata(mergeRoot, taskId, includeTaskId, traile
   const needsPrefix = includeTaskId && !subject.toLowerCase().startsWith(taskId.toLowerCase());
   const missingTrailers = trailers.filter((t) => !fullMessage.includes(t));
   if (!needsPrefix && missingTrailers.length === 0) return;
-  const args = ["-c", "trailer.ifExists=addIfDifferent", "commit", "--amend"];
+  const args = [...commitIdentityArgs(resolveCommitIdentity()), "-c", "trailer.ifExists=addIfDifferent", "commit", "--amend"];
   if (needsPrefix) {
     args.push("-m", `${taskId}: ${subject}`);
     if (body.trim()) args.push("-m", body);
@@ -262119,6 +262348,7 @@ var execFileAsync25, aiMergeLog, MAX_CONCURRENT_ADVANCE_RETRIES, AiMergeBlockedE
 var init_merger_ai = __esm({
   "../engine/src/merge/merger-ai.ts"() {
     "use strict";
+    init_git_identity();
     init_src2();
     init_agent_user_comments();
     init_worktree_names();
@@ -264897,7 +265127,7 @@ function defaultGitOps(cwd) {
       await runGit8(cwd, ["add", ...paths3]);
     },
     async commit(message) {
-      await runGit8(cwd, ["commit", "-m", JSON.stringify(message)]);
+      await runGit8(cwd, [...commitIdentityArgs(resolveCommitIdentity()), "commit", "-m", JSON.stringify(message)]);
       return await runGit8(cwd, ["rev-parse", "HEAD"]);
     },
     async resetHard(ref) {
@@ -264975,6 +265205,7 @@ var execAsync55, GIT_TIMEOUT_MS10, GIT_MAX_BUFFER8;
 var init_git_ops = __esm({
   "../engine/src/experiment/git-ops.ts"() {
     "use strict";
+    init_git_identity();
     init_finalize_types();
     execAsync55 = promisify81(exec59);
     GIT_TIMEOUT_MS10 = 3e4;