@nerviq/cli 1.8.6 → 1.8.8

package/src/context.js

@@ -185,12 +185,38 @@ class ProjectContext {
     return deps;
   }
 
+  /**
+   * Recursively check if a file or directory name exists anywhere under a given base directory.
+   * Searches up to maxDepth levels deep.
+   */
+  _findInSubdirs(name, baseDir, maxDepth = 3) {
+    if (maxDepth <= 0) return false;
+    try {
+      const entries = fs.readdirSync(baseDir, { withFileTypes: true });
+      for (const entry of entries) {
+        if (entry.name === 'node_modules' || entry.name === '__pycache__' || entry.name === '.git') continue;
+        if (entry.name === name || entry.name.endsWith(name)) return true;
+        if (entry.isDirectory()) {
+          if (this._findInSubdirs(name, path.join(baseDir, entry.name), maxDepth - 1)) return true;
+        }
+      }
+    } catch {
+      // directory not readable
+    }
+    return false;
+  }
+
   detectStacks(STACKS) {
     const detected = [];
     for (const [key, stack] of Object.entries(STACKS)) {
-      const hasFile = stack.files.some(f => {
+      // Check root-level files first (fast path)
+      let hasFile = stack.files.some(f => {
         return this.files.some(pf => pf.startsWith(f));
       });
+      // If not found at root, search subdirectories (up to 3 levels deep)
+      if (!hasFile) {
+        hasFile = stack.files.some(f => this._findInSubdirs(f, this.dir));
+      }
       if (!hasFile) continue;
 
       let contentMatch = true;

package/src/convert.js

@@ -98,7 +98,7 @@ function readSourceConfig(dir, from) {
           if (descMatch) desc = descMatch[1].trim();
         }
         canonical.rules.push({
-          name: file.replace('.mdc', ''),
+          name: file.replace(/\.(mdc|md|txt)$/i, ''),
           content,
           alwaysOn,
           glob,
@@ -165,7 +165,11 @@ function readSourceConfig(dir, from) {
 
 function buildTargetOutput(canonical, to, { dryRun = false } = {}) {
   const outputs = [];  // Array of { path, content }
-  const combinedContent = canonical.rules.map(r => r.content).join('\n\n');
+  // Strip MDC frontmatter from rule content for non-cursor targets to prevent leaking
+  const stripFrontmatter = (text) => text.replace(/^---[\s\S]*?---\n/m, '').trim();
+  const combinedContent = to === 'cursor'
+    ? canonical.rules.map(r => r.content).join('\n\n')
+    : canonical.rules.map(r => stripFrontmatter(r.content)).join('\n\n');
 
   if (to === 'claude') {
     // Extract or create CLAUDE.md from combined rules

package/src/copilot/patch.js

@@ -1,238 +1,238 @@
-/**
- * Copilot Patch Intelligence
- *
- * Safe patching of existing Copilot files using managed blocks.
- * Supports copilot-instructions.md (HTML comment blocks) and
- * .vscode/settings.json + .vscode/mcp.json (JSON merge).
- *
- * Managed blocks are sections that nerviq controls.
- * Hand-authored content outside managed blocks is preserved.
- */
-
-const fs = require('fs');
-const path = require('path');
-const { writeRollbackArtifact, writeActivityArtifact } = require('../activity');
-
-// Managed block markers for Markdown
-const MANAGED_START_MD = '<!-- nerviq:managed:start -->';
-const MANAGED_END_MD = '<!-- nerviq:managed:end -->';
-const MANAGED_JSON_KEY = '_claudex_managed';
-
-/**
- * Extract managed blocks from a file.
- */
-function extractManagedBlock(content, startMarker, endMarker) {
-  const startIdx = content.indexOf(startMarker);
-  const endIdx = content.indexOf(endMarker);
-
-  if (startIdx === -1 || endIdx === -1 || endIdx <= startIdx) {
-    return { before: content, managed: null, after: '' };
-  }
-
-  return {
-    before: content.substring(0, startIdx),
-    managed: content.substring(startIdx + startMarker.length, endIdx).trim(),
-    after: content.substring(endIdx + endMarker.length),
-  };
-}
-
-/**
- * Replace or insert a managed block in a file.
- */
-function upsertManagedBlock(content, newManaged, startMarker, endMarker) {
-  const { before, managed, after } = extractManagedBlock(content, startMarker, endMarker);
-
-  if (managed !== null) {
-    return `${before}${startMarker}\n${newManaged}\n${endMarker}${after}`;
-  }
-
-  const separator = content.endsWith('\n') ? '\n' : '\n\n';
-  return `${content}${separator}${startMarker}\n${newManaged}\n${endMarker}\n`;
-}
-
-/**
- * Patch copilot-instructions.md with managed sections.
- */
-function patchCopilotInstructionsMd(existingContent, managedSections) {
-  const newManaged = Object.entries(managedSections)
-    .map(([section, content]) => `## ${section}\n${content}`)
-    .join('\n\n');
-
-  return upsertManagedBlock(existingContent, newManaged, MANAGED_START_MD, MANAGED_END_MD);
-}
-
-/**
- * Patch .vscode/settings.json by safely merging new keys.
- * Only adds new keys or updates the _claudex_managed namespace.
- */
-function patchVscodeSettingsJson(existingContent, newKeys) {
-  let existing;
-  try {
-    existing = JSON.parse(existingContent);
-  } catch {
-    existing = {};
-  }
-
-  const merged = { ...existing };
-
-  for (const [key, value] of Object.entries(newKeys)) {
-    if (key === MANAGED_JSON_KEY) {
-      merged[MANAGED_JSON_KEY] = { ...(existing[MANAGED_JSON_KEY] || {}), ...value };
-    } else if (!(key in existing)) {
-      merged[key] = value;
-    }
-  }
-
-  if (!merged[MANAGED_JSON_KEY]) merged[MANAGED_JSON_KEY] = {};
-  merged[MANAGED_JSON_KEY]._updatedAt = new Date().toISOString();
-  merged[MANAGED_JSON_KEY]._generator = nerviq;
-  merged[MANAGED_JSON_KEY]._platform = 'copilot';
-
-  return JSON.stringify(merged, null, 2) + '\n';
-}
-
-/**
- * Patch .vscode/mcp.json by safely merging new servers.
- * Copilot MCP uses the "servers" wrapper format.
- */
-function patchMcpJson(existingContent, newServers) {
-  let existing;
-  try {
-    existing = JSON.parse(existingContent);
-  } catch {
-    existing = {};
-  }
-
-  if (!existing.servers) existing.servers = {};
-
-  const merged = { ...existing };
-  for (const [serverName, config] of Object.entries(newServers)) {
-    if (!(serverName in merged.servers)) {
-      merged.servers[serverName] = config;
-    }
-  }
-
-  if (!merged[MANAGED_JSON_KEY]) merged[MANAGED_JSON_KEY] = {};
-  merged[MANAGED_JSON_KEY]._updatedAt = new Date().toISOString();
-  merged[MANAGED_JSON_KEY]._generator = nerviq;
-
-  return JSON.stringify(merged, null, 2) + '\n';
-}
-
-/**
- * Detect if a repo has multiple agent surfaces (Copilot + Claude + Codex + Gemini coexistence).
- */
-function detectMixedAgentRepo(dir) {
-  const hasClaude = fs.existsSync(path.join(dir, 'CLAUDE.md')) || fs.existsSync(path.join(dir, '.claude'));
-  const hasCodex = fs.existsSync(path.join(dir, 'AGENTS.md')) || fs.existsSync(path.join(dir, '.codex'));
-  const hasGemini = fs.existsSync(path.join(dir, 'GEMINI.md')) || fs.existsSync(path.join(dir, '.gemini'));
-  const hasCopilot = fs.existsSync(path.join(dir, '.github', 'copilot-instructions.md')) ||
-                     fs.existsSync(path.join(dir, '.vscode', 'mcp.json'));
-
-  const platforms = [];
-  if (hasClaude) platforms.push('claude');
-  if (hasCodex) platforms.push('codex');
-  if (hasGemini) platforms.push('gemini');
-  if (hasCopilot) platforms.push('copilot');
-
-  return {
-    isMixed: platforms.length >= 2,
-    hasClaude,
-    hasCodex,
-    hasGemini,
-    hasCopilot,
-    platforms,
-    guidance: platforms.length >= 2
-      ? `This is a mixed-agent repo (${platforms.join(', ')}). Keep each platform's instructions in its own file (CLAUDE.md, AGENTS.md, GEMINI.md, copilot-instructions.md). Do not merge them.`
-      : null,
-  };
-}
-
-/**
- * Generate a diff preview for a patch operation.
- */
-function generatePatchPreview(originalContent, patchedContent, filePath) {
-  const origLines = originalContent.split('\n');
-  const patchLines = patchedContent.split('\n');
-  const lines = [`--- ${filePath} (original)`, `+++ ${filePath} (patched)`];
-
-  let inChange = false;
-  for (let i = 0; i < Math.max(origLines.length, patchLines.length); i++) {
-    const orig = origLines[i] || '';
-    const patched = patchLines[i] || '';
-    if (orig !== patched) {
-      if (!inChange) { lines.push(`@@ line ${i + 1} @@`); inChange = true; }
-      if (i < origLines.length) lines.push(`-${orig}`);
-      if (i < patchLines.length) lines.push(`+${patched}`);
-    } else {
-      inChange = false;
-    }
-  }
-
-  return lines.join('\n');
-}
-
-/**
- * Apply a patch to a file with backup and rollback support.
- */
-function applyPatch(dir, filePath, patchFn, options = {}) {
-  const fullPath = path.join(dir, filePath);
-  const dryRun = options.dryRun === true;
-
-  if (!fs.existsSync(fullPath)) {
-    return { success: false, reason: `${filePath} does not exist`, preview: null };
-  }
-
-  const original = fs.readFileSync(fullPath, 'utf8');
-  const patched = patchFn(original);
-
-  if (patched === original) {
-    return { success: true, reason: 'no changes needed', preview: null, unchanged: true };
-  }
-
-  const preview = generatePatchPreview(original, patched, filePath);
-
-  if (dryRun) {
-    return { success: true, reason: 'dry run', preview, unchanged: false };
-  }
-
-  const backupPath = fullPath + '.nerviq-backup';
-  fs.writeFileSync(backupPath, original, 'utf8');
-  fs.writeFileSync(fullPath, patched, 'utf8');
-
-  const rollback = writeRollbackArtifact(dir, {
-    sourcePlan: 'copilot-patch',
-    patchedFiles: [filePath],
-    backupFiles: [{ original: filePath, backup: path.relative(dir, backupPath) }],
-    rollbackInstructions: [`Restore ${filePath} from ${path.relative(dir, backupPath)}`],
-  });
-
-  const activity = writeActivityArtifact(dir, 'copilot-patch', {
-    platform: 'copilot',
-    patchedFiles: [filePath],
-    rollbackArtifact: rollback.relativePath,
-  });
-
-  return {
-    success: true,
-    reason: 'patched',
-    preview,
-    unchanged: false,
-    rollbackArtifact: rollback.relativePath,
-    activityArtifact: activity.relativePath,
-  };
-}
-
-module.exports = {
-  MANAGED_START_MD,
-  MANAGED_END_MD,
-  MANAGED_JSON_KEY,
-  extractManagedBlock,
-  upsertManagedBlock,
-  patchCopilotInstructionsMd,
-  patchVscodeSettingsJson,
-  patchMcpJson,
-  detectMixedAgentRepo,
-  generatePatchPreview,
-  applyPatch,
-};
+/**
+ * Copilot Patch Intelligence
+ *
+ * Safe patching of existing Copilot files using managed blocks.
+ * Supports copilot-instructions.md (HTML comment blocks) and
+ * .vscode/settings.json + .vscode/mcp.json (JSON merge).
+ *
+ * Managed blocks are sections that nerviq controls.
+ * Hand-authored content outside managed blocks is preserved.
+ */
+
+const fs = require('fs');
+const path = require('path');
+const { writeRollbackArtifact, writeActivityArtifact } = require('../activity');
+
+// Managed block markers for Markdown
+const MANAGED_START_MD = '<!-- nerviq:managed:start -->';
+const MANAGED_END_MD = '<!-- nerviq:managed:end -->';
+const MANAGED_JSON_KEY = '_nerviq_managed';
+
+/**
+ * Extract managed blocks from a file.
+ */
+function extractManagedBlock(content, startMarker, endMarker) {
+  const startIdx = content.indexOf(startMarker);
+  const endIdx = content.indexOf(endMarker);
+
+  if (startIdx === -1 || endIdx === -1 || endIdx <= startIdx) {
+    return { before: content, managed: null, after: '' };
+  }
+
+  return {
+    before: content.substring(0, startIdx),
+    managed: content.substring(startIdx + startMarker.length, endIdx).trim(),
+    after: content.substring(endIdx + endMarker.length),
+  };
+}
+
+/**
+ * Replace or insert a managed block in a file.
+ */
+function upsertManagedBlock(content, newManaged, startMarker, endMarker) {
+  const { before, managed, after } = extractManagedBlock(content, startMarker, endMarker);
+
+  if (managed !== null) {
+    return `${before}${startMarker}\n${newManaged}\n${endMarker}${after}`;
+  }
+
+  const separator = content.endsWith('\n') ? '\n' : '\n\n';
+  return `${content}${separator}${startMarker}\n${newManaged}\n${endMarker}\n`;
+}
+
+/**
+ * Patch copilot-instructions.md with managed sections.
+ */
+function patchCopilotInstructionsMd(existingContent, managedSections) {
+  const newManaged = Object.entries(managedSections)
+    .map(([section, content]) => `## ${section}\n${content}`)
+    .join('\n\n');
+
+  return upsertManagedBlock(existingContent, newManaged, MANAGED_START_MD, MANAGED_END_MD);
+}
+
+/**
+ * Patch .vscode/settings.json by safely merging new keys.
+ * Only adds new keys or updates the _nerviq_managed namespace.
+ */
+function patchVscodeSettingsJson(existingContent, newKeys) {
+  let existing;
+  try {
+    existing = JSON.parse(existingContent);
+  } catch {
+    existing = {};
+  }
+
+  const merged = { ...existing };
+
+  for (const [key, value] of Object.entries(newKeys)) {
+    if (key === MANAGED_JSON_KEY) {
+      merged[MANAGED_JSON_KEY] = { ...(existing[MANAGED_JSON_KEY] || {}), ...value };
+    } else if (!(key in existing)) {
+      merged[key] = value;
+    }
+  }
+
+  if (!merged[MANAGED_JSON_KEY]) merged[MANAGED_JSON_KEY] = {};
+  merged[MANAGED_JSON_KEY]._updatedAt = new Date().toISOString();
+  merged[MANAGED_JSON_KEY]._generator = nerviq;
+  merged[MANAGED_JSON_KEY]._platform = 'copilot';
+
+  return JSON.stringify(merged, null, 2) + '\n';
+}
+
+/**
+ * Patch .vscode/mcp.json by safely merging new servers.
+ * Copilot MCP uses the "servers" wrapper format.
+ */
+function patchMcpJson(existingContent, newServers) {
+  let existing;
+  try {
+    existing = JSON.parse(existingContent);
+  } catch {
+    existing = {};
+  }
+
+  if (!existing.servers) existing.servers = {};
+
+  const merged = { ...existing };
+  for (const [serverName, config] of Object.entries(newServers)) {
+    if (!(serverName in merged.servers)) {
+      merged.servers[serverName] = config;
+    }
+  }
+
+  if (!merged[MANAGED_JSON_KEY]) merged[MANAGED_JSON_KEY] = {};
+  merged[MANAGED_JSON_KEY]._updatedAt = new Date().toISOString();
+  merged[MANAGED_JSON_KEY]._generator = nerviq;
+
+  return JSON.stringify(merged, null, 2) + '\n';
+}
+
+/**
+ * Detect if a repo has multiple agent surfaces (Copilot + Claude + Codex + Gemini coexistence).
+ */
+function detectMixedAgentRepo(dir) {
+  const hasClaude = fs.existsSync(path.join(dir, 'CLAUDE.md')) || fs.existsSync(path.join(dir, '.claude'));
+  const hasCodex = fs.existsSync(path.join(dir, 'AGENTS.md')) || fs.existsSync(path.join(dir, '.codex'));
+  const hasGemini = fs.existsSync(path.join(dir, 'GEMINI.md')) || fs.existsSync(path.join(dir, '.gemini'));
+  const hasCopilot = fs.existsSync(path.join(dir, '.github', 'copilot-instructions.md')) ||
+                     fs.existsSync(path.join(dir, '.vscode', 'mcp.json'));
+
+  const platforms = [];
+  if (hasClaude) platforms.push('claude');
+  if (hasCodex) platforms.push('codex');
+  if (hasGemini) platforms.push('gemini');
+  if (hasCopilot) platforms.push('copilot');
+
+  return {
+    isMixed: platforms.length >= 2,
+    hasClaude,
+    hasCodex,
+    hasGemini,
+    hasCopilot,
+    platforms,
+    guidance: platforms.length >= 2
+      ? `This is a mixed-agent repo (${platforms.join(', ')}). Keep each platform's instructions in its own file (CLAUDE.md, AGENTS.md, GEMINI.md, copilot-instructions.md). Do not merge them.`
+      : null,
+  };
+}
+
+/**
+ * Generate a diff preview for a patch operation.
+ */
+function generatePatchPreview(originalContent, patchedContent, filePath) {
+  const origLines = originalContent.split('\n');
+  const patchLines = patchedContent.split('\n');
+  const lines = [`--- ${filePath} (original)`, `+++ ${filePath} (patched)`];
+
+  let inChange = false;
+  for (let i = 0; i < Math.max(origLines.length, patchLines.length); i++) {
+    const orig = origLines[i] || '';
+    const patched = patchLines[i] || '';
+    if (orig !== patched) {
+      if (!inChange) { lines.push(`@@ line ${i + 1} @@`); inChange = true; }
+      if (i < origLines.length) lines.push(`-${orig}`);
+      if (i < patchLines.length) lines.push(`+${patched}`);
+    } else {
+      inChange = false;
+    }
+  }
+
+  return lines.join('\n');
+}
+
+/**
+ * Apply a patch to a file with backup and rollback support.
+ */
+function applyPatch(dir, filePath, patchFn, options = {}) {
+  const fullPath = path.join(dir, filePath);
+  const dryRun = options.dryRun === true;
+
+  if (!fs.existsSync(fullPath)) {
+    return { success: false, reason: `${filePath} does not exist`, preview: null };
+  }
+
+  const original = fs.readFileSync(fullPath, 'utf8');
+  const patched = patchFn(original);
+
+  if (patched === original) {
+    return { success: true, reason: 'no changes needed', preview: null, unchanged: true };
+  }
+
+  const preview = generatePatchPreview(original, patched, filePath);
+
+  if (dryRun) {
+    return { success: true, reason: 'dry run', preview, unchanged: false };
+  }
+
+  const backupPath = fullPath + '.nerviq-backup';
+  fs.writeFileSync(backupPath, original, 'utf8');
+  fs.writeFileSync(fullPath, patched, 'utf8');
+
+  const rollback = writeRollbackArtifact(dir, {
+    sourcePlan: 'copilot-patch',
+    patchedFiles: [filePath],
+    backupFiles: [{ original: filePath, backup: path.relative(dir, backupPath) }],
+    rollbackInstructions: [`Restore ${filePath} from ${path.relative(dir, backupPath)}`],
+  });
+
+  const activity = writeActivityArtifact(dir, 'copilot-patch', {
+    platform: 'copilot',
+    patchedFiles: [filePath],
+    rollbackArtifact: rollback.relativePath,
+  });
+
+  return {
+    success: true,
+    reason: 'patched',
+    preview,
+    unchanged: false,
+    rollbackArtifact: rollback.relativePath,
+    activityArtifact: activity.relativePath,
+  };
+}
+
+module.exports = {
+  MANAGED_START_MD,
+  MANAGED_END_MD,
+  MANAGED_JSON_KEY,
+  extractManagedBlock,
+  upsertManagedBlock,
+  patchCopilotInstructionsMd,
+  patchVscodeSettingsJson,
+  patchMcpJson,
+  detectMixedAgentRepo,
+  generatePatchPreview,
+  applyPatch,
+};