aiblueprint-cli 1.4.76 → 1.4.78

package/README.md

@@ -132,6 +132,8 @@ npx aiblueprint-cli@latest agents config unify sessions
 
 - `cc` - Claude Code with permissions skipped
 - `ccc` - Claude Code with continue mode
+- `cx` - Codex
+- `cxc` - Codex continue mode for the current directory
 
 ### Skills
 
@@ -169,11 +171,11 @@ npx skills add Melvynx/aiblueprint --skill skill-manager
 Unlock advanced features at [mlv.sh/claude-cli](https://mlv.sh/claude-cli)
 
 ```bash
-# Activate premium
-npx aiblueprint-cli@latest agents pro activate YOUR_TOKEN
-
-# Setup premium configs
+# Setup premium configs (prompts for your token if needed)
 npx aiblueprint-cli@latest agents pro setup
+
+# Or activate first if you prefer
+npx aiblueprint-cli@latest agents pro activate YOUR_TOKEN
 ```
 
 ## 🛠️ Development

package/dist/cli.js

@@ -32764,18 +32764,84 @@ import { dirname as dirname2 } from "path";
 var import_fs_extra = __toESM(require_lib4(), 1);
 import path2 from "path";
 import os3 from "os";
+var BEGIN_MARKER = "# BEGIN AIBlueprint shell shortcuts";
+var END_MARKER = "# END AIBlueprint shell shortcuts";
+var POSIX_COMMAND_LINES = [
+  'alias cc="claude --dangerously-skip-permissions"',
+  'alias ccc="claude --dangerously-skip-permissions -c"',
+  'alias cx="codex"',
+  'alias cxc="codex resume --last"'
+];
+var POWERSHELL_COMMAND_LINES = [
+  "function cc { claude --dangerously-skip-permissions $args }",
+  "function ccc { claude --dangerously-skip-permissions -c $args }",
+  "function cx { codex $args }",
+  "function cxc { codex resume --last $args }"
+];
+var POSIX_SHORTCUT_BLOCK = {
+  legacyHeaders: [
+    "# AIBlueprint Claude Code aliases",
+    "# AIBlueprint Codex aliases"
+  ],
+  commandLines: POSIX_COMMAND_LINES,
+  lines: [
+    BEGIN_MARKER,
+    "# Claude Code",
+    POSIX_COMMAND_LINES[0],
+    POSIX_COMMAND_LINES[1],
+    "# Codex",
+    POSIX_COMMAND_LINES[2],
+    POSIX_COMMAND_LINES[3],
+    END_MARKER
+  ]
+};
+var POWERSHELL_SHORTCUT_BLOCK = {
+  legacyHeaders: [
+    "# AIBlueprint Claude Code shortcuts",
+    "# AIBlueprint Codex shortcuts"
+  ],
+  commandLines: POWERSHELL_COMMAND_LINES,
+  lines: [
+    BEGIN_MARKER,
+    "# Claude Code",
+    POWERSHELL_COMMAND_LINES[0],
+    POWERSHELL_COMMAND_LINES[1],
+    "# Codex",
+    POWERSHELL_COMMAND_LINES[2],
+    POWERSHELL_COMMAND_LINES[3],
+    END_MARKER
+  ]
+};
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function detectEol(content) {
+  return content.includes(`\r
+`) ? `\r
+` : `
+`;
+}
+function upsertShortcutBlock(existingContent, shortcutBlock) {
+  const eol = detectEol(existingContent);
+  const managedBlockPattern = new RegExp(`${escapeRegExp(BEGIN_MARKER)}[\\s\\S]*?${escapeRegExp(END_MARKER)}\\r?\\n?`, "g");
+  const removableLegacyLines = new Set([
+    ...shortcutBlock.legacyHeaders,
+    ...shortcutBlock.commandLines
+  ]);
+  const existingWithoutManagedBlock = existingContent.replace(managedBlockPattern, "");
+  const existingLines = existingWithoutManagedBlock.split(/\r?\n/).filter((line) => !removableLegacyLines.has(line.trim()));
+  const baseContent = existingLines.join(eol).trimEnd();
+  const blockContent = shortcutBlock.lines.join(eol);
+  return `${baseContent}${baseContent ? `${eol}${eol}` : ""}${blockContent}${eol}`;
+}
 async function setupShellShortcuts() {
   try {
     const platform = os3.platform();
     let shellConfigFile;
-    let aliases;
+    let shortcutBlock;
     if (platform === "darwin") {
       shellConfigFile = path2.join(os3.homedir(), ".zshenv");
-      aliases = `
-# AIBlueprint Claude Code aliases
-alias cc="claude --dangerously-skip-permissions"
-alias ccc="claude --dangerously-skip-permissions -c"
-`;
+      shortcutBlock = POSIX_SHORTCUT_BLOCK;
     } else if (platform === "linux") {
       const shell = process.env.SHELL || "";
       if (shell.includes("zsh")) {
@@ -32783,11 +32849,7 @@ alias ccc="claude --dangerously-skip-permissions -c"
       } else {
         shellConfigFile = path2.join(os3.homedir(), ".bashrc");
       }
-      aliases = `
-# AIBlueprint Claude Code aliases
-alias cc="claude --dangerously-skip-permissions"
-alias ccc="claude --dangerously-skip-permissions -c"
-`;
+      shortcutBlock = POSIX_SHORTCUT_BLOCK;
     } else if (platform === "win32") {
       const pwshProfileDir = path2.join(os3.homedir(), "Documents", "PowerShell");
       const windowsPwshProfileDir = path2.join(os3.homedir(), "Documents", "WindowsPowerShell");
@@ -32801,18 +32863,15 @@ alias ccc="claude --dangerously-skip-permissions -c"
         await import_fs_extra.default.ensureDir(profileDir);
       }
       shellConfigFile = path2.join(profileDir, "Profile.ps1");
-      aliases = `
-# AIBlueprint Claude Code shortcuts
-function cc { claude --dangerously-skip-permissions $args }
-function ccc { claude --dangerously-skip-permissions -c $args }
-`;
+      shortcutBlock = POWERSHELL_SHORTCUT_BLOCK;
     } else {
       console.log(source_default.yellow(`Shell shortcuts are not supported on platform: ${platform}`));
       return;
     }
     const existingContent = await import_fs_extra.default.readFile(shellConfigFile, "utf-8").catch(() => "");
-    if (!existingContent.includes("AIBlueprint Claude Code")) {
-      await import_fs_extra.default.appendFile(shellConfigFile, aliases);
+    const nextContent = upsertShortcutBlock(existingContent, shortcutBlock);
+    if (nextContent !== existingContent) {
+      await import_fs_extra.default.writeFile(shellConfigFile, nextContent);
     }
   } catch (error) {
     console.error(source_default.red("Error setting up shell shortcuts:"), error);
@@ -34240,7 +34299,7 @@ async function setupCommand(params = {}) {
           choices: [
             {
               value: "shellShortcuts",
-              name: "Shell shortcuts (cc, ccc aliases) - Quick access to Claude Code",
+              name: "Shell shortcuts (cc, ccc, cx, cxc aliases) - Quick access to Claude Code and Codex",
               checked: true
             },
             {
@@ -34440,6 +34499,8 @@ Next steps:`));
       }
       console.log(source_default.gray('  • Use "cc" for Claude Code with permissions skipped'));
       console.log(source_default.gray('  • Use "ccc" for Claude Code with permissions skipped and continue mode'));
+      console.log(source_default.gray('  • Use "cx" to launch Codex'));
+      console.log(source_default.gray('  • Use "cxc" to continue the latest Codex session for this directory'));
     }
     console.log(source_default.gray('  • Run "claude" to start using Claude Code with your new configuration'));
     console.log(source_default.blue(`
@@ -37809,6 +37870,74 @@ function getTokenInfo() {
 var import_fs_extra17 = __toESM(require_lib4(), 1);
 var API_URL = "https://codeline.app/api/products";
 var PRODUCT_IDS = ["prd_XJVgxVPbGG", "prd_NKabAkdOkw"];
+
+class PremiumActivationError extends Error {
+  code;
+  constructor(code, message) {
+    super(message);
+    this.code = code;
+    this.name = "PremiumActivationError";
+  }
+}
+function isPremiumActivationError(error) {
+  return error instanceof PremiumActivationError;
+}
+function logPremiumActivationError(error) {
+  M2.error(error.message);
+  if (error.code === "invalid-token") {
+    M2.info("\uD83D\uDC8E Get AIBlueprint CLI Premium at: https://mlv.sh/claude-cli");
+  }
+}
+async function promptForPremiumToken() {
+  const result = await he({
+    message: "Enter your Premium access token:",
+    placeholder: "Your ProductsOnUsers ID from codeline.app",
+    validate: (value) => {
+      if (!value)
+        return "Token is required";
+      if (value.length < 5)
+        return "Token seems invalid";
+      return;
+    }
+  });
+  if (pD(result)) {
+    xe("Premium activation cancelled");
+    process.exit(0);
+  }
+  return result;
+}
+async function fetchPremiumActivationData(userToken) {
+  const encodedToken = encodeURIComponent(userToken);
+  for (const productId of PRODUCT_IDS) {
+    const response = await fetch(`${API_URL}/${productId}/have-access?token=${encodedToken}`);
+    if (response.ok) {
+      const responseData = await response.json();
+      if (responseData.hasAccess) {
+        return responseData;
+      }
+    }
+  }
+  return null;
+}
+async function activatePremiumToken(userToken) {
+  const premiumToken = userToken ?? await promptForPremiumToken();
+  const spinner = Y2();
+  spinner.start("Validating token against premium products...");
+  const data = await fetchPremiumActivationData(premiumToken);
+  if (!data) {
+    spinner.stop("Token validation failed");
+    throw new PremiumActivationError("invalid-token", "Invalid token or no access to premium products");
+  }
+  spinner.stop("Token validated");
+  const githubToken = data.product?.metadata?.["cli-github-token"];
+  if (!githubToken) {
+    throw new PremiumActivationError("missing-github-token", "No GitHub token found in product metadata. Please contact support.");
+  }
+  spinner.start("Saving token...");
+  await saveToken(githubToken);
+  spinner.stop("Token saved");
+  return { githubToken, data };
+}
 async function countInstalledItems(claudeDir) {
   const counts = {
     agents: 0,
@@ -37841,60 +37970,11 @@ async function countInstalledItems(claudeDir) {
 async function proActivateCommand(userToken) {
   Ie(source_default.blue(`\uD83D\uDD11 Activate AIBlueprint CLI Premium ${source_default.gray(`v${getVersion()}`)}`));
   try {
-    if (!userToken) {
-      const result = await he({
-        message: "Enter your Premium access token:",
-        placeholder: "Your ProductsOnUsers ID from codeline.app",
-        validate: (value) => {
-          if (!value)
-            return "Token is required";
-          if (value.length < 5)
-            return "Token seems invalid";
-          return;
-        }
-      });
-      if (pD(result)) {
-        xe("Activation cancelled");
-        process.exit(0);
-      }
-      userToken = result;
-    }
-    const spinner = Y2();
-    spinner.start("Validating token against premium products...");
-    let validationSuccess = false;
-    let data = null;
-    for (const productId of PRODUCT_IDS) {
-      const response = await fetch(`${API_URL}/${productId}/have-access?token=${userToken}`);
-      if (response.ok) {
-        const responseData = await response.json();
-        if (responseData.hasAccess) {
-          data = responseData;
-          validationSuccess = true;
-          break;
-        }
-      }
-    }
-    if (!validationSuccess || !data) {
-      spinner.stop("Token validation failed");
-      M2.error("Invalid token or no access to premium products");
-      M2.info("\uD83D\uDC8E Get AIBlueprint CLI Premium at: https://mlv.sh/claude-cli");
-      Se(source_default.red("❌ Activation failed"));
-      process.exit(1);
-    }
-    spinner.stop("Token validated");
-    const githubToken = data.product.metadata?.["cli-github-token"];
-    if (!githubToken) {
-      M2.error("No GitHub token found in product metadata. Please contact support.");
-      Se(source_default.red("❌ Activation failed"));
-      process.exit(1);
-    }
-    spinner.start("Saving token...");
-    await saveToken(githubToken);
-    spinner.stop("Token saved");
+    const { data } = await activatePremiumToken(userToken);
     const tokenInfo = getTokenInfo();
     M2.success("✅ Token activated!");
-    M2.info(`User: ${data.user.name} (${data.user.email})`);
-    M2.info(`Product: ${data.product.title}`);
+    M2.info(`User: ${data.user?.name ?? "Unknown"} (${data.user?.email ?? "unknown email"})`);
+    M2.info(`Product: ${data.product?.title ?? "Premium"}`);
     M2.info(`Token saved to: ${tokenInfo.path}`);
     M2.info(source_default.cyan(`
 \uD83D\uDCA1 Next step: Run 'npx aiblueprint-cli@latest agents pro setup' to install premium configs`));
@@ -37903,7 +37983,9 @@ async function proActivateCommand(userToken) {
   } catch (error) {
     trackError(error, { command: "pro-activate" });
     await flushTelemetry();
-    if (error instanceof Error) {
+    if (isPremiumActivationError(error)) {
+      logPremiumActivationError(error);
+    } else if (error instanceof Error) {
       M2.error(error.message);
     }
     Se(source_default.red("❌ Activation failed"));
@@ -37937,12 +38019,13 @@ async function proStatusCommand() {
 async function proSetupCommand(options = {}) {
   Ie(source_default.blue(`⚙️  Setup AIBlueprint CLI Premium ${source_default.gray(`v${getVersion()}`)}`));
   try {
-    const githubToken = await getToken();
+    let githubToken = await getToken();
     if (!githubToken) {
-      M2.error("No token found");
-      M2.info("Run: npx aiblueprint-cli@latest agents pro activate <token>");
-      Se(source_default.red("❌ Not activated"));
-      process.exit(1);
+      M2.warn("No token found");
+      M2.info("Enter your Premium access token to activate and continue setup.");
+      const activation = await activatePremiumToken();
+      githubToken = activation.githubToken;
+      M2.success("✅ Token activated. Continuing setup...");
     }
     const { claudeDir } = resolveFolders(options);
     const spinner = Y2();
@@ -37989,13 +38072,15 @@ async function proSetupCommand(options = {}) {
     M2.info(`  • Agents (${counts.agents})`);
     M2.info(`  • Premium Skills (${counts.skills})`);
     M2.info("  • Premium statusline (advanced)");
-    M2.info("  • Shell shortcuts (cc, ccc)");
+    M2.info("  • Shell shortcuts (cc, ccc, cx, cxc)");
     M2.info("  • Settings.json with statusline");
     Se(source_default.green("\uD83D\uDE80 Ready to use!"));
   } catch (error) {
     trackError(error, { command: "pro-setup" });
     await flushTelemetry();
-    if (error instanceof Error) {
+    if (isPremiumActivationError(error)) {
+      logPremiumActivationError(error);
+    } else if (error instanceof Error) {
       M2.error(error.message);
     }
     Se(source_default.red("❌ Setup failed"));
@@ -39464,7 +39549,7 @@ function registerAgentsCommands(cmd) {
   proCmd.command("status").description("Check your Premium token status").action(() => {
     proStatusCommand();
   });
-  proCmd.command("setup").description("Install premium configurations (requires activation)").action((options, command) => {
+  proCmd.command("setup").description("Install premium configurations, prompting for activation if needed").action((options, command) => {
     const parentOptions = command.parent.parent.opts();
     proSetupCommand({
       folder: parentOptions.folder,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiblueprint-cli",
-  "version": "1.4.76",
+  "version": "1.4.78",
   "description": "AIBlueprint CLI for setting up AI coding configurations",
   "author": "AIBlueprint",
   "license": "MIT",