@erclx/canon 5.28.0 → 5.30.0

package/src/commands/claude.ts

@@ -70,7 +70,7 @@ import {
   writeSettings,
 } from '@/claude/settings'
 import { copyPreservingMode } from '@/sync/copy'
-import { execScript } from '@/exec'
+import { execScript } from '@/cli/exec'
 import { checkoutMismatchWarning, PROJECT_ROOT } from '@/roots/project'
 import { recordDir } from '@/roots/record'
 import { SURFACE_ENTRIES, surfaceDir } from '@/roots/surface'
@@ -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

@@ -16,7 +16,15 @@ 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

@@ -2,7 +2,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 '@/roots/project'
-import { intro, logError, logInfo, logStep, logWarn, outro } from '@/ui'
+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

@@ -12,7 +12,7 @@ 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

@@ -22,7 +22,7 @@ import {
   palette,
   pipeOutput,
   plural,
-} from '@/ui'
+} from '@/cli/ui'
 import { repairBareFlag } from '@/worktrees/bare-flag'
 
 interface RunCommandOptions {

package/src/commands/gov.ts

@@ -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 { 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

@@ -46,7 +46,7 @@ import {
 } from '@/migrate/scratch-evidence'
 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

package/src/commands/pr.ts

@@ -32,10 +32,14 @@ import {
   findEvidenceHead,
   findEvidenceLocal,
   findEvidencePreview,
+  type EvidenceItem,
+  type EvidenceReading,
   groupEvidence,
   hasMarkedEvidenceComment,
+  PNG_HEADER_BYTES,
   readChecklistBoxes,
   readOwed,
+  readPngWidth,
   renderEvidenceBody,
   settleChecklist,
 } from '@/pr/evidence'
@@ -87,7 +91,7 @@ import {
   selectBranchPull,
 } from '@/pr/rest'
 import { resolveReviewScope } from '@/pr/review-scope'
-import { intro, logInfo, logStep, logWarn, outro, plural } from '@/ui'
+import { intro, logInfo, logStep, logWarn, outro, plural } from '@/cli/ui'
 
 const GH_TIMEOUT_MS = 30_000
 
@@ -1746,6 +1750,134 @@ async function readPullMergeBase(
   return sha === null || sha.trim() === '' ? undefined : sha.trim()
 }
 
+/** How many width reads run at once, since each downloads a whole image. */
+const WIDTH_READ_CONCURRENCY = 4
+
+type WidthRead =
+  | { readonly kind: 'read'; readonly width?: number }
+  | { readonly kind: 'failed' }
+
+/**
+ * The pixel width of a PNG at `sha`, read over the contents API like every
+ * other evidence read. The endpoint ignores a `Range` header, so the whole
+ * file arrives and only its first bytes are read. A format other than PNG
+ * reads without a width, and a refused or timed-out call reads as failed, so
+ * the caller can keep the ceiling width and still report the cause.
+ */
+async function readImageWidth(
+  cwd: string,
+  path: string,
+  sha: string,
+): Promise<WidthRead> {
+  if (!/\.png$/i.test(path)) return { kind: 'read' }
+  try {
+    const result = await execa(
+      'gh',
+      [
+        'api',
+        '-H',
+        'Accept: application/vnd.github.raw',
+        `repos/{owner}/{repo}/contents/${path.split('/').map(encodeURIComponent).join('/')}?ref=${sha}`,
+      ],
+      {
+        cwd,
+        timeout: GH_TIMEOUT_MS,
+        env: gitEnv(),
+        extendEnv: false,
+        encoding: 'buffer',
+      },
+    )
+    const width = readPngWidth(result.stdout.subarray(0, PNG_HEADER_BYTES))
+    return width === undefined ? { kind: 'read' } : { kind: 'read', width }
+  } catch {
+    return { kind: 'failed' }
+  }
+}
+
+/** Runs `task` over `inputs` with at most `limit` in flight, keeping input order. */
+async function mapPool<T, R>(
+  inputs: readonly T[],
+  limit: number,
+  task: (input: T) => Promise<R>,
+): Promise<R[]> {
+  const results: R[] = new Array(inputs.length)
+  let next = 0
+  const lane = async (): Promise<void> => {
+    while (next < inputs.length) {
+      const index = next++
+      results[index] = await task(inputs[index] as T)
+    }
+  }
+  await Promise.all(
+    Array.from({ length: Math.min(limit, inputs.length) }, lane),
+  )
+  return results
+}
+
+interface SizedEvidence {
+  readonly reading: EvidenceReading
+  /** Each image whose width read failed, as `head:<path>` or `base:<path>`, which rendered at the ceiling. */
+  readonly unread: readonly string[]
+}
+
+/** Each item with the pixel width of its head image and, when it has one, its base image. */
+async function withImageWidths(
+  cwd: string,
+  reading: EvidenceReading,
+  base: string | undefined,
+  head: string,
+): Promise<SizedEvidence> {
+  if (reading.kind === 'refused') return { reading, unread: [] }
+  const jobs = reading.states.flatMap((entry, stateIndex) =>
+    entry.items.flatMap((item, itemIndex) => [
+      {
+        stateIndex,
+        itemIndex,
+        side: 'head' as const,
+        path: item.path,
+        sha: head,
+      },
+      ...(item.added || base === undefined
+        ? []
+        : [
+            {
+              stateIndex,
+              itemIndex,
+              side: 'base' as const,
+              path: item.path,
+              sha: base,
+            },
+          ]),
+    ]),
+  )
+  const reads = await mapPool(jobs, WIDTH_READ_CONCURRENCY, (job) =>
+    readImageWidth(cwd, job.path, job.sha),
+  )
+  const unread: string[] = []
+  const states = reading.states.map((entry, stateIndex) => ({
+    ...entry,
+    items: entry.items.map((item, itemIndex): EvidenceItem => {
+      const widths: { width?: number; baseWidth?: number } = {}
+      jobs.forEach((job, index) => {
+        const read = reads[index]
+        if (
+          job.stateIndex !== stateIndex ||
+          job.itemIndex !== itemIndex ||
+          read === undefined
+        ) {
+          return
+        }
+        if (read.kind === 'failed') unread.push(`${job.side}:${job.path}`)
+        else if (read.width !== undefined) {
+          widths[job.side === 'head' ? 'width' : 'baseWidth'] = read.width
+        }
+      })
+      return { ...item, ...widths }
+    }),
+  }))
+  return { reading: { kind: 'read', states }, unread }
+}
+
 async function runEvidence(
   number: string | undefined,
   opts: EvidenceOptions,
@@ -1954,7 +2086,8 @@ async function runEvidence(
     unsettled === undefined
       ? undefined
       : settleChecklist(unsettled, identity.head, findEvidenceHead(comments))
-  const states = grouped.kind === 'read' ? grouped.states : []
+  const sized = await withImageWidths(root, grouped, base, identity.head)
+  const states = sized.reading.kind === 'read' ? sized.reading.states : []
   const body = renderEvidenceBody(
     states,
     repo,
@@ -1993,6 +2126,11 @@ async function runEvidence(
   logInfo(
     `${plural(caseCount, 'case')} across ${plural(states.length, 'state')}`,
   )
+  if (sized.unread.length > 0) {
+    logWarn(
+      `width unread for ${plural(sized.unread.length, 'image')}, rendered at 1000: ${sized.unread.join(', ')}`,
+    )
+  }
   if (preview !== undefined) logInfo(`preview ${preview}`)
   if (local !== undefined) logInfo(`local preview ${local}`)
   if (checklist !== undefined) {
@@ -2015,6 +2153,7 @@ async function runEvidence(
         head: identity.head,
         body,
         states,
+        ...(sized.unread.length > 0 && { widthUnread: sized.unread }),
         ...(commentId !== undefined && { commentId }),
         ...carried,
       })}\n`,

package/src/commands/records.ts

@@ -55,7 +55,7 @@ import {
   outro,
   pipeOutput,
   plural,
-} from '@/ui'
+} from '@/cli/ui'
 import { currentWorktreeRoot, mainWorktreeRoot } from '@/git/worktree'
 
 /** Returned when a record carries a finding, which is the gating result. */

package/src/commands/repo.ts

@@ -17,7 +17,7 @@ import {
   logStep,
   logWarn,
   outro,
-} from '@/ui'
+} from '@/cli/ui'
 
 const GH_TIMEOUT_MS = 30_000
 

package/src/commands/sandbox.ts

@@ -40,7 +40,7 @@ import {
   outro,
   palette,
   select,
-} from '@/ui'
+} from '@/cli/ui'
 
 const SANDBOX_DIR = join(PROJECT_ROOT, 'sandbox')
 

package/src/commands/secrets.ts

@@ -1,7 +1,15 @@
 import { resolve } from 'node:path'
 import type { Command } from 'commander'
 import { type ScanRefusal, scanShippedTree } from '@/secrets/scan'
-import { intro, logError, logInfo, logStep, logWarn, outro, plural } from '@/ui'
+import {
+  intro,
+  logError,
+  logInfo,
+  logStep,
+  logWarn,
+  outro,
+  plural,
+} from '@/cli/ui'
 
 interface ScanCommandOptions {
   readonly json?: boolean

package/src/commands/sessions.ts

@@ -23,7 +23,7 @@ import {
   outro,
   pipeOutput,
   plural,
-} from '@/ui'
+} from '@/cli/ui'
 import { mainWorktreeRoot } from '@/git/worktree'
 
 interface ListCommandOptions {

package/src/commands/slides.ts

@@ -4,7 +4,7 @@ import { INSTALL_BROWSER } from '@/browser/engine'
 import { creationRel, SCRATCH } from '@/roots/record'
 import { listDecks, resolveDeck, SLIDES_FOLDER } from '@/slides/decks'
 import { openDeck } from '@/slides/open'
-import { intro, outro, palette } from '@/ui'
+import { intro, outro, palette } from '@/cli/ui'
 
 const SLIDES_AT = creationRel(process.cwd(), SLIDES_FOLDER)
 

package/src/commands/standards.ts

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

package/src/commands/sync.ts

@@ -1,7 +1,7 @@
 import { existsSync } from 'node:fs'
 import { join } from 'node:path'
 import type { Command } from 'commander'
-import { cliPath, cliRun } from '@/cli-run'
+import { cliPath, cliRun } from '@/cli/run'
 import { PROJECT_ROOT } from '@/roots/project'
 import {
   buildCheckReport,
@@ -30,7 +30,7 @@ import {
   logWarn,
   outro,
   palette,
-} from '@/ui'
+} from '@/cli/ui'
 import { describeSkew } from '@/version/skew'
 
 const SYNC_ARGS: Record<SyncDomain, readonly string[]> = {

package/src/commands/targets.ts

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

package/src/commands/tasks.ts

@@ -59,7 +59,7 @@ import {
   logWarn,
   outro,
   pipeOutput,
-} from '@/ui'
+} from '@/cli/ui'
 import { mainWorktreeRoot } from '@/git/worktree'
 
 /** Returned when the board carries a finding, which is the gating result. */

package/src/commands/teach.ts

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

package/src/commands/tooling.ts

@@ -32,7 +32,7 @@ import {
   outro,
   palette,
   select,
-} from '@/ui'
+} from '@/cli/ui'
 
 interface SyncOptions {
   readonly skip?: string

package/src/commands/transcripts.ts

@@ -2,7 +2,7 @@ import { resolve } from 'node:path'
 import type { Command } from 'commander'
 import { recordDir } from '@/roots/record'
 import { ensureYtDlp, fetchOne } from '@/transcripts/fetch'
-import { palette } from '@/ui'
+import { palette } from '@/cli/ui'
 import { mainWorktreeRoot } from '@/git/worktree'
 
 interface TranscriptOptions {

package/src/commands/upgrade.ts

@@ -9,7 +9,7 @@ import {
   logWarn,
   outro,
   select,
-} from '@/ui'
+} from '@/cli/ui'
 import { compareVersions, parseVersion } from '@/version/compare'
 import { readInstalled, UNKNOWN_LABEL } from '@/version/installed'
 import { detectManager, installCommand, type Manager } from '@/version/manager'

package/src/commands/wiki.ts

@@ -11,7 +11,7 @@ import {
   outro,
   palette,
   select,
-} from '@/ui'
+} from '@/cli/ui'
 import {
   applyWikiInit,
   isWikiTarget,

package/src/commands/worktrees.ts

@@ -8,7 +8,7 @@ import {
   outro,
   pipeOutput,
   plural,
-} from '@/ui'
+} from '@/cli/ui'
 import {
   type Refusal,
   type ReclaimReport,

package/src/design/brand-favicon.ts

@@ -0,0 +1,18 @@
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { FAVICON_COLORS, renderFavicon } from '@/design/favicon'
+import { PROJECT_ROOT } from '@/roots/project'
+
+const BRAND_MARK = 'assets/brand/mark.svg'
+
+/**
+ * The brand icon, built from the mark and the favicon's own pair, the same two
+ * inputs `web/public/favicon.svg` is generated from. Every surface that shows
+ * the icon reads it here rather than keeping a copy that drifts from the mark.
+ * It sits apart from `favicon.ts` because the card build imports that module
+ * through an `@` alias pointed at `web/src`, so it must import nothing.
+ */
+export function brandFavicon(): string {
+  const mark = readFileSync(join(PROJECT_ROOT, BRAND_MARK), 'utf8')
+  return renderFavicon(mark, FAVICON_COLORS)
+}

package/src/gate/measures.ts

@@ -39,7 +39,7 @@ import {
 } from '@/shipped/references'
 import { surfaceDir } from '@/roots/surface'
 import { seedRoots } from '@/tooling/seeds'
-import { plural } from '@/ui'
+import { plural } from '@/cli/ui'
 import {
   README_PARAPHRASE_MARKER,
   readmeCitationsIn,

package/src/init/run.ts

@@ -1,4 +1,4 @@
-import { logInfo, logStep, logWarn } from '@/ui'
+import { logInfo, logStep, logWarn } from '@/cli/ui'
 
 /**
  * A domain either runs or announces why it did not. Governance under

package/src/migrate/rename.ts

@@ -211,7 +211,7 @@ export const AITK_RULES: RenameRules = defineRenameRules({
     'src/sync/stamp.test.ts',
     'src/targets/registry.test.ts',
     'src/targets/sweep.test.ts',
-    'src/ui.test.ts',
+    'src/cli/ui.test.ts',
   ],
   articleFixups: [{ pattern: AITK_ARTICLE, replacement: '$1$2$3' }],
 })