@erclx/canon 5.27.0 → 5.29.0

package/src/commands/autoship.ts

@@ -4,7 +4,7 @@ import {
   type FailedTest,
   classifyChanges,
 } from '@/autoship/classify'
-import { intro, logInfo, logStep, logWarn, outro, plural } from '@/ui'
+import { intro, logInfo, logStep, logWarn, outro, plural } from '@/cli/ui'
 
 interface ClassifyOptions {
   readonly json?: boolean

package/src/commands/canvas.ts

@@ -27,7 +27,7 @@ import {
   readEditing,
 } from '@/canvas/editing'
 import { CANVAS_PORT, startCanvas } from '@/canvas/server'
-import { PROJECT_ROOT } from '@/project-root'
+import { PROJECT_ROOT } from '@/roots/project'
 import { resolveFrameTokens } from '@/canvas/tokens'
 import { displayPath, parsePort, waitForInterrupt } from '@/serve/report'
 import {
@@ -45,7 +45,7 @@ import {
   logWarn,
   outro,
   plural,
-} from '@/ui'
+} from '@/cli/ui'
 import { mainWorktreeRoot } from '@/git/worktree'
 
 const BANNER = 'canon canvas'

package/src/commands/capture.ts

@@ -15,7 +15,7 @@ import {
   logWarn,
   outro,
   pipeOutput,
-} from '@/ui'
+} from '@/cli/ui'
 
 /**
  * Kept rather than removed, unlike the selector's default that came out for

package/src/commands/census.ts

@@ -1,7 +1,7 @@
 import { resolve } from 'node:path'
 import type { Command } from 'commander'
 import { census, type CensusRefusal } from '@/census/count'
-import { intro, logInfo, logStep, logWarn, outro, plural } from '@/ui'
+import { intro, logInfo, logStep, logWarn, outro, plural } from '@/cli/ui'
 
 interface CensusCommandOptions {
   readonly json?: boolean

package/src/commands/claude.ts

@@ -70,10 +70,10 @@ import {
   writeSettings,
 } from '@/claude/settings'
 import { copyPreservingMode } from '@/sync/copy'
-import { execScript } from '@/exec'
-import { checkoutMismatchWarning, PROJECT_ROOT } from '@/project-root'
-import { recordDir } from '@/record-root'
-import { SURFACE_ENTRIES, surfaceDir } from '@/surface-root'
+import { execScript } from '@/cli/exec'
+import { checkoutMismatchWarning, PROJECT_ROOT } from '@/roots/project'
+import { recordDir } from '@/roots/record'
+import { SURFACE_ENTRIES, surfaceDir } from '@/roots/surface'
 import { isDirectory, resolveTarget } from '@/targets/validate'
 import { injectGitignore, pruneGitignore } from '@/tooling/inject'
 import {
@@ -90,7 +90,7 @@ import {
   pipeOutput,
   plural,
   select,
-} from '@/ui'
+} from '@/cli/ui'
 import { describeSkew, readSkew, type SkewReport } from '@/version/skew'
 
 interface SeedsListOptions {

package/src/commands/comments.ts

@@ -9,7 +9,7 @@ import {
 } from '@/comments/scan'
 import { type TrendPoint, trend } from '@/comments/trend'
 import { loadVocabulary, type Vocabulary } from '@/comments/vocabulary'
-import { intro, logInfo, logStep, logWarn, outro, pipeOutput } from '@/ui'
+import { intro, logInfo, logStep, logWarn, outro, pipeOutput } from '@/cli/ui'
 
 interface ScanCommandOptions {
   readonly json?: boolean

package/src/commands/context.ts

@@ -80,7 +80,7 @@ import {
   outro,
   pipeOutput,
   plural,
-} from '@/ui'
+} from '@/cli/ui'
 
 /** Returned when a gating finding is present. */
 const EXIT_GATE = 2

package/src/commands/demo.ts

@@ -12,7 +12,15 @@ import {
 } from '@/demo/container'
 import { DEFAULT_CURSORS } from '@/demo/cursors'
 import { loadCursorTheme } from '@/demo/theme'
-import { intro, logError, logInfo, logStep, logWarn, outro, plural } from '@/ui'
+import {
+  intro,
+  logError,
+  logInfo,
+  logStep,
+  logWarn,
+  outro,
+  plural,
+} from '@/cli/ui'
 
 const DEFAULT_OUT = 'demos'
 

package/src/commands/deps.ts

