@cerbur/clutch-dsh-worktree 0.1.17 → 0.1.18
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.
- package/README.md +105 -33
- package/README.zh.md +92 -29
- package/lib/client/WorktreeSurface.d.ts.map +1 -1
- package/lib/client/WorktreeSurface.js +37 -10
- package/lib/client/WorktreeSurface.js.map +1 -1
- package/lib/client/branch/GitBranchSelector.d.ts +23 -0
- package/lib/client/branch/GitBranchSelector.d.ts.map +1 -0
- package/lib/client/branch/GitBranchSelector.js +142 -0
- package/lib/client/branch/GitBranchSelector.js.map +1 -0
- package/lib/client/context/worktree-context-store.d.ts.map +1 -1
- package/lib/client/context/worktree-context-store.js +1 -0
- package/lib/client/context/worktree-context-store.js.map +1 -1
- package/lib/client/context/worktree-context.d.ts +3 -2
- package/lib/client/context/worktree-context.d.ts.map +1 -1
- package/lib/client/context/worktree-context.js +5 -3
- package/lib/client/context/worktree-context.js.map +1 -1
- package/lib/client/dashboard/WorktreeDashboard.d.ts +4 -1
- package/lib/client/dashboard/WorktreeDashboard.d.ts.map +1 -1
- package/lib/client/dashboard/WorktreeDashboard.js +67 -69
- package/lib/client/dashboard/WorktreeDashboard.js.map +1 -1
- package/lib/client/dashboard/dashboard-selection.d.ts +4 -3
- package/lib/client/dashboard/dashboard-selection.d.ts.map +1 -1
- package/lib/client/dashboard/dashboard-selection.js +6 -4
- package/lib/client/dashboard/dashboard-selection.js.map +1 -1
- package/lib/client/dashboard/git/GitChangedFiles.d.ts +2 -1
- package/lib/client/dashboard/git/GitChangedFiles.d.ts.map +1 -1
- package/lib/client/dashboard/git/GitChangedFiles.js +8 -6
- package/lib/client/dashboard/git/GitChangedFiles.js.map +1 -1
- package/lib/client/dashboard/git/GitCommitList.d.ts +6 -1
- package/lib/client/dashboard/git/GitCommitList.d.ts.map +1 -1
- package/lib/client/dashboard/git/GitCommitList.js +34 -29
- package/lib/client/dashboard/git/GitCommitList.js.map +1 -1
- package/lib/client/dashboard/git/GitCommitStats.d.ts +8 -0
- package/lib/client/dashboard/git/GitCommitStats.d.ts.map +1 -0
- package/lib/client/dashboard/git/GitCommitStats.js +7 -0
- package/lib/client/dashboard/git/GitCommitStats.js.map +1 -0
- package/lib/client/dashboard/git/WorktreeGitOverview.d.ts.map +1 -1
- package/lib/client/dashboard/git/WorktreeGitOverview.js +2 -1
- package/lib/client/dashboard/git/WorktreeGitOverview.js.map +1 -1
- package/lib/client/dashboard/git/WorktreeGitPanel.d.ts +1 -1
- package/lib/client/dashboard/git/WorktreeGitPanel.d.ts.map +1 -1
- package/lib/client/dashboard/git/WorktreeGitPanel.js +28 -9
- package/lib/client/dashboard/git/WorktreeGitPanel.js.map +1 -1
- package/lib/client/dashboard/git/file-address.d.ts +5 -2
- package/lib/client/dashboard/git/file-address.d.ts.map +1 -1
- package/lib/client/dashboard/git/file-address.js +50 -7
- package/lib/client/dashboard/git/file-address.js.map +1 -1
- package/lib/client/dashboard/git/git-facts.js +1 -1
- package/lib/client/dashboard/git/git-facts.js.map +1 -1
- package/lib/client/dashboard/git/useWorktreeGitState.d.ts +7 -2
- package/lib/client/dashboard/git/useWorktreeGitState.d.ts.map +1 -1
- package/lib/client/dashboard/git/useWorktreeGitState.js +84 -21
- package/lib/client/dashboard/git/useWorktreeGitState.js.map +1 -1
- package/lib/client/dsh-icons.d.ts +2 -0
- package/lib/client/dsh-icons.d.ts.map +1 -1
- package/lib/client/dsh-icons.js +2 -0
- package/lib/client/dsh-icons.js.map +1 -1
- package/lib/client/locales.d.ts +40 -2
- package/lib/client/locales.d.ts.map +1 -1
- package/lib/client/locales.js +46 -8
- package/lib/client/locales.js.map +1 -1
- package/lib/client/select/SearchableSingleSelect.d.ts +44 -0
- package/lib/client/select/SearchableSingleSelect.d.ts.map +1 -0
- package/lib/client/select/SearchableSingleSelect.js +180 -0
- package/lib/client/select/SearchableSingleSelect.js.map +1 -0
- package/lib/client/select/WorktreeSelector.d.ts +14 -0
- package/lib/client/select/WorktreeSelector.d.ts.map +1 -0
- package/lib/client/select/WorktreeSelector.js +11 -0
- package/lib/client/select/WorktreeSelector.js.map +1 -0
- package/lib/client/surface/actions/useLifecycleActions.js +1 -1
- package/lib/client/surface/actions/useLifecycleActions.js.map +1 -1
- package/lib/client/surface/actions/useWorktreeRegistration.d.ts +1 -1
- package/lib/client/surface/actions/useWorktreeRegistration.d.ts.map +1 -1
- package/lib/client/surface/actions/useWorktreeRegistration.js +32 -11
- package/lib/client/surface/actions/useWorktreeRegistration.js.map +1 -1
- package/lib/client/surface/components/RegistrationDialog.d.ts +3 -3
- package/lib/client/surface/components/RegistrationDialog.d.ts.map +1 -1
- package/lib/client/surface/components/RegistrationDialog.js +70 -5
- package/lib/client/surface/components/RegistrationDialog.js.map +1 -1
- package/lib/client/surface/components/WorkspaceTree.d.ts.map +1 -1
- package/lib/client/surface/components/WorkspaceTree.js +11 -8
- package/lib/client/surface/components/WorkspaceTree.js.map +1 -1
- package/lib/client/surface/components/dialogs.d.ts +1 -1
- package/lib/client/surface/components/dialogs.d.ts.map +1 -1
- package/lib/client/surface/components/dialogs.js +24 -15
- package/lib/client/surface/components/dialogs.js.map +1 -1
- package/lib/client/surface/state/useRegistrationState.d.ts +6 -1
- package/lib/client/surface/state/useRegistrationState.d.ts.map +1 -1
- package/lib/client/surface/state/useRegistrationState.js +7 -0
- package/lib/client/surface/state/useRegistrationState.js.map +1 -1
- package/lib/client/surface/types.d.ts +5 -1
- package/lib/client/surface/types.d.ts.map +1 -1
- package/lib/client/view/worktree-error-copy.d.ts.map +1 -1
- package/lib/client/view/worktree-error-copy.js +4 -0
- package/lib/client/view/worktree-error-copy.js.map +1 -1
- package/lib/client/view/worktree-view-read.d.ts +4 -2
- package/lib/client/view/worktree-view-read.d.ts.map +1 -1
- package/lib/client/view/worktree-view-read.js +34 -17
- package/lib/client/view/worktree-view-read.js.map +1 -1
- package/lib/client/worktree-connection.d.ts +3 -0
- package/lib/client/worktree-connection.d.ts.map +1 -1
- package/lib/client/worktree-connection.js +18 -1
- package/lib/client/worktree-connection.js.map +1 -1
- package/lib/client.js +1386 -434
- package/lib/client.js.map +1 -1
- package/lib/contract/index.contract.js +15 -0
- package/lib/contract/index.contract.js.map +1 -1
- package/lib/contract/index.d.ts +69 -12
- package/lib/contract/index.d.ts.map +1 -1
- package/lib/contract/index.js +3 -0
- package/lib/contract/index.js.map +1 -1
- package/lib/host/remote.d.ts.map +1 -1
- package/lib/host/remote.js +7 -0
- package/lib/host/remote.js.map +1 -1
- package/lib/host/service.d.ts +13 -6
- package/lib/host/service.d.ts.map +1 -1
- package/lib/host/service.js +18 -0
- package/lib/host/service.js.map +1 -1
- package/lib/manage/manager-git-history.d.ts +5 -7
- package/lib/manage/manager-git-history.d.ts.map +1 -1
- package/lib/manage/manager-git-history.js +158 -65
- package/lib/manage/manager-git-history.js.map +1 -1
- package/lib/manage/manager-git-paths.d.ts +7 -0
- package/lib/manage/manager-git-paths.d.ts.map +1 -0
- package/lib/manage/manager-git-paths.js +62 -0
- package/lib/manage/manager-git-paths.js.map +1 -0
- package/lib/manage/manager-worktrees.d.ts +9 -1
- package/lib/manage/manager-worktrees.d.ts.map +1 -1
- package/lib/manage/manager-worktrees.js +69 -14
- package/lib/manage/manager-worktrees.js.map +1 -1
- package/lib/manage/manager.d.ts +12 -5
- package/lib/manage/manager.d.ts.map +1 -1
- package/lib/manage/manager.js +64 -3
- package/lib/manage/manager.js.map +1 -1
- package/lib/provider/git/adapter.d.ts +13 -12
- package/lib/provider/git/adapter.d.ts.map +1 -1
- package/lib/provider/git/adapter.js +152 -29
- package/lib/provider/git/adapter.js.map +1 -1
- package/lib/provider/git/branch-name.d.ts +5 -0
- package/lib/provider/git/branch-name.d.ts.map +1 -0
- package/lib/provider/git/branch-name.js +16 -0
- package/lib/provider/git/branch-name.js.map +1 -0
- package/lib/provider/git/branches.d.ts +11 -0
- package/lib/provider/git/branches.d.ts.map +1 -0
- package/lib/provider/git/branches.js +37 -0
- package/lib/provider/git/branches.js.map +1 -0
- package/lib/provider/sidecar/repository.d.ts.map +1 -1
- package/lib/provider/sidecar/repository.js +2 -1
- package/lib/provider/sidecar/repository.js.map +1 -1
- package/lib/provider/sidecar/sidecar-schema.d.ts.map +1 -1
- package/lib/provider/sidecar/sidecar-schema.js +2 -0
- package/lib/provider/sidecar/sidecar-schema.js.map +1 -1
- package/lib/provider/transaction/operations/create.d.ts.map +1 -1
- package/lib/provider/transaction/operations/create.js +18 -6
- package/lib/provider/transaction/operations/create.js.map +1 -1
- package/lib/provider/transaction/recovery/failure-recovery.d.ts.map +1 -1
- package/lib/provider/transaction/recovery/failure-recovery.js +3 -2
- package/lib/provider/transaction/recovery/failure-recovery.js.map +1 -1
- package/lib/provider/transaction/recovery/recover.d.ts.map +1 -1
- package/lib/provider/transaction/recovery/recover.js +8 -5
- package/lib/provider/transaction/recovery/recover.js.map +1 -1
- package/lib/provider/transaction/support/journal.d.ts.map +1 -1
- package/lib/provider/transaction/support/journal.js +1 -0
- package/lib/provider/transaction/support/journal.js.map +1 -1
- package/lib/provider/types.d.ts +24 -4
- package/lib/provider/types.d.ts.map +1 -1
- package/lib/provider/types.js.map +1 -1
- package/lib/tool/list-worktrees.d.ts.map +1 -1
- package/lib/tool/list-worktrees.js +9 -2
- package/lib/tool/list-worktrees.js.map +1 -1
- package/lib/tool/new-worktree.js +2 -2
- package/lib/tool/new-worktree.js.map +1 -1
- package/lib/typert.host.js +216 -46
- package/lib/typert.remote-client.d.ts +11 -5
- package/lib/typert.remote-client.d.ts.map +1 -1
- package/lib/typert.remote-client.js +216 -46
- package/package.json +4 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useWorktreeRegistration.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/actions/useWorktreeRegistration.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAWjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EACV,aAAa,EACb,wBAAwB,EACxB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,YAAY,CAAC,CAAC;IACjE,iBAAiB,EAAE,IAAI,CACrB,UAAU,CAAC,OAAO,oBAAoB,CAAC,EACrC,0BAA0B,GAC1B,kBAAkB,GAClB,mBAAmB,GACnB,cAAc,GACd,qBAAqB,GACrB,uBAAuB,GACvB,qBAAqB,GACrB,iBAAiB,GACjB,kBAAkB,GAClB,6BAA6B,GAC7B,mBAAmB,GACnB,qBAAqB,GACrB,sBAAsB,GACtB,uBAAuB,GACvB,kBAAkB,GAClB,WAAW,GACX,oBAAoB,GACpB,mBAAmB,GACnB,gBAAgB,CACnB,CAAC;IACF,IAAI,EAAE,IAAI,CACR,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpC,iBAAiB,GAAG,uBAAuB,GAAG,SAAS,CACxD,CAAC;IACF,KAAK,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,GAAG,0BAA0B,CAAC,CAAC;IAC1E,QAAQ,EAAE,IAAI,CACZ,UAAU,CAAC,OAAO,kBAAkB,CAAC,EACrC,eAAe,GAAG,gBAAgB,GAAG,kBAAkB,CACxD,CAAC;IACF,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,0BAA0B,CAAC,CAAC;CACjF,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,EACtC,MAAM,EACN,iBAAiB,EACjB,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,OAAO,GACR,EAAE,KAAK;;;;;;
|
|
1
|
+
{"version":3,"file":"useWorktreeRegistration.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/actions/useWorktreeRegistration.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAWjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EACV,aAAa,EACb,wBAAwB,EACxB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,YAAY,CAAC,CAAC;IACjE,iBAAiB,EAAE,IAAI,CACrB,UAAU,CAAC,OAAO,oBAAoB,CAAC,EACrC,0BAA0B,GAC1B,kBAAkB,GAClB,eAAe,GACf,kBAAkB,GAClB,mBAAmB,GACnB,cAAc,GACd,qBAAqB,GACrB,uBAAuB,GACvB,qBAAqB,GACrB,oBAAoB,GACpB,kBAAkB,GAClB,iBAAiB,GACjB,kBAAkB,GAClB,6BAA6B,GAC7B,mBAAmB,GACnB,qBAAqB,GACrB,sBAAsB,GACtB,uBAAuB,GACvB,kBAAkB,GAClB,WAAW,GACX,oBAAoB,GACpB,mBAAmB,GACnB,gBAAgB,CACnB,CAAC;IACF,IAAI,EAAE,IAAI,CACR,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpC,iBAAiB,GAAG,uBAAuB,GAAG,SAAS,CACxD,CAAC;IACF,KAAK,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,GAAG,0BAA0B,CAAC,CAAC;IAC1E,QAAQ,EAAE,IAAI,CACZ,UAAU,CAAC,OAAO,kBAAkB,CAAC,EACrC,eAAe,GAAG,gBAAgB,GAAG,kBAAkB,CACxD,CAAC;IACF,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,0BAA0B,CAAC,CAAC;CACjF,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,EACtC,MAAM,EACN,iBAAiB,EACjB,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,OAAO,GACR,EAAE,KAAK;;;;;;wCAyEgB,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;+CAqBE,IAAI;qCAarC,aAAa,aACd,sBAAsB,KAC/B,IAAI;oCAgCgC,wBAAwB,KAAG,IAAI;uDAYhD,cAAc,KACjC,OAAO,CAAC,IAAI,CAAC;0BA0CiB,OAAO,CAAC,IAAI,CAAC;EAgE/C"}
|
|
@@ -1,34 +1,41 @@
|
|
|
1
|
-
import { useCallback, useEffect } from 'react';
|
|
1
|
+
import { useCallback, useEffect, useMemo } from 'react';
|
|
2
2
|
import { createDefaultWorktreeName, executeWorktreeAction, reconcileBaseBranchSelection, selectDefaultBaseBranch, toWorktreeViewError, WorktreeSessionBindingError, WorktreeSessionPermissionError, } from '../../view/worktree-view.js';
|
|
3
3
|
export function useWorktreeRegistration({ source, registrationState, read, props, mutation, session, }) {
|
|
4
4
|
const { workspaces } = source;
|
|
5
|
-
const { worktreeModalWorkspaceId, modalReadLoading, setSelectedBranch, setNewBranch, setImportCandidates, importCandidatesGuard, modalWorkspaceIdRef, modalReadLoader, modalReadViewRef, setWorktreeModalWorkspaceId, setModalReadError, setModalReadLoading, setWorktreeModalMode, setSelectedImportPath, importCandidates, newBranch, selectedImportPath, worktreeModalMode, selectedBranch, } = registrationState;
|
|
5
|
+
const { worktreeModalWorkspaceId, modalReadLoading, modalBranches, setModalBranches, setSelectedBranch, setNewBranch, setImportCandidates, importCandidatesGuard, modalWorkspaceIdRef, modalGenerationRef, modalLifetimeRef, modalReadLoader, modalReadViewRef, setWorktreeModalWorkspaceId, setModalReadError, setModalReadLoading, setWorktreeModalMode, setSelectedImportPath, importCandidates, newBranch, selectedImportPath, worktreeModalMode, selectedBranch, } = registrationState;
|
|
6
6
|
const { viewByWorkspace, loadModalWorktreeView, refresh } = read;
|
|
7
7
|
const { manager, createSessionForWorktree: createSessionCallback } = props;
|
|
8
8
|
const { actionPending, setActionError, setActionPending } = mutation;
|
|
9
9
|
const { setPendingSessionBinding } = session;
|
|
10
10
|
const modalWorkspace = workspaces.items.find((workspace) => workspace.workspaceId === worktreeModalWorkspaceId);
|
|
11
|
-
const
|
|
11
|
+
const modalProjection = worktreeModalWorkspaceId === undefined
|
|
12
12
|
? undefined
|
|
13
|
-
:
|
|
13
|
+
: modalReadViewRef.current?.workspaceId === worktreeModalWorkspaceId
|
|
14
|
+
? modalReadViewRef.current : viewByWorkspace.get(worktreeModalWorkspaceId);
|
|
15
|
+
const modalView = useMemo(() => modalProjection === undefined || modalBranches === undefined
|
|
16
|
+
? modalProjection : { ...modalProjection, branches: modalBranches }, [modalProjection, modalBranches]);
|
|
14
17
|
const modalReadiness = modalView?.readiness;
|
|
15
18
|
const modalSetupStatus = modalView === undefined
|
|
16
19
|
? undefined
|
|
17
20
|
: modalReadiness?.status === 'ready'
|
|
18
|
-
?
|
|
19
|
-
? 'noLocalBranch'
|
|
20
|
-
: undefined
|
|
21
|
+
? undefined
|
|
21
22
|
: modalReadiness?.status;
|
|
22
23
|
const modalCanCreate = !modalReadLoading && modalSetupStatus === undefined && modalReadiness?.status === 'ready';
|
|
23
24
|
useEffect(() => {
|
|
24
25
|
if (worktreeModalWorkspaceId === undefined || modalView === undefined)
|
|
25
26
|
return;
|
|
27
|
+
if (modalReadLoading)
|
|
28
|
+
return;
|
|
26
29
|
if (modalView.readiness.status !== 'ready') {
|
|
27
30
|
setSelectedBranch('');
|
|
28
31
|
setNewBranch('');
|
|
29
32
|
return;
|
|
30
33
|
}
|
|
31
|
-
setSelectedBranch((current) =>
|
|
34
|
+
setSelectedBranch((current) => current === 'HEAD' && modalView.checkout?.currentHead !== undefined
|
|
35
|
+
? current : modalView.checkout?.currentHead?.kind !== 'branch' && modalView.checkout?.currentHead !== undefined && current === ''
|
|
36
|
+
? 'HEAD' : modalView.branches.length > 0
|
|
37
|
+
? reconcileBaseBranchSelection(current, modalView.branches)
|
|
38
|
+
: current || modalView.currentBranch || 'HEAD');
|
|
32
39
|
setNewBranch((current) => {
|
|
33
40
|
if (current.length > 0)
|
|
34
41
|
return current;
|
|
@@ -38,7 +45,7 @@ export function useWorktreeRegistration({ source, registrationState, read, props
|
|
|
38
45
|
];
|
|
39
46
|
return createDefaultWorktreeName(existingNames);
|
|
40
47
|
});
|
|
41
|
-
}, [modalView, worktreeModalWorkspaceId]);
|
|
48
|
+
}, [modalView, worktreeModalWorkspaceId, modalReadLoading]);
|
|
42
49
|
const loadImportCandidates = useCallback(async (workspaceId) => {
|
|
43
50
|
if (manager === undefined)
|
|
44
51
|
return;
|
|
@@ -60,39 +67,49 @@ export function useWorktreeRegistration({ source, registrationState, read, props
|
|
|
60
67
|
const closeWorktreeCreator = (force = false) => {
|
|
61
68
|
if (actionPending && !force)
|
|
62
69
|
return;
|
|
70
|
+
modalGenerationRef.current++;
|
|
71
|
+
modalLifetimeRef.current++;
|
|
63
72
|
modalReadLoader.current.invalidate();
|
|
64
73
|
modalReadViewRef.current = undefined;
|
|
65
74
|
importCandidatesGuard.current.invalidate();
|
|
66
75
|
setWorktreeModalWorkspaceId(undefined);
|
|
67
76
|
setModalReadError(undefined);
|
|
68
77
|
setModalReadLoading(false);
|
|
78
|
+
setModalBranches(undefined);
|
|
69
79
|
};
|
|
70
80
|
const openWorktreeCreator = (workspace, defaults = {}) => {
|
|
71
81
|
const view = viewByWorkspace.get(workspace.workspaceId);
|
|
82
|
+
modalGenerationRef.current++;
|
|
83
|
+
modalLifetimeRef.current++;
|
|
72
84
|
modalReadLoader.current.invalidate();
|
|
73
85
|
modalReadViewRef.current = undefined;
|
|
74
86
|
importCandidatesGuard.current.invalidate();
|
|
75
87
|
setWorktreeModalWorkspaceId(workspace.workspaceId);
|
|
88
|
+
setModalBranches(undefined);
|
|
76
89
|
setWorktreeModalMode('create');
|
|
77
90
|
setImportCandidates({ status: 'idle', candidates: [] });
|
|
78
91
|
setSelectedImportPath(undefined);
|
|
79
92
|
setActionError(undefined);
|
|
80
93
|
setModalReadError(undefined);
|
|
81
94
|
setModalReadLoading(false);
|
|
82
|
-
if (view === undefined) {
|
|
95
|
+
if (view === undefined || view.branches.length === 0) {
|
|
83
96
|
setSelectedBranch(defaults.baseBranch ?? '');
|
|
84
97
|
setNewBranch(defaults.newBranch ?? '');
|
|
85
98
|
loadModalWorktreeView(workspace.workspaceId);
|
|
86
99
|
return;
|
|
87
100
|
}
|
|
88
|
-
setSelectedBranch(defaults.baseBranch ??
|
|
101
|
+
setSelectedBranch(defaults.baseBranch ?? (view.checkout?.currentHead !== undefined && view.checkout.currentHead.kind !== 'branch'
|
|
102
|
+
? 'HEAD' : selectDefaultBaseBranch(view.branches)));
|
|
89
103
|
setNewBranch(defaults.newBranch ??
|
|
90
104
|
createDefaultWorktreeName([
|
|
91
105
|
...view.branches.map((branch) => branch.name),
|
|
92
106
|
...view.worktrees.map((worktree) => worktree.branch),
|
|
93
107
|
]));
|
|
108
|
+
loadModalWorktreeView(workspace.workspaceId);
|
|
94
109
|
};
|
|
95
110
|
const changeWorktreeModalMode = (mode) => {
|
|
111
|
+
if (mode !== worktreeModalMode)
|
|
112
|
+
modalGenerationRef.current++;
|
|
96
113
|
setWorktreeModalMode(mode);
|
|
97
114
|
if (mode === 'import' &&
|
|
98
115
|
worktreeModalWorkspaceId !== undefined &&
|
|
@@ -162,6 +179,10 @@ export function useWorktreeRegistration({ source, registrationState, read, props
|
|
|
162
179
|
input: {
|
|
163
180
|
workspaceId: modalWorkspace.workspaceId,
|
|
164
181
|
branch: selectedBranch,
|
|
182
|
+
...(selectedBranch === 'HEAD' ? {
|
|
183
|
+
fromHead: true,
|
|
184
|
+
expectedHeadCommit: modalView?.checkout?.currentHead?.commit,
|
|
185
|
+
} : {}),
|
|
165
186
|
newBranch: worktreeName,
|
|
166
187
|
},
|
|
167
188
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useWorktreeRegistration.js","sourceRoot":"","sources":["../../../../src/client/surface/actions/useWorktreeRegistration.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"useWorktreeRegistration.js","sourceRoot":"","sources":["../../../../src/client/surface/actions/useWorktreeRegistration.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,11 +4,11 @@ import type { useSurfaceMutation } from '../actions/useSurfaceMutation.js';
|
|
|
4
4
|
import type { useSurfaceRefresh } from '../state/useSurfaceRefresh.js';
|
|
5
5
|
import type { useWorktreeRegistration } from '../actions/useWorktreeRegistration.js';
|
|
6
6
|
type Input = {
|
|
7
|
-
props: Pick<WorktreeSurfaceProps, 't'>;
|
|
7
|
+
props: Pick<WorktreeSurfaceProps, 't' | 'manager'>;
|
|
8
8
|
registration: Pick<ReturnType<typeof useWorktreeRegistration>, 'modalWorkspace' | 'modalView' | 'modalSetupStatus' | 'modalCanCreate' | 'closeWorktreeCreator' | 'changeWorktreeModalMode' | 'loadImportCandidates' | 'submitWorktree'>;
|
|
9
|
-
registrationState: Pick<ReturnType<typeof useRegistrationState>, 'modalReadError' | 'worktreeModalMode' | 'importCandidates' | 'selectedImportPath' | 'selectedBranch' | 'newBranch' | 'worktreeModalWorkspaceId' | 'modalReadViewRef' | 'setSelectedBranch' | 'setNewBranch' | 'setSelectedImportPath'>;
|
|
9
|
+
registrationState: Pick<ReturnType<typeof useRegistrationState>, 'modalReadError' | 'modalReadLoading' | 'worktreeModalMode' | 'importCandidates' | 'selectedImportPath' | 'selectedBranch' | 'newBranch' | 'worktreeModalWorkspaceId' | 'modalReadViewRef' | 'modalWorkspaceIdRef' | 'modalGenerationRef' | 'modalLifetimeRef' | 'setModalBranches' | 'setSelectedBranch' | 'setNewBranch' | 'setSelectedImportPath'>;
|
|
10
10
|
mutation: Pick<ReturnType<typeof useSurfaceMutation>, 'actionPending'>;
|
|
11
|
-
read: Pick<ReturnType<typeof useSurfaceRefresh>, 'loadModalWorktreeView'>;
|
|
11
|
+
read: Pick<ReturnType<typeof useSurfaceRefresh>, 'loadModalWorktreeView' | 'refresh'>;
|
|
12
12
|
};
|
|
13
13
|
export declare function RegistrationDialog({ props, registration, registrationState, mutation, read, }: Input): import("react").JSX.Element;
|
|
14
14
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RegistrationDialog.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/RegistrationDialog.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RegistrationDialog.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/RegistrationDialog.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAErF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,IAAI,CAAC,oBAAoB,EAAE,GAAG,GAAG,SAAS,CAAC,CAAC;IACnD,YAAY,EAAE,IAAI,CAChB,UAAU,CAAC,OAAO,uBAAuB,CAAC,EACxC,gBAAgB,GAChB,WAAW,GACX,kBAAkB,GAClB,gBAAgB,GAChB,sBAAsB,GACtB,yBAAyB,GACzB,sBAAsB,GACtB,gBAAgB,CACnB,CAAC;IACF,iBAAiB,EAAE,IAAI,CACrB,UAAU,CAAC,OAAO,oBAAoB,CAAC,EACrC,gBAAgB,GAChB,kBAAkB,GAClB,mBAAmB,GACnB,kBAAkB,GAClB,oBAAoB,GACpB,gBAAgB,GAChB,WAAW,GACX,0BAA0B,GAC1B,kBAAkB,GAClB,qBAAqB,GACrB,oBAAoB,GACpB,kBAAkB,GAClB,kBAAkB,GAClB,mBAAmB,GACnB,cAAc,GACd,uBAAuB,CAC1B,CAAC;IACF,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAAE,eAAe,CAAC,CAAC;IACvE,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,uBAAuB,GAAG,SAAS,CAAC,CAAC;CACvF,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,EACjC,KAAK,EACL,YAAY,EACZ,iBAAiB,EACjB,QAAQ,EACR,IAAI,GACL,EAAE,KAAK,+BAkIP"}
|
|
@@ -1,22 +1,87 @@
|
|
|
1
1
|
import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
|
+
import { useEffect, useRef } from 'react';
|
|
2
3
|
import { WorktreeCreateDialog } from './dialogs.js';
|
|
3
4
|
export function RegistrationDialog({ props, registration, registrationState, mutation, read, }) {
|
|
4
5
|
const { t } = props;
|
|
5
6
|
const { modalWorkspace, modalView, modalSetupStatus, modalCanCreate, closeWorktreeCreator, changeWorktreeModalMode, loadImportCandidates, submitWorktree, } = registration;
|
|
6
|
-
const { modalReadError, worktreeModalMode, importCandidates, selectedImportPath, selectedBranch, newBranch, worktreeModalWorkspaceId, modalReadViewRef, setSelectedBranch, setNewBranch, setSelectedImportPath, } = registrationState;
|
|
7
|
+
const { modalReadError, modalReadLoading, worktreeModalMode, importCandidates, selectedImportPath, selectedBranch, newBranch, worktreeModalWorkspaceId, modalReadViewRef, modalWorkspaceIdRef, modalGenerationRef, modalLifetimeRef, setModalBranches, setSelectedBranch, setNewBranch, setSelectedImportPath, } = registrationState;
|
|
7
8
|
const { actionPending } = mutation;
|
|
8
9
|
const { loadModalWorktreeView } = read;
|
|
9
|
-
|
|
10
|
-
|
|
10
|
+
// Tab/request invalidation must not restart the native Modal entry animation.
|
|
11
|
+
const shell = useRef({ workspaceId: worktreeModalWorkspaceId, manager: props.manager,
|
|
12
|
+
lifetime: modalLifetimeRef.current, generation: 0 });
|
|
13
|
+
if (shell.current.workspaceId !== worktreeModalWorkspaceId ||
|
|
14
|
+
shell.current.manager !== props.manager || shell.current.lifetime !== modalLifetimeRef.current) {
|
|
15
|
+
shell.current = { workspaceId: worktreeModalWorkspaceId, manager: props.manager,
|
|
16
|
+
lifetime: modalLifetimeRef.current, generation: shell.current.generation + 1 };
|
|
17
|
+
}
|
|
18
|
+
// Workspace equality cannot distinguish closing and reopening the same dialog.
|
|
19
|
+
const lifecycle = useRef({ workspaceId: worktreeModalWorkspaceId, manager: props.manager,
|
|
20
|
+
mode: worktreeModalMode, ownerGeneration: modalGenerationRef.current, generation: 0 });
|
|
21
|
+
if (lifecycle.current.workspaceId !== worktreeModalWorkspaceId ||
|
|
22
|
+
lifecycle.current.manager !== props.manager || lifecycle.current.mode !== worktreeModalMode ||
|
|
23
|
+
lifecycle.current.ownerGeneration !== modalGenerationRef.current) {
|
|
24
|
+
lifecycle.current = { workspaceId: worktreeModalWorkspaceId, manager: props.manager,
|
|
25
|
+
mode: worktreeModalMode, ownerGeneration: modalGenerationRef.current,
|
|
26
|
+
generation: lifecycle.current.generation + 1 };
|
|
27
|
+
}
|
|
28
|
+
const alive = useRef(true);
|
|
29
|
+
useEffect(() => {
|
|
30
|
+
alive.current = true;
|
|
31
|
+
return () => { alive.current = false; };
|
|
32
|
+
}, []);
|
|
33
|
+
const generation = lifecycle.current.generation;
|
|
34
|
+
const ownerGeneration = modalGenerationRef.current;
|
|
35
|
+
const isCurrent = () => alive.current && lifecycle.current.generation === generation &&
|
|
36
|
+
modalGenerationRef.current === ownerGeneration &&
|
|
37
|
+
modalWorkspaceIdRef.current === worktreeModalWorkspaceId;
|
|
38
|
+
return (_jsx(_Fragment, { children: _jsx(WorktreeCreateDialog, { pickerKey: generation, t: t, workspace: modalWorkspace, view: modalView, readError: modalReadError, setupStatus: modalSetupStatus, canCreate: modalCanCreate, branchesLoading: modalReadLoading || modalView === undefined, mode: worktreeModalMode, importCandidates: importCandidates, selectedImportPath: selectedImportPath, selectedBranch: selectedBranch, newBranch: newBranch, actionPending: actionPending, onClose: () => {
|
|
39
|
+
if (actionPending || !isCurrent())
|
|
11
40
|
return;
|
|
41
|
+
lifecycle.current.generation++;
|
|
42
|
+
closeWorktreeCreator();
|
|
43
|
+
}, onRetry: () => {
|
|
44
|
+
if (worktreeModalWorkspaceId === undefined || !isCurrent())
|
|
45
|
+
return;
|
|
46
|
+
lifecycle.current.generation++;
|
|
12
47
|
modalReadViewRef.current = undefined;
|
|
13
48
|
setSelectedBranch('');
|
|
14
49
|
setNewBranch('');
|
|
15
50
|
loadModalWorktreeView(worktreeModalWorkspaceId);
|
|
16
|
-
}, onModeChange:
|
|
51
|
+
}, onModeChange: (mode) => {
|
|
52
|
+
if (!isCurrent())
|
|
53
|
+
return;
|
|
54
|
+
if (mode !== worktreeModalMode)
|
|
55
|
+
lifecycle.current.generation++;
|
|
56
|
+
changeWorktreeModalMode(mode);
|
|
57
|
+
}, onRetryImportCandidates: () => {
|
|
17
58
|
if (worktreeModalWorkspaceId !== undefined) {
|
|
18
59
|
void loadImportCandidates(worktreeModalWorkspaceId);
|
|
19
60
|
}
|
|
20
|
-
}, onSelectedImportPathChange: setSelectedImportPath, onSelectedBranchChange: setSelectedBranch,
|
|
61
|
+
}, onSelectedImportPathChange: setSelectedImportPath, onSelectedBranchChange: setSelectedBranch, onLoadBranches: props.manager === undefined || worktreeModalWorkspaceId === undefined ? undefined
|
|
62
|
+
: async () => {
|
|
63
|
+
if (!isCurrent())
|
|
64
|
+
return [];
|
|
65
|
+
const branches = await props.manager.listBranches({ workspaceId: worktreeModalWorkspaceId });
|
|
66
|
+
if (isCurrent())
|
|
67
|
+
setModalBranches(branches);
|
|
68
|
+
return branches;
|
|
69
|
+
}, onFetchBranches: props.manager?.fetchRemoteBranches === undefined || worktreeModalWorkspaceId === undefined ? undefined : async () => {
|
|
70
|
+
if (!isCurrent())
|
|
71
|
+
return [];
|
|
72
|
+
const workspaceId = worktreeModalWorkspaceId;
|
|
73
|
+
try {
|
|
74
|
+
const branches = await props.manager.fetchRemoteBranches({ workspaceId });
|
|
75
|
+
if (isCurrent())
|
|
76
|
+
setModalBranches(branches);
|
|
77
|
+
return branches;
|
|
78
|
+
}
|
|
79
|
+
finally {
|
|
80
|
+
if (isCurrent()) {
|
|
81
|
+
await read.refresh({ preserveCurrent: true, invalidateContext: false,
|
|
82
|
+
scope: { kind: 'workspace', workspaceId } });
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}, onNewBranchChange: setNewBranch, onSubmit: submitWorktree }, shell.current.generation) }));
|
|
21
86
|
}
|
|
22
87
|
//# sourceMappingURL=RegistrationDialog.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RegistrationDialog.js","sourceRoot":"","sources":["../../../../src/client/surface/components/RegistrationDialog.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"RegistrationDialog.js","sourceRoot":"","sources":["../../../../src/client/surface/components/RegistrationDialog.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkspaceTree.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/WorkspaceTree.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"WorkspaceTree.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/WorkspaceTree.tsx"],"names":[],"mappings":"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"}
|
|
@@ -29,10 +29,13 @@ export function WorkspaceTree({ props, read, source, expansion, ordering, drag,
|
|
|
29
29
|
worktreeDrag === undefined &&
|
|
30
30
|
sessionDrag === undefined, resetKey: query, children: visibleWorkspaces.length === 0 ? (_jsx("p", { className: styles.empty, children: t('workspace.noMatches') })) : (visibleWorkspaces.map((workspace) => {
|
|
31
31
|
const view = viewByWorkspace.get(workspace.workspaceId);
|
|
32
|
-
const currentBranch = view?.
|
|
33
|
-
|
|
32
|
+
const currentBranch = view?.currentBranch === null ? undefined
|
|
33
|
+
: view?.currentBranch ?? view?.branches.find((branch) => branch.isCurrent)?.name;
|
|
34
|
+
const currentHead = view?.checkout?.currentHead;
|
|
35
|
+
const mainRef = currentHead?.name ?? currentBranch;
|
|
36
|
+
const mainLabel = mainRef === undefined
|
|
34
37
|
? t('worktree.main')
|
|
35
|
-
: t('worktree.mainWithBranch', { branch:
|
|
38
|
+
: t('worktree.mainWithBranch', { branch: mainRef });
|
|
36
39
|
const expanded = isWorkspaceExpanded(expandSnapshot, workspace.workspaceId) ||
|
|
37
40
|
isCurrentSessionReveal('workspace:' + workspace.workspaceId);
|
|
38
41
|
const workspaceMatchesQuery = includesText(workspace.title, query);
|
|
@@ -111,22 +114,22 @@ export function WorkspaceTree({ props, read, source, expansion, ordering, drag,
|
|
|
111
114
|
}, showDashboardAction: props.openDashboard !== undefined, menu: {
|
|
112
115
|
onDashboard: props.openDashboard === undefined
|
|
113
116
|
? undefined
|
|
114
|
-
: () => props.openDashboard?.(createMainWorktreeRecord(workspace, currentBranch)),
|
|
117
|
+
: () => props.openDashboard?.(createMainWorktreeRecord(workspace, currentBranch, view?.mainInstructions, view?.checkout)),
|
|
115
118
|
open: openMainMenuId === workspace.workspaceId,
|
|
116
119
|
label: mainLabel,
|
|
117
120
|
copyPath: workspace.path,
|
|
118
|
-
showCreate:
|
|
121
|
+
showCreate: mainRef !== undefined,
|
|
119
122
|
showRemove: false,
|
|
120
123
|
disabled: actionPending,
|
|
121
124
|
onOpenChange: (open) => {
|
|
122
125
|
setOpenMainMenuId(open ? workspace.workspaceId : undefined);
|
|
123
126
|
},
|
|
124
|
-
onCreateWorktree:
|
|
127
|
+
onCreateWorktree: mainRef === undefined
|
|
125
128
|
? undefined
|
|
126
129
|
: () => {
|
|
127
130
|
openWorktreeCreator(workspace, {
|
|
128
|
-
baseBranch: currentBranch,
|
|
129
|
-
newBranch: createNumberedWorktreeName(
|
|
131
|
+
baseBranch: currentHead?.kind !== 'branch' && currentHead !== undefined ? 'HEAD' : currentBranch,
|
|
132
|
+
newBranch: createNumberedWorktreeName(mainRef, workspaceWorktreeNames),
|
|
130
133
|
});
|
|
131
134
|
},
|
|
132
135
|
}, onCreateSession: createMainSession === undefined
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkspaceTree.js","sourceRoot":"","sources":["../../../../src/client/surface/components/WorkspaceTree.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"WorkspaceTree.js","sourceRoot":"","sources":["../../../../src/client/surface/components/WorkspaceTree.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ export declare function WorktreeAdoptBranchDialog({ t, worktree, actionPending,
|
|
|
3
3
|
export declare function WorktreeSessionRenameDialog({ t, target, draft, pending, error, onClose, onDraftChange, onSubmit, }: SessionRenameDialogProps): import("react").JSX.Element;
|
|
4
4
|
export declare function WorktreeWorkspaceRenameDialog({ t, target, draft, pending, duplicate, error, onClose, onDraftChange, onSubmit, }: WorkspaceRenameDialogProps): import("react").JSX.Element | null;
|
|
5
5
|
export declare function WorktreeWorkspaceDeleteDialog({ t, target, pending, error, onClose, onSubmit, }: WorkspaceDeleteDialogProps): import("react").JSX.Element | null;
|
|
6
|
-
export declare function WorktreeCreateDialog({ t, workspace, view, readError, setupStatus, canCreate, mode, importCandidates, selectedImportPath, selectedBranch, newBranch, actionPending, onClose, onRetry, onModeChange, onRetryImportCandidates, onSelectedImportPathChange, onSelectedBranchChange, onNewBranchChange, onSubmit, }: WorktreeCreateDialogProps): import("react").JSX.Element | null;
|
|
6
|
+
export declare function WorktreeCreateDialog({ t, workspace, view, readError, setupStatus, canCreate, branchesLoading, pickerKey, mode, importCandidates, selectedImportPath, selectedBranch, newBranch, actionPending, onClose, onRetry, onModeChange, onRetryImportCandidates, onSelectedImportPathChange, onSelectedBranchChange, onFetchBranches, onLoadBranches, onNewBranchChange, onSubmit, }: WorktreeCreateDialogProps): import("react").JSX.Element | null;
|
|
7
7
|
export declare function WorktreeRemovalDialog({ t, worktree, actionPending, onClose, onSubmit, }: WorktreeRemovalDialogProps): import("react").JSX.Element | null;
|
|
8
8
|
export declare function WorktreeCleanDiskDialog({ t, worktree, actionPending, onClose, onSubmit, }: WorktreeCleanDiskDialogProps): import("react").JSX.Element | null;
|
|
9
9
|
export declare function WorktreeForgetDialog({ t, worktree, actionPending, onClose, onSubmit, }: WorktreeForgetDialogProps): import("react").JSX.Element | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dialogs.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/dialogs.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dialogs.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/dialogs.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,wBAAwB,EACxB,0BAA0B,EAC1B,0BAA0B,EAC1B,8BAA8B,EAC9B,4BAA4B,EAC5B,yBAAyB,EACzB,yBAAyB,EACzB,0BAA0B,EAE3B,MAAM,aAAa,CAAC;AAErB,wBAAgB,yBAAyB,CAAC,EACxC,CAAC,EACD,QAAQ,EACR,aAAa,EACb,KAAK,EACL,OAAO,EACP,QAAQ,EACR,OAAO,GACR,EAAE,8BAA8B,sCAoChC;AAoBD,wBAAgB,2BAA2B,CAAC,EAC1C,CAAC,EACD,MAAM,EACN,KAAK,EACL,OAAO,EACP,KAAK,EACL,OAAO,EACP,aAAa,EACb,QAAQ,GACT,EAAE,wBAAwB,+BA+C1B;AAED,wBAAgB,6BAA6B,CAAC,EAC5C,CAAC,EACD,MAAM,EACN,KAAK,EACL,OAAO,EACP,SAAS,EACT,KAAK,EACL,OAAO,EACP,aAAa,EACb,QAAQ,GACT,EAAE,0BAA0B,sCA6D5B;AAED,wBAAgB,6BAA6B,CAAC,EAC5C,CAAC,EACD,MAAM,EACN,OAAO,EACP,KAAK,EACL,OAAO,EACP,QAAQ,GACT,EAAE,0BAA0B,sCA+B5B;AAED,wBAAgB,oBAAoB,CAAC,EACnC,CAAC,EACD,SAAS,EACT,IAAI,EACJ,SAAS,EACT,WAAW,EACX,SAAS,EACT,eAA4F,EAC5F,SAAS,EACT,IAAI,EACJ,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACd,SAAS,EACT,aAAa,EACb,OAAO,EACP,OAAO,EACP,YAAY,EACZ,uBAAuB,EACvB,0BAA0B,EAC1B,sBAAsB,EACtB,eAAe,EACf,cAAc,EACd,iBAAiB,EACjB,QAAQ,GACT,EAAE,yBAAyB,sCA0K3B;AAED,wBAAgB,qBAAqB,CAAC,EACpC,CAAC,EACD,QAAQ,EACR,aAAa,EACb,OAAO,EACP,QAAQ,GACT,EAAE,0BAA0B,sCAmC5B;AAED,wBAAgB,uBAAuB,CAAC,EACtC,CAAC,EACD,QAAQ,EACR,aAAa,EACb,OAAO,EACP,QAAQ,GACT,EAAE,4BAA4B,sCAwC9B;AAED,wBAAgB,oBAAoB,CAAC,EACnC,CAAC,EACD,QAAQ,EACR,aAAa,EACb,OAAO,EACP,QAAQ,GACT,EAAE,yBAAyB,sCAqC3B"}
|
|
@@ -2,6 +2,8 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
|
|
|
2
2
|
import { Button, Input, Modal } from '@deepseek-ai/dsh-client-ui-primitives';
|
|
3
3
|
import { gitWorktreeRoot } from '../../../contract/index.js';
|
|
4
4
|
import { ErrorToast, NotificationToasts } from './NotificationToasts.js';
|
|
5
|
+
import { GitBranchSelector } from '../../branch/GitBranchSelector.js';
|
|
6
|
+
import { WorktreeSelector } from '../../select/WorktreeSelector.js';
|
|
5
7
|
import { worktreeSetupCommands } from '../../view/worktree-view.js';
|
|
6
8
|
import styles from '../../worktree.css';
|
|
7
9
|
import { worktreeLifecycleBlockReason } from '../selectors.js';
|
|
@@ -74,17 +76,28 @@ export function WorktreeWorkspaceDeleteDialog({ t, target, pending, error, onClo
|
|
|
74
76
|
void onSubmit();
|
|
75
77
|
}, children: t('dialog.delete') })] }), children: _jsx(ErrorToast, { error: error, t: t, scope: 'delete-workspace:' + target.workspaceId, describe: (translate) => translate('workspace.deleteTitle') + ' · ' + target.title }) }));
|
|
76
78
|
}
|
|
77
|
-
export function WorktreeCreateDialog({ t, workspace, view, readError, setupStatus, canCreate, mode, importCandidates, selectedImportPath, selectedBranch, newBranch, actionPending, onClose, onRetry, onModeChange, onRetryImportCandidates, onSelectedImportPathChange, onSelectedBranchChange, onNewBranchChange, onSubmit, }) {
|
|
79
|
+
export function WorktreeCreateDialog({ t, workspace, view, readError, setupStatus, canCreate, branchesLoading = view === undefined && setupStatus === undefined && readError === undefined, pickerKey, mode, importCandidates, selectedImportPath, selectedBranch, newBranch, actionPending, onClose, onRetry, onModeChange, onRetryImportCandidates, onSelectedImportPathChange, onSelectedBranchChange, onFetchBranches, onLoadBranches, onNewBranchChange, onSubmit, }) {
|
|
78
80
|
if (workspace === undefined)
|
|
79
81
|
return null;
|
|
80
82
|
const setupCommands = setupStatus === undefined ? [] : worktreeSetupCommands(setupStatus);
|
|
81
83
|
const importing = mode === 'import';
|
|
84
|
+
const branchOptions = [
|
|
85
|
+
...(view?.checkout?.currentHead !== undefined
|
|
86
|
+
? [{
|
|
87
|
+
ref: 'HEAD',
|
|
88
|
+
name: t('worktree.headOption', { name: view.checkout.currentHead.name }),
|
|
89
|
+
isCurrent: false,
|
|
90
|
+
checkedOut: false,
|
|
91
|
+
}]
|
|
92
|
+
: []),
|
|
93
|
+
...(view?.branches ?? []),
|
|
94
|
+
];
|
|
82
95
|
const importBlocked = actionPending || importCandidates.status === 'loading' || selectedImportPath === undefined;
|
|
83
|
-
return (
|
|
96
|
+
return (_jsx(Modal, { open: true, onClose: () => {
|
|
84
97
|
if (actionPending)
|
|
85
98
|
return;
|
|
86
99
|
onClose();
|
|
87
|
-
}, closeLabel: t('dialog.closeWorktreeCreate'), title: t('worktree.createTitle'), description: importing
|
|
100
|
+
}, closeLabel: t('dialog.closeWorktreeCreate'), title: t('worktree.createTitle'), className: styles.worktreeRegistrationDialog, description: importing
|
|
88
101
|
? t('worktree.importDescription', { name: workspace.title })
|
|
89
102
|
: t('worktree.createDescription', { name: workspace.title }), footer: _jsxs(_Fragment, { children: [_jsx(Button, { variant: "outline", disabled: actionPending, onClick: onClose, children: t('dialog.cancel') }), _jsx(Button, { variant: "primary", disabled: importing
|
|
90
103
|
? importBlocked
|
|
@@ -93,18 +106,14 @@ export function WorktreeCreateDialog({ t, workspace, view, readError, setupStatu
|
|
|
93
106
|
selectedBranch.length === 0 ||
|
|
94
107
|
newBranch.trim().length === 0, onClick: () => {
|
|
95
108
|
void onSubmit();
|
|
96
|
-
}, children: importing ? t('worktree.import') : t('worktree.create') })] }), children: [_jsxs("div", { className: styles.worktreeModalTabs, role: "tablist", "aria-label": t('worktree.title'), children: [_jsx("button", { className: styles.worktreeModalTab, type: "button", role: "tab", "aria-selected": mode === 'create', disabled: actionPending, onClick: () => {
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
onSelectedBranchChange(event.currentTarget.value);
|
|
105
|
-
}, children: view?.branches.map((branch) => (_jsxs("option", { value: branch.name, children: [branch.name, branch.isCurrent ? t('branch.current') : '', branch.checkedOut ? t('branch.checkedOut') : ''] }, branch.name))) })] }), _jsxs("label", { className: styles.modalField, children: [t('worktree.name'), _jsx(Input, { className: styles.renameInput, "aria-label": t('worktree.name'), value: newBranch, placeholder: "dsh/12345678", disabled: actionPending, onChange: (event) => {
|
|
106
|
-
onNewBranchChange(event.currentTarget.value);
|
|
107
|
-
} })] })] })) : (_jsxs("div", { className: styles.gitReadiness, "data-worktree-readiness": setupStatus ?? 'loading', role: "status", children: [_jsx("p", { className: styles.message, children: setupStatus === undefined ? t('status.loading') : worktreeSetupMessage(setupStatus, t) }), setupCommands.length > 0 && (_jsx("pre", { className: styles.commandBlock, "aria-label": t('worktree.setup.commands'), children: setupCommands.join('\n') }))] }))] }));
|
|
109
|
+
}, children: importing ? t('worktree.import') : t('worktree.create') })] }), children: _jsxs("div", { className: styles.worktreeRegistrationBody, children: [_jsxs("div", { className: styles.worktreeModalTabs, role: "tablist", "aria-label": t('worktree.title'), children: [_jsx("button", { className: styles.worktreeModalTab, type: "button", role: "tab", "aria-selected": mode === 'create', disabled: actionPending, onClick: () => {
|
|
110
|
+
onModeChange('create');
|
|
111
|
+
}, children: t('worktree.tabCreate') }), _jsx("button", { className: styles.worktreeModalTab, type: "button", role: "tab", "aria-selected": mode === 'import', disabled: actionPending, onClick: () => {
|
|
112
|
+
onModeChange('import');
|
|
113
|
+
}, children: t('worktree.tabImport') })] }), importing ? (_jsxs("div", { className: styles.worktreeImportCandidates, role: "tabpanel", children: [importCandidates.status === 'error' && (_jsx("div", { className: styles.recoveryActions, children: _jsx(ErrorToast, { error: importCandidates.error, t: t, scope: 'import:' + workspace.workspaceId, context: t('settings.import') + ' · ' + workspace.title + ' · ' + workspace.path, actions: [{ label: t('action.retry'), disabled: actionPending, onClick: onRetryImportCandidates }] }) })), importCandidates.candidates.length === 0 && importCandidates.status === 'ready' && (_jsx("p", { className: styles.message, children: t('worktree.importEmpty') })), _jsxs("div", { className: styles.modalField, children: [t('worktree.tabImport'), _jsx(WorktreeSelector, { t: t, candidates: importCandidates.candidates, value: selectedImportPath ?? '', disabled: actionPending, loading: importCandidates.status === 'idle' || importCandidates.status === 'loading', onChange: onSelectedImportPathChange }, pickerKey)] })] })) : readError !== undefined ? (_jsx("div", { className: styles.gitReadiness, "data-worktree-readiness": "error", children: _jsx(ErrorToast, { error: readError, t: t, scope: 'modal-read:' + workspace.workspaceId, context: t('settings.create') + ' · ' + workspace.title + ' · ' + workspace.path, actions: readError.retryable && onRetry !== undefined
|
|
114
|
+
? [{ label: t('action.retry'), disabled: actionPending, onClick: onRetry }] : [] }) })) : canCreate || (branchesLoading && setupStatus === undefined) ? (_jsxs(_Fragment, { children: [_jsxs("div", { className: styles.modalField, children: [t('worktree.baseBranch'), _jsx(GitBranchSelector, { t: t, branches: branchOptions, label: t('worktree.baseBranch'), value: selectedBranch, disabled: actionPending, loading: branchesLoading, onChange: onSelectedBranchChange, onFetch: onFetchBranches, onLoad: onLoadBranches }, pickerKey)] }), _jsxs("label", { className: styles.modalField, children: [t('worktree.name'), _jsx(Input, { className: styles.renameInput, "aria-label": t('worktree.name'), value: newBranch, placeholder: "dsh/12345678", disabled: actionPending, onChange: (event) => {
|
|
115
|
+
onNewBranchChange(event.currentTarget.value);
|
|
116
|
+
} })] })] })) : (_jsxs("div", { className: styles.gitReadiness, "data-worktree-readiness": setupStatus ?? 'loading', role: "status", children: [_jsx("p", { className: styles.message, children: setupStatus === undefined ? t('status.loading') : worktreeSetupMessage(setupStatus, t) }), setupCommands.length > 0 && (_jsx("pre", { className: styles.commandBlock, "aria-label": t('worktree.setup.commands'), children: setupCommands.join('\n') }))] }))] }) }));
|
|
108
117
|
}
|
|
109
118
|
export function WorktreeRemovalDialog({ t, worktree, actionPending, onClose, onSubmit, }) {
|
|
110
119
|
if (worktree === undefined)
|