@erclx/canon 4.23.0 → 4.23.1

package/claude/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "canon",
   "description": "Automated governance, versioning, and discovery tools for Claude Code.",
-  "version": "4.23.0",
+  "version": "4.23.1",
   "author": {
     "name": "Eric Le",
     "url": "https://github.com/erclx"

package/docs/agents/commands.md

@@ -56,7 +56,7 @@ Full help: `canon <command> --help`. Behavior notes for the install and sync ver
 | `canon context audit`         | Report required sections, length, cited paths, reference form, catalog tables, provenance, superseded-decision narration, and index drift                             |
 | `canon markdown audit`        | Fail any markdown path on a banned character, word, or spelling, and report the structural checkpoints                                                                |
 | `canon claude skills audit`   | Report both skill corpora against the mechanical rules in `standards/skill.md`                                                                                        |
-| `canon standards audit`       | Report the corpus against the `## Success criterion` gate, failing only on a standard new to the branch (`--json`, `--arrivals-only`)                                 |
+| `canon standards audit`       | Report the corpus against the success-criterion gate `standards/standard.md` states, failing only on a standard new to the branch (`--json`, `--arrivals-only`)       |
 | `canon claude skills drift`   | Name the shipped skill bodies rewritten between a given ref and `HEAD`, and the installed version against the newest published (`--json`)                             |
 | `canon claude skills reach`   | Report the bodies in either skill corpus citing a toolkit path no target project receives, exiting 2 on an unqualified one                                            |
 | `canon claude skills rank`    | Score either skill corpus's descriptions against a case corpus by TF-IDF cosine similarity, reporting rank-one and top-three (`--cases <path>`)                       |

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@erclx/canon",
   "type": "module",
-  "version": "4.23.0",
+  "version": "4.23.1",
   "description": "Infrastructure and quality tooling for developer workflows",
   "license": "MIT",
   "bin": {

package/src/commands/standards.ts

@@ -62,7 +62,7 @@ export function register(program: Command): void {
   standards
     .command('audit')
     .description(
-      'Report the corpus against the `## Success criterion` gate in standards/standard.md',
+      'Report the corpus against the success-criterion gate standards/standard.md states',
     )
     .argument('[path]', 'Project root, defaulting to the current directory')
     .helpOption('-h, --help', 'Show this help message')
@@ -78,7 +78,7 @@ export function register(program: Command): void {
         'Exit codes:',
         '  0  the audit completed with every arriving standard carrying the section',
         '  1  refused, with the reason on stderr',
-        '  2  a standard new to this branch carries no ## Success criterion section',
+        '  2  a standard new to this branch carries no success-criterion section',
         '',
         'A standard already in the corpus without the section is a known gap',
         'standards/standard.md names, not a violation, so only an arrival fails.',
@@ -204,8 +204,8 @@ function reportArrivalGate(
   intro('canon standards audit')
   logError(
     missing.length === 1
-      ? '1 standard new to this branch carries no ## Success criterion section'
-      : `${missing.length} standards new to this branch carry no ## Success criterion section`,
+      ? '1 standard new to this branch carries no success-criterion section'
+      : `${missing.length} standards new to this branch carry no success-criterion section`,
   )
   pipeOutput(missing.join('\n'))
   outro()
@@ -217,7 +217,7 @@ function reportCorpus(
   logStep('Corpus')
   logInfo(`${plural(audit.standards.length, 'standard')} at standards/`)
   logInfo(
-    `${plural(audit.withCriterion.length, 'standard')} carrying ## Success criterion`,
+    `${plural(audit.withCriterion.length, 'standard')} carrying a success criterion`,
   )
 
   logStep('Known gaps')
@@ -241,7 +241,7 @@ function reportCorpus(
   }
 
   logError(
-    `${plural(audit.arrivalsWithoutCriterion.length, 'standard')} arrived carrying no ## Success criterion section`,
+    `${plural(audit.arrivalsWithoutCriterion.length, 'standard')} arrived carrying no success-criterion section`,
   )
   pipeOutput(audit.arrivalsWithoutCriterion.join('\n'))
 }

package/src/gate/measures.ts

@@ -435,7 +435,7 @@ export const standardCriteria: Measure = async (ctx) => {
     emissions: [output(run.all)],
     failure:
       run.exitCode === 2
-        ? 'A standard new to this branch carries no ## Success criterion section. Run bun src/cli.ts standards audit.'
+        ? 'A standard new to this branch carries no success-criterion section. Run bun src/cli.ts standards audit.'
         : 'canon standards audit could not read which standards arrived on this branch. Run bun src/cli.ts standards audit --json to see why.',
   }
 }

package/src/git-base.ts

@@ -0,0 +1,19 @@
+/**
+ * Preferred first, matching `src/tasks/trunk.ts`. A local `main` trailing the
+ * remote pulls other people's merged commits into the range, so a check
+ * reading it decides against files the branch never touched.
+ */
+export const TRUNK_REFS = ['origin/main', 'main'] as const
+
+/**
+ * The refs to try, in order, for the far side of a branch range: a named ref
+ * alone, or the trunk list when none was named.
+ */
+export function baseCandidates(ref: string | undefined): readonly string[] {
+  return ref !== undefined ? [ref] : TRUNK_REFS
+}
+
+/** Whether a `merge-base` result names a commit rather than an empty read. */
+export function isMergeBase(value: string | undefined): value is string {
+  return value !== undefined && value !== ''
+}

package/src/git-files.ts

@@ -1,13 +1,7 @@
 import { $ } from 'bun'
+import { baseCandidates, isMergeBase } from '@/git-base'
 import { gitEnv } from '@/git-env'
 
-/**
- * Preferred first, matching `src/gov/test-order.ts` and `src/tasks/trunk.ts`. A
- * local `main` trailing the remote pulls other people's merged commits into the
- * range, so a check reading it decides against files the branch never touched.
- */
-const TRUNK_REFS = ['origin/main', 'main'] as const
-
 /** Runs git under `root` with the resolution variables a hook exports stripped. */
 async function git(
   root: string,
@@ -37,14 +31,9 @@ export async function resolveBaseRef(
   root: string,
   ref?: string,
 ): Promise<string | undefined> {
-  if (ref !== undefined) {
-    const merged = await git(root, ['merge-base', 'HEAD', ref])
-    return merged === undefined || merged === '' ? undefined : merged
-  }
-
-  for (const trunk of TRUNK_REFS) {
-    const merged = await git(root, ['merge-base', 'HEAD', trunk])
-    if (merged !== undefined && merged !== '') return merged
+  for (const candidate of baseCandidates(ref)) {
+    const merged = await git(root, ['merge-base', 'HEAD', candidate])
+    if (isMergeBase(merged)) return merged
   }
 
   return undefined

package/src/gov/test-order.ts

@@ -1,13 +1,7 @@
 import { execaSync } from 'execa'
+import { baseCandidates, isMergeBase } from '@/git-base'
 import { gitEnv } from '@/git-env'
 
-/**
- * Preferred first, matching `src/tasks/trunk.ts`. A clone with no remote still
- * answers off its local trunk, and a local `main` trailing the remote widens
- * the range rather than narrowing it, which over-reports instead of hiding.
- */
-const TRUNK_REFS = ['origin/main', 'main'] as const
-
 /**
  * The extensions this check can pair. A test sits beside its subject under one
  * name throughout this corpus, so the weakest assumption available is also the
@@ -349,22 +343,17 @@ function resolveBase(
   ref: string | undefined,
   head: string,
 ): string | { kind: 'unreadable'; reason: TestOrderRefusal; message: string } {
-  if (ref !== undefined) {
-    const merged = git(root, ['merge-base', head, ref])
-    if (merged === undefined || merged === '') {
-      return {
-        kind: 'unreadable',
-        reason: 'bad-base',
-        message: `Ref ${ref} shares no history with HEAD in ${root}. Pass a ref this branch was taken from.`,
-      }
-    }
-    return merged
+  for (const candidate of baseCandidates(ref)) {
+    const merged = git(root, ['merge-base', head, candidate])
+    if (isMergeBase(merged)) return merged
   }
 
-  for (const trunk of TRUNK_REFS) {
-    if (revParse(root, trunk) === undefined) continue
-    const merged = git(root, ['merge-base', head, trunk])
-    if (merged !== undefined && merged !== '') return merged
+  if (ref !== undefined) {
+    return {
+      kind: 'unreadable',
+      reason: 'bad-base',
+      message: `Ref ${ref} shares no history with HEAD in ${root}. Pass a ref this branch was taken from.`,
+    }
   }
 
   const rootCommits = git(root, ['rev-list', '--max-parents=0', head])