@treedy/pyright-mcp 1.1.2 → 1.1.3

package/dist/tools/rename.js

@@ -1,153 +0,0 @@
-import { z } from 'zod';
-import { execSync } from 'child_process';
-import { readFileSync } from 'fs';
-import { findProjectRoot } from '../utils/position.js';
-export const renameSchema = {
-    file: z.string().describe('Absolute path to the Python file'),
-    line: z.number().int().positive().describe('Line number (1-based)'),
-    column: z.number().int().positive().describe('Column number (1-based)'),
-    newName: z.string().describe('New name for the symbol'),
-};
-function getSymbolAtPosition(filePath, line, column) {
-    try {
-        const content = readFileSync(filePath, 'utf-8');
-        const lines = content.split('\n');
-        const targetLine = lines[line - 1];
-        if (!targetLine)
-            return null;
-        // Find word at position
-        const col = column - 1;
-        let start = col;
-        let end = col;
-        // Expand left
-        while (start > 0 && /[\w_]/.test(targetLine[start - 1])) {
-            start--;
-        }
-        // Expand right
-        while (end < targetLine.length && /[\w_]/.test(targetLine[end])) {
-            end++;
-        }
-        const symbol = targetLine.slice(start, end);
-        return symbol.length > 0 ? { symbol, start: start + 1, end: end + 1 } : null;
-    }
-    catch {
-        return null;
-    }
-}
-export async function rename(args) {
-    const { file, line, column, newName } = args;
-    // Get symbol name at position
-    const symbolInfo = getSymbolAtPosition(file, line, column);
-    if (!symbolInfo) {
-        return {
-            content: [{ type: 'text', text: 'Could not identify symbol at this position.' }],
-        };
-    }
-    const { symbol: oldName } = symbolInfo;
-    if (oldName === newName) {
-        return {
-            content: [{ type: 'text', text: 'New name is the same as the old name.' }],
-        };
-    }
-    // Find project root
-    const projectRoot = findProjectRoot(file);
-    // Use ripgrep to find all references in Python files
-    const pattern = `\\b${oldName}\\b`;
-    let rgOutput;
-    try {
-        rgOutput = execSync(`rg --no-heading --line-number --column --type py "${pattern}" "${projectRoot}"`, {
-            encoding: 'utf-8',
-            maxBuffer: 10 * 1024 * 1024,
-            timeout: 30000,
-        });
-    }
-    catch (e) {
-        const error = e;
-        if (error.status === 1) {
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: `No references found for symbol \`${oldName}\``,
-                    },
-                ],
-            };
-        }
-        // Try grep as fallback
-        try {
-            rgOutput = execSync(`grep -rn --include="*.py" -w "${oldName}" "${projectRoot}"`, {
-                encoding: 'utf-8',
-                maxBuffer: 10 * 1024 * 1024,
-                timeout: 30000,
-            });
-        }
-        catch {
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: `No references found for symbol \`${oldName}\``,
-                    },
-                ],
-            };
-        }
-    }
-    // Parse output and create edits
-    const edits = [];
-    const outputLines = rgOutput.trim().split('\n').filter(Boolean);
-    for (const outputLine of outputLines) {
-        // Format: /path/to/file.py:10:5:    some code here
-        const match = outputLine.match(/^(.+?):(\d+):(\d+):(.*)$/);
-        if (match) {
-            const [, filePath, lineNum, colNum, lineContent] = match;
-            const col = parseInt(colNum, 10);
-            edits.push({
-                file: filePath,
-                line: parseInt(lineNum, 10),
-                column: col,
-                endColumn: col + oldName.length,
-                oldText: oldName,
-                newText: newName,
-                lineContent: lineContent.trim(),
-            });
-        }
-    }
-    if (edits.length === 0) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `No references found for symbol \`${oldName}\``,
-                },
-            ],
-        };
-    }
-    // Group by file
-    const byFile = new Map();
-    for (const edit of edits) {
-        const list = byFile.get(edit.file) || [];
-        list.push(edit);
-        byFile.set(edit.file, list);
-    }
-    let output = `**Rename Preview**\n\n`;
-    output += `- Symbol: \`${oldName}\` → \`${newName}\`\n`;
-    output += `- Found ${edits.length} occurrence(s) in ${byFile.size} file(s)\n\n`;
-    output += `---\n\n`;
-    for (const [filePath, fileEdits] of byFile) {
-        output += `### ${filePath}\n\n`;
-        for (const edit of fileEdits) {
-            const preview = edit.lineContent.replace(new RegExp(`\\b${oldName}\\b`), `~~${oldName}~~ **${newName}**`);
-            output += `- Line ${edit.line}: ${preview}\n`;
-        }
-        output += '\n';
-    }
-    output += `---\n\n`;
-    output += `**Note:** This is a preview only. To apply the rename, use your editor's rename feature or run:\n`;
-    output += `\`\`\`bash\n`;
-    output += `# Using sed (backup recommended)\n`;
-    output += `find "${projectRoot}" -name "*.py" -exec sed -i '' 's/\\b${oldName}\\b/${newName}/g' {} +\n`;
-    output += `\`\`\``;
-    return {
-        content: [{ type: 'text', text: output }],
-    };
-}

