@biffo/cli 0.59.3 → 0.60.1

package/_skeletons/plugin-template/README.md

@@ -90,7 +90,7 @@ SDK is versioned `1.0.0` and biffo-template's
 builds and publishes it to PyPI (via Trusted Publishing) on a pushed
 `sdk-v*` tag. `>=1.0,<2.0` matches the `"biffo-plugin-sdk": "^1.0"` that
 `biffo.plugin.json` declares, and the SDK carries its own independent
-semver — it is **not** tied to the template's `core.version`, so a major
+semver — it is **not** tied to the template's core version, so a major
 bump here means the plugin API broke and nothing else.
 
 **Ordering caveat.** The release _pipeline_ exists; the _release_ does not

package/dist/index.js

@@ -13,16 +13,150 @@ import chalk2 from "chalk";
 import { Command } from "commander";
 
 // src/lib/core-manifest.ts
-import { existsSync, readFileSync, readdirSync } from "fs";
-import { dirname, join, relative, sep } from "path";
+import { existsSync as existsSync2, readFileSync as readFileSync2, readdirSync } from "fs";
+import { dirname as dirname2, join as join2, relative, sep } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+import { z as z2 } from "zod";
+
+// src/lib/core-version.ts
+import { execFileSync } from "child_process";
+import { existsSync, readFileSync, writeFileSync } from "fs";
+import { dirname, join, parse as parsePath } from "path";
 import { fileURLToPath } from "url";
 import { z } from "zod";
