qwen-base 1.0.1 → 1.0.2

package/bin/install.js

@@ -3,8 +3,8 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const readline = require('readline');
 
-// Colors
 const green = '\x1b[32m';
 const cyan = '\x1b[36m';
 const yellow = '\x1b[33m';
@@ -14,12 +14,12 @@ const reset = '\x1b[0m';
 const pkg = require('../package.json');
 
 const banner = `
-${green}  ██████╗ ███████╗███████╗██████╗
-  ██╔══██╗██╔════╝██╔════╝██╔══██╗
-  ██████╔╝█████╗  █████╗  ██████╔╝
-  ██╔══██╗██╔══╝  ██╔══╝  ██╔══██╗
-  ██║  ██║███████╗███████╗██║  ██║
-  ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝  ╚═╝${reset}
+${green}  \u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2557
+  \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557
+  \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551
+  \u2588\u2588\u2554\u2550\u2550\u2550\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2551
+  \u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255d\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551
+  \u255a\u2550\u2550\u2550\u2550\u2550\u255d \u255a\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255d\u255a\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255d\u255a\u2550\u2550\u2550\u2550\u2550\u255d${reset}
 
   BASE ${dim}v${pkg.version}${reset}
   Builder's Automated State Engine
@@ -27,8 +27,10 @@ ${green}  ██████╗ ███████╗███████╗
 `;
 
 const args = process.argv.slice(2);
-const hasHelp = args.includes('--help') || args.includes('-h');
+const hasGlobal = args.includes('--global') || args.includes('-g');
 const hasLocal = args.includes('--local') || args.includes('-l');
+const hasHelp = args.includes('--help') || args.includes('-h');
+const skipTools = args.includes('--skip-tools');
 
 function parseConfigDirArg() {
   const idx = args.findIndex(arg => arg === '--config-dir' || arg === '-c');
@@ -41,16 +43,14 @@ function parseConfigDirArg() {
     return nextArg;
   }
   const configDirArg = args.find(arg => arg.startsWith('--config-dir=') || arg.startsWith('-c='));
-  if (configDirArg) {
-    return configDirArg.split('=')[1];
-  }
+  if (configDirArg) return configDirArg.split('=')[1];
   return null;
 }
 
+const explicitConfigDir = parseConfigDirArg();
+
 function expandTilde(filePath) {
-  if (filePath && filePath.startsWith('~/')) {
-    return path.join(os.homedir(), filePath.slice(2));
-  }
+  if (filePath && filePath.startsWith('~/')) return path.join(os.homedir(), filePath.slice(2));
   return filePath;
 }
 
@@ -61,24 +61,17 @@ function copyDir(srcDir, destDir, skipDirs = []) {
     if (skipDirs.includes(entry.name)) continue;
     const srcPath = path.join(srcDir, entry.name);
     const destPath = path.join(destDir, entry.name);
-    if (entry.isDirectory()) {
-      copyDir(srcPath, destPath, skipDirs);
-    } else {
-      fs.copyFileSync(srcPath, destPath);
-    }
+    if (entry.isDirectory()) copyDir(srcPath, destPath, skipDirs);
+    else fs.copyFileSync(srcPath, destPath);
   }
 }
 
