@cyanheads/git-mcp-server 2.2.4 → 2.3.2

package/dist/mcp-server/tools/gitRebase/logic.d.ts

@@ -0,0 +1,242 @@
+/**
+ * @fileoverview Defines the core logic, schemas, and types for the git_rebase tool.
+ * @module src/mcp-server/tools/gitRebase/logic
+ */
+import { z } from "zod";
+import { type RequestContext } from "../../../utils/index.js";
+export declare const GitRebaseBaseSchema: z.ZodObject<{
+    path: z.ZodDefault<z.ZodString>;
+    mode: z.ZodDefault<z.ZodEnum<["start", "continue", "abort", "skip"]>>;
+    upstream: z.ZodOptional<z.ZodString>;
+    branch: z.ZodOptional<z.ZodString>;
+    interactive: z.ZodDefault<z.ZodBoolean>;
+    strategy: z.ZodOptional<z.ZodEnum<["recursive", "resolve", "ours", "theirs", "octopus", "subtree"]>>;
+    strategyOption: z.ZodOptional<z.ZodString>;
+    onto: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    path: string;
+    mode: "abort" | "start" | "continue" | "skip";
+    interactive: boolean;
+    branch?: string | undefined;
+    strategy?: "recursive" | "resolve" | "ours" | "theirs" | "octopus" | "subtree" | undefined;
+    upstream?: string | undefined;
+    strategyOption?: string | undefined;
+    onto?: string | undefined;
+}, {
+    path?: string | undefined;
+    mode?: "abort" | "start" | "continue" | "skip" | undefined;
+    branch?: string | undefined;
+    strategy?: "recursive" | "resolve" | "ours" | "theirs" | "octopus" | "subtree" | undefined;
+    upstream?: string | undefined;
+    interactive?: boolean | undefined;
+    strategyOption?: string | undefined;
+    onto?: string | undefined;
+}>;
+export declare const GitRebaseInputSchema: z.ZodEffects<z.ZodObject<{
+    path: z.ZodDefault<z.ZodString>;
+    mode: z.ZodDefault<z.ZodEnum<["start", "continue", "abort", "skip"]>>;
+    upstream: z.ZodOptional<z.ZodString>;
+    branch: z.ZodOptional<z.ZodString>;
+    interactive: z.ZodDefault<z.ZodBoolean>;
+    strategy: z.ZodOptional<z.ZodEnum<["recursive", "resolve", "ours", "theirs", "octopus", "subtree"]>>;
+    strategyOption: z.ZodOptional<z.ZodString>;
+    onto: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    path: string;
+    mode: "abort" | "start" | "continue" | "skip";
+    interactive: boolean;
+    branch?: string | undefined;
+    strategy?: "recursive" | "resolve" | "ours" | "theirs" | "octopus" | "subtree" | undefined;
+    upstream?: string | undefined;
+    strategyOption?: string | undefined;
+    onto?: string | undefined;
+}, {
+    path?: string | undefined;
+    mode?: "abort" | "start" | "continue" | "skip" | undefined;
+    branch?: string | undefined;
+    strategy?: "recursive" | "resolve" | "ours" | "theirs" | "octopus" | "subtree" | undefined;
+    upstream?: string | undefined;
+    interactive?: boolean | undefined;
+    strategyOption?: string | undefined;
+    onto?: string | undefined;
+}>, {
+    path: string;
+    mode: "abort" | "start" | "continue" | "skip";
+    interactive: boolean;
+    branch?: string | undefined;
+    strategy?: "recursive" | "resolve" | "ours" | "theirs" | "octopus" | "subtree" | undefined;
+    upstream?: string | undefined;
+    strategyOption?: string | undefined;
+    onto?: string | undefined;
+}, {
+    path?: string | undefined;
+    mode?: "abort" | "start" | "continue" | "skip" | undefined;
+    branch?: string | undefined;
+    strategy?: "recursive" | "resolve" | "ours" | "theirs" | "octopus" | "subtree" | undefined;
+    upstream?: string | undefined;
+    interactive?: boolean | undefined;
+    strategyOption?: string | undefined;
+    onto?: string | undefined;
+}>;
+export declare const GitRebaseOutputSchema: z.ZodObject<{
+    success: z.ZodBoolean;
+    message: z.ZodString;
+    rebaseCompleted: z.ZodOptional<z.ZodBoolean>;
+    needsManualAction: z.ZodOptional<z.ZodBoolean>;
+    status: z.ZodOptional<z.ZodObject<{
+        current_branch: z.ZodNullable<z.ZodString>;
+        staged_changes: z.ZodObject<{
+            Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        }, "strip", z.ZodTypeAny, {
+            Added?: string[] | undefined;
+            Modified?: string[] | undefined;
+            Deleted?: string[] | undefined;
+            Renamed?: string[] | undefined;
+            Copied?: string[] | undefined;
+            TypeChanged?: string[] | undefined;
+        }, {
+            Added?: string[] | undefined;
+            Modified?: string[] | undefined;
+            Deleted?: string[] | undefined;
+            Renamed?: string[] | undefined;
+            Copied?: string[] | undefined;
+            TypeChanged?: string[] | undefined;
+        }>;
+        unstaged_changes: z.ZodObject<{
+            Added: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            Modified: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            Deleted: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            Renamed: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            Copied: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            TypeChanged: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        }, "strip", z.ZodTypeAny, {
+            Added?: string[] | undefined;
+            Modified?: string[] | undefined;
+            Deleted?: string[] | undefined;
+            Renamed?: string[] | undefined;
+            Copied?: string[] | undefined;
+            TypeChanged?: string[] | undefined;
+        }, {
+            Added?: string[] | undefined;
+            Modified?: string[] | undefined;
+            Deleted?: string[] | undefined;
+            Renamed?: string[] | undefined;
+            Copied?: string[] | undefined;
+            TypeChanged?: string[] | undefined;
+        }>;
+        untracked_files: z.ZodArray<z.ZodString, "many">;
+        conflicted_files: z.ZodArray<z.ZodString, "many">;
+        is_clean: z.ZodBoolean;
+    }, "strip", z.ZodTypeAny, {
+        current_branch: string | null;
+        staged_changes: {
+            Added?: string[] | undefined;
+            Modified?: string[] | undefined;
+            Deleted?: string[] | undefined;
+            Renamed?: string[] | undefined;
+            Copied?: string[] | undefined;
+            TypeChanged?: string[] | undefined;
+        };
+        unstaged_changes: {
+            Added?: string[] | undefined;
+            Modified?: string[] | undefined;
+            Deleted?: string[] | undefined;
+            Renamed?: string[] | undefined;
+            Copied?: string[] | undefined;
+            TypeChanged?: string[] | undefined;
+        };
+        untracked_files: string[];
+        conflicted_files: string[];
+        is_clean: boolean;
+    }, {
+        current_branch: string | null;
+        staged_changes: {
+            Added?: string[] | undefined;
+            Modified?: string[] | undefined;
+            Deleted?: string[] | undefined;
+            Renamed?: string[] | undefined;
+            Copied?: string[] | undefined;
+            TypeChanged?: string[] | undefined;
+        };
+        unstaged_changes: {
+            Added?: string[] | undefined;
+            Modified?: string[] | undefined;
+            Deleted?: string[] | undefined;
+            Renamed?: string[] | undefined;
+            Copied?: string[] | undefined;
+            TypeChanged?: string[] | undefined;
+        };
+        untracked_files: string[];
+        conflicted_files: string[];
+        is_clean: boolean;
+    }>>;
+}, "strip", z.ZodTypeAny, {
+    message: string;
+    success: boolean;
+    status?: {
+        current_branch: string | null;
+        staged_changes: {
+            Added?: string[] | undefined;
+            Modified?: string[] | undefined;
+            Deleted?: string[] | undefined;
+            Renamed?: string[] | undefined;
+            Copied?: string[] | undefined;
+            TypeChanged?: string[] | undefined;
+        };
+        unstaged_changes: {
+            Added?: string[] | undefined;
+            Modified?: string[] | undefined;
+            Deleted?: string[] | undefined;
+            Renamed?: string[] | undefined;
+            Copied?: string[] | undefined;
+            TypeChanged?: string[] | undefined;
+        };
+        untracked_files: string[];
+        conflicted_files: string[];
+        is_clean: boolean;
+    } | undefined;
+    rebaseCompleted?: boolean | undefined;
+    needsManualAction?: boolean | undefined;
+}, {
+    message: string;
+    success: boolean;
+    status?: {
+        current_branch: string | null;
+        staged_changes: {
+            Added?: string[] | undefined;
+            Modified?: string[] | undefined;
+            Deleted?: string[] | undefined;
+            Renamed?: string[] | undefined;
+            Copied?: string[] | undefined;
+            TypeChanged?: string[] | undefined;
+        };
+        unstaged_changes: {
+            Added?: string[] | undefined;
+            Modified?: string[] | undefined;
+            Deleted?: string[] | undefined;
+            Renamed?: string[] | undefined;
+            Copied?: string[] | undefined;
+            TypeChanged?: string[] | undefined;
+        };
+        untracked_files: string[];
+        conflicted_files: string[];
+        is_clean: boolean;
+    } | undefined;
+    rebaseCompleted?: boolean | undefined;
+    needsManualAction?: boolean | undefined;
+}>;
+export type GitRebaseInput = z.infer<typeof GitRebaseInputSchema>;
+export type GitRebaseOutput = z.infer<typeof GitRebaseOutputSchema>;
+/**
+ * 4. IMPLEMENT the core logic function.
+ * @throws {McpError} If the logic encounters an unrecoverable issue.
+ */
+export declare function gitRebaseLogic(params: GitRebaseInput, context: RequestContext & {
+    getWorkingDirectory: () => string | undefined;
+}): Promise<GitRebaseOutput>;
+//# sourceMappingURL=logic.d.ts.map

