agent-tower 0.4.15 → 0.4.16-beta.3

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

@@ -1,7 +1,24 @@
+import { type TeamLockService } from './team-lock.service.js';
 import type { GitOperationStatus } from '@agent-tower/shared';
+export interface CreateWorkspaceOptions {
+    branchName?: string;
+    branchNamePrefix?: string;
+    startPoint?: string | null;
+    parentWorkspaceId?: string | null;
+    ownerMemberId?: string | null;
+    reuseInactive?: boolean;
+}
+export interface MergeWorkspaceOptions {
+    commitMessage?: string;
+    lockOwnerId?: string;
+}
 export declare class WorkspaceService {
+    private readonly lockService;
+    private static readonly mainWorkspaceClaims;
+    private static readonly dedicatedWorkspaceClaims;
     private sessionService;
     private eventBus;
+    constructor(lockService?: TeamLockService);
     private getBaseBranch;
     findById(id: string): Promise<({
         task: {
@@ -51,10 +68,13 @@ export declare class WorkspaceService {
         updatedAt: Date;
         status: string;
         taskId: string;
+        parentWorkspaceId: string | null;
+        ownerMemberId: string | null;
         branchName: string;
         baseBranch: string | null;
         worktreePath: string;
         commitMessage: string | null;
+        previewTarget: string | null;
         hibernatedAt: Date | null;
     }) | null>;
     /**
@@ -81,10 +101,13 @@ export declare class WorkspaceService {
         updatedAt: Date;
         status: string;
         taskId: string;
+        parentWorkspaceId: string | null;
+        ownerMemberId: string | null;
         branchName: string;
         baseBranch: string | null;
         worktreePath: string;
         commitMessage: string | null;
+        previewTarget: string | null;
         hibernatedAt: Date | null;
     })[]>;
     /**
@@ -96,7 +119,64 @@ export declare class WorkspaceService {
      * - 创建后自动将关联 Task 状态改为 IN_PROGRESS
      * - 失败时回滚已创建的数据库记录
      */
-    create(taskId: string, branchName?: string): Promise<{
+    create(taskId: string, branchNameOrOptions?: string | CreateWorkspaceOptions): Promise<{
+        task: {
+            project: {
+                name: string;
+                repoDeletedAt: Date | null;
+                archivedAt: Date | null;
+                repoRemoteUrl: string | null;
+                id: string;
+                description: string | null;
+                repoPath: string;
+                mainBranch: string;
+                copyFiles: string | null;
+                setupScript: string | null;
+                quickCommands: string | null;
+                createdAt: Date;
+                updatedAt: Date;
+            };
+        } & {
+            id: string;
+            description: string | null;
+            createdAt: Date;
+            updatedAt: Date;
+            title: string;
+            status: string;
+            priority: number;
+            position: number;
+            projectId: string;
+        };
+        sessions: {
+            id: string;
+            createdAt: Date;
+            updatedAt: Date;
+            status: string;
+            workspaceId: string;
+            agentType: string;
+            variant: string;
+            providerId: string | null;
+            prompt: string;
+            purpose: string;
+            logSnapshot: string | null;
+            tokenUsage: string | null;
+        }[];
+    } & {
+        id: string;
+        createdAt: Date;
+        updatedAt: Date;
+        status: string;
+        taskId: string;
+        parentWorkspaceId: string | null;
+        ownerMemberId: string | null;
+        branchName: string;
+        baseBranch: string | null;
+        worktreePath: string;
+        commitMessage: string | null;
+        previewTarget: string | null;
+        hibernatedAt: Date | null;
+    }>;
+    getOrCreateMainWorkspace(teamRunId: string): Promise<{
         task: {
             project: {
                 name: string;
@@ -144,12 +224,79 @@ export declare class WorkspaceService {
         updatedAt: Date;
         status: string;
         taskId: string;
+        parentWorkspaceId: string | null;
+        ownerMemberId: string | null;
         branchName: string;
         baseBranch: string | null;
         worktreePath: string;
         commitMessage: string | null;
+        previewTarget: string | null;
         hibernatedAt: Date | null;
     }>;
+    getOrCreateDedicatedWorkspace(teamRunId: string, memberId: string): Promise<{
+        task: {
+            project: {
+                name: string;
+                repoDeletedAt: Date | null;
+                archivedAt: Date | null;
+                repoRemoteUrl: string | null;
+                id: string;
+                description: string | null;
+                repoPath: string;
+                mainBranch: string;
+                copyFiles: string | null;
+                setupScript: string | null;
+                quickCommands: string | null;
+                createdAt: Date;
+                updatedAt: Date;
+            };
+        } & {
+            id: string;
+            description: string | null;
+            createdAt: Date;
+            updatedAt: Date;
+            title: string;
+            status: string;
+            priority: number;
+            position: number;
+            projectId: string;
+        };
+        sessions: {
+            id: string;
+            createdAt: Date;
+            updatedAt: Date;
+            status: string;
+            workspaceId: string;
+            agentType: string;
+            variant: string;
+            providerId: string | null;
+            prompt: string;
+            purpose: string;
+            logSnapshot: string | null;
+            tokenUsage: string | null;
+        }[];
+    } & {
+        id: string;
+        createdAt: Date;
+        updatedAt: Date;
+        status: string;
+        taskId: string;
+        parentWorkspaceId: string | null;
+        ownerMemberId: string | null;
+        branchName: string;
+        baseBranch: string | null;
+        worktreePath: string;
+        commitMessage: string | null;
+        previewTarget: string | null;
+        hibernatedAt: Date | null;
+    }>;
+    private findOrCreateMainWorkspace;
+    private findOrCreateDedicatedWorkspace;
+    private findDedicatedWorkspace;
+    private activateDedicatedWorkspace;
+    private waitForWorkspaceReady;
+    private ensureActiveWorkspaceWorktree;
+    private restoreInactiveWorkspace;
     /**
      * 删除 Workspace
      *
@@ -172,13 +319,14 @@ export declare class WorkspaceService {
      * 中止工作空间当前进行中的 Git 操作
      */
     abortOperation(id: string): Promise<void>;
-    /**
-     * 合并 Workspace 到主分支（squash merge）
-     *
-     * @param commitMessage - 可选的自定义 commit message
-     * @returns squash commit 的 SHA
-     */
     merge(id: string, commitMessage?: string): Promise<string>;
+    merge(id: string, options?: MergeWorkspaceOptions): Promise<string>;
+    private mergeWithLock;
+    private mergeChildIntoParent;
+    private mergeRootWorkspaceToMain;
+    private assertTeamRunFinalMergeAllowed;
+    private assertNoActiveWriteSessions;
+    private withProjectMergeLock;
     /**
      * 归档 Workspace（标记状态为 ABANDONED）
      */
@@ -230,10 +378,13 @@ export declare class WorkspaceService {
         updatedAt: Date;
         status: string;
         taskId: string;
+        parentWorkspaceId: string | null;
+        ownerMemberId: string | null;
         branchName: string;
         baseBranch: string | null;
         worktreePath: string;
         commitMessage: string | null;
+        previewTarget: string | null;
         hibernatedAt: Date | null;
     }>;
     /**
@@ -292,10 +443,13 @@ export declare class WorkspaceService {
         updatedAt: Date;
         status: string;
         taskId: string;
+        parentWorkspaceId: string | null;
+        ownerMemberId: string | null;
         branchName: string;
         baseBranch: string | null;
         worktreePath: 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":"AAWA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAU9D,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,QAAQ,CAA2B;IAE3C,OAAO,CAAC,aAAa;IASf,QAAQ,CAAC,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAOzB;;OAEG;IACG,YAAY,CAAC,MAAM,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;IAejC;;;;;;;;OAQG;IACG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAgGhD;;;;;;;OAOG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM;IA4CjB,OAAO,CAAC,EAAE,EAAE,MAAM;IAsBxB;;OAEG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBvC;;OAEG;IACG,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAiB3D;;OAEG;IACG,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB/C;;;;;OAKG;IACG,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA2DhE;;OAEG;IACG,OAAO,CAAC,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAwCxB;;;OAGG;IACG,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmE1C;;OAEG;IACG,UAAU,CAAC,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAsC3B;;;;;;;;OAQG;IACG,aAAa,CAAC,kBAAkB,SAA+B,GAAG,OAAO,CAAC,MAAM,CAAC;IAuCvF;;OAEG;YACW,iBAAiB;IAoB/B;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IA4ChC;;OAEG;IACH,OAAO,CAAC,YAAY;IAWpB;;OAEG;YACW,cAAc;IAyC5B;;OAEG;IACH,OAAO,CAAC,eAAe;IAmBvB;;OAEG;WACU,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;CAchD"}
+{"version":3,"file":"workspace.service.d.ts","sourceRoot":"","sources":["../../src/services/workspace.service.ts"],"names":[],"mappings":"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"}