@cerbur/clutch-dsh-worktree 0.1.10 → 0.1.13
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 +278 -498
- package/README.zh.md +231 -432
- package/assets/screenshots/screenshots-dashboard.png +0 -0
- package/assets/screenshots/screenshots-en.png +0 -0
- package/assets/screenshots/screenshots-git-reviewer.png +0 -0
- package/assets/screenshots/screenshots-import.png +0 -0
- package/assets/screenshots/screenshots-zh.png +0 -0
- package/lib/client/WorktreeSurface.d.ts +1 -1
- package/lib/client/WorktreeSurface.d.ts.map +1 -1
- package/lib/client/WorktreeSurface.js +268 -10
- package/lib/client/WorktreeSurface.js.map +1 -1
- package/lib/client/context/WorktreeHeroContext.d.ts +4 -3
- package/lib/client/context/WorktreeHeroContext.d.ts.map +1 -1
- package/lib/client/context/WorktreeHeroContext.js +29 -11
- package/lib/client/context/WorktreeHeroContext.js.map +1 -1
- package/lib/client/dashboard/DashboardHeaderAction.d.ts +20 -0
- package/lib/client/dashboard/DashboardHeaderAction.d.ts.map +1 -0
- package/lib/client/dashboard/DashboardHeaderAction.js +19 -0
- package/lib/client/dashboard/DashboardHeaderAction.js.map +1 -0
- package/lib/client/dashboard/OpenInAppButton.d.ts +9 -0
- package/lib/client/dashboard/OpenInAppButton.d.ts.map +1 -0
- package/lib/client/dashboard/OpenInAppButton.js +123 -0
- package/lib/client/dashboard/OpenInAppButton.js.map +1 -0
- package/lib/client/dashboard/WorktreeDashboard.d.ts +28 -0
- package/lib/client/dashboard/WorktreeDashboard.d.ts.map +1 -0
- package/lib/client/dashboard/WorktreeDashboard.js +362 -0
- package/lib/client/dashboard/WorktreeDashboard.js.map +1 -0
- package/lib/client/dashboard/WorktreeInstructions.d.ts +8 -0
- package/lib/client/dashboard/WorktreeInstructions.d.ts.map +1 -0
- package/lib/client/dashboard/WorktreeInstructions.js +53 -0
- package/lib/client/dashboard/WorktreeInstructions.js.map +1 -0
- package/lib/client/dashboard/dashboard-icon.d.ts +7 -0
- package/lib/client/dashboard/dashboard-icon.d.ts.map +1 -0
- package/lib/client/dashboard/dashboard-icon.js +6 -0
- package/lib/client/dashboard/dashboard-icon.js.map +1 -0
- package/lib/client/dashboard/dashboard-navigation.d.ts +35 -0
- package/lib/client/dashboard/dashboard-navigation.d.ts.map +1 -0
- package/lib/client/dashboard/dashboard-navigation.js +48 -0
- package/lib/client/dashboard/dashboard-navigation.js.map +1 -0
- package/lib/client/dashboard/dashboard-overlay.d.ts +16 -0
- package/lib/client/dashboard/dashboard-overlay.d.ts.map +1 -0
- package/lib/client/dashboard/dashboard-overlay.js +185 -0
- package/lib/client/dashboard/dashboard-overlay.js.map +1 -0
- package/lib/client/dashboard/dashboard-selection.d.ts +33 -0
- package/lib/client/dashboard/dashboard-selection.d.ts.map +1 -0
- package/lib/client/dashboard/dashboard-selection.js +31 -0
- package/lib/client/dashboard/dashboard-selection.js.map +1 -0
- package/lib/client/dashboard/dashboard-sessions.d.ts +6 -0
- package/lib/client/dashboard/dashboard-sessions.d.ts.map +1 -0
- package/lib/client/dashboard/dashboard-sessions.js +21 -0
- package/lib/client/dashboard/dashboard-sessions.js.map +1 -0
- package/lib/client/dashboard/git/GitChangedFiles.d.ts +11 -0
- package/lib/client/dashboard/git/GitChangedFiles.d.ts.map +1 -0
- package/lib/client/dashboard/git/GitChangedFiles.js +101 -0
- package/lib/client/dashboard/git/GitChangedFiles.js.map +1 -0
- package/lib/client/dashboard/git/GitCommitList.d.ts +15 -0
- package/lib/client/dashboard/git/GitCommitList.d.ts.map +1 -0
- package/lib/client/dashboard/git/GitCommitList.js +55 -0
- package/lib/client/dashboard/git/GitCommitList.js.map +1 -0
- package/lib/client/dashboard/git/GitDiffView.d.ts +10 -0
- package/lib/client/dashboard/git/GitDiffView.d.ts.map +1 -0
- package/lib/client/dashboard/git/GitDiffView.js +65 -0
- package/lib/client/dashboard/git/GitDiffView.js.map +1 -0
- package/lib/client/dashboard/git/GitFileTypeIcon.d.ts +8 -0
- package/lib/client/dashboard/git/GitFileTypeIcon.d.ts.map +1 -0
- package/lib/client/dashboard/git/GitFileTypeIcon.js +24 -0
- package/lib/client/dashboard/git/GitFileTypeIcon.js.map +1 -0
- package/lib/client/dashboard/git/GitLineStats.d.ts +10 -0
- package/lib/client/dashboard/git/GitLineStats.d.ts.map +1 -0
- package/lib/client/dashboard/git/GitLineStats.js +9 -0
- package/lib/client/dashboard/git/GitLineStats.js.map +1 -0
- package/lib/client/dashboard/git/WorktreeGitOverview.d.ts +31 -0
- package/lib/client/dashboard/git/WorktreeGitOverview.d.ts.map +1 -0
- package/lib/client/dashboard/git/WorktreeGitOverview.js +89 -0
- package/lib/client/dashboard/git/WorktreeGitOverview.js.map +1 -0
- package/lib/client/dashboard/git/WorktreeGitPanel.d.ts +16 -0
- package/lib/client/dashboard/git/WorktreeGitPanel.d.ts.map +1 -0
- package/lib/client/dashboard/git/WorktreeGitPanel.js +126 -0
- package/lib/client/dashboard/git/WorktreeGitPanel.js.map +1 -0
- package/lib/client/dashboard/git/file-address.d.ts +2 -0
- package/lib/client/dashboard/git/file-address.d.ts.map +1 -0
- package/lib/client/dashboard/git/file-address.js +16 -0
- package/lib/client/dashboard/git/file-address.js.map +1 -0
- package/lib/client/dashboard/git/git-column-split.d.ts +34 -0
- package/lib/client/dashboard/git/git-column-split.d.ts.map +1 -0
- package/lib/client/dashboard/git/git-column-split.js +41 -0
- package/lib/client/dashboard/git/git-column-split.js.map +1 -0
- package/lib/client/dashboard/git/git-diff-parser.d.ts +24 -0
- package/lib/client/dashboard/git/git-diff-parser.d.ts.map +1 -0
- package/lib/client/dashboard/git/git-diff-parser.js +56 -0
- package/lib/client/dashboard/git/git-diff-parser.js.map +1 -0
- package/lib/client/dashboard/git/git-facts.d.ts +18 -0
- package/lib/client/dashboard/git/git-facts.d.ts.map +1 -0
- package/lib/client/dashboard/git/git-facts.js +31 -0
- package/lib/client/dashboard/git/git-facts.js.map +1 -0
- package/lib/client/dashboard/git/git-file-tree.d.ts +16 -0
- package/lib/client/dashboard/git/git-file-tree.d.ts.map +1 -0
- package/lib/client/dashboard/git/git-file-tree.js +52 -0
- package/lib/client/dashboard/git/git-file-tree.js.map +1 -0
- package/lib/client/dashboard/git/git-state-cache.d.ts +49 -0
- package/lib/client/dashboard/git/git-state-cache.d.ts.map +1 -0
- package/lib/client/dashboard/git/git-state-cache.js +80 -0
- package/lib/client/dashboard/git/git-state-cache.js.map +1 -0
- package/lib/client/dashboard/git/useGitPaneSplit.d.ts +33 -0
- package/lib/client/dashboard/git/useGitPaneSplit.d.ts.map +1 -0
- package/lib/client/dashboard/git/useGitPaneSplit.js +119 -0
- package/lib/client/dashboard/git/useGitPaneSplit.js.map +1 -0
- package/lib/client/dashboard/git/useWorktreeGitState.d.ts +60 -0
- package/lib/client/dashboard/git/useWorktreeGitState.d.ts.map +1 -0
- package/lib/client/dashboard/git/useWorktreeGitState.js +654 -0
- package/lib/client/dashboard/git/useWorktreeGitState.js.map +1 -0
- package/lib/client/dashboard/open-in-app-controller.d.ts +30 -0
- package/lib/client/dashboard/open-in-app-controller.d.ts.map +1 -0
- package/lib/client/dashboard/open-in-app-controller.js +94 -0
- package/lib/client/dashboard/open-in-app-controller.js.map +1 -0
- package/lib/client/dashboard/vscode-url.d.ts +3 -0
- package/lib/client/dashboard/vscode-url.d.ts.map +1 -0
- package/lib/client/dashboard/vscode-url.js +9 -0
- package/lib/client/dashboard/vscode-url.js.map +1 -0
- package/lib/client/dashboard/worktree-acquisition-facts.d.ts +16 -0
- package/lib/client/dashboard/worktree-acquisition-facts.d.ts.map +1 -0
- package/lib/client/dashboard/worktree-acquisition-facts.js +14 -0
- package/lib/client/dashboard/worktree-acquisition-facts.js.map +1 -0
- package/lib/client/dsh-slot-contract.d.ts +5 -0
- package/lib/client/dsh-slot-contract.d.ts.map +1 -1
- package/lib/client/entry.d.ts.map +1 -1
- package/lib/client/entry.js +93 -0
- package/lib/client/entry.js.map +1 -1
- package/lib/client/locales.d.ts +296 -0
- package/lib/client/locales.d.ts.map +1 -1
- package/lib/client/locales.js +296 -0
- package/lib/client/locales.js.map +1 -1
- package/lib/client/session/session-labels.d.ts +9 -0
- package/lib/client/session/session-labels.d.ts.map +1 -0
- package/lib/client/session/session-labels.js +44 -0
- package/lib/client/session/session-labels.js.map +1 -0
- package/lib/client/session/session-view.d.ts +10 -0
- package/lib/client/session/session-view.d.ts.map +1 -1
- package/lib/client/session/session-view.js +57 -0
- package/lib/client/session/session-view.js.map +1 -1
- package/lib/client/session/worktree-session-order.d.ts +2 -5
- package/lib/client/session/worktree-session-order.d.ts.map +1 -1
- package/lib/client/session/worktree-session-order.js +35 -10
- package/lib/client/session/worktree-session-order.js.map +1 -1
- package/lib/client/session/worktree-session-position.d.ts +2 -1
- package/lib/client/session/worktree-session-position.d.ts.map +1 -1
- package/lib/client/session/worktree-session-position.js +10 -3
- package/lib/client/session/worktree-session-position.js.map +1 -1
- package/lib/client/surface/actions/useDragActions.d.ts +33 -2
- package/lib/client/surface/actions/useDragActions.d.ts.map +1 -1
- package/lib/client/surface/actions/useDragActions.js +66 -18
- package/lib/client/surface/actions/useDragActions.js.map +1 -1
- package/lib/client/surface/components/ActiveWorktree.d.ts +1 -1
- package/lib/client/surface/components/ActiveWorktree.d.ts.map +1 -1
- package/lib/client/surface/components/ActiveWorktree.js +4 -3
- package/lib/client/surface/components/ActiveWorktree.js.map +1 -1
- package/lib/client/surface/components/ArchivedWorktree.d.ts +1 -1
- package/lib/client/surface/components/ArchivedWorktree.d.ts.map +1 -1
- package/lib/client/surface/components/ArchivedWorktree.js +4 -3
- package/lib/client/surface/components/ArchivedWorktree.js.map +1 -1
- package/lib/client/surface/components/ArchivedWorktrees.d.ts +1 -1
- package/lib/client/surface/components/ArchivedWorktrees.d.ts.map +1 -1
- package/lib/client/surface/components/ArchivedWorktrees.js +2 -2
- package/lib/client/surface/components/ArchivedWorktrees.js.map +1 -1
- package/lib/client/surface/components/SurfaceContent.d.ts +2 -2
- package/lib/client/surface/components/SurfaceContent.d.ts.map +1 -1
- package/lib/client/surface/components/SurfaceContent.js +1 -1
- package/lib/client/surface/components/SurfaceContent.js.map +1 -1
- package/lib/client/surface/components/SurfaceHeader.d.ts +1 -1
- package/lib/client/surface/components/SurfaceHeader.d.ts.map +1 -1
- package/lib/client/surface/components/SurfaceHeader.js +12 -3
- package/lib/client/surface/components/SurfaceHeader.js.map +1 -1
- package/lib/client/surface/components/WorkspaceTree.d.ts +1 -1
- package/lib/client/surface/components/WorkspaceTree.d.ts.map +1 -1
- package/lib/client/surface/components/WorkspaceTree.js +9 -5
- package/lib/client/surface/components/WorkspaceTree.js.map +1 -1
- package/lib/client/surface/components/rows.d.ts +2 -2
- package/lib/client/surface/components/rows.d.ts.map +1 -1
- package/lib/client/surface/components/rows.js +111 -8
- package/lib/client/surface/components/rows.js.map +1 -1
- package/lib/client/surface/selectors.d.ts +10 -0
- package/lib/client/surface/selectors.d.ts.map +1 -1
- package/lib/client/surface/selectors.js +14 -0
- package/lib/client/surface/selectors.js.map +1 -1
- package/lib/client/surface/state/useSessionExpansion.d.ts +2 -1
- package/lib/client/surface/state/useSessionExpansion.d.ts.map +1 -1
- package/lib/client/surface/state/useSessionExpansion.js +26 -13
- package/lib/client/surface/state/useSessionExpansion.js.map +1 -1
- package/lib/client/surface/state/useSessionOrdering.d.ts +1 -1
- package/lib/client/surface/state/useSessionOrdering.d.ts.map +1 -1
- package/lib/client/surface/state/useSessionOrdering.js +23 -8
- package/lib/client/surface/state/useSessionOrdering.js.map +1 -1
- package/lib/client/surface/types.d.ts +23 -3
- package/lib/client/surface/types.d.ts.map +1 -1
- package/lib/client/view/WorktreeModeAction.d.ts.map +1 -1
- package/lib/client/view/WorktreeModeAction.js +8 -0
- package/lib/client/view/WorktreeModeAction.js.map +1 -1
- package/lib/client/view/view-mode-dispatch.d.ts +7 -0
- package/lib/client/view/view-mode-dispatch.d.ts.map +1 -0
- package/lib/client/view/view-mode-dispatch.js +11 -0
- package/lib/client/view/view-mode-dispatch.js.map +1 -0
- package/lib/client/view/worktree-expand-state.d.ts +1 -1
- package/lib/client/view/worktree-expand-state.d.ts.map +1 -1
- package/lib/client/view/worktree-expand-state.js +8 -1
- package/lib/client/view/worktree-expand-state.js.map +1 -1
- package/lib/client/worktree-connection.d.ts +5 -0
- package/lib/client/worktree-connection.d.ts.map +1 -1
- package/lib/client/worktree-connection.js +14 -0
- package/lib/client/worktree-connection.js.map +1 -1
- package/lib/client.js +4865 -158
- package/lib/client.js.map +1 -1
- package/lib/contract/index.contract.js +10 -0
- package/lib/contract/index.contract.js.map +1 -1
- package/lib/contract/index.d.ts +163 -1
- package/lib/contract/index.d.ts.map +1 -1
- package/lib/contract/index.js +19 -0
- package/lib/contract/index.js.map +1 -1
- package/lib/host/dsh-read-adapter.d.ts +3 -1
- package/lib/host/dsh-read-adapter.d.ts.map +1 -1
- package/lib/host/dsh-read-adapter.js +5 -2
- package/lib/host/dsh-read-adapter.js.map +1 -1
- package/lib/host/remote.d.ts.map +1 -1
- package/lib/host/remote.js +5 -0
- package/lib/host/remote.js.map +1 -1
- package/lib/host/service.d.ts +20 -1
- package/lib/host/service.d.ts.map +1 -1
- package/lib/host/service.js +32 -0
- package/lib/host/service.js.map +1 -1
- package/lib/host/worktree-instructions.d.ts +41 -0
- package/lib/host/worktree-instructions.d.ts.map +1 -0
- package/lib/host/worktree-instructions.js +65 -0
- package/lib/host/worktree-instructions.js.map +1 -0
- package/lib/index.d.ts +4 -4
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +3 -3
- package/lib/index.js.map +1 -1
- package/lib/manage/manager-git-history.d.ts +17 -0
- package/lib/manage/manager-git-history.d.ts.map +1 -0
- package/lib/manage/manager-git-history.js +717 -0
- package/lib/manage/manager-git-history.js.map +1 -0
- package/lib/manage/manager-worktrees.d.ts.map +1 -1
- package/lib/manage/manager-worktrees.js +27 -0
- package/lib/manage/manager-worktrees.js.map +1 -1
- package/lib/manage/manager.d.ts +21 -1
- package/lib/manage/manager.d.ts.map +1 -1
- package/lib/manage/manager.js +60 -0
- package/lib/manage/manager.js.map +1 -1
- package/lib/manage/types.d.ts +1 -0
- package/lib/manage/types.d.ts.map +1 -1
- package/lib/provider/git/adapter.d.ts +54 -1
- package/lib/provider/git/adapter.d.ts.map +1 -1
- package/lib/provider/git/adapter.js +820 -1
- package/lib/provider/git/adapter.js.map +1 -1
- package/lib/provider/index.d.ts +2 -2
- package/lib/provider/index.d.ts.map +1 -1
- package/lib/provider/index.js +1 -1
- package/lib/provider/index.js.map +1 -1
- package/lib/provider/mutation-token.d.ts +1 -1
- package/lib/provider/mutation-token.d.ts.map +1 -1
- package/lib/provider/mutation-token.js +1 -0
- package/lib/provider/mutation-token.js.map +1 -1
- package/lib/provider/sidecar/repository.d.ts +1 -1
- package/lib/provider/sidecar/repository.d.ts.map +1 -1
- package/lib/provider/sidecar/repository.js +7 -2
- package/lib/provider/sidecar/repository.js.map +1 -1
- package/lib/provider/sidecar/sidecar-schema.d.ts +16 -3
- package/lib/provider/sidecar/sidecar-schema.d.ts.map +1 -1
- package/lib/provider/sidecar/sidecar-schema.js +117 -28
- 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 +21 -6
- package/lib/provider/transaction/operations/create.js.map +1 -1
- package/lib/provider/transaction/operations/import.d.ts.map +1 -1
- package/lib/provider/transaction/operations/import.js +1 -0
- package/lib/provider/transaction/operations/import.js.map +1 -1
- package/lib/provider/transaction/recovery/failure-recovery.d.ts.map +1 -1
- package/lib/provider/transaction/recovery/failure-recovery.js +11 -4
- package/lib/provider/transaction/recovery/failure-recovery.js.map +1 -1
- package/lib/provider/transaction/recovery/recover.js +11 -11
- package/lib/provider/transaction/recovery/recover.js.map +1 -1
- package/lib/provider/transaction/support/inspection.d.ts +0 -2
- package/lib/provider/transaction/support/inspection.d.ts.map +1 -1
- package/lib/provider/transaction/support/inspection.js +0 -4
- package/lib/provider/transaction/support/inspection.js.map +1 -1
- package/lib/provider/transaction/support/journal.d.ts.map +1 -1
- package/lib/provider/transaction/support/journal.js +4 -0
- package/lib/provider/transaction/support/journal.js.map +1 -1
- package/lib/provider/transaction/types.d.ts +1 -0
- package/lib/provider/transaction/types.d.ts.map +1 -1
- package/lib/provider/types.d.ts +53 -5
- package/lib/provider/types.d.ts.map +1 -1
- package/lib/provider/types.js +1 -1
- package/lib/provider/types.js.map +1 -1
- package/lib/typert.host.js +349 -33
- package/lib/typert.remote-client.d.ts +11 -1
- package/lib/typert.remote-client.d.ts.map +1 -1
- package/lib/typert.remote-client.js +349 -33
- package/package.json +23 -20
|
@@ -1,7 +1,50 @@
|
|
|
1
1
|
import { useRef, useState } from 'react';
|
|
2
2
|
import { reorderSessionIds } from '../../session/worktree-session-order.js';
|
|
3
3
|
import { resolveWorktreeMove, toRetryableWorktreeOrderError, toWorktreeViewError, } from '../../view/worktree-view.js';
|
|
4
|
-
|
|
4
|
+
import { updatedAtById } from '../shared.js';
|
|
5
|
+
/**
|
|
6
|
+
* Persist one visual Session move without crossing the Worktree membership boundary.
|
|
7
|
+
* Worktree Sessions are plugin-local projections, while Main Sessions remain native DSH members.
|
|
8
|
+
*/
|
|
9
|
+
export async function commitSessionOrder(input) {
|
|
10
|
+
if (input.groupKey.startsWith('worktree:')) {
|
|
11
|
+
input.setOrder(input.groupKey, input.nextOrder, input.updatedAtById);
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
14
|
+
if (input.insertSessionBefore === undefined) {
|
|
15
|
+
throw new Error('Native Session ordering is unavailable');
|
|
16
|
+
}
|
|
17
|
+
await input.insertSessionBefore(input.workspaceId, input.sessionId, input.beforeSessionId);
|
|
18
|
+
input.setOrder(input.groupKey, input.nextOrder, input.updatedAtById);
|
|
19
|
+
}
|
|
20
|
+
/** Resolve a visual drop against the full account order, retaining filtered IDs. */
|
|
21
|
+
export function resolveSessionDragOrder(input) {
|
|
22
|
+
const targetIndex = input.visibleSessionIds.indexOf(input.over.sessionId);
|
|
23
|
+
const sourceIndex = input.visibleSessionIds.indexOf(input.sessionId);
|
|
24
|
+
if (targetIndex === -1 || sourceIndex === -1)
|
|
25
|
+
return undefined;
|
|
26
|
+
const currentOrder = [...input.currentOrder];
|
|
27
|
+
const knownIds = new Set(currentOrder);
|
|
28
|
+
for (const id of input.visibleSessionIds) {
|
|
29
|
+
if (!knownIds.has(id)) {
|
|
30
|
+
knownIds.add(id);
|
|
31
|
+
currentOrder.push(id);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
const nextOrder = reorderSessionIds(currentOrder, input.sessionId, input.over.sessionId, input.over.half);
|
|
35
|
+
if (nextOrder.length === currentOrder.length &&
|
|
36
|
+
nextOrder.every((id, index) => id === currentOrder[index])) {
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
const nextIndex = nextOrder.indexOf(input.sessionId);
|
|
40
|
+
if (nextIndex === -1)
|
|
41
|
+
return undefined;
|
|
42
|
+
return {
|
|
43
|
+
beforeSessionId: nextOrder[nextIndex + 1],
|
|
44
|
+
nextOrder,
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
export function useDragActions({ source, orderedSessionIdsByAccount, props, mutation, read, }) {
|
|
5
48
|
const { workspaces, sessionOrderSnapshot } = source;
|
|
6
49
|
const { insertWorkspaceBefore, insertSessionBefore, sessionOrder, insertWorktreeBefore } = props;
|
|
7
50
|
const { setActionError } = mutation;
|
|
@@ -49,18 +92,19 @@ export function useDragActions({ source, props, mutation, read }) {
|
|
|
49
92
|
return;
|
|
50
93
|
sessionDropCommitted.current = true;
|
|
51
94
|
setSessionDrag(undefined);
|
|
52
|
-
const
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
95
|
+
const currentOrder = orderedSessionIdsByAccount.get(activeDrag.groupKey) ??
|
|
96
|
+
sessionOrderSnapshot.accounts[activeDrag.groupKey]?.order ??
|
|
97
|
+
sessionIds;
|
|
98
|
+
const move = resolveSessionDragOrder({
|
|
99
|
+
visibleSessionIds: sessionIds,
|
|
100
|
+
currentOrder,
|
|
101
|
+
sessionId: activeDrag.sessionId,
|
|
102
|
+
over,
|
|
103
|
+
});
|
|
104
|
+
if (move === undefined)
|
|
61
105
|
return;
|
|
62
|
-
|
|
63
|
-
if (insertSessionBefore === undefined) {
|
|
106
|
+
const isWorktreeSession = activeDrag.groupKey.startsWith('worktree:');
|
|
107
|
+
if (!isWorktreeSession && insertSessionBefore === undefined) {
|
|
64
108
|
setActionError({
|
|
65
109
|
code: 'SESSION_ORDER_UNAVAILABLE',
|
|
66
110
|
message: '',
|
|
@@ -69,12 +113,16 @@ export function useDragActions({ source, props, mutation, read }) {
|
|
|
69
113
|
return;
|
|
70
114
|
}
|
|
71
115
|
setActionError(undefined);
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
.
|
|
116
|
+
void commitSessionOrder({
|
|
117
|
+
groupKey: activeDrag.groupKey,
|
|
118
|
+
workspaceId,
|
|
119
|
+
sessionId: activeDrag.sessionId,
|
|
120
|
+
beforeSessionId: move.beforeSessionId,
|
|
121
|
+
nextOrder: move.nextOrder,
|
|
122
|
+
insertSessionBefore,
|
|
123
|
+
setOrder: sessionOrder.actions.setOrder,
|
|
124
|
+
updatedAtById: updatedAtById(sessionIds, source.sessions),
|
|
125
|
+
}).catch((error) => {
|
|
78
126
|
setActionError(toWorktreeViewError(error));
|
|
79
127
|
});
|
|
80
128
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDragActions.js","sourceRoot":"","sources":["../../../../src/client/surface/actions/useDragActions.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EACL,mBAAmB,EACnB,6BAA6B,EAC7B,mBAAmB,GACpB,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"useDragActions.js","sourceRoot":"","sources":["../../../../src/client/surface/actions/useDragActions.tsx"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ type Input = {
|
|
|
6
6
|
source: Pick<WorkspaceTreeInput['source'], 'sessions' | 'archivedSessionIds' | 'currentSessionId' | 'expandSnapshot' | 'sessionPresentations'>;
|
|
7
7
|
expansion: Pick<WorkspaceTreeInput['expansion'], 'query' | 'isCurrentSessionReveal' | 'expandedSessionGroups' | 'toggleWorktree' | 'toggleSessionGroup'>;
|
|
8
8
|
ordering: Pick<WorkspaceTreeInput['ordering'], 'orderedSessionIdsByAccount'>;
|
|
9
|
-
props: Pick<WorkspaceTreeInput['props'], 't' | 'renameSession' | 'forkSession' | 'archiveSession'>;
|
|
9
|
+
props: Pick<WorkspaceTreeInput['props'], 't' | 'renameSession' | 'forkSession' | 'archiveSession' | 'openDashboard'>;
|
|
10
10
|
lifecycle: Pick<WorkspaceTreeInput['lifecycle'], 'branchLabel' | 'branchActions'>;
|
|
11
11
|
session: Pick<WorkspaceTreeInput['session'], 'createSession' | 'openWorkspaceSession'>;
|
|
12
12
|
menus: Pick<WorkspaceTreeInput['menus'], 'openWorktreeMenuId' | 'setOpenWorktreeMenuId'>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActiveWorktree.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/ActiveWorktree.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,IAAI,CACV,kBAAkB,CAAC,QAAQ,CAAC,EAC1B,UAAU,GACV,oBAAoB,GACpB,kBAAkB,GAClB,gBAAgB,GAChB,sBAAsB,CACzB,CAAC;IACF,SAAS,EAAE,IAAI,CACb,kBAAkB,CAAC,WAAW,CAAC,EAC7B,OAAO,GACP,wBAAwB,GACxB,uBAAuB,GACvB,gBAAgB,GAChB,oBAAoB,CACvB,CAAC;IACF,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,4BAA4B,CAAC,CAAC;IAC7E,KAAK,EAAE,IAAI,CACT,kBAAkB,CAAC,OAAO,CAAC,EAC3B,GAAG,GAAG,eAAe,GAAG,aAAa,GAAG,gBAAgB,
|
|
1
|
+
{"version":3,"file":"ActiveWorktree.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/ActiveWorktree.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,IAAI,CACV,kBAAkB,CAAC,QAAQ,CAAC,EAC1B,UAAU,GACV,oBAAoB,GACpB,kBAAkB,GAClB,gBAAgB,GAChB,sBAAsB,CACzB,CAAC;IACF,SAAS,EAAE,IAAI,CACb,kBAAkB,CAAC,WAAW,CAAC,EAC7B,OAAO,GACP,wBAAwB,GACxB,uBAAuB,GACvB,gBAAgB,GAChB,oBAAoB,CACvB,CAAC;IACF,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,4BAA4B,CAAC,CAAC;IAC7E,KAAK,EAAE,IAAI,CACT,kBAAkB,CAAC,OAAO,CAAC,EAC3B,GAAG,GAAG,eAAe,GAAG,aAAa,GAAG,gBAAgB,GAAG,eAAe,CAC3E,CAAC;IACF,SAAS,EAAE,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,aAAa,GAAG,eAAe,CAAC,CAAC;IAClF,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,eAAe,GAAG,sBAAsB,CAAC,CAAC;IACvF,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,uBAAuB,CAAC,CAAC;IACzF,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,eAAe,GAAG,gBAAgB,CAAC,CAAC;IACnF,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,CAAC;IAClD,YAAY,EAAE,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAAE,qBAAqB,CAAC,CAAC;IAC9E,cAAc,EAAE,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACjF,IAAI,EAAE,IAAI,CACR,kBAAkB,CAAC,MAAM,CAAC,EACxB,cAAc,GACd,uBAAuB,GACvB,iBAAiB,GACjB,oBAAoB,GACpB,aAAa,GACb,sBAAsB,GACtB,gBAAgB,GAChB,mBAAmB,CACtB,CAAC;IACF,MAAM,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,mBAAmB,GAAG,wBAAwB,CAAC,CAAC;IAC3F,QAAQ,EAAE,SAAS,cAAc,EAAE,CAAC;IACpC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,SAAS,EAAE,aAAa,CAAC;IACzB,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC,yBAAyB,EAAE,OAAO,CAAC;IACnC,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC,CAAC;AACF,wBAAgB,cAAc,CAAC,EAC7B,MAAM,EACN,MAAM,EACN,SAAS,EACT,QAAQ,EACR,KAAK,EACL,SAAS,EACT,OAAO,EACP,KAAK,EACL,QAAQ,EACR,IAAI,EACJ,YAAY,EACZ,cAAc,EACd,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,qBAAqB,EACrB,SAAS,EACT,sBAAsB,EACtB,yBAAyB,EACzB,eAAe,GAChB,EAAE,KAAK,sCA+PP"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { IconBranchOutline16 } from '@deepseek-ai/dsh-client-ui-primitives';
|
|
3
|
-
import { filterVisibleSessionIds,
|
|
3
|
+
import { filterVisibleSessionIds, aggregateSessionStatus, sessionMatchesQuery, } from '../../session/session-view.js';
|
|
4
4
|
import { isWorktreeExpanded } from '../../view/worktree-expand-state.js';
|
|
5
5
|
import { createNumberedWorktreeName, filterArchivedSessionIds } from '../../view/worktree-view.js';
|
|
6
6
|
import styles from '../../worktree.css';
|
|
@@ -52,7 +52,7 @@ export function ActiveWorktree({ record, source, expansion, ordering, props, lif
|
|
|
52
52
|
: t('worktree.ready');
|
|
53
53
|
const worktreeExpanded = isWorktreeExpanded(expandSnapshot, record.worktreeId) ||
|
|
54
54
|
isCurrentSessionReveal('worktree:' + record.worktreeId);
|
|
55
|
-
return (_jsxs("div", { className: styles.worktreeGroup, "data-worktree-id": record.worktreeId, children: [_jsx(WorktreeGroupRow, { t: t, kind: "worktree", label: branchLabel(record), worktreeId: record.worktreeId, expanded: worktreeExpanded,
|
|
55
|
+
return (_jsxs("div", { className: styles.worktreeGroup, "data-worktree-id": record.worktreeId, children: [_jsx(WorktreeGroupRow, { t: t, kind: "worktree", label: branchLabel(record), worktreeId: record.worktreeId, expanded: worktreeExpanded, groupActivityStatus: aggregateSessionStatus(worktreeSessionIds, sessionPresentations), icon: _jsx(IconBranchOutline16, {}), workspaceTitle: workspace.title, state: state, stateLabel: stateLabel, repairGuidance: record.health === 'repair'
|
|
56
56
|
? t('worktree.repairGuidance')
|
|
57
57
|
: record.health === 'recovery-needed'
|
|
58
58
|
? t('worktree.recoveryGuidance')
|
|
@@ -60,7 +60,7 @@ export function ActiveWorktree({ record, source, expansion, ordering, props, lif
|
|
|
60
60
|
? t(record.currentBranch === null ? 'worktree.detachedGuidance' : 'worktree.branchDriftGuidance')
|
|
61
61
|
: undefined, onToggle: () => {
|
|
62
62
|
toggleWorktree(record.worktreeId);
|
|
63
|
-
}, onCreateSession: record.status === 'active' &&
|
|
63
|
+
}, showDashboardAction: props.openDashboard !== undefined, onCreateSession: record.status === 'active' &&
|
|
64
64
|
record.health !== 'repair' &&
|
|
65
65
|
record.health !== 'recovery-needed'
|
|
66
66
|
? () => {
|
|
@@ -71,6 +71,7 @@ export function ActiveWorktree({ record, source, expansion, ordering, props, lif
|
|
|
71
71
|
});
|
|
72
72
|
}
|
|
73
73
|
: undefined, menu: {
|
|
74
|
+
onDashboard: props.openDashboard === undefined ? undefined : () => props.openDashboard?.(record),
|
|
74
75
|
...branchActions(record),
|
|
75
76
|
open: openWorktreeMenuId === record.worktreeId,
|
|
76
77
|
label: record.branch,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActiveWorktree.js","sourceRoot":"","sources":["../../../../src/client/surface/components/ActiveWorktree.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EACL,uBAAuB,EACvB,
|
|
1
|
+
{"version":3,"file":"ActiveWorktree.js","sourceRoot":"","sources":["../../../../src/client/surface/components/ActiveWorktree.tsx"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ type Input = {
|
|
|
6
6
|
source: Pick<ArchivedWorktreesInput['source'], 'sessions' | 'archivedSessionIds' | 'currentSessionId' | 'expandSnapshot' | 'sessionPresentations'>;
|
|
7
7
|
expansion: Pick<ArchivedWorktreesInput['expansion'], 'query' | 'isCurrentSessionReveal' | 'expandedSessionGroups' | 'toggleWorktree' | 'toggleSessionGroup'>;
|
|
8
8
|
ordering: Pick<ArchivedWorktreesInput['ordering'], 'orderedSessionIdsByAccount'>;
|
|
9
|
-
props: Pick<ArchivedWorktreesInput['props'], 't' | 'manager' | 'renameSession' | 'forkSession' | 'archiveSession'>;
|
|
9
|
+
props: Pick<ArchivedWorktreesInput['props'], 't' | 'manager' | 'renameSession' | 'forkSession' | 'archiveSession' | 'openDashboard'>;
|
|
10
10
|
lifecycle: Pick<ArchivedWorktreesInput['lifecycle'], 'branchLabel' | 'branchActions'>;
|
|
11
11
|
mutation: Pick<ArchivedWorktreesInput['mutation'], 'actionPending' | 'setActionError' | 'runMutation'>;
|
|
12
12
|
menus: Pick<ArchivedWorktreesInput['menus'], 'openWorktreeMenuId' | 'setOpenWorktreeMenuId'>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArchivedWorktree.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/ArchivedWorktree.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AASjF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAQrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,IAAI,CACV,sBAAsB,CAAC,QAAQ,CAAC,EAC9B,UAAU,GACV,oBAAoB,GACpB,kBAAkB,GAClB,gBAAgB,GAChB,sBAAsB,CACzB,CAAC;IACF,SAAS,EAAE,IAAI,CACb,sBAAsB,CAAC,WAAW,CAAC,EACjC,OAAO,GACP,wBAAwB,GACxB,uBAAuB,GACvB,gBAAgB,GAChB,oBAAoB,CACvB,CAAC;IACF,QAAQ,EAAE,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,EAAE,4BAA4B,CAAC,CAAC;IACjF,KAAK,EAAE,IAAI,CACT,sBAAsB,CAAC,OAAO,CAAC,EAC/B,GAAG,GAAG,SAAS,GAAG,eAAe,GAAG,aAAa,GAAG,gBAAgB,
|
|
1
|
+
{"version":3,"file":"ArchivedWorktree.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/ArchivedWorktree.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AASjF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAQrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,IAAI,CACV,sBAAsB,CAAC,QAAQ,CAAC,EAC9B,UAAU,GACV,oBAAoB,GACpB,kBAAkB,GAClB,gBAAgB,GAChB,sBAAsB,CACzB,CAAC;IACF,SAAS,EAAE,IAAI,CACb,sBAAsB,CAAC,WAAW,CAAC,EACjC,OAAO,GACP,wBAAwB,GACxB,uBAAuB,GACvB,gBAAgB,GAChB,oBAAoB,CACvB,CAAC;IACF,QAAQ,EAAE,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,EAAE,4BAA4B,CAAC,CAAC;IACjF,KAAK,EAAE,IAAI,CACT,sBAAsB,CAAC,OAAO,CAAC,EAC/B,GAAG,GAAG,SAAS,GAAG,eAAe,GAAG,aAAa,GAAG,gBAAgB,GAAG,eAAe,CACvF,CAAC;IACF,SAAS,EAAE,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,EAAE,aAAa,GAAG,eAAe,CAAC,CAAC;IACtF,QAAQ,EAAE,IAAI,CACZ,sBAAsB,CAAC,UAAU,CAAC,EAClC,eAAe,GAAG,gBAAgB,GAAG,aAAa,CACnD,CAAC;IACF,KAAK,EAAE,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,uBAAuB,CAAC,CAAC;IAC7F,IAAI,EAAE,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,CAAC;IACtD,cAAc,EAAE,IAAI,CAClB,sBAAsB,CAAC,gBAAgB,CAAC,EACxC,sBAAsB,GAAG,mBAAmB,CAC7C,CAAC;IACF,IAAI,EAAE,IAAI,CACR,sBAAsB,CAAC,MAAM,CAAC,EAC9B,aAAa,GAAG,sBAAsB,GAAG,gBAAgB,GAAG,mBAAmB,CAChF,CAAC;IACF,OAAO,EAAE,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,sBAAsB,CAAC,CAAC;IACzE,MAAM,EAAE,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,EAAE,mBAAmB,GAAG,wBAAwB,CAAC,CAAC;IAC/F,QAAQ,EAAE,SAAS,cAAc,EAAE,CAAC;IACpC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,SAAS,EAAE,aAAa,CAAC;CAC1B,CAAC;AACF,wBAAgB,gBAAgB,CAAC,EAC/B,MAAM,EACN,MAAM,EACN,SAAS,EACT,QAAQ,EACR,KAAK,EACL,SAAS,EACT,QAAQ,EACR,KAAK,EACL,IAAI,EACJ,cAAc,EACd,IAAI,EACJ,OAAO,EACP,MAAM,EACN,QAAQ,EACR,qBAAqB,EACrB,SAAS,GACV,EAAE,KAAK,sCA8NP"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { IconBranchOutline16 } from '@deepseek-ai/dsh-client-ui-primitives';
|
|
3
|
-
import { filterVisibleSessionIds,
|
|
3
|
+
import { filterVisibleSessionIds, aggregateSessionStatus, sessionMatchesQuery, } from '../../session/session-view.js';
|
|
4
4
|
import { isWorktreeExpanded } from '../../view/worktree-expand-state.js';
|
|
5
5
|
import { executeWorktreeAction, filterArchivedSessionIds } from '../../view/worktree-view.js';
|
|
6
6
|
import styles from '../../worktree.css';
|
|
@@ -55,12 +55,13 @@ export function ArchivedWorktree({ record, source, expansion, ordering, props, l
|
|
|
55
55
|
: t('worktree.detached');
|
|
56
56
|
const worktreeExpanded = isWorktreeExpanded(expandSnapshot, record.worktreeId) ||
|
|
57
57
|
isCurrentSessionReveal('worktree:' + record.worktreeId);
|
|
58
|
-
return (_jsxs("div", { className: styles.worktreeGroup, "data-worktree-id": record.worktreeId, children: [_jsx(WorktreeGroupRow, { t: t, kind: "worktree", label: branchLabel(record), worktreeId: record.worktreeId, expanded: worktreeExpanded,
|
|
58
|
+
return (_jsxs("div", { className: styles.worktreeGroup, "data-worktree-id": record.worktreeId, children: [_jsx(WorktreeGroupRow, { t: t, kind: "worktree", label: branchLabel(record), worktreeId: record.worktreeId, expanded: worktreeExpanded, groupActivityStatus: aggregateSessionStatus(worktreeSessionIds, sessionPresentations), icon: _jsx(IconBranchOutline16, {}), workspaceTitle: workspace.title, state: state, stateLabel: stateLabel, onToggle: () => {
|
|
59
59
|
toggleWorktree(record.worktreeId);
|
|
60
|
-
}, menu: (() => {
|
|
60
|
+
}, showDashboardAction: props.openDashboard !== undefined, menu: (() => {
|
|
61
61
|
const activityBlocked = worktreeLifecycleBlockReason(actionPending, record.health);
|
|
62
62
|
const blockedReasonText = activityBlocked === 'recovery' ? t('worktree.recovery') : undefined;
|
|
63
63
|
return {
|
|
64
|
+
onDashboard: props.openDashboard === undefined ? undefined : () => props.openDashboard?.(record),
|
|
64
65
|
...branchActions(record),
|
|
65
66
|
open: openWorktreeMenuId === record.worktreeId,
|
|
66
67
|
label: record.branch,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArchivedWorktree.js","sourceRoot":"","sources":["../../../../src/client/surface/components/ArchivedWorktree.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAE5E,OAAO,EACL,uBAAuB,EACvB,
|
|
1
|
+
{"version":3,"file":"ArchivedWorktree.js","sourceRoot":"","sources":["../../../../src/client/surface/components/ArchivedWorktree.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import type { SessionBinding, WorktreeRecord } from '../../../contract/index.js'
|
|
|
3
3
|
import type { WorkspaceLike } from '../types.js';
|
|
4
4
|
export type ArchivedWorktreesInput = {
|
|
5
5
|
expansion: Pick<WorkspaceTreeInput['expansion'], 'isCurrentSessionReveal' | 'expandedArchivedWorkspaces' | 'toggleArchivedWorkspace' | 'query' | 'expandedSessionGroups' | 'toggleWorktree' | 'toggleSessionGroup'>;
|
|
6
|
-
props: Pick<WorkspaceTreeInput['props'], 't' | 'manager' | 'renameSession' | 'forkSession' | 'archiveSession'>;
|
|
6
|
+
props: Pick<WorkspaceTreeInput['props'], 't' | 'manager' | 'renameSession' | 'forkSession' | 'archiveSession' | 'openDashboard'>;
|
|
7
7
|
source: Pick<WorkspaceTreeInput['source'], 'sessions' | 'archivedSessionIds' | 'sessionPresentations' | 'currentSessionId' | 'expandSnapshot'>;
|
|
8
8
|
ordering: Pick<WorkspaceTreeInput['ordering'], 'orderedSessionIdsByAccount'>;
|
|
9
9
|
lifecycle: Pick<WorkspaceTreeInput['lifecycle'], 'branchLabel' | 'branchActions'>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArchivedWorktrees.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/ArchivedWorktrees.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,IAAI,CACb,kBAAkB,CAAC,WAAW,CAAC,EAC7B,wBAAwB,GACxB,4BAA4B,GAC5B,yBAAyB,GACzB,OAAO,GACP,uBAAuB,GACvB,gBAAgB,GAChB,oBAAoB,CACvB,CAAC;IACF,KAAK,EAAE,IAAI,CACT,kBAAkB,CAAC,OAAO,CAAC,EAC3B,GAAG,GAAG,SAAS,GAAG,eAAe,GAAG,aAAa,GAAG,gBAAgB,
|
|
1
|
+
{"version":3,"file":"ArchivedWorktrees.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/ArchivedWorktrees.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,IAAI,CACb,kBAAkB,CAAC,WAAW,CAAC,EAC7B,wBAAwB,GACxB,4BAA4B,GAC5B,yBAAyB,GACzB,OAAO,GACP,uBAAuB,GACvB,gBAAgB,GAChB,oBAAoB,CACvB,CAAC;IACF,KAAK,EAAE,IAAI,CACT,kBAAkB,CAAC,OAAO,CAAC,EAC3B,GAAG,GAAG,SAAS,GAAG,eAAe,GAAG,aAAa,GAAG,gBAAgB,GAAG,eAAe,CACvF,CAAC;IACF,MAAM,EAAE,IAAI,CACV,kBAAkB,CAAC,QAAQ,CAAC,EAC1B,UAAU,GACV,oBAAoB,GACpB,sBAAsB,GACtB,kBAAkB,GAClB,gBAAgB,CACnB,CAAC;IACF,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,4BAA4B,CAAC,CAAC;IAC7E,SAAS,EAAE,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,aAAa,GAAG,eAAe,CAAC,CAAC;IAClF,QAAQ,EAAE,IAAI,CACZ,kBAAkB,CAAC,UAAU,CAAC,EAC9B,eAAe,GAAG,gBAAgB,GAAG,aAAa,CACnD,CAAC;IACF,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,uBAAuB,CAAC,CAAC;IACzF,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,CAAC;IAClD,cAAc,EAAE,IAAI,CAClB,kBAAkB,CAAC,gBAAgB,CAAC,EACpC,sBAAsB,GAAG,mBAAmB,CAC7C,CAAC;IACF,IAAI,EAAE,IAAI,CACR,kBAAkB,CAAC,MAAM,CAAC,EAC1B,aAAa,GAAG,sBAAsB,GAAG,gBAAgB,GAAG,mBAAmB,CAChF,CAAC;IACF,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,sBAAsB,CAAC,CAAC;IACrE,MAAM,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,mBAAmB,GAAG,wBAAwB,CAAC,CAAC;IAC3F,SAAS,EAAE,aAAa,CAAC;IACzB,iBAAiB,EAAE,cAAc,EAAE,CAAC;IACpC,QAAQ,EAAE,SAAS,cAAc,EAAE,CAAC;IACpC,qBAAqB,EAAE,OAAO,CAAC;CAChC,CAAC;AACF,KAAK,KAAK,GAAG,sBAAsB,CAAC;AACpC,wBAAgB,iBAAiB,CAAC,EAChC,SAAS,EACT,KAAK,EACL,MAAM,EACN,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,KAAK,EACL,IAAI,EACJ,cAAc,EACd,IAAI,EACJ,OAAO,EACP,MAAM,EACN,SAAS,EACT,iBAAiB,EACjB,QAAQ,EACR,qBAAqB,GACtB,EAAE,KAAK,+BA4DP"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { IconArchiveOutline20 } from '@deepseek-ai/dsh-client-ui-primitives';
|
|
3
|
-
import {
|
|
3
|
+
import { aggregateSessionStatus } from '../../session/session-view.js';
|
|
4
4
|
import { filterArchivedSessionIds } from '../../view/worktree-view.js';
|
|
5
5
|
import styles from '../../worktree.css';
|
|
6
6
|
import { ArchivedWorktree } from './ArchivedWorktree.js';
|
|
@@ -13,7 +13,7 @@ export function ArchivedWorktrees({ expansion, props, source, ordering, lifecycl
|
|
|
13
13
|
const archivedKey = 'archived:' + workspace.workspaceId;
|
|
14
14
|
const isArchivedAutoExpanded = isCurrentSessionReveal(archivedKey);
|
|
15
15
|
const isArchivedExpanded = expandedArchivedWorkspaces[workspace.workspaceId] === true || isArchivedAutoExpanded;
|
|
16
|
-
return (_jsxs("div", { className: styles.archivedGroup, "data-archived-group": true, children: [_jsx(WorktreeGroupRow, { t: t, kind: "archived-group", label: `${t('worktree.archivedGroup')} (${archivedWorktrees.length})`, expanded: isArchivedExpanded,
|
|
16
|
+
return (_jsxs("div", { className: styles.archivedGroup, "data-archived-group": true, children: [_jsx(WorktreeGroupRow, { t: t, kind: "archived-group", label: `${t('worktree.archivedGroup')} (${archivedWorktrees.length})`, expanded: isArchivedExpanded, groupActivityStatus: aggregateSessionStatus(filterArchivedSessionIds(archivedWorktrees.flatMap((record) => bindingIdsFor(bindings, record.worktreeId).filter((sessionId) => sessions.ids.includes(sessionId))), archivedSessionIds), sessionPresentations), icon: _jsx(IconArchiveOutline20, { size: 16 }), workspaceTitle: workspace.title, onToggle: () => {
|
|
17
17
|
toggleArchivedWorkspace(workspace.workspaceId);
|
|
18
18
|
} }), isArchivedExpanded && (_jsx("div", { className: styles.treeChildren, children: archivedWorktrees.map((record) => (_jsx(ArchivedWorktree, { record: record, source: source, expansion: expansion, ordering: ordering, props: props, lifecycle: lifecycle, mutation: mutation, menus: menus, read: read, lifecycleState: lifecycleState, drag: drag, session: session, native: native, bindings: bindings, workspaceMatchesQuery: workspaceMatchesQuery, workspace: workspace }, record.worktreeId))) }))] }));
|
|
19
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArchivedWorktrees.js","sourceRoot":"","sources":["../../../../src/client/surface/components/ArchivedWorktrees.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ArchivedWorktrees.js","sourceRoot":"","sources":["../../../../src/client/surface/components/ArchivedWorktrees.tsx"],"names":[],"mappings":"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"}
|
|
@@ -13,12 +13,12 @@ import type { useSurfaceSources } from '../state/useSurfaceSources.js';
|
|
|
13
13
|
import type { useWorktreeRegistration } from '../actions/useWorktreeRegistration.js';
|
|
14
14
|
type Input = {
|
|
15
15
|
source: Pick<ReturnType<typeof useSurfaceSources>, 'permissionNoticeSnapshot' | 'forkRecoverySnapshot' | 'expandSnapshot' | 'workspaces' | 'sessions' | 'archivedSessionIds' | 'sessionPresentations' | 'currentSessionId'>;
|
|
16
|
-
props: Pick<WorktreeSurfaceProps, 't' | 'retryForkSession' | 'openSession' | 'createMainSession' | 'renameSession' | 'forkSession' | 'archiveSession' | 'manager'>;
|
|
16
|
+
props: Pick<WorktreeSurfaceProps, 't' | 'openDashboard' | 'retryForkSession' | 'openSession' | 'createMainSession' | 'renameSession' | 'forkSession' | 'archiveSession' | 'manager'>;
|
|
17
17
|
lifecycle: Pick<ReturnType<typeof useLifecycleActions>, 'permissionRetryTarget' | 'retryCleanupPermissions' | 'recoveryAction' | 'branchLabel' | 'branchActions'>;
|
|
18
18
|
mutation: Pick<ReturnType<typeof useSurfaceMutation>, 'actionPending' | 'actionError' | 'setActionError' | 'runMutation'>;
|
|
19
19
|
session: Pick<ReturnType<typeof useSessionActions>, 'forkRetryKey' | 'retryForkBinding' | 'pendingSessionBinding' | 'pendingSessionArchived' | 'retrySessionBinding' | 'setPendingSessionBinding' | 'createSession' | 'openWorkspaceSession'>;
|
|
20
20
|
read: Pick<ReturnType<typeof useSurfaceRefresh>, 'refresh' | 'readState' | 'viewByWorkspace'>;
|
|
21
|
-
expansion: Pick<ReturnType<typeof useSessionExpansion>, 'isCurrentSessionReveal' | 'query' | 'expandedSessionGroups' | 'toggleWorkspace' | 'toggleMain' | 'toggleSessionGroup' | 'toggleWorktree' | 'expandedArchivedWorkspaces' | 'toggleArchivedWorkspace'>;
|
|
21
|
+
expansion: Pick<ReturnType<typeof useSessionExpansion>, 'contentRef' | 'isCurrentSessionReveal' | 'query' | 'expandedSessionGroups' | 'toggleWorkspace' | 'toggleMain' | 'toggleSessionGroup' | 'toggleWorktree' | 'expandedArchivedWorkspaces' | 'toggleArchivedWorkspace'>;
|
|
22
22
|
ordering: Pick<ReturnType<typeof useSessionOrdering>, 'orderedSessionIdsByAccount'>;
|
|
23
23
|
drag: Pick<ReturnType<typeof useDragActions>, 'worktreeDrag' | 'workspaceDrag' | 'workspaceDropCommitted' | 'setWorkspaceDrag' | 'commitWorkspaceDrag' | 'sessionDrag' | 'sessionDropCommitted' | 'setSessionDrag' | 'commitSessionDrag' | 'worktreeDropCommitted' | 'setWorktreeDrag' | 'commitWorktreeDrag'>;
|
|
24
24
|
menus: Pick<ReturnType<typeof useSurfaceMenus>, 'openWorkspaceMenuId' | 'setOpenWorkspaceMenuId' | 'openMainMenuId' | 'setOpenMainMenuId' | 'openWorktreeMenuId' | 'setOpenWorktreeMenuId'>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SurfaceContent.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/SurfaceContent.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"SurfaceContent.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/SurfaceContent.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAErF,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,IAAI,CACV,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAClC,0BAA0B,GAC1B,sBAAsB,GACtB,gBAAgB,GAChB,YAAY,GACZ,UAAU,GACV,oBAAoB,GACpB,sBAAsB,GACtB,kBAAkB,CACrB,CAAC;IACF,KAAK,EAAE,IAAI,CACT,oBAAoB,EAClB,GAAG,GACH,eAAe,GACf,kBAAkB,GAClB,aAAa,GACb,mBAAmB,GACnB,eAAe,GACf,aAAa,GACb,gBAAgB,GAChB,SAAS,CACZ,CAAC;IACF,SAAS,EAAE,IAAI,CACb,UAAU,CAAC,OAAO,mBAAmB,CAAC,EACpC,uBAAuB,GACvB,yBAAyB,GACzB,gBAAgB,GAChB,aAAa,GACb,eAAe,CAClB,CAAC;IACF,QAAQ,EAAE,IAAI,CACZ,UAAU,CAAC,OAAO,kBAAkB,CAAC,EACrC,eAAe,GAAG,aAAa,GAAG,gBAAgB,GAAG,aAAa,CACnE,CAAC;IACF,OAAO,EAAE,IAAI,CACX,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAClC,cAAc,GACd,kBAAkB,GAClB,uBAAuB,GACvB,wBAAwB,GACxB,qBAAqB,GACrB,0BAA0B,GAC1B,eAAe,GACf,sBAAsB,CACzB,CAAC;IACF,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,SAAS,GAAG,WAAW,GAAG,iBAAiB,CAAC,CAAC;IAC9F,SAAS,EAAE,IAAI,CACb,UAAU,CAAC,OAAO,mBAAmB,CAAC,EACpC,YAAY,GACZ,wBAAwB,GACxB,OAAO,GACP,uBAAuB,GACvB,iBAAiB,GACjB,YAAY,GACZ,oBAAoB,GACpB,gBAAgB,GAChB,4BAA4B,GAC5B,yBAAyB,CAC5B,CAAC;IACF,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAAE,4BAA4B,CAAC,CAAC;IACpF,IAAI,EAAE,IAAI,CACR,UAAU,CAAC,OAAO,cAAc,CAAC,EAC/B,cAAc,GACd,eAAe,GACf,wBAAwB,GACxB,kBAAkB,GAClB,qBAAqB,GACrB,aAAa,GACb,sBAAsB,GACtB,gBAAgB,GAChB,mBAAmB,GACnB,uBAAuB,GACvB,iBAAiB,GACjB,oBAAoB,CACvB,CAAC;IACF,KAAK,EAAE,IAAI,CACT,UAAU,CAAC,OAAO,eAAe,CAAC,EAChC,qBAAqB,GACrB,wBAAwB,GACxB,gBAAgB,GAChB,mBAAmB,GACnB,oBAAoB,GACpB,uBAAuB,CAC1B,CAAC;IACF,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,uBAAuB,CAAC,EAAE,qBAAqB,CAAC,CAAC;IACtF,MAAM,EAAE,IAAI,CACV,UAAU,CAAC,OAAO,gBAAgB,CAAC,EACnC,qBAAqB,GAAG,qBAAqB,GAAG,mBAAmB,GAAG,wBAAwB,CAC/F,CAAC;IACF,cAAc,EAAE,IAAI,CAClB,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpC,oBAAoB,GAAG,sBAAsB,GAAG,mBAAmB,CACpE,CAAC;CACH,CAAC;AAKF,wBAAgB,cAAc,CAAC,EAC7B,MAAM,EACN,KAAK,EACL,SAAS,EACT,QAAQ,EACR,OAAO,EACP,IAAI,EACJ,SAAS,EACT,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,YAAY,EACZ,MAAM,EACN,cAAc,GACf,EAAE,KAAK,+BA+NP"}
|
|
@@ -33,7 +33,7 @@ export function SurfaceContent({ source, props, lifecycle, mutation, session, re
|
|
|
33
33
|
if (readState.status === 'error' && readState.error !== undefined) {
|
|
34
34
|
addNotice('read', formatWorktreeViewError(readState.error, t));
|
|
35
35
|
}
|
|
36
|
-
return (_jsxs("div", { className: styles.content, tabIndex: 0, children: [_jsx(NotificationToasts, { notices: notices, detailsLabel: t('notice.details') }), notices.length > 0 && (_jsxs("details", { className: styles.notificationDetails, children: [_jsxs("summary", { children: [t('notice.details'), " (", notices.length, ")"] }), permissionNoticeSnapshot !== undefined && (_jsxs("div", { className: styles.notice, role: "status", "data-worktree-permission-notice": true, children: [_jsx("p", { className: styles.message, children: formatWorktreePermissionNotice(permissionNoticeSnapshot.result, t) }), permissionRetryTarget !== undefined && (_jsx("button", { type: "button", className: styles.retryButton, disabled: actionPending, onClick: retryCleanupPermissions, children: t('action.retry') }))] })), forkRecoverySnapshot.pending.map((recovery) => {
|
|
36
|
+
return (_jsxs("div", { ref: expansion.contentRef, className: styles.content, tabIndex: 0, children: [_jsx(NotificationToasts, { notices: notices, detailsLabel: t('notice.details') }), notices.length > 0 && (_jsxs("details", { className: styles.notificationDetails, children: [_jsxs("summary", { children: [t('notice.details'), " (", notices.length, ")"] }), permissionNoticeSnapshot !== undefined && (_jsxs("div", { className: styles.notice, role: "status", "data-worktree-permission-notice": true, children: [_jsx("p", { className: styles.message, children: formatWorktreePermissionNotice(permissionNoticeSnapshot.result, t) }), permissionRetryTarget !== undefined && (_jsx("button", { type: "button", className: styles.retryButton, disabled: actionPending, onClick: retryCleanupPermissions, children: t('action.retry') }))] })), forkRecoverySnapshot.pending.map((recovery) => {
|
|
37
37
|
const recoveryViewError = forkRecoveryError(recovery);
|
|
38
38
|
return (_jsxs("div", { className: styles.error, role: "alert", "data-fork-recovery": recovery.key, children: [_jsx("p", { className: styles.message, "data-error": "true", children: formatWorktreeViewError(recoveryViewError, t) }), _jsxs("div", { className: styles.recoveryActions, children: [retryForkSession !== undefined && recoveryViewError.retryable && (_jsx("button", { type: "button", className: styles.actionButton, disabled: forkRetryKey !== undefined, onClick: () => {
|
|
39
39
|
void retryForkBinding(recovery.key);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SurfaceContent.js","sourceRoot":"","sources":["../../../../src/client/surface/components/SurfaceContent.tsx"],"names":[],"mappings":";AAAA,OAAO,EACL,8BAA8B,EAC9B,uBAAuB,GACxB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"SurfaceContent.js","sourceRoot":"","sources":["../../../../src/client/surface/components/SurfaceContent.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import type { useSurfaceMutation } from '../actions/useSurfaceMutation.js';
|
|
|
4
4
|
import type { useSurfaceRefresh } from '../state/useSurfaceRefresh.js';
|
|
5
5
|
import type { useSurfaceSources } from '../state/useSurfaceSources.js';
|
|
6
6
|
type Input = {
|
|
7
|
-
expansion: Pick<ReturnType<typeof useSessionExpansion>, 'searchExpanded' | 'searchRoot' | 'setSearchExpanded' | 'searchInput' | 'searchQuery' | 'setSearchQuery' | 'setExpandedArchivedWorkspaces' | 'setExpandedSessionGroups' | 'setCurrentSessionReveal'>;
|
|
7
|
+
expansion: Pick<ReturnType<typeof useSessionExpansion>, 'searchExpanded' | 'searchRoot' | 'setSearchExpanded' | 'searchInput' | 'searchQuery' | 'setSearchQuery' | 'setExpandedArchivedWorkspaces' | 'setExpandedSessionGroups' | 'setCurrentSessionReveal' | 'currentSessionLocation'>;
|
|
8
8
|
props: Pick<WorktreeSurfaceProps, 't' | 'expandState' | 'createWorkspace' | 'actions'>;
|
|
9
9
|
source: Pick<ReturnType<typeof useSurfaceSources>, 'workspaceIds'>;
|
|
10
10
|
read: Pick<ReturnType<typeof useSurfaceRefresh>, 'readState'>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SurfaceHeader.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/SurfaceHeader.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,KAAK,KAAK,GAAG;IACX,SAAS,EAAE,IAAI,CACb,UAAU,CAAC,OAAO,mBAAmB,CAAC,EACpC,gBAAgB,GAChB,YAAY,GACZ,mBAAmB,GACnB,aAAa,GACb,aAAa,GACb,gBAAgB,GAChB,+BAA+B,GAC/B,0BAA0B,GAC1B,yBAAyB,
|
|
1
|
+
{"version":3,"file":"SurfaceHeader.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/SurfaceHeader.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,KAAK,KAAK,GAAG;IACX,SAAS,EAAE,IAAI,CACb,UAAU,CAAC,OAAO,mBAAmB,CAAC,EACpC,gBAAgB,GAChB,YAAY,GACZ,mBAAmB,GACnB,aAAa,GACb,aAAa,GACb,gBAAgB,GAChB,+BAA+B,GAC/B,0BAA0B,GAC1B,yBAAyB,GACzB,wBAAwB,CAC3B,CAAC;IACF,KAAK,EAAE,IAAI,CAAC,oBAAoB,EAAE,GAAG,GAAG,aAAa,GAAG,iBAAiB,GAAG,SAAS,CAAC,CAAC;IACvF,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,cAAc,CAAC,CAAC;IACnE,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,WAAW,CAAC,CAAC;IAC9D,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAAE,aAAa,CAAC,CAAC;CACtE,CAAC;AAEF,wBAAgB,aAAa,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,KAAK,+BA6IhF"}
|
|
@@ -3,11 +3,17 @@ import { IconCloseFill14, IconCloseOutline16, IconProjectAddOutline16, IconSearc
|
|
|
3
3
|
import styles from '../../worktree.css';
|
|
4
4
|
import { cx, IconCollapseAll16 } from '../shared.js';
|
|
5
5
|
export function SurfaceHeader({ expansion, props, source, read, mutation }) {
|
|
6
|
-
const { searchExpanded, searchRoot, setSearchExpanded, searchInput, searchQuery, setSearchQuery, setExpandedArchivedWorkspaces, setExpandedSessionGroups, setCurrentSessionReveal, } = expansion;
|
|
6
|
+
const { searchExpanded, searchRoot, setSearchExpanded, searchInput, searchQuery, setSearchQuery, setExpandedArchivedWorkspaces, setExpandedSessionGroups, setCurrentSessionReveal, currentSessionLocation, } = expansion;
|
|
7
7
|
const { t, expandState, createWorkspace, actions } = props;
|
|
8
8
|
const { workspaceIds } = source;
|
|
9
9
|
const { readState } = read;
|
|
10
10
|
const { runMutation } = mutation;
|
|
11
|
+
const currentWorkspaceId = currentSessionLocation?.workspaceId;
|
|
12
|
+
const currentWorktreeId = currentSessionLocation?.kind === 'worktree' ? currentSessionLocation.worktreeId : undefined;
|
|
13
|
+
const targetWorkspaceIds = workspaceIds.filter((id) => id !== currentWorkspaceId);
|
|
14
|
+
const worktreeIds = readState.views
|
|
15
|
+
.flatMap((view) => view.worktrees.map((record) => record.worktreeId))
|
|
16
|
+
.filter((worktreeId) => worktreeId !== currentWorktreeId);
|
|
11
17
|
return (_jsx(_Fragment, { children: _jsxs("header", { className: styles.header, children: [_jsx("span", { className: cx(styles.title, searchExpanded && styles.titleHidden), children: t('worktree.title') }), _jsx("div", { className: cx(styles.searchSlot, searchExpanded && styles.searchSlotExpanded), children: _jsxs("div", { ref: searchRoot, className: cx(styles.search, searchExpanded && styles.searchExpanded), onClick: () => {
|
|
12
18
|
if (!searchExpanded) {
|
|
13
19
|
setSearchExpanded(true);
|
|
@@ -28,8 +34,11 @@ export function SurfaceHeader({ expansion, props, source, read, mutation }) {
|
|
|
28
34
|
setSearchQuery('');
|
|
29
35
|
setSearchExpanded(false);
|
|
30
36
|
}, children: _jsx(IconCloseFill14, {}) }))] }) }), _jsxs("div", { className: cx(styles.headerActions, searchExpanded && styles.headerActionsHidden), children: [_jsx(Tooltip, { label: t('workspace.collapseAll'), side: "bottom", delayMs: 500, children: _jsx("button", { type: "button", className: styles.iconButton, "aria-label": t('workspace.collapseAll'), onClick: () => {
|
|
31
|
-
|
|
32
|
-
|
|
37
|
+
// Keep the current Session's workspace and worktree expanded in state,
|
|
38
|
+
// while collapsing all other unrelated workspaces and worktrees, and collapsing all Main groups.
|
|
39
|
+
if (currentSessionLocation === undefined)
|
|
40
|
+
setCurrentSessionReveal(undefined);
|
|
41
|
+
expandState.actions.collapseAll(targetWorkspaceIds, worktreeIds, workspaceIds);
|
|
33
42
|
setExpandedArchivedWorkspaces({});
|
|
34
43
|
setExpandedSessionGroups({});
|
|
35
44
|
}, children: _jsx(IconCollapseAll16, {}) }) }), _jsx(Tooltip, { label: t('workspace.add'), side: "bottom", delayMs: 500, children: _jsx("button", { type: "button", className: styles.iconButton, "aria-label": t('workspace.add'), onClick: () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SurfaceHeader.js","sourceRoot":"","sources":["../../../../src/client/surface/components/SurfaceHeader.tsx"],"names":[],"mappings":";AAAA,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,uBAAuB,EACvB,mBAAmB,EACnB,OAAO,GACR,MAAM,uCAAuC,CAAC;AAC/C,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,EAAE,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"SurfaceHeader.js","sourceRoot":"","sources":["../../../../src/client/surface/components/SurfaceHeader.tsx"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ import type { useSurfaceRefresh } from '../state/useSurfaceRefresh.js';
|
|
|
12
12
|
import type { useSurfaceSources } from '../state/useSurfaceSources.js';
|
|
13
13
|
import type { useWorktreeRegistration } from '../actions/useWorktreeRegistration.js';
|
|
14
14
|
export type WorkspaceTreeInput = {
|
|
15
|
-
props: Pick<WorktreeSurfaceProps, 't' | 'createMainSession' | 'openSession' | 'renameSession' | 'forkSession' | 'archiveSession' | 'manager'>;
|
|
15
|
+
props: Pick<WorktreeSurfaceProps, 't' | 'openDashboard' | 'createMainSession' | 'openSession' | 'renameSession' | 'forkSession' | 'archiveSession' | 'manager'>;
|
|
16
16
|
read: Pick<ReturnType<typeof useSurfaceRefresh>, 'viewByWorkspace' | 'refresh'>;
|
|
17
17
|
source: Pick<ReturnType<typeof useSurfaceSources>, 'expandSnapshot' | 'workspaces' | 'sessions' | 'archivedSessionIds' | 'sessionPresentations' | 'currentSessionId'>;
|
|
18
18
|
expansion: Pick<ReturnType<typeof useSessionExpansion>, 'isCurrentSessionReveal' | 'query' | 'expandedSessionGroups' | 'toggleWorkspace' | 'toggleMain' | 'toggleSessionGroup' | 'toggleWorktree' | 'expandedArchivedWorkspaces' | 'toggleArchivedWorkspace'>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkspaceTree.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/WorkspaceTree.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"WorkspaceTree.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/components/WorkspaceTree.tsx"],"names":[],"mappings":"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"}
|