package/dist/mcp-server/tools/gitRebase/logic.d.ts.map

@@ -0,0 +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

@@ -5,19 +5,40 @@
 import { execFile } from "child_process";
 import { promisify } from "util";
 import { z } from "zod";
-import { logger, sanitization } from "../../../utils/index.js";
+import { logger, sanitization, } from "../../../utils/index.js";
 import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
+import { getGitStatus, GitStatusOutputSchema } from "../gitStatus/logic.js";
 const execFileAsync = promisify(execFile);
 // 1. DEFINE the Zod input schema.
 export const GitRebaseBaseSchema = z.object({
     path: z.string().default(".").describe("Path to the local Git repository."),
-    mode: z.enum(["start", "continue", "abort", "skip"]).default("start").describe("Rebase operation mode."),
-    upstream: z.string().min(1).optional().describe("The upstream branch or commit to rebase onto."),
+    mode: z
+        .enum(["start", "continue", "abort", "skip"])
+        .default("start")
+        .describe("Rebase operation mode."),
+    upstream: z
+        .string()
+        .min(1)
+        .optional()
+        .describe("The upstream branch or commit to rebase onto."),
     branch: z.string().min(1).optional().describe("The branch to rebase."),
-    interactive: z.boolean().default(false).describe("Perform an interactive rebase."),
-    strategy: z.enum(["recursive", "resolve", "ours", "theirs", "octopus", "subtree"]).optional().describe("The merge strategy to use."),
-    strategyOption: z.string().optional().describe("Pass a specific option to the merge strategy."),
-    onto: z.string().min(1).optional().describe("Rebase onto a specific commit/branch instead of the upstream's base."),
+    interactive: z
+        .boolean()
+        .default(false)
+        .describe("Perform an interactive rebase."),
+    strategy: z
+        .enum(["recursive", "resolve", "ours", "theirs", "octopus", "subtree"])
+        .optional()
+        .describe("The merge strategy to use."),
+    strategyOption: z
+        .string()
+        .optional()
+        .describe("Pass a specific option to the merge strategy."),
+    onto: z
+        .string()
+        .min(1)
+        .optional()
+        .describe("Rebase onto a specific commit/branch instead of the upstream's base."),
 });
 export const GitRebaseInputSchema = GitRebaseBaseSchema.refine((data) => !(data.mode === "start" && !data.interactive && !data.upstream), {
     message: "An 'upstream' branch/commit is required for 'start' mode unless 'interactive' is true.",
@@ -27,8 +48,15 @@ export const GitRebaseInputSchema = GitRebaseBaseSchema.refine((data) => !(data.
 export const GitRebaseOutputSchema = z.object({
     success: z.boolean().describe("Indicates if the command was successful."),
     message: z.string().describe("A summary message of the result."),
-    rebaseCompleted: z.boolean().optional().describe("True if the rebase finished successfully."),
-    needsManualAction: z.boolean().optional().describe("True if conflicts or interactive steps require user input."),
+    rebaseCompleted: z
+        .boolean()
+        .optional()
+        .describe("True if the rebase finished successfully."),
+    needsManualAction: z
+        .boolean()
+        .optional()
+        .describe("True if conflicts or interactive steps require user input."),
+    status: GitStatusOutputSchema.optional().describe("The status of the repository after the rebase operation."),
 });
 /**
  * 4. IMPLEMENT the core logic function.
@@ -62,13 +90,19 @@ export async function gitRebaseLogic(params, context) {
             args.push(`--${params.mode}`);
             break;
     }
-    logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
+    logger.debug(`Executing command: git ${args.join(" ")}`, {
+        ...context,
+        operation,
+    });
     const { stdout, stderr } = await execFileAsync("git", args);
     const output = stdout + stderr;
+    const status = await getGitStatus({ path: targetPath }, context);
     return {
         success: true,
         message: `Rebase ${params.mode} executed successfully.`,
         rebaseCompleted: /successfully rebased/i.test(output),
         needsManualAction: /conflict|stopped at|edit/i.test(output),
+        status,
     };
 }
+//# sourceMappingURL=logic.js.map

package/dist/mcp-server/tools/gitRebase/logic.js.map

@@ -0,0 +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/gitRebase/registration.d.ts

@@ -0,0 +1,16 @@
+/**
+ * @fileoverview Handles registration and error handling for the git_rebase tool.
+ * @module src/mcp-server/tools/gitRebase/registration
+ */
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { RequestContext } from "../../../utils/index.js";
+export type GetWorkingDirectoryFn = (sessionId: string | undefined) => string | undefined;
+export type GetSessionIdFn = (context: RequestContext) => string | undefined;
+/**
+ * Registers the git_rebase tool with the MCP server instance.
+ * @param server The MCP server instance.
+ * @param getWorkingDirectory Function to get the session's working directory.
+ * @param getSessionId Function to get the session ID from context.
+ */
+export declare const registerGitRebaseTool: (server: McpServer, getWorkingDirectory: GetWorkingDirectoryFn, getSessionId: GetSessionIdFn) => Promise<void>;
+//# sourceMappingURL=registration.d.ts.map

package/dist/mcp-server/tools/gitRebase/registration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"registration.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitRebase/registration.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAGL,cAAc,EAEf,MAAM,yBAAyB,CAAC;AASjC,MAAM,MAAM,qBAAqB,GAAG,CAClC,SAAS,EAAE,MAAM,GAAG,SAAS,KAC1B,MAAM,GAAG,SAAS,CAAC;AACxB,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,cAAc,KAAK,MAAM,GAAG,SAAS,CAAC;AAM7E;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAChC,QAAQ,SAAS,EACjB,qBAAqB,qBAAqB,EAC1C,cAAc,cAAc,KAC3B,OAAO,CAAC,IAAI,CAgEd,CAAC"}

package/dist/mcp-server/tools/gitRebase/registration.js

@@ -2,7 +2,7 @@
  * @fileoverview Handles registration and error handling for the git_rebase tool.
  * @module src/mcp-server/tools/gitRebase/registration
  */
-import { ErrorHandler, logger, requestContextService } from "../../../utils/index.js";
+import { ErrorHandler, logger, requestContextService, } from "../../../utils/index.js";
 import { gitRebaseLogic, GitRebaseOutputSchema, GitRebaseBaseSchema, } from "./logic.js";
 const TOOL_NAME = "git_rebase";
 const TOOL_DESCRIPTION = "Reapplies commits on top of another base tip. Supports starting a rebase (standard or interactive), continuing, aborting, or skipping steps in an ongoing rebase. Returns results as a JSON object.";
@@ -39,11 +39,19 @@ export const registerGitRebaseTool = async (server, getWorkingDirectory, getSess
             });
             return {
                 structuredContent: result,
-                content: [{ type: "text", text: `Success: ${JSON.stringify(result, null, 2)}` }],
+                content: [
+                    {
+                        type: "text",
+                        text: `Success: ${JSON.stringify(result, null, 2)}`,
+                    },
+                ],
             };
         }
         catch (error) {
-            logger.error(`Error in ${TOOL_NAME} handler`, { error, ...handlerContext });
+            logger.error(`Error in ${TOOL_NAME} handler`, {
+                error,
+                ...handlerContext,
+            });
             const mcpError = ErrorHandler.handleError(error, {
                 operation: `tool:${TOOL_NAME}`,
                 context: handlerContext,
@@ -62,3 +70,4 @@ export const registerGitRebaseTool = async (server, getWorkingDirectory, getSess
     });
     logger.info(`Tool '${TOOL_NAME}' registered successfully.`, context);
 };
+//# sourceMappingURL=registration.js.map

package/dist/mcp-server/tools/gitRebase/registration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"registration.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitRebase/registration.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACL,YAAY,EACZ,MAAM,EAEN,qBAAqB,GACtB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACL,cAAc,EAEd,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,YAAY,CAAC;AAOpB,MAAM,SAAS,GAAG,YAAY,CAAC;AAC/B,MAAM,gBAAgB,GACpB,qMAAqM,CAAC;AAExM;;;;;GAKG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EACxC,MAAiB,EACjB,mBAA0C,EAC1C,YAA4B,EACb,EAAE;IACjB,MAAM,SAAS,GAAG,uBAAuB,CAAC;IAC1C,MAAM,OAAO,GAAG,qBAAqB,CAAC,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAE1E,MAAM,CAAC,YAAY,CACjB,SAAS,EACT;QACE,KAAK,EAAE,YAAY;QACnB,WAAW,EAAE,gBAAgB;QAC7B,WAAW,EAAE,mBAAmB,CAAC,KAAK;QACtC,YAAY,EAAE,qBAAqB,CAAC,KAAK;QACzC,WAAW,EAAE;YACX,YAAY,EAAE,KAAK;YACnB,eAAe,EAAE,IAAI,EAAE,+BAA+B;YACtD,cAAc,EAAE,KAAK;YACrB,aAAa,EAAE,KAAK;SACrB;KACF,EACD,KAAK,EAAE,MAAsB,EAAE,WAAoC,EAAE,EAAE;QACrE,MAAM,cAAc,GAAG,qBAAqB,CAAC,oBAAoB,CAAC;YAChE,QAAQ,EAAE,SAAS;YACnB,aAAa,EAAE,WAAW;SAC3B,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC;YAC/C,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,MAAM,EAAE;gBAC1C,GAAG,cAAc;gBACjB,mBAAmB,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC;aAC1D,CAAC,CAAC;YAEH,OAAO;gBACL,iBAAiB,EAAE,MAAM;gBACzB,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,YAAY,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE;qBACpD;iBACF;aACF,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,YAAY,SAAS,UAAU,EAAE;gBAC5C,KAAK;gBACL,GAAG,cAAc;aAClB,CAAC,CAAC;YACH,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE;gBAC/C,SAAS,EAAE,QAAQ,SAAS,EAAE;gBAC9B,OAAO,EAAE,cAAc;gBACvB,KAAK,EAAE,MAAM;aACd,CAAa,CAAC;YAEf,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;gBAC/D,iBAAiB,EAAE;oBACjB,IAAI,EAAE,QAAQ,CAAC,IAAI;oBACnB,OAAO,EAAE,QAAQ,CAAC,OAAO;oBACzB,OAAO,EAAE,QAAQ,CAAC,OAAO;iBAC1B;aACF,CAAC;QACJ,CAAC;IACH,CAAC,CACF,CAAC;IACF,MAAM,CAAC,IAAI,CAAC,SAAS,SAAS,4BAA4B,EAAE,OAAO,CAAC,CAAC;AACvE,CAAC,CAAC"}

package/dist/mcp-server/tools/gitRemote/index.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @fileoverview Barrel file for the gitRemote tool.
+ * @module src/mcp-server/tools/gitRemote/index
+ */
+export { registerGitRemoteTool } from "./registration.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/mcp-server/tools/gitRemote/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitRemote/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC"}