package/dist/tools/search.js

@@ -1,91 +0,0 @@
-import { z } from 'zod';
-import { execSync } from 'child_process';
-import * as path from 'path';
-export const searchSchema = {
-    pattern: z.string().describe('The regex pattern to search for'),
-    path: z.string().optional().describe('Directory or file to search in (defaults to current working directory)'),
-    glob: z.string().optional().describe('Glob pattern to filter files (e.g., "*.py", "**/*.ts")'),
-    caseSensitive: z.boolean().optional().default(true).describe('Whether the search is case sensitive'),
-    maxResults: z.number().int().positive().optional().default(50).describe('Maximum number of results to return'),
-};
-export async function search(args) {
-    const searchPath = args.path || process.cwd();
-    const caseSensitive = args.caseSensitive ?? true;
-    const maxResults = args.maxResults ?? 50;
-    // Build rg command
-    const rgArgs = [
-        '--json',
-        '--line-number',
-        '--column',
-    ];
-    if (!caseSensitive) {
-        rgArgs.push('--ignore-case');
-    }
-    if (args.glob) {
-        rgArgs.push('--glob', args.glob);
-    }
-    rgArgs.push('--', args.pattern, searchPath);
-    try {
-        const result = execSync(`rg ${rgArgs.map(a => `'${a}'`).join(' ')}`, {
-            encoding: 'utf-8',
-            maxBuffer: 10 * 1024 * 1024, // 10MB
-        });
-        const results = [];
-        const lines = result.split('\n').filter(Boolean);
-        for (const line of lines) {
-            if (results.length >= maxResults)
-                break;
-            try {
-                const json = JSON.parse(line);
-                if (json.type === 'match') {
-                    const data = json.data;
-                    const filePath = data.path.text;
-                    const lineNumber = data.line_number;
-                    const lineText = data.lines.text.trimEnd();
-                    // Get all matches in this line
-                    for (const submatch of data.submatches) {
-                        if (results.length >= maxResults)
-                            break;
-                        results.push({
-                            file: path.resolve(filePath),
-                            line: lineNumber,
-                            column: submatch.start + 1, // Convert to 1-based
-                            text: lineText,
-                            match: submatch.match.text,
-                        });
-                    }
-                }
-            }
-            catch {
-                // Skip non-JSON lines
-            }
-        }
-        if (results.length === 0) {
-            return {
-                content: [{ type: 'text', text: `No matches found for pattern: ${args.pattern}` }],
-            };
-        }
-        let output = `**Search Results** for \`${args.pattern}\`\n\n`;
-        output += `Found ${results.length} match(es)${results.length >= maxResults ? ` (limited to ${maxResults})` : ''}:\n\n`;
-        for (const r of results) {
-            output += `**${r.file}:${r.line}:${r.column}**\n`;
-            output += `  \`${r.text}\`\n`;
-            output += `  Match: \`${r.match}\`\n\n`;
-        }
-        return {
-            content: [{ type: 'text', text: output }],
-        };
-    }
-    catch (err) {
-        const error = err;
-        if (error.status === 1) {
-            // rg returns 1 when no matches found
-            return {
-                content: [{ type: 'text', text: `No matches found for pattern: ${args.pattern}` }],
-            };
-        }
-        return {
-            content: [{ type: 'text', text: `Search error: ${error.message || 'Unknown error'}` }],
-        };
-    }
-}

package/dist/tools/signature-help.js

