projecta-rrr 1.15.2 → 1.15.3

package/bin/install.js

@@ -736,6 +736,41 @@ function install(isGlobal) {
   copyWithPathReplacement(skillSrc, skillDest, pathPrefix);
   console.log(`  ${green}✓${reset} Installed rrr`);
 
+  // Install RRR runtime dependencies (tree-sitter, lancedb, etc.)
+  // These are needed by lib/search/ modules which the MCP server imports
+  if (fs.existsSync(path.join(skillDest, 'package.json'))) {
+    try {
+      console.log(`  ${dim}Installing RRR runtime dependencies (may take a moment)...${reset}`);
+      execSync('npm install --omit=dev --silent 2>/dev/null || npm install --omit=dev', {
+        cwd: skillDest,
+        stdio: 'pipe',
+        timeout: 120000  // 2 min for native modules
+      });
+      console.log(`  ${green}✓${reset} Installed RRR runtime dependencies`);
+    } catch (e) {
+      console.log(`  ${yellow}⚠${reset} RRR runtime deps failed: ${e.message}`);
+      console.log(`    ${dim}Run manually: cd ${skillDest} && npm install${reset}`);
+    }
+  }
+
+  // Install MCP server dependencies
+  // The mcp-server needs @modelcontextprotocol/sdk which isn't bundled in npm package
+  const mcpServerDir = path.join(skillDest, 'mcp-server');
+  if (fs.existsSync(path.join(mcpServerDir, 'package.json'))) {
+    try {
+      console.log(`  ${dim}Installing MCP server dependencies...${reset}`);
+      execSync('npm install --omit=dev --silent 2>/dev/null || npm install --omit=dev', {
+        cwd: mcpServerDir,
+        stdio: 'pipe',
+        timeout: 60000
+      });
+      console.log(`  ${green}✓${reset} Installed MCP server dependencies`);
+    } catch (e) {
+      console.log(`  ${yellow}⚠${reset} MCP server deps failed: ${e.message}`);
+      console.log(`    ${dim}Run manually: cd ${mcpServerDir} && npm install${reset}`);
+    }
+  }
+
   // Copy agents to ~/.claude/agents (subagents must be at root level)
   const agentsSrc = path.join(src, 'agents');
   if (fs.existsSync(agentsSrc)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projecta-rrr",
-  "version": "1.15.2",
+  "version": "1.15.3",
   "description": "A meta-prompting, context engineering and spec-driven development system for Claude Code by Projecta.ai",
   "bin": {
     "projecta-rrr": "bin/install.js"
@@ -32,6 +32,7 @@
     "scripts",
     "mcp.registry.json",
     "projecta.defaults.json",
+    "rrr/package.json",
     "rrr/lib",
     "rrr/mcp-server",
     "rrr/presets",

package/rrr/lib/mcp/semantic-migration.js

@@ -19,8 +19,9 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 
-// Settings file path
+// Settings file paths - Claude Code reads MCPs from multiple locations
 const SETTINGS_PATH = path.join(os.homedir(), '.claude', 'settings.json');
+const ALT_SETTINGS_PATH = path.join(os.homedir(), '.claude.json');
 
 // LanceDB storage constants
 const STORAGE_DIR = '.rrr/search';
@@ -50,109 +51,181 @@ const OLD_INDEX_DIRS = [
 ];
 
 /**
- * Detect conflicting search MCPs in settings.
+ * Check a settings object for conflicting MCPs.
  *
- * @returns {{found: string[], settings: Object}} Found conflicting IDs and settings object
+ * @param {Object} settings - Settings object to check
+ * @param {string[]} foundList - Array to add found conflicts to
  */
-function detectConflictingSearch() {
-  const result = {
-    found: [],
-    settings: null
-  };
+function checkSettingsForConflicts(settings, foundList) {
+  const mcpServers = settings.mcpServers || {};
 
-  // Check if settings file exists
-  if (!fs.existsSync(SETTINGS_PATH)) {
-    return result;
-  }
-
-  // Read and parse settings
-  try {
-    const content = fs.readFileSync(SETTINGS_PATH, 'utf8');
-    const settings = JSON.parse(content);
-    result.settings = settings;
+  for (const serverId of Object.keys(mcpServers)) {
+    // Skip our own MCP
+    if (serverId === OUR_MCP_ID) {
+      continue;
+    }
 
-    // Check mcpServers for conflicting entries
-    const mcpServers = settings.mcpServers || {};
+    // Skip if already found
+    if (foundList.includes(serverId)) {
+      continue;
+    }
 
-    for (const serverId of Object.keys(mcpServers)) {
-      // Skip our own MCP
-      if (serverId === OUR_MCP_ID) {
-        continue;
+    // Check if server ID matches any conflicting pattern
+    const lowerServerId = serverId.toLowerCase();
+    for (const pattern of CONFLICTING_PATTERNS) {
+      if (lowerServerId.includes(pattern)) {
+        foundList.push(serverId);
+        break;
       }
+    }
 
-      // Check if server ID matches any conflicting pattern
-      const lowerServerId = serverId.toLowerCase();
+    // Also check if the command/args reference known conflicting tools
+    const config = mcpServers[serverId];
+    if (config && config.args) {
+      const argsStr = config.args.join(' ').toLowerCase();
       for (const pattern of CONFLICTING_PATTERNS) {
-        if (lowerServerId.includes(pattern)) {
-          result.found.push(serverId);
+        if (argsStr.includes(pattern) && !foundList.includes(serverId)) {
+          foundList.push(serverId);
           break;
         }
       }
+    }
 
-      // Also check if the command/args reference known conflicting tools
-      const config = mcpServers[serverId];
-      if (config && config.args) {
-        const argsStr = config.args.join(' ').toLowerCase();
-        for (const pattern of CONFLICTING_PATTERNS) {
-          if (argsStr.includes(pattern) && !result.found.includes(serverId)) {
-            result.found.push(serverId);
-            break;
-          }
+    // Check command path for known binaries
+    if (config && config.command) {
+      const cmdLower = config.command.toLowerCase();
+      if (cmdLower.includes('/ck') || cmdLower.endsWith('/ck')) {
+        if (!foundList.includes(serverId)) {
+          foundList.push(serverId);
         }
       }
     }
-  } catch (e) {
-    // Can't parse settings, return empty
-    console.warn(`Warning: Could not parse ${SETTINGS_PATH}: ${e.message}`);
+  }
+}
+
+/**
+ * Detect conflicting search MCPs in settings.
+ * Checks both ~/.claude/settings.json and ~/.claude.json
+ *
+ * @returns {{found: string[], settings: Object, altSettings: Object}} Found conflicting IDs and settings objects
+ */
+function detectConflictingSearch() {
+  const result = {
+    found: [],
+    settings: null,
+    altSettings: null
+  };
+
+  // Check primary settings file (~/.claude/settings.json)
+  if (fs.existsSync(SETTINGS_PATH)) {
+    try {
+      const content = fs.readFileSync(SETTINGS_PATH, 'utf8');
+      result.settings = JSON.parse(content);
+      checkSettingsForConflicts(result.settings, result.found);
+    } catch (e) {
+      console.warn(`Warning: Could not parse ${SETTINGS_PATH}: ${e.message}`);
+    }
+  }
+
+  // Check alternate settings file (~/.claude.json)
+  if (fs.existsSync(ALT_SETTINGS_PATH)) {
+    try {
+      const content = fs.readFileSync(ALT_SETTINGS_PATH, 'utf8');
+      result.altSettings = JSON.parse(content);
+      checkSettingsForConflicts(result.altSettings, result.found);
+    } catch (e) {
+      console.warn(`Warning: Could not parse ${ALT_SETTINGS_PATH}: ${e.message}`);
+    }
   }
 
   return result;
 }
 
 /**
- * Disable conflicting MCPs by removing them from settings.
+ * Remove conflicting MCPs from a single settings file.
  *
+ * @param {string} settingsPath - Path to settings file
  * @param {string[]} conflictingIds - IDs of MCPs to remove
- * @returns {{disabled: string[], backupPath: string|null}} Disabled IDs and backup path
+ * @returns {{disabled: string[], backupPath: string|null}}
  */
-function disableConflictingMCPs(conflictingIds) {
+function removeFromSettingsFile(settingsPath, conflictingIds) {
   const result = {
     disabled: [],
     backupPath: null
   };
 
-  if (!conflictingIds || conflictingIds.length === 0) {
-    return result;
-  }
-
-  if (!fs.existsSync(SETTINGS_PATH)) {
+  if (!fs.existsSync(settingsPath)) {
     return result;
   }
 
   try {
-    // Read current settings
-    const content = fs.readFileSync(SETTINGS_PATH, 'utf8');
+    const content = fs.readFileSync(settingsPath, 'utf8');
     const settings = JSON.parse(content);
 
-    // Create backup with timestamp
-    const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
-    const backupPath = `${SETTINGS_PATH}.bak.${timestamp}`;
-    fs.writeFileSync(backupPath, content, 'utf8');
-    result.backupPath = backupPath;
-
-    // Remove conflicting MCPs
     const mcpServers = settings.mcpServers || {};
+    let modified = false;
+
     for (const serverId of conflictingIds) {
       if (mcpServers[serverId]) {
+        // Create backup before first modification
+        if (!modified) {
+          const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+          result.backupPath = `${settingsPath}.bak.${timestamp}`;
+          fs.writeFileSync(result.backupPath, content, 'utf8');
+        }
+
         delete mcpServers[serverId];
         result.disabled.push(serverId);
+        modified = true;
+        console.log(`[migration] Removed ${serverId} from ${path.basename(settingsPath)}`);
       }
     }
 
-    // Write updated settings
-    fs.writeFileSync(SETTINGS_PATH, JSON.stringify(settings, null, 2), 'utf8');
+    if (modified) {
+      fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf8');
+    }
   } catch (e) {
-    console.error(`Error disabling conflicting MCPs: ${e.message}`);
+    console.error(`Error removing MCPs from ${settingsPath}: ${e.message}`);
+  }
+
+  return result;
+}
+
+/**
+ * Disable conflicting MCPs by removing them from all settings files.
+ * Checks both ~/.claude/settings.json and ~/.claude.json
+ *
+ * @param {string[]} conflictingIds - IDs of MCPs to remove
+ * @returns {{disabled: string[], backupPaths: string[]}} Disabled IDs and backup paths
+ */
+function disableConflictingMCPs(conflictingIds) {
+  const result = {
+    disabled: [],
+    backupPath: null,  // Keep for backwards compat
+    backupPaths: []
+  };
+
+  if (!conflictingIds || conflictingIds.length === 0) {
+    return result;
+  }
+
+  // Remove from primary settings file
+  const primary = removeFromSettingsFile(SETTINGS_PATH, conflictingIds);
+  result.disabled.push(...primary.disabled);
+  if (primary.backupPath) {
+    result.backupPaths.push(primary.backupPath);
+    result.backupPath = primary.backupPath;
+  }
+
+  // Remove from alternate settings file
+  const alt = removeFromSettingsFile(ALT_SETTINGS_PATH, conflictingIds);
+  for (const id of alt.disabled) {
+    if (!result.disabled.includes(id)) {
+      result.disabled.push(id);
+    }
+  }
+  if (alt.backupPath) {
+    result.backupPaths.push(alt.backupPath);
   }
 
   return result;
@@ -387,6 +460,7 @@ module.exports = {
   reindexWithQwen,
   // Expose constants for testing
   SETTINGS_PATH,
+  ALT_SETTINGS_PATH,
   CONFLICTING_PATTERNS,
   OLD_INDEX_DIRS,
   OUR_MCP_ID,

package/rrr/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "rrr-runtime",
+  "version": "1.0.0",
+  "description": "RRR runtime dependencies for semantic search",
+  "private": true,
+  "dependencies": {
+    "@lancedb/lancedb": "^0.23.0",
+    "tree-sitter": "^0.21.1",
+    "tree-sitter-go": "^0.21.0",
+    "tree-sitter-javascript": "^0.21.4",
+    "tree-sitter-python": "^0.21.0",
+    "tree-sitter-typescript": "^0.23.2"
+  }
+}

package/rrr/scripts/register-mcp.js

@@ -27,11 +27,19 @@ const MCP_SERVER_ID = 'rrr-search';
 
 /**
  * Get the absolute path to the MCP server entry point.
+ * Prefers the installed location (~/.claude/rrr/mcp-server/index.js)
+ * over the npx/source location.
  *
  * @returns {string} Absolute path to rrr/mcp-server/index.js
  */
 function getMCPServerPath() {
-  // Navigate from this script to the MCP server
+  // Prefer the installed location - this is stable across npx runs
+  const installedPath = path.join(os.homedir(), '.claude', 'rrr', 'mcp-server', 'index.js');
+  if (fs.existsSync(installedPath)) {
+    return installedPath;
+  }
+
+  // Fallback to relative path from script (for source/development)
   // scripts/register-mcp.js -> ../mcp-server/index.js
   return path.resolve(__dirname, '..', 'mcp-server', 'index.js');
 }
@@ -113,7 +121,7 @@ function writeSettings(settings) {
  * @returns {Promise<{registered: boolean, method: string, error?: string}>}
  */
 async function registerMCP(options = {}) {
-  const {
+  let {
     forceCLI = false,
     forceJSON = false,
     runMigration = true
@@ -133,6 +141,21 @@ async function registerMCP(options = {}) {
   let method = 'json';
   let registered = false;
   let error = null;
+  let updated = false;
+
+  // Check if existing registration has wrong path (e.g., npx temp dir)
+  // If so, force JSON update to fix it
+  const existingSettings = readSettings();
+  const existingConfig = existingSettings.mcpServers?.[MCP_SERVER_ID];
+  if (existingConfig && existingConfig.args?.[0]) {
+    const existingPath = existingConfig.args[0];
+    // Detect stale npx paths or non-existent paths
+    if (existingPath.includes('/_npx/') || existingPath.includes('\\_npx\\') || !fs.existsSync(existingPath)) {
+      console.log(`[mcp] Updating stale MCP path: ${existingPath.slice(-50)}... -> ${mcpServerPath}`);
+      forceJSON = true;  // Force JSON method to update
+      updated = true;
+    }
+  }
 
   // Try CLI method first (unless forceJSON)
   if (!forceJSON && (hasClaudeCLI() || forceCLI)) {
@@ -158,7 +181,7 @@ async function registerMCP(options = {}) {
     try {
       const settings = readSettings();
 
-      // Add rrr-search to mcpServers
+      // Add or update rrr-search in mcpServers
       settings.mcpServers[MCP_SERVER_ID] = {
         command: 'node',
         args: [mcpServerPath]
@@ -166,7 +189,7 @@ async function registerMCP(options = {}) {
 
       const success = writeSettings(settings);
       if (success) {
-        method = 'json';
+        method = updated ? 'json-updated' : 'json';
         registered = true;
       } else {
         error = 'Failed to write settings.json';