@intellectronica/ruler 0.3.42 → 0.3.43

package/dist/revert.js

@@ -46,24 +46,23 @@ const agent_selection_1 = require("./core/agent-selection");
 const config_utils_1 = require("./core/config-utils");
 const GitignoreUtils_1 = require("./core/GitignoreUtils");
 const agents = agents_1.allAgents;
-const RULER_IGNORE_START_MARKER = '# START Ruler Generated Files';
-const RULER_IGNORE_END_MARKER = '# END Ruler Generated Files';
 const MANAGED_IGNORE_FILES = ['.gitignore', '.git/info/exclude'];
 /**
  * Reverts ruler configurations for selected AI agents.
  */
 async function revertAllAgentConfigs(projectRoot, includedAgents, configPath, keepBackups = false, verbose = false, dryRun = false, localOnly = false) {
-    (0, constants_1.logVerbose)(`Loading configuration for revert from project root: ${projectRoot}`, verbose);
+    const rulerDir = await FileSystemUtils.findRulerDir(projectRoot, !localOnly);
+    if (!rulerDir) {
+        throw (0, constants_1.createRulerError)(`.ruler directory not found`, `Searched from: ${projectRoot}`);
+    }
+    const effectiveProjectRoot = FileSystemUtils.resolveProjectRootForRulerDir(projectRoot, rulerDir);
+    (0, constants_1.logVerbose)(`Loading configuration for revert from project root: ${effectiveProjectRoot}`, verbose);
     const config = await (0, ConfigLoader_1.loadConfig)({
-        projectRoot,
+        projectRoot: effectiveProjectRoot,
         cliAgents: includedAgents,
         configPath,
         checkGlobal: !localOnly,
     });
-    const rulerDir = await FileSystemUtils.findRulerDir(projectRoot, !localOnly);
-    if (!rulerDir) {
-        throw (0, constants_1.createRulerError)(`.ruler directory not found`, `Searched from: ${projectRoot}`);
-    }
     (0, constants_1.logVerbose)(`Found .ruler directory at: ${rulerDir}`, verbose);
     // Normalize per-agent config keys to agent identifiers
     config.agentConfigs = (0, config_utils_1.mapRawAgentConfigs)(config.agentConfigs, agents);
@@ -105,27 +104,35 @@ async function revertAllAgentConfigs(projectRoot, includedAgents, configPath, ke
         }
     }
     (0, constants_1.logVerbose)(`Selected agents: ${selected.map((a) => a.getName()).join(', ')}`, verbose);
+    const isFullRevert = !config.cliAgents || config.cliAgents.length === 0;
     // Revert configurations for each agent
     let totalFilesProcessed = 0;
     let totalFilesRestored = 0;
     let totalFilesRemoved = 0;
     let totalBackupsRemoved = 0;
+    let totalDirectoriesRemoved = 0;
     for (const agent of selected) {
         const prefix = (0, constants_1.actionPrefix)(dryRun);
         console.log(`${prefix} Reverting ${agent.getName()}...`);
         const agentConfig = config.agentConfigs[agent.getIdentifier()];
-        const result = await (0, revert_engine_1.revertAgentConfiguration)(agent, projectRoot, agentConfig, keepBackups, verbose, dryRun);
+        const result = await (0, revert_engine_1.revertAgentConfiguration)(agent, effectiveProjectRoot, agentConfig, keepBackups, verbose, dryRun);
         totalFilesProcessed += result.restored + result.removed;
         totalFilesRestored += result.restored;
         totalFilesRemoved += result.removed;
         totalBackupsRemoved += result.backupsRemoved;
+        if (!isFullRevert) {
+            totalDirectoriesRemoved += await (0, revert_engine_1.cleanUpAgentDirectories)(agent, effectiveProjectRoot, agentConfig, verbose, dryRun);
+        }
     }
-    // Clean up auxiliary files and directories
-    const cleanupResult = await (0, revert_engine_1.cleanUpAuxiliaryFiles)(projectRoot, verbose, dryRun);
+    // Clean up auxiliary files and directories only when reverting all agents.
+    const cleanupResult = isFullRevert
+        ? await (0, revert_engine_1.cleanUpAuxiliaryFiles)(effectiveProjectRoot, verbose, dryRun)
+        : { additionalFilesRemoved: 0, directoriesRemoved: 0 };
     totalFilesRemoved += cleanupResult.additionalFilesRemoved;
+    totalDirectoriesRemoved += cleanupResult.directoriesRemoved;
     // Clean managed ignore blocks if reverting all agents.
-    const cleanedIgnoreFiles = !config.cliAgents || config.cliAgents.length === 0
-        ? await cleanManagedIgnoreFiles(projectRoot, verbose, dryRun)
+    const cleanedIgnoreFiles = isFullRevert
+        ? await cleanManagedIgnoreFiles(effectiveProjectRoot, verbose, dryRun)
         : [];
     // Display summary
     const prefix = (0, constants_1.actionPrefix)(dryRun);