@@ -15,7 +15,7 @@ import {
   outro,
   pipeOutput,
   plural,
-} from '@/ui'
+} from '@/cli/ui'
 
 interface AuditCommandOptions {
   readonly json?: boolean

package/src/commands/design.ts

@@ -11,12 +11,20 @@ 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 { isDirectory, resolveTarget } from '@/targets/validate'
-import { intro, logAdd, logError, logInfo, logWarn, outro, palette } from '@/ui'
+import {
+  intro,
+  logAdd,
+  logError,
+  logInfo,
+  logWarn,
+  outro,
+  palette,
+} from '@/cli/ui'
 
 export function register(program: Command): void {
   const design = program

package/src/commands/docs.ts

@@ -1,8 +1,8 @@
 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 { intro, logError, logInfo, logStep, logWarn, outro } from '@/ui'
+import { checkoutMismatchWarning, PROJECT_ROOT } from '@/roots/project'
+import { intro, logError, logInfo, logStep, logWarn, outro } from '@/cli/ui'
 
 export function register(program: Command): void {
   const docs = program

package/src/commands/driver.ts

@@ -6,7 +6,15 @@ import type { DriverRefusal } from '@/driver/drive'
 import { describeViewport } from '@/driver/probes/viewport'
 import { PROBE_NAMES, readDriverPlan } from '@/driver/steps'
 import type { PlanRefusal } from '@/driver/steps'
-import { intro, logError, logInfo, logStep, logWarn, outro, plural } from '@/ui'
+import {
+  intro,
+  logError,
+  logInfo,
+  logStep,
+  logWarn,
+  outro,
+  plural,
+} from '@/cli/ui'
 
 /**
  * Holds wiring only. Every browser reference sits behind `loadDriver`, because

package/src/commands/feedback.ts

@@ -8,11 +8,11 @@ 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'
+import { frameError, frameSuccess, logWarn, palette } from '@/cli/ui'
 
 function readStdin(): Promise<string> {
   return new Promise((resolveStream, rejectStream) => {

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,
@@ -22,7 +22,7 @@ import {
   palette,
   pipeOutput,
   plural,
-} from '@/ui'
+} from '@/cli/ui'
 import { repairBareFlag } from '@/worktrees/bare-flag'
 
 interface RunCommandOptions {
@@ -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'
@@ -65,7 +65,7 @@ import {
   outro,
   palette,
   select,
-} from '@/ui'
+} from '@/cli/ui'
 
 /**
  * Where the rules payload lands, resolved per target rather than once at import.

package/src/commands/indexes.ts

@@ -6,7 +6,7 @@ import { buildIndexCatalog } from '@/indexes/list'
 import { exitCodeFor, type RegenResult, regenOne } from '@/indexes/regen'
 import { gitEnv } from '@/git/env'
 import { findIndexedAncestor, isIgnored, listIndexes } from '@/indexes/walk'
-import { intro, logAdd, logInfo, logStep, logWarn, outro } from '@/ui'
+import { intro, logAdd, logInfo, logStep, logWarn, outro } from '@/cli/ui'
 
 interface RegenCommandOptions {
   readonly dryRun?: boolean

package/src/commands/init.ts

@@ -1,12 +1,20 @@
 import type { Command } from 'commander'
-import { cliPath, cliRun } from '@/cli-run'
-import { PROJECT_ROOT } from '@/project-root'
+import { cliPath, cliRun } from '@/cli/run'
+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 '@/targets/validate'
-import { intro, logInfo, logStep, logWarn, outro, palette, select } from '@/ui'
+import {
+  intro,
+  logInfo,
+  logStep,
+  logWarn,
+  outro,
+  palette,
+  select,
+} from '@/cli/ui'
 
 interface InitOptions {
   /** Always present: the option falls back to `DEFAULT_STACK`. */

package/src/commands/intake.ts

@@ -20,7 +20,7 @@ import {
   logWarn,
   outro,
   pipeOutput,
-} from '@/ui'
+} from '@/cli/ui'
 import { mainWorktreeRoot } from '@/git/worktree'
 
 /**

package/src/commands/inventory.ts

@@ -9,7 +9,15 @@ import {
 import { abbreviate, groupByTreatment } from '@/inventory/group'
 import { findSubject, SUBJECTS } from '@/inventory/subjects'
 import type { WalkRefusal } from '@/inventory/walk'
-import { intro, logError, logInfo, logStep, logWarn, outro, plural } from '@/ui'
+import {
+  intro,
+  logError,
+  logInfo,
+  logStep,
+  logWarn,
+  outro,
+  plural,
+} from '@/cli/ui'
 
 /**
  * Holds wiring only. Every browser reference sits behind `loadWalker`, because

package/src/commands/labels.ts

@@ -6,7 +6,7 @@ import { checkTitleFormat, type TitleFormatIssue } from '@/labels/format'
 import { MAP_REL } from '@/labels/map'
 import { scanPhaseLabels } from '@/labels/phase'
 import { scanTitleSpelling } from '@/labels/spelling'
-import { intro, logInfo, logStep, logWarn, outro, plural } from '@/ui'
+import { intro, logInfo, logStep, logWarn, outro, plural } from '@/cli/ui'
 
 interface AuditOptions {
   readonly base?: string

package/src/commands/markdown.ts

@@ -29,7 +29,7 @@ import {
   outro,
   pipeOutput,
   plural,
-} from '@/ui'
+} from '@/cli/ui'
 
 const EXIT_REFUSED = 1
 const EXIT_GATE = 2

package/src/commands/migrate.ts

@@ -44,9 +44,9 @@ 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'
+import { logError, logInfo, logStep, logWarn, plural } from '@/cli/ui'
 
 interface SweepOptions {
   readonly json?: boolean