@renseiai/agentfactory 0.8.7 → 0.8.9

package/dist/src/orchestrator/orchestrator.js

@@ -13,6 +13,7 @@ import { initializeAgentDir, writeState, updateState, writeTodos, createInitialS
 import { createHeartbeatWriter, getHeartbeatIntervalFromEnv } from './heartbeat-writer.js';
 import { createProgressLogger } from './progress-logger.js';
 import { createSessionLogger } from './session-logger.js';
+import { ContextManager } from './context-manager.js';
 import { isSessionLoggingEnabled, getLogAnalysisConfig } from './log-config.js';
 import { parseWorkResult } from './parse-work-result.js';
 import { createActivityEmitter } from './activity-emitter.js';
@@ -21,6 +22,7 @@ import { createLogger } from '../logger.js';
 import { TemplateRegistry, createToolPermissionAdapter } from '../templates/index.js';
 import { loadRepositoryConfig, getProjectConfig, getProvidersConfig } from '../config/index.js';
 import { ToolRegistry } from '../tools/index.js';
+import { createMergeQueueAdapter } from '../merge-queue/index.js';
 // Default inactivity timeout: 5 minutes
 const DEFAULT_INACTIVITY_TIMEOUT_MS = 300000;
 // Default max session timeout: unlimited (undefined)
@@ -368,6 +370,53 @@ function checkForIncompleteWork(worktreePath) {
         };
     }
 }
