@trishchuk/codex-mcp-tool 1.0.6 → 1.3.0

package/dist/utils/workingDirResolver.js

@@ -0,0 +1,217 @@
+import { existsSync, statSync } from 'fs';
+import { dirname, resolve, isAbsolute } from 'path';
+import { Logger } from './logger.js';
+/**
+ * Project marker files that indicate the root of a project directory
+ */
+const PROJECT_MARKERS = [
+    'package.json', // Node.js/JavaScript
+    '.git', // Git repository
+    'pyproject.toml', // Python
+    'Cargo.toml', // Rust
+    'go.mod', // Go
+    'pom.xml', // Java (Maven)
+    'build.gradle', // Java (Gradle)
+    'composer.json', // PHP
+];
+/**
+ * Maximum levels to walk up the directory tree when searching for project root
+ */
+const MAX_WALK_UP_LEVELS = 10;
+/**
+ * Find the project root directory by walking up the directory tree
+ * looking for common project marker files.
+ *
+ * @param startPath - The directory or file path to start searching from
+ * @returns The project root directory, or the starting directory if no markers found
+ */
+export function findProjectRoot(startPath) {
+    try {
+        // Ensure we start from a directory, not a file
+        let currentDir = ensureDirectory(startPath);
+        if (!currentDir) {
+            Logger.debug(`findProjectRoot: Invalid start path: ${startPath}`);
+            return startPath;
+        }
+        // Walk up the directory tree looking for project markers
+        let levelsWalked = 0;
+        while (levelsWalked < MAX_WALK_UP_LEVELS) {
+            Logger.debug(`Checking for project markers in: ${currentDir}`);
+            // Check if any project marker exists in current directory
+            for (const marker of PROJECT_MARKERS) {
+                const markerPath = resolve(currentDir, marker);
+                if (existsSync(markerPath)) {
+                    Logger.debug(`Found project root at: ${currentDir} (marker: ${marker})`);
+                    return currentDir;
+                }
+            }
+            // Move up one directory
+            const parentDir = dirname(currentDir);
+            // Stop if we've reached the root directory
+            if (parentDir === currentDir) {
+                Logger.debug(`Reached filesystem root, using: ${currentDir}`);
+                break;
+            }
+            currentDir = parentDir;
+            levelsWalked++;
+        }
+        // If no markers found, return the starting directory
+        Logger.debug(`No project markers found, using start directory: ${currentDir}`);
+        return ensureDirectory(startPath) || startPath;
+    }
+    catch (error) {
+        Logger.debug(`Error in findProjectRoot: ${error}`);
+        return startPath;
+    }
+}
+/**
+ * Ensures that the provided path points to a directory.
+ * If the path is a file, returns its parent directory.
+ * If the path doesn't exist or is invalid, returns undefined.
+ * Supports both absolute and relative paths.
+ *
+ * @param path - The file or directory path (absolute or relative)
+ * @param baseDir - Base directory for resolving relative paths (default: process.cwd())
+ * @returns The directory path, or undefined if invalid
+ */
+export function ensureDirectory(path, baseDir = process.cwd()) {
+    if (!path) {
+        return undefined;
+    }
+    try {
+        // Resolve to absolute path if relative
+        const absolutePath = isAbsolute(path) ? path : resolve(baseDir, path);
+        Logger.debug(`Resolving path: ${path} -> ${absolutePath} (base: ${baseDir})`);
+        // Check if path exists
+        if (!existsSync(absolutePath)) {
+            Logger.debug(`Path does not exist: ${absolutePath}`);
+            return undefined;
+        }
+        // Get file stats
+        const stats = statSync(absolutePath);
+        // If it's a directory, return as-is
+        if (stats.isDirectory()) {
+            return absolutePath;
+        }
+        // If it's a file, return its parent directory
+        if (stats.isFile()) {
+            const parentDir = dirname(absolutePath);
+            Logger.debug(`Path is a file, using parent directory: ${parentDir}`);
+            return parentDir;
+        }
+        // If it's neither file nor directory (symlink, etc.), try to resolve
+        Logger.debug(`Path is neither file nor directory: ${absolutePath}`);
+        return undefined;
+    }
+    catch (error) {
+        Logger.debug(`Error in ensureDirectory: ${error}`);
+        return undefined;
+    }
+}
+/**
+ * Extract file paths from @path syntax in the prompt.
+ * Supports both quoted and unquoted paths, absolute and relative.
+ *
+ * Examples:
+ * - @/absolute/path/to/file.ts (absolute)
+ * - @./relative/path/to/file.ts (relative)
+ * - @src/file.ts (relative)
+ * - @"path with spaces/file.ts" (quoted, can be absolute or relative)
+ * - @'path with spaces/file.ts' (quoted, can be absolute or relative)
+ *
+ * @param prompt - The user prompt that may contain @path references
+ * @param baseDir - Base directory for resolving relative paths (default: process.cwd())
+ * @returns Array of absolute paths found in the prompt
+ */
+export function extractPathFromAtSyntax(prompt, baseDir = process.cwd()) {
+    const paths = [];
+    // Pattern 1: Quoted paths with @ prefix: @"path" or @'path'
+    const quotedPathRegex = /@["']([^"']+)["']/g;
+    let match;
+    while ((match = quotedPathRegex.exec(prompt)) !== null) {
+        const path = match[1];
+        // Convert to absolute if relative
+        const absolutePath = isAbsolute(path) ? path : resolve(baseDir, path);
+        paths.push(absolutePath);
+        Logger.debug(`Extracted quoted @path: ${path} -> ${absolutePath}`);
+    }
+    // Pattern 2: Unquoted absolute paths: @/path
+    const absolutePathRegex = /@(\/[^\s"']+)/g;
+    while ((match = absolutePathRegex.exec(prompt)) !== null) {
+        const path = match[1];
+        paths.push(path);
+        Logger.debug(`Extracted absolute @path: ${path}`);
+    }
+    // Pattern 3: Unquoted relative paths: @./path or @../path or @word/path
+    const relativePathRegex = /@(\.{1,2}\/[^\s"']+|[a-zA-Z0-9_-]+\/[^\s"']+)/g;
+    while ((match = relativePathRegex.exec(prompt)) !== null) {
+        const path = match[1];
+        const absolutePath = resolve(baseDir, path);
+        paths.push(absolutePath);
+        Logger.debug(`Extracted relative @path: ${path} -> ${absolutePath}`);
+    }
+    Logger.debug(`Extracted ${paths.length} paths from @syntax: ${paths.join(', ')}`);
+    return paths;
+}
+/**
+ * Resolve the working directory using a fallback chain with multiple strategies.
+ *
+ * Priority order (highest to lowest):
+ * 1. Explicit workingDir parameter
+ * 2. Environment variables: CODEX_MCP_CWD > PWD > INIT_CWD
+ * 3. Automatic inference from @path syntax in prompt
+ * 4. process.cwd() as last resort
+ *
+ * @param options - Resolution options
+ * @returns The resolved working directory path
+ */
+export function resolveWorkingDirectory(options) {
+    const { workingDir, prompt } = options || {};
+    // Get a base directory for resolving relative paths
+    const baseDir = process.env['CODEX_MCP_CWD'] || process.env['PWD'] || process.env['INIT_CWD'] || process.cwd();
+    // Priority 1: Explicit workingDir parameter
+    if (workingDir) {
+        const validDir = ensureDirectory(workingDir, baseDir);
+        if (validDir) {
+            Logger.debug(`Using explicit working directory: ${validDir}`);
+            return validDir;
+        }
+        else {
+            Logger.warn(`Explicit workingDir is invalid: ${workingDir}`);
+        }
+    }
+    // Priority 2: Environment variables
+    const envVars = ['CODEX_MCP_CWD', 'PWD', 'INIT_CWD'];
+    for (const envVar of envVars) {
+        const envValue = process.env[envVar];
+        if (envValue) {
+            const validDir = ensureDirectory(envValue, process.cwd());
+            if (validDir) {
+                Logger.debug(`Using environment variable ${envVar}: ${validDir}`);
+                return validDir;
+            }
+            else {
+                Logger.debug(`Environment variable ${envVar} is invalid: ${envValue}`);
+            }
+        }
+    }
+    // Priority 3: Automatic inference from @path syntax
+    if (prompt) {
+        const paths = extractPathFromAtSyntax(prompt, baseDir);
+        for (const path of paths) {
+            if (existsSync(path)) {
+                // Find the project root for this path
+                const projectRoot = findProjectRoot(path);
+                if (projectRoot) {
+                    Logger.debug(`Inferred working directory from @path syntax: ${projectRoot}`);
+                    return projectRoot;
+                }
+            }
+        }
+    }
+    // Priority 4: process.cwd() as fallback
+    const cwd = process.cwd();
+    Logger.debug(`Using process.cwd() as working directory: ${cwd}`);
+    return cwd;
+}
+//# sourceMappingURL=workingDirResolver.js.map

package/dist/utils/workingDirResolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workingDirResolver.js","sourceRoot":"","sources":["../../src/utils/workingDirResolver.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trishchuk/codex-mcp-tool",
-  "version": "1.0.6",
+  "version": "1.3.0",
   "description": "MCP server for Codex CLI integration",
   "type": "module",
   "main": "dist/index.js",
@@ -13,6 +13,8 @@
     "dev": "tsc && node dist/index.js",
     "test": "echo \"No tests yet\" && exit 0",
     "lint": "tsc --noEmit",
+    "format": "prettier --write \"src/**/*.{ts,js,json,md}\" \"docs/**/*.{md,json}\" \"*.{md,json}\"",
+    "format:check": "prettier --check \"src/**/*.{ts,js,json,md}\" \"docs/**/*.{md,json}\" \"*.{md,json}\"",
     "prepublishOnly": "echo '⚠️  Remember to test locally first!' && npm run build",
     "docs:dev": "vitepress dev docs",
     "docs:build": "vitepress build docs",
@@ -52,19 +54,22 @@
   ],
   "dependencies": {
     "@modelcontextprotocol/sdk": "^0.6.1",
+    "cross-spawn": "^7.0.6",
     "zod": "^3.25.76",
     "zod-to-json-schema": "^3.24.6"
   },
   "devDependencies": {
+    "@types/cross-spawn": "^6.0.6",
     "@types/inquirer": "^9.0.0",
     "@types/node": "^18.19.124",
     "archiver": "^7.0.1",
     "mermaid": "^11.9.0",
+    "prettier": "^3.6.2",
+    "prismjs": "^1.30.0",
     "tsx": "^4.20.5",
     "typescript": "^5.0.0",
     "vitepress": "^1.6.4",
-    "vitepress-plugin-mermaid": "^2.0.17",
-    "prismjs": "^1.30.0"
+    "vitepress-plugin-mermaid": "^2.0.17"
   },
   "publishConfig": {
     "access": "public"