agent-tower 0.7.3 → 0.7.4-beta.1

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

@@ -131,9 +131,11 @@ export declare class WorkspaceService {
             updatedAt: Date;
             title: string;
             deletedAt: Date | null;
+            handoff: string | null;
             baseBranch: string | null;
             position: number;
             projectId: string;
+            parentTaskId: string | null;
         };
         sessions: {
             agentType: string;
@@ -166,6 +168,7 @@ export declare class WorkspaceService {
         commitMessage: string | null;
         previewTarget: string | null;
         hibernatedAt: Date | null;
+        cleanedAt: Date | null;
     }) | null>;
     /**
      * 获取 Task 下所有 Workspace
@@ -202,6 +205,7 @@ export declare class WorkspaceService {
         commitMessage: string | null;
         previewTarget: string | null;
         hibernatedAt: Date | null;
+        cleanedAt: Date | null;
     })[]>;
     getSetupProgress(taskId: string): Promise<WorkspaceSetupProgressPayload[]>;
     listVerdicts(workspaceId: string): Promise<WorkspaceVerdict[]>;
@@ -261,9 +265,11 @@ export declare class WorkspaceService {
             updatedAt: Date;
             title: string;
             deletedAt: Date | null;
+            handoff: string | null;
             baseBranch: string | null;
             position: number;
             projectId: string;
+            parentTaskId: string | null;
         };
         sessions: {
             agentType: string;
@@ -296,6 +302,7 @@ export declare class WorkspaceService {
         commitMessage: string | null;
         previewTarget: string | null;
         hibernatedAt: Date | null;
+        cleanedAt: Date | null;
     }>;
     getOrCreateDedicatedWorkspace(teamRunId: string, memberId: string): Promise<{
         task: {
@@ -327,9 +334,11 @@ export declare class WorkspaceService {
             updatedAt: Date;
             title: string;
             deletedAt: Date | null;
+            handoff: string | null;
             baseBranch: string | null;
             position: number;
             projectId: string;
+            parentTaskId: string | null;
         };
         sessions: {
             agentType: string;
@@ -362,6 +371,7 @@ export declare class WorkspaceService {
         commitMessage: string | null;
         previewTarget: string | null;
         hibernatedAt: Date | null;
+        cleanedAt: Date | null;
     }>;
     private findOrCreateMainWorkspace;
     private findOrCreateDedicatedWorkspace;
@@ -373,12 +383,8 @@ export declare class WorkspaceService {
     private ensureActiveWorkspaceWorktree;
     private restoreInactiveWorkspace;
     /**
-     * 删除 Workspace
-     *
-     * - 删除前检查是否有 RUNNING 状态的 Session，有则拒绝删除
-     * - 删除时先停止所有关联 Session 的进程
-     * - 删除时调用 WorktreeManager.remove 清理 worktree
-     * - worktree 清理失败时仍然删除数据库记录（记录警告日志）
+     * 回收 Workspace 的运行资源，保留任务下的会话历史。
+     * 只有任务/项目硬删除才级联删除 Workspace 和 Session。
      */
     delete(id: string): Promise<boolean>;
     private deleteWithLifecycle;
