@erclx/canon 5.26.0 → 5.28.0

package/src/commands/design.ts

@@ -8,20 +8,23 @@ import {
 } from '@/design/adapter'
 import { buildDesignCss } from '@/design/css'
 import { HAND_DRAWN_FONT_FACES } from '@/design/fonts'
+import { addProjectFace, listProjectFaces } from '@/design/project-fonts'
 import { renderDesignDoc } from '@/design/render'
 import { DESIGN_BASE_CSS, DESIGN_DOCUMENT, regenDesign } from '@/design/regen'
-import { checkoutMismatchWarning, PROJECT_ROOT } from '@/project-root'
-import { creationRel, SCRATCH } from '@/record-root'
-import { surfaceDir } from '@/surface-root'
+import { checkoutMismatchWarning, PROJECT_ROOT } from '@/roots/project'
+import { creationRel, SCRATCH } from '@/roots/record'
+import { surfaceDir } from '@/roots/surface'
 import { recordStamp, runDomainSync } from '@/sync/engine'
-import { resolveTarget } from '@/target'
+import { isDirectory, resolveTarget } from '@/targets/validate'
 import { intro, logAdd, logError, logInfo, logWarn, outro, palette } from '@/ui'
 
 export function register(program: Command): void {
   const design = program
     .command('design')
     .helpOption('-h, --help', 'Show this help message')
-    .description('Design system commands (regen, css, render, install, sync)')
+    .description(
+      'Design system commands (regen, css, render, install, sync, fonts)',
+    )
 
   design
     .command('regen')
@@ -172,6 +175,143 @@ export function register(program: Command): void {
         { protectedRoot: PROJECT_ROOT },
       )
     })
