@cerbur/clutch-dsh-worktree 0.1.12 → 0.1.14
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 +312 -433
- package/README.zh.md +265 -348
- package/assets/screenshots/screenshots-dashboard.png +0 -0
- package/assets/screenshots/screenshots-git-reviewer.png +0 -0
- package/lib/client/WorktreeSurface.d.ts.map +1 -1
- package/lib/client/WorktreeSurface.js +140 -18
- 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/WorktreeDashboard.d.ts +9 -2
- package/lib/client/dashboard/WorktreeDashboard.d.ts.map +1 -1
- package/lib/client/dashboard/WorktreeDashboard.js +165 -14
- package/lib/client/dashboard/WorktreeDashboard.js.map +1 -1
- 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 +7 -2
- package/lib/client/dashboard/dashboard-overlay.d.ts.map +1 -1
- package/lib/client/dashboard/dashboard-overlay.js +81 -16
- package/lib/client/dashboard/dashboard-overlay.js.map +1 -1
- package/lib/client/dashboard/dashboard-selection.d.ts +5 -3
- package/lib/client/dashboard/dashboard-selection.d.ts.map +1 -1
- package/lib/client/dashboard/dashboard-selection.js +3 -2
- package/lib/client/dashboard/dashboard-selection.js.map +1 -1
- 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 +22 -0
- package/lib/client/dashboard/git/git-facts.d.ts.map +1 -0
- package/lib/client/dashboard/git/git-facts.js +37 -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 +650 -0
- package/lib/client/dashboard/git/useWorktreeGitState.js.map +1 -0
- package/lib/client/dashboard/open-in-app-controller.d.ts +1 -0
- package/lib/client/dashboard/open-in-app-controller.d.ts.map +1 -1
- package/lib/client/dashboard/open-in-app-controller.js +6 -24
- package/lib/client/dashboard/open-in-app-controller.js.map +1 -1
- package/lib/client/dashboard/vscode-url.d.ts.map +1 -1
- package/lib/client/dashboard/vscode-url.js +6 -3
- package/lib/client/dashboard/vscode-url.js.map +1 -1
- package/lib/client/entry.d.ts.map +1 -1
- package/lib/client/entry.js +28 -0
- package/lib/client/entry.js.map +1 -1
- package/lib/client/locales.d.ts +158 -0
- package/lib/client/locales.d.ts.map +1 -1
- package/lib/client/locales.js +172 -14
- package/lib/client/locales.js.map +1 -1
- 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/session/worktree-session.d.ts +2 -0
- package/lib/client/session/worktree-session.d.ts.map +1 -1
- package/lib/client/session/worktree-session.js +15 -3
- package/lib/client/session/worktree-session.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.js +2 -2
- package/lib/client/surface/components/ActiveWorktree.js.map +1 -1
- package/lib/client/surface/components/ArchivedWorktree.js +2 -2
- package/lib/client/surface/components/ArchivedWorktree.js.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 +1 -1
- 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.js +4 -4
- 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 +14 -9
- 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 +15 -3
- package/lib/client/surface/types.d.ts.map +1 -1
- 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/view/worktree-view-read.d.ts +3 -1
- package/lib/client/view/worktree-view-read.d.ts.map +1 -1
- package/lib/client/view/worktree-view-read.js +9 -2
- package/lib/client/view/worktree-view-read.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 +3520 -321
- 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 +155 -1
- package/lib/contract/index.d.ts.map +1 -1
- package/lib/contract/index.js +20 -0
- package/lib/contract/index.js.map +1 -1
- package/lib/contract/windows-path.d.ts +11 -0
- package/lib/contract/windows-path.d.ts.map +1 -0
- package/lib/contract/windows-path.js +41 -0
- package/lib/contract/windows-path.js.map +1 -0
- 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 +18 -1
- package/lib/host/service.d.ts.map +1 -1
- package/lib/host/service.js +30 -0
- package/lib/host/service.js.map +1 -1
- package/lib/host/worktree-instructions.js +2 -2
- package/lib/host/worktree-instructions.js.map +1 -1
- package/lib/host/worktree-permission-manager.d.ts.map +1 -1
- package/lib/host/worktree-permission-manager.js +5 -1
- package/lib/host/worktree-permission-manager.js.map +1 -1
- 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 +884 -0
- package/lib/manage/manager-git-history.js.map +1 -0
- package/lib/manage/manager-sessions.js +1 -1
- package/lib/manage/manager-sessions.js.map +1 -1
- package/lib/manage/manager-support.d.ts +3 -2
- package/lib/manage/manager-support.d.ts.map +1 -1
- package/lib/manage/manager-support.js +5 -13
- package/lib/manage/manager-support.js.map +1 -1
- package/lib/manage/manager-worktree-lifecycle.d.ts.map +1 -1
- package/lib/manage/manager-worktree-lifecycle.js +11 -3
- package/lib/manage/manager-worktree-lifecycle.js.map +1 -1
- package/lib/manage/manager-worktrees.d.ts.map +1 -1
- package/lib/manage/manager-worktrees.js +24 -0
- package/lib/manage/manager-worktrees.js.map +1 -1
- package/lib/manage/manager.d.ts +18 -1
- package/lib/manage/manager.d.ts.map +1 -1
- package/lib/manage/manager.js +74 -16
- package/lib/manage/manager.js.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 +824 -2
- 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/path-identity.d.ts +8 -0
- package/lib/provider/path-identity.d.ts.map +1 -0
- package/lib/provider/path-identity.js +62 -0
- package/lib/provider/path-identity.js.map +1 -0
- package/lib/provider/sidecar/mutation-lock.d.ts +4 -1
- package/lib/provider/sidecar/mutation-lock.d.ts.map +1 -1
- package/lib/provider/sidecar/mutation-lock.js +5 -11
- package/lib/provider/sidecar/mutation-lock.js.map +1 -1
- package/lib/provider/sidecar/process-liveness.d.ts +12 -0
- package/lib/provider/sidecar/process-liveness.d.ts.map +1 -0
- package/lib/provider/sidecar/process-liveness.js +39 -0
- package/lib/provider/sidecar/process-liveness.js.map +1 -0
- 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 +3 -2
- package/lib/provider/sidecar/repository.js.map +1 -1
- package/lib/provider/sidecar/sidecar-durability.d.ts +9 -0
- package/lib/provider/sidecar/sidecar-durability.d.ts.map +1 -0
- package/lib/provider/sidecar/sidecar-durability.js +36 -0
- package/lib/provider/sidecar/sidecar-durability.js.map +1 -0
- package/lib/provider/sidecar/sidecar-persistence.d.ts.map +1 -1
- package/lib/provider/sidecar/sidecar-persistence.js +2 -27
- package/lib/provider/sidecar/sidecar-persistence.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 +124 -25
- 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/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.d.ts.map +1 -1
- package/lib/provider/transaction/recovery/recover.js +9 -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 +2 -0
- package/lib/provider/transaction/support/journal.js.map +1 -1
- package/lib/provider/transaction/support/paths.d.ts +2 -1
- package/lib/provider/transaction/support/paths.d.ts.map +1 -1
- package/lib/provider/transaction/support/paths.js +2 -12
- package/lib/provider/transaction/support/paths.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 +58 -8
- 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 +337 -35
- 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 +337 -35
- package/package.json +3 -1
- package/assets/screenshots/screenshots-dashboard.webp +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree-session-order.js","sourceRoot":"","sources":["../../../src/client/session/worktree-session-order.ts"],"names":[],"mappings":"AAKA,0FAA0F;AAC1F,MAAM,CAAC,MAAM,kCAAkC,GAAG,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"worktree-session-order.js","sourceRoot":"","sources":["../../../src/client/session/worktree-session-order.ts"],"names":[],"mappings":"AAKA,0FAA0F;AAC1F,MAAM,CAAC,MAAM,kCAAkC,GAAG,mCAAmC,CAAC;AAgCtF,SAAS,UAAU;IACjB,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;AAC1B,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc;IACtC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,YAAY,CAAC,KAAc;IAClC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACrC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,KAAK,MAAM,EAAE,IAAI,KAAK,EAAE,CAAC;QACvB,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,SAAS;QACxE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACb,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc;IACtC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACvC,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IAC/B,MAAM,iBAAiB,GAA2B,EAAE,CAAC;IACrD,IAAI,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,KAAK,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACtE,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,gBAAgB,CAAC,SAAS,CAAC;gBAAE,iBAAiB,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;QACxF,CAAC;IACH,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC;AACtC,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,kCAAkC,CAAC,KAAc;IAC/D,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC;QAAE,OAAO,UAAU,EAAE,CAAC;IACvE,MAAM,QAAQ,GAA6C,EAAE,CAAC;IAC9D,KAAK,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QACnE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QACtC,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,UAAU,KAAK,SAAS;YAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC;IAClE,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,GAAsB;IACtC,OAAO,YAAY,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,UAAU,CACjB,IAAkD,EAClD,KAAuC;IAEvC,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACrC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnC,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrC,IAAI,QAAQ,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IACvD,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;AAC5D,CAAC;AAED,SAAS,WAAW,CAClB,IAA0C,EAC1C,KAA+B;IAE/B,OAAO,CACL,IAAI,KAAK,SAAS;QAClB,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,KAAK,CAAC,MAAM;QACxC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,KAAK,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1D,UAAU,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAC5D,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CACvB,GAAsB,EACtB,aAA2D;IAE3D,OAAO,GAAG;SACP,GAAG,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,aAAa,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjE,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACpB,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACnD,MAAM,UAAU,GAAG,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACrD,IAAI,SAAS,IAAI,UAAU,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACpE,IAAI,UAAU,KAAK,CAAC;gBAAE,OAAO,UAAU,CAAC;QAC1C,CAAC;QACD,IAAI,SAAS,KAAK,UAAU;YAAE,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;IAClC,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;AACzB,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,uBAAuB,CAAC,KAIvC;IACC,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;IAChC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,iBAAiB,GAA2B,EAAE,CAAC;QACrD,KAAK,MAAM,EAAE,IAAI,OAAO,EAAE,CAAC;YACzB,MAAM,SAAS,GAAG,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YAC1C,IAAI,gBAAgB,CAAC,SAAS,CAAC;gBAAE,iBAAiB,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;QACrE,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,iBAAiB,EAAE,CAAC;IACtF,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IACnC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,EAAE,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACb,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjB,CAAC;IACH,CAAC;IACD,KAAK,MAAM,EAAE,IAAI,OAAO,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YAClB,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACb,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjB,CAAC;IACH,CAAC;IAED,MAAM,iBAAiB,GAA2B,EAAE,CAAC;IACrD,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5C,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,MAAM,QAAQ,GAAuD,EAAE,CAAC;IACxE,KAAK,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;QAC1C,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;QACzD,MAAM,SAAS,GAAG,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAC1C,IAAI,gBAAgB,CAAC,iBAAiB,CAAC;YAAE,iBAAiB,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC;QACnF,IAAI,gBAAgB,CAAC,SAAS,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,SAAS,GAAG,iBAAiB,EAAE,CAAC;gBAC1E,IAAI,gBAAgB,CAAC,iBAAiB,CAAC,EAAE,CAAC;oBACxC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;gBAC1C,CAAC;gBACD,iBAAiB,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC,IAAI,SAAS,EAAE,SAAS,CAAC,CAAC;YAClF,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,aAAa,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;IAClF,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7F,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC;QAC1B,GAAG,oBAAoB;QACvB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;KAChC,CAAC,CAAC;IACH,OAAO;QACL,KAAK,EAAE;YACL,GAAG,oBAAoB;YACvB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;YAC/B,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;SAC9C;QACD,iBAAiB;KAClB,CAAC;AACJ,CAAC;AAED,4EAA4E;AAC5E,MAAM,UAAU,iBAAiB,CAC/B,KAAwB,EACxB,SAAiB,EACjB,aAAqB,EACrB,IAAwB;IAExB,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAChD,IAAI,WAAW,KAAK,CAAC,CAAC;QAAE,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC;IAC1C,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;IAC7E,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,YAAY,CAAC,OAAiC;IACrD,OAAO;QACL,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;QACzB,iBAAiB,EAAE,EAAE,GAAG,OAAO,CAAC,iBAAiB,EAAE;KACpD,CAAC;AACJ,CAAC;AAED,qEAAqE;AACrE,MAAM,UAAU,+BAA+B,CAC7C,oBAA0C;IAE1C,IAAI,KAA+C,CAAC;IACpD,IAAI,CAAC;QACH,KAAK,GAAG,oBAAoB,CAA4B,UAAU,EAAE,EAAE;YACpE,OAAO,EAAE,EAAE,IAAI,EAAE,kCAAkC,EAAE;SACtD,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,KAAK,GAAG,oBAAoB,CAA4B,UAAU,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,kCAAkC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IACnE,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,OAAO,GAAgC;QAC3C,SAAS,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE;YAChD,IAAI,QAAQ,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO;YAChD,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;gBACrB,MAAM,IAAI,GAAG,uBAAuB,CAAC;oBACnC,OAAO;oBACP,aAAa;oBACb,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC;iBACrC,CAAC,CAAC;gBACH,IAAI,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC;oBAAE,OAAO;gBAC1D,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;YAClD,CAAC,CAAC,CAAC;QACL,CAAC;QACD,QAAQ,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE;YAC7C,IAAI,QAAQ,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO;YAChD,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;gBACrB,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI;oBAC5C,KAAK,EAAE,EAAE;oBACT,iBAAiB,EAAE,EAAE;iBACtB,CAAC;gBACF,MAAM,iBAAiB,GAAG,EAAE,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;gBAC3D,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;oBAChC,KAAK,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;wBAC5D,IAAI,gBAAgB,CAAC,SAAS,CAAC,EAAE,CAAC;4BAChC,iBAAiB,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC,IAAI,SAAS,EAAE,SAAS,CAAC,CAAC;wBAClF,CAAC;oBACH,CAAC;gBACH,CAAC;gBACD,MAAM,IAAI,GAAG;oBACX,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;oBACtB,iBAAiB;iBAClB,CAAC;gBACF,IAAI,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC;oBAAE,OAAO;gBACvC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;YACpC,CAAC,CAAC,CAAC;QACL,CAAC;QACD,MAAM,EAAE,CAAC,WAAW,EAAE,EAAE;YACtB,IAAI,QAAQ;gBAAE,OAAO;YACrB,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;YACrC,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC;gBAAE,OAAO;YAC/B,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;gBACrB,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACrD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;wBAAE,OAAO,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;gBAClE,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;IAEF,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE;QAC1B,OAAO;QACP,OAAO,EAAE,GAAG,EAAE;YACZ,QAAQ,GAAG,IAAI,CAAC;QAClB,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
|
-
|
|
1
|
+
/** Keep one current Session row in the Worktree content scrollport. */
|
|
2
|
+
export declare function scrollCurrentSessionIntoView(root: HTMLElement | null, sessionId: string): boolean;
|
|
2
3
|
//# sourceMappingURL=worktree-session-position.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree-session-position.d.ts","sourceRoot":"","sources":["../../../src/client/session/worktree-session-position.ts"],"names":[],"mappings":"AAAA,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"worktree-session-position.d.ts","sourceRoot":"","sources":["../../../src/client/session/worktree-session-position.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,WAAW,GAAG,IAAI,EACxB,SAAS,EAAE,MAAM,GAChB,OAAO,CAeT"}
|
|
@@ -1,11 +1,18 @@
|
|
|
1
|
+
/** Keep one current Session row in the Worktree content scrollport. */
|
|
1
2
|
export function scrollCurrentSessionIntoView(root, sessionId) {
|
|
2
3
|
if (root === null)
|
|
3
4
|
return false;
|
|
4
|
-
const row = Array.from(root.querySelectorAll('[data-session-id]'))
|
|
5
|
-
.find((candidate) => candidate.dataset.sessionId === sessionId);
|
|
5
|
+
const row = Array.from(root.querySelectorAll('[data-session-id]')).find((candidate) => candidate.dataset.sessionId === sessionId);
|
|
6
6
|
if (row === undefined)
|
|
7
7
|
return false;
|
|
8
|
-
|
|
8
|
+
const rootRect = root.getBoundingClientRect();
|
|
9
|
+
const rowRect = row.getBoundingClientRect();
|
|
10
|
+
if (rowRect.top < rootRect.top) {
|
|
11
|
+
root.scrollTop -= rootRect.top - rowRect.top;
|
|
12
|
+
}
|
|
13
|
+
else if (rowRect.bottom > rootRect.bottom) {
|
|
14
|
+
root.scrollTop += rowRect.bottom - rootRect.bottom;
|
|
15
|
+
}
|
|
9
16
|
return true;
|
|
10
17
|
}
|
|
11
18
|
//# sourceMappingURL=worktree-session-position.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree-session-position.js","sourceRoot":"","sources":["../../../src/client/session/worktree-session-position.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,4BAA4B,CAC1C,
|
|
1
|
+
{"version":3,"file":"worktree-session-position.js","sourceRoot":"","sources":["../../../src/client/session/worktree-session-position.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,MAAM,UAAU,4BAA4B,CAC1C,IAAwB,EACxB,SAAiB;IAEjB,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAChC,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAc,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAClF,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS,CACzD,CAAC;IACF,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAEpC,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC9C,MAAM,OAAO,GAAG,GAAG,CAAC,qBAAqB,EAAE,CAAC;IAC5C,IAAI,OAAO,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,SAAS,IAAI,QAAQ,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAC/C,CAAC;SAAM,IAAI,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;QAC5C,IAAI,CAAC,SAAS,IAAI,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;IACrD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -41,6 +41,8 @@ export interface ResolveWorktreeSessionActionInput {
|
|
|
41
41
|
readonly sessions: WorktreeSessionListSnapshot;
|
|
42
42
|
readonly archivedSessionIds: readonly string[];
|
|
43
43
|
readonly bindings: readonly SessionBinding[];
|
|
44
|
+
/** True when Host will perform authoritative physical cwd validation before opening. */
|
|
45
|
+
readonly hostValidatesPhysicalPath?: boolean;
|
|
44
46
|
}
|
|
45
47
|
export declare class WorktreeSessionActionError extends Error {
|
|
46
48
|
readonly code: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree-session.d.ts","sourceRoot":"","sources":["../../../src/client/session/worktree-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EACd,eAAe,EACf,yBAAyB,EACzB,wBAAwB,EACxB,cAAc,EACf,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"worktree-session.d.ts","sourceRoot":"","sources":["../../../src/client/session/worktree-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EACd,eAAe,EACf,yBAAyB,EACzB,wBAAwB,EACxB,cAAc,EACf,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,8BAA8B,EAAE,MAAM,iCAAiC,CAAC;AAEjF,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,SAAS,MAAM,EAAE,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,sBAAsB,GAAG,SAAS,CAAC,CAAC,CAAC;CAC7E;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC;CAClC;AAED,MAAM,MAAM,qBAAqB,GAC7B;IAAE,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC3D;IAAE,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC9D;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,GAC3B;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAClD;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GACjF;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzD,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;IACvC,QAAQ,CAAC,QAAQ,EAAE,2BAA2B,CAAC;IAC/C,QAAQ,CAAC,kBAAkB,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/C,QAAQ,CAAC,QAAQ,EAAE,SAAS,cAAc,EAAE,CAAC;IAC7C,wFAAwF;IACxF,QAAQ,CAAC,yBAAyB,CAAC,EAAE,OAAO,CAAC;CAC9C;AAED,qBAAa,0BAA2B,SAAQ,KAAK;IAIjD,QAAQ,CAAC,IAAI,EAAE,MAAM;IAErB,QAAQ,CAAC,SAAS,EAAE,OAAO;IAL7B,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;gBAGzC,IAAI,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACN,SAAS,EAAE,OAAO,EAC3B,OAAO,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;CAMlD;AAED,MAAM,WAAW,6BAA6B;IAC5C,WAAW,IAAI,2BAA2B,CAAC;CAC5C;AAED,MAAM,WAAW,+BAA+B;IAC9C,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,eAAe,GAAG,cAAc,GAAG,aAAa,CAAC,CAAC;IAC1F,QAAQ,CAAC,QAAQ,EAAE,6BAA6B,CAAC;IACjD,QAAQ,CAAC,kBAAkB,EAAE,MAAM,SAAS,MAAM,EAAE,CAAC;IACrD,QAAQ,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7E,QAAQ,CAAC,sBAAsB,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAClF,QAAQ,CAAC,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAClD,QAAQ,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,yBAAyB,EAAE,0BAA0B,CAAC,CAAC;IAClF,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE;QACnC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;QAC7B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;KACtB,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACjC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAC5B,KAAK,EAAE;QACL,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;QAC7B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;KACtB,EACD,MAAM,EAAE,wBAAwB,KAC7B,IAAI,CAAC;CACX;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,CAAC,KAAK,EAAE,6BAA6B,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9D,OAAO,IAAI,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,6BAA8B,SAAQ,6BAA6B;IAClF,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC;CACvC;AAED,UAAU,oCAAoC;IAC5C,QAAQ,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,yBAAyB,EAAE,0BAA0B,CAAC,CAAC;IAClF,QAAQ,CAAC,iBAAiB,CAAC,EAAE,+BAA+B,CAAC,mBAAmB,CAAC,CAAC;IAClF,QAAQ,CAAC,kBAAkB,CAAC,EAAE,+BAA+B,CAAC,oBAAoB,CAAC,CAAC;IACpF,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;CAClC;AAED;;;GAGG;AACH,wBAAsB,+BAA+B,CACnD,KAAK,EAAE,oCAAoC,GAC1C,OAAO,CAAC,IAAI,CAAC,CA8Cf;AAUD,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,iCAAiC,GACvC,qBAAqB,CAmEvB;AAqBD,wBAAsB,2BAA2B,CAAC,KAAK,EAAE;IACvD,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;IACvD,QAAQ,CAAC,OAAO,EAAE,6BAA6B,CAAC;IAChD,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,sBAAsB,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAClF,QAAQ,CAAC,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAClD,QAAQ,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,yBAAyB,EAAE,0BAA0B,CAAC,CAAC;IAClF,QAAQ,CAAC,iBAAiB,CAAC,EAAE,+BAA+B,CAAC,mBAAmB,CAAC,CAAC;IAClF,QAAQ,CAAC,kBAAkB,CAAC,EAAE,+BAA+B,CAAC,oBAAoB,CAAC,CAAC;CACrF,GAAG,OAAO,CAAC,MAAM,CAAC,CA4BlB;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,+BAA+B,GACvC,wBAAwB,CA4G1B"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { sameWindowsPath } from '../../contract/windows-path.js';
|
|
1
2
|
import { createSessionForWorktree, WorktreeSessionBindingError, } from '../view/worktree-view.js';
|
|
2
3
|
import { WorktreeSessionPermissionError } from '../view/worktree-view-errors.js';
|
|
3
4
|
export { WorktreeSessionPermissionError } from '../view/worktree-view-errors.js';
|
|
@@ -68,6 +69,13 @@ export async function ensureWorktreeSessionPermission(input) {
|
|
|
68
69
|
cwd: input.cwd,
|
|
69
70
|
}, result);
|
|
70
71
|
}
|
|
72
|
+
/**
|
|
73
|
+
* Compare paths for browser-side candidate filtering and the no-Host safety fallback.
|
|
74
|
+
* When Host validation is available, it remains authoritative for physical aliases.
|
|
75
|
+
*/
|
|
76
|
+
function sameWorktreePath(left, right) {
|
|
77
|
+
return left === right || sameWindowsPath(left, right);
|
|
78
|
+
}
|
|
71
79
|
export function resolveWorktreeSessionAction(input) {
|
|
72
80
|
if (input.target.status !== 'active' ||
|
|
73
81
|
input.target.health === 'repair' ||
|
|
@@ -87,7 +95,8 @@ export function resolveWorktreeSessionAction(input) {
|
|
|
87
95
|
sessionId: targetBinding.sessionId,
|
|
88
96
|
};
|
|
89
97
|
}
|
|
90
|
-
if (summary.cwd
|
|
98
|
+
if (summary.cwd === undefined ||
|
|
99
|
+
(!input.hostValidatesPhysicalPath && !sameWorktreePath(summary.cwd, input.target.absolutePath))) {
|
|
91
100
|
return {
|
|
92
101
|
kind: 'repair',
|
|
93
102
|
reason: 'active-binding-cwd-mismatch',
|
|
@@ -110,7 +119,8 @@ export function resolveWorktreeSessionAction(input) {
|
|
|
110
119
|
for (const sessionId of input.sessions.ids) {
|
|
111
120
|
const summary = input.sessions.byId[sessionId];
|
|
112
121
|
if (summary?.blank !== true ||
|
|
113
|
-
summary.cwd
|
|
122
|
+
summary.cwd === undefined ||
|
|
123
|
+
!sameWorktreePath(summary.cwd, input.target.absolutePath) ||
|
|
114
124
|
input.archivedSessionIds.includes(sessionId)) {
|
|
115
125
|
continue;
|
|
116
126
|
}
|
|
@@ -180,7 +190,8 @@ export function createWorktreeSessionConnector(options) {
|
|
|
180
190
|
throw new WorktreeSessionActionError('CLIENT_DISPOSED', '', false);
|
|
181
191
|
}
|
|
182
192
|
const target = worktrees.find((record) => record.worktreeId === input.worktreeId);
|
|
183
|
-
if (target === undefined ||
|
|
193
|
+
if (target === undefined ||
|
|
194
|
+
(options.permission === undefined && !sameWorktreePath(target.absolutePath, input.cwd))) {
|
|
184
195
|
throw new WorktreeSessionActionError('WORKTREE_SESSION_REPAIR_REQUIRED', 'worktree target unavailable', true);
|
|
185
196
|
}
|
|
186
197
|
const action = resolveWorktreeSessionAction({
|
|
@@ -188,6 +199,7 @@ export function createWorktreeSessionConnector(options) {
|
|
|
188
199
|
sessions: options.sessions.getSnapshot(),
|
|
189
200
|
archivedSessionIds: options.archivedSessionIds(),
|
|
190
201
|
bindings,
|
|
202
|
+
hostValidatesPhysicalPath: options.permission !== undefined,
|
|
191
203
|
});
|
|
192
204
|
if (action.kind === 'open-bound') {
|
|
193
205
|
await ensureWorktreeSessionPermission({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree-session.js","sourceRoot":"","sources":["../../../src/client/session/worktree-session.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,wBAAwB,EACxB,2BAA2B,GAE5B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,8BAA8B,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EAAE,8BAA8B,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"worktree-session.js","sourceRoot":"","sources":["../../../src/client/session/worktree-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,13 +2,44 @@ import type { SessionDragState, WorkspaceDragState, WorktreeDragState, WorktreeS
|
|
|
2
2
|
import type { useSurfaceMutation } from './useSurfaceMutation.js';
|
|
3
3
|
import type { useSurfaceRefresh } from '../state/useSurfaceRefresh.js';
|
|
4
4
|
import type { useSurfaceSources } from '../state/useSurfaceSources.js';
|
|
5
|
+
export interface SessionOrderCommitInput {
|
|
6
|
+
readonly groupKey: string;
|
|
7
|
+
readonly workspaceId: string;
|
|
8
|
+
readonly sessionId: string;
|
|
9
|
+
readonly beforeSessionId?: string;
|
|
10
|
+
readonly nextOrder: readonly string[];
|
|
11
|
+
readonly insertSessionBefore?: WorktreeSurfaceProps['insertSessionBefore'];
|
|
12
|
+
readonly setOrder: (groupKey: string, order: readonly string[], updatedAtById?: Readonly<Record<string, number | undefined>>) => void;
|
|
13
|
+
readonly updatedAtById?: Readonly<Record<string, number | undefined>>;
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Persist one visual Session move without crossing the Worktree membership boundary.
|
|
17
|
+
* Worktree Sessions are plugin-local projections, while Main Sessions remain native DSH members.
|
|
18
|
+
*/
|
|
19
|
+
export declare function commitSessionOrder(input: SessionOrderCommitInput): Promise<void>;
|
|
20
|
+
export interface SessionDragOrderInput {
|
|
21
|
+
readonly visibleSessionIds: readonly string[];
|
|
22
|
+
readonly currentOrder: readonly string[];
|
|
23
|
+
readonly sessionId: string;
|
|
24
|
+
readonly over: {
|
|
25
|
+
readonly sessionId: string;
|
|
26
|
+
readonly half: 'before' | 'after';
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
export interface SessionDragOrderResult {
|
|
30
|
+
readonly beforeSessionId?: string;
|
|
31
|
+
readonly nextOrder: string[];
|
|
32
|
+
}
|
|
33
|
+
/** Resolve a visual drop against the full account order, retaining filtered IDs. */
|
|
34
|
+
export declare function resolveSessionDragOrder(input: SessionDragOrderInput): SessionDragOrderResult | undefined;
|
|
5
35
|
type Input = {
|
|
6
|
-
source: Pick<ReturnType<typeof useSurfaceSources>, 'workspaces' | 'sessionOrderSnapshot'>;
|
|
36
|
+
source: Pick<ReturnType<typeof useSurfaceSources>, 'workspaces' | 'sessions' | 'sessionOrderSnapshot'>;
|
|
37
|
+
orderedSessionIdsByAccount: ReadonlyMap<string, readonly string[]>;
|
|
7
38
|
props: Pick<WorktreeSurfaceProps, 'insertWorkspaceBefore' | 'insertSessionBefore' | 'sessionOrder' | 'insertWorktreeBefore'>;
|
|
8
39
|
mutation: Pick<ReturnType<typeof useSurfaceMutation>, 'setActionError'>;
|
|
9
40
|
read: Pick<ReturnType<typeof useSurfaceRefresh>, 'refresh'>;
|
|
10
41
|
};
|
|
11
|
-
export declare function useDragActions({ source, props, mutation, read }: Input): {
|
|
42
|
+
export declare function useDragActions({ source, orderedSessionIdsByAccount, props, mutation, read, }: Input): {
|
|
12
43
|
workspaceDrag: WorkspaceDragState | undefined;
|
|
13
44
|
setWorkspaceDrag: import("react").Dispatch<import("react").SetStateAction<WorkspaceDragState | undefined>>;
|
|
14
45
|
workspaceDropCommitted: import("react").MutableRefObject<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDragActions.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/actions/useDragActions.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useDragActions.d.ts","sourceRoot":"","sources":["../../../../src/client/surface/actions/useDragActions.tsx"],"names":[],"mappings":"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"}
|
|
@@ -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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"}
|
|
@@ -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')
|
|
@@ -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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"}
|
|
@@ -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,7 +55,7 @@ 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
60
|
}, showDashboardAction: props.openDashboard !== undefined, menu: (() => {
|
|
61
61
|
const activityBlocked = worktreeLifecycleBlockReason(actionPending, record.health);
|
|
@@ -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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"}
|
|
@@ -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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"}
|
|
@@ -18,7 +18,7 @@ type Input = {
|
|
|
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'>;
|