@biffo/cli 0.167.0 → 0.168.0

package/dist/index.js

@@ -948,6 +948,27 @@ var GitAdapter = class {
   async fetchPrune(cwd, remote = "origin") {
     await execa2("git", ["fetch", "--quiet", "--prune", remote], { cwd, reject: false });
   }
+  /**
+   * Is `cwd` the primary checkout, rather than a linked worktree?
+   *
+   * The distinction decides whether being off the integration branch is a
+   * defect or the mandated state: AGENTS.md §1 requires all work to happen in a
+   * worktree on its own branch, while §2 requires the primary to stay on `dev`.
+   * Reporting the former as a problem is a false positive in the one place
+   * everybody works.
+   *
+   * A linked worktree's git dir points inside `.git/worktrees/<name>`, while the
+   * common dir is the shared `.git`. They are equal only in the primary.
+   */
+  async isPrimaryWorktree(cwd) {
+    const opts = { cwd, reject: false };
+    const [dir, common] = await Promise.all([
+      execa2("git", ["rev-parse", "--absolute-git-dir"], opts),
+      execa2("git", ["rev-parse", "--path-format=absolute", "--git-common-dir"], opts)
+    ]);
+    if (dir.exitCode !== 0 || common.exitCode !== 0) return true;
+    return dir.stdout.trim() === common.stdout.trim();
+  }
   /**
    * Worktrees other than the primary, with the branch each is on (#797).
    *
@@ -6498,12 +6519,26 @@ async function promptForConfig(awsAccountId, awsRegion, awsProfile) {
 import { Command as Command20 } from "commander";
 
 // src/commands/plugin-create.ts
-import { existsSync as existsSync23, readFileSync as readFileSync17 } from "fs";
+import { existsSync as existsSync23, readFileSync as readFileSync17, writeFileSync as writeFileSync9 } from "fs";
 import { dirname as dirname8, join as join23, resolve as resolve11 } from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
 import chalk13 from "chalk";
 import { Command as Command13 } from "commander";
 
+// src/lib/registry-sources.ts
+function manifestUrlFor(repoUrl, branch = "dev") {
+  const slug = repoUrl.replace(/^https:\/\/github\.com\//, "").replace(/\.git$/, "");
+  return `https://raw.githubusercontent.com/${slug}/${branch}/biffo.plugin.json`;
+}
+function addSource(file, source) {
+  if (file.sources.some((s) => s.name === source.name)) return null;
+  return { ...file, sources: [...file.sources, source] };
+}
+function serialiseSources(file) {
+  return `${JSON.stringify(file, null, 2)}
+`;
+}
+
 // src/lib/workflow-check-contexts.ts
 function unquote(value) {
   const trimmed = value.trim();
@@ -6912,7 +6947,7 @@ var pluginCreateCommand = new Command13("create").description("Scaffold a new pl
 ).option(
   "--runner-label <label>",
   "With --org, the RUNNER_LABEL the new repo\u2019s CI should run on (defaults to mirroring this checkout\u2019s)"
-).option(
+).option("--no-register", "With --org, skip adding the plugin to the registry\u2019s sources.json").option(
   "--skeleton <path>",
   "Path to the plugin skeleton (defaults to _skeletons/plugin-template)"
 ).option("--dry-run", "Print planned changes without modifying the repo").option("--no-commit", "Scaffold the files but leave them uncommitted").option("--cwd <path>", "Project root to scaffold into (defaults to the current directory)").action(
@@ -6926,6 +6961,7 @@ var pluginCreateCommand = new Command13("create").description("Scaffold a new pl
           standalone: options.standalone ?? false,
           ...options.org ? { org: options.org } : {},
           ...options.runnerLabel ? { runnerLabel: options.runnerLabel } : {},
+          register: options.register !== false,
           ...options.skeleton ? { skeletonRoot: resolve11(options.skeleton) } : {},
           dryRun: options.dryRun ?? false,
           commit: options.commit !== false,
@@ -7080,8 +7116,41 @@ async function createAndPushStandaloneRepo(org, names, destDir, options, deps) {
   } else {
     await github.protectSingleBranch(org, names.dist, "dev", contexts);
   }
+  if (options.register !== false) {
+    await registerInRegistrySources(names, cloneUrl, token, deps);
+  }
   printStandaloneRemoteNextSteps(names, org);
 }
+var REGISTRY_REPO = "https://github.com/keiranholloway/biffo-plugins-registry";
+async function registerInRegistrySources(names, cloneUrl, token, deps) {
+  let dir;
+  try {
+    dir = await deps.git.cloneForEditing(REGISTRY_REPO, "biffo-registry", token);
+    const path = join23(dir, "sources.json");
+    const file = JSON.parse(readFileSync17(path, "utf8"));
+    const next = addSource(file, {
+      name: names.slug,
+      repo: cloneUrl.replace(/\.git$/, ""),
+      manifest: manifestUrlFor(cloneUrl),
+      tags: []
+    });
+    if (next === null) {
+      log.info(`${names.slug} is already listed in the registry's sources.json`);
+      return;
+    }
+    writeFileSync9(path, serialiseSources(next));
+    await deps.git.add(dir, ["sources.json"]);
+    await deps.git.commit(dir, `feat(registry): track ${names.slug} in sources.json`);
+    await deps.git.push(dir, "main", { token });
+    log.success(`Registered ${names.slug} in the plugin registry's sources.json`);
+  } catch (err) {
+    log.warn(
+      `Could not add ${names.slug} to the registry's sources.json: ${err.message}. Until it is listed there (or REGISTRY_PUBLISH_TOKEN is set on the new repo), the plugin will not appear in the portal's plugin store.`
+    );
+  } finally {
+    if (dir !== void 0) deps.git.cleanup(dir);
+  }
+}
 async function propagateRunnerLabel(org, repo, options, deps, github) {
   try {
     let label = options.runnerLabel?.trim();
@@ -7390,7 +7459,7 @@ var PluginMigrationsAdapter = class {
 };
 
 // src/lib/plugin-workspace-sources.ts
-import { existsSync as existsSync24, readdirSync as readdirSync12, readFileSync as readFileSync18, writeFileSync as writeFileSync9 } from "fs";
+import { existsSync as existsSync24, readdirSync as readdirSync12, readFileSync as readFileSync18, writeFileSync as writeFileSync10 } from "fs";
 import { join as join25 } from "path";
 function readTomlStringArray(text, key) {
   const open = new RegExp(`^${key}\\s*=\\s*\\[`, "m").exec(text);
@@ -7494,7 +7563,7 @@ ${lines.join("\n")}${text.slice(insertAt)}`;
 ${lines.join("\n")}
 `;
   }
-  writeFileSync9(pluginPyprojectPath, updated);
+  writeFileSync10(pluginPyprojectPath, updated);
   return toAdd;
 }
 
@@ -9131,7 +9200,7 @@ function checkCheckoutCurrency(facts) {
     });
     return findings;
   }
-  if (facts.currentBranch !== facts.integrationBranch) {
+  if (facts.isPrimary && facts.currentBranch !== facts.integrationBranch) {
     findings.push({
       check: "checkout-off-integration",
       severity: "error",
@@ -9139,12 +9208,24 @@ function checkCheckoutCurrency(facts) {
       remedy: `git switch ${facts.integrationBranch} && git pull  (do the work in a worktree instead)`
     });
   }
+  if (facts.isPrimary && facts.isDirty) {
+    findings.push({
+      check: "checkout-dirty",
+      severity: "warn",
+      detail: "The primary checkout has uncommitted changes, so what it contains is neither the integration branch nor anything reviewed. Editing the primary directly is what AGENTS.md \xA71 exists to prevent; work belongs in a worktree.",
+      remedy: 'git stash push -m "<what this is>" or commit it on a branch, then work in a worktree'
+    });
+  }
   if (facts.hasUpstream && facts.behind > 0) {
     const diverged = facts.ahead > 0 ? `, and ${String(facts.ahead)} ahead (diverged)` : "";
+    const where = facts.isPrimary ? "The primary checkout" : "This worktree";
     findings.push({
       check: "checkout-behind",
-      severity: "error",
-      detail: `The primary checkout is ${String(facts.behind)} commit(s) behind its upstream${diverged}. Every file read from it may be stale, including the ones that look like authoritative state.`,
+      // In a worktree, behind-its-own-upstream means someone else pushed to the
+      // branch — worth knowing, but not a reason to distrust everything read
+      // from it the way a stale primary is.
+      severity: facts.isPrimary ? "error" : "warn",
+      detail: `${where} is ${String(facts.behind)} commit(s) behind its upstream${diverged}. Every file read from it may be stale, including the ones that look like authoritative state.`,
       remedy: "git pull --ff-only"
     });
   }
@@ -9153,6 +9234,7 @@ function checkCheckoutCurrency(facts) {
 function checkCoreVersionCurrency(facts) {
   if (facts.localCoreVersion === null || facts.remoteCoreVersion === null) return [];
   if (facts.localCoreVersion === facts.remoteCoreVersion) return [];
+  if (!facts.isPrimary) return [];
   return [
     {
       check: "core-version-stale",
@@ -9247,6 +9329,8 @@ async function runDoctor(options, deps = { git: new GitAdapter() }) {
   }
   if (options.fetch) await git.fetchPrune(options.cwd);
   const currentBranch = await git.currentBranch(options.cwd);
+  const isPrimary = await git.isPrimaryWorktree(options.cwd);
+  const isDirty = await git.hasUncommittedChanges(options.cwd);
   const { ahead, behind, hasUpstream } = await git.aheadBehind(options.cwd);
   const branches = await git.listBranchRefs(options.cwd);
   const worktreePaths = await git.listWorktrees(options.cwd);
@@ -9258,10 +9342,12 @@ async function runDoctor(options, deps = { git: new GitAdapter() }) {
   );
   const facts = {
     currentBranch,
+    isPrimary,
     integrationBranch: INTEGRATION_BRANCH,
     ahead,
     behind,
     hasUpstream,
+    isDirty,
     localCoreVersion: readLocalCoreVersion(options.cwd),
     remoteCoreVersion: parseCoreRecord(
       await git.showFileAtRef(options.cwd, `origin/${INTEGRATION_BRANCH}`, INSTANCE_CORE_FILE)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@biffo/cli",
-  "version": "0.167.0",
+  "version": "0.168.0",
   "description": "Biffo project scaffolding CLI",
   "license": "MIT",
   "type": "module",