+function checkForPushedWorkWithoutPR(worktreePath) {
+    try {
+        const currentBranch = execSync('git branch --show-current', {
+            cwd: worktreePath,
+            encoding: 'utf-8',
+            timeout: 10000,
+        }).trim();
+        // If on main, no work to check
+        if (currentBranch === 'main' || currentBranch === 'master') {
+            return { hasPushedWork: false };
+        }
+        // Count commits ahead of main
+        const aheadOutput = execSync(`git rev-list --count main..HEAD`, {
+            cwd: worktreePath,
+            encoding: 'utf-8',
+            timeout: 10000,
+        }).trim();
+        const aheadCount = parseInt(aheadOutput, 10);
+        if (aheadCount === 0) {
+            return { hasPushedWork: false };
+        }
+        // Branch has commits ahead of main — check if they've been pushed
+        try {
+            const remoteRef = execSync(`git ls-remote --heads origin ${currentBranch}`, {
+                cwd: worktreePath,
+                encoding: 'utf-8',
+                timeout: 10000,
+            }).trim();
+            if (remoteRef.length > 0) {
+                // Branch exists on remote with commits ahead of main — likely missing a PR
+                return {
+                    hasPushedWork: true,
+                    branch: currentBranch,
+                    details: `Branch \`${currentBranch}\` has ${aheadCount} commit(s) ahead of main and has been pushed to the remote, but no PR was detected.`,
+                };
+            }
+        }
+        catch {
+            // ls-remote failed — can't confirm remote state
+        }
+        return { hasPushedWork: false };
+    }
+    catch {
+        // Git commands failed — don't block on our check failing
+        return { hasPushedWork: false };
+    }
+}
 /**
  * Generate a prompt for the agent based on work type
  *
@@ -671,6 +720,13 @@ IMPORTANT: If you encounter "exceeds maximum allowed tokens" error when reading
 - Avoid reading auto-generated files like payload-types.ts (use Grep instead)
 See the "Working with Large Files" section in the project documentation (CLAUDE.md / AGENTS.md) for details.${LINEAR_CLI_INSTRUCTION}`;
             break;
+        case 'merge':
+            basePrompt = `Handle merge queue operations for ${identifier}.
+Check PR merge readiness (CI status, approvals).
+Attempt rebase onto latest main.
+Resolve conflicts using mergiraf-enhanced git merge if available.
+Push updated branch and trigger merge via configured merge queue provider.${LINEAR_CLI_INSTRUCTION}`;
+            break;
     }
     // Inject workflow failure context for retries
     if (options?.failureContext) {
@@ -698,6 +754,7 @@ const WORK_TYPE_SUFFIX = {
     'refinement-coordination': 'REF-COORD',
     'qa-coordination': 'QA-COORD',
     'acceptance-coordination': 'AC-COORD',
+    merge: 'MRG',
 };
 /**
  * Generate a worktree identifier that includes the work type suffix
@@ -761,6 +818,7 @@ export class AgentOrchestrator {
     progressLoggers = new Map();
     // Session loggers per agent for verbose analysis logging
     sessionLoggers = new Map();
+    contextManagers = new Map();
     // Template registry for configurable workflow prompts
     templateRegistry;
     // Allowlisted project names from .agentfactory/config.yaml
@@ -781,6 +839,8 @@ export class AgentOrchestrator {
     validateCommand;
     // Tool plugin registry for in-process agent tools
     toolRegistry;
+    // Merge queue adapter for automated merge operations (initialized from config or repo config)
+    mergeQueueAdapter;
     // Git repository root for running git commands (resolved from worktreePath or cwd)
     gitRoot;
     constructor(config = {}, events = {}) {
@@ -892,12 +952,26 @@ export class AgentOrchestrator {
                     }
                     // Store providers config for per-spawn resolution
                     this.configProviders = getProvidersConfig(repoConfig);
+                    // Initialize merge queue adapter from repository config
+                    if (repoConfig.mergeQueue?.enabled && !config.mergeQueueAdapter) {
+                        try {
+                            this.mergeQueueAdapter = createMergeQueueAdapter(repoConfig.mergeQueue.provider ?? 'github-native');
+                            console.log(`[orchestrator] Merge queue adapter initialized: ${repoConfig.mergeQueue.provider ?? 'github-native'}`);
+                        }
+                        catch (error) {
+                            console.warn(`[orchestrator] Failed to initialize merge queue adapter: ${error instanceof Error ? error.message : String(error)}`);
+                        }
+                    }
                 }
             }
         }
         catch (err) {
             console.warn('[orchestrator] Failed to load .agentfactory/config.yaml:', err instanceof Error ? err.message : err);
         }
+        // Accept merge queue adapter passed directly via config (takes precedence over repo config)
+        if (config.mergeQueueAdapter) {
+            this.mergeQueueAdapter = config.mergeQueueAdapter;
+        }
         // Initialize tool plugin registry with injected plugins
         this.toolRegistry = new ToolRegistry();
         if (config.toolPlugins) {
@@ -988,6 +1062,11 @@ export class AgentOrchestrator {
         for (const issue of allIssues) {
             if (results.length >= maxIssues)
                 break;
+            // Skip sub-issues — coordinators manage their lifecycle, not the backlog scanner
+            if (issue.parentId) {
+                console.log(`[orchestrator] Skipping sub-issue ${issue.identifier} — managed by parent coordinator`);
+                continue;
+            }
             // Filter by allowedProjects from .agentfactory/config.yaml
             if (this.allowedProjects && this.allowedProjects.length > 0) {
                 if (!issue.projectName || !this.allowedProjects.includes(issue.projectName)) {
@@ -1423,6 +1502,8 @@ export class AgentOrchestrator {
         }
         // Write helper scripts into .agent/ for agent use
         this.writeWorktreeHelpers(worktreePath);
+        // Configure mergiraf merge driver if enabled
+        this.configureMergiraf(worktreePath);
         return { worktreePath, worktreeIdentifier };
     }
     /**
@@ -1503,6 +1584,39 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
             console.warn(`Failed to write worktree helper scripts: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
+    /**
+     * Configure mergiraf as the git merge driver in a worktree.
+     * Falls back silently to default git merge if mergiraf is not installed.
+     */
+    configureMergiraf(worktreePath) {
+        // Check if mergiraf is disabled via config
+        if (this.repoConfig?.mergeDriver === 'default') {
+            return;
+        }
+        try {
+            // Check if mergiraf binary is available
+            execSync('which mergiraf', { stdio: 'pipe', encoding: 'utf-8' });
+        }
+        catch {
+            // mergiraf not installed — fall back to default merge silently
+            console.log('mergiraf not found on PATH, using default git merge driver');
+            return;
+        }
+        try {
+            // Register mergiraf as the merge driver in this worktree
+            // This sets up .git/config merge driver entries and .gitattributes
+            execSync('mergiraf register', {
+                stdio: 'pipe',
+                encoding: 'utf-8',
+                cwd: worktreePath,
+            });
+            console.log(`mergiraf registered as merge driver in ${worktreePath}`);
+        }
+        catch (error) {
+            // Log warning but don't fail — merge driver is non-critical
+            console.warn(`Failed to register mergiraf in worktree: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
     /**
      * Link dependencies from the main repo into a worktree via symlinks.
      *
@@ -1793,6 +1907,9 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
                     this.sessionLoggers.set(issueId, sessionLogger);
                     log.debug('Session logging initialized', { logsDir: logConfig.logsDir });
                 }
+                // Initialize context manager for context window management
+                const contextManager = ContextManager.load(worktreePath);
+                this.contextManagers.set(issueId, contextManager);
                 log.debug('State persistence initialized', { agentDir: resolve(worktreePath, '.agent') });
             }
             catch (stateError) {
@@ -1996,6 +2113,41 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
             if (emitter) {
                 await emitter.flush();
             }
+            // Post-exit PR detection: if the agent exited without a detected PR URL,
+            // check GitHub directly in case the PR was created but the output wasn't captured
+            if (agent.status === 'completed' && !agent.pullRequestUrl && agent.worktreePath) {
+                const postExitWorkType = agent.workType ?? 'development';
+                const isPostExitCodeProducing = postExitWorkType === 'development' || postExitWorkType === 'inflight';
+                if (isPostExitCodeProducing) {
+                    try {
+                        const currentBranch = execSync('git branch --show-current', {
+                            cwd: agent.worktreePath,
+                            encoding: 'utf-8',
+                            timeout: 10000,
+                        }).trim();
+                        if (currentBranch && currentBranch !== 'main' && currentBranch !== 'master') {
+                            const prJson = execSync(`gh pr list --head "${currentBranch}" --json url --limit 1`, {
+                                cwd: agent.worktreePath,
+                                encoding: 'utf-8',
+                                timeout: 15000,
+                            }).trim();
+                            const prs = JSON.parse(prJson);
+                            if (prs.length > 0 && prs[0].url) {
+                                log?.info('Post-exit PR detection found existing PR', { prUrl: prs[0].url, branch: currentBranch });
+                                agent.pullRequestUrl = prs[0].url;
+                                if (sessionId) {
+                                    await this.updateSessionPullRequest(sessionId, prs[0].url, agent);
+                                }
+                            }
+                        }
+                    }
+                    catch (error) {
+                        log?.debug('Post-exit PR detection failed (non-fatal)', {
+                            error: error instanceof Error ? error.message : String(error),
+                        });
+                    }
+                }
+            }
             // Update Linear status based on work type if auto-transition is enabled
             if (agent.status === 'completed' && this.config.autoTransition) {
                 const workType = agent.workType ?? 'development';
@@ -2073,8 +2225,32 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
                             // Do NOT set targetStatus — leave issue in current state
                         }
                         else {
-                            // No PR but worktree is clean — either no changes needed or agent cleaned up
-                            targetStatus = this.statusMappings.workTypeCompleteStatus[workType];
+                            // Worktree is clean (no uncommitted/unpushed changes) — but check if branch
+                            // has commits ahead of main that should have resulted in a PR
+                            const hasPushedWork = checkForPushedWorkWithoutPR(agent.worktreePath);
+                            if (hasPushedWork.hasPushedWork) {
+                                // Agent pushed commits to remote but never created a PR — block promotion
+                                log?.error('Code-producing agent pushed commits but no PR was created — blocking promotion', {
+                                    workType,
+                                    details: hasPushedWork.details,
+                                });
+                                try {
+                                    await this.client.createComment(issueId, `⚠️ **Agent completed and pushed code, but no PR was created.**\n\n` +
+                                        `${hasPushedWork.details}\n\n` +
+                                        `**Issue status was NOT promoted** because work cannot be reviewed without a PR.\n\n` +
+                                        `The branch has been pushed to the remote. To recover:\n` +
+                                        `\`\`\`bash\ngh pr create --head ${hasPushedWork.branch} --title "feat: <title>" --body "..."\n\`\`\`\n` +
+                                        `Or re-trigger the agent to complete the PR creation step.`);
+                                }
+                                catch {
+                                    // Best-effort comment
+                                }
+                                // Do NOT set targetStatus — leave issue in current state
+                            }
+                            else {
+                                // No PR and no pushed commits ahead of main — genuinely clean completion
+                                targetStatus = this.statusMappings.workTypeCompleteStatus[workType];
+                            }
                         }
                     }
                     else {
@@ -2096,6 +2272,28 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
                 else if (!isResultSensitive) {
                     log?.info('No auto-transition configured for work type', { workType });
                 }
+                // Merge queue: enqueue PR after successful merge work
+                if (workType === 'merge' && this.mergeQueueAdapter && agent.pullRequestUrl) {
+                    try {
+                        const prMatch = agent.pullRequestUrl.match(/\/([^/]+)\/([^/]+)\/pull\/(\d+)/);
+                        if (prMatch) {
+                            const [, owner, repo, prNum] = prMatch;
+                            const canEnqueue = await this.mergeQueueAdapter.canEnqueue(owner, repo, parseInt(prNum, 10));
+                            if (canEnqueue) {
+                                const status = await this.mergeQueueAdapter.enqueue(owner, repo, parseInt(prNum, 10));
+                                log?.info('PR enqueued in merge queue', { owner, repo, prNumber: prNum, state: status.state });
+                            }
+                            else {
+                                log?.info('PR not eligible for merge queue', { owner, repo, prNumber: prNum });
+                            }
+                        }
+                    }
+                    catch (error) {
+                        log?.warn('Failed to enqueue PR in merge queue', {
+                            error: error instanceof Error ? error.message : String(error),
+                        });
+                    }
+                }
                 // Unassign agent from issue for clean handoff visibility
                 // This enables automated QA pickup via webhook
                 // Skip unassignment for research work (user should decide when to move to backlog)
@@ -2295,6 +2493,8 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
                 }
                 else if (event.subtype === 'compact_boundary') {
                     log?.debug('Context compacted');
+                    // Trigger incremental summarization on compaction boundary
+                    this.contextManagers.get(issueId)?.handleCompaction();
                 }
                 else if (event.subtype === 'hook_response') {
                     // Provider-specific hook handling — access raw event for details
@@ -2315,6 +2515,8 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
             case 'tool_result':
                 // Tool results — track activity and detect PR URLs
                 this.updateLastActivity(issueId, 'tool_result');
+                // Feed to context manager for artifact tracking
+                this.contextManagers.get(issueId)?.processEvent(event);
                 sessionLogger?.logToolResult(event.toolUseId ?? 'unknown', event.content, event.isError);
                 // Detect GitHub PR URLs in tool output (from gh pr create)
                 if (sessionId) {
@@ -2329,8 +2531,19 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
             case 'assistant_text':
                 // Assistant text output
                 this.updateLastActivity(issueId, 'assistant');
+                // Feed to context manager for session intent extraction
+                this.contextManagers.get(issueId)?.processEvent(event);
                 heartbeatWriter?.recordThinking();
                 sessionLogger?.logAssistant(event.text);
+                // Detect GitHub PR URLs in assistant text (backup for tool_result detection)
+                if (sessionId && !agent.pullRequestUrl) {
+                    const prUrl = this.extractPullRequestUrl(event.text);
+                    if (prUrl) {
+                        log?.info('Pull request detected in assistant text', { prUrl });
+                        agent.pullRequestUrl = prUrl;
+                        await this.updateSessionPullRequest(sessionId, prUrl, agent);
+                    }
+                }
                 if (emitter) {
                     await emitter.emitThought(event.text.substring(0, 200));
                 }
@@ -2338,6 +2551,8 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
             case 'tool_use':
                 // Tool invocation
                 this.updateLastActivity(issueId, 'assistant');
+                // Feed to context manager for artifact tracking
+                this.contextManagers.get(issueId)?.processEvent(event);
                 log?.toolCall(event.toolName, event.input);
                 heartbeatWriter?.recordToolCall(event.toolName);
                 progressLogger?.logTool(event.toolName, event.input);
@@ -2383,6 +2598,15 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
                     // Store full result for completion comment posting later
                     if (event.message) {
                         agent.resultMessage = event.message;
+                        // Detect GitHub PR URLs in final result message (backup for tool_result detection)
+                        if (sessionId && !agent.pullRequestUrl) {
+                            const prUrl = this.extractPullRequestUrl(event.message);
+                            if (prUrl) {
+                                log?.info('Pull request detected in result message', { prUrl });
+                                agent.pullRequestUrl = prUrl;
+                                await this.updateSessionPullRequest(sessionId, prUrl, agent);
+                            }
+                        }
                     }
                     // Update state to completing/completed (only for worktree-based agents)
                     if (agent.worktreePath) {
@@ -2432,6 +2656,22 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
                     }
                     progressLogger?.logError('Agent error result', new Error(errorMessage));
                     sessionLogger?.logError('Agent error result', new Error(errorMessage), { subtype: event.errorSubtype });
+                    // Merge queue: dequeue PR on merge agent failure
+                    if (agent.workType === 'merge' && this.mergeQueueAdapter && agent.pullRequestUrl) {
+                        try {
+                            const prMatch = agent.pullRequestUrl.match(/\/([^/]+)\/([^/]+)\/pull\/(\d+)/);
+                            if (prMatch) {
+                                const [, owner, repo, prNum] = prMatch;
+                                await this.mergeQueueAdapter.dequeue(owner, repo, parseInt(prNum, 10));
+                                log?.info('PR dequeued from merge queue after failure', { owner, repo, prNumber: prNum });
+                            }
+                        }
+                        catch (dequeueError) {
+                            log?.warn('Failed to dequeue PR from merge queue', {
+                                error: dequeueError instanceof Error ? dequeueError.message : String(dequeueError),
+                            });
+                        }
+                    }
                     // Report tool errors as Linear issues for tracking
                     // Only report for 'error_during_execution' subtype (tool/execution errors)
                     if (event.errorSubtype === 'error_during_execution' &&
@@ -2619,6 +2859,17 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
             progressLogger.stop();
             this.progressLoggers.delete(issueId);
         }
+        // Persist and cleanup context manager
+        const contextManager = this.contextManagers.get(issueId);
+        if (contextManager) {
+            try {
+                contextManager.persist();
+            }
+            catch {
+                // Ignore persistence errors during cleanup
+            }
+            this.contextManagers.delete(issueId);
+        }
         // Session logger is cleaned up separately (in finalizeSessionLogger)
         // to ensure the final status is captured before cleanup
         this.sessionLoggers.delete(issueId);
@@ -2722,6 +2973,25 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
             throw new Error(`Issue ${identifier} is in terminal status '${currentStatus}' — skipping ${workType ?? 'auto'} work. ` +
                 `The issue was likely accepted/canceled after being queued.`);
         }
+        // Guard: skip sub-issues that should be managed by a coordinator, not spawned independently.
+        // Only applies when no explicit work type is provided (i.e., orchestrator auto-pickup).
+        // Coordinators spawning sub-agents always pass an explicit work type, so they bypass this check.
+        if (!workType) {
+            try {
+                const isChild = await this.client.isChildIssue(issueId);
+                if (isChild) {
+                    throw new Error(`Issue ${identifier} is a sub-issue managed by a parent coordinator — skipping independent pickup. ` +
+                        `Sub-issues should only be processed by their parent's coordination agent.`);
+                }
+            }
+            catch (err) {
+                // Re-throw our own guard error; swallow API errors so we don't block on transient failures
+                if (err instanceof Error && err.message.includes('managed by a parent coordinator')) {
+                    throw err;
+                }
+                console.warn(`Failed to check child status for ${identifier}:`, err);
+            }
+        }
         // Defense in depth: re-validate git remote before spawning (guards against long-running instances)
         if (this.config.repository) {
             validateGitRemote(this.config.repository, this.gitRoot);
@@ -2830,6 +3100,13 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
             labels: labelNames,
         });
     }
