@boyingliu01/xp-gate 0.9.3 → 0.9.4

package/lib/doctor.js

@@ -211,7 +211,32 @@ function diagnose() {
   issues += configResult.issues;
 
   // --- Check 2: Version mismatch ---
-  const pkgVersion = getPackageVersion();
+  issues += diagnoseVersion(config, getPackageVersion(), checks);
+
+  // --- Check 3: templateDir validation ---
+  issues += diagnoseTemplateDir(config, checks);
+
+  // --- Check 4: Hooks files ---
+  if (config.mode === 'local') {
+    issues += checkLocalHooks(checks);
+  } else {
+    issues += checkGlobalHooks(checks);
+  }
+
+  // --- Check 5: Adapters directory ---
+  issues += checkAdapters(checks, config.mode, getGitDir());
+
+  // --- Check 6: Environment dependencies ---
+  checkEnv(checks);
+
+  return { checks, issues };
+}
+
+/**
+ * Check 2: Version mismatch between config and package.
+ * @returns {number} issue count (0 or 1)
+ */
+function diagnoseVersion(config, pkgVersion, checks) {
   const configVersion = config.version;
   if (configVersion && pkgVersion && configVersion !== pkgVersion) {
     checks.push({
@@ -219,10 +244,16 @@ function diagnose() {
       status: 'FAIL',
       detail: `config: ${configVersion}, package: ${pkgVersion} — run 'xp-gate doctor --fix' to sync`
     });
-    issues++;
+    return 1;
   }
+  return 0;
+}
 
-  // --- Check 3: templateDir validation ---
+/**
+ * Check 3: templateDir validation against platform expectation.
+ * @returns {number} issue count (0 or 1)
+ */
+function diagnoseTemplateDir(config, checks) {
   const configTemplateDir = config.templateDir;
   if (configTemplateDir) {
     const expectedTemplateDir = getTemplateDir();
@@ -232,24 +263,10 @@ function diagnose() {
         status: 'FAIL',
         detail: `points to ${configTemplateDir}, expected ${expectedTemplateDir} for current platform`
       });
-      issues++;
+      return 1;
     }
   }
-
-  // --- Check 4: Hooks files ---
-  if (config.mode === 'local') {
-    issues += checkLocalHooks(checks);
-  } else {
-    issues += checkGlobalHooks(checks);
-  }
-
-  // --- Check 5: Adapters directory ---
-  issues += checkAdapters(checks, config.mode, getGitDir());
-
-  // --- Check 6: Environment dependencies ---
-  checkEnv(checks);
-
-  return { checks, issues };
+  return 0;
 }
 
 /**
@@ -280,82 +297,131 @@ function restoreHook(srcFile, destFile, label) {
 }
 
 /**
- * Attempt to fix known issues.
- * Only operates when mode === 'active' (local or global).
+ * Fix version mismatch — update config.version to match package version.
+ * @param {object} config
+ * @param {string|null} pkgVersion
+ * @returns {boolean} Whether a fix was applied
  */
