crewly 1.20.234 → 1.20.236

package/dist/backend/backend/src/index.d.ts

@@ -111,6 +111,23 @@ export declare class CrewlyServer {
      * @param sessions - Entries loaded from session-state.json.
      */
     private pruneUnboundPersistedSessions;
+    /** WorkItems to recover after boot, grouped by target session. */
+    private recoveryBySession;
+    /**
+     * In-progress WorkItems worth re-sending after a restart: active status,
+     * with a target, touched within the last hour of `referenceMs`.
+     *
+     * @param referenceMs - Boot time (age is measured at boot, not after the restore)
+     * @returns Items grouped by target session
+     */
+    private collectRecoverableTasks;
+    /**
+     * Send the task-recovery messages of one session (once), e.g. right after
+     * that agent registered.
+     *
+     * @param sessionName - Target session
+     */
+    private sendRecoveryFor;
     /**
      * Auto-restore agent sessions that were running before the last shutdown.
      * Loads persisted session state and calls createAgentSession() for each

package/dist/backend/backend/src/index.d.ts.map

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

package/dist/backend/backend/src/index.js

@@ -23,7 +23,7 @@ import { TerminalGateway, setTerminalGateway } from './websocket/terminal.gatewa
 import { initializeChatGateway } from './websocket/chat.gateway.js';
 import { LoggerService } from './services/core/logger.service.js';
 import { retryWithBackoff } from './services/core/retry.util.js';
-import { CREWLY_CONSTANTS, ORCHESTRATOR_SESSION_NAME, OWNER_MESSAGE_WATCHDOG_CONSTANTS, TURN_STATE_CONSTANTS, CLOUD_DISCONNECT_NOTICE_CONSTANTS, ORCHESTRATOR_ROLE, ORCHESTRATOR_WINDOW_NAME, MESSAGE_QUEUE_CONSTANTS, RUNTIME_TYPES, AUDITOR_CONSTANTS, AUDITOR_SCHEDULER_CONSTANTS, API_SECURITY_CONSTANTS, } from './constants.js';
+import { CREWLY_CONSTANTS, ORCHESTRATOR_SESSION_NAME, AGENT_SUSPEND_CONSTANTS, OWNER_MESSAGE_WATCHDOG_CONSTANTS, TURN_STATE_CONSTANTS, CLOUD_DISCONNECT_NOTICE_CONSTANTS, ORCHESTRATOR_ROLE, ORCHESTRATOR_WINDOW_NAME, MESSAGE_QUEUE_CONSTANTS, RUNTIME_TYPES, AUDITOR_CONSTANTS, AUDITOR_SCHEDULER_CONSTANTS, API_SECURITY_CONSTANTS, TEAM_LEAD_CONSTANTS, } from './constants.js';
 import { getSettingsService } from './services/settings/index.js';
 import { MemoryService } from './services/memory/memory.service.js';
 import { getImprovementStartupService } from './services/orchestrator/improvement-startup.service.js';
@@ -169,6 +169,8 @@ import { TaskPoolService } from './services/task-pool/task-pool.service.js';
 import { PENDING_WORK_STATUSES } from './services/agent/idle-detection.service.js';
 import { WorkItemWorktreeService } from './services/worktree/workitem-worktree.service.js';
 import { WorkItemWorktreeSubscriber, createTerminalNotifier } from './services/worktree/workitem-worktree.subscriber.js';
+import { ResourceModeService, RESOURCE_MODE_CONSTANTS } from './services/agent/resource-mode.service.js';
+import { getRestoreQueue, RESTORE_TIER } from './services/agent/restore-queue.js';
 import { sessionsToRestore } from './services/agent/restore-filter.js';
 import { ProjectMemoryService } from './services/memory/project-memory.service.js';
 import { TaskHistorySubscriber } from './services/memory/task-history.subscriber.js';
@@ -1701,6 +1703,10 @@ export class CrewlyServer {
                 // Agents whose deliveries the input guard keeps refusing (crewly#1028).
                 input_circuit: inputCircuitStats(),
                 cloud: cloudHealthBlock(),
+                // Boot restore progress (staggered restore queue).
+                restoreQueue: getRestoreQueue().stats(),
+                // Adaptive agent limits: normal | pressure, running count, cap.
+                ...ResourceModeService.getInstance().stats(),
             });
         });
         // H5 quick entry static page (served regardless of headless mode)
@@ -1926,6 +1932,44 @@ export class CrewlyServer {
                 return items.some((wi) => wi.target === sessionName && PENDING_WORK_STATUSES.has(wi.status));
             });
             idleDetection.start();
+            // Adaptive agent limits (pressure mode cap + start queue).
+            const resourceMode = ResourceModeService.getInstance();
+            const agentRegistration = this.apiController.agentRegistrationService;
+            resourceMode.setDeps({
+                limits: async () => {
+                    const g = (await getSettingsService().getSettings()).general;
+                    return {
+                        maxRunning: Math.max(1, g.pressureMaxRunningAgents ?? RESOURCE_MODE_CONSTANTS.DEFAULT_MAX_RUNNING_AGENTS),
+                        idleTimeoutMinutes: g.pressureIdleTimeoutMinutes ?? RESOURCE_MODE_CONSTANTS.DEFAULT_IDLE_TIMEOUT_MINUTES,
+                    };
+                },
+                listRunning: async () => {
+                    const teams = await StorageService.getInstance().getTeams();
+                    const tracker = PtyActivityTrackerService.getInstance();
+                    const out = [];
+                    for (const t of teams) {
+                        for (const m of t.members || []) {
+                            if (m.agentStatus !== CREWLY_CONSTANTS.AGENT_STATUSES.ACTIVE && m.agentStatus !== CREWLY_CONSTANTS.AGENT_STATUSES.STARTED)
+                                continue;
+                            if (m.sessionName === ORCHESTRATOR_SESSION_NAME || AGENT_SUSPEND_CONSTANTS.ALWAYS_ON_ROLES.includes(m.role))
+                                continue;
+                            let busy = m.agentStatus === CREWLY_CONSTANTS.AGENT_STATUSES.STARTED;
+                            try {
+                                busy = busy || (await this.activityMonitorService.getWorkingStatusForSession(m.sessionName)) === 'in_progress';
+                            }
+                            catch { /* unknown status: treat as not busy */ }
+                            out.push({ sessionName: m.sessionName, role: m.role, idleMs: tracker.getIdleTimeMs(m.sessionName), busy });
+                        }
+                    }
+                    return out;
+                },
+                hasOwnerMessage: (name) => SubAgentMessageQueue.getInstance().peek(name).some((m) => m.meta?.owner === true),
+                stopAgent: async (name, role) => {
+                    await agentRegistration.terminateAgentSession(name, role);
+                    await StorageService.getInstance().updateAgentStatus(name, CREWLY_CONSTANTS.AGENT_STATUSES.INACTIVE, 'idle_exit');
+                },
+            });
+            resourceMode.start();
             // Wire OrchestratorRestartService with dependencies for auto-restart
             try {
                 const sessionBackend = getSessionBackendSync();
@@ -3492,68 +3536,21 @@ export class CrewlyServer {
             // minutes, and measuring afterwards dropped work that was minutes old
             // when the backend went down (CE-128 / CE-132, 2026-10-05).
             const recoveryReferenceMs = Date.now();
-            // Auto-restore agent sessions that were running before the last shutdown
+            // #166/#196: in-progress WorkItems to re-send after the restart (not
+            // older than 1 hour at boot). Each restored agent gets its own recovery
+            // messages right after it registers; agents outside the restore queue
+            // (already live, or not restored) get theirs now.
+            this.recoveryBySession = await this.collectRecoverableTasks(recoveryReferenceMs);
+            // Auto-restore agent sessions that were running before the last shutdown.
+            // Starts the staggered restore queue; it drains in the background.
             await this.autoRestoreAgentSessionsIfEnabled();
             // Re-deliver interrupted turns now that their agents are coming back.
             // Background: the orchestrator may take minutes to register.
             void this.resumeInterruptedTurnsAfterBoot();
-            // #166: Auto-recover in-progress tasks after restart.
-            // #196: Skip tasks older than 1 hour to avoid re-sending stale work.
-            // V3-only as of spec 2026-05-06-task-management-v1-deprecation.md —
-            // reads WorkItems from TaskPoolService (replaces the prior
-            // `TaskTrackingService.getAllInProgressTasks()` call).
-            try {
-                const TASK_RECOVERY_MAX_AGE_MS = 60 * 60 * 1000; // 1 hour
-                const { TaskPoolService } = await import('./services/task-pool/task-pool.service.js');
-                const allItems = await TaskPoolService.getInstance().getAllItems();
-                const now = recoveryReferenceMs;
-                const activeTasks = allItems.filter(wi => {
-                    if (wi.status !== 'queued' && wi.status !== 'accepted' && wi.status !== 'running')
-                        return false;
-                    if (!wi.target)
-                        return false;
-                    // Skip stale tasks — startedAt/createdAt older than threshold
-                    // Last sign of life: a re-claim / status change counts, not only creation.
-                    const taskTime = Math.max(new Date(wi.startedAt || wi.createdAt || 0).getTime() || 0, new Date(wi.statusChangedAt || 0).getTime() || 0);
-                    if (now - taskTime > TASK_RECOVERY_MAX_AGE_MS) {
-                        this.logger.info('Skipping stale task recovery (older than 1 hour)', {
-                            workItemId: wi.id,
-                            taskName: wi.title,
-                            age: `${Math.round((now - taskTime) / 60000)} minutes`,
-                        });
-                        return false;
-                    }
-                    return true;
-                });
-                if (activeTasks.length > 0) {
-                    this.logger.info('Found in-progress WorkItems to recover after restart', {
-                        count: activeTasks.length,
-                    });
-                    for (const wi of activeTasks) {
-                        try {
-                            const recoveryMessage = `[SYSTEM — TASK RECOVERY] You were working on this task before the server restarted. Please continue:\n\nTask: ${wi.title}\nWorkItem: ${wi.id}\n\nFetch full brief: bash config/skills/agent/core/read-task/execute.sh '{"workItemId":"${wi.id}"}'\n\nPlease check the current state and continue working.`;
-                            await this.apiController.agentRegistrationService.sendMessageToAgent(wi.target, recoveryMessage, undefined);
-                            this.logger.info('Task recovery message sent', {
-                                workItemId: wi.id,
-                                sessionName: wi.target,
-                                taskName: wi.title,
-                            });
-                        }
-                        catch (err) {
-                            // Agent might not be online yet — DLQ in scheduler will handle it
-                            this.logger.warn('Task recovery delivery deferred (agent may not be online yet)', {
-                                workItemId: wi.id,
-                                sessionName: wi.target,
-                                error: err instanceof Error ? err.message : String(err),
-                            });
-                        }
-                    }
-                }
-            }
-            catch (err) {
-                this.logger.warn('Task auto-recovery failed (non-critical)', {
-                    error: err instanceof Error ? err.message : String(err),
-                });
+            const queued = new Set(getRestoreQueue().stats().order);
+            for (const session of [...this.recoveryBySession.keys()]) {
+                if (!queued.has(session))
+                    await this.sendRecoveryFor(session);
             }
             // Start log rotation service (non-critical — logs cleanup)
             try {
@@ -3983,6 +3980,77 @@ export class CrewlyServer {
             });
         }
     }
+    /** WorkItems to recover after boot, grouped by target session. */
+    recoveryBySession = new Map();
+    /**
+     * In-progress WorkItems worth re-sending after a restart: active status,
+     * with a target, touched within the last hour of `referenceMs`.
+     *
+     * @param referenceMs - Boot time (age is measured at boot, not after the restore)
+     * @returns Items grouped by target session
+     */
+    async collectRecoverableTasks(referenceMs) {
+        const out = new Map();
+        try {
+            const TASK_RECOVERY_MAX_AGE_MS = 60 * 60 * 1000; // 1 hour
+            const allItems = await TaskPoolService.getInstance().getAllItems();
+            for (const wi of allItems) {
+                if (wi.status !== 'queued' && wi.status !== 'accepted' && wi.status !== 'running')
+                    continue;
+                if (!wi.target)
+                    continue;
+                // Last sign of life: a re-claim / status change counts, not only creation.
+                const taskTime = Math.max(new Date(wi.startedAt || wi.createdAt || 0).getTime() || 0, new Date(wi.statusChangedAt || 0).getTime() || 0);
+                if (referenceMs - taskTime > TASK_RECOVERY_MAX_AGE_MS) {
+                    this.logger.info('Skipping stale task recovery (older than 1 hour)', {
+                        workItemId: wi.id,
+                        taskName: wi.title,
+                        age: `${Math.round((referenceMs - taskTime) / 60000)} minutes`,
+                    });
+                    continue;
+                }
+                const list = out.get(wi.target) ?? [];
+                list.push(wi);
+                out.set(wi.target, list);
+            }
+            if (out.size > 0) {
+                this.logger.info('Found in-progress WorkItems to recover after restart', {
+                    count: [...out.values()].reduce((n, l) => n + l.length, 0),
+                });
+            }
+        }
+        catch (err) {
+            this.logger.warn('Task auto-recovery failed (non-critical)', {
+                error: err instanceof Error ? err.message : String(err),
+            });
+        }
+        return out;
+    }
+    /**
+     * Send the task-recovery messages of one session (once), e.g. right after
+     * that agent registered.
+     *
+     * @param sessionName - Target session
+     */
+    async sendRecoveryFor(sessionName) {
+        const items = this.recoveryBySession.get(sessionName);
+        this.recoveryBySession.delete(sessionName);
+        for (const wi of items ?? []) {
+            try {
+                const recoveryMessage = `[SYSTEM — TASK RECOVERY] You were working on this task before the server restarted. Please continue:\n\nTask: ${wi.title}\nWorkItem: ${wi.id}\n\nFetch full brief: bash config/skills/agent/core/read-task/execute.sh '{"workItemId":"${wi.id}"}'\n\nPlease check the current state and continue working.`;
+                await this.apiController.agentRegistrationService.sendMessageToAgent(sessionName, recoveryMessage, undefined);
+                this.logger.info('Task recovery message sent', { workItemId: wi.id, sessionName, taskName: wi.title });
+            }
+            catch (err) {
+                // Agent might not be online yet — DLQ in scheduler will handle it
+                this.logger.warn('Task recovery delivery deferred (agent may not be online yet)', {
+                    workItemId: wi.id,
+                    sessionName,
+                    error: err instanceof Error ? err.message : String(err),
+                });
+            }
+        }
+    }
     /**
      * Auto-restore agent sessions that were running before the last shutdown.
      * Loads persisted session state and calls createAgentSession() for each
@@ -4077,76 +4145,67 @@ export class CrewlyServer {
                 count: agentSessions.length,
                 sessions: agentSessions.map((s) => s.name),
             });
-            let restored = 0;
-            let alreadyRunning = 0;
-            const failed = [];
-            const RESTORE_DELAY_MS = 10_000; // 10 seconds between each session restore to avoid resource pressure
-            for (let i = 0; i < agentSessions.length; i++) {
-                const session = agentSessions[i];
-                // Wait between session restores to avoid SIGTERM from resource pressure
-                if (i > 0) {
-                    this.logger.info('Waiting before restoring next session to avoid resource pressure', {
-                        delayMs: RESTORE_DELAY_MS,
-                        nextSession: session.name,
-                        progress: `${i}/${agentSessions.length}`,
-                    });
-                    await new Promise((resolve) => setTimeout(resolve, RESTORE_DELAY_MS));
-                }
-                try {
-                    // PTYs live in this process, so none survive a restart: a session
-                    // that exists now was started this boot by another launcher (a
-                    // reconciler wake, a team start). forceRecreate would kill it and
-                    // resume the same conversation again — a second kickoff in one
-                    // chat (2026-09-25 startup-prompt loop). Leave it be.
-                    if (await this.apiController.agentRegistrationService.isSessionLiveOrLaunching(session.name)) {
-                        alreadyRunning++;
-                        this.logger.info('Skipping restore — session already started this boot by another launcher', {
-                            name: session.name,
-                        });
-                        continue;
-                    }
-                    const result = await this.apiController.agentRegistrationService.createAgentSession({
-                        sessionName: session.name,
-                        role: session.role || 'developer',
-                        projectPath: session.cwd || process.cwd(),
-                        runtimeType: session.runtimeType,
-                        teamId: session.teamId,
-                        memberId: session.memberId,
-                        forceRecreate: true,
-                    });
-                    if (result.success) {
-                        restored++;
-                        this.logger.info('Restored agent session', {
-                            name: session.name,
-                            role: session.role,
+            // Staggered restore: one agent at a time (CREWLY_RESTORE_CONCURRENCY,
+            // max 3), the next starts when the previous one registered or timed out.
+            // Owner-waiting agents first, then orchestrator, leads, everyone else.
+            const queueMessages = SubAgentMessageQueue.getInstance();
+            const owedSince = new Map();
+            for (const c of this.openCommitmentsAtBoot) {
+                const due = c.due ? Date.parse(c.due) : NaN;
+                owedSince.set(c.sessionName, Math.min(owedSince.get(c.sessionName) ?? Infinity, Number.isFinite(due) ? due : 0));
+            }
+            const leadRoles = TEAM_LEAD_CONSTANTS.LEAD_ROLES;
+            const entries = agentSessions.map((session) => {
+                const ownerTimes = queueMessages.peek(session.name).filter((m) => m.meta?.owner === true).map((m) => m.queuedAt);
+                if (owedSince.has(session.name))
+                    ownerTimes.push(owedSince.get(session.name));
+                const base = {
+                    name: session.name,
+                    run: async (attempt) => {
+                        // PTYs live in this process, so none survive a restart: a session
+                        // that exists now was started this boot by another launcher (a
+                        // reconciler wake, a team start). forceRecreate would kill it and
+                        // resume the same conversation again — a second kickoff in one
+                        // chat (2026-09-25 startup-prompt loop). Leave it be.
+                        if (attempt === 0 && await this.apiController.agentRegistrationService.isSessionLiveOrLaunching(session.name)) {
+                            this.logger.info('Skipping restore — session already started this boot by another launcher', { name: session.name });
+                            return { success: true };
+                        }
+                        const result = await this.apiController.agentRegistrationService.createAgentSession({
+                            sessionName: session.name,
+                            role: session.role || 'developer',
+                            projectPath: session.cwd || process.cwd(),
                             runtimeType: session.runtimeType,
-                            progress: `${restored}/${agentSessions.length}`,
-                        });
-                    }
-                    else {
-                        failed.push(session.name);
-                        this.logger.warn('Failed to restore agent session', {
-                            name: session.name,
-                            error: result.error,
+                            teamId: session.teamId,
+                            memberId: session.memberId,
+                            // A retry joins the launch still in flight instead of killing it.
+                            forceRecreate: attempt === 0,
                         });
-                    }
-                }
-                catch (error) {
-                    failed.push(session.name);
-                    this.logger.error('Error restoring agent session', {
-                        name: session.name,
-                        error: error instanceof Error ? error.message : String(error),
-                    });
+                        if (!result.success)
+                            this.logger.warn('Failed to restore agent session', { name: session.name, error: result.error });
+                        return { success: result.success };
+                    },
+                    onReady: () => this.sendRecoveryFor(session.name),
+                };
+                if (ownerTimes.length > 0) {
+                    return { ...base, tier: RESTORE_TIER.OWNER, ownerSince: Math.min(...ownerTimes), reason: 'owner message waiting' };
                 }
-            }
-            this.logger.info('Agent session restore complete', {
-                restored,
-                alreadyRunning,
-                total: agentSessions.length,
-                failed: failed.length > 0 ? failed : undefined,
+                if (session.role === ORCHESTRATOR_ROLE)
+                    return { ...base, tier: RESTORE_TIER.ORCHESTRATOR, reason: 'orchestrator' };
+                if (leadRoles.includes(session.role ?? ''))
+                    return { ...base, tier: RESTORE_TIER.LEAD, reason: 'team lead with work in hand' };
+                return { ...base, tier: RESTORE_TIER.OTHER, reason: 'work in hand' };
+            });
+            // Runs in the background; boot continues while agents come back.
+            void getRestoreQueue()
+                .start(entries)
+                .then(async () => {
+                // Clear persisted state after the restore to avoid double-restore
+                await persistence.clearState();
+            })
+                .catch((error) => {
+                this.logger.error('Restore queue failed', { error: error instanceof Error ? error.message : String(error) });
             });
-            // Clear persisted state after restore attempt to avoid double-restore
-            await persistence.clearState();
         }
         catch (error) {
             this.logger.error('Failed to auto-restore agent sessions', {