package/dist/mcp-server/tools/gitRemote/index.js

@@ -3,3 +3,4 @@
  * @module src/mcp-server/tools/gitRemote/index
  */
 export { registerGitRemoteTool } from "./registration.js";
+//# sourceMappingURL=index.js.map

package/dist/mcp-server/tools/gitRemote/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitRemote/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC"}

package/dist/mcp-server/tools/gitRemote/logic.d.ts

@@ -0,0 +1,107 @@
+/**
+ * @fileoverview Defines the core logic, schemas, and types for the git_remote tool.
+ * @module src/mcp-server/tools/gitRemote/logic
+ */
+import { z } from "zod";
+import { type RequestContext } from "../../../utils/index.js";
+export declare const GitRemoteBaseSchema: z.ZodObject<{
+    path: z.ZodDefault<z.ZodString>;
+    mode: z.ZodEnum<["list", "add", "remove", "show"]>;
+    name: z.ZodOptional<z.ZodString>;
+    url: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    path: string;
+    mode: "add" | "list" | "show" | "remove";
+    url?: string | undefined;
+    name?: string | undefined;
+}, {
+    mode: "add" | "list" | "show" | "remove";
+    path?: string | undefined;
+    url?: string | undefined;
+    name?: string | undefined;
+}>;
+export declare const GitRemoteInputSchema: z.ZodEffects<z.ZodEffects<z.ZodObject<{
+    path: z.ZodDefault<z.ZodString>;
+    mode: z.ZodEnum<["list", "add", "remove", "show"]>;
+    name: z.ZodOptional<z.ZodString>;
+    url: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    path: string;
+    mode: "add" | "list" | "show" | "remove";
+    url?: string | undefined;
+    name?: string | undefined;
+}, {
+    mode: "add" | "list" | "show" | "remove";
+    path?: string | undefined;
+    url?: string | undefined;
+    name?: string | undefined;
+}>, {
+    path: string;
+    mode: "add" | "list" | "show" | "remove";
+    url?: string | undefined;
+    name?: string | undefined;
+}, {
+    mode: "add" | "list" | "show" | "remove";
+    path?: string | undefined;
+    url?: string | undefined;
+    name?: string | undefined;
+}>, {
+    path: string;
+    mode: "add" | "list" | "show" | "remove";
+    url?: string | undefined;
+    name?: string | undefined;
+}, {
+    mode: "add" | "list" | "show" | "remove";
+    path?: string | undefined;
+    url?: string | undefined;
+    name?: string | undefined;
+}>;
+export declare const GitRemoteOutputSchema: z.ZodObject<{
+    success: z.ZodBoolean;
+    mode: z.ZodString;
+    message: z.ZodOptional<z.ZodString>;
+    remotes: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        name: z.ZodString;
+        fetchUrl: z.ZodString;
+        pushUrl: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        name: string;
+        fetchUrl: string;
+        pushUrl: string;
+    }, {
+        name: string;
+        fetchUrl: string;
+        pushUrl: string;
+    }>, "many">>;
+    details: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    success: boolean;
+    mode: string;
+    message?: string | undefined;
+    details?: string | undefined;
+    remotes?: {
+        name: string;
+        fetchUrl: string;
+        pushUrl: string;
+    }[] | undefined;
+}, {
+    success: boolean;
+    mode: string;
+    message?: string | undefined;
+    details?: string | undefined;
+    remotes?: {
+        name: string;
+        fetchUrl: string;
+        pushUrl: string;
+    }[] | undefined;
+}>;
+export type GitRemoteInput = z.infer<typeof GitRemoteInputSchema>;
+export type GitRemoteOutput = z.infer<typeof GitRemoteOutputSchema>;
+/**
+ * 4. IMPLEMENT the core logic function.
+ * @throws {McpError} If the logic encounters an unrecoverable issue.
+ */
+export declare function gitRemoteLogic(params: GitRemoteInput, context: RequestContext & {
+    getWorkingDirectory: () => string | undefined;
+}): Promise<GitRemoteOutput>;
+//# sourceMappingURL=logic.d.ts.map