@@ -1,54 +0,0 @@
-import { z } from 'zod';
-import { getLspClient } from '../lsp-client.js';
-import { toPosition } from '../utils/position.js';
-export const signatureHelpSchema = {
-    file: z.string().describe('Absolute path to the Python file'),
-    line: z.number().int().positive().describe('Line number (1-based)'),
-    column: z.number().int().positive().describe('Column number (1-based)'),
-};
-export async function signatureHelp(args) {
-    const client = getLspClient();
-    const position = toPosition(args.line, args.column);
-    const result = await client.signatureHelp(args.file, position);
-    if (!result || result.signatures.length === 0) {
-        return {
-            content: [{ type: 'text', text: 'No signature help available at this position.' }],
-        };
-    }
-    let output = `**Signature Help** at ${args.file}:${args.line}:${args.column}\n\n`;
-    const activeIndex = result.activeSignature ?? 0;
-    const activeParam = result.activeParameter ?? 0;
-    for (let i = 0; i < result.signatures.length; i++) {
-        const sig = result.signatures[i];
-        const isActive = i === activeIndex;
-        output += `${isActive ? '→ ' : '  '}**${sig.label}**\n`;
-        if (sig.documentation) {
-            const doc = typeof sig.documentation === 'string'
-                ? sig.documentation
-                : sig.documentation.value;
-            output += `  ${doc}\n`;
-        }
-        if (sig.parameters && sig.parameters.length > 0) {
-            output += `\n  Parameters:\n`;
-            for (let j = 0; j < sig.parameters.length; j++) {
-                const param = sig.parameters[j];
-                const isActiveParam = isActive && j === activeParam;
-                const label = typeof param.label === 'string'
-                    ? param.label
-                    : sig.label.slice(param.label[0], param.label[1]);
-                output += `  ${isActiveParam ? '→ ' : '  '}${label}`;
-                if (param.documentation) {
-                    const paramDoc = typeof param.documentation === 'string'
-                        ? param.documentation
-                        : param.documentation.value;
-                    output += ` - ${paramDoc}`;
-                }
-                output += '\n';
-            }
-        }
-        output += '\n';
-    }
-    return {
-        content: [{ type: 'text', text: output }],
-    };
-}

package/dist/tools/status.js

@@ -1,147 +0,0 @@
-import { z } from 'zod';
-import { execSync } from 'child_process';
-import { existsSync, readFileSync } from 'fs';
-import { join } from 'path';
-import { findProjectRoot } from '../utils/position.js';
-export const statusSchema = {
-    file: z.string().describe('A Python file path to check the project status for'),
-};
-export async function status(args) {
-    const { file } = args;
-    const lines = [];
-    // Find project root
-    const projectRoot = findProjectRoot(file);
-    lines.push(`## Project Root`);
-    lines.push(`\`${projectRoot}\``);
-    lines.push('');
-    // Check pyright installation
-    lines.push(`## Pyright`);
-    try {
-        const pyrightVersion = execSync('pyright --version', { encoding: 'utf-8' }).trim();
-        lines.push(`- Version: ${pyrightVersion}`);
-    }
-    catch {
-        lines.push(`- ⚠️ **Not installed or not in PATH**`);
-        lines.push(`  Install with: \`npm install -g pyright\``);
-    }
-    lines.push('');
-    // Check pyright config
-    lines.push(`## Pyright Config`);
-    const pyrightConfigPath = join(projectRoot, 'pyrightconfig.json');
-    const pyprojectPath = join(projectRoot, 'pyproject.toml');
-    if (existsSync(pyrightConfigPath)) {
-        lines.push(`- Config file: \`pyrightconfig.json\``);
-        try {
-            const config = JSON.parse(readFileSync(pyrightConfigPath, 'utf-8'));
-            if (config.pythonVersion) {
-                lines.push(`- Python version: ${config.pythonVersion}`);
-            }
-            if (config.pythonPlatform) {
-                lines.push(`- Platform: ${config.pythonPlatform}`);
-            }
-            if (config.venvPath) {
-                lines.push(`- Venv path: ${config.venvPath}`);
-            }
-            if (config.venv) {
-                lines.push(`- Venv: ${config.venv}`);
-            }
-            if (config.typeCheckingMode) {
-                lines.push(`- Type checking mode: ${config.typeCheckingMode}`);
-            }
-            if (config.include) {
-                lines.push(`- Include: ${JSON.stringify(config.include)}`);
-            }
-            if (config.exclude) {
-                lines.push(`- Exclude: ${JSON.stringify(config.exclude)}`);
-            }
-        }
-        catch (e) {
-            lines.push(`- ⚠️ Failed to parse config: ${e}`);
-        }
-    }
-    else if (existsSync(pyprojectPath)) {
-        lines.push(`- Config file: \`pyproject.toml\` (may contain [tool.pyright] section)`);
-    }
-    else {
-        lines.push(`- ⚠️ No pyrightconfig.json or pyproject.toml found`);
-        lines.push(`  Pyright will use default settings`);
-    }
-    lines.push('');
-    // Check Python environment
-    lines.push(`## Python Environment`);
-    try {
-        const pythonVersion = execSync('python3 --version', { encoding: 'utf-8' }).trim();
-        lines.push(`- System Python: ${pythonVersion}`);
-    }
-    catch {
-        try {
-            const pythonVersion = execSync('python --version', { encoding: 'utf-8' }).trim();
-            lines.push(`- System Python: ${pythonVersion}`);
-        }
-        catch {
-            lines.push(`- ⚠️ Python not found in PATH`);
-        }
-    }
-    // Check for virtual environment
-    const venvPaths = ['.venv', 'venv', '.env', 'env'];
-    for (const venv of venvPaths) {
-        const venvPath = join(projectRoot, venv);
-        if (existsSync(venvPath)) {
-            lines.push(`- Virtual env found: \`${venv}/\``);
-            // Try to get venv python version
-            const venvPython = join(venvPath, 'bin', 'python');
-            if (existsSync(venvPython)) {
-                try {
-                    const venvVersion = execSync(`"${venvPython}" --version`, { encoding: 'utf-8' }).trim();
-                    lines.push(`  - ${venvVersion}`);
-                }
-                catch {
-                    // ignore
-                }
-            }
-            break;
-        }
-    }
-    lines.push('');
-    // Quick pyright check on the file
-    lines.push(`## File Check`);
-    lines.push(`- File: \`${file}\``);
-    if (existsSync(file)) {
-        lines.push(`- Exists: ✅`);
-        try {
-            const result = execSync(`pyright "${file}" --outputjson`, {
-                encoding: 'utf-8',
-                cwd: projectRoot,
-                timeout: 30000,
-            });
-            const output = JSON.parse(result);
-            const errors = output.generalDiagnostics?.filter((d) => d.severity === 'error')?.length || 0;
-            const warnings = output.generalDiagnostics?.filter((d) => d.severity === 'warning')?.length || 0;
-            lines.push(`- Diagnostics: ${errors} errors, ${warnings} warnings`);
-        }
-        catch (e) {
-            // pyright returns non-zero exit code if there are errors
-            const error = e;
-            if (error.stdout) {
-                try {
-                    const output = JSON.parse(error.stdout);
-                    const errors = output.generalDiagnostics?.filter((d) => d.severity === 'error')?.length || 0;
-                    const warnings = output.generalDiagnostics?.filter((d) => d.severity === 'warning')?.length || 0;
-                    lines.push(`- Diagnostics: ${errors} errors, ${warnings} warnings`);
-                }
-                catch {
-                    lines.push(`- ⚠️ Could not run pyright check`);
-                }
-            }
-            else {
-                lines.push(`- ⚠️ Could not run pyright check`);
-            }
-        }
-    }
-    else {
-        lines.push(`- Exists: ❌ File not found`);
-    }
-    return {
-        content: [{ type: 'text', text: lines.join('\n') }],
-    };
-}

