aiblueprint-cli 1.4.51 → 1.4.53

package/dist/cli.js

@@ -32264,8 +32264,8 @@ var lib_default = inquirer;
 
 // src/commands/setup.ts
 var import_fs_extra8 = __toESM(require_lib4(), 1);
-import path11 from "path";
-import os11 from "os";
+import path12 from "path";
+import os12 from "os";
 
 // node_modules/chalk/source/vendor/ansi-styles/index.js
 var ANSI_BACKGROUND_OFFSET = 10;
@@ -33142,7 +33142,7 @@ async function resolveConfigDir(repoPath) {
   }
   return null;
 }
-var CONFIG_FOLDER_CANDIDATES = ["ai-coding", "claude-code-config", "ai-config"];
+var CONFIG_FOLDER_CANDIDATES = ["agents-config", "ai-coding", "claude-code-config", "ai-config"];
 
 // src/lib/version.ts
 import { readFileSync as readFileSync2 } from "fs";
@@ -33535,10 +33535,21 @@ async function flushTelemetry() {
 var import_fs_extra7 = __toESM(require_lib4(), 1);
 import os10 from "os";
 import path10 from "path";
-var AGENT_CATEGORIES = ["skills"];
-function getAgentsDir(custom) {
-  return custom ? path10.resolve(custom) : path10.join(os10.homedir(), ".agents");
+async function applyPathPlaceholders(target, claudeDir) {
+  const stat = await import_fs_extra7.default.stat(target).catch(() => null);
+  if (!stat)
+    return;
+  if (stat.isDirectory()) {
+    await replacePathPlaceholdersInDir(target, claudeDir);
+  } else if (isTextFile(target)) {
+    const content = await import_fs_extra7.default.readFile(target, "utf-8");
+    const replaced = replaceClaudePathPlaceholder(content, claudeDir);
+    if (replaced !== content) {
+      await import_fs_extra7.default.writeFile(target, replaced, "utf-8");
+    }
+  }
 }
+var AGENT_CATEGORIES = ["skills", "agents"];
 async function platformSymlink(source, target) {
   await import_fs_extra7.default.ensureDir(path10.dirname(target));
   const isWindows2 = os10.platform() === "win32";
@@ -33581,13 +33592,13 @@ async function installCategoryToAgents(sourceCategoryDir, category, agentsDir, c
       }
       if (!migrated) {
         await import_fs_extra7.default.copy(sourcePath, agentsTarget, { overwrite: false });
-        await replacePathPlaceholdersInDir(agentsTarget, claudeDir);
+        await applyPathPlaceholders(agentsTarget, claudeDir);
         result.copied.push(entry.name);
       }
     } else if (options.overwrite) {
       await import_fs_extra7.default.remove(agentsTarget);
       await import_fs_extra7.default.copy(sourcePath, agentsTarget, { overwrite: false });
-      await replacePathPlaceholdersInDir(agentsTarget, claudeDir);
+      await applyPathPlaceholders(agentsTarget, claudeDir);
       result.copied.push(entry.name);
     }
   }
@@ -33641,15 +33652,38 @@ function isAgentCategory(category) {
   return AGENT_CATEGORIES.includes(category);
 }
 
+// src/lib/folder-paths.ts
+import os11 from "os";
+import path11 from "path";
+function resolveFolders(options = {}) {
+  const rootDir = options.folder ? path11.resolve(options.folder) : os11.homedir();
+  const claudeDir = options.claudeCodeFolder ? path11.resolve(options.claudeCodeFolder) : path11.join(rootDir, ".claude");
+  const codexDir = options.codexFolder ? path11.resolve(options.codexFolder) : path11.join(rootDir, ".codex");
+  const agentsDir = options.agentsFolder ? path11.resolve(options.agentsFolder) : path11.join(rootDir, ".agents");
+  return { rootDir, claudeDir, codexDir, agentsDir };
+}
+
 // src/commands/setup.ts
 var __filename2 = fileURLToPath2(import.meta.url);
 var __dirname2 = dirname2(__filename2);
+async function resolveClaudeAssetPath(sourceDir, name) {
+  const candidates = [
+    path12.join(sourceDir, "claude-config", name),
+    path12.join(sourceDir, name)
+  ];
+  for (const candidate of candidates) {
+    if (await import_fs_extra8.default.pathExists(candidate))
+      return candidate;
+  }
+  return null;
+}
 async function setupCommand(params = {}) {
   const {
-    claudeCodeFolder: customClaudeCodeFolder,
-    codexFolder: customCodexFolder,
-    openCodeFolder: customOpenCodeFolder,
-    agentsFolder: customAgentsFolder,
+    folder,
+    claudeCodeFolder,
+    codexFolder,
+    openCodeFolder,
+    agentsFolder,
     skipInteractive
   } = params;
   let repoPath = null;
@@ -33704,7 +33738,7 @@ async function setupCommand(params = {}) {
             },
             {
               value: "codexSymlink",
-              name: "Codex symlink - Link commands to ~/.codex/prompts",
+              name: "Codex symlink - Link commands/skills/agents to ~/.codex",
               checked: false
             },
             {
@@ -33732,10 +33766,15 @@ async function setupCommand(params = {}) {
       skipInteractive
     };
     const s = new SimpleSpinner;
-    const claudeDir = customClaudeCodeFolder ? path11.resolve(customClaudeCodeFolder) : path11.join(os11.homedir(), ".claude");
-    const agentsDir = getAgentsDir(customAgentsFolder);
-    console.log(source_default.gray(`Installing to: ${claudeDir}`));
-    console.log(source_default.gray(`Skills source: ${agentsDir}/skills`));
+    const { claudeDir, codexDir, agentsDir } = resolveFolders({
+      folder,
+      claudeCodeFolder,
+      codexFolder,
+      agentsFolder
+    });
+    console.log(source_default.gray(`Claude:  ${claudeDir}`));
+    console.log(source_default.gray(`Codex:   ${codexDir}`));
+    console.log(source_default.gray(`Agents:  ${agentsDir}`));
     await import_fs_extra8.default.ensureDir(claudeDir);
     await import_fs_extra8.default.ensureDir(agentsDir);
     s.start("Creating backup of existing configuration");
@@ -33753,7 +33792,7 @@ async function setupCommand(params = {}) {
     const sourceDir = await resolveConfigDir(repoPath);
     if (!sourceDir) {
       await cleanupRepository(repoPath);
-      throw new Error("Configuration directory not found in cloned repository (looked for ai-coding/, claude-code-config/, and ai-config/)");
+      throw new Error("Configuration directory not found in cloned repository (looked for agents-config/, ai-coding/, claude-code-config/, and ai-config/)");
     }
     s.stop("Repository cloned successfully");
     if (options.shellShortcuts) {
@@ -33763,43 +33802,50 @@ async function setupCommand(params = {}) {
     }
     if (options.customStatusline) {
       s.start("Setting up scripts");
-      await import_fs_extra8.default.copy(path11.join(sourceDir, "scripts"), path11.join(claudeDir, "scripts"), { overwrite: true });
-      await replacePathPlaceholdersInDir(path11.join(claudeDir, "scripts"), claudeDir);
-      if (options.customStatusline) {
-        await import_fs_extra8.default.ensureDir(path11.join(claudeDir, "scripts/statusline/data"));
+      const scriptsSource = await resolveClaudeAssetPath(sourceDir, "scripts");
+      if (scriptsSource) {
+        await import_fs_extra8.default.copy(scriptsSource, path12.join(claudeDir, "scripts"), {
+          overwrite: true
+        });
+        await replacePathPlaceholdersInDir(path12.join(claudeDir, "scripts"), claudeDir);
+        await import_fs_extra8.default.ensureDir(path12.join(claudeDir, "scripts/statusline/data"));
+        s.stop("Scripts installed");
+      } else {
+        s.stop("Scripts not available in repository");
       }
-      s.stop("Scripts installed");
     }
     if (options.aiblueprintCommands) {
       s.start("Setting up AIBlueprint commands");
-      const commandsSourcePath = path11.join(sourceDir, "commands");
-      if (await import_fs_extra8.default.pathExists(commandsSourcePath)) {
-        await import_fs_extra8.default.copy(commandsSourcePath, path11.join(claudeDir, "commands"), { overwrite: true });
-        await replacePathPlaceholdersInDir(path11.join(claudeDir, "commands"), claudeDir);
+      const commandsSource = await resolveClaudeAssetPath(sourceDir, "commands");
+      if (commandsSource) {
+        await import_fs_extra8.default.copy(commandsSource, path12.join(claudeDir, "commands"), {
+          overwrite: true
+        });
+        await replacePathPlaceholdersInDir(path12.join(claudeDir, "commands"), claudeDir);
         s.stop("Commands installed");
       } else {
         s.stop("Commands not available in repository");
       }
     }
-    if (options.codexSymlink && options.aiblueprintCommands) {
-      s.start("Setting up Codex symlink");
-      await setupCodexSymlink(claudeDir, customCodexFolder, customClaudeCodeFolder);
-      s.stop("Codex symlink configured");
-    }
-    if (options.openCodeSymlink && options.aiblueprintCommands) {
-      s.start("Setting up OpenCode symlink");
-      await setupOpenCodeSymlink(claudeDir, customOpenCodeFolder, customClaudeCodeFolder);
-      s.stop("OpenCode symlink configured");
-    }
     if (options.aiblueprintAgents) {
       s.start("Setting up AIBlueprint agents");
-      await import_fs_extra8.default.copy(path11.join(sourceDir, "agents"), path11.join(claudeDir, "agents"), { overwrite: true });
-      await replacePathPlaceholdersInDir(path11.join(claudeDir, "agents"), claudeDir);
-      s.stop("Agents installed");
+      const agentsSource = path12.join(sourceDir, "agents");
+      if (await import_fs_extra8.default.pathExists(agentsSource)) {
+        const installResult = await installCategoryToAgents(agentsSource, "agents", agentsDir, claudeDir, { migrateClaudeDirs: true, silent: true });
+        const summary = [
+          installResult.copied.length && `${installResult.copied.length} copied`,
+          installResult.migrated.length && `${installResult.migrated.length} migrated`,
+          installResult.symlinked.length && `${installResult.symlinked.length} linked`,
+          installResult.skipped.length && `${installResult.skipped.length} skipped`
+        ].filter(Boolean).join(", ");
+        s.stop(`Agents installed${summary ? ` (${summary})` : ""}`);
+      } else {
+        s.stop("Agents not available in repository");
+      }
     }
     if (options.aiblueprintSkills) {
       s.start("Setting up AIBlueprint Skills");
-      const skillsSourcePath = path11.join(sourceDir, "skills");
+      const skillsSourcePath = path12.join(sourceDir, "skills");
       if (await import_fs_extra8.default.pathExists(skillsSourcePath)) {
         const installResult = await installCategoryToAgents(skillsSourcePath, "skills", agentsDir, claudeDir, { migrateClaudeDirs: true, silent: true });
         const summary = [
@@ -33818,6 +33864,28 @@ async function setupCommand(params = {}) {
         s.stop("Skills not available in repository");
       }
     }
+    if (options.codexSymlink) {
+      s.start("Setting up Codex configuration");
+      const codexConfigSource = path12.join(sourceDir, "codex-config");
+      if (await import_fs_extra8.default.pathExists(codexConfigSource)) {
+        await import_fs_extra8.default.copy(codexConfigSource, codexDir, { overwrite: false });
+      }
+      if (options.aiblueprintCommands) {
+        await setupCodexSymlink(claudeDir, codexDir, claudeCodeFolder);
+      }
+      if (options.aiblueprintSkills) {
+        await syncCategorySymlinks("skills", agentsDir, codexDir, undefined, true);
+      }
+      if (options.aiblueprintAgents) {
+        await syncCategorySymlinks("agents", agentsDir, codexDir, undefined, true);
+      }
+      s.stop("Codex configured");
+    }
+    if (options.openCodeSymlink && options.aiblueprintCommands) {
+      s.start("Setting up OpenCode symlink");
+      await setupOpenCodeSymlink(claudeDir, openCodeFolder, claudeCodeFolder);
+      s.stop("OpenCode symlink configured");
+    }
     if (options.customStatusline) {
       s.start("Checking dependencies");
       await checkAndInstallDependencies();
@@ -33854,7 +33922,7 @@ async function setupCommand(params = {}) {
     console.log(source_default.gray(`
 Next steps:`));
     if (options.shellShortcuts) {
-      const platform = os11.platform();
+      const platform = os12.platform();
       if (platform === "win32") {
         console.log(source_default.gray("  • Restart PowerShell to load the new functions"));
       } else {
@@ -33881,8 +33949,8 @@ Next steps:`));
 
 // src/commands/setup-terminal.ts
 var import_fs_extra9 = __toESM(require_lib4(), 1);
-import path12 from "path";
-import os12 from "os";
+import path13 from "path";
+import os13 from "os";
 import { execSync as execSync3, exec as exec2 } from "child_process";
 var OHMYZSH_INSTALL_URL = "https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh";
 var INSTALL_TIMEOUT = 120000;
@@ -33916,7 +33984,7 @@ function commandExists(cmd) {
   }
 }
 function isOhMyZshInstalled(homeDir) {
-  const ohMyZshDir = path12.join(homeDir, ".oh-my-zsh");
+  const ohMyZshDir = path13.join(homeDir, ".oh-my-zsh");
   return import_fs_extra9.default.existsSync(ohMyZshDir);
 }
 function backupFile(filePath) {
@@ -33964,7 +34032,7 @@ function installPrerequisiteSync(packageName, installCmd) {
 async function installOhMyZsh(homeDir) {
   return new Promise((resolve, reject) => {
     const installCmd = `sh -c "$(curl -fsSL ${OHMYZSH_INSTALL_URL})" "" --unattended`;
-    const env2 = { ...process.env, HOME: homeDir, ZSH: path12.join(homeDir, ".oh-my-zsh") };
+    const env2 = { ...process.env, HOME: homeDir, ZSH: path13.join(homeDir, ".oh-my-zsh") };
     exec2(installCmd, { timeout: INSTALL_TIMEOUT, env: env2 }, (error, stdout, stderr) => {
       if (error) {
         if ("killed" in error && error.killed) {
@@ -33985,7 +34053,7 @@ async function installPlugin(pluginName, repoUrl, homeDir) {
   if (!/^https:\/\/github\.com\/[\w-]+\/[\w-]+$/.test(repoUrl)) {
     throw new Error(`Invalid repository URL: ${repoUrl}`);
   }
-  const customPluginsDir = path12.join(homeDir, ".oh-my-zsh/custom/plugins", pluginName);
+  const customPluginsDir = path13.join(homeDir, ".oh-my-zsh/custom/plugins", pluginName);
   if (import_fs_extra9.default.existsSync(customPluginsDir)) {
     return;
   }
@@ -34004,7 +34072,7 @@ async function installPlugin(pluginName, repoUrl, homeDir) {
   });
 }
 function updateZshrcTheme(theme, homeDir) {
-  const zshrcPath = path12.join(homeDir, ".zshrc");
+  const zshrcPath = path13.join(homeDir, ".zshrc");
   const sanitizedTheme = sanitizeThemeName(theme);
   if (!import_fs_extra9.default.existsSync(zshrcPath)) {
     throw new Error(".zshrc file not found. Please ensure Oh My ZSH is installed correctly.");
@@ -34026,7 +34094,7 @@ ${content}`;
   }
 }
 function updateZshrcPlugins(plugins, homeDir) {
-  const zshrcPath = path12.join(homeDir, ".zshrc");
+  const zshrcPath = path13.join(homeDir, ".zshrc");
   if (!import_fs_extra9.default.existsSync(zshrcPath)) {
     throw new Error(".zshrc file not found. Please ensure Oh My ZSH is installed correctly.");
   }
@@ -34049,7 +34117,7 @@ plugins=(${pluginsString})`;
 }
 async function setupTerminalCommand(options = {}) {
   const { skipInteractive, homeDir: customHomeDir } = options;
-  const homeDir = customHomeDir || os12.homedir();
+  const homeDir = customHomeDir || os13.homedir();
   try {
     console.log(source_default.blue.bold(`
 \uD83D\uDDA5️  AIBlueprint Terminal Setup ${source_default.gray(`v${getVersion()}`)}
@@ -34146,7 +34214,7 @@ Installing missing prerequisites: ${missingPrereqs.join(", ")}`));
         selectedTheme = themeAnswer.theme;
       }
     }
-    const zshrcPath = path12.join(homeDir, ".zshrc");
+    const zshrcPath = path13.join(homeDir, ".zshrc");
     if (import_fs_extra9.default.existsSync(zshrcPath)) {
       s.start("Backing up .zshrc");
       const backupPath = backupFile(zshrcPath);
@@ -34313,9 +34381,14 @@ async function symlinkCommand(params = {}) {
       }
     ]);
     const selectedDestinations = destinationAnswer.destinations;
+    const { claudeDir, codexDir } = resolveFolders({
+      folder: params.folder,
+      claudeCodeFolder: params.claudeCodeFolder,
+      codexFolder: params.codexFolder
+    });
     const customFolders = {
-      "claude-code": params.claudeCodeFolder,
-      codex: params.codexFolder,
+      "claude-code": claudeDir,
+      codex: codexDir,
       opencode: params.openCodeFolder,
       factoryai: params.factoryAiFolder
     };
@@ -35078,28 +35151,38 @@ var Y2 = ({ indicator: t = "dots" } = {}) => {
 };
 
 // src/commands/pro.ts
-import os15 from "os";
-import path15 from "path";
+import path16 from "path";
 
 // src/lib/pro-installer.ts
 var import_fs_extra10 = __toESM(require_lib4(), 1);
-import os13 from "os";
-import path13 from "path";
+import os14 from "os";
+import path14 from "path";
 import { exec as exec3 } from "child_process";
 import { promisify as promisify2 } from "util";
 var execAsync2 = promisify2(exec3);
 var PREMIUM_REPO = "Melvynx/aiblueprint-cli-premium";
 var PREMIUM_BRANCH = "main";
-var CONFIG_FOLDER_CANDIDATES2 = ["ai-coding", "claude-code-config", "ai-config"];
-function resolveBaseDir(relativePath, claudeDir, agentsDir) {
-  const firstSeg = relativePath.split(path13.sep)[0];
-  if (isAgentCategory(firstSeg)) {
-    return { base: agentsDir, isAgentTarget: true };
+var CONFIG_FOLDER_CANDIDATES2 = ["agents-config", "ai-coding", "claude-code-config", "ai-config"];
+function routePath(relativePath) {
+  const segments = relativePath.split(path14.sep);
+  const first = segments[0];
+  const rest = segments.slice(1).join(path14.sep);
+  if (first === "claude-config") {
+    return { kind: "claude", relativePath: rest };
+  }
+  if (first === "codex-config") {
+    return { kind: "codex", relativePath: rest };
+  }
+  if (isAgentCategory(first)) {
+    return { kind: "agents-category", category: first, relativePath };
   }
-  return { base: claudeDir, isAgentTarget: false };
+  if (first === ".claude") {
+    return { kind: "claude", relativePath: rest };
+  }
+  return { kind: "claude", relativePath };
 }
 function getCacheRepoDir() {
-  return path13.join(os13.homedir(), ".config", "aiblueprint", "pro-repos", "aiblueprint-cli-premium");
+  return path14.join(os14.homedir(), ".config", "aiblueprint", "pro-repos", "aiblueprint-cli-premium");
 }
 async function execGitWithAuth(command, token, repoUrl, cwd) {
   const authenticatedUrl = `https://x-access-token:${token}@${repoUrl.replace(/^https?:\/\//, "")}`;
@@ -35113,57 +35196,53 @@ async function execGitWithAuth(command, token, repoUrl, cwd) {
 async function cloneOrUpdateRepo(token) {
   const cacheDir = getCacheRepoDir();
   const repoUrl = `https://github.com/${PREMIUM_REPO}.git`;
-  if (await import_fs_extra10.default.pathExists(path13.join(cacheDir, ".git"))) {
+  if (await import_fs_extra10.default.pathExists(path14.join(cacheDir, ".git"))) {
     try {
       await execGitWithAuth("pull", token, repoUrl, cacheDir);
     } catch (error) {
       await import_fs_extra10.default.remove(cacheDir);
-      await import_fs_extra10.default.ensureDir(path13.dirname(cacheDir));
+      await import_fs_extra10.default.ensureDir(path14.dirname(cacheDir));
       await execGitWithAuth(`clone ${repoUrl} ${cacheDir}`, token, repoUrl);
     }
   } else {
-    await import_fs_extra10.default.ensureDir(path13.dirname(cacheDir));
+    await import_fs_extra10.default.ensureDir(path14.dirname(cacheDir));
     await execGitWithAuth(`clone ${repoUrl} ${cacheDir}`, token, repoUrl);
   }
   for (const candidate of CONFIG_FOLDER_CANDIDATES2) {
-    const candidatePath = path13.join(cacheDir, candidate);
+    const candidatePath = path14.join(cacheDir, candidate);
     if (await import_fs_extra10.default.pathExists(candidatePath)) {
       return candidatePath;
     }
   }
-  throw new Error("Premium repo missing config folder (ai-coding or claude-code-config)");
+  throw new Error("Premium repo missing config folder (agents-config, ai-coding, or claude-code-config)");
 }
-async function copyConfigFromCache(cacheConfigDir, claudeDir, agentsDir, onProgress) {
+async function copyConfigFromCache(cacheConfigDir, dest, onProgress) {
   const walk = async (dir, baseDir = dir) => {
     const entries = await import_fs_extra10.default.readdir(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const sourcePath = path13.join(dir, entry.name);
-      const relativePath = path13.relative(baseDir, sourcePath);
-      if (entry.isDirectory() && entry.name === ".claude" && dir === baseDir) {
-        await walk(sourcePath, sourcePath);
+      if (entry.name === ".DS_Store" || entry.name === "node_modules")
         continue;
-      }
-      const { base, isAgentTarget } = resolveBaseDir(relativePath, claudeDir, agentsDir);
-      const targetPath = path13.join(base, relativePath);
-      if (isAgentTarget) {
-        const segments = relativePath.split(path13.sep);
-        if (segments.length >= 2) {
-          const claudeTop = path13.join(claudeDir, segments[0], segments[1]);
-          const claudeStat = await import_fs_extra10.default.lstat(claudeTop).catch(() => null);
-          if (claudeStat && !claudeStat.isSymbolicLink()) {
-            onProgress?.(`${relativePath} (skipped - real dir)`, "file");
-            continue;
-          }
+      const sourcePath = path14.join(dir, entry.name);
+      const relativePath = path14.relative(baseDir, sourcePath);
+      const route = routePath(relativePath);
+      if (route.kind === "skip")
+        continue;
+      if (route.kind === "agents-category") {
+        if (relativePath.split(path14.sep).length === 1) {
+          await copyAgentCategory(sourcePath, route.category, dest.agentsDir, dest.claudeDir, onProgress);
         }
+        continue;
       }
+      const targetBase = route.kind === "claude" ? dest.claudeDir : dest.codexDir;
+      const targetPath = path14.join(targetBase, route.relativePath);
       if (entry.isDirectory()) {
         await import_fs_extra10.default.ensureDir(targetPath);
         onProgress?.(relativePath, "directory");
         await walk(sourcePath, baseDir);
       } else if (isTextFile(entry.name)) {
         const content = await import_fs_extra10.default.readFile(sourcePath, "utf-8");
-        const replaced = replaceClaudePathPlaceholder(content, claudeDir);
-        await import_fs_extra10.default.ensureDir(path13.dirname(targetPath));
+        const replaced = replaceClaudePathPlaceholder(content, dest.claudeDir);
+        await import_fs_extra10.default.ensureDir(path14.dirname(targetPath));
         await import_fs_extra10.default.writeFile(targetPath, replaced, "utf-8");
         onProgress?.(relativePath, "file");
       } else {
@@ -35174,6 +35253,26 @@ async function copyConfigFromCache(cacheConfigDir, claudeDir, agentsDir, onProgr
   };
   await walk(cacheConfigDir);
 }
+async function copyAgentCategory(sourceCategoryDir, category, agentsDir, claudeDir, onProgress) {
+  const agentsCategoryDir = path14.join(agentsDir, category);
+  await import_fs_extra10.default.ensureDir(agentsCategoryDir);
+  const entries = await import_fs_extra10.default.readdir(sourceCategoryDir, { withFileTypes: true });
+  for (const entry of entries) {
+    if (entry.name === ".DS_Store")
+      continue;
+    const src = path14.join(sourceCategoryDir, entry.name);
+    const dst = path14.join(agentsCategoryDir, entry.name);
+    const claudeTop = path14.join(claudeDir, category, entry.name);
+    const claudeStat = await import_fs_extra10.default.lstat(claudeTop).catch(() => null);
+    if (claudeStat && !claudeStat.isSymbolicLink()) {
+      onProgress?.(`${category}/${entry.name} (skipped - real dir in claude)`, "file");
+      continue;
+    }
+    await import_fs_extra10.default.copy(src, dst, { overwrite: true });
+    await replacePathPlaceholdersInDir(dst, claudeDir);
+    onProgress?.(`${category}/${entry.name}`, entry.isDirectory() ? "directory" : "file");
+  }
+}
 async function downloadFromPrivateGitHub(repo, branch, relativePath, targetPath, githubToken) {
   try {
     const url = `https://raw.githubusercontent.com/${repo}/${branch}/${relativePath}`;
@@ -35188,7 +35287,7 @@ async function downloadFromPrivateGitHub(repo, branch, relativePath, targetPath,
       return false;
     }
     const content = await response.arrayBuffer();
-    await import_fs_extra10.default.ensureDir(path13.dirname(targetPath));
+    await import_fs_extra10.default.ensureDir(path14.dirname(targetPath));
     await import_fs_extra10.default.writeFile(targetPath, Buffer.from(content));
     return true;
   } catch (error) {
@@ -35217,8 +35316,8 @@ async function downloadDirectoryFromPrivateGitHub(repo, branch, dirPath, targetD
     await import_fs_extra10.default.ensureDir(targetDir);
     for (const file of files) {
       const relativePath = dirPath ? `${dirPath}/${file.name}` : file.name;
-      const targetPath = path13.join(targetDir, file.name);
-      const displayPath = relativePath.replace(/^(ai-coding|claude-code-config|ai-config)\//, "");
+      const targetPath = path14.join(targetDir, file.name);
+      const displayPath = relativePath.replace(/^(agents-config|ai-coding|claude-code-config|ai-config)\//, "");
       if (file.type === "file") {
         onProgress?.(displayPath, "file");
         await downloadFromPrivateGitHub(repo, branch, relativePath, targetPath, githubToken);
@@ -35233,20 +35332,25 @@ async function downloadDirectoryFromPrivateGitHub(repo, branch, dirPath, targetD
   }
 }
 async function installProConfigs(options) {
-  const { githubToken, claudeCodeFolder, agentsFolder, onProgress } = options;
-  const claudeFolder = claudeCodeFolder || path13.join(os13.homedir(), ".claude");
-  const agentsDir = getAgentsDir(agentsFolder);
-  await import_fs_extra10.default.ensureDir(claudeFolder);
+  const { githubToken, folder, claudeCodeFolder, codexFolder, agentsFolder, onProgress } = options;
+  const { claudeDir, codexDir, agentsDir } = resolveFolders({
+    folder,
+    claudeCodeFolder,
+    codexFolder,
+    agentsFolder
+  });
+  await import_fs_extra10.default.ensureDir(claudeDir);
   await import_fs_extra10.default.ensureDir(agentsDir);
+  const dest = { claudeDir, codexDir, agentsDir };
   try {
     const cacheConfigDir = await cloneOrUpdateRepo(githubToken);
-    await copyConfigFromCache(cacheConfigDir, claudeFolder, agentsDir, onProgress);
-    await syncAllAgentSymlinks(agentsDir, claudeFolder);
+    await copyConfigFromCache(cacheConfigDir, dest, onProgress);
+    await syncAllAgentSymlinks(agentsDir, claudeDir);
     return;
   } catch (error) {
     console.warn("Git caching failed, falling back to API download");
   }
-  const tempDir = path13.join(os13.tmpdir(), `aiblueprint-premium-${Date.now()}`);
+  const tempDir = path14.join(os14.tmpdir(), `aiblueprint-premium-${Date.now()}`);
   try {
     let success = false;
     for (const candidate of CONFIG_FOLDER_CANDIDATES2) {
@@ -35257,20 +35361,15 @@ async function installProConfigs(options) {
     if (!success) {
       throw new Error("Failed to download premium configurations");
     }
-    const dotClaudeDir = path13.join(tempDir, ".claude");
-    if (await import_fs_extra10.default.pathExists(dotClaudeDir)) {
-      await import_fs_extra10.default.copy(dotClaudeDir, tempDir, { overwrite: true });
-      await import_fs_extra10.default.remove(dotClaudeDir);
-    }
-    await copyTreeWithRouting(tempDir, claudeFolder, agentsDir);
-    await replacePathPlaceholdersInDir(claudeFolder, claudeFolder);
+    await copyConfigFromCache(tempDir, dest, onProgress);
+    await replacePathPlaceholdersInDir(claudeDir, claudeDir);
     for (const category of AGENT_CATEGORIES) {
-      const agentsCategoryDir = path13.join(agentsDir, category);
+      const agentsCategoryDir = path14.join(agentsDir, category);
       if (await import_fs_extra10.default.pathExists(agentsCategoryDir)) {
-        await replacePathPlaceholdersInDir(agentsCategoryDir, claudeFolder);
+        await replacePathPlaceholdersInDir(agentsCategoryDir, claudeDir);
       }
     }
-    await syncAllAgentSymlinks(agentsDir, claudeFolder);
+    await syncAllAgentSymlinks(agentsDir, claudeDir);
   } catch (error) {
     throw new Error(`Failed to install premium configs: ${error instanceof Error ? error.message : "Unknown error"}`);
   } finally {
@@ -35279,28 +35378,6 @@ async function installProConfigs(options) {
     } catch {}
   }
 }
-async function copyTreeWithRouting(source, claudeDir, agentsDir) {
-  const entries = await import_fs_extra10.default.readdir(source, { withFileTypes: true });
-  for (const entry of entries) {
-    const src = path13.join(source, entry.name);
-    const { base } = resolveBaseDir(entry.name, claudeDir, agentsDir);
-    const dst = path13.join(base, entry.name);
-    if (entry.isDirectory() && isAgentCategory(entry.name)) {
-      const inner = await import_fs_extra10.default.readdir(src, { withFileTypes: true });
-      for (const innerEntry of inner) {
-        const innerSrc = path13.join(src, innerEntry.name);
-        const innerDst = path13.join(dst, innerEntry.name);
-        const claudeTop = path13.join(claudeDir, entry.name, innerEntry.name);
-        const claudeStat = await import_fs_extra10.default.lstat(claudeTop).catch(() => null);
-        if (claudeStat && !claudeStat.isSymbolicLink())
-          continue;
-        await import_fs_extra10.default.copy(innerSrc, innerDst, { overwrite: true });
-      }
-    } else {
-      await import_fs_extra10.default.copy(src, dst, { overwrite: true });
-    }
-  }
-}
 async function syncAllAgentSymlinks(agentsDir, claudeDir) {
   for (const category of AGENT_CATEGORIES) {
     await syncCategorySymlinks(category, agentsDir, claudeDir, undefined, true);
@@ -35309,24 +35386,24 @@ async function syncAllAgentSymlinks(agentsDir, claudeDir) {
 
 // src/lib/token-storage.ts
 var import_fs_extra11 = __toESM(require_lib4(), 1);
-import os14 from "os";
-import path14 from "path";
+import os15 from "os";
+import path15 from "path";
 function getConfigDir() {
-  const platform = os14.platform();
+  const platform = os15.platform();
   if (platform === "win32") {
-    const appData = process.env.APPDATA || path14.join(os14.homedir(), "AppData", "Roaming");
-    return path14.join(appData, "aiblueprint");
+    const appData = process.env.APPDATA || path15.join(os15.homedir(), "AppData", "Roaming");
+    return path15.join(appData, "aiblueprint");
   } else {
-    const configHome = process.env.XDG_CONFIG_HOME || path14.join(os14.homedir(), ".config");
-    return path14.join(configHome, "aiblueprint");
+    const configHome = process.env.XDG_CONFIG_HOME || path15.join(os15.homedir(), ".config");
+    return path15.join(configHome, "aiblueprint");
   }
 }
 function getTokenFilePath2() {
-  return path14.join(getConfigDir(), "token.txt");
+  return path15.join(getConfigDir(), "token.txt");
 }
 async function saveToken(githubToken) {
   const tokenFile = getTokenFilePath2();
-  const configDir = path14.dirname(tokenFile);
+  const configDir = path15.dirname(tokenFile);
   try {
     await import_fs_extra11.default.ensureDir(configDir);
   } catch (error) {
@@ -35353,7 +35430,7 @@ async function getToken() {
 function getTokenInfo() {
   return {
     path: getTokenFilePath2(),
-    platform: os14.platform()
+    platform: os15.platform()
   };
 }
 
@@ -35368,7 +35445,7 @@ async function countInstalledItems(claudeDir) {
     skills: 0
   };
   try {
-    const commandsDir = path15.join(claudeDir, "commands");
+    const commandsDir = path16.join(claudeDir, "commands");
     if (await import_fs_extra12.default.pathExists(commandsDir)) {
       const files = await import_fs_extra12.default.readdir(commandsDir);
       counts.commands = files.filter((f) => f.endsWith(".md")).length;
@@ -35377,7 +35454,7 @@ async function countInstalledItems(claudeDir) {
     console.error("Failed to count commands:", error instanceof Error ? error.message : error);
   }
   try {
-    const agentsDir = path15.join(claudeDir, "agents");
+    const agentsDir = path16.join(claudeDir, "agents");
     if (await import_fs_extra12.default.pathExists(agentsDir)) {
       const files = await import_fs_extra12.default.readdir(agentsDir);
       counts.agents = files.filter((f) => f.endsWith(".md")).length;
@@ -35386,11 +35463,11 @@ async function countInstalledItems(claudeDir) {
     console.error("Failed to count agents:", error instanceof Error ? error.message : error);
   }
   try {
-    const skillsDir = path15.join(claudeDir, "skills");
+    const skillsDir = path16.join(claudeDir, "skills");
     if (await import_fs_extra12.default.pathExists(skillsDir)) {
       const items = await import_fs_extra12.default.readdir(skillsDir);
       const dirs = await Promise.all(items.map(async (item) => {
-        const stat = await import_fs_extra12.default.stat(path15.join(skillsDir, item));
+        const stat = await import_fs_extra12.default.stat(path16.join(skillsDir, item));
         return stat.isDirectory();
       }));
       counts.skills = dirs.filter(Boolean).length;
@@ -35459,7 +35536,7 @@ async function proActivateCommand(userToken) {
     M2.info(`Product: ${data.product.title}`);
     M2.info(`Token saved to: ${tokenInfo.path}`);
     M2.info(source_default.cyan(`
-\uD83D\uDCA1 Next step: Run 'npx aiblueprint-cli@latest ai-coding pro setup' to install premium configs`));
+\uD83D\uDCA1 Next step: Run 'npx aiblueprint-cli@latest agents pro setup' to install premium configs`));
     trackEvent("pro-activate");
     Se(source_default.green("✅ Activation complete!"));
   } catch (error) {
@@ -35478,7 +35555,7 @@ async function proStatusCommand() {
     const token = await getToken();
     if (!token) {
       M2.warn("No token found");
-      M2.info("Run: npx aiblueprint-cli@latest ai-coding pro activate <token>");
+      M2.info("Run: npx aiblueprint-cli@latest agents pro activate <token>");
       M2.info("Get your token at: https://mlv.sh/claude-cli");
       Se(source_default.yellow("⚠️  Not activated"));
       process.exit(0);
@@ -35502,11 +35579,11 @@ async function proSetupCommand(options = {}) {
     const githubToken = await getToken();
     if (!githubToken) {
       M2.error("No token found");
-      M2.info("Run: npx aiblueprint-cli@latest ai-coding pro activate <token>");
+      M2.info("Run: npx aiblueprint-cli@latest agents pro activate <token>");
       Se(source_default.red("❌ Not activated"));
       process.exit(1);
     }
-    const claudeDir = options.folder ? path15.resolve(options.folder) : path15.join(os15.homedir(), ".claude");
+    const { claudeDir } = resolveFolders(options);
     const spinner = Y2();
     const onProgress = (file, type) => {
       spinner.message(`Installing: ${source_default.cyan(file)} ${source_default.gray(`(${type})`)}`);
@@ -35514,7 +35591,9 @@ async function proSetupCommand(options = {}) {
     spinner.start("Installing premium configurations...");
     await installProConfigs({
       githubToken,
-      claudeCodeFolder: claudeDir,
+      folder: options.folder,
+      claudeCodeFolder: options.claudeCodeFolder,
+      codexFolder: options.codexFolder,
       agentsFolder: options.agentsFolder,
       onProgress
     });
@@ -35572,7 +35651,7 @@ async function proUpdateCommand(options = {}) {
     const githubToken = await getToken();
     if (!githubToken) {
       M2.error("No token found");
-      M2.info("Run: npx aiblueprint-cli@latest ai-coding pro activate <token>");
+      M2.info("Run: npx aiblueprint-cli@latest agents pro activate <token>");
       Se(source_default.red("❌ Not activated"));
       process.exit(1);
     }
@@ -35580,7 +35659,9 @@ async function proUpdateCommand(options = {}) {
     spinner.start("Updating premium configurations...");
     await installProConfigs({
       githubToken,
-      claudeCodeFolder: options.folder,
+      folder: options.folder,
+      claudeCodeFolder: options.claudeCodeFolder,
+      codexFolder: options.codexFolder,
       agentsFolder: options.agentsFolder
     });
     spinner.stop("Premium configurations updated");
@@ -35597,17 +35678,13 @@ async function proUpdateCommand(options = {}) {
   }
 }
 
-// src/commands/sync.ts
-import os16 from "os";
-import path17 from "path";
-
 // src/lib/sync-utils.ts
 var import_fs_extra13 = __toESM(require_lib4(), 1);
-import path16 from "path";
+import path17 from "path";
 import crypto from "crypto";
 var PREMIUM_REPO2 = "Melvynx/aiblueprint-cli-premium";
 var PREMIUM_BRANCH2 = "main";
-var CONFIG_FOLDER_CANDIDATES3 = ["ai-coding", "claude-code-config", "ai-config"];
+var CONFIG_FOLDER_CANDIDATES3 = ["agents-config", "ai-coding", "claude-code-config", "ai-config"];
 function computeFileSha(content) {
   const size = content.length;
   const header = `blob ${size}\x00`;
@@ -35631,8 +35708,8 @@ async function resolveRemoteConfigFolder(githubToken) {
       return candidate;
     }
   }
-  resolvedConfigFolder = "ai-coding";
-  return "ai-coding";
+  resolvedConfigFolder = "agents-config";
+  return "agents-config";
 }
 async function listRemoteDirectory(dirPath, githubToken) {
   const configFolder = await resolveRemoteConfigFolder(githubToken);
@@ -35689,7 +35766,7 @@ async function listLocalFiles(dir) {
   for (const item of items) {
     if (item === "node_modules" || item === ".DS_Store")
       continue;
-    const fullPath = path16.join(dir, item);
+    const fullPath = path17.join(dir, item);
     const stat = await import_fs_extra13.default.stat(fullPath).catch(() => null);
     if (!stat)
       continue;
@@ -35709,7 +35786,7 @@ async function listLocalFilesRecursive(dir, basePath) {
   for (const item of items) {
     if (item === "node_modules" || item === ".DS_Store")
       continue;
-    const fullPath = path16.join(dir, item);
+    const fullPath = path17.join(dir, item);
     const relativePath = `${basePath}/${item}`;
     const stat = await import_fs_extra13.default.stat(fullPath).catch(() => null);
     if (!stat)
@@ -35732,7 +35809,7 @@ async function listClaudeRealTopLevel(claudeCategoryDir) {
   for (const name of entries) {
     if (name === "node_modules" || name === ".DS_Store")
       continue;
-    const stat = await import_fs_extra13.default.lstat(path16.join(claudeCategoryDir, name)).catch(() => null);
+    const stat = await import_fs_extra13.default.lstat(path17.join(claudeCategoryDir, name)).catch(() => null);
     if (!stat)
       continue;
     if (stat.isDirectory())
@@ -35740,12 +35817,18 @@ async function listClaudeRealTopLevel(claudeCategoryDir) {
   }
   return real;
 }
+function getRemoteCategoryPath(category) {
+  if (category === "scripts")
+    return "claude-config/scripts";
+  return category;
+}
 async function analyzeCategory(category, claudeDir, agentsDir, githubToken) {
   const items = [];
   const useAgents = isAgentCategory(category);
   const localBase = useAgents ? agentsDir : claudeDir;
-  const localDir = path16.join(localBase, category);
-  const remoteFiles = await listRemoteFilesRecursive(category, githubToken);
+  const localDir = path17.join(localBase, category);
+  const remoteCategoryPath = getRemoteCategoryPath(category);
+  const remoteFiles = await listRemoteFilesRecursive(remoteCategoryPath, githubToken);
   const localFiles = await listLocalFiles(localDir);
   const remoteSet = new Map;
   for (const rf of remoteFiles) {
@@ -35757,7 +35840,7 @@ async function analyzeCategory(category, claudeDir, agentsDir, githubToken) {
   }
   const localSet = new Set(localFiles);
   for (const [remotePath, { sha, isFolder }] of remoteSet) {
-    const localPath = path16.join(localDir, remotePath);
+    const localPath = path17.join(localDir, remotePath);
     if (isFolder) {
       continue;
     }
@@ -35792,7 +35875,7 @@ async function analyzeCategory(category, claudeDir, agentsDir, githubToken) {
     for (const localPath of localSet) {
       agentsTopLevels.add(localPath.split("/")[0]);
     }
-    const claudeCategoryDir = path16.join(claudeDir, category);
+    const claudeCategoryDir = path17.join(claudeDir, category);
     const claudeRealEntries = await listClaudeRealTopLevel(claudeCategoryDir);
     for (const top of claudeRealEntries) {
       if (!remoteTopLevels.has(top))
@@ -35832,10 +35915,16 @@ async function analyzeSyncChanges(claudeDir, githubToken, agentsDir) {
     migrationCount: allItems.filter((i) => i.status === "migration").length
   };
 }
+function translateRemotePath(relativePath) {
+  const [first, ...rest] = relativePath.split("/");
+  const remoteFirst = getRemoteCategoryPath(first);
+  return [remoteFirst, ...rest].join("/");
+}
 async function downloadFromPrivateGitHub2(relativePath, targetPath, githubToken, claudeDir) {
   try {
     const configFolder = await resolveRemoteConfigFolder(githubToken);
-    const url = `https://raw.githubusercontent.com/${PREMIUM_REPO2}/${PREMIUM_BRANCH2}/${configFolder}/${relativePath}`;
+    const remotePath = translateRemotePath(relativePath);
+    const url = `https://raw.githubusercontent.com/${PREMIUM_REPO2}/${PREMIUM_BRANCH2}/${configFolder}/${remotePath}`;
     const response = await fetch(url, {
       headers: {
         Authorization: `token ${githubToken}`,
@@ -35846,7 +35935,7 @@ async function downloadFromPrivateGitHub2(relativePath, targetPath, githubToken,
       return false;
     }
     const content = await response.arrayBuffer();
-    await import_fs_extra13.default.ensureDir(path16.dirname(targetPath));
+    await import_fs_extra13.default.ensureDir(path17.dirname(targetPath));
     if (isTextFile(relativePath)) {
       const textContent = Buffer.from(content).toString("utf-8");
       const transformedContent = transformFileContent(textContent, claudeDir);
@@ -35868,11 +35957,11 @@ async function syncSelectedItems(claudeDir, items, githubToken, agentsDir, onPro
   for (const item of items) {
     const useAgents = isAgentCategory(item.category);
     const baseDir = useAgents ? agentsDir : claudeDir;
-    const targetPath = path16.join(baseDir, item.relativePath);
+    const targetPath = path17.join(baseDir, item.relativePath);
     if (item.status === "migration" && useAgents) {
       const topName = item.name.split("/")[0];
-      const agentsTop = path16.join(agentsDir, item.category, topName);
-      const claudeTop = path16.join(claudeDir, item.category, topName);
+      const agentsTop = path17.join(agentsDir, item.category, topName);
+      const claudeTop = path17.join(claudeDir, item.category, topName);
       try {
         const claudeStat = await import_fs_extra13.default.lstat(claudeTop).catch(() => null);
         if (!claudeStat || claudeStat.isSymbolicLink()) {
@@ -35887,7 +35976,7 @@ async function syncSelectedItems(claudeDir, items, githubToken, agentsDir, onPro
           continue;
         }
         onProgress?.(item.relativePath, "moving to .agents");
-        await import_fs_extra13.default.ensureDir(path16.dirname(agentsTop));
+        await import_fs_extra13.default.ensureDir(path17.dirname(agentsTop));
         await import_fs_extra13.default.move(claudeTop, agentsTop);
         migrated++;
         touchedAgentCategories.add(item.category);
@@ -35898,7 +35987,7 @@ async function syncSelectedItems(claudeDir, items, githubToken, agentsDir, onPro
     }
     if (useAgents) {
       const topName = item.name.split("/")[0];
-      const claudeTop = path16.join(claudeDir, item.category, topName);
+      const claudeTop = path17.join(claudeDir, item.category, topName);
       const claudeTopStat = await import_fs_extra13.default.lstat(claudeTop).catch(() => null);
       if (claudeTopStat && !claudeTopStat.isSymbolicLink()) {
         onProgress?.(item.relativePath, "skipping (real dir in .claude)");
@@ -36080,12 +36169,11 @@ async function proSyncCommand(options = {}) {
     const githubToken = await getToken();
     if (!githubToken) {
       M2.error("No token found");
-      M2.info("Run: npx aiblueprint-cli@latest ai-coding pro activate <token>");
+      M2.info("Run: npx aiblueprint-cli@latest agents pro activate <token>");
       Se(source_default.red("❌ Not activated"));
       process.exit(1);
     }
-    const claudeDir = options.folder ? path17.resolve(options.folder) : path17.join(os16.homedir(), ".claude");
-    const agentsDir = getAgentsDir(options.agentsFolder);
+    const { claudeDir, agentsDir } = resolveFolders(options);
     const spinner = Y2();
     spinner.start("Analyzing changes...");
     const result = await analyzeSyncChanges(claudeDir, githubToken, agentsDir);
@@ -36248,8 +36336,6 @@ async function proSyncCommand(options = {}) {
 }
 
 // src/commands/backup.ts
-import os17 from "os";
-import path18 from "path";
 function formatBackupDate(date) {
   const now = new Date;
   const diffMs = now.getTime() - date.getTime();
@@ -36269,8 +36355,7 @@ function formatBackupDate(date) {
   return `${date.toLocaleString()} (${relative})`;
 }
 async function backupLoadCommand(options = {}) {
-  const claudeDir = options.folder || path18.join(os17.homedir(), ".claude");
-  const agentsDir = getAgentsDir(options.agentsFolder);
+  const { claudeDir, agentsDir } = resolveFolders(options);
   Ie(source_default.blue("\uD83D\uDCE6 Load Backup"));
   const spinner = Y2();
   spinner.start("Scanning for backups...");
@@ -36326,19 +36411,19 @@ async function backupLoadCommand(options = {}) {
 }
 
 // src/commands/openclaw-pro.ts
-import os20 from "os";
-import path21 from "path";
+import os18 from "os";
+import path20 from "path";
 
 // src/lib/openclaw-installer.ts
 var import_fs_extra14 = __toESM(require_lib4(), 1);
-import os18 from "os";
-import path19 from "path";
+import os16 from "os";
+import path18 from "path";
 import { exec as exec4 } from "child_process";
 import { promisify as promisify3 } from "util";
 var execAsync3 = promisify3(exec4);
 var OPENCLAW_PRO_REPO = "Melvynx/openclawpro";
 function getCacheRepoDir2() {
-  return path19.join(os18.homedir(), ".config", "openclaw", "pro-repos", "openclawpro");
+  return path18.join(os16.homedir(), ".config", "openclaw", "pro-repos", "openclawpro");
 }
 async function execGitWithAuth2(command, token, repoUrl, cwd) {
   const authenticatedUrl = `https://x-access-token:${token}@${repoUrl.replace(/^https?:\/\//, "")}`;
@@ -36352,27 +36437,27 @@ async function execGitWithAuth2(command, token, repoUrl, cwd) {
 async function cloneOrUpdateRepo2(token) {
   const cacheDir = getCacheRepoDir2();
   const repoUrl = `https://github.com/${OPENCLAW_PRO_REPO}.git`;
-  if (await import_fs_extra14.default.pathExists(path19.join(cacheDir, ".git"))) {
+  if (await import_fs_extra14.default.pathExists(path18.join(cacheDir, ".git"))) {
     try {
       await execGitWithAuth2("pull", token, repoUrl, cacheDir);
     } catch (error) {
       await import_fs_extra14.default.remove(cacheDir);
-      await import_fs_extra14.default.ensureDir(path19.dirname(cacheDir));
+      await import_fs_extra14.default.ensureDir(path18.dirname(cacheDir));
       await execGitWithAuth2(`clone ${repoUrl} ${cacheDir}`, token, repoUrl);
     }
   } else {
-    await import_fs_extra14.default.ensureDir(path19.dirname(cacheDir));
+    await import_fs_extra14.default.ensureDir(path18.dirname(cacheDir));
     await execGitWithAuth2(`clone ${repoUrl} ${cacheDir}`, token, repoUrl);
   }
-  return path19.join(cacheDir, "openclaw-config");
+  return path18.join(cacheDir, "openclaw-config");
 }
 async function copyConfigFromCache2(cacheConfigDir, targetDir, onProgress) {
   const walk = async (dir, baseDir = dir) => {
     const entries = await import_fs_extra14.default.readdir(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const sourcePath = path19.join(dir, entry.name);
-      const relativePath = path19.relative(baseDir, sourcePath);
-      const targetPath = path19.join(targetDir, relativePath);
+      const sourcePath = path18.join(dir, entry.name);
+      const relativePath = path18.relative(baseDir, sourcePath);
+      const targetPath = path18.join(targetDir, relativePath);
       if (entry.isDirectory()) {
         await import_fs_extra14.default.ensureDir(targetPath);
         onProgress?.(relativePath, "directory");
@@ -36387,7 +36472,7 @@ async function copyConfigFromCache2(cacheConfigDir, targetDir, onProgress) {
 }
 async function installOpenclawProConfigs(options) {
   const { githubToken, openclawFolder, onProgress } = options;
-  const targetFolder = openclawFolder || path19.join(os18.homedir(), ".openclaw");
+  const targetFolder = openclawFolder || path18.join(os16.homedir(), ".openclaw");
   try {
     const cacheConfigDir = await cloneOrUpdateRepo2(githubToken);
     await copyConfigFromCache2(cacheConfigDir, targetFolder, onProgress);
@@ -36399,17 +36484,17 @@ async function installOpenclawProConfigs(options) {
 
 // src/lib/openclaw-token-storage.ts
 var import_fs_extra15 = __toESM(require_lib4(), 1);
-import os19 from "os";
-import path20 from "path";
+import os17 from "os";
+import path19 from "path";
 function getConfigDir2() {
-  const platform = os19.platform();
+  const platform = os17.platform();
   if (platform === "win32") {
-    return path20.join(process.env.APPDATA || os19.homedir(), "openclaw");
+    return path19.join(process.env.APPDATA || os17.homedir(), "openclaw");
   }
-  return path20.join(os19.homedir(), ".config", "openclaw");
+  return path19.join(os17.homedir(), ".config", "openclaw");
 }
 function getTokenPath() {
-  return path20.join(getConfigDir2(), "token.txt");
+  return path19.join(getConfigDir2(), "token.txt");
 }
 async function saveOpenclawToken(githubToken) {
   const configDir = getConfigDir2();
@@ -36427,7 +36512,7 @@ async function getOpenclawToken() {
 function getOpenclawTokenInfo() {
   return {
     path: getTokenPath(),
-    platform: os19.platform()
+    platform: os17.platform()
   };
 }
 
@@ -36539,7 +36624,7 @@ async function openclawProSetupCommand(options = {}) {
       Se(source_default.red("❌ Not activated"));
       process.exit(1);
     }
-    const openclawDir = options.folder ? path21.resolve(options.folder) : path21.join(os20.homedir(), ".openclaw");
+    const openclawDir = options.folder ? path20.resolve(options.folder) : path20.join(os18.homedir(), ".openclaw");
     const spinner = Y2();
     const onProgress = (file, type) => {
       spinner.message(`Installing: ${source_default.cyan(file)} ${source_default.gray(`(${type})`)}`);
@@ -36552,18 +36637,18 @@ async function openclawProSetupCommand(options = {}) {
     });
     spinner.stop("OpenClaw Pro configurations installed");
     let skillCount = 0;
-    const skillsDir = path21.join(openclawDir, "skills");
+    const skillsDir = path20.join(openclawDir, "skills");
     if (await import_fs_extra16.default.pathExists(skillsDir)) {
       const items = await import_fs_extra16.default.readdir(skillsDir);
       const dirs = await Promise.all(items.map(async (item) => {
-        const stat = await import_fs_extra16.default.stat(path21.join(skillsDir, item));
+        const stat = await import_fs_extra16.default.stat(path20.join(skillsDir, item));
         return stat.isDirectory();
       }));
       skillCount = dirs.filter(Boolean).length;
     }
     spinner.start("Setting up workspace TOOLS.md...");
-    const workspaceDir = path21.join(openclawDir, "workspace");
-    const toolsPath = path21.join(workspaceDir, "TOOLS.md");
+    const workspaceDir = path20.join(openclawDir, "workspace");
+    const toolsPath = path20.join(workspaceDir, "TOOLS.md");
     await import_fs_extra16.default.ensureDir(workspaceDir);
     if (await import_fs_extra16.default.pathExists(toolsPath)) {
       const existingContent = await import_fs_extra16.default.readFile(toolsPath, "utf-8");
@@ -36593,7 +36678,7 @@ ${CLAUDE_CODE_TOOLS_INSTRUCTIONS}
 script -q -c "claude $*" /dev/null
 `;
     const binDir = "/usr/local/bin";
-    const wrapperPath = path21.join(binDir, "claude-run");
+    const wrapperPath = path20.join(binDir, "claude-run");
     try {
       await import_fs_extra16.default.writeFile(wrapperPath, claudeRunWrapper, { mode: 493 });
       spinner.stop("claude-run wrapper created");
@@ -36644,12 +36729,12 @@ async function openclawProUpdateCommand(options = {}) {
 }
 
 // src/commands/dynamic-scripts.ts
-import path24 from "path";
+import path23 from "path";
 import { homedir } from "os";
 
 // src/lib/script-parser.ts
 var import_fs_extra17 = __toESM(require_lib4(), 1);
-import path22 from "path";
+import path21 from "path";
 var EXCLUDED_SCRIPTS = ["test", "lint", "format", "start"];
 var EXCLUDED_SUFFIXES = [":test", ":lint", ":test-fixtures", ":start"];
 function shouldIncludeScript(scriptName) {
@@ -36660,7 +36745,7 @@ function shouldIncludeScript(scriptName) {
   return true;
 }
 async function readScriptsPackageJson(claudeDir) {
-  const packageJsonPath = path22.join(claudeDir, "scripts", "package.json");
+  const packageJsonPath = path21.join(claudeDir, "scripts", "package.json");
   try {
     if (!await import_fs_extra17.default.pathExists(packageJsonPath)) {
       return null;
@@ -36712,11 +36797,11 @@ function groupScriptsByPrefix(commands) {
 var import_fs_extra18 = __toESM(require_lib4(), 1);
 import { spawn as spawn2 } from "child_process";
 import { execSync as execSync4 } from "child_process";
-import path23 from "path";
-import os21 from "os";
+import path22 from "path";
+import os19 from "os";
 function checkCommand2(cmd) {
   try {
-    const isWindows2 = os21.platform() === "win32";
+    const isWindows2 = os19.platform() === "win32";
     const whichCmd = isWindows2 ? `where ${cmd}` : `which ${cmd}`;
     execSync4(whichCmd, { stdio: "ignore" });
     return true;
@@ -36742,13 +36827,13 @@ async function executeScript(scriptName, claudeDir) {
     console.error(source_default.red("Bun is not installed. Install with: npm install -g bun"));
     return 1;
   }
-  const scriptsDir = path23.join(claudeDir, "scripts");
+  const scriptsDir = path22.join(claudeDir, "scripts");
   if (!await import_fs_extra18.default.pathExists(scriptsDir)) {
     console.error(source_default.red(`Scripts directory not found at ${scriptsDir}`));
-    console.log(source_default.gray("Run: aiblueprint ai-coding setup"));
+    console.log(source_default.gray("Run: aiblueprint agents setup"));
     return 1;
   }
-  const packageJsonPath = path23.join(scriptsDir, "package.json");
+  const packageJsonPath = path22.join(scriptsDir, "package.json");
   if (!await import_fs_extra18.default.pathExists(packageJsonPath)) {
     console.error(source_default.red(`package.json not found in ${scriptsDir}`));
     return 1;
@@ -36776,7 +36861,7 @@ async function executeScript(scriptName, claudeDir) {
 
 // src/commands/dynamic-scripts.ts
 function getClaudeDir(parentOptions) {
-  return parentOptions.claudeCodeFolder || parentOptions.folder ? path24.resolve(parentOptions.claudeCodeFolder || parentOptions.folder) : path24.join(homedir(), ".claude");
+  return parentOptions.claudeCodeFolder || parentOptions.folder ? path23.resolve(parentOptions.claudeCodeFolder || parentOptions.folder) : path23.join(homedir(), ".claude");
 }
 async function registerDynamicScriptCommands(claudeCodeCmd, claudeDir) {
   const scripts = await readScriptsPackageJson(claudeDir);
@@ -36811,12 +36896,13 @@ var __dirname3 = dirname3(fileURLToPath3(import.meta.url));
 var packageJson = JSON.parse(readFileSync3(join2(__dirname3, "../package.json"), "utf8"));
 var program2 = new Command;
 program2.name("aiblueprint").description("AIBlueprint CLI for setting up AI coding configurations").version(packageJson.version);
-function registerAiCodingCommands(cmd) {
-  cmd.option("-f, --folder <path>", "Specify custom Claude Code folder path (default: ~/.claude) - alias for --claudeCodeFolder").option("--claudeCodeFolder <path>", "Specify custom Claude Code folder path (default: ~/.claude)").option("--codexFolder <path>", "Specify custom Codex folder path (default: ~/.codex)").option("--openCodeFolder <path>", "Specify custom OpenCode folder path (default: ~/.config/opencode)").option("--factoryAiFolder <path>", "Specify custom FactoryAI folder path (default: ~/.factory)").option("--agentsFolder <path>", "Specify custom agents folder path (default: ~/.agents)").option("-s, --skip", "Skip interactive prompts and install all features");
+function registerAgentsCommands(cmd) {
+  cmd.option("-f, --folder <path>", "Root folder that contains .claude/, .codex/, .agents/ (default: $HOME)").option("--claudeCodeFolder <path>", "Override Claude Code folder (default: {folder}/.claude)").option("--codexFolder <path>", "Override Codex folder (default: {folder}/.codex)").option("--openCodeFolder <path>", "Override OpenCode folder (default: ~/.config/opencode)").option("--factoryAiFolder <path>", "Override FactoryAI folder (default: ~/.factory)").option("--agentsFolder <path>", "Override shared agents folder (default: {folder}/.agents)").option("-s, --skip", "Skip interactive prompts and install all features");
   cmd.command("setup").description("Setup AI coding configuration with AIBlueprint defaults").action((options, command) => {
     const parentOptions = command.parent.opts();
     setupCommand({
-      claudeCodeFolder: parentOptions.claudeCodeFolder || parentOptions.folder,
+      folder: parentOptions.folder,
+      claudeCodeFolder: parentOptions.claudeCodeFolder,
       codexFolder: parentOptions.codexFolder,
       openCodeFolder: parentOptions.openCodeFolder,
       agentsFolder: parentOptions.agentsFolder,
@@ -36827,13 +36913,14 @@ function registerAiCodingCommands(cmd) {
     const parentOptions = command.parent.opts();
     setupTerminalCommand({
       skipInteractive: parentOptions.skip,
-      homeDir: parentOptions.claudeCodeFolder || parentOptions.folder
+      homeDir: parentOptions.folder
     });
   });
   cmd.command("symlink").description("Create symlinks between different AI coding tools (Claude Code, Codex, OpenCode, FactoryAI)").action((options, command) => {
     const parentOptions = command.parent.opts();
     symlinkCommand({
-      claudeCodeFolder: parentOptions.claudeCodeFolder || parentOptions.folder,
+      folder: parentOptions.folder,
+      claudeCodeFolder: parentOptions.claudeCodeFolder,
       codexFolder: parentOptions.codexFolder,
       openCodeFolder: parentOptions.openCodeFolder,
       factoryAiFolder: parentOptions.factoryAiFolder
@@ -36848,65 +36935,47 @@ function registerAiCodingCommands(cmd) {
   });
   proCmd.command("setup").description("Install premium configurations (requires activation)").action((options, command) => {
     const parentOptions = command.parent.parent.opts();
-    const claudeCodeFolder = parentOptions.claudeCodeFolder || parentOptions.folder;
-    proSetupCommand({ folder: claudeCodeFolder, agentsFolder: parentOptions.agentsFolder });
+    proSetupCommand({
+      folder: parentOptions.folder,
+      claudeCodeFolder: parentOptions.claudeCodeFolder,
+      codexFolder: parentOptions.codexFolder,
+      agentsFolder: parentOptions.agentsFolder
+    });
   });
   proCmd.command("update").description("Update premium configurations").action((options, command) => {
     const parentOptions = command.parent.parent.opts();
-    const claudeCodeFolder = parentOptions.claudeCodeFolder || parentOptions.folder;
-    proUpdateCommand({ folder: claudeCodeFolder, agentsFolder: parentOptions.agentsFolder });
+    proUpdateCommand({
+      folder: parentOptions.folder,
+      claudeCodeFolder: parentOptions.claudeCodeFolder,
+      codexFolder: parentOptions.codexFolder,
+      agentsFolder: parentOptions.agentsFolder
+    });
   });
   proCmd.command("sync").description("Sync premium configurations with selective update").action((options, command) => {
     const parentOptions = command.parent.parent.opts();
-    const claudeCodeFolder = parentOptions.claudeCodeFolder || parentOptions.folder;
-    proSyncCommand({ folder: claudeCodeFolder, agentsFolder: parentOptions.agentsFolder });
+    proSyncCommand({
+      folder: parentOptions.folder,
+      claudeCodeFolder: parentOptions.claudeCodeFolder,
+      codexFolder: parentOptions.codexFolder,
+      agentsFolder: parentOptions.agentsFolder
+    });
   });
   const backupCmd = cmd.command("backup").description("Manage AI coding configuration backups");
   backupCmd.command("load").description("Load a previous backup interactively").action((options, command) => {
     const parentOptions = command.parent.parent.opts();
-    const claudeCodeFolder = parentOptions.claudeCodeFolder || parentOptions.folder;
     backupLoadCommand({
-      folder: claudeCodeFolder,
+      folder: parentOptions.folder,
+      claudeCodeFolder: parentOptions.claudeCodeFolder,
       agentsFolder: parentOptions.agentsFolder
     });
   });
 }
-var aiCodingCmd = program2.command("ai-coding").description("AI coding configuration commands");
-registerAiCodingCommands(aiCodingCmd);
-var claudeCodeCmd = program2.command("claude-code").description("Legacy alias for ai-coding configuration commands");
-registerAiCodingCommands(claudeCodeCmd);
-var agentsCmd = program2.command("agents").description("Manage AIBlueprint configurations under ~/.agents (with ~/.claude symlinks)").option("-f, --folder <path>", "Specify custom Claude Code folder path (default: ~/.claude) - alias for --claudeCodeFolder").option("--claudeCodeFolder <path>", "Specify custom Claude Code folder path (default: ~/.claude)").option("--agentsFolder <path>", "Specify custom agents folder path (default: ~/.agents)");
-var agentsProCmd = agentsCmd.command("pro").description("Manage AIBlueprint CLI Premium features");
-agentsProCmd.command("activate [token]").description("Activate AIBlueprint CLI Premium with your access token").action((token) => {
-  proActivateCommand(token);
-});
-agentsProCmd.command("status").description("Check your Premium token status").action(() => {
-  proStatusCommand();
-});
-agentsProCmd.command("setup").description("Install premium configurations into ~/.agents and symlink into ~/.claude").action((options, command) => {
-  const parentOptions = command.parent.parent.opts();
-  const claudeCodeFolder = parentOptions.claudeCodeFolder || parentOptions.folder;
-  proSetupCommand({
-    folder: claudeCodeFolder,
-    agentsFolder: parentOptions.agentsFolder
-  });
-});
-agentsProCmd.command("update").description("Update premium configurations").action((options, command) => {
-  const parentOptions = command.parent.parent.opts();
-  const claudeCodeFolder = parentOptions.claudeCodeFolder || parentOptions.folder;
-  proUpdateCommand({
-    folder: claudeCodeFolder,
-    agentsFolder: parentOptions.agentsFolder
-  });
-});
-agentsProCmd.command("sync").description("Sync premium configurations with selective update").action((options, command) => {
-  const parentOptions = command.parent.parent.opts();
-  const claudeCodeFolder = parentOptions.claudeCodeFolder || parentOptions.folder;
-  proSyncCommand({
-    folder: claudeCodeFolder,
-    agentsFolder: parentOptions.agentsFolder
-  });
-});
+var agentsCmd = program2.command("agents").description("AI coding configuration commands");
+registerAgentsCommands(agentsCmd);
+var aiCodingCmd = program2.command("ai-coding").description("Legacy alias for agents configuration commands");
+registerAgentsCommands(aiCodingCmd);
+var claudeCodeCmd = program2.command("claude-code").description("Legacy alias for agents configuration commands");
+registerAgentsCommands(claudeCodeCmd);
 var openclawCmd = program2.command("openclaw").description("OpenClaw configuration commands").option("-f, --folder <path>", "Specify custom OpenClaw folder path (default: ~/.openclaw)");
 var openclawProCmd = openclawCmd.command("pro").description("Manage OpenClaw Pro features");
 openclawProCmd.command("activate [token]").description("Activate OpenClaw Pro with your access token").action((token) => {
@@ -36927,6 +36996,7 @@ openclawProCmd.command("update").description("Update OpenClaw Pro configurations
 });
 try {
   const claudeDir = join2(homedir2(), ".claude");
+  await registerDynamicScriptCommands(agentsCmd, claudeDir);
   await registerDynamicScriptCommands(aiCodingCmd, claudeDir);
   await registerDynamicScriptCommands(claudeCodeCmd, claudeDir);
 } catch (error) {