package/dist/mcp-server/tools/gitRemote/logic.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/tools/gitRemote/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;;;;;;;;;;;;;;;EAQ9B,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAYhC,CAAC;AASF,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAShC,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,CA8E1B"}

package/dist/mcp-server/tools/gitRemote/logic.js

@@ -5,20 +5,23 @@
 import { execFile } from "child_process";
 import { promisify } from "util";
 import { z } from "zod";
-import { logger, sanitization } from "../../../utils/index.js";
+import { logger, sanitization, } from "../../../utils/index.js";
 import { McpError, BaseErrorCode } from "../../../types-global/errors.js";
 const execFileAsync = promisify(execFile);
 // 1. DEFINE the Zod input schema.
 export const GitRemoteBaseSchema = z.object({
     path: z.string().default(".").describe("Path to the Git repository."),
     mode: z.enum(["list", "add", "remove", "show"]).describe("Operation mode."),
-    name: z.string().optional().describe("Remote name (required for 'add', 'remove', 'show')."),
+    name: z
+        .string()
+        .optional()
+        .describe("Remote name (required for 'add', 'remove', 'show')."),
     url: z.string().optional().describe("Remote URL (required for 'add')."),
 });
-export const GitRemoteInputSchema = GitRemoteBaseSchema.refine(data => !(data.mode === 'add' && (!data.name || !data.url)), {
+export const GitRemoteInputSchema = GitRemoteBaseSchema.refine((data) => !(data.mode === "add" && (!data.name || !data.url)), {
     message: "Remote 'name' and 'url' are required for 'add' mode.",
     path: ["name", "url"],
-}).refine(data => !((data.mode === 'remove' || data.mode === 'show') && !data.name), {
+}).refine((data) => !((data.mode === "remove" || data.mode === "show") && !data.name), {
     message: "Remote 'name' is required for 'remove' or 'show' mode.",
     path: ["name"],
 });
@@ -32,7 +35,10 @@ export const GitRemoteOutputSchema = z.object({
     success: z.boolean().describe("Indicates if the command was successful."),
     mode: z.string().describe("The mode of operation that was performed."),
     message: z.string().optional().describe("A summary message of the result."),
-    remotes: z.array(RemoteInfoSchema).optional().describe("A list of remotes for the 'list' mode."),
+    remotes: z
+        .array(RemoteInfoSchema)
+        .optional()
+        .describe("A list of remotes for the 'list' mode."),
     details: z.string().optional().describe("Details for the 'show' mode."),
 });
 /**
@@ -62,28 +68,48 @@ export async function gitRemoteLogic(params, context) {
             args.push("show", params.name);
             break;
     }
-    logger.debug(`Executing command: git ${args.join(" ")}`, { ...context, operation });
+    logger.debug(`Executing command: git ${args.join(" ")}`, {
+        ...context,
+        operation,
+    });
     const { stdout } = await execFileAsync("git", args);
-    if (params.mode === 'list') {
+    if (params.mode === "list") {
         const remoteMap = new Map();
-        stdout.trim().split("\n").forEach(line => {
+        stdout
+            .trim()
+            .split("\n")
+            .forEach((line) => {
             const parts = line.split(/\s+/);
             if (parts.length < 3)
                 return;
-            const [name, url, type] = parts;
-            const cleanType = type.replace(/[()]/g, "");
-            if (!remoteMap.has(name))
-                remoteMap.set(name, {});
-            if (cleanType === 'fetch')
-                remoteMap.get(name).fetchUrl = url;
-            if (cleanType === 'push')
-                remoteMap.get(name).pushUrl = url;
+            const name = parts[0];
+            const url = parts[1];
+            const type = parts[2];
+            if (name && url && type) {
+                const cleanType = type.replace(/[()]/g, "");
+                if (!remoteMap.has(name))
+                    remoteMap.set(name, {});
+                const remote = remoteMap.get(name);
+                if (cleanType === "fetch")
+                    remote.fetchUrl = url;
+                if (cleanType === "push")
+                    remote.pushUrl = url;
+            }
         });
-        const remotes = Array.from(remoteMap.entries()).map(([name, urls]) => ({ name, fetchUrl: urls.fetchUrl || 'N/A', pushUrl: urls.pushUrl || urls.fetchUrl || 'N/A' }));
+        const remotes = Array.from(remoteMap.entries()).map(([name, urls]) => ({
+            name,
+            fetchUrl: urls.fetchUrl || "N/A",
+            pushUrl: urls.pushUrl || urls.fetchUrl || "N/A",
+        }));
         return { success: true, mode: params.mode, remotes };
     }
-    if (params.mode === 'show') {
+    if (params.mode === "show") {
         return { success: true, mode: params.mode, details: stdout.trim() };
     }
-    return { success: true, mode: params.mode, message: `Remote '${params.name}' ${params.mode === 'add' ? 'added' : 'removed'} successfully.` };
+    return {
+        success: true,
+        mode: params.mode,
+        message: `Remote '${params.name}' ${params.mode === "add" ? "added" : "removed"} successfully.`,
+    };
 }
+//# sourceMappingURL=logic.js.map