@jvittechs/jai1-cli 0.1.106 → 1.0.0

package/dist/cli.js

@@ -33,7 +33,7 @@ var NetworkError = class extends Jai1Error {
 // package.json
 var package_default = {
   name: "@jvittechs/jai1-cli",
-  version: "0.1.106",
+  version: "1.0.0",
   description: "A unified CLI tool for JV-IT TECHS developers to manage Jai1 Framework. Please contact TeamAI for usage instructions.",
   type: "module",
   bin: {
@@ -480,6 +480,34 @@ var ComponentsService = class {
     this.cacheDir = join2(homedir3(), ".jai1", "cache");
     this.manifestFile = join2(projectRoot, ".jai1", "manifest.json");
   }
+  /**
+   * Expand component paths with special prefixes
+   *
+   * Supported formats:
+   * - Standard paths: "rule-presets/react-spa-zustand", "rules/jai1.md", "workflows/commit-it.md"
+   * - Package prefix: "package:core" -> expands to all components in that package
+   *
+   * @param config - Jai1 config
+   * @param paths - Array of component paths (may include special prefixes)
+   * @returns Array of expanded component paths
+   */
+  async expandPaths(config, paths) {
+    const expandedPaths = [];
+    for (const path13 of paths) {
+      if (path13.startsWith("package:")) {
+        const packageName = path13.substring("package:".length);
+        const components = await this.list(config);
+        if (packageName === "core") {
+          expandedPaths.push(...components.map((c) => c.filepath));
+        } else {
+          console.warn(`Warning: Unknown package '${packageName}', skipping`);
+        }
+      } else {
+        expandedPaths.push(path13);
+      }
+    }
+    return expandedPaths;
+  }
   /**
    * List components from API
    */
@@ -547,9 +575,6 @@ var ComponentsService = class {
     if (!component.content) {
       throw new Error(`Component ${filepath} has no content`);
     }
-    const targetPath = join2(targetDir, filepath);
-    const targetFolder = join2(targetPath, "..");
-    await fs2.mkdir(targetFolder, { recursive: true });
     let checksumContent = component.content;
     if (component.contentType === "bundle" || component.contentType === "zip") {
       let bundleJson;
@@ -594,6 +619,9 @@ var ComponentsService = class {
       if (component.contentType === "markdown") {
         checksumContent = component.content;
       }
+      const targetPath = join2(targetDir, filepath);
+      const targetFolder = join2(targetPath, "..");
+      await fs2.mkdir(targetFolder, { recursive: true });
       await fs2.writeFile(targetPath, component.content);
     }
     await this.markInstalled(filepath, component.version, this.calculateChecksum(checksumContent));
@@ -1359,12 +1387,18 @@ var UnifiedApplyApp = ({
     setAvailableIdes(getMigrationIDEs());
   }, []);
   const filteredComponents = useMemo(() => {
+    if (focusArea === "packages" && tags.length > 0) {
+      const selectedTag = tags[selectedPackageIndex];
+      if (selectedTag) {
+        return components.filter((c) => c.tags?.includes(selectedTag.tag));
+      }
+    }
     if (!searchQuery.trim()) return components;
     const query = searchQuery.toLowerCase();
     return components.filter(
       (c) => c.filepath.toLowerCase().includes(query) || c.tags?.some((t) => t.toLowerCase().includes(query))
     );
-  }, [components, searchQuery]);
+  }, [components, searchQuery, focusArea, selectedPackageIndex, tags]);
   useInput((input5, key) => {
     if (viewState === "done") {
       if (key.return || input5 === "q" || key.escape) {
@@ -1480,7 +1514,6 @@ var UnifiedApplyApp = ({
             packageComponents.forEach((c) => next.add(c.filepath));
             return next;
           });
-          setSearchQuery(tag.tag);
         }
       }
     }
@@ -1601,7 +1634,7 @@ var UnifiedApplyApp = ({
       onChange: setSearchQuery,
       placeholder: "Type to filter..."
     }
-  ) : /* @__PURE__ */ React3.createElement(Text3, null, searchQuery || /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, "Press Tab to search"))), /* @__PURE__ */ React3.createElement(Box2, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ React3.createElement(Text3, { bold: true, dimColor: true }, "Quick Apply (Packages):"), /* @__PURE__ */ React3.createElement(Box2, { marginTop: 1, flexWrap: "wrap" }, tags.slice(0, 6).map((tag, i) => {
+  ) : /* @__PURE__ */ React3.createElement(Text3, null, searchQuery || /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, "Press Tab to search"))), /* @__PURE__ */ React3.createElement(Box2, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ React3.createElement(Text3, { bold: true, dimColor: true }, "Quick Apply (Packages):"), /* @__PURE__ */ React3.createElement(Box2, { marginTop: 1, flexWrap: "wrap" }, tags.map((tag, i) => {
     const isSelected = focusArea === "packages" && i === selectedPackageIndex;
     return /* @__PURE__ */ React3.createElement(Box2, { key: tag.tag, marginRight: 1 }, /* @__PURE__ */ React3.createElement(
       Text3,
@@ -1615,12 +1648,12 @@ var UnifiedApplyApp = ({
       tag.count,
       "]"
     ));
-  }))), /* @__PURE__ */ React3.createElement(Box2, { flexDirection: "column", borderStyle: "round", borderColor: focusArea === "components" ? "cyan" : "gray", padding: 1 }, /* @__PURE__ */ React3.createElement(Box2, { marginBottom: 1 }, /* @__PURE__ */ React3.createElement(Text3, { bold: true }, "Components "), /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, "(", filteredComponents.length, " shown", hasMore ? `, scroll for more` : "", ")")), visibleComponents.map((comp, i) => {
+  })), focusArea === "packages" && tags.length > 0 && /* @__PURE__ */ React3.createElement(Box2, { marginTop: 1 }, /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, "\u2190 \u2192 to browse packages \xB7 Space/Enter to select package"))), /* @__PURE__ */ React3.createElement(Box2, { flexDirection: "column", borderStyle: "round", borderColor: focusArea === "components" ? "cyan" : "gray", padding: 1 }, /* @__PURE__ */ React3.createElement(Box2, { marginBottom: 1 }, /* @__PURE__ */ React3.createElement(Text3, { bold: true }, "Components "), focusArea === "packages" && tags.length > 0 && /* @__PURE__ */ React3.createElement(Text3, { color: "cyan" }, "[", tags[selectedPackageIndex]?.tag, "] "), /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, "(", filteredComponents.length, " shown", hasMore ? `, scroll for more` : "", ")")), visibleComponents.map((comp, i) => {
     const isCursor = i === cursorIndex && focusArea === "components";
     const isChecked = selectedPaths.has(comp.filepath);
     const isInstalled = installedPaths.has(comp.filepath);
     return /* @__PURE__ */ React3.createElement(Box2, { key: comp.filepath }, /* @__PURE__ */ React3.createElement(Text3, { color: isCursor ? "cyan" : "white" }, isCursor ? "\u276F " : "  ", isChecked ? "[\u2713]" : "[ ]", " ", comp.filepath), /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, " ", isInstalled ? "\u2713 installed" : "\u25CB new"));
-  }), filteredComponents.length === 0 && /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, "No components match your search")), selectedPaths.size > 0 && /* @__PURE__ */ React3.createElement(Box2, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React3.createElement(Text3, { bold: true }, "Selected: ", selectedPaths.size, " components"), /* @__PURE__ */ React3.createElement(Box2, { flexDirection: "column", marginLeft: 2 }, Array.from(selectedPaths).slice(0, 4).map((fp) => /* @__PURE__ */ React3.createElement(Text3, { key: fp, dimColor: true }, "\u{1F4CC} ", fp)), selectedPaths.size > 4 && /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, "   ... and ", selectedPaths.size - 4, " more"))), /* @__PURE__ */ React3.createElement(Box2, { marginTop: 1, borderStyle: "single", borderColor: "gray", paddingX: 1 }, /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, "[Tab] Switch area \xB7 [\u2191\u2193/\u2190\u2192] Navigate \xB7 [\u2423] Toggle \xB7 [A] Select all \xB7 [C] Clear \xB7 [Enter] Apply \xB7 [Q] Quit")));
+  }), filteredComponents.length === 0 && /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, "No components match your search")), selectedPaths.size > 0 && /* @__PURE__ */ React3.createElement(Box2, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React3.createElement(Text3, { bold: true }, "Selected: ", selectedPaths.size, " components"), /* @__PURE__ */ React3.createElement(Box2, { flexDirection: "column", marginLeft: 2 }, Array.from(selectedPaths).slice(0, 4).map((fp) => /* @__PURE__ */ React3.createElement(Text3, { key: fp, dimColor: true }, "\u{1F4CC} ", fp)), selectedPaths.size > 4 && /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, "   ... and ", selectedPaths.size - 4, " more"))), /* @__PURE__ */ React3.createElement(Box2, { marginTop: 1, borderStyle: "single", borderColor: "gray", paddingX: 1 }, /* @__PURE__ */ React3.createElement(Text3, { dimColor: true }, focusArea === "packages" && "[\u2190\u2192] Browse packages \xB7 [\u2423/Enter] Select package", focusArea === "components" && "[\u2191\u2193] Navigate \xB7 [\u2423] Toggle", focusArea === "search" && "Type to search...", " \xB7 [Tab] Switch area \xB7 [A] All \xB7 [C] Clear \xB7 [Enter] Apply \xB7 [Q] Quit")));
 };
 
 // src/commands/apply.ts
