Skip to content

fix: lazy engine loading, enriched errors, and switchProject tool #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SimplyLiz merged 5 commits into from
Jan 31, 2026
Merged

fix: lazy engine loading, enriched errors, and switchProject tool #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24c7f34
fix: lazy engine loading for fast MCP startup
SimplyLiz Jan 27, 2026
3d702d1
fix: enrich not-found errors with repo context for clients without ro…
SimplyLiz Jan 30, 2026
ae4b841
fix: prevent redundant entries in Grok and VS Code global setup
SimplyLiz Jan 30, 2026
39b58a6
feat: add switchProject tool for dynamic repo switching
SimplyLiz Jan 31, 2026
3033be5
fix: resolve govet shadow warnings in switchProject
SimplyLiz Jan 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ coverage.out
# IDE
.idea/
.vscode/
.cursor/
*.swp
*.swo

Expand Down
29 changes: 13 additions & 16 deletions cmd/ckb/mcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package main

import (
Expand All @@ -15,6 +15,7 @@
"github.com/SimplyLiz/CodeMCP/internal/index"
"github.com/SimplyLiz/CodeMCP/internal/mcp"
"github.com/SimplyLiz/CodeMCP/internal/project"
"github.com/SimplyLiz/CodeMCP/internal/query"
"github.com/SimplyLiz/CodeMCP/internal/repos"
"github.com/SimplyLiz/CodeMCP/internal/repostate"
"github.com/SimplyLiz/CodeMCP/internal/slogutil"
Expand Down Expand Up @@ -118,10 +119,9 @@
repoName = mcpRepo
fmt.Fprintf(os.Stderr, "Repository: %s (%s) [%s]\n", repoName, repoRoot, state)

// Use multi-repo mode
server = mcp.NewMCPServerWithRegistry(version.Version, registry, logger)
engine := mustGetEngine(repoRoot, logger)
server.SetActiveRepo(repoName, repoRoot, engine)
// Skip multi-repo mode - use lazy loading path instead
// TODO: Add lazy loading support to multi-repo mode
_ = registry // silence unused warning
}
} else {
// No --repo flag - use smart resolution
Expand Down Expand Up @@ -160,13 +160,9 @@
}
}

// Use multi-repo mode if registry is available
registry, err := repos.LoadRegistry()
if err == nil && resolved.Source != repos.ResolvedFromCWDGit {
server = mcp.NewMCPServerWithRegistry(version.Version, registry, logger)
engine := mustGetEngine(repoRoot, logger)
server.SetActiveRepo(repoName, repoRoot, engine)
}
// Skip multi-repo mode for now - use lazy loading path instead
// TODO: Add lazy loading support to multi-repo mode
_ = repos.LoadRegistry // silence unused warning
} else {
// No repo found - fall back to current directory
repoRoot = mustGetRepoRoot()
Expand Down Expand Up @@ -199,11 +195,12 @@
logger = slogutil.NewTeeLogger(fileLogger.Handler(), stderrHandler)
}

// Create server if not already created (legacy single-engine mode)
if server == nil {
engine := mustGetEngine(repoRoot, logger)
server = mcp.NewMCPServer(version.Version, engine, logger)
}
// Use lazy loading for fast MCP handshake
// Capture repoRoot and logger for the closure
root, log := repoRoot, logger
server = mcp.NewMCPServerLazy(version.Version, func() (*query.Engine, error) {
return getEngine(root, log)
}, logger)

// Apply preset configuration
if err := server.SetPreset(mcpPreset); err != nil {
Expand Down
Loading
Loading