@cerbur/clutch-dsh-worktree 0.1.8 → 0.1.10

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 (508) hide show
  1. package/README.md +117 -46
  2. package/README.zh.md +92 -40
  3. package/lib/client/WorktreeSurface.d.ts +4 -7
  4. package/lib/client/WorktreeSurface.d.ts.map +1 -1
  5. package/lib/client/WorktreeSurface.js +44 -1243
  6. package/lib/client/WorktreeSurface.js.map +1 -1
  7. package/lib/client/{WorktreeContext.d.ts → context/WorktreeContext.d.ts} +2 -2
  8. package/lib/client/context/WorktreeContext.d.ts.map +1 -0
  9. package/lib/client/{WorktreeContext.js → context/WorktreeContext.js} +1 -1
  10. package/lib/client/context/WorktreeContext.js.map +1 -0
  11. package/lib/client/{WorktreeHeroContext.d.ts → context/WorktreeHeroContext.d.ts} +1 -1
  12. package/lib/client/context/WorktreeHeroContext.d.ts.map +1 -0
  13. package/lib/client/{WorktreeHeroContext.js → context/WorktreeHeroContext.js} +1 -1
  14. package/lib/client/context/WorktreeHeroContext.js.map +1 -0
  15. package/lib/client/{worktree-context-store.d.ts → context/worktree-context-store.d.ts} +7 -15
  16. package/lib/client/context/worktree-context-store.d.ts.map +1 -0
  17. package/lib/client/{worktree-context-store.js → context/worktree-context-store.js} +20 -13
  18. package/lib/client/context/worktree-context-store.js.map +1 -0
  19. package/lib/client/{worktree-context.d.ts → context/worktree-context.d.ts} +1 -1
  20. package/lib/client/context/worktree-context.d.ts.map +1 -0
  21. package/lib/client/{worktree-context.js → context/worktree-context.js} +5 -3
  22. package/lib/client/context/worktree-context.js.map +1 -0
  23. package/lib/client/dsh-slot-contract.d.ts +43 -0
  24. package/lib/client/dsh-slot-contract.d.ts.map +1 -0
  25. package/lib/client/dsh-slot-contract.js +2 -0
  26. package/lib/client/dsh-slot-contract.js.map +1 -0
  27. package/lib/client/entry.d.ts +3 -3
  28. package/lib/client/entry.d.ts.map +1 -1
  29. package/lib/client/entry.js +168 -38
  30. package/lib/client/entry.js.map +1 -1
  31. package/lib/client/index.d.ts +3 -3
  32. package/lib/client/index.d.ts.map +1 -1
  33. package/lib/client/index.js +2 -2
  34. package/lib/client/index.js.map +1 -1
  35. package/lib/client/locales.d.ts +66 -0
  36. package/lib/client/locales.d.ts.map +1 -1
  37. package/lib/client/locales.js +76 -10
  38. package/lib/client/locales.js.map +1 -1
  39. package/lib/client/{WorktreeOverlay.d.ts → overlay/WorktreeOverlay.d.ts} +2 -2
  40. package/lib/client/overlay/WorktreeOverlay.d.ts.map +1 -0
  41. package/lib/client/{WorktreeOverlay.js → overlay/WorktreeOverlay.js} +2 -2
  42. package/lib/client/overlay/WorktreeOverlay.js.map +1 -0
  43. package/lib/client/overlay/overlay-bounds.d.ts.map +1 -0
  44. package/lib/client/overlay/overlay-bounds.js.map +1 -0
  45. package/lib/client/overlay/sidebar-overlay-geometry.d.ts.map +1 -0
  46. package/lib/client/overlay/sidebar-overlay-geometry.js.map +1 -0
  47. package/lib/client/permission/worktree-permission-icon.d.ts.map +1 -0
  48. package/lib/client/permission/worktree-permission-icon.js.map +1 -0
  49. package/lib/client/permission/worktree-permission.d.ts.map +1 -0
  50. package/lib/client/permission/worktree-permission.js.map +1 -0
  51. package/lib/client/session/session-view.d.ts.map +1 -0
  52. package/lib/client/session/session-view.js.map +1 -0
  53. package/lib/client/session/virtual-workspace-membership.d.ts +29 -0
  54. package/lib/client/session/virtual-workspace-membership.d.ts.map +1 -0
  55. package/lib/client/session/virtual-workspace-membership.js +131 -0
  56. package/lib/client/session/virtual-workspace-membership.js.map +1 -0
  57. package/lib/client/{worktree-session-fork.d.ts → session/worktree-session-fork.d.ts} +25 -4
  58. package/lib/client/session/worktree-session-fork.d.ts.map +1 -0
  59. package/lib/client/session/worktree-session-fork.js +309 -0
  60. package/lib/client/session/worktree-session-fork.js.map +1 -0
  61. package/lib/client/{worktree-session-order.d.ts → session/worktree-session-order.d.ts} +2 -2
  62. package/lib/client/session/worktree-session-order.d.ts.map +1 -0
  63. package/lib/client/session/worktree-session-order.js.map +1 -0
  64. package/lib/client/session/worktree-session-position.d.ts.map +1 -0
  65. package/lib/client/session/worktree-session-position.js.map +1 -0
  66. package/lib/client/{worktree-session.d.ts → session/worktree-session.d.ts} +3 -3
  67. package/lib/client/session/worktree-session.d.ts.map +1 -0
  68. package/lib/client/{worktree-session.js → session/worktree-session.js} +3 -3
  69. package/lib/client/session/worktree-session.js.map +1 -0
  70. package/lib/client/surface/actions/lifecycle-commands.d.ts +9 -0
  71. package/lib/client/surface/actions/lifecycle-commands.d.ts.map +1 -0
  72. package/lib/client/surface/actions/lifecycle-commands.js +243 -0
  73. package/lib/client/surface/actions/lifecycle-commands.js.map +1 -0
  74. package/lib/client/surface/actions/useDragActions.d.ts +26 -0
  75. package/lib/client/surface/actions/useDragActions.d.ts.map +1 -0
  76. package/lib/client/surface/actions/useDragActions.js +125 -0
  77. package/lib/client/surface/actions/useDragActions.js.map +1 -0
  78. package/lib/client/surface/actions/useLifecycleActions.d.ts +30 -0
  79. package/lib/client/surface/actions/useLifecycleActions.d.ts.map +1 -0
  80. package/lib/client/surface/actions/useLifecycleActions.js +140 -0
  81. package/lib/client/surface/actions/useLifecycleActions.js.map +1 -0
  82. package/lib/client/surface/actions/useNativeActions.d.ts +48 -0
  83. package/lib/client/surface/actions/useNativeActions.d.ts.map +1 -0
  84. package/lib/client/surface/actions/useNativeActions.js +182 -0
  85. package/lib/client/surface/actions/useNativeActions.js.map +1 -0
  86. package/lib/client/surface/actions/useSessionActions.d.ts +24 -0
  87. package/lib/client/surface/actions/useSessionActions.d.ts.map +1 -0
  88. package/lib/client/surface/actions/useSessionActions.js +116 -0
  89. package/lib/client/surface/actions/useSessionActions.js.map +1 -0
  90. package/lib/client/surface/actions/useSurfaceMutation.d.ts +15 -0
  91. package/lib/client/surface/actions/useSurfaceMutation.d.ts.map +1 -0
  92. package/lib/client/surface/actions/useSurfaceMutation.js +24 -0
  93. package/lib/client/surface/actions/useSurfaceMutation.js.map +1 -0
  94. package/lib/client/surface/actions/useWorktreeRegistration.d.ts +31 -0
  95. package/lib/client/surface/actions/useWorktreeRegistration.d.ts.map +1 -0
  96. package/lib/client/surface/actions/useWorktreeRegistration.js +203 -0
  97. package/lib/client/surface/actions/useWorktreeRegistration.js.map +1 -0
  98. package/lib/client/surface/actions/worktree-cleanup-flow.d.ts +10 -0
  99. package/lib/client/surface/actions/worktree-cleanup-flow.d.ts.map +1 -0
  100. package/lib/client/surface/actions/worktree-cleanup-flow.js +19 -0
  101. package/lib/client/surface/actions/worktree-cleanup-flow.js.map +1 -0
  102. package/lib/client/surface/components/AccessConfirmation.d.ts +9 -0
  103. package/lib/client/surface/components/AccessConfirmation.d.ts.map +1 -0
  104. package/lib/client/surface/components/AccessConfirmation.js +18 -0
  105. package/lib/client/surface/components/AccessConfirmation.js.map +1 -0
  106. package/lib/client/surface/components/ActiveWorktree.d.ts +28 -0
  107. package/lib/client/surface/components/ActiveWorktree.d.ts.map +1 -0
  108. package/lib/client/surface/components/ActiveWorktree.js +154 -0
  109. package/lib/client/surface/components/ActiveWorktree.js.map +1 -0
  110. package/lib/client/surface/components/ArchivedWorktree.d.ts +24 -0
  111. package/lib/client/surface/components/ArchivedWorktree.d.ts.map +1 -0
  112. package/lib/client/surface/components/ArchivedWorktree.js +145 -0
  113. package/lib/client/surface/components/ArchivedWorktree.js.map +1 -0
  114. package/lib/client/surface/components/ArchivedWorktrees.d.ts +25 -0
  115. package/lib/client/surface/components/ArchivedWorktrees.d.ts.map +1 -0
  116. package/lib/client/surface/components/ArchivedWorktrees.js +20 -0
  117. package/lib/client/surface/components/ArchivedWorktrees.js.map +1 -0
  118. package/lib/client/surface/components/LifecycleDialogs.d.ts +20 -0
  119. package/lib/client/surface/components/LifecycleDialogs.d.ts.map +1 -0
  120. package/lib/client/surface/components/LifecycleDialogs.js +31 -0
  121. package/lib/client/surface/components/LifecycleDialogs.js.map +1 -0
  122. package/lib/client/surface/components/NativeDialogs.d.ts +9 -0
  123. package/lib/client/surface/components/NativeDialogs.d.ts.map +1 -0
  124. package/lib/client/surface/components/NativeDialogs.js +14 -0
  125. package/lib/client/surface/components/NativeDialogs.js.map +1 -0
  126. package/lib/client/surface/components/NotificationToasts.d.ts +7 -0
  127. package/lib/client/surface/components/NotificationToasts.d.ts.map +1 -0
  128. package/lib/client/surface/components/NotificationToasts.js +24 -0
  129. package/lib/client/surface/components/NotificationToasts.js.map +1 -0
  130. package/lib/client/surface/components/RegistrationDialog.d.ts +15 -0
  131. package/lib/client/surface/components/RegistrationDialog.d.ts.map +1 -0
  132. package/lib/client/surface/components/RegistrationDialog.js +22 -0
  133. package/lib/client/surface/components/RegistrationDialog.js.map +1 -0
  134. package/lib/client/surface/components/SurfaceContent.d.ts +31 -0
  135. package/lib/client/surface/components/SurfaceContent.d.ts.map +1 -0
  136. package/lib/client/surface/components/SurfaceContent.js +65 -0
  137. package/lib/client/surface/components/SurfaceContent.js.map +1 -0
  138. package/lib/client/surface/components/SurfaceHeader.d.ts +15 -0
  139. package/lib/client/surface/components/SurfaceHeader.d.ts.map +1 -0
  140. package/lib/client/surface/components/SurfaceHeader.js +42 -0
  141. package/lib/client/surface/components/SurfaceHeader.js.map +1 -0
  142. package/lib/client/surface/components/WorkspaceTree.d.ts +32 -0
  143. package/lib/client/surface/components/WorkspaceTree.d.ts.map +1 -0
  144. package/lib/client/surface/components/WorkspaceTree.js +145 -0
  145. package/lib/client/surface/components/WorkspaceTree.js.map +1 -0
  146. package/lib/client/{worktree-surface-dialogs.d.ts → surface/components/dialogs.d.ts} +5 -2
  147. package/lib/client/surface/components/dialogs.d.ts.map +1 -0
  148. package/lib/client/{worktree-surface-dialogs.js → surface/components/dialogs.js} +67 -24
  149. package/lib/client/surface/components/dialogs.js.map +1 -0
  150. package/lib/client/{worktree-surface-rows.d.ts → surface/components/rows.d.ts} +3 -3
  151. package/lib/client/surface/components/rows.d.ts.map +1 -0
  152. package/lib/client/{worktree-surface-rows.js → surface/components/rows.js} +79 -17
  153. package/lib/client/surface/components/rows.js.map +1 -0
  154. package/lib/client/surface/notification-queue.d.ts +11 -0
  155. package/lib/client/surface/notification-queue.d.ts.map +1 -0
  156. package/lib/client/surface/notification-queue.js +19 -0
  157. package/lib/client/surface/notification-queue.js.map +1 -0
  158. package/lib/client/{worktree-surface-selectors.d.ts → surface/selectors.d.ts} +10 -5
  159. package/lib/client/surface/selectors.d.ts.map +1 -0
  160. package/lib/client/{worktree-surface-selectors.js → surface/selectors.js} +23 -6
  161. package/lib/client/surface/selectors.js.map +1 -0
  162. package/lib/client/surface/shared.d.ts +40 -0
  163. package/lib/client/surface/shared.d.ts.map +1 -0
  164. package/lib/client/surface/shared.js +53 -0
  165. package/lib/client/surface/shared.js.map +1 -0
  166. package/lib/client/surface/state/useLifecycleState.d.ts +34 -0
  167. package/lib/client/surface/state/useLifecycleState.d.ts.map +1 -0
  168. package/lib/client/surface/state/useLifecycleState.js +39 -0
  169. package/lib/client/surface/state/useLifecycleState.js.map +1 -0
  170. package/lib/client/surface/state/useRegistrationState.d.ts +34 -0
  171. package/lib/client/surface/state/useRegistrationState.d.ts.map +1 -0
  172. package/lib/client/surface/state/useRegistrationState.js +44 -0
  173. package/lib/client/surface/state/useRegistrationState.js.map +1 -0
  174. package/lib/client/surface/state/useSessionExpansion.d.ts +39 -0
  175. package/lib/client/surface/state/useSessionExpansion.d.ts.map +1 -0
  176. package/lib/client/surface/state/useSessionExpansion.js +230 -0
  177. package/lib/client/surface/state/useSessionExpansion.js.map +1 -0
  178. package/lib/client/surface/state/useSessionOrdering.d.ts +15 -0
  179. package/lib/client/surface/state/useSessionOrdering.d.ts.map +1 -0
  180. package/lib/client/surface/state/useSessionOrdering.js +68 -0
  181. package/lib/client/surface/state/useSessionOrdering.js.map +1 -0
  182. package/lib/client/surface/state/useSurfaceMenus.d.ts +9 -0
  183. package/lib/client/surface/state/useSurfaceMenus.d.ts.map +1 -0
  184. package/lib/client/surface/state/useSurfaceMenus.js +15 -0
  185. package/lib/client/surface/state/useSurfaceMenus.js.map +1 -0
  186. package/lib/client/surface/state/useSurfaceRefresh.d.ts +39 -0
  187. package/lib/client/surface/state/useSurfaceRefresh.d.ts.map +1 -0
  188. package/lib/client/surface/state/useSurfaceRefresh.js +274 -0
  189. package/lib/client/surface/state/useSurfaceRefresh.js.map +1 -0
  190. package/lib/client/surface/state/useSurfaceSources.d.ts +31 -0
  191. package/lib/client/surface/state/useSurfaceSources.d.ts.map +1 -0
  192. package/lib/client/surface/state/useSurfaceSources.js +63 -0
  193. package/lib/client/surface/state/useSurfaceSources.js.map +1 -0
  194. package/lib/client/{worktree-surface-types.d.ts → surface/types.d.ts} +68 -13
  195. package/lib/client/surface/types.d.ts.map +1 -0
  196. package/lib/client/surface/types.js +2 -0
  197. package/lib/client/surface/types.js.map +1 -0
  198. package/lib/client/{WorktreeModeAction.d.ts → view/WorktreeModeAction.d.ts} +1 -1
  199. package/lib/client/view/WorktreeModeAction.d.ts.map +1 -0
  200. package/lib/client/{WorktreeModeAction.js → view/WorktreeModeAction.js} +1 -1
  201. package/lib/client/view/WorktreeModeAction.js.map +1 -0
  202. package/lib/client/view/navigation.d.ts.map +1 -0
  203. package/lib/client/view/navigation.js.map +1 -0
  204. package/lib/client/{view-mode-store.d.ts → view/view-mode-store.d.ts} +1 -1
  205. package/lib/client/view/view-mode-store.d.ts.map +1 -0
  206. package/lib/client/{view-mode-store.js → view/view-mode-store.js} +1 -1
  207. package/lib/client/view/view-mode-store.js.map +1 -0
  208. package/lib/client/{view-mode.d.ts → view/view-mode.d.ts} +20 -6
  209. package/lib/client/view/view-mode.d.ts.map +1 -0
  210. package/lib/client/{view-mode.js → view/view-mode.js} +35 -10
  211. package/lib/client/view/view-mode.js.map +1 -0
  212. package/lib/client/{worktree-error-copy.d.ts → view/worktree-error-copy.d.ts} +2 -2
  213. package/lib/client/view/worktree-error-copy.d.ts.map +1 -0
  214. package/lib/client/view/worktree-error-copy.js.map +1 -0
  215. package/lib/client/{worktree-expand-state.d.ts → view/worktree-expand-state.d.ts} +6 -4
  216. package/lib/client/view/worktree-expand-state.d.ts.map +1 -0
  217. package/lib/client/{worktree-expand-state.js → view/worktree-expand-state.js} +11 -0
  218. package/lib/client/view/worktree-expand-state.js.map +1 -0
  219. package/lib/client/{worktree-view-actions.d.ts → view/worktree-view-actions.d.ts} +11 -5
  220. package/lib/client/view/worktree-view-actions.d.ts.map +1 -0
  221. package/lib/client/{worktree-view-actions.js → view/worktree-view-actions.js} +13 -11
  222. package/lib/client/view/worktree-view-actions.js.map +1 -0
  223. package/lib/client/view/worktree-view-errors.d.ts.map +1 -0
  224. package/lib/client/view/worktree-view-errors.js.map +1 -0
  225. package/lib/client/{worktree-view-read.d.ts → view/worktree-view-read.d.ts} +21 -9
  226. package/lib/client/view/worktree-view-read.d.ts.map +1 -0
  227. package/lib/client/{worktree-view-read.js → view/worktree-view-read.js} +78 -10
  228. package/lib/client/view/worktree-view-read.js.map +1 -0
  229. package/lib/client/view/worktree-view.d.ts.map +1 -0
  230. package/lib/client/view/worktree-view.js.map +1 -0
  231. package/lib/client/worktree-connection.d.ts +5 -0
  232. package/lib/client/worktree-connection.d.ts.map +1 -1
  233. package/lib/client/worktree-connection.js +16 -0
  234. package/lib/client/worktree-connection.js.map +1 -1
  235. package/lib/client.js +5990 -3139
  236. package/lib/client.js.map +1 -1
  237. package/lib/contract/index.contract.js +10 -0
  238. package/lib/contract/index.contract.js.map +1 -1
  239. package/lib/contract/index.d.ts +46 -3
  240. package/lib/contract/index.d.ts.map +1 -1
  241. package/lib/contract/index.js +7 -0
  242. package/lib/contract/index.js.map +1 -1
  243. package/lib/host/dsh-read-adapter.d.ts +10 -1
  244. package/lib/host/dsh-read-adapter.d.ts.map +1 -1
  245. package/lib/host/dsh-read-adapter.js +18 -1
  246. package/lib/host/dsh-read-adapter.js.map +1 -1
  247. package/lib/host/remote.d.ts.map +1 -1
  248. package/lib/host/remote.js +14 -0
  249. package/lib/host/remote.js.map +1 -1
  250. package/lib/host/service.d.ts +24 -0
  251. package/lib/host/service.d.ts.map +1 -1
  252. package/lib/host/service.js +39 -1
  253. package/lib/host/service.js.map +1 -1
  254. package/lib/host/worktree-activity.d.ts +13 -0
  255. package/lib/host/worktree-activity.d.ts.map +1 -0
  256. package/lib/host/worktree-activity.js +23 -0
  257. package/lib/host/worktree-activity.js.map +1 -0
  258. package/lib/host/worktree-permission-manager.js +2 -2
  259. package/lib/host/worktree-permission-manager.js.map +1 -1
  260. package/lib/host/worktree-permission.d.ts +3 -2
  261. package/lib/host/worktree-permission.d.ts.map +1 -1
  262. package/lib/host/worktree-permission.js +29 -5
  263. package/lib/host/worktree-permission.js.map +1 -1
  264. package/lib/index.d.ts +3 -3
  265. package/lib/index.d.ts.map +1 -1
  266. package/lib/index.js +2 -2
  267. package/lib/index.js.map +1 -1
  268. package/lib/manage/manager-context.d.ts +2 -1
  269. package/lib/manage/manager-context.d.ts.map +1 -1
  270. package/lib/manage/manager-sessions.js +4 -4
  271. package/lib/manage/manager-sessions.js.map +1 -1
  272. package/lib/manage/manager-worktree-lifecycle.d.ts +23 -0
  273. package/lib/manage/manager-worktree-lifecycle.d.ts.map +1 -0
  274. package/lib/manage/manager-worktree-lifecycle.js +165 -0
  275. package/lib/manage/manager-worktree-lifecycle.js.map +1 -0
  276. package/lib/manage/manager-worktrees.d.ts +1 -6
  277. package/lib/manage/manager-worktrees.d.ts.map +1 -1
  278. package/lib/manage/manager-worktrees.js +83 -114
  279. package/lib/manage/manager-worktrees.js.map +1 -1
  280. package/lib/manage/manager.d.ts +17 -1
  281. package/lib/manage/manager.d.ts.map +1 -1
  282. package/lib/manage/manager.js +25 -6
  283. package/lib/manage/manager.js.map +1 -1
  284. package/lib/provider/generated-name.d.ts +8 -0
  285. package/lib/provider/generated-name.d.ts.map +1 -0
  286. package/lib/provider/generated-name.js +29 -0
  287. package/lib/provider/generated-name.js.map +1 -0
  288. package/lib/provider/{git.d.ts → git/adapter.d.ts} +2 -2
  289. package/lib/provider/git/adapter.d.ts.map +1 -0
  290. package/lib/provider/{git.js → git/adapter.js} +15 -2
  291. package/lib/provider/git/adapter.js.map +1 -0
  292. package/lib/provider/{repository-fingerprint.d.ts → git/repository-fingerprint.d.ts} +1 -1
  293. package/lib/provider/git/repository-fingerprint.d.ts.map +1 -0
  294. package/lib/provider/git/repository-fingerprint.js.map +1 -0
  295. package/lib/provider/{subprocess.d.ts → git/subprocess.d.ts} +1 -1
  296. package/lib/provider/git/subprocess.d.ts.map +1 -0
  297. package/lib/provider/{subprocess.js → git/subprocess.js} +8 -0
  298. package/lib/provider/git/subprocess.js.map +1 -0
  299. package/lib/provider/git/worktree-status.d.ts +5 -0
  300. package/lib/provider/git/worktree-status.d.ts.map +1 -0
  301. package/lib/provider/git/worktree-status.js +23 -0
  302. package/lib/provider/git/worktree-status.js.map +1 -0
  303. package/lib/provider/index.d.ts +5 -5
  304. package/lib/provider/index.d.ts.map +1 -1
  305. package/lib/provider/index.js +5 -5
  306. package/lib/provider/index.js.map +1 -1
  307. package/lib/provider/mutation-token.d.ts +1 -1
  308. package/lib/provider/mutation-token.d.ts.map +1 -1
  309. package/lib/provider/mutation-token.js +1 -0
  310. package/lib/provider/mutation-token.js.map +1 -1
  311. package/lib/provider/sidecar/mutation-lock.d.ts.map +1 -0
  312. package/lib/provider/{mutation-lock.js → sidecar/mutation-lock.js} +1 -1
  313. package/lib/provider/sidecar/mutation-lock.js.map +1 -0
  314. package/lib/provider/{sidecar.d.ts → sidecar/repository.d.ts} +3 -3
  315. package/lib/provider/sidecar/repository.d.ts.map +1 -0
  316. package/lib/provider/{sidecar.js → sidecar/repository.js} +13 -6
  317. package/lib/provider/sidecar/repository.js.map +1 -0
  318. package/lib/provider/{sidecar-persistence.d.ts → sidecar/sidecar-persistence.d.ts} +1 -1
  319. package/lib/provider/sidecar/sidecar-persistence.d.ts.map +1 -0
  320. package/lib/provider/{sidecar-persistence.js → sidecar/sidecar-persistence.js} +29 -2
  321. package/lib/provider/sidecar/sidecar-persistence.js.map +1 -0
  322. package/lib/provider/{sidecar-schema.d.ts → sidecar/sidecar-schema.d.ts} +1 -1
  323. package/lib/provider/sidecar/sidecar-schema.d.ts.map +1 -0
  324. package/lib/provider/{sidecar-schema.js → sidecar/sidecar-schema.js} +52 -16
  325. package/lib/provider/sidecar/sidecar-schema.js.map +1 -0
  326. package/lib/provider/transaction/dependencies.d.ts +10 -0
  327. package/lib/provider/transaction/dependencies.d.ts.map +1 -0
  328. package/lib/provider/transaction/dependencies.js +2 -0
  329. package/lib/provider/transaction/dependencies.js.map +1 -0
  330. package/lib/provider/transaction/index.d.ts +17 -0
  331. package/lib/provider/transaction/index.d.ts.map +1 -0
  332. package/lib/provider/transaction/index.js +44 -0
  333. package/lib/provider/transaction/index.js.map +1 -0
  334. package/lib/provider/transaction/operations/adopt-branch.d.ts +6 -0
  335. package/lib/provider/transaction/operations/adopt-branch.d.ts.map +1 -0
  336. package/lib/provider/transaction/operations/adopt-branch.js +59 -0
  337. package/lib/provider/transaction/operations/adopt-branch.js.map +1 -0
  338. package/lib/provider/transaction/operations/clean.d.ts +4 -0
  339. package/lib/provider/transaction/operations/clean.d.ts.map +1 -0
  340. package/lib/provider/transaction/operations/clean.js +168 -0
  341. package/lib/provider/transaction/operations/clean.js.map +1 -0
  342. package/lib/provider/transaction/operations/create.d.ts +5 -0
  343. package/lib/provider/transaction/operations/create.d.ts.map +1 -0
  344. package/lib/provider/transaction/operations/create.js +136 -0
  345. package/lib/provider/transaction/operations/create.js.map +1 -0
  346. package/lib/provider/transaction/operations/import.d.ts +5 -0
  347. package/lib/provider/transaction/operations/import.d.ts.map +1 -0
  348. package/lib/provider/transaction/operations/import.js +92 -0
  349. package/lib/provider/transaction/operations/import.js.map +1 -0
  350. package/lib/provider/transaction/operations/remove.d.ts +4 -0
  351. package/lib/provider/transaction/operations/remove.d.ts.map +1 -0
  352. package/lib/provider/transaction/operations/remove.js +164 -0
  353. package/lib/provider/transaction/operations/remove.js.map +1 -0
  354. package/lib/provider/transaction/recovery/failure-recovery.d.ts +32 -0
  355. package/lib/provider/transaction/recovery/failure-recovery.d.ts.map +1 -0
  356. package/lib/provider/transaction/recovery/failure-recovery.js +147 -0
  357. package/lib/provider/transaction/recovery/failure-recovery.js.map +1 -0
  358. package/lib/provider/transaction/recovery/recover.d.ts +4 -0
  359. package/lib/provider/transaction/recovery/recover.d.ts.map +1 -0
  360. package/lib/provider/transaction/recovery/recover.js +162 -0
  361. package/lib/provider/transaction/recovery/recover.js.map +1 -0
  362. package/lib/provider/transaction/support/admission.d.ts +7 -0
  363. package/lib/provider/transaction/support/admission.d.ts.map +1 -0
  364. package/lib/provider/transaction/support/admission.js +90 -0
  365. package/lib/provider/transaction/support/admission.js.map +1 -0
  366. package/lib/provider/transaction/support/inspection.d.ts +11 -0
  367. package/lib/provider/transaction/support/inspection.d.ts.map +1 -0
  368. package/lib/provider/transaction/support/inspection.js +51 -0
  369. package/lib/provider/transaction/support/inspection.js.map +1 -0
  370. package/lib/provider/transaction/support/journal.d.ts +12 -0
  371. package/lib/provider/transaction/support/journal.d.ts.map +1 -0
  372. package/lib/provider/transaction/support/journal.js +72 -0
  373. package/lib/provider/transaction/support/journal.js.map +1 -0
  374. package/lib/provider/transaction/support/locking.d.ts +4 -0
  375. package/lib/provider/transaction/support/locking.d.ts.map +1 -0
  376. package/lib/provider/transaction/support/locking.js +11 -0
  377. package/lib/provider/transaction/support/locking.js.map +1 -0
  378. package/lib/provider/transaction/support/path-safety.d.ts +11 -0
  379. package/lib/provider/transaction/support/path-safety.d.ts.map +1 -0
  380. package/lib/provider/transaction/support/path-safety.js +82 -0
  381. package/lib/provider/transaction/support/path-safety.js.map +1 -0
  382. package/lib/provider/transaction/support/paths.d.ts +10 -0
  383. package/lib/provider/transaction/support/paths.d.ts.map +1 -0
  384. package/lib/provider/transaction/support/paths.js +68 -0
  385. package/lib/provider/transaction/support/paths.js.map +1 -0
  386. package/lib/provider/transaction/support/publication.d.ts +9 -0
  387. package/lib/provider/transaction/support/publication.d.ts.map +1 -0
  388. package/lib/provider/transaction/support/publication.js +92 -0
  389. package/lib/provider/transaction/support/publication.js.map +1 -0
  390. package/lib/provider/transaction/types.d.ts +38 -0
  391. package/lib/provider/transaction/types.d.ts.map +1 -0
  392. package/lib/provider/transaction/types.js +2 -0
  393. package/lib/provider/transaction/types.js.map +1 -0
  394. package/lib/provider/types.d.ts +22 -3
  395. package/lib/provider/types.d.ts.map +1 -1
  396. package/lib/provider/types.js +1 -1
  397. package/lib/provider/types.js.map +1 -1
  398. package/lib/provider/worktree-lifecycle.d.ts +19 -0
  399. package/lib/provider/worktree-lifecycle.d.ts.map +1 -0
  400. package/lib/provider/worktree-lifecycle.js +44 -0
  401. package/lib/provider/worktree-lifecycle.js.map +1 -0
  402. package/lib/typert.host.js +269 -30
  403. package/lib/typert.remote-client.d.ts +10 -0
  404. package/lib/typert.remote-client.d.ts.map +1 -1
  405. package/lib/typert.remote-client.js +269 -30
  406. package/package.json +48 -34
  407. package/lib/client/WorktreeContext.d.ts.map +0 -1
  408. package/lib/client/WorktreeContext.js.map +0 -1
  409. package/lib/client/WorktreeHeroContext.d.ts.map +0 -1
  410. package/lib/client/WorktreeHeroContext.js.map +0 -1
  411. package/lib/client/WorktreeModeAction.d.ts.map +0 -1
  412. package/lib/client/WorktreeModeAction.js.map +0 -1
  413. package/lib/client/WorktreeOverlay.d.ts.map +0 -1
  414. package/lib/client/WorktreeOverlay.js.map +0 -1
  415. package/lib/client/navigation.d.ts.map +0 -1
  416. package/lib/client/navigation.js.map +0 -1
  417. package/lib/client/overlay-bounds.d.ts.map +0 -1
  418. package/lib/client/overlay-bounds.js.map +0 -1
  419. package/lib/client/session-view.d.ts.map +0 -1
  420. package/lib/client/session-view.js.map +0 -1
  421. package/lib/client/sidebar-overlay-geometry.d.ts.map +0 -1
  422. package/lib/client/sidebar-overlay-geometry.js.map +0 -1
  423. package/lib/client/view-mode-store.d.ts.map +0 -1
  424. package/lib/client/view-mode-store.js.map +0 -1
  425. package/lib/client/view-mode.d.ts.map +0 -1
  426. package/lib/client/view-mode.js.map +0 -1
  427. package/lib/client/virtual-workspace-membership.d.ts +0 -27
  428. package/lib/client/virtual-workspace-membership.d.ts.map +0 -1
  429. package/lib/client/virtual-workspace-membership.js +0 -106
  430. package/lib/client/virtual-workspace-membership.js.map +0 -1
  431. package/lib/client/worktree-context-store.d.ts.map +0 -1
  432. package/lib/client/worktree-context-store.js.map +0 -1
  433. package/lib/client/worktree-context.d.ts.map +0 -1
  434. package/lib/client/worktree-context.js.map +0 -1
  435. package/lib/client/worktree-error-copy.d.ts.map +0 -1
  436. package/lib/client/worktree-error-copy.js.map +0 -1
  437. package/lib/client/worktree-expand-state.d.ts.map +0 -1
  438. package/lib/client/worktree-expand-state.js.map +0 -1
  439. package/lib/client/worktree-permission-icon.d.ts.map +0 -1
  440. package/lib/client/worktree-permission-icon.js.map +0 -1
  441. package/lib/client/worktree-permission.d.ts.map +0 -1
  442. package/lib/client/worktree-permission.js.map +0 -1
  443. package/lib/client/worktree-session-fork.d.ts.map +0 -1
  444. package/lib/client/worktree-session-fork.js +0 -174
  445. package/lib/client/worktree-session-fork.js.map +0 -1
  446. package/lib/client/worktree-session-order.d.ts.map +0 -1
  447. package/lib/client/worktree-session-order.js.map +0 -1
  448. package/lib/client/worktree-session-position.d.ts.map +0 -1
  449. package/lib/client/worktree-session-position.js.map +0 -1
  450. package/lib/client/worktree-session.d.ts.map +0 -1
  451. package/lib/client/worktree-session.js.map +0 -1
  452. package/lib/client/worktree-surface-dialogs.d.ts.map +0 -1
  453. package/lib/client/worktree-surface-dialogs.js.map +0 -1
  454. package/lib/client/worktree-surface-rows.d.ts.map +0 -1
  455. package/lib/client/worktree-surface-rows.js.map +0 -1
  456. package/lib/client/worktree-surface-selectors.d.ts.map +0 -1
  457. package/lib/client/worktree-surface-selectors.js.map +0 -1
  458. package/lib/client/worktree-surface-types.d.ts.map +0 -1
  459. package/lib/client/worktree-surface-types.js +0 -2
  460. package/lib/client/worktree-surface-types.js.map +0 -1
  461. package/lib/client/worktree-view-actions.d.ts.map +0 -1
  462. package/lib/client/worktree-view-actions.js.map +0 -1
  463. package/lib/client/worktree-view-errors.d.ts.map +0 -1
  464. package/lib/client/worktree-view-errors.js.map +0 -1
  465. package/lib/client/worktree-view-read.d.ts.map +0 -1
  466. package/lib/client/worktree-view-read.js.map +0 -1
  467. package/lib/client/worktree-view.d.ts.map +0 -1
  468. package/lib/client/worktree-view.js.map +0 -1
  469. package/lib/provider/git.d.ts.map +0 -1
  470. package/lib/provider/git.js.map +0 -1
  471. package/lib/provider/mutation-lock.d.ts.map +0 -1
  472. package/lib/provider/mutation-lock.js.map +0 -1
  473. package/lib/provider/repository-fingerprint.d.ts.map +0 -1
  474. package/lib/provider/repository-fingerprint.js.map +0 -1
  475. package/lib/provider/sidecar-persistence.d.ts.map +0 -1
  476. package/lib/provider/sidecar-persistence.js.map +0 -1
  477. package/lib/provider/sidecar-schema.d.ts.map +0 -1
  478. package/lib/provider/sidecar-schema.js.map +0 -1
  479. package/lib/provider/sidecar.d.ts.map +0 -1
  480. package/lib/provider/sidecar.js.map +0 -1
  481. package/lib/provider/subprocess.d.ts.map +0 -1
  482. package/lib/provider/subprocess.js.map +0 -1
  483. package/lib/provider/transaction.d.ts +0 -65
  484. package/lib/provider/transaction.d.ts.map +0 -1
  485. package/lib/provider/transaction.js +0 -1011
  486. package/lib/provider/transaction.js.map +0 -1
  487. /package/lib/client/{overlay-bounds.d.ts → overlay/overlay-bounds.d.ts} +0 -0
  488. /package/lib/client/{overlay-bounds.js → overlay/overlay-bounds.js} +0 -0
  489. /package/lib/client/{sidebar-overlay-geometry.d.ts → overlay/sidebar-overlay-geometry.d.ts} +0 -0
  490. /package/lib/client/{sidebar-overlay-geometry.js → overlay/sidebar-overlay-geometry.js} +0 -0
  491. /package/lib/client/{worktree-permission-icon.d.ts → permission/worktree-permission-icon.d.ts} +0 -0
  492. /package/lib/client/{worktree-permission-icon.js → permission/worktree-permission-icon.js} +0 -0
  493. /package/lib/client/{worktree-permission.d.ts → permission/worktree-permission.d.ts} +0 -0
  494. /package/lib/client/{worktree-permission.js → permission/worktree-permission.js} +0 -0
  495. /package/lib/client/{session-view.d.ts → session/session-view.d.ts} +0 -0
  496. /package/lib/client/{session-view.js → session/session-view.js} +0 -0
  497. /package/lib/client/{worktree-session-order.js → session/worktree-session-order.js} +0 -0
  498. /package/lib/client/{worktree-session-position.d.ts → session/worktree-session-position.d.ts} +0 -0
  499. /package/lib/client/{worktree-session-position.js → session/worktree-session-position.js} +0 -0
  500. /package/lib/client/{navigation.d.ts → view/navigation.d.ts} +0 -0
  501. /package/lib/client/{navigation.js → view/navigation.js} +0 -0
  502. /package/lib/client/{worktree-error-copy.js → view/worktree-error-copy.js} +0 -0
  503. /package/lib/client/{worktree-view-errors.d.ts → view/worktree-view-errors.d.ts} +0 -0
  504. /package/lib/client/{worktree-view-errors.js → view/worktree-view-errors.js} +0 -0
  505. /package/lib/client/{worktree-view.d.ts → view/worktree-view.d.ts} +0 -0
  506. /package/lib/client/{worktree-view.js → view/worktree-view.js} +0 -0
  507. /package/lib/provider/{repository-fingerprint.js → git/repository-fingerprint.js} +0 -0
  508. /package/lib/provider/{mutation-lock.d.ts → sidecar/mutation-lock.d.ts} +0 -0
