@jingyi0605/codingns 0.2.0 → 0.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (257) hide show
  1. package/README.md +44 -0
  2. package/bin/codingns.mjs +640 -53
  3. package/dist/public/assets/{TerminalPage-BlbQuWi1.js → TerminalPage-BkjqU9NG.js} +19 -19
  4. package/dist/public/assets/index-C6U8-9jg.css +1 -0
  5. package/dist/public/assets/index-CKSumuV2.js +109 -0
  6. package/dist/public/index.html +2 -2
  7. package/dist/server/config/env.d.ts +1 -0
  8. package/dist/server/config/env.js +3 -0
  9. package/dist/server/config/env.js.map +1 -1
  10. package/dist/server/modules/assistant-capability/assistant-capability-controller.d.ts +89 -0
  11. package/dist/server/modules/assistant-capability/assistant-capability-controller.js +138 -0
  12. package/dist/server/modules/assistant-capability/assistant-capability-controller.js.map +1 -0
  13. package/dist/server/modules/assistant-capability/assistant-capability-service.d.ts +115 -0
  14. package/dist/server/modules/assistant-capability/assistant-capability-service.js +241 -0
  15. package/dist/server/modules/assistant-capability/assistant-capability-service.js.map +1 -0
  16. package/dist/server/modules/butler/butler-control-session-service.js +69 -30
  17. package/dist/server/modules/butler/butler-control-session-service.js.map +1 -1
  18. package/dist/server/modules/butler/butler-follow-up-scheduler.d.ts +9 -0
  19. package/dist/server/modules/butler/butler-follow-up-scheduler.js +47 -11
  20. package/dist/server/modules/butler/butler-follow-up-scheduler.js.map +1 -1
  21. package/dist/server/modules/butler/butler-follow-up-service.d.ts +7 -1
  22. package/dist/server/modules/butler/butler-follow-up-service.js +10 -0
  23. package/dist/server/modules/butler/butler-follow-up-service.js.map +1 -1
  24. package/dist/server/modules/butler/butler-session-service.d.ts +2 -1
  25. package/dist/server/modules/butler/butler-session-service.js +10 -1
  26. package/dist/server/modules/butler/butler-session-service.js.map +1 -1
  27. package/dist/server/modules/butler/butler-session-summary-service.d.ts +8 -1
  28. package/dist/server/modules/butler/butler-session-summary-service.js +34 -7
  29. package/dist/server/modules/butler/butler-session-summary-service.js.map +1 -1
  30. package/dist/server/modules/butler/context-aggregator.js +44 -13
  31. package/dist/server/modules/butler/context-aggregator.js.map +1 -1
  32. package/dist/server/modules/butler/patrol-scheduler.d.ts +9 -0
  33. package/dist/server/modules/butler/patrol-scheduler.js +63 -9
  34. package/dist/server/modules/butler/patrol-scheduler.js.map +1 -1
  35. package/dist/server/modules/butler/session-summary-scheduler.d.ts +9 -0
  36. package/dist/server/modules/butler/session-summary-scheduler.js +47 -11
  37. package/dist/server/modules/butler/session-summary-scheduler.js.map +1 -1
  38. package/dist/server/modules/debug-target/debug-runtime-reconciliation-scheduler.d.ts +38 -0
  39. package/dist/server/modules/debug-target/debug-runtime-reconciliation-scheduler.js +99 -0
  40. package/dist/server/modules/debug-target/debug-runtime-reconciliation-scheduler.js.map +1 -0
  41. package/dist/server/modules/debug-target/debug-target-controller.d.ts +70 -0
  42. package/dist/server/modules/debug-target/debug-target-controller.js +113 -0
  43. package/dist/server/modules/debug-target/debug-target-controller.js.map +1 -0
  44. package/dist/server/modules/debug-target/debug-target-service.d.ts +102 -0
  45. package/dist/server/modules/debug-target/debug-target-service.js +1484 -0
  46. package/dist/server/modules/debug-target/debug-target-service.js.map +1 -0
  47. package/dist/server/modules/debug-target/framework-compatibility-matrix.d.ts +4 -0
  48. package/dist/server/modules/debug-target/framework-compatibility-matrix.js +45 -0
  49. package/dist/server/modules/debug-target/framework-compatibility-matrix.js.map +1 -0
  50. package/dist/server/modules/debug-target/launch-adapter-registry.d.ts +25 -0
  51. package/dist/server/modules/debug-target/launch-adapter-registry.js +445 -0
  52. package/dist/server/modules/debug-target/launch-adapter-registry.js.map +1 -0
  53. package/dist/server/modules/file/file-content-service.d.ts +2 -1
  54. package/dist/server/modules/file/file-content-service.js +53 -0
  55. package/dist/server/modules/file/file-content-service.js.map +1 -1
  56. package/dist/server/modules/git/commit-orchestrator.d.ts +4 -1
  57. package/dist/server/modules/git/commit-orchestrator.js +18 -1
  58. package/dist/server/modules/git/commit-orchestrator.js.map +1 -1
  59. package/dist/server/modules/git/git-auth.d.ts +25 -0
  60. package/dist/server/modules/git/git-auth.js +88 -0
  61. package/dist/server/modules/git/git-auth.js.map +1 -0
  62. package/dist/server/modules/git/git-controller.d.ts +6 -0
  63. package/dist/server/modules/git/git-controller.js +5 -1
  64. package/dist/server/modules/git/git-controller.js.map +1 -1
  65. package/dist/server/modules/git/git-read-service.d.ts +2 -1
  66. package/dist/server/modules/git/git-read-service.js +19 -2
  67. package/dist/server/modules/git/git-read-service.js.map +1 -1
  68. package/dist/server/modules/git/git-remote-credential-service.d.ts +9 -0
  69. package/dist/server/modules/git/git-remote-credential-service.js +76 -0
  70. package/dist/server/modules/git/git-remote-credential-service.js.map +1 -0
  71. package/dist/server/modules/git/git-write-service.d.ts +5 -2
  72. package/dist/server/modules/git/git-write-service.js +33 -17
  73. package/dist/server/modules/git/git-write-service.js.map +1 -1
  74. package/dist/server/modules/git/types.d.ts +3 -0
  75. package/dist/server/modules/git/workspace-repo-guard.js +3 -2
  76. package/dist/server/modules/git/workspace-repo-guard.js.map +1 -1
  77. package/dist/server/modules/provider/codex-model-options.d.ts +3 -1
  78. package/dist/server/modules/provider/codex-model-options.js +4 -1
  79. package/dist/server/modules/provider/codex-model-options.js.map +1 -1
  80. package/dist/server/modules/provider/opencode-model-options.d.ts +3 -1
  81. package/dist/server/modules/provider/opencode-model-options.js +5 -1
  82. package/dist/server/modules/provider/opencode-model-options.js.map +1 -1
  83. package/dist/server/modules/provider/provider-discovery-helper-client.d.ts +24 -0
  84. package/dist/server/modules/provider/provider-discovery-helper-client.js +14 -0
  85. package/dist/server/modules/provider/provider-discovery-helper-client.js.map +1 -1
  86. package/dist/server/modules/provider/provider-discovery-helper-process.js +54 -0
  87. package/dist/server/modules/provider/provider-discovery-helper-process.js.map +1 -1
  88. package/dist/server/modules/sessions/session-controller.d.ts +5 -0
  89. package/dist/server/modules/sessions/session-controller.js +16 -0
  90. package/dist/server/modules/sessions/session-controller.js.map +1 -1
  91. package/dist/server/modules/sessions/session-history-service.d.ts +19 -5
  92. package/dist/server/modules/sessions/session-history-service.js +322 -39
  93. package/dist/server/modules/sessions/session-history-service.js.map +1 -1
  94. package/dist/server/modules/tasks/event-loop-monitor.d.ts +21 -0
  95. package/dist/server/modules/tasks/event-loop-monitor.js +64 -0
  96. package/dist/server/modules/tasks/event-loop-monitor.js.map +1 -0
  97. package/dist/server/modules/tasks/observability-controller.d.ts +30 -0
  98. package/dist/server/modules/tasks/observability-controller.js +44 -0
  99. package/dist/server/modules/tasks/observability-controller.js.map +1 -0
  100. package/dist/server/modules/tasks/observability-service.d.ts +32 -0
  101. package/dist/server/modules/tasks/observability-service.js +104 -0
  102. package/dist/server/modules/tasks/observability-service.js.map +1 -0
  103. package/dist/server/modules/tasks/scheduler-metrics.d.ts +41 -0
  104. package/dist/server/modules/tasks/scheduler-metrics.js +92 -0
  105. package/dist/server/modules/tasks/scheduler-metrics.js.map +1 -0
  106. package/dist/server/modules/tasks/task-activity-log.d.ts +39 -0
  107. package/dist/server/modules/tasks/task-activity-log.js +43 -0
  108. package/dist/server/modules/tasks/task-activity-log.js.map +1 -0
  109. package/dist/server/modules/tasks/task-helper-client.d.ts +11 -0
  110. package/dist/server/modules/tasks/task-helper-client.js +132 -0
  111. package/dist/server/modules/tasks/task-helper-client.js.map +1 -0
  112. package/dist/server/modules/tasks/task-helper-process-handlers.d.ts +16 -0
  113. package/dist/server/modules/tasks/task-helper-process-handlers.js +14 -0
  114. package/dist/server/modules/tasks/task-helper-process-handlers.js.map +1 -0
  115. package/dist/server/modules/tasks/task-helper-process.d.ts +1 -0
  116. package/dist/server/modules/tasks/task-helper-process.js +49 -0
  117. package/dist/server/modules/tasks/task-helper-process.js.map +1 -0
  118. package/dist/server/modules/tasks/task-lane-executors.d.ts +2 -0
  119. package/dist/server/modules/tasks/task-lane-executors.js +15 -0
  120. package/dist/server/modules/tasks/task-lane-executors.js.map +1 -0
  121. package/dist/server/modules/tasks/task-manager.d.ts +15 -0
  122. package/dist/server/modules/tasks/task-manager.js +36 -0
  123. package/dist/server/modules/tasks/task-manager.js.map +1 -0
  124. package/dist/server/modules/tasks/task-metrics.d.ts +9 -0
  125. package/dist/server/modules/tasks/task-metrics.js +81 -0
  126. package/dist/server/modules/tasks/task-metrics.js.map +1 -0
  127. package/dist/server/modules/tasks/task-registry.d.ts +7 -0
  128. package/dist/server/modules/tasks/task-registry.js +21 -0
  129. package/dist/server/modules/tasks/task-registry.js.map +1 -0
  130. package/dist/server/modules/tasks/task-scheduler.d.ts +31 -0
  131. package/dist/server/modules/tasks/task-scheduler.js +473 -0
  132. package/dist/server/modules/tasks/task-scheduler.js.map +1 -0
  133. package/dist/server/modules/tasks/task-types.d.ts +106 -0
  134. package/dist/server/modules/tasks/task-types.js +23 -0
  135. package/dist/server/modules/tasks/task-types.js.map +1 -0
  136. package/dist/server/modules/terminal/command-template-service.d.ts +4 -0
  137. package/dist/server/modules/terminal/command-template-service.js +5 -3
  138. package/dist/server/modules/terminal/command-template-service.js.map +1 -1
  139. package/dist/server/modules/terminal/runtime/terminal-log-spooler.d.ts +7 -3
  140. package/dist/server/modules/terminal/runtime/terminal-log-spooler.js +95 -15
  141. package/dist/server/modules/terminal/runtime/terminal-log-spooler.js.map +1 -1
  142. package/dist/server/modules/terminal/runtime/terminal-log-writer-client.d.ts +21 -0
  143. package/dist/server/modules/terminal/runtime/terminal-log-writer-client.js +144 -0
  144. package/dist/server/modules/terminal/runtime/terminal-log-writer-client.js.map +1 -0
  145. package/dist/server/modules/terminal/runtime/terminal-log-writer-process.d.ts +1 -0
  146. package/dist/server/modules/terminal/runtime/terminal-log-writer-process.js +187 -0
  147. package/dist/server/modules/terminal/runtime/terminal-log-writer-process.js.map +1 -0
  148. package/dist/server/modules/terminal/terminal-service.d.ts +12 -0
  149. package/dist/server/modules/terminal/terminal-service.js +34 -17
  150. package/dist/server/modules/terminal/terminal-service.js.map +1 -1
  151. package/dist/server/modules/workbench/workbench-service.d.ts +23 -2
  152. package/dist/server/modules/workbench/workbench-service.js +126 -15
  153. package/dist/server/modules/workbench/workbench-service.js.map +1 -1
  154. package/dist/server/modules/workbench/workspace-panel-snapshot-service.d.ts +5 -1
  155. package/dist/server/modules/workbench/workspace-panel-snapshot-service.js +88 -19
  156. package/dist/server/modules/workbench/workspace-panel-snapshot-service.js.map +1 -1
  157. package/dist/server/modules/workspace/workspace-code-composition.d.ts +2 -0
  158. package/dist/server/modules/workspace/workspace-code-composition.js +154 -0
  159. package/dist/server/modules/workspace/workspace-code-composition.js.map +1 -0
  160. package/dist/server/modules/workspace/workspace-controller.d.ts +14 -0
  161. package/dist/server/modules/workspace/workspace-controller.js +19 -0
  162. package/dist/server/modules/workspace/workspace-controller.js.map +1 -1
  163. package/dist/server/modules/workspace/workspace-service.d.ts +21 -14
  164. package/dist/server/modules/workspace/workspace-service.js +183 -234
  165. package/dist/server/modules/workspace/workspace-service.js.map +1 -1
  166. package/dist/server/modules/worktree/worktree-cleanup-service.d.ts +35 -0
  167. package/dist/server/modules/worktree/worktree-cleanup-service.js +210 -0
  168. package/dist/server/modules/worktree/worktree-cleanup-service.js.map +1 -0
  169. package/dist/server/modules/worktree/worktree-controller.d.ts +44 -0
  170. package/dist/server/modules/worktree/worktree-controller.js +40 -0
  171. package/dist/server/modules/worktree/worktree-controller.js.map +1 -0
  172. package/dist/server/modules/worktree/worktree-manager.d.ts +34 -0
  173. package/dist/server/modules/worktree/worktree-manager.js +292 -0
  174. package/dist/server/modules/worktree/worktree-manager.js.map +1 -0
  175. package/dist/server/modules/worktree/worktree-merge-service.d.ts +52 -0
  176. package/dist/server/modules/worktree/worktree-merge-service.js +293 -0
  177. package/dist/server/modules/worktree/worktree-merge-service.js.map +1 -0
  178. package/dist/server/modules/worktree/worktree-sync-service.d.ts +23 -0
  179. package/dist/server/modules/worktree/worktree-sync-service.js +166 -0
  180. package/dist/server/modules/worktree/worktree-sync-service.js.map +1 -0
  181. package/dist/server/routes/assistant.d.ts +3 -0
  182. package/dist/server/routes/assistant.js +15 -0
  183. package/dist/server/routes/assistant.js.map +1 -0
  184. package/dist/server/routes/debug-targets.d.ts +3 -0
  185. package/dist/server/routes/debug-targets.js +15 -0
  186. package/dist/server/routes/debug-targets.js.map +1 -0
  187. package/dist/server/routes/git.js +1 -0
  188. package/dist/server/routes/git.js.map +1 -1
  189. package/dist/server/routes/observability.d.ts +3 -0
  190. package/dist/server/routes/observability.js +7 -0
  191. package/dist/server/routes/observability.js.map +1 -0
  192. package/dist/server/routes/workspaces.js +2 -0
  193. package/dist/server/routes/workspaces.js.map +1 -1
  194. package/dist/server/routes/worktrees.d.ts +3 -0
  195. package/dist/server/routes/worktrees.js +8 -0
  196. package/dist/server/routes/worktrees.js.map +1 -0
  197. package/dist/server/server/create-server.d.ts +34 -0
  198. package/dist/server/server/create-server.js +100 -10
  199. package/dist/server/server/create-server.js.map +1 -1
  200. package/dist/server/shared/utils/secret-box.d.ts +2 -0
  201. package/dist/server/shared/utils/secret-box.js +29 -0
  202. package/dist/server/shared/utils/secret-box.js.map +1 -0
  203. package/dist/server/shared/utils/terminal-debug-log.js +5 -3
  204. package/dist/server/shared/utils/terminal-debug-log.js.map +1 -1
  205. package/dist/server/storage/repositories/ai-fallback-edit-repository.d.ts +11 -0
  206. package/dist/server/storage/repositories/ai-fallback-edit-repository.js +118 -0
  207. package/dist/server/storage/repositories/ai-fallback-edit-repository.js.map +1 -0
  208. package/dist/server/storage/repositories/debug-runtime-session-repository.d.ts +11 -0
  209. package/dist/server/storage/repositories/debug-runtime-session-repository.js +100 -0
  210. package/dist/server/storage/repositories/debug-runtime-session-repository.js.map +1 -0
  211. package/dist/server/storage/repositories/debug-service-repository.d.ts +9 -0
  212. package/dist/server/storage/repositories/debug-service-repository.js +99 -0
  213. package/dist/server/storage/repositories/debug-service-repository.js.map +1 -0
  214. package/dist/server/storage/repositories/debug-target-repository.d.ts +11 -0
  215. package/dist/server/storage/repositories/debug-target-repository.js +100 -0
  216. package/dist/server/storage/repositories/debug-target-repository.js.map +1 -0
  217. package/dist/server/storage/repositories/framework-analysis-result-repository.d.ts +9 -0
  218. package/dist/server/storage/repositories/framework-analysis-result-repository.js +98 -0
  219. package/dist/server/storage/repositories/framework-analysis-result-repository.js.map +1 -0
  220. package/dist/server/storage/repositories/git-remote-credential-repository.d.ts +9 -0
  221. package/dist/server/storage/repositories/git-remote-credential-repository.js +51 -0
  222. package/dist/server/storage/repositories/git-remote-credential-repository.js.map +1 -0
  223. package/dist/server/storage/repositories/port-lease-repository.d.ts +12 -0
  224. package/dist/server/storage/repositories/port-lease-repository.js +124 -0
  225. package/dist/server/storage/repositories/port-lease-repository.js.map +1 -0
  226. package/dist/server/storage/repositories/runtime-binding-repository.d.ts +10 -0
  227. package/dist/server/storage/repositories/runtime-binding-repository.js +89 -0
  228. package/dist/server/storage/repositories/runtime-binding-repository.js.map +1 -0
  229. package/dist/server/storage/repositories/terminal-command-template-repository.js +77 -4
  230. package/dist/server/storage/repositories/terminal-command-template-repository.js.map +1 -1
  231. package/dist/server/storage/repositories/terminal-instance-repository.js +89 -7
  232. package/dist/server/storage/repositories/terminal-instance-repository.js.map +1 -1
  233. package/dist/server/storage/repositories/workspace-navigation-state-repository.d.ts +9 -0
  234. package/dist/server/storage/repositories/workspace-navigation-state-repository.js +49 -0
  235. package/dist/server/storage/repositories/workspace-navigation-state-repository.js.map +1 -0
  236. package/dist/server/storage/repositories/workspace-repository.d.ts +7 -1
  237. package/dist/server/storage/repositories/workspace-repository.js +32 -8
  238. package/dist/server/storage/repositories/workspace-repository.js.map +1 -1
  239. package/dist/server/storage/repositories/workspace-worktree-repository.d.ts +13 -0
  240. package/dist/server/storage/repositories/workspace-worktree-repository.js +158 -0
  241. package/dist/server/storage/repositories/workspace-worktree-repository.js.map +1 -0
  242. package/dist/server/storage/sqlite/client.js +301 -0
  243. package/dist/server/storage/sqlite/client.js.map +1 -1
  244. package/dist/server/storage/sqlite/schema.sql +238 -0
  245. package/dist/server/types/domain.d.ts +231 -0
  246. package/dist/server/ws/workbench-ws-hub.js +33 -9
  247. package/dist/server/ws/workbench-ws-hub.js.map +1 -1
  248. package/node_modules/@codingns/session-sync-core/dist/providers/claude-code.js +18 -6
  249. package/node_modules/@codingns/session-sync-core/dist/providers/claude-code.js.map +1 -1
  250. package/node_modules/@codingns/session-sync-core/dist/providers/codex.js +14 -2
  251. package/node_modules/@codingns/session-sync-core/dist/providers/codex.js.map +1 -1
  252. package/node_modules/@codingns/session-sync-core/dist/providers/opencode.js +25 -1
  253. package/node_modules/@codingns/session-sync-core/dist/providers/opencode.js.map +1 -1
  254. package/node_modules/@codingns/session-sync-core/dist/types.d.ts +6 -0
  255. package/package.json +1 -1
  256. package/dist/public/assets/index-1VIm8lVL.css +0 -1
  257. package/dist/public/assets/index-Dti93O2S.js +0 -109
