@overlordai/server 1.0.53 → 1.0.55

package/dist/dispatcher/task-lifecycle.service.js

@@ -0,0 +1,584 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var TaskLifecycleService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TaskLifecycleService = void 0;
+const protocol_1 = require("@overlordai/protocol");
+const common_1 = require("@nestjs/common");
+const crypto = __importStar(require("node:crypto"));
+const task_repository_1 = require("../database/repositories/task.repository");
+const audit_log_repository_1 = require("../database/repositories/audit-log.repository");
+const workspace_repository_1 = require("../database/repositories/workspace.repository");
+const redis_service_1 = require("../redis/redis.service");
+const event_emitter_1 = require("@nestjs/event-emitter");
+const event_types_1 = require("../events/event-types");
+const state_machine_1 = require("./state-machine");
+const scheduler_service_1 = require("./scheduler.service");
+const worker_connection_manager_1 = require("./worker-connection.manager");
+const cleanup_service_1 = require("./cleanup.service");
+const git_utils_1 = require("../common/git-utils");
+const task_creation_service_1 = require("./task-creation.service");
+const dedup_service_1 = require("./dedup.service");
+let TaskLifecycleService = TaskLifecycleService_1 = class TaskLifecycleService {
+    taskRepo;
+    auditLogRepo;
+    workspaceRepo;
+    redis;
+    schedulerService;
+    workerConnectionManager;
+    cleanupService;
+    taskCreationService;
+    dedupService;
+    eventEmitter;
+    logger = new common_1.Logger(TaskLifecycleService_1.name);
+    constructor(taskRepo, auditLogRepo, workspaceRepo, redis, schedulerService, workerConnectionManager, cleanupService, taskCreationService, dedupService, eventEmitter) {
+        this.taskRepo = taskRepo;
+        this.auditLogRepo = auditLogRepo;
+        this.workspaceRepo = workspaceRepo;
+        this.redis = redis;
+        this.schedulerService = schedulerService;
+        this.workerConnectionManager = workerConnectionManager;
+        this.cleanupService = cleanupService;
+        this.taskCreationService = taskCreationService;
+        this.dedupService = dedupService;
+        this.eventEmitter = eventEmitter;
+    }
+    // ---------------------------------------------------------------------------
+    // cancelTask
+    // ---------------------------------------------------------------------------
+    async cancelTask(taskId, cancelledBy) {
+        const task = this.taskRepo.findById(taskId);
+        if (!task) {
+            throw new common_1.NotFoundException(`Task #${taskId} not found`);
+        }
+        // Validate transition
+        state_machine_1.TaskStateMachine.assertTransition(task.status, protocol_1.TaskStatus.CANCELLED);
+        switch (task.status) {
+            case protocol_1.TaskStatus.QUEUED: {
+                // Remove from BullMQ — task stays QUEUED until we set CANCELLED below
+                this.updateTaskStatusWithRetry(taskId, protocol_1.TaskStatus.CANCELLED, task.revision);
+                break;
+            }
+            case protocol_1.TaskStatus.RUNNING: {
+                // Send cancel to Worker via WS, wait ack with timeout
+                if (task.workerId) {
+                    const acked = await this.sendCancelToWorkerWithAck(task.workerId, taskId);
+                    if (!acked) {
+                        this.logger.warn(`Cancel ack timeout for task #${taskId} on worker ${task.workerId}, forcing cancel`);
+                    }
+                }
+                // Reload task to get latest revision (may have changed during ack wait)
+                const freshTask = this.taskRepo.findById(taskId);
+                if (freshTask && freshTask.status !== protocol_1.TaskStatus.CANCELLED) {
+                    this.updateTaskStatusWithRetry(taskId, protocol_1.TaskStatus.CANCELLED, freshTask.revision, { completedAt: new Date().toISOString() });
+                }
+                break;
+            }
+            case protocol_1.TaskStatus.ASSIGNED: {
+                // Re-read to catch ASSIGNED->RUNNING race between initial read and CAS
+                const freshAssigned = this.taskRepo.findById(taskId);
+                if (!freshAssigned || freshAssigned.status === protocol_1.TaskStatus.CANCELLED) {
+                    break;
+                }
+                state_machine_1.TaskStateMachine.assertTransition(freshAssigned.status, protocol_1.TaskStatus.CANCELLED);
+                // Send cancel to Worker if assigned, set CANCELLED
+                if (freshAssigned.workerId) {
+                    this.sendCancelToWorker(freshAssigned.workerId, taskId);
+                }
+                this.updateTaskStatusWithRetry(taskId, protocol_1.TaskStatus.CANCELLED, freshAssigned.revision, { completedAt: new Date().toISOString() });
+                break;
+            }
+            case protocol_1.TaskStatus.SUSPENDED: {
+                // Direct set CANCELLED — no Worker ack needed
+                this.updateTaskStatusWithRetry(taskId, protocol_1.TaskStatus.CANCELLED, task.revision, { completedAt: new Date().toISOString() });
+                break;
+            }
+            default:
+                throw new common_1.BadRequestException(`Cannot cancel task #${taskId} in status ${task.status}`);
+        }
+        this.auditLogRepo.create({
+            userId: cancelledBy,
+            action: 'task_cancel',
+            resource: `task:${taskId}`,
+            detail: `Cancelled task #${taskId} from status ${task.status}`,
+        });
+        this.eventEmitter.emit(event_types_1.DomainEvents.TASK_STATUS_CHANGED, {
+            taskId,
+            status: protocol_1.TaskStatus.CANCELLED,
+            previousStatus: task.status,
+            workerId: task.workerId,
+            projectKey: task.projectKey,
+        });
+        // Schedule workspace cleanup for the cancelled task
+        if (task.workerId) {
+            const workspace = this.workspaceRepo.findByTaskId(taskId);
+            if (workspace) {
+                this.cleanupService.scheduleCleanup(taskId, task.workerId, workspace.path).catch((err) => {
+                    this.logger.error(`Failed to schedule cleanup for cancelled task #${taskId}: ${(0, protocol_1.getErrorMessage)(err)}`);
+                });
+            }
+        }
+        this.logger.log(`Task #${taskId} cancelled by developer #${cancelledBy}`);
+    }
+    // ---------------------------------------------------------------------------
+    // markTaskRunning — transition ASSIGNED → RUNNING when worker starts executing
+    // ---------------------------------------------------------------------------
+    markTaskRunning(taskId) {
+        const task = this.taskRepo.findById(taskId);
+        if (!task || task.status !== protocol_1.TaskStatus.ASSIGNED)
+            return false;
+        const updated = this.updateTaskStatusWithRetry(taskId, protocol_1.TaskStatus.RUNNING, task.revision, { startedAt: new Date().toISOString() });
+        if (updated) {
+            this.auditLogRepo.create({
+                action: 'task_running_from_worker',
+                resource: `task:${taskId}`,
+                detail: `Task marked RUNNING via worker progress frame`,
+            });
+            this.eventEmitter.emit(event_types_1.DomainEvents.TASK_STATUS_CHANGED, {
+                taskId,
+                status: protocol_1.TaskStatus.RUNNING,
+                previousStatus: protocol_1.TaskStatus.ASSIGNED,
+                workerId: task.workerId,
+                projectKey: task.projectKey,
+            });
+        }
+        return updated;
+    }
+    // ---------------------------------------------------------------------------
+    // markTaskTerminalFromWorker — called by gateway when worker reports failure/cancel
+    // ---------------------------------------------------------------------------
+    markTaskTerminalFromWorker(taskId, targetStatus, errorMessage) {
+        const task = this.taskRepo.findById(taskId);
+        if (!task)
+            return false;
+        // Already in target or other terminal status — nothing to do
+        if (state_machine_1.TaskStateMachine.isTerminal(task.status))
+            return false;
+        // Validate transition is legal
+        if (!state_machine_1.TaskStateMachine.canTransition(task.status, targetStatus)) {
+            this.logger.warn(`Cannot transition task #${taskId} from ${task.status} to ${targetStatus} via worker progress`);
+            return false;
+        }
+        const extra = {
+            completedAt: new Date().toISOString(),
+        };
+        if (errorMessage)
+            extra.errorMessage = errorMessage;
+        const updated = this.updateTaskStatusWithRetry(taskId, targetStatus, task.revision, extra);
+        if (updated) {
+            // Schedule workspace cleanup
+            if (task.workerId) {
+                const workspace = this.workspaceRepo.findByTaskId(taskId);
+                if (workspace) {
+                    this.cleanupService
+                        .scheduleCleanup(taskId, task.workerId, workspace.path)
+                        .catch((err) => {
+                        this.logger.error(`Failed to schedule cleanup for task #${taskId}: ${(0, protocol_1.getErrorMessage)(err)}`);
+                    });
+                }
+            }
+            this.auditLogRepo.create({
+                action: `task_${targetStatus.toLowerCase()}_from_worker`,
+                resource: `task:${taskId}`,
+                detail: `Task marked ${targetStatus} via worker progress frame`,
+            });
+            this.eventEmitter.emit(event_types_1.DomainEvents.TASK_STATUS_CHANGED, {
+                taskId,
+                status: targetStatus,
+                previousStatus: task.status,
+                workerId: task.workerId,
+                projectKey: task.projectKey,
+            });
+        }
+        return updated;
+    }
+    // ---------------------------------------------------------------------------
+    // retryTask
+    // ---------------------------------------------------------------------------
+    async retryTask(taskId, retriedBy) {
+        const task = this.taskRepo.findById(taskId);
+        if (!task) {
+            throw new common_1.NotFoundException(`Task #${taskId} not found`);
+        }
+        if (task.status !== protocol_1.TaskStatus.FAILED) {
+            throw new common_1.BadRequestException(`Cannot retry task #${taskId}: status is ${task.status}, expected FAILED`);
+        }
+        // Validate transition
+        state_machine_1.TaskStateMachine.assertTransition(task.status, protocol_1.TaskStatus.QUEUED);
+        // Check fingerprint conflict — another active task with same fingerprint
+        if (task.fingerprint) {
+            const conflicting = this.taskRepo.findActiveByFingerprint(task.fingerprint);
+            if (conflicting && conflicting.id !== taskId) {
+                throw new common_1.ConflictException(`Cannot retry: active task #${conflicting.id} has the same fingerprint`);
+            }
+        }
+        // Check for existing MR/PR on the branch (if branch exists)
+        if (task.branch && task.configSnapshot) {
+            const mrCheckResult = await this.checkExistingMergeRequest(task);
+            if (mrCheckResult) {
+                // Store pending confirm for retry with existing MR
+                const confirmKey = `pending_confirm:retry:${crypto.randomUUID()}`;
+                const pendingData = JSON.stringify({
+                    action: 'retry',
+                    taskId,
+                    createdBy: retriedBy,
+                });
+                await this.redis.setex(confirmKey, protocol_1.CONFIRM_PENDING_TTL_SEC, pendingData);
+                // Store index from taskId to confirmKey for lookup during confirm
+                await this.redis.setex(`pending_confirm_idx:task:${taskId}`, protocol_1.CONFIRM_PENDING_TTL_SEC, confirmKey);
+                throw new common_1.ConflictException({
+                    message: `Task #${taskId} branch '${task.branch}' has an open MR/PR`,
+                    confirmRequired: {
+                        reason: 'existing_mr',
+                        message: `Task #${taskId} branch '${task.branch}' has an open MR/PR (${mrCheckResult}). Retry will force push to the same branch. Continue?`,
+                        pendingAction: 'retry',
+                        taskId,
+                        mrUrl: mrCheckResult,
+                        confirmKey,
+                    },
+                });
+            }
+        }
+        return this.executeRetry(taskId, retriedBy);
+    }
+    async executeRetry(taskId, retriedBy) {
+        const task = this.taskRepo.findById(taskId);
+        if (!task) {
+            throw new common_1.NotFoundException(`Task #${taskId} not found`);
+        }
+        // CAS update: FAILED -> QUEUED
+        const updated = this.updateTaskStatusWithRetry(taskId, protocol_1.TaskStatus.QUEUED, task.revision, {
+            retryCount: task.retryCount + 1,
+            errorMessage: null,
+            workerId: null,
+            assignedAt: null,
+            startedAt: null,
+            completedAt: null,
+            currentStage: null,
+            currentSessionId: null,
+        });
+        if (!updated) {
+            throw new common_1.ConflictException(`Failed to retry task #${taskId}: concurrent modification`);
+        }
+        // Re-enqueue to BullMQ
+        await this.schedulerService.enqueueTask(taskId);
+        this.auditLogRepo.create({
+            userId: retriedBy,
+            action: 'task_retry',
+            resource: `task:${taskId}`,
+            detail: `Retried task #${taskId} (attempt ${task.retryCount + 1})`,
+        });
+        this.eventEmitter.emit(event_types_1.DomainEvents.TASK_STATUS_CHANGED, {
+            taskId,
+            status: protocol_1.TaskStatus.QUEUED,
+            previousStatus: protocol_1.TaskStatus.FAILED,
+            workerId: null,
+            projectKey: task.projectKey,
+        });
+        this.logger.log(`Task #${taskId} retried by developer #${retriedBy}`);
+        return this.taskRepo.findById(taskId);
+    }
+    // ---------------------------------------------------------------------------
+    // confirmStage — forward interactive stage confirm result to Worker
+    // ---------------------------------------------------------------------------
+    async confirmStage(taskId, stageName, approved) {
+        const task = this.taskRepo.findById(taskId);
+        if (!task) {
+            throw new common_1.NotFoundException(`Task #${taskId} not found`);
+        }
+        if (task.status !== protocol_1.TaskStatus.RUNNING &&
+            task.status !== protocol_1.TaskStatus.SUSPENDED) {
+            throw new common_1.BadRequestException(`Task #${taskId} is not in a confirmable state (${task.status})`);
+        }
+        if (!task.workerId) {
+            throw new common_1.BadRequestException(`Task #${taskId} has no assigned worker`);
+        }
+        // Forward confirm response to Worker via WS
+        const frame = {
+            type: 'stage_confirm_response',
+            taskId,
+            stageName,
+            approved,
+        };
+        const ws = this.workerConnectionManager.getConnection(task.workerId);
+        if (!ws || ws.readyState !== 1 /* WebSocket.OPEN */) {
+            throw new common_1.BadRequestException(`Worker for task #${taskId} is not connected`);
+        }
+        ws.send(JSON.stringify(frame));
+        // Set a short TTL on the stage confirm key instead of deleting immediately.
+        // This gives a 60-second window for retry if the worker doesn't process the message,
+        // while still ensuring eventual cleanup.
+        const stageConfirmKey = `confirm:stage:${taskId}:${stageName}`;
+        await this.redis.expire(stageConfirmKey, 60);
+        this.logger.log(`Stage confirm forwarded to Worker for task #${taskId}, stage ${stageName}`);
+    }
+    // ---------------------------------------------------------------------------
+    // confirmByKey — resolve pending confirmation directly by its Redis key
+    // ---------------------------------------------------------------------------
+    async confirmByKey(confirmKey, confirmed, userId) {
+        if (!confirmed) {
+            // User cancelled — just delete the pending data
+            await this.redis.del(confirmKey);
+            return { success: true, message: 'Task creation cancelled' };
+        }
+        // Atomically consume the confirm data
+        const raw = await this.redis.getdel(confirmKey);
+        if (!raw) {
+            return { success: false, message: 'No pending confirmation found or expired' };
+        }
+        let data;
+        try {
+            data = JSON.parse(raw);
+        }
+        catch {
+            return { success: false, message: 'Invalid pending confirmation data' };
+        }
+        // Validate the requesting user matches the original creator
+        if (userId && data.createdBy !== userId) {
+            this.logger.warn(`confirmByKey attempt by user #${userId} but pending confirm belongs to user #${data.createdBy}`);
+            return { success: false, message: 'Not authorized to confirm this action' };
+        }
+        if (data.action === 'create_task' && data.request) {
+            const task = await this.taskCreationService.createTaskInternal(data.request, data.createdBy, data.source, true);
+            return { success: true, task, message: 'Task created (dedup override)' };
+        }
+        if (data.action === 'retry' && data.taskId) {
+            const task = await this.executeRetry(data.taskId, data.createdBy);
+            return { success: true, task, message: `Task #${data.taskId} retried (MR override)` };
+        }
+        return { success: false, message: 'Unknown confirm action' };
+    }
+    // ---------------------------------------------------------------------------
+    // resolvePendingConfirm — used by handleConfirmCommand in DispatcherService
+    // ---------------------------------------------------------------------------
+    async resolvePendingConfirm(taskId, userId, _msgId) {
+        const consumed = await this.dedupService.consumePendingConfirm(taskId);
+        if (!consumed)
+            return null;
+        let data;
+        try {
+            data = JSON.parse(consumed.raw);
+        }
+        catch {
+            return null;
+        }
+        // Validate user matches original creator.
+        // If auth fails the confirm data is already consumed (intentional —
+        // prevents an unauthorized user from probing indefinitely, and the
+        // confirm would have expired via TTL anyway).
+        if (data.createdBy !== userId) {
+            this.logger.warn(`Confirm attempt by user #${userId} but pending confirm belongs to user #${data.createdBy}`);
+            return null;
+        }
+        await this.dedupService.cleanupConfirmIndex(consumed.indexKey);
+        return data;
+    }
+    // ---------------------------------------------------------------------------
+    // Internal helpers
+    // ---------------------------------------------------------------------------
+    /**
+     * Update task status with CAS retry (up to CAS_MAX_RETRIES).
+     * Returns true if successful, throws ConflictException on exhaustion.
+     */
+    updateTaskStatusWithRetry(taskId, status, initialRevision, extra) {
+        const { success, task } = this.taskRepo.updateStatusWithCasRetry(taskId, status, initialRevision, extra);
+        if (!success) {
+            if (!task) {
+                throw new common_1.NotFoundException(`Task #${taskId} not found during CAS retry`);
+            }
+            throw new common_1.ConflictException(`CAS retry exhausted for task #${taskId}`);
+        }
+        return true;
+    }
+    /**
+     * Send cancel frame to Worker and wait for ack within CANCEL_ACK_TIMEOUT_MS.
+     */
+    async sendCancelToWorkerWithAck(workerId, taskId) {
+        const msgId = crypto.randomUUID();
+        try {
+            await this.workerConnectionManager
+                .sendWithAck(workerId, { type: 'cancel', msgId, taskId }, protocol_1.CANCEL_ACK_TIMEOUT_MS);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    /**
+     * Send cancel frame to Worker (fire and forget).
+     */
+    sendCancelToWorker(workerId, taskId) {
+        const msgId = crypto.randomUUID();
+        this.workerConnectionManager.send(workerId, {
+            type: 'cancel',
+            msgId,
+            taskId,
+        });
+    }
+    /**
+     * Check if the task's branch has an existing open MR/PR on the Git platform.
+     * Returns the MR/PR URL if found, null otherwise.
+     * On timeout or error, returns null (allows retry to proceed).
+     */
+    async checkExistingMergeRequest(task) {
+        if (!task.branch || !task.configSnapshot)
+            return null;
+        try {
+            const config = JSON.parse(task.configSnapshot);
+            const { repoUrl, gitPlatform } = config;
+            if (!repoUrl)
+                return null;
+            // Extract the project path from the repo URL.
+            const projectPath = (0, git_utils_1.extractProjectPath)(repoUrl);
+            if (!projectPath) {
+                this.logger.warn(`Cannot extract project path from repo URL '${repoUrl}' for task #${task.id}`);
+                return task.mrUrl ?? null;
+            }
+            // Extract the base URL for API calls
+            const baseUrl = (0, git_utils_1.extractGitBaseUrl)(repoUrl);
+            if (!baseUrl) {
+                this.logger.warn(`Cannot extract base URL from repo URL '${repoUrl}' for task #${task.id}`);
+                return task.mrUrl ?? null;
+            }
+            // Look up the git token. Since the DB schema does not currently include
+            // git_token_encrypted, use the GIT_TOKEN environment variable as fallback.
+            const gitToken = process.env.GIT_TOKEN || '';
+            if (!gitToken) {
+                this.logger.debug(`No GIT_TOKEN configured; skipping MR/PR API check for task #${task.id}`);
+                return task.mrUrl ?? null;
+            }
+            const abortController = new AbortController();
+            const timeout = setTimeout(() => abortController.abort(), 10_000);
+            try {
+                let mrUrl = null;
+                if (gitPlatform === 'gitlab') {
+                    mrUrl = await this.checkGitLabMergeRequest(baseUrl, projectPath, task.branch, gitToken, abortController.signal);
+                }
+                else if (gitPlatform === 'github') {
+                    mrUrl = await this.checkGitHubPullRequest(baseUrl, projectPath, task.branch, gitToken, abortController.signal);
+                }
+                else {
+                    this.logger.debug(`Unsupported git platform '${gitPlatform}' for MR/PR check on task #${task.id}`);
+                    return task.mrUrl ?? null;
+                }
+                return mrUrl;
+            }
+            finally {
+                clearTimeout(timeout);
+            }
+        }
+        catch (err) {
+            this.logger.warn(`MR/PR check failed for task #${task.id}: ${(0, protocol_1.getErrorMessage)(err)}`);
+            // On error, allow retry to proceed
+            return null;
+        }
+    }
+    /**
+     * Query GitLab API for open merge requests on a branch.
+     */
+    async checkGitLabMergeRequest(baseUrl, projectPath, branch, token, signal) {
+        const encodedPath = encodeURIComponent(projectPath);
+        const url = `${baseUrl}/api/v4/projects/${encodedPath}/merge_requests?source_branch=${encodeURIComponent(branch)}&state=opened&per_page=1`;
+        const response = await fetch(url, {
+            headers: {
+                'PRIVATE-TOKEN': token,
+                'Accept': 'application/json',
+            },
+            signal,
+        });
+        if (!response.ok) {
+            this.logger.warn(`GitLab MR check returned ${response.status} for project '${projectPath}', branch '${branch}'`);
+            return null;
+        }
+        const data = (await response.json());
+        if (Array.isArray(data) && data.length > 0 && data[0].web_url) {
+            this.logger.debug(`Found open GitLab MR for branch '${branch}': ${data[0].web_url}`);
+            return data[0].web_url;
+        }
+        return null;
+    }
+    /**
+     * Query GitHub API for open pull requests on a branch.
+     */
+    async checkGitHubPullRequest(baseUrl, projectPath, branch, token, signal) {
+        const owner = projectPath.split('/')[0];
+        const apiBase = baseUrl === 'https://github.com'
+            ? 'https://api.github.com'
+            : `${baseUrl}/api/v3`;
+        const url = `${apiBase}/repos/${projectPath}/pulls?head=${encodeURIComponent(`${owner}:${branch}`)}&state=open&per_page=1`;
+        const response = await fetch(url, {
+            headers: {
+                'Authorization': `Bearer ${token}`,
+                'Accept': 'application/vnd.github+json',
+                'X-GitHub-Api-Version': '2022-11-28',
+            },
+            signal,
+        });
+        if (!response.ok) {
+            this.logger.warn(`GitHub PR check returned ${response.status} for project '${projectPath}', branch '${branch}'`);
+            return null;
+        }
+        const data = (await response.json());
+        if (Array.isArray(data) && data.length > 0 && data[0].html_url) {
+            this.logger.debug(`Found open GitHub PR for branch '${branch}': ${data[0].html_url}`);
+            return data[0].html_url;
+        }
+        return null;
+    }
+};
+exports.TaskLifecycleService = TaskLifecycleService;
+exports.TaskLifecycleService = TaskLifecycleService = TaskLifecycleService_1 = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [task_repository_1.TaskRepository,
+        audit_log_repository_1.AuditLogRepository,
+        workspace_repository_1.WorkspaceRepository,
+        redis_service_1.RedisService,
+        scheduler_service_1.SchedulerService,
+        worker_connection_manager_1.WorkerConnectionManager,
+        cleanup_service_1.CleanupService,
+        task_creation_service_1.TaskCreationService,
+        dedup_service_1.DedupService,
+        event_emitter_1.EventEmitter2])
+], TaskLifecycleService);
+//# sourceMappingURL=task-lifecycle.service.js.map