-var CORE_MANIFEST_FILE = "core-manifest.json";
+var SEMVER = /^(\d+)\.(\d+)\.(\d+)$/;
 var CoreManifestSchema = z.object({
-  version: z.literal(1),
-  note: z.string().optional(),
-  templateOwned: z.array(z.string()).min(1),
-  userOwned: z.array(z.string()).default([])
+  version: z.string().regex(SEMVER, "must be a semver, e.g. 1.2.3")
+});
+var CORE_VERSION_FILE = "core.version";
+var INSTANCE_CORE_FILE = "biffo.core.json";
+function parseCoreVersion(raw) {
+  const match = SEMVER.exec(raw.trim());
+  if (!match) {
+    throw new Error(`Invalid core version ${JSON.stringify(raw)}: expected semver like 1.2.3`);
+  }
+  return [Number(match[1]), Number(match[2]), Number(match[3])];
+}
+function compareCoreVersions(a, b) {
+  const [aMaj, aMin, aPat] = parseCoreVersion(a);
+  const [bMaj, bMin, bPat] = parseCoreVersion(b);
+  if (aMaj !== bMaj) return aMaj < bMaj ? -1 : 1;
+  if (aMin !== bMin) return aMin < bMin ? -1 : 1;
+  if (aPat !== bPat) return aPat < bPat ? -1 : 1;
+  return 0;
+}
+function readCoreVersionFile(path) {
+  const raw = readFileSync(path, "utf8").trim();
+  parseCoreVersion(raw);
+  return raw;
+}
+function findCoreVersionUpward(startDir) {
+  let dir = startDir;
+  for (; ; ) {
+    const candidate = join(dir, CORE_VERSION_FILE);
+    if (existsSync(candidate)) return candidate;
+    const parent = dirname(dir);
+    if (parent === dir || dir === parsePath(dir).root) return null;
+    dir = parent;
+  }
+}
+function getLatestCoreVersion(fromDir) {
+  const start = fromDir ?? dirname(fileURLToPath(import.meta.url));
+  const fromPackage = versionFromPackageJson(start);
+  if (fromPackage) return fromPackage;
+  const fromTags = latestCoreVersionFromTags(findRepoRoot(start) ?? start, defaultTagRunner, {
+    fetch: false
+  });
+  if (fromTags) return fromTags;
+  const path = findCoreVersionUpward(start);
+  if (path) return readCoreVersionFile(path);
+  throw new Error(
+    `Could not determine the core version above ${start}: no package.json version and no core-v* tag.
+Installed from npm, the package's own version answers this. In a template checkout the tags do \u2014 so a checkout with none (a shallow CI clone, or a source download with no git history) cannot say which core it is. Run \`git fetch --tags\` and retry, or use the published CLI (\`npx @biffo/cli\`), whose version is stamped at publish.`
+  );
+}
+function versionFromPackageJson(startDir) {
+  let dir = startDir;
+  for (; ; ) {
+    const candidate = join(dir, "package.json");
+    if (existsSync(candidate)) {
+      try {
+        const raw = JSON.parse(readFileSync(candidate, "utf8"));
+        if (typeof raw.version === "string" && SEMVER.test(raw.version) && raw.version !== "0.0.0") {
+          return raw.version;
+        }
+      } catch {
+      }
+      return null;
+    }
+    const parent = dirname(dir);
+    if (parent === dir || dir === parsePath(dir).root) return null;
+    dir = parent;
+  }
+}
+function findRepoRoot(startDir) {
+  let dir = startDir;
+  for (; ; ) {
+    if (existsSync(join(dir, ".git"))) return dir;
+    const parent = dirname(dir);
+    if (parent === dir || dir === parsePath(dir).root) return null;
+    dir = parent;
+  }
+}
+function readInstanceCoreVersion(cwd) {
+  const path = join(cwd, INSTANCE_CORE_FILE);
+  if (!existsSync(path)) {
+    const inherited = join(cwd, CORE_VERSION_FILE);
+    return existsSync(inherited) ? readCoreVersionFile(inherited) : null;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(readFileSync(path, "utf8"));
+  } catch (err) {
+    throw new Error(`${INSTANCE_CORE_FILE} is not valid JSON: ${err.message}`);
+  }
+  const result = CoreManifestSchema.safeParse(parsed);
+  if (!result.success) {
+    const detail = result.error.issues[0]?.message ?? "unexpected shape";
+    throw new Error(`${INSTANCE_CORE_FILE} is invalid: ${detail}`);
+  }
+  return result.data.version;
+}
+function serializeInstanceCoreVersion(version) {
+  parseCoreVersion(version);
+  return `${JSON.stringify({ version }, null, 2)}
+`;
+}
+function writeInstanceCoreVersion(cwd, version) {
+  writeFileSync(join(cwd, INSTANCE_CORE_FILE), serializeInstanceCoreVersion(version));
+}
+function latestCoreVersionFromTags(repo, git = defaultTagRunner, options = {}) {
+  if (options.fetch !== false) {
+    try {
+      git(["-C", repo, "fetch", "--tags", "--quiet"]);
+    } catch {
+    }
+  }
+  let out;
+  try {
+    out = git(["-C", repo, "tag", "--list", "core-v*"]);
+  } catch {
+    return null;
+  }
+  const versions = out.split("\n").map((line) => line.trim()).filter((line) => line.startsWith(CORE_TAG_PREFIX)).map((tag) => tag.slice(CORE_TAG_PREFIX.length)).filter((v) => SEMVER.test(v));
+  if (versions.length === 0) return null;
+  return versions.sort(compareCoreVersions).at(-1) ?? null;
+}
+var CORE_TAG_PREFIX = "core-v";
+var defaultTagRunner = (args) => execFileSync("git", args, { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] });
+
+// src/lib/core-manifest.ts
+var CORE_MANIFEST_FILE = "core-manifest.json";
+var CoreManifestSchema2 = z2.object({
+  version: z2.literal(1),
+  note: z2.string().optional(),
+  templateOwned: z2.array(z2.string()).min(1),
+  userOwned: z2.array(z2.string()).default([])
 });
 var HARD_EXCLUDED_DIRS = /* @__PURE__ */ new Set([
   ".git",
@@ -44,37 +178,37 @@ var HARD_EXCLUDED_DIRS = /* @__PURE__ */ new Set([
 function findTemplateRoot(startDir) {
   let dir = startDir;
   for (; ; ) {
-    if (existsSync(join(dir, CORE_MANIFEST_FILE)) && existsSync(join(dir, "core.version"))) {
+    if (existsSync2(join2(dir, CORE_MANIFEST_FILE)) && !existsSync2(join2(dir, INSTANCE_CORE_FILE))) {
       return dir;
     }
-    const parent = dirname(dir);
+    const parent = dirname2(dir);
     if (parent === dir) return null;
     dir = parent;
   }
 }
 function resolveTemplateRoot(options = {}) {
-  const start = options.fromDir ?? dirname(fileURLToPath(import.meta.url));
+  const start = options.fromDir ?? dirname2(fileURLToPath2(import.meta.url));
   const root = findTemplateRoot(start);
   if (!root) {
     const guidance = options.guidance ?? "Point this command at a biffo-template checkout at the target version.";
     throw new Error(
-      `Could not locate a Biffo template root (a directory with ${CORE_MANIFEST_FILE} and core.version) above ${start}. ` + guidance
+      `Could not locate a Biffo template root (a directory with ${CORE_MANIFEST_FILE} and no ${INSTANCE_CORE_FILE}) above ${start}. ` + guidance
     );
   }
   return root;
 }
 function readCoreManifest(templateRoot) {
-  const path = join(templateRoot, CORE_MANIFEST_FILE);
-  if (!existsSync(path)) {
+  const path = join2(templateRoot, CORE_MANIFEST_FILE);
+  if (!existsSync2(path)) {
     throw new Error(`${CORE_MANIFEST_FILE} not found in ${templateRoot}`);
   }
   let parsed;
   try {
-    parsed = JSON.parse(readFileSync(path, "utf8"));
+    parsed = JSON.parse(readFileSync2(path, "utf8"));
   } catch (err) {
     throw new Error(`${CORE_MANIFEST_FILE} is not valid JSON: ${err.message}`);
   }
-  const result = CoreManifestSchema.safeParse(parsed);
+  const result = CoreManifestSchema2.safeParse(parsed);
   if (!result.success) {
     const detail = result.error.issues[0]?.message ?? "unexpected shape";
     throw new Error(`${CORE_MANIFEST_FILE} is invalid: ${detail}`);
@@ -109,7 +243,7 @@ function listTemplateOwnedFiles(root, manifest) {
   function walk(dir) {
     for (const entry of readdirSync(dir, { withFileTypes: true })) {
       if (entry.isDirectory() && HARD_EXCLUDED_DIRS.has(entry.name)) continue;
-      const abs = join(dir, entry.name);
+      const abs = join2(dir, entry.name);
       if (entry.isDirectory()) {
         walk(abs);
       } else if (entry.isFile()) {
@@ -122,7 +256,7 @@ function listTemplateOwnedFiles(root, manifest) {
   return out.sort();
 }
 function sameFile(a, b) {
-  return readFileSync(a).equals(readFileSync(b));
+  return readFileSync2(a).equals(readFileSync2(b));
 }
 function computeCoreDiff(templateRoot, instanceRoot, manifest) {
   const templateFiles = new Set(listTemplateOwnedFiles(templateRoot, manifest));
@@ -132,7 +266,7 @@ function computeCoreDiff(templateRoot, instanceRoot, manifest) {
     if (!instanceFiles.has(rel)) {
       diff.added.push(rel);
       diff.entries.push({ path: rel, kind: "added" });
-    } else if (sameFile(join(templateRoot, rel), join(instanceRoot, rel))) {
+    } else if (sameFile(join2(templateRoot, rel), join2(instanceRoot, rel))) {
       diff.unchanged++;
     } else {
       diff.modified.push(rel);
@@ -148,103 +282,6 @@ function computeCoreDiff(templateRoot, instanceRoot, manifest) {
   return diff;
 }
 
-// src/lib/core-version.ts
-import { execFileSync } from "child_process";
-import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync } from "fs";
-import { dirname as dirname2, join as join2, parse as parsePath } from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
-import { z as z2 } from "zod";
-var SEMVER = /^(\d+)\.(\d+)\.(\d+)$/;
-var CoreManifestSchema2 = z2.object({
-  version: z2.string().regex(SEMVER, "must be a semver, e.g. 1.2.3")
-});
-var CORE_VERSION_FILE = "core.version";
-var INSTANCE_CORE_FILE = "biffo.core.json";
-function parseCoreVersion(raw) {
-  const match = SEMVER.exec(raw.trim());
-  if (!match) {
-    throw new Error(`Invalid core version ${JSON.stringify(raw)}: expected semver like 1.2.3`);
-  }
-  return [Number(match[1]), Number(match[2]), Number(match[3])];
-}
-function compareCoreVersions(a, b) {
-  const [aMaj, aMin, aPat] = parseCoreVersion(a);
-  const [bMaj, bMin, bPat] = parseCoreVersion(b);
-  if (aMaj !== bMaj) return aMaj < bMaj ? -1 : 1;
-  if (aMin !== bMin) return aMin < bMin ? -1 : 1;
-  if (aPat !== bPat) return aPat < bPat ? -1 : 1;
-  return 0;
-}
-function readCoreVersionFile(path) {
-  const raw = readFileSync2(path, "utf8").trim();
-  parseCoreVersion(raw);
-  return raw;
-}
-function findCoreVersionUpward(startDir) {
-  let dir = startDir;
-  for (; ; ) {
-    const candidate = join2(dir, CORE_VERSION_FILE);
-    if (existsSync2(candidate)) return candidate;
-    const parent = dirname2(dir);
-    if (parent === dir || dir === parsePath(dir).root) return null;
-    dir = parent;
-  }
-}
-function getLatestCoreVersion(fromDir) {
-  const start = fromDir ?? dirname2(fileURLToPath2(import.meta.url));
-  const path = findCoreVersionUpward(start);
-  if (!path) {
-    throw new Error(
-      `Could not locate a ${CORE_VERSION_FILE} file above ${start}. This CLI build is missing its core version.`
-    );
-  }
-  return readCoreVersionFile(path);
-}
-function readInstanceCoreVersion(cwd) {
-  const path = join2(cwd, INSTANCE_CORE_FILE);
-  if (!existsSync2(path)) {
-    const inherited = join2(cwd, CORE_VERSION_FILE);
-    return existsSync2(inherited) ? readCoreVersionFile(inherited) : null;
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(readFileSync2(path, "utf8"));
-  } catch (err) {
-    throw new Error(`${INSTANCE_CORE_FILE} is not valid JSON: ${err.message}`);
-  }
-  const result = CoreManifestSchema2.safeParse(parsed);
-  if (!result.success) {
-    const detail = result.error.issues[0]?.message ?? "unexpected shape";
-    throw new Error(`${INSTANCE_CORE_FILE} is invalid: ${detail}`);
-  }
-  return result.data.version;
-}
-function serializeInstanceCoreVersion(version) {
-  parseCoreVersion(version);
-  return `${JSON.stringify({ version }, null, 2)}
-`;
-}
-function writeInstanceCoreVersion(cwd, version) {
-  writeFileSync(join2(cwd, INSTANCE_CORE_FILE), serializeInstanceCoreVersion(version));
-}
-function latestCoreVersionFromTags(repo, git = defaultTagRunner) {
-  try {
-    git(["-C", repo, "fetch", "--tags", "--quiet"]);
-  } catch {
-  }
-  let out;
-  try {
-    out = git(["-C", repo, "tag", "--list", "core-v*"]);
-  } catch {
-    return null;
-  }
-  const versions = out.split("\n").map((line) => line.trim()).filter((line) => line.startsWith(CORE_TAG_PREFIX)).map((tag) => tag.slice(CORE_TAG_PREFIX.length)).filter((v) => SEMVER.test(v));
-  if (versions.length === 0) return null;
-  return versions.sort(compareCoreVersions).at(-1) ?? null;
-}
-var CORE_TAG_PREFIX = "core-v";
-var defaultTagRunner = (args) => execFileSync("git", args, { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] });
-
 // src/lib/logger.ts
 import chalk from "chalk";
 var log = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@biffo/cli",
-  "version": "0.59.3",
+  "version": "0.60.1",
   "description": "Biffo project scaffolding CLI",
   "license": "MIT",
   "type": "module",
@@ -23,7 +23,6 @@
   "files": [
     "dist",
     "schemas",
-    "core.version",
     "_skeletons"
   ],
   "scripts": {
@@ -35,7 +34,7 @@
     "lint:fix": "eslint src/ --fix",
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
-    "check:core-bump": "tsx src/scripts/check-core-version-bump.ts",
+    "check:release-subject": "tsx src/scripts/check-release-subject.ts",
     "check:core-ownership": "tsx src/scripts/check-core-ownership.ts",
     "check:plugin-terraform": "tsx src/scripts/check-plugin-terraform.ts",
     "sync:core-tag": "tsx src/scripts/sync-core-tag.ts",

package/core.version

@@ -1 +0,0 @@
-0.59.3