@@ -1967,7 +2000,7 @@ var MainMenuView = ({ ideContexts, onSelect }) => {
     {
       ide: "antigravity",
       icon: "\u{1F680}",
-      title: "Antigravity (Claude)",
+      title: "Antigravity",
       itemCount: ideContexts.find((ctx) => ctx.ide === "antigravity")?.stats.totalItems || 0,
       available: ideContexts.some((ctx) => ctx.ide === "antigravity")
     },
@@ -2294,7 +2327,7 @@ var IDE_CONFIGS = {
   },
   antigravity: {
     id: "antigravity",
-    name: "Antigravity (Claude)",
+    name: "Antigravity",
     icon: "\u{1F680}",
     basePath: ".agent",
     contentPaths: {
@@ -2795,6 +2828,25 @@ import { checkbox, confirm as confirm2, select } from "@inquirer/prompts";
 import fs6 from "fs/promises";
 import path3 from "path";
 import { existsSync } from "fs";
+
+// src/utils/prompt-theme.ts
+var keysHelpTipWithQuit = (keys) => {
+  const keyStrings = keys.map(([key, action]) => `${key} ${action}`);
+  keyStrings.push("Ctrl+C quit");
+  return keyStrings.join(" \u2022 ");
+};
+var checkboxTheme = {
+  style: {
+    keysHelpTip: keysHelpTipWithQuit
+  }
+};
+var selectTheme = {
+  style: {
+    keysHelpTip: keysHelpTipWithQuit
+  }
+};
+
+// src/commands/ide/setup.ts
 var PERFORMANCE_GROUPS = {
   telemetry: {
     name: "Telemetry",
@@ -2981,7 +3033,8 @@ async function interactiveMode() {
       { name: "\u274C Disable optimization groups", value: "disable" },
       { name: "\u{1F680} Max Performance (enable all)", value: "max" },
       { name: "\u{1F504} Reset to defaults", value: "reset" }
-    ]
+    ],
+    theme: selectTheme
   });
   if (action === "max") {
     const allGroups = Object.keys(PERFORMANCE_GROUPS);
@@ -3000,7 +3053,8 @@ async function selectGroupsToApply(action) {
   try {
     const selectedGroups = await checkbox({
       message: `Select groups to ${action} (SPACE to select, ENTER to confirm):`,
-      choices
+      choices,
+      theme: checkboxTheme
     });
     if (selectedGroups.length === 0) {
       console.log("\n\u26A0\uFE0F  No groups selected!");
@@ -3136,7 +3190,8 @@ async function runSync(options) {
     });
     selectedIdes = await checkbox2({
       message: "Select target IDE(s) (SPACE to select, ENTER to confirm):",
-      choices: ideChoices
+      choices: ideChoices,
+      theme: checkboxTheme
     });
     if (selectedIdes.length === 0) {
       console.log("\n\u26A0\uFE0F  No IDE selected!");
@@ -3155,7 +3210,8 @@ async function runSync(options) {
     ];
     selectedTypes = await checkbox2({
       message: "Select content types to sync:",
-      choices: typeChoices
+      choices: typeChoices,
+      theme: checkboxTheme
     });
     if (selectedTypes.length === 0) {
       console.log("\n\u26A0\uFE0F  No content type selected!");
@@ -3281,78 +3337,6 @@ var IDE_FORMATS = {
     // Gemini requires AGENTS.md
   }
 };
-var JAI1_BASE_RULE = `# Jai1 Framework Agent
-
-You are an AI coding assistant integrated with the Jai1 Framework.
-
-## Skills Reference
-
-The Jai1 Framework provides specialized skills that you can reference and apply:
-
-### Pattern Detection
-
-When you encounter:
-- **Component creation**: Reference \`@jai1-component-patterns\`
-- **API development**: Reference \`@jai1-api-patterns\`
-- **Database operations**: Reference \`@jai1-database-patterns\`
-- **Testing**: Reference \`@jai1-testing-patterns\`
-- **Deployment**: Reference \`@jai1-deployment-patterns\`
-
-### Skill Loading Procedure
-
-1. **Detect the task type** from user request
-2. **Load relevant skill** using \`@jai1-[skill-name]\` syntax
-3. **Apply patterns** from the skill to your response
-4. **Follow conventions** defined in the skill
-
-Example:
-\`\`\`
-User: "Create a new API endpoint for users"
-Assistant:
-1. Loading @jai1-api-patterns
-2. Applying RESTful conventions
-3. Following project structure from @jai1-component-patterns
-4. Implementing validation using @jai1-testing-patterns
-\`\`\`
-
-### Application
-
-- **Always reference skills** before implementing patterns
-- **Follow naming conventions** from loaded skills
-- **Apply best practices** defined in skills
-- **Maintain consistency** with existing codebase patterns
-
-### Naming Convention
-
-Skills are named using the pattern: \`@jai1-[domain]-patterns\`
-
-Examples:
-- \`@jai1-component-patterns\`
-- \`@jai1-api-patterns\`
-- \`@jai1-database-patterns\`
-- \`@jai1-testing-patterns\`
-- \`@jai1-deployment-patterns\`
-
-## Best Practices
-
-1. **Load before applying**: Always reference the appropriate skill before implementing
-2. **Follow project structure**: Use patterns from \`@jai1-component-patterns\`
-3. **Maintain consistency**: Apply conventions consistently across the codebase
-4. **Document decisions**: Explain why specific patterns are used
-
-## Integration
-
-This base rule works in conjunction with:
-- Project-specific rules (e.g., 01-project.md)
-- Technology-specific rules (e.g., 03-frontend.md)
-- Custom rules (e.g., 09-custom.md)
-- AGENTS.md (if present)
-
-When conflicts arise, prioritize:
-1. Custom rules (09-custom.*)
-2. Project rules (01-project.*)
-3. This base rule (00-jai1.*)
-`;
 
 // src/services/ide-detection.service.ts
 var IdeDetectionService = class {
@@ -7830,7 +7814,8 @@ async function handleInteractiveFeedback(config) {
         name: "\u{1F4DD} Suggestion - Share ideas or improvements",
         value: "suggestion"
       }
-    ]
+    ],
+    theme: selectTheme
   });
   const title = await input({
     message: "Title (max 200 characters):",
@@ -11145,7 +11130,7 @@ ${"\u2501".repeat(80)}`));
   } else {
     try {
       const selected = await checkbox3({
-        message: "Ch\u1ECDn packages \u0111\u1EC3 upgrade (\u2191\u2193 di chuy\u1EC3n \u2022 space ch\u1ECDn \u2022 a t\u1EA5t c\u1EA3 \u2022 i \u0111\u1EA3o \u2022 \u23CE x\xE1c nh\u1EADn \u2022 esc tho\xE1t):",
+        message: "Ch\u1ECDn packages \u0111\u1EC3 upgrade (\u2191\u2193 di chuy\u1EC3n \u2022 space ch\u1ECDn \u2022 a t\u1EA5t c\u1EA3 \u2022 i \u0111\u1EA3o \u2022 \u23CE x\xE1c nh\u1EADn):",
         choices: packages.map((pkg) => {
           const icon = pkg.upgradeType === "major" ? "\u{1F534}" : pkg.upgradeType === "minor" ? "\u{1F7E1}" : "\u{1F7E2}";
           return {
@@ -11154,7 +11139,8 @@ ${"\u2501".repeat(80)}`));
             checked: true
           };
         }),