+    /**
+     * Get the merge queue adapter, if configured.
+     * Returns undefined if no merge queue is enabled.
+     */
+    getMergeQueueAdapter() {
+        return this.mergeQueueAdapter;
+    }
     /**
      * Get all active agents
      */
@@ -3214,6 +3491,9 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
                     this.sessionLoggers.set(issueId, sessionLogger);
                     log.debug('Session logging initialized', { logsDir: logConfig.logsDir });
                 }
+                // Initialize context manager for context window management
+                const contextManager = ContextManager.load(worktreePath);
+                this.contextManagers.set(issueId, contextManager);
                 log.debug('State persistence initialized', { agentDir: resolve(worktreePath, '.agent') });
             }
             catch (stateError) {

package/dist/src/orchestrator/parse-work-result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-work-result.d.ts","sourceRoot":"","sources":["../../../src/orchestrator/parse-work-result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAuGjD;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAC7B,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,QAAQ,EAAE,aAAa,GACtB,eAAe,CAyCjB"}
+{"version":3,"file":"parse-work-result.d.ts","sourceRoot":"","sources":["../../../src/orchestrator/parse-work-result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AA6GjD;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAC7B,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,QAAQ,EAAE,aAAa,GACtB,eAAe,CAyCjB"}

package/dist/src/orchestrator/parse-work-result.js

@@ -91,6 +91,12 @@ const COORDINATION_FAIL_PATTERNS = [
     // Explicit result labels
     /\bCoordination\s+(?:Result|Status|Verdict):\s*\*{0,2}Fail(?:ed)?\*{0,2}/i,
     /\bCoordination\s+Failed/i,
+    // Early-exit detection — agent reported progress instead of completing coordination
+    /\bI'll wait\b.*\bcomplete\b/i,
+    /\bagents?\s+(?:are|is)\s+(?:actively\s+)?(?:working|running|in\s+progress)\b/i,
+    /\bwork\s+is\s+in\s+progress\b/i,
+    /\bwait(?:ing)?\s+for\s+(?:them|sub-?\s*agents?|sub-?\s*issues?)\s+to\s+(?:complete|finish)\b/i,
+    /\bbefore\s+proceeding\s+to\s+(?:Layer|Wave|Phase)\s+\d/i,
 ];
 /**
  * Parse the agent's result message to determine whether the work passed or failed.

package/dist/src/orchestrator/parse-work-result.test.js

@@ -192,6 +192,25 @@ describe('parseWorkResult', () => {
         it('checks fail patterns before pass patterns', () => {
             expect(parseWorkResult('All 8/8 sub-issues completed.\n### Must Fix Before Merge\n1. Bad code', 'coordination')).toBe('failed');
         });
+        // Early-exit detection — agent reported progress instead of completing
+        it('detects "I\'ll wait for them to complete" as early-exit fail', () => {
+            expect(parseWorkResult("Both agents are progressing well. I'll wait for them to complete before proceeding.", 'coordination')).toBe('failed');
+        });
+        it('detects "agents are actively working" as early-exit fail', () => {
+            expect(parseWorkResult('SUP-1552 agent has read the existing patterns. Agents are actively working on their sub-issues.', 'coordination')).toBe('failed');
+        });
+        it('detects "waiting for sub-agents to finish" as early-exit fail', () => {
+            expect(parseWorkResult('Spawned 2 agents. Waiting for sub-agents to finish their work.', 'coordination')).toBe('failed');
+        });
+        it('detects "before proceeding to Layer 2" as early-exit fail', () => {
+            expect(parseWorkResult('Wave 1 agents spawned. Will check results before proceeding to Layer 2.', 'coordination')).toBe('failed');
+        });
+        it('detects "work is in progress" as early-exit fail', () => {
+            expect(parseWorkResult('Work is in progress on 3 sub-issues. Status will be updated.', 'coordination')).toBe('failed');
+        });
+        it('early-exit patterns also apply to inflight-coordination', () => {
+            expect(parseWorkResult("Agents are actively running. I'll wait for them to complete.", 'inflight-coordination')).toBe('failed');
+        });
     });
     // QA coordination with real agent output formats
     describe('QA coordination real-world patterns', () => {

package/dist/src/orchestrator/state-recovery.d.ts

@@ -4,7 +4,7 @@
  * Detects and recovers agent state from the .agent/ directory.
  * Enables crash recovery and duplicate agent prevention.
  */
-import type { WorktreeState, HeartbeatState, TodosState, RecoveryCheckResult } from './state-types.js';
+import type { WorktreeState, HeartbeatState, TodosState, RecoveryCheckResult, StructuredSummary } from './state-types.js';
 import type { AgentWorkType } from './work-types.js';
 /**
  * Get the .agent directory path for a worktree
@@ -84,7 +84,13 @@ export declare function getTaskListId(issueIdentifier: string, workType: AgentWo
 /**
  * Build a recovery prompt for resuming crashed work
  */
-export declare function buildRecoveryPrompt(state: WorktreeState, todos?: TodosState): string;
+export declare function buildRecoveryPrompt(state: WorktreeState, todos?: TodosState, contextSection?: string): string;
+/**
+ * Build a context injection string for session resume (non-crash).
+ * Returns empty string if no context is available.
+ * Uses neutral framing to avoid "context anxiety" (from SUP-1186 research).
+ */
+export declare function buildResumeContext(contextSection: string): string;
 /**
  * Parse environment variable for heartbeat timeout
  */
@@ -93,4 +99,17 @@ export declare function getHeartbeatTimeoutFromEnv(): number;
  * Parse environment variable for max recovery attempts
  */
 export declare function getMaxRecoveryAttemptsFromEnv(): number;
+/**
+ * Get the path to the summary.json file
+ */
+export declare function getSummaryPath(worktreePath: string): string;
+/**
+ * Read the persisted structured summary from a worktree
+ */
+export declare function readSummary(worktreePath: string): StructuredSummary | null;
+/**
+ * Write the structured summary with atomic writes (write to temp, then rename).
+ * This ensures the summary survives process crashes.
+ */
+export declare function writeSummary(worktreePath: string, summary: StructuredSummary): void;
 //# sourceMappingURL=state-recovery.d.ts.map

package/dist/src/orchestrator/state-recovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state-recovery.d.ts","sourceRoot":"","sources":["../../../src/orchestrator/state-recovery.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EACd,UAAU,EACV,mBAAmB,EAEpB,MAAM,kBAAkB,CAAA;AACzB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAQpD;;GAEG;AACH,wBAAgB,WAAW,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAExD;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAEzD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAEzD;AAeD;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,cAAc,GAAG,IAAI,EAChC,SAAS,GAAE,MAAqC,GAC/C,OAAO,CAIT;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAE5E;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAEzE;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAEjE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE;IACP,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAA;CACxB,GACL,mBAAmB,CA2ErB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAK7D;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,IAAI,CAI3E;AAED;;GAEG;AACH,wBAAgB,WAAW,CACzB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,GAC9B,aAAa,GAAG,IAAI,CAWtB;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI,CAIxE;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAC1C,OAAO,EAAE,MAAM,CAAA;IACf,eAAe,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,QAAQ,EAAE,aAAa,CAAA;IACvB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CACpB,GAAG,aAAa,CAmBhB;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,aAAa,GACtB,MAAM,CAgBR;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,aAAa,EACpB,KAAK,CAAC,EAAE,UAAU,GACjB,MAAM,CA6CR;AAED;;GAEG;AACH,wBAAgB,0BAA0B,IAAI,MAAM,CASnD;AAED;;GAEG;AACH,wBAAgB,6BAA6B,IAAI,MAAM,CAStD"}
+{"version":3,"file":"state-recovery.d.ts","sourceRoot":"","sources":["../../../src/orchestrator/state-recovery.ts"],"names":[],"mappings":"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"}

package/dist/src/orchestrator/state-recovery.js

@@ -4,7 +4,7 @@
  * Detects and recovers agent state from the .agent/ directory.
  * Enables crash recovery and duplicate agent prevention.
  */
-import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
+import { existsSync, readFileSync, writeFileSync, mkdirSync, renameSync } from 'fs';
 import { resolve } from 'path';
 // Default heartbeat timeout: 30 seconds
 const DEFAULT_HEARTBEAT_TIMEOUT_MS = 30000;
@@ -230,14 +230,23 @@ export function getTaskListId(issueIdentifier, workType) {
         'refinement-coordination': 'REF-COORD',
         'qa-coordination': 'QA-COORD',
         'acceptance-coordination': 'AC-COORD',
+        merge: 'MRG',
     };
     return `${issueIdentifier}-${suffixMap[workType]}`;
 }
 /**
  * Build a recovery prompt for resuming crashed work
  */
-export function buildRecoveryPrompt(state, todos) {
+export function buildRecoveryPrompt(state, todos, contextSection) {
     const lines = [];
+    // Inject structured summary context at the top (if available)
+    if (contextSection) {
+        lines.push(contextSection);
+        lines.push('');
+        lines.push('---');
+        lines.push('You are resuming work on this task. The context above summarizes your progress so far.');
+        lines.push('');
+    }
     lines.push(`Resume work on ${state.issueIdentifier}.`);
     lines.push('');
     lines.push('RECOVERY CONTEXT:');
@@ -271,10 +280,30 @@ export function buildRecoveryPrompt(state, todos) {
     lines.push('3. Review the codebase for any partial changes');
     lines.push('4. Continue from where the previous session left off');
     lines.push('5. If work appears complete, verify and create PR if needed');
+    // Repeat key context at the end to mitigate "lost in the middle" phenomenon
+    if (contextSection) {
+        lines.push('');
+        lines.push('KEY CONTEXT REMINDER:');
+        lines.push(contextSection);
+    }
     lines.push('');
     lines.push(`Original prompt: ${state.prompt}`);
     return lines.join('\n');
 }
+/**
+ * Build a context injection string for session resume (non-crash).
+ * Returns empty string if no context is available.
+ * Uses neutral framing to avoid "context anxiety" (from SUP-1186 research).
+ */
+export function buildResumeContext(contextSection) {
+    if (!contextSection)
+        return '';
+    const lines = [];
+    lines.push('Here is your session context:');
+    lines.push('');
+    lines.push(contextSection);
+    return lines.join('\n');
+}
 /**
  * Parse environment variable for heartbeat timeout
  */
@@ -301,3 +330,26 @@ export function getMaxRecoveryAttemptsFromEnv() {
     }
     return DEFAULT_MAX_RECOVERY_ATTEMPTS;
 }
+/**
+ * Get the path to the summary.json file
+ */
+export function getSummaryPath(worktreePath) {
+    return resolve(getAgentDir(worktreePath), 'summary.json');
+}
+/**
+ * Read the persisted structured summary from a worktree
+ */
+export function readSummary(worktreePath) {
+    return readJsonSafe(getSummaryPath(worktreePath));
+}
+/**
+ * Write the structured summary with atomic writes (write to temp, then rename).
+ * This ensures the summary survives process crashes.
+ */
+export function writeSummary(worktreePath, summary) {
+    const summaryPath = getSummaryPath(worktreePath);
+    initializeAgentDir(worktreePath);
+    const tempPath = summaryPath + '.tmp';
+    writeFileSync(tempPath, JSON.stringify(summary, null, 2));
+    renameSync(tempPath, summaryPath);
+}