@matt82198/aesop 0.3.2 → 0.4.1

package/tools/doctor.js

@@ -9,6 +9,7 @@
 
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 const { spawnSync } = require('child_process');
 const net = require('net');
 
@@ -34,17 +35,19 @@ function colorFail() {
 function checkNodeVersion() {
   const version = parseInt(process.versions.node.split('.')[0], 10);
   const passed = version >= 18;
-  const hint = passed ? '' : `Found Node.js v${process.versions.node}, need >=18`;
+  const hint = passed ? `v${process.versions.node}` : `Found Node.js v${process.versions.node}, need >=18`;
   return { passed, hint };
 }
 
-// Check Python available (python3 or python)
+// Check Python available and version >= 3.10
 function checkPython() {
   // Try python3 first
-  const result3 = spawnSync('python3', ['--version'], { stdio: 'ignore', timeout: 5000 });
+  let pythonBin = null;
+  let result3 = spawnSync('python3', ['--version'], { encoding: 'utf8', timeout: 5000 });
+
   if (result3.error && result3.error.code === 'ENOENT') {
     // python3 not found, try python fallback
-    const result = spawnSync('python', ['--version'], { stdio: 'ignore', timeout: 5000 });
+    const result = spawnSync('python', ['--version'], { encoding: 'utf8', timeout: 5000 });
     if (result.error && result.error.code === 'ENOENT') {
       // Neither python3 nor python found
       return { passed: false, hint: 'python3 or python not found on PATH' };
@@ -53,13 +56,35 @@ function checkPython() {
       // python exists but returned non-zero exit code
       return { passed: false, hint: 'python found but returned non-zero exit code' };
     }
-    return { passed: true, hint: '' };
-  }
-  if (result3.status !== 0) {
+    pythonBin = 'python';
+  } else if (result3.status !== 0) {
     // python3 exists but returned non-zero exit code
     return { passed: false, hint: 'python3 found but returned non-zero exit code' };
+  } else {
+    pythonBin = 'python3';
+  }
+
+  // Extract version from python output
+  let versionStr = '';
+  try {
+    const versionOutput = result3.stdout || result3.stderr || '';
+    const match = versionOutput.match(/Python\s+(\d+)\.(\d+)/i);
+    if (match) {
+      const major = parseInt(match[1], 10);
+      const minor = parseInt(match[2], 10);
+      versionStr = `${major}.${minor}`;
+      if (major > 3 || (major === 3 && minor >= 10)) {
+        return { passed: true, hint: `v${versionStr}` };
+      } else {
+        return { passed: false, hint: `Found Python v${versionStr}, need >=3.10` };
+      }
+    }
+  } catch (e) {
+    // Version extraction failed but python runs
+    return { passed: true, hint: 'Available (version check skipped)' };
   }
-  return { passed: true, hint: '' };
+
+  return { passed: true, hint: 'Available' };
 }
 
 // Check git repo (.git directory exists)
@@ -78,13 +103,98 @@ function checkConfig() {
       return { passed: false, hint: 'aesop.config.json not found' };
     }
     const content = fs.readFileSync(configPath, 'utf8');
-    JSON.parse(content);
+    const config = JSON.parse(content);
+
+    // Validate repos array exists and is an array
+    if (!('repos' in config)) {
+      return { passed: false, hint: 'Missing required field: repos' };
+    }
+    if (!Array.isArray(config.repos)) {
+      return { passed: false, hint: 'repos field must be an array' };
+    }
+
+    // Validate aesop_root exists on disk (if present in config)
+    if (config.aesop_root && !fs.existsSync(config.aesop_root)) {
+      return { passed: false, hint: `aesop_root does not exist: ${config.aesop_root}` };
+    }
+
+    // Validate repo paths exist (if specified)
+    for (const repo of config.repos) {
+      if (repo.path && !fs.existsSync(repo.path)) {
+        return { passed: false, hint: `Repo path does not exist: ${repo.path}` };
+      }
+    }
+
     return { passed: true, hint: '' };
   } catch (e) {
-    return { passed: false, hint: `Config parse error: ${e.message}` };
+    return { passed: false, hint: `Config error: ${e.message}` };
   }
 }
 