-        pageSize: 15
+        pageSize: 15,
+        theme: checkboxTheme
       });
       if (selected.length === 0) {
         console.log(chalk12.yellow("\u23F8\uFE0F  Kh\xF4ng c\xF3 packages n\xE0o \u0111\u01B0\u1EE3c ch\u1ECDn\n"));
@@ -11590,7 +11576,8 @@ function createKitCreateCommand() {
             const answer = await select3({
               message: v.prompt,
               choices: v.options.map((opt) => ({ name: opt, value: opt })),
-              default: v.default
+              default: v.default,
+              theme: selectTheme
             });
             variables[v.name] = answer;
           } else {
@@ -11609,9 +11596,13 @@ function createKitCreateCommand() {
     if (!options.skipFramework && kit.config.framework?.apply) {
       console.log("\u{1F916} Applying jai1 framework...");
       const componentsService = new ComponentsService(targetDir);
-      for (const filepath of kit.config.framework.components) {
+      const expandedPaths = await componentsService.expandPaths(
+        config,
+        kit.config.framework.components
+      );
+      for (const filepath of expandedPaths) {
         console.log(`   \u{1F4E5} Installing ${filepath}...`);
-        await componentsService.install(config, filepath);
+        await componentsService.install(config, filepath, join8(targetDir, ".jai1"));
       }
       console.log("   \u2713 Framework components applied");
     }
@@ -11649,7 +11640,8 @@ function createKitCreateCommand() {
           choices: ideChoices.map((c) => ({
             ...c,
             checked: defaultTargets.includes(c.value)
-          }))
+          })),
+          theme: checkboxTheme
         });
         selectedIdes = answer;
       }
@@ -11793,7 +11785,7 @@ function createRulesListCommand() {
         console.log(table.toString());
         console.log();
       }
