@proletariat/cli 0.3.93 → 0.3.95

package/dist/lib/session/heartbeat.js

@@ -0,0 +1,150 @@
+/**
+ * Agent Heartbeat
+ *
+ * Heartbeat recording and checking for agent executions.
+ * The heartbeat system has two sides:
+ *
+ * 1. Agent-side (push): Agents update their heartbeat when alive/active.
+ *    This is done by checking tmux pane liveness and JSONL file activity.
+ *
+ * 2. Host-side (pull): The watcher checks heartbeat timestamps and marks
+ *    stale executions as failed. This catches the case where the agent is
+ *    so dead it can't self-report (OOM, zombie processes).
+ */
+import { execSync } from 'node:child_process';
+import { captureTmuxPane, getHostTmuxSessionNames, getContainerTmuxSessionMap, findContainerSessionsByPrefix, findSessionForExecution, } from '../execution/session-utils.js';
+import { detectState } from '../../commands/session/health.js';
+// =============================================================================
+// Heartbeat Recording (Agent-side push)
+// =============================================================================
+/**
+ * Record a heartbeat for an execution by checking if its tmux session is alive.
+ * Uses tmux pane inspection to determine if the agent is still active.
+ *
+ * Returns the detected health state, or null if the session couldn't be found.
+ */
+export function recordHeartbeatFromSession(storage, execution) {
+    const isContainer = execution.environment === 'devcontainer';
+    let sessionId = execution.sessionId;
+    // Try to find the tmux session
+    if (isContainer && execution.containerId) {
+        const containerSessions = getContainerTmuxSessionMap();
+        const sessions = findContainerSessionsByPrefix(containerSessions, execution.containerId);
+        if (!sessions || sessions.length === 0)
+            return null;
+        if (sessionId && sessions.includes(sessionId)) {
+            // Session found by exact match
+        }
+        else {
+            // Try fuzzy match
+            const match = findSessionForExecution(execution.ticketId, execution.agentName, sessions);
+            if (match) {
+                sessionId = match;
+            }
+            else {
+                return null;
+            }
+        }
+    }
+    else {
+        const hostSessions = getHostTmuxSessionNames();
+        if (sessionId && hostSessions.includes(sessionId)) {
+            // Session found
+        }
+        else {
+            const match = findSessionForExecution(execution.ticketId, execution.agentName, hostSessions);
+            if (match) {
+                sessionId = match;
+            }
+            else {
+                return null;
+            }
+        }
+    }
+    if (!sessionId)
+        return null;
+    // Capture pane content and detect state
+    const paneContent = captureTmuxPane(sessionId, 10, isContainer ? execution.containerId : undefined);
+    const state = detectState(paneContent);
+    // If the session is alive (any state other than UNKNOWN with no content), record heartbeat
+    if (paneContent !== null) {
+        storage.updateHeartbeat(execution.id);
+        // Update lifecycle state based on detected health
+        if (state === 'WORKING') {
+            storage.updateLifecycleState(execution.id, 'healthy');
+        }
+        else if (state === 'IDLE') {
+            storage.updateLifecycleState(execution.id, 'idle');
+        }
+        else if (state === 'DONE') {
+            storage.updateLifecycleState(execution.id, 'completed');
+        }
+    }
+    return state;
+}
+/**
+ * Record heartbeats for all running executions.
+ * Returns a map of execution ID to detected state.
+ */
+export function recordAllHeartbeats(storage) {
+    const results = new Map();
+    const runningExecutions = storage.listExecutions({ status: 'running' });
+    const startingExecutions = storage.listExecutions({ status: 'starting' });
+    const activeExecutions = [...runningExecutions, ...startingExecutions];
+    for (const exec of activeExecutions) {
+        const state = recordHeartbeatFromSession(storage, exec);
+        if (state) {
+            results.set(exec.id, state);
+        }
+    }
+    return results;
+}
+/**
+ * Check for stale executions that have exceeded the heartbeat timeout.
+ */
+export function detectStaleExecutions(storage, timeoutMinutes) {
+    const staleExecutions = storage.getStaleExecutions(timeoutMinutes);
+    return staleExecutions.map(exec => {
+        const lastHeartbeat = exec.lastHeartbeat || null;
+        const referenceTime = lastHeartbeat || exec.startedAt;
+        const staleDurationMs = Date.now() - referenceTime.getTime();
+        const staleDurationMinutes = Math.floor(staleDurationMs / 60000);
+        const reason = lastHeartbeat
+            ? `No heartbeat for ${staleDurationMinutes} minutes (last: ${lastHeartbeat.toISOString()})`
+            : `No heartbeat since start ${staleDurationMinutes} minutes ago`;
+        return {
+            execution: exec,
+            lastHeartbeat,
+            staleDurationMinutes,
+            reason,
+        };
+    });
+}
+// =============================================================================
+// Container Kill
+// =============================================================================
+/**
+ * Kill a Docker container by ID.
+ * Returns true if the container was killed or already stopped.
+ */
+export function killContainer(containerId) {
+    try {
+        execSync(`docker kill ${containerId}`, {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+            timeout: 30000,
+        });
+        return true;
+    }
+    catch {
+        // Container may already be stopped
+        try {
+            const status = execSync(`docker inspect --format '{{.State.Status}}' ${containerId}`, { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'], timeout: 10000 }).trim();
+            return status === 'exited' || status === 'dead';
+        }
+        catch {
+            return false;
+        }
+    }
+}
+//# sourceMappingURL=heartbeat.js.map

package/dist/lib/session/heartbeat.js.map

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

package/dist/lib/session/index.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Session Module
+ *
+ * Agent session monitoring, heartbeat tracking, and stale detection.
+ */
+export * from './heartbeat.js';
+export * from './watcher.js';

package/dist/lib/session/index.js

@@ -0,0 +1,8 @@
+/**
+ * Session Module
+ *
+ * Agent session monitoring, heartbeat tracking, and stale detection.
+ */
+export * from './heartbeat.js';
+export * from './watcher.js';
+//# sourceMappingURL=index.js.map

package/dist/lib/session/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/session/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,gBAAgB,CAAA;AAC9B,cAAc,cAAc,CAAA"}

package/dist/lib/session/watcher.d.ts

@@ -0,0 +1,79 @@
+/**
+ * Session Watcher
+ *
+ * Host-side cron/poll loop that monitors agent heartbeats and takes action
+ * on stale executions. This is the safety net for detecting hung agents
+ * that can't self-report (OOM kills, zombie processes, container crashes).
+ *
+ * Architecture:
+ * 1. Poll: Check all running executions for heartbeat timeout
+ * 2. Update: Record heartbeats for alive agents (tmux pane inspection)
+ * 3. Detect: Find stale executions that exceeded the timeout
+ * 4. Act: Mark failed, kill containers, fire events
+ */
+import type Database from 'better-sqlite3';
+import type { AgentWork } from '../execution/types.js';
+import { type StaleExecution } from './heartbeat.js';
+export interface WatcherOptions {
+    /** Database connection */
+    db: Database.Database;
+    /** Poll interval in minutes (default: 5) */
+    intervalMinutes?: number;
+    /** Heartbeat timeout in minutes (default: 15) */
+    timeoutMinutes?: number;
+    /** Whether to kill containers on timeout (default: true) */
+    autoKill?: boolean;
+    /** Logger function */
+    log?: (msg: string) => void;
+    /** Callback when a stale execution is detected and handled */
+    onStaleDetected?: (execution: AgentWork, reason: string) => void | Promise<void>;
+}
+export interface WatchCycleResult {
+    /** Number of active executions checked */
+    checked: number;
+    /** Number of heartbeats updated (agents confirmed alive) */
+    heartbeatsUpdated: number;
+    /** Stale executions detected and acted upon */
+    staleExecutions: StaleExecution[];
+    /** Number of containers killed */
+    containersKilled: number;
+}
+export declare class SessionWatcher {
+    private storage;
+    private db;
+    private intervalMinutes;
+    private timeoutMinutes;
+    private autoKill;
+    private log;
+    private onStaleDetected?;
+    private timer;
+    private running;
+    constructor(options: WatcherOptions);
+    /**
+     * Run a single watch cycle.
+     * Can be called directly for one-shot checking, or used by the polling loop.
+     */
+    runCycle(): Promise<WatchCycleResult>;
+    /**
+     * Start the polling loop.
+     * Runs an initial cycle immediately, then polls at the configured interval.
+     */
+    start(): void;
+    /**
+     * Stop the polling loop.
+     */
+    stop(): void;
+    /**
+     * Check if the watcher is currently running.
+     */
+    isRunning(): boolean;
+    /**
+     * Get current configuration.
+     */
+    getConfig(): {
+        intervalMinutes: number;
+        timeoutMinutes: number;
+        autoKill: boolean;
+    };
+    private runCycleWithErrorHandling;
+}

package/dist/lib/session/watcher.js

@@ -0,0 +1,142 @@
+/**
+ * Session Watcher
+ *
+ * Host-side cron/poll loop that monitors agent heartbeats and takes action
+ * on stale executions. This is the safety net for detecting hung agents
+ * that can't self-report (OOM kills, zombie processes, container crashes).
+ *
+ * Architecture:
+ * 1. Poll: Check all running executions for heartbeat timeout
+ * 2. Update: Record heartbeats for alive agents (tmux pane inspection)
+ * 3. Detect: Find stale executions that exceeded the timeout
+ * 4. Act: Mark failed, kill containers, fire events
+ */
+import { ExecutionStorage } from '../execution/storage.js';
+import { recordAllHeartbeats, detectStaleExecutions, killContainer, } from './heartbeat.js';
+// =============================================================================
+// Session Watcher
+// =============================================================================
+export class SessionWatcher {
+    storage;
+    db;
+    intervalMinutes;
+    timeoutMinutes;
+    autoKill;
+    log;
+    onStaleDetected;
+    timer = null;
+    running = false;
+    constructor(options) {
+        this.db = options.db;
+        this.storage = new ExecutionStorage(options.db);
+        this.intervalMinutes = options.intervalMinutes ?? 5;
+        this.timeoutMinutes = options.timeoutMinutes ?? 15;
+        this.autoKill = options.autoKill ?? true;
+        this.log = options.log ?? (() => { });
+        this.onStaleDetected = options.onStaleDetected;
+    }
+    /**
+     * Run a single watch cycle.
+     * Can be called directly for one-shot checking, or used by the polling loop.
+     */
+    async runCycle() {
+        const result = {
+            checked: 0,
+            heartbeatsUpdated: 0,
+            staleExecutions: [],
+            containersKilled: 0,
+        };
+        // Phase 1: Record heartbeats for all active executions
+        // This is the "push" side — we check tmux panes and update heartbeats
+        const heartbeats = recordAllHeartbeats(this.storage);
+        result.heartbeatsUpdated = heartbeats.size;
+        result.checked = heartbeats.size;
+        // Phase 2: Detect stale executions that exceeded timeout
+        // This is the "pull" side — safety net for completely dead agents
+        const staleExecutions = detectStaleExecutions(this.storage, this.timeoutMinutes);
+        result.staleExecutions = staleExecutions;
+        // Phase 3: Act on stale executions
+        for (const stale of staleExecutions) {
+            const exec = stale.execution;
+            this.log(`[watcher] Stale agent detected: ${exec.agentName} (${exec.ticketId}) — ${stale.reason}`);
+            // Mark execution as failed due to heartbeat timeout
+            this.storage.markHeartbeatTimeout(exec.id);
+            // Kill container if configured and applicable
+            if (this.autoKill && exec.containerId) {
+                this.log(`[watcher] Killing container ${exec.containerId} for ${exec.agentName}`);
+                const killed = killContainer(exec.containerId);
+                if (killed) {
+                    result.containersKilled++;
+                    this.log(`[watcher] Container ${exec.containerId} killed`);
+                }
+                else {
+                    this.log(`[watcher] Failed to kill container ${exec.containerId}`);
+                }
+            }
+            // Fire callback
+            if (this.onStaleDetected) {
+                await this.onStaleDetected(exec, stale.reason);
+            }
+        }
+        return result;
+    }
+    /**
+     * Start the polling loop.
+     * Runs an initial cycle immediately, then polls at the configured interval.
+     */
+    start() {
+        if (this.running)
+            return;
+        this.running = true;
+        this.log(`[watcher] Starting session watcher (interval: ${this.intervalMinutes}m, timeout: ${this.timeoutMinutes}m, auto-kill: ${this.autoKill})`);
+        // Run initial cycle
+        void this.runCycleWithErrorHandling();
+        // Start polling
+        const intervalMs = this.intervalMinutes * 60 * 1000;
+        this.timer = setInterval(() => {
+            void this.runCycleWithErrorHandling();
+        }, intervalMs);
+    }
+    /**
+     * Stop the polling loop.
+     */
+    stop() {
+        if (!this.running)
+            return;
+        this.running = false;
+        if (this.timer) {
+            clearInterval(this.timer);
+            this.timer = null;
+        }
+        this.log('[watcher] Session watcher stopped');
+    }
+    /**
+     * Check if the watcher is currently running.
+     */
+    isRunning() {
+        return this.running;
+    }
+    /**
+     * Get current configuration.
+     */
+    getConfig() {
+        return {
+            intervalMinutes: this.intervalMinutes,
+            timeoutMinutes: this.timeoutMinutes,
+            autoKill: this.autoKill,
+        };
+    }
+    async runCycleWithErrorHandling() {
+        try {
+            const result = await this.runCycle();
+            if (result.staleExecutions.length > 0) {
+                this.log(`[watcher] Cycle complete: ${result.checked} checked, ${result.heartbeatsUpdated} heartbeats, ` +
+                    `${result.staleExecutions.length} stale, ${result.containersKilled} killed`);
+            }
+        }
+        catch (error) {
+            this.log(`[watcher] Error during watch cycle: ${error instanceof Error ? error.message : error}`);
+        }
+    }
+}
+//# sourceMappingURL=watcher.js.map

package/dist/lib/session/watcher.js.map

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

package/dist/lib/shipping/auto-merge.d.ts

@@ -0,0 +1,57 @@
+/**
+ * Auto-Merge Orchestration
+ *
+ * Implements the --when-green watch loop that polls CI status and
+ * automatically merges a PR once all checks pass. Handles the full
+ * rebase+CI cycle automatically.
+ *
+ * Flow:
+ * 1. Optionally enable native auto-merge as a safety net
+ * 2. Poll CI status at regular intervals
+ * 3. If CI is green and branch is up to date, merge
+ * 4. If branch has conflicts, rebase and wait for CI to rerun
+ * 5. If CI fails, exit with error
+ * 6. If timeout, exit with error
+ */
+import { getPRChecks, mergePR } from '../pr/index.js';
+import type { AutoMergeProvider } from './types.js';
+import type { WhenGreenOptions, WhenGreenResult } from './types.js';
+declare function sleep(ms: number): Promise<void>;
+/**
+ * Check if a PR has merge conflicts with its base branch.
+ */
+declare function checkMergeConflicts(prNumber: number, cwd?: string): boolean;
+/**
+ * Check if a PR has already been merged.
+ */
+declare function isPRMerged(prNumber: number, cwd?: string): boolean;
+/**
+ * Rebase a PR branch onto its base branch and force-push.
+ */
+declare function rebaseOntoBase(headBranch: string, baseBranch: string, cwd?: string): {
+    success: boolean;
+    error?: string;
+};
+export interface WatchAndShipDeps {
+    getPRChecks: typeof getPRChecks;
+    mergePR: typeof mergePR;
+    checkMergeConflicts: typeof checkMergeConflicts;
+    isPRMerged: typeof isPRMerged;
+    rebaseOntoBase: typeof rebaseOntoBase;
+    sleep: typeof sleep;
+}
+/**
+ * Watch a PR and ship it when CI turns green.
+ *
+ * This is the core implementation of `--when-green`. It enters a poll loop
+ * that checks CI status and handles the rebase+merge cycle automatically.
+ *
+ * If a native auto-merge provider is given, it will be enabled as a safety net
+ * so that even if this process dies, the PR will still auto-merge when ready.
+ *
+ * @param options - Watch loop configuration
+ * @param autoMergeProvider - Optional provider for native auto-merge
+ * @param deps - Injectable dependencies for testing
+ */
+export declare function watchAndShip(options: WhenGreenOptions, autoMergeProvider?: AutoMergeProvider | null, deps?: WatchAndShipDeps): Promise<WhenGreenResult>;
+export {};