@cerbur/clutch-dsh-worktree 0.1.17 → 0.1.19
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 +207 -42
- package/README.zh.md +174 -38
- package/assets/screenshots/screenshots-agent-steer.jpg +0 -0
- package/assets/screenshots/screenshots-baseline-sync.png +0 -0
- package/lib/client/WorktreeSurface.d.ts.map +1 -1
- package/lib/client/WorktreeSurface.js +55 -12
- package/lib/client/WorktreeSurface.js.map +1 -1
- package/lib/client/branch/GitBranchSelector.d.ts +23 -0
- package/lib/client/branch/GitBranchSelector.d.ts.map +1 -0
- package/lib/client/branch/GitBranchSelector.js +142 -0
- package/lib/client/branch/GitBranchSelector.js.map +1 -0
- package/lib/client/context/worktree-context-store.d.ts +3 -1
- package/lib/client/context/worktree-context-store.d.ts.map +1 -1
- package/lib/client/context/worktree-context-store.js +4 -2
- package/lib/client/context/worktree-context-store.js.map +1 -1
- package/lib/client/context/worktree-context.d.ts +3 -2
- package/lib/client/context/worktree-context.d.ts.map +1 -1
- package/lib/client/context/worktree-context.js +5 -3
- package/lib/client/context/worktree-context.js.map +1 -1
- package/lib/client/dashboard/WorktreeDashboard.d.ts +11 -3
- package/lib/client/dashboard/WorktreeDashboard.d.ts.map +1 -1
- package/lib/client/dashboard/WorktreeDashboard.js +181 -75
- package/lib/client/dashboard/WorktreeDashboard.js.map +1 -1
- package/lib/client/dashboard/dashboard-selection.d.ts +8 -3
- package/lib/client/dashboard/dashboard-selection.d.ts.map +1 -1
- package/lib/client/dashboard/dashboard-selection.js +29 -4
- package/lib/client/dashboard/dashboard-selection.js.map +1 -1
- package/lib/client/dashboard/git/GitChangedFiles.d.ts +2 -1
- package/lib/client/dashboard/git/GitChangedFiles.d.ts.map +1 -1
- package/lib/client/dashboard/git/GitChangedFiles.js +8 -6
- package/lib/client/dashboard/git/GitChangedFiles.js.map +1 -1
- package/lib/client/dashboard/git/GitCommitList.d.ts +6 -1
- package/lib/client/dashboard/git/GitCommitList.d.ts.map +1 -1
- package/lib/client/dashboard/git/GitCommitList.js +34 -29
- package/lib/client/dashboard/git/GitCommitList.js.map +1 -1
- package/lib/client/dashboard/git/GitCommitStats.d.ts +8 -0
- package/lib/client/dashboard/git/GitCommitStats.d.ts.map +1 -0
- package/lib/client/dashboard/git/GitCommitStats.js +7 -0
- package/lib/client/dashboard/git/GitCommitStats.js.map +1 -0
- package/lib/client/dashboard/git/WorktreeGitOverview.d.ts.map +1 -1
- package/lib/client/dashboard/git/WorktreeGitOverview.js +2 -1
- package/lib/client/dashboard/git/WorktreeGitOverview.js.map +1 -1
- package/lib/client/dashboard/git/WorktreeGitPanel.d.ts +1 -1
- package/lib/client/dashboard/git/WorktreeGitPanel.d.ts.map +1 -1
- package/lib/client/dashboard/git/WorktreeGitPanel.js +28 -9
- package/lib/client/dashboard/git/WorktreeGitPanel.js.map +1 -1
- package/lib/client/dashboard/git/file-address.d.ts +5 -2
- package/lib/client/dashboard/git/file-address.d.ts.map +1 -1
- package/lib/client/dashboard/git/file-address.js +50 -7
- package/lib/client/dashboard/git/file-address.js.map +1 -1
- package/lib/client/dashboard/git/git-facts.js +1 -1
- package/lib/client/dashboard/git/git-facts.js.map +1 -1
- package/lib/client/dashboard/git/useWorktreeGitState.d.ts +7 -2
- package/lib/client/dashboard/git/useWorktreeGitState.d.ts.map +1 -1
- package/lib/client/dashboard/git/useWorktreeGitState.js +84 -21
- package/lib/client/dashboard/git/useWorktreeGitState.js.map +1 -1
- package/lib/client/dsh-icons.d.ts +2 -0
- package/lib/client/dsh-icons.d.ts.map +1 -1
- package/lib/client/dsh-icons.js +2 -0
- package/lib/client/dsh-icons.js.map +1 -1
- package/lib/client/dsh-slot-contract.d.ts +8 -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 +22 -4
- package/lib/client/entry.js.map +1 -1
- package/lib/client/locales.d.ts +86 -2
- package/lib/client/locales.d.ts.map +1 -1
- package/lib/client/locales.js +100 -16
- package/lib/client/locales.js.map +1 -1
- package/lib/client/permission/worktree-permission.d.ts.map +1 -1
- package/lib/client/permission/worktree-permission.js +14 -6
- package/lib/client/permission/worktree-permission.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/settings/diagnostics.d.ts +4 -0
- package/lib/client/settings/diagnostics.d.ts.map +1 -1
- package/lib/client/settings/diagnostics.js +12 -0
- package/lib/client/settings/diagnostics.js.map +1 -1
- package/lib/client/steer/SteerDock.d.ts +8 -0
- package/lib/client/steer/SteerDock.d.ts.map +1 -0
- package/lib/client/steer/SteerDock.js +12 -0
- package/lib/client/steer/SteerDock.js.map +1 -0
- package/lib/client/steer/steer-activity.d.ts +18 -0
- package/lib/client/steer/steer-activity.d.ts.map +1 -0
- package/lib/client/steer/steer-activity.js +37 -0
- package/lib/client/steer/steer-activity.js.map +1 -0
- package/lib/client/steer/steer-state.d.ts +24 -0
- package/lib/client/steer/steer-state.d.ts.map +1 -0
- package/lib/client/steer/steer-state.js +102 -0
- package/lib/client/steer/steer-state.js.map +1 -0
- package/lib/client/surface/actions/useLifecycleActions.js +1 -1
- package/lib/client/surface/actions/useLifecycleActions.js.map +1 -1
- package/lib/client/surface/actions/useWorktreeRegistration.d.ts +1 -1
- package/lib/client/surface/actions/useWorktreeRegistration.d.ts.map +1 -1
- package/lib/client/surface/actions/useWorktreeRegistration.js +32 -11
- package/lib/client/surface/actions/useWorktreeRegistration.js.map +1 -1
- package/lib/client/surface/components/RegistrationDialog.d.ts +3 -3
- package/lib/client/surface/components/RegistrationDialog.d.ts.map +1 -1
- package/lib/client/surface/components/RegistrationDialog.js +70 -5
- package/lib/client/surface/components/RegistrationDialog.js.map +1 -1
- package/lib/client/surface/components/WorkspaceTree.d.ts.map +1 -1
- package/lib/client/surface/components/WorkspaceTree.js +11 -8
- package/lib/client/surface/components/WorkspaceTree.js.map +1 -1
- package/lib/client/surface/components/dialogs.d.ts +1 -1
- package/lib/client/surface/components/dialogs.d.ts.map +1 -1
- package/lib/client/surface/components/dialogs.js +24 -15
- package/lib/client/surface/components/dialogs.js.map +1 -1
- package/lib/client/surface/state/useRegistrationState.d.ts +6 -1
- package/lib/client/surface/state/useRegistrationState.d.ts.map +1 -1
- package/lib/client/surface/state/useRegistrationState.js +7 -0
- package/lib/client/surface/state/useRegistrationState.js.map +1 -1
- package/lib/client/surface/state/useSurfaceRefresh.d.ts.map +1 -1
- package/lib/client/surface/state/useSurfaceRefresh.js +6 -3
- package/lib/client/surface/state/useSurfaceRefresh.js.map +1 -1
- package/lib/client/surface/types.d.ts +10 -2
- package/lib/client/surface/types.d.ts.map +1 -1
- package/lib/client/view/worktree-error-copy.d.ts.map +1 -1
- package/lib/client/view/worktree-error-copy.js +4 -0
- package/lib/client/view/worktree-error-copy.js.map +1 -1
- package/lib/client/view/worktree-view-read.d.ts +7 -2
- package/lib/client/view/worktree-view-read.d.ts.map +1 -1
- package/lib/client/view/worktree-view-read.js +57 -18
- package/lib/client/view/worktree-view-read.js.map +1 -1
- package/lib/client/worktree-connection.d.ts +4 -0
- package/lib/client/worktree-connection.d.ts.map +1 -1
- package/lib/client/worktree-connection.js +20 -1
- package/lib/client/worktree-connection.js.map +1 -1
- package/lib/client.js +2361 -834
- package/lib/client.js.map +1 -1
- package/lib/contract/baseline-sync.d.ts +27 -0
- package/lib/contract/baseline-sync.d.ts.map +1 -0
- package/lib/contract/baseline-sync.js +2 -0
- package/lib/contract/baseline-sync.js.map +1 -0
- package/lib/contract/index.contract.js +16 -0
- package/lib/contract/index.contract.js.map +1 -1
- package/lib/contract/index.d.ts +73 -12
- package/lib/contract/index.d.ts.map +1 -1
- package/lib/contract/index.js +4 -0
- package/lib/contract/index.js.map +1 -1
- package/lib/contract/worktree-permission.d.ts +2 -0
- package/lib/contract/worktree-permission.d.ts.map +1 -1
- package/lib/contract/worktree-permission.js +1 -1
- package/lib/contract/worktree-permission.js.map +1 -1
- package/lib/contract/worktree-tool-changes.d.ts +2 -0
- package/lib/contract/worktree-tool-changes.d.ts.map +1 -1
- package/lib/host/baseline-sync.d.ts +15 -0
- package/lib/host/baseline-sync.d.ts.map +1 -0
- package/lib/host/baseline-sync.js +93 -0
- package/lib/host/baseline-sync.js.map +1 -0
- package/lib/host/remote.d.ts +2 -1
- package/lib/host/remote.d.ts.map +1 -1
- package/lib/host/remote.js +8 -1
- package/lib/host/remote.js.map +1 -1
- package/lib/host/service.d.ts +18 -6
- package/lib/host/service.d.ts.map +1 -1
- package/lib/host/service.js +45 -2
- package/lib/host/service.js.map +1 -1
- package/lib/host/worktree-permission.d.ts +12 -0
- package/lib/host/worktree-permission.d.ts.map +1 -1
- package/lib/host/worktree-permission.js +87 -16
- package/lib/host/worktree-permission.js.map +1 -1
- package/lib/host/worktree-tool-changes.d.ts +1 -1
- package/lib/host/worktree-tool-changes.d.ts.map +1 -1
- package/lib/host/worktree-tool-changes.js +5 -2
- package/lib/host/worktree-tool-changes.js.map +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js.map +1 -1
- package/lib/manage/manager-git-history.d.ts +5 -7
- package/lib/manage/manager-git-history.d.ts.map +1 -1
- package/lib/manage/manager-git-history.js +158 -65
- package/lib/manage/manager-git-history.js.map +1 -1
- package/lib/manage/manager-git-paths.d.ts +7 -0
- package/lib/manage/manager-git-paths.d.ts.map +1 -0
- package/lib/manage/manager-git-paths.js +62 -0
- package/lib/manage/manager-git-paths.js.map +1 -0
- package/lib/manage/manager-worktrees.d.ts +9 -1
- package/lib/manage/manager-worktrees.d.ts.map +1 -1
- package/lib/manage/manager-worktrees.js +69 -14
- package/lib/manage/manager-worktrees.js.map +1 -1
- package/lib/manage/manager.d.ts +17 -5
- package/lib/manage/manager.d.ts.map +1 -1
- package/lib/manage/manager.js +81 -4
- package/lib/manage/manager.js.map +1 -1
- package/lib/manage/types.d.ts +5 -0
- package/lib/manage/types.d.ts.map +1 -1
- package/lib/provider/git/adapter.d.ts +13 -12
- package/lib/provider/git/adapter.d.ts.map +1 -1
- package/lib/provider/git/adapter.js +152 -29
- package/lib/provider/git/adapter.js.map +1 -1
- package/lib/provider/git/branch-name.d.ts +5 -0
- package/lib/provider/git/branch-name.d.ts.map +1 -0
- package/lib/provider/git/branch-name.js +16 -0
- package/lib/provider/git/branch-name.js.map +1 -0
- package/lib/provider/git/branches.d.ts +11 -0
- package/lib/provider/git/branches.d.ts.map +1 -0
- package/lib/provider/git/branches.js +37 -0
- package/lib/provider/git/branches.js.map +1 -0
- package/lib/provider/sidecar/repository.d.ts.map +1 -1
- package/lib/provider/sidecar/repository.js +2 -1
- package/lib/provider/sidecar/repository.js.map +1 -1
- package/lib/provider/sidecar/sidecar-schema.d.ts.map +1 -1
- package/lib/provider/sidecar/sidecar-schema.js +2 -0
- package/lib/provider/sidecar/sidecar-schema.js.map +1 -1
- package/lib/provider/transaction/operations/create.d.ts.map +1 -1
- package/lib/provider/transaction/operations/create.js +18 -6
- package/lib/provider/transaction/operations/create.js.map +1 -1
- package/lib/provider/transaction/recovery/failure-recovery.d.ts.map +1 -1
- package/lib/provider/transaction/recovery/failure-recovery.js +3 -2
- package/lib/provider/transaction/recovery/failure-recovery.js.map +1 -1
- package/lib/provider/transaction/recovery/recover.d.ts.map +1 -1
- package/lib/provider/transaction/recovery/recover.js +8 -5
- package/lib/provider/transaction/recovery/recover.js.map +1 -1
- package/lib/provider/transaction/support/journal.d.ts.map +1 -1
- package/lib/provider/transaction/support/journal.js +1 -0
- package/lib/provider/transaction/support/journal.js.map +1 -1
- package/lib/provider/types.d.ts +24 -4
- package/lib/provider/types.d.ts.map +1 -1
- package/lib/provider/types.js.map +1 -1
- package/lib/tool/agent-relay.d.ts +55 -0
- package/lib/tool/agent-relay.d.ts.map +1 -0
- package/lib/tool/agent-relay.js +159 -0
- package/lib/tool/agent-relay.js.map +1 -0
- package/lib/tool/delegation.d.ts +1 -0
- package/lib/tool/delegation.d.ts.map +1 -1
- package/lib/tool/delegation.js +32 -6
- package/lib/tool/delegation.js.map +1 -1
- package/lib/tool/dispatch-session.d.ts +18 -0
- package/lib/tool/dispatch-session.d.ts.map +1 -0
- package/lib/tool/dispatch-session.js +41 -0
- package/lib/tool/dispatch-session.js.map +1 -0
- package/lib/tool/errors.d.ts +6 -0
- package/lib/tool/errors.d.ts.map +1 -1
- package/lib/tool/errors.js +16 -2
- package/lib/tool/errors.js.map +1 -1
- package/lib/tool/guidance.d.ts +1 -0
- package/lib/tool/guidance.d.ts.map +1 -1
- package/lib/tool/guidance.js +2 -0
- package/lib/tool/guidance.js.map +1 -1
- package/lib/tool/index.d.ts.map +1 -1
- package/lib/tool/index.js +38 -4
- package/lib/tool/index.js.map +1 -1
- package/lib/tool/inputs.d.ts.map +1 -1
- package/lib/tool/inputs.js +6 -6
- package/lib/tool/inputs.js.map +1 -1
- package/lib/tool/list-models.js +2 -2
- package/lib/tool/list-models.js.map +1 -1
- package/lib/tool/list-sessions.js +2 -2
- package/lib/tool/list-sessions.js.map +1 -1
- package/lib/tool/list-worktrees.d.ts.map +1 -1
- package/lib/tool/list-worktrees.js +9 -2
- package/lib/tool/list-worktrees.js.map +1 -1
- package/lib/tool/native-session.d.ts +4 -0
- package/lib/tool/native-session.d.ts.map +1 -1
- package/lib/tool/native-session.js +17 -0
- package/lib/tool/native-session.js.map +1 -1
- package/lib/tool/new-worktree.js +4 -4
- package/lib/tool/new-worktree.js.map +1 -1
- package/lib/tool/report-result.d.ts.map +1 -1
- package/lib/tool/report-result.js +9 -7
- package/lib/tool/report-result.js.map +1 -1
- package/lib/tool/schema.d.ts +8 -0
- package/lib/tool/schema.d.ts.map +1 -1
- package/lib/tool/schema.js +31 -2
- package/lib/tool/schema.js.map +1 -1
- package/lib/tool/send-message.d.ts.map +1 -1
- package/lib/tool/send-message.js +8 -7
- package/lib/tool/send-message.js.map +1 -1
- package/lib/tool/span-worktree.d.ts.map +1 -1
- package/lib/tool/span-worktree.js +33 -59
- package/lib/tool/span-worktree.js.map +1 -1
- package/lib/tool/types.d.ts +2 -0
- package/lib/tool/types.d.ts.map +1 -1
- package/lib/tool/wire-schema.d.ts +4 -0
- package/lib/tool/wire-schema.d.ts.map +1 -0
- package/lib/tool/wire-schema.js +24 -0
- package/lib/tool/wire-schema.js.map +1 -0
- package/lib/typert.host.js +283 -52
- package/lib/typert.remote-client.d.ts +13 -5
- package/lib/typert.remote-client.d.ts.map +1 -1
- package/lib/typert.remote-client.js +283 -52
- package/package.json +7 -2
package/lib/host/remote.js
CHANGED
|
@@ -11,7 +11,7 @@ function isWorktreeError(error) {
|
|
|
11
11
|
candidate.details !== null &&
|
|
12
12
|
!Array.isArray(candidate.details));
|
|
13
13
|
}
|
|
14
|
-
async function project(operation) {
|
|
14
|
+
export async function project(operation) {
|
|
15
15
|
try {
|
|
16
16
|
return { ok: true, value: await operation() };
|
|
17
17
|
}
|
|
@@ -44,15 +44,22 @@ async function project(operation) {
|
|
|
44
44
|
*/
|
|
45
45
|
export function createWorktreeRemoteProjection(manager, permissions) {
|
|
46
46
|
return {
|
|
47
|
+
getWorkspaceCheckout: (input) => project(() => {
|
|
48
|
+
if (!manager.getWorkspaceCheckout)
|
|
49
|
+
throw new Error('Workspace checkout read unavailable');
|
|
50
|
+
return manager.getWorkspaceCheckout(input);
|
|
51
|
+
}),
|
|
47
52
|
getWorktreeInstructions: (input) => project(() => manager.getWorktreeInstructions(input)),
|
|
48
53
|
updateWorktreeInstructions: (input) => project(() => manager.updateWorktreeInstructions(input)),
|
|
49
54
|
updateWorktreeBaseBranch: (input) => project(() => manager.updateWorktreeBaseBranch(input)),
|
|
50
55
|
listWorktrees: (input) => project(() => manager.listWorktrees(input)),
|
|
56
|
+
getWorkspaceGitState: (input) => project(() => manager.getWorkspaceGitState(input)),
|
|
51
57
|
listWorktreeCommits: (input) => project(() => manager.listWorktreeCommits(input)),
|
|
52
58
|
listWorktreeCommitFiles: (input) => project(() => manager.listWorktreeCommitFiles(input)),
|
|
53
59
|
getWorktreeCommitFileDiff: (input) => project(() => manager.getWorktreeCommitFileDiff(input)),
|
|
54
60
|
listImportCandidates: (input) => project(() => manager.listImportCandidates(input)),
|
|
55
61
|
listBranches: (input) => project(() => manager.listBranches(input)),
|
|
62
|
+
fetchRemoteBranches: (input) => project(() => manager.fetchRemoteBranches(input)),
|
|
56
63
|
createWorktree: (input) => project(() => manager.createWorktree(input)),
|
|
57
64
|
importWorktree: (input) => project(() => manager.importWorktree(input)),
|
|
58
65
|
removeWorktree: (input) => project(async () => {
|
package/lib/host/remote.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../src/host/remote.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,mBAAmB,GAMpB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAS,oBAAoB,CAAC,CAAC;AAEjE,SAAS,eAAe,CAAC,KAAc;IACrC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACtF,MAAM,SAAS,GAAG,KAA+B,CAAC;IAClD,OAAO,CACL,OAAO,SAAS,CAAC,IAAI,KAAK,QAAQ;QAClC,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC;QACtC,OAAO,SAAS,CAAC,OAAO,KAAK,QAAQ;QACrC,OAAO,SAAS,CAAC,OAAO,KAAK,QAAQ;QACrC,SAAS,CAAC,OAAO,KAAK,IAAI;QAC1B,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAClC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,OAAO,CAAQ,SAA+B;
|
|
1
|
+
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../src/host/remote.ts"],"names":[],"mappings":"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"}
|
package/lib/host/service.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
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 { WorktreeBaselineSyncRequest, WorktreeSessionDispatchResult } from '../contract/baseline-sync.js';
|
|
4
5
|
import type { WorktreeToolChangeBatch } from '../contract/worktree-tool-changes.js';
|
|
5
6
|
import type { WorktreeToolSelection, WorktreeToolSettingsScope } from '../contract/tool-settings.js';
|
|
6
7
|
/**
|
|
@@ -10,6 +11,8 @@ import type { WorktreeToolSelection, WorktreeToolSettingsScope } from '../contra
|
|
|
10
11
|
export interface WorktreeHostConfig {
|
|
11
12
|
/** DSH 解析后的绝对数据根目录。 / Absolute DSH data root resolved by the Host. */
|
|
12
13
|
readonly dshHome: string;
|
|
14
|
+
/** Provider ids whose wire tools require explicit nullable default fields. */
|
|
15
|
+
readonly nullableToolProviders?: readonly string[];
|
|
13
16
|
}
|
|
14
17
|
/**
|
|
15
18
|
* Worktree plugin 的真实 composition root。
|
|
@@ -30,12 +33,14 @@ export declare class WorktreeRemoteService extends TypertRemoteService {
|
|
|
30
33
|
private readonly remote;
|
|
31
34
|
private readonly toolChanges;
|
|
32
35
|
private readonly toolSettings;
|
|
36
|
+
private baselineSync?;
|
|
33
37
|
/**
|
|
34
38
|
* 为当前 Cordis fiber 建立一次 Host 组合,并复用同一个 Remote projection 处理调用。
|
|
35
39
|
* Builds the Host composition once for the current Cordis fiber and reuses one Remote
|
|
36
40
|
* projection for all calls.
|
|
37
41
|
*/
|
|
38
42
|
constructor(ctx: Context, config: WorktreeHostConfig);
|
|
43
|
+
syncWorktreeBaseline(input: WorktreeBaselineSyncRequest, signal: AbortSignal): Promise<WorktreeRemoteResult<WorktreeSessionDispatchResult>>;
|
|
39
44
|
getToolSettings(input: {
|
|
40
45
|
scope: WorktreeToolSettingsScope;
|
|
41
46
|
}): Promise<WorktreeRemoteResult<WorktreeToolSelection>>;
|
|
@@ -64,14 +69,13 @@ export declare class WorktreeRemoteService extends TypertRemoteService {
|
|
|
64
69
|
baseBranch: string;
|
|
65
70
|
expectedBaseBranch?: string;
|
|
66
71
|
}): Promise<WorktreeRemoteResult<string>>;
|
|
72
|
+
getWorkspaceGitState(input: {
|
|
73
|
+
workspaceId: WorkspaceId;
|
|
74
|
+
}): Promise<WorktreeRemoteResult<WorkspaceGitState>>;
|
|
67
75
|
listWorktrees(input: {
|
|
68
76
|
readonly workspaceId: string;
|
|
69
77
|
}): Promise<WorktreeRemoteResult<readonly WorktreeRecord[]>>;
|
|
70
|
-
listWorktreeCommits(input:
|
|
71
|
-
readonly workspaceId: WorkspaceId;
|
|
72
|
-
readonly worktreeId: WorktreeId;
|
|
73
|
-
readonly baseBranch?: string;
|
|
74
|
-
}): Promise<WorktreeRemoteResult<WorktreeGitHistory>>;
|
|
78
|
+
listWorktreeCommits(input: WorktreeGitHistoryRequest): Promise<WorktreeRemoteResult<WorktreeGitHistory>>;
|
|
75
79
|
listWorktreeCommitFiles(input: WorktreeGitCommitFilesRequest): Promise<WorktreeRemoteResult<WorktreeGitCommitFiles>>;
|
|
76
80
|
getWorktreeCommitFileDiff(input: WorktreeGitFileDiffRequest): Promise<WorktreeRemoteResult<WorktreeGitFileDiff>>;
|
|
77
81
|
listImportCandidates(input: {
|
|
@@ -80,10 +84,18 @@ export declare class WorktreeRemoteService extends TypertRemoteService {
|
|
|
80
84
|
listBranches(input: {
|
|
81
85
|
readonly workspaceId: string;
|
|
82
86
|
}): Promise<WorktreeRemoteResult<readonly BranchRecord[]>>;
|
|
87
|
+
fetchRemoteBranches(input: {
|
|
88
|
+
readonly workspaceId: string;
|
|
89
|
+
}): Promise<WorktreeRemoteResult<readonly BranchRecord[]>>;
|
|
90
|
+
getWorkspaceCheckout(input: {
|
|
91
|
+
readonly workspaceId: WorkspaceId;
|
|
92
|
+
}): Promise<WorktreeRemoteResult<WorkspaceCheckout>>;
|
|
83
93
|
createWorktree(input: {
|
|
84
94
|
readonly workspaceId: string;
|
|
85
95
|
readonly branch: string;
|
|
86
96
|
readonly newBranch?: string;
|
|
97
|
+
readonly fromHead?: boolean;
|
|
98
|
+
readonly expectedHeadCommit?: string;
|
|
87
99
|
}): Promise<WorktreeRemoteResult<WorktreeRecord>>;
|
|
88
100
|
importWorktree(input: {
|
|
89
101
|
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;AAKnD,OAAO,EAAU,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAE/E,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EACd,sBAAsB,EACtB,6BAA6B,EAC7B,mBAAmB,EACnB,0BAA0B,EAC1B,kBAAkB,EAClB,UAAU,EACV,cAAc,EACd,uBAAuB,EACvB,yBAAyB,EACzB,sCAAsC,EACtC,wBAAwB,EACxB,WAAW,
|
|
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
|
@@ -37,7 +37,8 @@ import { Remote, TypertRemoteService } from '@deepseek-ai/dsh-typert-protocol';
|
|
|
37
37
|
import { samePhysicalPath } from '../provider/path-identity.js';
|
|
38
38
|
import { createWorktreeManager } from '../manage/index.js';
|
|
39
39
|
import { DshHostReadAdapter } from './dsh-read-adapter.js';
|
|
40
|
-
import { createWorktreeRemoteProjection } from './remote.js';
|
|
40
|
+
import { createWorktreeRemoteProjection, project } from './remote.js';
|
|
41
|
+
import { createBaselineSync } from './baseline-sync.js';
|
|
41
42
|
import { createDshWorktreePermissionAdapter, } from './worktree-permission.js';
|
|
42
43
|
import { createWorktreePermissionManager } from './worktree-permission-manager.js';
|
|
43
44
|
import { registerWorktreeTools, createWorktreeToolSessionPort } from '../tool/index.js';
|
|
@@ -58,18 +59,22 @@ import { WorktreeToolSettings } from './tool-settings.js';
|
|
|
58
59
|
let WorktreeRemoteService = (() => {
|
|
59
60
|
let _classSuper = TypertRemoteService;
|
|
60
61
|
let _instanceExtraInitializers = [];
|
|
62
|
+
let _syncWorktreeBaseline_decorators;
|
|
61
63
|
let _getToolSettings_decorators;
|
|
62
64
|
let _updateToolSettings_decorators;
|
|
63
65
|
let _watchToolChanges_decorators;
|
|
64
66
|
let _getWorktreeInstructions_decorators;
|
|
65
67
|
let _updateWorktreeInstructions_decorators;
|
|
66
68
|
let _updateWorktreeBaseBranch_decorators;
|
|
69
|
+
let _getWorkspaceGitState_decorators;
|
|
67
70
|
let _listWorktrees_decorators;
|
|
68
71
|
let _listWorktreeCommits_decorators;
|
|
69
72
|
let _listWorktreeCommitFiles_decorators;
|
|
70
73
|
let _getWorktreeCommitFileDiff_decorators;
|
|
71
74
|
let _listImportCandidates_decorators;
|
|
72
75
|
let _listBranches_decorators;
|
|
76
|
+
let _fetchRemoteBranches_decorators;
|
|
77
|
+
let _getWorkspaceCheckout_decorators;
|
|
73
78
|
let _createWorktree_decorators;
|
|
74
79
|
let _importWorktree_decorators;
|
|
75
80
|
let _removeWorktree_decorators;
|
|
@@ -86,18 +91,22 @@ let WorktreeRemoteService = (() => {
|
|
|
86
91
|
return class WorktreeRemoteService extends _classSuper {
|
|
87
92
|
static {
|
|
88
93
|
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
|
|
94
|
+
_syncWorktreeBaseline_decorators = [Remote];
|
|
89
95
|
_getToolSettings_decorators = [Remote];
|
|
90
96
|
_updateToolSettings_decorators = [Remote];
|
|
91
97
|
_watchToolChanges_decorators = [Remote];
|
|
92
98
|
_getWorktreeInstructions_decorators = [Remote];
|
|
93
99
|
_updateWorktreeInstructions_decorators = [Remote];
|
|
94
100
|
_updateWorktreeBaseBranch_decorators = [Remote];
|
|
101
|
+
_getWorkspaceGitState_decorators = [Remote];
|
|
95
102
|
_listWorktrees_decorators = [Remote];
|
|
96
103
|
_listWorktreeCommits_decorators = [Remote];
|
|
97
104
|
_listWorktreeCommitFiles_decorators = [Remote];
|
|
98
105
|
_getWorktreeCommitFileDiff_decorators = [Remote];
|
|
99
106
|
_listImportCandidates_decorators = [Remote];
|
|
100
107
|
_listBranches_decorators = [Remote];
|
|
108
|
+
_fetchRemoteBranches_decorators = [Remote];
|
|
109
|
+
_getWorkspaceCheckout_decorators = [Remote];
|
|
101
110
|
_createWorktree_decorators = [Remote];
|
|
102
111
|
_importWorktree_decorators = [Remote];
|
|
103
112
|
_removeWorktree_decorators = [Remote];
|
|
@@ -111,18 +120,22 @@ let WorktreeRemoteService = (() => {
|
|
|
111
120
|
_bindSession_decorators = [Remote];
|
|
112
121
|
_ensureWorktreePermission_decorators = [Remote];
|
|
113
122
|
_normalizeDetachedWorktreePermissions_decorators = [Remote];
|
|
123
|
+
__esDecorate(this, null, _syncWorktreeBaseline_decorators, { kind: "method", name: "syncWorktreeBaseline", static: false, private: false, access: { has: obj => "syncWorktreeBaseline" in obj, get: obj => obj.syncWorktreeBaseline }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
114
124
|
__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);
|
|
115
125
|
__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);
|
|
116
126
|
__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);
|
|
117
127
|
__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);
|
|
118
128
|
__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);
|
|
119
129
|
__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);
|
|
130
|
+
__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);
|
|
120
131
|
__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);
|
|
121
132
|
__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);
|
|
122
133
|
__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);
|
|
123
134
|
__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);
|
|
124
135
|
__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);
|
|
125
136
|
__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);
|
|
137
|
+
__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);
|
|
138
|
+
__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);
|
|
126
139
|
__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);
|
|
127
140
|
__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);
|
|
128
141
|
__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);
|
|
@@ -147,6 +160,7 @@ let WorktreeRemoteService = (() => {
|
|
|
147
160
|
remote;
|
|
148
161
|
toolChanges = new WorktreeToolChanges();
|
|
149
162
|
toolSettings;
|
|
163
|
+
baselineSync;
|
|
150
164
|
/**
|
|
151
165
|
* 为当前 Cordis fiber 建立一次 Host 组合,并复用同一个 Remote projection 处理调用。
|
|
152
166
|
* Builds the Host composition once for the current Cordis fiber and reuses one Remote
|
|
@@ -175,11 +189,21 @@ let WorktreeRemoteService = (() => {
|
|
|
175
189
|
ctx.effect(() => () => this.toolChanges.dispose(), 'clutch-dsh-worktree: tool change cleanup');
|
|
176
190
|
// Optional command composition keeps the read-only Provider adapter unchanged.
|
|
177
191
|
ctx.inject(['commands', 'tools', 'sessionController', 'sessionQuery', 'agents', 'llm', 'systemPrompt'], (toolCtx) => {
|
|
192
|
+
const sessions = createWorktreeToolSessionPort(toolCtx);
|
|
193
|
+
const sync = createBaselineSync({ manager, sessions,
|
|
194
|
+
changed: (workspaceId, worktreeId, requestId) => this.toolChanges.changed(workspaceId, worktreeId, requestId) });
|
|
195
|
+
this.baselineSync = sync;
|
|
196
|
+
toolCtx.effect(() => () => {
|
|
197
|
+
sync.dispose();
|
|
198
|
+
if (this.baselineSync === sync)
|
|
199
|
+
this.baselineSync = undefined;
|
|
200
|
+
}, 'clutch-dsh-worktree: baseline task cleanup');
|
|
178
201
|
return registerWorktreeTools(toolCtx, {
|
|
202
|
+
nullableToolProviders: config.nullableToolProviders,
|
|
179
203
|
manager,
|
|
180
204
|
samePhysicalPath,
|
|
181
205
|
dsh,
|
|
182
|
-
sessions
|
|
206
|
+
sessions,
|
|
183
207
|
changed: (workspaceId, worktreeId) => this.toolChanges.changed(workspaceId, worktreeId),
|
|
184
208
|
isDisposed: () => disposed,
|
|
185
209
|
settings: this.toolSettings,
|
|
@@ -200,6 +224,9 @@ let WorktreeRemoteService = (() => {
|
|
|
200
224
|
get sandboxPolicy() {
|
|
201
225
|
return ctx.get('sandboxPolicy');
|
|
202
226
|
},
|
|
227
|
+
get approval() {
|
|
228
|
+
return ctx.get('approval');
|
|
229
|
+
},
|
|
203
230
|
});
|
|
204
231
|
this.remote = createWorktreeRemoteProjection(manager, createWorktreePermissionManager({
|
|
205
232
|
manager,
|
|
@@ -212,6 +239,13 @@ let WorktreeRemoteService = (() => {
|
|
|
212
239
|
// These methods stay deliberately thin so generated Typert descriptors see only
|
|
213
240
|
// contract-safe signatures; error normalization and JSON projection remain centralized
|
|
214
241
|
// in `createWorktreeRemoteProjection`.
|
|
242
|
+
syncWorktreeBaseline(input, signal) {
|
|
243
|
+
return project(() => {
|
|
244
|
+
if (!this.baselineSync)
|
|
245
|
+
throw new Error('Native Session task capability is unavailable.');
|
|
246
|
+
return this.baselineSync.sync(input, signal);
|
|
247
|
+
});
|
|
248
|
+
}
|
|
215
249
|
async getToolSettings(input) {
|
|
216
250
|
await this.validateToolSettingsScope(input.scope);
|
|
217
251
|
return { ok: true, value: await this.toolSettings.read(input.scope) };
|
|
@@ -246,6 +280,9 @@ let WorktreeRemoteService = (() => {
|
|
|
246
280
|
updateWorktreeBaseBranch(input) {
|
|
247
281
|
return this.remote.updateWorktreeBaseBranch(input);
|
|
248
282
|
}
|
|
283
|
+
getWorkspaceGitState(input) {
|
|
284
|
+
return this.remote.getWorkspaceGitState(input);
|
|
285
|
+
}
|
|
249
286
|
listWorktrees(input) {
|
|
250
287
|
return this.remote.listWorktrees(input);
|
|
251
288
|
}
|
|
@@ -264,6 +301,12 @@ let WorktreeRemoteService = (() => {
|
|
|
264
301
|
listBranches(input) {
|
|
265
302
|
return this.remote.listBranches(input);
|
|
266
303
|
}
|
|
304
|
+
fetchRemoteBranches(input) {
|
|
305
|
+
return this.remote.fetchRemoteBranches(input);
|
|
306
|
+
}
|
|
307
|
+
getWorkspaceCheckout(input) {
|
|
308
|
+
return this.remote.getWorkspaceCheckout(input);
|
|
309
|
+
}
|
|
267
310
|
createWorktree(input) {
|
|
268
311
|
return this.remote.createWorktree(input);
|
|
269
312
|
}
|
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,EACL,4BAA4B,GAE7B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/host/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,17 @@ interface PermissionPresetService {
|
|
|
21
21
|
}
|
|
22
22
|
interface SandboxPolicyService {
|
|
23
23
|
readonly defaultMode?: WorktreePermissionSandboxMode;
|
|
24
|
+
resolve?(request: {
|
|
25
|
+
session: PermissionSession;
|
|
26
|
+
}): {
|
|
27
|
+
readonly mode: WorktreePermissionSandboxMode;
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
interface ApprovalService {
|
|
31
|
+
readonly config: {
|
|
32
|
+
readonly policy?: WorktreePermissionApprovalPolicy;
|
|
33
|
+
};
|
|
34
|
+
overrideOf(session: PermissionSession): WorktreePermissionApprovalPolicy | undefined;
|
|
24
35
|
}
|
|
25
36
|
export interface DshWorktreePermissionAdapterOptions {
|
|
26
37
|
readonly sessions: {
|
|
@@ -28,6 +39,7 @@ export interface DshWorktreePermissionAdapterOptions {
|
|
|
28
39
|
};
|
|
29
40
|
readonly permissionPresets?: PermissionPresetService;
|
|
30
41
|
readonly sandboxPolicy?: SandboxPolicyService;
|
|
42
|
+
readonly approval?: ApprovalService;
|
|
31
43
|
}
|
|
32
44
|
/**
|
|
33
45
|
* Adapt the optional public DSH permission services to the Worktree Manager
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree-permission.d.ts","sourceRoot":"","sources":["../../src/host/worktree-permission.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,gCAAgC,EAErC,KAAK,sBAAsB,EAG3B,KAAK,6BAA6B,EACnC,MAAM,kCAAkC,CAAC;AAE1C,UAAU,eAAe;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,UAAU,iBAAiB;IACzB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,eAAe,EAAE,CAAC;IAC7C,cAAc,CAAC,IAAI,SAAS,eAAe,EAAE,CAAC;IAC9C,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC;CAC9C;AAED,UAAU,oBAAoB;IAC5B,QAAQ,CAAC,OAAO,EAAE,6BAA6B,CAAC;IAChD,QAAQ,CAAC,QAAQ,EAAE,gCAAgC,CAAC;CACrD;AAED,UAAU,uBAAuB;IAC/B,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,OAAO,CAAC,eAAe,EAAE,OAAO,GAAG,MAAM,CAAC;IAC1C,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,CAAC;IAC5C,GAAG,CAAC,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrD;AAED,UAAU,oBAAoB;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"worktree-permission.d.ts","sourceRoot":"","sources":["../../src/host/worktree-permission.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,gCAAgC,EAErC,KAAK,sBAAsB,EAG3B,KAAK,6BAA6B,EACnC,MAAM,kCAAkC,CAAC;AAE1C,UAAU,eAAe;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,UAAU,iBAAiB;IACzB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,eAAe,EAAE,CAAC;IAC7C,cAAc,CAAC,IAAI,SAAS,eAAe,EAAE,CAAC;IAC9C,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC;CAC9C;AAED,UAAU,oBAAoB;IAC5B,QAAQ,CAAC,OAAO,EAAE,6BAA6B,CAAC;IAChD,QAAQ,CAAC,QAAQ,EAAE,gCAAgC,CAAC;CACrD;AAED,UAAU,uBAAuB;IAC/B,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,OAAO,CAAC,eAAe,EAAE,OAAO,GAAG,MAAM,CAAC;IAC1C,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,CAAC;IAC5C,GAAG,CAAC,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrD;AAED,UAAU,oBAAoB;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,6BAA6B,CAAC;IACrD,OAAO,CAAC,CAAC,OAAO,EAAE;QAAE,OAAO,EAAE,iBAAiB,CAAA;KAAE,GAAG;QAAE,QAAQ,CAAC,IAAI,EAAE,6BAA6B,CAAA;KAAE,CAAC;CACrG;AAED,UAAU,eAAe;IACvB,QAAQ,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,gCAAgC,CAAA;KAAE,CAAC;IACxE,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,gCAAgC,GAAG,SAAS,CAAC;CACtF;AAED,MAAM,WAAW,mCAAmC;IAClD,QAAQ,CAAC,QAAQ,EAAE;QACjB,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;KACjC,CAAC;IACF,QAAQ,CAAC,iBAAiB,CAAC,EAAE,uBAAuB,CAAC;IACrD,QAAQ,CAAC,aAAa,CAAC,EAAE,oBAAoB,CAAC;IAC9C,QAAQ,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC;CACrC;AA+ID;;;;GAIG;AACH,wBAAgB,kCAAkC,CAChD,OAAO,EAAE,mCAAmC,GAC3C,sBAAsB,CA2HxB"}
|
|
@@ -20,6 +20,12 @@ function lastEventValue(events, type, key) {
|
|
|
20
20
|
function hasFullThenRestriction(events) {
|
|
21
21
|
let fullSeen = false;
|
|
22
22
|
for (const event of events) {
|
|
23
|
+
if (event.type === 'sandbox/mode' && isRecord(event.data)) {
|
|
24
|
+
if (event.data.mode === 'danger-full-access')
|
|
25
|
+
fullSeen = true;
|
|
26
|
+
else if (fullSeen && (event.data.mode === 'workspace-write' || event.data.mode === 'read-only'))
|
|
27
|
+
return true;
|
|
28
|
+
}
|
|
23
29
|
if (event.type !== 'permission/preset' || !isRecord(event.data))
|
|
24
30
|
continue;
|
|
25
31
|
const preset = stringValue(event.data.preset);
|
|
@@ -48,7 +54,7 @@ function resolveCurrentPreset(permissionPresets, session, events) {
|
|
|
48
54
|
}
|
|
49
55
|
}
|
|
50
56
|
}
|
|
51
|
-
function readCurrentState(session, permissionPresets, sandboxPolicy, pluginApplied) {
|
|
57
|
+
function readCurrentState(session, permissionPresets, sandboxPolicy, pluginApplied, approval) {
|
|
52
58
|
const events = getSessionEvents(session);
|
|
53
59
|
const preset = resolveCurrentPreset(permissionPresets, session, events);
|
|
54
60
|
let presetSpec;
|
|
@@ -60,18 +66,34 @@ function readCurrentState(session, permissionPresets, sandboxPolicy, pluginAppli
|
|
|
60
66
|
presetSpec = undefined;
|
|
61
67
|
}
|
|
62
68
|
}
|
|
63
|
-
|
|
69
|
+
let sandboxMode = lastEventValue(events, 'sandbox/mode', 'mode') ??
|
|
64
70
|
presetSpec?.sandbox ??
|
|
65
71
|
sandboxPolicy?.defaultMode;
|
|
66
|
-
|
|
72
|
+
let approvalPolicy = lastEventValue(events, 'approval/policy', 'policy') ??
|
|
67
73
|
presetSpec?.approval;
|
|
74
|
+
// When available these are the actual consumers of the durable knob events,
|
|
75
|
+
// not merely the configured preset (which may no longer match the Session).
|
|
76
|
+
if (typeof sandboxPolicy?.resolve === 'function' && typeof approval?.overrideOf === 'function') {
|
|
77
|
+
try {
|
|
78
|
+
sandboxMode = sandboxPolicy.resolve({ session }).mode;
|
|
79
|
+
approvalPolicy = approval.overrideOf(session) ?? approval.config.policy ?? 'ask';
|
|
80
|
+
if (!['read-only', 'workspace-write', 'danger-full-access'].includes(sandboxMode) ||
|
|
81
|
+
!['ask', 'never'].includes(approvalPolicy))
|
|
82
|
+
throw new Error('Unsupported native permission state');
|
|
83
|
+
}
|
|
84
|
+
catch {
|
|
85
|
+
return { ...(preset === undefined ? {} : { preset }), explicitUserOverride: false, unavailable: true };
|
|
86
|
+
}
|
|
87
|
+
}
|
|
68
88
|
const pluginChangedThisRuntime = pluginApplied.has(session.id);
|
|
69
89
|
const currentIsRestricted = pluginChangedThisRuntime && sandboxMode !== 'danger-full-access' ||
|
|
70
90
|
hasFullThenRestriction(events) ||
|
|
91
|
+
(preset !== undefined && sandboxMode === 'read-only') ||
|
|
71
92
|
(preset !== undefined &&
|
|
72
93
|
preset !== WORKSPACE_WRITE_PRESET &&
|
|
73
94
|
preset !== WORKTREE_FULL_ACCESS_PRESET &&
|
|
74
|
-
preset !== 'danger-full-access'
|
|
95
|
+
preset !== 'danger-full-access' &&
|
|
96
|
+
!(preset === 'custom' && sandboxMode === 'danger-full-access'));
|
|
75
97
|
return {
|
|
76
98
|
...(preset === undefined ? {} : { preset }),
|
|
77
99
|
...(sandboxMode === undefined ? {} : { sandboxMode }),
|
|
@@ -108,14 +130,30 @@ export function createDshWorktreePermissionAdapter(options) {
|
|
|
108
130
|
return { status: 'unverified', retryable: true };
|
|
109
131
|
}
|
|
110
132
|
const permissionPresets = options.permissionPresets;
|
|
111
|
-
const
|
|
133
|
+
const sandboxPolicy = options.sandboxPolicy;
|
|
134
|
+
const approval = options.approval;
|
|
135
|
+
const readState = () => readCurrentState(session, permissionPresets, sandboxPolicy, pluginApplied, approval);
|
|
136
|
+
const current = readState();
|
|
112
137
|
const hasService = serviceAvailable(permissionPresets);
|
|
138
|
+
if (current.unavailable || (hasService && current.preset === undefined)) {
|
|
139
|
+
return resultFromCurrent('unverified', current, true);
|
|
140
|
+
}
|
|
141
|
+
const sessionPolicyAvailable = hasService && typeof sandboxPolicy?.resolve === 'function' &&
|
|
142
|
+
typeof approval?.overrideOf === 'function' && current.sandboxMode !== undefined &&
|
|
143
|
+
current.approvalPolicy !== undefined;
|
|
144
|
+
const namedFullAvailable = hasService && permissionPresets.names.includes(WORKTREE_FULL_ACCESS_PRESET);
|
|
145
|
+
const verifiedResult = (status, mode, retryable = false) => {
|
|
146
|
+
const next = readState();
|
|
147
|
+
const verified = !next.unavailable && next.sandboxMode === mode && next.approvalPolicy === 'ask';
|
|
148
|
+
return resultFromCurrent(verified ? status : 'unverified', next, !verified || retryable);
|
|
149
|
+
};
|
|
113
150
|
const decision = decideWorktreePermission({
|
|
114
151
|
binding,
|
|
115
152
|
current,
|
|
116
153
|
capability: {
|
|
117
154
|
permissionService: hasService,
|
|
118
|
-
fullPreset:
|
|
155
|
+
fullPreset: namedFullAvailable,
|
|
156
|
+
sessionPolicy: sessionPolicyAvailable,
|
|
119
157
|
workspaceWrite: hasService && permissionPresets.names.includes(WORKSPACE_WRITE_PRESET),
|
|
120
158
|
},
|
|
121
159
|
});
|
|
@@ -128,9 +166,24 @@ export function createDshWorktreePermissionAdapter(options) {
|
|
|
128
166
|
case 'apply-full':
|
|
129
167
|
if (!hasService)
|
|
130
168
|
return resultFromCurrent('unverified', current, true);
|
|
131
|
-
|
|
169
|
+
if (namedFullAvailable) {
|
|
170
|
+
const spec = permissionPresets.resolve(decision.preset);
|
|
171
|
+
if (spec.sandbox !== 'danger-full-access' || spec.approval !== 'ask') {
|
|
172
|
+
return resultFromCurrent('unverified', current, true);
|
|
173
|
+
}
|
|
174
|
+
permissionPresets.set(session, decision.preset);
|
|
175
|
+
}
|
|
176
|
+
else if (sessionPolicyAvailable) {
|
|
177
|
+
// Same durable path as native setApprovalPolicy/setSandboxMode. Set
|
|
178
|
+
// approval first: a failed write must not widen filesystem access.
|
|
179
|
+
// No fabricated preset identity or native provider mutation.
|
|
180
|
+
session.append('approval/policy', { policy: 'ask' });
|
|
181
|
+
session.append('sandbox/mode', { mode: 'danger-full-access' });
|
|
182
|
+
}
|
|
183
|
+
else
|
|
184
|
+
return resultFromCurrent('unverified', current, true);
|
|
132
185
|
pluginApplied.add(session.id);
|
|
133
|
-
return
|
|
186
|
+
return verifiedResult('full-applied', 'danger-full-access');
|
|
134
187
|
case 'preserve-user-restriction':
|
|
135
188
|
return resultFromCurrent('user-restricted', current, false);
|
|
136
189
|
case 'unverified':
|
|
@@ -138,25 +191,43 @@ export function createDshWorktreePermissionAdapter(options) {
|
|
|
138
191
|
case 'fallback-workspace-write':
|
|
139
192
|
if (!hasService)
|
|
140
193
|
return resultFromCurrent('unverified', current, true);
|
|
194
|
+
{
|
|
195
|
+
const spec = permissionPresets.resolve(WORKSPACE_WRITE_PRESET);
|
|
196
|
+
if (spec.sandbox !== 'workspace-write' || spec.approval !== 'ask') {
|
|
197
|
+
return resultFromCurrent('unverified', current, true);
|
|
198
|
+
}
|
|
199
|
+
}
|
|
141
200
|
permissionPresets.set(session, WORKSPACE_WRITE_PRESET);
|
|
142
|
-
return
|
|
201
|
+
return verifiedResult('fallback-workspace-write', 'workspace-write', true);
|
|
143
202
|
case 'normalize-workspace-write':
|
|
144
|
-
if (!hasService
|
|
203
|
+
if (!hasService) {
|
|
145
204
|
return resultFromCurrent('unverified', current, true);
|
|
146
205
|
}
|
|
147
|
-
permissionPresets.
|
|
206
|
+
if (permissionPresets.names.includes(WORKSPACE_WRITE_PRESET)) {
|
|
207
|
+
const spec = permissionPresets.resolve(WORKSPACE_WRITE_PRESET);
|
|
208
|
+
if (spec.sandbox !== 'workspace-write' || spec.approval !== 'ask') {
|
|
209
|
+
return resultFromCurrent('unverified', current, true);
|
|
210
|
+
}
|
|
211
|
+
permissionPresets.set(session, WORKSPACE_WRITE_PRESET);
|
|
212
|
+
}
|
|
213
|
+
else if (sessionPolicyAvailable) {
|
|
214
|
+
session.append('sandbox/mode', { mode: 'workspace-write' });
|
|
215
|
+
session.append('approval/policy', { policy: 'ask' });
|
|
216
|
+
}
|
|
217
|
+
else
|
|
218
|
+
return resultFromCurrent('unverified', current, true);
|
|
148
219
|
pluginApplied.delete(session.id);
|
|
149
|
-
return
|
|
220
|
+
return verifiedResult('normalized-workspace-write', 'workspace-write');
|
|
150
221
|
case 'no-op':
|
|
151
222
|
return resultFromCurrent(binding === 'active' && isFullAccessState(current) ? 'already-full' : 'no-op', current, false);
|
|
152
223
|
}
|
|
153
224
|
};
|
|
154
225
|
return {
|
|
155
|
-
ensure(input) {
|
|
156
|
-
return
|
|
226
|
+
async ensure(input) {
|
|
227
|
+
return apply(input, 'active');
|
|
157
228
|
},
|
|
158
|
-
normalize(input) {
|
|
159
|
-
return
|
|
229
|
+
async normalize(input) {
|
|
230
|
+
return apply(input, 'detached');
|
|
160
231
|
},
|
|
161
232
|
};
|
|
162
233
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree-permission.js","sourceRoot":"","sources":["../../src/host/worktree-permission.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,2BAA2B,GAO5B,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"worktree-permission.js","sourceRoot":"","sources":["../../src/host/worktree-permission.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ export declare class WorktreeToolChanges {
|
|
|
5
5
|
private readonly latest;
|
|
6
6
|
private readonly waiters;
|
|
7
7
|
private disposed;
|
|
8
|
-
changed(workspaceId: string, worktreeId: string): void;
|
|
8
|
+
changed(workspaceId: string, worktreeId: string, requestId?: string): void;
|
|
9
9
|
watch(afterRevision: number, signal: AbortSignal): Promise<WorktreeToolChangeBatch>;
|
|
10
10
|
dispose(): void;
|
|
11
11
|
}
|
|
@@ -1 +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;
|
|
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,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAWpE,KAAK,CACT,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,uBAAuB,CAAC;IAkCnC,OAAO,IAAI,IAAI;CAKhB"}
|