@intrect/openswarm 0.17.2 → 0.17.4

package/dist/automation/autonomousRunner.d.ts

@@ -4,10 +4,13 @@ import type { AdapterName } from '../adapters/types.js';
 export { setNotifier, setTaskSource } from './runnerExecution.js';
 export type { AutonomousConfig, RunnerState } from './runnerTypes.js';
 export type { ProjectInfo } from './runnerState.js';
+export declare function decisionSelectionBudget(availableSlots: number, candidateCount: number): number;
 export declare class AutonomousRunner {
     private config;
     private engine;
     private scheduler;
+    /** Adapter default-model cache for the dashboard PAIR bar (INT-2393). */
+    private defaultModelCache;
     private cronJob;
     private state;
     private _heartbeatRunning;
@@ -30,6 +33,9 @@ export declare class AutonomousRunner {
      * untouched stays the legacy "run all allowed projects" fallback. (INT-2207)
      */
     private shouldFilterByEnabled;
+    private sameProjectCandidateCap;
+    private currentProjectLoad;
+    private canQueueProjectCandidate;
     /** Persist the project selection so it survives a restart. No-op under dryRun
      * (tests) to avoid touching the real ~/.openswarm. (INT-2208) */
     private persistSelection;
@@ -41,9 +47,11 @@ export declare class AutonomousRunner {
     private completedTaskIds;
     private failedTaskCounts;
     private failedTaskRetryTimes;
+    private lastFailureDetails;
     private static readonly MAX_RETRY_COUNT;
     private rateLimitUntil;
     private unresolvableIssueIds;
+    private lastBacklogGroomingAt;
     private get taskStateRef();
     private loadTaskState;
     private saveTaskState;
@@ -78,8 +86,20 @@ export declare class AutonomousRunner {
      * and stay silent while the summary is identical to the previous heartbeat.
      */
     private syslogSkipSummary;
+    private groupTasksForGrooming;
+    private maybeRunBacklogGrooming;
     heartbeat(): Promise<void>;
     private heartbeatParallel;
+    private resolveRunnableCandidates;
+    private detectSafeCandidateIds;
+    /**
+     * Re-attempt of a previously failed/rejected issue: carry the last failure
+     * feedback into the run so the worker's first iteration addresses it instead
+     * of repeating the same mistake blind (INT-2474). Called on BOTH execution
+     * paths — parallel enqueue and the serial (maxConcurrentTasks=1) heartbeat.
+     */
+    private attachPriorFeedback;
+    private enqueueCandidate;
     /** Execute task in pair mode */
     private executeTaskPairMode;
     private getExecCtx;
@@ -110,29 +130,29 @@ export declare class AutonomousRunner {
     };
     getTurboMode(): boolean;
     setTurboMode(enabled: boolean): void;
-    getAdapterSummary(): {
+    getAdapterSummary(): Promise<{
         defaultAdapter: "codex" | "local" | "codex-responses" | "gpt" | "lmstudio" | "openrouter" | "claude";
         worker: {
-            adapter: "codex" | "local" | "codex-responses" | "gpt" | "lmstudio" | "openrouter" | "claude";
+            adapter: import("../core/types.js").AgentAdapterName;
             model: string | undefined;
             enabled: boolean;
         };
         reviewer: {
-            adapter: "codex" | "local" | "codex-responses" | "gpt" | "lmstudio" | "openrouter" | "claude";
+            adapter: import("../core/types.js").AgentAdapterName;
             model: string | undefined;
             enabled: boolean;
         };
         tester: {
-            adapter: "codex" | "local" | "codex-responses" | "gpt" | "lmstudio" | "openrouter" | "claude";
+            adapter: import("../core/types.js").AgentAdapterName;
             model: string | undefined;
             enabled: boolean;
         } | undefined;
         documenter: {
-            adapter: "codex" | "local" | "codex-responses" | "gpt" | "lmstudio" | "openrouter" | "claude";
+            adapter: import("../core/types.js").AgentAdapterName;
             model: string | undefined;
             enabled: boolean;
         } | undefined;
-    };
+    }>;
     switchProvider(adapter: AdapterName): void;
     pauseScheduler(): void;
     resumeScheduler(): void;

package/dist/automation/autonomousRunner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"autonomousRunner.d.ts","sourceRoot":"","sources":["../../src/automation/autonomousRunner.ts"],"names":[],"mappings":"AAGA,OAAO,EAkBL,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AA+B1B,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGxD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAClE,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACtE,YAAY,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAIpD,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,KAAK,CAIX;IAGF,OAAO,CAAC,iBAAiB,CAAS;IAIlC,OAAO,CAAC,eAAe,CAAqB;IAM5C,OAAO,CAAC,uBAAuB,CAAS;IAExC;;;;;;OAMG;IACH,OAAO,KAAK,oBAAoB,GAE/B;IAED,OAAO,CAAC,aAAa;IAIrB,4DAA4D;IAC5D,OAAO,CAAC,gBAAgB;IAWxB;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAI7B;qEACiE;IACjE,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,gBAAgB,CAAkB;IAG1C,OAAO,CAAC,gBAAgB,CAA6B;IAGrD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAsB;IAG/D,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,gBAAgB,CAA6B;IACrD,OAAO,CAAC,oBAAoB,CAA6B;IACzD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAK;IAI5C,OAAO,CAAC,cAAc,CAAK;IAK3B,OAAO,CAAC,oBAAoB,CAAqB;IAEjD,OAAO,KAAK,YAAY,GAMvB;IAED,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,iBAAiB;gBAQb,MAAM,EAAE,gBAAgB;IAoCpC,OAAO,CAAC,oBAAoB;IAiQ5B,OAAO,CAAC,sBAAsB;IAsG9B;;;;;;;;;;OAUG;IACH,OAAO,CAAC,mBAAmB,CAA8C;IACzE,OAAO,CAAC,qBAAqB;YAWf,iBAAiB;IAU/B,OAAO,CAAC,kBAAkB;IA8CpB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAsC5B,IAAI,IAAI,IAAI;IASZ,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,sBAAsB;IAiB9B,gDAAgD;IAChD,OAAO,CAAC,MAAM;IAKd,OAAO,CAAC,eAAe,CAAM;IAE7B;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAmBnB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;YAqIlB,iBAAiB;IA+L/B,gCAAgC;YAClB,mBAAmB;IA2HjC,OAAO,CAAC,UAAU;YAsBJ,kBAAkB;YAIlB,aAAa;YAIb,eAAe;YAIf,eAAe;IAIvB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAkBjC,MAAM,IAAI,OAAO;IASX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B,QAAQ,IAAI,WAAW;IAIvB,kBAAkB,IAAI,MAAM,EAAE;IAI9B,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAK5C,QAAQ;;;;;;;;;;;;;;;IAcR,YAAY,IAAI,OAAO;IAQvB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAcpC,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;IA6BjB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;IAwF1C,cAAc,IAAI,IAAI;IACtB,eAAe,IAAI,IAAI;IACvB,cAAc;IACd,eAAe;IACf,kBAAkB,CAAC,KAAK,SAAK;IAE7B,OAAO,CAAC,qBAAqB;IAe7B,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAazC,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAexC,8CAA8C;IAC9C,kBAAkB,IAAI,MAAM,EAAE;IAI9B;;;;OAIG;IACH,mBAAmB,IAAI,KAAK,CAAC;QAC3B,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAC3D,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;KACxD,CAAC;IAYF,6EAA6E;IAC7E,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAInC,uDAAuD;IACvD,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IAW5D,eAAe,IAAI,WAAW,EAAE;CASjC;AAED,wBAAgB,SAAS,CAAC,MAAM,CAAC,EAAE,gBAAgB,GAAG,gBAAgB,CAQrE;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAIzF;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,IAAI,CAIrC"}
+{"version":3,"file":"autonomousRunner.d.ts","sourceRoot":"","sources":["../../src/automation/autonomousRunner.ts"],"names":[],"mappings":"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"}

package/dist/automation/autonomousRunner.js

@@ -1,13 +1,13 @@
 // OpenSwarm - Autonomous Runner
 // Heartbeat → Decision → Execution → Report
 import { Cron } from 'croner';
-import { loadTaskState, saveTaskState, buildProjectsInfo, appendPipelineHistory, getPipelineHistory, incrementRejection, clearRejection, isRejectionLimitReached, canRetryNow, setRetryTime, clearRetryTime, formatRetryTime, getDailyPaceInfo, recordProjectCompletion, loadProjectSelection, saveProjectSelection, } from './runnerState.js';
+import { loadTaskState, saveTaskState, buildProjectsInfo, appendPipelineHistory, getPipelineHistory, incrementRejection, clearRejection, isRejectionLimitReached, canRetryNow, setRetryTime, clearRetryTime, formatRetryTime, getDailyPaceInfo, recordProjectCompletion, loadProjectSelection, saveProjectSelection, recordLastFailureDetail, } from './runnerState.js';
 import { getDecisionEngine, classifyStuck, } from '../orchestration/decisionEngine.js';
 // ExecutorResult used via execution.reportExecutionResult
 import { checkWorkAllowed } from '../support/timeWindow.js';
 import { recordTaskOutcome } from '../memory/repoKnowledge.js';
 import { updateProjectAfterTask } from '../linear/projectUpdater.js';
-import { initScheduler } from '../orchestration/taskScheduler.js';
+import { initScheduler, normalizeProjectPath } from '../orchestration/taskScheduler.js';
 import { formatPipelineResultEmbed, } from '../agents/pairPipeline.js';
 import * as planner from '../support/planner.js';
 import * as execution from './runnerExecution.js';
@@ -22,13 +22,25 @@ import { STUCK_LABEL } from '../linear/index.js';
 import { refreshGraph, toProjectSlug } from '../knowledge/index.js';
 import { checkAllMonitors, getActiveMonitors } from './longRunningMonitor.js';
 import { detectFileConflicts } from '../orchestration/conflictDetector.js';
+import { resolveAdapterDefaultModel } from '../agents/stageModelResolver.js';
+import { applyBacklogGrooming, filterGroomableTasks, runBacklogGroomingPlanner, summarizeGroomingDecision, } from './backlogGrooming.js';
 // Re-export types and integration setters (used by service.ts)
 export { setNotifier, setTaskSource } from './runnerExecution.js';
 let runnerInstance = null;
+const DECISION_SELECTION_OVERSAMPLE = 3;
+export function decisionSelectionBudget(availableSlots, candidateCount) {
+    const slots = Math.max(0, Math.floor(availableSlots));
+    const candidates = Math.max(0, Math.floor(candidateCount));
+    if (slots === 0 || candidates === 0)
+        return 0;
+    return Math.min(candidates, Math.max(slots, slots * DECISION_SELECTION_OVERSAMPLE));
+}
 export class AutonomousRunner {
     config;
     engine;
     scheduler;
+    /** Adapter default-model cache for the dashboard PAIR bar (INT-2393). */
+    defaultModelCache = new Map();
     cronJob = null;
     state = {
         isRunning: false,
@@ -80,6 +92,30 @@ export class AutonomousRunner {
     shouldFilterByEnabled() {
         return this.projectSelectionTouched || this.enabledProjects.size > 0;
     }
+    sameProjectCandidateCap() {
+        const sameProjectParallel = (this.config.allowSameProjectConcurrent ?? true) && (this.config.worktreeMode ?? false);
+        if (!sameProjectParallel || this.config.maxConcurrentPerProject == null)
+            return null;
+        const cap = Math.floor(this.config.maxConcurrentPerProject);
+        const maxConcurrent = this.config.maxConcurrentTasks ?? 1;
+        return Math.max(1, Math.min(cap, maxConcurrent));
+    }
+    currentProjectLoad(projectPath) {
+        const target = normalizeProjectPath(projectPath);
+        const queued = this.scheduler.getQueuedTasks()
+            .filter(task => normalizeProjectPath(task.projectPath) === target)
+            .length;
+        const running = this.scheduler.getRunningTasks()
+            .filter(task => normalizeProjectPath(task.projectPath) === target)
+            .length;
+        return queued + running;
+    }
+    canQueueProjectCandidate(projectPath) {
+        const cap = this.sameProjectCandidateCap();
+        if (cap == null)
+            return true;
+        return this.currentProjectLoad(projectPath) < cap;
+    }
     /** Persist the project selection so it survives a restart. No-op under dryRun
      * (tests) to avoid touching the real ~/.openswarm. (INT-2208) */
     persistSelection() {
@@ -99,6 +135,10 @@ export class AutonomousRunner {
     completedTaskIds = new Set();
     failedTaskCounts = new Map();
     failedTaskRetryTimes = new Map(); // issueId → next retry timestamp (ms)
+    // Last failure feedback per issue — re-injected into the next attempt's worker
+    // prompt so re-picked tasks don't restart blind and repeat the same mistake
+    // the reviewer already called out (INT-2474). Persisted; cleared on success.
+    lastFailureDetails = new Map();
     static MAX_RETRY_COUNT = 4; // Increased from 2 to allow more retries with backoff
     // Rate-limit hold: epoch ms until which all task execution is paused.
     // Set when any adapter returns a 429 / usage_limit_reached response (INT-1906).
@@ -107,11 +147,13 @@ export class AutonomousRunner {
     // the first resolve failure so they aren't re-picked every heartbeat (which
     // starved other actionable tasks — they were top-priority but never runnable). (INT-1875)
     unresolvableIssueIds = new Set();
+    lastBacklogGroomingAt = 0;
     get taskStateRef() {
         return {
             completedTaskIds: this.completedTaskIds,
             failedTaskCounts: this.failedTaskCounts,
             failedTaskRetryTimes: this.failedTaskRetryTimes,
+            lastFailureDetails: this.lastFailureDetails,
         };
     }
     loadTaskState() {
@@ -158,6 +200,7 @@ export class AutonomousRunner {
         this.scheduler = initScheduler({
             maxConcurrent: config.maxConcurrentTasks ?? 1,
             allowSameProjectConcurrent: config.allowSameProjectConcurrent ?? true,
+            maxConcurrentPerProject: config.maxConcurrentPerProject,
             worktreeMode: config.worktreeMode ?? false,
         });
         // Set up scheduler event handling
@@ -180,6 +223,7 @@ export class AutonomousRunner {
                 this.completedTaskIds.add(task.issueId);
                 clearRejection(task.issueId); // Clear rejection count on success
                 clearRetryTime(task.issueId, this.failedTaskRetryTimes); // Clear retry backoff time
+                this.lastFailureDetails.delete(task.issueId); // Stale feedback must not haunt future work
                 this.saveTaskState();
                 // Track project-level pace (5h rolling window)
                 const projectName = task.linearProject?.name ?? 'unknown';
@@ -297,6 +341,8 @@ export class AutonomousRunner {
             if (task.issueId && result.finalStatus === 'rejected') {
                 const feedback = result.reviewResult?.feedback || 'No feedback provided';
                 const rejectionCount = incrementRejection(task.issueId, feedback);
+                // Persist for prompt injection on the retry (same mechanism as failures).
+                recordLastFailureDetail(this.taskStateRef, task.issueId, feedback);
                 // Store the rejection reason as a repo pitfall (constraint) — blocks repeating the same mistake
                 if (result.taskContext?.projectPath) {
                     await recordTaskOutcome(result.taskContext.projectPath, {
@@ -344,17 +390,20 @@ export class AutonomousRunner {
             if (task.issueId) {
                 const count = (this.failedTaskCounts.get(task.issueId) ?? 0) + 1;
                 this.failedTaskCounts.set(task.issueId, count);
+                // Surface the underlying failure (worker CLI error / review feedback) so the
+                // stuck comment is actionable instead of an opaque "failed N times", AND
+                // persist it so the NEXT attempt starts with this feedback instead of
+                // blind — re-picked tasks used to repeat the exact same mistake (INT-2474).
+                const failureDetail = result.workerResult?.error
+                    || result.reviewResult?.feedback
+                    || 'No error detail captured (worker produced no output).';
+                recordLastFailureDetail(this.taskStateRef, task.issueId, failureDetail);
                 if (count >= AutonomousRunner.MAX_RETRY_COUNT) {
                     // Max retries exceeded - permanently block
                     this.completedTaskIds.add(task.issueId); // Prevent re-selection
                     clearRetryTime(task.issueId, this.failedTaskRetryTimes); // Clear retry time
                     this.saveTaskState();
                     console.log(`[Scheduler] Task failure count: ${count}/${AutonomousRunner.MAX_RETRY_COUNT} for ${taskCtx} — STUCK`);
-                    // Surface the underlying failure (worker CLI error / review feedback) so the
-                    // stuck comment is actionable instead of an opaque "failed N times".
-                    const failureDetail = result.workerResult?.error
-                        || result.reviewResult?.feedback
-                        || 'No error detail captured (worker produced no output).';
                     try {
                         await execution.syncFailureState(task, `Autonomous execution failed ${count} times: ${failureDetail}`);
                         await getTaskSource()?.logStuck(task.issueId, 'autonomous-runner', `Autonomous execution failed ${count} times in a row — automatic retries exhausted.\n\n` +
@@ -655,6 +704,87 @@ export class AutonomousRunner {
         for (const line of lines)
             this.syslog(line);
     }
+    async groupTasksForGrooming(tasks) {
+        const byProjectId = new Map();
+        for (const repoPath of this.config.allowedProjects) {
+            try {
+                const resolvedPath = repoPath.replace('~', process.env.HOME || '');
+                const meta = await loadRepoMetadata(resolvedPath);
+                if (meta?.linear?.projectId)
+                    byProjectId.set(meta.linear.projectId, resolvedPath);
+            }
+            catch {
+                // Grooming is advisory; unreadable metadata should not block normal work.
+            }
+        }
+        const groups = new Map();
+        for (const task of tasks) {
+            const projectPath = task.projectPath
+                ?? (task.linearProject?.id ? byProjectId.get(task.linearProject.id) : undefined)
+                ?? undefined;
+            if (!projectPath)
+                continue;
+            const list = groups.get(projectPath) ?? [];
+            list.push(task);
+            groups.set(projectPath, list);
+        }
+        return groups;
+    }
+    async maybeRunBacklogGrooming(tasks) {
+        const cfg = this.config.backlogGrooming;
+        if (!cfg?.enabled)
+            return tasks;
+        const cadenceMs = Math.max(1, cfg.cadenceHours ?? 24) * 60 * 60 * 1000;
+        const now = Date.now();
+        if (this.lastBacklogGroomingAt && now - this.lastBacklogGroomingAt < cadenceMs)
+            return tasks;
+        const source = getTaskSource();
+        if (!source) {
+            this.syslog('⚠ Backlog grooming skipped: no task source');
+            return tasks;
+        }
+        const groomable = filterGroomableTasks(tasks);
+        if (groomable.length === 0)
+            return tasks;
+        const mode = cfg.mode ?? 'comment';
+        const moved = new Set();
+        const groups = await this.groupTasksForGrooming(groomable);
+        if (groups.size === 0) {
+            this.syslog('⚠ Backlog grooming skipped: no mapped project paths');
+            return tasks;
+        }
+        let successfulPlannerRuns = 0;
+        for (const [projectPath, groupTasks] of groups) {
+            this.syslog(`⟳ Backlog grooming: ${groupTasks.length} issue(s) in ${projectPath.split('/').pop()}`);
+            const result = await runBacklogGroomingPlanner({
+                tasks: groupTasks,
+                projectPath,
+                projectName: groupTasks[0]?.linearProject?.name,
+                model: cfg.plannerModel ?? this.config.plannerModel,
+                timeoutMs: cfg.plannerTimeoutMs ?? this.config.plannerTimeoutMs,
+                maxIssues: cfg.maxIssues,
+                onLog: (line) => broadcastEvent({ type: 'log', data: { taskId: 'system', stage: 'groom', line } }),
+            });
+            if (!result.success) {
+                this.syslog(`⚠ Backlog grooming failed: ${result.error ?? 'unknown error'}`);
+                continue;
+            }
+            successfulPlannerRuns++;
+            const validIssueIds = new Set(groupTasks.map(task => task.issueId || task.id));
+            const applied = await applyBacklogGrooming(source, result, mode, validIssueIds);
+            for (const issueId of applied.movedIssueIds)
+                moved.add(issueId);
+            this.syslog(`✓ Backlog grooming: ${result.decisions.length} decision(s), ${applied.commented} comment(s), ${applied.failedComments} comment failure(s), ${applied.updatedDescriptions} description update(s), ${applied.moved} moved, ${applied.skippedUnknown} unknown skipped`);
+            for (const decision of result.decisions.slice(0, 5)) {
+                this.syslog(`  ${summarizeGroomingDecision(decision)}`);
+            }
+        }
+        if (successfulPlannerRuns > 0)
+            this.lastBacklogGroomingAt = now;
+        if (moved.size === 0)
+            return tasks;
+        return tasks.filter(task => !moved.has(task.issueId || task.id));
+    }
     async heartbeat() {
         if (this._heartbeatRunning) {
             console.log('[AutonomousRunner] Heartbeat already running, skipping');
@@ -721,13 +851,19 @@ export class AutonomousRunner {
                 await reportToDiscord(`⚠️ Linear fetch failed: ${fetchResult.error}`);
                 return;
             }
-            const tasks = fetchResult.tasks;
+            let tasks = fetchResult.tasks;
             if (tasks.length === 0) {
                 this.syslog('— No tasks in backlog');
                 return;
             }
             this.lastFetchedTasks = tasks;
             this.syslog(`✓ Found ${tasks.length} tasks from Linear`);
+            tasks = await this.maybeRunBacklogGrooming(tasks);
+            this.lastFetchedTasks = tasks;
+            if (tasks.length === 0) {
+                this.syslog('— No executable tasks after backlog grooming');
+                return;
+            }
             // Filter out completed and over-retried tasks
             const filteredTasks = this.filterAlreadyProcessed(tasks);
             if (filteredTasks.length === 0) {
@@ -836,20 +972,67 @@ export class AutonomousRunner {
             }
             this.syslog(`  Tasks: ${tasksForEngine.length} enabled-or-uncached / ${executableTasks.length} executable / ${tasks.length} total`);
         }
-        // Get validated task list from DecisionEngine
-        this.syslog('⟳ Decision Engine evaluating tasks...');
-        const decision = await this.engine.heartbeatMultiple(tasksForEngine, maxSlots, [] // No project exclusion — worktree mode isolates each task
-        );
-        console.log(`[AutonomousRunner] Decision: ${decision.action} — ${decision.reason} (${decision.tasks?.length ?? 0} tasks)`);
-        if (decision.action === 'skip' || decision.action === 'defer') {
-            this.syslog(`→ Decision: ${decision.action} — ${decision.reason}`);
-            return;
-        }
-        // Add validated tasks to queue (with conflict detection)
         let enqueuedCount = 0;
-        // Pre-filter: resolve project paths and skip invalid tasks
+        let skippedCount = 0;
+        const consideredTaskIds = new Set();
+        let pass = 0;
+        while (enqueuedCount < maxSlots) {
+            const remainingSlots = maxSlots - enqueuedCount;
+            const selectableTasks = tasksForEngine.filter(task => !consideredTaskIds.has(task.id));
+            const selectionBudget = decisionSelectionBudget(remainingSlots, selectableTasks.length);
+            if (selectionBudget === 0)
+                break;
+            this.syslog(pass === 0
+                ? '⟳ Decision Engine evaluating tasks...'
+                : `⟳ Backfill pass (${remainingSlots} slot(s) open)...`);
+            const decision = await this.engine.heartbeatMultiple(selectableTasks, selectionBudget, [] // No project exclusion — worktree mode isolates each task
+            );
+            console.log(`[AutonomousRunner] Decision: ${decision.action} — ${decision.reason} (${decision.tasks?.length ?? 0} tasks)`);
+            skippedCount += decision.skippedCount ?? 0;
+            if (decision.action === 'skip' || decision.action === 'defer') {
+                this.syslog(`→ Decision: ${decision.action} — ${decision.reason}`);
+                break;
+            }
+            for (const { task } of decision.tasks) {
+                consideredTaskIds.add(task.id);
+            }
+            const candidates = await this.resolveRunnableCandidates(decision.tasks);
+            const safeTasks = await this.detectSafeCandidateIds(candidates);
+            const before = enqueuedCount;
+            for (const { task, projectPath } of candidates) {
+                if (enqueuedCount >= maxSlots)
+                    break;
+                if (!safeTasks.has(task.id))
+                    continue;
+                if (!this.canQueueProjectCandidate(projectPath)) {
+                    this.syslog(`  Project cap reached: ${projectPath}`);
+                    continue;
+                }
+                this.enqueueCandidate(task, projectPath);
+                enqueuedCount++;
+            }
+            pass++;
+            if (enqueuedCount >= maxSlots)
+                break;
+            if (decision.tasks.length === 0)
+                break;
+            if (selectionBudget >= selectableTasks.length)
+                break;
+            if (enqueuedCount === before)
+                continue;
+        }
+        if (enqueuedCount === 0 && skippedCount > 0) {
+            this.syslog(`— No new tasks queued (skipped: ${skippedCount})`);
+        }
+        else {
+            this.syslog(`✓ Enqueued ${enqueuedCount} task(s) | skipped: ${skippedCount}`);
+        }
+        // Execute tasks
+        await this.runAvailableTasks();
+    }
+    async resolveRunnableCandidates(decisionTasks) {
         const candidates = [];
-        for (const { task } of decision.tasks) {
+        for (const { task } of decisionTasks) {
             if (this.scheduler.isTaskQueued(task.id) || this.scheduler.isTaskRunning(task.id)) {
                 this.syslog(`  Skip (already queued/running): ${task.issueIdentifier || task.id.slice(0, 8)} ${task.title}`);
                 continue;
@@ -877,6 +1060,9 @@ export class AutonomousRunner {
             // rate limiter only. Completions are still recorded for cost telemetry.
             candidates.push({ task, projectPath });
         }
+        return candidates;
+    }
+    async detectSafeCandidateIds(candidates) {
         // Group candidates by projectPath for conflict detection
         const byProject = new Map();
         for (const c of candidates) {
@@ -916,30 +1102,36 @@ export class AutonomousRunner {
                     safeTasks.add(c.task.id);
             }
         }
-        // Enqueue safe tasks only
-        for (const { task, projectPath } of candidates) {
-            if (!safeTasks.has(task.id))
-                continue;
-            this.scheduler.enqueue(task, projectPath);
-            broadcastEvent({ type: 'task:queued', data: { taskId: task.id, title: task.title, projectPath, issueIdentifier: task.issueIdentifier } });
-            this.syslog(`✓ Queued: ${task.issueIdentifier || ''} ${task.title} → ${projectPath.split('/').slice(-2).join('/')}`);
-            enqueuedCount++;
-            // Claim the task immediately: set Linear to 'In Progress' so restarts don't re-queue it
-            if (task.issueId) {
-                getTaskSource()?.updateState(task.issueId, 'In Progress').catch((err) => console.warn(`[AutonomousRunner] Failed to claim issue ${task.issueIdentifier}:`, err));
-            }
-        }
-        if (enqueuedCount === 0 && decision.skippedCount > 0) {
-            this.syslog(`— No new tasks queued (skipped: ${decision.skippedCount})`);
-        }
-        else {
-            this.syslog(`✓ Enqueued ${enqueuedCount} task(s) | skipped: ${decision.skippedCount}`);
+        return safeTasks;
+    }
+    /**
+     * Re-attempt of a previously failed/rejected issue: carry the last failure
+     * feedback into the run so the worker's first iteration addresses it instead
+     * of repeating the same mistake blind (INT-2474). Called on BOTH execution
+     * paths — parallel enqueue and the serial (maxConcurrentTasks=1) heartbeat.
+     */
+    attachPriorFeedback(task) {
+        if (!task.issueId)
+            return;
+        const prior = this.lastFailureDetails.get(task.issueId);
+        if (prior)
+            task.priorAttemptFeedback = prior.detail;
+    }
+    enqueueCandidate(task, projectPath) {
+        this.attachPriorFeedback(task);
+        this.scheduler.enqueue(task, projectPath);
+        broadcastEvent({ type: 'task:queued', data: { taskId: task.id, title: task.title, projectPath, issueIdentifier: task.issueIdentifier } });
+        this.syslog(`✓ Queued: ${task.issueIdentifier || ''} ${task.title} → ${projectPath.split('/').slice(-2).join('/')}`);
+        // Claim the task immediately: set Linear to 'In Progress' so restarts don't re-queue it
+        if (task.issueId) {
+            getTaskSource()?.updateState(task.issueId, 'In Progress').catch((err) => console.warn(`[AutonomousRunner] Failed to claim issue ${task.issueIdentifier}:`, err));
         }
-        // Execute tasks
-        await this.runAvailableTasks();
     }
     /** Execute task in pair mode */
     async executeTaskPairMode(task) {
+        // Serial path (maxConcurrentTasks=1) bypasses enqueueCandidate — attach the
+        // prior-session feedback here too so both paths inject it (INT-2474).
+        this.attachPriorFeedback(task);
         // Auto-resolve project path
         const projectPath = await this.resolveProjectPath(task);
         // Error if project path mapping failed
@@ -1146,19 +1338,25 @@ export class AutonomousRunner {
             broadcastEvent({ type: 'log', data: { taskId: 'system', stage: 'turbo', line: 'TURBO OFF — normal pace resumed' } });
         }
     }
-    getAdapterSummary() {
+    async getAdapterSummary() {
         const defaultAdapter = this.config.defaultAdapter ?? 'codex';
         const defaultRoles = this.config.defaultRoles;
+        const workerAdapter = defaultRoles?.worker?.adapter ?? defaultAdapter;
+        const reviewerAdapter = defaultRoles?.reviewer?.adapter ?? defaultAdapter;
         return {
             defaultAdapter,
             worker: {
-                adapter: defaultRoles?.worker?.adapter ?? defaultAdapter,
-                model: defaultRoles?.worker?.model ?? this.config.workerModel,
+                adapter: workerAdapter,
+                // Resolve the adapter's real default when config omits the model, so the
+                // dashboard's PAIR bar shows what's running instead of "-". (INT-2393)
+                model: defaultRoles?.worker?.model ?? this.config.workerModel
+                    ?? await resolveAdapterDefaultModel(workerAdapter, this.defaultModelCache),
                 enabled: defaultRoles?.worker?.enabled !== false,
             },
             reviewer: {
-                adapter: defaultRoles?.reviewer?.adapter ?? defaultAdapter,
-                model: defaultRoles?.reviewer?.model ?? this.config.reviewerModel,
+                adapter: reviewerAdapter,
+                model: defaultRoles?.reviewer?.model ?? this.config.reviewerModel
+                    ?? await resolveAdapterDefaultModel(reviewerAdapter, this.defaultModelCache),
                 enabled: defaultRoles?.reviewer?.enabled !== false,
             },
             tester: defaultRoles?.tester ? {