@@ -138,11 +145,9 @@ async function revertAllAgentConfigs(projectRoot, includedAgents, configPath, ke
     console.log(`  Files processed: ${totalFilesProcessed}`);
     console.log(`  Files restored from backup: ${totalFilesRestored}`);
     console.log(`  Generated files removed: ${totalFilesRemoved}`);
-    if (!keepBackups) {
-        console.log(`  Backup files removed: ${totalBackupsRemoved}`);
-    }
-    if (cleanupResult.directoriesRemoved > 0) {
-        console.log(`  Empty directories removed: ${cleanupResult.directoriesRemoved}`);
+    console.log(`  Backup files removed: ${totalBackupsRemoved}`);
+    if (totalDirectoriesRemoved > 0) {
+        console.log(`  Empty directories removed: ${totalDirectoriesRemoved}`);
     }
     for (const ignoreFile of cleanedIgnoreFiles) {
         console.log(`  ${ignoreFile} cleaned: yes`);
@@ -170,9 +175,8 @@ async function cleanIgnoreFile(projectRoot, ignoreFile, verbose, dryRun) {
         return false;
     }
     const content = await fs_1.promises.readFile(ignorePath, 'utf8');
-    const startIndex = content.indexOf(RULER_IGNORE_START_MARKER);
-    const endIndex = content.indexOf(RULER_IGNORE_END_MARKER);
-    if (startIndex === -1 || endIndex === -1) {
+    const cleaned = (0, GitignoreUtils_1.removeCompleteRulerBlocks)(content);
+    if (!cleaned.removed) {
         (0, constants_1.logVerbose)(`No ruler-managed block found in ${ignoreFile}`, verbose);
         return false;
     }
@@ -181,16 +185,12 @@ async function cleanIgnoreFile(projectRoot, ignoreFile, verbose, dryRun) {
         (0, constants_1.logVerbose)(`${prefix} Would remove ruler block from ${ignoreFile}`, verbose);
     }
     else {
-        const beforeBlock = content.substring(0, startIndex);
-        const afterBlock = content.substring(endIndex + RULER_IGNORE_END_MARKER.length);
-        let newContent = beforeBlock + afterBlock;
-        newContent = newContent.replace(/\n{3,}/g, '\n\n'); // Replace 3+ newlines with 2
-        if (newContent.trim() === '') {
+        if (cleaned.content.trim() === '') {
             await fs_1.promises.unlink(ignorePath);
             (0, constants_1.logVerbose)(`${prefix} Removed empty ${ignoreFile} file`, verbose);
         }
         else {
-            await fs_1.promises.writeFile(ignorePath, newContent);
+            await fs_1.promises.writeFile(ignorePath, cleaned.content);
             (0, constants_1.logVerbose)(`${prefix} Removed ruler block from ${ignoreFile}`, verbose);
         }
     }

package/dist/vscode/settings.d.ts

@@ -25,7 +25,7 @@ export declare function readVSCodeSettings(settingsPath: string): Promise<VSCode
 /**
  * Write VSCode settings.json file
  */
-export declare function writeVSCodeSettings(settingsPath: string, settings: VSCodeSettings): Promise<void>;
+export declare function writeVSCodeSettings(settingsPath: string, settings: VSCodeSettings, containmentRoot?: string): Promise<void>;
 /**
  * Transform ruler MCP config to Augment MCP server array format
  */

package/dist/vscode/settings.js

@@ -40,6 +40,7 @@ exports.mergeAugmentMcpServers = mergeAugmentMcpServers;
 exports.getVSCodeSettingsPath = getVSCodeSettingsPath;
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
+const FileSystemUtils_1 = require("../core/FileSystemUtils");
 /**
  * Read VSCode settings.json file
  */
@@ -58,9 +59,8 @@ async function readVSCodeSettings(settingsPath) {
 /**
  * Write VSCode settings.json file
  */
-async function writeVSCodeSettings(settingsPath, settings) {
-    await fs_1.promises.mkdir(path.dirname(settingsPath), { recursive: true });
-    await fs_1.promises.writeFile(settingsPath, JSON.stringify(settings, null, 4));
+async function writeVSCodeSettings(settingsPath, settings, containmentRoot) {
+    await (0, FileSystemUtils_1.writeGeneratedFile)(settingsPath, JSON.stringify(settings, null, 4), containmentRoot);
 }
 /**
  * Transform ruler MCP config to Augment MCP server array format

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intellectronica/ruler",
-  "version": "0.3.42",
+  "version": "0.3.43",
   "description": "Ruler — apply the same rules to all coding agents",
   "main": "dist/lib.js",
   "types": "dist/lib.d.ts",
@@ -13,7 +13,8 @@
     "test:coverage": "jest --coverage",
     "test:integration": "jest tests/e2e/ruler.integration.test.ts --verbose",
     "build": "tsc",
-    "prepare": "npm run build"
+    "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"
   },
   "repository": {
     "type": "git",
@@ -68,7 +69,7 @@
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",
-    "js-yaml": "^4.1.1",
+    "js-yaml": "^4.2.0",
     "yargs": "^18.0.0",
     "zod": "^4.1.12"
   }