agent-tower 0.5.1 → 0.5.2-beta.1

package/dist/services/task-cleanup.service.js

@@ -0,0 +1,209 @@
+import { prisma } from '../utils/index.js';
+import { WorktreeManager } from '../git/worktree.manager.js';
+import { isWorktreeWorkspace } from './workspace-kind.js';
+export const TaskCleanupJobStatus = {
+    PENDING: 'PENDING',
+    RUNNING: 'RUNNING',
+    COMPLETED: 'COMPLETED',
+    FAILED: 'FAILED',
+};
+const MAX_JOB_ATTEMPTS = 5;
+const RETRY_DELAYS_MS = [
+    30_000,
+    2 * 60_000,
+    10 * 60_000,
+    30 * 60_000,
+    60 * 60_000,
+];
+function parseSnapshot(payload) {
+    const parsed = JSON.parse(payload);
+    if (!parsed.taskId || !parsed.projectId || !parsed.project?.repoPath || !Array.isArray(parsed.workspaces)) {
+        throw new Error('Invalid task cleanup snapshot');
+    }
+    return parsed;
+}
+export function getTaskCleanupRetryDelayMs(attempts) {
+    return RETRY_DELAYS_MS[Math.min(Math.max(attempts - 1, 0), RETRY_DELAYS_MS.length - 1)];
+}
+function toErrorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+function isMissingCleanupTableError(error) {
+    return Boolean(error &&
+        typeof error === 'object' &&
+        'code' in error &&
+        error.code === 'P2021');
+}
+/**
+ * Persistent worker for resources left behind by fast task deletion.
+ */
+export class TaskCleanupService {
+    sessionManager;
+    running = false;
+    timer = null;
+    constructor(sessionManager) {
+        this.sessionManager = sessionManager;
+    }
+    start(intervalMs = 30_000) {
+        if (this.timer)
+            return;
+        this.timer = setInterval(() => {
+            this.processDueJobs().catch((error) => {
+                console.error('[TaskCleanupService] processDueJobs failed:', error);
+            });
+        }, intervalMs);
+        this.processDueJobs().catch((error) => {
+            console.error('[TaskCleanupService] startup cleanup failed:', error);
+        });
+    }
+    stop() {
+        if (!this.timer)
+            return;
+        clearInterval(this.timer);
+        this.timer = null;
+    }
+    trigger() {
+        this.processDueJobs().catch((error) => {
+            console.error('[TaskCleanupService] triggered cleanup failed:', error);
+        });
+    }
+    async processDueJobs(limit = 5) {
+        if (this.running)
+            return 0;
+        this.running = true;
+        try {
+            let processed = 0;
+            while (processed < limit) {
+                const job = await this.claimNextJob();
+                if (!job)
+                    break;
+                await this.processJob(job.id);
+                processed++;
+            }
+            return processed;
+        }
+        finally {
+            this.running = false;
+        }
+    }
+    async processJob(jobId) {
+        const job = await prisma.taskCleanupJob.findUnique({ where: { id: jobId } });
+        if (!job)
+            return;
+        try {
+            const snapshot = parseSnapshot(job.payload);
+            await this.cleanupSnapshot(snapshot);
+            await prisma.$transaction([
+                prisma.task.deleteMany({ where: { id: snapshot.taskId } }),
+                prisma.taskCleanupJob.update({
+                    where: { id: jobId },
+                    data: {
+                        status: TaskCleanupJobStatus.COMPLETED,
+                        lastError: null,
+                        nextRetryAt: null,
+                        completedAt: new Date(),
+                    },
+                }),
+            ]);
+        }
+        catch (error) {
+            await this.recordFailure(jobId, job.attempts, toErrorMessage(error));
+        }
+    }
+    async claimNextJob() {
+        const now = new Date();
+        let job;
+        try {
+            job = await prisma.taskCleanupJob.findFirst({
+                where: {
+                    OR: [
+                        { status: TaskCleanupJobStatus.PENDING },
+                        {
+                            status: TaskCleanupJobStatus.RUNNING,
+                            attempts: { lt: MAX_JOB_ATTEMPTS },
+                        },
+                        {
+                            status: TaskCleanupJobStatus.FAILED,
+                            attempts: { lt: MAX_JOB_ATTEMPTS },
+                            OR: [{ nextRetryAt: null }, { nextRetryAt: { lte: now } }],
+                        },
+                    ],
+                },
+                orderBy: [{ createdAt: 'asc' }],
+            });
+        }
+        catch (error) {
+            if (isMissingCleanupTableError(error)) {
+                return null;
+            }
+            throw error;
+        }
+        if (!job)
+            return null;
+        try {
+            return await prisma.taskCleanupJob.update({
+                where: { id: job.id },
+                data: {
+                    status: TaskCleanupJobStatus.RUNNING,
+                    attempts: { increment: 1 },
+                    startedAt: now,
+                    lastError: null,
+                },
+            });
+        }
+        catch {
+            return null;
+        }
+    }
+    async cleanupSnapshot(snapshot) {
+        const worktreeManager = new WorktreeManager(snapshot.project.repoPath);
+        for (const workspace of snapshot.workspaces) {
+            for (const session of workspace.sessions) {
+                try {
+                    await this.sessionManager.stop(session.id, { skipTeamRunReconcile: true });
+                }
+                catch (error) {
+                    console.warn(`[TaskCleanupService] failed to stop session ${session.id}:`, toErrorMessage(error));
+                }
+            }
+        }
+        for (const workspace of snapshot.workspaces) {
+            if (!isWorktreeWorkspace(workspace))
+                continue;
+            if (!workspace.worktreePath)
+                continue;
+            const result = await worktreeManager.remove(workspace.worktreePath);
+            if (result.status === 'unregistered') {
+                throw new Error(`Workspace ${workspace.id} path is unregistered or unsafe to remove: ${result.path}`);
+            }
+        }
+        for (const workspace of snapshot.workspaces) {
+            if (!isWorktreeWorkspace(workspace))
+                continue;
+            const result = await worktreeManager.deleteBranchIfSafe(workspace.branchName, {
+                protectedBranches: [snapshot.project.mainBranch, workspace.baseBranch],
+            });
+            if (result.status === 'failed') {
+                throw new Error(`Failed to delete branch ${result.branchName}: ${result.reason ?? 'unknown error'}`);
+            }
+            if (result.status === 'checked_out') {
+                throw new Error(`Branch ${result.branchName} is checked out: ${result.reason ?? 'unknown location'}`);
+            }
+        }
+        if (snapshot.workspaces.some((workspace) => isWorktreeWorkspace(workspace))) {
+            await worktreeManager.prune();
+        }
+    }
+    async recordFailure(jobId, attempts, message) {
+        const retryable = attempts < MAX_JOB_ATTEMPTS;
+        await prisma.taskCleanupJob.update({
+            where: { id: jobId },
+            data: {
+                status: TaskCleanupJobStatus.FAILED,
+                lastError: message,
+                nextRetryAt: retryable ? new Date(Date.now() + getTaskCleanupRetryDelayMs(attempts)) : null,
+            },
+        });
+    }
+}
+//# sourceMappingURL=task-cleanup.service.js.map

