@massu/core 1.2.1 → 1.3.0

package/src/commands/install-commands.ts

@@ -8,12 +8,31 @@
  * Copies all massu assets from the npm package into the project's .claude/
  * directory. Existing massu files are updated; non-massu files are preserved.
  * Handles subdirectories recursively (e.g., golden-path/references/).
+ *
+ * v1.3.0 — Stack-aware variants + local-edit protection (manifest):
+ *   - Variant resolution at the top level of `commands/`: a template named
+ *     `<base>.<variant>.md` is preferred over `<base>.md` when the consumer's
+ *     `massu.config.yaml` declares a matching language. See `pickVariant`.
+ *   - Local edits are preserved across reinstalls via a per-consumer manifest
+ *     (`<claudeDir>/.massu/install-manifest.json`) that records the SHA-256 of
+ *     each file at last install. See "Layer 3: Local-edit protection" in the
+ *     2026-04-26 plan doc.
  */
 
-import { existsSync, readFileSync, writeFileSync, mkdirSync, readdirSync, statSync } from 'fs';
+import {
+  existsSync,
+  readFileSync,
+  writeFileSync,
+  mkdirSync,
+  readdirSync,
+  statSync,
+  renameSync,
+} from 'fs';
 import { resolve, dirname, relative, join } from 'path';
 import { fileURLToPath } from 'url';
+import { createHash } from 'crypto';
 import { getConfig } from '../config.ts';
+import type { Config } from '../config.ts';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -68,6 +87,179 @@ export function resolveCommandsDir(): string | null {
   return resolveAssetDir('commands');
 }
 
