@thebassclef/lite 1.1.0 → 1.2.0-alpha.1

package/dist/cli.cjs

@@ -313,14 +313,21 @@ function substrateConfigMdTemplate(pkgVersion) {
   ].join("\n");
 }
 const MANIFEST_SCHEMA_VERSION = "0.1.0";
-const MANIFEST_SHAPE_VERSION = 2;
+const MANIFEST_SHAPE_VERSION = 3;
+const GENERATED_BY = "@thebassclef/lite";
 function manifestTemplate(input) {
   const value = {
     schema_version: MANIFEST_SHAPE_VERSION,
+    // Top-level `version` — read by the v0.45.0 npm-version-drift hook
+    // (fragment 91 under session-reflection) via lib/npm-version-check.sh
+    // `jq -r '.version // ""' "$manifest"`. Duplicates
+    // $bassclef.generated_by_version on purpose — the hook does not walk
+    // into $bassclef. Per bassclef-upstream#1749.
+    version: input.pkgVersion,
     $bassclef: {
       template: "init.manifest.json",
       manifest_schema_version: MANIFEST_SCHEMA_VERSION,
-      generated_by: "@thebassclef/core",
+      generated_by: GENERATED_BY,
       generated_by_version: input.pkgVersion
     },
     created_at: (/* @__PURE__ */ new Date()).toISOString(),
@@ -388,7 +395,7 @@ function readManifest(targetDir) {
   if (compareSchemaVersion(schema, MANIFEST_SCHEMA_VERSION) > 0) {
     throw new ManifestReadError(
       "SchemaTooNew",
-      `manifest schema version ${schema} is newer than this package understands (${MANIFEST_SCHEMA_VERSION}). Upgrade @thebassclef/core.`
+      `manifest schema version ${schema} is newer than this package understands (${MANIFEST_SCHEMA_VERSION}). Upgrade @thebassclef/lite.`
     );
   }
   const obj = parsed;
@@ -541,7 +548,10 @@ function copySubstrate(targetDir, options = {}) {
     hookCount: 0,
     wiringVersion: manifest.version
   };
-  if (options.dryRun) result.wouldCopy = [];
+  if (options.dryRun) {
+    result.wouldCopy = [];
+    result.wouldCopyEntries = [];
+  }
   const files = walkDistTree(bundleRoot);
   const groups = groupByTopDirectory(files);
   const bundleHookRelPaths = new Set(files.filter(isHookFile));
@@ -697,6 +707,11 @@ function copyOne(relPath, bundleRoot, options, result, scopeDecision) {
   const outputContent = options.transform ? options.transform(adopterRelPath, content) : content;
   if (options.dryRun) {
     result.wouldCopy?.push(adopterRelPath);
+    result.wouldCopyEntries?.push({
+      path: adopterRelPath,
+      scope,
+      content_hash_sha256: hashContent(outputContent)
+    });
     return "wouldCopy";
   }
   try {
@@ -706,7 +721,11 @@ function copyOne(relPath, bundleRoot, options, result, scopeDecision) {
       setExecutable(targetPath);
     }
     result.copied.push(adopterRelPath);
-    result.copiedEntries.push({ path: adopterRelPath, scope });
+    result.copiedEntries.push({
+      path: adopterRelPath,
+      scope,
+      content_hash_sha256: hashContent(outputContent)
+    });
     return "copied";
   } catch (e) {
     if (e instanceof WriteError) {
@@ -783,7 +802,92 @@ function dirExists(p) {
     return false;
   }
 }
+const FAMILIES = [
+  "skills",
+  "rules",
+  "agents",
+  "luminaries",
+  "hooks",
+  "libs",
+  "adrs",
+  "standards",
+  "templates",
+  "presence-templates",
+  "scripts",
+  "root-docs",
+  "other"
+];
+const UNDER_CLAUDE = `${CLAUDE_TARGET_ROOT}/`;
+const PREFIX_RULES = [
+  [`${UNDER_CLAUDE}skills/`, "skills"],
+  [`${UNDER_CLAUDE}rules/`, "rules"],
+  [`${UNDER_CLAUDE}agents/`, "agents"],
+  [`${UNDER_CLAUDE}luminaries/`, "luminaries"],
+  [`${UNDER_CLAUDE}hooks/`, "hooks"],
+  ["lib/", "libs"],
+  ["architecture/decisions/", "adrs"],
+  ["standards/", "standards"],
+  ["templates/", "templates"],
+  ["presence/install/", "presence-templates"],
+  ["scripts/", "scripts"]
+];
+function classifyEntry(path) {
+  for (const [prefix, family] of PREFIX_RULES) {
+    if (path.startsWith(prefix)) return family;
+  }
+  if (!path.includes("/") && /^[A-Z]/.test(path)) return "root-docs";
+  return "other";
+}
+function emptyCatalogCounts() {
+  const out = {};
+  for (const f of FAMILIES) out[f] = 0;
+  return out;
+}
+function buildInitReport(input) {
+  const catalog = emptyCatalogCounts();
+  let project = 0;
+  let user = 0;
+  for (const e of input.entries) {
+    catalog[classifyEntry(e.path)] += 1;
+    if (e.scope === "user") user += 1;
+    else project += 1;
+  }
+  const refused = input.refused.length;
+  const errored = input.errored.length;
+  const written = input.configs.length + input.entries.length;
+  return {
+    schema_version: 3,
+    tier: input.tier,
+    totals: {
+      files: written + refused + errored,
+      written,
+      project,
+      user,
+      configs: input.configs.length
+    },
+    catalog,
+    hooks: {
+      declared: input.hookCount,
+      copied: input.declaredHooksCopied,
+      files: catalog.hooks
+    },
+    refused,
+    errored,
+    failed: refused + errored
+  };
+}
+function renderJsonReport(report, write) {
+  write(JSON.stringify(report) + "\n");
+}
 const RESOLVED_TIER = "lite";
+const SAY_HUMAN = (s) => {
+  process.stdout.write(s);
+};
+const SAY_QUIET = () => {
+};
+function makeSay(json) {
+  return json ? SAY_QUIET : SAY_HUMAN;
+}
 const PLACEHOLDER_FILES = /* @__PURE__ */ new Set([
   "CLAUDE.md",
   "docs/whereami.md",
@@ -825,7 +929,7 @@ function runInit(argv) {
     }
     throw e;
   }
-  const advisoryOutcome = maybeEmitUpgradeAdvisory(targetDir, args.yes);
+  const advisoryOutcome = maybeEmitUpgradeAdvisory(targetDir, args.yes, args.json);
   if (advisoryOutcome === "refused") return 1;
   const upgradeApproved = advisoryOutcome === "upgrade-approved";
   if (!args.force && !args.dryRun && !upgradeApproved) {
@@ -847,26 +951,55 @@ function runInit(argv) {
       templateVersion: SUBSTRATE_CONFIG_TEMPLATE_VERSION
     }
   ];
+  const say = makeSay(args.json);
   if (args.dryRun) {
-    runDryRun$1(plans);
-    return dispatchSubstrateCopy(targetDir, args.force || upgradeApproved, args.verbose, true, args.allowRoot, args.json);
-  }
-  return runReal$1(plans, args.force || upgradeApproved, args.verbose, targetDir, args.allowRoot, args.json);
-}
-function maybeEmitUpgradeAdvisory(targetDir, yes) {
+    runDryRun$1(plans, say);
+    const outcome = dispatchSubstrateCopy(
+      targetDir,
+      args.force || upgradeApproved,
+      args.verbose,
+      true,
+      args.allowRoot,
+      say
+    );
+    if (args.json) {
+      const report = buildInitReport({
+        entries: outcome.result?.wouldCopyEntries ?? [],
+        configs: plans.map((pl) => ({ path: pl.relativePath })),
+        refused: outcome.result?.refused ?? [],
+        // A dry run still reads every source file, so it can still fail
+        // to read one. Hard-coding this empty hid those failures from
+        // the JSON (RFC-0005 A-3).
+        errored: outcome.result?.errored ?? [],
+        hookCount: outcome.result?.hookCount ?? 0,
+        declaredHooksCopied: 0,
+        tier: RESOLVED_TIER
+      });
+      renderJsonReport(report, (t) => {
+        process.stdout.write(t);
+      });
+    }
+    return outcome.code;
+  }
+  return runReal$1(plans, args.force || upgradeApproved, args.verbose, targetDir, args.allowRoot, args.json, say);
+}
+function maybeEmitUpgradeAdvisory(targetDir, yes, json) {
+  const prompt = json ? (t) => {
+    process.stderr.write(t);
+  } : SAY_HUMAN;
   const manifestPath = node_path.join(targetDir, MANIFEST_RELATIVE_PATH);
   if (!node_fs.existsSync(manifestPath)) return "ok";
   const version = readManifestShapeVersion(targetDir);
   if (version !== null && version >= 2) return "ok";
-  process.stdout.write(
+  prompt(
     `bassclef init: cli 1.0.1 introduces user-scope hook installation at ~/${HOOKS_SUBPATH}. cli 1.0.0 did not write there.
 `
   );
   if (yes) return "upgrade-approved";
-  process.stdout.write("bassclef init: continue? (y/N) ");
+  prompt("bassclef init: continue? (y/N) ");
   const answer = readOneLineFromStdin();
   if (answer === "" || answer === "y" || answer === "Y") return "upgrade-approved";
-  process.stdout.write("bassclef init: aborted by adopter.\n");
+  prompt("bassclef init: aborted by adopter.\n");
   return "refused";
 }
 function readOneLineFromStdin() {
@@ -878,7 +1011,7 @@ function readOneLineFromStdin() {
     return "";
   }
 }
-function dispatchSubstrateCopy(targetDir, force, verbose, dryRun, allowRoot, json) {
+function dispatchSubstrateCopy(targetDir, force, verbose, dryRun, allowRoot, say) {
   const substitute = makePlaceholderTransform(targetDir);
   let result;
   try {
@@ -892,9 +1025,9 @@ function dispatchSubstrateCopy(targetDir, force, verbose, dryRun, allowRoot, jso
     if (e instanceof CopyFailure) {
       process.stderr.write(`bassclef init: ${e.message}
 `);
-      if (e.kind === "ManifestMissing") return 4;
-      if (e.kind === "SchemaIncompatible") return 5;
-      return 2;
+      if (e.kind === "ManifestMissing") return { code: 4 };
+      if (e.kind === "SchemaIncompatible") return { code: 5 };
+      return { code: 2 };
     }
     throw e;
   }
@@ -902,23 +1035,23 @@ function dispatchSubstrateCopy(targetDir, force, verbose, dryRun, allowRoot, jso
     const wouldCopy = result.wouldCopy ?? [];
     for (const relativePath of wouldCopy) {
       const targetPath = node_path.join(targetDir, relativePath);
-      process.stdout.write(`  ${"would create".padEnd(14)} ${targetPath}
+      say(`  ${"would create".padEnd(14)} ${targetPath}
 `);
     }
     if (wouldCopy.length > 0) {
-      process.stdout.write(
+      say(
         `bassclef init: ${wouldCopy.length} substrate files would be copied.
 `
       );
     }
-    process.stdout.write(
+    say(
       `bassclef init: ${result.hookCount} hooks armed (${RESOLVED_TIER} tier).
 `
     );
-    return 0;
+    return { code: 0, result };
   }
   if (result.copied.length === 0 && result.refused.length === 0 && result.errored.length === 0) {
-    return 0;
+    return { code: 0, result };
   }
   const groupCounts = /* @__PURE__ */ new Map();
   for (const path of result.copied) {
@@ -927,17 +1060,17 @@ function dispatchSubstrateCopy(targetDir, force, verbose, dryRun, allowRoot, jso
     groupCounts.set(top, (groupCounts.get(top) ?? 0) + 1);
   }
   for (const [directory, count] of groupCounts) {
-    process.stdout.write(`  ${directory}: ${count} files copied
+    say(`  ${directory}: ${count} files copied
 `);
   }
   const parts = [];
   if (result.copied.length > 0) parts.push(`${result.copied.length} substrate files copied`);
   if (result.refused.length > 0) parts.push(`${result.refused.length} refused`);
   if (result.errored.length > 0) parts.push(`${result.errored.length} error(s)`);
-  process.stdout.write(`bassclef init: ${parts.join(", ")}.
+  say(`bassclef init: ${parts.join(", ")}.
 `);
   const grandTotal = 1 + result.copied.length;
-  process.stdout.write(
+  say(
     `bassclef init: ${grandTotal} files total (1 config + ${result.copied.length} substrate).
 `
   );
@@ -949,17 +1082,17 @@ function dispatchSubstrateCopy(targetDir, force, verbose, dryRun, allowRoot, jso
   );
   const copiedCount = copiedHookEntries.length;
   const declaredCount = result.hookCount;
-  const failedCount = result.refused.length + result.errored.length;
+  const erroredCount = result.errored.length;
   const userScope = copiedHookEntries.filter((e) => e.scope === "user").length;
   const projectScope = copiedHookEntries.filter((e) => e.scope === "project").length;
   const scopeSuffix = userScope + projectScope > 0 ? ` ${projectScope} in <repo>/${HOOKS_SUBPATH.replace(/\/$/, "")}, ${userScope} in ~/${HOOKS_SUBPATH.replace(/\/$/, "")}.` : "";
-  if (failedCount > 0) {
-    process.stdout.write(
-      `bassclef init: Installed ${copiedCount} of ${declaredCount} hooks (${RESOLVED_TIER} tier).${scopeSuffix} ${failedCount} failed — see errors above. Rerun bassclef init to retry.
+  if (erroredCount > 0) {
+    say(
+      `bassclef init: Installed ${copiedCount} of ${declaredCount} hooks (${RESOLVED_TIER} tier).${scopeSuffix} ${erroredCount} failed — see errors above. Rerun bassclef init to retry.
 `
     );
   } else {
-    process.stdout.write(
+    say(
       `bassclef init: Installed ${copiedCount} of ${declaredCount} hooks (${RESOLVED_TIER} tier).${scopeSuffix}
 `
     );
@@ -1004,7 +1137,7 @@ function dispatchSubstrateCopy(targetDir, force, verbose, dryRun, allowRoot, jso
     catalogCounts.luminaries > 0 ? `${catalogCounts.luminaries} luminaries` : null
   ].filter((s) => s !== null);
   if (claudeCounts.length > 0) {
-    process.stdout.write(
+    say(
       `bassclef init: Installed ${claudeCounts.join(", ")} under <repo>/.claude/.
 `
     );
@@ -1019,24 +1152,16 @@ function dispatchSubstrateCopy(targetDir, force, verbose, dryRun, allowRoot, jso
     catalogCounts.scripts > 0 ? `${catalogCounts.scripts} scripts` : null
   ].filter((s) => s !== null);
   if (otherCounts.length > 0) {
-    process.stdout.write(
+    say(
       `bassclef init: Installed ${otherCounts.join(", ")} under <repo>/.
 `
     );
   }
-  process.stdout.write(
-    `bassclef init: ${result.refused.length} files refused (path collision).` + (result.refused.length > 0 ? ` Use --force to overwrite existing files.` : ``) + `
+  if (result.refused.length > 0) {
+    say(
+      `bassclef init: ${result.refused.length} files refused (path collision). Use --force to overwrite existing files.
 `
-  );
-  if (json) {
-    const report = {
-      copied: copiedCount,
-      declared: declaredCount,
-      failed: failedCount,
-      scope_counts: { user: userScope, project: projectScope },
-      tier: RESOLVED_TIER
-    };
-    process.stderr.write(JSON.stringify(report) + "\n");
+    );
   }
   if (verbose && result.erroredMessages) {
     for (const msg of result.erroredMessages) {
@@ -1044,7 +1169,7 @@ function dispatchSubstrateCopy(targetDir, force, verbose, dryRun, allowRoot, jso
 `);
     }
   }
-  return result.errored.length > 0 ? 2 : 0;
+  return { code: result.errored.length > 0 ? 2 : 0, result };
 }
 function makePlaceholderTransform(targetDir) {
   const repoName = node_path.basename(targetDir);
@@ -1054,7 +1179,7 @@ function makePlaceholderTransform(targetDir) {
     return content.replace(/\[REPO_NAME\]/g, repoName).replace(/\[ISO_TIMESTAMP\]/g, timestamp).replace(/\[TIER\]/g, RESOLVED_TIER).replace(/\[Repo name\]/g, repoName).replace(/<tier>/g, RESOLVED_TIER);
   };
 }
-function runDryRun$1(plans) {
+function runDryRun$1(plans, say) {
   for (const p of plans) {
     let planned;
     let extra = "";
@@ -1074,12 +1199,12 @@ function runDryRun$1(plans) {
         planned = "would skip";
       }
     }
-    process.stdout.write(`  ${planned.padEnd(14)} ${p.fullPath}${extra}
+    say(`  ${planned.padEnd(14)} ${p.fullPath}${extra}
 `);
   }
   return 0;
 }
-function runReal$1(plans, force, verbose, targetDir, allowRoot, json) {
+function runReal$1(plans, force, verbose, targetDir, allowRoot, json, say) {
   const results = [];
   let anyRefused = false;
   let anyError = false;
@@ -1127,7 +1252,7 @@ function runReal$1(plans, force, verbose, targetDir, allowRoot, json) {
       if (r.outcome === "error") label = `error (${r.message ?? "unknown"})`;
       else if (r.outcome === "refused") label = "refused";
       else label = r.outcome;
-      process.stdout.write(`  ${label.padEnd(10)} ${r.plan.fullPath}
+      say(`  ${label.padEnd(10)} ${r.plan.fullPath}
 `);
     }
   }
@@ -1149,38 +1274,59 @@ function runReal$1(plans, force, verbose, targetDir, allowRoot, json) {
     return 2;
   }
   if (anyRefused && created > 0) {
-    process.stdout.write(
+    say(
       `bassclef init: ${created} config files created, ${unchanged} unchanged. Pass --force to overwrite.
 `
     );
   } else if (created === 0 && unchanged === plans.length) {
-    process.stdout.write("bassclef init: already initialized. No changes.\n");
+    say("bassclef init: already initialized. No changes.\n");
   } else {
-    process.stdout.write(`bassclef init: ${created} config files created, ${unchanged} unchanged.
+    say(`bassclef init: ${created} config files created, ${unchanged} unchanged.
 `);
   }
-  const walkerExit = dispatchSubstrateCopy(targetDir, force, verbose, false, allowRoot, json);
-  writeManifest(targetDir, results);
-  if (walkerExit === 0) {
-    process.stdout.write(
+  const walker = dispatchSubstrateCopy(targetDir, force, verbose, false, allowRoot, say);
+  const declaredLeaves = readDeclaredCommandLeaves(
+    node_path.join(targetDir, ".claude", "settings.json")
+  );
+  const declaredHooksCopied = (walker.result?.copiedEntries ?? []).filter(
+    (e) => e.path.startsWith(HOOKS_SUBPATH) && e.path.endsWith(".sh") && declaredLeaves.has(node_path.basename(e.path))
+  ).length;
+  const report = buildInitReport({
+    entries: walker.result?.copiedEntries ?? [],
+    configs: results.map((r) => ({ path: r.plan.relativePath })),
+    refused: walker.result?.refused ?? [],
+    errored: walker.result?.errored ?? [],
+    hookCount: walker.result?.hookCount ?? 0,
+    declaredHooksCopied,
+    tier: RESOLVED_TIER
+  });
+  writeManifest(targetDir, results, walker.result);
+  if (walker.code === 0) {
+    say(
       `bassclef init: your substrate lives under .claude/. Add .claude/ to .gitignore if you have not.
 `
     );
   }
-  return walkerExit;
+  if (json) {
+    renderJsonReport(report, (t) => {
+      process.stdout.write(t);
+    });
+  }
+  return walker.code;
 }
 function shouldRefuseRoot(currentUid, allowRoot) {
   if (currentUid === void 0) return false;
   if (currentUid !== 0) return false;
   return !allowRoot;
 }
-function writeManifest(targetDir, results) {
+function writeManifest(targetDir, results, walkerResult) {
   const entries = results.map((r) => {
     const entry = {
       path: r.plan.relativePath,
       template: r.plan.templateName,
       template_version: r.plan.templateVersion,
-      outcome: r.outcome
+      outcome: r.outcome,
+      source: "config-composer"
     };
     if (r.outcome === "created") {
       entry.content_hash_sha256 = hashContent(r.plan.content);
@@ -1188,6 +1334,38 @@ function writeManifest(targetDir, results) {
     }
     return entry;
   });
+  if (walkerResult) {
+    for (const copied of walkerResult.copiedEntries) {
+      entries.push({
+        path: copied.path,
+        template: `bundle:${copied.path}`,
+        template_version: index.version,
+        outcome: "created",
+        source: "bundle",
+        scope: copied.scope,
+        ...copied.content_hash_sha256 ? { content_hash_sha256: copied.content_hash_sha256 } : {},
+        updated_at: (/* @__PURE__ */ new Date()).toISOString()
+      });
+    }
+    for (const path of walkerResult.refused) {
+      entries.push({
+        path,
+        template: `bundle:${path}`,
+        template_version: index.version,
+        outcome: "refused",
+        source: "bundle"
+      });
+    }
+    for (const path of walkerResult.errored) {
+      entries.push({
+        path,
+        template: `bundle:${path}`,
+        template_version: index.version,
+        outcome: "error",
+        source: "bundle"
+      });
+    }
+  }
   const manifestDir = node_path.join(targetDir, ".bassclef");
   const manifestPath = node_path.join(manifestDir, "init.manifest.json");
   const content = manifestTemplate({
@@ -1198,7 +1376,12 @@ function writeManifest(targetDir, results) {
   try {
     mkdirSafely(manifestDir);
     writeSafely(manifestPath, content, { force: true });
-  } catch {
+  } catch (e) {
+    const reason = e instanceof Error ? e.message : String(e);
+    process.stderr.write(
+      `bassclef init: could not write ${manifestPath} (${reason}). The files were written. Run \`bassclef init --force\` to rebuild the record.
+`
+    );
   }
 }
 function usage$2() {
@@ -1649,7 +1832,10 @@ function emitL2Output(decisions, verbose) {
   }
 }
 function updateManifestEntry(manifest, path, patch) {
-  const idx = manifest.files.findIndex((f) => f.path === path);
+  const wantScope = patch.scope;
+  const idx = manifest.files.findIndex(
+    (f) => f.path === path && (wantScope === void 0 || f.scope === wantScope)
+  );
   if (idx < 0) {
     manifest.files.push({
       path,
@@ -1833,6 +2019,12 @@ Proceed?`,
   const errored = copyResult.errored;
   const newManifest = {
     schema_version: MANIFEST_SHAPE_VERSION,
+    // Top-level `.version` — read by the v0.45.0 npm-version-drift hook
+    // (fragment 91 under session-reflection) via lib/npm-version-check.sh
+    // `jq -r '.version // ""' "$manifest"`. Duplicates
+    // $bassclef.generated_by_version on purpose — the hook does not walk
+    // into $bassclef. Per bassclef-upstream#1749; bassclef-cli#129.
+    version: index.version,
     $bassclef: {
       template: "init.manifest.json",
       manifest_schema_version: "0.1.0",
@@ -2000,6 +2192,9 @@ Run \`bassclef migrate --help\` for migrate options + the upgrade paths.
 Version: ${index.version}
 Docs:    https://github.com/sunj-labs/bassclef-cli
 `;
+for (const stream of [process.stdout, process.stderr]) {
+  stream._handle?.setBlocking?.(true);
+}
 async function main(argv) {
   const first = argv[0];
   if (first === void 0 || first === "--help" || first === "-h" || first === "help") {