@jingyi0605/codingns 0.3.5 → 0.4.0

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;
 }

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

@@ -11,7 +11,7 @@ export class WorktreeSyncService {
         this.workspaceWorktreeRepository = workspaceWorktreeRepository;
         this.gitCommandRunner = gitCommandRunner;
     }
-    async syncRoot(rootWorkspaceId) {
+    async syncRoot(rootWorkspaceId, signal) {
         const requestedWorkspaceId = rootWorkspaceId.trim();
         if (!requestedWorkspaceId) {
             throw new AppError({
@@ -26,7 +26,8 @@ export class WorktreeSyncService {
         const rootWorkspace = this.workspaceService.getWorkspaceOrThrow(resolvedRootWorkspaceId);
         const listResult = await this.gitCommandRunner.run(rootWorkspace.path, ["worktree", "list", "--porcelain"], {
             workspaceId: resolvedRootWorkspaceId,
-            operation: "worktree.sync.list"
+            operation: "worktree.sync.list",
+            signal
         });
         const actualEntryByPath = new Map(parseWorktreeList(listResult.stdout)
             .map((entry) => [normalizeWorktreePath(entry.path), entry]));
@@ -69,7 +70,8 @@ export class WorktreeSyncService {
             await this.gitCommandRunner.run(rootWorkspace.path, ["worktree", "prune"], {
                 allowNonZeroExit: true,
                 workspaceId: resolvedRootWorkspaceId,
-                operation: "worktree.sync.prune"
+                operation: "worktree.sync.prune",
+                signal
             });
         }
         return syncResult;

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

@@ -1 +1 @@
-{"version":3,"file":"worktree-sync-service.js","sourceRoot":"","sources":["../../../../src/modules/worktree/worktree-sync-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AA0BpD,MAAM,OAAO,mBAAmB;IAEX;IACA;IACA;IAHnB,YACmB,gBAAkC,EAClC,2BAAwD,EACxD,gBAAkC;QAFlC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,gCAA2B,GAA3B,2BAA2B,CAA6B;QACxD,qBAAgB,GAAhB,gBAAgB,CAAkB;IAClD,CAAC;IAEJ,KAAK,CAAC,QAAQ,CAAC,eAAuB;QACpC,MAAM,oBAAoB,GAAG,eAAe,CAAC,IAAI,EAAE,CAAC;QAEpD,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,MAAM,IAAI,QAAQ,CAAC;gBACjB,UAAU,EAAE,GAAG;gBACf,SAAS,EAAE,eAAe;gBAC1B,MAAM,EAAE,UAAU;gBAClB,KAAK,EAAE,iBAAiB;aACzB,CAAC,CAAC;QACL,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,2BAA2B,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,CAAC;QAC1F,MAAM,uBAAuB,GAAG,QAAQ,EAAE,eAAe,IAAI,oBAAoB,CAAC;QAClF,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;QACzF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAChD,aAAa,CAAC,IAAI,EAClB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,CAAC,EACnC;YACE,WAAW,EAAE,uBAAuB;YACpC,SAAS,EAAE,oBAAoB;SAChC,CACF,CAAC;QACF,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAC/B,iBAAiB,CAAC,UAAU,CAAC,MAAM,CAAC;aACjC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,CAAU,CAAC,CACvE,CAAC;QACF,MAAM,UAAU,GAAuB;YACrC,eAAe,EAAE,uBAAuB;YACxC,mBAAmB,EAAE,EAAE;YACvB,mBAAmB,EAAE,EAAE;YACvB,MAAM,EAAE,EAAE;SACX,CAAC;QACF,MAAM,gBAAgB,GAAG,IAAI,CAAC,2BAA2B;aACtD,qBAAqB,CAAC,uBAAuB,CAAC;aAC9C,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,KAAK,QAAQ,IAAI,MAAM,CAAC,eAAe,KAAK,UAAU,CAAC,CAAC;QACpG,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,KAAK,MAAM,MAAM,IAAI,gBAAgB,EAAE,CAAC;YACtC,IAAI,aAAqB,CAAC;YAE1B,IAAI,CAAC;gBACH,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;YACrF,CAAC;YAAC,MAAM,CAAC;gBACP,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC;oBACrB,IAAI,EAAE,mBAAmB;oBACzB,WAAW,EAAE,MAAM,CAAC,WAAW;oBAC/B,UAAU,EAAE,MAAM,CAAC,UAAU;iBAC9B,CAAC,CAAC;gBACH,SAAS;YACX,CAAC;YAED,MAAM,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,CAAC;YAE1E,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC9D,WAAW,GAAG,WAAW,IAAI,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;gBACtD,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;gBACjC,UAAU,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBACxD,SAAS;YACX,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAEvD,IAAI,OAAO,EAAE,CAAC;gBACZ,UAAU,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;QAED,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE;gBACzE,gBAAgB,EAAE,IAAI;gBACtB,WAAW,EAAE,uBAAuB;gBACpC,SAAS,EAAE,qBAAqB;aACjC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,mBAAmB,CAAC,MAA+B;QACzD,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC;QAE3B,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC;YACtC,GAAG,MAAM;YACT,eAAe,EAAE,SAAS;YAC1B,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,SAAS;YACxC,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC5D,CAAC;QAAC,MAAM,CAAC;YACP,wBAAwB;QAC1B,CAAC;IACH,CAAC;IAEO,kBAAkB,CAAC,MAA+B,EAAE,KAA0B;QACpF,MAAM,cAAc,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;QAC7F,MAAM,cAAc,GAAG,KAAK,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC;QAE7D,IAAI,cAAc,KAAK,MAAM,CAAC,UAAU,IAAI,cAAc,KAAK,MAAM,CAAC,UAAU,EAAE,CAAC;YACjF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC;YACtC,GAAG,MAAM;YACT,UAAU,EAAE,cAAc;YAC1B,UAAU,EAAE,cAAc;YAC1B,SAAS,EAAE,MAAM,EAAE;SACpB,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,SAAS,iBAAiB,CAAC,KAAa;IACtC,MAAM,KAAK,GAAG,KAAK;SAChB,KAAK,CAAC,OAAO,CAAC;SACd,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACjC,MAAM,OAAO,GAA0B,EAAE,CAAC;IAC1C,IAAI,OAAO,GAA+B,IAAI,CAAC;IAE/C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACxB,CAAC;YAED,OAAO,GAAG,IAAI,CAAC;YACf,SAAS;QACX,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YACjC,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACxB,CAAC;YAED,OAAO,GAAG;gBACR,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE;gBAC3C,UAAU,EAAE,IAAI;gBAChB,SAAS,EAAE,IAAI;gBACf,QAAQ,EAAE,KAAK;aAChB,CAAC;YACF,SAAS;QACX,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,SAAS;QACX,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7B,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC;YAC/D,SAAS;QACX,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC;YAChE,SAAS;QACX,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAChC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxB,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,cAAc,CAAC,SAAiB;IACvC,OAAO,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC;QACxC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC;QACvC,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAa;IAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACrC,MAAM,QAAQ,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAEvF,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,OAAO,QAAQ,CAAC,WAAW,EAAE,CAAC;IAChC,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
+{"version":3,"file":"worktree-sync-service.js","sourceRoot":"","sources":["../../../../src/modules/worktree/worktree-sync-service.ts"],"names":[],"mappings":"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"}

package/dist/server/routes/assistant.js

@@ -3,13 +3,56 @@ export async function registerAssistantCapabilityRoutes(app, assistantCapability
     app.get("/api/assistant/projects", assistantCapabilityController.listProjects);
     app.get("/api/assistant/projects/:projectId", assistantCapabilityController.getProject);
     app.get("/api/assistant/projects/:projectId/sessions", assistantCapabilityController.listProjectSessions);
+    app.post("/api/assistant/projects/:projectId/sessions", assistantCapabilityController.startProjectSession);
+    app.post("/api/assistant/sessions/start", assistantCapabilityController.startSession);
     app.get("/api/assistant/sessions/:sessionId", assistantCapabilityController.getSession);
     app.get("/api/assistant/sessions/:sessionId/messages", assistantCapabilityController.listSessionMessages);
     app.get("/api/assistant/sessions/:sessionId/runtime", assistantCapabilityController.getSessionRuntime);
     app.post("/api/assistant/sessions/:sessionId/messages", assistantCapabilityController.sendSessionMessage);
     app.post("/api/assistant/sessions/:sessionId/forks", assistantCapabilityController.forkSession);
+    app.get("/api/assistant/sandboxes", assistantCapabilityController.listSandboxes);
+    app.post("/api/assistant/sandboxes", assistantCapabilityController.createSandbox);
+    app.post("/api/assistant/sandboxes/:sandboxId/promote", assistantCapabilityController.promoteSandbox);
+    app.post("/api/assistant/sandboxes/:sandboxId/expire", assistantCapabilityController.expireSandbox);
+    app.delete("/api/assistant/sandboxes/:sandboxId", assistantCapabilityController.removeSandbox);
+    app.get("/api/assistant/automations", assistantCapabilityController.listAutomations);
+    app.get("/api/assistant/automations/runs/recent", assistantCapabilityController.listRecentAutomationRuns);
+    app.get("/api/assistant/automations/:automationId", assistantCapabilityController.getAutomation);
+    app.post("/api/assistant/automations", assistantCapabilityController.createAutomation);
+    app.patch("/api/assistant/automations/:automationId", assistantCapabilityController.updateAutomation);
+    app.post("/api/assistant/automations/:automationId/cancel", assistantCapabilityController.cancelAutomation);
+    app.post("/api/assistant/automations/:automationId/skip-wait", assistantCapabilityController.skipAutomationWait);
+    app.get("/api/assistant/automations/:automationId/runs", assistantCapabilityController.listAutomationRuns);
+    app.get("/api/assistant/timers", assistantCapabilityController.listTimers);
+    app.get("/api/assistant/timers/:timerId", assistantCapabilityController.getTimer);
+    app.post("/api/assistant/timers", assistantCapabilityController.createTimer);
+    app.post("/api/assistant/timers/:timerId/cancel", assistantCapabilityController.cancelTimer);
     app.get("/api/assistant/terminals", assistantCapabilityController.listTerminals);
     app.get("/api/assistant/terminals/:terminalId/history", assistantCapabilityController.readTerminalHistory);
     app.post("/api/assistant/terminals/:terminalId/input", assistantCapabilityController.sendTerminalInput);
+    app.delete("/api/assistant/terminals/:terminalId", assistantCapabilityController.closeTerminal);
+    app.get("/api/assistant/workspaces", assistantCapabilityController.listWorkspaces);
+    app.get("/api/assistant/workspaces/browse", assistantCapabilityController.browseWorkspaces);
+    app.post("/api/assistant/workspaces/directories", assistantCapabilityController.createWorkspaceDirectory);
+    app.post("/api/assistant/workspaces/import", assistantCapabilityController.importWorkspace);
+    app.post("/api/assistant/workspaces/clone", assistantCapabilityController.cloneWorkspace);
+    app.put("/api/assistant/workspaces/reorder", assistantCapabilityController.reorderWorkspaces);
+    app.get("/api/assistant/workspaces/:workspaceId/management", assistantCapabilityController.getWorkspaceManagementSummary);
+    app.put("/api/assistant/workspaces/:workspaceId/navigation-state", assistantCapabilityController.updateWorkspaceNavigationState);
+    app.delete("/api/assistant/workspaces/:workspaceId", assistantCapabilityController.removeWorkspace);
+    app.get("/api/assistant/worktrees/tree", assistantCapabilityController.getWorktreeTree);
+    app.post("/api/assistant/worktrees", assistantCapabilityController.createWorktree);
+    app.post("/api/assistant/worktrees/:workspaceId/merge-preview", assistantCapabilityController.getWorktreeMergePreview);
+    app.post("/api/assistant/worktrees/:workspaceId/merge-into-parent", assistantCapabilityController.mergeWorktreeIntoParent);
+    app.post("/api/assistant/worktrees/:workspaceId/cleanup", assistantCapabilityController.cleanupWorktree);
+    app.get("/api/assistant/debug-targets/compatibility-matrix", assistantCapabilityController.getDebugCompatibilityMatrix);
+    app.post("/api/assistant/debug-targets/analyze", assistantCapabilityController.analyzeDebugTarget);
+    app.get("/api/assistant/debug-targets/:targetId/framework-analysis", assistantCapabilityController.getDebugFrameworkAnalysis);
+    app.post("/api/assistant/debug-targets/:targetId/framework-analysis/refresh", assistantCapabilityController.refreshDebugFrameworkAnalysis);
+    app.post("/api/assistant/debug-targets/:targetId/launch-plan", assistantCapabilityController.createDebugLaunchPlan);
+    app.post("/api/assistant/debug-targets/:targetId/run", assistantCapabilityController.runDebugTarget);
+    app.get("/api/assistant/debug-targets/:targetId/runtime-latest", assistantCapabilityController.getLatestDebugRuntime);
+    app.get("/api/assistant/debug-targets/:targetId/runtimes", assistantCapabilityController.listDebugRuntimes);
+    app.get("/api/assistant/debug-runtimes/:runtimeId", assistantCapabilityController.getDebugRuntime);
 }
 //# sourceMappingURL=assistant.js.map

package/dist/server/routes/assistant.js.map

@@ -1 +1 @@
-{"version":3,"file":"assistant.js","sourceRoot":"","sources":["../../../src/routes/assistant.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,KAAK,UAAU,iCAAiC,CACrD,GAAoB,EACpB,6BAA4D;IAE5D,GAAG,CAAC,GAAG,CAAC,6BAA6B,EAAE,6BAA6B,CAAC,gBAAgB,CAAC,CAAC;IACvF,GAAG,CAAC,GAAG,CAAC,yBAAyB,EAAE,6BAA6B,CAAC,YAAY,CAAC,CAAC;IAC/E,GAAG,CAAC,GAAG,CAAC,oCAAoC,EAAE,6BAA6B,CAAC,UAAU,CAAC,CAAC;IACxF,GAAG,CAAC,GAAG,CAAC,6CAA6C,EAAE,6BAA6B,CAAC,mBAAmB,CAAC,CAAC;IAC1G,GAAG,CAAC,GAAG,CAAC,oCAAoC,EAAE,6BAA6B,CAAC,UAAU,CAAC,CAAC;IACxF,GAAG,CAAC,GAAG,CAAC,6CAA6C,EAAE,6BAA6B,CAAC,mBAAmB,CAAC,CAAC;IAC1G,GAAG,CAAC,GAAG,CAAC,4CAA4C,EAAE,6BAA6B,CAAC,iBAAiB,CAAC,CAAC;IACvG,GAAG,CAAC,IAAI,CAAC,6CAA6C,EAAE,6BAA6B,CAAC,kBAAkB,CAAC,CAAC;IAC1G,GAAG,CAAC,IAAI,CAAC,0CAA0C,EAAE,6BAA6B,CAAC,WAAW,CAAC,CAAC;IAChG,GAAG,CAAC,GAAG,CAAC,0BAA0B,EAAE,6BAA6B,CAAC,aAAa,CAAC,CAAC;IACjF,GAAG,CAAC,GAAG,CAAC,8CAA8C,EAAE,6BAA6B,CAAC,mBAAmB,CAAC,CAAC;IAC3G,GAAG,CAAC,IAAI,CAAC,4CAA4C,EAAE,6BAA6B,CAAC,iBAAiB,CAAC,CAAC;AAC1G,CAAC"}
+{"version":3,"file":"assistant.js","sourceRoot":"","sources":["../../../src/routes/assistant.ts"],"names":[],"mappings":"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"}

package/dist/server/routes/butler.js

@@ -5,11 +5,15 @@ export async function registerButlerRoutes(app, butlerController) {
     app.get("/api/butler/control-session", butlerController.getCurrentControlSession);
     app.get("/api/butler/control-sessions", butlerController.listControlSessions);
     app.get("/api/butler/control-sessions/:controlSessionId", butlerController.getControlSession);
+    app.get("/api/butler/control-timers", butlerController.listControlTimers);
+    app.get("/api/butler/control-timers/:timerId", butlerController.getControlTimer);
     app.get("/api/butler/control-session/events", butlerController.listControlSessionEvents);
     app.post("/api/butler/control-session/reset", butlerController.resetControlSession);
     app.post("/api/butler/control-session/start", butlerController.startControlSession);
     app.post("/api/butler/control-session/resume", butlerController.resumeControlSession);
     app.post("/api/butler/control-session/messages", butlerController.sendControlMessage);
+    app.post("/api/butler/control-timers", butlerController.createControlTimer);
+    app.post("/api/butler/control-timers/:timerId/cancel", butlerController.cancelControlTimer);
     app.get("/api/butler/overview", butlerController.getOverview);
     app.get("/api/butler/follow-up-tasks", butlerController.listFollowUpTasks);
     app.get("/api/butler/follow-up-tasks/:taskId", butlerController.getFollowUpTask);
@@ -53,6 +57,7 @@ export async function registerButlerRoutes(app, butlerController) {
     app.get("/api/butler/projects/:projectId/patrol-runs/:runId", butlerController.getPatrolRun);
     app.get("/api/butler/projects/:projectId/verifications", butlerController.listVerificationRuns);
     app.post("/api/butler/projects/:projectId/verifications", butlerController.startVerificationRun);
+    app.post("/api/butler/projects/:projectId/verifications/:verificationId/cancel", butlerController.cancelVerificationRun);
     app.get("/api/butler/projects/:projectId/verifications/:verificationId", butlerController.getVerificationRun);
 }
 //# sourceMappingURL=butler.js.map

package/dist/server/routes/butler.js.map

@@ -1 +1 @@
-{"version":3,"file":"butler.js","sourceRoot":"","sources":["../../../src/routes/butler.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,GAAoB,EACpB,gBAAkC;IAElC,GAAG,CAAC,GAAG,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAC5D,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;IACnE,GAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;IACjE,GAAG,CAAC,GAAG,CAAC,6BAA6B,EAAE,gBAAgB,CAAC,wBAAwB,CAAC,CAAC;IAClF,GAAG,CAAC,GAAG,CAAC,8BAA8B,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;IAC9E,GAAG,CAAC,GAAG,CAAC,gDAAgD,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;IAC9F,GAAG,CAAC,GAAG,CAAC,oCAAoC,EAAE,gBAAgB,CAAC,wBAAwB,CAAC,CAAC;IACzF,GAAG,CAAC,IAAI,CAAC,mCAAmC,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;IACpF,GAAG,CAAC,IAAI,CAAC,mCAAmC,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;IACpF,GAAG,CAAC,IAAI,CAAC,oCAAoC,EAAE,gBAAgB,CAAC,oBAAoB,CAAC,CAAC;IACtF,GAAG,CAAC,IAAI,CAAC,sCAAsC,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;IACtF,GAAG,CAAC,GAAG,CAAC,sBAAsB,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAC9D,GAAG,CAAC,GAAG,CAAC,6BAA6B,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;IAC3E,GAAG,CAAC,GAAG,CAAC,qCAAqC,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;IACjF,GAAG,CAAC,IAAI,CAAC,6BAA6B,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;IAC7E,GAAG,CAAC,IAAI,CAAC,4CAA4C,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;IAC5F,GAAG,CAAC,GAAG,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAC9D,GAAG,CAAC,IAAI,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;IAChE,GAAG,CAAC,KAAK,CAAC,2BAA2B,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;IACzE,GAAG,CAAC,IAAI,CAAC,mCAAmC,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;IACjF,GAAG,CAAC,IAAI,CAAC,yCAAyC,EAAE,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;IAC5F,GAAG,CAAC,MAAM,CAAC,2BAA2B,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;IAC1E,GAAG,CAAC,GAAG,CAAC,oCAAoC,EAAE,gBAAgB,CAAC,wBAAwB,CAAC,CAAC;IACzF,GAAG,CAAC,KAAK,CAAC,oDAAoD,EAAE,gBAAgB,CAAC,yBAAyB,CAAC,CAAC;IAC5G,GAAG,CAAC,GAAG,CAAC,8BAA8B,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;IAC7E,GAAG,CAAC,GAAG,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;IAChE,GAAG,CAAC,GAAG,CAAC,4BAA4B,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;IACzE,GAAG,CAAC,GAAG,CAAC,oCAAoC,EAAE,gBAAgB,CAAC,uBAAuB,CAAC,CAAC;IACxF,GAAG,CAAC,IAAI,CAAC,kCAAkC,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;IACjF,GAAG,CAAC,IAAI,CAAC,oCAAoC,EAAE,gBAAgB,CAAC,0BAA0B,CAAC,CAAC;IAC5F,GAAG,CAAC,IAAI,CAAC,kCAAkC,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;IACjF,GAAG,CAAC,IAAI,CAAC,wCAAwC,EAAE,gBAAgB,CAAC,uBAAuB,CAAC,CAAC;IAC7F,GAAG,CAAC,GAAG,CAAC,sBAAsB,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC/D,GAAG,CAAC,IAAI,CAAC,sBAAsB,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;IACjE,GAAG,CAAC,GAAG,CAAC,iCAAiC,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAC;IACxE,GAAG,CAAC,KAAK,CAAC,iCAAiC,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAC7E,GAAG,CAAC,GAAG,CAAC,yCAAyC,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;IACvF,GAAG,CAAC,GAAG,CAAC,0CAA0C,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;IACzF,GAAG,CAAC,GAAG,CAAC,0CAA0C,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;IAC1F,GAAG,CAAC,IAAI,CAAC,gDAAgD,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;IACjG,GAAG,CAAC,IAAI,CAAC,iDAAiD,EAAE,gBAAgB,CAAC,oBAAoB,CAAC,CAAC;IACnG,GAAG,CAAC,IAAI,CACN,kEAAkE,EAClE,gBAAgB,CAAC,oBAAoB,CACtC,CAAC;IACF,GAAG,CAAC,IAAI,CACN,oEAAoE,EACpE,gBAAgB,CAAC,6BAA6B,CAC/C,CAAC;IACF,GAAG,CAAC,GAAG,CAAC,0CAA0C,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;IAC1F,GAAG,CAAC,IAAI,CAAC,0CAA0C,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;IAC3F,GAAG,CAAC,KAAK,CAAC,oDAAoD,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;IACtG,GAAG,CAAC,GAAG,CAAC,8CAA8C,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;IAC1F,GAAG,CAAC,IAAI,CAAC,8CAA8C,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;IAC5F,GAAG,CAAC,KAAK,CAAC,sDAAsD,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;IACrG,GAAG,CAAC,GAAG,CAAC,6CAA6C,EAAE,gBAAgB,CAAC,cAAc,CAAC,CAAC;IACxF,GAAG,CAAC,IAAI,CAAC,mDAAmD,EAAE,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAC/F,GAAG,CAAC,GAAG,CAAC,oDAAoD,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC7F,GAAG,CAAC,GAAG,CAAC,+CAA+C,EAAE,gBAAgB,CAAC,oBAAoB,CAAC,CAAC;IAChG,GAAG,CAAC,IAAI,CAAC,+CAA+C,EAAE,gBAAgB,CAAC,oBAAoB,CAAC,CAAC;IACjG,GAAG,CAAC,GAAG,CACL,+DAA+D,EAC/D,gBAAgB,CAAC,kBAAkB,CACpC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"butler.js","sourceRoot":"","sources":["../../../src/routes/butler.ts"],"names":[],"mappings":"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"}

package/dist/server/server/create-server.d.ts

@@ -50,11 +50,15 @@ import { WorktreeMergeService } from "../modules/worktree/worktree-merge-service
 import { WorktreeManager } from "../modules/worktree/worktree-manager.js";
 import { WorktreeSyncService } from "../modules/worktree/worktree-sync-service.js";
 import { WorkspaceService } from "../modules/workspace/workspace-service.js";
+import { AssistantAutomationRunRepository } from "../storage/repositories/assistant-automation-run-repository.js";
+import { AssistantSandboxWorkspaceRepository } from "../storage/repositories/assistant-sandbox-workspace-repository.js";
+import { AssistantAutomationTaskRepository } from "../storage/repositories/assistant-automation-task-repository.js";
 import { AuthTokenRepository } from "../storage/repositories/auth-token-repository.js";
 import { AuthLoginAttemptRepository } from "../storage/repositories/auth-login-attempt-repository.js";
 import { AuthUserRepository } from "../storage/repositories/auth-user-repository.js";
 import { AiFallbackEditRepository } from "../storage/repositories/ai-fallback-edit-repository.js";
 import { BootstrapStateRepository } from "../storage/repositories/bootstrap-state-repository.js";
+import { ButlerControlTimerRepository } from "../storage/repositories/butler-control-timer-repository.js";
 import { ButlerControlSessionRepository } from "../storage/repositories/butler-control-session-repository.js";
 import { ButlerControlEventRepository } from "../storage/repositories/butler-control-event-repository.js";
 import { ButlerFollowUpTaskRepository } from "../storage/repositories/butler-follow-up-task-repository.js";
@@ -113,6 +117,9 @@ export declare function createServer(config: HostConfig): {
             authUserRepository: AuthUserRepository;
             authTokenRepository: AuthTokenRepository;
             authLoginAttemptRepository: AuthLoginAttemptRepository;
+            assistantAutomationTaskRepository: AssistantAutomationTaskRepository;
+            assistantAutomationRunRepository: AssistantAutomationRunRepository;
+            assistantSandboxWorkspaceRepository: AssistantSandboxWorkspaceRepository;
             workspaceRepository: WorkspaceRepository;
             workspaceWorktreeRepository: WorkspaceWorktreeRepository;
             workspaceNavigationStateRepository: WorkspaceNavigationStateRepository;
@@ -123,6 +130,7 @@ export declare function createServer(config: HostConfig): {
             portLeaseRepository: PortLeaseRepository;
             runtimeBindingRepository: RuntimeBindingRepository;
             aiFallbackEditRepository: AiFallbackEditRepository;
+            butlerControlTimerRepository: ButlerControlTimerRepository;
             butlerControlSessionRepository: ButlerControlSessionRepository;
             butlerControlEventRepository: ButlerControlEventRepository;
             butlerFollowUpTaskRepository: ButlerFollowUpTaskRepository;