@jingyi0605/codingns 0.3.0 → 0.3.6

package/dist/server/modules/worktree/worktree-cleanup-service.js

@@ -18,8 +18,8 @@ export class WorktreeCleanupService {
         this.gitCommandRunner = gitCommandRunner;
         this.worktreeSyncService = worktreeSyncService;
     }
-    async cleanup(workspaceId, userId, options = {}) {
-        const meta = await this.resolveCleanupCandidate(workspaceId);
+    async cleanup(workspaceId, userId, options = {}, signal) {
+        const meta = await this.resolveCleanupCandidate(workspaceId, signal);
         const workspace = this.workspaceService.getWorkspaceOrThrow(meta.workspaceId);
         const rootWorkspace = this.workspaceService.getWorkspaceOrThrow(meta.rootWorkspaceId);
         const targetWorkspace = this.workspaceService.getWorkspaceOrThrow(meta.parentWorkspaceId);
@@ -34,7 +34,7 @@ export class WorktreeCleanupService {
                 detail: "当前工作树下面还有子节点，必须先从叶子节点开始清理"
             });
         }
-        const status = await this.gitReadService.getStatus(workspace.id);
+        const status = await this.gitReadService.getStatus(workspace.id, signal);
         if (status.snapshot.isDirty) {
             throw new AppError({
                 statusCode: 409,
@@ -63,7 +63,7 @@ export class WorktreeCleanupService {
             });
         }
         const branchMergedIntoParent = deleteBranchRequested
-            ? await this.isBranchMergedIntoParent(workspace, targetWorkspace)
+            ? await this.isBranchMergedIntoParent(workspace, targetWorkspace, signal)
             : false;
         if (deleteBranchRequested && !branchMergedIntoParent) {
             throw new AppError({
@@ -92,7 +92,8 @@ export class WorktreeCleanupService {
                 allowNonZeroExit: true,
                 timeoutMs: WORKTREE_CLEANUP_TIMEOUT_MS,
                 workspaceId: rootWorkspace.id,
-                operation: "worktree.cleanup.remove"
+                operation: "worktree.cleanup.remove",
+                signal
             });
             if (removeResult.exitCode !== 0) {
                 throw new AppError({
@@ -104,13 +105,15 @@ export class WorktreeCleanupService {
             await this.gitCommandRunner.run(rootWorkspace.path, ["worktree", "prune"], {
                 allowNonZeroExit: true,
                 workspaceId: rootWorkspace.id,
-                operation: "worktree.cleanup.prune"
+                operation: "worktree.cleanup.prune",
+                signal
             });
             if (deleteBranchRequested) {
                 const deleteBranchResult = await this.gitCommandRunner.run(rootWorkspace.path, ["branch", "-d", meta.branchName], {
                     allowNonZeroExit: true,
                     workspaceId: rootWorkspace.id,
-                    operation: "worktree.cleanup.deleteBranch"
+                    operation: "worktree.cleanup.deleteBranch",
+                    signal
                 });
                 if (deleteBranchResult.exitCode === 0) {
                     branchDeleted = true;
@@ -153,31 +156,33 @@ export class WorktreeCleanupService {
             throw error;
         }
     }
-    async isBranchMergedIntoParent(sourceWorkspace, targetWorkspace) {
-        const sourceHeadCommit = await this.resolveCommit(sourceWorkspace.path, sourceWorkspace.id, "HEAD");
-        const targetHeadCommit = await this.resolveCommit(targetWorkspace.path, targetWorkspace.id, "HEAD");
+    async isBranchMergedIntoParent(sourceWorkspace, targetWorkspace, signal) {
+        const sourceHeadCommit = await this.resolveCommit(sourceWorkspace.path, sourceWorkspace.id, "HEAD", signal);
+        const targetHeadCommit = await this.resolveCommit(targetWorkspace.path, targetWorkspace.id, "HEAD", signal);
         if (!sourceHeadCommit || !targetHeadCommit) {
             return false;
         }
-        return this.isAncestor(targetWorkspace.path, targetWorkspace.id, sourceHeadCommit, targetHeadCommit);
+        return this.isAncestor(targetWorkspace.path, targetWorkspace.id, sourceHeadCommit, targetHeadCommit, signal);
     }
-    async resolveCommit(cwd, workspaceId, ref) {
+    async resolveCommit(cwd, workspaceId, ref, signal) {
         const result = await this.gitCommandRunner.run(cwd, ["rev-parse", "--verify", ref], {
             allowNonZeroExit: true,
             workspaceId,
-            operation: "worktree.cleanup.resolveCommit"
+            operation: "worktree.cleanup.resolveCommit",
+            signal
         });
         return result.exitCode === 0 ? result.stdout.trim() || null : null;
     }
-    async isAncestor(cwd, workspaceId, ancestorCommit, descendantCommit) {
+    async isAncestor(cwd, workspaceId, ancestorCommit, descendantCommit, signal) {
         const result = await this.gitCommandRunner.run(cwd, ["merge-base", "--is-ancestor", ancestorCommit, descendantCommit], {
             allowNonZeroExit: true,
             workspaceId,
-            operation: "worktree.cleanup.previewAncestor"
+            operation: "worktree.cleanup.previewAncestor",
+            signal
         });
         return result.exitCode === 0;
     }
-    async resolveCleanupCandidate(workspaceId) {
+    async resolveCleanupCandidate(workspaceId, signal) {
         const normalizedWorkspaceId = workspaceId.trim();
         if (!normalizedWorkspaceId) {
             throw new AppError({
@@ -195,7 +200,7 @@ export class WorktreeCleanupService {
                 detail: "指定工作区不是子工作树"
             });
         }
-        await this.worktreeSyncService.syncRoot(meta.rootWorkspaceId);
+        await this.worktreeSyncService.syncRoot(meta.rootWorkspaceId, signal);
         const nextMeta = this.workspaceWorktreeRepository.findByWorkspaceId(normalizedWorkspaceId);
         if (!nextMeta || nextMeta.lifecycleStatus === "removed") {
             throw new AppError({

package/dist/server/modules/worktree/worktree-cleanup-service.js.map

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

package/dist/server/modules/worktree/worktree-controller.js

@@ -1,3 +1,4 @@
+import { createRequestAbortSignal } from "../../shared/http/request-abort.js";
 import { requireUserId } from "../preferences/common.js";
 export class WorktreeController {
     worktreeManager;
@@ -11,7 +12,7 @@ export class WorktreeController {
         this.worktreeCleanupService = worktreeCleanupService;
     }
     getTree = async (request, reply) => {
-        await this.worktreeSyncService.syncRoot(request.query.rootWorkspaceId?.trim() || "");
+        await this.worktreeSyncService.syncRoot(request.query.rootWorkspaceId?.trim() || "", createRequestAbortSignal(request));
         reply.send({
             items: this.worktreeManager.getTree(request.query.rootWorkspaceId?.trim() || "")
         });
@@ -23,18 +24,18 @@ export class WorktreeController {
             displayName: request.body.displayName?.trim() || undefined,
             baseRef: request.body.baseRef?.trim() || undefined
         };
-        reply.status(201).send(await this.worktreeManager.create(input));
+        reply.status(201).send(await this.worktreeManager.create(input, createRequestAbortSignal(request)));
     };
     getMergePreview = async (request, reply) => {
-        reply.send(await this.worktreeMergeService.preview(request.params.workspaceId?.trim() || ""));
+        reply.send(await this.worktreeMergeService.preview(request.params.workspaceId?.trim() || "", createRequestAbortSignal(request)));
     };
     mergeIntoParent = async (request, reply) => {
-        reply.send(await this.worktreeMergeService.apply(request.params.workspaceId?.trim() || ""));
+        reply.send(await this.worktreeMergeService.apply(request.params.workspaceId?.trim() || "", createRequestAbortSignal(request)));
     };
     cleanup = async (request, reply) => {
         reply.send(await this.worktreeCleanupService.cleanup(request.params.workspaceId?.trim() || "", requireUserId(request), {
             deleteBranch: request.body?.deleteBranch === true
-        }));
+        }, createRequestAbortSignal(request)));
     };
 }
 //# sourceMappingURL=worktree-controller.js.map

package/dist/server/modules/worktree/worktree-controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"worktree-controller.js","sourceRoot":"","sources":["../../../../src/modules/worktree/worktree-controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAyBzD,MAAM,OAAO,kBAAkB;IAEV;IACA;IACA;IACA;IAJnB,YACmB,eAAgC,EAChC,mBAAwC,EACxC,oBAA0C,EAC1C,sBAA8C;QAH9C,oBAAe,GAAf,eAAe,CAAiB;QAChC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,2BAAsB,GAAtB,sBAAsB,CAAwB;IAC9D,CAAC;IAEK,OAAO,GAAG,KAAK,EACtB,OAA2D,EAC3D,KAAmB,EACJ,EAAE;QACjB,MAAM,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAErF,KAAK,CAAC,IAAI,CAAC;YACT,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;SACjF,CAAC,CAAC;IACL,CAAC,CAAC;IAEO,MAAM,GAAG,KAAK,EACrB,OAAqD,EACrD,KAAmB,EACJ,EAAE;QACjB,MAAM,KAAK,GAAwB;YACjC,iBAAiB,EAAE,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE;YAC/D,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE;YACjD,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,SAAS;YAC1D,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,SAAS;SACnD,CAAC;QAEF,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACnE,CAAC,CAAC;IAEO,eAAe,GAAG,KAAK,EAC9B,OAAmD,EACnD,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAChG,CAAC,CAAC;IAEO,eAAe,GAAG,KAAK,EAC9B,OAAmD,EACnD,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC9F,CAAC,CAAC;IAEO,OAAO,GAAG,KAAK,EACtB,OAA8E,EAC9E,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CACR,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CACvC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,EACxC,aAAa,CAAC,OAAO,CAAC,EACtB;YACE,YAAY,EAAE,OAAO,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI;SAClD,CACF,CACF,CAAC;IACJ,CAAC,CAAC;CACH"}
+{"version":3,"file":"worktree-controller.js","sourceRoot":"","sources":["../../../../src/modules/worktree/worktree-controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAyBzD,MAAM,OAAO,kBAAkB;IAEV;IACA;IACA;IACA;IAJnB,YACmB,eAAgC,EAChC,mBAAwC,EACxC,oBAA0C,EAC1C,sBAA8C;QAH9C,oBAAe,GAAf,eAAe,CAAiB;QAChC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,2BAAsB,GAAtB,sBAAsB,CAAwB;IAC9D,CAAC;IAEK,OAAO,GAAG,KAAK,EACtB,OAA2D,EAC3D,KAAmB,EACJ,EAAE;QACjB,MAAM,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CACrC,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,EAC3C,wBAAwB,CAAC,OAAO,CAAC,CAClC,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC;YACT,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;SACjF,CAAC,CAAC;IACL,CAAC,CAAC;IAEO,MAAM,GAAG,KAAK,EACrB,OAAqD,EACrD,KAAmB,EACJ,EAAE;QACjB,MAAM,KAAK,GAAwB;YACjC,iBAAiB,EAAE,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE;YAC/D,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE;YACjD,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,SAAS;YAC1D,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,SAAS;SACnD,CAAC;QAEF,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACtG,CAAC,CAAC;IAEO,eAAe,GAAG,KAAK,EAC9B,OAAmD,EACnD,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CACR,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CACrC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,EACxC,wBAAwB,CAAC,OAAO,CAAC,CAClC,CACF,CAAC;IACJ,CAAC,CAAC;IAEO,eAAe,GAAG,KAAK,EAC9B,OAAmD,EACnD,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CACR,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CACnC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,EACxC,wBAAwB,CAAC,OAAO,CAAC,CAClC,CACF,CAAC;IACJ,CAAC,CAAC;IAEO,OAAO,GAAG,KAAK,EACtB,OAA8E,EAC9E,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CACR,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CACvC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,EACxC,aAAa,CAAC,OAAO,CAAC,EACtB;YACE,YAAY,EAAE,OAAO,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI;SAClD,EACD,wBAAwB,CAAC,OAAO,CAAC,CAClC,CACF,CAAC;IACJ,CAAC,CAAC;CACH"}

package/dist/server/modules/worktree/worktree-manager.d.ts

@@ -24,7 +24,7 @@ export declare class WorktreeManager {
     private readonly gitReadService;
     private readonly gitCommandRunner;
     constructor(workspaceService: WorkspaceService, workspaceWorktreeRepository: WorkspaceWorktreeRepository, gitReadService: GitReadService, gitCommandRunner: GitCommandRunner);
-    create(input: CreateWorktreeInput): Promise<WorktreeCreateResult>;
+    create(input: CreateWorktreeInput, signal?: AbortSignal): Promise<WorktreeCreateResult>;
     getTree(rootWorkspaceId: string): WorktreeNodeView[];
     private ensureBranchNameValid;
     private ensureBranchDoesNotExist;

package/dist/server/modules/worktree/worktree-manager.js

@@ -14,7 +14,7 @@ export class WorktreeManager {
         this.gitReadService = gitReadService;
         this.gitCommandRunner = gitCommandRunner;
     }
-    async create(input) {
+    async create(input, signal) {
         const sourceWorkspaceId = input.sourceWorkspaceId.trim();
         const branchName = normalizeBranchName(input.branchName);
         if (!sourceWorkspaceId) {
@@ -28,7 +28,7 @@ export class WorktreeManager {
         const sourceWorkspace = this.workspaceService.getWorkspaceOrThrow(sourceWorkspaceId);
         const sourceMeta = this.workspaceWorktreeRepository.findByWorkspaceId(sourceWorkspaceId);
         const rootWorkspace = this.workspaceService.getWorkspaceOrThrow(sourceMeta?.rootWorkspaceId ?? sourceWorkspaceId);
-        const sourceStatus = await this.gitReadService.getStatus(sourceWorkspaceId);
+        const sourceStatus = await this.gitReadService.getStatus(sourceWorkspaceId, signal);
         if (sourceStatus.snapshot.isDirty) {
             throw new AppError({
                 statusCode: 409,
@@ -36,10 +36,10 @@ export class WorktreeManager {
                 detail: "来源工作区存在未提交改动，不能直接创建子工作树"
             });
         }
-        await this.ensureBranchNameValid(sourceStatus.snapshot.repoRoot, sourceWorkspaceId, branchName);
-        await this.ensureBranchDoesNotExist(sourceStatus.snapshot.repoRoot, sourceWorkspaceId, branchName);
+        await this.ensureBranchNameValid(sourceStatus.snapshot.repoRoot, sourceWorkspaceId, branchName, signal);
+        await this.ensureBranchDoesNotExist(sourceStatus.snapshot.repoRoot, sourceWorkspaceId, branchName, signal);
         const baseRef = (input.baseRef?.trim() || sourceStatus.snapshot.branch || "HEAD").trim();
-        const baseCommit = await this.resolveBaseCommit(sourceStatus.snapshot.repoRoot, sourceWorkspaceId, baseRef);
+        const baseCommit = await this.resolveBaseCommit(sourceStatus.snapshot.repoRoot, sourceWorkspaceId, baseRef, signal);
         const targetPath = buildTargetPath(rootWorkspace.path, branchName);
         ensureTargetPathSafe(rootWorkspace.path, targetPath);
         if (fs.existsSync(targetPath)) {
@@ -58,11 +58,12 @@ export class WorktreeManager {
             await this.gitCommandRunner.run(sourceStatus.snapshot.repoRoot, ["worktree", "add", "-b", branchName, targetPath, baseRef], {
                 timeoutMs: WORKTREE_CREATE_TIMEOUT_MS,
                 workspaceId: sourceWorkspaceId,
-                operation: "worktree.create"
+                operation: "worktree.create",
+                signal
             });
             worktreeCreated = true;
             createdWorkspace = this.workspaceService.importWorkspace(targetPath, displayName);
-            const headCommit = await this.resolveHeadCommit(targetPath, createdWorkspace.id);
+            const headCommit = await this.resolveHeadCommit(targetPath, createdWorkspace.id, signal);
             const meta = this.workspaceWorktreeRepository.create({
                 workspaceId: createdWorkspace.id,
                 rootWorkspaceId: rootWorkspace.id,
@@ -87,7 +88,7 @@ export class WorktreeManager {
             };
         }
         catch (error) {
-            await this.rollbackCreate(sourceStatus.snapshot.repoRoot, sourceWorkspaceId, branchName, targetPath, createdWorkspace, worktreeCreated);
+            await this.rollbackCreate(sourceStatus.snapshot.repoRoot, sourceWorkspaceId, branchName, targetPath, createdWorkspace, worktreeCreated, signal);
             throw mapCreateWorktreeError(error);
         }
     }
@@ -134,11 +135,12 @@ export class WorktreeManager {
         }
         return roots;
     }
-    async ensureBranchNameValid(repoRoot, workspaceId, branchName) {
+    async ensureBranchNameValid(repoRoot, workspaceId, branchName, signal) {
         const result = await this.gitCommandRunner.run(repoRoot, ["check-ref-format", "--branch", branchName], {
             allowNonZeroExit: true,
             workspaceId,
-            operation: "worktree.create.validateBranch"
+            operation: "worktree.create.validateBranch",
+            signal
         });
         if (result.exitCode === 0) {
             return;
@@ -150,11 +152,12 @@ export class WorktreeManager {
             field: "branchName"
         });
     }
-    async ensureBranchDoesNotExist(repoRoot, workspaceId, branchName) {
+    async ensureBranchDoesNotExist(repoRoot, workspaceId, branchName, signal) {
         const result = await this.gitCommandRunner.run(repoRoot, ["show-ref", "--verify", "--quiet", `refs/heads/${branchName}`], {
             allowNonZeroExit: true,
             workspaceId,
-            operation: "worktree.create.checkBranchExists"
+            operation: "worktree.create.checkBranchExists",
+            signal
         });
         if (result.exitCode !== 0) {
             return;
@@ -165,11 +168,12 @@ export class WorktreeManager {
             detail: "目标分支已经存在，不能重复创建工作树"
         });
     }
-    async resolveBaseCommit(repoRoot, workspaceId, baseRef) {
+    async resolveBaseCommit(repoRoot, workspaceId, baseRef, signal) {
         const result = await this.gitCommandRunner.run(repoRoot, ["rev-parse", "--verify", baseRef], {
             allowNonZeroExit: true,
             workspaceId,
-            operation: "worktree.create.resolveBaseRef"
+            operation: "worktree.create.resolveBaseRef",
+            signal
         });
         const baseCommit = result.stdout.trim();
         if (result.exitCode === 0 && baseCommit) {
@@ -182,14 +186,15 @@ export class WorktreeManager {
             field: "baseRef"
         });
     }
-    async resolveHeadCommit(targetPath, workspaceId) {
+    async resolveHeadCommit(targetPath, workspaceId, signal) {
         const result = await this.gitCommandRunner.run(targetPath, ["rev-parse", "HEAD"], {
             workspaceId,
-            operation: "worktree.create.resolveHeadCommit"
+            operation: "worktree.create.resolveHeadCommit",
+            signal
         });
         return result.stdout.trim();
     }
-    async rollbackCreate(repoRoot, workspaceId, branchName, targetPath, createdWorkspace, worktreeCreated) {
+    async rollbackCreate(repoRoot, workspaceId, branchName, targetPath, createdWorkspace, worktreeCreated, signal) {
         if (createdWorkspace) {
             this.workspaceService.removeWorkspace(createdWorkspace.id);
         }
@@ -198,7 +203,8 @@ export class WorktreeManager {
                 await this.gitCommandRunner.run(repoRoot, ["worktree", "remove", "--force", targetPath], {
                     allowNonZeroExit: true,
                     workspaceId,
-                    operation: "worktree.create.rollbackRemove"
+                    operation: "worktree.create.rollbackRemove",
+                    signal
                 });
             }
             catch {
@@ -212,7 +218,8 @@ export class WorktreeManager {
             await this.gitCommandRunner.run(repoRoot, ["branch", "-D", branchName], {
                 allowNonZeroExit: true,
                 workspaceId,
-                operation: "worktree.create.rollbackDeleteBranch"
+                operation: "worktree.create.rollbackDeleteBranch",
+                signal
             });
         }
         catch {

package/dist/server/modules/worktree/worktree-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"worktree-manager.js","sourceRoot":"","sources":["../../../../src/modules/worktree/worktree-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worktree-manager.js","sourceRoot":"","sources":["../../../../src/modules/worktree/worktree-manager.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/worktree/worktree-merge-service.d.ts

@@ -40,8 +40,8 @@ export declare class WorktreeMergeService {
     private readonly gitCommandRunner;
     private readonly worktreeSyncService;
     constructor(workspaceService: WorkspaceService, workspaceWorktreeRepository: WorkspaceWorktreeRepository, gitReadService: GitReadService, gitCommandRunner: GitCommandRunner, worktreeSyncService: WorktreeSyncService);
-    preview(workspaceId: string): Promise<WorktreeMergePreviewResult>;
-    apply(workspaceId: string): Promise<WorktreeMergeApplyResult>;
+    preview(workspaceId: string, signal?: AbortSignal): Promise<WorktreeMergePreviewResult>;
+    apply(workspaceId: string, signal?: AbortSignal): Promise<WorktreeMergeApplyResult>;
     private resolveActiveWorktreeMeta;
     private normalizePreviewMeta;
     private resolveCommit;

package/dist/server/modules/worktree/worktree-merge-service.js

@@ -14,25 +14,25 @@ export class WorktreeMergeService {
         this.gitCommandRunner = gitCommandRunner;
         this.worktreeSyncService = worktreeSyncService;
     }
-    async preview(workspaceId) {
-        const meta = await this.resolveActiveWorktreeMeta(workspaceId);
+    async preview(workspaceId, signal) {
+        const meta = await this.resolveActiveWorktreeMeta(workspaceId, signal);
         const sourceWorkspace = this.workspaceService.getWorkspaceOrThrow(meta.workspaceId);
         const targetWorkspace = this.workspaceService.getWorkspaceOrThrow(meta.parentWorkspaceId);
         const [sourceStatus, targetStatus] = await Promise.all([
-            this.gitReadService.getStatus(sourceWorkspace.id),
-            this.gitReadService.getStatus(targetWorkspace.id)
+            this.gitReadService.getStatus(sourceWorkspace.id, signal),
+            this.gitReadService.getStatus(targetWorkspace.id, signal)
         ]);
-        const sourceHeadCommit = await this.resolveCommit(sourceWorkspace.path, sourceWorkspace.id, "HEAD");
-        const targetHeadCommit = await this.resolveCommit(targetWorkspace.path, targetWorkspace.id, "HEAD");
+        const sourceHeadCommit = await this.resolveCommit(sourceWorkspace.path, sourceWorkspace.id, "HEAD", signal);
+        const targetHeadCommit = await this.resolveCommit(targetWorkspace.path, targetWorkspace.id, "HEAD", signal);
         const mergeBaseCommit = sourceHeadCommit && targetHeadCommit
-            ? await this.resolveMergeBase(targetWorkspace.path, targetWorkspace.id, targetHeadCommit, sourceHeadCommit)
+            ? await this.resolveMergeBase(targetWorkspace.path, targetWorkspace.id, targetHeadCommit, sourceHeadCommit, signal)
             : null;
         const { ahead, behind } = sourceHeadCommit && targetHeadCommit
-            ? await this.resolveAheadBehind(targetWorkspace.path, targetWorkspace.id, targetHeadCommit, sourceHeadCommit)
+            ? await this.resolveAheadBehind(targetWorkspace.path, targetWorkspace.id, targetHeadCommit, sourceHeadCommit, signal)
             : { ahead: 0, behind: 0 };
         const alreadyMerged = Boolean(sourceHeadCommit)
             && Boolean(targetHeadCommit)
-            && await this.isAncestor(targetWorkspace.path, targetWorkspace.id, sourceHeadCommit ?? "", targetHeadCommit ?? "");
+            && await this.isAncestor(targetWorkspace.path, targetWorkspace.id, sourceHeadCommit ?? "", targetHeadCommit ?? "", signal);
         const childRecords = this.workspaceWorktreeRepository
             .listByParentWorkspaceId(meta.workspaceId)
             .filter((record) => record.lifecycleStatus === "active" || record.lifecycleStatus === "removing");
@@ -71,7 +71,7 @@ export class WorktreeMergeService {
         const conflictPaths = !alreadyMerged
             && ahead > 0
             && blockers.every((item) => item.code !== "SOURCE_DIRTY" && item.code !== "TARGET_DIRTY")
-            ? await this.detectConflictPaths(targetWorkspace.path, targetWorkspace.id, targetHeadCommit, sourceHeadCommit)
+            ? await this.detectConflictPaths(targetWorkspace.path, targetWorkspace.id, targetHeadCommit, sourceHeadCommit, signal)
             : [];
         if (conflictPaths.length > 0) {
             blockers.push({
@@ -98,8 +98,8 @@ export class WorktreeMergeService {
             blockers
         };
     }
-    async apply(workspaceId) {
-        const preview = await this.preview(workspaceId);
+    async apply(workspaceId, signal) {
+        const preview = await this.preview(workspaceId, signal);
         const meta = preview.meta;
         if (!preview.alreadyMerged && preview.blockers.length > 0) {
             const blocker = preview.blockers[0];
@@ -117,13 +117,15 @@ export class WorktreeMergeService {
                 allowNonZeroExit: true,
                 timeoutMs: WORKTREE_MERGE_TIMEOUT_MS,
                 workspaceId: targetWorkspace.id,
-                operation: "worktree.merge.apply"
+                operation: "worktree.merge.apply",
+                signal
             });
             if (mergeResult.exitCode !== 0) {
                 await this.gitCommandRunner.run(targetWorkspace.path, ["merge", "--abort"], {
                     allowNonZeroExit: true,
                     workspaceId: targetWorkspace.id,
-                    operation: "worktree.merge.abort"
+                    operation: "worktree.merge.abort",
+                    signal
                 });
                 throw new AppError({
                     statusCode: 409,
@@ -133,7 +135,7 @@ export class WorktreeMergeService {
             }
             applied = true;
         }
-        const mergeCommit = await this.resolveCommit(targetWorkspace.path, targetWorkspace.id, "HEAD");
+        const mergeCommit = await this.resolveCommit(targetWorkspace.path, targetWorkspace.id, "HEAD", signal);
         const nextMeta = this.workspaceWorktreeRepository.update({
             ...meta,
             lifecycleStatus: "merged",
@@ -169,7 +171,7 @@ export class WorktreeMergeService {
             meta: nextMeta
         };
     }
-    async resolveActiveWorktreeMeta(workspaceId) {
+    async resolveActiveWorktreeMeta(workspaceId, signal) {
         const normalizedWorkspaceId = workspaceId.trim();
         if (!normalizedWorkspaceId) {
             throw new AppError({
@@ -187,7 +189,7 @@ export class WorktreeMergeService {
                 detail: "指定工作区不是子工作树"
             });
         }
-        await this.worktreeSyncService.syncRoot(meta.rootWorkspaceId);
+        await this.worktreeSyncService.syncRoot(meta.rootWorkspaceId, signal);
         const nextMeta = this.workspaceWorktreeRepository.findByWorkspaceId(normalizedWorkspaceId);
         if (!nextMeta || nextMeta.lifecycleStatus === "removed") {
             throw new AppError({
@@ -220,26 +222,29 @@ export class WorktreeMergeService {
             updatedAt: nowIso()
         }) ?? meta);
     }
-    async resolveCommit(cwd, workspaceId, ref) {
+    async resolveCommit(cwd, workspaceId, ref, signal) {
         const result = await this.gitCommandRunner.run(cwd, ["rev-parse", "--verify", ref], {
             allowNonZeroExit: true,
             workspaceId,
-            operation: "worktree.merge.resolveCommit"
+            operation: "worktree.merge.resolveCommit",
+            signal
         });
         return result.exitCode === 0 ? result.stdout.trim() || null : null;
     }
-    async resolveMergeBase(cwd, workspaceId, targetHeadCommit, sourceHeadCommit) {
+    async resolveMergeBase(cwd, workspaceId, targetHeadCommit, sourceHeadCommit, signal) {
         const result = await this.gitCommandRunner.run(cwd, ["merge-base", targetHeadCommit, sourceHeadCommit], {
             allowNonZeroExit: true,
             workspaceId,
-            operation: "worktree.merge.previewBase"
+            operation: "worktree.merge.previewBase",
+            signal
         });
         return result.exitCode === 0 ? result.stdout.trim() || null : null;
     }
-    async resolveAheadBehind(cwd, workspaceId, targetHeadCommit, sourceHeadCommit) {
+    async resolveAheadBehind(cwd, workspaceId, targetHeadCommit, sourceHeadCommit, signal) {
         const result = await this.gitCommandRunner.run(cwd, ["rev-list", "--left-right", "--count", `${targetHeadCommit}...${sourceHeadCommit}`], {
             workspaceId,
-            operation: "worktree.merge.previewAheadBehind"
+            operation: "worktree.merge.previewAheadBehind",
+            signal
         });
         const [behindRaw, aheadRaw] = result.stdout.trim().split(/\s+/);
         return {
@@ -247,22 +252,24 @@ export class WorktreeMergeService {
             behind: Number(behindRaw ?? "0") || 0
         };
     }
-    async isAncestor(cwd, workspaceId, ancestorCommit, descendantCommit) {
+    async isAncestor(cwd, workspaceId, ancestorCommit, descendantCommit, signal) {
         const result = await this.gitCommandRunner.run(cwd, ["merge-base", "--is-ancestor", ancestorCommit, descendantCommit], {
             allowNonZeroExit: true,
             workspaceId,
-            operation: "worktree.merge.previewAncestor"
+            operation: "worktree.merge.previewAncestor",
+            signal
         });
         return result.exitCode === 0;
     }
-    async detectConflictPaths(cwd, workspaceId, targetHeadCommit, sourceHeadCommit) {
+    async detectConflictPaths(cwd, workspaceId, targetHeadCommit, sourceHeadCommit, signal) {
         if (!targetHeadCommit || !sourceHeadCommit) {
             return [];
         }
         const result = await this.gitCommandRunner.run(cwd, ["merge-tree", "--write-tree", targetHeadCommit, sourceHeadCommit], {
             allowNonZeroExit: true,
             workspaceId,
-            operation: "worktree.merge.previewConflicts"
+            operation: "worktree.merge.previewConflicts",
+            signal
         });
         if (result.exitCode === 0) {
             return [];

package/dist/server/modules/worktree/worktree-merge-service.js.map

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

package/dist/server/modules/worktree/worktree-sync-service.d.ts

@@ -17,7 +17,7 @@ export declare class WorktreeSyncService {
     private readonly workspaceWorktreeRepository;
     private readonly gitCommandRunner;
     constructor(workspaceService: WorkspaceService, workspaceWorktreeRepository: WorkspaceWorktreeRepository, gitCommandRunner: GitCommandRunner);
-    syncRoot(rootWorkspaceId: string): Promise<WorktreeSyncResult>;
+    syncRoot(rootWorkspaceId: string, signal?: AbortSignal): Promise<WorktreeSyncResult>;
     private markWorktreeRemoved;
     private updateHeadSnapshot;
 }