@intellectronica/ruler 0.3.43 → 0.3.44

package/README.md

@@ -57,7 +57,7 @@ Ruler solves this by providing a **single source of truth** for all your AI agen
 | Agent                  | Rules File(s)                                  | MCP Configuration / Notes                        | Skills Support / Location | Subagents Support / Location |
 | ---------------------- | ---------------------------------------------- | ------------------------------------------------ | ------------------------- | ---------------------------- |
 | AGENTS.md              | `AGENTS.md`                                    | (pseudo-agent ensuring root `AGENTS.md` exists)  | -                         | -                            |
-| GitHub Copilot         | `AGENTS.md`                                    | `.vscode/mcp.json`                               | `.claude/skills/`         | `.github/agents/`            |
+| GitHub Copilot         | `AGENTS.md`                                    | `.mcp.json`                                      | `.claude/skills/`         | `.github/agents/`            |
 | Claude Code            | `CLAUDE.md`                                    | `.mcp.json`                                      | `.claude/skills/`         | `.claude/agents/`            |
 | OpenAI Codex CLI       | `AGENTS.md`                                    | `.codex/config.toml`                             | `.agents/skills/`         | `.codex/agents/` (`.toml`)   |
 | Pi Coding Agent        | `AGENTS.md`                                    | -                                                | `.pi/skills/`             | -                            |
@@ -953,7 +953,7 @@ ruler apply
 
 ### Scenario 2: Working with worktrees
 
-When using the default `git add worktree` command (which is also run by agents apps such as Claude code or Codex through the interface), the gitignored files are not copied over. You will need to ask your agent to run `ruler apply` at the start of every session.
+When using the default `git worktree add` command (which is also run by agent apps such as Claude Code or Codex through the interface), the gitignored files are not copied over. You will need to ask your agent to run `ruler apply` at the start of every session.
 
 As an alternative you can commit your default agents files to source control.
 
