@cyanheads/git-mcp-server 2.3.1 → 2.3.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/dist/mcp-server/tools/gitAdd/logic.d.ts +136 -0
- package/dist/mcp-server/tools/gitAdd/logic.d.ts.map +1 -1
- package/dist/mcp-server/tools/gitAdd/logic.js +4 -0
- package/dist/mcp-server/tools/gitAdd/logic.js.map +1 -1
- package/dist/mcp-server/tools/gitCheckout/logic.d.ts +136 -0
- package/dist/mcp-server/tools/gitCheckout/logic.d.ts.map +1 -1
- package/dist/mcp-server/tools/gitCheckout/logic.js +4 -0
- package/dist/mcp-server/tools/gitCheckout/logic.js.map +1 -1
- package/dist/mcp-server/tools/gitCherryPick/logic.d.ts +136 -0
- package/dist/mcp-server/tools/gitCherryPick/logic.d.ts.map +1 -1
- package/dist/mcp-server/tools/gitCherryPick/logic.js +4 -1
- package/dist/mcp-server/tools/gitCherryPick/logic.js.map +1 -1
- package/dist/mcp-server/tools/gitClean/logic.d.ts +136 -0
- package/dist/mcp-server/tools/gitClean/logic.d.ts.map +1 -1
- package/dist/mcp-server/tools/gitClean/logic.js +10 -1
- package/dist/mcp-server/tools/gitClean/logic.js.map +1 -1
- package/dist/mcp-server/tools/gitCommit/logic.d.ts +136 -0
- package/dist/mcp-server/tools/gitCommit/logic.d.ts.map +1 -1
- package/dist/mcp-server/tools/gitCommit/logic.js +4 -0
- package/dist/mcp-server/tools/gitCommit/logic.js.map +1 -1
- package/dist/mcp-server/tools/gitMerge/logic.d.ts +136 -0
- package/dist/mcp-server/tools/gitMerge/logic.d.ts.map +1 -1
- package/dist/mcp-server/tools/gitMerge/logic.js +4 -0
- package/dist/mcp-server/tools/gitMerge/logic.js.map +1 -1
- package/dist/mcp-server/tools/gitPull/logic.d.ts +136 -0
- package/dist/mcp-server/tools/gitPull/logic.d.ts.map +1 -1
- package/dist/mcp-server/tools/gitPull/logic.js +9 -1
- package/dist/mcp-server/tools/gitPull/logic.js.map +1 -1
- package/dist/mcp-server/tools/gitRebase/logic.d.ts +136 -0
- package/dist/mcp-server/tools/gitRebase/logic.d.ts.map +1 -1
- package/dist/mcp-server/tools/gitRebase/logic.js +4 -0
- package/dist/mcp-server/tools/gitRebase/logic.js.map +1 -1
- package/dist/mcp-server/tools/gitReset/logic.d.ts +136 -0
- package/dist/mcp-server/tools/gitReset/logic.d.ts.map +1 -1
- package/dist/mcp-server/tools/gitReset/logic.js +4 -1
- package/dist/mcp-server/tools/gitReset/logic.js.map +1 -1
- package/dist/mcp-server/tools/gitStash/logic.d.ts +136 -0
- package/dist/mcp-server/tools/gitStash/logic.d.ts.map +1 -1
- package/dist/mcp-server/tools/gitStash/logic.js +6 -1
- package/dist/mcp-server/tools/gitStash/logic.js.map +1 -1
- package/dist/utils/metrics/tokenCounter.d.ts.map +1 -1
- package/dist/utils/metrics/tokenCounter.js +8 -6
- package/dist/utils/metrics/tokenCounter.js.map +1 -1
- package/package.json +18 -15
package/README.md
CHANGED
|
@@ -5,9 +5,9 @@
|
|
|
5
5
|
**Empower your AI agents with comprehensive, secure, and programmatic control over Git repositories!**
|
|
6
6
|
|
|
7
7
|
[](https://www.typescriptlang.org/)
|
|
8
|
-
[](https://github.com/modelcontextprotocol/typescript-sdk)
|
|
9
9
|
[](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/docs/specification/2025-06-18/changelog.mdx)
|
|
10
|
-
[](./CHANGELOG.md)
|
|
11
11
|
[](./vitest.config.ts)
|
|
12
12
|
[](https://opensource.org/licenses/Apache-2.0)
|
|
13
13
|
[](https://github.com/cyanheads/git-mcp-server/issues)
|
|
@@ -15,14 +15,150 @@ export declare const GitAddOutputSchema: z.ZodObject<{
|
|
|
15
15
|
success: z.ZodBoolean;
|
|
16
16
|
statusMessage: z.ZodString;
|
|
17
17
|
filesStaged: z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>;
|
|
18
|
+
status: z.ZodOptional<z.ZodObject<{
|
|
19
|
+
current_branch: z.ZodNullable<z.ZodString>;
|
|
20
|
+
staged_changes: z.ZodObject<{
|
|
21
|
+
Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
22
|
+
Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
23
|
+
Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
24
|
+
Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
25
|
+
Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
26
|
+
TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
27
|
+
}, "strip", z.ZodTypeAny, {
|
|
28
|
+
Added?: string[] | undefined;
|
|
29
|
+
Modified?: string[] | undefined;
|
|
30
|
+
Deleted?: string[] | undefined;
|
|
31
|
+
Renamed?: string[] | undefined;
|
|
32
|
+
Copied?: string[] | undefined;
|
|
33
|
+
TypeChanged?: string[] | undefined;
|
|
34
|
+
}, {
|
|
35
|
+
Added?: string[] | undefined;
|
|
36
|
+
Modified?: string[] | undefined;
|
|
37
|
+
Deleted?: string[] | undefined;
|
|
38
|
+
Renamed?: string[] | undefined;
|
|
39
|
+
Copied?: string[] | undefined;
|
|
40
|
+
TypeChanged?: string[] | undefined;
|
|
41
|
+
}>;
|
|
42
|
+
unstaged_changes: z.ZodObject<{
|
|
43
|
+
Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
44
|
+
Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
45
|
+
Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
46
|
+
Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
47
|
+
Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
48
|
+
TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
49
|
+
}, "strip", z.ZodTypeAny, {
|
|
50
|
+
Added?: string[] | undefined;
|
|
51
|
+
Modified?: string[] | undefined;
|
|
52
|
+
Deleted?: string[] | undefined;
|
|
53
|
+
Renamed?: string[] | undefined;
|
|
54
|
+
Copied?: string[] | undefined;
|
|
55
|
+
TypeChanged?: string[] | undefined;
|
|
56
|
+
}, {
|
|
57
|
+
Added?: string[] | undefined;
|
|
58
|
+
Modified?: string[] | undefined;
|
|
59
|
+
Deleted?: string[] | undefined;
|
|
60
|
+
Renamed?: string[] | undefined;
|
|
61
|
+
Copied?: string[] | undefined;
|
|
62
|
+
TypeChanged?: string[] | undefined;
|
|
63
|
+
}>;
|
|
64
|
+
untracked_files: z.ZodArray<z.ZodString, "many">;
|
|
65
|
+
conflicted_files: z.ZodArray<z.ZodString, "many">;
|
|
66
|
+
is_clean: z.ZodBoolean;
|
|
67
|
+
}, "strip", z.ZodTypeAny, {
|
|
68
|
+
current_branch: string | null;
|
|
69
|
+
staged_changes: {
|
|
70
|
+
Added?: string[] | undefined;
|
|
71
|
+
Modified?: string[] | undefined;
|
|
72
|
+
Deleted?: string[] | undefined;
|
|
73
|
+
Renamed?: string[] | undefined;
|
|
74
|
+
Copied?: string[] | undefined;
|
|
75
|
+
TypeChanged?: string[] | undefined;
|
|
76
|
+
};
|
|
77
|
+
unstaged_changes: {
|
|
78
|
+
Added?: string[] | undefined;
|
|
79
|
+
Modified?: string[] | undefined;
|
|
80
|
+
Deleted?: string[] | undefined;
|
|
81
|
+
Renamed?: string[] | undefined;
|
|
82
|
+
Copied?: string[] | undefined;
|
|
83
|
+
TypeChanged?: string[] | undefined;
|
|
84
|
+
};
|
|
85
|
+
untracked_files: string[];
|
|
86
|
+
conflicted_files: string[];
|
|
87
|
+
is_clean: boolean;
|
|
88
|
+
}, {
|
|
89
|
+
current_branch: string | null;
|
|
90
|
+
staged_changes: {
|
|
91
|
+
Added?: string[] | undefined;
|
|
92
|
+
Modified?: string[] | undefined;
|
|
93
|
+
Deleted?: string[] | undefined;
|
|
94
|
+
Renamed?: string[] | undefined;
|
|
95
|
+
Copied?: string[] | undefined;
|
|
96
|
+
TypeChanged?: string[] | undefined;
|
|
97
|
+
};
|
|
98
|
+
unstaged_changes: {
|
|
99
|
+
Added?: string[] | undefined;
|
|
100
|
+
Modified?: string[] | undefined;
|
|
101
|
+
Deleted?: string[] | undefined;
|
|
102
|
+
Renamed?: string[] | undefined;
|
|
103
|
+
Copied?: string[] | undefined;
|
|
104
|
+
TypeChanged?: string[] | undefined;
|
|
105
|
+
};
|
|
106
|
+
untracked_files: string[];
|
|
107
|
+
conflicted_files: string[];
|
|
108
|
+
is_clean: boolean;
|
|
109
|
+
}>>;
|
|
18
110
|
}, "strip", z.ZodTypeAny, {
|
|
19
111
|
success: boolean;
|
|
20
112
|
statusMessage: string;
|
|
21
113
|
filesStaged: string | string[];
|
|
114
|
+
status?: {
|
|
115
|
+
current_branch: string | null;
|
|
116
|
+
staged_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
|
+
unstaged_changes: {
|
|
125
|
+
Added?: string[] | undefined;
|
|
126
|
+
Modified?: string[] | undefined;
|
|
127
|
+
Deleted?: string[] | undefined;
|
|
128
|
+
Renamed?: string[] | undefined;
|
|
129
|
+
Copied?: string[] | undefined;
|
|
130
|
+
TypeChanged?: string[] | undefined;
|
|
131
|
+
};
|
|
132
|
+
untracked_files: string[];
|
|
133
|
+
conflicted_files: string[];
|
|
134
|
+
is_clean: boolean;
|
|
135
|
+
} | undefined;
|
|
22
136
|
}, {
|
|
23
137
|
success: boolean;
|
|
24
138
|
statusMessage: string;
|
|
25
139
|
filesStaged: string | string[];
|
|
140
|
+
status?: {
|
|
141
|
+
current_branch: string | null;
|
|
142
|
+
staged_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
|
+
unstaged_changes: {
|
|
151
|
+
Added?: string[] | undefined;
|
|
152
|
+
Modified?: string[] | undefined;
|
|
153
|
+
Deleted?: string[] | undefined;
|
|
154
|
+
Renamed?: string[] | undefined;
|
|
155
|
+
Copied?: string[] | undefined;
|
|
156
|
+
TypeChanged?: string[] | undefined;
|
|
157
|
+
};
|
|
158
|
+
untracked_files: string[];
|
|
159
|
+
conflicted_files: string[];
|
|
160
|
+
is_clean: boolean;
|
|
161
|
+
} | undefined;
|
|
26
162
|
}>;
|
|
27
163
|
export type GitAddOutput = z.infer<typeof GitAddOutputSchema>;
|
|
28
164
|
export declare function addGitFiles(params: GitAddInput, context: RequestContext & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitAdd/logic.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAU,cAAc,EAAgB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitAdd/logic.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAU,cAAc,EAAgB,MAAM,yBAAyB,CAAC;AAK/E,eAAO,MAAM,iBAAiB;;;;;;;;;EAa5B,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE5D,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAa7B,CAAC;AAEH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE9D,wBAAsB,WAAW,CAC/B,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,cAAc,GAAG;IACxB,mBAAmB,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;CAC/C,GACA,OAAO,CAAC,YAAY,CAAC,CAmEvB"}
|
|
@@ -3,6 +3,7 @@ import { execFile } from "child_process";
|
|
|
3
3
|
import { promisify } from "util";
|
|
4
4
|
import { z } from "zod";
|
|
5
5
|
import { logger, sanitization } from "../../../utils/index.js";
|
|
6
|
+
import { getGitStatus, GitStatusOutputSchema } from "../gitStatus/logic.js";
|
|
6
7
|
const execFileAsync = promisify(execFile);
|
|
7
8
|
export const GitAddInputSchema = z.object({
|
|
8
9
|
path: z
|
|
@@ -26,6 +27,7 @@ export const GitAddOutputSchema = z.object({
|
|
|
26
27
|
filesStaged: z
|
|
27
28
|
.union([z.string(), z.array(z.string())])
|
|
28
29
|
.describe("The files or patterns that were staged."),
|
|
30
|
+
status: GitStatusOutputSchema.optional().describe("The status of the repository after the add operation."),
|
|
29
31
|
});
|
|
30
32
|
export async function addGitFiles(params, context) {
|
|
31
33
|
const operation = "addGitFiles";
|
|
@@ -71,10 +73,12 @@ export async function addGitFiles(params, context) {
|
|
|
71
73
|
files: filesToStage,
|
|
72
74
|
});
|
|
73
75
|
const reminder = "Remember to write clear, concise commit messages using the Conventional Commits format (e.g., 'feat(scope): subject').";
|
|
76
|
+
const status = await getGitStatus({ path: targetPath }, context);
|
|
74
77
|
return {
|
|
75
78
|
success: true,
|
|
76
79
|
statusMessage: `${successMessage}. ${reminder}`,
|
|
77
80
|
filesStaged: filesToStage,
|
|
81
|
+
status,
|
|
78
82
|
};
|
|
79
83
|
}
|
|
80
84
|
//# sourceMappingURL=logic.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitAdd/logic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,MAAM,EAAkB,YAAY,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitAdd/logic.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,14 +25,150 @@ export declare const GitCheckoutOutputSchema: z.ZodObject<{
|
|
|
25
25
|
message: z.ZodString;
|
|
26
26
|
currentBranch: z.ZodOptional<z.ZodString>;
|
|
27
27
|
newBranchCreated: z.ZodOptional<z.ZodBoolean>;
|
|
28
|
+
status: z.ZodOptional<z.ZodObject<{
|
|
29
|
+
current_branch: z.ZodNullable<z.ZodString>;
|
|
30
|
+
staged_changes: z.ZodObject<{
|
|
31
|
+
Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
32
|
+
Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
33
|
+
Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
34
|
+
Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
35
|
+
Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
36
|
+
TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
37
|
+
}, "strip", z.ZodTypeAny, {
|
|
38
|
+
Added?: string[] | undefined;
|
|
39
|
+
Modified?: string[] | undefined;
|
|
40
|
+
Deleted?: string[] | undefined;
|
|
41
|
+
Renamed?: string[] | undefined;
|
|
42
|
+
Copied?: string[] | undefined;
|
|
43
|
+
TypeChanged?: string[] | undefined;
|
|
44
|
+
}, {
|
|
45
|
+
Added?: string[] | undefined;
|
|
46
|
+
Modified?: string[] | undefined;
|
|
47
|
+
Deleted?: string[] | undefined;
|
|
48
|
+
Renamed?: string[] | undefined;
|
|
49
|
+
Copied?: string[] | undefined;
|
|
50
|
+
TypeChanged?: string[] | undefined;
|
|
51
|
+
}>;
|
|
52
|
+
unstaged_changes: z.ZodObject<{
|
|
53
|
+
Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
54
|
+
Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
55
|
+
Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
56
|
+
Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
57
|
+
Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
58
|
+
TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
59
|
+
}, "strip", z.ZodTypeAny, {
|
|
60
|
+
Added?: string[] | undefined;
|
|
61
|
+
Modified?: string[] | undefined;
|
|
62
|
+
Deleted?: string[] | undefined;
|
|
63
|
+
Renamed?: string[] | undefined;
|
|
64
|
+
Copied?: string[] | undefined;
|
|
65
|
+
TypeChanged?: string[] | undefined;
|
|
66
|
+
}, {
|
|
67
|
+
Added?: string[] | undefined;
|
|
68
|
+
Modified?: string[] | undefined;
|
|
69
|
+
Deleted?: string[] | undefined;
|
|
70
|
+
Renamed?: string[] | undefined;
|
|
71
|
+
Copied?: string[] | undefined;
|
|
72
|
+
TypeChanged?: string[] | undefined;
|
|
73
|
+
}>;
|
|
74
|
+
untracked_files: z.ZodArray<z.ZodString, "many">;
|
|
75
|
+
conflicted_files: z.ZodArray<z.ZodString, "many">;
|
|
76
|
+
is_clean: z.ZodBoolean;
|
|
77
|
+
}, "strip", z.ZodTypeAny, {
|
|
78
|
+
current_branch: string | null;
|
|
79
|
+
staged_changes: {
|
|
80
|
+
Added?: string[] | undefined;
|
|
81
|
+
Modified?: string[] | undefined;
|
|
82
|
+
Deleted?: string[] | undefined;
|
|
83
|
+
Renamed?: string[] | undefined;
|
|
84
|
+
Copied?: string[] | undefined;
|
|
85
|
+
TypeChanged?: string[] | undefined;
|
|
86
|
+
};
|
|
87
|
+
unstaged_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
|
+
untracked_files: string[];
|
|
96
|
+
conflicted_files: string[];
|
|
97
|
+
is_clean: boolean;
|
|
98
|
+
}, {
|
|
99
|
+
current_branch: string | null;
|
|
100
|
+
staged_changes: {
|
|
101
|
+
Added?: string[] | undefined;
|
|
102
|
+
Modified?: string[] | undefined;
|
|
103
|
+
Deleted?: string[] | undefined;
|
|
104
|
+
Renamed?: string[] | undefined;
|
|
105
|
+
Copied?: string[] | undefined;
|
|
106
|
+
TypeChanged?: string[] | undefined;
|
|
107
|
+
};
|
|
108
|
+
unstaged_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
|
+
untracked_files: string[];
|
|
117
|
+
conflicted_files: string[];
|
|
118
|
+
is_clean: boolean;
|
|
119
|
+
}>>;
|
|
28
120
|
}, "strip", z.ZodTypeAny, {
|
|
29
121
|
message: string;
|
|
30
122
|
success: boolean;
|
|
123
|
+
status?: {
|
|
124
|
+
current_branch: string | null;
|
|
125
|
+
staged_changes: {
|
|
126
|
+
Added?: string[] | undefined;
|
|
127
|
+
Modified?: string[] | undefined;
|
|
128
|
+
Deleted?: string[] | undefined;
|
|
129
|
+
Renamed?: string[] | undefined;
|
|
130
|
+
Copied?: string[] | undefined;
|
|
131
|
+
TypeChanged?: string[] | undefined;
|
|
132
|
+
};
|
|
133
|
+
unstaged_changes: {
|
|
134
|
+
Added?: string[] | undefined;
|
|
135
|
+
Modified?: string[] | undefined;
|
|
136
|
+
Deleted?: string[] | undefined;
|
|
137
|
+
Renamed?: string[] | undefined;
|
|
138
|
+
Copied?: string[] | undefined;
|
|
139
|
+
TypeChanged?: string[] | undefined;
|
|
140
|
+
};
|
|
141
|
+
untracked_files: string[];
|
|
142
|
+
conflicted_files: string[];
|
|
143
|
+
is_clean: boolean;
|
|
144
|
+
} | undefined;
|
|
31
145
|
currentBranch?: string | undefined;
|
|
32
146
|
newBranchCreated?: boolean | undefined;
|
|
33
147
|
}, {
|
|
34
148
|
message: string;
|
|
35
149
|
success: boolean;
|
|
150
|
+
status?: {
|
|
151
|
+
current_branch: string | null;
|
|
152
|
+
staged_changes: {
|
|
153
|
+
Added?: string[] | undefined;
|
|
154
|
+
Modified?: string[] | undefined;
|
|
155
|
+
Deleted?: string[] | undefined;
|
|
156
|
+
Renamed?: string[] | undefined;
|
|
157
|
+
Copied?: string[] | undefined;
|
|
158
|
+
TypeChanged?: string[] | undefined;
|
|
159
|
+
};
|
|
160
|
+
unstaged_changes: {
|
|
161
|
+
Added?: string[] | undefined;
|
|
162
|
+
Modified?: string[] | undefined;
|
|
163
|
+
Deleted?: string[] | undefined;
|
|
164
|
+
Renamed?: string[] | undefined;
|
|
165
|
+
Copied?: string[] | undefined;
|
|
166
|
+
TypeChanged?: string[] | undefined;
|
|
167
|
+
};
|
|
168
|
+
untracked_files: string[];
|
|
169
|
+
conflicted_files: string[];
|
|
170
|
+
is_clean: boolean;
|
|
171
|
+
} | undefined;
|
|
36
172
|
currentBranch?: string | undefined;
|
|
37
173
|
newBranchCreated?: boolean | undefined;
|
|
38
174
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitCheckout/logic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitCheckout/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,sBAAsB;;;;;;;;;;;;;;;EAmBjC,CAAC;AAGH,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAclC,CAAC;AAGH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AACtE,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAExE;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,cAAc,GAAG;IAAE,mBAAmB,EAAE,MAAM,MAAM,GAAG,SAAS,CAAA;CAAE,GAC1E,OAAO,CAAC,iBAAiB,CAAC,CAwD5B"}
|
|
@@ -7,6 +7,7 @@ import { promisify } from "util";
|
|
|
7
7
|
import { z } from "zod";
|
|
8
8
|
import { logger, sanitization, } from "../../../utils/index.js";
|
|
9
9
|
import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
|
|
10
|
+
import { getGitStatus, GitStatusOutputSchema } from "../gitStatus/logic.js";
|
|
10
11
|
const execFileAsync = promisify(execFile);
|
|
11
12
|
// 1. DEFINE the Zod input schema.
|
|
12
13
|
export const GitCheckoutInputSchema = z.object({
|
|
@@ -39,6 +40,7 @@ export const GitCheckoutOutputSchema = z.object({
|
|
|
39
40
|
.boolean()
|
|
40
41
|
.optional()
|
|
41
42
|
.describe("Indicates if a new branch was created."),
|
|
43
|
+
status: GitStatusOutputSchema.optional().describe("The status of the repository after the checkout operation."),
|
|
42
44
|
});
|
|
43
45
|
/**
|
|
44
46
|
* 4. IMPLEMENT the core logic function.
|
|
@@ -82,11 +84,13 @@ export async function checkoutGit(params, context) {
|
|
|
82
84
|
catch {
|
|
83
85
|
currentBranch = "Detached HEAD";
|
|
84
86
|
}
|
|
87
|
+
const status = await getGitStatus({ path: targetPath }, context);
|
|
85
88
|
return {
|
|
86
89
|
success: true,
|
|
87
90
|
message,
|
|
88
91
|
currentBranch,
|
|
89
92
|
newBranchCreated: !!params.newBranch,
|
|
93
|
+
status,
|
|
90
94
|
};
|
|
91
95
|
}
|
|
92
96
|
//# sourceMappingURL=logic.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitCheckout/logic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EACL,MAAM,EAEN,YAAY,GACb,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitCheckout/logic.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,16 +31,152 @@ export declare const GitCherryPickOutputSchema: z.ZodObject<{
|
|
|
31
31
|
message: z.ZodString;
|
|
32
32
|
commitCreated: z.ZodBoolean;
|
|
33
33
|
conflicts: z.ZodBoolean;
|
|
34
|
+
status: z.ZodOptional<z.ZodObject<{
|
|
35
|
+
current_branch: z.ZodNullable<z.ZodString>;
|
|
36
|
+
staged_changes: z.ZodObject<{
|
|
37
|
+
Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
38
|
+
Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
39
|
+
Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
40
|
+
Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
41
|
+
Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
42
|
+
TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
43
|
+
}, "strip", z.ZodTypeAny, {
|
|
44
|
+
Added?: string[] | undefined;
|
|
45
|
+
Modified?: string[] | undefined;
|
|
46
|
+
Deleted?: string[] | undefined;
|
|
47
|
+
Renamed?: string[] | undefined;
|
|
48
|
+
Copied?: string[] | undefined;
|
|
49
|
+
TypeChanged?: string[] | undefined;
|
|
50
|
+
}, {
|
|
51
|
+
Added?: string[] | undefined;
|
|
52
|
+
Modified?: string[] | undefined;
|
|
53
|
+
Deleted?: string[] | undefined;
|
|
54
|
+
Renamed?: string[] | undefined;
|
|
55
|
+
Copied?: string[] | undefined;
|
|
56
|
+
TypeChanged?: string[] | undefined;
|
|
57
|
+
}>;
|
|
58
|
+
unstaged_changes: z.ZodObject<{
|
|
59
|
+
Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
60
|
+
Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
61
|
+
Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
62
|
+
Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
63
|
+
Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
64
|
+
TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
65
|
+
}, "strip", z.ZodTypeAny, {
|
|
66
|
+
Added?: string[] | undefined;
|
|
67
|
+
Modified?: string[] | undefined;
|
|
68
|
+
Deleted?: string[] | undefined;
|
|
69
|
+
Renamed?: string[] | undefined;
|
|
70
|
+
Copied?: string[] | undefined;
|
|
71
|
+
TypeChanged?: string[] | undefined;
|
|
72
|
+
}, {
|
|
73
|
+
Added?: string[] | undefined;
|
|
74
|
+
Modified?: string[] | undefined;
|
|
75
|
+
Deleted?: string[] | undefined;
|
|
76
|
+
Renamed?: string[] | undefined;
|
|
77
|
+
Copied?: string[] | undefined;
|
|
78
|
+
TypeChanged?: string[] | undefined;
|
|
79
|
+
}>;
|
|
80
|
+
untracked_files: z.ZodArray<z.ZodString, "many">;
|
|
81
|
+
conflicted_files: z.ZodArray<z.ZodString, "many">;
|
|
82
|
+
is_clean: z.ZodBoolean;
|
|
83
|
+
}, "strip", z.ZodTypeAny, {
|
|
84
|
+
current_branch: string | null;
|
|
85
|
+
staged_changes: {
|
|
86
|
+
Added?: string[] | undefined;
|
|
87
|
+
Modified?: string[] | undefined;
|
|
88
|
+
Deleted?: string[] | undefined;
|
|
89
|
+
Renamed?: string[] | undefined;
|
|
90
|
+
Copied?: string[] | undefined;
|
|
91
|
+
TypeChanged?: string[] | undefined;
|
|
92
|
+
};
|
|
93
|
+
unstaged_changes: {
|
|
94
|
+
Added?: string[] | undefined;
|
|
95
|
+
Modified?: string[] | undefined;
|
|
96
|
+
Deleted?: string[] | undefined;
|
|
97
|
+
Renamed?: string[] | undefined;
|
|
98
|
+
Copied?: string[] | undefined;
|
|
99
|
+
TypeChanged?: string[] | undefined;
|
|
100
|
+
};
|
|
101
|
+
untracked_files: string[];
|
|
102
|
+
conflicted_files: string[];
|
|
103
|
+
is_clean: boolean;
|
|
104
|
+
}, {
|
|
105
|
+
current_branch: string | null;
|
|
106
|
+
staged_changes: {
|
|
107
|
+
Added?: string[] | undefined;
|
|
108
|
+
Modified?: string[] | undefined;
|
|
109
|
+
Deleted?: string[] | undefined;
|
|
110
|
+
Renamed?: string[] | undefined;
|
|
111
|
+
Copied?: string[] | undefined;
|
|
112
|
+
TypeChanged?: string[] | undefined;
|
|
113
|
+
};
|
|
114
|
+
unstaged_changes: {
|
|
115
|
+
Added?: string[] | undefined;
|
|
116
|
+
Modified?: string[] | undefined;
|
|
117
|
+
Deleted?: string[] | undefined;
|
|
118
|
+
Renamed?: string[] | undefined;
|
|
119
|
+
Copied?: string[] | undefined;
|
|
120
|
+
TypeChanged?: string[] | undefined;
|
|
121
|
+
};
|
|
122
|
+
untracked_files: string[];
|
|
123
|
+
conflicted_files: string[];
|
|
124
|
+
is_clean: boolean;
|
|
125
|
+
}>>;
|
|
34
126
|
}, "strip", z.ZodTypeAny, {
|
|
35
127
|
message: string;
|
|
36
128
|
success: boolean;
|
|
37
129
|
commitCreated: boolean;
|
|
38
130
|
conflicts: boolean;
|
|
131
|
+
status?: {
|
|
132
|
+
current_branch: string | null;
|
|
133
|
+
staged_changes: {
|
|
134
|
+
Added?: string[] | undefined;
|
|
135
|
+
Modified?: string[] | undefined;
|
|
136
|
+
Deleted?: string[] | undefined;
|
|
137
|
+
Renamed?: string[] | undefined;
|
|
138
|
+
Copied?: string[] | undefined;
|
|
139
|
+
TypeChanged?: string[] | undefined;
|
|
140
|
+
};
|
|
141
|
+
unstaged_changes: {
|
|
142
|
+
Added?: string[] | undefined;
|
|
143
|
+
Modified?: string[] | undefined;
|
|
144
|
+
Deleted?: string[] | undefined;
|
|
145
|
+
Renamed?: string[] | undefined;
|
|
146
|
+
Copied?: string[] | undefined;
|
|
147
|
+
TypeChanged?: string[] | undefined;
|
|
148
|
+
};
|
|
149
|
+
untracked_files: string[];
|
|
150
|
+
conflicted_files: string[];
|
|
151
|
+
is_clean: boolean;
|
|
152
|
+
} | undefined;
|
|
39
153
|
}, {
|
|
40
154
|
message: string;
|
|
41
155
|
success: boolean;
|
|
42
156
|
commitCreated: boolean;
|
|
43
157
|
conflicts: boolean;
|
|
158
|
+
status?: {
|
|
159
|
+
current_branch: string | null;
|
|
160
|
+
staged_changes: {
|
|
161
|
+
Added?: string[] | undefined;
|
|
162
|
+
Modified?: string[] | undefined;
|
|
163
|
+
Deleted?: string[] | undefined;
|
|
164
|
+
Renamed?: string[] | undefined;
|
|
165
|
+
Copied?: string[] | undefined;
|
|
166
|
+
TypeChanged?: string[] | undefined;
|
|
167
|
+
};
|
|
168
|
+
unstaged_changes: {
|
|
169
|
+
Added?: string[] | undefined;
|
|
170
|
+
Modified?: string[] | undefined;
|
|
171
|
+
Deleted?: string[] | undefined;
|
|
172
|
+
Renamed?: string[] | undefined;
|
|
173
|
+
Copied?: string[] | undefined;
|
|
174
|
+
TypeChanged?: string[] | undefined;
|
|
175
|
+
};
|
|
176
|
+
untracked_files: string[];
|
|
177
|
+
conflicted_files: string[];
|
|
178
|
+
is_clean: boolean;
|
|
179
|
+
} | undefined;
|
|
44
180
|
}>;
|
|
45
181
|
export type GitCherryPickInput = z.infer<typeof GitCherryPickInputSchema>;
|
|
46
182
|
export type GitCherryPickOutput = z.infer<typeof GitCherryPickOutputSchema>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitCherryPick/logic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitCherryPick/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,wBAAwB;;;;;;;;;;;;;;;;;;;;;EA6BnC,CAAC;AAGH,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQpC,CAAC;AAGH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAC1E,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAE5E;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,kBAAkB,EAC1B,OAAO,EAAE,cAAc,GAAG;IAAE,mBAAmB,EAAE,MAAM,MAAM,GAAG,SAAS,CAAA;CAAE,GAC1E,OAAO,CAAC,mBAAmB,CAAC,CAqE9B"}
|
|
@@ -8,6 +8,7 @@ import { z } from "zod";
|
|
|
8
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 GitCherryPickInputSchema = z.object({
|
|
@@ -44,6 +45,7 @@ export const GitCherryPickOutputSchema = z.object({
|
|
|
44
45
|
message: z.string().describe("A summary message of the result."),
|
|
45
46
|
commitCreated: z.boolean().describe("Indicates if a new commit was created."),
|
|
46
47
|
conflicts: z.boolean().describe("Indicates if conflicts occurred."),
|
|
48
|
+
status: GitStatusOutputSchema.optional().describe("The status of the repository after the cherry-pick operation."),
|
|
47
49
|
});
|
|
48
50
|
/**
|
|
49
51
|
* 4. IMPLEMENT the core logic function.
|
|
@@ -104,6 +106,7 @@ export async function gitCherryPickLogic(params, context) {
|
|
|
104
106
|
const message = conflicts
|
|
105
107
|
? `Cherry-pick resulted in conflicts for commit(s) '${params.commitRef}'. Manual resolution required.`
|
|
106
108
|
: `Successfully cherry-picked commit(s) '${params.commitRef}'.`;
|
|
107
|
-
|
|
109
|
+
const status = await getGitStatus({ path: targetPath }, context);
|
|
110
|
+
return { success: true, message, commitCreated, conflicts, status };
|
|
108
111
|
}
|
|
109
112
|
//# sourceMappingURL=logic.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitCherryPick/logic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EACL,MAAM,EAEN,YAAY,GACb,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitCherryPick/logic.ts"],"names":[],"mappings":"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"}
|