@rigour-labs/cli 7.0.0-rc.11 → 7.0.0-rc.12

package/dist/commands/install-record.d.ts

@@ -8,6 +8,8 @@ export declare function recordCreated(cwd: string, relPath: string, content: str
 export declare function unchangedSinceInstall(record: InstallRecord, relPath: string, content: string): boolean;
 /** A server entry Rigour wrote (npx of its MCP package), which setup may re-pin; one the person changed is theirs. */
 export declare function isRigourMcpEntry(entry: unknown): boolean;
+/** Whether an MCP server entry, or `claude mcp get`'s description of one, runs Rigour's server: the package, or a checkout's build. */
+export declare function namesRigourMcp(entry: unknown): boolean;
 /** A hook script Rigour wrote (the Cline hooks): it names Rigour in its header or runs the Rigour CLI. */
 export declare function isRigourScript(text: string): boolean;
 /**

package/dist/commands/install-record.js

@@ -38,6 +38,11 @@ export function isRigourMcpEntry(entry) {
     const e = entry;
     return e?.command === 'npx' && Array.isArray(e.args) && e.args.some(a => typeof a === 'string' && a.startsWith('@rigour-labs/mcp'));
 }
+/** Whether an MCP server entry, or `claude mcp get`'s description of one, runs Rigour's server: the package, or a checkout's build. */
+export function namesRigourMcp(entry) {
+    const text = typeof entry === 'string' ? entry : JSON.stringify(entry ?? '');
+    return /@rigour-labs\/mcp|rigour-mcp[\\/]+dist/.test(text);
+}
 /** A hook script Rigour wrote (the Cline hooks): it names Rigour in its header or runs the Rigour CLI. */
 export function isRigourScript(text) {
     return /hook for Rigour|@rigour-labs\/cli/.test(text) || isRigourCommand(text);

package/dist/commands/personal.d.ts

@@ -24,7 +24,10 @@ export declare function asUserLevel<T extends {
     path: string;
     content: string;
 }>(file: T): T;
-export type McpState = 'added' | 'updated' | 'present' | 'removed' | 'absent' | 'no CLI';
+/** `taken`: a user-level server named rigour that is not Rigour's; Rigour's is not registered over it. */
+export type McpState = 'added' | 'updated' | 'present' | 'removed' | 'absent' | 'no CLI' | 'taken';
+/** What setup and doctor say when another server holds the name. */
+export declare const MCP_NAME_TAKEN = "a user-level MCP server named rigour exists and is not Rigour's; rename it, then run rigour setup again";
 /**
  * The Rigour MCP server at user level: Claude Code through its own `claude mcp add --scope user`
  * (its state file is Claude's, not Rigour's to edit), Cursor merged into `~/.cursor/mcp.json`.

package/dist/commands/personal.js

@@ -16,7 +16,7 @@ import fs from 'fs';
 import os from 'os';
 import path from 'path';
 import { rigourUserDir } from '@rigour-labs/core';
-import { isEmptyConfig, isRigourMcpEntry, readInstallRecord, recordCreated, unchangedSinceInstall, withoutRigour } from './install-record.js';
+import { isEmptyConfig, isRigourMcpEntry, namesRigourMcp, readInstallRecord, recordCreated, unchangedSinceInstall, withoutRigour } from './install-record.js';
 const MARKER = 'rigour-enabled';
 /**
  * Where the agents keep their user-level configs: RIGOUR_AGENT_HOME when set (tests, a sandbox),
@@ -136,6 +136,8 @@ export function asUserLevel(file) {
     };
     return { ...file, path: target, content: JSON.stringify(guard(JSON.parse(file.content)), null, 4) };
 }
+/** What setup and doctor say when another server holds the name. */
+export const MCP_NAME_TAKEN = "a user-level MCP server named rigour exists and is not Rigour's; rename it, then run rigour setup again";
 /**
  * The Rigour MCP server at user level: Claude Code through its own `claude mcp add --scope user`
  * (its state file is Claude's, not Rigour's to edit), Cursor merged into `~/.cursor/mcp.json`.
@@ -147,6 +149,9 @@ export function registerUserMcp(server) {
         const get = claude(['mcp', 'get', 'rigour']);
         if (!get.ok)
             state = add() ? 'added' : 'no CLI';
+        // Another server holds the name: Rigour's is not registered over it, and the person is told.
+        else if (!namesRigourMcp(get.stdout))
+            state = 'taken';
         // Rigour's own registration at another version is moved to this one, as the hooks are; one the person changed stays.
         else if (/@rigour-labs\/mcp/.test(get.stdout) && !get.stdout.includes(server.args[server.args.length - 1])) {
             claude(['mcp', 'remove', '--scope', 'user', 'rigour']);
@@ -169,6 +174,8 @@ export function registerUserMcp(server) {
         }
     }
     const current = config?.mcpServers?.rigour;
+    if (current && !namesRigourMcp(current))
+        return { claude: state, cursor: 'taken' };
     if (current && (JSON.stringify(current) === JSON.stringify(server) || !isRigourMcpEntry(current)))
         return { claude: state, cursor: 'present' };
     config.mcpServers = { ...(config.mcpServers ?? {}), rigour: server };

package/dist/commands/repo-setup.js

@@ -7,7 +7,8 @@ import fs from 'fs';
 import path from 'path';
 import { getContextEvents } from '@rigour-labs/core';
 import { resolveMCPServerConfig } from './init.js';
-import { agentHome, enabledHere } from './personal.js';
+import { agentHome, enabledHere, MCP_NAME_TAKEN } from './personal.js';
+import { namesRigourMcp } from './install-record.js';
 import { isOldEditHook } from './setup-migrations.js';
 import { getCliVersion } from '../utils/cli-version.js';
 import { checkoutRoots, eventsAcross } from './studio-checkouts.js';
@@ -39,7 +40,7 @@ export async function checkRepoSetup(cwd, now = new Date(), toolCalls, installed
         configCheck(cwd, personal),
         editCheck(agents, now, events, setup),
         stopCheck(agents.map(a => a.config).join('\n'), now, events, setup),
-        mcpCheck(mcpConfig, now, calls),
+        mcpCheck(mcpConfig, now, calls, nameTaken(readFrom(agentHome()))),
         ...(version ? [version] : []),
         prCheck(cwd),
     ];
@@ -93,8 +94,24 @@ function stopCheck(config, now, events, setup) {
         return { id: 'stop', name, state: 'missing', detail: 'No stop hook configured', fix: setup };
     return fired('stop', name, events.filter(e => e.type === 'stop_review'), now, 'finish checks');
 }
-function mcpCheck(mcpJson, now, calls) {
+/** Which agent's user-level config holds a server named rigour that is not Rigour's (personal.ts MCP_NAME_TAKEN). */
+function nameTaken(home) {
+    for (const [agent, rel] of [['Claude Code', '.claude.json'], ['Cursor', '.cursor/mcp.json']]) {
+        try {
+            const entry = JSON.parse(home(rel) || '{}')?.mcpServers?.rigour;
+            if (entry && !namesRigourMcp(entry))
+                return agent;
+        }
+        catch {
+            // not JSON: not Rigour's to judge
+        }
+    }
+    return undefined;
+}
+function mcpCheck(mcpJson, now, calls, taken) {
     const name = 'Rigour tools for agents (MCP)';
+    if (taken)
+        return { id: 'mcp', name, state: 'broken', detail: `${taken}: ${MCP_NAME_TAKEN}`, fix: 'rename the other server, then rigour setup' };
     if (!mcpJson.includes('rigour') && calls.length === 0) {
         return { id: 'mcp', name, state: 'missing', detail: 'Agents cannot ask Rigour for review tasks or lessons', fix: `claude mcp add --scope user rigour -- ${[resolveMCPServerConfig().command, ...resolveMCPServerConfig().args].join(' ')}` };
     }

package/dist/commands/setup.js

@@ -22,7 +22,7 @@ import { installGitPushHook } from './hooks-git.js';
 import { hooksInitCommand, installMachineHooks, pinnedCliCommand, projectHookPaths } from './hooks.js';
 import { initCommand, registerProjectMcp, resolveMCPServerConfig } from './init.js';
 import { writeAgentInstructions } from './init-handshake.js';
-import { disableHere, enableHere, registerUserMcp } from './personal.js';
+import { disableHere, enableHere, MCP_NAME_TAKEN, registerUserMcp } from './personal.js';
 import { applyConfigMigrations, isOldEditHook } from './setup-migrations.js';
 import { getCliVersion } from '../utils/cli-version.js';
 import { setupSemantic } from './semantic.js';
@@ -80,6 +80,9 @@ async function personalSetup(cwd, brief) {
         console.log(chalk.yellow(`Claude Code MCP: add it with ${chalk.cyan(`claude mcp add --scope user rigour -- ${[resolveMCPServerConfig().command, ...resolveMCPServerConfig().args].join(' ')}`)}`));
     else
         console.log(chalk.green(`✔ Rigour tools for agents (MCP): Claude Code ${mcp.claude}, Cursor ${mcp.cursor}`));
+    for (const [agent, state] of [['Claude Code', mcp.claude], ['Cursor', mcp.cursor]])
+        if (state === 'taken')
+            console.log(chalk.yellow(`${agent}: ${MCP_NAME_TAKEN}.`));
 }
 async function teamSetup(cwd, options) {
     // A personal switch here would run the machine hooks beside the committed ones.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rigour-labs/cli",
-  "version": "7.0.0-rc.11",
+  "version": "7.0.0-rc.12",
   "description": "Code review that happens while your agent writes: deterministic checks on the lines it changed, quiet unless it can prove a defect, and learning from your team's fixes and dismissals. Works with Claude Code, Cursor, Codex, Cline and Windsurf.",
   "engines": {
     "node": ">=22.13"
@@ -59,12 +59,12 @@
     "globby": "^14.0.1",
     "ora": "^8.0.1",
     "yaml": "^2.8.2",
-    "@rigour-labs/core": "7.0.0-rc.11"
+    "@rigour-labs/core": "7.0.0-rc.12"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^25.0.3",
-    "@rigour-labs/studio": "7.0.0-rc.11"
+    "@rigour-labs/studio": "7.0.0-rc.12"
   },
   "scripts": {
     "build": "tsc && pnpm bundle-studio",