-      console.log(chalk16.dim('\u{1F4A1} Ch\u1EA1y "jai1 rules init --preset=<slug>" \u0111\u1EC3 \xE1p d\u1EE5ng preset'));
+      console.log(chalk16.dim('\u{1F4A1} Ch\u1EA1y "jai1 rules apply <name>" \u0111\u1EC3 \xE1p d\u1EE5ng preset'));
     } catch (error) {
       throw new Error(
         `L\u1ED7i khi t\u1EA3i presets: ${error instanceof Error ? error.message : String(error)}`
@@ -11804,9 +11796,129 @@ function createRulesListCommand() {
 
 // src/commands/rules/init.ts
 import { Command as Command44 } from "commander";
+import { promises as fs20 } from "fs";
+import { join as join10 } from "path";
+import { select as select4, confirm as confirm7 } from "@inquirer/prompts";
+
+// src/services/project-config.service.ts
 import { promises as fs19 } from "fs";
 import { join as join9 } from "path";
-import { select as select4, confirm as confirm7 } from "@inquirer/prompts";
+var ProjectConfigService = class {
+  projectRoot;
+  configDir;
+  configPath;
+  constructor(projectRoot = process.cwd()) {
+    this.projectRoot = projectRoot;
+    this.configDir = join9(this.projectRoot, ".jai1");
+    this.configPath = join9(this.configDir, "project.json");
+  }
+  /**
+   * Check if config file exists
+   */
+  async exists() {
+    try {
+      await fs19.access(this.configPath);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  /**
+   * Load full project configuration
+   * @returns Config object or null if not found
+   */
+  async load() {
+    if (!await this.exists()) {
+      return null;
+    }
+    try {
+      const content = await fs19.readFile(this.configPath, "utf-8");
+      return JSON.parse(content);
+    } catch (error) {
+      throw new Error(
+        `Failed to load project config: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
+  /**
+   * Save full project configuration
+   * Creates .jai1 directory if it doesn't exist
+   */
+  async save(config) {
+    try {
+      await fs19.mkdir(this.configDir, { recursive: true });
+      await fs19.writeFile(this.configPath, JSON.stringify(config, null, 2), "utf-8");
+    } catch (error) {
+      throw new Error(
+        `Failed to save project config: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
+  /**
+   * Load rules configuration only
+   * @returns RulesConfig or null if not found
+   */
+  async loadRules() {
+    const config = await this.load();
+    return config?.rules ?? null;
+  }
+  /**
+   * Save rules configuration
+   * Merges with existing config, preserving other sections
+   */
+  async saveRules(rulesConfig) {
+    const existingConfig = await this.load() ?? {};
+    existingConfig.rules = rulesConfig;
+    await this.save(existingConfig);
+  }
+  /**
+   * Update rules configuration partially
+   * Merges with existing rules config
+   */
+  async updateRules(partialRulesConfig) {
+    const existingRules = await this.loadRules();
+    if (!existingRules) {
+      throw new Error('No rules configuration found. Run "jai1 rules apply" first.');
+    }
+    const updatedRules = {
+      ...existingRules,
+      ...partialRulesConfig
+    };
+    await this.saveRules(updatedRules);
+  }
+  /**
+   * Add a backup entry to rules config
+   * Keeps only the last 5 backups
+   */
+  async addBackup(backup) {
+    const rules = await this.loadRules();
+    if (!rules) {
+      throw new Error("No rules configuration found.");
+    }
+    const backups = [backup, ...rules.backups ?? []].slice(0, 5);
+    await this.updateRules({ backups });
+  }
+  /**
+   * Get config file path
+   */
+  getConfigPath() {
+    return this.configPath;
+  }
+  /**
+   * Get config directory path (.jai1/)
+   */
+  getConfigDir() {
+    return this.configDir;
+  }
+  /**
+   * Get project root path
+   */
+  getProjectRoot() {
+    return this.projectRoot;
+  }
+};
+
+// src/commands/rules/init.ts
 function createRulesInitCommand() {
   return new Command44("init").description("Apply rule preset to project").option("--preset <slug>", "Preset slug to apply").option("--output <format>", "Output format: cursor, agents-md, both (default: cursor)", "cursor").option("-y, --yes", "Skip confirmations").action(async (options) => {
     const configService = new ConfigService();
@@ -11836,7 +11948,8 @@ function createRulesInitCommand() {
           name: `${p.name} - ${p.description}`,
           value: p.slug,
           description: `v${p.version} | ${p.tags.join(", ")}`
-        }))
+        })),
+        theme: selectTheme
       });
     }
     console.log(`
@@ -11864,7 +11977,8 @@ function createRulesInitCommand() {
           { name: "Cursor (.cursor/rules/)", value: "cursor" },
           { name: "AGENTS.md (single file)", value: "agents-md" },
           { name: "Both", value: "both" }
-        ]
+        ],
+        theme: selectTheme
       });
     }
     if (!options.yes) {
@@ -11884,14 +11998,16 @@ function createRulesInitCommand() {
     if (outputFormat === "agents-md" || outputFormat === "both") {
       await applyAgentsMdFormat(bundle);
     }
-    const projectConfig = {
+    const projectConfigService = new ProjectConfigService();
+    const rulesConfig = {
       preset: bundle.preset.slug,
       version: bundle.preset.version,
       appliedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      ides: [],
       customContext: "09-custom.mdc"
     };
-    await fs19.writeFile("jai1-rules.json", JSON.stringify(projectConfig, null, 2));
-    console.log("\u2713 Created jai1-rules.json");
+    await projectConfigService.saveRules(rulesConfig);
+    console.log("\u2713 Created .jai1/project.json");
     console.log("\n\u2705 Preset applied successfully!\n");
     console.log("Next steps:");
     console.log("  1. Edit 09-custom.mdc to add project-specific rules");
@@ -11900,11 +12016,11 @@ function createRulesInitCommand() {
   });
 }
 async function applyCursorFormat(bundle) {
-  const rulesDir = join9(process.cwd(), ".cursor", "rules");
-  await fs19.mkdir(rulesDir, { recursive: true });
+  const rulesDir = join10(process.cwd(), ".cursor", "rules");
+  await fs20.mkdir(rulesDir, { recursive: true });
   for (const [filename, content] of Object.entries(bundle.files)) {
-    const filePath = join9(rulesDir, filename);
-    await fs19.writeFile(filePath, content, "utf-8");
+    const filePath = join10(rulesDir, filename);
+    await fs20.writeFile(filePath, content, "utf-8");
     console.log(`\u2713 Created .cursor/rules/${filename}`);
   }
 }
@@ -11931,14 +12047,14 @@ async function applyAgentsMdFormat(bundle) {
     }
   }
   const agentsMd = sections.join("\n");
-  await fs19.writeFile("AGENTS.md", agentsMd, "utf-8");
+  await fs20.writeFile("AGENTS.md", agentsMd, "utf-8");
   console.log("\u2713 Created AGENTS.md");
 }
 
 // src/commands/rules/apply.ts
 import { Command as Command45 } from "commander";
-import { promises as fs21 } from "fs";
-import { join as join11 } from "path";
+import { promises as fs22 } from "fs";
+import { join as join12 } from "path";
 import { select as select5, confirm as confirm8, checkbox as checkbox5 } from "@inquirer/prompts";
 
 // src/services/rules-generator.service.ts
@@ -11973,11 +12089,6 @@ var RulesGeneratorService = class {
    */
   generateCursorFiles(bundle, format) {
     const files = [];
-    files.push({
-      path: `${format.rulesPath}/00-jai1${format.fileExtension}`,
-      content: this.generateCursorJai1Rule(),
-      description: "Jai1 Framework base rule"
-    });
     for (const [filename, content] of Object.entries(bundle.files)) {
       files.push({
         path: `${format.rulesPath}/${filename}`,
@@ -11988,28 +12099,11 @@ var RulesGeneratorService = class {
     }
     return files;
   }
-  /**
-   * Generate Cursor jai1 base rule
-   */
-  generateCursorJai1Rule() {
-    return `---
-description: Jai1 Framework integration and skill loading
-globs: ["**/*"]
-alwaysApply: true
----
-
-${JAI1_BASE_RULE}`;
-  }
   /**
    * Generate Windsurf format (.md files with trigger metadata)
    */
   generateWindsurfFiles(bundle, format) {
     const files = [];
-    files.push({
-      path: `${format.rulesPath}/00-jai1${format.fileExtension}`,
-      content: this.generateWindsurfJai1Rule(),
-      description: "Jai1 Framework base rule"
-    });
     for (const [filename, content] of Object.entries(bundle.files)) {
       const converted = this.convertToWindsurf(content, filename);
       const newFilename = filename.replace(/\.mdc$/, ".md");
@@ -12044,27 +12138,12 @@ trigger: ${trigger}
 
 ${body.trim()}
 `;
-  }
-  /**
-   * Generate Windsurf jai1 base rule
-   */
-  generateWindsurfJai1Rule() {
-    return `---
-trigger: always
----
-
-${JAI1_BASE_RULE}`;
   }
   /**
    * Generate Antigravity format (.md files with trigger metadata + @AGENTS.md reference)
    */
   generateAntigravityFiles(bundle, format) {
     const files = [];
-    files.push({
-      path: `${format.rulesPath}/00-jai1${format.fileExtension}`,
-      content: this.generateAntigravityJai1Rule(),
-      description: "Jai1 Framework base rule"
-    });
     for (const [filename, content] of Object.entries(bundle.files)) {
       const converted = this.convertToAntigravity(content, filename);
       const newFilename = filename.replace(/\.mdc$/, ".md");
@@ -12099,29 +12178,12 @@ trigger: ${trigger}
 
 ${body.trim()}
 `;
-  }
-  /**
-   * Generate Antigravity jai1 base rule
-   */
-  generateAntigravityJai1Rule() {
-    return `---
-trigger: always_on
----
-
-@AGENTS.md
-
-${JAI1_BASE_RULE}`;
   }
   /**
    * Generate Claude Code format (.md files with paths metadata)
    */
   generateClaudeFiles(bundle, format) {
     const files = [];
-    files.push({
-      path: `${format.rulesPath}/00-jai1${format.fileExtension}`,
-      content: this.generateClaudeJai1Rule(),
-      description: "Jai1 Framework base rule"
-    });
     for (const [filename, content] of Object.entries(bundle.files)) {
       const converted = this.convertToClaude(content, filename);
       const newFilename = filename.replace(/\.mdc$/, ".md");
@@ -12155,17 +12217,6 @@ paths: ${paths}`;
 
 ${body.trim()}
 `;
-  }
-  /**
-   * Generate Claude jai1 base rule
-   */
-  generateClaudeJai1Rule() {
-    return `---
-description: Jai1 Framework integration and skill loading
-paths: **/*
----
-
-${JAI1_BASE_RULE}`;
   }
   /**
    * Generate AGENTS.md file (single merged file)
@@ -12175,10 +12226,8 @@ ${JAI1_BASE_RULE}`;
     sections.push("# AGENTS.md\n");
     sections.push(`<!-- Generated by jai1 rules - Preset: ${bundle.preset.slug} v${bundle.preset.version} -->
 `);
-    sections.push("## Jai1 Framework Integration\n");
-    sections.push(JAI1_BASE_RULE.trim());
-    sections.push("\n---\n");
     const fileOrder = [
+      "00-jai1.mdc",
       "01-project.mdc",
       "02-standards.mdc",
       "03-frontend.mdc",
@@ -12298,8 +12347,8 @@ Follow all instructions and patterns defined in AGENTS.md above.
 };
 
 // src/services/backup.service.ts
-import { promises as fs20 } from "fs";
-import { join as join10, dirname } from "path";
+import { promises as fs21 } from "fs";
+import { join as join11, dirname } from "path";
 var BackupService = class {
   backupDir = ".jai1/backups";
   /**
@@ -12307,7 +12356,7 @@ var BackupService = class {
    */
   async createBackup(ides, presetSlug) {
     const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-    const backupPath = join10(this.backupDir, timestamp);
+    const backupPath = join11(this.backupDir, timestamp);
     const backedUpFiles = [];
     let hasContent = false;
     for (const ideId of ides) {
@@ -12316,7 +12365,7 @@ var BackupService = class {
         console.warn(`Unknown IDE format: ${ideId}, skipping backup`);
         continue;
       }
-      const rulesPath = format.rulesPath === "." ? process.cwd() : join10(process.cwd(), format.rulesPath);
+      const rulesPath = format.rulesPath === "." ? process.cwd() : join11(process.cwd(), format.rulesPath);
       try {
         const exists = await this.pathExists(rulesPath);
         if (!exists) {
@@ -12329,19 +12378,19 @@ var BackupService = class {
           await this.backupSingleFile("GEMINI.md", backupPath, ideId, backedUpFiles);
           hasContent = true;
         } else {
-          const stats = await fs20.stat(rulesPath);
+          const stats = await fs21.stat(rulesPath);
           if (stats.isDirectory()) {
-            const files = await fs20.readdir(rulesPath);
+            const files = await fs21.readdir(rulesPath);
             for (const file of files) {
               if (file.endsWith(format.fileExtension)) {
-                const originalPath = join10(rulesPath, file);
-                const relativePath = join10(format.rulesPath, file);
-                const destPath = join10(backupPath, ideId, file);
-                await fs20.mkdir(dirname(destPath), { recursive: true });
-                await fs20.copyFile(originalPath, destPath);
+                const originalPath = join11(rulesPath, file);
+                const relativePath = join11(format.rulesPath, file);
+                const destPath = join11(backupPath, ideId, file);
+                await fs21.mkdir(dirname(destPath), { recursive: true });
+                await fs21.copyFile(originalPath, destPath);
                 backedUpFiles.push({
                   originalPath: relativePath,
-                  backupPath: join10(ideId, file),
+                  backupPath: join11(ideId, file),
                   ide: ideId
                 });
                 hasContent = true;
@@ -12362,9 +12411,9 @@ var BackupService = class {
       ides,
       files: backedUpFiles
     };
-    await fs20.mkdir(backupPath, { recursive: true });
-    await fs20.writeFile(
-      join10(backupPath, "metadata.json"),
+    await fs21.mkdir(backupPath, { recursive: true });
+    await fs21.writeFile(
+      join11(backupPath, "metadata.json"),
       JSON.stringify(metadata, null, 2),
       "utf-8"
     );
@@ -12374,18 +12423,18 @@ var BackupService = class {
    * Backup a single file (for AGENTS.md, GEMINI.md)
    */
   async backupSingleFile(filename, backupPath, ideId, backedUpFiles) {
-    const originalPath = join10(process.cwd(), filename);
+    const originalPath = join11(process.cwd(), filename);
     try {
       const exists = await this.pathExists(originalPath);
       if (!exists) {
         return;
       }
-      const destPath = join10(backupPath, ideId, filename);
-      await fs20.mkdir(dirname(destPath), { recursive: true });
-      await fs20.copyFile(originalPath, destPath);
+      const destPath = join11(backupPath, ideId, filename);
+      await fs21.mkdir(dirname(destPath), { recursive: true });
+      await fs21.copyFile(originalPath, destPath);
       backedUpFiles.push({
         originalPath: filename,
-        backupPath: join10(ideId, filename),
+        backupPath: join11(ideId, filename),
         ide: ideId
       });
     } catch (error) {
@@ -12395,16 +12444,16 @@ var BackupService = class {
    * Restore files from a backup
    */
   async restoreBackup(backupPath) {
-    const metadataPath = join10(backupPath, "metadata.json");
-    const metadataContent = await fs20.readFile(metadataPath, "utf-8");
+    const metadataPath = join11(backupPath, "metadata.json");
+    const metadataContent = await fs21.readFile(metadataPath, "utf-8");
     const metadata = JSON.parse(metadataContent);
     console.log(`
 Restoring backup from ${metadata.timestamp}...`);
     for (const file of metadata.files) {
-      const sourcePath = join10(backupPath, file.backupPath);
-      const destPath = join10(process.cwd(), file.originalPath);
-      await fs20.mkdir(dirname(destPath), { recursive: true });
-      await fs20.copyFile(sourcePath, destPath);
+      const sourcePath = join11(backupPath, file.backupPath);
+      const destPath = join11(process.cwd(), file.originalPath);
+      await fs21.mkdir(dirname(destPath), { recursive: true });
+      await fs21.copyFile(sourcePath, destPath);
       console.log(`\u2713 Restored ${file.originalPath}`);
     }
     console.log("\n\u2705 Backup restored successfully!");
@@ -12414,18 +12463,18 @@ Restoring backup from ${metadata.timestamp}...`);
    */
   async listBackups() {
     try {
-      const backupDirPath = join10(process.cwd(), this.backupDir);
+      const backupDirPath = join11(process.cwd(), this.backupDir);
       const exists = await this.pathExists(backupDirPath);
       if (!exists) {
         return [];
       }
-      const entries = await fs20.readdir(backupDirPath, { withFileTypes: true });
+      const entries = await fs21.readdir(backupDirPath, { withFileTypes: true });
       const backups = [];
       for (const entry of entries) {
         if (entry.isDirectory()) {
-          const metadataPath = join10(backupDirPath, entry.name, "metadata.json");
+          const metadataPath = join11(backupDirPath, entry.name, "metadata.json");
           try {
-            const metadataContent = await fs20.readFile(metadataPath, "utf-8");
+            const metadataContent = await fs21.readFile(metadataPath, "utf-8");
             const metadata = JSON.parse(metadataContent);
             backups.push(metadata);
           } catch {
@@ -12442,7 +12491,7 @@ Restoring backup from ${metadata.timestamp}...`);
    * Delete a specific backup
    */
   async deleteBackup(timestamp) {
-    const backupPath = join10(process.cwd(), this.backupDir, timestamp);
+    const backupPath = join11(process.cwd(), this.backupDir, timestamp);
     await this.deleteDirectory(backupPath);
   }
   /**
@@ -12474,7 +12523,7 @@ Restoring backup from ${metadata.timestamp}...`);
    */
   async pathExists(path13) {
     try {
-      await fs20.access(path13);
+      await fs21.access(path13);
       return true;
     } catch {
       return false;
@@ -12489,16 +12538,16 @@ Restoring backup from ${metadata.timestamp}...`);
       if (!exists) {
         return;
       }
-      const entries = await fs20.readdir(path13, { withFileTypes: true });
+      const entries = await fs21.readdir(path13, { withFileTypes: true });
       for (const entry of entries) {
-        const fullPath = join10(path13, entry.name);
+        const fullPath = join11(path13, entry.name);
         if (entry.isDirectory()) {
           await this.deleteDirectory(fullPath);
         } else {
-          await fs20.unlink(fullPath);
+          await fs21.unlink(fullPath);
         }
       }
-      await fs20.rmdir(path13);
+      await fs21.rmdir(path13);
     } catch (error) {
     }
   }
@@ -12506,14 +12555,14 @@ Restoring backup from ${metadata.timestamp}...`);
    * Get backup directory path
    */
   getBackupDir() {
-    return join10(process.cwd(), this.backupDir);
+    return join11(process.cwd(), this.backupDir);
   }
   /**
    * Ensure backup directory exists
    */
   async ensureBackupDir() {
-    const backupDirPath = join10(process.cwd(), this.backupDir);
-    await fs20.mkdir(backupDirPath, { recursive: true });
+    const backupDirPath = join11(process.cwd(), this.backupDir);
+    await fs21.mkdir(backupDirPath, { recursive: true });
   }
 };
 
@@ -12557,7 +12606,8 @@ function createRulesApplyCommand() {
           name: `${p.name} - ${p.description}`,
           value: p.slug,
           description: `v${p.version} | ${p.tags.join(", ")}`
-        }))
+        })),
+        theme: selectTheme
       });
     }
     console.log(`
@@ -12627,7 +12677,8 @@ function createRulesApplyCommand() {
         selectedIdes = await checkbox5({
           message: "Select IDE formats to generate (pre-selected are recommended):",
           choices,
-          required: true
+          required: true,
+          theme: checkboxTheme
         });
       }
     }
@@ -12669,21 +12720,21 @@ function createRulesApplyCommand() {
       }
     }
     console.log("\n\u{1F4DD} Applying preset...\n");
-    const rulePresetDir = join11(process.cwd(), ".jai1", "rule-preset");
+    const rulePresetDir = join12(process.cwd(), ".jai1", "rule-preset");
     try {
-      await fs21.rm(rulePresetDir, { recursive: true, force: true });
+      await fs22.rm(rulePresetDir, { recursive: true, force: true });
     } catch {
     }
-    await fs21.mkdir(rulePresetDir, { recursive: true });
-    await fs21.writeFile(
-      join11(rulePresetDir, "preset.json"),
+    await fs22.mkdir(rulePresetDir, { recursive: true });
+    await fs22.writeFile(
+      join12(rulePresetDir, "preset.json"),
       JSON.stringify(bundle.preset, null, 2),
       "utf-8"
     );
     for (const [filename, content] of Object.entries(bundle.files)) {
-      const filePath = join11(rulePresetDir, filename);
-      await fs21.mkdir(join11(filePath, ".."), { recursive: true });
-      await fs21.writeFile(filePath, content, "utf-8");
+      const filePath = join12(rulePresetDir, filename);
+      await fs22.mkdir(join12(filePath, ".."), { recursive: true });
+      await fs22.writeFile(filePath, content, "utf-8");
     }
     console.log(`\u2713 Saved preset to .jai1/rule-preset/`);
     const allGeneratedFiles = [];
@@ -12691,9 +12742,9 @@ function createRulesApplyCommand() {
       try {
         const files = generatorService.generateForIde(bundle, ideId);
         for (const file of files) {
-          const fullPath = join11(process.cwd(), file.path);
-          await fs21.mkdir(join11(fullPath, ".."), { recursive: true });
-          await fs21.writeFile(fullPath, file.content, "utf-8");
+          const fullPath = join12(process.cwd(), file.path);
+          await fs22.mkdir(join12(fullPath, ".."), { recursive: true });
+          await fs22.writeFile(fullPath, file.content, "utf-8");
           console.log(`\u2713 [${ideId}] ${file.path}`);
           allGeneratedFiles.push({
             ide: ideId,
@@ -12705,7 +12756,8 @@ function createRulesApplyCommand() {
         console.error(`\u2717 Failed to generate ${ideId} files:`, error);
       }
     }
-    const projectConfig = {
+    const projectConfigService = new ProjectConfigService();
+    const rulesConfig = {
       preset: bundle.preset.slug,
       version: bundle.preset.version,
       appliedAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -12720,24 +12772,18 @@ function createRulesApplyCommand() {
       ] : []
     };
     try {
-      const existingConfigPath = join11(process.cwd(), "jai1-rules.json");
-      const existingConfigContent = await fs21.readFile(existingConfigPath, "utf-8");
-      const existingConfig = JSON.parse(existingConfigContent);
-      if (existingConfig.backups && existingConfig.backups.length > 0) {
-        projectConfig.backups = [
-          ...projectConfig.backups,
-          ...existingConfig.backups.slice(0, 5)
+      const existingRules = await projectConfigService.loadRules();
+      if (existingRules?.backups && existingRules.backups.length > 0) {
+        rulesConfig.backups = [
+          ...rulesConfig.backups,
+          ...existingRules.backups.slice(0, 5)
           // Keep last 5 backups
         ];
       }
     } catch {
     }
-    await fs21.writeFile(
-      join11(process.cwd(), "jai1-rules.json"),
-      JSON.stringify(projectConfig, null, 2),
-      "utf-8"
-    );
-    console.log("\n\u2713 Updated jai1-rules.json");
+    await projectConfigService.saveRules(rulesConfig);
+    console.log("\n\u2713 Updated .jai1/project.json");
     console.log("\n\u2705 Preset applied successfully!\n");
     console.log("\u{1F4CA} Summary:");
     console.log(`  Generated ${allGeneratedFiles.length} files across ${resolvedIdes.length} IDE(s)`);
@@ -12765,7 +12811,7 @@ function createRulesApplyCommand() {
 
 // src/commands/rules/restore.ts
 import { Command as Command46 } from "commander";
-import { join as join12 } from "path";
+import { join as join13 } from "path";
 import { select as select6, confirm as confirm9 } from "@inquirer/prompts";
 function createRulesRestoreCommand() {
   return new Command46("restore").description("Restore rules from a backup").option("--latest", "Restore the most recent backup").option("-y, --yes", "Skip confirmation").action(async (options) => {
@@ -12787,7 +12833,8 @@ function createRulesRestoreCommand() {
           name: formatBackupInfo(backup),
           value: backup.timestamp,
           description: `${backup.files.length} files | IDEs: ${backup.ides.join(", ")}`
-        }))
+        })),
+        theme: selectTheme
       });
       selectedBackup = backups.find((b) => b.timestamp === backupTimestamp);
       if (!selectedBackup) {
@@ -12811,7 +12858,7 @@ function createRulesRestoreCommand() {
     }
     console.log("\n\u{1F504} Restoring backup...\n");
     try {
-      const backupPath = join12(backupService.getBackupDir(), selectedBackup.timestamp);
+      const backupPath = join13(backupService.getBackupDir(), selectedBackup.timestamp);
       await backupService.restoreBackup(backupPath);
       console.log("\n\u2705 Backup restored successfully!\n");
       console.log("\u{1F4A1} Tip: Your IDE may need to be restarted to pick up the changes.");
@@ -12837,23 +12884,41 @@ function formatTimestamp(timestamp) {
 
 // src/commands/rules/sync.ts
 import { Command as Command47 } from "commander";
-import { promises as fs22 } from "fs";
-import { join as join13 } from "path";
-import { checkbox as checkbox6, confirm as confirm10 } from "@inquirer/prompts";
+import { promises as fs23 } from "fs";
+import { join as join14 } from "path";
+import { checkbox as checkbox6, confirm as confirm10, Separator } from "@inquirer/prompts";
 function createRulesSyncCommand() {
   return new Command47("sync").description("Regenerate rule outputs for all configured IDEs").option("--ides <ides>", "Comma-separated list of IDEs to sync (default: all configured)").option("--detect", "Auto-detect active IDEs instead of using config").option("-y, --yes", "Skip confirmations").action(async (options) => {
-    const configPath = join13(process.cwd(), "jai1-rules.json");
-    let projectConfig;
+    const rulePresetDir = join14(process.cwd(), ".jai1", "rule-preset");
+    const presetJsonPath = join14(rulePresetDir, "preset.json");
+    let presetExists = false;
+    let presetData = null;
     try {
-      const configContent = await fs22.readFile(configPath, "utf-8");
-      projectConfig = JSON.parse(configContent);
+      const presetContent = await fs23.readFile(presetJsonPath, "utf-8");
+      presetData = JSON.parse(presetContent);
+      presetExists = true;
     } catch {
+    }
+    if (!presetExists) {
       throw new ValidationError(
-        'No jai1-rules.json found. Run "jai1 rules apply" first.'
+        'No rule preset found in .jai1/rule-preset/\nRun "jai1 rules apply <preset>" or create a project with "jai1 kit create <kit>" first.'
       );
     }
+    const projectConfigService = new ProjectConfigService();
+    let rulesConfig = await projectConfigService.loadRules();
+    if (!rulesConfig) {
+      console.log("\u26A0\uFE0F  No .jai1/project.json found, creating from preset...\n");
+      rulesConfig = {
+        preset: presetData.slug,
+        version: presetData.version,
+        appliedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        ides: [],
+        customContext: "09-custom.md",
+        backups: []
+      };
+    }
     console.log("\u{1F504} Syncing rules...\n");
-    console.log(`Preset: ${projectConfig.preset} v${projectConfig.version}`);
+    console.log(`Preset: ${rulesConfig.preset} v${rulesConfig.version}`);
     let idesToSync = [];
     if (options.detect) {
       console.log("\n\u{1F50D} Auto-detecting active IDEs...");
@@ -12884,16 +12949,16 @@ Detected ${detected.length} active IDE(s):
       idesToSync = detected.map((d) => d.id);
     } else if (options.ides) {
       const requested = options.ides.split(",").map((ide) => ide.trim());
-      const configured = projectConfig.ides || [];
+      const configured = rulesConfig.ides || [];
       idesToSync = requested;
       const notConfigured = requested.filter((ide) => !configured.includes(ide));
       if (notConfigured.length > 0) {
         console.log(`
 \u26A0\uFE0F  IDEs not in config: ${notConfigured.join(", ")}`);
-        console.log("   They will still be synced, but may not be in jai1-rules.json");
+        console.log("   They will still be synced, but may not be in .jai1/project.json");
       }
     } else if (!options.yes) {
-      const currentIdes = projectConfig.ides || [];
+      const currentIdes = rulesConfig.ides || [];
       console.log(`
 Current IDE(s): ${currentIdes.join(", ") || "none"}`);
       const detectionService = new IdeDetectionService();
@@ -12913,18 +12978,23 @@ Current IDE(s): ${currentIdes.join(", ") || "none"}`);
       }
       const choices = buildIdeChoices(currentIdes, detected, suggestions);
       idesToSync = await checkbox6({
-        message: "Select IDE formats to sync (pre-selected are recommended):",
+        message: "Select IDE formats to sync:",
         choices,
-        required: true
+        required: false,
+        theme: checkboxTheme
       });
+      if (idesToSync.includes("__quit__")) {
+        console.log("Cancelled.");
+        return;
+      }
       if (idesToSync.length === 0) {
         console.log("Cancelled.");
         return;
       }
     } else {
-      idesToSync = projectConfig.ides || [];
+      idesToSync = rulesConfig.ides || [];
       if (idesToSync.length === 0) {
-        console.log("\n\u26A0\uFE0F  No IDEs configured in jai1-rules.json");
+        console.log("\n\u26A0\uFE0F  No IDEs configured in .jai1/project.json");
         console.log("   Detecting from existing files...\n");
         const detectionService = new IdeDetectionService();
         idesToSync = await detectionService.detectExistingIdes();
@@ -12945,7 +13015,7 @@ Current IDE(s): ${currentIdes.join(", ") || "none"}`);
     if (!config) {
       throw new ValidationError('Not initialized. Run "jai1 auth" first.');
     }
-    const presetResponse = await fetch(`${config.apiUrl}/api/rules/presets/${projectConfig.preset}`, {
+    const presetResponse = await fetch(`${config.apiUrl}/api/rules/presets/${rulesConfig.preset}`, {
       headers: {
         "JAI1-Access-Key": config.accessKey
       }
@@ -12954,21 +13024,13 @@ Current IDE(s): ${currentIdes.join(", ") || "none"}`);
       throw new Error(`Failed to fetch preset: ${presetResponse.statusText}`);
     }
     const bundle = await presetResponse.json();
-    const rulePresetDir = join13(process.cwd(), ".jai1", "rule-preset");
-    const presetExists = await checkPathExists(rulePresetDir);
-    if (presetExists) {
-      const files = await fs22.readdir(rulePresetDir);
-      for (const file of files) {
-        if (file.endsWith(".mdc")) {
-          const filePath = join13(rulePresetDir, file);
-          const content = await fs22.readFile(filePath, "utf-8");
-          bundle.files[file] = content;
-        }
+    const files = await fs23.readdir(rulePresetDir);
+    for (const file of files) {
+      if (file.endsWith(".mdc") || file.endsWith(".md")) {
+        const filePath = join14(rulePresetDir, file);
+        const content = await fs23.readFile(filePath, "utf-8");
+        bundle.files[file] = content;
       }
-    } else {
-      console.log("\n\u26A0\uFE0F  No rule preset found in .jai1/rule-preset/");
-      console.log('   Run "jai1 rules apply" first to apply a preset.\n');
-      return;
     }
     const generatorService = new RulesGeneratorService();
     for (const ideId of idesToSync) {
@@ -12978,25 +13040,21 @@ Current IDE(s): ${currentIdes.join(", ") || "none"}`);
           console.log(`\u26A0\uFE0F  Unknown IDE format: ${ideId}, skipping`);
           continue;
         }
-        const files = generatorService.generateForIde(bundle, ideId);
-        for (const file of files) {
-          const fullPath = join13(process.cwd(), file.path);
-          await fs22.mkdir(join13(fullPath, ".."), { recursive: true });
-          await fs22.writeFile(fullPath, file.content, "utf-8");
+        const files2 = generatorService.generateForIde(bundle, ideId);
+        for (const file of files2) {
+          const fullPath = join14(process.cwd(), file.path);
+          await fs23.mkdir(join14(fullPath, ".."), { recursive: true });
+          await fs23.writeFile(fullPath, file.content, "utf-8");
         }
-        console.log(`\u2713 ${format.name} - ${files.length} files regenerated`);
+        console.log(`\u2713 ${format.name} - ${files2.length} files regenerated`);
       } catch (error) {
         console.error(`\u2717 Failed to sync ${ideId}:`, error);
       }
     }
-    if (JSON.stringify(projectConfig.ides) !== JSON.stringify(idesToSync)) {
-      projectConfig.ides = idesToSync;
-      await fs22.writeFile(
-        join13(process.cwd(), "jai1-rules.json"),
-        JSON.stringify(projectConfig, null, 2),
-        "utf-8"
-      );
-      console.log("\n\u2713 Updated jai1-rules.json with synced IDEs");
+    if (JSON.stringify(rulesConfig.ides) !== JSON.stringify(idesToSync)) {
+      rulesConfig.ides = idesToSync;
+      await projectConfigService.saveRules(rulesConfig);
+      console.log("\n\u2713 Updated .jai1/project.json with synced IDEs");
     }
     console.log("\n\u2705 Rules synced successfully!\n");
     console.log("\u{1F4A1} Next steps:");
@@ -13036,48 +13094,43 @@ function buildIdeChoices(currentIdes, detected, suggestions) {
       name: "Gemini CLI (GEMINI.md)",
       value: "gemini",
       checked: currentIdes.includes("gemini") || detected.some((d) => d.id === "gemini")
+    },
+    new Separator(),
+    {
+      name: "\u2716 Quit",
+      value: "__quit__",
+      checked: false
     }
   ];
   return choices;
 }
-async function checkPathExists(absolutePath) {
-  try {
-    await fs22.access(absolutePath);
-    return true;
-  } catch {
-    return false;
-  }
-}
 
 // src/commands/rules/info.ts
 import { Command as Command48 } from "commander";
-import { promises as fs23 } from "fs";
-import { join as join14 } from "path";
+import { promises as fs24 } from "fs";
+import { join as join15 } from "path";
 function createRulesInfoCommand() {
   return new Command48("info").description("Show current preset information").option("--json", "Output as JSON").action(async (options) => {
-    const configPath = join14(process.cwd(), "jai1-rules.json");
-    let projectConfig;
-    try {
-      const configContent = await fs23.readFile(configPath, "utf-8");
-      projectConfig = JSON.parse(configContent);
-    } catch {
+    const projectConfigService = new ProjectConfigService();
+    const rulesConfig = await projectConfigService.loadRules();
+    if (!rulesConfig) {
       throw new ValidationError(
-        'No jai1-rules.json found. Run "jai1 rules init" first.'
+        'No .jai1/project.json found. Run "jai1 rules apply" first.'
       );
     }
     if (options.json) {
-      console.log(JSON.stringify(projectConfig, null, 2));
+      console.log(JSON.stringify(rulesConfig, null, 2));
       return;
     }
     console.log("\u{1F4CB} Current Preset Information\n");
-    const rulePresetDir = join14(process.cwd(), ".jai1", "rule-preset");
-    const presetJsonPath = join14(rulePresetDir, "preset.json");
+    const rulePresetDir = join15(process.cwd(), ".jai1", "rule-preset");
+    const presetJsonPath = join15(rulePresetDir, "preset.json");
     let presetMetadata = null;
     let presetFiles = [];
     try {
-      const presetContent = await fs23.readFile(presetJsonPath, "utf-8");
+      const presetContent = await fs24.readFile(presetJsonPath, "utf-8");
       presetMetadata = JSON.parse(presetContent);
-      const files = await fs23.readdir(rulePresetDir);
+      const files = await fs24.readdir(rulePresetDir);
       presetFiles = files.filter((f) => f.endsWith(".mdc"));
     } catch {
     }
@@ -13089,10 +13142,10 @@ function createRulesInfoCommand() {
         console.log(`Tags:         ${presetMetadata.tags.join(", ")}`);
       }
     } else {
-      console.log(`Preset:       ${projectConfig.preset}`);
-      console.log(`Version:      ${projectConfig.version}`);
+      console.log(`Preset:       ${rulesConfig.preset}`);
+      console.log(`Version:      ${rulesConfig.version}`);
     }
-    console.log(`Applied at:   ${new Date(projectConfig.appliedAt).toLocaleString()}`);
+    console.log(`Applied at:   ${new Date(rulesConfig.appliedAt).toLocaleString()}`);
     console.log(`
 Source of Truth:`);
     if (presetFiles.length > 0) {
@@ -13107,10 +13160,10 @@ Source of Truth:`);
       console.log(`  \u26A0\uFE0F  .jai1/rule-preset/ not found`);
       console.log(`     Run "jai1 rules apply" to create it`);
     }
-    if (projectConfig.ides && projectConfig.ides.length > 0) {
+    if (rulesConfig.ides && rulesConfig.ides.length > 0) {
       console.log(`
-Configured IDEs (${projectConfig.ides.length}):`);
-      for (const ideId of projectConfig.ides) {
+Configured IDEs (${rulesConfig.ides.length}):`);
+      for (const ideId of rulesConfig.ides) {
         const format = IDE_FORMATS[ideId];
         if (format) {
           const exists = await checkIdeFilesExist(ideId, format);
@@ -13119,15 +13172,15 @@ Configured IDEs (${projectConfig.ides.length}):`);
         }
       }
     }
-    if (projectConfig.backups && projectConfig.backups.length > 0) {
+    if (rulesConfig.backups && rulesConfig.backups.length > 0) {
       console.log(`
-Available Backups (${projectConfig.backups.length}):`);
-      for (const backup of projectConfig.backups.slice(0, 3)) {
+Available Backups (${rulesConfig.backups.length}):`);
+      for (const backup of rulesConfig.backups.slice(0, 3)) {
         const timestamp = new Date(backup.timestamp).toLocaleString();
         console.log(`  \u2022 ${timestamp} - IDEs: ${backup.ides.join(", ")}`);
       }
-      if (projectConfig.backups.length > 3) {
-        console.log(`  ... and ${projectConfig.backups.length - 3} more`);
+      if (rulesConfig.backups.length > 3) {
+        console.log(`  ... and ${rulesConfig.backups.length - 3} more`);
       }
     }
     console.log("\n\u2139\uFE0F  Commands:");
@@ -13136,9 +13189,9 @@ Available Backups (${projectConfig.backups.length}):`);
     console.log('  \u2022 "jai1 rules apply" - Apply a different preset (replaces current)');
   });
 }
-async function checkPathExists2(path13) {
+async function checkPathExists(path13) {
   try {
-    await fs23.access(join14(process.cwd(), path13));
+    await fs24.access(join15(process.cwd(), path13));
     return true;
   } catch {
     return false;
@@ -13147,11 +13200,11 @@ async function checkPathExists2(path13) {
 async function checkIdeFilesExist(ideId, format) {
   try {
     if (ideId === "agentsmd") {
-      return await checkPathExists2("AGENTS.md");
+      return await checkPathExists("AGENTS.md");
     } else if (ideId === "gemini") {
-      return await checkPathExists2("GEMINI.md");
+      return await checkPathExists("GEMINI.md");
     } else {
-      return await checkPathExists2(format.rulesPath);
+      return await checkPathExists(format.rulesPath);
     }
   } catch {
     return false;
@@ -13167,7 +13220,7 @@ function showRulesHelp() {
   console.log(`  ${chalk17.cyan("info")}      Xem chi ti\u1EBFt m\u1ED9t preset`);
   console.log(`  ${chalk17.cyan("init")}      Kh\u1EDFi t\u1EA1o rules t\u1EEB preset`);
   console.log(`  ${chalk17.cyan("apply")}     \xC1p d\u1EE5ng preset v\xE0o project`);
-  console.log(`  ${chalk17.cyan("sync")}      \u0110\u1ED3ng b\u1ED9 rules v\u1EDBi server`);
+  console.log(`  ${chalk17.cyan("sync")}      \u0110\u1ED3ng b\u1ED9 rules sang c\xE1c \u0111\u1ECBnh d\u1EA1ng IDE`);
   console.log(`  ${chalk17.cyan("restore")}   Kh\xF4i ph\u1EE5c rules t\u1EEB backup`);
   console.log();
   console.log(chalk17.bold("V\xED d\u1EE5:"));
@@ -13354,7 +13407,7 @@ function getInstallCommand(packageManager2) {
 // src/commands/clean.ts
 import { Command as Command51 } from "commander";
 import { confirm as confirm12, select as select7 } from "@inquirer/prompts";
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 function createCleanCommand() {
   return new Command51("clean").description("Clean up backups, cache, and temporary files").option("-y, --yes", "Skip confirmation").option("--backups", "Clean only backup files").option("--all", "Clean all (backups + cache)").action(async (options) => {
     await handleClean(options);
@@ -13367,7 +13420,7 @@ async function handleClean(options) {
     {
       name: "Backups",
       description: "Component backup files (.jai1_backup/)",
-      path: join15(cwd, ".jai1_backup"),
+      path: join16(cwd, ".jai1_backup"),
       check: async () => {
         const backups = await service.listBackups(cwd);
         return { exists: backups.length > 0, count: backups.length };
@@ -13426,7 +13479,8 @@ async function handleClean(options) {
       })),
       { name: "\u{1F9F9} Clean all", value: "all" },
       { name: "\u274C Cancel", value: "cancel" }
-    ]
+    ],
+    theme: selectTheme
   });
   if (action === "cancel") {
     console.log("\n\u274C Operation cancelled.");
@@ -14358,8 +14412,8 @@ async function handleSyncProject(options) {
 
 // src/commands/framework/info.ts
 import { Command as Command55 } from "commander";
-import { promises as fs24 } from "fs";
-import { join as join16 } from "path";
+import { promises as fs25 } from "fs";
+import { join as join17 } from "path";
 import { homedir as homedir5 } from "os";
 function createInfoCommand() {
   const cmd = new Command55("info").description("Show jai1-client configuration and status").option("--json", "Output as JSON").option("--verbose", "Show detailed information").action(async (options) => {
@@ -14373,7 +14427,7 @@ async function handleInfo(options) {
   if (!config) {
     throw new ValidationError('Not initialized. Run "jai1 auth" first.');
   }
-  const frameworkPath = join16(homedir5(), ".jai1", "framework");
+  const frameworkPath = join17(homedir5(), ".jai1", "framework");
   const projectStatus = await getProjectStatus2();
   const info = {
     configPath: configService.getConfigPath(),
@@ -14408,9 +14462,9 @@ function maskKey3(key) {
   return "****" + key.slice(-4);
 }
 async function getProjectStatus2() {
-  const projectJai1 = join16(process.cwd(), ".jai1");
+  const projectJai1 = join17(process.cwd(), ".jai1");
   try {
-    await fs24.access(projectJai1);
+    await fs25.access(projectJai1);
     return { exists: true, version: "Synced" };
   } catch {
     return { exists: false };
@@ -14600,7 +14654,7 @@ function createClearBackupsCommand() {
 // src/commands/vscode/index.ts
 import { Command as Command58 } from "commander";
 import { checkbox as checkbox7, confirm as confirm15, select as select8 } from "@inquirer/prompts";
-import fs25 from "fs/promises";
+import fs26 from "fs/promises";
 import path12 from "path";
 import { existsSync as existsSync3 } from "fs";
 var PERFORMANCE_GROUPS2 = {
@@ -14789,7 +14843,8 @@ async function interactiveMode2() {
       { name: "\u274C Disable c\xE1c nh\xF3m t\u1ED1i \u01B0u", value: "disable" },
       { name: "\u{1F680} Max Performance (enable t\u1EA5t c\u1EA3)", value: "max" },
       { name: "\u{1F504} Reset v\u1EC1 m\u1EB7c \u0111\u1ECBnh", value: "reset" }
-    ]
+    ],
+    theme: selectTheme
   });
   if (action === "max") {
     const allGroups = Object.keys(PERFORMANCE_GROUPS2);
@@ -14808,7 +14863,8 @@ async function selectGroupsToApply2(action) {
   try {
     const selectedGroups = await checkbox7({
       message: `Ch\u1ECDn c\xE1c nh\xF3m \u0111\u1EC3 ${action === "enable" ? "enable" : "disable"} (SPACE \u0111\u1EC3 ch\u1ECDn, ENTER \u0111\u1EC3 x\xE1c nh\u1EADn):`,
-      choices
+      choices,
+      theme: checkboxTheme
     });
     if (selectedGroups.length === 0) {
       console.log("\n\u26A0\uFE0F  B\u1EA1n ch\u01B0a ch\u1ECDn nh\xF3m n\xE0o!");
@@ -14831,13 +14887,13 @@ async function applyGroups2(groupKeys, action) {
     return;
   }
   if (!existsSync3(vscodeDir)) {
-    await fs25.mkdir(vscodeDir, { recursive: true });
+    await fs26.mkdir(vscodeDir, { recursive: true });
     console.log("\u{1F4C1} \u0110\xE3 t\u1EA1o th\u01B0 m\u1EE5c .vscode/");
   }
   let currentSettings = {};
   if (existsSync3(settingsPath)) {
     try {
-      const content = await fs25.readFile(settingsPath, "utf-8");
+      const content = await fs26.readFile(settingsPath, "utf-8");
       currentSettings = JSON.parse(content);
       console.log("\u{1F4C4} \u0110\xE3 \u0111\u1ECDc c\xE0i \u0111\u1EB7t hi\u1EC7n t\u1EA1i t\u1EEB settings.json");
     } catch {
@@ -14877,7 +14933,7 @@ async function applyGroups2(groupKeys, action) {
       }
     }
   }
-  await fs25.writeFile(settingsPath, JSON.stringify(newSettings, null, 2));
+  await fs26.writeFile(settingsPath, JSON.stringify(newSettings, null, 2));
   console.log(`
 \u2705 \u0110\xE3 c\u1EADp nh\u1EADt c\xE0i \u0111\u1EB7t VSCode t\u1EA1i: ${settingsPath}`);
   console.log("\u{1F4A1} M\u1EB9o: Kh\u1EDFi \u0111\u1ED9ng l\u1EA1i VSCode \u0111\u1EC3 \xE1p d\u1EE5ng c\xE1c thay \u0111\u1ED5i.");
@@ -14898,7 +14954,7 @@ async function resetSettings2(groupKeys) {
     return;
   }
   if (groupKeys.length === 0) {
-    await fs25.unlink(settingsPath);
+    await fs26.unlink(settingsPath);
     console.log("\n\u2705 \u0110\xE3 x\xF3a file settings.json");
   } else {
     await applyGroups2(groupKeys, "disable");
@@ -15021,7 +15077,8 @@ async function runMigrateIde(options) {
     });
     selectedIdes = await checkbox8({
       message: "Ch\u1ECDn IDE(s) \u0111\u1EC3 migrate (SPACE \u0111\u1EC3 ch\u1ECDn, ENTER \u0111\u1EC3 x\xE1c nh\u1EADn):",
-      choices: ideChoices
+      choices: ideChoices,
+      theme: checkboxTheme
     });
     if (selectedIdes.length === 0) {
       console.log("\n\u26A0\uFE0F  B\u1EA1n ch\u01B0a ch\u1ECDn IDE n\xE0o!");
@@ -15040,7 +15097,8 @@ async function runMigrateIde(options) {
     ];
     selectedTypes = await checkbox8({
       message: "Ch\u1ECDn content types \u0111\u1EC3 migrate:",
-      choices: typeChoices
+      choices: typeChoices,
+      theme: checkboxTheme
     });
     if (selectedTypes.length === 0) {
       console.log("\n\u26A0\uFE0F  B\u1EA1n ch\u01B0a ch\u1ECDn content type n\xE0o!");