@intellectronica/ruler 0.3.41 → 0.3.42

package/dist/revert.js

@@ -35,7 +35,6 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.allAgents = void 0;
 exports.revertAllAgentConfigs = revertAllAgentConfigs;
-const path = __importStar(require("path"));
 const fs_1 = require("fs");
 const FileSystemUtils = __importStar(require("./core/FileSystemUtils"));
 const ConfigLoader_1 = require("./core/ConfigLoader");
@@ -45,7 +44,11 @@ const constants_1 = require("./constants");
 const revert_engine_1 = require("./core/revert-engine");
 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.
  */
@@ -55,6 +58,7 @@ async function revertAllAgentConfigs(projectRoot, includedAgents, configPath, ke
         projectRoot,
         cliAgents: includedAgents,
         configPath,
+        checkGlobal: !localOnly,
     });
     const rulerDir = await FileSystemUtils.findRulerDir(projectRoot, !localOnly);
     if (!rulerDir) {
@@ -77,18 +81,19 @@ async function revertAllAgentConfigs(projectRoot, includedAgents, configPath, ke
             // Fall back to the old logic without validation
             if (config.cliAgents && config.cliAgents.length > 0) {
                 const filters = config.cliAgents.map((n) => n.toLowerCase());
-                selected = agents.filter((agent) => filters.some((f) => agent.getIdentifier() === f ||
-                    agent.getName().toLowerCase().includes(f)));
+                const validAgentIdentifiers = new Set(agents.map((agent) => agent.getIdentifier()));
+                selected = agents.filter((agent) => filters.some((f) => (0, agent_selection_1.agentMatchesFilter)(agent, f, validAgentIdentifiers)));
             }
             else if (config.defaultAgents && config.defaultAgents.length > 0) {
                 const defaults = config.defaultAgents.map((n) => n.toLowerCase());
+                const validAgentIdentifiers = new Set(agents.map((agent) => agent.getIdentifier()));
                 selected = agents.filter((agent) => {
                     const identifier = agent.getIdentifier();
                     const override = config.agentConfigs[identifier]?.enabled;
                     if (override !== undefined) {
                         return override;
                     }
-                    return defaults.some((d) => identifier === d || agent.getName().toLowerCase().includes(d));
+                    return defaults.some((d) => (0, agent_selection_1.agentMatchesFilter)(agent, d, validAgentIdentifiers));
                 });
             }
             else {
@@ -118,10 +123,10 @@ async function revertAllAgentConfigs(projectRoot, includedAgents, configPath, ke
     // Clean up auxiliary files and directories
     const cleanupResult = await (0, revert_engine_1.cleanUpAuxiliaryFiles)(projectRoot, verbose, dryRun);
     totalFilesRemoved += cleanupResult.additionalFilesRemoved;
-    // Clean .gitignore if reverting all agents
-    const gitignoreCleaned = !config.cliAgents || config.cliAgents.length === 0
-        ? await cleanGitignore(projectRoot, verbose, dryRun)
-        : false;
+    // Clean managed ignore blocks if reverting all agents.
+    const cleanedIgnoreFiles = !config.cliAgents || config.cliAgents.length === 0
+        ? await cleanManagedIgnoreFiles(projectRoot, verbose, dryRun)
+        : [];
     // Display summary
     const prefix = (0, constants_1.actionPrefix)(dryRun);
     if (dryRun) {
@@ -139,47 +144,54 @@ async function revertAllAgentConfigs(projectRoot, includedAgents, configPath, ke
     if (cleanupResult.directoriesRemoved > 0) {
         console.log(`  Empty directories removed: ${cleanupResult.directoriesRemoved}`);
     }
-    if (gitignoreCleaned) {
-        console.log(`  .gitignore cleaned: yes`);
+    for (const ignoreFile of cleanedIgnoreFiles) {
+        console.log(`  ${ignoreFile} cleaned: yes`);
     }
 }
 /**
- * Removes the ruler-managed block from .gitignore file.
+ * Removes the ruler-managed block from ignore files Ruler can update.
  */
-async function cleanGitignore(projectRoot, verbose, dryRun) {
-    const gitignorePath = path.join(projectRoot, '.gitignore');
+async function cleanManagedIgnoreFiles(projectRoot, verbose, dryRun) {
+    const cleanedFiles = [];
+    for (const ignoreFile of MANAGED_IGNORE_FILES) {
+        if (await cleanIgnoreFile(projectRoot, ignoreFile, verbose, dryRun)) {
+            cleanedFiles.push(ignoreFile);
+        }
+    }
+    return cleanedFiles;
+}
+async function cleanIgnoreFile(projectRoot, ignoreFile, verbose, dryRun) {
+    const ignorePath = await (0, GitignoreUtils_1.resolveIgnoreFilePath)(projectRoot, ignoreFile);
     try {
-        await fs_1.promises.access(gitignorePath);
+        await fs_1.promises.access(ignorePath);
     }
     catch {
-        (0, constants_1.logVerbose)('No .gitignore file found', verbose);
+        (0, constants_1.logVerbose)(`No ${ignoreFile} file found`, verbose);
         return false;
     }
-    const content = await fs_1.promises.readFile(gitignorePath, 'utf8');
-    const startMarker = '# START Ruler Generated Files';
-    const endMarker = '# END Ruler Generated Files';
-    const startIndex = content.indexOf(startMarker);
-    const endIndex = content.indexOf(endMarker);
+    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) {
-        (0, constants_1.logVerbose)('No ruler-managed block found in .gitignore', verbose);
+        (0, constants_1.logVerbose)(`No ruler-managed block found in ${ignoreFile}`, verbose);
         return false;
     }
     const prefix = (0, constants_1.actionPrefix)(dryRun);
     if (dryRun) {
-        (0, constants_1.logVerbose)(`${prefix} Would remove ruler block from .gitignore`, verbose);
+        (0, constants_1.logVerbose)(`${prefix} Would remove ruler block from ${ignoreFile}`, verbose);
     }
     else {
         const beforeBlock = content.substring(0, startIndex);
-        const afterBlock = content.substring(endIndex + endMarker.length);
+        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() === '') {
-            await fs_1.promises.unlink(gitignorePath);
-            (0, constants_1.logVerbose)(`${prefix} Removed empty .gitignore file`, verbose);
+            await fs_1.promises.unlink(ignorePath);
+            (0, constants_1.logVerbose)(`${prefix} Removed empty ${ignoreFile} file`, verbose);
         }
         else {
-            await fs_1.promises.writeFile(gitignorePath, newContent);
-            (0, constants_1.logVerbose)(`${prefix} Removed ruler block from .gitignore`, verbose);
+            await fs_1.promises.writeFile(ignorePath, newContent);
+            (0, constants_1.logVerbose)(`${prefix} Removed ruler block from ${ignoreFile}`, verbose);
         }
     }
     return true;

package/dist/types.d.ts

@@ -0,0 +1,87 @@
+/**
+ * Types for Model Context Protocol (MCP) server configuration.
+ */
+export type McpStrategy = 'merge' | 'overwrite';
+/** MCP configuration for an agent or global. */
+export interface McpConfig {
+    /** Enable or disable MCP propagation (merge or overwrite). */
+    enabled?: boolean;
+    /** Merge strategy: 'merge' to merge servers, 'overwrite' to replace config. */
+    strategy?: McpStrategy;
+}
+/** Global MCP configuration section (same as agent-specific config). */
+export type GlobalMcpConfig = McpConfig;
+/** Gitignore configuration for automatic .gitignore file updates. */
+export interface GitignoreConfig {
+    /** Enable or disable automatic .gitignore updates. */
+    enabled?: boolean;
+    /** Write managed ignore entries to .git/info/exclude instead of .gitignore. */
+    local?: boolean;
+}
+/** Backup configuration for .bak file generation. */
+export interface BackupConfig {
+    /** Enable or disable creation of .bak backup files. */
+    enabled?: boolean;
+}
+/** Skills configuration for automatic skills distribution. */
+export interface SkillsConfig {
+    /** Enable or disable skills support. */
+    enabled?: boolean;
+}
+/** Information about a discovered skill. */
+export interface SkillInfo {
+    /** Name of the skill (directory name). */
+    name: string;
+    /** Absolute path to the skill directory. */
+    path: string;
+    /** Whether the directory contains a SKILL.md file. */
+    hasSkillMd: boolean;
+    /** Whether this is a valid skill. */
+    valid: boolean;
+    /** Error message if invalid. */
+    error?: string;
+}
+/** Subagents configuration for automatic subagent distribution. */
+export interface SubagentsConfig {
+    /** Enable or disable subagents support. */
+    enabled?: boolean;
+    /**
+     * When true, Ruler may delete previously generated native subagent
+     * directories that are stale (disabled, no source definitions, or
+     * deselected targets). Defaults to false (non-destructive).
+     */
+    cleanup_orphaned?: boolean;
+    /**
+     * When true, `.ruler/agents/*.md` are also concatenated into the
+     * generated top-level rule files (CLAUDE.md, AGENTS.md, Copilot
+     * instructions, etc.). When false (default), `.ruler/agents/` is
+     * skipped during rule concatenation, mirroring `.ruler/skills/`.
+     */
+    include_in_rules?: boolean;
+}
+/** Frontmatter fields recognised on a source subagent definition. */
+export interface SubagentFrontmatter {
+    name: string;
+    description: string;
+    tools?: string[];
+    model?: string;
+    readonly?: boolean;
+    is_background?: boolean;
+}
+/** Information about a discovered subagent. */
+export interface SubagentInfo {
+    /** Name of the subagent (filename stem and frontmatter `name`). */
+    name: string;
+    /** Absolute path to the source `.md` file. */
+    path: string;
+    /** Relative `.md` path under `.ruler/agents/` (preserves nested layout). */
+    sourceRelativePath?: string;
+    /** Parsed frontmatter (only present when valid). */
+    frontmatter?: SubagentFrontmatter;
+    /** Body content after the frontmatter delimiter. */
+    body?: string;
+    /** Whether this subagent passed validation. */
+    valid: boolean;
+    /** Error message if invalid. */
+    error?: string;
+}

package/dist/vscode/settings.d.ts

@@ -0,0 +1,40 @@
+import { McpStrategy } from '../types';
+/**
+ * VSCode settings.json structure for Augment MCP configuration
+ */
+export interface VSCodeSettings {
+    'augment.advanced'?: {
+        mcpServers?: AugmentMcpServer[];
+        [key: string]: unknown;
+    };
+    [key: string]: unknown;
+}
+/**
+ * Augment MCP server configuration format
+ */
+export interface AugmentMcpServer {
+    name: string;
+    command: string;
+    args?: string[];
+    env?: Record<string, string>;
+}
+/**
+ * Read VSCode settings.json file
+ */
+export declare function readVSCodeSettings(settingsPath: string): Promise<VSCodeSettings>;
+/**
+ * Write VSCode settings.json file
+ */
+export declare function writeVSCodeSettings(settingsPath: string, settings: VSCodeSettings): Promise<void>;
+/**
+ * Transform ruler MCP config to Augment MCP server array format
+ */
+export declare function transformRulerToAugmentMcp(rulerMcpJson: Record<string, unknown>): AugmentMcpServer[];
+/**
+ * Merge MCP servers into VSCode settings using the specified strategy
+ */
+export declare function mergeAugmentMcpServers(existingSettings: VSCodeSettings, newServers: AugmentMcpServer[], strategy: McpStrategy): VSCodeSettings;
+/**
+ * Get the VSCode settings.json path for a project (local)
+ */
+export declare function getVSCodeSettingsPath(projectRoot: string): string;

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@intellectronica/ruler",
-  "version": "0.3.41",
+  "version": "0.3.42",
   "description": "Ruler — apply the same rules to all coding agents",
   "main": "dist/lib.js",
+  "types": "dist/lib.d.ts",
   "scripts": {
     "lint": "eslint \"src/**/*.{ts,tsx}\"",
-    "format": "prettier --write \"src/**/*.{ts,tsx,json,md}\"",
-    "test": "jest",
+    "format": "prettier --write package.json package-lock.json tsconfig.json README.md \".github/**/*.yml\" \"src/**/*.{ts,tsx,json,md}\" \"tests/**/*.{ts,tsx,json,md}\"",
+    "format:check": "prettier --check package.json package-lock.json tsconfig.json README.md \".github/**/*.yml\" \"src/**/*.{ts,tsx,json,md}\" \"tests/**/*.{ts,tsx,json,md}\"",
+    "test": "jest --coverage",
     "test:watch": "jest --watch",
     "test:coverage": "jest --coverage",
     "test:integration": "jest tests/e2e/ruler.integration.test.ts --verbose",
@@ -66,7 +68,7 @@
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",
-    "js-yaml": "^4.1.0",
+    "js-yaml": "^4.1.1",
     "yargs": "^18.0.0",
     "zod": "^4.1.12"
   }