@@ -1,28 +1,22 @@
1
1
  import path from 'node:path';
2
+ import { assertGeneratedNameAvailable, GeneratedWorktreeNameCollision } from '../provider/generated-name.js';
3
+ import { readWorktreeStatus } from '../provider/git/worktree-status.js';
2
4
  import { createWorktreeMutationToken } from '../provider/mutation-token.js';
3
5
  import { providerError } from '../provider/types.js';
4
- import { asGitError, asSidecarError, canonicalPath, describeError, generatedId, isDirectory, pathExists, requireWorkspace, samePhysicalPath, validateGeneratedPath, validatePhysicalGeneratedPath, } from './manager-support.js';
5
- function projectRuntimeRecord(snapshot, record, health) {
6
- const { health: _health, mutationToken: _mutationToken, ...durableRecord } = record;
6
+ import { asGitError, asSidecarError, canonicalPath, describeError, generatedId, isDirectory, requireWorkspace, samePhysicalPath, validateGeneratedPath, validatePhysicalGeneratedPath, } from './manager-support.js';
7
+ function projectRuntimeRecord(snapshot, record, health, activity) {
8
+ const { health: _health, mutationToken: _mutationToken, activity: _activity, currentBranch: _currentBranch, ...durableRecord } = record;
7
9
  void _health;
8
10
  void _mutationToken;
9
- if (record.status !== 'active')
10
- return durableRecord;
11
+ void _activity;
12
+ void _currentBranch;
11
13
  return {
12
14
  ...durableRecord,
13
15
  mutationToken: createWorktreeMutationToken(snapshot, record),
14
16
  ...(health === undefined ? {} : { health }),
17
+ ...(activity === undefined ? {} : { activity }),
15
18
  };
16
19
  }
17
- function assertMutationToken(snapshot, record, token) {
18
- const expected = createWorktreeMutationToken(snapshot, record);
19
- if (token === undefined || token !== expected) {
20
- throw providerError('WORKTREE_STATE_CONFLICT', 'Worktree state changed after it was loaded', {
21
- workspaceId: record.workspaceId,
22
- worktreeId: record.worktreeId,
23
- });
24
- }
25
- }
26
20
  /** Return the sidecar Worktree projection with runtime Git health attached. */
27
21
  export async function listWorktrees(context, input) {
28
22
  const workspace = await requireWorkspace(context, input.workspaceId);
@@ -35,6 +29,23 @@ export async function listWorktrees(context, input) {
35
29
  ...(snapshot.pendingOperation ? { operationId: snapshot.pendingOperation.id } : {}),
36
30
  });
37
31
  }
