@cerbur/clutch-dsh-worktree 0.1.16 → 0.1.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +314 -43
- package/README.zh.md +263 -37
- 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-worktree-tool.png +0 -0
- package/assets/screenshots/screenshots-zh.png +0 -0
- package/cordis.patch.yml +6 -19
- package/lib/client/WorktreeSurface.d.ts.map +1 -1
- package/lib/client/WorktreeSurface.js +41 -13
- package/lib/client/WorktreeSurface.js.map +1 -1
- package/lib/client/branch/GitBranchSelector.d.ts +23 -0
- package/lib/client/branch/GitBranchSelector.d.ts.map +1 -0
- package/lib/client/branch/GitBranchSelector.js +142 -0
- package/lib/client/branch/GitBranchSelector.js.map +1 -0
- package/lib/client/command-activity.d.ts +11 -0
- package/lib/client/command-activity.d.ts.map +1 -0
- package/lib/client/command-activity.js +71 -0
- package/lib/client/command-activity.js.map +1 -0
- package/lib/client/context/worktree-context-store.d.ts.map +1 -1
- package/lib/client/context/worktree-context-store.js +1 -0
- package/lib/client/context/worktree-context-store.js.map +1 -1
- package/lib/client/context/worktree-context.d.ts +3 -2
- package/lib/client/context/worktree-context.d.ts.map +1 -1
- package/lib/client/context/worktree-context.js +5 -3
- package/lib/client/context/worktree-context.js.map +1 -1
- package/lib/client/dashboard/DashboardRequest.d.ts +2 -1
- package/lib/client/dashboard/DashboardRequest.d.ts.map +1 -1
- package/lib/client/dashboard/DashboardRequest.js +3 -3
- package/lib/client/dashboard/DashboardRequest.js.map +1 -1
- package/lib/client/dashboard/WorktreeDashboard.d.ts +6 -2
- package/lib/client/dashboard/WorktreeDashboard.d.ts.map +1 -1
- package/lib/client/dashboard/WorktreeDashboard.js +111 -89
- package/lib/client/dashboard/WorktreeDashboard.js.map +1 -1
- package/lib/client/dashboard/WorktreeInstructions.d.ts +2 -1
- package/lib/client/dashboard/WorktreeInstructions.d.ts.map +1 -1
- package/lib/client/dashboard/WorktreeInstructions.js +27 -8
- package/lib/client/dashboard/WorktreeInstructions.js.map +1 -1
- package/lib/client/dashboard/dashboard-overlay.d.ts.map +1 -1
- package/lib/client/dashboard/dashboard-overlay.js +38 -52
- package/lib/client/dashboard/dashboard-overlay.js.map +1 -1
- package/lib/client/dashboard/dashboard-selection.d.ts +4 -2
- package/lib/client/dashboard/dashboard-selection.d.ts.map +1 -1
- package/lib/client/dashboard/dashboard-selection.js +6 -4
- package/lib/client/dashboard/dashboard-selection.js.map +1 -1
- package/lib/client/dashboard/git/GitChangedFiles.d.ts +2 -1
- package/lib/client/dashboard/git/GitChangedFiles.d.ts.map +1 -1
- package/lib/client/dashboard/git/GitChangedFiles.js +8 -6
- package/lib/client/dashboard/git/GitChangedFiles.js.map +1 -1
- package/lib/client/dashboard/git/GitCommitList.d.ts +6 -1
- package/lib/client/dashboard/git/GitCommitList.d.ts.map +1 -1
- package/lib/client/dashboard/git/GitCommitList.js +34 -29
- package/lib/client/dashboard/git/GitCommitList.js.map +1 -1
- package/lib/client/dashboard/git/GitCommitStats.d.ts +8 -0
- package/lib/client/dashboard/git/GitCommitStats.d.ts.map +1 -0
- package/lib/client/dashboard/git/GitCommitStats.js +7 -0
- package/lib/client/dashboard/git/GitCommitStats.js.map +1 -0
- package/lib/client/dashboard/git/WorktreeGitOverview.d.ts.map +1 -1
- package/lib/client/dashboard/git/WorktreeGitOverview.js +2 -1
- package/lib/client/dashboard/git/WorktreeGitOverview.js.map +1 -1
- package/lib/client/dashboard/git/WorktreeGitPanel.d.ts +3 -2
- package/lib/client/dashboard/git/WorktreeGitPanel.d.ts.map +1 -1
- package/lib/client/dashboard/git/WorktreeGitPanel.js +79 -14
- package/lib/client/dashboard/git/WorktreeGitPanel.js.map +1 -1
- package/lib/client/dashboard/git/file-address.d.ts +5 -1
- package/lib/client/dashboard/git/file-address.d.ts.map +1 -1
- package/lib/client/dashboard/git/file-address.js +49 -11
- package/lib/client/dashboard/git/file-address.js.map +1 -1
- package/lib/client/dashboard/git/git-facts.js +1 -1
- package/lib/client/dashboard/git/git-facts.js.map +1 -1
- package/lib/client/dashboard/git/useWorktreeGitState.d.ts +7 -2
- package/lib/client/dashboard/git/useWorktreeGitState.d.ts.map +1 -1
- package/lib/client/dashboard/git/useWorktreeGitState.js +88 -22
- package/lib/client/dashboard/git/useWorktreeGitState.js.map +1 -1
- package/lib/client/dsh-icons.d.ts +4 -0
- package/lib/client/dsh-icons.d.ts.map +1 -1
- package/lib/client/dsh-icons.js +5 -1
- package/lib/client/dsh-icons.js.map +1 -1
- package/lib/client/dsh-slot-contract.d.ts +9 -1
- 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 +39 -2
- package/lib/client/entry.js.map +1 -1
- package/lib/client/layout/app-frame.d.ts +12 -0
- package/lib/client/layout/app-frame.d.ts.map +1 -0
- package/lib/client/layout/app-frame.js +82 -0
- package/lib/client/layout/app-frame.js.map +1 -0
- package/lib/client/locales.d.ts +184 -2
- package/lib/client/locales.d.ts.map +1 -1
- package/lib/client/locales.js +250 -68
- package/lib/client/locales.js.map +1 -1
- package/lib/client/overlay/overlay-bounds.d.ts.map +1 -1
- package/lib/client/overlay/overlay-bounds.js +8 -3
- package/lib/client/overlay/overlay-bounds.js.map +1 -1
- package/lib/client/overlay/sidebar-overlay-geometry.d.ts +3 -1
- package/lib/client/overlay/sidebar-overlay-geometry.d.ts.map +1 -1
- package/lib/client/overlay/sidebar-overlay-geometry.js +94 -34
- package/lib/client/overlay/sidebar-overlay-geometry.js.map +1 -1
- package/lib/client/restart-notice.d.ts +10 -3
- package/lib/client/restart-notice.d.ts.map +1 -1
- package/lib/client/restart-notice.js +44 -11
- package/lib/client/restart-notice.js.map +1 -1
- package/lib/client/select/SearchableSingleSelect.d.ts +44 -0
- package/lib/client/select/SearchableSingleSelect.d.ts.map +1 -0
- package/lib/client/select/SearchableSingleSelect.js +180 -0
- package/lib/client/select/SearchableSingleSelect.js.map +1 -0
- package/lib/client/select/WorktreeSelector.d.ts +14 -0
- package/lib/client/select/WorktreeSelector.d.ts.map +1 -0
- package/lib/client/select/WorktreeSelector.js +11 -0
- package/lib/client/select/WorktreeSelector.js.map +1 -0
- package/lib/client/session/session-view.d.ts +16 -2
- package/lib/client/session/session-view.d.ts.map +1 -1
- package/lib/client/session/session-view.js +24 -10
- package/lib/client/session/session-view.js.map +1 -1
- package/lib/client/session/worktree-session.d.ts +1 -0
- package/lib/client/session/worktree-session.d.ts.map +1 -1
- package/lib/client/session/worktree-session.js +3 -1
- package/lib/client/session/worktree-session.js.map +1 -1
- package/lib/client/settings/ToolSettings.d.ts +9 -0
- package/lib/client/settings/ToolSettings.d.ts.map +1 -0
- package/lib/client/settings/ToolSettings.js +77 -0
- package/lib/client/settings/ToolSettings.js.map +1 -0
- package/lib/client/settings/WorktreeSettings.d.ts +8 -0
- package/lib/client/settings/WorktreeSettings.d.ts.map +1 -0
- package/lib/client/settings/WorktreeSettings.js +46 -0
- package/lib/client/settings/WorktreeSettings.js.map +1 -0
- package/lib/client/settings/WorktreeSettingsNavIcon.d.ts +6 -0
- package/lib/client/settings/WorktreeSettingsNavIcon.d.ts.map +1 -0
- package/lib/client/settings/WorktreeSettingsNavIcon.js +51 -0
- package/lib/client/settings/WorktreeSettingsNavIcon.js.map +1 -0
- package/lib/client/settings/diagnostics.d.ts +24 -0
- package/lib/client/settings/diagnostics.d.ts.map +1 -0
- package/lib/client/settings/diagnostics.js +63 -0
- package/lib/client/settings/diagnostics.js.map +1 -0
- package/lib/client/settings/settings-navigation.d.ts +7 -0
- package/lib/client/settings/settings-navigation.d.ts.map +1 -0
- package/lib/client/settings/settings-navigation.js +12 -0
- package/lib/client/settings/settings-navigation.js.map +1 -0
- package/lib/client/surface/actions/useLifecycleActions.d.ts +2 -1
- package/lib/client/surface/actions/useLifecycleActions.d.ts.map +1 -1
- package/lib/client/surface/actions/useLifecycleActions.js +15 -6
- package/lib/client/surface/actions/useLifecycleActions.js.map +1 -1
- package/lib/client/surface/actions/useSessionActions.d.ts.map +1 -1
- package/lib/client/surface/actions/useSessionActions.js +6 -6
- package/lib/client/surface/actions/useSessionActions.js.map +1 -1
- package/lib/client/surface/actions/useWorktreeRegistration.d.ts +1 -1
- package/lib/client/surface/actions/useWorktreeRegistration.d.ts.map +1 -1
- package/lib/client/surface/actions/useWorktreeRegistration.js +36 -13
- package/lib/client/surface/actions/useWorktreeRegistration.js.map +1 -1
- package/lib/client/surface/components/NotificationToasts.d.ts +19 -3
- package/lib/client/surface/components/NotificationToasts.d.ts.map +1 -1
- package/lib/client/surface/components/NotificationToasts.js +73 -7
- package/lib/client/surface/components/NotificationToasts.js.map +1 -1
- package/lib/client/surface/components/OverlayScrollbar.d.ts +6 -0
- package/lib/client/surface/components/OverlayScrollbar.d.ts.map +1 -0
- package/lib/client/surface/components/OverlayScrollbar.js +84 -0
- package/lib/client/surface/components/OverlayScrollbar.js.map +1 -0
- package/lib/client/surface/components/RegistrationDialog.d.ts +3 -3
- package/lib/client/surface/components/RegistrationDialog.d.ts.map +1 -1
- package/lib/client/surface/components/RegistrationDialog.js +70 -5
- package/lib/client/surface/components/RegistrationDialog.js.map +1 -1
- package/lib/client/surface/components/RestartToast.d.ts.map +1 -1
- package/lib/client/surface/components/RestartToast.js +4 -3
- package/lib/client/surface/components/RestartToast.js.map +1 -1
- package/lib/client/surface/components/SurfaceContent.d.ts.map +1 -1
- package/lib/client/surface/components/SurfaceContent.js +110 -39
- package/lib/client/surface/components/SurfaceContent.js.map +1 -1
- package/lib/client/surface/components/WorkspaceTree.d.ts.map +1 -1
- package/lib/client/surface/components/WorkspaceTree.js +13 -9
- package/lib/client/surface/components/WorkspaceTree.js.map +1 -1
- package/lib/client/surface/components/dialogs.d.ts +1 -1
- package/lib/client/surface/components/dialogs.d.ts.map +1 -1
- package/lib/client/surface/components/dialogs.js +34 -21
- package/lib/client/surface/components/dialogs.js.map +1 -1
- package/lib/client/surface/components/rows.d.ts +1 -1
- package/lib/client/surface/components/rows.d.ts.map +1 -1
- package/lib/client/surface/components/rows.js +15 -97
- package/lib/client/surface/components/rows.js.map +1 -1
- package/lib/client/surface/notification-queue.d.ts +15 -0
- package/lib/client/surface/notification-queue.d.ts.map +1 -1
- package/lib/client/surface/notification-queue.js +13 -2
- package/lib/client/surface/notification-queue.js.map +1 -1
- package/lib/client/surface/state/useRegistrationState.d.ts +6 -1
- package/lib/client/surface/state/useRegistrationState.d.ts.map +1 -1
- package/lib/client/surface/state/useRegistrationState.js +7 -0
- package/lib/client/surface/state/useRegistrationState.js.map +1 -1
- package/lib/client/surface/state/useSurfaceRefresh.d.ts +1 -1
- package/lib/client/surface/state/useSurfaceRefresh.d.ts.map +1 -1
- package/lib/client/surface/state/useSurfaceRefresh.js +13 -1
- package/lib/client/surface/state/useSurfaceRefresh.js.map +1 -1
- package/lib/client/surface/state/useSurfaceSources.d.ts +1 -1
- package/lib/client/surface/state/useSurfaceSources.d.ts.map +1 -1
- package/lib/client/surface/state/useSurfaceSources.js +4 -2
- package/lib/client/surface/state/useSurfaceSources.js.map +1 -1
- package/lib/client/surface/state/useTitleMarquee.d.ts +7 -0
- package/lib/client/surface/state/useTitleMarquee.d.ts.map +1 -0
- package/lib/client/surface/state/useTitleMarquee.js +60 -0
- package/lib/client/surface/state/useTitleMarquee.js.map +1 -0
- package/lib/client/surface/types.d.ts +12 -1
- package/lib/client/surface/types.d.ts.map +1 -1
- package/lib/client/view/worktree-error-copy.d.ts.map +1 -1
- package/lib/client/view/worktree-error-copy.js +73 -14
- package/lib/client/view/worktree-error-copy.js.map +1 -1
- package/lib/client/view/worktree-view-errors.d.ts.map +1 -1
- package/lib/client/view/worktree-view-errors.js +13 -5
- package/lib/client/view/worktree-view-errors.js.map +1 -1
- package/lib/client/view/worktree-view-read.d.ts +4 -2
- package/lib/client/view/worktree-view-read.d.ts.map +1 -1
- package/lib/client/view/worktree-view-read.js +34 -17
- package/lib/client/view/worktree-view-read.js.map +1 -1
- package/lib/client/worktree-connection.d.ts +9 -2
- package/lib/client/worktree-connection.d.ts.map +1 -1
- package/lib/client/worktree-connection.js +24 -1
- package/lib/client/worktree-connection.js.map +1 -1
- package/lib/client/worktree-tool-changes.d.ts +13 -0
- package/lib/client/worktree-tool-changes.d.ts.map +1 -0
- package/lib/client/worktree-tool-changes.js +64 -0
- package/lib/client/worktree-tool-changes.js.map +1 -0
- package/lib/client.js +3503 -1310
- package/lib/client.js.map +1 -1
- package/lib/contract/index.contract.js +15 -0
- package/lib/contract/index.contract.js.map +1 -1
- package/lib/contract/index.d.ts +79 -12
- package/lib/contract/index.d.ts.map +1 -1
- package/lib/contract/index.js +12 -0
- package/lib/contract/index.js.map +1 -1
- package/lib/contract/tool-settings.d.ts +28 -0
- package/lib/contract/tool-settings.d.ts.map +1 -0
- package/lib/contract/tool-settings.js +10 -0
- package/lib/contract/tool-settings.js.map +1 -0
- package/lib/contract/worktree-tool-changes.d.ts +10 -0
- package/lib/contract/worktree-tool-changes.d.ts.map +1 -0
- package/lib/contract/worktree-tool-changes.js +2 -0
- package/lib/contract/worktree-tool-changes.js.map +1 -0
- package/lib/host/permission-preset-append.d.ts +15 -0
- package/lib/host/permission-preset-append.d.ts.map +1 -0
- package/lib/host/permission-preset-append.js +63 -0
- package/lib/host/permission-preset-append.js.map +1 -0
- package/lib/host/remote.d.ts.map +1 -1
- package/lib/host/remote.js +7 -0
- package/lib/host/remote.js.map +1 -1
- package/lib/host/service.d.ts +30 -6
- package/lib/host/service.d.ts.map +1 -1
- package/lib/host/service.js +85 -11
- package/lib/host/service.js.map +1 -1
- package/lib/host/tool-settings.d.ts +14 -0
- package/lib/host/tool-settings.d.ts.map +1 -0
- package/lib/host/tool-settings.js +98 -0
- package/lib/host/tool-settings.js.map +1 -0
- package/lib/host/worktree-permission-manager.d.ts.map +1 -1
- package/lib/host/worktree-permission-manager.js +2 -4
- package/lib/host/worktree-permission-manager.js.map +1 -1
- package/lib/host/worktree-tool-changes.d.ts +12 -0
- package/lib/host/worktree-tool-changes.d.ts.map +1 -0
- package/lib/host/worktree-tool-changes.js +60 -0
- package/lib/host/worktree-tool-changes.js.map +1 -0
- package/lib/manage/manager-git-history.d.ts +5 -7
- package/lib/manage/manager-git-history.d.ts.map +1 -1
- package/lib/manage/manager-git-history.js +185 -91
- package/lib/manage/manager-git-history.js.map +1 -1
- package/lib/manage/manager-git-paths.d.ts +7 -0
- package/lib/manage/manager-git-paths.d.ts.map +1 -0
- package/lib/manage/manager-git-paths.js +62 -0
- package/lib/manage/manager-git-paths.js.map +1 -0
- package/lib/manage/manager-sessions.d.ts +5 -0
- package/lib/manage/manager-sessions.d.ts.map +1 -1
- package/lib/manage/manager-sessions.js +34 -11
- package/lib/manage/manager-sessions.js.map +1 -1
- package/lib/manage/manager-support.d.ts +3 -1
- package/lib/manage/manager-support.d.ts.map +1 -1
- package/lib/manage/manager-support.js +17 -0
- 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 +5 -4
- package/lib/manage/manager-worktree-lifecycle.js.map +1 -1
- package/lib/manage/manager-worktrees.d.ts +10 -1
- package/lib/manage/manager-worktrees.d.ts.map +1 -1
- package/lib/manage/manager-worktrees.js +141 -34
- package/lib/manage/manager-worktrees.js.map +1 -1
- package/lib/manage/manager.d.ts +22 -5
- package/lib/manage/manager.d.ts.map +1 -1
- package/lib/manage/manager.js +76 -4
- package/lib/manage/manager.js.map +1 -1
- package/lib/manage/types.d.ts +10 -1
- package/lib/manage/types.d.ts.map +1 -1
- package/lib/provider/generated-name.d.ts.map +1 -1
- package/lib/provider/generated-name.js +5 -4
- package/lib/provider/generated-name.js.map +1 -1
- package/lib/provider/git/adapter.d.ts +13 -12
- package/lib/provider/git/adapter.d.ts.map +1 -1
- package/lib/provider/git/adapter.js +157 -31
- package/lib/provider/git/adapter.js.map +1 -1
- package/lib/provider/git/branch-name.d.ts +5 -0
- package/lib/provider/git/branch-name.d.ts.map +1 -0
- package/lib/provider/git/branch-name.js +16 -0
- package/lib/provider/git/branch-name.js.map +1 -0
- package/lib/provider/git/branches.d.ts +11 -0
- package/lib/provider/git/branches.d.ts.map +1 -0
- package/lib/provider/git/branches.js +37 -0
- package/lib/provider/git/branches.js.map +1 -0
- package/lib/provider/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.map +1 -1
- package/lib/provider/sidecar/repository.js +3 -1
- package/lib/provider/sidecar/repository.js.map +1 -1
- package/lib/provider/sidecar/sidecar-schema.d.ts.map +1 -1
- package/lib/provider/sidecar/sidecar-schema.js +26 -4
- package/lib/provider/sidecar/sidecar-schema.js.map +1 -1
- package/lib/provider/transaction/operations/adopt-branch.d.ts.map +1 -1
- package/lib/provider/transaction/operations/adopt-branch.js +6 -5
- package/lib/provider/transaction/operations/adopt-branch.js.map +1 -1
- package/lib/provider/transaction/operations/clean.d.ts.map +1 -1
- package/lib/provider/transaction/operations/clean.js +20 -19
- package/lib/provider/transaction/operations/clean.js.map +1 -1
- package/lib/provider/transaction/operations/create.d.ts +1 -1
- package/lib/provider/transaction/operations/create.d.ts.map +1 -1
- package/lib/provider/transaction/operations/create.js +39 -17
- 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 +7 -1
- package/lib/provider/transaction/operations/import.js.map +1 -1
- package/lib/provider/transaction/operations/remove.d.ts.map +1 -1
- package/lib/provider/transaction/operations/remove.js +20 -19
- package/lib/provider/transaction/operations/remove.js.map +1 -1
- package/lib/provider/transaction/recovery/failure-recovery.d.ts.map +1 -1
- package/lib/provider/transaction/recovery/failure-recovery.js +22 -20
- 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 +11 -4
- package/lib/provider/transaction/recovery/recover.js.map +1 -1
- package/lib/provider/transaction/support/inspection.d.ts.map +1 -1
- package/lib/provider/transaction/support/inspection.js +3 -2
- 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 +9 -5
- package/lib/provider/transaction/support/journal.js.map +1 -1
- package/lib/provider/transaction/support/path-safety.d.ts.map +1 -1
- package/lib/provider/transaction/support/path-safety.js +4 -3
- package/lib/provider/transaction/support/path-safety.js.map +1 -1
- package/lib/provider/transaction/types.d.ts +2 -1
- package/lib/provider/transaction/types.d.ts.map +1 -1
- package/lib/provider/types.d.ts +27 -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/provider/worktree-path.d.ts +10 -0
- package/lib/provider/worktree-path.d.ts.map +1 -0
- package/lib/provider/worktree-path.js +47 -0
- package/lib/provider/worktree-path.js.map +1 -0
- package/lib/tool/context.d.ts +14 -0
- package/lib/tool/context.d.ts.map +1 -0
- package/lib/tool/context.js +95 -0
- package/lib/tool/context.js.map +1 -0
- package/lib/tool/delegation.d.ts +41 -0
- package/lib/tool/delegation.d.ts.map +1 -0
- package/lib/tool/delegation.js +196 -0
- package/lib/tool/delegation.js.map +1 -0
- package/lib/tool/errors.d.ts +3 -0
- package/lib/tool/errors.d.ts.map +1 -0
- package/lib/tool/errors.js +63 -0
- package/lib/tool/errors.js.map +1 -0
- package/lib/tool/guidance.d.ts +5 -0
- package/lib/tool/guidance.d.ts.map +1 -0
- package/lib/tool/guidance.js +48 -0
- package/lib/tool/guidance.js.map +1 -0
- package/lib/tool/history.d.ts +27 -0
- package/lib/tool/history.d.ts.map +1 -0
- package/lib/tool/history.js +157 -0
- package/lib/tool/history.js.map +1 -0
- package/lib/tool/index.d.ts +8 -0
- package/lib/tool/index.d.ts.map +1 -0
- package/lib/tool/index.js +296 -0
- package/lib/tool/index.js.map +1 -0
- package/lib/tool/inputs.d.ts +12 -0
- package/lib/tool/inputs.d.ts.map +1 -0
- package/lib/tool/inputs.js +24 -0
- package/lib/tool/inputs.js.map +1 -0
- package/lib/tool/list-models.d.ts +3 -0
- package/lib/tool/list-models.d.ts.map +1 -0
- package/lib/tool/list-models.js +38 -0
- package/lib/tool/list-models.js.map +1 -0
- package/lib/tool/list-sessions.d.ts +3 -0
- package/lib/tool/list-sessions.d.ts.map +1 -0
- package/lib/tool/list-sessions.js +70 -0
- package/lib/tool/list-sessions.js.map +1 -0
- package/lib/tool/list-worktrees.d.ts +3 -0
- package/lib/tool/list-worktrees.d.ts.map +1 -0
- package/lib/tool/list-worktrees.js +46 -0
- package/lib/tool/list-worktrees.js.map +1 -0
- package/lib/tool/native-session.d.ts +74 -0
- package/lib/tool/native-session.d.ts.map +1 -0
- package/lib/tool/native-session.js +248 -0
- package/lib/tool/native-session.js.map +1 -0
- package/lib/tool/new-worktree.d.ts +3 -0
- package/lib/tool/new-worktree.d.ts.map +1 -0
- package/lib/tool/new-worktree.js +81 -0
- package/lib/tool/new-worktree.js.map +1 -0
- package/lib/tool/outputs.d.ts +50 -0
- package/lib/tool/outputs.d.ts.map +1 -0
- package/lib/tool/outputs.js +65 -0
- package/lib/tool/outputs.js.map +1 -0
- package/lib/tool/report-result.d.ts +3 -0
- package/lib/tool/report-result.d.ts.map +1 -0
- package/lib/tool/report-result.js +83 -0
- package/lib/tool/report-result.js.map +1 -0
- package/lib/tool/schema.d.ts +7 -0
- package/lib/tool/schema.d.ts.map +1 -0
- package/lib/tool/schema.js +92 -0
- package/lib/tool/schema.js.map +1 -0
- package/lib/tool/send-message.d.ts +3 -0
- package/lib/tool/send-message.d.ts.map +1 -0
- package/lib/tool/send-message.js +64 -0
- package/lib/tool/send-message.js.map +1 -0
- package/lib/tool/span-worktree.d.ts +3 -0
- package/lib/tool/span-worktree.d.ts.map +1 -0
- package/lib/tool/span-worktree.js +114 -0
- package/lib/tool/span-worktree.js.map +1 -0
- package/lib/tool/types.d.ts +54 -0
- package/lib/tool/types.d.ts.map +1 -0
- package/lib/tool/types.js +2 -0
- package/lib/tool/types.js.map +1 -0
- package/lib/typert.host.js +387 -46
- package/lib/typert.remote-client.d.ts +17 -5
- package/lib/typert.remote-client.d.ts.map +1 -1
- package/lib/typert.remote-client.js +387 -46
- package/package.json +17 -3
package/lib/host/service.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { Context } from '@deepseek-ai/cordis';
|
|
2
2
|
import { TypertRemoteService } from '@deepseek-ai/dsh-typert-protocol';
|
|
3
|
-
import type { BranchRecord, SessionBinding, WorktreeGitCommitFiles, WorktreeGitCommitFilesRequest, WorktreeGitFileDiff, WorktreeGitFileDiffRequest, WorktreeGitHistory, WorktreeId, WorktreeRecord, WorktreeImportCandidate, WorktreePermissionRequest, WorktreePermissionNormalizationRequest, WorktreePermissionResult, WorkspaceId, WorktreeRemoteResult } from '../contract/index.js';
|
|
3
|
+
import type { BranchRecord, WorkspaceCheckout, SessionBinding, WorktreeGitCommitFiles, WorktreeGitCommitFilesRequest, WorktreeGitFileDiff, WorktreeGitFileDiffRequest, WorktreeGitHistory, WorktreeGitHistoryRequest, WorktreeId, WorktreeRecord, WorktreeImportCandidate, WorktreePermissionRequest, WorktreePermissionNormalizationRequest, WorktreePermissionResult, WorkspaceId, WorkspaceGitState, WorktreeRemoteResult } from '../contract/index.js';
|
|
4
|
+
import type { WorktreeToolChangeBatch } from '../contract/worktree-tool-changes.js';
|
|
5
|
+
import type { WorktreeToolSelection, WorktreeToolSettingsScope } from '../contract/tool-settings.js';
|
|
4
6
|
/**
|
|
5
7
|
* Host composition 所需且由 DSH bundle 注入的配置。
|
|
6
8
|
* Configuration supplied by the DSH bundle to the Host composition.
|
|
@@ -24,13 +26,28 @@ export interface WorktreeHostConfig {
|
|
|
24
26
|
export declare class WorktreeRemoteService extends TypertRemoteService {
|
|
25
27
|
static inject: string[];
|
|
26
28
|
private readonly manager;
|
|
29
|
+
private readonly dsh;
|
|
27
30
|
private readonly remote;
|
|
31
|
+
private readonly toolChanges;
|
|
32
|
+
private readonly toolSettings;
|
|
28
33
|
/**
|
|
29
34
|
* 为当前 Cordis fiber 建立一次 Host 组合,并复用同一个 Remote projection 处理调用。
|
|
30
35
|
* Builds the Host composition once for the current Cordis fiber and reuses one Remote
|
|
31
36
|
* projection for all calls.
|
|
32
37
|
*/
|
|
33
38
|
constructor(ctx: Context, config: WorktreeHostConfig);
|
|
39
|
+
getToolSettings(input: {
|
|
40
|
+
scope: WorktreeToolSettingsScope;
|
|
41
|
+
}): Promise<WorktreeRemoteResult<WorktreeToolSelection>>;
|
|
42
|
+
updateToolSettings(input: {
|
|
43
|
+
scope: WorktreeToolSettingsScope;
|
|
44
|
+
selection: WorktreeToolSelection;
|
|
45
|
+
expected: WorktreeToolSelection;
|
|
46
|
+
}): Promise<WorktreeRemoteResult<WorktreeToolSelection>>;
|
|
47
|
+
private validateToolSettingsScope;
|
|
48
|
+
watchToolChanges(input: {
|
|
49
|
+
readonly afterRevision: number;
|
|
50
|
+
}, signal: AbortSignal): Promise<WorktreeRemoteResult<WorktreeToolChangeBatch>>;
|
|
34
51
|
getWorktreeInstructions(input: {
|
|
35
52
|
workspaceId: string;
|
|
36
53
|
worktreeId: string;
|
|
@@ -47,14 +64,13 @@ export declare class WorktreeRemoteService extends TypertRemoteService {
|
|
|
47
64
|
baseBranch: string;
|
|
48
65
|
expectedBaseBranch?: string;
|
|
49
66
|
}): Promise<WorktreeRemoteResult<string>>;
|
|
67
|
+
getWorkspaceGitState(input: {
|
|
68
|
+
workspaceId: WorkspaceId;
|
|
69
|
+
}): Promise<WorktreeRemoteResult<WorkspaceGitState>>;
|
|
50
70
|
listWorktrees(input: {
|
|
51
71
|
readonly workspaceId: string;
|
|
52
72
|
}): Promise<WorktreeRemoteResult<readonly WorktreeRecord[]>>;
|
|
53
|
-
listWorktreeCommits(input:
|
|
54
|
-
readonly workspaceId: WorkspaceId;
|
|
55
|
-
readonly worktreeId: WorktreeId;
|
|
56
|
-
readonly baseBranch?: string;
|
|
57
|
-
}): Promise<WorktreeRemoteResult<WorktreeGitHistory>>;
|
|
73
|
+
listWorktreeCommits(input: WorktreeGitHistoryRequest): Promise<WorktreeRemoteResult<WorktreeGitHistory>>;
|
|
58
74
|
listWorktreeCommitFiles(input: WorktreeGitCommitFilesRequest): Promise<WorktreeRemoteResult<WorktreeGitCommitFiles>>;
|
|
59
75
|
getWorktreeCommitFileDiff(input: WorktreeGitFileDiffRequest): Promise<WorktreeRemoteResult<WorktreeGitFileDiff>>;
|
|
60
76
|
listImportCandidates(input: {
|
|
@@ -63,10 +79,18 @@ export declare class WorktreeRemoteService extends TypertRemoteService {
|
|
|
63
79
|
listBranches(input: {
|
|
64
80
|
readonly workspaceId: string;
|
|
65
81
|
}): Promise<WorktreeRemoteResult<readonly BranchRecord[]>>;
|
|
82
|
+
fetchRemoteBranches(input: {
|
|
83
|
+
readonly workspaceId: string;
|
|
84
|
+
}): Promise<WorktreeRemoteResult<readonly BranchRecord[]>>;
|
|
85
|
+
getWorkspaceCheckout(input: {
|
|
86
|
+
readonly workspaceId: WorkspaceId;
|
|
87
|
+
}): Promise<WorktreeRemoteResult<WorkspaceCheckout>>;
|
|
66
88
|
createWorktree(input: {
|
|
67
89
|
readonly workspaceId: string;
|
|
68
90
|
readonly branch: string;
|
|
69
91
|
readonly newBranch?: string;
|
|
92
|
+
readonly fromHead?: boolean;
|
|
93
|
+
readonly expectedHeadCommit?: string;
|
|
70
94
|
}): Promise<WorktreeRemoteResult<WorktreeRecord>>;
|
|
71
95
|
importWorktree(input: {
|
|
72
96
|
readonly workspaceId: WorkspaceId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/host/service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/host/service.ts"],"names":[],"mappings":"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"}
|
package/lib/host/service.js
CHANGED
|
@@ -32,13 +32,17 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
|
|
|
32
32
|
if (target) Object.defineProperty(target, contextIn.name, descriptor);
|
|
33
33
|
done = true;
|
|
34
34
|
};
|
|
35
|
-
import { registerWorktreeInstructions } from './worktree-instructions.js';
|
|
35
|
+
import { registerWorktreeInstructions, } from './worktree-instructions.js';
|
|
36
36
|
import { Remote, TypertRemoteService } from '@deepseek-ai/dsh-typert-protocol';
|
|
37
|
+
import { samePhysicalPath } from '../provider/path-identity.js';
|
|
37
38
|
import { createWorktreeManager } from '../manage/index.js';
|
|
38
|
-
import { DshHostReadAdapter
|
|
39
|
+
import { DshHostReadAdapter } from './dsh-read-adapter.js';
|
|
39
40
|
import { createWorktreeRemoteProjection } from './remote.js';
|
|
40
41
|
import { createDshWorktreePermissionAdapter, } from './worktree-permission.js';
|
|
41
42
|
import { createWorktreePermissionManager } from './worktree-permission-manager.js';
|
|
43
|
+
import { registerWorktreeTools, createWorktreeToolSessionPort } from '../tool/index.js';
|
|
44
|
+
import { WorktreeToolChanges } from './worktree-tool-changes.js';
|
|
45
|
+
import { WorktreeToolSettings } from './tool-settings.js';
|
|
42
46
|
/**
|
|
43
47
|
* Worktree plugin 的真实 composition root。
|
|
44
48
|
*
|
|
@@ -54,15 +58,21 @@ import { createWorktreePermissionManager } from './worktree-permission-manager.j
|
|
|
54
58
|
let WorktreeRemoteService = (() => {
|
|
55
59
|
let _classSuper = TypertRemoteService;
|
|
56
60
|
let _instanceExtraInitializers = [];
|
|
61
|
+
let _getToolSettings_decorators;
|
|
62
|
+
let _updateToolSettings_decorators;
|
|
63
|
+
let _watchToolChanges_decorators;
|
|
57
64
|
let _getWorktreeInstructions_decorators;
|
|
58
65
|
let _updateWorktreeInstructions_decorators;
|
|
59
66
|
let _updateWorktreeBaseBranch_decorators;
|
|
67
|
+
let _getWorkspaceGitState_decorators;
|
|
60
68
|
let _listWorktrees_decorators;
|
|
61
69
|
let _listWorktreeCommits_decorators;
|
|
62
70
|
let _listWorktreeCommitFiles_decorators;
|
|
63
71
|
let _getWorktreeCommitFileDiff_decorators;
|
|
64
72
|
let _listImportCandidates_decorators;
|
|
65
73
|
let _listBranches_decorators;
|
|
74
|
+
let _fetchRemoteBranches_decorators;
|
|
75
|
+
let _getWorkspaceCheckout_decorators;
|
|
66
76
|
let _createWorktree_decorators;
|
|
67
77
|
let _importWorktree_decorators;
|
|
68
78
|
let _removeWorktree_decorators;
|
|
@@ -79,15 +89,21 @@ let WorktreeRemoteService = (() => {
|
|
|
79
89
|
return class WorktreeRemoteService extends _classSuper {
|
|
80
90
|
static {
|
|
81
91
|
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
|
|
92
|
+
_getToolSettings_decorators = [Remote];
|
|
93
|
+
_updateToolSettings_decorators = [Remote];
|
|
94
|
+
_watchToolChanges_decorators = [Remote];
|
|
82
95
|
_getWorktreeInstructions_decorators = [Remote];
|
|
83
96
|
_updateWorktreeInstructions_decorators = [Remote];
|
|
84
97
|
_updateWorktreeBaseBranch_decorators = [Remote];
|
|
98
|
+
_getWorkspaceGitState_decorators = [Remote];
|
|
85
99
|
_listWorktrees_decorators = [Remote];
|
|
86
100
|
_listWorktreeCommits_decorators = [Remote];
|
|
87
101
|
_listWorktreeCommitFiles_decorators = [Remote];
|
|
88
102
|
_getWorktreeCommitFileDiff_decorators = [Remote];
|
|
89
103
|
_listImportCandidates_decorators = [Remote];
|
|
90
104
|
_listBranches_decorators = [Remote];
|
|
105
|
+
_fetchRemoteBranches_decorators = [Remote];
|
|
106
|
+
_getWorkspaceCheckout_decorators = [Remote];
|
|
91
107
|
_createWorktree_decorators = [Remote];
|
|
92
108
|
_importWorktree_decorators = [Remote];
|
|
93
109
|
_removeWorktree_decorators = [Remote];
|
|
@@ -101,15 +117,21 @@ let WorktreeRemoteService = (() => {
|
|
|
101
117
|
_bindSession_decorators = [Remote];
|
|
102
118
|
_ensureWorktreePermission_decorators = [Remote];
|
|
103
119
|
_normalizeDetachedWorktreePermissions_decorators = [Remote];
|
|
120
|
+
__esDecorate(this, null, _getToolSettings_decorators, { kind: "method", name: "getToolSettings", static: false, private: false, access: { has: obj => "getToolSettings" in obj, get: obj => obj.getToolSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
121
|
+
__esDecorate(this, null, _updateToolSettings_decorators, { kind: "method", name: "updateToolSettings", static: false, private: false, access: { has: obj => "updateToolSettings" in obj, get: obj => obj.updateToolSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
122
|
+
__esDecorate(this, null, _watchToolChanges_decorators, { kind: "method", name: "watchToolChanges", static: false, private: false, access: { has: obj => "watchToolChanges" in obj, get: obj => obj.watchToolChanges }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
104
123
|
__esDecorate(this, null, _getWorktreeInstructions_decorators, { kind: "method", name: "getWorktreeInstructions", static: false, private: false, access: { has: obj => "getWorktreeInstructions" in obj, get: obj => obj.getWorktreeInstructions }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
105
124
|
__esDecorate(this, null, _updateWorktreeInstructions_decorators, { kind: "method", name: "updateWorktreeInstructions", static: false, private: false, access: { has: obj => "updateWorktreeInstructions" in obj, get: obj => obj.updateWorktreeInstructions }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
106
125
|
__esDecorate(this, null, _updateWorktreeBaseBranch_decorators, { kind: "method", name: "updateWorktreeBaseBranch", static: false, private: false, access: { has: obj => "updateWorktreeBaseBranch" in obj, get: obj => obj.updateWorktreeBaseBranch }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
126
|
+
__esDecorate(this, null, _getWorkspaceGitState_decorators, { kind: "method", name: "getWorkspaceGitState", static: false, private: false, access: { has: obj => "getWorkspaceGitState" in obj, get: obj => obj.getWorkspaceGitState }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
107
127
|
__esDecorate(this, null, _listWorktrees_decorators, { kind: "method", name: "listWorktrees", static: false, private: false, access: { has: obj => "listWorktrees" in obj, get: obj => obj.listWorktrees }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
108
128
|
__esDecorate(this, null, _listWorktreeCommits_decorators, { kind: "method", name: "listWorktreeCommits", static: false, private: false, access: { has: obj => "listWorktreeCommits" in obj, get: obj => obj.listWorktreeCommits }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
109
129
|
__esDecorate(this, null, _listWorktreeCommitFiles_decorators, { kind: "method", name: "listWorktreeCommitFiles", static: false, private: false, access: { has: obj => "listWorktreeCommitFiles" in obj, get: obj => obj.listWorktreeCommitFiles }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
110
130
|
__esDecorate(this, null, _getWorktreeCommitFileDiff_decorators, { kind: "method", name: "getWorktreeCommitFileDiff", static: false, private: false, access: { has: obj => "getWorktreeCommitFileDiff" in obj, get: obj => obj.getWorktreeCommitFileDiff }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
111
131
|
__esDecorate(this, null, _listImportCandidates_decorators, { kind: "method", name: "listImportCandidates", static: false, private: false, access: { has: obj => "listImportCandidates" in obj, get: obj => obj.listImportCandidates }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
112
132
|
__esDecorate(this, null, _listBranches_decorators, { kind: "method", name: "listBranches", static: false, private: false, access: { has: obj => "listBranches" in obj, get: obj => obj.listBranches }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
133
|
+
__esDecorate(this, null, _fetchRemoteBranches_decorators, { kind: "method", name: "fetchRemoteBranches", static: false, private: false, access: { has: obj => "fetchRemoteBranches" in obj, get: obj => obj.fetchRemoteBranches }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
134
|
+
__esDecorate(this, null, _getWorkspaceCheckout_decorators, { kind: "method", name: "getWorkspaceCheckout", static: false, private: false, access: { has: obj => "getWorkspaceCheckout" in obj, get: obj => obj.getWorkspaceCheckout }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
113
135
|
__esDecorate(this, null, _createWorktree_decorators, { kind: "method", name: "createWorktree", static: false, private: false, access: { has: obj => "createWorktree" in obj, get: obj => obj.createWorktree }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
114
136
|
__esDecorate(this, null, _importWorktree_decorators, { kind: "method", name: "importWorktree", static: false, private: false, access: { has: obj => "importWorktree" in obj, get: obj => obj.importWorktree }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
115
137
|
__esDecorate(this, null, _removeWorktree_decorators, { kind: "method", name: "removeWorktree", static: false, private: false, access: { has: obj => "removeWorktree" in obj, get: obj => obj.removeWorktree }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
@@ -130,7 +152,10 @@ let WorktreeRemoteService = (() => {
|
|
|
130
152
|
// DSH mutation API is injected here.
|
|
131
153
|
static inject = ['workspaceRegistry', 'sessions', 'sessionPersistence'];
|
|
132
154
|
manager = __runInitializers(this, _instanceExtraInitializers);
|
|
155
|
+
dsh;
|
|
133
156
|
remote;
|
|
157
|
+
toolChanges = new WorktreeToolChanges();
|
|
158
|
+
toolSettings;
|
|
134
159
|
/**
|
|
135
160
|
* 为当前 Cordis fiber 建立一次 Host 组合,并复用同一个 Remote projection 处理调用。
|
|
136
161
|
* Builds the Host composition once for the current Cordis fiber and reuses one Remote
|
|
@@ -138,6 +163,7 @@ let WorktreeRemoteService = (() => {
|
|
|
138
163
|
*/
|
|
139
164
|
constructor(ctx, config) {
|
|
140
165
|
super(ctx, 'worktreeManager');
|
|
166
|
+
this.toolSettings = new WorktreeToolSettings(config.dshHome);
|
|
141
167
|
let disposed = false;
|
|
142
168
|
ctx.effect(() => () => {
|
|
143
169
|
disposed = true;
|
|
@@ -147,6 +173,7 @@ let WorktreeRemoteService = (() => {
|
|
|
147
173
|
activitySource,
|
|
148
174
|
isDisposed: () => disposed,
|
|
149
175
|
});
|
|
176
|
+
this.dsh = dsh;
|
|
150
177
|
const subprocess = ctx.get('subprocess');
|
|
151
178
|
const manager = createWorktreeManager({
|
|
152
179
|
dsh,
|
|
@@ -154,21 +181,34 @@ let WorktreeRemoteService = (() => {
|
|
|
154
181
|
subprocess,
|
|
155
182
|
});
|
|
156
183
|
this.manager = manager;
|
|
184
|
+
ctx.effect(() => () => this.toolChanges.dispose(), 'clutch-dsh-worktree: tool change cleanup');
|
|
185
|
+
// Optional command composition keeps the read-only Provider adapter unchanged.
|
|
186
|
+
ctx.inject(['commands', 'tools', 'sessionController', 'sessionQuery', 'agents', 'llm', 'systemPrompt'], (toolCtx) => {
|
|
187
|
+
return registerWorktreeTools(toolCtx, {
|
|
188
|
+
manager,
|
|
189
|
+
samePhysicalPath,
|
|
190
|
+
dsh,
|
|
191
|
+
sessions: createWorktreeToolSessionPort(toolCtx),
|
|
192
|
+
changed: (workspaceId, worktreeId) => this.toolChanges.changed(workspaceId, worktreeId),
|
|
193
|
+
isDisposed: () => disposed,
|
|
194
|
+
settings: this.toolSettings,
|
|
195
|
+
});
|
|
196
|
+
});
|
|
157
197
|
registerWorktreeInstructions(ctx, (sessionId) => manager.resolveSessionInstructions(sessionId), () => disposed);
|
|
158
198
|
ctx.effect(() => () => this.manager.close(), 'clutch-dsh-worktree: Host manager cleanup');
|
|
159
|
-
//
|
|
160
|
-
//
|
|
161
|
-
//
|
|
162
|
-
const optionalServices = {
|
|
163
|
-
permissionPresets: ctx.get('permissionPresets'),
|
|
164
|
-
sandboxPolicy: ctx.get('sandboxPolicy'),
|
|
165
|
-
};
|
|
199
|
+
// Optional capabilities can mount late, disappear or be replaced without
|
|
200
|
+
// remounting this Host. Read the owning Context at call time, never capture
|
|
201
|
+
// a provider instance; older profiles remain loadable and fail closed.
|
|
166
202
|
const permissionAdapter = createDshWorktreePermissionAdapter({
|
|
167
203
|
sessions: {
|
|
168
204
|
get: (sessionId) => ctx.sessions.get(sessionId),
|
|
169
205
|
},
|
|
170
|
-
permissionPresets
|
|
171
|
-
|
|
206
|
+
get permissionPresets() {
|
|
207
|
+
return ctx.get('permissionPresets');
|
|
208
|
+
},
|
|
209
|
+
get sandboxPolicy() {
|
|
210
|
+
return ctx.get('sandboxPolicy');
|
|
211
|
+
},
|
|
172
212
|
});
|
|
173
213
|
this.remote = createWorktreeRemoteProjection(manager, createWorktreePermissionManager({
|
|
174
214
|
manager,
|
|
@@ -181,6 +221,31 @@ let WorktreeRemoteService = (() => {
|
|
|
181
221
|
// These methods stay deliberately thin so generated Typert descriptors see only
|
|
182
222
|
// contract-safe signatures; error normalization and JSON projection remain centralized
|
|
183
223
|
// in `createWorktreeRemoteProjection`.
|
|
224
|
+
async getToolSettings(input) {
|
|
225
|
+
await this.validateToolSettingsScope(input.scope);
|
|
226
|
+
return { ok: true, value: await this.toolSettings.read(input.scope) };
|
|
227
|
+
}
|
|
228
|
+
async updateToolSettings(input) {
|
|
229
|
+
await this.validateToolSettingsScope(input.scope);
|
|
230
|
+
return { ok: true, value: await this.toolSettings.update(input.scope, input.selection, input.expected) };
|
|
231
|
+
}
|
|
232
|
+
async validateToolSettingsScope(scope) {
|
|
233
|
+
if (scope.kind === 'general')
|
|
234
|
+
return;
|
|
235
|
+
if (scope.kind === 'local') {
|
|
236
|
+
if (!scope.workspaceId || !(await this.dsh.getWorkspace(scope.workspaceId)))
|
|
237
|
+
throw new Error('Workspace is unavailable. Reopen its Dashboard.');
|
|
238
|
+
return;
|
|
239
|
+
}
|
|
240
|
+
if (scope.kind !== 'worktree')
|
|
241
|
+
throw new Error('Invalid tool settings scope');
|
|
242
|
+
const records = await this.manager.listWorktrees({ workspaceId: scope.workspaceId });
|
|
243
|
+
if (!records.some((record) => record.worktreeId === scope.worktreeId && record.status === 'active'))
|
|
244
|
+
throw new Error('Worktree is unavailable. Reopen its Dashboard.');
|
|
245
|
+
}
|
|
246
|
+
async watchToolChanges(input, signal) {
|
|
247
|
+
return { ok: true, value: await this.toolChanges.watch(input.afterRevision, signal) };
|
|
248
|
+
}
|
|
184
249
|
getWorktreeInstructions(input) {
|
|
185
250
|
return this.remote.getWorktreeInstructions(input);
|
|
186
251
|
}
|
|
@@ -190,6 +255,9 @@ let WorktreeRemoteService = (() => {
|
|
|
190
255
|
updateWorktreeBaseBranch(input) {
|
|
191
256
|
return this.remote.updateWorktreeBaseBranch(input);
|
|
192
257
|
}
|
|
258
|
+
getWorkspaceGitState(input) {
|
|
259
|
+
return this.remote.getWorkspaceGitState(input);
|
|
260
|
+
}
|
|
193
261
|
listWorktrees(input) {
|
|
194
262
|
return this.remote.listWorktrees(input);
|
|
195
263
|
}
|
|
@@ -208,6 +276,12 @@ let WorktreeRemoteService = (() => {
|
|
|
208
276
|
listBranches(input) {
|
|
209
277
|
return this.remote.listBranches(input);
|
|
210
278
|
}
|
|
279
|
+
fetchRemoteBranches(input) {
|
|
280
|
+
return this.remote.fetchRemoteBranches(input);
|
|
281
|
+
}
|
|
282
|
+
getWorkspaceCheckout(input) {
|
|
283
|
+
return this.remote.getWorkspaceCheckout(input);
|
|
284
|
+
}
|
|
211
285
|
createWorktree(input) {
|
|
212
286
|
return this.remote.createWorktree(input);
|
|
213
287
|
}
|
package/lib/host/service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/host/service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/host/service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,EACL,4BAA4B,GAE7B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAwB/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,OAAO,EAAE,kBAAkB,EAA2B,MAAM,uBAAuB,CAAC;AAEpF,OAAO,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EACL,kCAAkC,GAEnC,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,+BAA+B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AACxF,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAW1D;;;;;;;;;;;GAWG;IACU,qBAAqB;sBAAS,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAAjD,qBAAsB,SAAQ,WAAmB;;;2CAmG3D,MAAM;8CAMN,MAAM;4CAuBN,MAAM;mDAQN,MAAM;sDAQN,MAAM;oDAUN,MAAM;gDAUN,MAAM;yCAKN,MAAM;+CAON,MAAM;mDAKN,MAAM;qDAON,MAAM;gDAON,MAAM;wCAON,MAAM;+CAON,MAAM;gDAON,MAAM;0CAKN,MAAM;0CAWN,MAAM;0CAQN,MAAM;6CASN,MAAM;+CASN,MAAM;4CAUN,MAAM;yCAKN,MAAM;0CASN,MAAM;gDASN,MAAM;wCASN,MAAM;uCAON,MAAM;oDASN,MAAM;gEAON,MAAM;YA/NP,gMAAM,eAAe,6DAGpB;YAGD,yMAAM,kBAAkB,6DAOvB;YAgBD,mMAAM,gBAAgB,6DAKrB;YAGD,wNAAA,uBAAuB,6DAKtB;YAGD,iOAAA,0BAA0B,6DAOzB;YAGD,2NAAA,wBAAwB,6DAOvB;YAGD,+MAAA,oBAAoB,6DAEnB;YAGD,0LAAA,aAAa,6DAIZ;YAGD,4MAAA,mBAAmB,6DAElB;YAGD,wNAAA,uBAAuB,6DAItB;YAGD,8NAAA,yBAAyB,6DAIxB;YAGD,+MAAA,oBAAoB,6DAInB;YAGD,uLAAA,YAAY,6DAIX;YAGD,4MAAA,mBAAmB,6DAIlB;YAGD,+MAAA,oBAAoB,6DAEnB;YAGD,6LAAA,cAAc,6DAQb;YAGD,6LAAA,cAAc,6DAKb;YAGD,6LAAA,cAAc,6DAMb;YAGD,sMAAA,iBAAiB,6DAMhB;YAGD,4MAAA,mBAAmB,6DAOlB;YAGD,mMAAA,gBAAgB,6DAEf;YAGD,0LAAA,aAAa,6DAMZ;YAGD,6LAAA,cAAc,6DAMb;YAGD,+MAAA,oBAAoB,6DAMnB;YAGD,uLAAA,YAAY,6DAIX;YAGD,oLAAA,WAAW,6DAMV;YAGD,2NAAA,wBAAwB,6DAIvB;YAGD,+PAAA,oCAAoC,6DAInC;;;QAvUD,0DAA0D;QAC1D,oFAAoF;QACpF,qCAAqC;QACrC,MAAM,CAAC,MAAM,GAAG,CAAC,mBAAmB,EAAE,UAAU,EAAE,oBAAoB,CAAC,CAAC;QAEvD,OAAO,GANb,mDAAqB,CAMiB;QAChC,GAAG,CAAqB;QACxB,MAAM,CAAwB;QAC9B,WAAW,GAAG,IAAI,mBAAmB,EAAE,CAAC;QACxC,YAAY,CAAuB;QAEpD;;;;WAIG;QACH,YAAY,GAAY,EAAE,MAA0B;YAClD,KAAK,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;YAC9B,IAAI,CAAC,YAAY,GAAG,IAAI,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC7D,IAAI,QAAQ,GAAG,KAAK,CAAC;YACrB,GAAG,CAAC,MAAM,CACR,GAAG,EAAE,CAAC,GAAG,EAAE;gBACT,QAAQ,GAAG,IAAI,CAAC;YAClB,CAAC,EACD,+CAA+C,CAChD,CAAC;YACF,MAAM,cAAc,GAAG,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAuC,CAAC;YACvF,MAAM,GAAG,GAAG,IAAI,kBAAkB,CAAC,GAAmC,EAAE;gBACtE,cAAc;gBACd,UAAU,EAAE,GAAG,EAAE,CAAC,QAAQ;aAC3B,CAAC,CAAC;YACH,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;YACf,MAAM,UAAU,GAAG,GAAG,CAAC,GAAG,CAAC,YAAY,CAAqC,CAAC;YAC7E,MAAM,OAAO,GAAG,qBAAqB,CAAC;gBACpC,GAAG;gBACH,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,UAAU;aACX,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,0CAA0C,CAAC,CAAC;YAC/F,+EAA+E;YAC/E,GAAG,CAAC,MAAM,CACR,CAAC,UAAU,EAAE,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,CAAC,EAC3F,CAAC,OAAO,EAAE,EAAE;gBACV,OAAO,qBAAqB,CAAC,OAAO,EAAE;oBACpC,OAAO;oBACP,gBAAgB;oBAChB,GAAG;oBACH,QAAQ,EAAE,6BAA6B,CAAC,OAAO,CAAC;oBAChD,OAAO,EAAE,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC;oBACvF,UAAU,EAAE,GAAG,EAAE,CAAC,QAAQ;oBAC1B,QAAQ,EAAE,IAAI,CAAC,YAAY;iBAC5B,CAAC,CAAC;YACL,CAAC,CACF,CAAC;YACF,4BAA4B,CAC1B,GAAyC,EACzC,CAAC,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,0BAA0B,CAAC,SAAS,CAAC,EAC5D,GAAG,EAAE,CAAC,QAAQ,CACf,CAAC;YACF,GAAG,CAAC,MAAM,CACR,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAChC,2CAA2C,CAC5C,CAAC;YACF,yEAAyE;YACzE,4EAA4E;YAC5E,uEAAuE;YACvE,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;gBAC3D,QAAQ,EAAE;oBACR,GAAG,EAAE,CAAC,SAAS,EAAE,EAAE,CAEf,GAGD,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC;iBAC5B;gBACD,IAAI,iBAAiB;oBACnB,OAAO,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAA6D,CAAC;gBAClG,CAAC;gBACD,IAAI,aAAa;oBACf,OAAO,GAAG,CAAC,GAAG,CAAC,eAAe,CAAyD,CAAC;gBAC1F,CAAC;aACF,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,GAAG,8BAA8B,CAC1C,OAAO,EACP,+BAA+B,CAAC;gBAC9B,OAAO;gBACP,GAAG;gBACH,WAAW,EAAE,iBAAiB;aAC/B,CAAC,CACH,CAAC;QACJ,CAAC;QAED,sDAAsD;QACtD,oDAAoD;QACpD,gFAAgF;QAChF,uFAAuF;QACvF,uCAAuC;QAEvC,KAAK,CAAC,eAAe,CAAC,KAA2C;YAC/D,MAAM,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAClD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QACxE,CAAC;QAGD,KAAK,CAAC,kBAAkB,CAAC,KAIxB;YACC,MAAM,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAClD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC3G,CAAC;QAEO,KAAK,CAAC,yBAAyB,CAAC,KAAgC;YACtE,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;gBAAE,OAAO;YACrC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC3B,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;oBACzE,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;gBACrE,OAAO;YACT,CAAC;YACD,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU;gBAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAC9E,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;YACrF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,KAAK,KAAK,CAAC,UAAU,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC;gBACjG,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACtE,CAAC;QAGD,KAAK,CAAC,gBAAgB,CACpB,KAAyC,EACzC,MAAmB;YAEnB,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,EAAE,MAAM,CAAC,EAAE,CAAC;QACxF,CAAC;QAGD,uBAAuB,CAAC,KAGvB;YACC,OAAO,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QACpD,CAAC;QAGD,0BAA0B,CAAC,KAK1B;YACC,OAAO,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,KAAK,CAAC,CAAC;QACvD,CAAC;QAGD,wBAAwB,CAAC,KAKxB;YACC,OAAO,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;QACrD,CAAC;QAGD,oBAAoB,CAAC,KAAmC;YACtD,OAAO,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACjD,CAAC;QAGD,aAAa,CAAC,KAEb;YACC,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC1C,CAAC;QAGD,mBAAmB,CAAC,KAAgC;YAClD,OAAO,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAChD,CAAC;QAGD,uBAAuB,CACrB,KAAoC;YAEpC,OAAO,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QACpD,CAAC;QAGD,yBAAyB,CACvB,KAAiC;YAEjC,OAAO,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;QACtD,CAAC;QAGD,oBAAoB,CAAC,KAEpB;YACC,OAAO,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACjD,CAAC;QAGD,YAAY,CAAC,KAEZ;YACC,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;QAGD,mBAAmB,CAAC,KAEnB;YACC,OAAO,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAChD,CAAC;QAGD,oBAAoB,CAAC,KAA4C;YAC/D,OAAO,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACjD,CAAC;QAGD,cAAc,CAAC,KAMd;YACC,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC;QAGD,cAAc,CAAC,KAGd;YACC,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC;QAGD,cAAc,CAAC,KAId;YACC,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC;QAGD,iBAAiB,CAAC,KAIjB;YACC,OAAO,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC9C,CAAC;QAGD,mBAAmB,CAAC,KAKnB;YACC,OAAO,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAChD,CAAC;QAGD,gBAAgB,CAAC,KAA8B;YAC7C,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC7C,CAAC;QAGD,aAAa,CAAC,KAIb;YACC,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC1C,CAAC;QAGD,cAAc,CAAC,KAId;YACC,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC;QAGD,oBAAoB,CAAC,KAIpB;YACC,OAAO,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACjD,CAAC;QAGD,YAAY,CAAC,KAEZ;YACC,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;QAGD,WAAW,CAAC,KAIX;YACC,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACxC,CAAC;QAGD,wBAAwB,CACtB,KAAgC;YAEhC,OAAO,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;QACrD,CAAC;QAGD,oCAAoC,CAClC,KAA6C;YAE7C,OAAO,IAAI,CAAC,MAAM,CAAC,oCAAoC,CAAC,KAAK,CAAC,CAAC;QACjE,CAAC;;;SAxUU,qBAAqB;AA2UlC,eAAe,qBAAqB,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { type WorktreeToolSelection, type WorktreeToolSettingsScope } from '../contract/tool-settings.js';
|
|
2
|
+
/** Preferences have their own files; relationship shards never contain tool configuration. */
|
|
3
|
+
export declare class WorktreeToolSettings {
|
|
4
|
+
private readonly dshHome;
|
|
5
|
+
private queue;
|
|
6
|
+
private readonly listeners;
|
|
7
|
+
constructor(dshHome: string);
|
|
8
|
+
subscribe(listener: (scope: WorktreeToolSettingsScope, selection: WorktreeToolSelection) => void): () => void;
|
|
9
|
+
private filename;
|
|
10
|
+
read(scope: WorktreeToolSettingsScope): Promise<WorktreeToolSelection>;
|
|
11
|
+
update(scope: WorktreeToolSettingsScope, selection: WorktreeToolSelection, expected: WorktreeToolSelection): Promise<WorktreeToolSelection>;
|
|
12
|
+
}
|
|
13
|
+
export declare function normalizeToolSelection(value: unknown): WorktreeToolSelection;
|
|
14
|
+
//# sourceMappingURL=tool-settings.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-settings.d.ts","sourceRoot":"","sources":["../../src/host/tool-settings.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,yBAAyB,EAC/B,MAAM,8BAA8B,CAAC;AAEtC,8FAA8F;AAC9F,qBAAa,oBAAoB;IAKnB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJpC,OAAO,CAAC,KAAK,CAAuC;IACpD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAEtB;gBACyB,OAAO,EAAE,MAAM;IAE5C,SAAS,CACP,QAAQ,EAAE,CAAC,KAAK,EAAE,yBAAyB,EAAE,SAAS,EAAE,qBAAqB,KAAK,IAAI,GACrF,MAAM,IAAI;IAKb,OAAO,CAAC,QAAQ;IAeV,IAAI,CAAC,KAAK,EAAE,yBAAyB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAa5E,MAAM,CACJ,KAAK,EAAE,yBAAyB,EAChC,SAAS,EAAE,qBAAqB,EAChC,QAAQ,EAAE,qBAAqB,GAC9B,OAAO,CAAC,qBAAqB,CAAC;CAuClC;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,qBAAqB,CAW5E"}
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { mkdir, open, readFile, rename, unlink } from 'node:fs/promises';
|
|
3
|
+
import path from 'node:path';
|
|
4
|
+
import { WORKTREE_TOOL_IDS, } from '../contract/tool-settings.js';
|
|
5
|
+
/** Preferences have their own files; relationship shards never contain tool configuration. */
|
|
6
|
+
export class WorktreeToolSettings {
|
|
7
|
+
dshHome;
|
|
8
|
+
queue = Promise.resolve();
|
|
9
|
+
listeners = new Set();
|
|
10
|
+
constructor(dshHome) {
|
|
11
|
+
this.dshHome = dshHome;
|
|
12
|
+
}
|
|
13
|
+
subscribe(listener) {
|
|
14
|
+
this.listeners.add(listener);
|
|
15
|
+
return () => this.listeners.delete(listener);
|
|
16
|
+
}
|
|
17
|
+
filename(scope) {
|
|
18
|
+
const root = path.join(this.dshHome, 'clutch-dsh-worktree', 'tool-settings');
|
|
19
|
+
if (scope.kind === 'general')
|
|
20
|
+
return path.join(root, 'general.json');
|
|
21
|
+
if (scope.kind === 'local' && scope.workspaceId)
|
|
22
|
+
return path.join(root, 'locals', 'ws-' + encodeURIComponent(scope.workspaceId) + '.json');
|
|
23
|
+
if (scope.kind !== 'worktree' || !scope.workspaceId || !scope.worktreeId)
|
|
24
|
+
throw new Error('Invalid tool settings scope');
|
|
25
|
+
return path.join(root, 'worktrees', 'ws-' + encodeURIComponent(scope.workspaceId), 'wt-' + encodeURIComponent(scope.worktreeId) + '.json');
|
|
26
|
+
}
|
|
27
|
+
async read(scope) {
|
|
28
|
+
try {
|
|
29
|
+
const text = await readFile(this.filename(scope), 'utf8');
|
|
30
|
+
if (text.length > 32_000)
|
|
31
|
+
throw new Error('Tool settings file is too large');
|
|
32
|
+
const data = JSON.parse(text);
|
|
33
|
+
if (data.version !== 1)
|
|
34
|
+
throw new Error('Unsupported tool settings version');
|
|
35
|
+
return normalizeToolSelection(data.selection);
|
|
36
|
+
}
|
|
37
|
+
catch (error) {
|
|
38
|
+
if (error.code !== 'ENOENT')
|
|
39
|
+
throw error;
|
|
40
|
+
return { enabled: false, tools: [...WORKTREE_TOOL_IDS] };
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
update(scope, selection, expected) {
|
|
44
|
+
const operation = this.queue.then(async () => {
|
|
45
|
+
const next = normalizeToolSelection(selection);
|
|
46
|
+
const current = await this.read(scope);
|
|
47
|
+
if (JSON.stringify(current) !== JSON.stringify(normalizeToolSelection(expected)))
|
|
48
|
+
throw new Error('Tool settings changed elsewhere. Reload the settings and try again.');
|
|
49
|
+
const filename = this.filename(scope);
|
|
50
|
+
const directory = path.dirname(filename);
|
|
51
|
+
await mkdir(directory, { recursive: true });
|
|
52
|
+
const temporary = filename + '.' + randomUUID() + '.tmp';
|
|
53
|
+
try {
|
|
54
|
+
const handle = await open(temporary, 'wx', 0o600);
|
|
55
|
+
try {
|
|
56
|
+
await handle.writeFile(JSON.stringify({ version: 1, selection: next }) + '\n');
|
|
57
|
+
await handle.sync();
|
|
58
|
+
}
|
|
59
|
+
finally {
|
|
60
|
+
await handle.close();
|
|
61
|
+
}
|
|
62
|
+
await rename(temporary, filename);
|
|
63
|
+
// Only directory syncing is best effort; file syncing must succeed before publication.
|
|
64
|
+
try {
|
|
65
|
+
const directoryHandle = await open(directory, 'r');
|
|
66
|
+
try {
|
|
67
|
+
await directoryHandle.sync();
|
|
68
|
+
}
|
|
69
|
+
finally {
|
|
70
|
+
await directoryHandle.close();
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
catch {
|
|
74
|
+
/* Filesystems may not support directory syncing. */
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
finally {
|
|
78
|
+
await unlink(temporary).catch(() => undefined);
|
|
79
|
+
}
|
|
80
|
+
for (const listener of this.listeners)
|
|
81
|
+
listener(scope, next);
|
|
82
|
+
return next;
|
|
83
|
+
});
|
|
84
|
+
this.queue = operation.catch(() => undefined);
|
|
85
|
+
return operation;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
export function normalizeToolSelection(value) {
|
|
89
|
+
const selection = value;
|
|
90
|
+
if (!selection ||
|
|
91
|
+
typeof selection.enabled !== 'boolean' ||
|
|
92
|
+
!Array.isArray(selection.tools) ||
|
|
93
|
+
selection.tools.some((tool) => !WORKTREE_TOOL_IDS.includes(tool)))
|
|
94
|
+
throw new Error('Invalid Worktree tool selection');
|
|
95
|
+
const tools = WORKTREE_TOOL_IDS.filter((tool) => selection.tools.includes(tool));
|
|
96
|
+
return { enabled: selection.enabled && tools.length > 0, tools };
|
|
97
|
+
}
|
|
98
|
+
//# sourceMappingURL=tool-settings.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-settings.js","sourceRoot":"","sources":["../../src/host/tool-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EACL,iBAAiB,GAGlB,MAAM,8BAA8B,CAAC;AAEtC,8FAA8F;AAC9F,MAAM,OAAO,oBAAoB;IAKF;IAJrB,KAAK,GAAqB,OAAO,CAAC,OAAO,EAAE,CAAC;IACnC,SAAS,GAAG,IAAI,GAAG,EAEjC,CAAC;IACJ,YAA6B,OAAe;QAAf,YAAO,GAAP,OAAO,CAAQ;IAAG,CAAC;IAEhD,SAAS,CACP,QAAsF;QAEtF,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC7B,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAEO,QAAQ,CAAC,KAAgC;QAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,qBAAqB,EAAE,eAAe,CAAC,CAAC;QAC7E,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACrE,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,WAAW;YAC7C,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,CAAC;QAC5F,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,KAAK,CAAC,UAAU;YACtE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjD,OAAO,IAAI,CAAC,IAAI,CACd,IAAI,EACJ,WAAW,EACX,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC,WAAW,CAAC,EAC7C,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,OAAO,CACvD,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,KAAgC;QACzC,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;YAC1D,IAAI,IAAI,CAAC,MAAM,GAAG,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;YAC7E,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAA+C,CAAC;YAC5E,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;YAC7E,OAAO,sBAAsB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAK,KAA2B,CAAC,IAAI,KAAK,QAAQ;gBAAE,MAAM,KAAK,CAAC;YAChE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,GAAG,iBAAiB,CAAC,EAAE,CAAC;QAC3D,CAAC;IACH,CAAC;IAED,MAAM,CACJ,KAAgC,EAChC,SAAgC,EAChC,QAA+B;QAE/B,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAC3C,MAAM,IAAI,GAAG,sBAAsB,CAAC,SAAS,CAAC,CAAC;YAC/C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvC,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;gBAC9E,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;YACzF,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACtC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACzC,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5C,MAAM,SAAS,GAAG,QAAQ,GAAG,GAAG,GAAG,UAAU,EAAE,GAAG,MAAM,CAAC;YACzD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;gBAClD,IAAI,CAAC;oBACH,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;oBAC/E,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;gBACtB,CAAC;wBAAS,CAAC;oBACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;gBACvB,CAAC;gBACD,MAAM,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;gBAClC,uFAAuF;gBACvF,IAAI,CAAC;oBACH,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;oBACnD,IAAI,CAAC;wBACH,MAAM,eAAe,CAAC,IAAI,EAAE,CAAC;oBAC/B,CAAC;4BAAS,CAAC;wBACT,MAAM,eAAe,CAAC,KAAK,EAAE,CAAC;oBAChC,CAAC;gBACH,CAAC;gBAAC,MAAM,CAAC;oBACP,oDAAoD;gBACtD,CAAC;YACH,CAAC;oBAAS,CAAC;gBACT,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YACjD,CAAC;YACD,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS;gBAAE,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAC9C,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAED,MAAM,UAAU,sBAAsB,CAAC,KAAc;IACnD,MAAM,SAAS,GAAG,KAA8C,CAAC;IACjE,IACE,CAAC,SAAS;QACV,OAAO,SAAS,CAAC,OAAO,KAAK,SAAS;QACtC,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC;QAC/B,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEjE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,MAAM,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,KAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAClF,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC;AACnE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree-permission-manager.d.ts","sourceRoot":"","sources":["../../src/host/worktree-permission-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"worktree-permission-manager.d.ts","sourceRoot":"","sources":["../../src/host/worktree-permission-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,yBAAyB,EAEzB,sBAAsB,EAGvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAI3D,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,eAAe,GAAG,cAAc,CAAC,CAAC;IAC1E,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,WAAW,CAAC,EAAE,sBAAsB,CAAC;CAC/C;AAyBD;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,gCAAgC,GACxC,yBAAyB,CAkJ3B"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import path from 'node:path';
|
|
2
1
|
import { providerError } from '../provider/types.js';
|
|
3
|
-
import {
|
|
2
|
+
import { boundSessionCwdMatchesWorktree } from '../provider/worktree-path.js';
|
|
4
3
|
function unverified() {
|
|
5
4
|
return { status: 'unverified', retryable: true };
|
|
6
5
|
}
|
|
@@ -60,8 +59,7 @@ export function createWorktreePermissionManager(options) {
|
|
|
60
59
|
sessionId: input.sessionId,
|
|
61
60
|
});
|
|
62
61
|
}
|
|
63
|
-
const sessionCwdMatches =
|
|
64
|
-
await samePhysicalPath(session.cwd, worktree.absolutePath);
|
|
62
|
+
const sessionCwdMatches = await boundSessionCwdMatchesWorktree(session.cwd, worktree);
|
|
65
63
|
if ((session.workspaceId !== undefined && session.workspaceId !== workspace.workspaceId) ||
|
|
66
64
|
!sessionCwdMatches) {
|
|
67
65
|
throw providerError('SESSION_CWD_MISMATCH', `Session "${input.sessionId}" does not belong to this Worktree`, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree-permission-manager.js","sourceRoot":"","sources":["../../src/host/worktree-permission-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"worktree-permission-manager.js","sourceRoot":"","sources":["../../src/host/worktree-permission-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { WorktreeToolChangeBatch } from '../contract/worktree-tool-changes.js';
|
|
2
|
+
/** Coalesced identities and bounded long-poll lifetime; no Git or Session facts. */
|
|
3
|
+
export declare class WorktreeToolChanges {
|
|
4
|
+
private revision;
|
|
5
|
+
private readonly latest;
|
|
6
|
+
private readonly waiters;
|
|
7
|
+
private disposed;
|
|
8
|
+
changed(workspaceId: string, worktreeId: string): void;
|
|
9
|
+
watch(afterRevision: number, signal: AbortSignal): Promise<WorktreeToolChangeBatch>;
|
|
10
|
+
dispose(): void;
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=worktree-tool-changes.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worktree-tool-changes.d.ts","sourceRoot":"","sources":["../../src/host/worktree-tool-changes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAEpF,oFAAoF;AACpF,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAK;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAGnB;IACJ,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyB;IACjD,OAAO,CAAC,QAAQ,CAAS;IAEzB,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAUhD,KAAK,CACT,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,uBAAuB,CAAC;IAgCnC,OAAO,IAAI,IAAI;CAKhB"}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
/** Coalesced identities and bounded long-poll lifetime; no Git or Session facts. */
|
|
2
|
+
export class WorktreeToolChanges {
|
|
3
|
+
revision = 0;
|
|
4
|
+
latest = new Map();
|
|
5
|
+
waiters = new Set();
|
|
6
|
+
disposed = false;
|
|
7
|
+
changed(workspaceId, worktreeId) {
|
|
8
|
+
if (this.disposed)
|
|
9
|
+
return;
|
|
10
|
+
this.latest.set(workspaceId, {
|
|
11
|
+
revision: ++this.revision,
|
|
12
|
+
workspaceId,
|
|
13
|
+
worktreeId,
|
|
14
|
+
});
|
|
15
|
+
for (const wake of [...this.waiters])
|
|
16
|
+
wake();
|
|
17
|
+
}
|
|
18
|
+
async watch(afterRevision, signal) {
|
|
19
|
+
signal.throwIfAborted();
|
|
20
|
+
if (!Number.isSafeInteger(afterRevision) || afterRevision < 0)
|
|
21
|
+
throw new Error('Invalid revision');
|
|
22
|
+
if (this.disposed)
|
|
23
|
+
throw new Error('Worktree plugin is disposed');
|
|
24
|
+
if (afterRevision === this.revision) {
|
|
25
|
+
await new Promise((resolve, reject) => {
|
|
26
|
+
const done = (error) => {
|
|
27
|
+
clearTimeout(timer);
|
|
28
|
+
this.waiters.delete(wake);
|
|
29
|
+
signal.removeEventListener('abort', abort);
|
|
30
|
+
if (error)
|
|
31
|
+
reject(error);
|
|
32
|
+
else
|
|
33
|
+
resolve();
|
|
34
|
+
};
|
|
35
|
+
const wake = () => done();
|
|
36
|
+
const abort = () => done(signal.reason ?? new Error('Aborted'));
|
|
37
|
+
const timer = setTimeout(wake, 20000);
|
|
38
|
+
this.waiters.add(wake);
|
|
39
|
+
signal.addEventListener('abort', abort, { once: true });
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
signal.throwIfAborted();
|
|
43
|
+
if (this.disposed)
|
|
44
|
+
throw new Error('Worktree plugin is disposed');
|
|
45
|
+
const baseline = afterRevision > this.revision ? 0 : afterRevision;
|
|
46
|
+
return {
|
|
47
|
+
revision: this.revision,
|
|
48
|
+
changes: [...this.latest.values()]
|
|
49
|
+
.filter((change) => change.revision > baseline)
|
|
50
|
+
.map(({ workspaceId, worktreeId }) => ({ workspaceId, worktreeId })),
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
dispose() {
|
|
54
|
+
this.disposed = true;
|
|
55
|
+
for (const wake of [...this.waiters])
|
|
56
|
+
wake();
|
|
57
|
+
this.latest.clear();
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
//# sourceMappingURL=worktree-tool-changes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worktree-tool-changes.js","sourceRoot":"","sources":["../../src/host/worktree-tool-changes.ts"],"names":[],"mappings":"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"}
|