@cyanheads/git-mcp-server 2.3.1 → 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.
Files changed (41) hide show
  1. package/dist/mcp-server/tools/gitAdd/logic.d.ts +136 -0
  2. package/dist/mcp-server/tools/gitAdd/logic.d.ts.map +1 -1
  3. package/dist/mcp-server/tools/gitAdd/logic.js +4 -0
  4. package/dist/mcp-server/tools/gitAdd/logic.js.map +1 -1
  5. package/dist/mcp-server/tools/gitCheckout/logic.d.ts +136 -0
  6. package/dist/mcp-server/tools/gitCheckout/logic.d.ts.map +1 -1
  7. package/dist/mcp-server/tools/gitCheckout/logic.js +4 -0
  8. package/dist/mcp-server/tools/gitCheckout/logic.js.map +1 -1
  9. package/dist/mcp-server/tools/gitCherryPick/logic.d.ts +136 -0
  10. package/dist/mcp-server/tools/gitCherryPick/logic.d.ts.map +1 -1
  11. package/dist/mcp-server/tools/gitCherryPick/logic.js +4 -1
  12. package/dist/mcp-server/tools/gitCherryPick/logic.js.map +1 -1
  13. package/dist/mcp-server/tools/gitClean/logic.d.ts +136 -0
  14. package/dist/mcp-server/tools/gitClean/logic.d.ts.map +1 -1
  15. package/dist/mcp-server/tools/gitClean/logic.js +10 -1
  16. package/dist/mcp-server/tools/gitClean/logic.js.map +1 -1
  17. package/dist/mcp-server/tools/gitCommit/logic.d.ts +136 -0
  18. package/dist/mcp-server/tools/gitCommit/logic.d.ts.map +1 -1
  19. package/dist/mcp-server/tools/gitCommit/logic.js +4 -0
  20. package/dist/mcp-server/tools/gitCommit/logic.js.map +1 -1
  21. package/dist/mcp-server/tools/gitMerge/logic.d.ts +136 -0
  22. package/dist/mcp-server/tools/gitMerge/logic.d.ts.map +1 -1
  23. package/dist/mcp-server/tools/gitMerge/logic.js +4 -0
  24. package/dist/mcp-server/tools/gitMerge/logic.js.map +1 -1
  25. package/dist/mcp-server/tools/gitPull/logic.d.ts +136 -0
  26. package/dist/mcp-server/tools/gitPull/logic.d.ts.map +1 -1
  27. package/dist/mcp-server/tools/gitPull/logic.js +9 -1
  28. package/dist/mcp-server/tools/gitPull/logic.js.map +1 -1
  29. package/dist/mcp-server/tools/gitRebase/logic.d.ts +136 -0
  30. package/dist/mcp-server/tools/gitRebase/logic.d.ts.map +1 -1
  31. package/dist/mcp-server/tools/gitRebase/logic.js +4 -0
  32. package/dist/mcp-server/tools/gitRebase/logic.js.map +1 -1
  33. package/dist/mcp-server/tools/gitReset/logic.d.ts +136 -0
  34. package/dist/mcp-server/tools/gitReset/logic.d.ts.map +1 -1
  35. package/dist/mcp-server/tools/gitReset/logic.js +4 -1
  36. package/dist/mcp-server/tools/gitReset/logic.js.map +1 -1
  37. package/dist/mcp-server/tools/gitStash/logic.d.ts +136 -0
  38. package/dist/mcp-server/tools/gitStash/logic.d.ts.map +1 -1
  39. package/dist/mcp-server/tools/gitStash/logic.js +6 -1
  40. package/dist/mcp-server/tools/gitStash/logic.js.map +1 -1
  41. package/package.json +1 -1
package/dist/mcp-server/tools/gitPull/logic.d.ts CHANGED
@@ -27,13 +27,149 @@ export declare const GitPullOutputSchema: z.ZodObject<{
27
27
  success: z.ZodBoolean;
28
28
  message: z.ZodString;
29
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
+ }>>;
30
122
  }, "strip", z.ZodTypeAny, {
31
123
  message: string;
32
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;
33
147
  conflict?: boolean | undefined;
34
148
  }, {
35
149
  message: string;
36
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;
37
173
  conflict?: boolean | undefined;
38
174
  }>;