32
+ const getActivity = async (record) => {
33
+ const ids = [
34
+ ...new Set(snapshot.bindings
35
+ .filter((b) => b.worktreeId === record.worktreeId)
36
+ .map((b) => b.sessionId)),
37
+ ];
38
+ if (ids.length === 0)
39
+ return { state: 'idle' };
40
+ if (!context.dsh.readWorktreeActivity)
41
+ return { state: 'unknown' };
42
+ try {
43
+ return await context.dsh.readWorktreeActivity(ids);
44
+ }
45
+ catch {
46
+ return { state: 'unknown' };
47
+ }
48
+ };
38
49
  let gitWorktrees;
39
50
  try {
40
51
  const gitRoot = context.git.resolveRepositoryRoot
@@ -43,26 +54,37 @@ export async function listWorktrees(context, input) {
43
54
  gitWorktrees = await context.git.listWorktrees(gitRoot);
44
55
  }
45
56
  catch {
46
- return records.map((record) => projectRuntimeRecord(snapshot, record, record.status === 'active'
47
- ? recoveryNeeded ? 'recovery-needed' : 'repair'
48
- : undefined));
57
+ gitWorktrees = undefined;
49
58
  }
50
59
  const nextRecords = [];
51
60
  for (const record of records) {
52
- if (record.status !== 'active') {
53
- nextRecords.push(projectRuntimeRecord(snapshot, record));
61
+ const activity = await getActivity(record);
62
+ const recordRecoveryNeeded = (snapshot.pendingOperation !== undefined &&
63
+ (snapshot.pendingOperation.worktreeId === undefined ||
64
+ snapshot.pendingOperation.worktreeId === record.worktreeId)) ||
65
+ snapshot.recoveryIssues?.some((issue) => issue.worktreeId === undefined || issue.worktreeId === record.worktreeId) === true;
66
+ if (record.diskCleanup === 'completed') {
67
+ nextRecords.push(projectRuntimeRecord(snapshot, record, recordRecoveryNeeded ? 'recovery-needed' : 'cleaned', activity));
68
+ continue;
69
+ }
70
+ if (gitWorktrees === undefined) {
71
+ nextRecords.push(projectRuntimeRecord(snapshot, record, recordRecoveryNeeded ? 'recovery-needed' : 'repair', activity));
54
72
  continue;
55
73
  }
56
74
  let ready = false;
75
+ let currentBranch;
57
76
  for (const gitWorktree of gitWorktrees) {
58
77
  if (path.resolve(gitWorktree.absolutePath) === path.resolve(record.absolutePath) ||
59
78
  (await samePhysicalPath(gitWorktree.absolutePath, record.absolutePath))) {
60
- ready = true;
79
+ const status = await readWorktreeStatus(gitWorktree);
80
+ ready = status === 'ready' || status === 'detached';
81
+ currentBranch = gitWorktree.detached ? null : gitWorktree.branch;
61
82
  break;
62
83
  }
63
84
  }
64
85
  nextRecords.push({
65
- ...projectRuntimeRecord(snapshot, record, recoveryNeeded ? 'recovery-needed' : ready ? 'ready' : 'repair'),
86
+ ...projectRuntimeRecord(snapshot, record, recordRecoveryNeeded ? 'recovery-needed' : ready ? currentBranch === undefined || currentBranch === record.branch ? 'ready' : 'branch-drift' : 'repair', activity),
87
+ ...(currentBranch === undefined ? {} : { currentBranch }),
66
88
  });
67
89
  }
68
90
  return nextRecords;
@@ -82,6 +104,8 @@ export async function listImportCandidates(context, input) {
82
104
  for (const worktree of gitWorktrees) {
83
105
  if (!worktree.branch || await samePhysicalPath(worktree.absolutePath, gitRoot))
84
106
  continue;
107
+ if (await readWorktreeStatus(worktree) !== 'ready')
108
+ continue;
85
109
  let managed = false;
86
110
  for (const record of snapshot.worktrees) {
87
111
  if (await samePhysicalPath(worktree.absolutePath, record.absolutePath)) {
@@ -135,6 +159,23 @@ export async function listBranches(context, input) {
135
159
  }
136
160
  /** Create a Git Worktree first, then commit its external relation to the sidecar. */
137
161
  export async function createWorktree(context, input) {
162
+ let baseId = '';
163
+ for (let attempt = 0n;; attempt++) {
164
+ context.signal.throwIfAborted();
165
+ // Reroll first, then make progress even if an injected random source repeats forever.
166
+ if (attempt < 8n)
167
+ baseId = generatedId(context.idFactory);
168
+ const worktreeId = attempt < 8n ? baseId : `${baseId}_${attempt - 7n}`;
169
+ try {
170
+ return await createWorktreeAttempt(context, input, worktreeId);
171
+ }
172
+ catch (error) {
173
+ if (!(error instanceof GeneratedWorktreeNameCollision))
174
+ throw error;
175
+ }
176
+ }
177
+ }
178
+ async function createWorktreeAttempt(context, input, worktreeId) {
138
179
  const workspace = await requireWorkspace(context, input.workspaceId);
139
180
  const transactional = context.sidecar.runExclusive !== undefined;
140
181
  if (!transactional)
@@ -189,19 +230,11 @@ export async function createWorktree(context, input) {
189
230
  });
190
231
  }
191
232
  }
192
- const worktreeId = generatedId(context.idFactory);
193
233
  const targetPath = path.resolve(context.dshHome, 'clutch-dsh-worktree', 'worktree', worktreeId);
194
234
  // 创建前同时检查词法和物理目录边界,阻止配置、ID 或 symlink 将目标引回 Workspace 或带出插件根目录。
195
235
  // Check lexical and physical directory boundaries before creation so configuration, IDs, or symlinks cannot redirect the target into the Workspace or outside the plugin root.
196
236
  validateGeneratedPath(context, workspace.rootPath, targetPath, worktreeId);
197
237
  await validatePhysicalGeneratedPath(context, workspace.rootPath, targetPath);
198
- if (await pathExists(targetPath)) {
199
- throw providerError('GIT_OPERATION_FAILED', `Generated Worktree path already exists: ${targetPath}`, {
200
- workspaceRoot: workspace.rootPath,
201
- targetPath,
202
- worktreeId,
203
- });
204
- }
205
238
  // The default Workspace-sharded sidecar exposes the transaction seam. Legacy
206
239
  // injected stores keep the previous path below for compatibility with older
207
240
  // Host compositions and failure-injection tests.
@@ -216,6 +249,7 @@ export async function createWorktree(context, input) {
216
249
  targetBranch,
217
250
  });
218
251
  }
252
+ await assertGeneratedNameAvailable(worktreeId, targetPath, await context.sidecar.read(input.workspaceId), await context.git.listWorktrees(workspace.rootPath));
219
253
  // Git is the first external side effect; the sidecar mutation below is the relation commit point.
220
254
  try {
221
255
  await context.git.createWorktree(workspace.rootPath, targetPath, baseBranch, newBranch);
@@ -232,7 +266,7 @@ export async function createWorktree(context, input) {
232
266
  status: 'active',
233
267
  };
234
268
  try {
235
- return await context.sidecar.mutate(input.workspaceId, (snapshot) => {
269
+ return await context.sidecar.mutate(input.workspaceId, async (snapshot) => {
236
270
  // Recheck ID and branch inside the serialized mutation so concurrent writes cannot create duplicate active records.
237
271
  const idConflict = snapshot.worktrees.find((worktree) => worktree.worktreeId === worktreeId);
238
272
  if (idConflict) {
@@ -241,16 +275,21 @@ export async function createWorktree(context, input) {
241
275
  existingStatus: idConflict.status,
242
276
  });
243
277
  }
244
- const branchConflict = snapshot.worktrees.find((worktree) => worktree.status === 'active' && worktree.branch === targetBranch);
245
- if (branchConflict) {
246
- throw providerError('WORKTREE_BRANCH_CONFLICT', `Branch is already recorded as active: ${targetBranch}`, {
247
- branch: targetBranch,
248
- worktreeId: branchConflict.worktreeId,
249
- });
278
+ const branchClaims = snapshot.worktrees.filter((worktree) => worktree.status === 'active' && worktree.branch === targetBranch);
279
+ if (branchClaims.length > 0) {
280
+ const live = await context.git.listWorktrees(workspace.rootPath);
281
+ for (const claim of branchClaims) {
282
+ const actual = await findGitWorktreeByPhysicalPath(live, claim.absolutePath);
283
+ if (!actual || (!actual.detached && (!actual.branch || actual.branch === targetBranch))) {
284
+ throw providerError('WORKTREE_BRANCH_CONFLICT', `Branch is already recorded as active: ${targetBranch}`, {
285
+ branch: targetBranch, worktreeId: claim.worktreeId,
286
+ });
287
+ }
288
+ }
250
289
  }
251
290
  const next = {
252
291
  ...snapshot,
253
- worktrees: [...snapshot.worktrees, record],
292
+ worktrees: [record, ...snapshot.worktrees],
254
293
  };
255
294
  return { result: record, snapshot: next };
256
295
  });
@@ -300,7 +339,7 @@ export async function importWorktree(context, input) {
300
339
  await context.git.validateRepository(workspace.rootPath);
301
340
  const gitWorktrees = await context.git.listWorktrees(workspace.rootPath);
302
341
  const gitWorktree = await findGitWorktreeByPhysicalPath(gitWorktrees, requestedPath);
303
- if (!gitWorktree || !gitWorktree.branch || await samePhysicalPath(gitWorktree.absolutePath, workspace.rootPath)) {
342
+ if (!gitWorktree || !gitWorktree.branch || await readWorktreeStatus(gitWorktree) !== 'ready' || await samePhysicalPath(gitWorktree.absolutePath, workspace.rootPath)) {
304
343
  throw providerError('WORKTREE_IMPORT_INVALID', `Path is not an importable Worktree: ${requestedPath}`, {
305
344
  workspaceId: input.workspaceId,
306
345
  absolutePath: requestedPath,
@@ -318,6 +357,7 @@ export async function importWorktree(context, input) {
318
357
  const liveWorktree = await findGitWorktreeByPhysicalPath(await context.git.listWorktrees(workspace.rootPath), normalizedPath);
319
358
  if (!liveWorktree ||
320
359
  !liveWorktree.branch ||
360
+ await readWorktreeStatus(liveWorktree) !== 'ready' ||
321
361
  await samePhysicalPath(liveWorktree.absolutePath, workspace.rootPath)) {
322
362
  throw providerError('WORKTREE_IMPORT_INVALID', `Path is not an importable Worktree: ${normalizedPath}`, {
323
363
  workspaceId: input.workspaceId,
@@ -339,7 +379,10 @@ export async function importWorktree(context, input) {
339
379
  source: 'external',
340
380
  status: 'active',
341
381
  };
342
- return { result: record, snapshot: { ...snapshot, worktrees: [...snapshot.worktrees, record] } };
382
+ return {
383
+ result: record,
384
+ snapshot: { ...snapshot, worktrees: [record, ...snapshot.worktrees] },
385
+ };
343
386
  });
344
387
  }
345
388
  catch (error) {
@@ -368,81 +411,7 @@ function importConflictOrExisting(existing, workspaceId, absolutePath) {
368
411
  status: existing.status,
369
412
  });
370
413
  }
371
- /** Remove Git state first, then mark the relation removed while preserving detached bindings. */
372
- export async function removeWorktree(context, input) {
373
- const workspace = await requireWorkspace(context, input.workspaceId);
374
- if (context.sidecar.runExclusive) {
375
- await context.transaction.remove({
376
- workspaceId: input.workspaceId,
377
- workspaceRoot: workspace.rootPath,
378
- worktreeId: input.worktreeId,
379
- mutationToken: input.mutationToken,
380
- });
381
- return;
382
- }
383
- let gitRemoved = false;
384
- try {
385
- await context.sidecar.mutate(input.workspaceId, async (snapshot) => {
386
- const record = snapshot.worktrees.find((worktree) => worktree.worktreeId === input.worktreeId);
387
- if (!record) {
388
- throw providerError('WORKTREE_NOT_FOUND', `Worktree not found: ${input.worktreeId}`, {
389
- worktreeId: input.worktreeId,
390
- workspaceId: input.workspaceId,
391
- });
392
- }
393
- if (record.status === 'removed') {
394
- throw providerError('WORKTREE_REMOVED', `Worktree has already been removed: ${input.worktreeId}`, {
395
- worktreeId: input.worktreeId,
396
- });
397
- }
398
- assertMutationToken(snapshot, record, input.mutationToken);
399
- try {
400
- await context.git.removeWorktree(workspace.rootPath, record.absolutePath);
401
- }
402
- catch (error) {
403
- let stillRegistered;
404
- try {
405
- stillRegistered = false;
406
- for (const worktree of await context.git.listWorktrees(workspace.rootPath)) {
407
- if (await samePhysicalPath(worktree.absolutePath, record.absolutePath)) {
408
- stillRegistered = true;
409
- break;
410
- }
411
- }
412
- }
413
- catch {
414
- throw asGitError('remove worktree', workspace.rootPath, record.absolutePath, error);
415
- }
416
- if (stillRegistered) {
417
- throw asGitError('remove worktree', workspace.rootPath, record.absolutePath, error);
418
- }
419
- }
420
- gitRemoved = true;
421
- // Preserve Worktree and binding history while changing lifecycle only; DSH Sessions are never read or deleted here.
422
- const next = {
423
- ...snapshot,
424
- worktrees: snapshot.worktrees.map((candidate) => candidate.worktreeId === record.worktreeId ? { ...candidate, status: 'removed' } : candidate),
425
- bindings: snapshot.bindings.map((binding) => binding.worktreeId === record.worktreeId && binding.status === 'active'
426
- ? { ...binding, status: 'detached' }
427
- : binding),
428
- };
429
- return { result: undefined, snapshot: next };
430
- });
431
- }
432
- catch (error) {
433
- if (gitRemoved) {
434
- // Git removal cannot be rolled back here, so expose the divergence for a safe retry.
435
- const sidecarError = asSidecarError(error, input.workspaceId);
436
- throw providerError('SIDECAR_SYNC_REQUIRED', `Git removed Worktree ${input.worktreeId}, but sidecar synchronization failed`, {
437
- workspaceId: input.workspaceId,
438
- worktreeId: input.worktreeId,
439
- workspaceRoot: workspace.rootPath,
440
- sidecarError: sidecarError.message,
441
- });
442
- }
443
- throw error;
444
- }
445
- }
414
+ export { archiveWorktree as removeWorktree, unarchiveWorktree, cleanWorktree, forgetWorktree, } from './manager-worktree-lifecycle.js';
446
415
  /** Reconcile one Workspace's durable Git/sidecar operation marker. */
447
416
  export async function recoverWorktrees(context, input) {
448
417
  const workspace = await requireWorkspace(context, input.workspaceId);
@@ -1 +1 @@
1
- {"version":3,"file":"manager-worktrees.js","sourceRoot":"","sources":["../../src/manage/manager-worktrees.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"manager-worktrees.js","sourceRoot":"","sources":["../../src/manage/manager-worktrees.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { BranchRecord, SessionBinding, WorktreeId, WorktreeImportCandidate, WorktreeRecord, WorkspaceId } from '../contract/index.js';
1
+ import type { AdoptWorktreeBranchInput, BranchRecord, SessionBinding, WorktreeId, WorktreeImportCandidate, WorktreeRecord, WorkspaceId } from '../contract/index.js';
2
2
  import type { WorktreeManagerOptions, WorktreeManagerService } from './types.js';
3
3
  /**
4
4
  * Worktree/Session 用例编排器:DSH 只提供权威只读事实,Git 承担 worktree 副作用,sidecar 只保存外部关系。
@@ -16,6 +16,7 @@ export declare class WorktreeManagerImpl implements WorktreeManagerService {
16
16
  private closed;
17
17
  /** Compose the Manager from injectable ports while keeping local defaults. */
18
18
  constructor(options: WorktreeManagerOptions);
19
+ adoptWorktreeBranch(input: AdoptWorktreeBranchInput): Promise<void>;
19
20
  listWorktrees(input: {
20
21
  readonly workspaceId: WorkspaceId;
21
22
  }): Promise<readonly WorktreeRecord[]>;
@@ -39,6 +40,21 @@ export declare class WorktreeManagerImpl implements WorktreeManagerService {
39
40
  readonly worktreeId: string;
40
41
  readonly mutationToken: string;
41
42
  }): Promise<void>;
43
+ unarchiveWorktree(input: {
44
+ readonly workspaceId: WorkspaceId;
45
+ readonly worktreeId: string;
46
+ readonly mutationToken: string;
47
+ }): Promise<void>;
48
+ cleanWorktree(input: {
49
+ readonly workspaceId: WorkspaceId;
50
+ readonly worktreeId: string;
51
+ readonly mutationToken: string;
52
+ }): Promise<void>;
53
+ forgetWorktree(input: {
54
+ readonly workspaceId: WorkspaceId;
55
+ readonly worktreeId: string;
56
+ readonly mutationToken: string;
57
+ }): Promise<void>;
42
58
  insertWorktreeBefore(input: {
43
59
  readonly workspaceId: WorkspaceId;
44
60
  readonly worktreeId: WorktreeId;
@@ -1 +1 @@
1
- {"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/manage/manager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EACd,UAAU,EACV,uBAAuB,EACvB,cAAc,EACd,WAAW,EACZ,MAAM,sBAAsB,CAAC;AAqB9B,OAAO,KAAK,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEjF;;;;;;GAMG;AACH,qBAAa,mBAAoB,YAAW,sBAAsB;IAChE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyB;IACjD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAyB;IAC7D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA4B;IAC7D,OAAO,CAAC,SAAS,CAA4B;IAC7C,OAAO,CAAC,MAAM,CAAS;IAEvB,8EAA8E;gBAClE,OAAO,EAAE,sBAAsB;IAuB3C,aAAa,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,SAAS,cAAc,EAAE,CAAC;IAI/F,oBAAoB,CAAC,KAAK,EAAE;QAC1B,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;KACnC,GAAG,OAAO,CAAC,SAAS,uBAAuB,EAAE,CAAC;IAI/C,YAAY,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;IAI5F,cAAc,CAAC,KAAK,EAAE;QACpB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;QAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QACxB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;KAC7B,GAAG,OAAO,CAAC,cAAc,CAAC;IAI3B,cAAc,CAAC,KAAK,EAAE;QACpB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;QAClC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;KAC/B,GAAG,OAAO,CAAC,cAAc,CAAC;IAI3B,cAAc,CAAC,KAAK,EAAE;QACpB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;QAClC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;KAChC,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjB,oBAAoB,CAAC,KAAK,EAAE;QAC1B,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;QAClC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;QAChC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,UAAU,CAAC;KACxC,GAAG,OAAO,CAAC,SAAS,UAAU,EAAE,CAAC;IAIlC,YAAY,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,SAAS,cAAc,EAAE,CAAC;IAI9F,WAAW,CAAC,KAAK,EAAE;QACjB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;QAClC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;KAC5B,GAAG,OAAO,CAAC,cAAc,CAAC;IAI3B,iBAAiB,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;QAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAI5G,gBAAgB,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YAI/D,aAAa;IAO3B;;;;;;OAMG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAStB,OAAO,CAAC,KAAK;YAkBC,eAAe;CAwB9B;AAED,2FAA2F;AAC3F,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,sBAAsB,GAAG,sBAAsB,CAE7F"}
1
+ {"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/manage/manager.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,12 @@
1
- import { randomUUID } from 'node:crypto';
1
+ import { randomBytes } from 'node:crypto';
2
2
  import path from 'node:path';
3
- import { LocalGitAdapter } from '../provider/git.js';
4
- import { WorkspaceShardedSidecarRepository } from '../provider/sidecar.js';
5
- import { WorktreeMutationTransaction } from '../provider/transaction.js';
3
+ import { LocalGitAdapter } from '../provider/git/adapter.js';
4
+ import { WorkspaceShardedSidecarRepository } from '../provider/sidecar/repository.js';
5
+ import { WorktreeMutationTransaction } from '../provider/transaction/index.js';
6
6
  import { providerError } from '../provider/types.js';
7
7
  import { bindSession, listBindings, resolveRuntimeCwd, } from './manager-sessions.js';
8
- import { createWorktree, importWorktree, insertWorktreeBefore, listBranches, listImportCandidates, listWorktrees, removeWorktree, recoverWorktrees, } from './manager-worktrees.js';
8
+ import { cleanWorktree, createWorktree, forgetWorktree, importWorktree, insertWorktreeBefore, listBranches, listImportCandidates, listWorktrees, removeWorktree, unarchiveWorktree, recoverWorktrees, } from './manager-worktrees.js';
9
+ import { requireWorkspace } from './manager-support.js';
9
10
  /**
10
11
  * Worktree/Session 用例编排器:DSH 只提供权威只读事实,Git 承担 worktree 副作用,sidecar 只保存外部关系。
11
12
  * Worktree/Session use-case orchestrator: DSH supplies authoritative read-only facts, Git owns worktree side effects, and the sidecar stores only external relations.
@@ -39,10 +40,17 @@ export class WorktreeManagerImpl {
39
40
  git,
40
41
  sidecar,
41
42
  transaction: new WorktreeMutationTransaction({ dshHome, git, sidecar }),
42
- idFactory: options.idFactory ?? (() => `wt_${randomUUID()}`),
43
+ idFactory: options.idFactory ?? (() => `wt_${randomBytes(6).toString('hex')}`),
44
+ signal: this.lifecycleController.signal,
43
45
  };
44
46
  this.recoveryReady = this.startupRecovery();
45
47
  }
48
+ adoptWorktreeBranch(input) {
49
+ return this.afterRecovery(async () => {
50
+ const workspace = await requireWorkspace(this.context, input.workspaceId);
51
+ await this.context.transaction.adoptBranch({ ...input, workspaceRoot: workspace.rootPath });
52
+ });
53
+ }
46
54
  listWorktrees(input) {
47
55
  return this.afterRecovery(() => listWorktrees(this.context, input));
48
56
  }
@@ -61,6 +69,15 @@ export class WorktreeManagerImpl {
61
69
  removeWorktree(input) {
62
70
  return this.afterRecovery(() => removeWorktree(this.context, input));
63
71
  }
72
+ unarchiveWorktree(input) {
73
+ return this.afterRecovery(() => unarchiveWorktree(this.context, input));
74
+ }
75
+ cleanWorktree(input) {
76
+ return this.afterRecovery(() => cleanWorktree(this.context, input));
77
+ }
78
+ forgetWorktree(input) {
79
+ return this.afterRecovery(() => forgetWorktree(this.context, input));
80
+ }
64
81
  insertWorktreeBefore(input) {
65
82
  return this.afterRecovery(() => insertWorktreeBefore(this.context, input));
66
83
  }
@@ -128,6 +145,8 @@ export class WorktreeManagerImpl {
128
145
  return;
129
146
  }
130
147
  for (const workspace of workspaces) {
148
+ if (this.closed || this.lifecycleController.signal.aborted)
149
+ return;
131
150
  try {
132
151
  await recoverWorktrees(this.context, { workspaceId: workspace.workspaceId });
133
152
  }
@@ -1 +1 @@
1
- {"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/manage/manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/manage/manager.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,8 @@
1
+ import type { GitWorktreeInfo, SidecarSnapshot } from './types.js';
2
+ import { WorktreeProviderError } from './types.js';
3
+ /** Internal retry signal, emitted only before Git or journal mutation begins. */
4
+ export declare class GeneratedWorktreeNameCollision extends WorktreeProviderError {
5
+ constructor(worktreeId: string, targetPath: string);
6
+ }
7
+ export declare function assertGeneratedNameAvailable(worktreeId: string, targetPath: string, snapshot: SidecarSnapshot, worktrees: readonly GitWorktreeInfo[]): Promise<void>;
8
+ //# sourceMappingURL=generated-name.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"generated-name.d.ts","sourceRoot":"","sources":["../../src/provider/generated-name.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAGnD,iFAAiF;AACjF,qBAAa,8BAA+B,SAAQ,qBAAqB;gBAC3D,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;CAMnD;AAED,wBAAsB,4BAA4B,CAChD,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,eAAe,EACzB,SAAS,EAAE,SAAS,eAAe,EAAE,GACpC,OAAO,CAAC,IAAI,CAAC,CAsBf"}
@@ -0,0 +1,29 @@
1
+ import path from 'node:path';
2
+ import { WorktreeProviderError } from './types.js';
3
+ import { pathEntryMissing, samePhysicalPath } from './transaction/support/paths.js';
4
+ /** Internal retry signal, emitted only before Git or journal mutation begins. */
5
+ export class GeneratedWorktreeNameCollision extends WorktreeProviderError {
6
+ constructor(worktreeId, targetPath) {
7
+ super('GIT_OPERATION_FAILED', 'Generated Worktree name is already occupied', {
8
+ worktreeId,
9
+ targetPath,
10
+ });
11
+ }
12
+ }
13
+ export async function assertGeneratedNameAvailable(worktreeId, targetPath, snapshot, worktrees) {
14
+ if (!(await pathEntryMissing(targetPath)) ||
15
+ snapshot.worktrees.some((record) => record.worktreeId === worktreeId ||
16
+ path.resolve(record.absolutePath) === path.resolve(targetPath))) {
17
+ throw new GeneratedWorktreeNameCollision(worktreeId, targetPath);
18
+ }
19
+ // Retained records and prunable registrations still own their missing paths.
20
+ for (const worktree of [...snapshot.worktrees, ...worktrees]) {
21
+ if ((await samePhysicalPath(worktree.absolutePath, targetPath)) ||
22
+ (path.basename(worktree.absolutePath).toLowerCase() ===
23
+ path.basename(targetPath).toLowerCase() &&
24
+ (await samePhysicalPath(path.dirname(worktree.absolutePath), path.dirname(targetPath))))) {
25
+ throw new GeneratedWorktreeNameCollision(worktreeId, targetPath);
26
+ }
27
+ }
28
+ }
29
+ //# sourceMappingURL=generated-name.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"generated-name.js","sourceRoot":"","sources":["../../src/provider/generated-name.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAEpF,iFAAiF;AACjF,MAAM,OAAO,8BAA+B,SAAQ,qBAAqB;IACvE,YAAY,UAAkB,EAAE,UAAkB;QAChD,KAAK,CAAC,sBAAsB,EAAE,6CAA6C,EAAE;YAC3E,UAAU;YACV,UAAU;SACX,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,UAAkB,EAClB,UAAkB,EAClB,QAAyB,EACzB,SAAqC;IAErC,IACE,CAAC,CAAC,MAAM,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACrC,QAAQ,CAAC,SAAS,CAAC,IAAI,CACrB,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,CAAC,UAAU,KAAK,UAAU;YAChC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CACjE,EACD,CAAC;QACD,MAAM,IAAI,8BAA8B,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACnE,CAAC;IACD,6EAA6E;IAC7E,KAAK,MAAM,QAAQ,IAAI,CAAC,GAAG,QAAQ,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;QAC7D,IACE,CAAC,MAAM,gBAAgB,CAAC,QAAQ,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;YAC3D,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE;gBACjD,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE;gBACvC,CAAC,MAAM,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAC1F,CAAC;YACD,MAAM,IAAI,8BAA8B,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;AACH,CAAC"}
@@ -1,4 +1,4 @@
1
- import type { GitCommandOptions, GitBranchWorktreeInfo, GitSubprocessRuntime, GitWorktreeAdapter, GitWorktreeInfo } from './types.js';
1
+ import type { GitCommandOptions, GitBranchWorktreeInfo, GitSubprocessRuntime, GitWorktreeAdapter, GitWorktreeInfo } from '../types.js';
2
2
  export interface LocalGitAdapterOptions extends GitCommandOptions {
3
3
  readonly executable?: string;
4
4
  /** Test/embedded-runtime prefix; the normal Git executable needs no prefix. */
@@ -75,4 +75,4 @@ export declare class LocalGitAdapter implements GitWorktreeAdapter {
75
75
  */
76
76
  removeWorktree(workspaceRoot: string, targetPath: string, options?: GitCommandOptions): Promise<void>;
77
77
  }
78
- //# sourceMappingURL=git.d.ts.map
78
+ //# sourceMappingURL=adapter.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../src/provider/git/adapter.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,iBAAiB,EACjB,qBAAqB,EACrB,oBAAoB,EACpB,kBAAkB,EAClB,eAAe,EAChB,MAAM,aAAa,CAAC;AAGrB,MAAM,WAAW,sBAAuB,SAAQ,iBAAiB;IAC/D,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,+EAA+E;IAC/E,QAAQ,CAAC,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5C,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,wEAAwE;IACxE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,UAAU,CAAC,EAAE,oBAAoB,CAAC;CAC5C;AA6KD;;;;;;;GAOG;AACH,qBAAa,eAAgB,YAAW,kBAAkB;IACxD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;IACnD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAc;IAC7C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAuB;gBAEvC,OAAO,GAAE,sBAA2B;IAsBhD,OAAO,CAAC,GAAG;IAqBX;;;;OAIG;IACG,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiD/F,0EAA0E;IACpE,qBAAqB,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC;IAuBpG,8EAA8E;IACxE,yBAAyB,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,GAAE,iBAAsB;;;;;;;IA+BtF;;;;OAIG;IACG,YAAY,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC;IAgBtG;;;OAGG;IACG,6BAA6B,CACjC,aAAa,EAAE,MAAM,EACrB,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,SAAS,qBAAqB,EAAE,CAAC;IA4B5C;;;;OAIG;IACG,aAAa,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC;IAahH;;;;OAIG;IACG,cAAc,CAClB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC;IAWhB;;;;OAIG;IACG,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;CAOhH"}