@telora/daemon 0.12.33

package/dist/control-state.js

@@ -0,0 +1,204 @@
+/**
+ * Control state handler for the daemon.
+ *
+ * Polls for strategies with non-running control states and dispatches
+ * to the appropriate handler:
+ * - human_control: SIGSTOP the team lead process
+ * - resuming: SIGCONT the team lead process, inject note, set running
+ * - stopped: graceful shutdown (message + SIGTERM)
+ *
+ * Called from the poll loop alongside existing checks.
+ */
+import { getActiveTeams, terminateTeam } from './strategy-executor.js';
+import { getControlStateChanges, setControlStateRunning } from './queries/control-state.js';
+import { sendMessage } from '@telora/daemon-core';
+// Track strategies that have already been suspended to avoid repeated SIGSTOP.
+const suspendedStrategies = new Set();
+/**
+ * Check for control state changes and dispatch to appropriate handlers.
+ *
+ * Called from the poll loop. Queries for strategies and factory instances
+ * with non-running control states, then dispatches to the correct handler.
+ */
+export async function checkControlStateChanges(config) {
+    let changes;
+    try {
+        changes = await getControlStateChanges(config.productId);
+    }
+    catch (err) {
+        console.warn('[control-state] Failed to check control state changes:', err.message);
+        return;
+    }
+    if (changes.length === 0) {
+        // Clean up suspended set: remove strategies that have returned to running
+        // (they won't appear in the changes list since the API only returns non-running)
+        const activeTeams = getActiveTeams();
+        for (const strategyId of suspendedStrategies) {
+            if (!activeTeams.has(strategyId)) {
+                suspendedStrategies.delete(strategyId);
+            }
+        }
+        return;
+    }
+    for (const change of changes) {
+        // Only handle strategy entities for now (factory instances use a different execution model)
+        if (change.entityType !== 'strategy')
+            continue;
+        try {
+            switch (change.controlState) {
+                case 'human_control':
+                    handleHumanControl(change);
+                    break;
+                case 'resuming':
+                    await handleResuming(change);
+                    break;
+                case 'stopped':
+                    handleStopped(change);
+                    break;
+                default:
+                    console.warn(`[control-state] Unknown control state: ${change.controlState} for ${change.entityId}`);
+            }
+        }
+        catch (err) {
+            console.error(`[control-state] Failed to handle ${change.controlState} for ${change.entityType} ${change.entityId}:`, err.message);
+        }
+    }
+}
+/**
+ * Handle human_control: suspend the agent by sending SIGSTOP.
+ */
+export function handleHumanControl(change) {
+    const { entityId } = change;
+    const activeTeams = getActiveTeams();
+    const team = activeTeams.get(entityId);
+    if (!team) {
+        console.log(`[control-state] No active team for strategy ${entityId} -- acknowledging human_control`);
+        return;
+    }
+    // Avoid repeated SIGSTOP
+    if (suspendedStrategies.has(entityId)) {
+        return;
+    }
+    if (!team.leadPid) {
+        console.warn(`[control-state] Team for "${team.strategyName}" has no PID -- cannot suspend`);
+        return;
+    }
+    try {
+        process.kill(team.leadPid, 'SIGSTOP');
+        suspendedStrategies.add(entityId);
+        console.log(`[control-state] Suspended team "${team.strategyName}" (PID: ${team.leadPid}) -- human_control`);
+    }
+    catch (err) {
+        console.error(`[control-state] Failed to SIGSTOP PID ${team.leadPid} for "${team.strategyName}":`, err.message);
+    }
+}
+/**
+ * Handle resuming: send SIGCONT, inject operator note, update to running.
+ */
+export async function handleResuming(change) {
+    const { entityId, entityType, controlNote } = change;
+    const activeTeams = getActiveTeams();
+    const team = activeTeams.get(entityId);
+    if (!team) {
+        console.log(`[control-state] No active team for strategy ${entityId} -- setting to running`);
+        try {
+            await setControlStateRunning(entityType, entityId);
+        }
+        catch (err) {
+            console.warn(`[control-state] Failed to set control state to running for strategy ${entityId}:`, err.message);
+        }
+        suspendedStrategies.delete(entityId);
+        return;
+    }
+    if (!team.leadPid) {
+        console.warn(`[control-state] Team for "${team.strategyName}" has no PID -- setting to running`);
+        try {
+            await setControlStateRunning(entityType, entityId);
+        }
+        catch (err) {
+            console.warn(`[control-state] Failed to set control state to running for "${team.strategyName}":`, err.message);
+        }
+        suspendedStrategies.delete(entityId);
+        return;
+    }
+    // Send SIGCONT to resume the suspended process
+    try {
+        process.kill(team.leadPid, 'SIGCONT');
+        console.log(`[control-state] Resumed team "${team.strategyName}" (PID: ${team.leadPid}) -- SIGCONT sent`);
+    }
+    catch (err) {
+        console.error(`[control-state] Failed to SIGCONT PID ${team.leadPid} for "${team.strategyName}":`, err.message);
+    }
+    // Inject operator note if present
+    if (controlNote && team.leadStdin) {
+        try {
+            sendMessage(team.leadStdin, `Human operator note: ${controlNote}`);
+            console.log(`[control-state] Injected operator note for "${team.strategyName}"`);
+        }
+        catch (err) {
+            console.warn(`[control-state] Failed to inject operator note for "${team.strategyName}":`, err.message);
+        }
+    }
+    // Update control state to running
+    try {
+        await setControlStateRunning(entityType, entityId);
+    }
+    catch (err) {
+        console.warn(`[control-state] Failed to set control state to running for "${team.strategyName}":`, err.message);
+    }
+    suspendedStrategies.delete(entityId);
+}
+/**
+ * Handle stopped: graceful halt with message + SIGTERM.
+ */
+export function handleStopped(change) {
+    const { entityId } = change;
+    const activeTeams = getActiveTeams();
+    const team = activeTeams.get(entityId);
+    if (!team) {
+        console.log(`[control-state] No active team for strategy ${entityId} -- acknowledging stopped`);
+        suspendedStrategies.delete(entityId);
+        return;
+    }
+    // If the team was suspended (human_control -> stopped), resume first so it can process the message
+    if (suspendedStrategies.has(entityId) && team.leadPid) {
+        try {
+            process.kill(team.leadPid, 'SIGCONT');
+            console.log(`[control-state] Sent SIGCONT before stop for "${team.strategyName}" (was suspended)`);
+        }
+        catch (err) {
+            console.debug(`[control-state] SIGCONT before stop failed (process may have exited):`, err.message);
+        }
+    }
+    // Send a shutdown message via stdin
+    if (team.leadStdin) {
+        try {
+            sendMessage(team.leadStdin, 'Execution has been stopped by the operator. Commit your current work and exit.');
+            console.log(`[control-state] Sent stop message to "${team.strategyName}"`);
+        }
+        catch (err) {
+            console.warn(`[control-state] Failed to send stop message to "${team.strategyName}":`, err.message);
+        }
+    }
+    // After a grace period, send SIGTERM via the existing terminateTeam flow
+    setTimeout(() => {
+        if (activeTeams.has(entityId)) {
+            console.log(`[control-state] Grace period expired for "${team.strategyName}" -- terminating`);
+            terminateTeam(entityId);
+        }
+    }, 10000);
+    suspendedStrategies.delete(entityId);
+}
+/**
+ * Get the set of suspended strategy IDs (for testing).
+ */
+export function getSuspendedStrategies() {
+    return suspendedStrategies;
+}
+/**
+ * Clear all tracked suspended strategies (for testing).
+ */
+export function clearSuspendedStrategies() {
+    suspendedStrategies.clear();
+}
+//# sourceMappingURL=control-state.js.map

