@cyanheads/git-mcp-server 2.0.2 → 2.0.3

package/dist/mcp-server/tools/gitAdd/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 input schema for the git_add tool using Zod
 export const GitAddInputSchema = z.object({
-    path: z.string().min(1).optional().default('.').describe("Path to the Git repository. Defaults to the session's working directory if set via `git_set_working_dir`, otherwise defaults to the server's current working directory (`.`)."),
+    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."),
     files: z.union([
         z.string().min(1),
         z.array(z.string().min(1))

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

@@ -1,9 +1,12 @@
-import { logger } from '../../../utils/logger.js';
-import { ErrorHandler } from '../../../utils/errorHandler.js';
-import { requestContextService } from '../../../utils/requestContext.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 { requestContextService } from '../../../utils/index.js';
 // Import the result type along with the function and input schema
-import { addGitFiles, GitAddInputSchema } from './logic.js';
 import { BaseErrorCode } from '../../../types-global/errors.js'; // Import BaseErrorCode
+import { addGitFiles, GitAddInputSchema } from './logic.js';
 let _getWorkingDirectory;
 let _getSessionId;
 /**

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

@@ -1,17 +1,20 @@
-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_branch tool using Zod
 export const GitBranchBaseSchema = 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', 'rename', 'show-current']).describe("The branch operation to perform: 'list', 'create', 'delete', 'rename', 'show-current'."),
-    branchName: z.string().min(1).optional().describe("The name of the branch. Required for 'create', 'delete', 'rename' modes."),
-    newBranchName: z.string().min(1).optional().describe("The new name for the branch. Required for 'rename' mode."),
-    startPoint: z.string().min(1).optional().describe("Optional commit hash, tag, or existing branch name to start the new branch from. Used only in 'create' mode. Defaults to HEAD."),
+    branchName: z.string().min(1).optional().describe("The name of the branch (e.g., 'feat/new-login', 'main'). Required for 'create', 'delete', 'rename' modes."),
+    newBranchName: z.string().min(1).optional().describe("The new name for the branch (e.g., 'fix/typo-in-readme'). Required for 'rename' mode."),
+    startPoint: z.string().min(1).optional().describe("Optional commit hash, tag, or existing branch name (e.g., 'main', 'v1.0.0', 'commit-hash') to start the new branch from. Used only in 'create' mode. Defaults to HEAD."),
     force: z.boolean().default(false).describe("Force the operation. Use -D for delete, -M for rename, -f for create (if branch exists). Use with caution, as forcing operations can lead to data loss."),
     all: z.boolean().default(false).describe("List both local and remote-tracking branches. Used only in 'list' mode."),
     remote: z.boolean().default(false).describe("Act on remote-tracking branches. Used with 'list' (-r) or 'delete' (-r)."),
@@ -80,12 +83,20 @@ export async function gitBranchLogic(input, context) {
                     .map(line => {
                     const isCurrent = line.startsWith('* ');
                     const trimmedLine = line.replace(/^\*?\s+/, ''); // Remove leading '*' and spaces
+                    // Determine isRemote based on the raw trimmed line BEFORE splitting
+                    const isRemote = trimmedLine.startsWith('remotes/');
                     const parts = trimmedLine.split(/\s+/);
-                    const name = parts[0];
-                    const isRemote = name.startsWith('remotes/');
+                    const name = parts[0]; // This might be 'remotes/origin/main' or just 'main'
                     const commitHash = parts[1] || undefined; // Verbose gives hash
                     const commitSubject = parts.slice(2).join(' ') || undefined; // Verbose gives subject
-                    return { name, isCurrent, isRemote, commitHash, commitSubject };
+                    // Return the correct name (without 'remotes/' prefix if it was remote) and the isRemote flag
+                    return {
+                        name: isRemote ? name.split('/').slice(2).join('/') : name, // e.g., 'origin/main' or 'main'
+                        isCurrent,
+                        isRemote, // Use the flag determined before splitting
+                        commitHash,
+                        commitSubject
+                    };
                 });
                 const currentBranch = branches.find(b => b.isCurrent)?.name;
                 result = { success: true, mode: 'list', branches, currentBranch };

package/dist/mcp-server/tools/gitBranch/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 { gitBranchLogic, GitBranchBaseSchema } 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 { GitBranchBaseSchema, gitBranchLogic } from './logic.js';
 let _getWorkingDirectory;
 let _getSessionId;
 /**

package/dist/mcp-server/tools/gitCheckout/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_checkout tool using Zod
 export const GitCheckoutInputSchema = z.object({
-    path: z.string().min(1).optional().default('.').describe("Path to the Git repository. Defaults to the session's working directory if set."),
-    branchOrPath: z.string().min(1).describe("The branch name, commit hash, tag, or file path(s) to checkout."),
-    newBranch: z.string().optional().describe("Create a new branch named <new_branch> and start it at <branchOrPath>."),
+    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."),
+    branchOrPath: z.string().min(1).describe("The branch name (e.g., 'main'), commit hash, tag, or file path(s) (e.g., './src/file.ts') to checkout."),
+    newBranch: z.string().optional().describe("Create a new branch named <new_branch> (e.g., 'feat/new-feature') and start it at <branchOrPath>."),
     force: z.boolean().optional().default(false).describe("Force checkout even if there are uncommitted changes (use with caution, discards local changes)."),
     // Add other relevant git checkout options as needed (e.g., --track, -b for new branch shorthand)
 });
@@ -72,52 +75,53 @@ export async function checkoutGit(input, context) {
         let currentBranch = undefined;
         let newBranchCreated = !!input.newBranch;
         let filesRestored = undefined;
+        let isDetachedHead = false;
+        let isFileCheckout = false;
+        // --- Initial analysis of checkout output ---
         // Extract previous branch if available
         const prevBranchMatch = stderr.match(/Switched to.*? from ['"]?(.*?)['"]?/);
         if (prevBranchMatch) {
             previousBranch = prevBranchMatch[1];
         }
-        // Extract current branch/state
-        if (stderr.includes('Switched to branch')) {
-            const currentBranchMatch = stderr.match(/Switched to branch ['"]?(.*?)['"]?/);
-            if (currentBranchMatch)
-                currentBranch = currentBranchMatch[1];
-            message = `Switched to branch '${currentBranch || input.branchOrPath}'.`;
-        }
-        else if (stderr.includes('Switched to a new branch')) {
+        // Determine primary outcome from stderr/stdout
+        if (stderr.includes('Switched to a new branch')) {
             const currentBranchMatch = stderr.match(/Switched to a new branch ['"]?(.*?)['"]?/);
-            if (currentBranchMatch)
-                currentBranch = currentBranchMatch[1];
-            message = `Switched to new branch '${currentBranch || input.newBranch}'.`;
-            newBranchCreated = true; // Confirm creation
+            currentBranch = currentBranchMatch ? currentBranchMatch[1] : input.newBranch; // Use matched or input
+            message = `Switched to new branch '${currentBranch}'.`;
+            newBranchCreated = true;
+        }
+        else if (stderr.includes('Switched to branch')) {
+            const currentBranchMatch = stderr.match(/Switched to branch ['"]?(.*?)['"]?/);
+            currentBranch = currentBranchMatch ? currentBranchMatch[1] : input.branchOrPath; // Use matched or input
+            message = `Switched to branch '${currentBranch}'.`;
         }
         else if (stderr.includes('Already on')) {
             const currentBranchMatch = stderr.match(/Already on ['"]?(.*?)['"]?/);
-            if (currentBranchMatch)
-                currentBranch = currentBranchMatch[1];
-            message = `Already on '${currentBranch || input.branchOrPath}'.`;
-        }
-        else if (stderr.includes('Updated N path') || stdout.includes('Updated N path')) { // Checking out files
-            message = `Restored path(s): ${input.branchOrPath}`;
-            // Potentially list the files if input.branchOrPath was specific enough
-            // Assume input.branchOrPath contains file paths separated by newlines
-            filesRestored = input.branchOrPath.split('\n').filter(p => p.trim().length > 0); // Split by newline and filter out empty entries
-            // Try to get current branch after file checkout
-            try {
-                const statusResult = await execAsync(`git -C "${targetPath}" branch --show-current`);
-                currentBranch = statusResult.stdout.trim();
+            currentBranch = currentBranchMatch ? currentBranchMatch[1] : input.branchOrPath; // Use matched or input
+            message = `Already on '${currentBranch}'.`;
+        }
+        else if (stderr.includes('Updated N path') || stdout.includes('Updated N path') || stderr.includes('Your branch is up to date with')) { // Checking out files or confirming current state
+            // Check if the input looks like file paths rather than a branch/commit
+            // This is heuristic - might need refinement if branch names look like paths
+            if (input.branchOrPath.includes('/') || input.branchOrPath.includes('.')) {
+                isFileCheckout = true;
+                message = `Restored or checked path(s): ${input.branchOrPath}`;
+                filesRestored = input.branchOrPath.split('\n').map(p => p.trim()).filter(p => p.length > 0);
             }
-            catch (statusError) {
-                logger.warning('Could not determine current branch after file checkout', { ...context, operation, statusError });
+            else {
+                // Assume it was just confirming the current branch state
+                message = stderr.trim() || stdout.trim() || `Checked out ${input.branchOrPath}.`;
             }
         }
         else if (stderr.includes('Previous HEAD position was') && stderr.includes('HEAD is now at')) { // Detached HEAD
             message = `Checked out commit ${input.branchOrPath} (Detached HEAD state).`;
-            currentBranch = 'Detached HEAD'; // Indicate detached state
+            currentBranch = 'Detached HEAD';
+            isDetachedHead = true;
         }
-        else if (stderr.includes('Note: switching to')) { // Another detached HEAD message variant
+        else if (stderr.includes('Note: switching to') || stderr.includes('Note: checking out')) { // Other detached HEAD variants
             message = `Checked out ${input.branchOrPath} (Detached HEAD state).`;
             currentBranch = 'Detached HEAD';
+            isDetachedHead = true;
         }
         else if (message.includes('fatal:')) {
             success = false;
@@ -125,19 +129,63 @@ export async function checkoutGit(input, context) {
             logger.error(`Git checkout command indicated failure: ${message}`, { ...context, operation, stdout, stderr });
         }
         else if (!message && !stdout && !stderr) {
-            message = 'Checkout command executed, but no output received.';
-            logger.warning(message, { ...context, operation });
-            // Attempt to get current branch as confirmation
+            message = 'Checkout command executed silently.'; // Assume success, will verify branch below
+            logger.info(message, { ...context, operation });
+        }
+        else {
+            // Some other message, treat as informational for now
+            message = stderr.trim() || stdout.trim();
+            logger.info(`Git checkout produced message: ${message}`, { ...context, operation });
+        }
+        // --- Get definitive current branch IF checkout was successful AND not file checkout/detached HEAD ---
+        if (success && !isFileCheckout && !isDetachedHead) {
             try {
+                logger.debug('Attempting to get current branch via git branch --show-current', { ...context, operation });
                 const statusResult = await execAsync(`git -C "${targetPath}" branch --show-current`);
-                currentBranch = statusResult.stdout.trim();
-                message += ` Current branch is '${currentBranch}'.`;
+                const definitiveCurrentBranch = statusResult.stdout.trim();
+                if (definitiveCurrentBranch) {
+                    currentBranch = definitiveCurrentBranch;
+                    logger.info(`Confirmed current branch: ${currentBranch}`, { ...context, operation });
+                    // Refine message if it wasn't specific before
+                    if (message.startsWith('Checkout command executed silently') || message.startsWith('Checked out ')) {
+                        message = `Checked out '${currentBranch}'.`;
+                    }
+                    else if (message.startsWith('Already on') && !message.includes(`'${currentBranch}'`)) {
+                        message = `Already on '${currentBranch}'.`; // Update if initial parse was wrong
+                    }
+                    else if (message.startsWith('Switched to branch') && !message.includes(`'${currentBranch}'`)) {
+                        message = `Switched to branch '${currentBranch}'.`; // Update if initial parse was wrong
+                    }
+                }
+                else {
+                    // Command succeeded but returned empty - might be detached HEAD after all?
+                    logger.warning('git branch --show-current returned empty, possibly detached HEAD?', { ...context, operation });
+                    // Keep potentially parsed 'Detached HEAD' or fallback to input if needed
+                    currentBranch = currentBranch || 'Unknown (possibly detached)';
+                    if (!message.includes('Detached HEAD'))
+                        message += ' (Could not confirm branch name).';
+                }
             }
             catch (statusError) {
-                logger.warning('Could not determine current branch after silent checkout', { ...context, operation, statusError });
+                logger.warning('Could not determine current branch after checkout', { ...context, operation, error: statusError.message });
+                // Keep potentially parsed 'Detached HEAD' or fallback to input if needed
+                currentBranch = currentBranch || 'Unknown (error checking)';
+                if (!message.includes('Detached HEAD'))
+                    message += ' (Error checking branch name).';
+            }
+        }
+        else if (success && isFileCheckout) {
+            // If it was a file checkout, still try to get the branch name for context
+            try {
+                const statusResult = await execAsync(`git -C "${targetPath}" branch --show-current`);
+                currentBranch = statusResult.stdout.trim() || 'Unknown (possibly detached)';
+            }
+            catch {
+                currentBranch = 'Unknown (error checking)';
             }
+            logger.info(`Current branch after file checkout: ${currentBranch}`, { ...context, operation });
         }
-        logger.info(`${operation} completed`, { ...context, operation, path: targetPath, success, message });
+        logger.info(`${operation} completed`, { ...context, operation, path: targetPath, success, message, currentBranch });
         return { success, message, previousBranch, currentBranch, newBranchCreated, filesRestored };
     }
     catch (error) {

package/dist/mcp-server/tools/gitCheckout/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 { GitCheckoutInputSchema, checkoutGit } from './logic.js';
-import { BaseErrorCode } from '../../../types-global/errors.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 { checkoutGit, GitCheckoutInputSchema } from './logic.js';
 let _getWorkingDirectory;
 let _getSessionId;
 /**

package/dist/mcp-server/tools/gitCherryPick/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_cherry-pick tool using Zod
 export const GitCherryPickInputSchema = 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."),
     commitRef: z.string().min(1).describe("The commit reference(s) to cherry-pick (e.g., 'hash1', 'hash1..hash3', 'branchName~3..branchName')."),
     mainline: z.number().int().min(1).optional().describe("Specify the parent number (starting from 1) when cherry-picking a merge commit."),
-    strategy: z.enum(['recursive', 'resolve', 'ours', 'theirs', 'octopus', 'subtree']).optional().describe("Specifies the merge strategy to use."),
+    strategy: z.enum(['recursive', 'resolve', 'ours', 'theirs', 'octopus', 'subtree']).optional().describe("Specifies a merge strategy *option* (passed via -X)."),
     noCommit: z.boolean().default(false).describe("Apply the changes but do not create a commit."),
     signoff: z.boolean().default(false).describe("Add a Signed-off-by line to the commit message."),
     // Add options for conflict handling? (e.g., --continue, --abort, --skip) - Maybe separate tool or mode?

package/dist/mcp-server/tools/gitCherryPick/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 { gitCherryPickLogic, GitCherryPickInputSchema } 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 { GitCherryPickInputSchema, gitCherryPickLogic } from './logic.js';
 let _getWorkingDirectory;
 let _getSessionId;
 /**

package/dist/mcp-server/tools/gitClean/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 { sanitization } from '../../../utils/index.js';
 const execAsync = promisify(exec);
 // Define the input schema for the git_clean tool using Zod
 // No refinements needed here, but the 'force' check is critical in the logic
 export const GitCleanInputSchema = 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."),
     force: z.boolean().describe("REQUIRED confirmation to run the command. Must be explicitly set to true to perform the clean operation. If false or omitted, the command will not run."),
     dryRun: z.boolean().default(false).describe("Show what would be deleted without actually deleting (-n flag)."),
     directories: z.boolean().default(false).describe("Remove untracked directories in addition to files (-d flag)."),

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

@@ -1,9 +1,12 @@
-import { logger } from '../../../utils/logger.js';
-import { ErrorHandler } from '../../../utils/errorHandler.js';
-import { requestContextService } from '../../../utils/requestContext.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 { requestContextService } from '../../../utils/index.js';
 // Import the schema and types
-import { gitCleanLogic, GitCleanInputSchema } from './logic.js';
-import { BaseErrorCode } from '../../../types-global/errors.js';
+import { BaseErrorCode } from '../../../types-global/errors.js'; // Keep direct import for types-global
+import { GitCleanInputSchema, gitCleanLogic } from './logic.js';
 let _getWorkingDirectory;
 let _getSessionId;
 /**

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

@@ -1,6 +1,7 @@
 import { z } from 'zod';
-import { logger } from '../../../utils/logger.js';
-import { McpError, BaseErrorCode } from '../../../types-global/errors.js';
+// Import utils from barrel (logger from ../utils/internal/logger.js)
+import { BaseErrorCode, McpError } from '../../../types-global/errors.js'; // Keep direct import for types-global
+import { logger } from '../../../utils/index.js';
 // Define the Zod schema for input validation (no arguments needed)
 export const GitClearWorkingDirInputSchema = z.object({});
 /**

package/dist/mcp-server/tools/gitClearWorkingDir/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 { GitClearWorkingDirInputSchema, gitClearWorkingDirLogic } from './logic.js';
-import { BaseErrorCode } from '../../../types-global/errors.js';
 let _clearWorkingDirectory;
 let _getSessionId;
 /**

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

@@ -1,10 +1,13 @@
-import { z } from 'zod';
-import { promisify } from 'util';
 import { exec } from 'child_process';
 import fs from 'fs/promises';
-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_clone tool using Zod
 export const GitCloneInputSchema = z.object({

package/dist/mcp-server/tools/gitClone/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 from ../utils/internal/requestContext.js)
+import { requestContextService } from '../../../utils/index.js';
 import { GitCloneInputSchema, gitCloneLogic } from './logic.js';
-import { BaseErrorCode } from '../../../types-global/errors.js';
+import { BaseErrorCode } from '../../../types-global/errors.js'; // Keep direct import for types-global
 const TOOL_NAME = 'git_clone';
 const TOOL_DESCRIPTION = 'Clones a Git repository from a given URL into a specified absolute directory path. Supports cloning specific branches and setting clone depth.';
 /**