@cyanheads/git-mcp-server 2.0.2 → 2.0.4

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

@@ -1,14 +1,17 @@
-import { z } from 'zod';
-import { promisify } from 'util';
 import { exec } from 'child_process';
-import { logger } from '../../../utils/logger.js';
-import { McpError, BaseErrorCode } from '../../../types-global/errors.js';
-import { sanitization } from '../../../utils/sanitization.js';
+import { promisify } from 'util';
+import { z } from 'zod';
+// Import utils from barrel (logger from ../utils/internal/logger.js)
+import { logger } from '../../../utils/index.js';
+// Import utils from barrel (RequestContext from ../utils/internal/requestContext.js)
+import { BaseErrorCode, McpError } from '../../../types-global/errors.js'; // Keep direct import for types-global
+// Import utils from barrel (sanitization from ../utils/security/sanitization.js)
 import path from 'path'; // Import path module
+import { sanitization } from '../../../utils/index.js';
 const execAsync = promisify(exec);
 // Define the input schema for the git_merge tool
 export const GitMergeInputSchema = z.object({
-    path: z.string().min(1).optional().default('.').describe("Path to the Git repository. Defaults to the session's working directory if set."),
+    path: z.string().min(1).optional().default('.').describe("Path to the Git repository. Defaults to the directory set via `git_set_working_dir` for the session; set 'git_set_working_dir' if not set."),
     branch: z.string().min(1).describe('The name of the branch to merge into the current branch.'),
     commitMessage: z.string().optional().describe('Commit message to use for the merge commit (if required, e.g., not fast-forward).'),
     noFf: z.boolean().default(false).describe('Create a merge commit even when the merge resolves as a fast-forward (`--no-ff`).'),

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

@@ -1,8 +1,11 @@
-import { logger } from '../../../utils/logger.js';
-import { ErrorHandler } from '../../../utils/errorHandler.js';
-import { requestContextService } from '../../../utils/requestContext.js';
-import { gitMergeLogic, GitMergeInputSchema } from './logic.js';
-import { BaseErrorCode } from '../../../types-global/errors.js';
+// Import utils from barrel (logger from ../utils/internal/logger.js)
+import { logger } from '../../../utils/index.js';
+// Import utils from barrel (ErrorHandler from ../utils/internal/errorHandler.js)
+import { ErrorHandler } from '../../../utils/index.js';
+// Import utils from barrel (requestContextService from ../utils/internal/requestContext.js)
+import { BaseErrorCode } from '../../../types-global/errors.js'; // Keep direct import for types-global
+import { requestContextService } from '../../../utils/index.js';
+import { GitMergeInputSchema, gitMergeLogic } from './logic.js';
 let _getWorkingDirectory;
 let _getSessionId;
 /**

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

@@ -1,15 +1,18 @@
-import { z } from 'zod';
-import { promisify } from 'util';
 import { exec } from 'child_process';
-import { logger } from '../../../utils/logger.js';
-import { McpError, BaseErrorCode } from '../../../types-global/errors.js';
-import { sanitization } from '../../../utils/sanitization.js';
+import { promisify } from 'util';
+import { z } from 'zod';
+// Import utils from barrel (logger from ../utils/internal/logger.js)
+import { logger } from '../../../utils/index.js';
+// Import utils from barrel (RequestContext from ../utils/internal/requestContext.js)
+import { BaseErrorCode, McpError } from '../../../types-global/errors.js'; // Keep direct import for types-global
+// Import utils from barrel (sanitization from ../utils/security/sanitization.js)
+import { sanitization } from '../../../utils/index.js';
 const execAsync = promisify(exec);
 // Define the input schema for the git_pull tool using Zod
 export const GitPullInputSchema = z.object({
-    path: z.string().min(1).optional().default('.').describe("Path to the Git repository. Defaults to the session's working directory if set."),
+    path: z.string().min(1).optional().default('.').describe("Path to the Git repository. Defaults to the directory set via `git_set_working_dir` for the session; set 'git_set_working_dir' if not set."),
     remote: z.string().optional().describe("The remote repository to pull from (e.g., 'origin'). Defaults to the tracked upstream or 'origin'."),
-    branch: z.string().optional().describe("The remote branch to pull. Defaults to the current branch's upstream."),
+    branch: z.string().optional().describe("The remote branch to pull (e.g., 'main'). Defaults to the current branch's upstream."),
     rebase: z.boolean().optional().default(false).describe("Use 'git pull --rebase' instead of merge."),
     ffOnly: z.boolean().optional().default(false).describe("Use '--ff-only' to only allow fast-forward merges."),
     // Add other relevant git pull options as needed (e.g., --prune, --tags, --depth)
@@ -125,7 +128,7 @@ export async function pullGitChanges(input, context) {
             throw new McpError(BaseErrorCode.NOT_FOUND, `Path is not a Git repository: ${targetPath}`, { context, operation, originalError: error });
         }
         if (errorMessage.includes('resolve host') || errorMessage.includes('Could not read from remote repository')) {
-            throw new McpError(BaseErrorCode.NETWORK_ERROR, `Failed to connect to remote repository. Error: ${errorMessage}`, { context, operation, originalError: error });
+            throw new McpError(BaseErrorCode.SERVICE_UNAVAILABLE, `Failed to connect to remote repository. Error: ${errorMessage}`, { context, operation, originalError: error });
         }
         if (errorMessage.includes('merge conflict') || errorMessage.includes('fix conflicts')) {
             // This might be caught here if execAsync throws due to non-zero exit code during conflict

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

@@ -1,8 +1,11 @@
-import { ErrorHandler } from '../../../utils/errorHandler.js';
-import { logger } from '../../../utils/logger.js';
-import { requestContextService } from '../../../utils/requestContext.js';
+// Import utils from barrel (ErrorHandler from ../utils/internal/errorHandler.js)
+import { ErrorHandler } from '../../../utils/index.js';
+// Import utils from barrel (logger from ../utils/internal/logger.js)
+import { logger } from '../../../utils/index.js';
+// Import utils from barrel (requestContextService, RequestContext from ../utils/internal/requestContext.js)
+import { BaseErrorCode } from '../../../types-global/errors.js'; // Keep direct import for types-global
+import { requestContextService } from '../../../utils/index.js';
 import { GitPullInputSchema, pullGitChanges } from './logic.js';
-import { BaseErrorCode } from '../../../types-global/errors.js';
 let _getWorkingDirectory;
 let _getSessionId;
 /**

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

@@ -1,16 +1,19 @@
-import { z } from 'zod';
-import { promisify } from 'util';
 import { exec } from 'child_process';
-import { logger } from '../../../utils/logger.js';
-import { McpError, BaseErrorCode } from '../../../types-global/errors.js';
-import { sanitization } from '../../../utils/sanitization.js';
+import { promisify } from 'util';
+import { z } from 'zod';
+// Import utils from barrel (logger from ../utils/internal/logger.js)
+import { logger } from '../../../utils/index.js';
+// Import utils from barrel (RequestContext from ../utils/internal/requestContext.js)
+import { BaseErrorCode, McpError } from '../../../types-global/errors.js'; // Keep direct import for types-global
+// Import utils from barrel (sanitization from ../utils/security/sanitization.js)
+import { sanitization } from '../../../utils/index.js';
 const execAsync = promisify(exec);
 // Define the input schema for the git_push tool using Zod
 export const GitPushInputSchema = z.object({
-    path: z.string().min(1).optional().default('.').describe("Path to the Git repository. Defaults to the session's working directory if set."),
+    path: z.string().min(1).optional().default('.').describe("Path to the Git repository. Defaults to the directory set via `git_set_working_dir` for the session; set 'git_set_working_dir' if not set."),
     remote: z.string().optional().describe("The remote repository to push to (e.g., 'origin'). Defaults to the tracked upstream or 'origin'."),
-    branch: z.string().optional().describe("The local branch to push. Defaults to the current branch."),
-    remoteBranch: z.string().optional().describe("The remote branch to push to. Defaults to the same name as the local branch."),
+    branch: z.string().optional().describe("The local branch to push (e.g., 'main', 'feat/new-login'). Defaults to the current branch."),
+    remoteBranch: z.string().optional().describe("The remote branch to push to (e.g., 'main', 'develop'). Defaults to the same name as the local branch."),
     force: z.boolean().optional().default(false).describe("Force the push (use with caution: `--force-with-lease` is generally safer)."),
     forceWithLease: z.boolean().optional().default(false).describe("Force the push only if the remote ref is the expected value (`--force-with-lease`). Safer than --force."),
     setUpstream: z.boolean().optional().default(false).describe("Set the upstream tracking configuration (`-u` or `--set-upstream`)."),
@@ -169,7 +172,7 @@ export async function pushGitChanges(input, context) {
             throw new McpError(BaseErrorCode.NOT_FOUND, `Path is not a Git repository: ${targetPath}`, { context, operation, originalError: error });
         }
         if (errorMessage.includes('resolve host') || errorMessage.includes('Could not read from remote repository') || errorMessage.includes('Connection timed out')) {
-            throw new McpError(BaseErrorCode.NETWORK_ERROR, `Failed to connect to remote repository. Error: ${errorMessage}`, { context, operation, originalError: error });
+            throw new McpError(BaseErrorCode.SERVICE_UNAVAILABLE, `Failed to connect to remote repository. Error: ${errorMessage}`, { context, operation, originalError: error });
         }
         if (errorMessage.includes('rejected') || errorMessage.includes('failed to push some refs')) {
             // This might be caught here if execAsync throws due to non-zero exit code on rejection

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

@@ -1,8 +1,11 @@
-import { ErrorHandler } from '../../../utils/errorHandler.js';
-import { logger } from '../../../utils/logger.js';
-import { requestContextService } from '../../../utils/requestContext.js';
+// Import utils from barrel (ErrorHandler from ../utils/internal/errorHandler.js)
+import { ErrorHandler } from '../../../utils/index.js';
+// Import utils from barrel (logger from ../utils/internal/logger.js)
+import { logger } from '../../../utils/index.js';
+// Import utils from barrel (requestContextService, RequestContext from ../utils/internal/requestContext.js)
+import { BaseErrorCode } from '../../../types-global/errors.js'; // Keep direct import for types-global
+import { requestContextService } from '../../../utils/index.js';
 import { GitPushInputSchema, pushGitChanges } from './logic.js';
-import { BaseErrorCode } from '../../../types-global/errors.js';
 let _getWorkingDirectory;
 let _getSessionId;
 /**

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

@@ -1,13 +1,16 @@
-import { z } from 'zod';
-import { promisify } from 'util';
 import { exec } from 'child_process';
-import { logger } from '../../../utils/logger.js';
-import { McpError, BaseErrorCode } from '../../../types-global/errors.js';
-import { sanitization } from '../../../utils/sanitization.js';
+import { promisify } from 'util';
+import { z } from 'zod';
+// Import utils from barrel (logger from ../utils/internal/logger.js)
+import { logger } from '../../../utils/index.js';
+// Import utils from barrel (RequestContext from ../utils/internal/requestContext.js)
+import { BaseErrorCode, McpError } from '../../../types-global/errors.js'; // Keep direct import for types-global
+// Import utils from barrel (sanitization from ../utils/security/sanitization.js)
+import { sanitization } from '../../../utils/index.js';
 const execAsync = promisify(exec);
 // Define the BASE input schema for the git_rebase tool using Zod
 export const GitRebaseBaseSchema = z.object({
-    path: z.string().min(1).optional().default('.').describe("Path to the local Git repository. If omitted, defaults to the path set by `git_set_working_dir` for the current session, or the server's CWD if no session path is set."),
+    path: z.string().min(1).optional().default('.').describe("Path to the local Git repository. Defaults to the directory set via `git_set_working_dir` for the session; set 'git_set_working_dir' if not set."),
     mode: z.enum(['start', 'continue', 'abort', 'skip']).default('start').describe("Rebase operation mode: 'start' (initiate rebase), 'continue', 'abort', 'skip' (manage ongoing rebase)."),
     upstream: z.string().min(1).optional().describe("The upstream branch or commit to rebase onto. Required for 'start' mode unless 'interactive' is true with default base."),
     branch: z.string().min(1).optional().describe("The branch to rebase. Defaults to the current branch if omitted."),

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

@@ -1,8 +1,11 @@
-import { logger } from '../../../utils/logger.js';
-import { ErrorHandler } from '../../../utils/errorHandler.js';
-import { requestContextService } from '../../../utils/requestContext.js';
-import { gitRebaseLogic, GitRebaseBaseSchema } from './logic.js';
-import { BaseErrorCode } from '../../../types-global/errors.js';
+// Import utils from barrel (logger from ../utils/internal/logger.js)
+import { logger } from '../../../utils/index.js';
+// Import utils from barrel (ErrorHandler from ../utils/internal/errorHandler.js)
+import { ErrorHandler } from '../../../utils/index.js';
+// Import utils from barrel (requestContextService from ../utils/internal/requestContext.js)
+import { BaseErrorCode } from '../../../types-global/errors.js'; // Keep direct import for types-global
+import { requestContextService } from '../../../utils/index.js';
+import { GitRebaseBaseSchema, gitRebaseLogic } from './logic.js';
 let _getWorkingDirectory;
 let _getSessionId;
 /**

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

@@ -1,16 +1,15 @@
 import { exec } from 'child_process';
 import { promisify } from 'util';
 import { z } from 'zod';
-import { BaseErrorCode, McpError } from '../../../types-global/errors.js';
-import { logger } from '../../../utils/logger.js';
-import { sanitization } from '../../../utils/sanitization.js';
+import { BaseErrorCode, McpError } from '../../../types-global/errors.js'; // Direct import for types-global
+import { logger, sanitization } from '../../../utils/index.js'; // Logger (./utils/internal/logger.js) & RequestContext (./utils/internal/requestContext.js) & sanitization (./utils/security/sanitization.js)
 const execAsync = promisify(exec);
 // Define the input schema for the git_remote tool using Zod
 export const GitRemoteInputSchema = z.object({
-    path: z.string().min(1).optional().default('.').describe("Path to the Git repository. Defaults to the session's working directory if set."),
+    path: z.string().min(1).optional().default('.').describe("Path to the Git repository. Defaults to the directory set via `git_set_working_dir` for the session; set 'git_set_working_dir' if not set."),
     mode: z.enum(['list', 'add', 'remove', 'show']).describe("Operation mode: 'list', 'add', 'remove', 'show'"),
     name: z.string().min(1).optional().describe("Remote name (required for 'add', 'remove', 'show')"),
-    url: z.string().url().optional().describe("Remote URL (required for 'add')"),
+    url: z.string().optional().describe("Remote URL (required for 'add')"), // Removed .url() validation
 });
 /**
  * Executes git remote commands based on the specified mode.

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

@@ -1,7 +1,5 @@
-import { BaseErrorCode } from '../../../types-global/errors.js';
-import { ErrorHandler } from '../../../utils/errorHandler.js';
-import { logger } from '../../../utils/logger.js';
-import { requestContextService } from '../../../utils/requestContext.js';
+import { BaseErrorCode } from '../../../types-global/errors.js'; // Direct import for types-global
+import { ErrorHandler, logger, requestContextService } from '../../../utils/index.js'; // ErrorHandler (./utils/internal/errorHandler.js), logger (./utils/internal/logger.js), requestContextService (./utils/internal/requestContext.js)
 import { GitRemoteInputSchema, gitRemoteLogic } from './logic.js';
 let _getWorkingDirectory;
 let _getSessionId;

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

@@ -1,15 +1,14 @@
-import { z } from 'zod';
-import { promisify } from 'util';
 import { exec } from 'child_process';
-import { logger } from '../../../utils/logger.js';
-import { McpError, BaseErrorCode } from '../../../types-global/errors.js';
-import { sanitization } from '../../../utils/sanitization.js';
+import { promisify } from 'util';
+import { z } from 'zod';
+import { BaseErrorCode, McpError } from '../../../types-global/errors.js'; // Direct import for types-global
+import { logger, sanitization } from '../../../utils/index.js'; // logger (./utils/internal/logger.js), RequestContext (./utils/internal/requestContext.js), sanitization (./utils/security/sanitization.js)
 const execAsync = promisify(exec);
 // Define the reset modes
 const ResetModeEnum = z.enum(['soft', 'mixed', 'hard', 'merge', 'keep']);
 // Define the input schema for the git_reset tool using Zod
 export const GitResetInputSchema = z.object({
-    path: z.string().min(1).optional().default('.').describe("Path to the Git repository. Defaults to the session's working directory if set."),
+    path: z.string().min(1).optional().default('.').describe("Path to the Git repository. Defaults to the directory set via `git_set_working_dir` for the session; set 'git_set_working_dir' if not set."),
     mode: ResetModeEnum.optional().default('mixed').describe("Reset mode: 'soft' (reset HEAD only), 'mixed' (reset HEAD and index, default), 'hard' (reset HEAD, index, and working tree - USE WITH CAUTION), 'merge', 'keep'."),
     commit: z.string().optional().describe("Commit, branch, or ref to reset to. Defaults to HEAD (useful for unstaging with 'mixed' mode)."),
     // file: z.string().optional().describe("If specified, reset only this file in the index (unstaging). Mode must be 'mixed' or omitted."), // Git reset [<mode>] [<tree-ish>] [--] <paths>… is complex, handle separately if needed

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

@@ -1,8 +1,6 @@
-import { ErrorHandler } from '../../../utils/errorHandler.js';
-import { logger } from '../../../utils/logger.js';
-import { requestContextService } from '../../../utils/requestContext.js';
+import { BaseErrorCode } from '../../../types-global/errors.js'; // Direct import for types-global
+import { ErrorHandler, logger, requestContextService } from '../../../utils/index.js'; // ErrorHandler (./utils/internal/errorHandler.js), logger (./utils/internal/logger.js), requestContextService & RequestContext (./utils/internal/requestContext.js)
 import { GitResetInputSchema, resetGitState } from './logic.js';
-import { BaseErrorCode } from '../../../types-global/errors.js';
 let _getWorkingDirectory;
 let _getSessionId;
 /**

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

@@ -1,14 +1,13 @@
-import { z } from 'zod';
 import { exec } from 'child_process';
-import { promisify } from 'util';
 import fs from 'fs/promises';
-import { McpError, BaseErrorCode } from '../../../types-global/errors.js';
-import { logger } from '../../../utils/logger.js';
-import { sanitization } from '../../../utils/sanitization.js';
+import { promisify } from 'util';
+import { z } from 'zod';
+import { BaseErrorCode, McpError } from '../../../types-global/errors.js'; // Direct import for types-global
+import { logger, sanitization } from '../../../utils/index.js'; // RequestContext (./utils/internal/requestContext.js), logger (./utils/internal/logger.js), sanitization (./utils/security/sanitization.js)
 const execAsync = promisify(exec);
 // Define the Zod schema for input validation
 export const GitSetWorkingDirInputSchema = z.object({
-    path: z.string().min(1, "Path cannot be empty.").describe("The absolute path to set as the default working directory for the current session."),
+    path: z.string().min(1, "Path cannot be empty.").describe("The absolute path to set as the default working directory for the current session. Set this before using other git_* tools."),
     validateGitRepo: z.boolean().default(true).describe("Whether to validate that the path is a Git repository"),
 });
 /**

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

@@ -1,19 +1,21 @@
-import { ErrorHandler } from '../../../utils/errorHandler.js';
-import { logger } from '../../../utils/logger.js';
-import { requestContextService } from '../../../utils/requestContext.js';
+import { BaseErrorCode } from '../../../types-global/errors.js'; // Direct import for types-global
+import { ErrorHandler, logger, requestContextService } from '../../../utils/index.js'; // ErrorHandler (./utils/internal/errorHandler.js), logger (./utils/internal/logger.js), requestContextService & RequestContext (./utils/internal/requestContext.js)
 import { GitSetWorkingDirInputSchema, gitSetWorkingDirLogic } from './logic.js';
-import { BaseErrorCode } from '../../../types-global/errors.js';
+let _getWorkingDirectory; // Added getter
 let _setWorkingDirectory;
 let _getSessionId;
 /**
  * Initializes the state accessors needed by the tool registration.
  * This should be called once during server setup.
- * @param setFn - Function to set the working directory for a session.
- * @param getFn - Function to get the session ID from context.
+ * @param getWdFn - Function to get the working directory for a session.
+ * @param setWdFn - Function to set the working directory for a session.
+ * @param getSidFn - Function to get the session ID from context.
  */
-export function initializeGitSetWorkingDirStateAccessors(setFn, getFn) {
-    _setWorkingDirectory = setFn;
-    _getSessionId = getFn;
+export function initializeGitSetWorkingDirStateAccessors(getWdFn, // Added getter parameter
+setWdFn, getSidFn) {
+    _getWorkingDirectory = getWdFn; // Store getter
+    _setWorkingDirectory = setWdFn;
+    _getSessionId = getSidFn;
     logger.info('State accessors initialized for git_set_working_dir tool registration.');
 }
 const TOOL_NAME = 'git_set_working_dir';
@@ -25,8 +27,9 @@ const TOOL_DESCRIPTION = "Sets the default working directory for the current ses
  * @throws {Error} If state accessors are not initialized.
  */
 export async function registerGitSetWorkingDirTool(server) {
-    if (!_setWorkingDirectory || !_getSessionId) {
-        throw new Error('State accessors for git_set_working_dir must be initialized before registration.');
+    // Check all required accessors
+    if (!_getWorkingDirectory || !_setWorkingDirectory || !_getSessionId) {
+        throw new Error('State accessors (getWD, setWD, getSID) for git_set_working_dir must be initialized before registration.');
     }
     try {
         server.tool(TOOL_NAME, TOOL_DESCRIPTION, GitSetWorkingDirInputSchema.shape, // Pass the shape for SDK validation
@@ -40,11 +43,17 @@ export async function registerGitSetWorkingDirTool(server) {
             const setWorkingDirectoryForSession = (path) => {
                 _setWorkingDirectory(sessionId, path); // Non-null assertion
             };
-            // Enhance context with session ID and the setter function
+            // Define the session-specific getter function (needed by logic?)
+            // If the logic needs the current WD, pass the getter too. Assuming it might.
+            const getWorkingDirectoryForSession = () => {
+                return _getWorkingDirectory(sessionId); // Non-null assertion
+            };
+            // Enhance context with session ID and the getter/setter functions
             const logicContext = {
                 ...requestContext,
                 sessionId: sessionId,
-                setWorkingDirectory: setWorkingDirectoryForSession,
+                getWorkingDirectory: getWorkingDirectoryForSession, // Pass getter
+                setWorkingDirectory: setWorkingDirectoryForSession, // Pass setter
             };
             return await ErrorHandler.tryCatch(async () => {
                 // Call the core logic function with validated args and enhanced context

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

@@ -1,14 +1,13 @@
-import { z } from 'zod';
-import { promisify } from 'util';
 import { exec } from 'child_process';
-import { logger } from '../../../utils/logger.js';
-import { McpError, BaseErrorCode } from '../../../types-global/errors.js';
-import { sanitization } from '../../../utils/sanitization.js';
+import { promisify } from 'util';
+import { z } from 'zod';
+import { BaseErrorCode, McpError } from '../../../types-global/errors.js'; // Direct import for types-global
+import { logger, sanitization } from '../../../utils/index.js'; // logger (./utils/internal/logger.js), RequestContext (./utils/internal/requestContext.js), sanitization (./utils/security/sanitization.js)
 const execAsync = promisify(exec);
 // Define the input schema for the git_show tool using Zod
 // No refinements needed here, so we don't need a separate BaseSchema
 export const GitShowInputSchema = z.object({
-    path: z.string().min(1).optional().default('.').describe("Path to the local Git repository. If omitted, defaults to the path set by `git_set_working_dir` for the current session, or the server's CWD if no session path is set."),
+    path: z.string().min(1).optional().default('.').describe("Path to the local Git repository. Defaults to the directory set via `git_set_working_dir` for the session; set 'git_set_working_dir' if not set."),
     ref: z.string().min(1).describe("The object reference (commit hash, tag name, branch name, HEAD, etc.) to show."),
     filePath: z.string().optional().describe("Optional specific file path within the ref to show (e.g., show a file's content at a specific commit). If provided, use the format '<ref>:<filePath>'."),
     // format: z.string().optional().describe("Optional format string for the output"), // Consider adding later

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

@@ -1,9 +1,7 @@
-import { logger } from '../../../utils/logger.js';
-import { ErrorHandler } from '../../../utils/errorHandler.js';
-import { requestContextService } from '../../../utils/requestContext.js';
+import { BaseErrorCode } from '../../../types-global/errors.js'; // Direct import for types-global
+import { ErrorHandler, logger, requestContextService } from '../../../utils/index.js'; // logger (./utils/internal/logger.js), ErrorHandler (./utils/internal/errorHandler.js), requestContextService (./utils/internal/requestContext.js)
 // Import the schema and types
-import { gitShowLogic, GitShowInputSchema } from './logic.js';
-import { BaseErrorCode } from '../../../types-global/errors.js';
+import { GitShowInputSchema, gitShowLogic } from './logic.js';
 let _getWorkingDirectory;
 let _getSessionId;
 /**

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

@@ -1,13 +1,12 @@
-import { z } from 'zod';
-import { promisify } from 'util';
 import { exec } from 'child_process';
-import { logger } from '../../../utils/logger.js';
-import { McpError, BaseErrorCode } from '../../../types-global/errors.js';
-import { sanitization } from '../../../utils/sanitization.js';
+import { promisify } from 'util';
+import { z } from 'zod';
+import { BaseErrorCode, McpError } from '../../../types-global/errors.js'; // Direct import for types-global
+import { logger, sanitization } from '../../../utils/index.js'; // logger (./utils/internal/logger.js), RequestContext (./utils/internal/requestContext.js), sanitization (./utils/security/sanitization.js)
 const execAsync = promisify(exec);
 // Define the BASE input schema for the git_stash tool using Zod
 export const GitStashBaseSchema = z.object({
-    path: z.string().min(1).optional().default('.').describe("Path to the local Git repository. If omitted, defaults to the path set by `git_set_working_dir` for the current session, or the server's CWD if no session path is set."),
+    path: z.string().min(1).optional().default('.').describe("Path to the local Git repository. Defaults to the directory set via `git_set_working_dir` for the session; set 'git_set_working_dir' if not set."),
     mode: z.enum(['list', 'apply', 'pop', 'drop', 'save']).describe("The stash operation to perform: 'list', 'apply', 'pop', 'drop', 'save'."),
     stashRef: z.string().optional().describe("Stash reference (e.g., 'stash@{1}'). Required for 'apply', 'pop', 'drop' modes."),
     message: z.string().optional().describe("Optional descriptive message used only for 'save' mode."),

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

@@ -1,10 +1,8 @@
-import { logger } from '../../../utils/logger.js';
-import { ErrorHandler } from '../../../utils/errorHandler.js';
-import { requestContextService } from '../../../utils/requestContext.js';
+import { BaseErrorCode } from '../../../types-global/errors.js'; // Direct import for types-global
+import { ErrorHandler, logger, requestContextService } from '../../../utils/index.js'; // logger (./utils/internal/logger.js), ErrorHandler (./utils/internal/errorHandler.js), requestContextService (./utils/internal/requestContext.js)
 // Import the final schema and types for handler logic
 // Import the BASE schema separately for registration shape
-import { gitStashLogic, GitStashBaseSchema } from './logic.js';
-import { BaseErrorCode } from '../../../types-global/errors.js';
+import { GitStashBaseSchema, gitStashLogic } from './logic.js';
 let _getWorkingDirectory;
 let _getSessionId;
 /**

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

@@ -1,13 +1,12 @@
-import { z } from 'zod';
-import { promisify } from 'util';
 import { exec } from 'child_process';
-import { logger } from '../../../utils/logger.js';
-import { McpError, BaseErrorCode } from '../../../types-global/errors.js';
-import { sanitization } from '../../../utils/sanitization.js';
+import { promisify } from 'util';
+import { z } from 'zod';
+import { BaseErrorCode, McpError } from '../../../types-global/errors.js'; // Direct import for types-global
+import { logger, sanitization } from '../../../utils/index.js'; // logger (./utils/internal/logger.js), RequestContext (./utils/internal/requestContext.js), sanitization (./utils/security/sanitization.js)
 const execAsync = promisify(exec);
 // Define the input schema for the git_status tool using Zod
 export const GitStatusInputSchema = z.object({
-    path: z.string().min(1).optional().default('.').describe("Path to the Git repository (defaults to '.' which uses the session's working directory if set)"),
+    path: z.string().min(1).optional().default('.').describe("Path to the Git repository. Defaults to the directory set via `git_set_working_dir` for the session; set 'git_set_working_dir' if not set."),
 });
 /**
  * Parses the output of 'git status --porcelain=v1 -b'.

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

@@ -1,9 +1,7 @@
-import { logger } from '../../../utils/logger.js';
-import { ErrorHandler } from '../../../utils/errorHandler.js';
-import { requestContextService } from '../../../utils/requestContext.js';
+import { BaseErrorCode } from '../../../types-global/errors.js'; // Direct import for types-global
+import { ErrorHandler, logger, requestContextService } from '../../../utils/index.js'; // logger (./utils/internal/logger.js), ErrorHandler (./utils/internal/errorHandler.js), requestContextService (./utils/internal/requestContext.js)
 // Import the result type along with the function and input schema
 import { getGitStatus, GitStatusInputSchema } from './logic.js';
-import { BaseErrorCode } from '../../../types-global/errors.js'; // Import BaseErrorCode
 let _getWorkingDirectory;
 let _getSessionId;
 /**

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

@@ -1,14 +1,13 @@
 import { exec } from 'child_process';
 import { promisify } from 'util';
 import { z } from 'zod';
-import { BaseErrorCode, McpError } from '../../../types-global/errors.js';
-import { logger } from '../../../utils/logger.js';
-import { sanitization } from '../../../utils/sanitization.js';
+import { BaseErrorCode, McpError } from '../../../types-global/errors.js'; // Direct import for types-global
+import { logger, sanitization } from '../../../utils/index.js'; // logger (./utils/internal/logger.js), RequestContext (./utils/internal/requestContext.js), sanitization (./utils/security/sanitization.js)
 const execAsync = promisify(exec);
 // Define the base input schema for the git_tag tool using Zod
 // We export this separately to access its .shape for registration
 export const GitTagBaseSchema = z.object({
-    path: z.string().min(1).optional().default('.').describe("Path to the local Git repository. If omitted, defaults to the path set by `git_set_working_dir` for the current session, or the server's CWD if no session path is set."),
+    path: z.string().min(1).optional().default('.').describe("Path to the local Git repository. Defaults to the directory set via `git_set_working_dir` for the session; set 'git_set_working_dir' if not set."),
     mode: z.enum(['list', 'create', 'delete']).describe("The tag operation to perform: 'list' (show all tags), 'create' (add a new tag), 'delete' (remove a local tag)."),
     tagName: z.string().min(1).optional().describe("The name for the tag. Required for 'create' and 'delete' modes. e.g., 'v2.3.0'."),
     message: z.string().optional().describe("The annotation message for the tag. Required and used only when 'mode' is 'create' and 'annotate' is true."),

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

@@ -1,9 +1,7 @@
-import { ErrorHandler } from '../../../utils/errorHandler.js';
-import { logger } from '../../../utils/logger.js';
-import { requestContextService } from '../../../utils/requestContext.js';
+import { BaseErrorCode } from '../../../types-global/errors.js'; // Direct import for types-global
+import { ErrorHandler, logger, requestContextService } from '../../../utils/index.js'; // ErrorHandler (./utils/internal/errorHandler.js), logger (./utils/internal/logger.js), requestContextService (./utils/internal/requestContext.js)
 // Import the final schema and types for handler logic
 // Import the BASE schema separately for registration shape
-import { BaseErrorCode } from '../../../types-global/errors.js';
 import { GitTagBaseSchema, gitTagLogic } from './logic.js';
 let _getWorkingDirectory;
 let _getSessionId;