@cyanheads/git-mcp-server 2.1.1 → 2.1.2

package/dist/utils/metrics/tokenCounter.js

@@ -1,9 +1,9 @@
-import { encoding_for_model } from 'tiktoken';
-import { BaseErrorCode } from '../../types-global/errors.js';
+import { encoding_for_model } from "tiktoken";
+import { BaseErrorCode } from "../../types-global/errors.js";
 // Import utils from the main barrel file (ErrorHandler, logger, RequestContext from ../internal/*)
-import { ErrorHandler, logger } from '../index.js';
+import { ErrorHandler, logger } from "../index.js";
 // Define the model used specifically for token counting
-const TOKENIZATION_MODEL = 'gpt-4o'; // Note this is strictly for token counting, not the model used for inference
+const TOKENIZATION_MODEL = "gpt-4o"; // Note this is strictly for token counting, not the model used for inference
 /**
  * Calculates the number of tokens for a given text using the 'gpt-4o' tokenizer.
  * Uses ErrorHandler for consistent error management.
@@ -27,11 +27,11 @@ export async function countTokens(text, context) {
             encoding?.free(); // Ensure the encoder is freed if it was successfully created
         }
     }, {
-        operation: 'countTokens',
+        operation: "countTokens",
         context: context,
-        input: { textSample: text.substring(0, 50) + '...' }, // Log sanitized input
+        input: { textSample: text.substring(0, 50) + "..." }, // Log sanitized input
         errorCode: BaseErrorCode.INTERNAL_ERROR, // Use INTERNAL_ERROR for external lib issues
-        rethrow: true // Rethrow as McpError
+        rethrow: true, // Rethrow as McpError
         // Removed onErrorReturn as we now rethrow
     });
 }
@@ -65,13 +65,13 @@ context) {
                 // Encode role
                 num_tokens += encoding.encode(message.role).length;
                 // Encode content - handle potential null or array content (vision)
-                if (typeof message.content === 'string') {
+                if (typeof message.content === "string") {
                     num_tokens += encoding.encode(message.content).length;
                 }
                 else if (Array.isArray(message.content)) {
                     // Handle multi-part content (e.g., text + image) - simplified: encode text parts only
                     for (const part of message.content) {
-                        if (part.type === 'text') {
+                        if (part.type === "text") {
                             num_tokens += encoding.encode(part.text).length;
                         }
                         else {
@@ -83,13 +83,15 @@ context) {
                     }
                 } // else: content is null, add 0 tokens
                 // Encode name if present (often associated with 'tool' or 'function' roles in newer models)
-                if ('name' in message && message.name) {
+                if ("name" in message && message.name) {
                     num_tokens += tokens_per_name;
                     num_tokens += encoding.encode(message.name).length;
                 }
                 // --- Handle tool calls (specific to newer models) ---
                 // Assistant message requesting tool calls
-                if (message.role === 'assistant' && 'tool_calls' in message && message.tool_calls) {
+                if (message.role === "assistant" &&
+                    "tool_calls" in message &&
+                    message.tool_calls) {
                     for (const tool_call of message.tool_calls) {
                         // Add tokens for the function name and arguments
                         if (tool_call.function.name) {
@@ -102,7 +104,9 @@ context) {
                     }
                 }
                 // Tool message providing results
-                if (message.role === 'tool' && 'tool_call_id' in message && message.tool_call_id) {
+                if (message.role === "tool" &&
+                    "tool_call_id" in message &&
+                    message.tool_call_id) {
                     num_tokens += encoding.encode(message.tool_call_id).length;
                     // Content of the tool message (the result) is already handled by the string content check above
                 }
@@ -114,11 +118,11 @@ context) {
             encoding?.free();
         }
     }, {
-        operation: 'countChatTokens',
+        operation: "countChatTokens",
         context: context,
         input: { messageCount: messages.length }, // Log sanitized input
         errorCode: BaseErrorCode.INTERNAL_ERROR, // Use INTERNAL_ERROR
-        rethrow: true // Rethrow as McpError
+        rethrow: true, // Rethrow as McpError
         // Removed onErrorReturn
     });
 }

package/dist/utils/parsing/dateParser.js

@@ -1,7 +1,7 @@
-import * as chrono from 'chrono-node';
+import * as chrono from "chrono-node";
 // Import utils from the main barrel file (logger, ErrorHandler, RequestContext from ../internal/*)
-import { logger, ErrorHandler } from '../index.js';
-import { BaseErrorCode } from '../../types-global/errors.js'; // Corrected path
+import { logger, ErrorHandler } from "../index.js";
+import { BaseErrorCode } from "../../types-global/errors.js"; // Corrected path
 /**
  * Parses a natural language date string into a Date object.
  *
@@ -12,7 +12,7 @@ import { BaseErrorCode } from '../../types-global/errors.js'; // Corrected path
  * @throws McpError if parsing fails unexpectedly.
  */
 async function parseDateString(text, context, refDate) {
-    const operation = 'parseDateString';
+    const operation = "parseDateString";
     const logContext = { ...context, operation, inputText: text, refDate };
     logger.debug(`Attempting to parse date string: "${text}"`, logContext);
     return await ErrorHandler.tryCatch(async () => {
@@ -42,7 +42,7 @@ async function parseDateString(text, context, refDate) {
  * @throws McpError if parsing fails unexpectedly.
  */
 async function parseDateStringDetailed(text, context, refDate) {
-    const operation = 'parseDateStringDetailed';
+    const operation = "parseDateStringDetailed";
     const logContext = { ...context, operation, inputText: text, refDate };
     logger.debug(`Attempting detailed parse of date string: "${text}"`, logContext);
     return await ErrorHandler.tryCatch(async () => {

package/dist/utils/parsing/index.js

@@ -1,2 +1,2 @@
-export * from './jsonParser.js';
-export * from './dateParser.js';
+export * from "./jsonParser.js";
+export * from "./dateParser.js";

package/dist/utils/parsing/jsonParser.js

@@ -1,7 +1,7 @@
-import { parse as parsePartialJson, Allow as PartialJsonAllow } from 'partial-json';
-import { BaseErrorCode, McpError } from '../../types-global/errors.js';
+import { parse as parsePartialJson, Allow as PartialJsonAllow, } from "partial-json";
+import { BaseErrorCode, McpError } from "../../types-global/errors.js";
 // Import utils from the main barrel file (logger, RequestContext from ../internal/*)
-import { logger } from '../index.js';
+import { logger } from "../index.js";
 /**
  * Enum mirroring partial-json's Allow constants for specifying
  * what types of partial JSON structures are permissible during parsing.
@@ -34,10 +34,13 @@ class JsonParser {
             const thinkContent = match[1].trim();
             const restOfString = match[2];
             if (thinkContent) {
-                logger.debug('LLM <think> block detected and logged.', { ...context, thinkContent });
+                logger.debug("LLM <think> block detected and logged.", {
+                    ...context,
+                    thinkContent,
+                });
             }
             else {
-                logger.debug('Empty LLM <think> block detected.', context);
+                logger.debug("Empty LLM <think> block detected.", context);
             }
             stringToParse = restOfString; // Parse only the part after </think>
         }
@@ -45,17 +48,18 @@ class JsonParser {
         stringToParse = stringToParse.trim();
         if (!stringToParse) {
             // If after removing think block and trimming, the string is empty, it's an error
-            throw new McpError(BaseErrorCode.VALIDATION_ERROR, 'JSON string is empty after removing <think> block.', context);
+            throw new McpError(BaseErrorCode.VALIDATION_ERROR, "JSON string is empty after removing <think> block.", context);
         }
         try {
             // Ensure the string starts with '{' or '[' if we expect an object or array after stripping <think>
             // This helps catch cases where only non-JSON text remains.
-            if (!stringToParse.startsWith('{') && !stringToParse.startsWith('[')) {
+            if (!stringToParse.startsWith("{") && !stringToParse.startsWith("[")) {
                 // Check if it might be a simple string value that partial-json could parse
                 // Allow simple strings only if specifically permitted or Allow.ALL is used
                 const allowsString = (allowPartial & Allow.STR) === Allow.STR;
-                if (!allowsString && !stringToParse.startsWith('"')) { // Allow quoted strings if Allow.STR is set
-                    throw new Error('Remaining content does not appear to be valid JSON object or array.');
+                if (!allowsString && !stringToParse.startsWith('"')) {
+                    // Allow quoted strings if Allow.STR is set
+                    throw new Error("Remaining content does not appear to be valid JSON object or array.");
                 }
                 // If it starts with a quote and strings are allowed, let parsePartialJson handle it
             }
@@ -64,11 +68,16 @@ class JsonParser {
         catch (error) {
             // Wrap the original error in an McpError for consistent error handling
             // Include the original error message for better debugging context.
-            logger.error('Failed to parse JSON content.', { ...context, error: error.message, contentAttempted: stringToParse });
+            logger.error("Failed to parse JSON content.", {
+                ...context,
+                error: error.message,
+                contentAttempted: stringToParse,
+            });
             throw new McpError(BaseErrorCode.VALIDATION_ERROR, `Failed to parse JSON: ${error.message}`, {
+                // Combine context and details into the third argument
                 ...context,
                 originalContent: stringToParse,
-                rawError: error instanceof Error ? error.stack : String(error) // Include raw error info
+                rawError: error instanceof Error ? error.stack : String(error), // Include raw error info
             });
         }
     }

package/dist/utils/security/idGenerator.js

@@ -1,13 +1,13 @@
-import { randomBytes, randomUUID as cryptoRandomUUID } from 'crypto'; // Import cryptoRandomUUID
-import { BaseErrorCode, McpError } from '../../types-global/errors.js'; // Corrected path
+import { randomBytes, randomUUID as cryptoRandomUUID } from "crypto"; // Import cryptoRandomUUID
+import { BaseErrorCode, McpError } from "../../types-global/errors.js"; // Corrected path
 /**
  * Generic ID Generator class for creating and managing unique identifiers
  */
 export class IdGenerator {
     // Default charset
-    static DEFAULT_CHARSET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+    static DEFAULT_CHARSET = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
     // Default separator
-    static DEFAULT_SEPARATOR = '_';
+    static DEFAULT_SEPARATOR = "_";
     // Default random part length
     static DEFAULT_LENGTH = 6;
     // Entity prefixes
@@ -50,7 +50,7 @@ export class IdGenerator {
      */
     generateRandomString(length = IdGenerator.DEFAULT_LENGTH, charset = IdGenerator.DEFAULT_CHARSET) {
         const bytes = randomBytes(length);
-        let result = '';
+        let result = "";
         for (let i = 0; i < length; i++) {
             result += charset[bytes[i] % charset.length];
         }
@@ -63,11 +63,9 @@ export class IdGenerator {
      * @returns A unique identifier string
      */
     generate(prefix, options = {}) {
-        const { length = IdGenerator.DEFAULT_LENGTH, separator = IdGenerator.DEFAULT_SEPARATOR, charset = IdGenerator.DEFAULT_CHARSET } = options;
+        const { length = IdGenerator.DEFAULT_LENGTH, separator = IdGenerator.DEFAULT_SEPARATOR, charset = IdGenerator.DEFAULT_CHARSET, } = options;
         const randomPart = this.generateRandomString(length, charset);
-        return prefix
-            ? `${prefix}${separator}${randomPart}`
-            : randomPart;
+        return prefix ? `${prefix}${separator}${randomPart}` : randomPart;
     }
     /**
      * Generates a custom ID for an entity with format PREFIX_XXXXXX
@@ -92,7 +90,7 @@ export class IdGenerator {
      */
     isValid(id, entityType, options = {}) {
         const prefix = this.entityPrefixes[entityType];
-        const { length = IdGenerator.DEFAULT_LENGTH, separator = IdGenerator.DEFAULT_SEPARATOR } = options;
+        const { length = IdGenerator.DEFAULT_LENGTH, separator = IdGenerator.DEFAULT_SEPARATOR, } = options;
         if (!prefix) {
             return false;
         }

package/dist/utils/security/index.js

@@ -1,3 +1,3 @@
-export * from './sanitization.js';
-export * from './rateLimiter.js';
-export * from './idGenerator.js';
+export * from "./sanitization.js";
+export * from "./rateLimiter.js";
+export * from "./idGenerator.js";

package/dist/utils/security/rateLimiter.js

@@ -1,7 +1,7 @@
-import { BaseErrorCode, McpError } from '../../types-global/errors.js';
+import { BaseErrorCode, McpError } from "../../types-global/errors.js";
 // Import config and utils
-import { environment } from '../../config/index.js'; // Import environment from config
-import { logger } from '../index.js';
+import { environment } from "../../config/index.js"; // Import environment from config
+import { logger } from "../index.js";
 /**
  * Generic rate limiter that can be used across the application
  */
@@ -15,9 +15,9 @@ export class RateLimiter {
     static DEFAULT_CONFIG = {
         windowMs: 15 * 60 * 1000, // 15 minutes
         maxRequests: 100, // 100 requests per window
-        errorMessage: 'Rate limit exceeded. Please try again in {waitTime} seconds.',
+        errorMessage: "Rate limit exceeded. Please try again in {waitTime} seconds.",
         skipInDevelopment: false,
-        cleanupInterval: 5 * 60 * 1000 // 5 minutes
+        cleanupInterval: 5 * 60 * 1000, // 5 minutes
     };
     /**
      * Create a new rate limiter
@@ -63,7 +63,7 @@ export class RateLimiter {
         }
         if (expiredCount > 0) {
             logger.debug(`Cleaned up ${expiredCount} expired rate limit entries`, {
-                totalRemaining: this.limits.size
+                totalRemaining: this.limits.size,
             });
         }
     }
@@ -90,7 +90,7 @@ export class RateLimiter {
      */
     reset() {
         this.limits.clear();
-        logger.debug('Rate limiter reset, all limits cleared');
+        logger.debug("Rate limiter reset, all limits cleared");
     }
     /**
      * Check if a request exceeds the rate limit
@@ -100,7 +100,7 @@ export class RateLimiter {
      */
     check(key, context) {
         // Skip in development if configured, using the validated environment from config
-        if (this.config.skipInDevelopment && environment === 'development') {
+        if (this.config.skipInDevelopment && environment === "development") {
             return;
         }
         // Generate key using custom generator if provided
@@ -117,7 +117,7 @@ export class RateLimiter {
             if (!entry || now >= entry.resetTime) {
                 const newEntry = {
                     count: 1,
-                    resetTime: now + this.config.windowMs
+                    resetTime: now + this.config.windowMs,
                 };
                 this.limits.set(limitKey, newEntry);
                 return newEntry;
@@ -125,9 +125,11 @@ export class RateLimiter {
             // Check if limit exceeded
             if (entry.count >= this.config.maxRequests) {
                 const waitTime = Math.ceil((entry.resetTime - now) / 1000);
-                const errorMessage = this.config.errorMessage?.replace('{waitTime}', waitTime.toString()) ||
-                    `Rate limit exceeded. Please try again in ${waitTime} seconds.`;
-                throw new McpError(BaseErrorCode.RATE_LIMITED, errorMessage, { waitTime, key: limitKey });
+                const errorMessage = this.config.errorMessage?.replace("{waitTime}", waitTime.toString()) || `Rate limit exceeded. Please try again in ${waitTime} seconds.`;
+                throw new McpError(BaseErrorCode.RATE_LIMITED, errorMessage, {
+                    waitTime,
+                    key: limitKey,
+                });
             }
             // Increment counter and return updated entry
             entry.count++;
@@ -150,7 +152,7 @@ export class RateLimiter {
             current: entry.count,
             limit: this.config.maxRequests,
             remaining: Math.max(0, this.config.maxRequests - entry.count),
-            resetTime: entry.resetTime
+            resetTime: entry.resetTime,
         };
     }
     /**
@@ -170,5 +172,5 @@ export class RateLimiter {
  */
 export const rateLimiter = new RateLimiter({
     windowMs: 15 * 60 * 1000, // 15 minutes
-    maxRequests: 100 // 100 requests per window
+    maxRequests: 100, // 100 requests per window
 });