+// Check for placeholder repo URLs and warn
+function checkRepoURLs() {
+  const configPath = path.join(CURRENT_DIR, 'aesop.config.json');
+  try {
+    if (!fs.existsSync(configPath)) {
+      // Skip this check if config doesn't exist (main checkConfig will fail)
+      return { passed: true, hint: '' };
+    }
+    const content = fs.readFileSync(configPath, 'utf8');
+    const config = JSON.parse(content);
+
+    // Check for placeholder URLs
+    const placeholderPattern = /https:\/\/github\.com\/user\//i;
+    if (config.repos && Array.isArray(config.repos)) {
+      for (const repo of config.repos) {
+        if (repo.url && placeholderPattern.test(repo.url)) {
+          return {
+            passed: false,
+            hint: `Placeholder URL found: ${repo.url}. Replace with actual repo URL or remove the repo entry.`
+          };
+        }
+      }
+    }
+
+    return { passed: true, hint: '' };
+  } catch (e) {
+    return { passed: true, hint: '' };  // Skip check on config parse error (main checkConfig handles it)
+  }
+}
+
+// Check if ~/.claude/skills/power/SKILL.md and ~/.claude/skills/buildsystem/SKILL.md exist (WARN only)
+function checkSkillsFiles() {
+  const homeDir = os.homedir();
+  const powerSkill = path.join(homeDir, '.claude', 'skills', 'power', 'SKILL.md');
+  const buildsystemSkill = path.join(homeDir, '.claude', 'skills', 'buildsystem', 'SKILL.md');
+
+  const powerExists = fs.existsSync(powerSkill);
+  const buildsystemExists = fs.existsSync(buildsystemSkill);
+
+  // Skills are required but we WARN, not FAIL, to allow doctor to proceed on partial setup
+  if (!powerExists && !buildsystemExists) {
+    return {
+      passed: true,  // WARN, not fail
+      hint: `⚠ Skills not found at ~/.claude/skills/. Required before running orchestrator. Copy: cp -r ~/.claude/skills/ here`
+    };
+  }
+
+  if (!powerExists) {
+    return {
+      passed: true,  // WARN, not fail
+      hint: `⚠ power/SKILL.md not found at ${powerSkill}. Required before running orchestrator.`
+    };
+  }
+
+  if (!buildsystemExists) {
+    return {
+      passed: true,  // WARN, not fail
+      hint: `⚠ buildsystem/SKILL.md not found at ${buildsystemSkill}. Required before running orchestrator.`
+    };
+  }
+
+  return { passed: true, hint: 'Both skills present' };
+}
+
 // Check required directories exist
 function checkDirectories() {
   const requiredDirs = ['daemons', 'dash', 'monitor', 'tools', 'ui'];
@@ -174,9 +284,11 @@ function formatRow(label, status, hint) {
 
     const syncChecks = [
       { label: 'Node.js version ≥18', fn: checkNodeVersion },
-      { label: 'Python (python3 or python)', fn: checkPython },
+      { label: 'Python version ≥3.10', fn: checkPython },
       { label: 'Git repository', fn: checkGitRepo },
-      { label: 'aesop.config.json (valid JSON)', fn: checkConfig },
+      { label: 'aesop.config.json (structure & required fields)', fn: checkConfig },
+      { label: 'Repository URLs (no placeholders)', fn: checkRepoURLs },
+      { label: 'Skills files (power & buildsystem)', fn: checkSkillsFiles },
       { label: 'Required directories (daemons, dash, monitor, tools, ui)', fn: checkDirectories },
       { label: 'Git pre-push hook installed', fn: checkPrePushHook }
     ];

package/tools/reproduce.js

@@ -44,9 +44,10 @@ function colorSkip() {
 
 // Detect context: repo checkout vs installed package
 function detectContext() {
-  // Repo checkout has .git/config and package.json with npm scripts
+  // Repo checkout has .git/config, package.json with npm scripts, AND package-lock.json
   const hasGitConfig = fs.existsSync(path.join(PACKAGE_ROOT, '.git', 'config'));
   const hasPackageJson = fs.existsSync(path.join(PACKAGE_ROOT, 'package.json'));
+  const hasPackageLock = fs.existsSync(path.join(PACKAGE_ROOT, 'package-lock.json'));
   const hasTestScripts = hasPackageJson && (() => {
     try {
       const pkg = JSON.parse(fs.readFileSync(path.join(PACKAGE_ROOT, 'package.json'), 'utf8'));
@@ -57,7 +58,8 @@ function detectContext() {
   })();
 
   // Installed package is in node_modules with limited structure
-  const isInstalled = !hasGitConfig && !hasTestScripts;
+  // OR repo-mode detected but package-lock.json is missing (fresh scaffold — degrade gracefully)
+  const isInstalled = (!hasGitConfig && !hasTestScripts) || (hasGitConfig && !hasPackageLock);
 
   return isInstalled ? 'installed' : 'repo';
 }
@@ -368,7 +370,14 @@ function runInstalledMode() {
 (async function main() {
   try {
     const context = detectContext();
+    const hasGitConfig = fs.existsSync(path.join(PACKAGE_ROOT, '.git', 'config'));
+    const hasPackageLock = fs.existsSync(path.join(PACKAGE_ROOT, 'package-lock.json'));
+    const isDegradedFromRepo = hasGitConfig && !hasPackageLock;
+
     console.log(`${COLORS.DIM}Context: ${context}${COLORS.RESET}`);
+    if (isDegradedFromRepo) {
+      console.log(`${COLORS.YELLOW}Scaffolded project detected — running installed-mode verification; full reproduce is for the aesop repo itself${COLORS.RESET}`);
+    }
 
     let results;
     if (context === 'repo') {