+// ============================================================
+// Manifest (local-edit protection)
+// ============================================================
+
+const MANIFEST_VERSION = 1;
+const MANIFEST_RELPATH = join('.massu', 'install-manifest.json');
+
+/** Manifest file shape — see plan §"Manifest JSON shape". */
+export interface Manifest {
+  version: number;
+  generatedBy: string;
+  generatedAt: string;
+  /** key: path relative to the consumer's claudeDir; value: SHA-256 hex digest. */
+  entries: Record<string, string>;
+}
+
+/** SHA-256 hex digest of a string. */
+export function hashContent(content: string): string {
+  return createHash('sha256').update(content, 'utf-8').digest('hex');
+}
+
+/** Load the manifest from `<claudeDir>/.massu/install-manifest.json`, or return an empty manifest. */
+export function loadManifest(claudeDir: string): Manifest {
+  const path = resolve(claudeDir, MANIFEST_RELPATH);
+  if (!existsSync(path)) {
+    return emptyManifest();
+  }
+  try {
+    const raw = readFileSync(path, 'utf-8');
+    const parsed = JSON.parse(raw) as Manifest;
+    if (!parsed || typeof parsed !== 'object' || !parsed.entries) {
+      return emptyManifest();
+    }
+    return parsed;
+  } catch {
+    return emptyManifest();
+  }
+}
+
+/** Write the manifest atomically: tempfile + renameSync. */
+export function saveManifest(claudeDir: string, manifest: Manifest): void {
+  const dir = resolve(claudeDir, '.massu');
+  if (!existsSync(dir)) {
+    mkdirSync(dir, { recursive: true });
+  }
+  const finalPath = resolve(dir, 'install-manifest.json');
+  const tempPath = finalPath + '.tmp';
+  manifest.generatedAt = new Date().toISOString();
+  writeFileSync(tempPath, JSON.stringify(manifest, null, 2), 'utf-8');
+  renameSync(tempPath, finalPath);
+}
+
+function emptyManifest(): Manifest {
+  return {
+    version: MANIFEST_VERSION,
+    generatedBy: '@massu/core',
+    generatedAt: new Date().toISOString(),
+    entries: {},
+  };
+}
+
+/**
+ * Run a function with the manifest loaded; persist atomically afterward.
+ * Used by both `installAll` and the legacy `installCommands` so any caller
+ * of either entry point gets the manifest written exactly once per run.
+ */
+export function runWithManifest<T>(claudeDir: string, fn: (m: Manifest) => T): T {
+  const manifest = loadManifest(claudeDir);
+  const result = fn(manifest);
+  saveManifest(claudeDir, manifest);
+  return result;
+}
+
+// ============================================================
+// Variant Resolution (Phase 1)
+// ============================================================
+
+/** Discriminated-union return shape for `pickVariant`. */
+export type PickVariantResult =
+  | { kind: 'hit'; suffix: string } // found a variant (suffix may be "")
+  | { kind: 'miss' } // no candidate found, caller SKIPS the file
+  | { kind: 'fallback'; reason: string }; // misconfig / safe fallback, caller copies UNSUFFIXED default
+
+/** Well-known language keys for the passthrough-fallback step in `pickVariant`. */
+const PASSTHROUGH_LANG_KEYS = [
+  'typescript',
+  'javascript',
+  'python',
+  'swift',
+  'rust',
+  'go',
+] as const;
+
+/**
+ * Choose the variant suffix for a base template name.
+ *
+ * Priority order (per plan §"Variant resolution algorithm"):
+ *   1. `framework.primary` (or `framework.type` if primary undefined)
+ *   2. Each declared `framework.languages.<lang>` entry with a non-empty `framework`,
+ *      in YAML declaration order.
+ *   3. Passthrough fallback: well-known top-level `framework.<lang>` blocks with a
+ *      non-empty `framework` field, in fixed order, excluding entries already covered.
+ *   4. The unsuffixed default ("").
+ *
+ * The function NEVER throws. It returns a discriminated union so the caller can
+ * distinguish "skip this file" from "copy the default" — see plan §"Error semantics".
+ */
+export function pickVariant(
+  baseName: string,
+  sourceDir: string,
+  framework: Config['framework'],
+): PickVariantResult {
+  const candidates: string[] = [];
+
+  // 1. framework.primary (or fall back to framework.type)
+  const primary = framework.primary ?? framework.type;
+  if (primary && primary !== 'multi') {
+    candidates.push(primary);
+  }
+
+  // 2. framework.languages declaration order
+  if (framework.languages) {
+    for (const lang of Object.keys(framework.languages)) {
+      const entry = framework.languages[lang];
+      if (entry && typeof entry.framework === 'string' && entry.framework.length > 0) {
+        if (!candidates.includes(lang)) {
+          candidates.push(lang);
+        }
+      }
+    }
+  }
+
+  // 3. Passthrough fallback — `framework.<lang>` (top-level passthrough block).
+  //    Zod's `.passthrough()` preserves these at runtime even though they are not
+  //    typed members of `Config['framework']`. Reading via a Record-shaped widening
+  //    avoids `any`/`@ts-ignore`.
+  const passthrough = framework as unknown as Record<string, unknown>;
+  for (const lang of PASSTHROUGH_LANG_KEYS) {
+    if (candidates.includes(lang)) continue;
+    const block = passthrough[lang];
+    if (block && typeof block === 'object') {
+      const fw = (block as { framework?: unknown }).framework;
+      if (typeof fw === 'string' && fw.length > 0) {
+        candidates.push(lang);
+      }
+    }
+  }
+
+  // 4. Probe disk
+  for (const cand of candidates) {
+    const path = resolve(sourceDir, `${baseName}.${cand}.md`);
+    if (existsSync(path)) {
+      return { kind: 'hit', suffix: `.${cand}` };
+    }
+  }
+  // Unsuffixed default
+  const defaultPath = resolve(sourceDir, `${baseName}.md`);
+  if (existsSync(defaultPath)) {
+    return { kind: 'hit', suffix: '' };
+  }
+
+  // No hit. Risk #7: framework.type=multi without primary → safe fallback.
+  if (framework.type === 'multi' && !framework.primary) {
+    process.stderr.write(
+      'massu: warning - framework.type=multi but framework.primary is undefined; ' +
+        'falling back to default templates\n',
+    );
+    return { kind: 'fallback', reason: 'multi-without-primary' };
+  }
+
+  return { kind: 'miss' };
+}
+
 // ============================================================
 // Recursive File Sync
 // ============================================================
@@ -76,14 +268,36 @@ interface SyncStats {
   installed: number;
   updated: number;
   skipped: number;
+  kept: number;
+}
+
+/** Returns true if a top-level entry name has the `<base>.<variant>.md` shape. */
+function isVariantFilename(entry: string): boolean {
+  // Match exactly one inner dot before `.md`. `_shared-preamble.md` (no inner dot) survives.
+  return /^[^.]+\.[^.]+\.md$/.test(entry);
 }
 
 /**
  * Recursively sync all .md files from sourceDir to targetDir.
- * Creates subdirectories as needed. Preserves non-massu files.
+ *
+ * At top level (`topLevel === true`), apply variant resolution:
+ *   - Skip entries that match `<base>.<variant>.md` (the variant siblings are
+ *     selected indirectly via `pickVariant` so they never land in the consumer
+ *     dir directly).
+ *   - For each base entry `<base>.md`, call `pickVariant` to choose the source.
+ *
+ * At depth ≥ 1 (subdirectory recursion), copy files as-is — no variant logic,
+ * no dot-skip filter (so future authors can use dotted filenames in subdirs).
  */