@@ -446,9 +452,11 @@ export declare class WorkspaceService {
             updatedAt: Date;
             title: string;
             deletedAt: Date | null;
+            handoff: string | null;
             baseBranch: string | null;
             position: number;
             projectId: string;
+            parentTaskId: string | null;
         };
         sessions: {
             agentType: string;
@@ -497,6 +505,7 @@ export declare class WorkspaceService {
         commitMessage: string | null;
         previewTarget: string | null;
         hibernatedAt: Date | null;
+        cleanedAt: Date | null;
     }>;
     private archiveWithLifecycle;
     /**
@@ -538,9 +547,11 @@ export declare class WorkspaceService {
             updatedAt: Date;
             title: string;
             deletedAt: Date | null;
+            handoff: string | null;
             baseBranch: string | null;
             position: number;
             projectId: string;
+            parentTaskId: string | null;
         };
         sessions: {
             agentType: string;
@@ -573,6 +584,7 @@ export declare class WorkspaceService {
         commitMessage: string | null;
         previewTarget: string | null;
         hibernatedAt: Date | null;
+        cleanedAt: Date | null;
     }>;
     private cleanupCreatedWorktree;
     private cleanupRestoredWorktree;
@@ -591,11 +603,12 @@ export declare class WorkspaceService {
      */
     private autoCommitIfDirty;
     /**
-     * 清理所有 ABANDONED/MERGED 状态且关联 Task 为 DONE 的 Workspace
+     * 回收已完成任务的 ABANDONED/MERGED Workspace 资源，保留会话历史。
      *
      * @returns 被清理的 Workspace 数量
      */
     cleanup(): Promise<number>;
+    private cleanupWorkspaceBranch;
     private assertWorktreeWorkspace;
     /**
      * 复制项目配置的文件到 worktree

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

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

package/dist/services/workspace.service.js

@@ -1013,6 +1013,7 @@ export class WorkspaceService {
                     ownerMemberId: options.ownerMemberId,
                     workspaceKind: WorkspaceKind.WORKTREE,
                     status: { in: [WorkspaceStatus.MERGED, WorkspaceStatus.HIBERNATED] },
+                    cleanedAt: null,
                 },
                 orderBy: { updatedAt: 'desc' },
             });
@@ -1344,7 +1345,26 @@ export class WorkspaceService {
         if (workspace.status === WorkspaceStatus.HIBERNATED) {
             return this.restoreInactiveWorkspace(workspace);
         }
-        if (workspace.status === WorkspaceStatus.MERGED) {
+        if (workspace.status === WorkspaceStatus.MERGED
+            || (workspace.status === WorkspaceStatus.ABANDONED && workspace.cleanedAt)) {
+            if (workspace.cleanedAt) {
+                return defaultWorkspaceLifecycleBarrier.withWorkspaces([workspace.id, mainWorkspace.id], async () => {
+                    const current = await prisma.workspace.findUnique({
+                        where: { id: workspace.id }, include: { task: { include: { project: true } } },
+                    });
+                    if (!current)
+                        throw new NotFoundError('Workspace', workspace.id);
+                    ensureTaskNotDeleted(current.task);
+                    const activeMain = await prisma.workspace.findFirst({
+                        where: { id: mainWorkspace.id, status: WorkspaceStatus.ACTIVE, cleanedAt: null, task: { deletedAt: null } },
+                    });
+                    if (!activeMain)
+                        throw new ServiceError('TeamRun main workspace is no longer active', 'WORKSPACE_NOT_ACTIVE', 409);
+                    if (!current.cleanedAt)
+                        return this.activateDedicatedWorkspace(current, mainWorkspace);
+                    return this.resetMergedDedicatedWorkspace(current, mainWorkspace);
+                });
+            }
             return this.resetMergedDedicatedWorkspace(workspace, mainWorkspace);
         }
         throw new ServiceError(`Cannot reuse dedicated workspace in ${workspace.status} status`, 'DEDICATED_WORKSPACE_UNAVAILABLE', 409);
@@ -1353,41 +1373,61 @@ export class WorkspaceService {
         this.assertWorktreeWorkspace(workspace);
         this.assertWorktreeWorkspace(mainWorkspace);
         const worktreeManager = new WorktreeManager(workspace.task.project.repoPath);
-        const worktreePath = await worktreeManager.ensureWorktreeExists(workspace.branchName);
-        if (!(await worktreeManager.isWorktreeClean(worktreePath))) {
-            throw new ServiceError(`Cannot start new work from merged workspace ${workspace.id} because it has uncommitted changes`, 'MERGED_WORKSPACE_DIRTY', 409);
-        }
-        const mainHead = (await execGit(mainWorkspace.worktreePath, ['rev-parse', 'HEAD'])).trim();
-        await execGit(worktreePath, ['reset', '--hard', mainHead]);
-        const actualHead = (await execGit(worktreePath, ['rev-parse', 'HEAD'])).trim();
-        if (!mainHead || actualHead !== mainHead || !(await worktreeManager.isWorktreeClean(worktreePath))) {
-            throw new ServiceError(`Merged workspace ${workspace.id} could not be aligned to the TeamRun main workspace`, 'MERGED_WORKSPACE_RESET_FAILED', 500);
+        // The retained record still occupies the member's unique workspace slot.
+        // Rebuild its resources with a fresh branch; the previous name is no longer owned.
+        const branchName = workspace.cleanedAt ? `${workspace.branchName}-${randomUUID().slice(0, 8)}` : workspace.branchName;
+        const worktreePath = workspace.cleanedAt
+            ? await worktreeManager.create(branchName, mainWorkspace.branchName)
+            : await worktreeManager.ensureWorktreeExists(branchName);
+        let resourcesBound = false;
+        try {
+            if (!(await worktreeManager.isWorktreeClean(worktreePath))) {
+                throw new ServiceError(`Cannot start new work from merged workspace ${workspace.id} because it has uncommitted changes`, 'MERGED_WORKSPACE_DIRTY', 409);
+            }
+            const mainHead = (await execGit(mainWorkspace.worktreePath, ['rev-parse', 'HEAD'])).trim();
+            await execGit(worktreePath, ['reset', '--hard', mainHead]);
+            const actualHead = (await execGit(worktreePath, ['rev-parse', 'HEAD'])).trim();
+            if (!mainHead || actualHead !== mainHead || !(await worktreeManager.isWorktreeClean(worktreePath))) {
+                throw new ServiceError(`Merged workspace ${workspace.id} could not be aligned to the TeamRun main workspace`, 'MERGED_WORKSPACE_RESET_FAILED', 500);
+            }
+            const updateResult = await prisma.workspace.updateMany({
+                where: {
+                    id: workspace.id,
+                    status: workspace.status,
+                    cleanedAt: workspace.cleanedAt,
+                    task: { deletedAt: null },
+                },
+                data: {
+                    status: WorkspaceStatus.ACTIVE,
+                    branchName,
+                    baseBranch: mainWorkspace.branchName,
+                    worktreePath,
+                    workingDir: worktreePath,
+                    hibernatedAt: null,
+                    commitMessage: null,
+                    cleanedAt: null,
+                },
+            });
+            if (updateResult.count !== 1) {
+                throw new ServiceError(`Merged workspace ${workspace.id} changed state while starting new work`, 'MERGED_WORKSPACE_STATE_CHANGED', 409);
+            }
+            resourcesBound = true;
+            this.runCopyFiles(workspace.task.project.repoPath, worktreePath, workspace.task.project.copyFiles);
+            this.fireSetupScript(workspace.id, workspace.taskId, worktreePath, workspace.task.project.setupScript);
+            const activated = await prisma.workspace.findUniqueOrThrow({
+                where: { id: workspace.id },
+                include: { sessions: visibleSessionsFilter, task: { include: { project: true } } },
+            });
+            return activated;
         }
-        const updateResult = await prisma.workspace.updateMany({
-            where: {
-                id: workspace.id,
-                status: WorkspaceStatus.MERGED,
-                task: { deletedAt: null },
-            },
-            data: {
-                status: WorkspaceStatus.ACTIVE,
-                baseBranch: mainWorkspace.branchName,
-                worktreePath,
-                workingDir: worktreePath,
-                hibernatedAt: null,
-                commitMessage: null,
-            },
-        });
-        if (updateResult.count !== 1) {
-            throw new ServiceError(`Merged workspace ${workspace.id} changed state while starting new work`, 'MERGED_WORKSPACE_STATE_CHANGED', 409);
+        catch (error) {
+            if (workspace.cleanedAt && !resourcesBound) {
+                await this.cleanupCreatedWorktree(worktreeManager, worktreePath, branchName, [
+                    workspace.task.project.mainBranch, mainWorkspace.branchName,
+                ]);
+            }
+            throw error;
         }
-        this.runCopyFiles(workspace.task.project.repoPath, worktreePath, workspace.task.project.copyFiles);
-        this.fireSetupScript(workspace.id, workspace.taskId, worktreePath, workspace.task.project.setupScript);
-        const activated = await prisma.workspace.findUniqueOrThrow({
-            where: { id: workspace.id },
-            include: { sessions: visibleSessionsFilter, task: { include: { project: true } } },
-        });
-        return activated;
     }
     async waitForWorkspaceReady(workspace) {
         if (workspace.branchName) {
@@ -1457,12 +1497,8 @@ export class WorkspaceService {
     }
     // ── Delete ───────────────────────────────────────────────────────────────────
     /**
-     * 删除 Workspace
-     *
-     * - 删除前检查是否有 RUNNING 状态的 Session，有则拒绝删除
-     * - 删除时先停止所有关联 Session 的进程
-     * - 删除时调用 WorktreeManager.remove 清理 worktree
-     * - worktree 清理失败时仍然删除数据库记录（记录警告日志）
+     * 回收 Workspace 的运行资源，保留任务下的会话历史。
+     * 只有任务/项目硬删除才级联删除 Workspace 和 Session。
      */
     async delete(id) {
         return withSessionResourceCleanup({ workspaceId: id }, () => (defaultWorkspaceLifecycleBarrier.withWorkspace(id, () => this.deleteWithLifecycle(id))));
@@ -1479,25 +1515,44 @@ export class WorkspaceService {
             throw new NotFoundError('Workspace', id);
         }
         ensureProjectIsMutable(workspace.task.project, 'delete workspaces');
+        ensureTaskNotDeleted(workspace.task);
+        if (workspace.cleanedAt)
+            return true;
         // A completed ACP turn may still own a reusable adapter process.
         for (const session of workspace.sessions) {
             await stopSessionForResourceCleanup(this.sessionService, session.id);
         }
         await this.backgroundService.stopAllForWorkspace(id);
-        if (isWorktreeWorkspace(workspace) && workspace.worktreePath) {
-            // 清理 worktree
-            try {
-                const worktreeManager = new WorktreeManager(workspace.task.project.repoPath);
-                await worktreeManager.remove(workspace.worktreePath);
-            }
-            catch (err) {
-                // worktree 清理失败时记录警告但不阻断删除
-                console.warn(`[WorkspaceService] Failed to remove worktree for workspace ${id}: ${err instanceof Error ? err.message : err}`);
+        const worktreeManager = isWorktreeWorkspace(workspace)
+            ? new WorktreeManager(workspace.task.project.repoPath) : null;
+        if (worktreeManager && workspace.worktreePath) {
+            const result = await worktreeManager.remove(workspace.worktreePath);
+            if (result.status === 'unregistered') {
+                throw new ServiceError('Workspace directory could not be safely removed', 'WORKSPACE_CLEANUP_PENDING', 409);
             }
         }
-        // 删除数据库记录（级联删除 sessions/services）
         await this.backgroundService.releaseLogsForWorkspace?.(id);
-        await prisma.workspace.delete({ where: { id } });
+        await prisma.workspace.update({
+            where: { id },
+            data: {
+                status: workspace.status === WorkspaceStatus.MERGED ? WorkspaceStatus.MERGED : WorkspaceStatus.ABANDONED,
+                worktreePath: '',
+                workingDir: '',
+                previewTarget: null,
+                hibernatedAt: null,
+            },
+        });
+        try {
+            // Preserve branch ownership for retry if another task still needs it.
+            if (!worktreeManager || await this.cleanupWorkspaceBranch(workspace, worktreeManager)) {
+                await prisma.workspace.update({ where: { id }, data: { cleanedAt: new Date() } });
+            }
+        }
+        finally {
+            this.eventBus.emit('task:updated', {
+                taskId: workspace.taskId, projectId: workspace.task.projectId, status: workspace.task.status,
+            });
+        }
         return true;
     }
     // ── Diff ─────────────────────────────────────────────────────────────────────
@@ -1597,7 +1652,18 @@ export class WorkspaceService {
         await worktreeManager.abortOperation(workspace.worktreePath);
     }
     async merge(id, commitMessageOrOptions) {
-        return defaultWorkspaceLifecycleBarrier.withWorkspace(id, async () => {
+        const source = await prisma.workspace.findUnique({ where: { id }, include: { task: true } });
+        if (!source || source.task.deletedAt)
+            throw new NotFoundError('Workspace', id);
+        const target = source.parentWorkspaceId || !source.baseBranch ? null : await prisma.workspace.findFirst({
+            where: {
+                id: { not: id }, branchName: source.baseBranch, status: WorkspaceStatus.ACTIVE,
+                parentWorkspaceId: null, workspaceKind: WorkspaceKind.WORKTREE,
+                task: { projectId: source.task.projectId, deletedAt: null },
+            },
+            include: { task: { include: { project: true } } },
+        });
+        return defaultWorkspaceLifecycleBarrier.withWorkspaces([id, ...(target ? [target.id] : [])], async () => {
             const options = typeof commitMessageOrOptions === 'string'
                 ? { commitMessage: commitMessageOrOptions }
                 : (commitMessageOrOptions ?? {});
@@ -1605,18 +1671,32 @@ export class WorkspaceService {
                 where: { id },
                 include: { task: { include: { project: true, teamRun: true } } },
             });
-            if (!workspace) {
+            if (!workspace || workspace.task.deletedAt) {
                 throw new NotFoundError('Workspace', id);
             }
+            if (workspace.baseBranch !== source.baseBranch) {
+                throw new ServiceError('Merge target changed. Refresh before merging.', 'MERGE_TARGET_CHANGED', 409);
+            }
+            const currentTarget = target ? await prisma.workspace.findUnique({
+                where: { id: target.id }, include: { task: { include: { project: true } } },
+            }) : null;
+            if (target && (!currentTarget || currentTarget.task.deletedAt || currentTarget.status !== WorkspaceStatus.ACTIVE
+                || currentTarget.branchName !== workspace.baseBranch)) {
+                throw new ServiceError('Merge target changed. Refresh before merging.', 'MERGE_TARGET_CHANGED', 409);
+            }
+            if (currentTarget) {
+                await this.assertNoActiveWriteSessions(currentTarget.id);
+                await this.assertNoActiveBackgroundServices(currentTarget.id);
+            }
             ensureProjectIsMutable(workspace.task.project, 'merge workspaces');
             this.assertWorktreeWorkspace(workspace);
             if (!options.stopActiveServices) {
                 await this.assertNoActiveBackgroundServices(workspace.id);
             }
-            return this.withMergeTargetLock(this.getMergeLockTarget(workspace), options.lockOwnerId, () => this.mergeWithLock(workspace, options));
+            return this.withMergeTargetLock(currentTarget ? this.getParentWorkspaceMergeLockTarget(currentTarget.id) : this.getMergeLockTarget(workspace), options.lockOwnerId, () => this.mergeWithLock(workspace, options, currentTarget));
         });
     }
-    async mergeWithLock(workspace, options) {
+    async mergeWithLock(workspace, options, targetWorkspace = null) {
         if (this.isTeamRunDedicatedChildWorkspace(workspace) && workspace.status === WorkspaceStatus.MERGED) {
             if (!workspace.worktreePath) {
                 return '';
@@ -1645,7 +1725,7 @@ export class WorkspaceService {
         if (parentWorkspace) {
             return this.mergeChildIntoParent(workspace, parentWorkspace, options.commitMessage);
         }
-        return this.mergeRootWorkspaceToMain(workspace, options.commitMessage);
+        return this.mergeRootWorkspaceToMain(workspace, options.commitMessage, targetWorkspace);
     }
     isTeamRunDedicatedChildWorkspace(workspace) {
         return Boolean(workspace.task.teamRun
@@ -1774,17 +1854,22 @@ export class WorkspaceService {
         });
         return sha;
     }
-    async mergeRootWorkspaceToMain(workspace, commitMessage) {
+    async mergeRootWorkspaceToMain(workspace, commitMessage, targetWorkspace = null) {
         this.assertWorktreeWorkspace(workspace);
         const worktreeManager = new WorktreeManager(workspace.task.project.repoPath);
         let sha;
         const targetBranch = this.getBaseBranch(workspace);
         try {
-            ({ sha } = await worktreeManager.merge(workspace.worktreePath, targetBranch, { commitMessage: commitMessage || workspace.commitMessage || undefined }));
+            ({ sha } = await worktreeManager.merge(workspace.worktreePath, targetBranch, { commitMessage: commitMessage || workspace.commitMessage || undefined,
+                ...(targetWorkspace ? { targetWorktreePath: targetWorkspace.worktreePath }
+                    : workspace.task.parentTaskId ? { restoreOriginalBranch: true } : {}),
+            }));
         }
         catch (error) {
             if (error instanceof MergeConflictError) {
                 error.sourceWorkspaceId = workspace.id;
+                if (targetWorkspace)
+                    error.targetWorkspaceId = targetWorkspace.id;
                 error.sourceWorktreePath ??= workspace.worktreePath;
                 error.sourceBranch ??= workspace.branchName;
                 error.targetBranch ??= targetBranch;
@@ -2124,7 +2209,7 @@ export class WorkspaceService {
     }
     // ── Cleanup ──────────────────────────────────────────────────────────────────
     /**
-     * 清理所有 ABANDONED/MERGED 状态且关联 Task 为 DONE 的 Workspace
+     * 回收已完成任务的 ABANDONED/MERGED Workspace 资源，保留会话历史。
      *
      * @returns 被清理的 Workspace 数量
      */
@@ -2132,56 +2217,86 @@ export class WorkspaceService {
         const workspaces = await prisma.workspace.findMany({
             where: {
                 status: { in: [WorkspaceStatus.ABANDONED, WorkspaceStatus.MERGED] },
-                task: { status: TaskStatus.DONE },
+                cleanedAt: null,
+                task: { status: TaskStatus.DONE, deletedAt: null },
             },
-            include: { task: { include: { project: true } } },
+            select: { id: true },
         });
         let cleaned = 0;
-        for (const workspace of workspaces) {
+        for (const candidate of workspaces) {
             try {
-                await withSessionResourceCleanup({ workspaceId: workspace.id }, () => (defaultWorkspaceLifecycleBarrier.withWorkspace(workspace.id, async () => {
+                await withSessionResourceCleanup({ workspaceId: candidate.id }, () => (defaultWorkspaceLifecycleBarrier.withWorkspace(candidate.id, async () => {
+                    // Recheck after acquiring the lifecycle lock: another cleanup or
+                    // reactivation may have already consumed this candidate.
+                    const workspace = await prisma.workspace.findFirst({
+                        where: {
+                            id: candidate.id, cleanedAt: null,
+                            status: { in: [WorkspaceStatus.ABANDONED, WorkspaceStatus.MERGED] },
+                            task: { status: TaskStatus.DONE, deletedAt: null },
+                        },
+                        include: { task: { include: { project: true } } },
+                    });
+                    if (!workspace)
+                        return;
                     const sessions = await prisma.session.findMany({ where: { workspaceId: workspace.id }, select: { id: true } });
                     for (const session of sessions) {
                         await stopSessionForResourceCleanup(this.sessionService, session.id);
                     }
                     await this.backgroundService.stopAllForWorkspace(workspace.id);
-                    if (isMainDirectoryWorkspace(workspace)) {
-                        await this.backgroundService.releaseLogsForWorkspace?.(workspace.id);
-                        await prisma.workspace.delete({ where: { id: workspace.id } });
-                        cleaned++;
-                        return;
-                    }
-                    const worktreeManager = new WorktreeManager(workspace.task.project.repoPath);
+                    const worktreeManager = isWorktreeWorkspace(workspace)
+                        ? new WorktreeManager(workspace.task.project.repoPath) : null;
                     // 清理残留 worktree（如果还存在）
-                    if (workspace.worktreePath) {
+                    if (worktreeManager && workspace.worktreePath) {
                         const removeResult = await worktreeManager.remove(workspace.worktreePath);
                         if (removeResult.status === 'unregistered') {
                             console.warn(`[WorkspaceService] cleanup: workspace ${workspace.id} path is unregistered or unsafe to remove: ${removeResult.path}`);
                             return;
                         }
                     }
-                    // Task 已 DONE，branch 不再需要，删除。安全 helper 会跳过 base/main/master/current/missing。
-                    const branchDeleteResult = await worktreeManager.deleteBranchIfSafe(workspace.branchName, {
-                        protectedBranches: [workspace.task.project.mainBranch, workspace.baseBranch],
+                    // Clear live paths even when branch reclamation needs a later retry.
+                    // MAIN_DIRECTORY releases its binding without removing project files.
+                    await this.backgroundService.releaseLogsForWorkspace?.(workspace.id);
+                    await prisma.workspace.update({
+                        where: { id: workspace.id },
+                        data: { worktreePath: '', workingDir: '', previewTarget: null },
                     });
-                    if (branchDeleteResult.status === 'failed') {
-                        console.warn(`[WorkspaceService] cleanup: failed to delete branch ${branchDeleteResult.branchName} for workspace ${workspace.id}: ${branchDeleteResult.reason}`);
+                    const cleanupComplete = !worktreeManager || await this.cleanupWorkspaceBranch(workspace, worktreeManager);
+                    if (cleanupComplete) {
+                        await prisma.workspace.update({ where: { id: workspace.id }, data: { cleanedAt: new Date() } });
                     }
-                    else if (branchDeleteResult.status === 'checked_out') {
-                        console.warn(`[WorkspaceService] cleanup: skipped checked-out branch ${branchDeleteResult.branchName} for workspace ${workspace.id}: ${branchDeleteResult.reason}`);
+                    if (cleanupComplete || getWorkspaceWorkingDir(workspace)) {
+                        cleaned++;
+                        this.eventBus.emit('task:updated', {
+                            taskId: workspace.taskId, projectId: workspace.task.projectId, status: workspace.task.status,
+                        });
                     }
-                    await this.backgroundService.releaseLogsForWorkspace?.(workspace.id);
-                    await prisma.workspace.delete({ where: { id: workspace.id } });
-                    cleaned++;
                 })));
             }
             catch (err) {
                 // Keep process evidence and directory resources for a later retry.
-                console.warn(`[WorkspaceService] cleanup: failed for workspace ${workspace.id}: ${err instanceof Error ? err.message : err}`);
+                console.warn(`[WorkspaceService] cleanup: failed for workspace ${candidate.id}: ${err instanceof Error ? err.message : err}`);
             }
         }
         return cleaned;
     }
+    async cleanupWorkspaceBranch(workspace, worktreeManager) {
+        const referencedByTask = await prisma.task.findFirst({
+            where: { projectId: workspace.task.projectId, id: { not: workspace.taskId }, deletedAt: null, OR: [
+                    { baseBranch: workspace.branchName },
+                    { workspaces: { some: { baseBranch: workspace.branchName, cleanedAt: null } } },
+                ] }, select: { id: true },
+        });
+        if (referencedByTask)
+            return false;
+        const result = await worktreeManager.deleteBranchIfSafe(workspace.branchName, {
+            protectedBranches: [workspace.task.project.mainBranch, workspace.baseBranch],
+        });
+        if (result.status === 'failed' || result.status === 'checked_out') {
+            console.warn(`[WorkspaceService] cleanup: branch ${result.branchName} retained for workspace ${workspace.id}: ${result.reason}`);
+            return false;
+        }
+        return true;
+    }
     // ── Startup Prune ────────────────────────────────────────────────────────────
     assertWorktreeWorkspace(workspace) {
         if (isWorktreeWorkspace(workspace))