@cyanheads/git-mcp-server 2.2.4 → 2.3.2
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/LICENSE +1 -1
- package/README.md +69 -25
- package/dist/config/index.d.ts +87 -0
- package/dist/config/index.d.ts.map +1 -0
- package/dist/config/index.js +7 -3
- package/dist/config/index.js.map +1 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -0
- package/dist/mcp-server/resources/gitWorkingDir/index.d.ts +6 -0
- package/dist/mcp-server/resources/gitWorkingDir/index.d.ts.map +1 -0
- package/dist/mcp-server/resources/gitWorkingDir/index.js +1 -0
- package/dist/mcp-server/resources/gitWorkingDir/index.js.map +1 -0
- package/dist/mcp-server/resources/gitWorkingDir/logic.d.ts +15 -0
- package/dist/mcp-server/resources/gitWorkingDir/logic.d.ts.map +1 -0
- package/dist/mcp-server/resources/gitWorkingDir/logic.js +1 -0
- package/dist/mcp-server/resources/gitWorkingDir/logic.js.map +1 -0
- package/dist/mcp-server/resources/gitWorkingDir/registration.d.ts +15 -0
- package/dist/mcp-server/resources/gitWorkingDir/registration.d.ts.map +1 -0
- package/dist/mcp-server/resources/gitWorkingDir/registration.js +9 -7
- package/dist/mcp-server/resources/gitWorkingDir/registration.js.map +1 -0
- package/dist/mcp-server/server.d.ts +13 -0
- package/dist/mcp-server/server.d.ts.map +1 -0
- package/dist/mcp-server/server.js +17 -6
- package/dist/mcp-server/server.js.map +1 -0
- package/dist/mcp-server/tools/gitAdd/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitAdd/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitAdd/index.js +1 -0
- package/dist/mcp-server/tools/gitAdd/index.js.map +1 -0
- package/dist/mcp-server/tools/gitAdd/logic.d.ts +167 -0
- package/dist/mcp-server/tools/gitAdd/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitAdd/logic.js +24 -5
- package/dist/mcp-server/tools/gitAdd/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitAdd/registration.d.ts +6 -0
- package/dist/mcp-server/tools/gitAdd/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitAdd/registration.js +5 -2
- package/dist/mcp-server/tools/gitAdd/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitBranch/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitBranch/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitBranch/index.js +1 -0
- package/dist/mcp-server/tools/gitBranch/index.js.map +1 -0
- package/dist/mcp-server/tools/gitBranch/logic.d.ts +175 -0
- package/dist/mcp-server/tools/gitBranch/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitBranch/logic.js +75 -27
- package/dist/mcp-server/tools/gitBranch/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitBranch/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitBranch/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitBranch/registration.js +13 -4
- package/dist/mcp-server/tools/gitBranch/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitCheckout/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitCheckout/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitCheckout/index.js +1 -0
- package/dist/mcp-server/tools/gitCheckout/index.js.map +1 -0
- package/dist/mcp-server/tools/gitCheckout/logic.d.ts +184 -0
- package/dist/mcp-server/tools/gitCheckout/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitCheckout/logic.js +45 -10
- package/dist/mcp-server/tools/gitCheckout/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitCheckout/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitCheckout/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitCheckout/registration.js +12 -3
- package/dist/mcp-server/tools/gitCheckout/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitCherryPick/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitCherryPick/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitCherryPick/index.js +1 -0
- package/dist/mcp-server/tools/gitCherryPick/index.js.map +1 -0
- package/dist/mcp-server/tools/gitCherryPick/logic.d.ts +190 -0
- package/dist/mcp-server/tools/gitCherryPick/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitCherryPick/logic.js +38 -10
- package/dist/mcp-server/tools/gitCherryPick/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitCherryPick/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitCherryPick/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitCherryPick/registration.js +12 -3
- package/dist/mcp-server/tools/gitCherryPick/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitClean/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitClean/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitClean/index.js +1 -0
- package/dist/mcp-server/tools/gitClean/index.js.map +1 -0
- package/dist/mcp-server/tools/gitClean/logic.d.ts +187 -0
- package/dist/mcp-server/tools/gitClean/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitClean/logic.js +48 -11
- package/dist/mcp-server/tools/gitClean/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitClean/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitClean/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitClean/registration.js +12 -3
- package/dist/mcp-server/tools/gitClean/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitClearWorkingDir/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitClearWorkingDir/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitClearWorkingDir/index.js +1 -0
- package/dist/mcp-server/tools/gitClearWorkingDir/index.js.map +1 -0
- package/dist/mcp-server/tools/gitClearWorkingDir/logic.d.ts +33 -0
- package/dist/mcp-server/tools/gitClearWorkingDir/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitClearWorkingDir/logic.js +21 -5
- package/dist/mcp-server/tools/gitClearWorkingDir/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitClearWorkingDir/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitClearWorkingDir/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitClearWorkingDir/registration.js +12 -3
- package/dist/mcp-server/tools/gitClearWorkingDir/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitClone/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitClone/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitClone/index.js +1 -0
- package/dist/mcp-server/tools/gitClone/index.js.map +1 -0
- package/dist/mcp-server/tools/gitClone/logic.d.ts +46 -0
- package/dist/mcp-server/tools/gitClone/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitClone/logic.js +33 -10
- package/dist/mcp-server/tools/gitClone/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitClone/registration.d.ts +12 -0
- package/dist/mcp-server/tools/gitClone/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitClone/registration.js +13 -5
- package/dist/mcp-server/tools/gitClone/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitCommit/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitCommit/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitCommit/index.js +1 -0
- package/dist/mcp-server/tools/gitCommit/index.js.map +1 -0
- package/dist/mcp-server/tools/gitCommit/logic.d.ts +211 -0
- package/dist/mcp-server/tools/gitCommit/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitCommit/logic.js +67 -14
- package/dist/mcp-server/tools/gitCommit/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitCommit/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitCommit/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitCommit/registration.js +12 -3
- package/dist/mcp-server/tools/gitCommit/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitDiff/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitDiff/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitDiff/index.js +1 -0
- package/dist/mcp-server/tools/gitDiff/index.js.map +1 -0
- package/dist/mcp-server/tools/gitDiff/logic.d.ts +87 -0
- package/dist/mcp-server/tools/gitDiff/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitDiff/logic.js +59 -15
- package/dist/mcp-server/tools/gitDiff/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitDiff/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitDiff/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitDiff/registration.js +13 -3
- package/dist/mcp-server/tools/gitDiff/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitFetch/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitFetch/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitFetch/index.js +1 -0
- package/dist/mcp-server/tools/gitFetch/index.js.map +1 -0
- package/dist/mcp-server/tools/gitFetch/logic.d.ts +45 -0
- package/dist/mcp-server/tools/gitFetch/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitFetch/logic.js +18 -5
- package/dist/mcp-server/tools/gitFetch/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitFetch/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitFetch/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitFetch/registration.js +12 -3
- package/dist/mcp-server/tools/gitFetch/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitInit/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitInit/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitInit/index.js +1 -0
- package/dist/mcp-server/tools/gitInit/index.js.map +1 -0
- package/dist/mcp-server/tools/gitInit/logic.d.ts +46 -0
- package/dist/mcp-server/tools/gitInit/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitInit/logic.js +73 -21
- package/dist/mcp-server/tools/gitInit/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitInit/registration.d.ts +12 -0
- package/dist/mcp-server/tools/gitInit/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitInit/registration.js +13 -5
- package/dist/mcp-server/tools/gitInit/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitLog/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitLog/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitLog/index.js +1 -0
- package/dist/mcp-server/tools/gitLog/index.js.map +1 -0
- package/dist/mcp-server/tools/gitLog/logic.d.ts +92 -0
- package/dist/mcp-server/tools/gitLog/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitLog/logic.js +84 -26
- package/dist/mcp-server/tools/gitLog/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitLog/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitLog/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitLog/registration.js +12 -3
- package/dist/mcp-server/tools/gitLog/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitMerge/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitMerge/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitMerge/index.js +1 -0
- package/dist/mcp-server/tools/gitMerge/index.js.map +1 -0
- package/dist/mcp-server/tools/gitMerge/logic.d.ts +196 -0
- package/dist/mcp-server/tools/gitMerge/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitMerge/logic.js +44 -11
- package/dist/mcp-server/tools/gitMerge/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitMerge/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitMerge/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitMerge/registration.js +12 -3
- package/dist/mcp-server/tools/gitMerge/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitPull/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitPull/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitPull/index.js +1 -0
- package/dist/mcp-server/tools/gitPull/index.js.map +1 -0
- package/dist/mcp-server/tools/gitPull/logic.d.ts +184 -0
- package/dist/mcp-server/tools/gitPull/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitPull/logic.js +31 -7
- package/dist/mcp-server/tools/gitPull/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitPull/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitPull/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitPull/registration.js +12 -3
- package/dist/mcp-server/tools/gitPull/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitPush/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitPush/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitPush/index.js +1 -0
- package/dist/mcp-server/tools/gitPush/index.js.map +1 -0
- package/dist/mcp-server/tools/gitPush/logic.d.ts +134 -0
- package/dist/mcp-server/tools/gitPush/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitPush/logic.js +28 -9
- package/dist/mcp-server/tools/gitPush/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitPush/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitPush/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitPush/registration.js +12 -3
- package/dist/mcp-server/tools/gitPush/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitRebase/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitRebase/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitRebase/index.js +1 -0
- package/dist/mcp-server/tools/gitRebase/index.js.map +1 -0
- package/dist/mcp-server/tools/gitRebase/logic.d.ts +242 -0
- package/dist/mcp-server/tools/gitRebase/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitRebase/logic.js +44 -10
- package/dist/mcp-server/tools/gitRebase/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitRebase/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitRebase/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitRebase/registration.js +12 -3
- package/dist/mcp-server/tools/gitRebase/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitRemote/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitRemote/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitRemote/index.js +1 -0
- package/dist/mcp-server/tools/gitRemote/index.js.map +1 -0
- package/dist/mcp-server/tools/gitRemote/logic.d.ts +107 -0
- package/dist/mcp-server/tools/gitRemote/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitRemote/logic.js +45 -19
- package/dist/mcp-server/tools/gitRemote/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitRemote/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitRemote/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitRemote/registration.js +12 -3
- package/dist/mcp-server/tools/gitRemote/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitReset/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitReset/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitReset/index.js +1 -0
- package/dist/mcp-server/tools/gitReset/index.js.map +1 -0
- package/dist/mcp-server/tools/gitReset/logic.d.ts +178 -0
- package/dist/mcp-server/tools/gitReset/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitReset/logic.js +24 -7
- package/dist/mcp-server/tools/gitReset/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitReset/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitReset/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitReset/registration.js +12 -3
- package/dist/mcp-server/tools/gitReset/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitSetWorkingDir/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitSetWorkingDir/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitSetWorkingDir/index.js +1 -0
- package/dist/mcp-server/tools/gitSetWorkingDir/index.js.map +1 -0
- package/dist/mcp-server/tools/gitSetWorkingDir/logic.d.ts +45 -0
- package/dist/mcp-server/tools/gitSetWorkingDir/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitSetWorkingDir/logic.js +29 -8
- package/dist/mcp-server/tools/gitSetWorkingDir/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitSetWorkingDir/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitSetWorkingDir/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitSetWorkingDir/registration.js +12 -3
- package/dist/mcp-server/tools/gitSetWorkingDir/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitShow/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitShow/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitShow/index.js +1 -0
- package/dist/mcp-server/tools/gitShow/index.js.map +1 -0
- package/dist/mcp-server/tools/gitShow/logic.d.ts +39 -0
- package/dist/mcp-server/tools/gitShow/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitShow/logic.js +17 -5
- package/dist/mcp-server/tools/gitShow/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitShow/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitShow/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitShow/registration.js +13 -3
- package/dist/mcp-server/tools/gitShow/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitStash/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitStash/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitStash/index.js +1 -0
- package/dist/mcp-server/tools/gitStash/index.js.map +1 -0
- package/dist/mcp-server/tools/gitStash/logic.d.ts +236 -0
- package/dist/mcp-server/tools/gitStash/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitStash/logic.js +76 -18
- package/dist/mcp-server/tools/gitStash/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitStash/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitStash/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitStash/registration.js +12 -3
- package/dist/mcp-server/tools/gitStash/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitStatus/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitStatus/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitStatus/index.js +1 -0
- package/dist/mcp-server/tools/gitStatus/index.js.map +1 -0
- package/dist/mcp-server/tools/gitStatus/logic.d.ts +115 -0
- package/dist/mcp-server/tools/gitStatus/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitStatus/logic.js +38 -23
- package/dist/mcp-server/tools/gitStatus/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitStatus/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitStatus/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitStatus/registration.js +12 -3
- package/dist/mcp-server/tools/gitStatus/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitTag/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitTag/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitTag/index.js +1 -0
- package/dist/mcp-server/tools/gitTag/index.js.map +1 -0
- package/dist/mcp-server/tools/gitTag/logic.d.ts +121 -0
- package/dist/mcp-server/tools/gitTag/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitTag/logic.js +59 -17
- package/dist/mcp-server/tools/gitTag/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitTag/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitTag/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitTag/registration.js +12 -3
- package/dist/mcp-server/tools/gitTag/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitWorktree/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitWorktree/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitWorktree/index.js +1 -0
- package/dist/mcp-server/tools/gitWorktree/index.js.map +1 -0
- package/dist/mcp-server/tools/gitWorktree/logic.d.ts +218 -0
- package/dist/mcp-server/tools/gitWorktree/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitWorktree/logic.js +61 -17
- package/dist/mcp-server/tools/gitWorktree/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitWorktree/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitWorktree/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitWorktree/registration.js +12 -3
- package/dist/mcp-server/tools/gitWorktree/registration.js.map +1 -0
- package/dist/mcp-server/tools/gitWrapupInstructions/index.d.ts +6 -0
- package/dist/mcp-server/tools/gitWrapupInstructions/index.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitWrapupInstructions/index.js +1 -0
- package/dist/mcp-server/tools/gitWrapupInstructions/index.js.map +1 -0
- package/dist/mcp-server/tools/gitWrapupInstructions/logic.d.ts +175 -0
- package/dist/mcp-server/tools/gitWrapupInstructions/logic.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitWrapupInstructions/logic.js +20 -6
- package/dist/mcp-server/tools/gitWrapupInstructions/logic.js.map +1 -0
- package/dist/mcp-server/tools/gitWrapupInstructions/registration.d.ts +16 -0
- package/dist/mcp-server/tools/gitWrapupInstructions/registration.d.ts.map +1 -0
- package/dist/mcp-server/tools/gitWrapupInstructions/registration.js +12 -3
- package/dist/mcp-server/tools/gitWrapupInstructions/registration.js.map +1 -0
- package/dist/mcp-server/transports/auth/authFactory.d.ts +11 -0
- package/dist/mcp-server/transports/auth/authFactory.d.ts.map +1 -0
- package/dist/mcp-server/transports/auth/authFactory.js +1 -0
- package/dist/mcp-server/transports/auth/authFactory.js.map +1 -0
- package/dist/mcp-server/transports/auth/authMiddleware.d.ts +20 -0
- package/dist/mcp-server/transports/auth/authMiddleware.d.ts.map +1 -0
- package/dist/mcp-server/transports/auth/authMiddleware.js +1 -0
- package/dist/mcp-server/transports/auth/authMiddleware.js.map +1 -0
- package/dist/mcp-server/transports/auth/index.d.ts +14 -0
- package/dist/mcp-server/transports/auth/index.d.ts.map +1 -0
- package/dist/mcp-server/transports/auth/index.js +1 -0
- package/dist/mcp-server/transports/auth/index.js.map +1 -0
- package/dist/mcp-server/transports/auth/lib/authContext.d.ts +34 -0
- package/dist/mcp-server/transports/auth/lib/authContext.d.ts.map +1 -0
- package/dist/mcp-server/transports/auth/lib/authContext.js +1 -0
- package/dist/mcp-server/transports/auth/lib/authContext.js.map +1 -0
- package/dist/mcp-server/transports/auth/lib/authTypes.d.ts +13 -0
- package/dist/mcp-server/transports/auth/lib/authTypes.d.ts.map +1 -0
- package/dist/mcp-server/transports/auth/lib/authTypes.js +1 -0
- package/dist/mcp-server/transports/auth/lib/authTypes.js.map +1 -0
- package/dist/mcp-server/transports/auth/lib/authUtils.d.ts +19 -0
- package/dist/mcp-server/transports/auth/lib/authUtils.d.ts.map +1 -0
- package/dist/mcp-server/transports/auth/lib/authUtils.js +1 -0
- package/dist/mcp-server/transports/auth/lib/authUtils.js.map +1 -0
- package/dist/mcp-server/transports/auth/strategies/authStrategy.d.ts +18 -0
- package/dist/mcp-server/transports/auth/strategies/authStrategy.d.ts.map +1 -0
- package/dist/mcp-server/transports/auth/strategies/authStrategy.js +1 -0
- package/dist/mcp-server/transports/auth/strategies/authStrategy.js.map +1 -0
- package/dist/mcp-server/transports/auth/strategies/jwtStrategy.d.ts +8 -0
- package/dist/mcp-server/transports/auth/strategies/jwtStrategy.d.ts.map +1 -0
- package/dist/mcp-server/transports/auth/strategies/jwtStrategy.js +5 -0
- package/dist/mcp-server/transports/auth/strategies/jwtStrategy.js.map +1 -0
- package/dist/mcp-server/transports/auth/strategies/oauthStrategy.d.ts +8 -0
- package/dist/mcp-server/transports/auth/strategies/oauthStrategy.d.ts.map +1 -0
- package/dist/mcp-server/transports/auth/strategies/oauthStrategy.js +6 -0
- package/dist/mcp-server/transports/auth/strategies/oauthStrategy.js.map +1 -0
- package/dist/mcp-server/transports/core/baseTransportManager.d.ts +18 -0
- package/dist/mcp-server/transports/core/baseTransportManager.d.ts.map +1 -0
- package/dist/mcp-server/transports/core/baseTransportManager.js +1 -0
- package/dist/mcp-server/transports/core/baseTransportManager.js.map +1 -0
- package/dist/mcp-server/transports/core/honoNodeBridge.d.ts +24 -0
- package/dist/mcp-server/transports/core/honoNodeBridge.d.ts.map +1 -0
- package/dist/mcp-server/transports/core/honoNodeBridge.js +11 -4
- package/dist/mcp-server/transports/core/honoNodeBridge.js.map +1 -0
- package/dist/mcp-server/transports/core/statefulTransportManager.d.ts +32 -0
- package/dist/mcp-server/transports/core/statefulTransportManager.d.ts.map +1 -0
- package/dist/mcp-server/transports/core/statefulTransportManager.js +1 -0
- package/dist/mcp-server/transports/core/statefulTransportManager.js.map +1 -0
- package/dist/mcp-server/transports/core/statelessTransportManager.d.ts +21 -0
- package/dist/mcp-server/transports/core/statelessTransportManager.d.ts.map +1 -0
- package/dist/mcp-server/transports/core/statelessTransportManager.js +1 -0
- package/dist/mcp-server/transports/core/statelessTransportManager.js.map +1 -0
- package/dist/mcp-server/transports/core/transportTypes.d.ts +69 -0
- package/dist/mcp-server/transports/core/transportTypes.d.ts.map +1 -0
- package/dist/mcp-server/transports/core/transportTypes.js +1 -0
- package/dist/mcp-server/transports/core/transportTypes.js.map +1 -0
- package/dist/mcp-server/transports/http/httpErrorHandler.d.ts +22 -0
- package/dist/mcp-server/transports/http/httpErrorHandler.d.ts.map +1 -0
- package/dist/mcp-server/transports/http/httpErrorHandler.js +1 -0
- package/dist/mcp-server/transports/http/httpErrorHandler.js.map +1 -0
- package/dist/mcp-server/transports/http/httpTransport.d.ts +23 -0
- package/dist/mcp-server/transports/http/httpTransport.d.ts.map +1 -0
- package/dist/mcp-server/transports/http/httpTransport.js +29 -10
- package/dist/mcp-server/transports/http/httpTransport.js.map +1 -0
- package/dist/mcp-server/transports/http/httpTypes.d.ts +17 -0
- package/dist/mcp-server/transports/http/httpTypes.d.ts.map +1 -0
- package/dist/mcp-server/transports/http/httpTypes.js +1 -0
- package/dist/mcp-server/transports/http/httpTypes.js.map +1 -0
- package/dist/mcp-server/transports/http/index.d.ts +8 -0
- package/dist/mcp-server/transports/http/index.d.ts.map +1 -0
- package/dist/mcp-server/transports/http/index.js +1 -0
- package/dist/mcp-server/transports/http/index.js.map +1 -0
- package/dist/mcp-server/transports/http/mcpTransportMiddleware.d.ts +27 -0
- package/dist/mcp-server/transports/http/mcpTransportMiddleware.d.ts.map +1 -0
- package/dist/mcp-server/transports/http/mcpTransportMiddleware.js +27 -24
- package/dist/mcp-server/transports/http/mcpTransportMiddleware.js.map +1 -0
- package/dist/mcp-server/transports/stdio/index.d.ts +6 -0
- package/dist/mcp-server/transports/stdio/index.d.ts.map +1 -0
- package/dist/mcp-server/transports/stdio/index.js +1 -0
- package/dist/mcp-server/transports/stdio/index.js.map +1 -0
- package/dist/mcp-server/transports/stdio/stdioTransport.d.ts +43 -0
- package/dist/mcp-server/transports/stdio/stdioTransport.d.ts.map +1 -0
- package/dist/mcp-server/transports/stdio/stdioTransport.js +1 -0
- package/dist/mcp-server/transports/stdio/stdioTransport.js.map +1 -0
- package/dist/types-global/errors.d.ts +122 -0
- package/dist/types-global/errors.d.ts.map +1 -0
- package/dist/types-global/errors.js +1 -0
- package/dist/types-global/errors.js.map +1 -0
- package/dist/utils/index.d.ts +5 -0
- package/dist/utils/index.d.ts.map +1 -0
- package/dist/utils/index.js +1 -0
- package/dist/utils/index.js.map +1 -0
- package/dist/utils/internal/errorHandler.d.ts +91 -0
- package/dist/utils/internal/errorHandler.d.ts.map +1 -0
- package/dist/utils/internal/errorHandler.js +8 -6
- package/dist/utils/internal/errorHandler.js.map +1 -0
- package/dist/utils/internal/index.d.ts +4 -0
- package/dist/utils/internal/index.d.ts.map +1 -0
- package/dist/utils/internal/index.js +1 -0
- package/dist/utils/internal/index.js.map +1 -0
- package/dist/utils/internal/logger.d.ts +55 -0
- package/dist/utils/internal/logger.d.ts.map +1 -0
- package/dist/utils/internal/logger.js +19 -5
- package/dist/utils/internal/logger.js.map +1 -0
- package/dist/utils/internal/requestContext.d.ts +48 -0
- package/dist/utils/internal/requestContext.d.ts.map +1 -0
- package/dist/utils/internal/requestContext.js +1 -0
- package/dist/utils/internal/requestContext.js.map +1 -0
- package/dist/utils/metrics/index.d.ts +2 -0
- package/dist/utils/metrics/index.d.ts.map +1 -0
- package/dist/utils/metrics/index.js +1 -0
- package/dist/utils/metrics/index.js.map +1 -0
- package/dist/utils/metrics/tokenCounter.d.ts +28 -0
- package/dist/utils/metrics/tokenCounter.d.ts.map +1 -0
- package/dist/utils/metrics/tokenCounter.js +1 -0
- package/dist/utils/metrics/tokenCounter.js.map +1 -0
- package/dist/utils/parsing/dateParser.d.ts +25 -0
- package/dist/utils/parsing/dateParser.d.ts.map +1 -0
- package/dist/utils/parsing/dateParser.js +57 -56
- package/dist/utils/parsing/dateParser.js.map +1 -0
- package/dist/utils/parsing/index.d.ts +3 -0
- package/dist/utils/parsing/index.d.ts.map +1 -0
- package/dist/utils/parsing/index.js +1 -0
- package/dist/utils/parsing/index.js.map +1 -0
- package/dist/utils/parsing/jsonParser.d.ts +83 -0
- package/dist/utils/parsing/jsonParser.d.ts.map +1 -0
- package/dist/utils/parsing/jsonParser.js +85 -45
- package/dist/utils/parsing/jsonParser.js.map +1 -0
- package/dist/utils/security/idGenerator.d.ts +94 -0
- package/dist/utils/security/idGenerator.d.ts.map +1 -0
- package/dist/utils/security/idGenerator.js +9 -2
- package/dist/utils/security/idGenerator.js.map +1 -0
- package/dist/utils/security/index.d.ts +4 -0
- package/dist/utils/security/index.d.ts.map +1 -0
- package/dist/utils/security/index.js +1 -0
- package/dist/utils/security/index.js.map +1 -0
- package/dist/utils/security/rateLimiter.d.ts +93 -0
- package/dist/utils/security/rateLimiter.d.ts.map +1 -0
- package/dist/utils/security/rateLimiter.js +1 -0
- package/dist/utils/security/rateLimiter.js.map +1 -0
- package/dist/utils/security/sanitization.d.ts +181 -0
- package/dist/utils/security/sanitization.d.ts.map +1 -0
- package/dist/utils/security/sanitization.js +6 -5
- package/dist/utils/security/sanitization.js.map +1 -0
- package/package.json +52 -34
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"registration.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitLog/registration.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAGL,cAAc,EAEf,MAAM,yBAAyB,CAAC;AASjC,MAAM,MAAM,qBAAqB,GAAG,CAClC,SAAS,EAAE,MAAM,GAAG,SAAS,KAC1B,MAAM,GAAG,SAAS,CAAC;AACxB,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,cAAc,KAAK,MAAM,GAAG,SAAS,CAAC;AAM7E;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,SAAS,EACjB,qBAAqB,qBAAqB,EAC1C,cAAc,cAAc,KAC3B,OAAO,CAAC,IAAI,CAgEd,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @fileoverview Handles registration and error handling for the git_log tool.
|
|
3
3
|
* @module src/mcp-server/tools/gitLog/registration
|
|
4
4
|
*/
|
|
5
|
-
import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
|
|
5
|
+
import { ErrorHandler, logger, requestContextService, } from "../../../utils/index.js";
|
|
6
6
|
import { logGitHistory, GitLogInputSchema, GitLogOutputSchema, } from "./logic.js";
|
|
7
7
|
const TOOL_NAME = "git_log";
|
|
8
8
|
const TOOL_DESCRIPTION = "Shows commit logs for the repository. Supports limiting count, filtering by author, date range, and specific branch/file. Returns a JSON object containing a list of commit objects (`commits` array) by default. If `showSignature: true` is used, it returns a JSON object where the `commits` array is empty and the raw signature verification output is included in the `rawOutput` field.";
|
|
@@ -39,11 +39,19 @@ export const registerGitLogTool = async (server, getWorkingDirectory, getSession
|
|
|
39
39
|
});
|
|
40
40
|
return {
|
|
41
41
|
structuredContent: result,
|
|
42
|
-
content: [
|
|
42
|
+
content: [
|
|
43
|
+
{
|
|
44
|
+
type: "text",
|
|
45
|
+
text: `Success: ${JSON.stringify(result, null, 2)}`,
|
|
46
|
+
},
|
|
47
|
+
],
|
|
43
48
|
};
|
|
44
49
|
}
|
|
45
50
|
catch (error) {
|
|
46
|
-
logger.error(`Error in ${TOOL_NAME} handler`, {
|
|
51
|
+
logger.error(`Error in ${TOOL_NAME} handler`, {
|
|
52
|
+
error,
|
|
53
|
+
...handlerContext,
|
|
54
|
+
});
|
|
47
55
|
const mcpError = ErrorHandler.handleError(error, {
|
|
48
56
|
operation: `tool:${TOOL_NAME}`,
|
|
49
57
|
context: handlerContext,
|
|
@@ -62,3 +70,4 @@ export const registerGitLogTool = async (server, getWorkingDirectory, getSession
|
|
|
62
70
|
});
|
|
63
71
|
logger.info(`Tool '${TOOL_NAME}' registered successfully.`, context);
|
|
64
72
|
};
|
|
73
|
+
//# sourceMappingURL=registration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"registration.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitLog/registration.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACL,YAAY,EACZ,MAAM,EAEN,qBAAqB,GACtB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACL,aAAa,EAEb,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,YAAY,CAAC;AAOpB,MAAM,SAAS,GAAG,SAAS,CAAC;AAC5B,MAAM,gBAAgB,GACpB,iYAAiY,CAAC;AAEpY;;;;;GAKG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,MAAiB,EACjB,mBAA0C,EAC1C,YAA4B,EACb,EAAE;IACjB,MAAM,SAAS,GAAG,oBAAoB,CAAC;IACvC,MAAM,OAAO,GAAG,qBAAqB,CAAC,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAE1E,MAAM,CAAC,YAAY,CACjB,SAAS,EACT;QACE,KAAK,EAAE,SAAS;QAChB,WAAW,EAAE,gBAAgB;QAC7B,WAAW,EAAE,iBAAiB,CAAC,KAAK;QACpC,YAAY,EAAE,kBAAkB,CAAC,KAAK;QACtC,WAAW,EAAE;YACX,YAAY,EAAE,IAAI;YAClB,eAAe,EAAE,KAAK;YACtB,cAAc,EAAE,IAAI;YACpB,aAAa,EAAE,KAAK;SACrB;KACF,EACD,KAAK,EAAE,MAAmB,EAAE,WAAoC,EAAE,EAAE;QAClE,MAAM,cAAc,GAAG,qBAAqB,CAAC,oBAAoB,CAAC;YAChE,QAAQ,EAAE,SAAS;YACnB,aAAa,EAAE,WAAW;SAC3B,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC;YAC/C,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE;gBACzC,GAAG,cAAc;gBACjB,mBAAmB,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC;aAC1D,CAAC,CAAC;YAEH,OAAO;gBACL,iBAAiB,EAAE,MAAM;gBACzB,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,YAAY,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE;qBACpD;iBACF;aACF,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,YAAY,SAAS,UAAU,EAAE;gBAC5C,KAAK;gBACL,GAAG,cAAc;aAClB,CAAC,CAAC;YACH,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE;gBAC/C,SAAS,EAAE,QAAQ,SAAS,EAAE;gBAC9B,OAAO,EAAE,cAAc;gBACvB,KAAK,EAAE,MAAM;aACd,CAAa,CAAC;YAEf,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;gBAC/D,iBAAiB,EAAE;oBACjB,IAAI,EAAE,QAAQ,CAAC,IAAI;oBACnB,OAAO,EAAE,QAAQ,CAAC,OAAO;oBACzB,OAAO,EAAE,QAAQ,CAAC,OAAO;iBAC1B;aACF,CAAC;QACJ,CAAC;IACH,CAAC,CACF,CAAC;IACF,MAAM,CAAC,IAAI,CAAC,SAAS,SAAS,4BAA4B,EAAE,OAAO,CAAC,CAAC;AACvE,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitMerge/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitMerge/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC"}
|
|
@@ -0,0 +1,196 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @fileoverview Defines the core logic, schemas, and types for the git_merge tool.
|
|
3
|
+
* @module src/mcp-server/tools/gitMerge/logic
|
|
4
|
+
*/
|
|
5
|
+
import { z } from "zod";
|
|
6
|
+
import { type RequestContext } from "../../../utils/index.js";
|
|
7
|
+
export declare const GitMergeInputSchema: z.ZodObject<{
|
|
8
|
+
path: z.ZodDefault<z.ZodString>;
|
|
9
|
+
branch: z.ZodString;
|
|
10
|
+
commitMessage: z.ZodOptional<z.ZodString>;
|
|
11
|
+
noFf: z.ZodDefault<z.ZodBoolean>;
|
|
12
|
+
squash: z.ZodDefault<z.ZodBoolean>;
|
|
13
|
+
abort: z.ZodDefault<z.ZodBoolean>;
|
|
14
|
+
}, "strip", z.ZodTypeAny, {
|
|
15
|
+
path: string;
|
|
16
|
+
branch: string;
|
|
17
|
+
noFf: boolean;
|
|
18
|
+
squash: boolean;
|
|
19
|
+
abort: boolean;
|
|
20
|
+
commitMessage?: string | undefined;
|
|
21
|
+
}, {
|
|
22
|
+
branch: string;
|
|
23
|
+
path?: string | undefined;
|
|
24
|
+
commitMessage?: string | undefined;
|
|
25
|
+
noFf?: boolean | undefined;
|
|
26
|
+
squash?: boolean | undefined;
|
|
27
|
+
abort?: boolean | undefined;
|
|
28
|
+
}>;
|
|
29
|
+
export declare const GitMergeOutputSchema: z.ZodObject<{
|
|
30
|
+
success: z.ZodBoolean;
|
|
31
|
+
message: z.ZodString;
|
|
32
|
+
conflict: z.ZodOptional<z.ZodBoolean>;
|
|
33
|
+
fastForward: z.ZodOptional<z.ZodBoolean>;
|
|
34
|
+
aborted: z.ZodOptional<z.ZodBoolean>;
|
|
35
|
+
needsManualCommit: z.ZodOptional<z.ZodBoolean>;
|
|
36
|
+
status: z.ZodOptional<z.ZodObject<{
|
|
37
|
+
current_branch: z.ZodNullable<z.ZodString>;
|
|
38
|
+
staged_changes: z.ZodObject<{
|
|
39
|
+
Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
40
|
+
Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
41
|
+
Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
42
|
+
Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
43
|
+
Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
44
|
+
TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
45
|
+
}, "strip", z.ZodTypeAny, {
|
|
46
|
+
Added?: string[] | undefined;
|
|
47
|
+
Modified?: string[] | undefined;
|
|
48
|
+
Deleted?: string[] | undefined;
|
|
49
|
+
Renamed?: string[] | undefined;
|
|
50
|
+
Copied?: string[] | undefined;
|
|
51
|
+
TypeChanged?: string[] | undefined;
|
|
52
|
+
}, {
|
|
53
|
+
Added?: string[] | undefined;
|
|
54
|
+
Modified?: string[] | undefined;
|
|
55
|
+
Deleted?: string[] | undefined;
|
|
56
|
+
Renamed?: string[] | undefined;
|
|
57
|
+
Copied?: string[] | undefined;
|
|
58
|
+
TypeChanged?: string[] | undefined;
|
|
59
|
+
}>;
|
|
60
|
+
unstaged_changes: z.ZodObject<{
|
|
61
|
+
Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
62
|
+
Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
63
|
+
Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
64
|
+
Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
65
|
+
Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
66
|
+
TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
67
|
+
}, "strip", z.ZodTypeAny, {
|
|
68
|
+
Added?: string[] | undefined;
|
|
69
|
+
Modified?: string[] | undefined;
|
|
70
|
+
Deleted?: string[] | undefined;
|
|
71
|
+
Renamed?: string[] | undefined;
|
|
72
|
+
Copied?: string[] | undefined;
|
|
73
|
+
TypeChanged?: string[] | undefined;
|
|
74
|
+
}, {
|
|
75
|
+
Added?: string[] | undefined;
|
|
76
|
+
Modified?: string[] | undefined;
|
|
77
|
+
Deleted?: string[] | undefined;
|
|
78
|
+
Renamed?: string[] | undefined;
|
|
79
|
+
Copied?: string[] | undefined;
|
|
80
|
+
TypeChanged?: string[] | undefined;
|
|
81
|
+
}>;
|
|
82
|
+
untracked_files: z.ZodArray<z.ZodString, "many">;
|
|
83
|
+
conflicted_files: z.ZodArray<z.ZodString, "many">;
|
|
84
|
+
is_clean: z.ZodBoolean;
|
|
85
|
+
}, "strip", z.ZodTypeAny, {
|
|
86
|
+
current_branch: string | null;
|
|
87
|
+
staged_changes: {
|
|
88
|
+
Added?: string[] | undefined;
|
|
89
|
+
Modified?: string[] | undefined;
|
|
90
|
+
Deleted?: string[] | undefined;
|
|
91
|
+
Renamed?: string[] | undefined;
|
|
92
|
+
Copied?: string[] | undefined;
|
|
93
|
+
TypeChanged?: string[] | undefined;
|
|
94
|
+
};
|
|
95
|
+
unstaged_changes: {
|
|
96
|
+
Added?: string[] | undefined;
|
|
97
|
+
Modified?: string[] | undefined;
|
|
98
|
+
Deleted?: string[] | undefined;
|
|
99
|
+
Renamed?: string[] | undefined;
|
|
100
|
+
Copied?: string[] | undefined;
|
|
101
|
+
TypeChanged?: string[] | undefined;
|
|
102
|
+
};
|
|
103
|
+
untracked_files: string[];
|
|
104
|
+
conflicted_files: string[];
|
|
105
|
+
is_clean: boolean;
|
|
106
|
+
}, {
|
|
107
|
+
current_branch: string | null;
|
|
108
|
+
staged_changes: {
|
|
109
|
+
Added?: string[] | undefined;
|
|
110
|
+
Modified?: string[] | undefined;
|
|
111
|
+
Deleted?: string[] | undefined;
|
|
112
|
+
Renamed?: string[] | undefined;
|
|
113
|
+
Copied?: string[] | undefined;
|
|
114
|
+
TypeChanged?: string[] | undefined;
|
|
115
|
+
};
|
|
116
|
+
unstaged_changes: {
|
|
117
|
+
Added?: string[] | undefined;
|
|
118
|
+
Modified?: string[] | undefined;
|
|
119
|
+
Deleted?: string[] | undefined;
|
|
120
|
+
Renamed?: string[] | undefined;
|
|
121
|
+
Copied?: string[] | undefined;
|
|
122
|
+
TypeChanged?: string[] | undefined;
|
|
123
|
+
};
|
|
124
|
+
untracked_files: string[];
|
|
125
|
+
conflicted_files: string[];
|
|
126
|
+
is_clean: boolean;
|
|
127
|
+
}>>;
|
|
128
|
+
}, "strip", z.ZodTypeAny, {
|
|
129
|
+
message: string;
|
|
130
|
+
success: boolean;
|
|
131
|
+
aborted?: boolean | undefined;
|
|
132
|
+
status?: {
|
|
133
|
+
current_branch: string | null;
|
|
134
|
+
staged_changes: {
|
|
135
|
+
Added?: string[] | undefined;
|
|
136
|
+
Modified?: string[] | undefined;
|
|
137
|
+
Deleted?: string[] | undefined;
|
|
138
|
+
Renamed?: string[] | undefined;
|
|
139
|
+
Copied?: string[] | undefined;
|
|
140
|
+
TypeChanged?: string[] | undefined;
|
|
141
|
+
};
|
|
142
|
+
unstaged_changes: {
|
|
143
|
+
Added?: string[] | undefined;
|
|
144
|
+
Modified?: string[] | undefined;
|
|
145
|
+
Deleted?: string[] | undefined;
|
|
146
|
+
Renamed?: string[] | undefined;
|
|
147
|
+
Copied?: string[] | undefined;
|
|
148
|
+
TypeChanged?: string[] | undefined;
|
|
149
|
+
};
|
|
150
|
+
untracked_files: string[];
|
|
151
|
+
conflicted_files: string[];
|
|
152
|
+
is_clean: boolean;
|
|
153
|
+
} | undefined;
|
|
154
|
+
conflict?: boolean | undefined;
|
|
155
|
+
fastForward?: boolean | undefined;
|
|
156
|
+
needsManualCommit?: boolean | undefined;
|
|
157
|
+
}, {
|
|
158
|
+
message: string;
|
|
159
|
+
success: boolean;
|
|
160
|
+
aborted?: boolean | undefined;
|
|
161
|
+
status?: {
|
|
162
|
+
current_branch: string | null;
|
|
163
|
+
staged_changes: {
|
|
164
|
+
Added?: string[] | undefined;
|
|
165
|
+
Modified?: string[] | undefined;
|
|
166
|
+
Deleted?: string[] | undefined;
|
|
167
|
+
Renamed?: string[] | undefined;
|
|
168
|
+
Copied?: string[] | undefined;
|
|
169
|
+
TypeChanged?: string[] | undefined;
|
|
170
|
+
};
|
|
171
|
+
unstaged_changes: {
|
|
172
|
+
Added?: string[] | undefined;
|
|
173
|
+
Modified?: string[] | undefined;
|
|
174
|
+
Deleted?: string[] | undefined;
|
|
175
|
+
Renamed?: string[] | undefined;
|
|
176
|
+
Copied?: string[] | undefined;
|
|
177
|
+
TypeChanged?: string[] | undefined;
|
|
178
|
+
};
|
|
179
|
+
untracked_files: string[];
|
|
180
|
+
conflicted_files: string[];
|
|
181
|
+
is_clean: boolean;
|
|
182
|
+
} | undefined;
|
|
183
|
+
conflict?: boolean | undefined;
|
|
184
|
+
fastForward?: boolean | undefined;
|
|
185
|
+
needsManualCommit?: boolean | undefined;
|
|
186
|
+
}>;
|
|
187
|
+
export type GitMergeInput = z.infer<typeof GitMergeInputSchema>;
|
|
188
|
+
export type GitMergeOutput = z.infer<typeof GitMergeOutputSchema>;
|
|
189
|
+
/**
|
|
190
|
+
* 4. IMPLEMENT the core logic function.
|
|
191
|
+
* @throws {McpError} If the logic encounters an unrecoverable issue.
|
|
192
|
+
*/
|
|
193
|
+
export declare function gitMergeLogic(params: GitMergeInput, context: RequestContext & {
|
|
194
|
+
getWorkingDirectory: () => string | undefined;
|
|
195
|
+
}): Promise<GitMergeOutput>;
|
|
196
|
+
//# sourceMappingURL=logic.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitMerge/logic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,yBAAyB,CAAC;AAQjC,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;EAwB9B,CAAC;AAGH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmB/B,CAAC;AAGH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAChE,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAElE;;;GAGG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,cAAc,GAAG;IAAE,mBAAmB,EAAE,MAAM,MAAM,GAAG,SAAS,CAAA;CAAE,GAC1E,OAAO,CAAC,cAAc,CAAC,CAqEzB"}
|
|
@@ -5,27 +5,53 @@
|
|
|
5
5
|
import { execFile } from "child_process";
|
|
6
6
|
import { promisify } from "util";
|
|
7
7
|
import { z } from "zod";
|
|
8
|
-
import { logger, sanitization } from "../../../utils/index.js";
|
|
8
|
+
import { logger, sanitization, } from "../../../utils/index.js";
|
|
9
9
|
import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
|
|
10
10
|
import { config } from "../../../config/index.js";
|
|
11
|
+
import { getGitStatus, GitStatusOutputSchema } from "../gitStatus/logic.js";
|
|
11
12
|
const execFileAsync = promisify(execFile);
|
|
12
13
|
// 1. DEFINE the Zod input schema.
|
|
13
14
|
export const GitMergeInputSchema = z.object({
|
|
14
15
|
path: z.string().default(".").describe("Path to the Git repository."),
|
|
15
|
-
branch: z
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
branch: z
|
|
17
|
+
.string()
|
|
18
|
+
.min(1)
|
|
19
|
+
.describe("The name of the branch to merge into the current branch."),
|
|
20
|
+
commitMessage: z
|
|
21
|
+
.string()
|
|
22
|
+
.optional()
|
|
23
|
+
.describe("Commit message for the merge commit."),
|
|
24
|
+
noFf: z
|
|
25
|
+
.boolean()
|
|
26
|
+
.default(false)
|
|
27
|
+
.describe("Create a merge commit even if a fast-forward is possible."),
|
|
28
|
+
squash: z
|
|
29
|
+
.boolean()
|
|
30
|
+
.default(false)
|
|
31
|
+
.describe("Combine merged changes into a single commit (requires manual commit)."),
|
|
32
|
+
abort: z
|
|
33
|
+
.boolean()
|
|
34
|
+
.default(false)
|
|
35
|
+
.describe("Abort the current merge process."),
|
|
20
36
|
});
|
|
21
37
|
// 2. DEFINE the Zod response schema.
|
|
22
38
|
export const GitMergeOutputSchema = z.object({
|
|
23
39
|
success: z.boolean().describe("Indicates if the command was successful."),
|
|
24
40
|
message: z.string().describe("A summary message of the result."),
|
|
25
|
-
conflict: z
|
|
26
|
-
|
|
41
|
+
conflict: z
|
|
42
|
+
.boolean()
|
|
43
|
+
.optional()
|
|
44
|
+
.describe("True if the merge resulted in conflicts."),
|
|
45
|
+
fastForward: z
|
|
46
|
+
.boolean()
|
|
47
|
+
.optional()
|
|
48
|
+
.describe("True if the merge was a fast-forward."),
|
|
27
49
|
aborted: z.boolean().optional().describe("True if the merge was aborted."),
|
|
28
|
-
needsManualCommit: z
|
|
50
|
+
needsManualCommit: z
|
|
51
|
+
.boolean()
|
|
52
|
+
.optional()
|
|
53
|
+
.describe("True if --squash was used."),
|
|
54
|
+
status: GitStatusOutputSchema.optional().describe("The status of the repository after the merge operation."),
|
|
29
55
|
});
|
|
30
56
|
/**
|
|
31
57
|
* 4. IMPLEMENT the core logic function.
|
|
@@ -55,7 +81,10 @@ export async function gitMergeLogic(params, context) {
|
|
|
55
81
|
args.push("-m", params.commitMessage);
|
|
56
82
|
args.push(params.branch);
|
|
57
83
|
}
|
|
58
|
-
logger.debug(`Executing command: git ${args.join(" ")}`, {
|
|
84
|
+
logger.debug(`Executing command: git ${args.join(" ")}`, {
|
|
85
|
+
...context,
|
|
86
|
+
operation,
|
|
87
|
+
});
|
|
59
88
|
return await execFileAsync("git", args);
|
|
60
89
|
};
|
|
61
90
|
// A merge commit is only created if it's not a fast-forward (or --no-ff is used)
|
|
@@ -68,7 +97,8 @@ export async function gitMergeLogic(params, context) {
|
|
|
68
97
|
stdout = result.stdout;
|
|
69
98
|
}
|
|
70
99
|
catch (error) {
|
|
71
|
-
const
|
|
100
|
+
const err = error; // Cast to a type that might have stderr
|
|
101
|
+
const isSigningError = (err.stderr || "").includes("gpg failed to sign");
|
|
72
102
|
if (shouldSign && isSigningError) {
|
|
73
103
|
logger.warning("Merge with signing failed. Retrying automatically without signature.", { ...context, operation });
|
|
74
104
|
const result = await attemptMerge(false);
|
|
@@ -78,11 +108,14 @@ export async function gitMergeLogic(params, context) {
|
|
|
78
108
|
throw error;
|
|
79
109
|
}
|
|
80
110
|
}
|
|
111
|
+
const status = await getGitStatus({ path: targetPath }, context);
|
|
81
112
|
return {
|
|
82
113
|
success: true,
|
|
83
114
|
message: stdout.trim() || "Merge command executed successfully.",
|
|
84
115
|
fastForward: stdout.includes("Fast-forward"),
|
|
85
116
|
needsManualCommit: params.squash,
|
|
86
117
|
aborted: params.abort,
|
|
118
|
+
status,
|
|
87
119
|
};
|
|
88
120
|
}
|
|
121
|
+
//# sourceMappingURL=logic.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitMerge/logic.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @fileoverview Handles registration and error handling for the git_merge tool.
|
|
3
|
+
* @module src/mcp-server/tools/gitMerge/registration
|
|
4
|
+
*/
|
|
5
|
+
import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
|
|
6
|
+
import { RequestContext } from "../../../utils/index.js";
|
|
7
|
+
export type GetWorkingDirectoryFn = (sessionId: string | undefined) => string | undefined;
|
|
8
|
+
export type GetSessionIdFn = (context: RequestContext) => string | undefined;
|
|
9
|
+
/**
|
|
10
|
+
* Registers the git_merge tool with the MCP server instance.
|
|
11
|
+
* @param server The MCP server instance.
|
|
12
|
+
* @param getWorkingDirectory Function to get the session's working directory.
|
|
13
|
+
* @param getSessionId Function to get the session ID from context.
|
|
14
|
+
*/
|
|
15
|
+
export declare const registerGitMergeTool: (server: McpServer, getWorkingDirectory: GetWorkingDirectoryFn, getSessionId: GetSessionIdFn) => Promise<void>;
|
|
16
|
+
//# sourceMappingURL=registration.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"registration.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitMerge/registration.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAGL,cAAc,EAEf,MAAM,yBAAyB,CAAC;AASjC,MAAM,MAAM,qBAAqB,GAAG,CAClC,SAAS,EAAE,MAAM,GAAG,SAAS,KAC1B,MAAM,GAAG,SAAS,CAAC;AACxB,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,cAAc,KAAK,MAAM,GAAG,SAAS,CAAC;AAM7E;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,SAAS,EACjB,qBAAqB,qBAAqB,EAC1C,cAAc,cAAc,KAC3B,OAAO,CAAC,IAAI,CAgEd,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @fileoverview Handles registration and error handling for the git_merge tool.
|
|
3
3
|
* @module src/mcp-server/tools/gitMerge/registration
|
|
4
4
|
*/
|
|
5
|
-
import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
|
|
5
|
+
import { ErrorHandler, logger, requestContextService, } from "../../../utils/index.js";
|
|
6
6
|
import { gitMergeLogic, GitMergeInputSchema, GitMergeOutputSchema, } from "./logic.js";
|
|
7
7
|
const TOOL_NAME = "git_merge";
|
|
8
8
|
const TOOL_DESCRIPTION = "Merges the specified branch into the current branch. Supports options like --no-ff, --squash, and --abort. Returns the merge result as a JSON object.";
|
|
@@ -39,11 +39,19 @@ export const registerGitMergeTool = async (server, getWorkingDirectory, getSessi
|
|
|
39
39
|
});
|
|
40
40
|
return {
|
|
41
41
|
structuredContent: result,
|
|
42
|
-
content: [
|
|
42
|
+
content: [
|
|
43
|
+
{
|
|
44
|
+
type: "text",
|
|
45
|
+
text: `Success: ${JSON.stringify(result, null, 2)}`,
|
|
46
|
+
},
|
|
47
|
+
],
|
|
43
48
|
};
|
|
44
49
|
}
|
|
45
50
|
catch (error) {
|
|
46
|
-
logger.error(`Error in ${TOOL_NAME} handler`, {
|
|
51
|
+
logger.error(`Error in ${TOOL_NAME} handler`, {
|
|
52
|
+
error,
|
|
53
|
+
...handlerContext,
|
|
54
|
+
});
|
|
47
55
|
const mcpError = ErrorHandler.handleError(error, {
|
|
48
56
|
operation: `tool:${TOOL_NAME}`,
|
|
49
57
|
context: handlerContext,
|
|
@@ -62,3 +70,4 @@ export const registerGitMergeTool = async (server, getWorkingDirectory, getSessi
|
|
|
62
70
|
});
|
|
63
71
|
logger.info(`Tool '${TOOL_NAME}' registered successfully.`, context);
|
|
64
72
|
};
|
|
73
|
+
//# sourceMappingURL=registration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"registration.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitMerge/registration.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACL,YAAY,EACZ,MAAM,EAEN,qBAAqB,GACtB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACL,aAAa,EAEb,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,YAAY,CAAC;AAOpB,MAAM,SAAS,GAAG,WAAW,CAAC;AAC9B,MAAM,gBAAgB,GACpB,uJAAuJ,CAAC;AAE1J;;;;;GAKG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EACvC,MAAiB,EACjB,mBAA0C,EAC1C,YAA4B,EACb,EAAE;IACjB,MAAM,SAAS,GAAG,sBAAsB,CAAC;IACzC,MAAM,OAAO,GAAG,qBAAqB,CAAC,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAE1E,MAAM,CAAC,YAAY,CACjB,SAAS,EACT;QACE,KAAK,EAAE,WAAW;QAClB,WAAW,EAAE,gBAAgB;QAC7B,WAAW,EAAE,mBAAmB,CAAC,KAAK;QACtC,YAAY,EAAE,oBAAoB,CAAC,KAAK;QACxC,WAAW,EAAE;YACX,YAAY,EAAE,KAAK;YACnB,eAAe,EAAE,IAAI,EAAE,8CAA8C;YACrE,cAAc,EAAE,KAAK;YACrB,aAAa,EAAE,KAAK;SACrB;KACF,EACD,KAAK,EAAE,MAAqB,EAAE,WAAoC,EAAE,EAAE;QACpE,MAAM,cAAc,GAAG,qBAAqB,CAAC,oBAAoB,CAAC;YAChE,QAAQ,EAAE,SAAS;YACnB,aAAa,EAAE,WAAW;SAC3B,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC;YAC/C,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE;gBACzC,GAAG,cAAc;gBACjB,mBAAmB,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC;aAC1D,CAAC,CAAC;YAEH,OAAO;gBACL,iBAAiB,EAAE,MAAM;gBACzB,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,YAAY,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE;qBACpD;iBACF;aACF,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,YAAY,SAAS,UAAU,EAAE;gBAC5C,KAAK;gBACL,GAAG,cAAc;aAClB,CAAC,CAAC;YACH,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE;gBAC/C,SAAS,EAAE,QAAQ,SAAS,EAAE;gBAC9B,OAAO,EAAE,cAAc;gBACvB,KAAK,EAAE,MAAM;aACd,CAAa,CAAC;YAEf,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;gBAC/D,iBAAiB,EAAE;oBACjB,IAAI,EAAE,QAAQ,CAAC,IAAI;oBACnB,OAAO,EAAE,QAAQ,CAAC,OAAO;oBACzB,OAAO,EAAE,QAAQ,CAAC,OAAO;iBAC1B;aACF,CAAC;QACJ,CAAC;IACH,CAAC,CACF,CAAC;IACF,MAAM,CAAC,IAAI,CAAC,SAAS,SAAS,4BAA4B,EAAE,OAAO,CAAC,CAAC;AACvE,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitPull/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitPull/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC"}
|
|
@@ -0,0 +1,184 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @fileoverview Defines the core logic, schemas, and types for the git_pull tool.
|
|
3
|
+
* @module src/mcp-server/tools/gitPull/logic
|
|
4
|
+
*/
|
|
5
|
+
import { z } from "zod";
|
|
6
|
+
import { type RequestContext } from "../../../utils/index.js";
|
|
7
|
+
export declare const GitPullInputSchema: z.ZodObject<{
|
|
8
|
+
path: z.ZodDefault<z.ZodString>;
|
|
9
|
+
remote: z.ZodOptional<z.ZodString>;
|
|
10
|
+
branch: z.ZodOptional<z.ZodString>;
|
|
11
|
+
rebase: z.ZodDefault<z.ZodBoolean>;
|
|
12
|
+
ffOnly: z.ZodDefault<z.ZodBoolean>;
|
|
13
|
+
}, "strip", z.ZodTypeAny, {
|
|
14
|
+
path: string;
|
|
15
|
+
rebase: boolean;
|
|
16
|
+
ffOnly: boolean;
|
|
17
|
+
remote?: string | undefined;
|
|
18
|
+
branch?: string | undefined;
|
|
19
|
+
}, {
|
|
20
|
+
path?: string | undefined;
|
|
21
|
+
remote?: string | undefined;
|
|
22
|
+
branch?: string | undefined;
|
|
23
|
+
rebase?: boolean | undefined;
|
|
24
|
+
ffOnly?: boolean | undefined;
|
|
25
|
+
}>;
|
|
26
|
+
export declare const GitPullOutputSchema: z.ZodObject<{
|
|
27
|
+
success: z.ZodBoolean;
|
|
28
|
+
message: z.ZodString;
|
|
29
|
+
conflict: z.ZodOptional<z.ZodBoolean>;
|
|
30
|
+
status: z.ZodOptional<z.ZodObject<{
|
|
31
|
+
current_branch: z.ZodNullable<z.ZodString>;
|
|
32
|
+
staged_changes: z.ZodObject<{
|
|
33
|
+
Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
34
|
+
Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
35
|
+
Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
36
|
+
Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
37
|
+
Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
38
|
+
TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
39
|
+
}, "strip", z.ZodTypeAny, {
|
|
40
|
+
Added?: string[] | undefined;
|
|
41
|
+
Modified?: string[] | undefined;
|
|
42
|
+
Deleted?: string[] | undefined;
|
|
43
|
+
Renamed?: string[] | undefined;
|
|
44
|
+
Copied?: string[] | undefined;
|
|
45
|
+
TypeChanged?: string[] | undefined;
|
|
46
|
+
}, {
|
|
47
|
+
Added?: string[] | undefined;
|
|
48
|
+
Modified?: string[] | undefined;
|
|
49
|
+
Deleted?: string[] | undefined;
|
|
50
|
+
Renamed?: string[] | undefined;
|
|
51
|
+
Copied?: string[] | undefined;
|
|
52
|
+
TypeChanged?: string[] | undefined;
|
|
53
|
+
}>;
|
|
54
|
+
unstaged_changes: z.ZodObject<{
|
|
55
|
+
Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
56
|
+
Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
57
|
+
Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
58
|
+
Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
59
|
+
Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
60
|
+
TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
61
|
+
}, "strip", z.ZodTypeAny, {
|
|
62
|
+
Added?: string[] | undefined;
|
|
63
|
+
Modified?: string[] | undefined;
|
|
64
|
+
Deleted?: string[] | undefined;
|
|
65
|
+
Renamed?: string[] | undefined;
|
|
66
|
+
Copied?: string[] | undefined;
|
|
67
|
+
TypeChanged?: string[] | undefined;
|
|
68
|
+
}, {
|
|
69
|
+
Added?: string[] | undefined;
|
|
70
|
+
Modified?: string[] | undefined;
|
|
71
|
+
Deleted?: string[] | undefined;
|
|
72
|
+
Renamed?: string[] | undefined;
|
|
73
|
+
Copied?: string[] | undefined;
|
|
74
|
+
TypeChanged?: string[] | undefined;
|
|
75
|
+
}>;
|
|
76
|
+
untracked_files: z.ZodArray<z.ZodString, "many">;
|
|
77
|
+
conflicted_files: z.ZodArray<z.ZodString, "many">;
|
|
78
|
+
is_clean: z.ZodBoolean;
|
|
79
|
+
}, "strip", z.ZodTypeAny, {
|
|
80
|
+
current_branch: string | null;
|
|
81
|
+
staged_changes: {
|
|
82
|
+
Added?: string[] | undefined;
|
|
83
|
+
Modified?: string[] | undefined;
|
|
84
|
+
Deleted?: string[] | undefined;
|
|
85
|
+
Renamed?: string[] | undefined;
|
|
86
|
+
Copied?: string[] | undefined;
|
|
87
|
+
TypeChanged?: string[] | undefined;
|
|
88
|
+
};
|
|
89
|
+
unstaged_changes: {
|
|
90
|
+
Added?: string[] | undefined;
|
|
91
|
+
Modified?: string[] | undefined;
|
|
92
|
+
Deleted?: string[] | undefined;
|
|
93
|
+
Renamed?: string[] | undefined;
|
|
94
|
+
Copied?: string[] | undefined;
|
|
95
|
+
TypeChanged?: string[] | undefined;
|
|
96
|
+
};
|
|
97
|
+
untracked_files: string[];
|
|
98
|
+
conflicted_files: string[];
|
|
99
|
+
is_clean: boolean;
|
|
100
|
+
}, {
|
|
101
|
+
current_branch: string | null;
|
|
102
|
+
staged_changes: {
|
|
103
|
+
Added?: string[] | undefined;
|
|
104
|
+
Modified?: string[] | undefined;
|
|
105
|
+
Deleted?: string[] | undefined;
|
|
106
|
+
Renamed?: string[] | undefined;
|
|
107
|
+
Copied?: string[] | undefined;
|
|
108
|
+
TypeChanged?: string[] | undefined;
|
|
109
|
+
};
|
|
110
|
+
unstaged_changes: {
|
|
111
|
+
Added?: string[] | undefined;
|
|
112
|
+
Modified?: string[] | undefined;
|
|
113
|
+
Deleted?: string[] | undefined;
|
|
114
|
+
Renamed?: string[] | undefined;
|
|
115
|
+
Copied?: string[] | undefined;
|
|
116
|
+
TypeChanged?: string[] | undefined;
|
|
117
|
+
};
|
|
118
|
+
untracked_files: string[];
|
|
119
|
+
conflicted_files: string[];
|
|
120
|
+
is_clean: boolean;
|
|
121
|
+
}>>;
|
|
122
|
+
}, "strip", z.ZodTypeAny, {
|
|
123
|
+
message: string;
|
|
124
|
+
success: boolean;
|
|
125
|
+
status?: {
|
|
126
|
+
current_branch: string | null;
|
|
127
|
+
staged_changes: {
|
|
128
|
+
Added?: string[] | undefined;
|
|
129
|
+
Modified?: string[] | undefined;
|
|
130
|
+
Deleted?: string[] | undefined;
|
|
131
|
+
Renamed?: string[] | undefined;
|
|
132
|
+
Copied?: string[] | undefined;
|
|
133
|
+
TypeChanged?: string[] | undefined;
|
|
134
|
+
};
|
|
135
|
+
unstaged_changes: {
|
|
136
|
+
Added?: string[] | undefined;
|
|
137
|
+
Modified?: string[] | undefined;
|
|
138
|
+
Deleted?: string[] | undefined;
|
|
139
|
+
Renamed?: string[] | undefined;
|
|
140
|
+
Copied?: string[] | undefined;
|
|
141
|
+
TypeChanged?: string[] | undefined;
|
|
142
|
+
};
|
|
143
|
+
untracked_files: string[];
|
|
144
|
+
conflicted_files: string[];
|
|
145
|
+
is_clean: boolean;
|
|
146
|
+
} | undefined;
|
|
147
|
+
conflict?: boolean | undefined;
|
|
148
|
+
}, {
|
|
149
|
+
message: string;
|
|
150
|
+
success: boolean;
|
|
151
|
+
status?: {
|
|
152
|
+
current_branch: string | null;
|
|
153
|
+
staged_changes: {
|
|
154
|
+
Added?: string[] | undefined;
|
|
155
|
+
Modified?: string[] | undefined;
|
|
156
|
+
Deleted?: string[] | undefined;
|
|
157
|
+
Renamed?: string[] | undefined;
|
|
158
|
+
Copied?: string[] | undefined;
|
|
159
|
+
TypeChanged?: string[] | undefined;
|
|
160
|
+
};
|
|
161
|
+
unstaged_changes: {
|
|
162
|
+
Added?: string[] | undefined;
|
|
163
|
+
Modified?: string[] | undefined;
|
|
164
|
+
Deleted?: string[] | undefined;
|
|
165
|
+
Renamed?: string[] | undefined;
|
|
166
|
+
Copied?: string[] | undefined;
|
|
167
|
+
TypeChanged?: string[] | undefined;
|
|
168
|
+
};
|
|
169
|
+
untracked_files: string[];
|
|
170
|
+
conflicted_files: string[];
|
|
171
|
+
is_clean: boolean;
|
|
172
|
+
} | undefined;
|
|
173
|
+
conflict?: boolean | undefined;
|
|
174
|
+
}>;
|
|
175
|
+
export type GitPullInput = z.infer<typeof GitPullInputSchema>;
|
|
176
|
+
export type GitPullOutput = z.infer<typeof GitPullOutputSchema>;
|
|
177
|
+
/**
|
|
178
|
+
* 4. IMPLEMENT the core logic function.
|
|
179
|
+
* @throws {McpError} If the logic encounters an unrecoverable issue.
|
|
180
|
+
*/
|
|
181
|
+
export declare function pullGitChanges(params: GitPullInput, context: RequestContext & {
|
|
182
|
+
getWorkingDirectory: () => string | undefined;
|
|
183
|
+
}): Promise<GitPullOutput>;
|
|
184
|
+
//# sourceMappingURL=logic.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitPull/logic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,yBAAyB,CAAC;AAOjC,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;EAe7B,CAAC;AAGH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAU9B,CAAC;AAGH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAC9D,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE;;;GAGG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,cAAc,GAAG;IAAE,mBAAmB,EAAE,MAAM,MAAM,GAAG,SAAS,CAAA;CAAE,GAC1E,OAAO,CAAC,aAAa,CAAC,CAuCxB"}
|