aiox-core 5.0.7 → 5.0.8

package/.aiox-core/cli/commands/pro/index.js

@@ -9,7 +9,7 @@
  *   aiox pro deactivate               Deactivate the current license
  *   aiox pro features                 List all pro features
  *   aiox pro validate                 Force online revalidation
- *   aiox pro setup                    Configure GitHub Packages access (AC-12)
+ *   aiox pro setup                    Install or verify the AIOX Pro package
  *
  * @module cli/commands/pro
  * @version 1.1.0
@@ -22,10 +22,11 @@ const { Command } = require('commander');
 const path = require('path');
 const fs = require('fs');
 const readline = require('readline');
+const { createBuyerCommand } = require('./buyer');
 
 // BUG-6 fix (INS-1): Dynamic licensePath resolution
 // In framework-dev: __dirname = aiox-core/.aiox-core/cli/commands/pro → ../../../../pro/license
-// In project-dev: pro is installed via npm as @aiox-fullstack/pro
+// In project-dev: pro is installed via npm as @aiox-squads/pro or a legacy scope.
 function resolveLicensePath() {
   // 1. Try relative path (framework-dev mode)
   const relativePath = path.resolve(__dirname, '..', '..', '..', '..', 'pro', 'license');
@@ -33,23 +34,38 @@ function resolveLicensePath() {
     return relativePath;
   }
 
-  // 2. Try node_modules/@aiox-fullstack/pro/license (project-dev mode)
-  try {
-    const proPkg = require.resolve('@aiox-fullstack/pro/package.json');
-    const proDir = path.dirname(proPkg);
-    const npmPath = path.join(proDir, 'license');
-    if (fs.existsSync(npmPath)) {
-      return npmPath;
+  // 2. Try npm packages — canonical then fallback
+  const npmCandidates = [
+    '@aiox-squads/pro',
+    '@aiox-fullstack/pro',
+    '@aios-fullstack/pro',
+  ];
+
+  for (const pkgName of npmCandidates) {
+    try {
+      const proPkg = require.resolve(`${pkgName}/package.json`);
+      const proDir = path.dirname(proPkg);
+      const npmPath = path.join(proDir, 'license');
+      if (fs.existsSync(npmPath)) {
+        return npmPath;
+      }
+    } catch {
+      // package not installed
     }
-  } catch {
-    // @aiox-fullstack/pro not installed via npm
   }
 
-  // 3. Try project root node_modules (fallback)
+  // 3. Try project root node_modules (both scopes)
   const projectRoot = process.cwd();
-  const cwdPath = path.join(projectRoot, 'node_modules', '@aiox-fullstack', 'pro', 'license');
-  if (fs.existsSync(cwdPath)) {
-    return cwdPath;
+  const scopePaths = [
+    path.join(projectRoot, 'node_modules', '@aiox-squads', 'pro', 'license'),
+    path.join(projectRoot, 'node_modules', '@aiox-fullstack', 'pro', 'license'),
+    path.join(projectRoot, 'node_modules', '@aios-fullstack', 'pro', 'license'),
+  ];
+
+  for (const cwdPath of scopePaths) {
+    if (fs.existsSync(cwdPath)) {
+      return cwdPath;
+    }
   }
 
   // Return relative path as default (will fail gracefully in loadLicenseModules)
@@ -97,7 +113,8 @@ function loadLicenseModules() {
     };
   } catch (error) {
     console.error('AIOX Pro license module not available.');
-    console.error('Install AIOX Pro: npm install @aiox-fullstack/pro');
+    console.error('Install AIOX Pro: aiox pro setup');
+    console.error('Or via wrapper: npx aiox-pro install');
     process.exit(1);
   }
 }
@@ -217,9 +234,13 @@ async function activateAction(options) {
     // Scaffold pro content into project (Story INS-3.1)
     // Lazy-load to avoid crashing if pro-scaffolder or js-yaml is unavailable
     const projectRoot = path.resolve(__dirname, '..', '..', '..', '..');
-    const proSourceDir = path.join(projectRoot, 'node_modules', '@aiox-fullstack', 'pro');
+    // Try canonical then fallback package path
+    const proSourceDir = [
+      path.join(projectRoot, 'node_modules', '@aiox-fullstack', 'pro'),
+      path.join(projectRoot, 'node_modules', '@aios-fullstack', 'pro'),
+    ].find(p => fs.existsSync(p));
 
-    if (fs.existsSync(proSourceDir)) {
+    if (proSourceDir) {
       let scaffoldProContent;
       try {
         ({ scaffoldProContent } = require('../../../../packages/installer/src/pro/pro-scaffolder'));
@@ -261,7 +282,7 @@ async function activateAction(options) {
         console.log('');
       }
     } else {
-      console.log('Note: @aiox-fullstack/pro package not found in node_modules.');
+      console.log('Note: AIOX Pro package not found in node_modules.');
       console.log('Pro content will be scaffolded when the package is installed.');
       console.log('');
     }
@@ -571,64 +592,108 @@ async function validateAction() {
 // ---------------------------------------------------------------------------
 
 /**
- * Setup and verify @aiox-fullstack/pro installation.
+ * Setup and verify AIOX Pro installation.
  *
- * Since @aiox-fullstack/pro is published on the public npm registry,
- * no special token or .npmrc configuration is needed. This command
- * installs the package and verifies it's working.
+ * Tries canonical @aiox-squads/pro first, then legacy fallbacks.
  *
  * @param {object} options - Command options
  * @param {boolean} options.verify - Only verify without installing
  */
 async function setupAction(options) {
+  const PRO_PACKAGES = ['@aiox-squads/pro', '@aiox-fullstack/pro', '@aios-fullstack/pro'];
+
   console.log('\nAIOX Pro - Setup\n');
 
   if (options.verify) {
-    // Verify-only mode
-    console.log('Verifying @aiox-fullstack/pro installation...\n');
+    console.log('Verifying AIOX Pro installation...\n');
 
     try {
       const { execSync } = require('child_process');
-      const result = execSync('npm ls @aiox-fullstack/pro --json', {
-        stdio: 'pipe',
-        timeout: 15000,
-      });
-      const parsed = JSON.parse(result.toString());
-      const deps = parsed.dependencies || {};
-      if (deps['@aiox-fullstack/pro']) {
-        console.log(`✅ @aiox-fullstack/pro@${deps['@aiox-fullstack/pro'].version} is installed`);
-      } else {
-        console.log('❌ @aiox-fullstack/pro is not installed');
+      let found = false;
+      for (const pkg of PRO_PACKAGES) {
+        try {
+          const result = execSync(`npm ls ${pkg} --json`, { stdio: 'pipe', timeout: 15000 });
+          const parsed = JSON.parse(result.toString());
+          const deps = parsed.dependencies || {};
+          if (deps[pkg]) {
+            console.log(`✅ ${pkg}@${deps[pkg].version} is installed`);
+            found = true;
+            break;
+          }
+        } catch { /* try next */ }
+      }
+      if (!found) {
+        console.log('❌ AIOX Pro is not installed');
         console.log('');
         console.log('Install with:');
-        console.log('  npm install @aiox-fullstack/pro');
+        console.log('  aiox pro setup');
+        console.log('  # or npx aiox-pro install');
       }
     } catch {
-      console.log('❌ @aiox-fullstack/pro is not installed');
+      console.log('❌ AIOX Pro is not installed');
       console.log('');
       console.log('Install with:');
-      console.log('  npm install @aiox-fullstack/pro');
+      console.log('  aiox pro setup');
+      console.log('  # or npx aiox-pro install');
     }
     return;
   }
 
-  // Install mode
-  console.log('@aiox-fullstack/pro is available on the public npm registry.');
+  // Install mode — try canonical first, fallback second
+  console.log('AIOX Pro is available on the public npm registry.');
   console.log('No special tokens or configuration needed.\n');
 
-  console.log('Installing @aiox-fullstack/pro...\n');
+  const { execSync } = require('child_process');
+  let installedPackage = null;
 
-  try {
-    const { execSync } = require('child_process');
-    execSync('npm install @aiox-fullstack/pro', {
-      stdio: 'inherit',
-      timeout: 120000,
-    });
-    console.log('\n✅ @aiox-fullstack/pro installed successfully!');
-  } catch (error) {
-    console.error(`\n❌ Installation failed: ${error.message}`);
+  function getInstallErrorOutput(error) {
+    return [
+      error?.message,
+      error?.stderr?.toString?.(),
+      error?.stdout?.toString?.(),
+    ].filter(Boolean).join('\n');
+  }
+
+  function isPackageNotFoundError(error, pkg) {
+    const output = getInstallErrorOutput(error).toLowerCase();
+    const packageName = pkg.toLowerCase();
+
+    if (!output.includes(packageName)) {
+      return false;
+    }
+
+    return output.includes('e404')
+      || output.includes('npm err! 404')
+      || output.includes(' is not in this registry')
+      || output.includes(' not found');
+  }
+
+  for (const pkg of PRO_PACKAGES) {
+    try {
+      console.log(`Installing ${pkg}...\n`);
+      execSync(`npm install ${pkg}`, { stdio: 'inherit', timeout: 120000 });
+      console.log(`\n✅ ${pkg} installed successfully!`);
+      installedPackage = pkg;
+      break;
+    } catch (error) {
+      if (isPackageNotFoundError(error, pkg)) {
+        continue;
+      }
+
+      console.error(`\n❌ Failed to install ${pkg}.`);
+      const details = getInstallErrorOutput(error);
+      if (details) {
+        console.error(details);
+      }
+      process.exit(1);
+    }
+  }
+
+  if (!installedPackage) {
+    console.error('\n❌ Installation failed.');
     console.log('\nTry manually:');
-    console.log('  npm install @aiox-fullstack/pro');
+    console.log('  aiox pro setup');
+    console.log('  # or npx aiox-pro install');
     process.exit(1);
   }
 
@@ -644,6 +709,66 @@ async function setupAction(options) {
   console.log('');
 }
 
+// ---------------------------------------------------------------------------
+// aiox pro update (Story 122.3)
+// ---------------------------------------------------------------------------
+
+async function updateAction(options) {
+  const proUpdaterPath = path.resolve(__dirname, '..', '..', '..', 'core', 'pro', 'pro-updater');
+  let updatePro, formatUpdateResult;
+
+  try {
+    ({ updatePro, formatUpdateResult } = require(proUpdaterPath));
+  } catch {
+    console.error('❌ Pro updater module not found.');
+    console.error('Please ensure aiox-core is installed correctly.');
+    process.exit(1);
+  }
+
+  const projectRoot = process.cwd();
+
+  // Validate license before updating (unless --check)
+  if (!options.check && !options.dryRun) {
+    try {
+      const { featureGate } = loadLicenseModules();
+      const state = featureGate.getLicenseState();
+      if (state !== 'Active' && state !== 'Grace') {
+        console.error('\n❌ AIOX Pro license is not active.');
+        console.error('Activate your license first: aiox pro activate --key PRO-XXXX-XXXX-XXXX-XXXX');
+        process.exit(1);
+      }
+    } catch {
+      // License modules not available — proceed anyway (first update scenario)
+    }
+  }
+
+  try {
+    const result = await updatePro(projectRoot, {
+      check: options.check || false,
+      dryRun: options.dryRun || false,
+      force: options.force || false,
+      includeCoreUpdate: options.includeCore || false,
+      skipScaffold: options.skipScaffold || false,
+      onProgress: (phase, message) => {
+        if (phase === 'detect') console.log(`  🔍 ${message}`);
+        else if (phase === 'check') console.log(`  📡 ${message}`);
+        else if (phase === 'core') console.log(`  📦 ${message}`);
+        else if (phase === 'update') console.log(`  ⬆️  ${message}`);
+        else if (phase === 'scaffold') console.log(`  🔧 ${message}`);
+      },
+    });
+
+    console.log(formatUpdateResult(result));
+
+    if (!result.success) {
+      process.exit(1);
+    }
+  } catch (error) {
+    console.error(`\n❌ ${error.message}`);
+    process.exit(1);
+  }
+}
+
 // ---------------------------------------------------------------------------
 // Command builder
 // ---------------------------------------------------------------------------
@@ -691,10 +816,24 @@ function createProCommand() {
   // aiox pro setup (AC-12: Install-gate)
   proCmd
     .command('setup')
-    .description('Install and verify @aiox-fullstack/pro')
+    .description('Install and verify AIOX Pro')
     .option('--verify', 'Only verify installation without installing')
     .action(setupAction);
 
+  // aiox pro update (Story 122.3)
+  proCmd
+    .command('update')
+    .description('Update AIOX Pro to latest version and sync assets')
+    .option('--check', 'Check for updates without applying')
+    .option('--dry-run', 'Show update plan without executing')
+    .option('-f, --force', 'Force reinstall even if up-to-date')
+    .option('--include-core', 'Also update aiox-core')
+    .option('--skip-scaffold', 'Skip re-scaffolding assets after update')
+    .action(updateAction);
+
+  // aiox pro buyer — Cohort admin operations (Story 123.8)
+  proCmd.addCommand(createBuyerCommand());
+
   return proCmd;
 }
 

package/.aiox-core/cli/commands/validate/index.js

@@ -62,6 +62,7 @@ function createValidateCommand() {
     .option('-d, --dry-run', 'Preview repairs without applying (use with --repair)')
     .option('--detailed', 'Show detailed file list')
     .option('--no-hash', 'Skip hash verification (faster)')
+    .option('--no-signature', 'Skip manifest signature verification (insecure; recovery only)')
     .option('--extras', 'Detect extra files not in manifest')
     .option('-v, --verbose', 'Enable verbose output')
     .option('--json', 'Output results as JSON')
@@ -213,6 +214,7 @@ async function runValidation(options) {
   // Create validator instance
   const validator = new PostInstallValidator(projectRoot, sourceDir, {
     verifyHashes: options.hash !== false,
+    requireSignature: options.signature !== false,
     detectExtras: options.extras === true,
     verbose: options.verbose === true,
     onProgress: options.json

package/.aiox-core/core/code-intel/helpers/dev-helper.js

@@ -6,7 +6,7 @@ const { getEnricher, getClient, isCodeIntelAvailable } = require('../index');
 const RISK_THRESHOLDS = {
   LOW_MAX: 4,       // 0-4 refs = LOW
   MEDIUM_MAX: 15,   // 5-15 refs = MEDIUM
-                     // >15 refs = HIGH
+  // >15 refs = HIGH
 };
 
 // Minimum references to suggest REUSE (>threshold = REUSE, <=threshold = ADAPT)

package/.aiox-core/core/code-intel/helpers/devops-helper.js

@@ -78,7 +78,6 @@ async function generateImpactSummary(files) {
     } catch { /* skip — partial result ok */ }
 
     const riskLevel = classifyRiskLevel(impact.blastRadius);
-    const fileCount = impact.references ? impact.references.length : 0;
     const topFiles = (impact.references || [])
       .map((r) => r.file || r.path || 'unknown')
       .slice(0, 10);

package/.aiox-core/core/code-intel/helpers/planning-helper.js

@@ -7,7 +7,7 @@ const { getEnricher, getClient, isCodeIntelAvailable } = require('../index');
 const RISK_THRESHOLDS = {
   LOW_MAX: 4,       // 0-4 refs = LOW
   MEDIUM_MAX: 15,   // 5-15 refs = MEDIUM
-                     // >15 refs = HIGH
+  // >15 refs = HIGH
 };
 
 /**

package/.aiox-core/core/code-intel/helpers/qa-helper.js

@@ -7,14 +7,14 @@ const { getEnricher, getClient, isCodeIntelAvailable } = require('../index');
 const RISK_THRESHOLDS = {
   LOW_MAX: 4,       // 0-4 refs = LOW
   MEDIUM_MAX: 15,   // 5-15 refs = MEDIUM
-                     // >15 refs = HIGH
+  // >15 refs = HIGH
 };
 
 // Coverage status thresholds based on test reference count
 const COVERAGE_THRESHOLDS = {
   INDIRECT_MAX: 2,  // 1-2 test refs = INDIRECT
   MINIMAL_MAX: 5,   // 3-5 test refs = MINIMAL
-                     // >5 test refs = GOOD
+  // >5 test refs = GOOD
 };
 
 /**

package/.aiox-core/core/config/schemas/framework-config.schema.json

@@ -116,6 +116,7 @@
             "properties": {
               "enabled": { "type": "boolean" },
               "path": { "type": "string" },
+              "skillsPath": { "type": "string" },
               "format": { "type": "string", "enum": ["full-markdown-yaml", "condensed-rules", "cursor-style"] }
             },
             "additionalProperties": false

package/.aiox-core/core/config/template-overrides.js

@@ -53,7 +53,7 @@ function getTemplateOverrides(resolvedConfig) {
   if (unknown.length > 0) {
     throw new Error(
       `Unknown story section ID(s) in template_overrides: ${unknown.join(', ')}. ` +
-      `Valid IDs: ${KNOWN_STORY_SECTIONS.join(', ')}`
+      `Valid IDs: ${KNOWN_STORY_SECTIONS.join(', ')}`,
     );
   }
 

package/.aiox-core/core/doctor/checks/ide-sync.js

@@ -1,8 +1,8 @@
 /**
  * Doctor Check: IDE Sync
  *
- * Validates agents in .claude/commands/AIOX/agents/ match
- * .aiox-core/development/agents/ (count and names).
+ * Validates Claude agent skills and legacy command files match
+ * .aiox-core/development/agents/ during the skills-first transition.
  *
  * @module aiox-core/doctor/checks/ide-sync
  * @story INS-4.1
@@ -13,9 +13,54 @@ const fs = require('fs');
 
 const name = 'ide-sync';
 
+function readMarkdownAgents(dir, label) {
+  if (!fs.existsSync(dir)) {
+    return { agents: [], error: null };
+  }
+
+  try {
+    const agents = fs.readdirSync(dir)
+      .filter((f) => f.endsWith('.md'))
+      .map((f) => f.replace('.md', ''));
+    return { agents, error: null };
+  } catch (error) {
+    return { agents: [], error: `Cannot read ${label} directory: ${error.message}` };
+  }
+}
+
+function readSkillAgents(dir) {
+  if (!fs.existsSync(dir)) {
+    return { agents: [], error: null };
+  }
+
+  try {
+    const agents = fs.readdirSync(dir, { withFileTypes: true })
+      .filter((entry) => entry.isDirectory() && fs.existsSync(path.join(dir, entry.name, 'SKILL.md')))
+      .map((entry) => entry.name);
+    return { agents, error: null };
+  } catch (error) {
+    return { agents: [], error: `Cannot read Claude skills directory: ${error.message}` };
+  }
+}
+
+function diffAgents(expected, actual) {
+  const expectedSet = new Set(expected);
+  const actualSet = new Set(actual);
+  return {
+    missing: expected.filter((id) => !actualSet.has(id)),
+    extra: actual.filter((id) => !expectedSet.has(id)),
+  };
+}
+
+function formatList(items) {
+  if (items.length === 0) return 'none';
+  return items.slice(0, 5).join(', ') + (items.length > 5 ? `, +${items.length - 5} more` : '');
+}
+
 async function run(context) {
   const agentsSourceDir = path.join(context.projectRoot, '.aiox-core', 'development', 'agents');
-  const agentsIdeDir = path.join(context.projectRoot, '.claude', 'commands', 'AIOX', 'agents');
+  const agentsCommandDir = path.join(context.projectRoot, '.claude', 'commands', 'AIOX', 'agents');
+  const agentsSkillDir = path.join(context.projectRoot, '.claude', 'skills', 'AIOX', 'agents');
 
   if (!fs.existsSync(agentsSourceDir)) {
     return {
@@ -26,16 +71,7 @@ async function run(context) {
     };
   }
 
-  if (!fs.existsSync(agentsIdeDir)) {
-    return {
-      check: name,
-      status: 'WARN',
-      message: 'IDE agents directory not found (.claude/commands/AIOX/agents/)',
-      fixCommand: 'npx aiox-core install --force',
-    };
-  }
-
-  let sourceAgents, ideFiles;
+  let sourceAgents;
   try {
     sourceAgents = fs.readdirSync(agentsSourceDir)
       .filter((f) => f.endsWith('.md'))
@@ -49,27 +85,41 @@ async function run(context) {
     };
   }
 
-  try {
-    ideFiles = fs.readdirSync(agentsIdeDir)
-      .filter((f) => f.endsWith('.md'));
-  } catch (_err) {
+  const commandResult = readMarkdownAgents(agentsCommandDir, 'Claude commands');
+  const skillResult = readSkillAgents(agentsSkillDir);
+
+  if (commandResult.error || skillResult.error) {
     return {
       check: name,
-      status: 'WARN',
-      message: 'Cannot read IDE agents directory',
+      status: 'FAIL',
+      message: commandResult.error || skillResult.error,
       fixCommand: 'npx aiox-core install --force',
     };
   }
 
-  const ideAgents = ideFiles.map((f) => f.replace('.md', ''));
+  const commandAgents = commandResult.agents;
+  const skillAgents = skillResult.agents;
+
   const sourceCount = sourceAgents.length;
-  const ideCount = ideAgents.length;
+  const commandCount = commandAgents.length;
+  const skillCount = skillAgents.length;
+  const skillDiff = diffAgents(sourceAgents, skillAgents);
+  const commandDiff = diffAgents(sourceAgents, commandAgents);
+
+  if (skillDiff.missing.length > 0 || skillDiff.extra.length > 0) {
+    return {
+      check: name,
+      status: 'WARN',
+      message: `Claude skills mismatch (missing: ${formatList(skillDiff.missing)}; extra: ${formatList(skillDiff.extra)})`,
+      fixCommand: 'npx aiox-core install --force',
+    };
+  }
 
-  if (sourceCount === ideCount) {
+  if (commandDiff.missing.length === 0 && commandDiff.extra.length === 0) {
     return {
       check: name,
       status: 'PASS',
-      message: `${ideCount}/${sourceCount} agents synced`,
+      message: `${skillCount}/${sourceCount} Claude skills synced; ${commandCount}/${sourceCount} legacy commands synced`,
       fixCommand: null,
     };
   }
@@ -77,9 +127,15 @@ async function run(context) {
   return {
     check: name,
     status: 'WARN',
-    message: `IDE has ${ideCount} agents, source has ${sourceCount}`,
+    message: `${skillCount}/${sourceCount} Claude skills synced; legacy commands mismatch (missing: ${formatList(commandDiff.missing)}; extra: ${formatList(commandDiff.extra)}; count: ${commandCount}/${sourceCount})`,
     fixCommand: 'npx aiox-core install --force',
   };
 }
 
-module.exports = { name, run };
+module.exports = {
+  name,
+  run,
+  readMarkdownAgents,
+  readSkillAgents,
+  diffAgents,
+};

package/.aiox-core/core/doctor/checks/rules-files.js

@@ -47,7 +47,6 @@ async function run(context) {
     };
   }
 
-  const present = EXPECTED_RULES.length - missing.length;
   const severity = missing.length > 3 ? 'FAIL' : 'WARN';
 
   return {