rulesync 9.8.0 → 10.1.0

package/dist/cli/index.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_import = require("../import-l0o1jVdc.cjs");
+const require_import = require("../import-Dcj5HiOE.cjs");
 let commander = require("commander");
 let zod_mini = require("zod/mini");
 let node_path = require("node:path");
@@ -542,9 +542,9 @@ const FEATURE_PATHS = {
 	subagents: ["subagents"],
 	skills: ["skills"],
 	ignore: [require_import.RULESYNC_AIIGNORE_FILE_NAME],
-	mcp: [require_import.RULESYNC_MCP_FILE_NAME],
-	hooks: [require_import.RULESYNC_HOOKS_FILE_NAME],
-	permissions: [require_import.RULESYNC_PERMISSIONS_FILE_NAME]
+	mcp: [require_import.RULESYNC_MCP_FILE_NAME, require_import.RULESYNC_MCP_JSONC_FILE_NAME],
+	hooks: [require_import.RULESYNC_HOOKS_FILE_NAME, require_import.RULESYNC_HOOKS_JSONC_FILE_NAME],
+	permissions: [require_import.RULESYNC_PERMISSIONS_FILE_NAME, require_import.RULESYNC_PERMISSIONS_JSONC_FILE_NAME]
 };
 /**
 * Check if target is a tool target (not rulesync)
@@ -1204,11 +1204,13 @@ const DERIVED_PATHS_NOT_GITIGNORED = /* @__PURE__ */ new Set([
 	"**/.antigravity/settings.json",
 	"**/.claude/settings.json",
 	"**/.claude/settings.local.json",
+	"**/.codex/config.toml",
 	"**/.devin/config.json",
 	"**/.factory/settings.json",
-	"**/.gemini/settings.json",
+	"**/.grok/config.toml",
+	"**/.vibe/config.toml",
+	"**/reasonix.toml",
 	"**/.zed/settings.json",
-	"**/.warp/settings.toml",
 	"**/kilo.json",
 	"**/kilo.jsonc",
 	"**/opencode.json"
@@ -1224,7 +1226,6 @@ const supportsProject = (factory) => {
 };
 const getProjectPaths = (factory) => factory.class.getSettablePaths({ global: false });
 const pushEntry = (entries, target, feature, entry) => {
-	if (DERIVED_PATHS_NOT_GITIGNORED.has(entry)) return;
 	entries.push({
 		target,
 		feature,
@@ -1293,7 +1294,8 @@ const DERIVED_FEATURES = [
 	"permissions",
 	"ignore"
 ];
-const deriveAllGitignoreEntries = () => DERIVED_FEATURES.flatMap((feature) => deriveFeatureGitignoreEntries(feature));
+const deriveAllGitignoreEntriesUnfiltered = () => DERIVED_FEATURES.flatMap((feature) => deriveFeatureGitignoreEntries(feature));
+const deriveAllGitignoreEntries = () => deriveAllGitignoreEntriesUnfiltered().filter((tag) => !DERIVED_PATHS_NOT_GITIGNORED.has(tag.entry));
 //#endregion
 //#region src/cli/commands/gitignore-entries.ts
 const normalizeGitignoreEntryTargets = (target) => {
@@ -1425,6 +1427,11 @@ const GITIGNORE_ENTRY_REGISTRY = [
 			target: "codexcli",
 			feature: "ignore",
 			entry: "**/.codexignore"
+		},
+		{
+			target: "codexcli",
+			feature: "permissions",
+			entry: `**/${require_import.CODEXCLI_DIR}/rules/`
 		}
 	],
 	...deriveAllGitignoreEntries(),
@@ -1499,50 +1506,103 @@ const resolveGitignoreEntries = (params) => {
 //#endregion
 //#region src/cli/commands/gitignore.ts
 const RULESYNC_HEADER = "# Generated by Rulesync";
+const RULESYNC_FOOTER = "# End of Rulesync";
 const LEGACY_RULESYNC_HEADER = "# Generated by rulesync - AI tool configuration files";
 const isRulesyncHeader = (line) => {
 	const trimmed = line.trim();
 	return trimmed === RULESYNC_HEADER || trimmed === LEGACY_RULESYNC_HEADER;
 };
+const isRulesyncFooter = (line) => {
+	return line.trim() === RULESYNC_FOOTER;
+};
 const isRulesyncEntry = (line) => {
 	const trimmed = line.trim();
-	if (trimmed === "" || isRulesyncHeader(line)) return false;
+	if (trimmed === "" || isRulesyncHeader(line) || isRulesyncFooter(line)) return false;
 	return ALL_GITIGNORE_ENTRIES.includes(trimmed);
 };
+const findRulesyncFooterIndex = (lines, start) => {
+	for (let index = start; index < lines.length; index++) {
+		const line = lines[index] ?? "";
+		if (isRulesyncFooter(line)) return index;
+		if (isRulesyncHeader(line)) return -1;
+	}
+	return -1;
+};
+const skipLegacyRulesyncBlock = (lines, headerIndex) => {
+	let index = headerIndex + 1;
+	let consecutiveEmptyLines = 0;
+	while (index < lines.length) {
+		const line = lines[index] ?? "";
+		if (line.trim() === "") {
+			consecutiveEmptyLines++;
+			index++;
+			if (consecutiveEmptyLines >= 2) break;
+			continue;
+		}
+		if (isRulesyncEntry(line)) {
+			consecutiveEmptyLines = 0;
+			index++;
+			continue;
+		}
+		break;
+	}
+	return index;
+};
 const removeExistingRulesyncEntries = (content) => {
 	const lines = content.split("\n");
 	const filteredLines = [];
-	let inRulesyncBlock = false;
-	let consecutiveEmptyLines = 0;
-	for (const line of lines) {
-		const trimmed = line.trim();
+	let index = 0;
+	while (index < lines.length) {
+		const line = lines[index] ?? "";
 		if (isRulesyncHeader(line)) {
-			inRulesyncBlock = true;
-			continue;
-		}
-		if (inRulesyncBlock) {
-			if (trimmed === "") {
-				consecutiveEmptyLines++;
-				if (consecutiveEmptyLines >= 2) {
-					inRulesyncBlock = false;
-					consecutiveEmptyLines = 0;
-				}
-				continue;
-			}
-			if (isRulesyncEntry(line)) {
-				consecutiveEmptyLines = 0;
+			const footerIndex = findRulesyncFooterIndex(lines, index + 1);
+			if (footerIndex !== -1) {
+				index = footerIndex + 1;
 				continue;
 			}
-			inRulesyncBlock = false;
-			consecutiveEmptyLines = 0;
+			index = skipLegacyRulesyncBlock(lines, index);
+			continue;
+		}
+		if (isRulesyncEntry(line)) {
+			index++;
+			continue;
 		}
-		if (isRulesyncEntry(line)) continue;
 		filteredLines.push(line);
+		index++;
 	}
 	let result = filteredLines.join("\n");
 	while (result.endsWith("\n\n")) result = result.slice(0, -1);
 	return result;
 };
+const extractRulesyncManagedEntries = (content) => {
+	const lines = content.split("\n");
+	const managed = [];
+	let index = 0;
+	const collectBlockLines = (start, end) => {
+		for (const blockLine of lines.slice(start, end)) {
+			const trimmed = blockLine.trim();
+			if (trimmed !== "") managed.push(trimmed);
+		}
+	};
+	while (index < lines.length) {
+		const line = lines[index] ?? "";
+		if (isRulesyncHeader(line)) {
+			const footerIndex = findRulesyncFooterIndex(lines, index + 1);
+			if (footerIndex !== -1) {
+				collectBlockLines(index + 1, footerIndex);
+				index = footerIndex + 1;
+				continue;
+			}
+			const legacyEnd = skipLegacyRulesyncBlock(lines, index);
+			collectBlockLines(index + 1, legacyEnd);
+			index = legacyEnd;
+			continue;
+		}
+		if (isRulesyncEntry(line)) managed.push(line.trim());
+		index++;
+	}
+	return managed;
+};
 const groupEntriesByDestination = ({ entries, resolveDestination }) => {
 	const gitignore = /* @__PURE__ */ new Set();
 	const gitattributes = /* @__PURE__ */ new Set();
@@ -1579,21 +1639,29 @@ const gitignoreCommand = async (logger, options) => {
 		let content = "";
 		if (await require_import.fileExists(filePath)) content = await require_import.readFileContent(filePath);
 		const cleanedContent = removeExistingRulesyncEntries(content);
-		const existingEntries = new Set(content.split("\n").map((line) => line.trim()).filter((line) => line !== "" && !isRulesyncHeader(line)));
+		const entrySet = new Set(entries);
+		const entriesRemoved = [...new Set(extractRulesyncManagedEntries(content).filter((entry) => !entrySet.has(entry)))];
+		const existingEntries = new Set(content.split("\n").map((line) => line.trim()).filter((line) => line !== "" && !isRulesyncHeader(line) && !isRulesyncFooter(line)));
 		const alreadyExistedEntries = entries.filter((entry) => existingEntries.has(entry));
 		const entriesToAdd = entries.filter((entry) => !existingEntries.has(entry));
-		const rulesyncBlock = [RULESYNC_HEADER, ...entries].join("\n");
+		const rulesyncBlock = [
+			RULESYNC_HEADER,
+			...entries,
+			RULESYNC_FOOTER
+		].join("\n");
 		const newContent = entries.length === 0 ? cleanedContent.trim() ? `${cleanedContent.trimEnd()}\n` : "" : cleanedContent.trim() ? `${cleanedContent.trimEnd()}\n\n${rulesyncBlock}\n` : `${rulesyncBlock}\n`;
 		if (content === newContent) return {
 			updated: false,
 			alreadyExistedEntries,
-			entriesToAdd: []
+			entriesToAdd: [],
+			entriesRemoved: []
 		};
 		await require_import.writeFileContent(filePath, newContent);
 		return {
 			updated: true,
 			alreadyExistedEntries,
-			entriesToAdd
+			entriesToAdd,
+			entriesRemoved
 		};
 	};
 	const gitignoreResult = await updateRulesyncFile({
@@ -1619,6 +1687,12 @@ const gitignoreCommand = async (logger, options) => {
 		logger.captureData("gitignorePath", gitignorePath);
 		logger.captureData("gitattributesPath", gitattributesPath);
 		logger.captureData("alreadyExisted", [...gitignoreResult.alreadyExistedEntries, ...gitattributesResult.alreadyExistedEntries]);
+		logger.captureData("entriesRemoved", gitignoreResult.entriesRemoved);
+	}
+	if (gitignoreResult.entriesRemoved.length > 0) {
+		logger.warn("The following entries were removed from the rulesync-managed block in .gitignore and are no longer gitignored by rulesync:");
+		for (const entry of gitignoreResult.entriesRemoved) logger.warn(`  ${entry}`);
+		logger.warn("Review these paths before committing — user-managed settings files may contain secrets.");
 	}
 	if (gitignoreResult.updated) logger.success("Updated .gitignore with rulesync entries:");
 	else logger.success(".gitignore is already up to date");
@@ -1715,7 +1789,8 @@ async function createConfigFile() {
 			"commands",
 			"subagents",
 			"skills",
-			"hooks"
+			"hooks",
+			"permissions"
 		],
 		outputRoots: ["."],
 		delete: true,
@@ -1859,6 +1934,25 @@ Keep the summary concise and ready to reuse in future tasks.`
     ]
   }
 }
+` };
+	const samplePermissionsFile = { content: `{
+  "$schema": "${require_import.RULESYNC_PERMISSIONS_SCHEMA_URL}",
+  "permission": {
+    "bash": {
+      "git status": "allow",
+      "git diff": "allow",
+      "ls *": "allow",
+      "rm -rf *": "deny",
+      "*": "ask"
+    },
+    "edit": {
+      "src/**": "allow"
+    },
+    "read": {
+      ".env": "deny"
+    }
+  }
+}
 ` };
 	const rulePaths = require_import.RulesyncRule.getSettablePaths();
 	const mcpPaths = require_import.RulesyncMcp.getSettablePaths();
@@ -1867,6 +1961,7 @@ Keep the summary concise and ready to reuse in future tasks.`
 	const skillPaths = require_import.RulesyncSkill.getSettablePaths();
 	const ignorePaths = require_import.RulesyncIgnore.getSettablePaths();
 	const hooksPaths = require_import.RulesyncHooks.getSettablePaths();
+	const permissionsPaths = require_import.RulesyncPermissions.getSettablePaths();
 	await require_import.ensureDir(rulePaths.recommended.relativeDirPath);
 	await require_import.ensureDir(mcpPaths.recommended.relativeDirPath);
 	await require_import.ensureDir(commandPaths.relativeDirPath);
@@ -1889,6 +1984,8 @@ Keep the summary concise and ready to reuse in future tasks.`
 	results.push(await writeIfNotExists(ignoreFilepath, sampleIgnoreFile.content));
 	const hooksFilepath = (0, node_path.join)(hooksPaths.relativeDirPath, hooksPaths.relativeFilePath);
 	results.push(await writeIfNotExists(hooksFilepath, sampleHooksFile.content));
+	const permissionsFilepath = (0, node_path.join)(permissionsPaths.relativeDirPath, permissionsPaths.relativeFilePath);
+	results.push(await writeIfNotExists(permissionsFilepath, samplePermissionsFile.content));
 	return results;
 }
 async function writeIfNotExists(path, content) {
@@ -1930,7 +2027,7 @@ async function initCommand(logger) {
 	}
 	logger.success("rulesync initialized successfully!");
 	logger.info("Next steps:");
-	logger.info(`1. Edit ${require_import.RULESYNC_RELATIVE_DIR_PATH}/**/*.md, ${require_import.RULESYNC_RELATIVE_DIR_PATH}/skills/*/${require_import.SKILL_FILE_NAME}, ${require_import.RULESYNC_MCP_RELATIVE_FILE_PATH}, ${require_import.RULESYNC_HOOKS_RELATIVE_FILE_PATH} and ${require_import.RULESYNC_AIIGNORE_RELATIVE_FILE_PATH}`);
+	logger.info(`1. Edit ${require_import.RULESYNC_RELATIVE_DIR_PATH}/**/*.md, ${require_import.RULESYNC_RELATIVE_DIR_PATH}/skills/*/${require_import.SKILL_FILE_NAME}, ${require_import.RULESYNC_MCP_RELATIVE_FILE_PATH}, ${require_import.RULESYNC_HOOKS_RELATIVE_FILE_PATH}, ${require_import.RULESYNC_PERMISSIONS_RELATIVE_FILE_PATH} and ${require_import.RULESYNC_AIIGNORE_RELATIVE_FILE_PATH}`);
 	logger.info("2. Run 'rulesync generate' to create configuration files");
 }
 //#endregion
@@ -4740,6 +4837,8 @@ async function putHooksFile({ content }) {
 	try {
 		const outputRoot = process.cwd();
 		const paths = require_import.RulesyncHooks.getSettablePaths();
+		const jsoncRelativePath = (0, node_path.join)(paths.jsonc.relativeDirPath, paths.jsonc.relativeFilePath);
+		if (await require_import.fileExists((0, node_path.join)(outputRoot, jsoncRelativePath))) throw new Error(`${jsoncRelativePath} exists and takes precedence over ${require_import.RULESYNC_HOOKS_RELATIVE_FILE_PATH}. Edit ${jsoncRelativePath} directly instead.`);
 		const relativeDirPath = paths.relativeDirPath;
 		const relativeFilePath = paths.relativeFilePath;
 		const fullPath = (0, node_path.join)(outputRoot, relativeDirPath, relativeFilePath);
@@ -4768,6 +4867,7 @@ async function deleteHooksFile() {
 		const outputRoot = process.cwd();
 		const paths = require_import.RulesyncHooks.getSettablePaths();
 		await require_import.removeFile((0, node_path.join)(outputRoot, paths.relativeDirPath, paths.relativeFilePath));
+		await require_import.removeFile((0, node_path.join)(outputRoot, paths.jsonc.relativeDirPath, paths.jsonc.relativeFilePath));
 		return { relativePathFromCwd: (0, node_path.join)(paths.relativeDirPath, paths.relativeFilePath) };
 	} catch (error) {
 		throw new Error(`Failed to delete hooks file (${require_import.RULESYNC_HOOKS_RELATIVE_FILE_PATH}): ${require_import.formatError(error)}`, { cause: error });
@@ -5018,6 +5118,8 @@ async function putMcpFile({ content }) {
 	try {
 		const outputRoot = process.cwd();
 		const paths = require_import.RulesyncMcp.getSettablePaths();
+		const jsoncRelativePath = (0, node_path.join)(paths.jsonc.relativeDirPath, paths.jsonc.relativeFilePath);
+		if (await require_import.fileExists((0, node_path.join)(outputRoot, jsoncRelativePath))) throw new Error(`${jsoncRelativePath} exists and takes precedence over ${require_import.RULESYNC_MCP_RELATIVE_FILE_PATH}. Edit ${jsoncRelativePath} directly instead.`);
 		const relativeDirPath = paths.recommended.relativeDirPath;
 		const relativeFilePath = paths.recommended.relativeFilePath;
 		const fullPath = (0, node_path.join)(outputRoot, relativeDirPath, relativeFilePath);
@@ -5048,6 +5150,7 @@ async function deleteMcpFile() {
 		const recommendedPath = (0, node_path.join)(outputRoot, paths.recommended.relativeDirPath, paths.recommended.relativeFilePath);
 		const legacyPath = (0, node_path.join)(outputRoot, paths.legacy.relativeDirPath, paths.legacy.relativeFilePath);
 		await require_import.removeFile(recommendedPath);
+		await require_import.removeFile((0, node_path.join)(outputRoot, paths.jsonc.relativeDirPath, paths.jsonc.relativeFilePath));
 		await require_import.removeFile(legacyPath);
 		return { relativePathFromCwd: (0, node_path.join)(paths.recommended.relativeDirPath, paths.recommended.relativeFilePath) };
 	} catch (error) {
@@ -5124,6 +5227,8 @@ async function putPermissionsFile({ content }) {
 	try {
 		const outputRoot = process.cwd();
 		const paths = require_import.RulesyncPermissions.getSettablePaths();
+		const jsoncRelativePath = (0, node_path.join)(paths.jsonc.relativeDirPath, paths.jsonc.relativeFilePath);
+		if (await require_import.fileExists((0, node_path.join)(outputRoot, jsoncRelativePath))) throw new Error(`${jsoncRelativePath} exists and takes precedence over ${require_import.RULESYNC_PERMISSIONS_RELATIVE_FILE_PATH}. Edit ${jsoncRelativePath} directly instead.`);
 		const relativeDirPath = paths.relativeDirPath;
 		const relativeFilePath = paths.relativeFilePath;
 		const fullPath = (0, node_path.join)(outputRoot, relativeDirPath, relativeFilePath);
@@ -5152,6 +5257,7 @@ async function deletePermissionsFile() {
 		const outputRoot = process.cwd();
 		const paths = require_import.RulesyncPermissions.getSettablePaths();
 		await require_import.removeFile((0, node_path.join)(outputRoot, paths.relativeDirPath, paths.relativeFilePath));
+		await require_import.removeFile((0, node_path.join)(outputRoot, paths.jsonc.relativeDirPath, paths.jsonc.relativeFilePath));
 		return { relativePathFromCwd: (0, node_path.join)(paths.relativeDirPath, paths.relativeFilePath) };
 	} catch (error) {
 		throw new Error(`Failed to delete permissions file (${require_import.RULESYNC_PERMISSIONS_RELATIVE_FILE_PATH}): ${require_import.formatError(error)}`, { cause: error });
@@ -6450,7 +6556,7 @@ function wrapCommand$1({ name, errorCode, handler, getVersion, loggerFactory = c
 }
 //#endregion
 //#region src/cli/index.ts
-const getVersion = () => "9.8.0";
+const getVersion = () => "10.1.0";
 function wrapCommand(name, errorCode, handler) {
 	return wrapCommand$1({
 		name,