package/dist/utils/position.js

@@ -1,74 +0,0 @@
-import { Position } from 'vscode-languageserver-protocol';
-import { existsSync } from 'fs';
-import { dirname, join, resolve } from 'path';
-/**
- * Convert 1-based line/column (user input) to 0-based LSP Position
- */
-export function toPosition(line, column) {
-    return Position.create(line - 1, column - 1);
-}
-/**
- * Convert 0-based LSP Position to 1-based line/column (user output)
- */
-export function fromPosition(pos) {
-    return {
-        line: pos.line + 1,
-        column: pos.character + 1,
-    };
-}
-/**
- * Format a Location for display
- */
-export function formatLocation(loc) {
-    const start = fromPosition(loc.range.start);
-    const end = fromPosition(loc.range.end);
-    return `${loc.uri}:${start.line}:${start.column}-${end.line}:${end.column}`;
-}
-/**
- * Format a Range for display
- */
-export function formatRange(range) {
-    const start = fromPosition(range.start);
-    const end = fromPosition(range.end);
-    return `${start.line}:${start.column}-${end.line}:${end.column}`;
-}
-/**
- * Convert file path to URI
- */
-export function pathToUri(filePath) {
-    if (filePath.startsWith('file://')) {
-        return filePath;
-    }
-    return `file://${filePath}`;
-}
-/**
- * Convert URI to file path
- */
-export function uriToPath(uri) {
-    if (uri.startsWith('file://')) {
-        return uri.slice(7);
-    }
-    return uri;
-}
-/**
- * Find project root by looking for pyrightconfig.json or pyproject.toml
- * starting from the given file path and walking up the directory tree
- */
-export function findProjectRoot(filePath) {
-    const configFiles = ['pyrightconfig.json', 'pyproject.toml', '.git'];
-    let dir = dirname(resolve(filePath));
-    const root = '/';
-    while (dir !== root) {
-        for (const configFile of configFiles) {
-            if (existsSync(join(dir, configFile))) {
-                return dir;
-            }
-        }
-        const parent = dirname(dir);
-        if (parent === dir)
-            break;
-        dir = parent;
-    }
-    // Fallback to file's directory
-    return dirname(resolve(filePath));
-}