package/dist/control-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"control-state.js","sourceRoot":"","sources":["../src/control-state.ts"],"names":[],"mappings":"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"}

package/dist/crash-recovery-cleanup.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Orphan cleanup and stale branch pruning for crash recovery.
+ *
+ * Processes orphaned worktrees (safety-commit, merge check, remove/preserve)
+ * and prunes stale agent branches with no worktree and no unmerged commits.
+ */
+import type { DaemonConfig } from './types.js';
+import type { OrphanedWorktree, CleanupAction, RecoveryDeps } from './crash-recovery-types.js';
+/**
+ * Clean up all orphaned worktrees. Returns actions taken and
+ * any preserved orphans that need escalation.
+ */
+export declare function cleanupOrphanedWorktrees(orphans: OrphanedWorktree[], config: DaemonConfig, deps?: RecoveryDeps): Promise<CleanupAction[]>;
+/**
+ * Prune stale agent branches that have no worktree and no unmerged commits.
+ */
+export declare function pruneStaleAgentBranches(config: DaemonConfig): {
+    pruned: string[];
+    preserved: string[];
+};
+//# sourceMappingURL=crash-recovery-cleanup.d.ts.map

package/dist/crash-recovery-cleanup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"crash-recovery-cleanup.d.ts","sourceRoot":"","sources":["../src/crash-recovery-cleanup.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAS/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAmG/F;;;GAGG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,gBAAgB,EAAE,EAC3B,MAAM,EAAE,YAAY,EACpB,IAAI,GAAE,YAA0B,GAC/B,OAAO,CAAC,aAAa,EAAE,CAAC,CAoE1B;AAgBD;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,YAAY,GACnB;IAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAwC3C"}