package/dist/services/task-cleanup.service.js.map

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

package/dist/services/task.service.d.ts

@@ -1,6 +1,7 @@
 import { TaskStatus } from '../types/index.js';
 import type { EventBus } from '../core/event-bus.js';
 import type { SessionManager } from './session-manager.js';
+import type { TaskCleanupService } from './task-cleanup.service.js';
 interface CreateTaskInput {
     title: string;
     description?: string;
@@ -19,7 +20,8 @@ interface FindTasksParams {
 export declare class TaskService {
     private readonly eventBus;
     private readonly sessionManager;
-    constructor(eventBus: EventBus, sessionManager: SessionManager);
+    private readonly cleanupService?;
+    constructor(eventBus: EventBus, sessionManager: SessionManager, cleanupService?: Pick<TaskCleanupService, "trigger"> | undefined);
     /**
      * 获取项目的任务列表（支持按状态过滤和分页）
      */
@@ -51,6 +53,8 @@ export declare class TaskService {
                 branchName: string;
                 baseBranch: string | null;
                 worktreePath: string;
+                workspaceKind: string;
+                workingDir: string;
                 commitMessage: string | null;
                 previewTarget: string | null;
                 hibernatedAt: Date | null;
@@ -60,6 +64,7 @@ export declare class TaskService {
             description: string | null;
             createdAt: Date;
             updatedAt: Date;
+            deletedAt: Date | null;
             title: string;
             status: string;
             priority: number;
@@ -101,6 +106,8 @@ export declare class TaskService {
             branchName: string;
             baseBranch: string | null;
             worktreePath: string;
+            workspaceKind: string;
+            workingDir: string;
             commitMessage: string | null;
             previewTarget: string | null;
             hibernatedAt: Date | null;
@@ -110,6 +117,7 @@ export declare class TaskService {
         description: string | null;
         createdAt: Date;
         updatedAt: Date;
+        deletedAt: Date | null;
         title: string;
         status: string;
         priority: number;
@@ -126,6 +134,7 @@ export declare class TaskService {
         description: string | null;
         createdAt: Date;
         updatedAt: Date;
+        deletedAt: Date | null;
         title: string;
         status: string;
         priority: number;
@@ -140,6 +149,7 @@ export declare class TaskService {
         description: string | null;
         createdAt: Date;
         updatedAt: Date;
+        deletedAt: Date | null;
         title: string;
         status: string;
         priority: number;
@@ -155,6 +165,7 @@ export declare class TaskService {
         description: string | null;
         createdAt: Date;
         updatedAt: Date;
+        deletedAt: Date | null;
         title: string;
         status: string;
         priority: number;
@@ -170,6 +181,7 @@ export declare class TaskService {
         description: string | null;
         createdAt: Date;
         updatedAt: Date;
+        deletedAt: Date | null;
         title: string;
         status: string;
         priority: number;
@@ -177,13 +189,12 @@ export declare class TaskService {
         projectId: string;
     }>;
     /**
-     * 删除任务（增强版）
+     * 快速删除任务
      *
-     * 1. 停止所有 RUNNING/PENDING 状态的 Session
-     * 2. 清理所有关联 Workspace 的 git worktree
-     * 3. 清理所有关联 Workspace 的本地任务分支
-     * 4. 级联删除数据库记录
-     * 5. 通过 EventBus 通知前端实时删除
+     * 1. 原子标记 Task 为 deletedAt，使普通列表立即隐藏
+     * 2. 保存后台清理快照
+     * 3. 通过 EventBus 通知前端实时删除
+     * 4. 后台 worker 再停止 Session、删除 worktree/branch，并最终硬删除 Task
      */
     delete(id: string): Promise<boolean>;
     /**
@@ -210,6 +221,7 @@ export declare class TaskService {
         description: string | null;
         createdAt: Date;
         updatedAt: Date;
+        deletedAt: Date | null;
         title: string;
         status: string;
         priority: number;

package/dist/services/task.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task.service.d.ts","sourceRoot":"","sources":["../../src/services/task.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAkD,MAAM,mBAAmB,CAAC;AAM/F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAI3D,UAAU,eAAe;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,eAAe;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,eAAe;IACvB,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAsBD,qBAAa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,cAAc;gBADd,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,cAAc;IAGjD;;OAEG;IACG,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,GAAE,eAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAuDrE;;OAEG;IACG,QAAQ,CAAC,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAazB;;;;OAIG;IACG,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe;;;;;;;;;;;IA6BtD;;OAEG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe;;;;;;;;;;;IAoB/C;;;OAGG;IACG,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU;;;;;;;;;;;IA2CjD;;;OAGG;IACG,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,UAAU;;;;;;;;;;;IAgCtE;;;;;;;;OAQG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM;IAyEvB;;OAEG;IACG,mBAAmB,CAAC,SAAS,EAAE,MAAM;;;;;;;;IAgD3C;;;;;;;OAOG;IACG,KAAK,CAAC,EAAE,EAAE,MAAM;;;;;;;;;;;IA+CtB;;OAEG;IACH,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;CAGzE"}
+{"version":3,"file":"task.service.d.ts","sourceRoot":"","sources":["../../src/services/task.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAkD,MAAM,mBAAmB,CAAC;AAO/F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAuB,MAAM,2BAA2B,CAAC;AAIzF,UAAU,eAAe;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,eAAe;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,eAAe;IACvB,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAwBD,qBAAa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;gBAFf,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,cAAc,EAC9B,cAAc,CAAC,EAAE,IAAI,CAAC,kBAAkB,EAAE,SAAS,CAAC,YAAA;IAGvE;;OAEG;IACG,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,GAAE,eAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAuDrE;;OAEG;IACG,QAAQ,CAAC,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAazB;;;;OAIG;IACG,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe;;;;;;;;;;;;IA6BtD;;OAEG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe;;;;;;;;;;;;IAoB/C;;;OAGG;IACG,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU;;;;;;;;;;;;IA2CjD;;;OAGG;IACG,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,UAAU;;;;;;;;;;;;IAgCtE;;;;;;;OAOG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM;IA0IvB;;OAEG;IACG,mBAAmB,CAAC,SAAS,EAAE,MAAM;;;;;;;;IAgD3C;;;;;;;OAOG;IACG,KAAK,CAAC,EAAE,EAAE,MAAM;;;;;;;;;;;;IA+CtB;;OAEG;IACH,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;CAGzE"}

package/dist/services/task.service.js

@@ -1,8 +1,9 @@
 import { prisma } from '../utils/index.js';
 import { TaskStatus, SessionStatus, SessionPurpose, WorkspaceStatus } from '../types/index.js';
+import { getWorkspaceWorkingDir } from './workspace-kind.js';
 import { NotFoundError, ValidationError, InvalidStateTransitionError, } from '../errors.js';
-import { WorktreeManager } from '../git/worktree.manager.js';
 import { ensureProjectIsMutable } from './project-guards.js';
+import { defaultTeamLockService } from './team-lock.service.js';
 /**
  * 合法的状态流转规则
  * 看板拖拽场景下允许任意状态互转，状态变更无危险副作用
@@ -14,6 +15,8 @@ const VALID_TRANSITIONS = {
     [TaskStatus.DONE]: [TaskStatus.TODO, TaskStatus.IN_PROGRESS, TaskStatus.IN_REVIEW, TaskStatus.CANCELLED],
     [TaskStatus.CANCELLED]: [TaskStatus.TODO, TaskStatus.IN_PROGRESS, TaskStatus.IN_REVIEW, TaskStatus.DONE],
 };
+const CANCELLABLE_DELETE_WORK_REQUEST_STATUSES = ['PENDING_APPROVAL', 'QUEUED', 'STARTED'];
+const CANCELLABLE_DELETE_INVOCATION_STATUSES = ['QUEUED', 'RUNNING', 'SESSION_ENDED', 'WAITING_ROOM_REPLY'];
 function normalizeTaskTitle(title) {
     const normalized = title.trim();
     if (normalized.length === 0) {
@@ -24,9 +27,11 @@ function normalizeTaskTitle(title) {
 export class TaskService {
     eventBus;
     sessionManager;
-    constructor(eventBus, sessionManager) {
+    cleanupService;
+    constructor(eventBus, sessionManager, cleanupService) {
         this.eventBus = eventBus;
         this.sessionManager = sessionManager;
+        this.cleanupService = cleanupService;
     }
     /**
      * 获取项目的任务列表（支持按状态过滤和分页）
@@ -42,7 +47,7 @@ export class TaskService {
         const page = Math.max(1, params.page || 1);
         const limit = Math.min(1000, Math.max(1, params.limit || 200));
         const skip = (page - 1) * limit;
-        const where = { projectId };
+        const where = { projectId, deletedAt: null };
         if (params.status) {
             where.status = params.status;
         }
@@ -84,8 +89,8 @@ export class TaskService {
      * 获取任务详情
      */
     async findById(id) {
-        const task = await prisma.task.findUnique({
-            where: { id },
+        const task = await prisma.task.findFirst({
+            where: { id, deletedAt: null },
             include: { workspaces: { include: { sessions: { where: { purpose: { not: SessionPurpose.COMMIT_MSG } } } } } },
         });
         if (!task) {
@@ -110,7 +115,7 @@ export class TaskService {
         ensureProjectIsMutable(project, 'create tasks');
         // 自动计算 position
         const maxPosition = await prisma.task.aggregate({
-            where: { projectId, status: TaskStatus.TODO },
+            where: { projectId, status: TaskStatus.TODO, deletedAt: null },
             _max: { position: true },
         });
         return prisma.task.create({
@@ -131,8 +136,8 @@ export class TaskService {
             ...input,
             ...(input.title !== undefined ? { title: normalizeTaskTitle(input.title) } : {}),
         };
-        const task = await prisma.task.findUnique({
-            where: { id },
+        const task = await prisma.task.findFirst({
+            where: { id, deletedAt: null },
             include: { project: true },
         });
         if (!task) {
@@ -149,8 +154,8 @@ export class TaskService {
      * 更新后通过 EventBus 发射 task:updated 事件，通知前端实时更新
      */
     async updateStatus(id, status) {
-        const task = await prisma.task.findUnique({
-            where: { id },
+        const task = await prisma.task.findFirst({
+            where: { id, deletedAt: null },
             include: { project: true },
         });
         if (!task) {
@@ -169,7 +174,7 @@ export class TaskService {
         }
         // 切换状态时自动计算新列的 position
         const maxPosition = await prisma.task.aggregate({
-            where: { projectId: task.projectId, status },
+            where: { projectId: task.projectId, status, deletedAt: null },
             _max: { position: true },
         });
         const updated = await prisma.task.update({
@@ -188,8 +193,8 @@ export class TaskService {
      * 如果同时传了 status，会进行状态流转并通知前端
      */
     async updatePosition(id, position, status) {
-        const task = await prisma.task.findUnique({
-            where: { id },
+        const task = await prisma.task.findFirst({
+            where: { id, deletedAt: null },
             include: { project: true },
         });
         if (!task) {
@@ -215,69 +220,140 @@ export class TaskService {
         return updated;
     }
     /**
-     * 删除任务（增强版）
+     * 快速删除任务
      *
-     * 1. 停止所有 RUNNING/PENDING 状态的 Session
-     * 2. 清理所有关联 Workspace 的 git worktree
-     * 3. 清理所有关联 Workspace 的本地任务分支
-     * 4. 级联删除数据库记录
-     * 5. 通过 EventBus 通知前端实时删除
+     * 1. 原子标记 Task 为 deletedAt，使普通列表立即隐藏
+     * 2. 保存后台清理快照
+     * 3. 通过 EventBus 通知前端实时删除
+     * 4. 后台 worker 再停止 Session、删除 worktree/branch，并最终硬删除 Task
      */
     async delete(id) {
-        const task = await prisma.task.findUnique({
+        const deletedAt = new Date();
+        const taskForGuard = await prisma.task.findUnique({
             where: { id },
-            include: {
-                project: true,
-                workspaces: {
-                    include: { sessions: true },
-                },
-            },
+            include: { project: true },
         });
-        if (!task) {
+        if (!taskForGuard || taskForGuard.deletedAt) {
             throw new NotFoundError('Task', id);
         }
-        ensureProjectIsMutable(task.project, 'delete tasks');
-        // 1. 停止所有活跃 Session
-        for (const workspace of task.workspaces) {
-            const activeSessions = workspace.sessions.filter((s) => s.status === SessionStatus.PENDING || s.status === SessionStatus.RUNNING);
-            for (const session of activeSessions) {
-                try {
-                    await this.sessionManager.stop(session.id);
-                }
-                catch (err) {
-                    console.warn(`[TaskService] Failed to stop session ${session.id} during task delete:`, err);
-                }
-            }
-        }
-        // 2. 清理所有 Workspace 的 worktree
-        const worktreeManager = new WorktreeManager(task.project.repoPath);
-        for (const workspace of task.workspaces) {
-            try {
-                await worktreeManager.remove(workspace.worktreePath);
-            }
-            catch (err) {
-                console.warn(`[TaskService] Failed to remove worktree for workspace ${workspace.id} during task delete:`, err instanceof Error ? err.message : err);
+        ensureProjectIsMutable(taskForGuard.project, 'delete tasks');
+        const marked = await prisma.task.updateMany({
+            where: {
+                id,
+                deletedAt: null,
+                project: { archivedAt: null },
+            },
+            data: { deletedAt },
+        });
+        if (marked.count === 0) {
+            const current = await prisma.task.findUnique({
+                where: { id },
+                include: { project: true },
+            });
+            if (!current || current.deletedAt) {
+                throw new NotFoundError('Task', id);
             }
+            ensureProjectIsMutable(current.project, 'delete tasks');
+            throw new NotFoundError('Task', id);
         }
-        // 3. 清理所有 Workspace 的本地任务分支。分支清理失败不阻断任务删除。
-        for (const workspace of task.workspaces) {
-            const result = await worktreeManager.deleteBranchIfSafe(workspace.branchName, {
-                protectedBranches: [task.project.mainBranch, workspace.baseBranch],
+        let deleteResult;
+        let cleanupJobCreated = false;
+        try {
+            const taskForCleanup = await prisma.task.findUnique({
+                where: { id },
+                include: {
+                    project: true,
+                    teamRun: {
+                        include: {
+                            invocations: {
+                                where: { status: { in: CANCELLABLE_DELETE_INVOCATION_STATUSES } },
+                                select: { id: true },
+                            },
+                        },
+                    },
+                    workspaces: {
+                        include: { sessions: true },
+                    },
+                },
             });
-            if (result.status === 'failed') {
-                console.warn(`[TaskService] Failed to delete branch ${result.branchName} for workspace ${workspace.id} during task delete:`, result.reason);
+            if (!taskForCleanup) {
+                throw new NotFoundError('Task', id);
             }
-            else if (result.status === 'checked_out') {
-                console.warn(`[TaskService] Skipped deleting checked-out branch ${result.branchName} for workspace ${workspace.id} during task delete:`, result.reason);
+            ensureProjectIsMutable(taskForCleanup.project, 'delete tasks');
+            const snapshot = {
+                taskId: taskForCleanup.id,
+                projectId: taskForCleanup.projectId,
+                project: {
+                    repoPath: taskForCleanup.project.repoPath,
+                    mainBranch: taskForCleanup.project.mainBranch,
+                },
+                workspaces: taskForCleanup.workspaces.map((workspace) => ({
+                    id: workspace.id,
+                    worktreePath: workspace.worktreePath,
+                    workingDir: getWorkspaceWorkingDir(workspace),
+                    workspaceKind: workspace.workspaceKind,
+                    branchName: workspace.branchName,
+                    baseBranch: workspace.baseBranch,
+                    sessions: workspace.sessions
+                        .filter((session) => session.status === SessionStatus.PENDING || session.status === SessionStatus.RUNNING)
+                        .map((session) => ({ id: session.id })),
+                })),
+            };
+            const teamRunId = taskForCleanup.teamRun?.id;
+            const cancelledInvocationIds = taskForCleanup.teamRun?.invocations.map((invocation) => invocation.id) ?? [];
+            await prisma.$transaction(async (tx) => {
+                await tx.taskCleanupJob.create({
+                    data: {
+                        taskId: taskForCleanup.id,
+                        projectId: taskForCleanup.projectId,
+                        payload: JSON.stringify(snapshot),
+                    },
+                });
+                if (teamRunId) {
+                    await tx.workRequest.updateMany({
+                        where: {
+                            teamRunId,
+                            status: { in: CANCELLABLE_DELETE_WORK_REQUEST_STATUSES },
+                        },
+                        data: { status: 'CANCELLED' },
+                    });
+                    await tx.agentInvocation.updateMany({
+                        where: {
+                            teamRunId,
+                            status: { in: CANCELLABLE_DELETE_INVOCATION_STATUSES },
+                        },
+                        data: {
+                            status: 'CANCELLED',
+                            nextRoomReplyReminderAt: null,
+                        },
+                    });
+                }
+            });
+            cleanupJobCreated = true;
+            deleteResult = {
+                projectId: taskForCleanup.projectId,
+                cancelledInvocationIds,
+            };
+        }
+        catch (error) {
+            if (!cleanupJobCreated) {
+                await prisma.task.updateMany({
+                    where: { id, deletedAt },
+                    data: { deletedAt: null },
+                }).catch(() => {
+                    // If rollback fails, leave the task hidden rather than masking the original error.
+                });
             }
+            throw error;
+        }
+        for (const invocationId of deleteResult.cancelledInvocationIds) {
+            defaultTeamLockService.releaseByOwner(invocationId);
         }
-        // 4. 级联删除数据库记录
-        await prisma.task.delete({ where: { id } });
-        // 5. 通知前端
         this.eventBus.emit('task:deleted', {
             taskId: id,
-            projectId: task.projectId,
+            projectId: deleteResult.projectId,
         });
+        this.cleanupService?.trigger();
         return true;
     }
     /**
@@ -292,7 +368,7 @@ export class TaskService {
         }
         const counts = await prisma.task.groupBy({
             by: ['status'],
-            where: { projectId },
+            where: { projectId, deletedAt: null },
             _count: { id: true },
         });
         const stats = {
@@ -335,8 +411,8 @@ export class TaskService {
      * 4. 通知前端 — 用户可重新派发 Agent（会创建新 Worktree）
      */
     async retry(id) {
-        const task = await prisma.task.findUnique({
-            where: { id },
+        const task = await prisma.task.findFirst({
+            where: { id, deletedAt: null },
             include: {
                 project: true,
                 workspaces: {