@@ -0,0 +1,210 @@
1
+ import { AppError } from "../../shared/errors/app-error.js";
2
+ import { nowIso } from "../../shared/utils/time.js";
3
+ const WORKTREE_CLEANUP_TIMEOUT_MS = 30_000;
4
+ export class WorktreeCleanupService {
5
+ workspaceService;
6
+ workspaceWorktreeRepository;
7
+ sessionIndexRepository;
8
+ terminalInstanceRepository;
9
+ gitReadService;
10
+ gitCommandRunner;
11
+ worktreeSyncService;
12
+ constructor(workspaceService, workspaceWorktreeRepository, sessionIndexRepository, terminalInstanceRepository, gitReadService, gitCommandRunner, worktreeSyncService) {
13
+ this.workspaceService = workspaceService;
14
+ this.workspaceWorktreeRepository = workspaceWorktreeRepository;
15
+ this.sessionIndexRepository = sessionIndexRepository;
16
+ this.terminalInstanceRepository = terminalInstanceRepository;
17
+ this.gitReadService = gitReadService;
18
+ this.gitCommandRunner = gitCommandRunner;
19
+ this.worktreeSyncService = worktreeSyncService;
20
+ }
21
+ async cleanup(workspaceId, userId, options = {}) {
22
+ const meta = await this.resolveCleanupCandidate(workspaceId);
23
+ const workspace = this.workspaceService.getWorkspaceOrThrow(meta.workspaceId);
24
+ const rootWorkspace = this.workspaceService.getWorkspaceOrThrow(meta.rootWorkspaceId);
25
+ const targetWorkspace = this.workspaceService.getWorkspaceOrThrow(meta.parentWorkspaceId);
26
+ const activeChildren = this.workspaceWorktreeRepository
27
+ .listByParentWorkspaceId(meta.workspaceId)
28
+ .filter((record) => record.lifecycleStatus !== "removed");
29
+ const deleteBranchRequested = options.deleteBranch === true;
30
+ if (activeChildren.length > 0) {
31
+ throw new AppError({
32
+ statusCode: 409,
33
+ errorCode: "WORKTREE_CLEANUP_HAS_CHILDREN",
34
+ detail: "当前工作树下面还有子节点,必须先从叶子节点开始清理"
35
+ });
36
+ }
37
+ const status = await this.gitReadService.getStatus(workspace.id);
38
+ if (status.snapshot.isDirty) {
39
+ throw new AppError({
40
+ statusCode: 409,
41
+ errorCode: "WORKTREE_CLEANUP_DIRTY",
42
+ detail: "当前工作树还有未提交改动,不能直接清理"
43
+ });
44
+ }
45
+ const runningSessions = this.sessionIndexRepository
46
+ .listByWorkspace(workspace.id, userId)
47
+ .filter((session) => session.runningState === "starting" || session.runningState === "running");
48
+ if (runningSessions.length > 0) {
49
+ throw new AppError({
50
+ statusCode: 409,
51
+ errorCode: "WORKTREE_CLEANUP_BUSY_SESSION",
52
+ detail: "当前工作树还有运行中的会话,先停掉再清理"
53
+ });
54
+ }
55
+ const runningTerminals = this.terminalInstanceRepository
56
+ .listByWorkspace(workspace.id)
57
+ .filter((terminal) => terminal.status === "creating" || terminal.status === "running");
58
+ if (runningTerminals.length > 0) {
59
+ throw new AppError({
60
+ statusCode: 409,
61
+ errorCode: "WORKTREE_CLEANUP_BUSY_TERMINAL",
62
+ detail: "当前工作树还有活跃终端,先关闭再清理"
63
+ });
64
+ }
65
+ const branchMergedIntoParent = deleteBranchRequested
66
+ ? await this.isBranchMergedIntoParent(workspace, targetWorkspace)
67
+ : false;
68
+ if (deleteBranchRequested && !branchMergedIntoParent) {
69
+ throw new AppError({
70
+ statusCode: 409,
71
+ errorCode: "WORKTREE_CLEANUP_BRANCH_NOT_MERGED",
72
+ detail: "当前分支还没有合入父工作区,不能在清理时同时删除分支"
73
+ });
74
+ }
75
+ const timestamp = nowIso();
76
+ const removingMeta = this.workspaceWorktreeRepository.update({
77
+ ...meta,
78
+ lifecycleStatus: "removing",
79
+ updatedAt: timestamp
80
+ });
81
+ if (!removingMeta) {
82
+ throw new AppError({
83
+ statusCode: 500,
84
+ errorCode: "WORKTREE_META_UPDATE_FAILED",
85
+ detail: "工作树清理前无法写入 removing 状态"
86
+ });
87
+ }
88
+ try {
89
+ let branchDeleted = false;
90
+ let branchDeleteError = null;
91
+ const removeResult = await this.gitCommandRunner.run(rootWorkspace.path, ["worktree", "remove", workspace.path], {
92
+ allowNonZeroExit: true,
93
+ timeoutMs: WORKTREE_CLEANUP_TIMEOUT_MS,
94
+ workspaceId: rootWorkspace.id,
95
+ operation: "worktree.cleanup.remove"
96
+ });
97
+ if (removeResult.exitCode !== 0) {
98
+ throw new AppError({
99
+ statusCode: 409,
100
+ errorCode: "WORKTREE_CLEANUP_REMOVE_FAILED",
101
+ detail: removeResult.stderr.trim() || removeResult.stdout.trim() || "工作树清理失败"
102
+ });
103
+ }
104
+ await this.gitCommandRunner.run(rootWorkspace.path, ["worktree", "prune"], {
105
+ allowNonZeroExit: true,
106
+ workspaceId: rootWorkspace.id,
107
+ operation: "worktree.cleanup.prune"
108
+ });
109
+ if (deleteBranchRequested) {
110
+ const deleteBranchResult = await this.gitCommandRunner.run(rootWorkspace.path, ["branch", "-d", meta.branchName], {
111
+ allowNonZeroExit: true,
112
+ workspaceId: rootWorkspace.id,
113
+ operation: "worktree.cleanup.deleteBranch"
114
+ });
115
+ if (deleteBranchResult.exitCode === 0) {
116
+ branchDeleted = true;
117
+ }
118
+ else {
119
+ branchDeleteError =
120
+ deleteBranchResult.stderr.trim() || deleteBranchResult.stdout.trim() || "分支删除失败";
121
+ }
122
+ }
123
+ const removedMeta = this.workspaceWorktreeRepository.update({
124
+ ...removingMeta,
125
+ lifecycleStatus: "removed",
126
+ removedAt: timestamp,
127
+ updatedAt: timestamp
128
+ });
129
+ if (!removedMeta) {
130
+ throw new AppError({
131
+ statusCode: 500,
132
+ errorCode: "WORKTREE_META_UPDATE_FAILED",
133
+ detail: "工作树目录已经删除,但 removed 状态写入失败"
134
+ });
135
+ }
136
+ this.workspaceService.removeWorkspace(workspace.id);
137
+ return {
138
+ workspaceId: workspace.id,
139
+ removed: true,
140
+ meta: removedMeta,
141
+ branchDeleteRequested: deleteBranchRequested,
142
+ branchDeleted,
143
+ deletedBranchName: branchDeleted ? meta.branchName : null,
144
+ branchDeleteError
145
+ };
146
+ }
147
+ catch (error) {
148
+ this.workspaceWorktreeRepository.update({
149
+ ...meta,
150
+ lifecycleStatus: meta.lifecycleStatus,
151
+ updatedAt: nowIso()
152
+ });
153
+ throw error;
154
+ }
155
+ }
156
+ async isBranchMergedIntoParent(sourceWorkspace, targetWorkspace) {
157
+ const sourceHeadCommit = await this.resolveCommit(sourceWorkspace.path, sourceWorkspace.id, "HEAD");
158
+ const targetHeadCommit = await this.resolveCommit(targetWorkspace.path, targetWorkspace.id, "HEAD");
159
+ if (!sourceHeadCommit || !targetHeadCommit) {
160
+ return false;
161
+ }
162
+ return this.isAncestor(targetWorkspace.path, targetWorkspace.id, sourceHeadCommit, targetHeadCommit);
163
+ }
164
+ async resolveCommit(cwd, workspaceId, ref) {
165
+ const result = await this.gitCommandRunner.run(cwd, ["rev-parse", "--verify", ref], {
166
+ allowNonZeroExit: true,
167
+ workspaceId,
168
+ operation: "worktree.cleanup.resolveCommit"
169
+ });
170
+ return result.exitCode === 0 ? result.stdout.trim() || null : null;
171
+ }
172
+ async isAncestor(cwd, workspaceId, ancestorCommit, descendantCommit) {
173
+ const result = await this.gitCommandRunner.run(cwd, ["merge-base", "--is-ancestor", ancestorCommit, descendantCommit], {
174
+ allowNonZeroExit: true,
175
+ workspaceId,
176
+ operation: "worktree.cleanup.previewAncestor"
177
+ });
178
+ return result.exitCode === 0;
179
+ }
180
+ async resolveCleanupCandidate(workspaceId) {
181
+ const normalizedWorkspaceId = workspaceId.trim();
182
+ if (!normalizedWorkspaceId) {
183
+ throw new AppError({
184
+ statusCode: 400,
185
+ errorCode: "INVALID_INPUT",
186
+ detail: "工作树 workspaceId 不能为空",
187
+ field: "workspaceId"
188
+ });
189
+ }
190
+ const meta = this.workspaceWorktreeRepository.findByWorkspaceId(normalizedWorkspaceId);
191
+ if (!meta) {
192
+ throw new AppError({
193
+ statusCode: 404,
194
+ errorCode: "WORKTREE_NOT_FOUND",
195
+ detail: "指定工作区不是子工作树"
196
+ });
197
+ }
198
+ await this.worktreeSyncService.syncRoot(meta.rootWorkspaceId);
199
+ const nextMeta = this.workspaceWorktreeRepository.findByWorkspaceId(normalizedWorkspaceId);
200
+ if (!nextMeta || nextMeta.lifecycleStatus === "removed") {
201
+ throw new AppError({
202
+ statusCode: 404,
203
+ errorCode: "WORKTREE_NOT_FOUND",
204
+ detail: "指定工作树已经不存在"
205
+ });
206
+ }
207
+ return nextMeta;
208
+ }
209
+ }
210
+ //# sourceMappingURL=worktree-cleanup-service.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"worktree-cleanup-service.js","sourceRoot":"","sources":["../../../../src/modules/worktree/worktree-cleanup-service.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,44 @@
1
+ import type { FastifyReply, FastifyRequest } from "fastify";
2
+ import type { WorktreeCleanupService } from "./worktree-cleanup-service.js";
3
+ import type { WorktreeManager } from "./worktree-manager.js";
4
+ import type { WorktreeMergeService } from "./worktree-merge-service.js";
5
+ import type { WorktreeSyncService } from "./worktree-sync-service.js";
6
+ interface CreateWorktreeBody {
7
+ sourceWorkspaceId?: string;
8
+ branchName?: string;
9
+ displayName?: string;
10
+ baseRef?: string;
11
+ }
12
+ interface WorktreeTreeQuery {
13
+ rootWorkspaceId?: string;
14
+ }
15
+ interface WorktreeParams {
16
+ workspaceId?: string;
17
+ }
18
+ interface WorktreeCleanupBody {
19
+ deleteBranch?: boolean;
20
+ }
21
+ export declare class WorktreeController {
22
+ private readonly worktreeManager;
23
+ private readonly worktreeSyncService;
24
+ private readonly worktreeMergeService;
25
+ private readonly worktreeCleanupService;
26
+ constructor(worktreeManager: WorktreeManager, worktreeSyncService: WorktreeSyncService, worktreeMergeService: WorktreeMergeService, worktreeCleanupService: WorktreeCleanupService);
27
+ readonly getTree: (request: FastifyRequest<{
28
+ Querystring: WorktreeTreeQuery;
29
+ }>, reply: FastifyReply) => Promise<void>;
30
+ readonly create: (request: FastifyRequest<{
31
+ Body: CreateWorktreeBody;
32
+ }>, reply: FastifyReply) => Promise<void>;
33
+ readonly getMergePreview: (request: FastifyRequest<{
34
+ Params: WorktreeParams;
35
+ }>, reply: FastifyReply) => Promise<void>;
36
+ readonly mergeIntoParent: (request: FastifyRequest<{
37
+ Params: WorktreeParams;
38
+ }>, reply: FastifyReply) => Promise<void>;
39
+ readonly cleanup: (request: FastifyRequest<{
40
+ Params: WorktreeParams;
41
+ Body: WorktreeCleanupBody;
42
+ }>, reply: FastifyReply) => Promise<void>;
43
+ }
44
+ export {};
@@ -0,0 +1,40 @@
1
+ import { requireUserId } from "../preferences/common.js";
2
+ export class WorktreeController {
3
+ worktreeManager;
4
+ worktreeSyncService;
5
+ worktreeMergeService;
6
+ worktreeCleanupService;
7
+ constructor(worktreeManager, worktreeSyncService, worktreeMergeService, worktreeCleanupService) {
8
+ this.worktreeManager = worktreeManager;
9
+ this.worktreeSyncService = worktreeSyncService;
10
+ this.worktreeMergeService = worktreeMergeService;
11
+ this.worktreeCleanupService = worktreeCleanupService;
12
+ }
13
+ getTree = async (request, reply) => {
14
+ await this.worktreeSyncService.syncRoot(request.query.rootWorkspaceId?.trim() || "");
15
+ reply.send({
16
+ items: this.worktreeManager.getTree(request.query.rootWorkspaceId?.trim() || "")
17
+ });
18
+ };
19
+ create = async (request, reply) => {
20
+ const input = {
21
+ sourceWorkspaceId: request.body.sourceWorkspaceId?.trim() || "",
22
+ branchName: request.body.branchName?.trim() || "",
23
+ displayName: request.body.displayName?.trim() || undefined,
24
+ baseRef: request.body.baseRef?.trim() || undefined
25
+ };
26
+ reply.status(201).send(await this.worktreeManager.create(input));
27
+ };
28
+ getMergePreview = async (request, reply) => {
29
+ reply.send(await this.worktreeMergeService.preview(request.params.workspaceId?.trim() || ""));
30
+ };
31
+ mergeIntoParent = async (request, reply) => {
32
+ reply.send(await this.worktreeMergeService.apply(request.params.workspaceId?.trim() || ""));
33
+ };
34
+ cleanup = async (request, reply) => {
35
+ reply.send(await this.worktreeCleanupService.cleanup(request.params.workspaceId?.trim() || "", requireUserId(request), {
36
+ deleteBranch: request.body?.deleteBranch === true
37
+ }));
38
+ };
39
+ }
40
+ //# sourceMappingURL=worktree-controller.js.map
@@ -0,0 +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"}
@@ -0,0 +1,34 @@
1
+ import type { Workspace, WorkspaceWorktreeRecord } from "../../types/domain.js";
2
+ import type { GitCommandRunner } from "../git/git-command-runner.js";
3
+ import type { GitReadService } from "../git/git-read-service.js";
4
+ import type { WorkspaceService } from "../workspace/workspace-service.js";
5
+ import type { WorkspaceWorktreeRepository } from "../../storage/repositories/workspace-worktree-repository.js";
6
+ export interface CreateWorktreeInput {
7
+ sourceWorkspaceId: string;
8
+ branchName: string;
9
+ displayName?: string;
10
+ baseRef?: string;
11
+ }
12
+ export interface WorktreeCreateResult {
13
+ workspace: Workspace;
14
+ meta: WorkspaceWorktreeRecord;
15
+ }
16
+ export interface WorktreeNodeView {
17
+ workspace: Workspace;
18
+ meta: WorkspaceWorktreeRecord;
19
+ children: WorktreeNodeView[];
20
+ }
21
+ export declare class WorktreeManager {
22
+ private readonly workspaceService;
23
+ private readonly workspaceWorktreeRepository;
24
+ private readonly gitReadService;
25
+ private readonly gitCommandRunner;
26
+ constructor(workspaceService: WorkspaceService, workspaceWorktreeRepository: WorkspaceWorktreeRepository, gitReadService: GitReadService, gitCommandRunner: GitCommandRunner);
27
+ create(input: CreateWorktreeInput): Promise<WorktreeCreateResult>;
28
+ getTree(rootWorkspaceId: string): WorktreeNodeView[];
29
+ private ensureBranchNameValid;
30
+ private ensureBranchDoesNotExist;
31
+ private resolveBaseCommit;
32
+ private resolveHeadCommit;
33
+ private rollbackCreate;
34
+ }
@@ -0,0 +1,292 @@
1
+ import fs from "node:fs";
2
+ import path from "node:path";
3
+ import { AppError } from "../../shared/errors/app-error.js";
4
+ import { nowIso } from "../../shared/utils/time.js";
5
+ const WORKTREE_CREATE_TIMEOUT_MS = 30_000;
6
+ export class WorktreeManager {
7
+ workspaceService;
8
+ workspaceWorktreeRepository;
9
+ gitReadService;
10
+ gitCommandRunner;
11
+ constructor(workspaceService, workspaceWorktreeRepository, gitReadService, gitCommandRunner) {
12
+ this.workspaceService = workspaceService;
13
+ this.workspaceWorktreeRepository = workspaceWorktreeRepository;
14
+ this.gitReadService = gitReadService;
15
+ this.gitCommandRunner = gitCommandRunner;
16
+ }
17
+ async create(input) {
18
+ const sourceWorkspaceId = input.sourceWorkspaceId.trim();
19
+ const branchName = normalizeBranchName(input.branchName);
20
+ if (!sourceWorkspaceId) {
21
+ throw new AppError({
22
+ statusCode: 400,
23
+ errorCode: "INVALID_INPUT",
24
+ detail: "来源工作区不能为空",
25
+ field: "sourceWorkspaceId"
26
+ });
27
+ }
28
+ const sourceWorkspace = this.workspaceService.getWorkspaceOrThrow(sourceWorkspaceId);
29
+ const sourceMeta = this.workspaceWorktreeRepository.findByWorkspaceId(sourceWorkspaceId);
30
+ const rootWorkspace = this.workspaceService.getWorkspaceOrThrow(sourceMeta?.rootWorkspaceId ?? sourceWorkspaceId);
31
+ const sourceStatus = await this.gitReadService.getStatus(sourceWorkspaceId);
32
+ if (sourceStatus.snapshot.isDirty) {
33
+ throw new AppError({
34
+ statusCode: 409,
35
+ errorCode: "WORKTREE_SOURCE_DIRTY",
36
+ detail: "来源工作区存在未提交改动,不能直接创建子工作树"
37
+ });
38
+ }
39
+ await this.ensureBranchNameValid(sourceStatus.snapshot.repoRoot, sourceWorkspaceId, branchName);
40
+ await this.ensureBranchDoesNotExist(sourceStatus.snapshot.repoRoot, sourceWorkspaceId, branchName);
41
+ const baseRef = (input.baseRef?.trim() || sourceStatus.snapshot.branch || "HEAD").trim();
42
+ const baseCommit = await this.resolveBaseCommit(sourceStatus.snapshot.repoRoot, sourceWorkspaceId, baseRef);
43
+ const targetPath = buildTargetPath(rootWorkspace.path, branchName);
44
+ ensureTargetPathSafe(rootWorkspace.path, targetPath);
45
+ if (fs.existsSync(targetPath)) {
46
+ throw new AppError({
47
+ statusCode: 409,
48
+ errorCode: "WORKTREE_PATH_CONFLICT",
49
+ detail: "目标工作树目录已经存在,不能直接覆盖"
50
+ });
51
+ }
52
+ const timestamp = nowIso();
53
+ const displayName = normalizeDisplayName(input.displayName, branchName);
54
+ let createdWorkspace = null;
55
+ let worktreeCreated = false;
56
+ try {
57
+ fs.mkdirSync(path.dirname(targetPath), { recursive: true });
58
+ await this.gitCommandRunner.run(sourceStatus.snapshot.repoRoot, ["worktree", "add", "-b", branchName, targetPath, baseRef], {
59
+ timeoutMs: WORKTREE_CREATE_TIMEOUT_MS,
60
+ workspaceId: sourceWorkspaceId,
61
+ operation: "worktree.create"
62
+ });
63
+ worktreeCreated = true;
64
+ createdWorkspace = this.workspaceService.importWorkspace(targetPath, displayName);
65
+ const headCommit = await this.resolveHeadCommit(targetPath, createdWorkspace.id);
66
+ const meta = this.workspaceWorktreeRepository.create({
67
+ workspaceId: createdWorkspace.id,
68
+ rootWorkspaceId: rootWorkspace.id,
69
+ parentWorkspaceId: sourceWorkspace.id,
70
+ sourceWorkspaceId: sourceWorkspace.id,
71
+ mergeTargetWorkspaceId: sourceWorkspace.id,
72
+ branchName,
73
+ baseRef,
74
+ baseCommit,
75
+ headCommit,
76
+ displayName,
77
+ depth: sourceMeta ? sourceMeta.depth + 1 : 1,
78
+ lifecycleStatus: "active",
79
+ mergedAt: null,
80
+ removedAt: null,
81
+ createdAt: timestamp,
82
+ updatedAt: timestamp
83
+ });
84
+ return {
85
+ workspace: createdWorkspace,
86
+ meta
87
+ };
88
+ }
89
+ catch (error) {
90
+ await this.rollbackCreate(sourceStatus.snapshot.repoRoot, sourceWorkspaceId, branchName, targetPath, createdWorkspace, worktreeCreated);
91
+ throw mapCreateWorktreeError(error);
92
+ }
93
+ }
94
+ getTree(rootWorkspaceId) {
95
+ const requestedWorkspaceId = rootWorkspaceId.trim();
96
+ if (!requestedWorkspaceId) {
97
+ throw new AppError({
98
+ statusCode: 400,
99
+ errorCode: "INVALID_INPUT",
100
+ detail: "根工作区不能为空",
101
+ field: "rootWorkspaceId"
102
+ });
103
+ }
104
+ const rootMeta = this.workspaceWorktreeRepository.findByWorkspaceId(requestedWorkspaceId);
105
+ const resolvedRootWorkspaceId = rootMeta?.rootWorkspaceId ?? requestedWorkspaceId;
106
+ this.workspaceService.getWorkspaceOrThrow(resolvedRootWorkspaceId);
107
+ const records = this.workspaceWorktreeRepository
108
+ .listByRootWorkspaceId(resolvedRootWorkspaceId)
109
+ .filter((record) => record.lifecycleStatus !== "removed");
110
+ const nodeByWorkspaceId = new Map();
111
+ const roots = [];
112
+ for (const record of records) {
113
+ nodeByWorkspaceId.set(record.workspaceId, {
114
+ workspace: this.workspaceService.getWorkspaceOrThrow(record.workspaceId),
115
+ meta: record,
116
+ children: []
117
+ });
118
+ }
119
+ for (const record of records) {
120
+ const currentNode = nodeByWorkspaceId.get(record.workspaceId);
121
+ if (!currentNode) {
122
+ continue;
123
+ }
124
+ if (record.parentWorkspaceId === resolvedRootWorkspaceId) {
125
+ roots.push(currentNode);
126
+ continue;
127
+ }
128
+ const parentNode = nodeByWorkspaceId.get(record.parentWorkspaceId);
129
+ if (parentNode) {
130
+ parentNode.children.push(currentNode);
131
+ continue;
132
+ }
133
+ roots.push(currentNode);
134
+ }
135
+ return roots;
136
+ }
137
+ async ensureBranchNameValid(repoRoot, workspaceId, branchName) {
138
+ const result = await this.gitCommandRunner.run(repoRoot, ["check-ref-format", "--branch", branchName], {
139
+ allowNonZeroExit: true,
140
+ workspaceId,
141
+ operation: "worktree.create.validateBranch"
142
+ });
143
+ if (result.exitCode === 0) {
144
+ return;
145
+ }
146
+ throw new AppError({
147
+ statusCode: 400,
148
+ errorCode: "INVALID_INPUT",
149
+ detail: "工作树分支名不合法",
150
+ field: "branchName"
151
+ });
152
+ }
153
+ async ensureBranchDoesNotExist(repoRoot, workspaceId, branchName) {
154
+ const result = await this.gitCommandRunner.run(repoRoot, ["show-ref", "--verify", "--quiet", `refs/heads/${branchName}`], {
155
+ allowNonZeroExit: true,
156
+ workspaceId,
157
+ operation: "worktree.create.checkBranchExists"
158
+ });
159
+ if (result.exitCode !== 0) {
160
+ return;
161
+ }
162
+ throw new AppError({
163
+ statusCode: 409,
164
+ errorCode: "WORKTREE_BRANCH_EXISTS",
165
+ detail: "目标分支已经存在,不能重复创建工作树"
166
+ });
167
+ }
168
+ async resolveBaseCommit(repoRoot, workspaceId, baseRef) {
169
+ const result = await this.gitCommandRunner.run(repoRoot, ["rev-parse", "--verify", baseRef], {
170
+ allowNonZeroExit: true,
171
+ workspaceId,
172
+ operation: "worktree.create.resolveBaseRef"
173
+ });
174
+ const baseCommit = result.stdout.trim();
175
+ if (result.exitCode === 0 && baseCommit) {
176
+ return baseCommit;
177
+ }
178
+ throw new AppError({
179
+ statusCode: 404,
180
+ errorCode: "WORKTREE_BASE_REF_NOT_FOUND",
181
+ detail: "指定的 baseRef 不存在,不能创建工作树",
182
+ field: "baseRef"
183
+ });
184
+ }
185
+ async resolveHeadCommit(targetPath, workspaceId) {
186
+ const result = await this.gitCommandRunner.run(targetPath, ["rev-parse", "HEAD"], {
187
+ workspaceId,
188
+ operation: "worktree.create.resolveHeadCommit"
189
+ });
190
+ return result.stdout.trim();
191
+ }
192
+ async rollbackCreate(repoRoot, workspaceId, branchName, targetPath, createdWorkspace, worktreeCreated) {
193
+ if (createdWorkspace) {
194
+ this.workspaceService.removeWorkspace(createdWorkspace.id);
195
+ }
196
+ if (worktreeCreated || fs.existsSync(targetPath)) {
197
+ try {
198
+ await this.gitCommandRunner.run(repoRoot, ["worktree", "remove", "--force", targetPath], {
199
+ allowNonZeroExit: true,
200
+ workspaceId,
201
+ operation: "worktree.create.rollbackRemove"
202
+ });
203
+ }
204
+ catch {
205
+ // 回滚阶段不再向外抛,优先保住原始错误。
206
+ }
207
+ if (fs.existsSync(targetPath)) {
208
+ fs.rmSync(targetPath, { recursive: true, force: true });
209
+ }
210
+ }
211
+ try {
212
+ await this.gitCommandRunner.run(repoRoot, ["branch", "-D", branchName], {
213
+ allowNonZeroExit: true,
214
+ workspaceId,
215
+ operation: "worktree.create.rollbackDeleteBranch"
216
+ });
217
+ }
218
+ catch {
219
+ // 分支删除失败只保留残留,不能覆盖原始错误。
220
+ }
221
+ }
222
+ }
223
+ function normalizeBranchName(branchName) {
224
+ const normalized = branchName.trim();
225
+ if (!normalized) {
226
+ throw new AppError({
227
+ statusCode: 400,
228
+ errorCode: "INVALID_INPUT",
229
+ detail: "工作树分支名不能为空",
230
+ field: "branchName"
231
+ });
232
+ }
233
+ return normalized;
234
+ }
235
+ function normalizeDisplayName(displayName, branchName) {
236
+ return displayName?.trim() || branchName;
237
+ }
238
+ function buildTargetPath(rootWorkspacePath, branchName) {
239
+ const rootPath = path.resolve(rootWorkspacePath);
240
+ const rootParentPath = path.dirname(rootPath);
241
+ const rootName = path.basename(rootPath);
242
+ return path.join(rootParentPath, `${rootName}.worktrees`, sanitizePathSegment(branchName));
243
+ }
244
+ function ensureTargetPathSafe(rootWorkspacePath, targetPath) {
245
+ const normalizedRootPath = path.resolve(rootWorkspacePath);
246
+ const normalizedTargetPath = path.resolve(targetPath);
247
+ const relative = path.relative(normalizedRootPath, normalizedTargetPath);
248
+ if (relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative))) {
249
+ throw new AppError({
250
+ statusCode: 400,
251
+ errorCode: "WORKTREE_PATH_INVALID",
252
+ detail: "工作树目录不能落在根工作区目录内部"
253
+ });
254
+ }
255
+ }
256
+ function sanitizePathSegment(input) {
257
+ const sanitized = input
258
+ .trim()
259
+ .replace(/[\\/]+/g, "-")
260
+ .replace(/[^a-zA-Z0-9._-]+/g, "-")
261
+ .replace(/-+/g, "-")
262
+ .replace(/^-|-$/g, "");
263
+ return sanitized || "worktree";
264
+ }
265
+ function mapCreateWorktreeError(error) {
266
+ if (!(error instanceof AppError)) {
267
+ return error instanceof Error ? error : new Error(String(error));
268
+ }
269
+ if (error.errorCode !== "GIT_COMMAND_FAILED") {
270
+ return error;
271
+ }
272
+ if (error.message.includes("already exists")) {
273
+ return new AppError({
274
+ statusCode: 409,
275
+ errorCode: "WORKTREE_BRANCH_EXISTS",
276
+ detail: "目标分支已经存在,不能重复创建工作树"
277
+ });
278
+ }
279
+ if (error.message.includes("is already checked out")) {
280
+ return new AppError({
281
+ statusCode: 409,
282
+ errorCode: "WORKTREE_BRANCH_IN_USE",
283
+ detail: "目标分支已经被其他工作树占用,不能再次创建"
284
+ });
285
+ }
286
+ return new AppError({
287
+ statusCode: 500,
288
+ errorCode: "WORKTREE_CREATE_FAILED",
289
+ detail: error.message
290
+ });
291
+ }
292
+ //# sourceMappingURL=worktree-manager.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"worktree-manager.js","sourceRoot":"","sources":["../../../../src/modules/worktree/worktree-manager.ts"],"names":[],"mappings":"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"}