@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/gitClean/logic.d.ts CHANGED
@@ -28,16 +28,152 @@ export declare const GitCleanOutputSchema: z.ZodObject<{
28
28
  message: z.ZodString;
29
29
  filesAffected: z.ZodArray<z.ZodString, "many">;
30
30
  dryRun: z.ZodBoolean;
31
+ status: z.ZodOptional<z.ZodObject<{
32
+ current_branch: z.ZodNullable<z.ZodString>;
33
+ staged_changes: z.ZodObject<{
34
+ Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
35
+ Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
36
+ Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
37
+ Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
38
+ Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
39
+ TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
40
+ }, "strip", z.ZodTypeAny, {
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
+ Added?: string[] | undefined;
49
+ Modified?: string[] | undefined;
50
+ Deleted?: string[] | undefined;
51
+ Renamed?: string[] | undefined;
52
+ Copied?: string[] | undefined;
53
+ TypeChanged?: string[] | undefined;
54
+ }>;
55
+ unstaged_changes: z.ZodObject<{
56
+ Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
57
+ Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
58
+ Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
59
+ Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
60
+ Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
61
+ TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
62
+ }, "strip", z.ZodTypeAny, {
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
+ 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
+ untracked_files: z.ZodArray<z.ZodString, "many">;
78
+ conflicted_files: z.ZodArray<z.ZodString, "many">;
79
+ is_clean: z.ZodBoolean;
80
+ }, "strip", z.ZodTypeAny, {
81
+ current_branch: string | null;
82
+ staged_changes: {
83
+ Added?: string[] | undefined;
84
+ Modified?: string[] | undefined;
85
+ Deleted?: string[] | undefined;
86
+ Renamed?: string[] | undefined;
87
+ Copied?: string[] | undefined;
88
+ TypeChanged?: string[] | undefined;
89
+ };
90
+ unstaged_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
+ untracked_files: string[];
99
+ conflicted_files: string[];
100
+ is_clean: boolean;
101
+ }, {
102
+ current_branch: string | null;
103
+ staged_changes: {
104
+ Added?: string[] | undefined;
105
+ Modified?: string[] | undefined;
106
+ Deleted?: string[] | undefined;
107
+ Renamed?: string[] | undefined;
108
+ Copied?: string[] | undefined;
109
+ TypeChanged?: string[] | undefined;
110
+ };
111
+ unstaged_changes: {
112
+ Added?: string[] | undefined;
113
+ Modified?: string[] | undefined;
114
+ Deleted?: string[] | undefined;
115
+ Renamed?: string[] | undefined;
116
+ Copied?: string[] | undefined;
117
+ TypeChanged?: string[] | undefined;
118
+ };
119
+ untracked_files: string[];
120
+ conflicted_files: string[];
121
+ is_clean: boolean;
122
+ }>>;
31
123
  }, "strip", z.ZodTypeAny, {
32
124
  message: string;
33
125
  success: boolean;
34
126
  dryRun: boolean;
35
127
  filesAffected: string[];
128
+ status?: {
129
+ current_branch: string | null;
130
+ staged_changes: {
131
+ Added?: string[] | undefined;
132
+ Modified?: string[] | undefined;
133
+ Deleted?: string[] | undefined;
134
+ Renamed?: string[] | undefined;
135
+ Copied?: string[] | undefined;
136
+ TypeChanged?: string[] | undefined;
137
+ };
138
+ unstaged_changes: {
139
+ Added?: string[] | undefined;
140
+ Modified?: string[] | undefined;
141
+ Deleted?: string[] | undefined;
142
+ Renamed?: string[] | undefined;
143
+ Copied?: string[] | undefined;
144
+ TypeChanged?: string[] | undefined;
145
+ };
146
+ untracked_files: string[];
147
+ conflicted_files: string[];
148
+ is_clean: boolean;
149
+ } | undefined;
36
150
  }, {
37
151
  message: string;
38
152
  success: boolean;
39
153
  dryRun: boolean;
40
154
  filesAffected: string[];
155
+ status?: {
156
+ current_branch: string | null;
157
+ staged_changes: {
158
+ Added?: string[] | undefined;
159
+ Modified?: string[] | undefined;
160
+ Deleted?: string[] | undefined;
161
+ Renamed?: string[] | undefined;
162
+ Copied?: string[] | undefined;
163
+ TypeChanged?: string[] | undefined;
164
+ };
165
+ unstaged_changes: {
166
+ Added?: string[] | undefined;
167
+ Modified?: string[] | undefined;
168
+ Deleted?: string[] | undefined;
169
+ Renamed?: string[] | undefined;
170
+ Copied?: string[] | undefined;
171
+ TypeChanged?: string[] | undefined;
172
+ };
173
+ untracked_files: string[];
174
+ conflicted_files: string[];
175
+ is_clean: boolean;
176
+ } | undefined;
41
177
  }>;
42
178
  export type GitCleanInput = z.infer<typeof GitCleanInputSchema>;
43
179
  export type GitCleanOutput = z.infer<typeof GitCleanOutputSchema>;
package/dist/mcp-server/tools/gitClean/logic.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitClean/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;;;;;;;;;;;;;;;;;;EAwB9B,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,CAwDzB"}
1
+ {"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitClean/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;;;;;;;;;;;;;;;;;;EAwB9B,CAAC;AAGH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAU/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,CAgEzB"}
package/dist/mcp-server/tools/gitClean/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 GitCleanInputSchema = z.object({
@@ -38,6 +39,7 @@ export const GitCleanOutputSchema = z.object({
38
39
  .array(z.string())
39
40
  .describe("A list of files that were or would be affected."),
40
41
  dryRun: z.boolean().describe("Indicates if the operation was a dry run."),
42
+ status: GitStatusOutputSchema.optional().describe("The status of the repository after the clean operation."),
41
43
  });
42
44
  /**
43
45
  * 4. IMPLEMENT the core logic function.
@@ -82,6 +84,13 @@ export async function gitCleanLogic(params, context) {
82
84
  const message = params.dryRun
83
85
  ? `Dry run complete. Files that would be removed: ${filesAffected.length}`
84
86
  : `Clean operation complete. Files removed: ${filesAffected.length}`;
85
- return { success: true, message, filesAffected, dryRun: params.dryRun };
87
+ const status = await getGitStatus({ path: targetPath }, context);
88
+ return {
89
+ success: true,
90
+ message,
91
+ filesAffected,
92
+ dryRun: params.dryRun,
93
+ status,
94
+ };
86
95
  }
87
96
  //# sourceMappingURL=logic.js.map
package/dist/mcp-server/tools/gitClean/logic.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitClean/logic.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitClean/logic.ts"],"names":[],"mappings":"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"}
package/dist/mcp-server/tools/gitCommit/logic.d.ts CHANGED
@@ -50,15 +50,151 @@ export declare const GitCommitOutputSchema: z.ZodObject<{
50
50
  commitHash: z.ZodOptional<z.ZodString>;
51
51
  committedFiles: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
52
52
  nothingToCommit: z.ZodOptional<z.ZodBoolean>;
53
+ status: z.ZodOptional<z.ZodObject<{
54
+ current_branch: z.ZodNullable<z.ZodString>;
55
+ staged_changes: z.ZodObject<{
56
+ Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
57
+ Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
58
+ Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
59
+ Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
60
+ Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
61
+ TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
62
+ }, "strip", z.ZodTypeAny, {
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
+ 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: z.ZodObject<{
78
+ Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
79
+ Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
80
+ Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
81
+ Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
82
+ Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
83
+ TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
84
+ }, "strip", z.ZodTypeAny, {
85
+ Added?: string[] | undefined;
86
+ Modified?: string[] | undefined;
87
+ Deleted?: string[] | undefined;
88
+ Renamed?: string[] | undefined;
89
+ Copied?: string[] | undefined;
90
+ TypeChanged?: string[] | undefined;
91
+ }, {
92
+ Added?: string[] | undefined;
93
+ Modified?: string[] | undefined;
94
+ Deleted?: string[] | undefined;
95
+ Renamed?: string[] | undefined;
96
+ Copied?: string[] | undefined;
97
+ TypeChanged?: string[] | undefined;
98
+ }>;
99
+ untracked_files: z.ZodArray<z.ZodString, "many">;
100
+ conflicted_files: z.ZodArray<z.ZodString, "many">;
101
+ is_clean: z.ZodBoolean;
102
+ }, "strip", z.ZodTypeAny, {
103
+ current_branch: string | null;
104
+ staged_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
+ unstaged_changes: {
113
+ Added?: string[] | undefined;
114
+ Modified?: string[] | undefined;
115
+ Deleted?: string[] | undefined;
116
+ Renamed?: string[] | undefined;
117
+ Copied?: string[] | undefined;
118
+ TypeChanged?: string[] | undefined;
119
+ };
120
+ untracked_files: string[];
121
+ conflicted_files: string[];
122
+ is_clean: boolean;
123
+ }, {
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
+ }>>;
53
145
  }, "strip", z.ZodTypeAny, {
54
146
  message: string;
55
147
  success: boolean;
148
+ status?: {
149
+ current_branch: string | null;
150
+ staged_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
+ unstaged_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
+ untracked_files: string[];
167
+ conflicted_files: string[];
168
+ is_clean: boolean;
169
+ } | undefined;
56
170
  commitHash?: string | undefined;
57
171
  committedFiles?: string[] | undefined;
58
172
  nothingToCommit?: boolean | undefined;
59
173
  }, {
60
174
  message: string;
61
175
  success: boolean;
176
+ status?: {
177
+ current_branch: string | null;
178
+ staged_changes: {
179
+ Added?: string[] | undefined;
180
+ Modified?: string[] | undefined;
181
+ Deleted?: string[] | undefined;
182
+ Renamed?: string[] | undefined;
183
+ Copied?: string[] | undefined;
184
+ TypeChanged?: string[] | undefined;
185
+ };
186
+ unstaged_changes: {
187
+ Added?: string[] | undefined;
188
+ Modified?: string[] | undefined;
189
+ Deleted?: string[] | undefined;
190
+ Renamed?: string[] | undefined;
191
+ Copied?: string[] | undefined;
192
+ TypeChanged?: string[] | undefined;
193
+ };
194
+ untracked_files: string[];
195
+ conflicted_files: string[];
196
+ is_clean: boolean;
197
+ } | undefined;
62
198
  commitHash?: string | undefined;
63
199
  committedFiles?: string[] | undefined;
64
200
  nothingToCommit?: boolean | undefined;
package/dist/mcp-server/tools/gitCommit/logic.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitCommit/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,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyB/B,CAAC;AAGH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;EAYhC,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;AA4CpE;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,cAAc,GAAG;IAAE,mBAAmB,EAAE,MAAM,MAAM,GAAG,SAAS,CAAA;CAAE,GAC1E,OAAO,CAAC,eAAe,CAAC,CA6E1B"}
1
+ {"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitCommit/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,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyB/B,CAAC;AAGH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAehC,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;AA4CpE;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,cAAc,GAAG;IAAE,mBAAmB,EAAE,MAAM,MAAM,GAAG,SAAS,CAAA;CAAE,GAC1E,OAAO,CAAC,eAAe,CAAC,CAgF1B"}
package/dist/mcp-server/tools/gitCommit/logic.js CHANGED
@@ -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 GitCommitInputSchema = z.object({
@@ -47,6 +48,7 @@ export const GitCommitOutputSchema = z.object({
47
48
  .boolean()
48
49
  .optional()
49
50
  .describe("True if there were no changes to commit."),
51
+ status: GitStatusOutputSchema.optional().describe("The status of the repository after the commit."),
50
52
  });
51
53
  async function stageFiles(targetPath, files, context) {
52
54
  const operation = "stageFilesForCommit";
@@ -133,11 +135,13 @@ export async function commitGitChanges(params, context) {
133
135
  const committedFiles = commitHash
134
136
  ? await getCommittedFiles(targetPath, commitHash, context)
135
137
  : [];
138
+ const status = await getGitStatus({ path: targetPath }, context);
136
139
  return {
137
140
  success: true,
138
141
  message: `Commit successful: ${commitHash}`,
139
142
  commitHash,
140
143
  committedFiles,
144
+ status,
141
145
  };
142
146
  }
143
147
  //# sourceMappingURL=logic.js.map
package/dist/mcp-server/tools/gitCommit/logic.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitCommit/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;AAElD,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAE1C,kCAAkC;AAClC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,6BAA6B,CAAC;IACrE,OAAO,EAAE,CAAC;SACP,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,CACP,mEAAmE,CACpE;IACH,MAAM,EAAE,CAAC;SACN,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC;SACvD,QAAQ,EAAE;SACV,QAAQ,CAAC,6BAA6B,CAAC;IAC1C,UAAU,EAAE,CAAC;SACV,OAAO,EAAE;SACT,OAAO,CAAC,KAAK,CAAC;SACd,QAAQ,CAAC,0CAA0C,CAAC;IACvD,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,4BAA4B,CAAC;IACxE,sBAAsB,EAAE,CAAC;SACtB,OAAO,EAAE;SACT,OAAO,CAAC,KAAK,CAAC;SACd,QAAQ,CAAC,2DAA2D,CAAC;IACxE,YAAY,EAAE,CAAC;SACZ,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACxB,QAAQ,EAAE;SACV,QAAQ,CAAC,oDAAoD,CAAC;CAClE,CAAC,CAAC;AAEH,qCAAqC;AACrC,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5C,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,0CAA0C,CAAC;IACzE,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,kCAAkC,CAAC;IAChE,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,6BAA6B,CAAC;IACzE,cAAc,EAAE,CAAC;SACd,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;SACjB,QAAQ,EAAE;SACV,QAAQ,CAAC,yCAAyC,CAAC;IACtD,eAAe,EAAE,CAAC;SACf,OAAO,EAAE;SACT,QAAQ,EAAE;SACV,QAAQ,CAAC,0CAA0C,CAAC;CACxD,CAAC,CAAC;AAMH,KAAK,UAAU,UAAU,CACvB,UAAkB,EAClB,KAAe,EACf,OAAuB;IAEvB,MAAM,SAAS,GAAG,qBAAqB,CAAC;IACxC,MAAM,CAAC,KAAK,CAAC,kBAAkB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;IAC9E,MAAM,cAAc,GAAG,KAAK,CAAC,GAAG,CAC9B,CAAC,IAAI,EAAE,EAAE,CACP,YAAY,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC,aAAa,CACzE,CAAC;IACF,MAAM,aAAa,CAAC,KAAK,EAAE;QACzB,IAAI;QACJ,UAAU;QACV,KAAK;QACL,IAAI;QACJ,GAAG,cAAc;KAClB,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,UAAkB,EAClB,UAAkB,EAClB,OAAuB;IAEvB,MAAM,SAAS,GAAG,mBAAmB,CAAC;IACtC,MAAM,IAAI,GAAG;QACX,IAAI;QACJ,UAAU;QACV,MAAM;QACN,WAAW;QACX,aAAa;QACb,UAAU;KACX,CAAC;IACF,MAAM,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;QACvD,GAAG,OAAO;QACV,SAAS;KACV,CAAC,CAAC;IACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACpD,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AACnD,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,MAAsB,EACtB,OAA2E;IAE3E,MAAM,SAAS,GAAG,kBAAkB,CAAC;IACrC,MAAM,CAAC,KAAK,CAAC,aAAa,SAAS,EAAE,EAAE,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAE/D,MAAM,UAAU,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IACjD,IAAI,MAAM,CAAC,IAAI,KAAK,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACvC,MAAM,IAAI,QAAQ,CAChB,aAAa,CAAC,gBAAgB,EAC9B,+FAA+F,CAChG,CAAC;IACJ,CAAC;IACD,MAAM,UAAU,GAAG,YAAY,CAAC,YAAY,CAC1C,MAAM,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,UAAW,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAC/C,EAAE,aAAa,EAAE,IAAI,EAAE,CACxB,CAAC,aAAa,CAAC;IAEhB,IAAI,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1D,MAAM,UAAU,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,IAAI,GAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAC1C,IAAI,MAAM,CAAC,MAAM;QACf,IAAI,CAAC,IAAI,CACP,IAAI,EACJ,aAAa,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EACjC,IAAI,EACJ,cAAc,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CACpC,CAAC;IACJ,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAC1C,IAAI,MAAM,CAAC,UAAU;QAAE,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAClD,IAAI,MAAM,CAAC,KAAK;QAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAEpD,MAAM,aAAa,GAAG,KAAK,EACzB,WAAoB,EACyB,EAAE;QAC/C,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;QAC5B,IAAI,WAAW;YAAE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,0BAA0B,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;YAC5D,GAAG,OAAO;YACV,SAAS;SACV,CAAC,CAAC;QACH,OAAO,MAAM,aAAa,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC/C,CAAC,CAAC;IAEF,IAAI,MAAM,CAAC;IACX,MAAM,UAAU,GAAG,MAAM,CAAC,cAAc,CAAC;IACzC,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,aAAa,CAAC,UAAU,IAAI,KAAK,CAAC,CAAC;IACpD,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,MAAM,MAAM,GACV,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,QAAQ,IAAI,KAAK;YACrD,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;YACtB,CAAC,CAAC,EAAE,CAAC;QACT,MAAM,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;QAC7D,IAAI,UAAU,IAAI,cAAc,IAAI,MAAM,CAAC,sBAAsB,EAAE,CAAC;YAClE,MAAM,CAAC,OAAO,CACZ,yDAAyD,EACzD,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,CAC1B,CAAC;YACF,MAAM,GAAG,MAAM,aAAa,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAChE,MAAM,UAAU,GAAG,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACpE,MAAM,cAAc,GAAG,UAAU;QAC/B,CAAC,CAAC,MAAM,iBAAiB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC;QAC1D,CAAC,CAAC,EAAE,CAAC;IAEP,OAAO;QACL,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,sBAAsB,UAAU,EAAE;QAC3C,UAAU;QACV,cAAc;KACf,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitCommit/logic.ts"],"names":[],"mappings":"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"}
package/dist/mcp-server/tools/gitMerge/logic.d.ts CHANGED
@@ -33,10 +33,124 @@ export declare const GitMergeOutputSchema: z.ZodObject<{
33
33
  fastForward: z.ZodOptional<z.ZodBoolean>;
34
34
  aborted: z.ZodOptional<z.ZodBoolean>;
35
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
+ }>>;
36
128
  }, "strip", z.ZodTypeAny, {
37
129
  message: string;
38
130
  success: boolean;
39
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;
40
154
  conflict?: boolean | undefined;
41
155
  fastForward?: boolean | undefined;
42
156
  needsManualCommit?: boolean | undefined;
@@ -44,6 +158,28 @@ export declare const GitMergeOutputSchema: z.ZodObject<{
44
158
  message: string;
45
159
  success: boolean;
46
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;
47
183
  conflict?: boolean | undefined;
48
184
  fastForward?: boolean | undefined;
49
185
  needsManualCommit?: boolean | undefined;
package/dist/mcp-server/tools/gitMerge/logic.d.ts.map CHANGED
@@ -1 +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;AAOjC,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;EAwB9B,CAAC;AAGH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;EAgB/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,CAkEzB"}
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"}
package/dist/mcp-server/tools/gitMerge/logic.js CHANGED
@@ -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 GitMergeInputSchema = z.object({
@@ -50,6 +51,7 @@ export const GitMergeOutputSchema = z.object({
50
51
  .boolean()
51
52
  .optional()
52
53
  .describe("True if --squash was used."),
54
+ status: GitStatusOutputSchema.optional().describe("The status of the repository after the merge operation."),
53
55
  });
54
56
  /**
55
57
  * 4. IMPLEMENT the core logic function.
@@ -106,12 +108,14 @@ export async function gitMergeLogic(params, context) {
106
108
  throw error;
107
109
  }
108
110
  }
111
+ const status = await getGitStatus({ path: targetPath }, context);
109
112
  return {
110
113
  success: true,
111
114
  message: stdout.trim() || "Merge command executed successfully.",
112
115
  fastForward: stdout.includes("Fast-forward"),
113
116
  needsManualCommit: params.squash,
114
117
  aborted: params.abort,
118
+ status,
115
119
  };
116
120
  }
117
121
  //# sourceMappingURL=logic.js.map
package/dist/mcp-server/tools/gitMerge/logic.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitMerge/logic.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitMerge/logic.ts"],"names":[],"mappings":"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"}