@@ -979,7 +979,7 @@ enabled = false
 To avoid having other contributors commit instructions outside of .ruler you can setup a github action to check there is no diff when running `ruler apply` in CI.
 
 ```yml
-# .github/workflows/ruler-check/yml
+# .github/workflows/ruler-check.yml
 
 # Verifies the committed agent files (AGENTS.md, CLAUDE.md, skills) match the .ruler/ source.
 # They are committed so a fresh clone/worktree has guidance immediately; this guards against drift.
@@ -1014,7 +1014,7 @@ jobs:
 
       - name: Verify committed agent files match .ruler/
         run: |
-          pnpm dlx @intellectronica/ruler@0.3.42 apply --no-gitignore --no-mcp
+          pnpm dlx @intellectronica/ruler apply --no-gitignore --no-mcp
           DRIFT="$(git status --porcelain -- AGENTS.md CLAUDE.md .claude/skills .codex/skills)"
           if [ -n "$DRIFT" ]; then
             echo "::error::Committed agent files are out of sync with .ruler/. Run 'pnpm dlx @intellectronica/ruler apply --no-gitignore --no-mcp' and commit the result."

package/dist/agents/CopilotAgent.js

@@ -31,7 +31,7 @@ class CopilotAgent {
         }, backup);
     }
     getMcpServerKey() {
-        return 'servers';
+        return 'mcpServers';
     }
     supportsMcpStdio() {
         return true;

package/dist/core/ConfigLoader.js

@@ -172,7 +172,10 @@ function parseAgentMcpServers(sectionObj) {
     const servers = {};
     for (const [name, def] of Object.entries(sectionObj.mcp_servers)) {
         if (def && typeof def === 'object' && !Array.isArray(def)) {
-            servers[name] = normalizeAgentMcpServer(def);
+            const server = normalizeAgentMcpServer(def);
+            if (server.command || server.url) {
+                servers[name] = server;
+            }
         }
     }
     return Object.keys(servers).length > 0 ? servers : undefined;
@@ -181,6 +184,17 @@ function normalizeAgentMcpServer(def) {
     const server = { ...def };
     const hasCommand = typeof server.command === 'string';
     const hasUrl = typeof server.url === 'string';
+    if (!hasCommand) {
+        delete server.command;
+        delete server.args;
+        delete server.env;
+    }
+    if (!hasUrl) {
+        delete server.url;
+        delete server.headers;
+        delete server.auth;
+        delete server.oauth;
+    }
     if (hasCommand && hasUrl) {
         delete server.command;
         delete server.args;

package/dist/core/FileSystemUtils.d.ts

@@ -1,3 +1,4 @@
+export declare function assertNotSymbolicLink(filePath: string, action: string): Promise<void>;
 export declare function assertManagedPathInsideRoot(managedPath: string, rootPath: string, action: string): Promise<void>;
 /**
  * Searches upwards from startPath to find a directory named .ruler.

package/dist/core/FileSystemUtils.js

@@ -33,6 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertNotSymbolicLink = assertNotSymbolicLink;
 exports.assertManagedPathInsideRoot = assertManagedPathInsideRoot;
 exports.findRulerDir = findRulerDir;
 exports.resolveProjectRootForRulerDir = resolveProjectRootForRulerDir;

package/dist/core/SkillsUtils.js

@@ -137,7 +137,10 @@ function formatValidationWarnings(warnings) {
  * Recursively copies a directory and all its contents.
  */
 async function copyRecursive(src, dest) {
-    const stat = await fs.stat(src);
+    const stat = await fs.lstat(src);
+    if (stat.isSymbolicLink()) {
+        return;
+    }
     if (stat.isDirectory()) {
         await fs.mkdir(dest, { recursive: true });
         const entries = await fs.readdir(src, { withFileTypes: true });

package/dist/core/UnifiedConfigLoader.js

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadUnifiedConfig = loadUnifiedConfig;
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
+const os = __importStar(require("os"));
 const toml_1 = require("@iarna/toml");
 const hash_1 = require("./hash");
 const RuleProcessor_1 = require("./RuleProcessor");
@@ -52,6 +53,39 @@ const KNOWN_MCP_SERVER_FIELDS = new Set([
 function copyAdditionalMcpServerFields(def) {
     return Object.fromEntries(Object.entries(def).filter(([key]) => !KNOWN_MCP_SERVER_FIELDS.has(key)));
 }
+async function resolveImplicitTomlFile(projectRoot, rulerDir, checkGlobal) {
+    const localTomlFile = path.join(rulerDir, 'ruler.toml');
+    if (await fileExists(localTomlFile)) {
+        return localTomlFile;
+    }
+    const projectTomlFile = path.join(projectRoot, '.ruler', 'ruler.toml');
+    if (path.resolve(projectTomlFile) !== path.resolve(localTomlFile) &&
+        (await fileExists(projectTomlFile))) {
+        return projectTomlFile;
+    }
+    if (!checkGlobal) {
+        return undefined;
+    }
+    const xdgConfigDir = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), '.config');
+    const globalTomlFile = path.join(xdgConfigDir, 'ruler', 'ruler.toml');
+    if (path.resolve(globalTomlFile) !== path.resolve(localTomlFile) &&
+        (await fileExists(globalTomlFile))) {
+        return globalTomlFile;
+    }
+    return undefined;
+}
+async function fileExists(filePath) {
+    try {
+        await fs_1.promises.access(filePath);
+        return true;
+    }
+    catch (err) {
+        if (err.code === 'ENOENT') {
+            return false;
+        }
+        throw err;
+    }
+}
 async function loadUnifiedConfig(options) {
     // Resolve the effective .ruler directory (local or global), mirroring the main loader behavior
     const resolvedRulerDir = (await FileSystemUtils.findRulerDir(options.projectRoot, options.checkGlobal ?? true)) || path.join(options.projectRoot, '.ruler');
@@ -66,15 +100,14 @@ async function loadUnifiedConfig(options) {
     let tomlRaw = {};
     const tomlFile = options.configPath
         ? path.resolve(options.configPath)
-        : path.join(meta.rulerDir, 'ruler.toml');
-    try {
-        const text = await fs_1.promises.readFile(tomlFile, 'utf8');
-        tomlRaw = text.trim() ? (0, toml_1.parse)(text) : {};
-        meta.configFile = tomlFile;
-    }
-    catch (err) {
-        if (options.configPath ||
-            err.code !== 'ENOENT') {
+        : await resolveImplicitTomlFile(options.projectRoot, meta.rulerDir, options.checkGlobal ?? true);
+    if (tomlFile) {
+        try {
+            const text = await fs_1.promises.readFile(tomlFile, 'utf8');
+            tomlRaw = text.trim() ? (0, toml_1.parse)(text) : {};
+            meta.configFile = tomlFile;
+        }
+        catch (err) {
             diagnostics.push({
                 severity: options.configPath ? 'error' : 'warning',
                 code: 'TOML_READ_ERROR',

package/dist/core/revert-engine.js

@@ -141,6 +141,8 @@ async function restoreFromBackup(filePath, verbose, dryRun, projectRoot) {
             await (0, FileSystemUtils_1.assertManagedPathInsideRoot)(filePath, projectRoot, 'Refusing to restore backup through symlinked output path');
             await (0, FileSystemUtils_1.assertManagedPathInsideRoot)(backupPath, projectRoot, 'Refusing to restore from backup through symlinked backup path');
         }
+        await (0, FileSystemUtils_1.assertNotSymbolicLink)(filePath, 'Refusing to restore backup through symlinked output path');
+        await (0, FileSystemUtils_1.assertNotSymbolicLink)(backupPath, 'Refusing to restore from symlinked backup path');
         await fs_1.promises.copyFile(backupPath, filePath);
         (0, constants_1.logVerbose)(`${prefix} Restored: ${filePath} from backup`, verbose);
     }
@@ -173,6 +175,7 @@ async function removeGeneratedFile(filePath, verbose, dryRun, projectRoot) {
         if (projectRoot) {
             await (0, FileSystemUtils_1.assertManagedPathInsideRoot)(filePath, projectRoot, 'Refusing to remove generated file through symlinked path');
         }
+        await (0, FileSystemUtils_1.assertNotSymbolicLink)(filePath, 'Refusing to remove symlinked generated file');
         await fs_1.promises.unlink(filePath);
         (0, constants_1.logVerbose)(`${prefix} Removed generated file: ${filePath}`, verbose);
     }
@@ -195,6 +198,7 @@ async function removeBackupFile(filePath, verbose, dryRun, projectRoot) {
         if (projectRoot) {
             await (0, FileSystemUtils_1.assertManagedPathInsideRoot)(backupPath, projectRoot, 'Refusing to remove backup file through symlinked path');
         }
+        await (0, FileSystemUtils_1.assertNotSymbolicLink)(backupPath, 'Refusing to remove symlinked backup file');
         await fs_1.promises.unlink(backupPath);
         (0, constants_1.logVerbose)(`${prefix} Removed backup file: ${backupPath}`, verbose);
     }
@@ -329,7 +333,6 @@ async function removeAdditionalAgentFiles(projectRoot, verbose, dryRun) {
     const additionalFiles = [
         '.gemini/settings.json',
         '.mcp.json',
-        '.vscode/mcp.json',
         '.cursor/mcp.json',
         '.junie/mcp/mcp.json',
         '.kilocode/mcp.json',
@@ -359,6 +362,8 @@ async function removeAdditionalAgentFiles(projectRoot, verbose, dryRun) {
                     (0, constants_1.logVerbose)(`${prefix} Would remove additional file: ${fullPath}`, verbose);
                 }
                 else {
+                    await (0, FileSystemUtils_1.assertManagedPathInsideRoot)(fullPath, projectRoot, 'Refusing to remove additional file through symlinked path');
+                    await (0, FileSystemUtils_1.assertNotSymbolicLink)(fullPath, 'Refusing to remove symlinked additional file');
                     await fs_1.promises.unlink(fullPath);
                     (0, constants_1.logVerbose)(`${prefix} Removed additional file: ${fullPath}`, verbose);
                 }

package/dist/mcp/capabilities.js

@@ -35,8 +35,8 @@ function filterMcpConfigForAgent(mcpConfig, agent) {
     for (const [serverName, serverConfig] of Object.entries(servers)) {
         const config = serverConfig;
         // Determine server type
-        const hasCommand = 'command' in config;
-        const hasUrl = 'url' in config;
+        const hasCommand = typeof config.command === 'string' || Array.isArray(config.command);
+        const hasUrl = typeof config.url === 'string';
         const isStdio = hasCommand && !hasUrl;
         const isRemote = hasUrl && !hasCommand;
         // Include server if agent supports its type

package/dist/paths/mcp.js

@@ -48,7 +48,7 @@ async function getNativeMcpPath(adapterName, projectRoot) {
     const candidates = [];
     switch (adapterName) {
         case 'GitHub Copilot':
-            candidates.push(path.join(projectRoot, '.vscode', 'mcp.json'));
+            candidates.push(path.join(projectRoot, '.mcp.json'));
             break;
         case 'Visual Studio':
             candidates.push(path.join(projectRoot, '.mcp.json'));

package/dist/revert.js

@@ -174,6 +174,8 @@ async function cleanIgnoreFile(projectRoot, ignoreFile, verbose, dryRun) {
         (0, constants_1.logVerbose)(`No ${ignoreFile} file found`, verbose);
         return false;
     }
+    await FileSystemUtils.assertManagedPathInsideRoot(ignorePath, projectRoot, `Refusing to clean ${ignoreFile} through symlinked path`);
+    await FileSystemUtils.assertNotSymbolicLink(ignorePath, `Refusing to clean symlinked ${ignoreFile}`);
     const content = await fs_1.promises.readFile(ignorePath, 'utf8');
     const cleaned = (0, GitignoreUtils_1.removeCompleteRulerBlocks)(content);
     if (!cleaned.removed) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intellectronica/ruler",
-  "version": "0.3.43",
+  "version": "0.3.44",
   "description": "Ruler — apply the same rules to all coding agents",
   "main": "dist/lib.js",
   "types": "dist/lib.d.ts",
@@ -12,7 +12,8 @@
     "test:watch": "jest --watch",
     "test:coverage": "jest --coverage",
     "test:integration": "jest tests/e2e/ruler.integration.test.ts --verbose",
-    "build": "tsc",
+    "clean": "node -e \"require('node:fs').rmSync('dist', { recursive: true, force: true })\"",
+    "build": "npm run clean && tsc",
     "check:package-lock": "node -e \"const pkg=require('./package.json'); const lock=require('./package-lock.json'); const root=lock.packages?.['']; if (lock.version !== pkg.version || root?.version !== pkg.version) { console.error('package-lock.json version metadata must match package.json version'); process.exit(1); }\"",
     "prepublishOnly": "npm run build"
   },