-function syncDirectory(sourceDir: string, targetDir: string): SyncStats {
-  const stats: SyncStats = { installed: 0, updated: 0, skipped: 0 };
+export function syncDirectory(
+  sourceDir: string,
+  targetDir: string,
+  framework: Config['framework'],
+  manifest: Manifest,
+  manifestKeyPrefix: string,
+  topLevel: boolean = true,
+): SyncStats {
+  const stats: SyncStats = { installed: 0, updated: 0, skipped: 0, kept: 0 };
 
   if (!existsSync(targetDir)) {
     mkdirSync(targetDir, { recursive: true });
@@ -93,30 +307,109 @@ function syncDirectory(sourceDir: string, targetDir: string): SyncStats {
 
   for (const entry of entries) {
     const sourcePath = resolve(sourceDir, entry);
-    const targetPath = resolve(targetDir, entry);
     const entryStat = statSync(sourcePath);
 
     if (entryStat.isDirectory()) {
-      // Recurse into subdirectories
-      const subStats = syncDirectory(sourcePath, targetPath);
+      // Recurse — depth > 0 disables variant filtering for nested files.
+      const subTargetDir = resolve(targetDir, entry);
+      const subPrefix = manifestKeyPrefix === ''
+        ? entry
+        : `${manifestKeyPrefix}/${entry}`;
+      const subStats = syncDirectory(
+        sourcePath,
+        subTargetDir,
+        framework,
+        manifest,
+        subPrefix,
+        false,
+      );
       stats.installed += subStats.installed;
       stats.updated += subStats.updated;
       stats.skipped += subStats.skipped;
-    } else if (entry.endsWith('.md')) {
-      const sourceContent = readFileSync(sourcePath, 'utf-8');
-
-      if (existsSync(targetPath)) {
-        const existingContent = readFileSync(targetPath, 'utf-8');
-        if (existingContent === sourceContent) {
-          stats.skipped++;
-          continue;
-        }
-        writeFileSync(targetPath, sourceContent, 'utf-8');
-        stats.updated++;
-      } else {
-        writeFileSync(targetPath, sourceContent, 'utf-8');
-        stats.installed++;
+      stats.kept += subStats.kept;
+      continue;
+    }
+
+    if (!entry.endsWith('.md')) continue;
+
+    let sourceFilename = entry;
+    let baseName = entry.slice(0, -'.md'.length);
+
+    if (topLevel) {
+      // Skip variant siblings — they are selected indirectly via the base name.
+      if (isVariantFilename(entry)) continue;
+
+      const choice = pickVariant(baseName, sourceDir, framework);
+      if (choice.kind === 'miss') {
+        // No file to copy.
+        continue;
       }
+      // 'hit' or 'fallback' both copy a file:
+      //   - 'hit' uses the chosen suffix (may be "")
+      //   - 'fallback' copies the unsuffixed default (same as suffix === "")
+      const suffix = choice.kind === 'hit' ? choice.suffix : '';
+      sourceFilename = suffix === '' ? `${baseName}.md` : `${baseName}${suffix}.md`;
+    }
+
+    const resolvedSourcePath = resolve(sourceDir, sourceFilename);
+    if (!existsSync(resolvedSourcePath)) {
+      // Defensive: pickVariant said hit, but file vanished between probe and read.
+      continue;
+    }
+
+    // Target filename is always the BASE name (variant suffix is internal to the package).
+    const targetFilename = topLevel ? `${baseName}.md` : entry;
+    const targetPath = resolve(targetDir, targetFilename);
+    const sourceContent = readFileSync(resolvedSourcePath, 'utf-8');
+    const sourceHash = hashContent(sourceContent);
+
+    const manifestKey = manifestKeyPrefix === ''
+      ? targetFilename
+      : `${manifestKeyPrefix}/${targetFilename}`;
+    const lastInstalledHash = manifest.entries[manifestKey];
+
+    if (existsSync(targetPath)) {
+      const existingContent = readFileSync(targetPath, 'utf-8');
+      const existingHash = hashContent(existingContent);
+
+      if (existingHash === sourceHash) {
+        // Already byte-identical to upstream. Ensure manifest reflects that.
+        manifest.entries[manifestKey] = sourceHash;
+        stats.skipped++;
+        continue;
+      }
+
+      if (lastInstalledHash === undefined) {
+        // First-install ambiguity: file exists but no manifest entry.
+        // Treat as user-edited: keep, record existing hash, print one-line notice.
+        manifest.entries[manifestKey] = existingHash;
+        process.stderr.write(
+          `First-install heuristic: keeping existing ${targetPath} (differs from upstream).\n` +
+            `  To accept upstream: rm ${targetPath} && npx massu install-commands\n`,
+        );
+        stats.kept++;
+        continue;
+      }
+
+      if (existingHash !== lastInstalledHash) {
+        // User edited it after the last install. Preserve.
+        process.stderr.write(
+          `${targetFilename} has local edits - kept your version.\n` +
+            `  To accept upstream: rm ${targetPath} && npx massu install-commands\n` +
+            `  To diff:            diff ${targetPath} <(npx massu show-template ${baseName})\n`,
+        );
+        stats.kept++;
+        continue;
+      }
+
+      // existingHash === lastInstalledHash and sourceHash differs → safe upgrade.
+      writeFileSync(targetPath, sourceContent, 'utf-8');
+      manifest.entries[manifestKey] = sourceHash;
+      stats.updated++;
+    } else {
+      writeFileSync(targetPath, sourceContent, 'utf-8');
+      manifest.entries[manifestKey] = sourceHash;
+      stats.installed++;
     }
   }
 
@@ -131,12 +424,14 @@ export interface InstallCommandsResult {
   installed: number;
   updated: number;
   skipped: number;
+  kept: number;
   commandsDir: string;
 }
 
 export function installCommands(projectRoot: string): InstallCommandsResult {
   const claudeDirName = getConfig().conventions?.claudeDirName ?? '.claude';
-  const targetDir = resolve(projectRoot, claudeDirName, 'commands');
+  const claudeDir = resolve(projectRoot, claudeDirName);
+  const targetDir = resolve(claudeDir, 'commands');
 
   if (!existsSync(targetDir)) {
     mkdirSync(targetDir, { recursive: true });
@@ -146,10 +441,13 @@ export function installCommands(projectRoot: string): InstallCommandsResult {
   if (!sourceDir) {
     console.error('  ERROR: Could not find massu commands directory.');
     console.error('  Try reinstalling: npm install @massu/core');
-    return { installed: 0, updated: 0, skipped: 0, commandsDir: targetDir };
+    return { installed: 0, updated: 0, skipped: 0, kept: 0, commandsDir: targetDir };
   }
 
-  const stats = syncDirectory(sourceDir, targetDir);
+  const framework = getConfig().framework;
+  const stats = runWithManifest(claudeDir, (manifest) =>
+    syncDirectory(sourceDir, targetDir, framework, manifest, 'commands', true),
+  );
   return { ...stats, commandsDir: targetDir };
 }
 
@@ -162,6 +460,7 @@ export interface InstallAllResult {
   totalInstalled: number;
   totalUpdated: number;
   totalSkipped: number;
+  totalKept: number;
   claudeDir: string;
 }
 
@@ -173,23 +472,41 @@ export function installAll(projectRoot: string): InstallAllResult {
   let totalInstalled = 0;
   let totalUpdated = 0;
   let totalSkipped = 0;
-
-  for (const assetType of ASSET_TYPES) {
-    const sourceDir = resolveAssetDir(assetType.name);
-    if (!sourceDir) {
-      continue;
+  let totalKept = 0;
+
+  const framework = getConfig().framework;
+
+  runWithManifest(claudeDir, (manifest) => {
+    for (const assetType of ASSET_TYPES) {
+      const sourceDir = resolveAssetDir(assetType.name);
+      if (!sourceDir) continue;
+
+      const targetDir = resolve(claudeDir, assetType.targetSubdir);
+      const stats = syncDirectory(
+        sourceDir,
+        targetDir,
+        framework,
+        manifest,
+        assetType.targetSubdir,
+        true,
+      );
+
+      assets[assetType.name] = stats;
+      totalInstalled += stats.installed;
+      totalUpdated += stats.updated;
+      totalSkipped += stats.skipped;
+      totalKept += stats.kept;
     }
-
-    const targetDir = resolve(claudeDir, assetType.targetSubdir);
-    const stats = syncDirectory(sourceDir, targetDir);
-
-    assets[assetType.name] = stats;
-    totalInstalled += stats.installed;
-    totalUpdated += stats.updated;
-    totalSkipped += stats.skipped;
-  }
-
-  return { assets, totalInstalled, totalUpdated, totalSkipped, claudeDir };
+  });
+
+  return {
+    assets,
+    totalInstalled,
+    totalUpdated,
+    totalSkipped,
+    totalKept,
+    claudeDir,
+  };
 }
 
 // ============================================================
@@ -212,21 +529,28 @@ export async function runInstallCommands(): Promise<void> {
     if (!stats) {
       continue;
     }
-    const total = stats.installed + stats.updated + stats.skipped;
+    const total = stats.installed + stats.updated + stats.skipped + stats.kept;
     if (total === 0) continue;
 
     const parts: string[] = [];
     if (stats.installed > 0) parts.push(`${stats.installed} new`);
     if (stats.updated > 0) parts.push(`${stats.updated} updated`);
     if (stats.skipped > 0) parts.push(`${stats.skipped} current`);
+    if (stats.kept > 0) parts.push(`${stats.kept} kept (local edits)`);
 
     const description = assetType.description;
     console.log(`  ${description}: ${parts.join(', ')} (${total} total)`);
   }
 
-  const grandTotal = result.totalInstalled + result.totalUpdated + result.totalSkipped;
+  const grandTotal =
+    result.totalInstalled + result.totalUpdated + result.totalSkipped + result.totalKept;
   console.log('');
   console.log(`  ${grandTotal} total files synced to ${result.claudeDir}`);
+  if (result.totalKept > 0) {
+    console.log(
+      `  ${result.totalKept} file(s) had local edits and were preserved (see stderr above).`,
+    );
+  }
   console.log('');
   console.log('  Restart your Claude Code session to use them.');
   console.log('');

package/src/commands/show-template.ts

@@ -0,0 +1,65 @@
+// Copyright (c) 2026 Massu. All rights reserved.
+// Licensed under BSL 1.1 - see LICENSE file for details.
+
+/**
+ * `massu show-template <name>` — print the resolved variant of a template.
+ *
+ * Used by the local-edit-protection messaging to support a workflow like:
+ *
+ *   diff .claude/commands/massu-scaffold-router.md \
+ *        <(npx massu show-template massu-scaffold-router)
+ *
+ * The resolved variant honors `pickVariant` against the consumer's current
+ * `massu.config.yaml`. Exits 0 on success, 1 on unknown template.
+ */
+
+import { existsSync, readFileSync } from 'fs';
+import { resolve } from 'path';
+import { getConfig } from '../config.ts';
+import { pickVariant, resolveAssetDir } from './install-commands.ts';
+
+/** Strip an optional trailing `.md` extension. */
+function normalizeBaseName(input: string): string {
+  return input.endsWith('.md') ? input.slice(0, -'.md'.length) : input;
+}
+
+export async function runShowTemplate(args: string[]): Promise<void> {
+  const rawName = args[0];
+  if (!rawName) {
+    process.stderr.write('massu: show-template requires a template name\n');
+    process.stderr.write('  usage: massu show-template <name>\n');
+    process.exit(1);
+    return;
+  }
+
+  const baseName = normalizeBaseName(rawName);
+  const sourceDir = resolveAssetDir('commands');
+  if (!sourceDir) {
+    process.stderr.write('massu: could not locate the bundled commands directory\n');
+    process.exit(1);
+    return;
+  }
+
+  const framework = getConfig().framework;
+  const choice = pickVariant(baseName, sourceDir, framework);
+
+  if (choice.kind === 'miss') {
+    process.stderr.write(`massu: no template named "${baseName}" found\n`);
+    process.exit(1);
+    return;
+  }
+
+  const suffix = choice.kind === 'hit' ? choice.suffix : '';
+  const file = suffix === ''
+    ? resolve(sourceDir, `${baseName}.md`)
+    : resolve(sourceDir, `${baseName}${suffix}.md`);
+
+  if (!existsSync(file)) {
+    // Defensive: pickVariant said hit but the file isn't there.
+    process.stderr.write(`massu: resolved template "${file}" no longer exists\n`);
+    process.exit(1);
+    return;
+  }
+
+  process.stdout.write(readFileSync(file, 'utf-8'));
+}

package/src/config.ts

@@ -534,13 +534,16 @@ export function getConfig(): Config {
       name: parsed.project.name,
       root: projectRoot,
     },
+    // Spread `fw` first so zod-`.passthrough()` extras (e.g., `framework.swift`,
+    // `framework.python`) survive into the consumer-visible Config. Then override
+    // the v2-backcompat-mirrored router/orm/ui values. Without the spread, the
+    // variant-resolution `pickVariant` (install-commands.ts) cannot see the
+    // top-level passthrough language blocks.
     framework: {
-      type: fw.type,
+      ...fw,
       router,
       orm,
       ui,
-      primary: fw.primary,
-      languages: fw.languages,
     },
     paths: parsed.paths,
     toolPrefix: parsed.toolPrefix,