# Directory Structure
```
├── .gitignore
├── LICENSE.txt
├── package.json
├── README.md
├── src
│ └── index.ts
└── tsconfig.json
```
# Files
--------------------------------------------------------------------------------
/.gitignore:
--------------------------------------------------------------------------------
```
# Dependencies
node_modules/
npm-debug.log*
yarn-debug.log*
yarn-error.log*
package-lock.json
yarn.lock
# TypeScript
*.tsbuildinfo
build/
dist/
# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
# IDE - JetBrains
.idea/
*.iml
*.iws
.idea_modules/
# macOS
.DS_Store
.AppleDouble
.LSOverride
._*
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Environment files
.env
.env.local
.env.*.local
.env.development
.env.test
.env.production
# Logs
logs/
*.log
# Testing
coverage/
# Optional npm cache directory
.npm
# Optional eslint cache
.eslintcache
# Optional REPL history
.node_repl_history
# Output of 'npm pack'
*.tgz
# Temporary files
*.swp
*.swo
*~
```
--------------------------------------------------------------------------------
/README.md:
--------------------------------------------------------------------------------
```markdown
# Git Forensics MCP
A specialized Model Context Protocol (MCP) server for deep git repository investigation and analysis. This forensics tool provides detailed insights into repository history, branch relationships, and development patterns, focusing solely on git repository analysis rather than general GitHub or git operations.
## Features
The server provides four main analysis tools:
1. **Branch Overview** (`get_branch_overview`)
- Provides high-level overview of branch states and relationships
- Analyzes last commits, commit counts, and merge bases
- Generates statistical summaries of branch activities
2. **Time Period Analysis** (`analyze_time_period`)
- Analyzes detailed development activity in specific time periods
- Categorizes commits (feature, fix, refactor, docs, other)
- Provides activity summaries with commit patterns
3. **File Changes Analysis** (`analyze_file_changes`)
- Tracks changes to specific files across branches
- Identifies potential conflict areas
- Provides risk assessment for file modifications
- Generates recommended review order based on risk levels
4. **Merge Recommendations** (`get_merge_recommendations`)
- Determines optimal merge strategies
- Assesses conflict risks
- Identifies code hotspots
- Provides step-by-step merge guidance
## Input Parameters
Each tool requires specific parameters:
- `repoPath`: Path to the git repository
- `branches`: Array of branch names to analyze
- `outputPath`: Path where analysis results will be written
- Additional tool-specific parameters:
- `timeRange`: Start and end dates for period analysis
- `files`: Array of file paths for file change analysis
## Output Format
All tools output JSON files containing:
- Detailed analysis results
- Summary statistics
- Risk assessments (where applicable)
- Recommendations based on analysis
## Technical Details
- Built with TypeScript
- Uses MCP SDK for server implementation
- Executes git commands through child processes
- Provides error handling and validation
- Runs on stdio transport
## Dependencies
- @modelcontextprotocol/sdk
- Node.js
- Git (must be installed and accessible)
## Usage
The server runs as an MCP service and can be integrated with any MCP-compatible client. All analysis results are written to specified output files in JSON format.
## Contributing and License
This project is licensed under the Apache License, Version 2.0 - see the [LICENSE.txt](LICENSE.txt) file for details.
### Collaboration Welcome
Forks and contributions welcome.
All contributions will be under the Apache License 2.0. This permissive license allows you to:
- Use the code commercially
- Modify and distribute the code
- Create derivative works
- Include in other projects
Copyright 2025. Licensed under the Apache License, Version 2.0; you may not use this project except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
```
--------------------------------------------------------------------------------
/package.json:
--------------------------------------------------------------------------------
```json
{
"name": "git-forensics-mcp",
"version": "0.1.0",
"description": "MCP server for deep git repository analysis and investigation, providing insights into branch relationships, merge strategies, and development patterns",
"type": "module",
"main": "build/index.js",
"scripts": {
"build": "tsc && chmod +x build/index.js",
"start": "node build/index.js"
},
"dependencies": {
"@modelcontextprotocol/sdk": "latest"
},
"devDependencies": {
"@types/node": "^20.0.0",
"typescript": "^5.0.0"
}
}
```
--------------------------------------------------------------------------------
/tsconfig.json:
--------------------------------------------------------------------------------
```json
{
"compilerOptions": {
"target": "ES2020",
"module": "ES2020",
"moduleResolution": "node",
"esModuleInterop": true,
"strict": true,
"outDir": "build",
"rootDir": "src",
"declaration": true,
"sourceMap": true,
"skipLibCheck": true,
"noImplicitAny": true,
"strictNullChecks": true,
"strictFunctionTypes": true,
"strictPropertyInitialization": true,
"noImplicitThis": true,
"alwaysStrict": true
},
"include": ["src/**/*"],
"exclude": ["node_modules", "build"]
}
```
--------------------------------------------------------------------------------
/LICENSE.txt:
--------------------------------------------------------------------------------
```
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright davidorex.ai
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
```
--------------------------------------------------------------------------------
/src/index.ts:
--------------------------------------------------------------------------------
```typescript
#!/usr/bin/env node
import { Server } from '@modelcontextprotocol/sdk/server/index.js';
import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
import {
CallToolRequestSchema,
ErrorCode,
ListToolsRequestSchema,
McpError,
} from '@modelcontextprotocol/sdk/types.js';
import { execSync } from 'child_process';
import { writeFileSync } from 'fs';
import { join } from 'path';
interface BranchOverviewArgs {
repoPath: string;
branches: string[];
outputPath: string;
}
interface TimePeriodArgs {
repoPath: string;
branches: string[];
timeRange: {
start: string;
end: string;
};
outputPath: string;
}
interface FileChangesArgs {
repoPath: string;
branches: string[];
files: string[];
outputPath: string;
}
interface MergeRecommendationsArgs {
repoPath: string;
branches: string[];
outputPath: string;
}
class GitAnalysisServer {
private server: Server;
constructor() {
this.server = new Server(
{
name: 'git-analysis-server',
version: '0.1.0',
},
{
capabilities: {
tools: {},
},
}
);
this.setupToolHandlers();
this.server.onerror = (error) => console.error('[MCP Error]', error);
process.on('SIGINT', async () => {
await this.server.close();
process.exit(0);
});
}
private setupToolHandlers() {
this.server.setRequestHandler(ListToolsRequestSchema, async () => ({
tools: [
{
name: 'get_branch_overview',
description: 'Get high-level overview of branch states and relationships',
inputSchema: {
type: 'object',
properties: {
repoPath: {
type: 'string',
description: 'Path to git repository',
},
branches: {
type: 'array',
items: { type: 'string' },
description: 'Branches to analyze',
},
outputPath: {
type: 'string',
description: 'Path to write analysis output',
},
},
required: ['repoPath', 'branches', 'outputPath'],
},
},
{
name: 'analyze_time_period',
description: 'Analyze detailed development activity in a specific time period',
inputSchema: {
type: 'object',
properties: {
repoPath: {
type: 'string',
description: 'Path to git repository',
},
branches: {
type: 'array',
items: { type: 'string' },
description: 'Branches to analyze',
},
timeRange: {
type: 'object',
properties: {
start: { type: 'string' },
end: { type: 'string' },
},
required: ['start', 'end'],
},
outputPath: {
type: 'string',
description: 'Path to write analysis output',
},
},
required: ['repoPath', 'branches', 'timeRange', 'outputPath'],
},
},
{
name: 'analyze_file_changes',
description: 'Analyze changes to specific files across branches',
inputSchema: {
type: 'object',
properties: {
repoPath: {
type: 'string',
description: 'Path to git repository',
},
branches: {
type: 'array',
items: { type: 'string' },
description: 'Branches to analyze',
},
files: {
type: 'array',
items: { type: 'string' },
description: 'Files to analyze',
},
outputPath: {
type: 'string',
description: 'Path to write analysis output',
},
},
required: ['repoPath', 'branches', 'files', 'outputPath'],
},
},
{
name: 'get_merge_recommendations',
description: 'Get detailed merge strategy recommendations',
inputSchema: {
type: 'object',
properties: {
repoPath: {
type: 'string',
description: 'Path to git repository',
},
branches: {
type: 'array',
items: { type: 'string' },
description: 'Branches to analyze',
},
outputPath: {
type: 'string',
description: 'Path to write analysis output',
},
},
required: ['repoPath', 'branches', 'outputPath'],
},
},
],
}));
this.server.setRequestHandler(CallToolRequestSchema, async (request) => {
try {
switch (request.params.name) {
case 'get_branch_overview': {
const args = request.params.arguments as BranchOverviewArgs;
if (!args?.repoPath || !args?.branches || !args?.outputPath) {
throw new McpError(ErrorCode.InvalidParams, 'Missing required parameters');
}
return await this.handleBranchOverview(args);
}
case 'analyze_time_period': {
const args = request.params.arguments as TimePeriodArgs;
if (!args?.repoPath || !args?.branches || !args?.timeRange || !args?.outputPath) {
throw new McpError(ErrorCode.InvalidParams, 'Missing required parameters');
}
return await this.handleTimePeriodAnalysis(args);
}
case 'analyze_file_changes': {
const args = request.params.arguments as FileChangesArgs;
if (!args?.repoPath || !args?.branches || !args?.files || !args?.outputPath) {
throw new McpError(ErrorCode.InvalidParams, 'Missing required parameters');
}
return await this.handleFileChangesAnalysis(args);
}
case 'get_merge_recommendations': {
const args = request.params.arguments as MergeRecommendationsArgs;
if (!args?.repoPath || !args?.branches || !args?.outputPath) {
throw new McpError(ErrorCode.InvalidParams, 'Missing required parameters');
}
return await this.handleMergeRecommendations(args);
}
default:
throw new McpError(
ErrorCode.MethodNotFound,
`Unknown tool: ${request.params.name}`
);
}
} catch (error) {
return {
content: [
{
type: 'text',
text: `Git analysis error: ${error instanceof Error ? error.message : String(error)}`,
},
],
isError: true,
};
}
});
}
private async handleBranchOverview(args: BranchOverviewArgs) {
const overview = args.branches.map(branch => {
const lastCommit = this.getLastCommit(args.repoPath, branch);
const commitCount = this.getCommitCount(args.repoPath, branch);
const mergeBase = args.branches.map(otherBranch => {
if (otherBranch === branch) return null;
return {
branch: otherBranch,
base: this.getMergeBase(args.repoPath, branch, otherBranch),
};
}).filter((base): base is NonNullable<typeof base> => base !== null);
return {
branch,
lastCommit,
commitCount,
mergeBase,
};
});
const analysis = {
overview,
summary: this.generateOverviewSummary(overview),
};
writeFileSync(args.outputPath, JSON.stringify(analysis, null, 2));
return {
content: [
{
type: 'text',
text: `Branch analysis written to ${args.outputPath}`,
},
],
};
}
private async handleTimePeriodAnalysis(args: TimePeriodArgs) {
const analysis = args.branches.map(branch => {
const commits = this.getCommitsInRange(args.repoPath, branch, args.timeRange);
return {
branch,
commits,
activitySummary: this.summarizeActivity(commits),
};
});
const result = {
analysis,
summary: this.generateTimePeriodSummary(analysis),
};
writeFileSync(args.outputPath, JSON.stringify(result, null, 2));
return {
content: [
{
type: 'text',
text: `Time period analysis written to ${args.outputPath}`,
},
],
};
}
private async handleFileChangesAnalysis(args: FileChangesArgs) {
const analysis = args.files.map(file => {
const changes = args.branches.map(branch => ({
branch,
history: this.getFileHistory(args.repoPath, branch, file),
}));
return {
file,
changes,
conflicts: this.analyzeConflicts(changes),
};
});
const result = {
analysis,
summary: this.generateFileChangesSummary(analysis),
};
writeFileSync(args.outputPath, JSON.stringify(result, null, 2));
return {
content: [
{
type: 'text',
text: `File changes analysis written to ${args.outputPath}`,
},
],
};
}
private async handleMergeRecommendations(args: MergeRecommendationsArgs) {
const recommendations = {
strategy: this.determineMergeStrategy(args.repoPath, args.branches),
conflictRisks: this.assessConflictRisks(args.repoPath, args.branches),
steps: this.generateMergeSteps(args.repoPath, args.branches),
};
writeFileSync(args.outputPath, JSON.stringify(recommendations, null, 2));
return {
content: [
{
type: 'text',
text: `Merge recommendations written to ${args.outputPath}`,
},
],
};
}
private getLastCommit(repoPath: string, branch: string) {
const output = execSync(
`cd "${repoPath}" && git log -1 --format="%H|%aI|%s" ${branch}`,
{ encoding: 'utf8' }
).trim();
const [hash, date, message] = output.split('|');
return { hash, date, message, branch };
}
private getCommitCount(repoPath: string, branch: string): number {
return parseInt(
execSync(
`cd "${repoPath}" && git rev-list --count ${branch}`,
{ encoding: 'utf8' }
).trim(),
10
);
}
private getMergeBase(repoPath: string, branch1: string, branch2: string): string {
return execSync(
`cd "${repoPath}" && git merge-base ${branch1} ${branch2}`,
{ encoding: 'utf8' }
).trim();
}
private getCommitsInRange(
repoPath: string,
branch: string,
timeRange: { start: string; end: string }
) {
const output = execSync(
`cd "${repoPath}" && git log --format="%H|%aI|%s" ` +
`--after="${timeRange.start}" --before="${timeRange.end}" ${branch}`,
{ encoding: 'utf8' }
);
return output.trim().split('\n').filter(Boolean).map(line => {
const [hash, date, message] = line.split('|');
return { hash, date, message, branch };
});
}
private getFileHistory(repoPath: string, branch: string, file: string) {
const output = execSync(
`cd "${repoPath}" && git log --format="%H|%aI|%s" ${branch} -- ${file}`,
{ encoding: 'utf8' }
);
return output.trim().split('\n').filter(Boolean).map(line => {
const [hash, date, message] = line.split('|');
return { hash, date, message, branch };
});
}
private summarizeActivity(commits: Array<{ hash: string; date: string; message: string; branch: string }>) {
return {
totalCommits: commits.length,
firstCommit: commits[commits.length - 1],
lastCommit: commits[0],
commitTypes: this.categorizeCommits(commits),
};
}
private categorizeCommits(commits: Array<{ message: string }>) {
const categories = {
feature: 0,
fix: 0,
refactor: 0,
docs: 0,
other: 0,
};
commits.forEach(({ message }) => {
if (message.match(/^feat|^add/i)) categories.feature++;
else if (message.match(/^fix|^bug/i)) categories.fix++;
else if (message.match(/^refactor|^style|^chore/i)) categories.refactor++;
else if (message.match(/^docs/i)) categories.docs++;
else categories.other++;
});
return categories;
}
private analyzeConflicts(branchChanges: Array<{ branch: string; history: Array<{ hash: string; date: string; message: string }> }>) {
const overlaps = this.findOverlappingChanges(branchChanges);
return {
riskLevel: this.assessRiskLevel(overlaps),
reasons: this.generateConflictReasons(overlaps),
};
}
private findOverlappingChanges(branchChanges: Array<{ branch: string; history: Array<{ date: string }> }>) {
const timeRanges = branchChanges.map(({ branch, history }) => ({
branch,
start: history[history.length - 1]?.date,
end: history[0]?.date,
}));
return timeRanges.flatMap((range1, i) =>
timeRanges.slice(i + 1).map(range2 => ({
branches: [range1.branch, range2.branch],
overlaps: this.datesOverlap(
new Date(range1.start),
new Date(range1.end),
new Date(range2.start),
new Date(range2.end)
),
}))
).filter(({ overlaps }) => overlaps);
}
private datesOverlap(start1: Date, end1: Date, start2: Date, end2: Date): boolean {
return start1 <= end2 && start2 <= end1;
}
private assessRiskLevel(overlaps: Array<{ branches: string[] }>) {
if (overlaps.length === 0) return 'low';
if (overlaps.length <= 2) return 'medium';
return 'high';
}
private generateConflictReasons(overlaps: Array<{ branches: string[] }>) {
return overlaps.map(({ branches }) =>
`Parallel development detected between ${branches.join(' and ')}`
);
}
private determineMergeStrategy(repoPath: string, branches: string[]) {
const commitCounts = branches.map(branch => ({
branch,
count: this.getCommitCount(repoPath, branch),
}));
const baseChoice = commitCounts.reduce((a, b) =>
a.count > b.count ? a : b
);
return {
recommendedBase: baseChoice.branch,
approach: 'cherry-pick',
reasoning: [
`${baseChoice.branch} has the most changes (${baseChoice.count} commits)`,
'Cherry-pick approach allows for selective integration',
],
};
}
private assessConflictRisks(repoPath: string, branches: string[]) {
const changedFiles = new Map<string, string[]>();
branches.forEach(branch => {
const files = execSync(
`cd "${repoPath}" && git diff --name-only $(git merge-base ${branches[0]} ${branch})..${branch}`,
{ encoding: 'utf8' }
)
.trim()
.split('\n')
.filter(Boolean);
files.forEach(file => {
const current = changedFiles.get(file) || [];
changedFiles.set(file, [...current, branch]);
});
});
const hotspots = Array.from(changedFiles.entries())
.filter(([_, branches]) => branches.length > 1)
.map(([file]) => file);
return {
overallRisk: hotspots.length > 5 ? 'high' : hotspots.length > 0 ? 'medium' : 'low',
hotspots,
recommendations: [
'Review changes in hotspots first',
'Consider creating integration tests for modified components',
],
};
}
private generateMergeSteps(repoPath: string, branches: string[]) {
return [
'Create backup branches',
'Create integration branch from recommended base',
'Cherry-pick non-conflicting changes',
'Resolve conflicts in hotspots',
'Run test suite after each significant change',
'Verify functionality of modified components',
'Update documentation to reflect changes',
];
}
private generateOverviewSummary(overview: Array<{ branch: string; commitCount: number }>) {
const totalCommits = overview.reduce((sum, { commitCount }) => sum + commitCount, 0);
const avgCommits = totalCommits / overview.length;
return {
totalBranches: overview.length,
totalCommits,
averageCommitsPerBranch: Math.round(avgCommits),
mostActiveBranch: overview.reduce((a, b) =>
a.commitCount > b.commitCount ? a : b
).branch,
};
}
private generateTimePeriodSummary(
analysis: Array<{
branch: string;
commits: Array<{ message: string }>;
activitySummary: { totalCommits: number };
}>
) {
const totalCommits = analysis.reduce(
(sum, { activitySummary }) => sum + activitySummary.totalCommits,
0
);
return {
totalCommits,
branchesWithActivity: analysis.filter(
({ activitySummary }) => activitySummary.totalCommits > 0
).length,
mostActiveBy: {
commits: analysis.reduce((a, b) =>
a.activitySummary.totalCommits > b.activitySummary.totalCommits ? a : b
).branch,
},
};
}
private generateFileChangesSummary(
analysis: Array<{
file: string;
changes: Array<{ branch: string; history: Array<unknown> }>;
conflicts: { riskLevel: string };
}>
) {
const riskLevels = analysis.map(({ conflicts }) => conflicts.riskLevel);
return {
totalFiles: analysis.length,
filesWithConflicts: riskLevels.filter(level => level !== 'low').length,
highRiskFiles: riskLevels.filter(level => level === 'high').length,
recommendedReviewOrder: analysis
.sort((a, b) => this.riskToNumber(b.conflicts.riskLevel) - this.riskToNumber(a.conflicts.riskLevel))
.map(({ file }) => file),
};
}
private riskToNumber(risk: string): number {
switch (risk) {
case 'high': return 3;
case 'medium': return 2;
case 'low': return 1;
default: return 0;
}
}
async run() {
const transport = new StdioServerTransport();
await this.server.connect(transport);
console.error('Git Analysis MCP server running on stdio');
}
}
const server = new GitAnalysisServer();
server.run().catch(console.error);
```