lynxprompt 2.1.39 → 2.1.41

package/dist/index.js

@@ -2,7 +2,7 @@
 
 // src/index.ts
 import { Command } from "commander";
-import chalk20 from "chalk";
+import chalk21 from "chalk";
 
 // src/commands/login.ts
 import chalk from "chalk";
@@ -32,8 +32,7 @@ var config = new Conf({
             properties: {
               id: { type: "string" },
               email: { type: "string" },
-              name: { type: ["string", "null"] },
-              plan: { type: "string" }
+              name: { type: ["string", "null"] }
             }
           }
         },
@@ -279,12 +278,17 @@ var ApiClient = class {
       `/api/v1/hierarchies${query ? `?${query}` : ""}`
     );
   }
-  async getHierarchy(id) {
+  /**
+   * A hierarchy and its blueprints. With includeContent the server returns each
+   * blueprint's content in the list; a server older than that leaves it out.
+   */
+  async getHierarchy(id, { includeContent = false } = {}) {
     let apiId = id;
     if (!id.startsWith("ha_")) {
       apiId = `ha_${id}`;
     }
-    return this.request(`/api/v1/hierarchies/${apiId}`);
+    const query = includeContent ? "?include=content" : "";
+    return this.request(`/api/v1/hierarchies/${apiId}${query}`);
   }
   async createHierarchy(data) {
     return this.request("/api/v1/hierarchies", {
@@ -534,7 +538,7 @@ function printOtherLogins() {
 // src/commands/whoami.ts
 import chalk3 from "chalk";
 import ora2 from "ora";
-async function whoamiCommand() {
+async function whoamiCommand(options = {}) {
   if (!isAuthenticated()) {
     console.log(chalk3.yellow("Not logged in. Run 'lynxprompt login' to authenticate."));
     process.exit(1);
@@ -546,9 +550,12 @@ async function whoamiCommand() {
     setUser({
       id: user.id,
       email: user.email,
-      name: user.name,
-      plan: user.plan
+      name: user.name
     });
+    if (options.json) {
+      console.log(JSON.stringify({ user }, null, 2));
+      return;
+    }
     console.log();
     console.log(chalk3.cyan("\u{1F431} LynxPrompt Account"));
     console.log();
@@ -591,11 +598,16 @@ async function listCommand(options) {
   const spinner = ora3("Fetching your blueprints...").start();
   try {
     const limit = parseInt(options.limit, 10) || 20;
-    const { blueprints, total, has_more } = await api.listBlueprints({
+    const response = await api.listBlueprints({
       limit,
       visibility: options.visibility
     });
     spinner.stop();
+    if (options.json) {
+      console.log(JSON.stringify(response, null, 2));
+      return;
+    }
+    const { blueprints, total, has_more } = response;
     if (blueprints.length === 0) {
       console.log();
       console.log(chalk4.yellow("No blueprints found."));
@@ -735,7 +747,11 @@ async function trackBlueprint(cwd, blueprint) {
     canPull,
     hierarchyId: blueprint.hierarchyId,
     hierarchyName: blueprint.hierarchyName,
-    repositoryPath: blueprint.repositoryPath
+    repositoryPath: blueprint.repositoryPath,
+    ...blueprint.variables ? {
+      variables: blueprint.variables,
+      localChecksum: calculateChecksum(blueprint.localContent ?? blueprint.content)
+    } : {}
   });
   await saveBlueprints(cwd, config2);
 }
@@ -748,7 +764,7 @@ async function hasLocalChanges(cwd, tracked) {
     const filePath = join(cwd, tracked.file);
     const content = await readFile(filePath, "utf-8");
     const currentChecksum = calculateChecksum(content);
-    return currentChecksum !== tracked.checksum;
+    return currentChecksum !== (tracked.localChecksum ?? tracked.checksum);
   } catch {
     return false;
   }
@@ -758,10 +774,15 @@ async function updateChecksum(cwd, file, content) {
   const blueprint = config2.blueprints.find((b) => sameFile(cwd, b.file, file));
   if (blueprint) {
     blueprint.checksum = calculateChecksum(content);
+    delete blueprint.variables;
+    delete blueprint.localChecksum;
     blueprint.pulledAt = (/* @__PURE__ */ new Date()).toISOString();
     await saveBlueprints(cwd, config2);
   }
 }
+function conflictFilePath(cwd, file) {
+  return join(cwd, `${file}.remote`);
+}
 async function untrackBlueprint(cwd, file) {
   const config2 = await loadBlueprints(cwd);
   const initialCount = config2.blueprints.length;
@@ -846,6 +867,7 @@ var PLATFORMS = [
     name: "Claude Code",
     file: "CLAUDE.md",
     blueprintType: "CLAUDE_MD",
+    importsFiles: true,
     icon: "\u{1F9E0}",
     gradient: "from-orange-500 to-amber-500",
     note: "Anthropic's agentic coding tool",
@@ -1139,6 +1161,7 @@ var PLATFORMS = [
     name: "Gemini CLI",
     file: "GEMINI.md",
     blueprintType: "GEMINI_MD",
+    importsFiles: true,
     icon: "\u{1F48E}",
     gradient: "from-blue-500 to-cyan-500",
     note: "Google's Gemini in terminal",
@@ -1183,6 +1206,18 @@ var PLATFORMS = [
     category: "other",
     format: "markdown"
   },
+  {
+    id: "devin",
+    name: "Devin",
+    file: ".devin/rules/project.md",
+    rulesDirectory: ".devin/rules/",
+    icon: "\u{1F6E0}\uFE0F",
+    gradient: "from-emerald-600 to-teal-700",
+    note: "Cognition's AI software engineer",
+    category: "other",
+    format: "markdown",
+    url: "https://devin.ai"
+  },
   {
     id: "firebender",
     name: "Firebender",
@@ -1338,6 +1373,53 @@ var COMMANDS = [
     note: "Custom commands for OpenCode TUI"
   }
 ];
+var SKILL_BLUEPRINT_TYPE = "AGENT_SKILL";
+var SKILL_DIRECTORIES = [
+  ".claude/skills",
+  ".agents/skills",
+  ".github/skills",
+  ".cursor/skills",
+  ".gemini/skills",
+  ".opencode/skills"
+];
+function skillFolder(bp) {
+  const lines = (bp.content ?? "").split("\n").map((l) => l.trimEnd());
+  const end = lines[0] === "---" ? lines.indexOf("---", 1) : -1;
+  const nameLine = end > 0 ? lines.slice(1, end).find((l) => l.startsWith("name:")) : void 0;
+  const name = nameLine?.slice("name:".length).trim().replace(/^["']|["']$/g, "");
+  const slug = (name || bp.name || "").toLowerCase().replace(/[^a-z0-9]+/g, "-").split("-").filter(Boolean).join("-");
+  return slug || "skill";
+}
+var MCP_BLUEPRINT_TYPE = "MCP_CONFIG";
+var MCP_CONFIGS = [
+  { id: "claude-mcp", name: "Claude Code", file: ".mcp.json", key: "mcpServers" },
+  { id: "cursor-mcp", name: "Cursor", file: ".cursor/mcp.json", key: "mcpServers" },
+  { id: "vscode-mcp", name: "VS Code (Copilot)", file: ".vscode/mcp.json", key: "servers" },
+  { id: "kiro-mcp", name: "Kiro", file: ".kiro/settings/mcp.json", key: "mcpServers" }
+];
+function convertMcpConfig(content, targetId) {
+  const target = MCP_CONFIGS.find((c) => c.id === targetId);
+  if (!target) throw new Error(`Unknown MCP target: ${targetId}`);
+  const source = JSON.parse(content);
+  const servers = source.mcpServers ?? source.servers;
+  if (!servers || typeof servers !== "object" || Array.isArray(servers)) {
+    throw new Error('No "mcpServers" or "servers" object in the MCP config');
+  }
+  const out = {};
+  if (target.key === "servers") {
+    out.servers = Object.fromEntries(
+      Object.entries(servers).map(([name, server]) => [
+        name,
+        server.type ? server : { type: server.url ? "http" : "stdio", ...server }
+      ])
+    );
+    if (source.inputs) out.inputs = source.inputs;
+  } else {
+    out[target.key] = servers;
+  }
+  return `${JSON.stringify(out, null, 2)}
+`;
+}
 function getPlatform(id) {
   return PLATFORMS.find((p) => p.id === id);
 }
@@ -1364,6 +1446,17 @@ var BLUEPRINT_TYPE_ALIASES = {
 function platformForBlueprintType(type) {
   return PLATFORMS.find((p) => p.blueprintType === type)?.id ?? BLUEPRINT_TYPE_ALIASES[type];
 }
+var AGENTS_MD_POINTER = "@AGENTS.md\n";
+function agentsMdPointerFiles(targets) {
+  const pointers = /* @__PURE__ */ new Set();
+  if (!targets.some((t) => t.file === "AGENTS.md")) return pointers;
+  for (const { file } of targets) {
+    if (file === "AGENTS.md") continue;
+    const readers = targets.filter((t) => t.file === file);
+    if (readers.every((t) => getPlatform(t.platform)?.importsFiles)) pointers.add(file);
+  }
+  return pointers;
+}
 var COMMAND_COUNT = COMMANDS.length;
 
 // src/utils/generator.ts
@@ -1853,11 +1946,11 @@ var STATIC_FILE_PATHS = {
 };
 function generateConfig(options) {
   const files = {};
-  for (const platform2 of options.platforms) {
-    const filename = PLATFORM_FILES2[platform2];
-    if (filename) {
-      files[filename] = generateFileContent(options, platform2);
-    }
+  const platforms = options.platforms.filter((platform2) => PLATFORM_FILES2[platform2]);
+  const pointers = options.pointerFiles ? agentsMdPointerFiles(platforms.map((platform2) => ({ platform: platform2, file: PLATFORM_FILES2[platform2] }))) : /* @__PURE__ */ new Set();
+  for (const platform2 of platforms) {
+    const file = PLATFORM_FILES2[platform2];
+    files[file] = pointers.has(file) ? AGENTS_MD_POINTER : generateFileContent(options, platform2);
   }
   const createLocalStaticFiles = options.staticFileHandling !== "config_only";
   if (options.staticFiles && options.staticFiles.length > 0 && createLocalStaticFiles) {
@@ -1920,6 +2013,8 @@ function generateFileContent(options, platform2) {
       sections.push("---", "inclusion: always", "---", "");
     } else if (platform2 === "augment") {
       sections.push("---", "type: always_apply", "---", "");
+    } else if (platform2 === "devin") {
+      sections.push("---", "trigger: always_on", "---", "");
     }
     sections.push(`# ${projectName} - AI Assistant Configuration`);
     sections.push("");
@@ -2912,6 +3007,8 @@ function slugify(name) {
 }
 function blueprintFilename(bp) {
   if (bp.repository_path) return bp.repository_path;
+  if (bp.type === SKILL_BLUEPRINT_TYPE) return `${SKILL_DIRECTORIES[0]}/${skillFolder(bp)}/SKILL.md`;
+  if (bp.type === MCP_BLUEPRINT_TYPE) return MCP_CONFIGS[0].file;
   const platform2 = platformForBlueprintType(bp.type);
   if (platform2 && PLATFORM_FILES2[platform2]) return PLATFORM_FILES2[platform2];
   const command = COMMANDS.find((c) => c.id === platform2);
@@ -2940,11 +3037,28 @@ var atPath = (relativePath, file) => {
   const p = normPath(relativePath);
   return p === file || p.endsWith(`/${file}`);
 };
+var inSkillFolder = (relativePath, dir) => {
+  const parts = normPath(relativePath).split("/");
+  const n = parts.length;
+  return n >= 4 && parts[n - 1] === "skill.md" && parts.slice(n - 4, n - 2).join("/") === dir;
+};
 var inFolder = (relativePath, folder) => {
   const p = normPath(relativePath);
   return p.startsWith(folder) || p.includes(`/${folder}`);
 };
 var CONFIG_PATTERNS = [
+  // Agent Skills: <tool>/skills/<skill name>/SKILL.md
+  ...SKILL_DIRECTORIES.map((dir) => ({
+    match: (p) => inSkillFolder(p, dir),
+    type: SKILL_BLUEPRINT_TYPE,
+    label: "Agent Skill"
+  })),
+  // MCP server configs
+  ...MCP_CONFIGS.map((c) => ({
+    match: (p) => atPath(p, c.file),
+    type: MCP_BLUEPRINT_TYPE,
+    label: `MCP Servers (${c.name})`
+  })),
   // Commands: one file per command in the tool's folder
   ...COMMANDS.map((c) => ({
     match: (p) => inFolder(p, `${c.directory}/`) && p.endsWith(c.extension),
@@ -2981,7 +3095,35 @@ function matchConfigFile(relativePath) {
   return null;
 }
 
+// src/utils/variables.ts
+var VARIABLE_PATTERN_SOURCE = String.raw`\[\[([A-Za-z_][A-Za-z0-9_]*)(?:\|((?:(?!\[\[)[\s\S])*?)\]\](?!\])|\]\])`;
+function fillBlueprintVariables(content, values) {
+  const missing = /* @__PURE__ */ new Set();
+  const filled = content.replace(
+    new RegExp(VARIABLE_PATTERN_SOURCE, "g"),
+    (match, name, fallback) => {
+      const key = name.toUpperCase();
+      if (Object.prototype.hasOwnProperty.call(values, key)) return values[key];
+      if (fallback !== void 0) return fallback;
+      missing.add(key);
+      return match;
+    }
+  );
+  return { content: filled, missing: [...missing] };
+}
+
 // src/commands/pull.ts
+function contentToWrite(content, options, label) {
+  if (options.vars === void 0) return content;
+  const { content: filled, missing } = fillBlueprintVariables(content, parseVariablesString(options.vars));
+  if (missing.length > 0) {
+    console.log(chalk5.yellow(`  \u26A0 ${label}: no value for ${missing.join(", ")} (left as [[...]])`));
+  }
+  return filled;
+}
+function pulledVariables(options, written, content) {
+  return options.vars === void 0 || written === content ? void 0 : parseVariablesString(options.vars);
+}
 function getSourceFromVisibility(visibility) {
   switch (visibility) {
     case "PUBLIC":
@@ -2997,24 +3139,26 @@ function getSourceFromVisibility(visibility) {
 function isHierarchyId(id) {
   return id.startsWith("ha_");
 }
-async function pullCommand(id, options) {
+async function pullCommand(ids, options) {
   if (!isAuthenticated()) {
     console.log(
       chalk5.yellow("Not logged in. Run 'lynxp login' to authenticate.")
     );
     process.exit(1);
   }
-  if (isHierarchyId(id)) {
-    await pullHierarchy(id, options);
-  } else {
-    await pullBlueprint(id, options);
+  for (const id of Array.isArray(ids) ? ids : [ids]) {
+    if (isHierarchyId(id)) {
+      await pullHierarchy(id, options);
+    } else {
+      await pullBlueprint(id, options);
+    }
   }
 }
 async function pullHierarchy(id, options) {
   const cwd = process.cwd();
   const spinner = ora4(`Fetching hierarchy ${chalk5.cyan(id)}...`).start();
   try {
-    const response = await api.getHierarchy(id);
+    const response = await api.getHierarchy(id, { includeContent: !options.preview });
     const { hierarchy, blueprints } = response;
     spinner.stop();
     console.log();
@@ -3077,7 +3221,7 @@ async function pullHierarchy(id, options) {
           continue;
         }
       }
-      const { blueprint } = await api.getBlueprint(bp.id);
+      const blueprint = typeof bp.content === "string" ? bp : (await api.getBlueprint(bp.id)).blueprint;
       if (!blueprint.content) {
         console.log(chalk5.yellow(`  \u26A0 No content: ${filename}`));
         skipped++;
@@ -3087,7 +3231,8 @@ async function pullHierarchy(id, options) {
       if (dir !== "." && dir !== options.output) {
         await mkdir2(dir, { recursive: true });
       }
-      await writeFile2(outputPath, blueprint.content, "utf-8");
+      const written = contentToWrite(blueprint.content, options, filename);
+      await writeFile2(outputPath, written, "utf-8");
       if (options.track !== false) {
         const source = getSourceFromVisibility(blueprint.visibility);
         await trackBlueprint(cwd, {
@@ -3099,7 +3244,9 @@ async function pullHierarchy(id, options) {
           source,
           hierarchyId: id,
           hierarchyName: hierarchy.name,
-          repositoryPath: bp.repository_path || void 0
+          repositoryPath: bp.repository_path || void 0,
+          localContent: written,
+          variables: pulledVariables(options, written, blueprint.content)
         });
       }
       console.log(chalk5.green(`  \u2713 ${filename}`));
@@ -3268,7 +3415,8 @@ async function pullBlueprint(id, options) {
     if (dir !== ".") {
       await mkdir2(dir, { recursive: true });
     }
-    await writeFile2(outputPath, blueprint.content, "utf-8");
+    const written = contentToWrite(blueprint.content, options, filename);
+    await writeFile2(outputPath, written, "utf-8");
     if (options.track !== false) {
       await trackBlueprint(cwd, {
         id: blueprint.id,
@@ -3277,7 +3425,9 @@ async function pullBlueprint(id, options) {
         content: blueprint.content,
         source,
         hierarchyId: blueprint.hierarchy_id || void 0,
-        repositoryPath: blueprint.repository_path || void 0
+        repositoryPath: blueprint.repository_path || void 0,
+        localContent: written,
+        variables: pulledVariables(options, written, blueprint.content)
       });
     }
     console.log(chalk5.green(`\u2705 Downloaded: ${chalk5.bold(outputPath)}`));
@@ -3286,8 +3436,8 @@ async function pullBlueprint(id, options) {
       if (blueprint.content_checksum) {
         console.log(chalk5.gray(`   Checksum: ${blueprint.content_checksum}`));
       }
-      if (isMarketplace) {
-        console.log(chalk5.gray(`   Updates: Run 'lynxp pull ${id}' to sync updates`));
+      if (isMarketplace || options.vars !== void 0) {
+        console.log(chalk5.gray(`   Updates: Run 'lynxp sync ${trackedFile}' to get cloud updates`));
       } else {
         console.log(chalk5.gray(`   Sync: Run 'lynxp push ${trackedFile}' to push changes`));
       }
@@ -3629,11 +3779,26 @@ async function pushCommand(fileArg, options) {
   const filename = path2.basename(file);
   const linked = await findBlueprintByFile(cwd, file);
   if (linked) {
+    const refusal = refusePush(cwd, linked, options);
+    if (refusal) {
+      console.log(chalk6.yellow(`\u26A0 Not pushed: ${refusal}`));
+      process.exit(1);
+    }
     await updateBlueprint(cwd, file, linked.id, content, options, linked.checksum);
   } else {
     await createOrLinkBlueprint(cwd, file, filename, content, options, fileArg !== void 0);
   }
 }
+function refusePush(cwd, tracked, options) {
+  if (options.force) return null;
+  if (fs.existsSync(conflictFilePath(cwd, tracked.file))) {
+    return `${tracked.file} has an unresolved sync conflict. Merge ${tracked.file}.remote into it and delete ${tracked.file}.remote first, or use --force.`;
+  }
+  if (tracked.variables) {
+    return `${tracked.file} was pulled with --vars, so pushing it would replace the blueprint's variables with your values. Use --force to push it anyway.`;
+  }
+  return null;
+}
 async function updateBlueprint(cwd, file, blueprintId, content, options, expectedChecksum) {
   console.log(chalk6.cyan(`
 \u{1F4E4} Updating blueprint ${chalk6.bold(blueprintId)}...`));
@@ -3924,6 +4089,11 @@ async function pushHierarchy(cwd, files, options) {
       const content = fs.readFileSync(file.absolutePath, "utf-8");
       const tracked = await findBlueprintByFile(cwd, file.path);
       if (tracked) {
+        const refusal = refusePush(cwd, tracked, options);
+        if (refusal) {
+          spinner.warn(`${file.path} \u2192 skipped: ${refusal}`);
+          continue;
+        }
         const updateData = { content };
         if (tracked.checksum && !options.force) {
           updateData.expected_checksum = tracked.checksum;
@@ -4050,19 +4220,19 @@ function inferBlueprintType(filePath) {
 function confirmSensitive(options, spinner) {
   return async (matches) => {
     spinner?.stop();
-    console.log(chalk6.yellow("\n\u26A0 This blueprint is public and may contain secrets:"));
+    console.log(chalk6.yellow("\n\u26A0 This blueprint may contain secrets:"));
     for (const m of matches) {
       console.log(chalk6.gray(`   line ${m.line}: ${m.type}${m.snippet ? ` (${m.snippet})` : ""}`));
     }
     let publish = false;
     if (options.allowSensitive) {
-      console.log(chalk6.gray("   Publishing anyway (--allow-sensitive)."));
+      console.log(chalk6.gray("   Pushing anyway (--allow-sensitive)."));
       publish = true;
     } else if (!options.yes && process.stdin.isTTY) {
       const answer = await prompts2({
         type: "confirm",
         name: "publish",
-        message: "Publish it anyway?",
+        message: "Push it anyway?",
         initial: false
       });
       publish = answer.publish === true;
@@ -4071,7 +4241,7 @@ function confirmSensitive(options, spinner) {
       spinner?.start();
     } else {
       console.log(
-        chalk6.gray("   Remove them, keep the blueprint private, or run again with --allow-sensitive to publish anyway.")
+        chalk6.gray("   Remove them, or run again with --allow-sensitive to push anyway.")
       );
     }
     return publish;
@@ -6591,7 +6761,7 @@ var TEST_FRAMEWORKS2 = TEST_FRAMEWORKS;
 
 // src/commands/wizard.ts
 var DRAFTS_DIR = ".lynxprompt/drafts";
-var CLI_VERSION = "2.1.39";
+var CLI_VERSION = "2.1.41";
 async function saveDraftLocally(name, config2, stepReached) {
   const draftsPath = join3(process.cwd(), DRAFTS_DIR);
   await mkdir3(draftsPath, { recursive: true });
@@ -7729,8 +7899,11 @@ async function runWizardWithDraftProtection(options) {
       ...config2,
       blueprintMode: options.blueprint || config2.blueprintMode || false,
       variables,
-      enableAutoUpdate: false
+      enableAutoUpdate: false,
       // Don't generate curl header yet
+      // One rule set: CLAUDE.md/GEMINI.md import AGENTS.md. Not with Cloud
+      // Sync, which uploads one of the files and must upload real rules.
+      pointerFiles: options.pointers !== false && !config2.enableAutoUpdate
     };
     let files = generateConfig({ ...finalConfig, apiUrl: getApiUrl() });
     let savedBlueprintId = null;
@@ -7797,7 +7970,8 @@ async function runWizardWithDraftProtection(options) {
         await mkdir3(dir, { recursive: true });
       }
       await writeFile3(outputPath, content, "utf-8");
-      console.log(`     ${chalk7.cyan("\u2192")} ${chalk7.bold(filename)}`);
+      const note = content === AGENTS_MD_POINTER ? chalk7.gray(" (imports AGENTS.md; --no-pointers for a full copy)") : "";
+      console.log(`     ${chalk7.cyan("\u2192")} ${chalk7.bold(filename)}${note}`);
       if (savedBlueprintId && syncedFile && syncedFile.file === filename) {
         await trackBlueprint(process.cwd(), {
           id: savedBlueprintId,
@@ -9966,8 +10140,13 @@ async function searchCommand(query, options) {
   const spinner = ora7(`Searching for "${query}"...`).start();
   try {
     const limit = parseInt(options.limit, 10) || 20;
-    const { templates, total, hasMore } = await api.searchBlueprints(query, limit);
+    const response = await api.searchBlueprints(query, limit);
     spinner.stop();
+    if (options.json) {
+      console.log(JSON.stringify(response, null, 2));
+      return;
+    }
+    const { templates, total, hasMore } = response;
     if (templates.length === 0) {
       console.log();
       console.log(chalk8.yellow(`No blueprints found for "${query}".`));
@@ -10106,6 +10285,8 @@ async function statusCommand() {
         console.log();
       }
     }
+    console.log(chalk9.gray("  \u2713 means no local edits. Run 'lynxp sync --dry-run' to check the cloud too."));
+    console.log();
   }
   console.log(chalk9.cyan("\u{1F4C4} AI Config Files"));
   console.log();
@@ -10196,6 +10377,94 @@ import { readFile as readFile6, readdir as readdir2, stat } from "fs/promises";
 import { join as join5 } from "path";
 import { existsSync as existsSync3 } from "fs";
 import * as yaml2 from "yaml";
+
+// src/utils/hidden-unicode.ts
+var NAMES = {
+  1564: "ARABIC LETTER MARK",
+  6158: "MONGOLIAN VOWEL SEPARATOR",
+  8203: "ZERO WIDTH SPACE",
+  8204: "ZERO WIDTH NON-JOINER",
+  8205: "ZERO WIDTH JOINER",
+  8206: "LEFT-TO-RIGHT MARK",
+  8207: "RIGHT-TO-LEFT MARK",
+  8234: "LEFT-TO-RIGHT EMBEDDING",
+  8235: "RIGHT-TO-LEFT EMBEDDING",
+  8236: "POP DIRECTIONAL FORMATTING",
+  8237: "LEFT-TO-RIGHT OVERRIDE",
+  8238: "RIGHT-TO-LEFT OVERRIDE",
+  8288: "WORD JOINER",
+  8289: "FUNCTION APPLICATION",
+  8290: "INVISIBLE TIMES",
+  8291: "INVISIBLE SEPARATOR",
+  8292: "INVISIBLE PLUS",
+  8294: "LEFT-TO-RIGHT ISOLATE",
+  8295: "RIGHT-TO-LEFT ISOLATE",
+  8296: "FIRST STRONG ISOLATE",
+  8297: "POP DIRECTIONAL ISOLATE",
+  65279: "ZERO WIDTH NO-BREAK SPACE"
+};
+var CONTEXTUAL = /* @__PURE__ */ new Set([1564, 8204, 8205, 8206, 8207]);
+var BLACK_FLAG = 127988;
+var CANCEL_TAG = 917631;
+var isTag = (cp) => cp >= 917504 && cp <= 917631;
+var isVariationSelectorSupplement = (cp) => cp >= 917760 && cp <= 917999;
+function isHidden(cp) {
+  return cp in NAMES || isTag(cp) || isVariationSelectorSupplement(cp);
+}
+function nameOf(cp) {
+  if (cp in NAMES) return NAMES[cp];
+  if (isTag(cp)) return "TAG CHARACTER";
+  return "VARIATION SELECTOR";
+}
+var RGI_SUBDIVISIONS = /* @__PURE__ */ new Set(["gbeng", "gbsct", "gbwls"]);
+function flagTagRunLength(cps, i) {
+  if (cps[i - 1] !== BLACK_FLAG) return 0;
+  let j = i;
+  while (j < cps.length && cps[j] >= 917536 && cps[j] < CANCEL_TAG) j++;
+  if (cps[j] !== CANCEL_TAG) return 0;
+  const code = String.fromCharCode(...cps.slice(i, j).map((cp) => cp - 917504));
+  return RGI_SUBDIVISIONS.has(code) ? j - i + 1 : 0;
+}
+var isVisibleNonAscii = (cp) => cp !== void 0 && cp > 127 && !isHidden(cp);
+function findHiddenUnicode(content) {
+  const cps = Array.from(content, (c) => c.codePointAt(0));
+  const found = [];
+  let line = 1;
+  let column = 0;
+  for (let i = 0; i < cps.length; i++) {
+    const cp = cps[i];
+    if (cp === 10) {
+      line++;
+      column = 0;
+      continue;
+    }
+    column++;
+    if (!isHidden(cp)) continue;
+    if (cp === 65279 && i === 0) continue;
+    if (CONTEXTUAL.has(cp) && isVisibleNonAscii(cps[i - 1]) && isVisibleNonAscii(cps[i + 1])) continue;
+    const flagRun = flagTagRunLength(cps, i);
+    if (flagRun > 0) {
+      i += flagRun - 1;
+      column += flagRun - 1;
+      continue;
+    }
+    found.push({
+      line,
+      column,
+      codePoint: `U+${cp.toString(16).toUpperCase().padStart(4, "0")}`,
+      name: nameOf(cp)
+    });
+  }
+  return found;
+}
+function describeHiddenUnicode(filename, found, shown = 5) {
+  const where = found.slice(0, shown).map((h) => `line ${h.line} col ${h.column} ${h.codePoint} ${h.name}`).join("; ");
+  const more = found.length > shown ? `; and ${found.length - shown} more` : "";
+  const n = found.length;
+  return `${filename}: ${n} hidden Unicode character${n === 1 ? "" : "s"} that can carry instructions a reviewer cannot see (${where}${more})`;
+}
+
+// src/commands/check.ts
 var CONFIG_FILES2 = [
   { path: "AGENTS.md", name: "AGENTS.md" },
   { path: "CLAUDE.md", name: "CLAUDE.md" },
@@ -10222,6 +10491,7 @@ var CONFIG_DIRS2 = [
   { path: ".trae/rules", name: "Trae" },
   { path: ".augment/rules", name: "Augment" },
   { path: ".roo/rules", name: "Roo Code" },
+  { path: ".devin/rules", name: "Devin" },
   { path: ".kilocode/rules", name: "Kilo Code" },
   { path: ".amazonq/rules", name: "Amazon Q" },
   { path: ".idx/rules", name: "Firebase Studio" },
@@ -10266,6 +10536,10 @@ function validateMarkdown(content, filename) {
   }
   return { errors, warnings };
 }
+function validateHiddenUnicode(content, filename) {
+  const found = findHiddenUnicode(content);
+  return found.length > 0 ? [describeHiddenUnicode(filename, found)] : [];
+}
 async function validateLynxPromptConfig(cwd) {
   const errors = [];
   const warnings = [];
@@ -10329,8 +10603,9 @@ function validateMdc(content, filename) {
 }
 async function checkCommand(options = {}) {
   const isCi = options.ci;
+  const isJson = options.json;
   const cwd = process.cwd();
-  if (!isCi) {
+  if (!isCi && !isJson) {
     console.log();
     console.log(chalk10.cyan("\u{1F431} LynxPrompt Check"));
     console.log();
@@ -10341,7 +10616,7 @@ async function checkCommand(options = {}) {
     warnings: [],
     files: []
   };
-  const spinner = !isCi ? ora8("Scanning for configuration files...").start() : null;
+  const spinner = !isCi && !isJson ? ora8("Scanning for configuration files...").start() : null;
   for (const file of CONFIG_FILES2) {
     const filePath = join5(cwd, file.path);
     if (existsSync3(filePath) && (await stat(filePath)).isFile()) {
@@ -10349,7 +10624,7 @@ async function checkCommand(options = {}) {
       try {
         const content = await readFile6(filePath, "utf-8");
         const validation = validateMarkdown(content, file.path);
-        result.errors.push(...validation.errors);
+        result.errors.push(...validation.errors, ...validateHiddenUnicode(content, file.path));
         result.warnings.push(...validation.warnings);
       } catch (error) {
         result.errors.push(`${file.path}: Could not read file`);
@@ -10367,6 +10642,7 @@ async function checkCommand(options = {}) {
           if (fileStat.isFile()) {
             result.files.push(`${dir.path}/${file}`);
             const content = await readFile6(filePath, "utf-8");
+            result.errors.push(...validateHiddenUnicode(content, `${dir.path}/${file}`));
             if (file.endsWith(".mdc")) {
               const validation = validateMdc(content, `${dir.path}/${file}`);
               result.errors.push(...validation.errors);
@@ -10387,7 +10663,10 @@ async function checkCommand(options = {}) {
   result.warnings.push(...lynxpromptValidation.warnings);
   spinner?.stop();
   result.valid = result.errors.length === 0;
-  if (isCi) {
+  if (isJson) {
+    console.log(JSON.stringify(result, null, 2));
+    if (!result.valid || isCi && result.files.length === 0) process.exitCode = 1;
+  } else if (isCi) {
     if (!result.valid) {
       console.error("\u2717 Validation failed");
       for (const error of result.errors) {
@@ -10555,7 +10834,7 @@ async function diffCommand(fileOrId, options = {}) {
   if (fileOrId) {
     const tracked = await findBlueprintByFile(cwd, fileOrId);
     if (tracked) {
-      await diffFileWithBlueprint(cwd, fileOrId, tracked.id);
+      await diffFileWithBlueprint(cwd, fileOrId, tracked.id, false, tracked.variables);
       return;
     }
     await diffWithBlueprintId(cwd, fileOrId);
@@ -10581,7 +10860,7 @@ async function diffCommand(fileOrId, options = {}) {
     }
     console.log(chalk12.cyan(`\u{1F4C4} ${blueprint.file}`));
     console.log(chalk12.gray(`   Linked to: ${blueprint.name} (${blueprint.id})`));
-    const result = await diffFileWithBlueprint(cwd, blueprint.file, blueprint.id, true);
+    const result = await diffFileWithBlueprint(cwd, blueprint.file, blueprint.id, true, blueprint.variables);
     if (result === "changed") {
       hasChanges = true;
     } else if (result === "same") {
@@ -10596,12 +10875,11 @@ async function diffCommand(fileOrId, options = {}) {
   } else if (!hasChanges) {
     console.log(chalk12.green("\u2713 All tracked files are in sync with their cloud blueprints!"));
   } else {
-    console.log(chalk12.gray("To push local changes: lynxp push"));
-    console.log(chalk12.gray("To pull cloud changes: lynxp pull <id>"));
+    console.log(chalk12.gray("To bring both sides together: lynxp sync"));
   }
   console.log();
 }
-async function diffFileWithBlueprint(cwd, file, blueprintId, compact = false) {
+async function diffFileWithBlueprint(cwd, file, blueprintId, compact = false, variables) {
   const filePath = join6(cwd, file);
   if (!existsSync4(filePath)) {
     console.log(chalk12.red(`\u2717 File not found: ${file}`));
@@ -10616,7 +10894,8 @@ async function diffFileWithBlueprint(cwd, file, blueprintId, compact = false) {
       return "error";
     }
     const localContent = await readFile7(filePath, "utf-8");
-    const diff = computeDiff(blueprint.content, localContent);
+    const cloudContent = variables ? fillBlueprintVariables(blueprint.content, variables).content : blueprint.content;
+    const diff = computeDiff(cloudContent, localContent);
     const stats = getDiffStats(diff);
     if (stats.added === 0 && stats.removed === 0) {
       if (!compact) {
@@ -10783,12 +11062,162 @@ async function diffLocal(cwd) {
   console.log();
 }
 
-// src/commands/link.ts
+// src/commands/sync.ts
 import chalk13 from "chalk";
+import { readFile as readFile8, writeFile as writeFile4, mkdir as mkdir4 } from "fs/promises";
+import { existsSync as existsSync5 } from "fs";
+import { dirname as dirname4, join as join7 } from "path";
+async function syncCommand(fileArg, options = {}) {
+  const cwd = process.cwd();
+  if (!isAuthenticated()) {
+    console.log(chalk13.yellow("Not logged in. Run 'lynxp login' to authenticate."));
+    process.exit(1);
+  }
+  const { blueprints } = await loadBlueprints(cwd);
+  const targets = fileArg ? blueprints.filter((b) => toTrackedPath(cwd, b.file) === toTrackedPath(cwd, fileArg)) : blueprints;
+  if (targets.length === 0) {
+    console.log(
+      chalk13.yellow(fileArg ? `${fileArg} is not tracked.` : "No tracked blueprints found.")
+    );
+    console.log(chalk13.gray("Track a file with 'lynxp pull <id>' or 'lynxp link <file> <id>'."));
+    if (fileArg) process.exit(1);
+    return;
+  }
+  console.log();
+  console.log(chalk13.cyan(options.dryRun ? "\u{1F431} LynxPrompt Sync (dry run)" : "\u{1F431} LynxPrompt Sync"));
+  console.log();
+  const counts = {
+    "in-sync": 0,
+    pulled: 0,
+    pushed: 0,
+    kept: 0,
+    conflict: 0,
+    error: 0
+  };
+  for (const tracked of targets) {
+    counts[await syncOne(cwd, tracked, options)]++;
+  }
+  console.log();
+  const parts = [
+    `${counts.pulled} pulled`,
+    `${counts.pushed} pushed`,
+    `${counts["in-sync"]} in sync`
+  ];
+  if (counts.kept) parts.push(`${counts.kept} local only`);
+  if (counts.conflict) parts.push(`${counts.conflict} conflict`);
+  if (counts.error) parts.push(`${counts.error} failed`);
+  console.log(chalk13.gray(`${options.dryRun ? "Would be: " : ""}${parts.join(", ")}`));
+  console.log();
+  if (counts.conflict || counts.error) process.exitCode = 1;
+}
+async function syncOne(cwd, tracked, options) {
+  const file = tracked.file;
+  const filePath = join7(cwd, file);
+  const remoteFile = conflictFilePath(cwd, file);
+  const dry = options.dryRun === true;
+  if (existsSync5(remoteFile)) {
+    console.log(chalk13.red(`\u2717 ${file}: unresolved conflict`));
+    console.log(chalk13.gray(`   Merge ${file}.remote into ${file}, delete ${file}.remote, then run 'lynxp sync' again.`));
+    return "conflict";
+  }
+  if (!existsSync5(filePath)) {
+    console.log(chalk13.red(`\u2717 ${file}: file not found`));
+    console.log(chalk13.gray(`   Run 'lynxp pull ${tracked.id}' to restore it or 'lynxp unlink ${file}' to stop tracking it.`));
+    return "error";
+  }
+  let remote;
+  try {
+    const { blueprint } = await api.getBlueprint(tracked.id);
+    if (!blueprint?.content) {
+      console.log(chalk13.red(`\u2717 ${file}: the cloud blueprint ${tracked.id} has no content`));
+      return "error";
+    }
+    remote = blueprint.content;
+  } catch (error) {
+    console.log(chalk13.red(`\u2717 ${file}: could not fetch ${tracked.id}: ${errorText(error)}`));
+    return "error";
+  }
+  const local = await readFile8(filePath, "utf-8");
+  const rendered = tracked.variables ? fillBlueprintVariables(remote, tracked.variables).content : remote;
+  const localChanged = calculateChecksum(local) !== (tracked.localChecksum ?? tracked.checksum);
+  const remoteChanged = calculateChecksum(remote) !== tracked.checksum;
+  if (calculateChecksum(local) === calculateChecksum(rendered)) {
+    if (!dry && (localChanged || remoteChanged)) await record(cwd, tracked, remote, local);
+    console.log(chalk13.green(`\u2713 ${file}: in sync`));
+    return "in-sync";
+  }
+  if (!localChanged) {
+    if (!dry) {
+      await writeFile4(filePath, rendered, "utf-8");
+      await record(cwd, tracked, remote, rendered);
+    }
+    console.log(chalk13.cyan(`\u2193 ${file}: ${dry ? "would update from the cloud" : "updated from the cloud"}`));
+    return "pulled";
+  }
+  if (!remoteChanged) {
+    const reason = tracked.variables ? "it was pulled with --vars, so pushing it would replace the blueprint's variables with your values" : !tracked.editable ? "marketplace blueprints are read-only" : null;
+    if (reason) {
+      console.log(chalk13.yellow(`\u25CF ${file}: local changes kept, not pushed (${reason})`));
+      return "kept";
+    }
+    if (dry) {
+      console.log(chalk13.cyan(`\u2191 ${file}: would push local changes`));
+      return "pushed";
+    }
+    try {
+      await api.updateBlueprint(tracked.id, { content: local, expected_checksum: tracked.checksum });
+      await updateChecksum(cwd, file, local);
+      console.log(chalk13.cyan(`\u2191 ${file}: pushed local changes`));
+      return "pushed";
+    } catch (error) {
+      if (error instanceof ApiRequestError && error.statusCode === 409) {
+        console.log(chalk13.red(`\u2717 ${file}: the cloud changed while syncing; run 'lynxp sync' again`));
+      } else {
+        console.log(chalk13.red(`\u2717 ${file}: push failed: ${errorText(error)}`));
+        console.log(chalk13.gray(`   Try 'lynxp push ${file}' for the full prompts.`));
+      }
+      return "error";
+    }
+  }
+  if (!dry) {
+    await mkdir4(dirname4(remoteFile), { recursive: true });
+    await writeFile4(remoteFile, rendered, "utf-8");
+    await record(cwd, tracked, remote, rendered);
+  }
+  console.log(chalk13.red(`\u2717 ${file}: changed both locally and in the cloud`));
+  console.log(
+    chalk13.gray(
+      dry ? `   Sync would write the cloud version to ${file}.remote and leave ${file} as it is.` : `   Cloud version written to ${file}.remote; ${file} was not touched.
+   Merge what you need into ${file}, delete ${file}.remote, then run 'lynxp sync' again.`
+    )
+  );
+  return "conflict";
+}
+async function record(cwd, t, remote, written) {
+  await trackBlueprint(cwd, {
+    id: t.id,
+    name: t.name,
+    file: t.file,
+    content: remote,
+    source: t.source,
+    version: t.version,
+    hierarchyId: t.hierarchyId,
+    hierarchyName: t.hierarchyName,
+    repositoryPath: t.repositoryPath,
+    variables: t.variables,
+    localContent: t.variables ? written : void 0
+  });
+}
+function errorText(error) {
+  return error instanceof Error ? error.message : String(error);
+}
+
+// src/commands/link.ts
+import chalk14 from "chalk";
 import ora10 from "ora";
 import prompts4 from "prompts";
-import { join as join7 } from "path";
-import { existsSync as existsSync5 } from "fs";
+import { join as join8 } from "path";
+import { existsSync as existsSync6 } from "fs";
 function getSourceFromVisibility2(visibility) {
   switch (visibility) {
     case "PUBLIC":
@@ -10808,7 +11237,7 @@ async function linkCommand(fileArg, blueprintIdArg, options = {}) {
     return;
   }
   console.log();
-  console.log(chalk13.cyan("\u{1F431} Link File to Blueprint"));
+  console.log(chalk14.cyan("\u{1F431} Link File to Blueprint"));
   console.log();
   let file;
   let blueprintId = blueprintIdArg;
@@ -10822,13 +11251,13 @@ async function linkCommand(fileArg, blueprintIdArg, options = {}) {
       ".rules",
       ".clinerules"
     ];
-    const foundFiles = configFiles.filter((f) => existsSync5(join7(cwd, f)));
+    const foundFiles = configFiles.filter((f) => existsSync6(join8(cwd, f)));
     if (foundFiles.length === 0) {
-      console.log(chalk13.yellow("No AI configuration files found in this directory."));
+      console.log(chalk14.yellow("No AI configuration files found in this directory."));
       console.log();
-      console.log(chalk13.gray("Create one first:"));
-      console.log(chalk13.gray("  lynxp wizard    Generate a new config file"));
-      console.log(chalk13.gray("  lynxp pull <id> Download from marketplace"));
+      console.log(chalk14.gray("Create one first:"));
+      console.log(chalk14.gray("  lynxp wizard    Generate a new config file"));
+      console.log(chalk14.gray("  lynxp pull <id> Download from marketplace"));
       return;
     }
     const { selectedFile } = await prompts4({
@@ -10842,22 +11271,22 @@ async function linkCommand(fileArg, blueprintIdArg, options = {}) {
       }))
     });
     if (!selectedFile) {
-      console.log(chalk13.gray("Cancelled."));
+      console.log(chalk14.gray("Cancelled."));
       return;
     }
     file = selectedFile;
   } else {
     file = fileArg;
   }
-  const filePath = join7(cwd, file);
-  if (!existsSync5(filePath)) {
-    console.log(chalk13.red(`\u2717 File not found: ${file}`));
+  const filePath = join8(cwd, file);
+  if (!existsSync6(filePath)) {
+    console.log(chalk14.red(`\u2717 File not found: ${file}`));
     return;
   }
   const existing = await findBlueprintByFile(cwd, file);
   if (existing) {
-    console.log(chalk13.yellow(`This file is already linked to: ${existing.name}`));
-    console.log(chalk13.gray(`   ID: ${existing.id}`));
+    console.log(chalk14.yellow(`This file is already linked to: ${existing.name}`));
+    console.log(chalk14.gray(`   ID: ${existing.id}`));
     console.log();
     const { proceed } = await prompts4({
       type: "confirm",
@@ -10866,13 +11295,13 @@ async function linkCommand(fileArg, blueprintIdArg, options = {}) {
       initial: false
     });
     if (!proceed) {
-      console.log(chalk13.gray("Cancelled."));
+      console.log(chalk14.gray("Cancelled."));
       return;
     }
   }
   if (!blueprintId) {
     if (!isAuthenticated()) {
-      console.log(chalk13.yellow("You need to login to access your blueprints."));
+      console.log(chalk14.yellow("You need to login to access your blueprints."));
       const { doLogin } = await prompts4({
         type: "confirm",
         name: "doLogin",
@@ -10880,10 +11309,10 @@ async function linkCommand(fileArg, blueprintIdArg, options = {}) {
         initial: true
       });
       if (doLogin) {
-        console.log(chalk13.gray("Run 'lynxp login' in another terminal, then come back here."));
+        console.log(chalk14.gray("Run 'lynxp login' in another terminal, then come back here."));
         return;
       }
-      console.log(chalk13.gray("Cancelled."));
+      console.log(chalk14.gray("Cancelled."));
       return;
     }
     const { searchMethod } = await prompts4({
@@ -10897,7 +11326,7 @@ async function linkCommand(fileArg, blueprintIdArg, options = {}) {
       ]
     });
     if (!searchMethod) {
-      console.log(chalk13.gray("Cancelled."));
+      console.log(chalk14.gray("Cancelled."));
       return;
     }
     if (searchMethod === "list") {
@@ -10906,8 +11335,8 @@ async function linkCommand(fileArg, blueprintIdArg, options = {}) {
         const blueprints = await api.listAllBlueprints();
         spinner2.stop();
         if (!blueprints || blueprints.length === 0) {
-          console.log(chalk13.yellow("You don't have any blueprints yet."));
-          console.log(chalk13.gray("Create one with 'lynxp push' or search the marketplace."));
+          console.log(chalk14.yellow("You don't have any blueprints yet."));
+          console.log(chalk14.gray("Create one with 'lynxp push' or search the marketplace."));
           return;
         }
         const { selected } = await prompts4({
@@ -10921,13 +11350,13 @@ async function linkCommand(fileArg, blueprintIdArg, options = {}) {
           }))
         });
         if (!selected) {
-          console.log(chalk13.gray("Cancelled."));
+          console.log(chalk14.gray("Cancelled."));
           return;
         }
         blueprintId = selected;
       } catch {
         spinner2.stop();
-        console.log(chalk13.red("\u2717 Could not fetch blueprints"));
+        console.log(chalk14.red("\u2717 Could not fetch blueprints"));
         return;
       }
     } else if (searchMethod === "search") {
@@ -10937,7 +11366,7 @@ async function linkCommand(fileArg, blueprintIdArg, options = {}) {
         message: "Search for:"
       });
       if (!query) {
-        console.log(chalk13.gray("Cancelled."));
+        console.log(chalk14.gray("Cancelled."));
         return;
       }
       const spinner2 = ora10(`Searching for "${query}"...`).start();
@@ -10945,7 +11374,7 @@ async function linkCommand(fileArg, blueprintIdArg, options = {}) {
         const results = await api.searchBlueprints(query, 10);
         spinner2.stop();
         if (!results.templates || results.templates.length === 0) {
-          console.log(chalk13.yellow(`No blueprints found for "${query}"`));
+          console.log(chalk14.yellow(`No blueprints found for "${query}"`));
           return;
         }
         const { selected } = await prompts4({
@@ -10959,13 +11388,13 @@ async function linkCommand(fileArg, blueprintIdArg, options = {}) {
           }))
         });
         if (!selected) {
-          console.log(chalk13.gray("Cancelled."));
+          console.log(chalk14.gray("Cancelled."));
           return;
         }
         blueprintId = selected;
       } catch {
         spinner2.stop();
-        console.log(chalk13.red("\u2717 Search failed"));
+        console.log(chalk14.red("\u2717 Search failed"));
         return;
       }
     } else {
@@ -10975,82 +11404,82 @@ async function linkCommand(fileArg, blueprintIdArg, options = {}) {
         message: "Enter blueprint ID:"
       });
       if (!manualId) {
-        console.log(chalk13.gray("Cancelled."));
+        console.log(chalk14.gray("Cancelled."));
         return;
       }
       blueprintId = manualId;
     }
   }
   if (!blueprintId) {
-    console.log(chalk13.red("\u2717 No blueprint ID provided."));
+    console.log(chalk14.red("\u2717 No blueprint ID provided."));
     return;
   }
-  const spinner = ora10(`Fetching blueprint ${chalk13.cyan(blueprintId)}...`).start();
+  const spinner = ora10(`Fetching blueprint ${chalk14.cyan(blueprintId)}...`).start();
   try {
     const { blueprint } = await api.getBlueprint(blueprintId);
     spinner.stop();
     const source = getSourceFromVisibility2(blueprint.visibility);
     const isMarketplace = source === "marketplace";
     console.log();
-    console.log(chalk13.cyan(`\u{1F431} Blueprint: ${chalk13.bold(safeText(blueprint.name))}`));
+    console.log(chalk14.cyan(`\u{1F431} Blueprint: ${chalk14.bold(safeText(blueprint.name))}`));
     if (blueprint.description) {
-      console.log(chalk13.gray(`   ${safeText(blueprint.description)}`));
+      console.log(chalk14.gray(`   ${safeText(blueprint.description)}`));
     }
-    console.log(chalk13.gray(`   Visibility: ${blueprint.visibility}`));
+    console.log(chalk14.gray(`   Visibility: ${blueprint.visibility}`));
     console.log();
     if (isMarketplace) {
-      console.log(chalk13.yellow("\u26A0 This is a marketplace blueprint."));
-      console.log(chalk13.gray("  Your local changes will NOT sync back to the cloud."));
-      console.log(chalk13.gray("  To make changes, you'll need to create your own copy."));
+      console.log(chalk14.yellow("\u26A0 This is a marketplace blueprint."));
+      console.log(chalk14.gray("  Your local changes will NOT sync back to the cloud."));
+      console.log(chalk14.gray("  To make changes, you'll need to create your own copy."));
       console.log();
     }
     const { confirm } = await prompts4({
       type: "confirm",
       name: "confirm",
-      message: `Link ${chalk13.cyan(file)} to ${chalk13.cyan(blueprint.name)}?`,
+      message: `Link ${chalk14.cyan(file)} to ${chalk14.cyan(blueprint.name)}?`,
       initial: true
     });
     if (!confirm) {
-      console.log(chalk13.gray("Cancelled."));
+      console.log(chalk14.gray("Cancelled."));
       return;
     }
     await linkBlueprint(cwd, file, blueprint.id, blueprint.name, source, blueprint.content);
     console.log();
-    console.log(chalk13.green(`\u2705 Linked: ${file} \u2192 ${blueprint.id}`));
+    console.log(chalk14.green(`\u2705 Linked: ${file} \u2192 ${blueprint.id}`));
     console.log();
-    console.log(chalk13.gray("Next steps:"));
-    console.log(chalk13.gray(`  \u2022 Run 'lynxp diff' to see differences`));
-    console.log(chalk13.gray(`  \u2022 Run 'lynxp status' to see all tracked blueprints`));
+    console.log(chalk14.gray("Next steps:"));
+    console.log(chalk14.gray(`  \u2022 Run 'lynxp diff' to see differences`));
+    console.log(chalk14.gray(`  \u2022 Run 'lynxp status' to see all tracked blueprints`));
     if (!isMarketplace) {
-      console.log(chalk13.gray(`  \u2022 Run 'lynxp push' to push local changes to cloud`));
+      console.log(chalk14.gray(`  \u2022 Run 'lynxp push' to push local changes to cloud`));
     }
     console.log();
   } catch (error) {
     spinner.stop();
     if (error instanceof ApiRequestError) {
       if (error.statusCode === 404) {
-        console.log(chalk13.red(`\u2717 Blueprint not found: ${blueprintId}`));
-        console.log(chalk13.gray("  Make sure the ID is correct. Use 'lynxp list' or 'lynxp search' to find blueprints."));
+        console.log(chalk14.red(`\u2717 Blueprint not found: ${blueprintId}`));
+        console.log(chalk14.gray("  Make sure the ID is correct. Use 'lynxp list' or 'lynxp search' to find blueprints."));
       } else if (error.statusCode === 403) {
-        console.log(chalk13.red("\u2717 You don't have access to this blueprint."));
+        console.log(chalk14.red("\u2717 You don't have access to this blueprint."));
       } else {
-        console.log(chalk13.red(`\u2717 Error: ${error.message}`));
+        console.log(chalk14.red(`\u2717 Error: ${error.message}`));
       }
     } else {
-      console.log(chalk13.red("\u2717 An unexpected error occurred."));
+      console.log(chalk14.red("\u2717 An unexpected error occurred."));
     }
   }
 }
 async function unlinkCommand(fileArg) {
   const cwd = process.cwd();
   console.log();
-  console.log(chalk13.cyan("\u{1F431} Unlink File from Blueprint"));
+  console.log(chalk14.cyan("\u{1F431} Unlink File from Blueprint"));
   console.log();
   let file;
   if (!fileArg) {
     const status = await checkSyncStatus(cwd);
     if (status.length === 0) {
-      console.log(chalk13.yellow("No files are currently linked to blueprints."));
+      console.log(chalk14.yellow("No files are currently linked to blueprints."));
       return;
     }
     const { selectedFile } = await prompts4({
@@ -11064,7 +11493,7 @@ async function unlinkCommand(fileArg) {
       }))
     });
     if (!selectedFile) {
-      console.log(chalk13.gray("Cancelled."));
+      console.log(chalk14.gray("Cancelled."));
       return;
     }
     file = selectedFile;
@@ -11073,77 +11502,77 @@ async function unlinkCommand(fileArg) {
   }
   const tracked = await findBlueprintByFile(cwd, file);
   if (!tracked) {
-    console.log(chalk13.yellow(`File is not linked to any blueprint: ${file}`));
+    console.log(chalk14.yellow(`File is not linked to any blueprint: ${file}`));
     return;
   }
-  console.log(chalk13.gray(`Currently linked to: ${tracked.name}`));
-  console.log(chalk13.gray(`   ID: ${tracked.id}`));
-  console.log(chalk13.gray(`   Source: ${tracked.source}`));
+  console.log(chalk14.gray(`Currently linked to: ${tracked.name}`));
+  console.log(chalk14.gray(`   ID: ${tracked.id}`));
+  console.log(chalk14.gray(`   Source: ${tracked.source}`));
   console.log();
   const { confirm } = await prompts4({
     type: "confirm",
     name: "confirm",
-    message: `Unlink ${chalk13.cyan(file)} from ${chalk13.cyan(tracked.name)}?`,
+    message: `Unlink ${chalk14.cyan(file)} from ${chalk14.cyan(tracked.name)}?`,
     initial: true
   });
   if (!confirm) {
-    console.log(chalk13.gray("Cancelled."));
+    console.log(chalk14.gray("Cancelled."));
     return;
   }
   const success = await untrackBlueprint(cwd, file);
   if (success) {
     console.log();
-    console.log(chalk13.green(`\u2705 Unlinked: ${file}`));
-    console.log(chalk13.gray("  The file is now standalone. Changes won't sync with the cloud."));
+    console.log(chalk14.green(`\u2705 Unlinked: ${file}`));
+    console.log(chalk14.gray("  The file is now standalone. Changes won't sync with the cloud."));
     console.log();
   } else {
-    console.log(chalk13.red("\u2717 Failed to unlink file."));
+    console.log(chalk14.red("\u2717 Failed to unlink file."));
   }
 }
 async function listTrackedBlueprints(cwd) {
   console.log();
-  console.log(chalk13.cyan("\u{1F431} Tracked Blueprints"));
+  console.log(chalk14.cyan("\u{1F431} Tracked Blueprints"));
   console.log();
   const status = await checkSyncStatus(cwd);
   if (status.length === 0) {
-    console.log(chalk13.gray("No blueprints are currently tracked."));
+    console.log(chalk14.gray("No blueprints are currently tracked."));
     console.log();
-    console.log(chalk13.gray("To track a blueprint:"));
-    console.log(chalk13.gray("  lynxp pull <blueprint-id>     Download and track a blueprint"));
-    console.log(chalk13.gray("  lynxp link                    Link an existing file to a blueprint"));
+    console.log(chalk14.gray("To track a blueprint:"));
+    console.log(chalk14.gray("  lynxp pull <blueprint-id>     Download and track a blueprint"));
+    console.log(chalk14.gray("  lynxp link                    Link an existing file to a blueprint"));
     return;
   }
   for (const { blueprint, localModified, fileExists: fileExists2 } of status) {
-    const statusIcon = !fileExists2 ? chalk13.red("\u2717") : localModified ? chalk13.yellow("\u25CF") : chalk13.green("\u2713");
+    const statusIcon = !fileExists2 ? chalk14.red("\u2717") : localModified ? chalk14.yellow("\u25CF") : chalk14.green("\u2713");
     const sourceLabel = {
-      marketplace: chalk13.gray("[marketplace]"),
-      team: chalk13.blue("[team]"),
-      private: chalk13.green("[private]"),
-      local: chalk13.gray("[local]")
+      marketplace: chalk14.gray("[marketplace]"),
+      team: chalk14.blue("[team]"),
+      private: chalk14.green("[private]"),
+      local: chalk14.gray("[local]")
     }[blueprint.source];
-    console.log(`${statusIcon} ${chalk13.cyan(blueprint.file)}`);
+    console.log(`${statusIcon} ${chalk14.cyan(blueprint.file)}`);
     console.log(`  ${sourceLabel} ${blueprint.name}`);
-    console.log(`  ${chalk13.gray(`ID: ${blueprint.id}`)}`);
+    console.log(`  ${chalk14.gray(`ID: ${blueprint.id}`)}`);
     if (!fileExists2) {
-      console.log(chalk13.red(`  \u26A0 File not found`));
+      console.log(chalk14.red(`  \u26A0 File not found`));
     } else if (localModified) {
-      console.log(chalk13.yellow(`  \u26A0 Local changes detected`));
+      console.log(chalk14.yellow(`  \u26A0 Local changes detected`));
     }
     console.log();
   }
-  console.log(chalk13.gray("Legend:"));
-  console.log(chalk13.gray(`  ${chalk13.green("\u2713")} In sync  ${chalk13.yellow("\u25CF")} Modified locally  ${chalk13.red("\u2717")} Missing`));
+  console.log(chalk14.gray("Legend:"));
+  console.log(chalk14.gray(`  ${chalk14.green("\u2713")} In sync  ${chalk14.yellow("\u25CF")} Modified locally  ${chalk14.red("\u2717")} Missing`));
   console.log();
 }
 
 // src/commands/analyze.ts
-import chalk14 from "chalk";
+import chalk15 from "chalk";
 import ora11 from "ora";
 async function analyzeCommand(options) {
   console.log();
   if (!options.json) {
-    console.log(chalk14.cyan.bold("  \u{1F50D} LynxPrompt Analyzer"));
-    console.log(chalk14.gray("     Detect project configuration and tech stack"));
+    console.log(chalk15.cyan.bold("  \u{1F50D} LynxPrompt Analyzer"));
+    console.log(chalk15.gray("     Detect project configuration and tech stack"));
     console.log();
   }
   let detected;
@@ -11151,7 +11580,7 @@ async function analyzeCommand(options) {
   if (options.remote) {
     if (!isGitUrl(options.remote)) {
       if (!options.json) {
-        console.log(chalk14.red("  \u2717 Invalid Git URL provided"));
+        console.log(chalk15.red("  \u2717 Invalid Git URL provided"));
       }
       process.exit(1);
     }
@@ -11164,7 +11593,7 @@ async function analyzeCommand(options) {
         spinner.succeed("Remote repository analyzed");
       } else {
         spinner.fail("Could not analyze repository");
-        console.log(chalk14.gray("  The repository may be private or inaccessible."));
+        console.log(chalk15.gray("  The repository may be private or inaccessible."));
         process.exit(1);
       }
     } else {
@@ -11197,57 +11626,57 @@ async function analyzeCommand(options) {
   }
   console.log();
   if (!detected) {
-    console.log(chalk14.yellow("  No project configuration detected."));
+    console.log(chalk15.yellow("  No project configuration detected."));
     console.log();
-    console.log(chalk14.gray("  Tips:"));
-    console.log(chalk14.gray("  \u2022 Make sure you're in a project directory with a package.json, pyproject.toml, etc."));
-    console.log(chalk14.gray("  \u2022 Use --remote <url> to analyze a remote repository"));
+    console.log(chalk15.gray("  Tips:"));
+    console.log(chalk15.gray("  \u2022 Make sure you're in a project directory with a package.json, pyproject.toml, etc."));
+    console.log(chalk15.gray("  \u2022 Use --remote <url> to analyze a remote repository"));
     console.log();
     return;
   }
-  console.log(chalk14.green.bold("  \u{1F4CA} Project Analysis"));
+  console.log(chalk15.green.bold("  \u{1F4CA} Project Analysis"));
   console.log();
-  console.log(chalk14.white("  Basic Info"));
-  console.log(chalk14.gray("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
-  console.log(`  ${chalk14.dim("Name:")}          ${chalk14.white(detected.name || "unknown")}`);
+  console.log(chalk15.white("  Basic Info"));
+  console.log(chalk15.gray("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+  console.log(`  ${chalk15.dim("Name:")}          ${chalk15.white(detected.name || "unknown")}`);
   if (detected.description) {
-    console.log(`  ${chalk14.dim("Description:")}   ${chalk14.gray(detected.description)}`);
+    console.log(`  ${chalk15.dim("Description:")}   ${chalk15.gray(detected.description)}`);
   }
-  console.log(`  ${chalk14.dim("Type:")}          ${chalk14.white(detected.type || "application")}`);
+  console.log(`  ${chalk15.dim("Type:")}          ${chalk15.white(detected.type || "application")}`);
   if (detected.license) {
-    console.log(`  ${chalk14.dim("License:")}       ${chalk14.white(detected.license.toUpperCase())}`);
+    console.log(`  ${chalk15.dim("License:")}       ${chalk15.white(detected.license.toUpperCase())}`);
   }
   console.log();
-  console.log(chalk14.white("  Tech Stack"));
-  console.log(chalk14.gray("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+  console.log(chalk15.white("  Tech Stack"));
+  console.log(chalk15.gray("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
   if (detected.stack.length > 0) {
     for (const tech of detected.stack) {
-      console.log(`  ${chalk14.cyan("\u2022")} ${tech}`);
+      console.log(`  ${chalk15.cyan("\u2022")} ${tech}`);
     }
   } else {
-    console.log(chalk14.gray("  No tech stack detected"));
+    console.log(chalk15.gray("  No tech stack detected"));
   }
   console.log();
-  console.log(chalk14.white("  Infrastructure"));
-  console.log(chalk14.gray("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
-  console.log(`  ${chalk14.dim("Package Manager:")} ${detected.packageManager || chalk14.gray("none detected")}`);
-  console.log(`  ${chalk14.dim("Repo Host:")}       ${detected.repoHost || chalk14.gray("none detected")}`);
-  console.log(`  ${chalk14.dim("CI/CD:")}           ${detected.cicd || chalk14.gray("none detected")}`);
-  console.log(`  ${chalk14.dim("Docker:")}          ${detected.hasDocker ? chalk14.green("yes") : chalk14.gray("no")}`);
+  console.log(chalk15.white("  Infrastructure"));
+  console.log(chalk15.gray("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+  console.log(`  ${chalk15.dim("Package Manager:")} ${detected.packageManager || chalk15.gray("none detected")}`);
+  console.log(`  ${chalk15.dim("Repo Host:")}       ${detected.repoHost || chalk15.gray("none detected")}`);
+  console.log(`  ${chalk15.dim("CI/CD:")}           ${detected.cicd || chalk15.gray("none detected")}`);
+  console.log(`  ${chalk15.dim("Docker:")}          ${detected.hasDocker ? chalk15.green("yes") : chalk15.gray("no")}`);
   console.log();
   if (detected.commands && Object.keys(detected.commands).length > 0) {
-    console.log(chalk14.white("  Commands"));
-    console.log(chalk14.gray("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+    console.log(chalk15.white("  Commands"));
+    console.log(chalk15.gray("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
     for (const [key, value] of Object.entries(detected.commands)) {
       if (value) {
         const cmdValue = Array.isArray(value) ? value.join(", ") : value;
-        console.log(`  ${chalk14.dim(key.padEnd(10))}  ${chalk14.yellow(cmdValue)}`);
+        console.log(`  ${chalk15.dim(key.padEnd(10))}  ${chalk15.yellow(cmdValue)}`);
       }
     }
     console.log();
   }
-  console.log(chalk14.white("  \u{1F4A1} Recommendations"));
-  console.log(chalk14.gray("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+  console.log(chalk15.white("  \u{1F4A1} Recommendations"));
+  console.log(chalk15.gray("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
   const recommendations = [];
   if (!detected.cicd) {
     recommendations.push("Add CI/CD configuration (GitHub Actions, GitLab CI, etc.)");
@@ -11266,122 +11695,83 @@ async function analyzeCommand(options) {
   }
   if (recommendations.length > 0) {
     for (const rec of recommendations) {
-      console.log(`  ${chalk14.yellow("\u2022")} ${rec}`);
+      console.log(`  ${chalk15.yellow("\u2022")} ${rec}`);
     }
   } else {
-    console.log(chalk14.green("  \u2713 Project looks well-configured!"));
+    console.log(chalk15.green("  \u2713 Project looks well-configured!"));
   }
   console.log();
-  console.log(chalk14.gray("  Run 'lynxp wizard' to generate AI IDE configuration"));
+  console.log(chalk15.gray("  Run 'lynxp wizard' to generate AI IDE configuration"));
   console.log();
 }
 
 // src/commands/convert.ts
-import chalk15 from "chalk";
-import { readFile as readFile8, writeFile as writeFile4, access as access5 } from "fs/promises";
-import { join as join8, basename as basename2, resolve as resolve2, dirname as dirname4 } from "path";
+import chalk16 from "chalk";
+import { readFile as readFile9, writeFile as writeFile5, access as access6 } from "fs/promises";
+import { basename as basename2, resolve as resolve2, dirname as dirname5 } from "path";
 import ora12 from "ora";
 
 // src/utils/convert-format.ts
-var isCommandTarget = (target) => target.includes("-command") || target.includes("-prompt") || target.includes("-workflow");
+import { access as access5 } from "fs/promises";
+import { join as join9 } from "path";
+
+// ../packages/shared/src/rules-format.ts
+function yamlString(value) {
+  return JSON.stringify(value);
+}
+var cursorFrontmatter = (description) => [`description: ${yamlString(description)}`, "alwaysApply: true"];
+var PLATFORM_FRONTMATTER = {
+  cursor: cursorFrontmatter,
+  firebender: cursorFrontmatter,
+  // Firebender reads Cursor-style .mdc rules
+  kiro: () => ["inclusion: always"],
+  augment: (description) => ["type: always_apply", `description: ${yamlString(description)}`],
+  devin: () => ["trigger: always_on"]
+  // .devin/rules/ uses Windsurf's rule frontmatter
+};
+var FRONTMATTER_PATTERN = /^---\r?\n[\s\S]*?\r?\n---[ \t]*(?:\r?\n)+/;
+function frontmatterLines(platform2, description) {
+  const keys = PLATFORM_FRONTMATTER[platform2];
+  return keys ? ["---", ...keys(description), "---", ""] : [];
+}
 function splitFrontmatter(content) {
-  const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---[ \t]*(?:\r?\n|$)/);
-  if (!match) return { frontmatter: null, body: content };
-  return { frontmatter: match[1], body: content.slice(match[0].length).replace(/^\s*\n/, "") };
-}
-function parseMarkdownConfig(content) {
-  const config2 = {};
-  const sections = content.split(/^##\s+/m);
-  for (const section of sections) {
-    const lines = section.trim().split("\n");
-    if (lines.length === 0) continue;
-    const title = lines[0].toLowerCase().trim();
-    const body2 = lines.slice(1).join("\n").trim();
-    config2[title] = body2;
-  }
-  config2._raw = content;
+  const match = content.match(FRONTMATTER_PATTERN);
+  if (!match) return { frontmatter: "", body: content };
+  return { frontmatter: match[0], body: content.slice(match[0].length) };
+}
+function adaptRulesContent(content, fromPlatform, toPlatform, description) {
   const { frontmatter, body } = splitFrontmatter(content);
-  config2._body = body;
-  if (frontmatter !== null) config2._frontmatter = frontmatter;
-  return config2;
-}
-var DEFAULT_MDC_FRONTMATTER = `description: "AI coding rules"
-globs: ["**/*"]
-alwaysApply: true`;
-function generateTargetContent(config2, targetPlatform) {
-  const rawContent = config2._body ?? config2._raw ?? "";
-  const sourceFrontmatter = config2._frontmatter;
-  const mdcFrontmatter = sourceFrontmatter && /^(alwaysApply|globs)\s*:/m.test(sourceFrontmatter) ? sourceFrontmatter : DEFAULT_MDC_FRONTMATTER;
-  if (isCommandTarget(targetPlatform)) {
-    return config2._raw || "";
-  }
-  switch (targetPlatform) {
-    case "cursor":
-    case "firebender":
-      return `---
-${mdcFrontmatter}
----
-
-${rawContent}`;
-    case "kiro":
-      return `---
-inclusion: always
----
-
-${rawContent}`;
-    case "augment":
-      return `---
-type: always_apply
----
-
-${rawContent}`;
-    case "cursor_legacy":
-      return rawContent.replace(/^#\s+/gm, "").replace(/^##\s+/gm, "\n").replace(/^###\s+/gm, "").trim();
-    case "windsurf":
-    case "cline":
-    case "goose":
-    case "trae":
-      return rawContent;
-    case "tabnine":
-      return `# Tabnine configuration
-# Converted from AI IDE configuration
-instructions: |
-${rawContent.split("\n").map((line) => `  ${line}`).join("\n")}
-`;
-    case "void":
-    case "continue":
-    case "cody":
-    case "codegpt":
-    case "supermaven":
-      return JSON.stringify({ instructions: rawContent }, null, 2) + "\n";
-    case "copilot":
-      return `# GitHub Copilot Instructions
-
-${rawContent}
-`;
-    case "agents":
-    case "universal":
-    case "claude":
-    case "codex":
-    case "antigravity":
-    case "gemini-cli":
-    case "zed":
-    case "amazonq":
-    case "junie":
-    case "warp":
-    case "openhands":
-    case "crush":
-    case "aider":
-    case "opencode":
-    case "firebase":
-    case "roocode":
-    case "kilocode":
-    default:
-      return rawContent;
-  }
+  const target = PLATFORM_FRONTMATTER[toPlatform];
+  if (fromPlatform === toPlatform && (frontmatter || !target)) return content;
+  if (frontmatter && target && PLATFORM_FRONTMATTER[fromPlatform] === target) return content;
+  const lines = frontmatterLines(toPlatform, description);
+  return lines.length ? `${lines.join("\n")}
+${body}` : body;
 }
 
-// src/commands/convert.ts
+// src/utils/convert-format.ts
+var isCommandTarget = (target) => target.includes("-command") || target.includes("-prompt") || target.includes("-workflow");
+var RULES_DESCRIPTION = "AI rules for this project";
+function isStructuredPlatform(platform2) {
+  const format = getPlatform(platform2)?.format;
+  return format === "json" || format === "yaml";
+}
+function platformForPath(filePath) {
+  const normalized = filePath.replace(/\\/g, "/").toLowerCase();
+  const rules = PLATFORMS.filter((p) => !p.isCommand);
+  const inFolder2 = rules.find((p) => p.rulesDirectory && `/${normalized}`.includes(`/${p.rulesDirectory.toLowerCase()}`));
+  if (inFolder2) return inFolder2.id;
+  const file = rules.find((p) => {
+    const own = p.file.toLowerCase();
+    return normalized === own || normalized.endsWith(`/${own}`);
+  });
+  if (file) return file.id;
+  return normalized.endsWith(".mdc") ? "cursor" : void 0;
+}
+function convertContent(content, sourcePlatform, targetPlatform) {
+  if (isCommandTarget(targetPlatform)) return content;
+  return adaptRulesContent(content, sourcePlatform, targetPlatform, RULES_DESCRIPTION);
+}
 var SOURCE_FILES = {
   "agents.md": "agents",
   "claude.md": "claude",
@@ -11393,8 +11783,33 @@ var SOURCE_FILES = {
   "copilot-instructions.md": "copilot",
   ".windsurfrules": "windsurf",
   ".clinerules": "cline",
-  ".aider.conf.yml": "aider"
+  // Real case: auto-detect looks the name up as is, and Linux disks are case-sensitive
+  "CONVENTIONS.md": "aider"
 };
+var sourceFilePlatform = (name) => Object.entries(SOURCE_FILES).find(([file]) => file.toLowerCase() === name.toLowerCase())?.[1];
+async function detectSourceFile(cwd) {
+  for (const [pattern, platform2] of Object.entries(SOURCE_FILES)) {
+    try {
+      const fullPath = join9(cwd, pattern);
+      await access5(fullPath);
+      return { path: fullPath, platform: platform2 };
+    } catch {
+    }
+  }
+  const uppercaseVariants = ["AGENTS.md", "CLAUDE.md"];
+  for (const variant of uppercaseVariants) {
+    try {
+      const fullPath = join9(cwd, variant);
+      await access5(fullPath);
+      const platform2 = variant.toLowerCase().replace(".md", "");
+      return { path: fullPath, platform: platform2 };
+    } catch {
+    }
+  }
+  return null;
+}
+
+// src/commands/convert.ts
 var TARGET_FILES = {
   ...PLATFORM_FILES2,
   cursor_legacy: ".cursorrules",
@@ -11434,6 +11849,7 @@ var PLATFORM_NAMES = {
   codex: "Codex",
   openhands: "OpenHands",
   crush: "Crush",
+  devin: "Devin",
   firebender: "Firebender",
   "cursor-command": "Cursor Command",
   "claude-command": "Claude Code Command",
@@ -11446,27 +11862,6 @@ var COMMAND_DIRS = {
   ...Object.fromEntries(COMMANDS.map((c) => [c.directory, c.id])),
   ".copilot/prompts": "copilot-prompt"
 };
-async function detectSourceFile(cwd) {
-  for (const [pattern, platform2] of Object.entries(SOURCE_FILES)) {
-    try {
-      const fullPath = join8(cwd, pattern);
-      await access5(fullPath);
-      return { path: fullPath, platform: platform2 };
-    } catch {
-    }
-  }
-  const uppercaseVariants = ["AGENTS.md", "CLAUDE.md"];
-  for (const variant of uppercaseVariants) {
-    try {
-      const fullPath = join8(cwd, variant);
-      await access5(fullPath);
-      const platform2 = variant.toLowerCase().replace(".md", "");
-      return { path: fullPath, platform: platform2 };
-    } catch {
-    }
-  }
-  return null;
-}
 function detectCommandPlatform(sourcePath) {
   const normalized = sourcePath.replace(/\\/g, "/").toLowerCase();
   for (const [dir, platform2] of Object.entries(COMMAND_DIRS)) {
@@ -11479,10 +11874,20 @@ function detectCommandPlatform(sourcePath) {
 async function convertCommand(first, second, options) {
   const [source, target] = second === void 0 ? [void 0, first] : [first, second];
   console.log();
-  console.log(chalk15.cyan.bold("  \u{1F504} LynxPrompt Convert"));
-  console.log(chalk15.gray("     Convert AI IDE configuration between formats"));
+  console.log(chalk16.cyan.bold("  \u{1F504} LynxPrompt Convert"));
+  console.log(chalk16.gray("     Convert AI IDE configuration between formats"));
   console.log();
   const cwd = process.cwd();
+  const mcpTarget = MCP_CONFIGS.find((c) => c.id === target.toLowerCase());
+  const mcpSource = source !== void 0 && matchConfigFile(source)?.type === "MCP_CONFIG";
+  if (mcpTarget || mcpSource) {
+    if (!mcpTarget) {
+      console.log(chalk16.red(`  \u2717 An MCP config converts only to another tool's MCP config: ${MCP_CONFIGS.map((c) => c.id).join(", ")}`));
+      process.exit(1);
+    }
+    await convertMcp(cwd, source, mcpTarget, options);
+    return;
+  }
   let sourcePath;
   let sourcePlatform;
   if (source) {
@@ -11491,27 +11896,26 @@ async function convertCommand(first, second, options) {
     if (cmdPlatform) {
       sourcePlatform = cmdPlatform;
     } else {
-      const sourceBasename = basename2(source).toLowerCase();
-      sourcePlatform = SOURCE_FILES[sourceBasename] || "unknown";
+      sourcePlatform = platformForPath(source) || sourceFilePlatform(basename2(source)) || "unknown";
     }
   } else {
     const detected = await detectSourceFile(cwd);
     if (!detected) {
-      console.log(chalk15.red("  \u2717 No AI configuration file found in current directory"));
+      console.log(chalk16.red("  \u2717 No AI configuration file found in current directory"));
       console.log();
-      console.log(chalk15.gray("  Supported source files:"));
+      console.log(chalk16.gray("  Supported source files:"));
       for (const file of Object.keys(SOURCE_FILES)) {
-        console.log(chalk15.gray(`    \u2022 ${file}`));
+        console.log(chalk16.gray(`    \u2022 ${file}`));
       }
       console.log();
-      console.log(chalk15.gray("  Command directories (for slash commands):"));
+      console.log(chalk16.gray("  Command directories (for slash commands):"));
       for (const dir of Object.keys(COMMAND_DIRS)) {
-        console.log(chalk15.gray(`    \u2022 ${dir}/*.md`));
+        console.log(chalk16.gray(`    \u2022 ${dir}/*.md`));
       }
       console.log();
-      console.log(chalk15.gray("  Usage: lynxp convert <source> <target>"));
-      console.log(chalk15.gray("  Example: lynxp convert AGENTS.md cursor"));
-      console.log(chalk15.gray("  Example: lynxp convert .cursor/commands/deploy.md claude-command"));
+      console.log(chalk16.gray("  Usage: lynxp convert <source> <target>"));
+      console.log(chalk16.gray("  Example: lynxp convert AGENTS.md cursor"));
+      console.log(chalk16.gray("  Example: lynxp convert .cursor/commands/deploy.md claude-command"));
       process.exit(1);
     }
     sourcePath = detected.path;
@@ -11520,27 +11924,36 @@ async function convertCommand(first, second, options) {
   const targetLower = target.toLowerCase();
   const normalizedTarget = TARGET_FILES[targetLower] ? targetLower : targetLower.replace(/-/g, "_");
   if (!TARGET_FILES[normalizedTarget]) {
-    console.log(chalk15.red(`  \u2717 Unknown target format: ${target}`));
+    console.log(chalk16.red(`  \u2717 Unknown target format: ${target}`));
     console.log();
-    console.log(chalk15.gray("  Supported target formats:"));
+    console.log(chalk16.gray("  Supported target formats:"));
     for (const [key, name] of Object.entries(PLATFORM_NAMES)) {
-      console.log(chalk15.gray(`    \u2022 ${key.padEnd(15)} \u2192 ${name}`));
+      if (isStructuredPlatform(key)) continue;
+      console.log(chalk16.gray(`    \u2022 ${key.padEnd(15)} \u2192 ${name}`));
     }
+    for (const c of MCP_CONFIGS) {
+      console.log(chalk16.gray(`    \u2022 ${c.id.padEnd(15)} \u2192 MCP servers for ${c.name} (${c.file})`));
+    }
+    process.exit(1);
+  }
+  const structured = [sourcePlatform, normalizedTarget].find(isStructuredPlatform);
+  if (structured) {
+    console.log(chalk16.red(`  \u2717 ${PLATFORM_NAMES[structured] || structured} uses a JSON/YAML config, not a rules file, so it cannot be converted`));
+    console.log(chalk16.gray(`     Run 'lynxp wizard' and pick ${PLATFORM_NAMES[structured] || structured} to generate one`));
     process.exit(1);
   }
   let sourceContent;
   try {
-    sourceContent = await readFile8(sourcePath, "utf-8");
+    sourceContent = await readFile9(sourcePath, "utf-8");
   } catch {
-    console.log(chalk15.red(`  \u2717 Could not read source file: ${sourcePath}`));
+    console.log(chalk16.red(`  \u2717 Could not read source file: ${sourcePath}`));
     process.exit(1);
   }
-  console.log(chalk15.white(`  Source: ${basename2(sourcePath)} (${PLATFORM_NAMES[sourcePlatform] || sourcePlatform})`));
-  console.log(chalk15.white(`  Target: ${PLATFORM_NAMES[normalizedTarget]}`));
+  console.log(chalk16.white(`  Source: ${basename2(sourcePath)} (${PLATFORM_NAMES[sourcePlatform] || sourcePlatform})`));
+  console.log(chalk16.white(`  Target: ${PLATFORM_NAMES[normalizedTarget]}`));
   console.log();
   const spinner = ora12("Converting configuration...").start();
-  const config2 = parseMarkdownConfig(sourceContent);
-  const targetContent = generateTargetContent(config2, normalizedTarget);
+  const targetContent = convertContent(sourceContent, sourcePlatform, normalizedTarget);
   spinner.stop();
   let outputFilename = options.output || TARGET_FILES[normalizedTarget];
   const targetCommand = COMMANDS.find((c) => c.id === normalizedTarget);
@@ -11550,35 +11963,71 @@ async function convertCommand(first, second, options) {
   }
   const outputPath = resolve2(cwd, outputFilename);
   try {
-    await access5(outputPath);
+    await access6(outputPath);
     if (!options.force) {
-      console.log(chalk15.yellow(`  \u26A0\uFE0F File already exists: ${outputFilename}`));
-      console.log(chalk15.gray("     Use --force to overwrite"));
+      console.log(chalk16.yellow(`  \u26A0\uFE0F File already exists: ${outputFilename}`));
+      console.log(chalk16.gray("     Use --force to overwrite"));
       process.exit(1);
     }
   } catch {
   }
   try {
-    const { mkdir: mkdir4 } = await import("fs/promises");
-    const outputDir = dirname4(outputPath);
+    const { mkdir: mkdir5 } = await import("fs/promises");
+    const outputDir = dirname5(outputPath);
     if (outputDir !== cwd) {
-      await mkdir4(outputDir, { recursive: true });
+      await mkdir5(outputDir, { recursive: true });
     }
-    await writeFile4(outputPath, targetContent, "utf-8");
-    console.log(chalk15.green(`  \u2713 Converted to ${outputFilename}`));
+    await writeFile5(outputPath, targetContent, "utf-8");
+    console.log(chalk16.green(`  \u2713 Converted to ${outputFilename}`));
     console.log();
-    console.log(chalk15.gray(`  Lines: ${targetContent.split("\n").length}`));
-    console.log(chalk15.gray(`  Size: ${targetContent.length} bytes`));
+    console.log(chalk16.gray(`  Lines: ${targetContent.split("\n").length}`));
+    console.log(chalk16.gray(`  Size: ${targetContent.length} bytes`));
     console.log();
   } catch (error) {
-    console.log(chalk15.red(`  \u2717 Could not write output: ${error instanceof Error ? error.message : "unknown error"}`));
+    console.log(chalk16.red(`  \u2717 Could not write output: ${error instanceof Error ? error.message : "unknown error"}`));
+    process.exit(1);
+  }
+}
+async function convertMcp(cwd, source, target, options) {
+  let sourceFile = source;
+  if (sourceFile === void 0) {
+    for (const c of MCP_CONFIGS) {
+      if (c.id !== target.id && await access6(resolve2(cwd, c.file)).then(() => true, () => false)) {
+        sourceFile = c.file;
+        break;
+      }
+    }
+  }
+  if (sourceFile === void 0) {
+    console.log(chalk16.red("  \u2717 No MCP config found. Looked for:"));
+    for (const c of MCP_CONFIGS) console.log(chalk16.gray(`    \u2022 ${c.file}`));
     process.exit(1);
   }
+  let converted;
+  try {
+    converted = convertMcpConfig(await readFile9(resolve2(cwd, sourceFile), "utf-8"), target.id);
+  } catch (error) {
+    console.log(chalk16.red(`  \u2717 Could not convert ${sourceFile}: ${error instanceof Error ? error.message : "unreadable"}`));
+    process.exit(1);
+  }
+  const outputFile = options.output || target.file;
+  const outputPath = resolve2(cwd, outputFile);
+  const exists = await access6(outputPath).then(() => true, () => false);
+  if (exists && !options.force) {
+    console.log(chalk16.yellow(`  \u26A0\uFE0F File already exists: ${outputFile}`));
+    console.log(chalk16.gray("     Use --force to overwrite"));
+    process.exit(1);
+  }
+  const { mkdir: mkdir5 } = await import("fs/promises");
+  await mkdir5(dirname5(outputPath), { recursive: true });
+  await writeFile5(outputPath, converted, "utf-8");
+  console.log(chalk16.green(`  \u2713 Converted ${sourceFile} to ${outputFile} (MCP servers for ${target.name})`));
+  console.log();
 }
 
 // src/commands/merge.ts
-import chalk16 from "chalk";
-import { readFile as readFile9, writeFile as writeFile5, access as access6 } from "fs/promises";
+import chalk17 from "chalk";
+import { readFile as readFile10, writeFile as writeFile6, access as access7 } from "fs/promises";
 import { basename as basename3, resolve as resolve3 } from "path";
 import ora13 from "ora";
 import prompts5 from "prompts";
@@ -11675,43 +12124,43 @@ ${s.content.trim()}`).join("\n\n");
 // src/commands/merge.ts
 async function mergeCommand(files, options) {
   console.log();
-  console.log(chalk16.cyan.bold("  \u{1F500} LynxPrompt Merge"));
-  console.log(chalk16.gray("     Merge multiple AI IDE configuration files"));
+  console.log(chalk17.cyan.bold("  \u{1F500} LynxPrompt Merge"));
+  console.log(chalk17.gray("     Merge multiple AI IDE configuration files"));
   console.log();
   if (files.length < 2) {
-    console.log(chalk16.red("  \u2717 Please provide at least 2 files to merge"));
+    console.log(chalk17.red("  \u2717 Please provide at least 2 files to merge"));
     console.log();
-    console.log(chalk16.gray("  Usage: lynxp merge <file1> <file2> [...files]"));
-    console.log(chalk16.gray("  Example: lynxp merge AGENTS.md team-rules.md --output merged.md"));
+    console.log(chalk17.gray("  Usage: lynxp merge <file1> <file2> [...files]"));
+    console.log(chalk17.gray("  Example: lynxp merge AGENTS.md team-rules.md --output merged.md"));
     console.log();
-    console.log(chalk16.gray("  Options:"));
-    console.log(chalk16.gray("    --output <file>     Output filename (default: merged.md)"));
-    console.log(chalk16.gray("    --strategy <type>   Merge strategy: concat, sections, smart (default: smart)"));
-    console.log(chalk16.gray("    --force             Overwrite existing output file"));
-    console.log(chalk16.gray("    --interactive       Review and select sections to include"));
+    console.log(chalk17.gray("  Options:"));
+    console.log(chalk17.gray("    --output <file>     Output filename (default: merged.md)"));
+    console.log(chalk17.gray("    --strategy <type>   Merge strategy: concat, sections, smart (default: smart)"));
+    console.log(chalk17.gray("    --force             Overwrite existing output file"));
+    console.log(chalk17.gray("    --interactive       Review and select sections to include"));
     process.exit(1);
   }
   const cwd = process.cwd();
   const strategy = options.strategy || "smart";
-  console.log(chalk16.white(`  Files to merge: ${files.length}`));
-  console.log(chalk16.white(`  Strategy: ${strategy}`));
+  console.log(chalk17.white(`  Files to merge: ${files.length}`));
+  console.log(chalk17.white(`  Strategy: ${strategy}`));
   console.log();
   const allSections = [];
   for (const file of files) {
     const filePath = resolve3(cwd, file);
     try {
-      await access6(filePath);
+      await access7(filePath);
     } catch {
-      console.log(chalk16.red(`  \u2717 File not found: ${file}`));
+      console.log(chalk17.red(`  \u2717 File not found: ${file}`));
       process.exit(1);
     }
     try {
-      const content = await readFile9(filePath, "utf-8");
+      const content = await readFile10(filePath, "utf-8");
       const sections = parseMarkdownSections(content, basename3(file));
       allSections.push(sections);
-      console.log(chalk16.gray(`  \u2713 Read ${file} (${sections.length} sections)`));
+      console.log(chalk17.gray(`  \u2713 Read ${file} (${sections.length} sections)`));
     } catch (error) {
-      console.log(chalk16.red(`  \u2717 Could not read ${file}: ${error instanceof Error ? error.message : "unknown"}`));
+      console.log(chalk17.red(`  \u2717 Could not read ${file}: ${error instanceof Error ? error.message : "unknown"}`));
       process.exit(1);
     }
   }
@@ -11734,7 +12183,7 @@ async function mergeCommand(files, options) {
       hint: "- Space to toggle, Enter to confirm"
     });
     if (!response.sections || response.sections.length === 0) {
-      console.log(chalk16.yellow("  No sections selected, aborting."));
+      console.log(chalk17.yellow("  No sections selected, aborting."));
       process.exit(0);
     }
     const selectedSections = response.sections.map((i) => flatSections[i]);
@@ -11757,34 +12206,34 @@ ${mergedContent}
   const outputFilename = options.output || "merged.md";
   const outputPath = resolve3(cwd, outputFilename);
   try {
-    await access6(outputPath);
+    await access7(outputPath);
     if (!options.force) {
-      console.log(chalk16.yellow(`  \u26A0\uFE0F File already exists: ${outputFilename}`));
-      console.log(chalk16.gray("     Use --force to overwrite"));
+      console.log(chalk17.yellow(`  \u26A0\uFE0F File already exists: ${outputFilename}`));
+      console.log(chalk17.gray("     Use --force to overwrite"));
       process.exit(1);
     }
   } catch {
   }
   try {
-    await writeFile5(outputPath, finalContent, "utf-8");
-    console.log(chalk16.green(`  \u2713 Merged to ${outputFilename}`));
+    await writeFile6(outputPath, finalContent, "utf-8");
+    console.log(chalk17.green(`  \u2713 Merged to ${outputFilename}`));
     console.log();
-    console.log(chalk16.gray(`  Sources: ${files.length} files`));
-    console.log(chalk16.gray(`  Lines: ${finalContent.split("\n").length}`));
-    console.log(chalk16.gray(`  Size: ${finalContent.length} bytes`));
+    console.log(chalk17.gray(`  Sources: ${files.length} files`));
+    console.log(chalk17.gray(`  Lines: ${finalContent.split("\n").length}`));
+    console.log(chalk17.gray(`  Size: ${finalContent.length} bytes`));
     console.log();
   } catch (error) {
-    console.log(chalk16.red(`  \u2717 Could not write output: ${error instanceof Error ? error.message : "unknown error"}`));
+    console.log(chalk17.red(`  \u2717 Could not write output: ${error instanceof Error ? error.message : "unknown error"}`));
     process.exit(1);
   }
 }
 
 // src/commands/import.ts
-import chalk17 from "chalk";
+import chalk18 from "chalk";
 import prompts6 from "prompts";
 import ora14 from "ora";
-import { readFile as readFile10, access as access7, readdir as readdir3 } from "fs/promises";
-import { join as join9, relative as relative3, dirname as dirname5, basename as basename4, resolve as resolve4 } from "path";
+import { readFile as readFile11, access as access8, readdir as readdir3 } from "fs/promises";
+import { join as join10, relative as relative3, dirname as dirname6, basename as basename4, resolve as resolve4 } from "path";
 var CONFIG_FILE_PATTERNS = [
   "AGENTS.md",
   "CLAUDE.md",
@@ -11801,7 +12250,7 @@ async function scanDirectory(rootPath, options = {}) {
     try {
       const entries = await readdir3(dir, { withFileTypes: true });
       for (const entry of entries) {
-        const fullPath = join9(dir, entry.name);
+        const fullPath = join10(dir, entry.name);
         if (entry.isDirectory()) {
           const skipDirs = [
             "node_modules",
@@ -11827,13 +12276,13 @@ async function scanDirectory(rootPath, options = {}) {
         } else if (entry.isFile()) {
           if (patterns.includes(entry.name)) {
             try {
-              const content = await readFile10(fullPath, "utf-8");
+              const content = await readFile11(fullPath, "utf-8");
               const relativePath = relative3(rootPath, fullPath);
               files.push({
                 path: fullPath,
                 relativePath,
                 depth,
-                name: extractProjectName(content, dirname5(fullPath)),
+                name: extractProjectName(content, dirname6(fullPath)),
                 content,
                 sections: parseMarkdownSections2(content)
               });
@@ -11900,13 +12349,13 @@ function buildHierarchy(files, _rootPath) {
   const potentialRoots = sorted.filter((f) => f.depth <= 1);
   if (potentialRoots.length === 0 && files.length > 0) {
     return files.map((f) => ({
-      rootPath: dirname5(f.path),
+      rootPath: dirname6(f.path),
       root: f,
       children: []
     }));
   }
   for (const root of potentialRoots) {
-    const rootDir = dirname5(root.path);
+    const rootDir = dirname6(root.path);
     const children = files.filter((f) => {
       if (f === root) return false;
       return f.path.startsWith(rootDir + "/") && f.depth > root.depth;
@@ -11924,7 +12373,7 @@ function buildHierarchy(files, _rootPath) {
   const orphans = files.filter((f) => !assignedPaths.has(f.path));
   for (const orphan of orphans) {
     hierarchies.push({
-      rootPath: dirname5(orphan.path),
+      rootPath: dirname6(orphan.path),
       root: orphan,
       children: []
     });
@@ -11937,33 +12386,33 @@ function displayResults(result, options) {
     return;
   }
   console.log();
-  console.log(chalk17.cyan.bold("  \u{1F4E5} Import Results"));
+  console.log(chalk18.cyan.bold("  \u{1F4E5} Import Results"));
   console.log();
   if (result.totalFound === 0) {
-    console.log(chalk17.yellow("  No AGENTS.md or compatible files found."));
-    console.log(chalk17.gray("  Try running from your project root, or use --pattern to specify custom filenames."));
+    console.log(chalk18.yellow("  No AGENTS.md or compatible files found."));
+    console.log(chalk18.gray("  Try running from your project root, or use --pattern to specify custom filenames."));
     return;
   }
-  console.log(chalk17.green(`  Found ${result.totalFound} configuration file(s)`));
+  console.log(chalk18.green(`  Found ${result.totalFound} configuration file(s)`));
   console.log();
   for (const hierarchy of result.hierarchy) {
     const isMonorepo = hierarchy.children.length > 0;
     if (hierarchy.root) {
       const icon = isMonorepo ? "\u{1F3E2}" : "\u{1F4C4}";
-      const typeLabel = isMonorepo ? chalk17.magenta("[Monorepo Root]") : chalk17.blue("[Standalone]");
-      console.log(`  ${icon} ${chalk17.white.bold(hierarchy.root.name)} ${typeLabel}`);
-      console.log(chalk17.gray(`     ${hierarchy.root.relativePath}`));
+      const typeLabel = isMonorepo ? chalk18.magenta("[Monorepo Root]") : chalk18.blue("[Standalone]");
+      console.log(`  ${icon} ${chalk18.white.bold(hierarchy.root.name)} ${typeLabel}`);
+      console.log(chalk18.gray(`     ${hierarchy.root.relativePath}`));
       if (options.verbose && hierarchy.root.sections.length > 0) {
         const sectionNames = hierarchy.root.sections.slice(0, 5).map((s) => s.title);
-        console.log(chalk17.gray(`     Sections: ${sectionNames.join(", ")}${hierarchy.root.sections.length > 5 ? "..." : ""}`));
+        console.log(chalk18.gray(`     Sections: ${sectionNames.join(", ")}${hierarchy.root.sections.length > 5 ? "..." : ""}`));
       }
     }
     for (const child of hierarchy.children) {
-      console.log(`     \u2514\u2500 \u{1F4C4} ${chalk17.white(child.name)}`);
-      console.log(chalk17.gray(`        ${child.relativePath}`));
+      console.log(`     \u2514\u2500 \u{1F4C4} ${chalk18.white(child.name)}`);
+      console.log(chalk18.gray(`        ${child.relativePath}`));
       if (options.verbose && child.sections.length > 0) {
         const sectionNames = child.sections.slice(0, 3).map((s) => s.title);
-        console.log(chalk17.gray(`        Sections: ${sectionNames.join(", ")}${child.sections.length > 3 ? "..." : ""}`));
+        console.log(chalk18.gray(`        Sections: ${sectionNames.join(", ")}${child.sections.length > 3 ? "..." : ""}`));
       }
     }
     console.log();
@@ -11971,16 +12420,16 @@ function displayResults(result, options) {
   const monorepoCount = result.hierarchy.filter((h) => h.children.length > 0).length;
   const standaloneCount = result.hierarchy.filter((h) => h.children.length === 0).length;
   if (monorepoCount > 0) {
-    console.log(chalk17.cyan(`  \u{1F4CA} ${monorepoCount} monorepo(s) detected with hierarchical configs`));
+    console.log(chalk18.cyan(`  \u{1F4CA} ${monorepoCount} monorepo(s) detected with hierarchical configs`));
   }
   if (standaloneCount > 0) {
-    console.log(chalk17.cyan(`  \u{1F4CA} ${standaloneCount} standalone config(s)`));
+    console.log(chalk18.cyan(`  \u{1F4CA} ${standaloneCount} standalone config(s)`));
   }
   if (result.errors.length > 0) {
     console.log();
-    console.log(chalk17.yellow("  \u26A0\uFE0F Warnings:"));
+    console.log(chalk18.yellow("  \u26A0\uFE0F Warnings:"));
     for (const error of result.errors) {
-      console.log(chalk17.gray(`     ${error}`));
+      console.log(chalk18.gray(`     ${error}`));
     }
   }
 }
@@ -11988,15 +12437,15 @@ async function importCommand(path3 = ".", options) {
   const json = Boolean(options.json);
   if (!json) {
     console.log();
-    console.log(chalk17.cyan.bold("  \u{1F4E5} LynxPrompt Import"));
-    console.log(chalk17.gray("     Scan and import AGENTS.md files and AI commands from your repository"));
+    console.log(chalk18.cyan.bold("  \u{1F4E5} LynxPrompt Import"));
+    console.log(chalk18.gray("     Scan and import AGENTS.md files and AI commands from your repository"));
     console.log();
   }
   const rootPath = resolve4(process.cwd(), path3);
   try {
-    await access7(rootPath);
+    await access8(rootPath);
   } catch {
-    console.error(chalk17.red(`  \u2717 Path not found: ${rootPath}`));
+    console.error(chalk18.red(`  \u2717 Path not found: ${rootPath}`));
     process.exit(1);
   }
   const spinner = ora14({ text: "Scanning for configuration files and commands...", isSilent: json }).start();
@@ -12011,10 +12460,10 @@ async function importCommand(path3 = ".", options) {
       }
       spinner.warn("No configuration files or commands found");
       console.log();
-      console.log(chalk17.gray("  Looking for:"));
-      console.log(chalk17.gray("    \u2022 Rules: AGENTS.md, CLAUDE.md, .cursorrules, .windsurfrules"));
-      console.log(chalk17.gray("    \u2022 Commands: .cursor/commands/*.md, .claude/commands/*.md"));
-      console.log(chalk17.gray("  Try specifying a different path or use --pattern for custom filenames"));
+      console.log(chalk18.gray("  Looking for:"));
+      console.log(chalk18.gray("    \u2022 Rules: AGENTS.md, CLAUDE.md, .cursorrules, .windsurfrules"));
+      console.log(chalk18.gray("    \u2022 Commands: .cursor/commands/*.md, .claude/commands/*.md"));
+      console.log(chalk18.gray("  Try specifying a different path or use --pattern for custom filenames"));
       return;
     }
     if (json) spinner.stop();
@@ -12031,31 +12480,31 @@ async function importCommand(path3 = ".", options) {
     if (json) return;
     if (commands.length > 0) {
       console.log();
-      console.log(chalk17.cyan.bold("  \u26A1 AI Agent Commands"));
+      console.log(chalk18.cyan.bold("  \u26A1 AI Agent Commands"));
       console.log();
       const cursorCommands = commands.filter((c) => c.type === "cursor-command");
       const claudeCommands = commands.filter((c) => c.type === "claude-command");
       if (cursorCommands.length > 0) {
-        console.log(chalk17.blue(`  Cursor Commands (${cursorCommands.length}):`));
+        console.log(chalk18.blue(`  Cursor Commands (${cursorCommands.length}):`));
         for (const cmd of cursorCommands) {
-          console.log(chalk17.gray(`    \u26A1 ${cmd.name}`));
-          console.log(chalk17.gray(`       ${relative3(rootPath, cmd.path)}`));
+          console.log(chalk18.gray(`    \u26A1 ${cmd.name}`));
+          console.log(chalk18.gray(`       ${relative3(rootPath, cmd.path)}`));
         }
         console.log();
       }
       if (claudeCommands.length > 0) {
-        console.log(chalk17.yellow(`  Claude Commands (${claudeCommands.length}):`));
+        console.log(chalk18.yellow(`  Claude Commands (${claudeCommands.length}):`));
         for (const cmd of claudeCommands) {
-          console.log(chalk17.gray(`    \u{1F9E0} ${cmd.name}`));
-          console.log(chalk17.gray(`       ${relative3(rootPath, cmd.path)}`));
+          console.log(chalk18.gray(`    \u{1F9E0} ${cmd.name}`));
+          console.log(chalk18.gray(`       ${relative3(rootPath, cmd.path)}`));
         }
         console.log();
       }
-      console.log(chalk17.cyan("  \u{1F4A1} Push commands with: lynxp push .cursor/commands/my-command.md"));
+      console.log(chalk18.cyan("  \u{1F4A1} Push commands with: lynxp push .cursor/commands/my-command.md"));
     }
     if (options.dryRun) {
-      console.log(chalk17.yellow("  \u{1F4CB} Dry run complete - no changes made"));
-      console.log(chalk17.gray("     Remove --dry-run to proceed with import"));
+      console.log(chalk18.yellow("  \u{1F4CB} Dry run complete - no changes made"));
+      console.log(chalk18.gray("     Remove --dry-run to proceed with import"));
       return;
     }
     if (!options.json) {
@@ -12074,15 +12523,15 @@ async function importCommand(path3 = ".", options) {
       });
       switch (action) {
         case "convert":
-          console.log(chalk17.cyan("\n  \u{1F4A1} Use 'lynxp convert <file> agents' to convert individual files"));
-          console.log(chalk17.cyan("     or 'lynxp merge <files...>' to combine multiple configs\n"));
+          console.log(chalk18.cyan("\n  \u{1F4A1} Use 'lynxp convert <file> agents' to convert individual files"));
+          console.log(chalk18.cyan("     or 'lynxp merge <files...>' to combine multiple configs\n"));
           break;
         case "save":
           await saveHierarchyInfo(rootPath, result);
           break;
         case "push":
-          console.log(chalk17.cyan("\n  \u{1F4A1} Use 'lynxp push <file>' to push files individually"));
-          console.log(chalk17.cyan("     Requires login: 'lynxp login'\n"));
+          console.log(chalk18.cyan("\n  \u{1F4A1} Use 'lynxp push <file>' to push files individually"));
+          console.log(chalk18.cyan("     Requires login: 'lynxp login'\n"));
           break;
         default:
           break;
@@ -12090,15 +12539,15 @@ async function importCommand(path3 = ".", options) {
     }
   } catch (error) {
     spinner.fail("Import failed");
-    console.error(chalk17.red(`  Error: ${error instanceof Error ? error.message : "Unknown error"}`));
+    console.error(chalk18.red(`  Error: ${error instanceof Error ? error.message : "Unknown error"}`));
     process.exit(1);
   }
 }
 async function saveHierarchyInfo(rootPath, result) {
-  const { writeFile: writeFile6, mkdir: mkdir4 } = await import("fs/promises");
-  const configDir = join9(rootPath, ".lynxprompt");
+  const { writeFile: writeFile7, mkdir: mkdir5 } = await import("fs/promises");
+  const configDir = join10(rootPath, ".lynxprompt");
   try {
-    await mkdir4(configDir, { recursive: true });
+    await mkdir5(configDir, { recursive: true });
     const hierarchyInfo = {
       scannedAt: (/* @__PURE__ */ new Date()).toISOString(),
       rootPath,
@@ -12114,25 +12563,25 @@ async function saveHierarchyInfo(rootPath, result) {
         }))
       }))
     };
-    await writeFile6(
-      join9(configDir, "hierarchy.json"),
+    await writeFile7(
+      join10(configDir, "hierarchy.json"),
       JSON.stringify(hierarchyInfo, null, 2),
       "utf-8"
     );
-    console.log(chalk17.green("\n  \u2713 Hierarchy saved to .lynxprompt/hierarchy.json"));
-    console.log(chalk17.gray("    The wizard will use this to understand your monorepo structure"));
+    console.log(chalk18.green("\n  \u2713 Hierarchy saved to .lynxprompt/hierarchy.json"));
+    console.log(chalk18.gray("    The wizard will use this to understand your monorepo structure"));
   } catch (error) {
-    console.error(chalk17.red(`  \u2717 Failed to save hierarchy: ${error instanceof Error ? error.message : "Unknown"}`));
+    console.error(chalk18.red(`  \u2717 Failed to save hierarchy: ${error instanceof Error ? error.message : "Unknown"}`));
   }
 }
 
 // src/commands/hierarchies.ts
-import chalk18 from "chalk";
+import chalk19 from "chalk";
 import ora15 from "ora";
 async function hierarchiesCommand(options) {
   if (!isAuthenticated()) {
-    console.log(chalk18.yellow("You need to be logged in to view hierarchies."));
-    console.log(chalk18.gray("Run 'lynxp login' to authenticate."));
+    console.log(chalk19.yellow("You need to be logged in to view hierarchies."));
+    console.log(chalk19.gray("Run 'lynxp login' to authenticate."));
     process.exit(1);
   }
   const spinner = ora15("Fetching hierarchies...").start();
@@ -12148,32 +12597,32 @@ async function hierarchiesCommand(options) {
     const { hierarchies, total } = response;
     if (hierarchies.length === 0) {
       console.log();
-      console.log(chalk18.yellow("No hierarchies found."));
+      console.log(chalk19.yellow("No hierarchies found."));
       console.log();
-      console.log(chalk18.gray("Hierarchies are created automatically when you push AGENTS.md files from a repository."));
-      console.log(chalk18.gray("Run 'lynxp push AGENTS.md' in a git repository to create a hierarchy."));
+      console.log(chalk19.gray("Hierarchies are created automatically when you push AGENTS.md files from a repository."));
+      console.log(chalk19.gray("Run 'lynxp push AGENTS.md' in a git repository to create a hierarchy."));
       console.log();
       return;
     }
     console.log();
-    console.log(chalk18.cyan(`\u{1F4C1} Your Hierarchies (${total} total)`));
+    console.log(chalk19.cyan(`\u{1F4C1} Your Hierarchies (${total} total)`));
     console.log();
     for (const hierarchy of hierarchies) {
-      console.log(chalk18.bold(`  ${hierarchy.name}`));
-      console.log(chalk18.gray(`    ID: ${hierarchy.id}`));
+      console.log(chalk19.bold(`  ${hierarchy.name}`));
+      console.log(chalk19.gray(`    ID: ${hierarchy.id}`));
       if (hierarchy.description) {
-        console.log(chalk18.gray(`    ${hierarchy.description}`));
+        console.log(chalk19.gray(`    ${hierarchy.description}`));
       }
-      console.log(chalk18.gray(`    Blueprints: ${hierarchy.blueprint_count || 0}`));
-      console.log(chalk18.gray(`    Repository: ${hierarchy.repository_root.slice(0, 16)}...`));
+      console.log(chalk19.gray(`    Blueprints: ${hierarchy.blueprint_count || 0}`));
+      console.log(chalk19.gray(`    Repository: ${hierarchy.repository_root.slice(0, 16)}...`));
       console.log();
     }
-    console.log(chalk18.gray("\u2500".repeat(50)));
+    console.log(chalk19.gray("\u2500".repeat(50)));
     console.log();
-    console.log(chalk18.gray("Tips:"));
-    console.log(chalk18.gray(`  \u2022 Pull entire hierarchy: lynxp pull <hierarchy_id>`));
-    console.log(chalk18.gray(`  \u2022 Preview a hierarchy: lynxp pull <hierarchy_id> --preview`));
-    console.log(chalk18.gray(`  \u2022 Push local changes: lynxp push --all`));
+    console.log(chalk19.gray("Tips:"));
+    console.log(chalk19.gray(`  \u2022 Pull entire hierarchy: lynxp pull <hierarchy_id>`));
+    console.log(chalk19.gray(`  \u2022 Preview a hierarchy: lynxp pull <hierarchy_id> --preview`));
+    console.log(chalk19.gray(`  \u2022 Push local changes: lynxp push --all`));
     console.log();
   } catch (error) {
     spinner.fail("Failed to fetch hierarchies");
@@ -12182,46 +12631,46 @@ async function hierarchiesCommand(options) {
 }
 function handleError2(error) {
   if (error instanceof ApiRequestError) {
-    console.error(chalk18.red(`Error: ${error.message}`));
+    console.error(chalk19.red(`Error: ${error.message}`));
     if (error.statusCode === 401) {
-      console.error(chalk18.gray("Your session may have expired. Run 'lynxp login' to re-authenticate."));
+      console.error(chalk19.gray("Your session may have expired. Run 'lynxp login' to re-authenticate."));
     } else if (error.statusCode === 403) {
-      console.error(chalk18.gray("You don't have permission to access hierarchies."));
+      console.error(chalk19.gray("You don't have permission to access hierarchies."));
     }
   } else {
-    console.error(chalk18.red("An unexpected error occurred."));
+    console.error(chalk19.red("An unexpected error occurred."));
   }
   process.exit(1);
 }
 
 // src/commands/config.ts
-import chalk19 from "chalk";
+import chalk20 from "chalk";
 function printLoginState() {
   if (isAuthenticated()) {
     const email = getUser()?.email;
-    console.log(chalk19.gray(`  Logged in${email ? ` as ${email}` : ""} on this instance.`));
+    console.log(chalk20.gray(`  Logged in${email ? ` as ${email}` : ""} on this instance.`));
   } else {
-    console.log(chalk19.gray("  Run 'lynxp login' to authenticate with this instance."));
+    console.log(chalk20.gray("  Run 'lynxp login' to authenticate with this instance."));
   }
 }
 async function configCommand(action, valueArg) {
   if (!action || action === "show") {
     console.log();
-    console.log(chalk19.cyan("\u2699\uFE0F  LynxPrompt CLI Configuration"));
+    console.log(chalk20.cyan("\u2699\uFE0F  LynxPrompt CLI Configuration"));
     console.log();
     console.log(
-      chalk19.white("  API URL: ") + chalk19.green(getApiUrl())
+      chalk20.white("  API URL: ") + chalk20.green(getApiUrl())
     );
     const loggedIn = isAuthenticated();
     console.log(
-      chalk19.white("  Login:   ") + (loggedIn ? chalk19.green(getUser()?.email ?? "token set") : chalk19.gray("not logged in"))
+      chalk20.white("  Login:   ") + (loggedIn ? chalk20.green(getUser()?.email ?? "token set") : chalk20.gray("not logged in"))
     );
     console.log(
-      chalk19.white("  Config:  ") + chalk19.gray(getConfigPath())
+      chalk20.white("  Config:  ") + chalk20.gray(getConfigPath())
     );
     if (process.env.LYNXPROMPT_API_URL) {
       console.log(
-        chalk19.gray(
+        chalk20.gray(
           "  (API URL overridden by LYNXPROMPT_API_URL env var)"
         )
       );
@@ -12232,20 +12681,20 @@ async function configCommand(action, valueArg) {
   if (action === "set-url") {
     if (!valueArg) {
       console.error(
-        chalk19.red("Usage: lynxp config set-url <url>")
+        chalk20.red("Usage: lynxp config set-url <url>")
       );
       process.exit(1);
     }
     try {
       new URL(valueArg);
     } catch {
-      console.error(chalk19.red(`Invalid URL: ${valueArg}`));
+      console.error(chalk20.red(`Invalid URL: ${valueArg}`));
       process.exit(1);
     }
     const clean = valueArg.replace(/\/+$/, "");
     setApiUrl(clean);
     console.log(
-      chalk19.green("\u2713") + ` API URL set to ${chalk19.cyan(clean)}`
+      chalk20.green("\u2713") + ` API URL set to ${chalk20.cyan(clean)}`
     );
     printLoginState();
     return;
@@ -12253,7 +12702,7 @@ async function configCommand(action, valueArg) {
   if (action === "reset-url") {
     const url = resetApiUrl();
     console.log(
-      chalk19.green("\u2713") + " API URL reset to " + chalk19.cyan(url)
+      chalk20.green("\u2713") + " API URL reset to " + chalk20.cyan(url)
     );
     printLoginState();
     return;
@@ -12262,82 +12711,87 @@ async function configCommand(action, valueArg) {
     console.log(getConfigPath());
     return;
   }
-  console.error(chalk19.red(`Unknown config action: ${action}`));
-  console.error(chalk19.gray("Available: show, set-url <url>, reset-url, path"));
+  console.error(chalk20.red(`Unknown config action: ${action}`));
+  console.error(chalk20.gray("Available: show, set-url <url>, reset-url, path"));
   process.exit(1);
 }
 
 // src/index.ts
-var CLI_VERSION2 = "2.1.39";
+var CLI_VERSION2 = "2.1.41";
 var program = new Command();
 program.name("lynxprompt").description("CLI for LynxPrompt - Generate AI IDE configuration files").version(CLI_VERSION2);
-program.command("wizard").description("Generate AI IDE configuration (recommended for most users)").option("-n, --name <name>", "Project name").option("-d, --description <description>", "Project description").option("-s, --stack <stack>", "Tech stack (comma-separated)").option("-f, --format <format>", "Output format: agents, cursor, or comma-separated for multiple").option("-p, --platforms <platforms>", "Alias for --format (deprecated)").option("--persona <persona>", "AI persona (fullstack, backend, frontend, devops, data, security)").option("--boundaries <level>", "Boundary preset (conservative, standard, permissive)").option("-y, --yes", "Skip prompts, use defaults (generates AGENTS.md)").option("-o, --output <dir>", "Output directory (default: current directory)").option("--repo-url <url>", "Analyze remote repository URL (GitHub/GitLab supported)").option("--blueprint", "Generate with [[VARIABLE|default]] placeholders for templates").option("--license <type>", "License type (mit, apache-2.0, gpl-3.0, etc.)").option("--ci-cd <platform>", "CI/CD platform (github_actions, gitlab_ci, jenkins, etc.)").option("--project-type <type>", "Project type (work, leisure, opensource, learning)").option("--detect-only", "Only detect project info, don't generate files").option("--load-draft <name>", "Load a saved wizard draft").option("--save-draft <name>", "Save wizard state as a draft (auto-saves at end)").option("--vars <values>", "Fill variables: VAR1=value1,VAR2=value2").action(wizardCommand);
-program.command("check").description("Validate AI configuration files (for CI/CD)").option("--ci", "CI mode - exit codes only (0=pass, 1=fail)").action(checkCommand);
+program.command("wizard").description("Generate AI IDE configuration (recommended for most users)").option("-n, --name <name>", "Project name").option("-d, --description <description>", "Project description").option("-s, --stack <stack>", "Tech stack (comma-separated)").option("-f, --format <format>", "Output format: agents, cursor, or comma-separated for multiple").option("-p, --platforms <platforms>", "Alias for --format (deprecated)").option("--persona <persona>", "AI persona (fullstack, backend, frontend, devops, data, security)").option("--boundaries <level>", "Boundary preset (conservative, standard, permissive)").option("-y, --yes", "Skip prompts, use defaults (generates AGENTS.md)").option("-o, --output <dir>", "Output directory (default: current directory)").option("--repo-url <url>", "Analyze remote repository URL (GitHub/GitLab supported)").option("--blueprint", "Generate with [[VARIABLE|default]] placeholders for templates").option("--license <type>", "License type (mit, apache-2.0, gpl-3.0, etc.)").option("--ci-cd <platform>", "CI/CD platform (github_actions, gitlab_ci, jenkins, etc.)").option("--project-type <type>", "Project type (work, leisure, opensource, learning)").option("--detect-only", "Only detect project info, don't generate files").option("--load-draft <name>", "Load a saved wizard draft").option("--save-draft <name>", "Save wizard state as a draft (auto-saves at end)").option("--vars <values>", "Fill variables: VAR1=value1,VAR2=value2").option("--no-pointers", "Write CLAUDE.md/GEMINI.md as full copies instead of importing AGENTS.md").action(wizardCommand);
+program.command("check").description("Validate AI configuration files (for CI/CD)").option("--ci", "CI mode - exit codes only (0=pass, 1=fail)").option("-j, --json", "Output as JSON (for scripting)").action(checkCommand);
 program.command("analyze").description("Analyze project configuration without generating files").option("-r, --remote <url>", "Analyze a remote repository (GitHub/GitLab)").option("-j, --json", "Output as JSON (for scripting)").action(analyzeCommand);
 program.command("convert <source> [target]").description("Convert AI config between formats (e.g., AGENTS.md \u2192 cursor); with one argument it is the target").option("-o, --output <file>", "Output filename").option("-f, --force", "Overwrite existing output file").action(convertCommand);
 program.command("merge <files...>").description("Merge multiple AI configuration files into one").option("-o, --output <file>", "Output filename (default: merged.md)").option("-s, --strategy <type>", "Merge strategy: concat, sections, smart (default: smart)").option("-f, --force", "Overwrite existing output file").option("-i, --interactive", "Review and select sections to include").action(mergeCommand);
 program.command("import [path]").description("Scan and import AGENTS.md files from a repository").option("--dry-run", "Preview what would be imported without changes").option("--no-recursive", "Don't scan subdirectories").option("--depth <n>", "Max directory depth to scan", "10").option("--pattern <file>", "Custom config filename to look for").option("-v, --verbose", "Show detailed section information").option("-j, --json", "Output as JSON").action(importCommand);
 program.command("status").description("Show current AI configuration and tracked blueprints").action(statusCommand);
-program.command("pull <id>").description("Download a blueprint (bp_xxx) or entire hierarchy (ha_xxx)").option("-o, --output <path>", "Output directory", ".").option("-y, --yes", "Overwrite existing files without prompting").option("--preview", "Preview content without downloading").option("--no-track", "Don't track the blueprint for future syncs").action(pullCommand);
-program.command("search <query>").description("Search public blueprints in the marketplace").option("-l, --limit <number>", "Number of results", "20").action(searchCommand);
-program.command("list").description("List your blueprints").option("-l, --limit <number>", "Number of results", "20").option("-v, --visibility <visibility>", "Filter: PRIVATE, TEAM, PUBLIC, or all").action(listCommand);
-program.command("push [file]").description("Push local file to LynxPrompt cloud as a blueprint").option("-a, --all", "Scan recursively and push ALL AI config files (40+ types)").option("-n, --name <name>", "Blueprint name").option("-d, --description <desc>", "Blueprint description").option("-v, --visibility <vis>", "Visibility: PRIVATE, TEAM, or PUBLIC (default: PRIVATE)").option("-t, --tags <tags>", "Tags (comma-separated)").option("-y, --yes", "Skip prompts").option("-f, --force", "Force push (overwrite remote changes)").option("--allow-sensitive", "Publish public content even if it looks like it holds secrets").action(pushCommand);
+program.command("pull <ids...>").description("Download blueprints (bp_xxx) or entire hierarchies (ha_xxx), one or several").option("-o, --output <path>", "Output directory", ".").option("-y, --yes", "Overwrite existing files without prompting").option("--preview", "Preview content without downloading").option("--no-track", "Don't track the blueprint for future syncs").option("--vars <values>", "Fill [[VARIABLES]]: VAR1=value1,VAR2=value2 (others get their defaults)").action(pullCommand);
+program.command("search <query>").description("Search public blueprints in the marketplace").option("-l, --limit <number>", "Number of results", "20").option("-j, --json", "Output as JSON (for scripting)").action(searchCommand);
+program.command("list").description("List your blueprints").option("-l, --limit <number>", "Number of results", "20").option("-v, --visibility <visibility>", "Filter: PRIVATE, TEAM, PUBLIC, or all").option("-j, --json", "Output as JSON (for scripting)").action(listCommand);
+program.command("push [file]").description("Push local file to LynxPrompt cloud as a blueprint").option("-a, --all", "Scan recursively and push ALL AI config files (40+ types)").option("-n, --name <name>", "Blueprint name").option("-d, --description <desc>", "Blueprint description").option("-v, --visibility <vis>", "Visibility: PRIVATE, TEAM, or PUBLIC (default: PRIVATE)").option("-t, --tags <tags>", "Tags (comma-separated)").option("-y, --yes", "Skip prompts").option("-f, --force", "Force push (overwrite remote changes)").option("--allow-sensitive", "Push public content or MCP configs even if they look like they hold secrets").action(pushCommand);
 program.command("hierarchies").description("List your blueprint hierarchies (monorepo groupings)").option("-l, --limit <number>", "Number of results", "50").option("-j, --json", "Output as JSON").action(hierarchiesCommand);
 program.command("link [file] [blueprint-id]").description("Link a local file to a cloud blueprint for tracking").option("--list", "List all tracked blueprints").action(linkCommand);
 program.command("unlink [file]").description("Disconnect a local file from its cloud blueprint").action(unlinkCommand);
 program.command("diff [file-or-id]").description("Compare tracked files with their cloud blueprints").option("--local", "Compare .lynxprompt/rules/ with exported files").action(diffCommand);
+program.command("sync [file]").description("Pull cloud changes and push local ones for tracked files; conflicts go to <file>.remote").option("--dry-run", "Show what would change without writing or pushing").action(syncCommand);
 program.command("login").description("Authenticate with LynxPrompt (opens browser)").action(loginCommand);
 program.command("logout").description("Log out and remove stored credentials").action(logoutCommand);
-program.command("whoami").description("Show current authenticated user").action(whoamiCommand);
+program.command("whoami").description("Show current authenticated user").option("-j, --json", "Output as JSON (for scripting)").action(whoamiCommand);
 program.command("config [action] [value]").description("View or change CLI settings (set-url, reset-url, path)").action(configCommand);
 program.addHelpText(
   "beforeAll",
   `
-${chalk20.cyan("\u{1F431} LynxPrompt CLI")} ${chalk20.gray("(also available as: lynxp)")}
-${chalk20.gray("Generate AI IDE configuration files from your terminal")}
+${chalk21.cyan("\u{1F431} LynxPrompt CLI")} ${chalk21.gray("(also available as: lynxp)")}
+${chalk21.gray("Generate AI IDE configuration files from your terminal")}
 `
 );
 program.addHelpText(
   "after",
   `
-${chalk20.cyan("Quick Start:")}
-  ${chalk20.white("$ lynxp wizard")}                ${chalk20.gray("Generate config interactively")}
-  ${chalk20.white("$ lynxp wizard -y")}             ${chalk20.gray("Generate AGENTS.md with defaults")}
-  ${chalk20.white("$ lynxp wizard -f cursor")}      ${chalk20.gray("Generate .cursor/rules/")}
-  ${chalk20.white("$ lynxp wizard --blueprint")}    ${chalk20.gray("Generate with [[VAR|default]] placeholders")}
-
-${chalk20.cyan("Analysis & Tools:")}
-  ${chalk20.white("$ lynxp analyze")}               ${chalk20.gray("Analyze project tech stack")}
-  ${chalk20.white("$ lynxp analyze -r <url>")}      ${chalk20.gray("Analyze remote repository")}
-  ${chalk20.white("$ lynxp import")}                ${chalk20.gray("Scan repo for AGENTS.md files")}
-  ${chalk20.white("$ lynxp import --dry-run")}      ${chalk20.gray("Preview monorepo hierarchy")}
-  ${chalk20.white("$ lynxp convert AGENTS.md cursor")} ${chalk20.gray("Convert to Cursor format")}
-  ${chalk20.white("$ lynxp merge a.md b.md -o out.md")} ${chalk20.gray("Merge multiple configs")}
-
-${chalk20.cyan("Marketplace:")}
-  ${chalk20.white("$ lynxp search nextjs")}         ${chalk20.gray("Search blueprints")}
-  ${chalk20.white("$ lynxp pull bp_abc123")}        ${chalk20.gray("Download and track a blueprint")}
-  ${chalk20.white("$ lynxp pull ha_xyz789")}        ${chalk20.gray("Download entire hierarchy")}
-  ${chalk20.white("$ lynxp push")}                  ${chalk20.gray("Push local file to cloud")}
-  ${chalk20.white("$ lynxp push --all")}             ${chalk20.gray("Push ALL config files recursively")}
-  ${chalk20.white("$ lynxp hierarchies")}           ${chalk20.gray("List your hierarchies")}
-  ${chalk20.white("$ lynxp link --list")}           ${chalk20.gray("Show tracked blueprints")}
-
-${chalk20.cyan("Blueprint Tracking:")}
-  ${chalk20.white("$ lynxp link AGENTS.md bp_xyz")} ${chalk20.gray("Link existing file to blueprint")}
-  ${chalk20.white("$ lynxp unlink AGENTS.md")}      ${chalk20.gray("Disconnect from cloud")}
-  ${chalk20.white("$ lynxp diff bp_abc123")}        ${chalk20.gray("Show changes vs cloud version")}
-
-${chalk20.cyan("CI/CD:")}
-  ${chalk20.white("$ lynxp check --ci")}            ${chalk20.gray("Validate config (exit code)")}
-
-${chalk20.cyan("Configuration:")}
-  ${chalk20.white("$ lynxp config")}                 ${chalk20.gray("Show current settings")}
-  ${chalk20.white("$ lynxp config set-url <url>")}   ${chalk20.gray("Point CLI to a self-hosted instance")}
-  ${chalk20.white("$ lynxp config reset-url")}       ${chalk20.gray("Reset to https://lynxprompt.com")}
-  ${chalk20.white("$ lynxp config path")}            ${chalk20.gray("Show config file location")}
-
-${chalk20.gray("Docs: https://lynxprompt.com/docs/cli")}
+${chalk21.cyan("Quick Start:")}
+  ${chalk21.white("$ lynxp wizard")}                ${chalk21.gray("Generate config interactively")}
+  ${chalk21.white("$ lynxp wizard -y")}             ${chalk21.gray("Generate AGENTS.md with defaults")}
+  ${chalk21.white("$ lynxp wizard -f cursor")}      ${chalk21.gray("Generate .cursor/rules/")}
+  ${chalk21.white("$ lynxp wizard --blueprint")}    ${chalk21.gray("Generate with [[VAR|default]] placeholders")}
+
+${chalk21.cyan("Analysis & Tools:")}
+  ${chalk21.white("$ lynxp analyze")}               ${chalk21.gray("Analyze project tech stack")}
+  ${chalk21.white("$ lynxp analyze -r <url>")}      ${chalk21.gray("Analyze remote repository")}
+  ${chalk21.white("$ lynxp import")}                ${chalk21.gray("Scan repo for AGENTS.md files")}
+  ${chalk21.white("$ lynxp import --dry-run")}      ${chalk21.gray("Preview monorepo hierarchy")}
+  ${chalk21.white("$ lynxp convert AGENTS.md cursor")} ${chalk21.gray("Convert to Cursor format")}
+  ${chalk21.white("$ lynxp merge a.md b.md -o out.md")} ${chalk21.gray("Merge multiple configs")}
+
+${chalk21.cyan("Marketplace:")}
+  ${chalk21.white("$ lynxp search nextjs")}         ${chalk21.gray("Search blueprints")}
+  ${chalk21.white("$ lynxp pull bp_abc123")}        ${chalk21.gray("Download and track a blueprint")}
+  ${chalk21.white("$ lynxp pull ha_xyz789")}        ${chalk21.gray("Download entire hierarchy")}
+  ${chalk21.white("$ lynxp pull bp_a bp_b")}        ${chalk21.gray("Download several at once")}
+  ${chalk21.white("$ lynxp push")}                  ${chalk21.gray("Push local file to cloud")}
+  ${chalk21.white("$ lynxp push --all")}             ${chalk21.gray("Push ALL config files recursively")}
+  ${chalk21.white("$ lynxp hierarchies")}           ${chalk21.gray("List your hierarchies")}
+  ${chalk21.white("$ lynxp link --list")}           ${chalk21.gray("Show tracked blueprints")}
+
+${chalk21.cyan("Blueprint Tracking:")}
+  ${chalk21.white("$ lynxp link AGENTS.md bp_xyz")} ${chalk21.gray("Link existing file to blueprint")}
+  ${chalk21.white("$ lynxp unlink AGENTS.md")}      ${chalk21.gray("Disconnect from cloud")}
+  ${chalk21.white("$ lynxp diff bp_abc123")}        ${chalk21.gray("Show changes vs cloud version")}
+  ${chalk21.white("$ lynxp sync")}                  ${chalk21.gray("Pull cloud changes, push local ones")}
+  ${chalk21.white("$ lynxp pull bp_x --vars A=1")}  ${chalk21.gray("Download with [[A]] filled in")}
+
+${chalk21.cyan("CI/CD:")}
+  ${chalk21.white("$ lynxp check --ci")}            ${chalk21.gray("Validate config (exit code)")}
+  ${chalk21.white("$ lynxp check --json")}          ${chalk21.gray("Validation result as JSON")}
+
+${chalk21.cyan("Configuration:")}
+  ${chalk21.white("$ lynxp config")}                 ${chalk21.gray("Show current settings")}
+  ${chalk21.white("$ lynxp config set-url <url>")}   ${chalk21.gray("Point CLI to a self-hosted instance")}
+  ${chalk21.white("$ lynxp config reset-url")}       ${chalk21.gray("Reset to https://lynxprompt.com")}
+  ${chalk21.white("$ lynxp config path")}            ${chalk21.gray("Show config file location")}
+
+${chalk21.gray("Docs: https://lynxprompt.com/docs/cli")}
 `
 );
 program.parse();