package/dist/crash-recovery-cleanup.js

@@ -0,0 +1,198 @@
+/**
+ * Orphan cleanup and stale branch pruning for crash recovery.
+ *
+ * Processes orphaned worktrees (safety-commit, merge check, remove/preserve)
+ * and prunes stale agent branches with no worktree and no unmerged commits.
+ */
+import { existsSync } from 'node:fs';
+import { runGitSync } from './git.js';
+import { worktreeHasUncommittedChanges, branchHasUnmergedCommits, safetyCommitWorktree, removeWorktree, } from './worktree.js';
+import { ESCALATION_REASONS } from '@telora/daemon-core';
+import { defaultDeps } from './crash-recovery-types.js';
+import { parseWorktreeList } from './crash-recovery-scan.js';
+// ── Helpers ──────────────────────────────────────────────────────
+/**
+ * Count unmerged commits on a branch relative to integration.
+ */
+function countUnmergedCommits(branchName, integrationBranch, repoPath) {
+    const result = runGitSync(['log', '--oneline', `${integrationBranch}..${branchName}`, '--'], repoPath);
+    if (!result.success)
+        return 0;
+    const lines = result.output.trim();
+    if (lines.length === 0)
+        return 0;
+    return lines.split('\n').length;
+}
+/**
+ * Process a single orphaned worktree: safety-commit if dirty,
+ * then remove if merged or preserve if unmerged.
+ *
+ * Returns the action taken.
+ */
+function cleanupSingleOrphan(orphan, config) {
+    const { worktreePath, branchName } = orphan;
+    const { repoPath, integrationBranch } = config;
+    let commitHash;
+    // Step 1: Safety-commit if dirty
+    if (existsSync(worktreePath) && worktreeHasUncommittedChanges(worktreePath)) {
+        const deliveryName = branchName.split('/').slice(2).join('/') || 'unknown';
+        console.log(`[crash-recovery] Safety-committing dirty worktree: ${worktreePath}`);
+        const hash = safetyCommitWorktree(worktreePath, deliveryName);
+        if (hash) {
+            commitHash = hash.trim();
+            console.log(`[crash-recovery] Safety commit created: ${commitHash.slice(0, 8)} on ${branchName}`);
+        }
+        else {
+            console.warn(`[crash-recovery] Safety commit failed for ${worktreePath}, preserving as-is`);
+            return {
+                worktreePath,
+                branchName,
+                action: 'preserved',
+            };
+        }
+    }
+    // Step 2: Check if branch is already merged to integration
+    const hasUnmerged = branchHasUnmergedCommits(branchName, integrationBranch, repoPath);
+    if (!hasUnmerged) {
+        // Fully merged -- safe to remove
+        console.log(`[crash-recovery] Removing merged orphan: ${worktreePath} [${branchName}]`);
+        removeWorktree(repoPath, worktreePath, {
+            branchName,
+            integrationBranch,
+            mergeSucceeded: true,
+        });
+        // Also delete the branch since it's merged
+        const deleteResult = runGitSync(['branch', '-d', branchName], repoPath);
+        if (deleteResult.success) {
+            console.log(`[crash-recovery] Deleted merged branch: ${branchName}`);
+        }
+        return {
+            worktreePath,
+            branchName,
+            action: commitHash ? 'safety-committed-and-removed' : 'removed',
+            commitHash,
+        };
+    }
+    // Step 3: Unmerged commits -- preserve
+    const unmergedCount = countUnmergedCommits(branchName, integrationBranch, repoPath);
+    console.log(`[crash-recovery] Preserving orphan with ${unmergedCount} unmerged commit(s): ${worktreePath} [${branchName}]`);
+    return {
+        worktreePath,
+        branchName,
+        action: commitHash ? 'safety-committed' : 'preserved',
+        commitHash,
+        unmergedCommitCount: unmergedCount,
+    };
+}
+// ── Orphan cleanup ───────────────────────────────────────────────
+/**
+ * Clean up all orphaned worktrees. Returns actions taken and
+ * any preserved orphans that need escalation.
+ */
+export async function cleanupOrphanedWorktrees(orphans, config, deps = defaultDeps) {
+    const actions = [];
+    // Mark orphaned sessions as failed in DB
+    for (const orphan of orphans) {
+        if (orphan.session) {
+            try {
+                await deps.updateSession(orphan.session.id, {
+                    status: 'failed',
+                    exit_reason: 'Daemon crash recovery: session was active when daemon restarted',
+                    ended_at: new Date().toISOString(),
+                });
+                console.log(`[crash-recovery] Marked session ${orphan.session.id} as failed (crash recovery)`);
+            }
+            catch (err) {
+                console.warn(`[crash-recovery] Failed to update session ${orphan.session.id}: ${err instanceof Error ? err.message : String(err)}`);
+            }
+        }
+    }
+    // Process each orphan
+    for (const orphan of orphans) {
+        try {
+            const action = cleanupSingleOrphan(orphan, config);
+            actions.push(action);
+        }
+        catch (err) {
+            console.error(`[crash-recovery] Error cleaning up orphan ${orphan.worktreePath}: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
+    // Escalate preserved orphans
+    const preserved = actions.filter((a) => a.action === 'preserved' || a.action === 'safety-committed');
+    if (preserved.length > 0) {
+        const lines = preserved.map((a) => `- ${a.branchName} (${a.worktreePath})` +
+            (a.unmergedCommitCount ? ` -- ${a.unmergedCommitCount} unmerged commit(s)` : '') +
+            (a.commitHash ? ` -- safety commit: ${a.commitHash.slice(0, 8)}` : ''));
+        const description = `Daemon crash recovery found ${preserved.length} orphaned worktree(s) with unmerged work:\n\n` +
+            lines.join('\n') +
+            '\n\nThese worktrees have been preserved for manual inspection.';
+        try {
+            await deps.createEscalation({
+                organizationId: config.organizationId,
+                sessionId: preserved[0].branchName, // No session available, use branch as context
+                issueId: null,
+                reasonType: ESCALATION_REASONS.NEEDS_CLARIFICATION,
+                description,
+                whatWasTried: 'Daemon crash recovery scanned for orphaned worktrees and preserved those with unmerged commits.',
+                helpNeeded: 'Inspect the preserved branches and either merge them to integration or delete them.',
+            });
+            console.log(`[crash-recovery] Created escalation for ${preserved.length} preserved orphan(s)`);
+        }
+        catch (err) {
+            console.warn(`[crash-recovery] Failed to create escalation: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
+    return actions;
+}
+// ── Stale branch pruning ─────────────────────────────────────────
+/**
+ * List all local branches matching the agent/* pattern.
+ */
+function listAgentBranches(repoPath) {
+    const result = runGitSync(['branch', '--list', 'agent/*'], repoPath);
+    if (!result.success)
+        return [];
+    return result.output
+        .split('\n')
+        .map((line) => line.replace(/^[*+]?\s+/, '').trim())
+        .filter(Boolean);
+}
+/**
+ * Prune stale agent branches that have no worktree and no unmerged commits.
+ */
+export function pruneStaleAgentBranches(config) {
+    const { repoPath, integrationBranch } = config;
+    const branches = listAgentBranches(repoPath);
+    const pruned = [];
+    const preserved = [];
+    if (branches.length === 0) {
+        console.log('[crash-recovery] No stale agent branches found');
+        return { pruned, preserved };
+    }
+    // Get set of branches that have active worktrees
+    const worktreeMap = parseWorktreeList(repoPath);
+    const worktreeBranches = new Set(worktreeMap.values());
+    for (const branch of branches) {
+        // Skip branches with active worktrees
+        if (worktreeBranches.has(branch))
+            continue;
+        // Check for unmerged commits
+        if (branchHasUnmergedCommits(branch, integrationBranch, repoPath)) {
+            console.log(`[crash-recovery] Preserving stale branch with unmerged commits: ${branch}`);
+            preserved.push(branch);
+            continue;
+        }
+        // Safe to delete
+        const deleteResult = runGitSync(['branch', '-D', branch], repoPath);
+        if (deleteResult.success) {
+            console.log(`[crash-recovery] Pruned stale branch: ${branch}`);
+            pruned.push(branch);
+        }
+        else {
+            console.warn(`[crash-recovery] Failed to prune branch ${branch}: ${deleteResult.error}`);
+        }
+    }
+    console.log(`[crash-recovery] Branch pruning: ${pruned.length} pruned, ${preserved.length} preserved with unmerged work`);
+    return { pruned, preserved };
+}
+//# sourceMappingURL=crash-recovery-cleanup.js.map

package/dist/crash-recovery-cleanup.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"crash-recovery-cleanup.js","sourceRoot":"","sources":["../src/crash-recovery-cleanup.ts"],"names":[],"mappings":"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"}

package/dist/crash-recovery-scan.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Worktree scanning for crash recovery.
+ *
+ * Parses `git worktree list` output and reconciles against DB sessions
+ * and active strategies to classify worktrees as active or orphaned.
+ */
+import type { DaemonConfig } from './types.js';
+import type { OrphanedWorktree, RecoveryDeps } from './crash-recovery-types.js';
+/**
+ * Parse `git worktree list --porcelain` to build a map of
+ * worktree path -> branch name for all registered worktrees.
+ */
+export declare function parseWorktreeList(repoPath: string): Map<string, string>;
+/**
+ * Scan the worktree directory and reconcile against active DB sessions
+ * to classify each worktree as active or orphaned.
+ */
+export declare function detectOrphanedWorktrees(config: DaemonConfig, deps?: RecoveryDeps): Promise<OrphanedWorktree[]>;
+//# sourceMappingURL=crash-recovery-scan.d.ts.map

package/dist/crash-recovery-scan.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"crash-recovery-scan.d.ts","sourceRoot":"","sources":["../src/crash-recovery-scan.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAgB,MAAM,YAAY,CAAC;AAE7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAgBhF;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAiBvE;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,YAAY,EACpB,IAAI,GAAE,YAA0B,GAC/B,OAAO,CAAC,gBAAgB,EAAE,CAAC,CA+G7B"}

package/dist/crash-recovery-scan.js

@@ -0,0 +1,145 @@
+/**
+ * Worktree scanning for crash recovery.
+ *
+ * Parses `git worktree list` output and reconciles against DB sessions
+ * and active strategies to classify worktrees as active or orphaned.
+ */
+import { existsSync, readdirSync, statSync } from 'node:fs';
+import { join, resolve } from 'node:path';
+import { runGitSync } from './git.js';
+import { defaultDeps } from './crash-recovery-types.js';
+// ── Helpers ──────────────────────────────────────────────────────
+/**
+ * Extract the strategy ID prefix (last 8 hex chars) from a worktree directory name.
+ * Strategy worktree directories follow: agent-{role}-{name}-{8-char-id}
+ */
+function extractStrategyIdPrefix(dirName) {
+    const match = dirName.match(/-([0-9a-f]{8})$/);
+    return match ? match[1] : null;
+}
+// ── Worktree scanning ────────────────────────────────────────────
+/**
+ * Parse `git worktree list --porcelain` to build a map of
+ * worktree path -> branch name for all registered worktrees.
+ */
+export function parseWorktreeList(repoPath) {
+    const result = runGitSync(['worktree', 'list', '--porcelain'], repoPath);
+    const map = new Map();
+    if (!result.success)
+        return map;
+    let currentPath = null;
+    for (const line of result.output.split('\n')) {
+        if (line.startsWith('worktree ')) {
+            currentPath = line.slice('worktree '.length);
+        }
+        else if (line.startsWith('branch refs/heads/') && currentPath) {
+            map.set(currentPath, line.slice('branch refs/heads/'.length));
+            currentPath = null;
+        }
+        else if (line === '') {
+            currentPath = null;
+        }
+    }
+    return map;
+}
+/**
+ * Scan the worktree directory and reconcile against active DB sessions
+ * to classify each worktree as active or orphaned.
+ */
+export async function detectOrphanedWorktrees(config, deps = defaultDeps) {
+    const { worktreeDir, repoPath } = config;
+    // 1. Read all subdirectories in worktreeDir
+    if (!existsSync(worktreeDir))
+        return [];
+    const entries = readdirSync(worktreeDir);
+    const subdirs = entries.filter((entry) => {
+        const fullPath = join(worktreeDir, entry);
+        try {
+            return statSync(fullPath).isDirectory();
+        }
+        catch (e) {
+            console.debug(`[crash-recovery] Failed to stat ${fullPath} (may have been deleted):`, e.message);
+            return false;
+        }
+    });
+    if (subdirs.length === 0)
+        return [];
+    // 2. Parse git worktree list to map paths -> branch names
+    const worktreeMap = parseWorktreeList(repoPath);
+    // Build a reverse lookup: resolve worktree paths so we can match
+    const pathToBranch = new Map();
+    for (const [wtPath, branch] of worktreeMap) {
+        pathToBranch.set(resolve(wtPath), branch);
+    }
+    // 3. Query active sessions from DB
+    let activeSessions = [];
+    try {
+        activeSessions = await deps.getActiveSessions();
+    }
+    catch (err) {
+        console.warn(`[crash-recovery] Failed to query active sessions from DB: ${err instanceof Error ? err.message : String(err)}. ` +
+            `Treating all worktrees as orphaned.`);
+    }
+    // Build set of branch names with active sessions
+    const activeBranches = new Set(activeSessions.map((s) => s.branch_name));
+    // Build map of branch -> session for linking
+    const branchToSession = new Map();
+    for (const session of activeSessions) {
+        branchToSession.set(session.branch_name, session);
+    }
+    // 3b. Query active strategies to preserve persistent worktrees
+    const activeStrategyIdPrefixes = new Set();
+    try {
+        const activeStrategies = await deps.getActiveStrategies(config.organizationId, config.productId);
+        for (const s of activeStrategies) {
+            activeStrategyIdPrefixes.add(s.strategy_id.slice(0, 8));
+        }
+    }
+    catch (err) {
+        console.warn(`[crash-recovery] Failed to query active strategies: ${err instanceof Error ? err.message : String(err)}. ` +
+            `Persistent strategy worktrees may be incorrectly classified as orphaned.`);
+    }
+    // 4. Classify each worktree subdirectory
+    const orphans = [];
+    for (const subdir of subdirs) {
+        const fullPath = resolve(join(worktreeDir, subdir));
+        const branchName = pathToBranch.get(fullPath);
+        if (!branchName) {
+            // Directory exists but no git worktree entry -- likely a stale directory.
+            // Check if it belongs to an active strategy before classifying as orphan.
+            const idPrefix = extractStrategyIdPrefix(subdir);
+            if (idPrefix && activeStrategyIdPrefixes.has(idPrefix)) {
+                console.log(`[crash-recovery] Worktree belongs to active strategy (persistent, no git entry): ${fullPath}`);
+                continue;
+            }
+            // Try to infer branch from directory name (agent-role-delivery pattern).
+            console.log(`[crash-recovery] Worktree directory has no git entry: ${fullPath}`);
+            orphans.push({
+                worktreePath: fullPath,
+                branchName: subdir.replace(/-/g, '/').replace(/^agent\//, 'agent/'),
+                session: null,
+            });
+            continue;
+        }
+        if (activeBranches.has(branchName)) {
+            // Active session exists -- leave alone
+            console.log(`[crash-recovery] Worktree is active (has DB session): ${fullPath} [${branchName}]`);
+            continue;
+        }
+        // Check if this worktree belongs to an active strategy (persistent worktree)
+        const idPrefix = extractStrategyIdPrefix(subdir);
+        if (idPrefix && activeStrategyIdPrefixes.has(idPrefix)) {
+            console.log(`[crash-recovery] Worktree belongs to active strategy (persistent): ${fullPath} [${branchName}]`);
+            continue;
+        }
+        // No active session and no active strategy -- orphaned
+        const session = branchToSession.get(branchName) ?? null;
+        orphans.push({
+            worktreePath: fullPath,
+            branchName,
+            session,
+        });
+    }
+    return orphans;
+}
+//# sourceMappingURL=crash-recovery-scan.js.map

package/dist/crash-recovery-scan.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"crash-recovery-scan.js","sourceRoot":"","sources":["../src/crash-recovery-scan.ts"],"names":[],"mappings":"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"}