39
175
  export type GitPullInput = z.infer<typeof GitPullInputSchema>;
package/dist/mcp-server/tools/gitPull/logic.d.ts.map CHANGED
@@ -1 +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;AAMjC,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;EAe7B,CAAC;AAGH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;EAO9B,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,CA+BxB"}
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"}
package/dist/mcp-server/tools/gitPull/logic.js CHANGED
@@ -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 GitPullInputSchema = z.object({
@@ -33,6 +34,7 @@ export const GitPullOutputSchema = z.object({
33
34
  .boolean()
34
35
  .optional()
35
36
  .describe("True if a merge conflict occurred."),
37
+ status: GitStatusOutputSchema.optional().describe("The status of the repository after the pull operation."),
36
38
  });
37
39
  /**
38
40
  * 4. IMPLEMENT the core logic function.
@@ -61,6 +63,12 @@ export async function pullGitChanges(params, context) {
61
63
  });
62
64
  const { stdout, stderr } = await execFileAsync("git", args);
63
65
  const message = stdout.trim() || stderr.trim() || "Pull command executed successfully.";
64
- return { success: true, message, conflict: message.includes("CONFLICT") };
66
+ const status = await getGitStatus({ path: targetPath }, context);
67
+ return {
68
+ success: true,
69
+ message,
70
+ conflict: message.includes("CONFLICT"),
71
+ status,
72
+ };
65
73
  }
66
74
  //# sourceMappingURL=logic.js.map
package/dist/mcp-server/tools/gitPull/logic.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitPull/logic.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitPull/logic.ts"],"names":[],"mappings":"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"}
package/dist/mcp-server/tools/gitRebase/logic.d.ts CHANGED
@@ -83,14 +83,150 @@ export declare const GitRebaseOutputSchema: z.ZodObject<{
83
83
  message: z.ZodString;
84
84
  rebaseCompleted: z.ZodOptional<z.ZodBoolean>;
85
85
  needsManualAction: z.ZodOptional<z.ZodBoolean>;
86
+ status: z.ZodOptional<z.ZodObject<{
87
+ current_branch: z.ZodNullable<z.ZodString>;
88
+ staged_changes: z.ZodObject<{
89
+ Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
90
+ Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
91
+ Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
92
+ Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
93
+ Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
94
+ TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
95
+ }, "strip", z.ZodTypeAny, {
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
+ 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: z.ZodObject<{
111
+ Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
112
+ Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
113
+ Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
114
+ Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
115
+ Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
116
+ TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
117
+ }, "strip", z.ZodTypeAny, {
118
+ Added?: string[] | undefined;
119
+ Modified?: string[] | undefined;
120
+ Deleted?: string[] | undefined;
121
+ Renamed?: string[] | undefined;
122
+ Copied?: string[] | undefined;
123
+ TypeChanged?: string[] | undefined;
124
+ }, {
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: z.ZodArray<z.ZodString, "many">;
133
+ conflicted_files: z.ZodArray<z.ZodString, "many">;
134
+ is_clean: z.ZodBoolean;
135
+ }, "strip", z.ZodTypeAny, {
136
+ current_branch: string | null;
137
+ staged_changes: {
138
+ Added?: string[] | undefined;
139
+ Modified?: string[] | undefined;
140
+ Deleted?: string[] | undefined;
141
+ Renamed?: string[] | undefined;
142
+ Copied?: string[] | undefined;
143
+ TypeChanged?: string[] | undefined;
144
+ };
145
+ unstaged_changes: {
146
+ Added?: string[] | undefined;
147
+ Modified?: string[] | undefined;
148
+ Deleted?: string[] | undefined;
149
+ Renamed?: string[] | undefined;
150
+ Copied?: string[] | undefined;
151
+ TypeChanged?: string[] | undefined;
152
+ };
153
+ untracked_files: string[];
154
+ conflicted_files: string[];
155
+ is_clean: boolean;
156
+ }, {
157
+ current_branch: string | null;
158
+ staged_changes: {
159
+ Added?: string[] | undefined;
160
+ Modified?: string[] | undefined;
161
+ Deleted?: string[] | undefined;
162
+ Renamed?: string[] | undefined;
163
+ Copied?: string[] | undefined;
164
+ TypeChanged?: string[] | undefined;
165
+ };
166
+ unstaged_changes: {
167
+ Added?: string[] | undefined;
168
+ Modified?: string[] | undefined;
169
+ Deleted?: string[] | undefined;
170
+ Renamed?: string[] | undefined;
171
+ Copied?: string[] | undefined;
172
+ TypeChanged?: string[] | undefined;
173
+ };
174
+ untracked_files: string[];
175
+ conflicted_files: string[];
176
+ is_clean: boolean;
177
+ }>>;
86
178
  }, "strip", z.ZodTypeAny, {
87
179
  message: string;
88
180
  success: boolean;
181
+ status?: {
182
+ current_branch: string | null;
183
+ staged_changes: {
184
+ Added?: string[] | undefined;
185
+ Modified?: string[] | undefined;
186
+ Deleted?: string[] | undefined;
187
+ Renamed?: string[] | undefined;
188
+ Copied?: string[] | undefined;
189
+ TypeChanged?: string[] | undefined;
190
+ };
191
+ unstaged_changes: {
192
+ Added?: string[] | undefined;
193
+ Modified?: string[] | undefined;
194
+ Deleted?: string[] | undefined;
195
+ Renamed?: string[] | undefined;
196
+ Copied?: string[] | undefined;
197
+ TypeChanged?: string[] | undefined;
198
+ };
199
+ untracked_files: string[];
200
+ conflicted_files: string[];
201
+ is_clean: boolean;
202
+ } | undefined;
89
203
  rebaseCompleted?: boolean | undefined;
90
204
  needsManualAction?: boolean | undefined;
91
205
  }, {
92
206
  message: string;
93
207
  success: boolean;
208
+ status?: {
209
+ current_branch: string | null;
210
+ staged_changes: {
211
+ Added?: string[] | undefined;
212
+ Modified?: string[] | undefined;
213
+ Deleted?: string[] | undefined;
214
+ Renamed?: string[] | undefined;
215
+ Copied?: string[] | undefined;
216
+ TypeChanged?: string[] | undefined;
217
+ };
218
+ unstaged_changes: {
219
+ Added?: string[] | undefined;
220
+ Modified?: string[] | undefined;
221
+ Deleted?: string[] | undefined;
222
+ Renamed?: string[] | undefined;
223
+ Copied?: string[] | undefined;
224
+ TypeChanged?: string[] | undefined;
225
+ };
226
+ untracked_files: string[];
227
+ conflicted_files: string[];
228
+ is_clean: boolean;
229
+ } | undefined;
94
230
  rebaseCompleted?: boolean | undefined;
95
231
  needsManualAction?: boolean | undefined;
96
232
  }>;
package/dist/mcp-server/tools/gitRebase/logic.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitRebase/logic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,yBAAyB,CAAC;AAMjC,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+B9B,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAOhC,CAAC;AAGF,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;EAWhC,CAAC;AAGH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAClE,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEpE;;;GAGG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,cAAc,GAAG;IAAE,mBAAmB,EAAE,MAAM,MAAM,GAAG,SAAS,CAAA;CAAE,GAC1E,OAAO,CAAC,eAAe,CAAC,CA4C1B"}
1
+ {"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitRebase/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,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+B9B,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAOhC,CAAC;AAGF,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAchC,CAAC;AAGH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAClE,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEpE;;;GAGG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,cAAc,GAAG;IAAE,mBAAmB,EAAE,MAAM,MAAM,GAAG,SAAS,CAAA;CAAE,GAC1E,OAAO,CAAC,eAAe,CAAC,CA+C1B"}
package/dist/mcp-server/tools/gitRebase/logic.js CHANGED
@@ -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 GitRebaseBaseSchema = z.object({
@@ -55,6 +56,7 @@ export const GitRebaseOutputSchema = z.object({
55
56
  .boolean()
56
57
  .optional()
57
58
  .describe("True if conflicts or interactive steps require user input."),
59
+ status: GitStatusOutputSchema.optional().describe("The status of the repository after the rebase operation."),
58
60
  });
59
61
  /**
60
62
  * 4. IMPLEMENT the core logic function.
@@ -94,11 +96,13 @@ export async function gitRebaseLogic(params, context) {
94
96
  });
95
97
  const { stdout, stderr } = await execFileAsync("git", args);
96
98
  const output = stdout + stderr;
99
+ const status = await getGitStatus({ path: targetPath }, context);
97
100
  return {
98
101
  success: true,
99
102
  message: `Rebase ${params.mode} executed successfully.`,
100
103
  rebaseCompleted: /successfully rebased/i.test(output),
101
104
  needsManualAction: /conflict|stopped at|edit/i.test(output),
105
+ status,
102
106
  };
103
107
  }
104
108
  //# sourceMappingURL=logic.js.map
package/dist/mcp-server/tools/gitRebase/logic.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitRebase/logic.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitRebase/logic.ts"],"names":[],"mappings":"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"}
package/dist/mcp-server/tools/gitReset/logic.d.ts CHANGED
@@ -21,13 +21,149 @@ export declare const GitResetOutputSchema: z.ZodObject<{
21
21
  success: z.ZodBoolean;
22
22
  message: z.ZodString;
23
23
  changesSummary: z.ZodOptional<z.ZodString>;
24
+ status: z.ZodOptional<z.ZodObject<{
25
+ current_branch: z.ZodNullable<z.ZodString>;
26
+ staged_changes: z.ZodObject<{
27
+ Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
28
+ Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
29
+ Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
30
+ Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
31
+ Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
32
+ TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
33
+ }, "strip", z.ZodTypeAny, {
34
+ Added?: string[] | undefined;
35
+ Modified?: string[] | undefined;
36
+ Deleted?: string[] | undefined;
37
+ Renamed?: string[] | undefined;
38
+ Copied?: string[] | undefined;
39
+ TypeChanged?: string[] | undefined;
40
+ }, {
41
+ Added?: string[] | undefined;
42
+ Modified?: string[] | undefined;
43
+ Deleted?: string[] | undefined;
44
+ Renamed?: string[] | undefined;
45
+ Copied?: string[] | undefined;
46
+ TypeChanged?: string[] | undefined;
47
+ }>;
48
+ unstaged_changes: z.ZodObject<{
49
+ Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
50
+ Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
51
+ Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
52
+ Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
53
+ Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
54
+ TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
55
+ }, "strip", z.ZodTypeAny, {
56
+ Added?: string[] | undefined;
57
+ Modified?: string[] | undefined;
58
+ Deleted?: string[] | undefined;
59
+ Renamed?: string[] | undefined;
60
+ Copied?: string[] | undefined;
61
+ TypeChanged?: string[] | undefined;
62
+ }, {
63
+ Added?: string[] | undefined;
64
+ Modified?: string[] | undefined;
65
+ Deleted?: string[] | undefined;
66
+ Renamed?: string[] | undefined;
67
+ Copied?: string[] | undefined;
68
+ TypeChanged?: string[] | undefined;
69
+ }>;
70
+ untracked_files: z.ZodArray<z.ZodString, "many">;
71
+ conflicted_files: z.ZodArray<z.ZodString, "many">;
72
+ is_clean: z.ZodBoolean;
73
+ }, "strip", z.ZodTypeAny, {
74
+ current_branch: string | null;
75
+ staged_changes: {
76
+ Added?: string[] | undefined;
77
+ Modified?: string[] | undefined;
78
+ Deleted?: string[] | undefined;
79
+ Renamed?: string[] | undefined;
80
+ Copied?: string[] | undefined;
81
+ TypeChanged?: string[] | undefined;
82
+ };
83
+ unstaged_changes: {
84
+ Added?: string[] | undefined;
85
+ Modified?: string[] | undefined;
86
+ Deleted?: string[] | undefined;
87
+ Renamed?: string[] | undefined;
88
+ Copied?: string[] | undefined;
89
+ TypeChanged?: string[] | undefined;
90
+ };
91
+ untracked_files: string[];
92
+ conflicted_files: string[];
93
+ is_clean: boolean;
94
+ }, {
95
+ current_branch: string | null;
96
+ staged_changes: {
97
+ Added?: string[] | undefined;
98
+ Modified?: string[] | undefined;
99
+ Deleted?: string[] | undefined;
100
+ Renamed?: string[] | undefined;
101
+ Copied?: string[] | undefined;
102
+ TypeChanged?: string[] | undefined;
103
+ };
104
+ unstaged_changes: {
105
+ Added?: string[] | undefined;
106
+ Modified?: string[] | undefined;
107
+ Deleted?: string[] | undefined;
108
+ Renamed?: string[] | undefined;
109
+ Copied?: string[] | undefined;
110
+ TypeChanged?: string[] | undefined;
111
+ };
112
+ untracked_files: string[];
113
+ conflicted_files: string[];
114
+ is_clean: boolean;
115
+ }>>;
24
116
  }, "strip", z.ZodTypeAny, {
25
117
  message: string;
26
118
  success: boolean;
119
+ status?: {
120
+ current_branch: string | null;
121
+ staged_changes: {
122
+ Added?: string[] | undefined;
123
+ Modified?: string[] | undefined;
124
+ Deleted?: string[] | undefined;
125
+ Renamed?: string[] | undefined;
126
+ Copied?: string[] | undefined;
127
+ TypeChanged?: string[] | undefined;
128
+ };
129
+ unstaged_changes: {
130
+ Added?: string[] | undefined;
131
+ Modified?: string[] | undefined;
132
+ Deleted?: string[] | undefined;
133
+ Renamed?: string[] | undefined;
134
+ Copied?: string[] | undefined;
135
+ TypeChanged?: string[] | undefined;
136
+ };
137
+ untracked_files: string[];
138
+ conflicted_files: string[];
139
+ is_clean: boolean;
140
+ } | undefined;
27
141
  changesSummary?: string | undefined;
28
142
  }, {
29
143
  message: string;
30
144
  success: boolean;
145
+ status?: {
146
+ current_branch: string | null;
147
+ staged_changes: {
148
+ Added?: string[] | undefined;
149
+ Modified?: string[] | undefined;
150
+ Deleted?: string[] | undefined;
151
+ Renamed?: string[] | undefined;
152
+ Copied?: string[] | undefined;
153
+ TypeChanged?: string[] | undefined;
154
+ };
155
+ unstaged_changes: {
156
+ Added?: string[] | undefined;
157
+ Modified?: string[] | undefined;
158
+ Deleted?: string[] | undefined;
159
+ Renamed?: string[] | undefined;
160
+ Copied?: string[] | undefined;
161
+ TypeChanged?: string[] | undefined;
162
+ };
163
+ untracked_files: string[];
164
+ conflicted_files: string[];
165
+ is_clean: boolean;
166
+ } | undefined;
31
167
  changesSummary?: string | undefined;
32
168
  }>;
33
169
  export type GitResetInput = z.infer<typeof GitResetInputSchema>;
package/dist/mcp-server/tools/gitReset/logic.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitReset/logic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,yBAAyB,CAAC;AAMjC,eAAO,MAAM,mBAAmB;;;;;;;;;;;;EAU9B,CAAC;AAGH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;EAI/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,CAmCzB"}
1
+ {"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitReset/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,mBAAmB;;;;;;;;;;;;EAU9B,CAAC;AAGH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAO/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,CAqCzB"}
package/dist/mcp-server/tools/gitReset/logic.js CHANGED
@@ -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 GitResetInputSchema = z.object({
@@ -25,6 +26,7 @@ export const GitResetOutputSchema = z.object({
25
26
  success: z.boolean().describe("Indicates if the command was successful."),
26
27
  message: z.string().describe("A summary message of the result."),
27
28
  changesSummary: z.string().optional().describe("Summary of changes, if any."),
29
+ status: GitStatusOutputSchema.optional().describe("The status of the repository after the reset operation."),
28
30
  });
29
31
  /**
30
32
  * 4. IMPLEMENT the core logic function.
@@ -53,6 +55,7 @@ export async function resetGitState(params, context) {
53
55
  const changesSummary = stderr.includes("Unstaged changes after reset")
54
56
  ? stderr
55
57
  : undefined;
56
- return { success: true, message, changesSummary };
58
+ const status = await getGitStatus({ path: targetPath }, context);
59
+ return { success: true, message, changesSummary, status };
57
60
  }
58
61
  //# sourceMappingURL=logic.js.map
package/dist/mcp-server/tools/gitReset/logic.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitReset/logic.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitReset/logic.ts"],"names":[],"mappings":"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"}