+
+  registerFonts(design)
+}
+
+const FONTS_DIR = join(DESIGN_INSTALL_DIR, DESIGN_PROJECT_SUBDIR, 'fonts')
+
+interface FontsRefused {
+  readonly ok: false
+  readonly reason: string
+  readonly detail: string
+}
+
+function writeJson(record: unknown): void {
+  process.stdout.write(`${JSON.stringify(record)}\n`)
+}
+
+function refuseFonts(
+  title: string,
+  refusal: FontsRefused,
+  emitJson: boolean,
+): number {
+  if (emitJson) writeJson(refusal)
+  intro(title)
+  logError(refusal.detail)
+  outro()
+  return 1
+}
+
+/** A target that is a directory, or the refusal naming the path given. */
+function fontsTarget(target: string): string | FontsRefused {
+  const resolved = resolve(target)
+  if (!isDirectory(resolved)) {
+    return {
+      ok: false,
+      reason: 'no-target',
+      detail: `Target directory not found: ${target}`,
+    }
+  }
+  return resolved
+}
+
+function registerFonts(design: Command): void {
+  const fonts = design
+    .command('fonts')
+    .helpOption('-h, --help', 'Show this help message')
+    .description(`Read and add the project's own faces under ${FONTS_DIR}/`)
+    .addHelpText(
+      'after',
+      [
+        '',
+        `Faces are declared as @font-face rules in ${join(DESIGN_INSTALL_DIR, DESIGN_PROJECT_SUBDIR)}/fonts.css,`,
+        'which the canvas embeds into every frame. Sync never writes the folder.',
+        '',
+      ].join('\n'),
+    )
+
+  fonts
+    .command('list')
+    .helpOption('-h, --help', 'Show this help message')
+    .description('List each face the project override sheets declare')
+    .argument('[target]', 'Target directory', '.')
+    .option('--json', 'Emit the record on stdout')
+    .action((target: string, opts: { json?: boolean }) => {
+      const title = 'canon design fonts list'
+      const resolved = fontsTarget(target)
+      if (typeof resolved !== 'string') {
+        process.exitCode = refuseFonts(title, resolved, Boolean(opts.json))
+        return
+      }
+      const faces = listProjectFaces(resolved)
+      if (opts.json) writeJson({ ok: true, faces })
+      intro(title)
+      if (faces.length === 0) logInfo(`No faces declared under ${FONTS_DIR}/`)
+      for (const face of faces) {
+        const line = `${face.family} ${face.weight} ${face.style}: ${face.file} in ${face.sheet}`
+        if (face.present) logInfo(line)
+        else logWarn(`${line} (${face.problem ?? 'missing'})`)
+      }
+      outro()
+    })
+
+  fonts
+    .command('add')
+    .helpOption('-h, --help', 'Show this help message')
+    .description(
+      `Copy a woff2, woff, ttf, or otf face into ${FONTS_DIR}/ and declare it`,
+    )
+    .argument('<file>', 'Font file to copy')
+    .argument('[target]', 'Target directory', '.')
+    .requiredOption('--family <name>', 'Family name the face declares')
+    .option('--weight <n>', "Weight, or a range such as '100 900'", '400')
+    .option('--style <style>', 'normal or italic', 'normal')
+    .option('--json', 'Emit the record on stdout')
+    .action(
+      (
+        file: string,
+        target: string,
+        opts: { family: string; weight: string; style: string; json?: boolean },
+      ) => {
+        const title = 'canon design fonts add'
+        const emitJson = Boolean(opts.json)
+        const resolved = fontsTarget(target)
+        if (typeof resolved !== 'string') {
+          process.exitCode = refuseFonts(title, resolved, emitJson)
+          return
+        }
+        if (resolved === PROJECT_ROOT) {
+          process.exitCode = refuseFonts(
+            title,
+            {
+              ok: false,
+              reason: 'toolkit-root',
+              detail:
+                'Cannot run against toolkit root. Files here are the source of truth.',
+            },
+            emitJson,
+          )
+          return
+        }
+        const outcome = addProjectFace(resolved, resolve(file), {
+          family: opts.family,
+          weight: opts.weight,
+          style: opts.style,
+        })
+        if (!outcome.ok) {
+          process.exitCode = refuseFonts(title, outcome, emitJson)
+          return
+        }
+        if (emitJson) writeJson(outcome)
+        intro(title)
+        logAdd(join(DESIGN_INSTALL_DIR, DESIGN_PROJECT_SUBDIR, outcome.file))
+        logInfo(
+          `Declared ${outcome.family} ${outcome.weight} ${outcome.style} in ${outcome.sheet}`,
+        )
+        outro()
+      },
+    )
 }
 
 /**

package/src/commands/docs.ts

@@ -1,7 +1,7 @@
 import type { Command } from 'commander'
 import { type DocEntry, listDocs } from '@/docs/list'
 import { listTopics, readTopic, resolveTopic } from '@/docs/read'
-import { checkoutMismatchWarning, PROJECT_ROOT } from '@/project-root'
+import { checkoutMismatchWarning, PROJECT_ROOT } from '@/roots/project'
 import { intro, logError, logInfo, logStep, logWarn, outro } from '@/ui'
 
 export function register(program: Command): void {

package/src/commands/feedback.ts

@@ -8,8 +8,8 @@ import {
   missingField,
   missingFieldMessage,
 } from '@/feedback/body'
-import { checkoutMismatchWarning, PROJECT_ROOT } from '@/project-root'
-import { creationRel } from '@/record-root'
+import { checkoutMismatchWarning, PROJECT_ROOT } from '@/roots/project'
+import { creationRel } from '@/roots/record'
 import { createGithubIssue } from '@/feedback/github'
 import { issueFailureMessage } from '@/feedback/github-format'
 import { frameError, frameSuccess, logWarn, palette } from '@/ui'

package/src/commands/gate.ts

@@ -11,7 +11,7 @@ import {
   summarize,
 } from '@/gate/sequencer'
 import { STAGES } from '@/gate/stages'
-import { checkoutMismatchWarning, PROJECT_ROOT } from '@/project-root'
+import { checkoutMismatchWarning, PROJECT_ROOT } from '@/roots/project'
 import {
   intro,
   logError,
@@ -113,6 +113,12 @@ async function runGate(opts: RunCommandOptions): Promise<number> {
     cli: cliRunner(root),
     write,
     changed: changed.scoped ? changed.files : undefined,
+    onQueue: (label, holder) => {
+      const text = `${label} is waiting for the suite pid ${holder.pid} runs at ${holder.root}`
+      // stderr in both modes, so a JSON caller's stdout stays one record.
+      if (emitJson) process.stderr.write(`${text}\n`)
+      else logWarn(text)
+    },
   }
 
   const results = await runStages(
@@ -138,12 +144,13 @@ async function runGate(opts: RunCommandOptions): Promise<number> {
         changed: changed.files.length,
         summary,
         ms: results.reduce((total, result) => total + result.ms, 0),
-        stages: results.map(({ id, label, status, failure, ms }) => ({
+        stages: results.map(({ id, label, status, failure, ms, queuedMs }) => ({
           id,
           label,
           status,
           failure,
           ms,
+          queuedMs,
         })),
       })}\n`,
     )

package/src/commands/gov.ts

@@ -8,8 +8,8 @@ import {
   type CountsReport,
   scanCounts,
 } from '@/counts/scan'
-import { checkoutMismatchWarning, PROJECT_ROOT } from '@/project-root'
-import { creationRel, SCRATCH } from '@/record-root'
+import { checkoutMismatchWarning, PROJECT_ROOT } from '@/roots/project'
+import { creationRel, SCRATCH } from '@/roots/record'
 import { createGovAdapter } from '@/gov/adapter'
 import { regenConsumedRules } from '@/gov/consumed'
 import { regenStandardRules } from '@/gov/standard-rules'
@@ -53,7 +53,7 @@ import {
 } from '@/gov/test-order'
 import { recordStamp, runDomainSync } from '@/sync/engine'
 import { writeChainStamp } from '@/sync/stamp'
-import { resolveTarget } from '@/target'
+import { resolveTarget } from '@/targets/validate'
 import {
   intro,
   isNonInteractive,

package/src/commands/hooks.ts

@@ -5,7 +5,7 @@ import {
   runPostMerge,
   STEP_VERBS,
 } from '@/hooks/post-merge'
-import { mainWorktreeRoot } from '@/worktree'
+import { mainWorktreeRoot } from '@/git/worktree'
 
 interface PostMergeOptions {
   readonly root?: string

package/src/commands/indexes.ts

@@ -4,7 +4,7 @@ import { $ } from 'bun'
 import type { Command } from 'commander'
 import { buildIndexCatalog } from '@/indexes/list'
 import { exitCodeFor, type RegenResult, regenOne } from '@/indexes/regen'
-import { gitEnv } from '@/git-env'
+import { gitEnv } from '@/git/env'
 import { findIndexedAncestor, isIgnored, listIndexes } from '@/indexes/walk'
 import { intro, logAdd, logInfo, logStep, logWarn, outro } from '@/ui'
 

package/src/commands/init.ts

@@ -1,11 +1,11 @@
 import type { Command } from 'commander'
 import { cliPath, cliRun } from '@/cli-run'
-import { PROJECT_ROOT } from '@/project-root'
+import { PROJECT_ROOT } from '@/roots/project'
 import { applyInitOptions, flagsProvided } from '@/init/flags'
 import { type InitFlags, parseSkip, planInit } from '@/init/plan'
 import { runDomains } from '@/init/run'
 import { buildSteps } from '@/init/steps'
-import { resolveTarget } from '@/target'
+import { resolveTarget } from '@/targets/validate'
 import { intro, logInfo, logStep, logWarn, outro, palette, select } from '@/ui'
 
 interface InitOptions {

package/src/commands/intake.ts

@@ -21,7 +21,7 @@ import {
   outro,
   pipeOutput,
 } from '@/ui'
-import { mainWorktreeRoot } from '@/worktree'
+import { mainWorktreeRoot } from '@/git/worktree'
 
 /**
  * A selection as the command line spells it, splitting on the first `=`. The

package/src/commands/migrate.ts

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync } from 'node:fs'
 import { join } from 'node:path'
 import type { Command } from 'commander'
-import { listRepositoryFiles } from '@/git-files'
+import { listRepositoryFiles } from '@/git/files'
 import { indexSourceRules } from '@/gov/adapter'
 import { applyRecordsMove, applyRename, readSources } from '@/migrate/apply'
 import { isToolkitOwned, planRename, type RenamePlan } from '@/migrate/plan'
@@ -44,7 +44,7 @@ import {
   type ScratchEvidencePlan,
   walkScratchEvidenceCorpus,
 } from '@/migrate/scratch-evidence'
-import { checkoutMismatchWarning, PROJECT_ROOT } from '@/project-root'
+import { checkoutMismatchWarning, PROJECT_ROOT } from '@/roots/project'
 import { readStamp, stampedHashes } from '@/sync/stamp'
 import { logError, logInfo, logStep, logWarn, plural } from '@/ui'