ppcos 1.0.5 → 1.0.7

package/lib/commands/init-all.js

@@ -4,31 +4,17 @@
  * Usage: ppcos init-all [--force]
  */
 
-import { readFileSync, existsSync } from 'node:fs';
+import { existsSync } from 'node:fs';
 import { readFile, mkdir, rename } from 'node:fs/promises';
 import { join, dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
 import { validateConfig } from '../utils/validation.js';
 import { calculateChecksum } from '../utils/checksum.js';
-import { createManifest, writeManifest, manifestExists, getManagedType } from '../utils/manifest.js';
+import { createManifest, writeManifest, manifestExists, getManagedType, hubManifestExists } from '../utils/manifest.js';
 import { getAllFiles } from '../utils/fs-helpers.js';
 import { fetchSkills } from '../utils/skills-fetcher.js';
+import { installHubSkills } from './init.js';
 import logger from '../utils/logger.js';
-
-// Get package root directory
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const PACKAGE_ROOT = join(__dirname, '..', '..');
-
-/**
- * Get package version from package.json
- * @returns {string}
- */
-function getPackageVersion() {
-  const pkgPath = join(PACKAGE_ROOT, 'package.json');
-  const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
-  return pkg.version;
-}
+import { getPackageVersion, getPackageRoot, getClientsDir } from '../utils/paths.js';
 
 /**
  * Get config file path
@@ -38,16 +24,6 @@ function getConfigPath() {
   return join(process.cwd(), 'main-config.json');
 }
 
-/**
- * Get clients directory path from config or default
- * @param {object} config
- * @returns {string}
- */
-function getClientsDir(config) {
-  const dir = config?.settings?.clientsDirectory || 'clients';
-  return join(process.cwd(), dir);
-}
-
 /**
  * Load and validate main-config.json
  * @returns {{ config: object, errors: string[] } | null}
@@ -216,7 +192,14 @@ export default async function initAll(options = {}) {
     }
   }
 
-  // 3. Display summary
+  // 3. Install hub skills if not already installed
+  const hubDir = process.cwd();
+  if (!hubManifestExists(hubDir)) {
+    const hubBasePath = join(getPackageRoot(), 'hub-base');
+    await installHubSkills(hubBasePath);
+  }
+
+  // 4. Display summary
   console.log('');
   console.log('Summary:');
   console.log(`  Initialized: ${results.initialized}`);
@@ -229,11 +212,5 @@ export default async function initAll(options = {}) {
 }
 
 // Export helpers for testing
-export {
-  getPackageVersion,
-  getConfigPath,
-  getClientsDir,
-  loadConfig,
-  initializeClient,
-  backupClient
-};
+export { getConfigPath, loadConfig, initializeClient, backupClient };
+export { getPackageVersion, getClientsDir } from '../utils/paths.js';

package/lib/commands/init.js

@@ -4,48 +4,17 @@
  * Usage: ppcos init <client-name> [--skip-config]
  */
 
-import { readFileSync, existsSync, rmSync } from 'node:fs';
+import { existsSync, rmSync } from 'node:fs';
 import { readFile, writeFile } from 'node:fs/promises';
-import { join, dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+import { join } from 'node:path';
 import { validateClientName } from '../utils/validation.js';
 import { calculateChecksum } from '../utils/checksum.js';
-import { createManifest, writeManifest, manifestExists, getManagedType } from '../utils/manifest.js';
+import { createManifest, writeManifest, manifestExists, getManagedType, hubManifestExists, writeHubManifest } from '../utils/manifest.js';
 import { getAllFiles, copyFileWithDirs, ensureDir, fileExists } from '../utils/fs-helpers.js';
 import { fetchSkills } from '../utils/skills-fetcher.js';
 import logger from '../utils/logger.js';
 import ora from 'ora';
-
-// Get package root directory
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const PACKAGE_ROOT = join(__dirname, '..', '..');
-
-/**
- * Get package version from package.json
- * @returns {string}
- */
-function getPackageVersion() {
-  const pkgPath = join(PACKAGE_ROOT, 'package.json');
-  const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
-  return pkg.version;
-}
-
-/**
- * Get path to .claude-base template directory
- * @returns {string}
- */
-function getBaseTemplatePath() {
-  return join(PACKAGE_ROOT, '.claude-base');
-}
-
-/**
- * Get clients directory path
- * @returns {string}
- */
-function getClientsDir() {
-  return join(process.cwd(), 'clients');
-}
+import { getPackageVersion, getBaseTemplatePath, getHubBasePath, getClientsDir } from '../utils/paths.js';
 
 /**
  * Add client to main-config.json
@@ -83,6 +52,73 @@ async function addToMainConfig(clientName) {
   logger.debug(`Added "${clientName}" to main-config.json`);
 }
 
+/**
+ * Install hub-level skills to the hub root directory
+ * Hub skills live in hub-base/.claude/skills/ and get installed to {cwd}/.claude/skills/
+ * Only skill files are tracked in .managed-hub.json; my-brand/ and reports/ are user dirs.
+ * @param {string} hubBasePath - Path to hub-base template (local or extracted from zip)
+ */
+async function installHubSkills(hubBasePath) {
+  const hubDir = process.cwd();
+
+  if (!existsSync(hubBasePath)) {
+    logger.debug('No hub-base template found, skipping hub skills');
+    return;
+  }
+
+  if (hubManifestExists(hubDir)) {
+    logger.debug('Hub skills already installed');
+    return;
+  }
+
+  const version = getPackageVersion();
+  const allHubFiles = await getAllFiles(hubBasePath);
+
+  // Separate skill files (tracked) from data directories (not tracked)
+  const skillFiles = allHubFiles.filter(f => f.startsWith('.claude/'));
+  const dataDirs = ['my-brand', 'reports'];
+
+  // Copy skill files and calculate checksums
+  const managedFiles = {};
+
+  for (const relativePath of skillFiles) {
+    const srcPath = join(hubBasePath, relativePath);
+    const destPath = join(hubDir, relativePath);
+    await copyFileWithDirs(srcPath, destPath);
+
+    // Verify copy integrity (guards against cloud sync placeholder files)
+    const srcChecksum = await calculateChecksum(srcPath);
+    let destChecksum = await calculateChecksum(destPath);
+    if (destChecksum !== srcChecksum) {
+      await copyFileWithDirs(srcPath, destPath);
+      destChecksum = await calculateChecksum(destPath);
+      if (destChecksum !== srcChecksum) {
+        logger.error(`File write failed for ${relativePath} (possible cloud sync interference).`);
+        logger.error('Try running the command again.');
+        process.exitCode = 1;
+        return;
+      }
+    }
+
+    managedFiles[relativePath] = {
+      checksum: srcChecksum,
+      version,
+      managedType: 'update'
+    };
+  }
+
+  // Create data directories (not tracked in manifest)
+  for (const dir of dataDirs) {
+    await ensureDir(join(hubDir, dir));
+  }
+
+  // Write hub manifest
+  const manifest = createManifest(version, managedFiles);
+  await writeHubManifest(hubDir, manifest);
+
+  logger.success(`Hub skills installed (${skillFiles.length} files)`);
+}
+
 /**
  * Create main-config.json template
  */
@@ -105,10 +141,15 @@ async function createConfigTemplate() {
   await writeFile(configPath, JSON.stringify(template, null, 2) + '\n');
 
   logger.success('Created main-config.json');
+
+  // Install hub skills
+  await installHubSkills(getHubBasePath());
+
   console.log('');
   console.log('Next steps:');
   console.log('  1. Edit main-config.json with your client names');
   console.log('  2. Run: ppcos init-all');
+  console.log('  3. Run: /my-brand to set up your agency branding');
 }
 
 /**
@@ -227,4 +268,5 @@ export default async function init(clientName, options = {}) {
 }
 
 // Export helpers for testing
-export { getPackageVersion, getBaseTemplatePath, getClientsDir, addToMainConfig };
+export { addToMainConfig, installHubSkills };
+export { getPackageVersion, getBaseTemplatePath, getHubBasePath, getClientsDir } from '../utils/paths.js';

package/lib/commands/status.js

@@ -5,65 +5,17 @@
  */
 
 import { readFileSync, existsSync, readdirSync } from 'node:fs';
-import { join, dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+import { join } from 'node:path';
 import {
   readManifest,
-  manifestExists,
-  detectModifications
+  detectModifications,
+  readHubManifest,
+  hubManifestExists
 } from '../utils/manifest.js';
 import { readAuth } from '../utils/auth.js';
 import logger from '../utils/logger.js';
 import chalk from 'chalk';
-
-// Get package root directory
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const PACKAGE_ROOT = join(__dirname, '..', '..');
-
-/**
- * Get package version from package.json
- * @returns {string}
- */
-function getPackageVersion() {
-  const pkgPath = join(PACKAGE_ROOT, 'package.json');
-  const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
-  return pkg.version;
-}
-
-/**
- * Get clients directory path
- * @returns {string}
- */
-function getClientsDir() {
-  return join(process.cwd(), 'clients');
-}
-
-/**
- * Find all client directories with .managed.json
- * @returns {string[]} Array of client names
- */
-function discoverClients() {
-  const clientsDir = getClientsDir();
-
-  if (!existsSync(clientsDir)) {
-    return [];
-  }
-
-  const entries = readdirSync(clientsDir, { withFileTypes: true });
-  const clients = [];
-
-  for (const entry of entries) {
-    if (entry.isDirectory()) {
-      const clientDir = join(clientsDir, entry.name);
-      if (manifestExists(clientDir)) {
-        clients.push(entry.name);
-      }
-    }
-  }
-
-  return clients;
-}
+import { getPackageVersion, getClientsDir, discoverClients } from '../utils/paths.js';
 
 /**
  * Find custom skills in a client directory
@@ -180,6 +132,45 @@ export default async function status(options = {}) {
   console.log('ppcos-hub/');
   console.log('');
 
+  // Hub skills status
+  const hubDir = process.cwd();
+  if (hubManifestExists(hubDir)) {
+    try {
+      const hubManifest = await readHubManifest(hubDir);
+      const hubMods = await detectModifications(hubDir, hubManifest);
+      const hubFileCount = Object.keys(hubManifest.managedFiles).length;
+
+      console.log('  Hub Skills');
+      if (hubManifest.baseVersion !== packageVersion) {
+        console.log(`    Version: ${hubManifest.baseVersion} → ${packageVersion} available`);
+      } else {
+        console.log(`    Version: ${hubManifest.baseVersion} (up to date)`);
+      }
+      console.log(`    Managed: ${hubFileCount} files`);
+      console.log(`    Modified: ${hubMods.modified.length} files`);
+      for (const file of hubMods.modified) {
+        console.log(`      - ${file}`);
+      }
+
+      // Check branding status
+      const brandPath = join(hubDir, 'my-brand', 'brand.json');
+      if (existsSync(brandPath)) {
+        try {
+          const brand = JSON.parse(readFileSync(brandPath, 'utf8'));
+          console.log(`    Branding: ${chalk.green('configured')} (${brand.company?.name || 'unknown'})`);
+        } catch {
+          console.log(`    Branding: ${chalk.yellow('invalid brand.json')}`);
+        }
+      } else {
+        console.log(`    Branding: ${chalk.yellow('not configured')} — run /my-brand`);
+      }
+      console.log('');
+    } catch (err) {
+      logger.error(`Failed to read hub status: ${err.message}`);
+      console.log('');
+    }
+  }
+
   // Process each client
   for (const clientName of clients) {
     try {
@@ -258,10 +249,5 @@ export default async function status(options = {}) {
 }
 
 // Export helpers for testing
-export {
-  getPackageVersion,
-  getClientsDir,
-  discoverClients,
-  findCustomSkills,
-  getClientStatus
-};
+export { findCustomSkills, getClientStatus };
+export { getPackageVersion, getClientsDir, discoverClients } from '../utils/paths.js';

package/lib/commands/update-hub.js

@@ -0,0 +1,200 @@
+/**
+ * Hub-level skill update command.
+ *
+ * Installs or updates hub skills (branding-generator, report-generator, etc.)
+ * tracked via .managed-hub.json at the project root.
+ */
+
+import { existsSync, unlinkSync } from 'node:fs';
+import { join, sep } from 'node:path';
+import {
+  detectModifications,
+  addConflict,
+  readHubManifest,
+  writeHubManifest,
+  hubManifestExists,
+  createManifest
+} from '../utils/manifest.js';
+import { calculateChecksum } from '../utils/checksum.js';
+import { getAllFiles, copyFileWithDirs, ensureDir } from '../utils/fs-helpers.js';
+import logger from '../utils/logger.js';
+import { getPackageVersion, getHubBasePath } from '../utils/paths.js';
+import { promptConflictResolution, backupFiles } from '../utils/conflicts.js';
+
+/**
+ * Update hub-level skills (branding-generator, report-generator, etc.)
+ * @param {string} basePath - Path to downloaded/local base template directory
+ * @param {object} options - Command options
+ * @param {boolean} options.dryRun - Dry run mode
+ */
+export default async function updateHub(basePath, options = {}) {
+  const hubDir = process.cwd();
+
+  // Determine hub base path — either nested inside downloaded zip or local dev path
+  let hubBasePath = join(basePath, 'hub-base');
+  if (!existsSync(hubBasePath)) {
+    // Try local hub-base (dev mode)
+    hubBasePath = getHubBasePath();
+    if (!existsSync(hubBasePath)) {
+      return; // No hub-base available, skip silently
+    }
+  }
+
+  const hubSkillsDir = join(hubBasePath, '.claude');
+  if (!existsSync(hubSkillsDir)) {
+    return; // hub-base exists but has no .claude/ content
+  }
+
+  const packageVersion = getPackageVersion();
+
+  // Get all hub skill files (only .claude/ subtree is managed)
+  const allHubFiles = await getAllFiles(hubBasePath);
+  const skillFiles = allHubFiles.filter(f => f.startsWith('.claude/'));
+
+  if (skillFiles.length === 0) {
+    return;
+  }
+
+  // First-time installation
+  if (!hubManifestExists(hubDir)) {
+    if (options.dryRun) {
+      console.log('Hub Skills (first install):');
+      console.log(`  Would install ${skillFiles.length} hub skill files`);
+      console.log('');
+      return;
+    }
+
+    const managedFiles = {};
+    for (const relativePath of skillFiles) {
+      const srcPath = join(hubBasePath, relativePath);
+      const destPath = join(hubDir, relativePath);
+      await copyFileWithDirs(srcPath, destPath);
+      const checksum = await calculateChecksum(destPath);
+      managedFiles[relativePath] = { checksum, version: packageVersion, managedType: 'update' };
+    }
+
+    // Create data directories
+    await ensureDir(join(hubDir, 'my-brand'));
+    await ensureDir(join(hubDir, 'reports'));
+
+    const manifest = createManifest(packageVersion, managedFiles);
+    await writeHubManifest(hubDir, manifest);
+    logger.success(`Hub skills installed (${skillFiles.length} files)`);
+    console.log('');
+    return;
+  }
+
+  // Update existing hub skills
+  const manifest = await readHubManifest(hubDir);
+  const currentVersion = manifest.baseVersion;
+
+  if (currentVersion === packageVersion) {
+    return; // Up to date
+  }
+
+  // Detect modifications
+  const mods = await detectModifications(hubDir, manifest, skillFiles);
+
+  if (options.dryRun) {
+    console.log(`Hub Skills (v${currentVersion} → v${packageVersion}):`);
+    console.log(`  Update: ${mods.unchanged.length + mods.missing.length + mods.newInBase.length} files`);
+    if (mods.modified.length > 0) {
+      console.log(`  Modified: ${mods.modified.length} files`);
+      for (const f of mods.modified) console.log(`    - ${f}`);
+    }
+    if (mods.newInBase.length > 0) {
+      console.log(`  New: ${mods.newInBase.length} files`);
+      for (const f of mods.newInBase) console.log(`    - ${f}`);
+    }
+    console.log('');
+    return;
+  }
+
+  // Handle modified files
+  let resolution = null;
+  if (mods.modified.length > 0) {
+    console.log(`Updating Hub Skills (v${currentVersion} → v${packageVersion})`);
+    resolution = await promptConflictResolution(mods.modified, hubDir, hubBasePath);
+    if (resolution === 'cancel') {
+      console.log('  Hub update cancelled');
+      console.log('');
+      return;
+    }
+    if (resolution === 'backup') {
+      try {
+        const backupDir = await backupFiles(hubDir, mods.modified);
+        const relPath = backupDir.replace(hubDir + sep, '');
+        console.log(`  Backed up ${mods.modified.length} modified hub files to ${relPath}`);
+      } catch (err) {
+        logger.error(`  Hub backup failed: ${err.message}`);
+        logger.error('  Hub update aborted.');
+        return;
+      }
+    }
+  }
+
+  // Apply updates
+  const filesToUpdate = [];
+  const filesToSkip = [];
+
+  for (const file of skillFiles) {
+    if (mods.modified.includes(file) && resolution === 'skip') {
+      filesToSkip.push(file);
+    } else {
+      filesToUpdate.push(file);
+    }
+  }
+
+  const updatedFiles = {};
+  for (const relativePath of filesToUpdate) {
+    const srcPath = join(hubBasePath, relativePath);
+    const destPath = join(hubDir, relativePath);
+    const srcChecksum = await calculateChecksum(srcPath);
+    await copyFileWithDirs(srcPath, destPath);
+
+    // Verify copy integrity (guards against cloud sync placeholder files)
+    let destChecksum = await calculateChecksum(destPath);
+    if (destChecksum !== srcChecksum) {
+      await copyFileWithDirs(srcPath, destPath);
+      destChecksum = await calculateChecksum(destPath);
+      if (destChecksum !== srcChecksum) {
+        logger.error(`  File write failed for ${relativePath} (possible cloud sync interference).`);
+        logger.error('  Hub update aborted — try running update again.');
+        return;
+      }
+    }
+
+    updatedFiles[relativePath] = { checksum: srcChecksum, version: packageVersion, managedType: 'update' };
+  }
+
+  // Detect and remove orphaned hub files
+  const hubBaseSet = new Set(skillFiles);
+  const orphaned = Object.keys(manifest.managedFiles).filter(f => !hubBaseSet.has(f));
+  let removedCount = 0;
+  for (const relativePath of orphaned) {
+    const fullPath = join(hubDir, relativePath);
+    if (existsSync(fullPath)) {
+      unlinkSync(fullPath);
+      removedCount++;
+    }
+    delete manifest.managedFiles[relativePath];
+  }
+
+  // Update manifest
+  manifest.baseVersion = packageVersion;
+  manifest.lastUpdated = new Date().toISOString();
+  manifest.conflicts = [];
+  for (const [path, info] of Object.entries(updatedFiles)) {
+    manifest.managedFiles[path] = info;
+  }
+  for (const file of filesToSkip) {
+    addConflict(manifest, file, 'User modified - skipped during update', packageVersion);
+  }
+  await writeHubManifest(hubDir, manifest);
+
+  console.log(`  Updated ${filesToUpdate.length} hub skill files`);
+  if (removedCount > 0) console.log(`  Removed ${removedCount} orphaned hub files`);
+  if (filesToSkip.length > 0) console.log(`  Skipped ${filesToSkip.length} modified hub files`);
+  logger.success('Hub skills updated');
+  console.log('');
+}