-function fixIssues(checks, config) {
-  console.log('');
-  console.log('Attempting fixes...');
-  console.log('-------------------');
-
-  const srcDir = PKG_DIR;
-  let fixed = false;
-
-  // Fix version mismatch — update config version to match package
-  const pkgVersion = getPackageVersion();
+function fixVersionMismatch(config, pkgVersion) {
   if (pkgVersion && config.version !== pkgVersion) {
     config.version = pkgVersion;
     saveConfig(config);
     console.log(`  ✓ Updated config version to ${pkgVersion}`);
-    fixed = true;
+    return true;
   }
+  return false;
+}
 
-  // Fix templateDir mismatch
-  const expectedTemplateDir = getTemplateDir();
+/**
+ * Fix templateDir mismatch — update config.templateDir to match expected.
+ * @param {object} config
+ * @param {string} expectedTemplateDir
+ * @returns {boolean} Whether a fix was applied
+ */
+function fixTemplateDirMismatch(config, expectedTemplateDir) {
   if (config.templateDir && config.templateDir !== expectedTemplateDir) {
     config.templateDir = expectedTemplateDir;
     saveConfig(config);
     console.log(`  ✓ Updated templateDir to ${expectedTemplateDir}`);
-    fixed = true;
+    return true;
+  }
+  return false;
+}
+
+/**
+ * Restore missing hooks from package source.
+ * @param {'local'|'global'} mode
+ * @param {string} srcDir - Package source directory
+ * @param {string} hooksDir - Target hooks directory
+ * @returns {boolean} Whether any hooks were restored
+ */
+function fixMissingHooks(mode, srcDir, hooksDir) {
+  let fixed = false;
+  const label = mode === 'local' ? '' : 'global ';
+  const preCommitLabel = `${label}pre-commit hook`;
+  const prePushLabel = `${label}pre-push hook`;
+  fixed = restoreHook(path.join(srcDir, 'hooks', 'pre-commit'), path.join(hooksDir, 'pre-commit'), preCommitLabel) || fixed;
+  fixed = restoreHook(path.join(srcDir, 'hooks', 'pre-push'), path.join(hooksDir, 'pre-push'), prePushLabel) || fixed;
+  return fixed;
+}
+
+/**
+ * Fix core.hooksPath for global mode.
+ * @param {string} globalHooksDir
+ * @returns {boolean} Whether the fix was applied
+ */
+function fixCoreHooksPath(globalHooksDir) {
+  try {
+    execSync(`git config --global core.hooksPath "${globalHooksDir}"`, {
+      stdio: ['pipe', 'pipe', 'pipe']
+    });
+    console.log(`  ✓ Set core.hooksPath to ${globalHooksDir}`);
+    return true;
+  } catch (e) {
+    console.log(`  ✗ Could not set core.hooksPath: ${e.message}`);
+    return false;
+  }
+}
+
+/**
+ * Restore missing adapters from package source.
+ * @param {'local'|'global'} mode
+ * @param {string} srcDir - Package source directory
+ * @param {string} adaptersDir - Target adapters directory
+ * @returns {boolean} Whether adapters were restored
+ */
+function fixMissingAdapters(mode, srcDir, adaptersDir) {
+  if (adaptersDir && (!fs.existsSync(adaptersDir) || fs.readdirSync(adaptersDir).filter(f => f.endsWith('.sh')).length === 0)) {
+    const pkgAdaptersDir = path.join(srcDir, 'adapters');
+    if (fs.existsSync(pkgAdaptersDir)) {
+      fs.mkdirSync(adaptersDir, { recursive: true });
+      const adapterFiles = fs.readdirSync(pkgAdaptersDir).filter(f => f.endsWith('.sh'));
+      for (const f of adapterFiles) {
+        fs.copyFileSync(path.join(pkgAdaptersDir, f), path.join(adaptersDir, f));
+      }
+      console.log(`  ✓ Restored ${adapterFiles.length} adapter(s)`);
+      return true;
+    }
   }
+  return false;
+}
+
+/**
+ * Attempt to fix known issues.
+ * Only operates when mode === 'active' (local or global).
+ */
+function fixIssues(checks, config) {
+  console.log('');
+  console.log('Attempting fixes...');
+  console.log('-------------------');
+
+  const srcDir = PKG_DIR;
+  let fixed = false;
+
+  fixed = fixVersionMismatch(config, getPackageVersion()) || fixed;
+  fixed = fixTemplateDirMismatch(config, getTemplateDir()) || fixed;
 
-  // Fix missing hooks
   if (config.mode === 'local') {
     const gitDir = getGitDir();
     if (gitDir) {
       const hooksDir = path.join(gitDir, 'hooks');
-      fixed = restoreHook(path.join(srcDir, 'hooks', 'pre-commit'), path.join(hooksDir, 'pre-commit'), 'pre-commit hook') || fixed;
-      fixed = restoreHook(path.join(srcDir, 'hooks', 'pre-push'), path.join(hooksDir, 'pre-push'), 'pre-push hook') || fixed;
+      fixed = fixMissingHooks('local', srcDir, hooksDir) || fixed;
     }
   } else {
-    const hooksDir = GLOBAL_HOOKS_DIR;
-    fixed = restoreHook(path.join(srcDir, 'hooks', 'pre-commit'), path.join(hooksDir, 'pre-commit'), 'global pre-commit hook') || fixed;
-    fixed = restoreHook(path.join(srcDir, 'hooks', 'pre-push'), path.join(hooksDir, 'pre-push'), 'global pre-push hook') || fixed;
+    fixed = fixMissingHooks('global', srcDir, GLOBAL_HOOKS_DIR) || fixed;
   }
 
-  // Fix core.hooksPath (global mode only)
   if (config.mode === 'global') {
     const hooksPath = getCurrentHooksPath();
     if (hooksPath !== GLOBAL_HOOKS_DIR) {
-      try {
-        execSync(`git config --global core.hooksPath "${GLOBAL_HOOKS_DIR}"`, {
-          stdio: ['pipe', 'pipe', 'pipe']
-        });
-        console.log(`  ✓ Set core.hooksPath to ${GLOBAL_HOOKS_DIR}`);
-        fixed = true;
-      } catch (e) {
-        console.log(`  ✗ Could not set core.hooksPath: ${e.message}`);
-      }
+      fixed = fixCoreHooksPath(GLOBAL_HOOKS_DIR) || fixed;
     }
   }
 
-  // Fix missing adapters
   const adaptersDir = config.mode === 'local'
     ? path.join(path.dirname(getGitDir() || ''), 'githooks', 'adapters')
     : GLOBAL_ADAPTERS_DIR;
-
-  if (adaptersDir && (!fs.existsSync(adaptersDir) || fs.readdirSync(adaptersDir).filter(f => f.endsWith('.sh')).length === 0)) {
-    const pkgAdaptersDir = path.join(srcDir, 'adapters');
-    if (fs.existsSync(pkgAdaptersDir)) {
-      fs.mkdirSync(adaptersDir, { recursive: true });
-      const adapterFiles = fs.readdirSync(pkgAdaptersDir).filter(f => f.endsWith('.sh'));
-      for (const f of adapterFiles) {
-        fs.copyFileSync(path.join(pkgAdaptersDir, f), path.join(adaptersDir, f));
-      }
-      console.log(`  ✓ Restored ${adapterFiles.length} adapter(s)`);
-      fixed = true;
-    }
-  }
+  fixed = fixMissingAdapters(config.mode, srcDir, adaptersDir) || fixed;
 
   if (!fixed) {
     console.log('  No fixable issues found.');
@@ -374,31 +440,10 @@ function isUninstalledMode(config) {
   return config && config !== 'corrupt' && config.mode === 'uninstalled';
 }
 
-async function doctor(args) {
-  const fixMode = args.includes('--fix');
-
-  console.log('XP-Gate Doctor');
-  console.log('==============');
-
-  const config = getConfig();
-
-  // §4.8: mode === "uninstalled" → print "xp-gate is not installed"
-  if (isUninstalledMode(config)) {
-    console.log('xp-gate is not installed.');
-    console.log('Run xp-gate init to install.');
-    return 0;
-  }
-
-  // §4.13: --fix only when mode === "active"
-  if (fixMode && isActiveMode(config)) {
-    fixIssues(null, config);
-  }
-
-  const { checks, issues } = diagnose();
-
-  printReport(checks);
-
-  // --- Check 7: Version upgrade check ---
+/**
+ * Check 7: Version upgrade check (non-blocking).
+ */
+async function diagnoseUpgrade() {
   try {
     const upgradeResult = await checkUpgrade();
     const msg = formatUpgradeMsg(upgradeResult, 'doctor');
@@ -406,8 +451,13 @@ async function doctor(args) {
       console.log(`\n  ℹ ${msg}`);
     }
   } catch { /* non-blocking — don't fail doctor on network issue */ }
+}
 
-  // --- Check 8: OpenCode plugin version check ---
+/**
+ * Check 8: OpenCode plugin version check.
+ * @returns {number} issue count
+ */
+function diagnoseOpenCodePlugin(checks) {
   const pluginPath = path.join(HOME_DIR, '.config', 'opencode', 'node_modules', '@boyingliu01', 'opencode-plugin', 'package.json');
   if (fs.existsSync(pluginPath)) {
     try {
@@ -423,13 +473,43 @@ async function doctor(args) {
             status: 'WARN',
             detail: `plugin: ${pluginVersion}, xp-gate CLI: ${pkgVersion} — run 'cd ~/.config/opencode && npm update @boyingliu01/opencode-plugin'`
           });
-          issues++;
+          return 1;
         }
       }
     } catch { /* skip */ }
   } else {
     checks.push({ name: 'OpenCode plugin', status: 'SKIP', detail: 'Not installed in OpenCode config' });
   }
+  return 0;
+}
+
+async function doctor(args) {
+  const fixMode = args.includes('--fix');
+
+  console.log('XP-Gate Doctor');
+  console.log('==============');
+
+  const config = getConfig();
+
+  // §4.8: mode === "uninstalled" → print "xp-gate is not installed"
+  if (isUninstalledMode(config)) {
+    console.log('xp-gate is not installed.');
+    console.log('Run xp-gate init to install.');
+    return 0;
+  }
+
+  // §4.13: --fix only when mode === "active"
+  if (fixMode && isActiveMode(config)) {
+    fixIssues(null, config);
+  }
+
+  const { checks, issues: diagnosedIssues } = diagnose();
+  let issues = diagnosedIssues;
+
+  printReport(checks);
+
+  await diagnoseUpgrade();
+  issues += diagnoseOpenCodePlugin(checks);
 
   if (issues === 0) {
     console.log('\n✓ All checks passed');
@@ -448,4 +528,11 @@ async function doctor(args) {
   return issues > 0 ? 1 : 0;
 }
 
-module.exports = { doctor, isXpGateFile, SIGNATURES };
+module.exports = {
+  doctor, isXpGateFile, SIGNATURES,
+  fixVersionMismatch,
+  fixTemplateDirMismatch,
+  fixMissingHooks,
+  fixCoreHooksPath,
+  fixMissingAdapters,
+};

package/lib/install-skill.js

@@ -7,6 +7,7 @@ const { checkDeps } = require('./detect-deps.js');
 const { downloadFromGitHub } = require('./download-skill.js');
 const { rollback } = require('./rollback.js');
 const { HOME_DIR, CONFIG_DIR, detectPlatform } = require('./shared-paths.js');
+const { copyDirRecursive } = require('./shared-utils');
 
 function getSkillsDir() {
   const platform = detectPlatform();
@@ -28,7 +29,7 @@ const SKILLS_REGISTRY = {
 
 async function installSkill(name, options = {}) {
   const { offline = false, verbose = false, force = false } = options;
-  
+
   const platform = detectPlatform();
   const depCheck = await checkDeps(platform);
   if (!depCheck.ok) {
@@ -44,84 +45,104 @@ async function installSkill(name, options = {}) {
       return 1;
     }
   }
-  
+
+  const skillInfo = validateSkillRegistry(name);
+  if (!skillInfo) return 1;
+
+  const targetDir = path.join(getSkillsDir(), name);
+  const dupError = checkDuplicateInstall(targetDir, force);
+  if (dupError) {
+    console.error(dupError);
+    return 1;
+  }
+
+  const installId = `${name}-${Date.now()}`;
+  const backupDir = path.join(CONFIG_DIR, 'backup', installId);
+  backupExisting(targetDir, installId, backupDir);
+
+  try {
+    const result = await performInstall(skillInfo, name, targetDir, offline, verbose);
+    if (result !== 0) return result;
+    return 0;
+  } catch (err) {
+    console.error(`Error: Install failed - ${err.message}`);
+    await rollback(installId);
+    return 1;
+  }
+}
+
+function validateSkillRegistry(name) {
   const skillInfo = SKILLS_REGISTRY[name];
   if (!skillInfo) {
     console.error(`Error: Unknown skill: ${name}`);
     console.error('Available skills: ' + Object.keys(SKILLS_REGISTRY).join(', '));
-    return 1;
+    return null;
   }
-  
-  const targetDir = path.join(getSkillsDir(), name);
+  return skillInfo;
+}
+
+function checkDuplicateInstall(targetDir, force) {
   if (fs.existsSync(targetDir) && !force) {
-    console.error(`Error: ${name} is already installed`);
-    console.error('Use --force to overwrite');
-    return 1;
+    return `Error: ${path.basename(targetDir)} is already installed\nUse --force to overwrite`;
   }
-  
-  const installId = `${name}-${Date.now()}`;
-  const backupDir = path.join(CONFIG_DIR, 'backup', installId);
-  
+  return null;
+}
+
+function backupExisting(targetDir, installId, backupDir) {
   if (fs.existsSync(targetDir)) {
     fs.mkdirSync(backupDir, { recursive: true });
     copyDirRecursive(targetDir, backupDir);
   }
-  
-  try {
-    console.log(`Installing ${name}...`);
-    
-    const skillUrl = `https://raw.githubusercontent.com/${skillInfo.repo}/main/${skillInfo.path}/SKILL.md`;
-    const targetFile = path.join(targetDir, 'SKILL.md');
-    
-    fs.mkdirSync(path.dirname(targetFile), { recursive: true });
-    
-    let downloaded = false;
-    if (!offline) {
-      try {
-        await downloadFile(skillUrl, targetFile, verbose);
-        downloaded = true;
-      } catch (err) {
-        if (verbose) console.warn(`Download failed: ${err.message}`);
-      }
+}
+
+async function performInstall(skillInfo, name, targetDir, offline, verbose) {
+  console.log(`Installing ${name}...`);
+
+  const skillUrl = `https://raw.githubusercontent.com/${skillInfo.repo}/main/${skillInfo.path}/SKILL.md`;
+  const targetFile = path.join(targetDir, 'SKILL.md');
+  fs.mkdirSync(path.dirname(targetFile), { recursive: true });
+
+  let downloaded = false;
+  if (!offline) {
+    try {
+      await downloadFile(skillUrl, targetFile, verbose);
+      downloaded = true;
+    } catch (err) {
+      if (verbose) console.warn(`Download failed: ${err.message}`);
     }
-    
-    if (!downloaded) {
-      if (offline) {
-        console.error(`Error: --offline specified but ${name} not in cache`);
-        return 2;
-      }
-      console.error(`Error: Failed to download ${name}`);
-      console.error('Check network connection');
-      return 1;
+  }
+
+  if (!downloaded) {
+    if (offline) {
+      console.error(`Error: --offline specified but ${name} not in cache`);
+      return 2;
     }
-    
-    ensureConfigDir();
-    updateConfig({
-      installedSkills: {
-        ...(getConfig().installedSkills || {}),
-        [name]: { version: '1.0.0', installedAt: new Date().toISOString() }
-      }
-    });
-    
-    if (verbose) console.log(`Installed to ${targetDir}`);
-    console.log(`✓ ${name} installed`);
-    
-    return 0;
-  } catch (err) {
-    console.error(`Error: Install failed - ${err.message}`);
-    await rollback(installId);
+    console.error(`Error: Failed to download ${name}`);
+    console.error('Check network connection');
     return 1;
   }
+
+  ensureConfigDir();
+  updateConfig({
+    installedSkills: {
+      ...(getConfig().installedSkills || {}),
+      [name]: { version: '1.0.0', installedAt: new Date().toISOString() }
+    }
+  });
+
+  if (verbose) console.log(`Installed to ${targetDir}`);
+  console.log(`✓ ${name} installed`);
+  return 0;
 }
 
 async function downloadFile(url, dest, verbose) {
   return new Promise((resolve, reject) => {
     const file = fs.createWriteStream(dest);
-    
+
     const protocol = url.startsWith('https') ? https : http;
-    
+
     if (verbose) console.log(`Downloading ${url}...`);
-    
+
     protocol.get(url, { timeout: 30000 }, (response) => {
       if (response.statusCode === 301 || response.statusCode === 302) {
         const redirectUrl = response.headers.location;
@@ -130,13 +151,13 @@ async function downloadFile(url, dest, verbose) {
         downloadFile(redirectUrl, dest, verbose).then(resolve).catch(reject);
         return;
       }
-      
+
       if (response.statusCode !== 200) {
         file.close();
         reject(new Error(`HTTP ${response.statusCode}`));
         return;
       }
-      
+
       response.pipe(file);
       file.on('finish', () => {
         file.close();
@@ -150,8 +171,6 @@ async function downloadFile(url, dest, verbose) {
   });
 }
 
-const { copyDirRecursive } = require('./shared-utils');
-
 function ensureConfigDir() {
   fs.mkdirSync(CONFIG_DIR, { recursive: true });
 }
@@ -173,4 +192,4 @@ function updateConfig(updates) {
   fs.writeFileSync(configFile, JSON.stringify(config, null, 2));
 }
 
-module.exports = { installSkill };
+module.exports = { installSkill };

package/lib/shared-phase-constants.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Type declarations for shared-phase-constants (CommonJS module).
+ * Consumed by both sprint-status.js (CJS) and tui-plugin.ts (ESM via tsx).
+ */
+
+export const PHASE_NAMES: Record<string, string>;
+export const PHASE_ORDER: string[];
+
+/**
+ * Find the most recent timestamp across started_at and phase_history.
+ */
+export function getLatestTimestamp(state: object): number;
+
+/**
+ * Check if the sprint state is stale (>1h since last activity).
+ */
+export function isStale(state: object): boolean;

package/lib/shared-phase-constants.js

@@ -0,0 +1,63 @@
+/**
+ * Shared Sprint Flow phase constants.
+ *
+ * Single source of truth for PHASE_NAMES and PHASE_ORDER, consumed by both
+ * the CLI (sprint-status.js, CommonJS) and the OpenCode TUI plugin
+ * (tui-plugin.ts, ESM via tsx).
+ *
+ * @module shared-phase-constants
+ */
+
+const PHASE_NAMES = {
+  '-1': 'ISOLATE',
+  '-0.5': 'AUTO-ESTIMATE',
+  '0': 'THINK',
+  '1': 'PLAN',
+  '2': 'BUILD',
+  '3': 'REVIEW',
+  '4': 'USER ACCEPT',
+  '5': 'FEEDBACK',
+  '6': 'SHIP',
+  '7': 'LAND',
+  '8': 'CLEANUP',
+};
+
+const PHASE_ORDER = ['-1', '-0.5', '0', '1', '2', '3', '4', '5', '6', '7', '8'];
+
+/**
+ * Find the most recent timestamp across started_at and phase_history.
+ * @param {object} state - Sprint state object
+ * @returns {number} Latest timestamp in ms, or 0 if none found
+ */
+function getLatestTimestamp(state) {
+  if (!state || !state.started_at) return 0;
+  const started = new Date(state.started_at).getTime();
+  if (isNaN(started)) return 0;
+  let latest = started;
+  if (Array.isArray(state.phase_history)) {
+    for (const ph of state.phase_history) {
+      if (ph.completed_at) {
+        const t = new Date(ph.completed_at).getTime();
+        if (!isNaN(t) && t > latest) latest = t;
+      }
+      if (ph.started_at) {
+        const t = new Date(ph.started_at).getTime();
+        if (!isNaN(t) && t > latest) latest = t;
+      }
+    }
+  }
+  return latest;
+}
+
+/**
+ * Check if the sprint state is stale (>1h since last activity).
+ * @param {object} state - Sprint state object
+ * @returns {boolean}
+ */
+function isStale(state) {
+  if (!state || !state.started_at) return false;
+  const latest = getLatestTimestamp(state);
+  return latest > 0 && Date.now() - latest > 3600000;
+}
+
+module.exports = { PHASE_NAMES, PHASE_ORDER, getLatestTimestamp, isStale };

package/lib/shared-utils.js

@@ -3,6 +3,7 @@
  * No module-level state — safe for tests that mock fs/path/os.
  */
 const fs = require('fs');
+const path = require('path');
 
 /**
  * Recursively copy a directory.
@@ -12,8 +13,8 @@ function copyDirRecursive(src, dest) {
   fs.mkdirSync(dest, { recursive: true });
   const entries = fs.readdirSync(src, { withFileTypes: true });
   for (const entry of entries) {
-    const srcPath = require('path').join(src, entry.name);
-    const destPath = require('path').join(dest, entry.name);
+    const srcPath = path.join(src, entry.name);
+    const destPath = path.join(dest, entry.name);
     if (entry.isDirectory()) {
       copyDirRecursive(srcPath, destPath);
     } else {
@@ -22,4 +23,14 @@ function copyDirRecursive(src, dest) {
   }
 }
 
-module.exports = { copyDirRecursive };
+function readXpGateConfig() {
+  const cfgPath = path.join(require('os').homedir(), '.xp-gate', 'config.json');
+  try {
+    if (!fs.existsSync(cfgPath)) return null;
+    return JSON.parse(fs.readFileSync(cfgPath, 'utf8'));
+  } catch {
+    return null;
+  }
+}
+
+module.exports = { copyDirRecursive, readXpGateConfig };