@adhdev/daemon-core 0.9.82-rc.211 → 0.9.82-rc.213

package/dist/providers/spec/driver.d.ts

@@ -146,6 +146,10 @@ export declare class SpecDriver {
     private completionIdleKey;
     /** Previous screen lines — passed to evaluate() for `changed` condition detection. */
     private prevScreenLines;
+    /** Timestamp of the last PTY frame that changed the screen content.
+     *  Used by screen_active_hold_ms to suppress idle downshifts while
+     *  the terminal is still actively updating. */
+    private lastScreenChangedAt;
     /** Timer that re-runs evaluate() once the hold window expires. Needed
      *  because the PTY stops emitting once the agent finishes; without an
      *  explicit wake-up there's nothing to trigger the busy → idle

package/dist/providers/spec/schema.gen.d.ts

@@ -755,6 +755,10 @@ export declare const SCHEMA_V3: {
                     readonly type: "integer";
                     readonly minimum: 0;
                 };
+                readonly screen_active_hold_ms: {
+                    readonly type: "integer";
+                    readonly minimum: 0;
+                };
                 readonly completion_marker: {
                     readonly type: "object";
                     readonly additionalProperties: false;
@@ -1451,6 +1455,10 @@ export declare const SCHEMA: {
                     readonly type: "integer";
                     readonly minimum: 0;
                 };
+                readonly screen_active_hold_ms: {
+                    readonly type: "integer";
+                    readonly minimum: 0;
+                };
                 readonly completion_marker: {
                     readonly type: "object";
                     readonly additionalProperties: false;

package/dist/providers/spec/types.d.ts

@@ -225,6 +225,11 @@ export interface CliSpec {
         busy_hold_ms?: number;
         idle_hold_ms?: number;
         startup_grace_ms?: number;
+        /** Suppress idle downshift while the screen is actively changing.
+         *  When set, any PTY frame that changes the screen resets a timer;
+         *  idle transitions (busy_hold expiry and completion_idle_after) are
+         *  blocked until the screen has been stable for this many ms. */
+        screen_active_hold_ms?: number;
         completion_marker?: {
             section?: string;
             matches: string;
@@ -243,6 +248,7 @@ export interface CliSpec {
         busy_hold_ms?: number;
         idle_hold_ms?: number;
         startup_grace_ms?: number;
+        screen_active_hold_ms?: number;
         /**
          * Legacy field name for completion_marker. Populated by the loader
          * from `timing.completion_marker` for backward compat.

package/dist/repo-mesh-types.d.ts

@@ -70,6 +70,14 @@ export interface RepoMeshNode {
 export type RepoMeshNodeHealth = 'online' | 'offline' | 'degraded' | 'dirty' | 'wrong_branch' | 'unknown';
 export type RepoMeshSessionCleanupMode = 'preserve' | 'stop' | 'delete_stopped' | 'stop_and_delete';
 export type RepoMeshSpawnedSessionVisibility = 'visible' | 'hidden';
+export interface RepoMeshAutoFastForwardPolicy {
+    /** Defaults to true. Set false to disable daemon-initiated idle fast-forwards. */
+    enabled: boolean;
+    /** Maximum behind count eligible for automatic fast-forward. Missing means no limit. */
+    maxBehind?: number;
+    /** Defaults to true. Require submodule status to be clean before automatic fast-forward. */
+    requireCleanSubmodules?: boolean;
+}
 export interface RepoMeshPolicy {
     requirePreTaskCheckpoint: boolean;
     requirePostTaskCheckpoint: boolean;
@@ -97,6 +105,11 @@ export interface RepoMeshPolicy {
      * runtimes are never stopped/deleted unless the mesh owner opts in.
      */
     sessionCleanupOnNodeRemove?: RepoMeshSessionCleanupMode;
+    /**
+     * Daemon-initiated fast-forward for idle clean nodes that are only behind
+     * their tracked upstream. Defaults to enabled.
+     */
+    autoFastForward?: RepoMeshAutoFastForwardPolicy;
     /**
      * Maximum number of automatic retry recommendations for a failed task on the
      * same node before the daemon advises the coordinator to escalate or reassign.
@@ -358,6 +371,10 @@ export interface RepoMeshNodeStatus {
     activeSessionDetails?: RepoMeshSessionStatus[];
     providerPriority?: string[];
     launchReady?: boolean;
+    /** True when the node is clean, ahead=0, behind>0, and safe for fast-forward consideration. */
+    autoFastForwardEligible?: boolean;
+    /** Coordinator-facing suggestion for obvious clean catch-up work. */
+    suggestedAction?: 'auto_fast_forward';
     worktreeBootstrap?: LocalMeshNodeEntry['worktreeBootstrap'];
     launchBlockedReason?: string;
     launchBlockedMessage?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.211",
+  "version": "0.9.82-rc.213",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/commands/router.ts

@@ -669,6 +669,25 @@ function getGitSubmoduleDriftState(git: Record<string, unknown> | null | undefin
     return { dirty, outOfSync };
 }
 
+function isInlineMeshAutoFastForwardEligible(git: Record<string, unknown> | null | undefined): boolean {
+    if (!git) return false;
+    if (readBooleanValue(git.isGitRepo) !== true) return false;
+    if (!readStringValue(git.branch)) return false;
+    if (!readStringValue(git.upstream)) return false;
+    const upstreamStatus = readStringValue(git.upstreamStatus, git.upstream_status);
+    if (upstreamStatus !== 'fresh') return false;
+    if ((readNumberValue(git.ahead) ?? 0) !== 0) return false;
+    if ((readNumberValue(git.behind) ?? 0) <= 0) return false;
+    const hasConflicts = readBooleanValue(git.hasConflicts)
+        ?? (Array.isArray(git.conflictFiles) && git.conflictFiles.length > 0);
+    if (hasConflicts) return false;
+    if ((readNumberValue(git.stashCount, git.stash_count) ?? 0) > 0) return false;
+    const submoduleDrift = getGitSubmoduleDriftState(git);
+    if (submoduleDrift.dirty || submoduleDrift.outOfSync) return false;
+    const dirty = readBooleanValue(git.dirty) ?? (countGitWorktreeChanges(git) > 0);
+    return dirty !== true && countGitWorktreeChanges(git) === 0;
+}
+
 function deriveMeshNodeHealthFromGit(git: Record<string, unknown> | null | undefined): 'online' | 'dirty' | 'degraded' {
     if (!git || readBooleanValue(git.isGitRepo) === false) return 'degraded';
     const branch = readStringValue(git.branch);
@@ -815,6 +834,12 @@ function applyInlineMeshBranchConvergence(mesh: any, node: any, status: Record<s
     status.isDirty = uncommittedChanges > 0;
     status.uncommittedChanges = uncommittedChanges;
     status.branchConvergence = buildInlineMeshBranchConvergence({ mesh, node, status });
+    status.autoFastForwardEligible = isInlineMeshAutoFastForwardEligible(git);
+    if (status.autoFastForwardEligible) {
+        status.suggestedAction = 'auto_fast_forward';
+    } else {
+        delete status.suggestedAction;
+    }
 }
 
 function summarizeInlineMeshBranchConvergence(nodes: Array<Record<string, unknown>>): Record<string, unknown> {

package/src/config/mesh-config.ts

@@ -95,7 +95,17 @@ const SESSION_CLEANUP_MODES = new Set(['preserve', 'stop', 'delete_stopped', 'st
 const SPAWNED_SESSION_VISIBILITY_MODES = new Set(['visible', 'hidden']);
 
 function mergeMeshPolicy(base: RepoMeshPolicy | undefined, patch: Partial<RepoMeshPolicy> | undefined): RepoMeshPolicy {
-    const policy: RepoMeshPolicy = { ...DEFAULT_MESH_POLICY, ...(base || {}), ...(patch || {}) };
+    const autoFastForward = normalizeAutoFastForwardPolicy({
+        ...DEFAULT_MESH_POLICY.autoFastForward,
+        ...((base?.autoFastForward && typeof base.autoFastForward === 'object') ? base.autoFastForward : {}),
+        ...((patch?.autoFastForward && typeof patch.autoFastForward === 'object') ? patch.autoFastForward : {}),
+    });
+    const policy: RepoMeshPolicy = {
+        ...DEFAULT_MESH_POLICY,
+        ...(base || {}),
+        ...(patch || {}),
+        autoFastForward,
+    };
     if (!['block', 'warn', 'checkpoint_then_continue'].includes(policy.dirtyWorkspaceBehavior)) {
         policy.dirtyWorkspaceBehavior = 'warn';
     }
@@ -111,6 +121,18 @@ function mergeMeshPolicy(base: RepoMeshPolicy | undefined, patch: Partial<RepoMe
     return policy;
 }
 
+function normalizeAutoFastForwardPolicy(value: unknown): NonNullable<RepoMeshPolicy['autoFastForward']> {
+    const record = value && typeof value === 'object' && !Array.isArray(value)
+        ? value as Record<string, unknown>
+        : {};
+    const maxBehind = Number(record.maxBehind);
+    return {
+        enabled: record.enabled !== false,
+        ...(Number.isFinite(maxBehind) && maxBehind >= 0 ? { maxBehind: Math.floor(maxBehind) } : {}),
+        requireCleanSubmodules: record.requireCleanSubmodules !== false,
+    };
+}
+
 export function listMeshes(): LocalMeshEntry[] {
     return loadMeshConfig().meshes;
 }

package/src/mesh/mesh-events-coordinator.ts

@@ -349,6 +349,39 @@ function isDirtyNode(node: any): boolean {
     return node?.health === 'dirty' || node?.git?.dirty === true;
 }
 
+function resolveAutoFastForwardPolicy(mesh: any): { enabled: boolean; maxBehind?: number; requireCleanSubmodules: boolean } {
+    const record = mesh?.policy?.autoFastForward && typeof mesh.policy.autoFastForward === 'object' && !Array.isArray(mesh.policy.autoFastForward)
+        ? mesh.policy.autoFastForward as Record<string, unknown>
+        : {};
+    const maxBehind = Number(record.maxBehind);
+    return {
+        enabled: record.enabled !== false,
+        ...(Number.isFinite(maxBehind) && maxBehind >= 0 ? { maxBehind: Math.floor(maxBehind) } : {}),
+        requireCleanSubmodules: record.requireCleanSubmodules !== false,
+    };
+}
+
+function sessionStateLooksActive(state: any): boolean {
+    const status = readNonEmptyString(state?.status).toLowerCase();
+    const chatStatus = readNonEmptyString(state?.activeChat?.status).toLowerCase();
+    const active = new Set(['generating', 'streaming', 'long_generating', 'working', 'starting', 'waiting_approval']);
+    return active.has(status) || active.has(chatStatus);
+}
+
+function nodeHasActiveMeshWork(components: DaemonComponents, meshId: string, nodeId: string, currentSessionId?: string): boolean {
+    if (nodeHasActiveAssignment(meshId, nodeId)) return true;
+    return components.instanceManager.getByCategory('cli').some((inst: any) => {
+        const state = inst.getState();
+        const settings = state.settings as Record<string, unknown> || {};
+        if (readNonEmptyString(settings.meshNodeFor) !== meshId) return false;
+        const instNodeId = readNonEmptyString(settings.meshNodeId) || readNonEmptyString(settings.nodeId);
+        if (instNodeId !== nodeId) return false;
+        const sessionId = readNonEmptyString(state.instanceId);
+        if (currentSessionId && sessionId === currentSessionId && isIdleSessionState(state)) return false;
+        return sessionStateLooksActive(state);
+    });
+}
+
 function isLaunchableNode(node: any): boolean {
     if (!node || node.status === 'disabled' || node.status === 'removed') return false;
     const health = readNonEmptyString(node.health).toLowerCase();
@@ -759,6 +792,10 @@ async function maybeAutoFastForwardIdleNode(components: DaemonComponents, args:
     if (!workspace) return;
     if (!existsSync(workspace)) return;
 
+    const policy = resolveAutoFastForwardPolicy(mesh);
+    if (!policy.enabled) return;
+    if (nodeHasActiveMeshWork(components, args.meshId, args.nodeId, args.sessionId)) return;
+
     const throttleKey = `${args.meshId}:${args.nodeId}`;
     const now = Date.now();
     const lastAttempt = idleAutoFastForwardLastAttempt.get(throttleKey) || 0;
@@ -780,6 +817,12 @@ async function maybeAutoFastForwardIdleNode(components: DaemonComponents, args:
             trigger: 'idle_auto',
         });
         if (!dryRun || dryRun.code !== 'fast_forward_available' || dryRun.allowed !== true) return;
+        const behind = Number(dryRun.current?.behind);
+        if (policy.maxBehind !== undefined && Number.isFinite(behind) && behind > policy.maxBehind) return;
+        if (policy.requireCleanSubmodules) {
+            const submodules = Array.isArray(dryRun.current?.submodules) ? dryRun.current.submodules : [];
+            if (submodules.some((submodule: any) => submodule?.dirty || submodule?.outOfSync || submodule?.error)) return;
+        }
         await fastForwardMeshNode({
             meshId: args.meshId,
             nodeId: args.nodeId,

package/src/mesh/mesh-events-utils.ts

@@ -38,12 +38,14 @@ function formatCompletionMetadata(event: Record<string, unknown>): string {
     const finalAssistantPresent = typeof completionDiagnostic?.finalAssistantPresent === 'boolean'
         ? String(completionDiagnostic.finalAssistantPresent)
         : '';
+    const evidenceLevel = readNonEmptyString(event.evidenceLevel);
     const parts = [
         readNonEmptyString(event.targetSessionId) ? `session_id=${readNonEmptyString(event.targetSessionId)}` : '',
         readNonEmptyString(event.providerType) ? `provider=${readNonEmptyString(event.providerType)}` : '',
         readNonEmptyString(event.providerSessionId) ? `provider_session_id=${readNonEmptyString(event.providerSessionId)}` : '',
         diagnosticReason ? `completion_diagnostic=${diagnosticReason}` : '',
         finalAssistantPresent ? `final_assistant=${finalAssistantPresent}` : '',
+        evidenceLevel && evidenceLevel !== 'sufficient' ? `evidence_level=${evidenceLevel}` : '',
     ].filter(Boolean);
     return parts.length > 0 ? ` (${parts.join('; ')})` : '';
 }
@@ -59,7 +61,10 @@ export function buildMeshSystemMessage(args: {
         if (args.metadataEvent.source === 'long_generating_reconciliation') {
             return `[System] ${args.nodeLabel} already has completion evidence${metadata}. The long-generating monitor reconciled the terminal handoff and marked the session complete; wait for the queued completion event/status refresh before doing any manual transcript check.`;
         }
-        return `[System] ${args.nodeLabel} has completed its task and is now idle${metadata}. This completion came from the agent status event path; use mesh_read_chat once to review its final progress, but do not poll repeatedly.`;
+        const reviewNote = args.metadataEvent.reviewRecommended === true
+            ? ' Completion evidence is insufficient — verify via git status or provider_session_id before assuming the task is done. Use mesh_read_chat once if needed, but do not poll repeatedly.'
+            : ' Use mesh_read_chat once to review its final progress, but do not poll repeatedly.';
+        return `[System] ${args.nodeLabel} has completed its task and is now idle${metadata}. This completion came from the agent status event path;${reviewNote}`;
     }
     if (args.event === 'agent:waiting_approval') {
         return `[System] ${args.nodeLabel} is waiting for approval to proceed${metadata}. You may use mesh_read_chat and mesh_approve to handle it.`;

package/src/providers/cli-provider-instance.ts

@@ -1544,9 +1544,10 @@ export class CliProviderInstance implements ProviderInstance {
                     message: typeof modal?.message === 'string' ? modal.message.trim() : '',
                     buttons: Array.isArray(modal?.buttons) ? modal.buttons.map((button: unknown) => String(button).trim()) : [],
                 });
-                // PTY redraws can briefly leave waiting_approval and then re-enter it.
-                // Keep one coordinator event per logical modal until the turn completes.
-                if (this.lastStatus !== 'waiting_approval' && approvalFingerprint !== this.lastApprovalEventFingerprint) {
+                // PTY redraws repeat the same modal content; fingerprint dedup prevents duplicate events.
+                // Do NOT also gate on lastStatus: consecutive approvals can arrive waiting_approval→waiting_approval
+                // (e.g. antigravity-cli resolves one prompt and immediately shows the next) and would be silently dropped.
+                if (approvalFingerprint !== this.lastApprovalEventFingerprint) {
                     this.lastApprovalEventFingerprint = approvalFingerprint;
                     this.appendRuntimeSystemMessage(
                         this.formatApprovalRequestMessage(modal?.message, modal?.buttons),

package/src/providers/spec/driver.ts

@@ -230,6 +230,10 @@ export class SpecDriver {
     private completionIdleKey = '';
     /** Previous screen lines — passed to evaluate() for `changed` condition detection. */
     private prevScreenLines: string[] = [];
+    /** Timestamp of the last PTY frame that changed the screen content.
+     *  Used by screen_active_hold_ms to suppress idle downshifts while
+     *  the terminal is still actively updating. */
+    private lastScreenChangedAt = 0;
     /** Timer that re-runs evaluate() once the hold window expires. Needed
      *  because the PTY stops emitting once the agent finishes; without an
      *  explicit wake-up there's nothing to trigger the busy → idle
@@ -470,9 +474,14 @@ export class SpecDriver {
     private reevaluate(forceEmit = false): void {
         const screen = this.adapter.snapshot();
         const cursor = this.adapter.getCursorPosition();
+        const currentLines = screen.split('\n').map(l => l.endsWith('\r') ? l.slice(0, -1) : l);
         const ev = evaluate(this.spec, screen, cursor, this.prevScreenLines.length > 0 ? this.prevScreenLines : undefined);
+        // Track when the screen last changed for screen_active_hold_ms.
+        if (this.prevScreenLines.length > 0 && currentLines.join('\n') !== this.prevScreenLines.join('\n')) {
+            this.lastScreenChangedAt = Date.now();
+        }
         // Update prevScreenLines for next evaluation's `changed` condition detection.
-        this.prevScreenLines = screen.split('\n').map(l => l.endsWith('\r') ? l.slice(0, -1) : l);
+        this.prevScreenLines = currentLines;
 
         // Busy hold: many TUIs flicker between busy and idle every frame
         // (claude in particular — its token counter appears and disappears
@@ -513,6 +522,7 @@ export class SpecDriver {
             }
         }
         const completionIdleRule = this.spec.debounce?.completion_idle_after;
+        const screenActiveHoldMs = this.spec.debounce?.screen_active_hold_ms;
         let busyWakeMs = busyHoldMs;
         // Don't fire completion_idle_after while in a modal state (approval,
         // picker, etc.) or within a grace period after leaving one.  Two cases:
@@ -525,7 +535,18 @@ export class SpecDriver {
         const now = Date.now();
         const recentlyInModal = isModalState(this.currentStateId) || (this.lastModalAt > 0 && now - this.lastModalAt < postModalGraceMs);
         const recentlyLeftModal = !recentlyInModal && this.lastModalExitAt > 0 && now - this.lastModalExitAt < postModalGraceMs;
-        if (evState.id === 'busy' && completionIdleRule && !recentlyInModal && !recentlyLeftModal) {
+        // screen_active_hold_ms: suppress idle downshift while the screen is
+        // actively changing. Any PTY frame that mutates screen content resets
+        // lastScreenChangedAt; we hold off until it has been stable for the
+        // configured duration. Applies to both completion_idle_after and the
+        // busy_hold expiry path below.
+        const screenActiveMs = screenActiveHoldMs ?? 0;
+        const screenStableMs = this.lastScreenChangedAt > 0 ? now - this.lastScreenChangedAt : Infinity;
+        const screenIsActive = screenActiveMs > 0 && screenStableMs < screenActiveMs;
+        if (screenIsActive) {
+            busyWakeMs = Math.min(busyWakeMs, screenActiveMs - screenStableMs + 50);
+        }
+        if (evState.id === 'busy' && completionIdleRule && !recentlyInModal && !recentlyLeftModal && !screenIsActive) {
             const completionKey = matchesCompletionIdleRule(this.spec, ev, screen);
             if (completionKey) {
                 const now = Date.now();
@@ -560,8 +581,18 @@ export class SpecDriver {
                 this.completionIdleFirstSeenAt = 0;
             }
         } else if (evState.id !== 'busy') {
-            this.completionIdleKey = '';
-            this.completionIdleFirstSeenAt = 0;
+            if (!screenIsActive) {
+                this.completionIdleKey = '';
+                this.completionIdleFirstSeenAt = 0;
+            }
+        }
+
+        // screen_active_hold_ms: if the screen is still changing and the
+        // evaluator wants to downshift from busy to idle, pin to busy instead.
+        // This catches paths not covered by the completion_idle_after gate above
+        // (e.g. direct idle via busy_hold expiry or default-state fallback).
+        if (screenIsActive && this.currentStateId === 'busy' && evState.id === (this.spec.default_state ?? 'idle')) {
+            evState = this.lastBusyState ?? evState;
         }
 
         if (evState.id === 'busy') {

package/src/providers/spec/loader.ts

@@ -79,6 +79,7 @@ function attachDebounceAlias(spec: CliSpec): void {
         ...(t.busy_hold_ms !== undefined ? { busy_hold_ms: t.busy_hold_ms } : {}),
         ...(t.idle_hold_ms !== undefined ? { idle_hold_ms: t.idle_hold_ms } : {}),
         ...(t.startup_grace_ms !== undefined ? { startup_grace_ms: t.startup_grace_ms } : {}),
+        ...(t.screen_active_hold_ms !== undefined ? { screen_active_hold_ms: t.screen_active_hold_ms } : {}),
         ...(cm ? {
             completion_idle_after: {
                 ...(cm.section ? { section: cm.section } : {}),

package/src/providers/spec/schema.gen.ts

@@ -384,6 +384,7 @@ export const SCHEMA_V3 = {
                 "busy_hold_ms": { "type": "integer", "minimum": 0 },
                 "idle_hold_ms": { "type": "integer", "minimum": 0 },
                 "startup_grace_ms": { "type": "integer", "minimum": 0 },
+                "screen_active_hold_ms": { "type": "integer", "minimum": 0 },
                 "completion_marker": {
                     "type": "object",
                     "additionalProperties": false,

package/src/providers/spec/schema.json

@@ -46,6 +46,7 @@
                 "busy_hold_ms": { "type": "integer", "minimum": 0 },
                 "idle_hold_ms": { "type": "integer", "minimum": 0 },
                 "startup_grace_ms": { "type": "integer", "minimum": 0 },
+                "screen_active_hold_ms": { "type": "integer", "minimum": 0 },
                 "completion_marker": {
                     "type": "object",
                     "additionalProperties": false,

package/src/providers/spec/types.ts

@@ -273,6 +273,11 @@ export interface CliSpec {
         busy_hold_ms?: number;
         idle_hold_ms?: number;
         startup_grace_ms?: number;
+        /** Suppress idle downshift while the screen is actively changing.
+         *  When set, any PTY frame that changes the screen resets a timer;
+         *  idle transitions (busy_hold expiry and completion_idle_after) are
+         *  blocked until the screen has been stable for this many ms. */
+        screen_active_hold_ms?: number;
         completion_marker?: {
             section?: string;
             matches: string;
@@ -291,6 +296,7 @@ export interface CliSpec {
         busy_hold_ms?: number;
         idle_hold_ms?: number;
         startup_grace_ms?: number;
+        screen_active_hold_ms?: number;
         /**
          * Legacy field name for completion_marker. Populated by the loader
          * from `timing.completion_marker` for backward compat.

package/src/repo-mesh-types.ts

@@ -90,6 +90,15 @@ export type RepoMeshNodeHealth =
 export type RepoMeshSessionCleanupMode = 'preserve' | 'stop' | 'delete_stopped' | 'stop_and_delete';
 export type RepoMeshSpawnedSessionVisibility = 'visible' | 'hidden';
 
+export interface RepoMeshAutoFastForwardPolicy {
+    /** Defaults to true. Set false to disable daemon-initiated idle fast-forwards. */
+    enabled: boolean;
+    /** Maximum behind count eligible for automatic fast-forward. Missing means no limit. */
+    maxBehind?: number;
+    /** Defaults to true. Require submodule status to be clean before automatic fast-forward. */
+    requireCleanSubmodules?: boolean;
+}
+
 export interface RepoMeshPolicy {
     requirePreTaskCheckpoint: boolean;
     requirePostTaskCheckpoint: boolean;
@@ -117,6 +126,11 @@ export interface RepoMeshPolicy {
      * runtimes are never stopped/deleted unless the mesh owner opts in.
      */
     sessionCleanupOnNodeRemove?: RepoMeshSessionCleanupMode;
+    /**
+     * Daemon-initiated fast-forward for idle clean nodes that are only behind
+     * their tracked upstream. Defaults to enabled.
+     */
+    autoFastForward?: RepoMeshAutoFastForwardPolicy;
     /**
      * Maximum number of automatic retry recommendations for a failed task on the
      * same node before the daemon advises the coordinator to escalate or reassign.
@@ -171,6 +185,7 @@ export const DEFAULT_MESH_POLICY: RepoMeshPolicy = {
     maxParallelTasks: 2,
     spawnedSessionVisibility: 'visible',
     sessionCleanupOnNodeRemove: 'preserve',
+    autoFastForward: { enabled: true },
     maxTaskRetries: 1,
 };
 
@@ -415,6 +430,10 @@ export interface RepoMeshNodeStatus {
     activeSessionDetails?: RepoMeshSessionStatus[];
     providerPriority?: string[];
     launchReady?: boolean;
+    /** True when the node is clean, ahead=0, behind>0, and safe for fast-forward consideration. */
+    autoFastForwardEligible?: boolean;
+    /** Coordinator-facing suggestion for obvious clean catch-up work. */
+    suggestedAction?: 'auto_fast_forward';
     worktreeBootstrap?: LocalMeshNodeEntry['worktreeBootstrap'];
     launchBlockedReason?: string;
     launchBlockedMessage?: string;