agent-tower 0.6.0-beta.2 → 0.6.0-beta.4

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

@@ -1,6 +1,7 @@
 import { WorkspaceKind } from '../types/index.js';
 import { type TeamLockService } from './team-lock.service.js';
 import type { GitOperationStatus, MergeableWorkspacesResponse, MergeTeamRunMembersInput, MergeTeamRunMembersResponse, WorkspaceVerdict, WorkspaceVerdictKind, WorkspaceVerdictValue } from '@agent-tower/shared';
+import type { WorkspaceBackgroundService } from './workspace-background-service.service.js';
 export interface CreateWorkspaceOptions {
     branchName?: string;
     branchNamePrefix?: string;
@@ -52,11 +53,12 @@ export interface MergeTeamRunMembersOptions extends MergeTeamRunMembersInput {
 }
 export declare class WorkspaceService {
     private readonly lockService;
+    private readonly backgroundService;
     private static readonly mainWorkspaceClaims;
     private static readonly dedicatedWorkspaceClaims;
     private sessionService;
     private eventBus;
-    constructor(lockService?: TeamLockService);
+    constructor(lockService?: TeamLockService, backgroundService?: Pick<WorkspaceBackgroundService, 'stopAllForWorkspace'> & Partial<Pick<WorkspaceBackgroundService, 'releaseLogsForWorkspace'>>);
     private getBaseBranch;
     findById(id: string): Promise<({
         task: {
@@ -95,9 +97,9 @@ export declare class WorkspaceService {
             id: string;
             createdAt: Date;
             updatedAt: Date;
+            agentType: string;
             status: string;
             workspaceId: string | null;
-            agentType: string;
             variant: string;
             providerId: string | null;
             purpose: string;
@@ -107,15 +109,15 @@ export declare class WorkspaceService {
         id: string;
         createdAt: Date;
         updatedAt: Date;
+        workingDir: string;
         status: string;
         taskId: string;
+        branchName: string;
+        worktreePath: string;
         parentWorkspaceId: string | null;
         ownerMemberId: string | null;
-        branchName: string;
         baseBranch: string | null;
-        worktreePath: string;
         workspaceKind: string;
-        workingDir: string;
         commitMessage: string | null;
         previewTarget: string | null;
         hibernatedAt: Date | null;
@@ -128,9 +130,9 @@ export declare class WorkspaceService {
             id: string;
             createdAt: Date;
             updatedAt: Date;
+            agentType: string;
             status: string;
             workspaceId: string | null;
-            agentType: string;
             variant: string;
             providerId: string | null;
             purpose: string;
@@ -140,15 +142,15 @@ export declare class WorkspaceService {
         id: string;
         createdAt: Date;
         updatedAt: Date;
+        workingDir: string;
         status: string;
         taskId: string;
+        branchName: string;
+        worktreePath: string;
         parentWorkspaceId: string | null;
         ownerMemberId: string | null;
-        branchName: string;
         baseBranch: string | null;
-        worktreePath: string;
         workspaceKind: string;
-        workingDir: string;
         commitMessage: string | null;
         previewTarget: string | null;
         hibernatedAt: Date | null;
@@ -214,9 +216,9 @@ export declare class WorkspaceService {
             id: string;
             createdAt: Date;
             updatedAt: Date;
+            agentType: string;
             status: string;
             workspaceId: string | null;
-            agentType: string;
             variant: string;
             providerId: string | null;
             purpose: string;
@@ -226,15 +228,15 @@ export declare class WorkspaceService {
         id: string;
         createdAt: Date;
         updatedAt: Date;
+        workingDir: string;
         status: string;
         taskId: string;
+        branchName: string;
+        worktreePath: string;
         parentWorkspaceId: string | null;
         ownerMemberId: string | null;
-        branchName: string;
         baseBranch: string | null;
-        worktreePath: string;
         workspaceKind: string;
-        workingDir: string;
         commitMessage: string | null;
         previewTarget: string | null;
         hibernatedAt: Date | null;
@@ -277,9 +279,9 @@ export declare class WorkspaceService {
             id: string;
             createdAt: Date;
             updatedAt: Date;
+            agentType: string;
             status: string;
             workspaceId: string | null;
-            agentType: string;
             variant: string;
             providerId: string | null;
             purpose: string;
@@ -289,15 +291,15 @@ export declare class WorkspaceService {
         id: string;
         createdAt: Date;
         updatedAt: Date;
+        workingDir: string;
         status: string;
         taskId: string;
+        branchName: string;
+        worktreePath: string;
         parentWorkspaceId: string | null;
         ownerMemberId: string | null;
-        branchName: string;
         baseBranch: string | null;
-        worktreePath: string;
         workspaceKind: string;
-        workingDir: string;
         commitMessage: string | null;
         previewTarget: string | null;
         hibernatedAt: Date | null;
@@ -339,9 +341,9 @@ export declare class WorkspaceService {
             id: string;
             createdAt: Date;
             updatedAt: Date;
+            agentType: string;
             status: string;
             workspaceId: string | null;
-            agentType: string;
             variant: string;
             providerId: string | null;
             purpose: string;
@@ -351,15 +353,15 @@ export declare class WorkspaceService {
         id: string;
         createdAt: Date;
         updatedAt: Date;
+        workingDir: string;
         status: string;
         taskId: string;
+        branchName: string;
+        worktreePath: string;
         parentWorkspaceId: string | null;
         ownerMemberId: string | null;
-        branchName: string;
         baseBranch: string | null;
-        worktreePath: string;
         workspaceKind: string;
-        workingDir: string;
         commitMessage: string | null;
         previewTarget: string | null;
         hibernatedAt: Date | null;
@@ -382,6 +384,7 @@ export declare class WorkspaceService {
      * - worktree 清理失败时仍然删除数据库记录（记录警告日志）
      */
     delete(id: string): Promise<boolean>;
+    private deleteWithLifecycle;
     getDiff(id: string): Promise<string>;
     /**
      * Rebase 工作空间分支到最新的基础分支
@@ -405,6 +408,7 @@ export declare class WorkspaceService {
     private mergeRootWorkspaceToMain;
     private assertTeamRunFinalMergeAllowed;
     private assertNoActiveWriteSessions;
+    private assertNoActiveBackgroundServices;
     private getMergeLockTarget;
     private getParentWorkspaceMergeLockTarget;
     private withMergeTargetLock;
@@ -448,12 +452,12 @@ export declare class WorkspaceService {
             id: string;
             createdAt: Date;
             updatedAt: Date;
+            agentType: string;
+            runtimeType: string;
             status: string;
             workspaceId: string | null;
             conversationId: string | null;
             context: string;
-            agentType: string;
-            runtimeType: string;
             externalSessionId: string | null;
             variant: string;
             providerId: string | null;
@@ -466,24 +470,26 @@ export declare class WorkspaceService {
         id: string;
         createdAt: Date;
         updatedAt: Date;
+        workingDir: string;
         status: string;
         taskId: string;
+        branchName: string;
+        worktreePath: string;
         parentWorkspaceId: string | null;
         ownerMemberId: string | null;
-        branchName: string;
         baseBranch: string | null;
-        worktreePath: string;
         workspaceKind: string;
-        workingDir: string;
         commitMessage: string | null;
         previewTarget: string | null;
         hibernatedAt: Date | null;
     }>;
+    private archiveWithLifecycle;
     /**
      * 休眠单个 workspace：auto-commit dirty changes → 删除 worktree 目录 → 标记 HIBERNATED
      * Branch 保留，可随时通过 reactivate() 恢复。
      */
     hibernate(id: string): Promise<void>;
+    private hibernateWithLifecycle;
     /**
      * 唤醒休眠的 workspace：从 branch 重建 worktree → 复制文件 → 执行 setup → 恢复 ACTIVE
      */
@@ -524,9 +530,9 @@ export declare class WorkspaceService {
             id: string;
             createdAt: Date;
             updatedAt: Date;
+            agentType: string;
             status: string;
             workspaceId: string | null;
-            agentType: string;
             variant: string;
             providerId: string | null;
             purpose: string;
@@ -536,15 +542,15 @@ export declare class WorkspaceService {
         id: string;
         createdAt: Date;
         updatedAt: Date;
+        workingDir: string;
         status: string;
         taskId: string;
+        branchName: string;
+        worktreePath: string;
         parentWorkspaceId: string | null;
         ownerMemberId: string | null;
-        branchName: string;
         baseBranch: string | null;
-        worktreePath: string;
         workspaceKind: string;
-        workingDir: string;
         commitMessage: string | null;
         previewTarget: string | null;
         hibernatedAt: Date | null;

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":"AACA,OAAO,EAAE,aAAa,EAA8D,MAAM,mBAAmB,CAAC;AAM9G,OAAO,EAA0B,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAQtF,OAAO,KAAK,EACV,kBAAkB,EAElB,2BAA2B,EAG3B,wBAAwB,EACxB,2BAA2B,EAE3B,gBAAgB,EAChB,oBAAoB,EACpB,qBAAqB,EACtB,MAAM,qBAAqB,CAAC;AAY7B,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAgD5F,MAAM,WAAW,sBAAsB;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B;AAED,MAAM,WAAW,qBAAqB;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,oBAAoB,CAAC;IAC3B,OAAO,EAAE,qBAAqB,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,uBAAuB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzC;AAED,MAAM,WAAW,sCAAsC;IACrD,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,UAAU,EAAE,kBAAkB,CAAC;IAC/B,aAAa,EAAE,QAAQ,GAAG,MAAM,CAAC;IACjC,uBAAuB,EAAE,MAAM,CAAC;IAChC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,uCAAuC;IACtD,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,0BAA2B,SAAQ,wBAAwB;IAC1E,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AA0QD,qBAAa,gBAAgB;IAOzB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAPpC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAA4D;IACvG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAA4D;IAC5G,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,QAAQ,CAA2B;gBAGxB,WAAW,GAAE,eAAwC,EACrD,iBAAiB,GAAE,IAAI,CAAC,0BAA0B,EAAE,qBAAqB,CAAC,GACvF,OAAO,CAAC,IAAI,CAAC,0BAA0B,EAAE,yBAAyB,CAAC,CAAmC;IAG5G,OAAO,CAAC,aAAa;IASf,QAAQ,CAAC,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAUzB;;OAEG;IACG,YAAY,CAAC,MAAM,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAc3B,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAiB9D,8BAA8B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAKvF,mBAAmB,CACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,2BAA2B,CAAC;IA4HjC,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,2BAA2B,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAkGjG,mCAAmC,CACvC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GACtC,OAAO,CAAC,2BAA2B,GAAG,IAAI,CAAC;IA+CxC,iCAAiC,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAAC;QAC3G,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,YAAY,EAAE,MAAM,CAAC;KACtB,GAAG,IAAI,CAAC;YAqBK,4BAA4B;YA6C5B,2BAA2B;YAmI3B,gCAAgC;YA+BhC,2BAA2B;IAkKzC,OAAO,CAAC,kBAAkB;IAqC1B;;;;;;;;OAQG;IACG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,mBAAmB,CAAC,EAAE,MAAM,GAAG,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAoHpE,4BAA4B;IAkDpC,wBAAwB,CAAC,SAAS,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAkB1C,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAoBzD,yBAAyB;YA4DzB,8BAA8B;IAkDtC,iCAAiC,CACrC,KAAK,EAAE,sCAAsC,GAC5C,OAAO,CAAC,uCAAuC,CAAC;YA8GrC,sBAAsB;YActB,0BAA0B;YA6B1B,6BAA6B;YA8D7B,qBAAqB;YA0BrB,6BAA6B;YAyB7B,wBAAwB;IAiCtC;;;;;;;OAOG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM;YAIT,mBAAmB;IAiD3B,OAAO,CAAC,EAAE,EAAE,MAAM;IAuBxB;;OAEG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBvC;;OAEG;IACG,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA2B3D;;OAEG;IACG,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBzC,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC1D,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;YA0B3D,aAAa;IAkC3B,OAAO,CAAC,gCAAgC;YAS1B,UAAU;YAIV,2BAA2B;YAsH3B,oBAAoB;YAuDpB,wBAAwB;YA4CxB,8BAA8B;YA+B9B,2BAA2B;YAmB3B,gCAAgC;IAiB9C,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,iCAAiC;YAQ3B,mBAAmB;IA0BjC;;OAEG;IACG,OAAO,CAAC,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAIV,oBAAoB;IA2ClC;;;OAGG;IACG,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAI5B,sBAAsB;IAyEpC;;OAEG;IACG,UAAU,CAAC,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAiDb,sBAAsB;YAqBtB,uBAAuB;IAkBrC;;;;;;;;OAQG;IACG,aAAa,CAAC,kBAAkB,SAA+B,GAAG,OAAO,CAAC,MAAM,CAAC;IAwCvF;;OAEG;YACW,iBAAiB;IAoB/B;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAkEhC,OAAO,CAAC,uBAAuB;IAS/B;;OAEG;IACH,OAAO,CAAC,YAAY;IAWpB;;OAEG;YACW,cAAc;IAyC5B;;OAEG;IACH,OAAO,CAAC,eAAe;IAmBvB;;OAEG;WACU,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;CAehD"}

package/dist/services/workspace.service.js

@@ -3,7 +3,7 @@ import { WorkspaceKind, WorkspaceStatus, TaskStatus, SessionStatus, SessionPurpo
 import { WorktreeManager } from '../git/worktree.manager.js';
 import { execGit, MergeConflictError } from '../git/git-cli.js';
 import { NotFoundError, ServiceError } from '../errors.js';
-import { getSessionManager, getEventBus } from '../core/container.js';
+import { getSessionManager, getEventBus, getWorkspaceBackgroundService } from '../core/container.js';
 import { copyProjectFiles } from './copy-files.service.js';
 import { defaultTeamLockService } from './team-lock.service.js';
 import { exec } from 'node:child_process';
@@ -14,6 +14,7 @@ import path from 'node:path';
 import { ensureProjectIsMutable, ensureProjectSupportsWorktrees, hasGitMetadata, } from './project-guards.js';
 import { ensureTaskNotDeleted } from './deleted-task-guard.js';
 import { isMainDirectoryWorkspace, isWorktreeWorkspace, } from './workspace-kind.js';
+import { defaultWorkspaceLifecycleBarrier } from './workspace-lifecycle-barrier.js';
 const DEFAULT_IDLE_THRESHOLD_HOURS = 24;
 const WORKSPACE_READY_RETRY_COUNT = 20;
 const WORKSPACE_READY_RETRY_DELAY_MS = 50;
@@ -48,6 +49,13 @@ const visibleSessionsFilter = {
 };
 const activeSessionStatuses = [SessionStatus.PENDING, SessionStatus.RUNNING];
 const activeInvocationStatuses = ['QUEUED', 'RUNNING', 'SESSION_ENDED', 'WAITING_ROOM_REPLY'];
+const activeBackgroundServiceStates = ['STARTING', 'RUNNING', 'STOPPING'];
+const activeBackgroundServiceWhere = {
+    OR: [
+        { runtimeState: { in: activeBackgroundServiceStates } },
+        { runtimeInstanceId: { not: null } },
+    ],
+};
 const finalChildWorkspaceStatuses = [WorkspaceStatus.MERGED, WorkspaceStatus.ABANDONED];
 function normalizeCreateOptions(input) {
     if (typeof input === 'string') {
@@ -178,12 +186,14 @@ function resultSummary(results, requested = results.length) {
 }
 export class WorkspaceService {
     lockService;
+    backgroundService;
     static mainWorkspaceClaims = new Map();
     static dedicatedWorkspaceClaims = new Map();
     sessionService = getSessionManager();
     eventBus = getEventBus();
-    constructor(lockService = defaultTeamLockService) {
+    constructor(lockService = defaultTeamLockService, backgroundService = getWorkspaceBackgroundService()) {
         this.lockService = lockService;
+        this.backgroundService = backgroundService;
     }
     getBaseBranch(workspace) {
         return workspace.baseBranch || workspace.task.project.mainBranch;
@@ -544,7 +554,7 @@ export class WorkspaceService {
         });
         const workspaceIds = dedicatedWorkspaces.map((workspace) => workspace.id);
         const ownerMemberIds = dedicatedWorkspaces.map((workspace) => workspace.ownerMemberId);
-        const [verdicts, ownerInvocations, parentActiveWriteSession, mainHeadSha] = await Promise.all([
+        const [verdicts, ownerInvocations, activeServices, parentActiveWriteSession, mainHeadSha] = await Promise.all([
             workspaceIds.length > 0
                 ? prisma.workspaceVerdict.findMany({
                     where: {
@@ -571,6 +581,15 @@ export class WorkspaceService {
                     select: { memberId: true },
                 })
                 : Promise.resolve([]),
+            workspaceIds.length > 0
+                ? prisma.workspaceBackgroundService.findMany({
+                    where: {
+                        workspaceId: { in: workspaceIds },
+                        ...activeBackgroundServiceWhere,
+                    },
+                    select: { workspaceId: true },
+                })
+                : Promise.resolve([]),
             mainWorkspace
                 ? prisma.session.findFirst({
                     where: {
@@ -620,6 +639,7 @@ export class WorkspaceService {
             latestReviews,
             latestTests,
             ownerActiveMemberIds: new Set(ownerInvocations.map((invocation) => invocation.memberId)),
+            activeServiceWorkspaceIds: new Set(activeServices.map((service) => service.workspaceId)),
         };
     }
     async buildMergeableWorkspacesResponse(context) {
@@ -718,6 +738,9 @@ export class WorkspaceService {
             if (ownerHasActiveInvocation) {
                 blockers.push(blocker('OWNER_HAS_ACTIVE_INVOCATION', 'BLOCKING', 'Cannot merge while the workspace owner has active work'));
             }
+            if (context.activeServiceWorkspaceIds.has(workspace.id)) {
+                blockers.push(blocker('WORKSPACE_HAS_ACTIVE_SERVICE', 'BLOCKING', 'Cannot merge a workspace while one of its background services is active'));
+            }
             if (context.mainWorkspace.hasActiveWriteSession) {
                 blockers.push(blocker('PARENT_WORKSPACE_HAS_ACTIVE_SESSION', 'BLOCKING', 'Cannot merge into parent workspace while it has an active write session'));
             }
@@ -1288,6 +1311,9 @@ export class WorkspaceService {
      * - worktree 清理失败时仍然删除数据库记录（记录警告日志）
      */
     async delete(id) {
+        return defaultWorkspaceLifecycleBarrier.withWorkspace(id, () => this.deleteWithLifecycle(id));
+    }
+    async deleteWithLifecycle(id) {
         const workspace = await prisma.workspace.findUnique({
             where: { id },
             include: {
@@ -1309,6 +1335,7 @@ export class WorkspaceService {
                 // 忽略停止失败
             }
         }
+        await this.backgroundService.stopAllForWorkspace(id);
         if (isWorktreeWorkspace(workspace) && workspace.worktreePath) {
             // 清理 worktree
             try {
@@ -1320,7 +1347,8 @@ export class WorkspaceService {
                 console.warn(`[WorkspaceService] Failed to remove worktree for workspace ${id}: ${err instanceof Error ? err.message : err}`);
             }
         }
-        // 删除数据库记录（级联删除 sessions）
+        // 删除数据库记录（级联删除 sessions/services）
+        await this.backgroundService.releaseLogsForWorkspace?.(id);
         await prisma.workspace.delete({ where: { id } });
         return true;
     }
@@ -1392,19 +1420,22 @@ export class WorkspaceService {
         await worktreeManager.abortOperation(workspace.worktreePath);
     }
     async merge(id, commitMessageOrOptions) {
-        const options = typeof commitMessageOrOptions === 'string'
-            ? { commitMessage: commitMessageOrOptions }
-            : (commitMessageOrOptions ?? {});
-        const workspace = await prisma.workspace.findUnique({
-            where: { id },
-            include: { task: { include: { project: true, teamRun: true } } },
+        return defaultWorkspaceLifecycleBarrier.withWorkspace(id, async () => {
+            const options = typeof commitMessageOrOptions === 'string'
+                ? { commitMessage: commitMessageOrOptions }
+                : (commitMessageOrOptions ?? {});
+            const workspace = await prisma.workspace.findUnique({
+                where: { id },
+                include: { task: { include: { project: true, teamRun: true } } },
+            });
+            if (!workspace) {
+                throw new NotFoundError('Workspace', id);
+            }
+            ensureProjectIsMutable(workspace.task.project, 'merge workspaces');
+            this.assertWorktreeWorkspace(workspace);
+            await this.assertNoActiveBackgroundServices(workspace.id);
+            return this.withMergeTargetLock(this.getMergeLockTarget(workspace), options.lockOwnerId, () => this.mergeWithLock(workspace, options));
         });
-        if (!workspace) {
-            throw new NotFoundError('Workspace', id);
-        }
-        ensureProjectIsMutable(workspace.task.project, 'merge workspaces');
-        this.assertWorktreeWorkspace(workspace);
-        return this.withMergeTargetLock(this.getMergeLockTarget(workspace), options.lockOwnerId, () => this.mergeWithLock(workspace, options));
     }
     async mergeWithLock(workspace, options) {
         if (this.isTeamRunDedicatedChildWorkspace(workspace) && workspace.status === WorkspaceStatus.MERGED) {
@@ -1421,6 +1452,9 @@ export class WorkspaceService {
         if (workspace.status !== WorkspaceStatus.ACTIVE) {
             throw new ServiceError(`Cannot merge workspace in ${workspace.status} status`, 'INVALID_WORKSPACE_STATE', 400);
         }
+        // The preflight/readiness result can become stale while waiting for the
+        // merge target lock, so the process-writing invariant is checked again.
+        await this.assertNoActiveBackgroundServices(workspace.id);
         if (workspace.parentWorkspaceId) {
             if (this.isTeamRunDedicatedChildWorkspace(workspace)) {
                 await this.assertTeamRunChildMergeGate(workspace, options);
@@ -1619,6 +1653,18 @@ export class WorkspaceService {
             throw new ServiceError('Cannot merge into parent workspace while it has an active write session', 'PARENT_WORKSPACE_HAS_ACTIVE_SESSION', 409);
         }
     }
+    async assertNoActiveBackgroundServices(workspaceId) {
+        const activeService = await prisma.workspaceBackgroundService.findFirst({
+            where: {
+                workspaceId,
+                ...activeBackgroundServiceWhere,
+            },
+            select: { id: true },
+        });
+        if (activeService) {
+            throw new ServiceError('Cannot merge a workspace while one of its background services is active', 'WORKSPACE_HAS_ACTIVE_SERVICE', 409);
+        }
+    }
     getMergeLockTarget(workspace) {
         if (workspace.parentWorkspaceId) {
             return this.getParentWorkspaceMergeLockTarget(workspace.parentWorkspaceId);
@@ -1656,6 +1702,9 @@ export class WorkspaceService {
      * 归档 Workspace（标记状态为 ABANDONED）
      */
     async archive(id) {
+        return defaultWorkspaceLifecycleBarrier.withWorkspace(id, () => this.archiveWithLifecycle(id));
+    }
+    async archiveWithLifecycle(id) {
         const workspace = await prisma.workspace.findUnique({
             where: { id },
             include: { sessions: true, task: { include: { project: true } } },
@@ -1677,6 +1726,7 @@ export class WorkspaceService {
                 // 忽略停止失败
             }
         }
+        await this.backgroundService.stopAllForWorkspace(id);
         const archived = await prisma.workspace.update({
             where: { id },
             data: { status: WorkspaceStatus.ABANDONED },
@@ -1690,6 +1740,9 @@ export class WorkspaceService {
      * Branch 保留，可随时通过 reactivate() 恢复。
      */
     async hibernate(id) {
+        return defaultWorkspaceLifecycleBarrier.withWorkspace(id, () => this.hibernateWithLifecycle(id));
+    }
+    async hibernateWithLifecycle(id) {
         const workspace = await prisma.workspace.findUnique({
             where: { id },
             include: {
@@ -1708,6 +1761,9 @@ export class WorkspaceService {
         if (hasActiveSessions) {
             throw new ServiceError('Cannot hibernate workspace with active sessions', 'WORKSPACE_HAS_ACTIVE_SESSIONS', 409);
         }
+        // Hibernation removes the worktree. Long-running services must stop first
+        // and remain stopped after reactivation.
+        await this.backgroundService.stopAllForWorkspace(id);
         // Auto-commit any dirty changes before removing worktree
         if (workspace.worktreePath) {
             const worktreeExists = await fs.access(workspace.worktreePath).then(() => true).catch(() => false);
@@ -1880,32 +1936,37 @@ export class WorkspaceService {
         let cleaned = 0;
         for (const workspace of workspaces) {
             try {
-                if (isMainDirectoryWorkspace(workspace)) {
+                await defaultWorkspaceLifecycleBarrier.withWorkspace(workspace.id, async () => {
+                    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);
+                    // 清理残留 worktree（如果还存在）
+                    if (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],
+                    });
+                    if (branchDeleteResult.status === 'failed') {
+                        console.warn(`[WorkspaceService] cleanup: failed to delete branch ${branchDeleteResult.branchName} for workspace ${workspace.id}: ${branchDeleteResult.reason}`);
+                    }
+                    else if (branchDeleteResult.status === 'checked_out') {
+                        console.warn(`[WorkspaceService] cleanup: skipped checked-out branch ${branchDeleteResult.branchName} for workspace ${workspace.id}: ${branchDeleteResult.reason}`);
+                    }
+                    await this.backgroundService.releaseLogsForWorkspace?.(workspace.id);
                     await prisma.workspace.delete({ where: { id: workspace.id } });
                     cleaned++;
-                    continue;
-                }
-                const worktreeManager = new WorktreeManager(workspace.task.project.repoPath);
-                // 清理残留 worktree（如果还存在）
-                if (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}`);
-                        continue;
-                    }
-                }
-                // Task 已 DONE，branch 不再需要，删除。安全 helper 会跳过 base/main/master/current/missing。
-                const branchDeleteResult = await worktreeManager.deleteBranchIfSafe(workspace.branchName, {
-                    protectedBranches: [workspace.task.project.mainBranch, workspace.baseBranch],
                 });
-                if (branchDeleteResult.status === 'failed') {
-                    console.warn(`[WorkspaceService] cleanup: failed to delete branch ${branchDeleteResult.branchName} for workspace ${workspace.id}: ${branchDeleteResult.reason}`);
-                }
-                else if (branchDeleteResult.status === 'checked_out') {
-                    console.warn(`[WorkspaceService] cleanup: skipped checked-out branch ${branchDeleteResult.branchName} for workspace ${workspace.id}: ${branchDeleteResult.reason}`);
-                }
-                await prisma.workspace.delete({ where: { id: workspace.id } });
-                cleaned++;
             }
             catch (err) {
                 // worktree 删除失败时保留 DB 记录，下次 scan 重试