package/dist/dispatcher/task-lifecycle.service.js.map

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

package/dist/dispatcher/task-log-batcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-log-batcher.d.ts","sourceRoot":"","sources":["../../src/dispatcher/task-log-batcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAMnF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAU/D,qBACa,cAAe,YAAW,YAAY,EAAE,eAAe;IAMtD,OAAO,CAAC,QAAQ,CAAC,EAAE;IAL/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmC;IAC1D,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,cAAc,CAAkB;gBAEX,EAAE,EAAE,eAAe;IAEhD,gCAAgC;IAChC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,6BAA6B,CAAuB;IAE5E,YAAY,IAAI,IAAI;IAmBpB,eAAe,IAAI,IAAI;IAOvB;;;;OAIG;IACH,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAc7D;;OAEG;IACH,KAAK,IAAI,IAAI;IAsDb;;;OAGG;IACH,WAAW,CACT,MAAM,EAAE,MAAM,EACd,KAAK,GAAE,MAAY,EACnB,MAAM,GAAE,MAAU,GACjB,MAAM,EAAE;IAiBX;;;OAGG;IACH,iBAAiB,CACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GACtE;QACD,MAAM,EAAE,KAAK,CAAC;YACZ,EAAE,EAAE,MAAM,CAAC;YACX,IAAI,EAAE,MAAM,CAAC;YACb,OAAO,EAAE,MAAM,CAAC;YAChB,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC,CAAC;QACH,KAAK,EAAE,MAAM,CAAC;KACf;IA4CD,gBAAgB,IAAI,IAAI;CAyBzB"}
+{"version":3,"file":"task-log-batcher.d.ts","sourceRoot":"","sources":["../../src/dispatcher/task-log-batcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAMnF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAU/D,qBACa,cAAe,YAAW,YAAY,EAAE,eAAe;IAMtD,OAAO,CAAC,QAAQ,CAAC,EAAE;IAL/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmC;IAC1D,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,cAAc,CAAkB;gBAEX,EAAE,EAAE,eAAe;IAEhD,gCAAgC;IAChC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,6BAA6B,CAAuB;IAE5E,YAAY,IAAI,IAAI;IAmBpB,eAAe,IAAI,IAAI;IAOvB;;;;OAIG;IACH,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAc7D;;OAEG;IACH,KAAK,IAAI,IAAI;IAsDb;;;OAGG;IACH,WAAW,CACT,MAAM,EAAE,MAAM,EACd,KAAK,GAAE,MAAY,EACnB,MAAM,GAAE,MAAU,GACjB,MAAM,EAAE;IAiBX;;;OAGG;IACH,iBAAiB,CACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GACtE;QACD,MAAM,EAAE,KAAK,CAAC;YACZ,EAAE,EAAE,MAAM,CAAC;YACX,IAAI,EAAE,MAAM,CAAC;YACb,OAAO,EAAE,MAAM,CAAC;YAChB,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC,CAAC;QACH,KAAK,EAAE,MAAM,CAAC;KACf;IAqCD,gBAAgB,IAAI,IAAI;CAyBzB"}

package/dist/dispatcher/task-log-batcher.js

@@ -137,8 +137,9 @@ let TaskLogBatcher = class TaskLogBatcher {
             params.type = opts.type;
         }
         if (opts.search) {
-            whereClause += ' AND message LIKE @search';
-            params.search = `%${opts.search}%`;
+            whereClause += " AND message LIKE @search ESCAPE '\\'";
+            const escaped = opts.search.replace(/\\/g, '\\\\').replace(/%/g, '\\%').replace(/_/g, '\\_');
+            params.search = `%${escaped}%`;
         }
         const countRow = db
             .prepare(`SELECT COUNT(*) as count FROM task_logs ${whereClause}`)
@@ -146,15 +147,7 @@ let TaskLogBatcher = class TaskLogBatcher {
         const rows = db
             .prepare(`SELECT id, type, message, timestamp FROM task_logs ${whereClause} ORDER BY id DESC LIMIT @limit OFFSET @offset`)
             .all({ ...params, limit: opts.limit, offset: opts.offset });
-        return {
-            events: rows.map((r) => ({
-                id: r.id,
-                type: r.type,
-                message: r.message,
-                timestamp: r.timestamp,
-            })),
-            total: countRow.count,
-        };
+        return { events: rows, total: countRow.count };
     }
     cleanupRetention() {
         const cutoffDate = new Date();