-function countFiles(dir, ext) {
+function countFiles(dir) {
   let count = 0;
   const entries = fs.readdirSync(dir, { withFileTypes: true });
   for (const entry of entries) {
-    const fullPath = path.join(dir, entry.name);
-    if (entry.isDirectory()) {
-      count += countFiles(fullPath, ext);
-    } else if (!ext || entry.name.endsWith(ext)) {
-      count++;
-    }
+    if (entry.isDirectory()) count += countFiles(path.join(dir, entry.name));
+    else count++;
   }
   return count;
 }
@@ -89,139 +82,94 @@ if (hasHelp) {
   console.log(`  ${yellow}Usage:${reset} npx qwen-base [options]
 
   ${yellow}Options:${reset}
-    ${cyan}-l, --local${reset}              Install to ./.qwen/commands/ instead of global
-    ${cyan}-c, --config-dir <path>${reset}  Specify custom Qwen config directory
-    ${cyan}-h, --help${reset}               Show this help message
+    ${cyan}-g, --global${reset}              Install globally (to Qwen config directory)
+    ${cyan}-l, --local${reset}               Install locally (to ./.qwen/ in current directory)
+    ${cyan}-c, --config-dir <path>${reset}   Specify custom Qwen config directory
+    ${cyan}--skip-tools${reset}              Skip OSS analysis tool installation
+    ${cyan}-h, --help${reset}                Show this help message
 
   ${yellow}Examples:${reset}
-    ${dim}# Install globally (default)${reset}
-    npx qwen-base
+    ${dim}# Install globally (recommended)${reset}
+    npx qwen-base --global
 
     ${dim}# Install to current project only${reset}
     npx qwen-base --local
 
   ${yellow}What gets installed:${reset}
-    ${cyan}commands/qwen-base/${reset}
-      base.md              Entry point (routing + persona)
-      framework/           Tasks, templates, frameworks (11 commands)
-      commands/            Command definitions
-      hooks/               7 Python hooks for workspace intelligence
-      templates/           operator.json, workspace.json templates
-    ${cyan}.qwen/hooks/${reset}              Python hooks registration
+    ${cyan}commands/qwen-base/${reset}       11 slash commands
+    ${cyan}base/                            Framework (core, transform, domains, schemas, rules, tools)
 `);
   process.exit(0);
 }
 
-const explicitConfigDir = parseConfigDirArg();
-const configDir = expandTilde(explicitConfigDir) || expandTilde(process.env.QWEN_CONFIG_DIR);
-const globalDir = configDir || path.join(os.homedir(), '.qwen');
-const qwenDir = hasLocal ? path.join(process.cwd(), '.qwen') : globalDir;
-const baseDest = path.join(qwenDir, 'commands', 'qwen-base');
-
-const locationLabel = hasLocal
-  ? baseDest.replace(process.cwd(), '.')
-  : baseDest.replace(os.homedir(), '~');
-
-if (fs.existsSync(baseDest)) {
-  console.log(`  ${yellow}Existing installation found at ${locationLabel}${reset}`);
-  console.log(`  Updating...`);
-  fs.rmSync(baseDest, { recursive: true, force: true });
-}
-
-console.log(`  Installing to ${cyan}${locationLabel}${reset}\n`);
-
-const src = path.join(__dirname, '..');
-
-// Copy entry point
-fs.mkdirSync(baseDest, { recursive: true });
-fs.copyFileSync(path.join(src, 'src', 'skill', 'base.md'), path.join(baseDest, 'base.md'));
-console.log(`  ${green}+${reset} base.md ${dim}(entry point)${reset}`);
-
-// Copy framework
-const fwSrc = path.join(src, 'src', 'framework');
-const fwDest = path.join(baseDest, 'framework');
-copyDir(fwSrc, fwDest);
-const fwCount = countFiles(fwSrc);
-console.log(`  ${green}+${reset} framework/ ${dim}(${fwCount} files)${reset}`);
-
-// Copy commands
-const cmdSrc = path.join(src, 'src', 'commands');
-const cmdDest = path.join(baseDest, 'commands');
-copyDir(cmdSrc, cmdDest);
-const cmdCount = countFiles(cmdSrc);
-console.log(`  ${green}+${reset} commands/ ${dim}(${cmdCount} files)${reset}`);
-
-// Copy hooks
-const hooksSrc = path.join(src, 'src', 'hooks');
-const hooksDest = path.join(baseDest, 'hooks');
-copyDir(hooksSrc, hooksDest);
-const hookCount = countFiles(hooksSrc);
-console.log(`  ${green}+${reset} hooks/ ${dim}(${hookCount} Python hooks)${reset}`);
-
-// Copy templates
-const tplSrc = path.join(src, 'src', 'templates');
-const tplDest = path.join(baseDest, 'templates');
-copyDir(tplSrc, tplDest);
-console.log(`  ${green}+${reset} templates/ ${dim}(workspace templates)${reset}`);
-
-// Copy MCP server
-const mcpSrc = path.join(src, 'src', 'packages', 'base-mcp');
-if (fs.existsSync(mcpSrc)) {
-  const mcpDest = path.join(qwenDir, 'base-mcp');
-  copyDir(mcpSrc, mcpDest);
-  console.log(`  ${green}+${reset} base-mcp/ ${dim}(MCP server)${reset}`);
-
-  // Install MCP deps
-  try {
-    require('child_process').execSync('npm install --production --silent', {
-      cwd: mcpDest, stdio: 'pipe'
-    });
-    console.log(`  ${green}+${reset} MCP dependencies installed${reset}`);
-  } catch (e) {
-    console.log(`  ${yellow}!${reset} MCP deps install failed — run cd ${mcpDest} && npm install${reset}`);
+function install(isGlobal) {
+  const src = path.join(__dirname, '..');
+  const configDir = expandTilde(explicitConfigDir) || expandTilde(process.env.QWEN_CONFIG_DIR);
+  const globalDir = configDir || path.join(os.homedir(), '.qwen');
+  const qwenDir = isGlobal ? globalDir : path.join(process.cwd(), '.qwen');
+  const aegisDest = path.join(qwenDir, 'aegis');
+  const cmdsDest = path.join(qwenDir, 'commands', 'qwen-base');
+
+  const locationLabel = isGlobal
+    ? qwenDir.replace(os.homedir(), '~')
+    : qwenDir.replace(process.cwd(), '.');
+
+  if (fs.existsSync(aegisDest) || fs.existsSync(cmdsDest)) {
+    console.log(`  ${yellow}Existing installation found at ${locationLabel}${reset}`);
+    console.log(`  Updating...`);
+    if (fs.existsSync(aegisDest)) fs.rmSync(aegisDest, { recursive: true, force: true });
+    if (fs.existsSync(cmdsDest)) fs.rmSync(cmdsDest, { recursive: true, force: true });
   }
-}
 
-// Wire hooks into .qwen/settings.json
-function wireHooks(qwenDir, hooksDir) {
-  const settingsPath = path.join(qwenDir, 'settings.json');
-  let settings = {};
-  if (fs.existsSync(settingsPath)) {
-    try { settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8')); } catch (e) {}
+  console.log(`  Installing to ${cyan}${locationLabel}${reset}\n`);
+
+  // Copy framework (note: BASE uses 'src/' structure)
+  if (fs.existsSync(path.join(src, 'src'))) {
+    copyDir(path.join(src, 'src'), path.join(qwenDir, 'base'));
+    console.log(`  ${green}+${reset} base/ ${dim}(${countFiles(path.join(qwenDir, 'base'))} framework files)${reset}`);
   }
-  if (!settings.hooks) settings.hooks = {};
-
-  const hookFiles = fs.readdirSync(hooksDir).filter(f => f.endsWith('.py') && !f.startsWith('_'));
-  for (const hookFile of hookFiles) {
-    const hookName = hookFile.replace('.py', '');
-    const hookPath = path.join(hooksDir, hookFile).replace(/\\/g, '/');
-    const hookCommand = `python3 ${hookPath}`;
-
-    // Determine which event
-    let eventName = 'SessionStart';
-    if (hookFile === 'active-hook.py') eventName = 'SessionStart';
-    else if (hookFile === 'psmm-injector.py') eventName = 'SessionStart';
-    else if (hookFile === 'backlog-hook.py') eventName = 'SessionStart';
-    else if (hookFile === 'operator.py') eventName = 'SessionStart';
-    else if (hookFile === 'satellite-detection.py') eventName = 'SessionStart';
-    else if (hookFile === 'apex-insights.py') eventName = 'Stop';
-    else if (hookFile === 'base-pulse-check.py') eventName = 'SessionStart';
-
-    if (!settings.hooks[eventName]) settings.hooks[eventName] = [];
-    const exists = settings.hooks[eventName].some(h =>
-      (h.command && h.command.includes(hookFile)) ||
-      (h.hooks && h.hooks.some(i => i.command && i.command.includes(hookFile)))
-    );
-    if (!exists) {
-      settings.hooks[eventName].push({ hooks: [{ type: 'command', command: hookCommand }] });
-    }
+
+  // Copy commands
+  if (fs.existsSync(path.join(src, 'src', 'commands'))) {
+    fs.mkdirSync(cmdsDest, { recursive: true });
+    copyDir(path.join(src, 'src', 'commands'), cmdsDest);
+    console.log(`  ${green}+${reset} commands/qwen-base/ ${dim}(${countFiles(cmdsDest)} commands)${reset}`);
   }
-  fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
+
+  console.log(`
+  ${green}Done!${reset} Open Qwen Code and type ${cyan}/base${reset} to start.
+`);
 }
 
-wireHooks(qwenDir, hooksDest);
-console.log(`  ${green}+${reset} Hooks wired in settings.json${reset}`);
+function promptLocation() {
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
 
-console.log(`
-  ${green}Done!${reset} Open Qwen Code and type ${cyan}/base${reset} to start.
+  const configDir = expandTilde(explicitConfigDir) || expandTilde(process.env.QWEN_CONFIG_DIR);
+  const globalPath = configDir || path.join(os.homedir(), '.qwen');
+  const globalLabel = globalPath.replace(os.homedir(), '~');
+
+  console.log(`  ${yellow}Where would you like to install?${reset}
+
+  ${cyan}1${reset}) Global ${dim}(${globalLabel})${reset} - available in all projects
+  ${cyan}2${reset}) Local  ${dim}(./.qwen)${reset} - this project only
 `);
+
+  rl.question(`  Choice ${dim}[1]${reset}: `, (answer) => {
+    rl.close();
+    install(answer.trim() !== '2');
+  });
+}
+
+if (hasGlobal && hasLocal) {
+  console.error(`  ${yellow}Cannot specify both --global and --local${reset}`);
+  process.exit(1);
+} else if (explicitConfigDir && hasLocal) {
+  console.error(`  ${yellow}Cannot use --config-dir with --local${reset}`);
+  process.exit(1);
+} else if (hasGlobal) {
+  install(true);
+} else if (hasLocal) {
+  install(false);
+} else {
+  promptLocation();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qwen-base",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Builder's Automated State Engine — workspace lifecycle management for Qwen Code",
   "bin": {
     "qwen-base": "bin/install.js"