@erclx/canon 5.27.0 → 5.28.0

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 {

package/src/commands/claude.ts

@@ -71,9 +71,9 @@ import {
 } 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 { 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 {

package/src/commands/design.ts

@@ -11,9 +11,9 @@ 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'

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'

package/src/commands/init.ts

@@ -1,6 +1,6 @@
 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'

package/src/commands/migrate.ts

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

package/src/commands/pr.ts

@@ -29,12 +29,15 @@ import {
   findEvidenceCaseCount,
   findEvidenceChecklist,
   findEvidenceCommentId,
+  findEvidenceHead,
   findEvidenceLocal,
   findEvidencePreview,
   groupEvidence,
   hasMarkedEvidenceComment,
+  readChecklistBoxes,
   readOwed,
   renderEvidenceBody,
+  settleChecklist,
 } from '@/pr/evidence'
 import {
   dropFrames,
@@ -71,6 +74,7 @@ import {
   servesChange,
   type WorkflowFile,
 } from '@/pr/preview'
+import { type TickRefusal, tickBoxes } from '@/pr/tick'
 import {
   commentRowOf,
   identityOf,
@@ -113,6 +117,28 @@ interface LocalOptions extends ReadOptions {
   readonly remove?: boolean
 }
 
+interface TickOptions extends ReadOptions {
+  readonly boxes?: string
+  readonly head?: string
+}
+
+type TickReason = TickRefusal | 'stale-head' | 'bad-boxes' | 'no-comment'
+
+const TICK_REFUSALS: Record<TickReason | 'gh-failed', string> = {
+  'stale-head':
+    'The head named is not the branch tip on the remote, so a tick would claim a pass on a commit that is no longer the pull request. Re-drive the checklist at the tip.',
+  'bad-boxes':
+    '--boxes takes box numbers as a comma-separated list of positive whole numbers, such as 1,3, and --head takes the commit that was driven.',
+  'no-comment': 'No comment on this pull request carries the evidence marker.',
+  'no-checklist': 'The evidence comment carries no checklist to tick.',
+  'no-box':
+    'A named box is past the end of the checklist. Number boxes off `canon pr evidence --json`.',
+  'taste-box':
+    'A named box ends in (taste), which no driver passes. Nothing was written.',
+  'gh-failed':
+    'gh could not read or edit the marked comment on this pull request.',
+}
+
 /** Shared by every verb that resolves a pull request from the checkout's branch. */
 const AMBIGUOUS_PULL =
   'More than one pull request is open on this branch, each against another base. Name the pull request number.'
@@ -563,10 +589,12 @@ export function register(program: Command): void {
         '--checklist closes the body with a visual checklist, below the',
         'comparison it annotates. A checklist the marked comment already',
         'carries is read back and carried forward the same way the preview',
-        'address is, which keeps a re-render from wiping ticked boxes. It',
-        'turns no-evidence into ok: a branch with a checklist and no evidence',
-        'image renders a marked body holding the checklist, so a later call',
-        'finds and edits that comment.',
+        'address is. A tick survives only a render at the head it names: one',
+        'stamped `passed at <sha>` for another head is cleared and unstamped,',
+        'and so is one carrying no stamp when the comment described another',
+        'head. A checklist, supplied or carried, turns no-evidence into ok: a',
+        'branch with a checklist and no evidence image renders a marked body',
+        'holding the checklist, so a later call finds and edits that comment.',
         '',
         '--local adds a **Local preview:** segment after any hosted one on the',
         'address line, or carries the line alone, and is carried forward the',
@@ -580,6 +608,8 @@ export function register(program: Command): void {
         '  preview    the hosted **Preview:** address the comment carries',
         '  local      the **Local preview:** address beside it',
         '  checklist  the checklist between its delimiters, ticks included',
+        '  boxes      each checklist box with its number, tick, stamp, and taste',
+        '             mark, the numbering `canon pr tick` takes',
         'These come from the comment already posted, never from the flags this',
         'call passed. A checklist the caller posted raw after a refused render',
         'carries no marker, so the record reports none of the three for it. An',
@@ -741,6 +771,51 @@ export function register(program: Command): void {
           : await runLocal(opts)
     })
 
+  pr.command('tick')
+    .description(
+      "Tick the checklist boxes a UI pass drove, stamping each with the commit it passed at, on the pull request's evidence comment",
+    )
+    .argument('[number]', 'Pull request to edit, defaulting to this branch')
+    .helpOption('-h, --help', 'Show this help message')
+    .option('--root <path>', 'Repository to read, defaulting to the cwd')
+    .option('--json', 'Add a machine-readable record on stdout')
+    .requiredOption(
+      '--boxes <list>',
+      'Box numbers to tick, comma-separated, as `canon pr evidence --json` numbers them',
+    )
+    .requiredOption('--head <sha>', 'The commit the boxes were driven at')
+    .addHelpText(
+      'after',
+      [
+        '',
+        'Edits the marked evidence comment in place, so a skill never',
+        'hand-edits a comment body. Each named box becomes',
+        '`- [x] <box> · passed at <short sha>`. Ticking a box again restamps',
+        'it. A later render at another head clears a tick whose stamp names',
+        'a different commit.',
+        '',
+        'Read `reason` on the JSON record:',
+        '  ticked       the boxes were ticked, with the tip in `head`',
+        '  stale-head   --head is not the remote branch tip, nothing written',
+        '  taste-box    a named box ends in (taste), nothing written',
+        '  no-box       a named number is past the checklist, nothing written',
+        '  no-checklist the evidence comment carries no checklist',
+        '  no-comment   no comment carries the evidence marker',
+        '  bad-boxes    --boxes or --head is malformed',
+        '',
+        'Exit codes:',
+        '  0  the boxes were ticked',
+        '  1  refused, with the reason on stderr or in the JSON record',
+        '',
+        'Examples:',
+        '  canon pr tick 1341 --boxes 1,2,4 --head 1a2b3c4 --json',
+        '',
+      ].join('\n'),
+    )
+    .action(async (number: string | undefined, opts: TickOptions) => {
+      process.exitCode = await runTick(number, opts)
+    })
+
   pr.command('frames')
     .description(
       `Push a UI review frame to the never-merged ${FRAMES_BRANCH} branch and return its embed link, or drop frames from it`,
@@ -1786,7 +1861,10 @@ async function runEvidence(
   const carried = {
     ...(carriedPreview !== undefined && { preview: carriedPreview }),
     ...(carriedLocal !== undefined && { local: carriedLocal }),
-    ...(carriedChecklist !== undefined && { checklist: carriedChecklist }),
+    ...(carriedChecklist !== undefined && {
+      checklist: carriedChecklist,
+      boxes: readChecklistBoxes(carriedChecklist),
+    }),
   }
 
   // A deploy that resolves and does not build from any changed path makes a
@@ -1834,7 +1912,8 @@ async function runEvidence(
   // comment a later call edits. A local address rides on a checklist or a
   // hosted preview and never opens one alone, so a docs-only branch with a
   // server up posts nothing.
-  const hasChecklist = suppliedChecklist !== undefined
+  const hasChecklist =
+    suppliedChecklist !== undefined || carriedChecklist !== undefined
   if (
     grouped.kind === 'refused' &&
     opts.preview === undefined &&
@@ -1870,7 +1949,11 @@ async function runEvidence(
 
   const preview = opts.preview ?? (isUnserved ? undefined : carriedPreview)
   const local = opts.local ?? carriedLocal
-  const checklist = suppliedChecklist ?? carriedChecklist
+  const unsettled = suppliedChecklist ?? carriedChecklist
+  const checklist =
+    unsettled === undefined
+      ? undefined
+      : settleChecklist(unsettled, identity.head, findEvidenceHead(comments))
   const states = grouped.kind === 'read' ? grouped.states : []
   const body = renderEvidenceBody(
     states,
@@ -2402,6 +2485,99 @@ async function runLocalRemove(
 
 const POSITIVE_WHOLE = /^[1-9]\d*$/
 
+const MIN_TICK_HEAD_LENGTH = 7
+
+/**
+ * Ticks the named boxes on the marked comment. It refuses a head that is not
+ * the remote tip and a taste box before writing, so both rules hold as checks
+ * rather than as prose a driver can talk itself out of.
+ */
+async function runTick(
+  number: string | undefined,
+  opts: TickOptions,
+): Promise<number> {
+  const root = resolve(opts.root ?? process.cwd())
+  const emitJson = opts.json ?? false
+
+  intro('canon pr tick')
+
+  const refuseTick = (reason: TickReason | 'gh-failed'): number =>
+    refuseWith(reason, TICK_REFUSALS[reason], emitJson, root)
+
+  const numbers = (opts.boxes ?? '').split(',').map((part) => part.trim())
+  const head = (opts.head ?? '').trim()
+  if (
+    numbers.length === 0 ||
+    !numbers.every((part) => POSITIVE_WHOLE.test(part)) ||
+    !/^[0-9a-f]+$/.test(head) ||
+    head.length < MIN_TICK_HEAD_LENGTH
+  ) {
+    return refuseTick('bad-boxes')
+  }
+
+  const read = await readIdentity(root, number)
+  if (read.kind === 'refused') {
+    return refuseWith(read.reason, PULL_REFUSALS[read.reason], emitJson, root)
+  }
+  const { identity } = read
+  if (identity.number === undefined) return refuseTick('gh-failed')
+
+  const reading = await resolveTip(identity.branch, refReader(root))
+  if (reading.kind === 'refused') {
+    return refuseWith(
+      reading.reason,
+      PULL_REFUSALS[reading.reason],
+      emitJson,
+      root,
+    )
+  }
+  if (!reading.tip.startsWith(head)) return refuseTick('stale-head')
+
+  const comments = await listComments(root, String(identity.number))
+  if (comments === undefined) return refuseTick('gh-failed')
+  const commentId = findEvidenceCommentId(comments)
+  const marked = comments.find((comment) =>
+    comment.url?.endsWith(`#issuecomment-${commentId}`),
+  )
+  if (commentId === undefined || marked === undefined) {
+    return refuseTick('no-comment')
+  }
+
+  const result = tickBoxes(marked.body, numbers.map(Number), reading.tip)
+  if (result.kind === 'refused') return refuseTick(result.reason)
+
+  if (result.body !== marked.body) {
+    const patched = await gh(root, [
+      'api',
+      '-X',
+      'PATCH',
+      `repos/{owner}/{repo}/issues/comments/${commentId}`,
+      '-f',
+      `body=${result.body}`,
+    ])
+    if (patched === null) return refuseTick('gh-failed')
+  }
+
+  logStep('Ticked')
+  logInfo(
+    `${plural(numbers.length, 'box')} at ${reading.tip.slice(0, 7)} on comment ${commentId}`,
+  )
+  outro()
+  if (emitJson) {
+    process.stdout.write(
+      `${JSON.stringify({
+        root,
+        number: identity.number,
+        reason: 'ticked',
+        head: reading.tip,
+        boxes: numbers.map(Number),
+        commentId,
+      })}\n`,
+    )
+  }
+  return 0
+}
+
 /** One `gh api` call, keeping the HTTP status of a failure so a refused write can be told from a missing ref. */
 type ApiCall =
   | { readonly ok: true; readonly data: unknown }

package/src/commands/sandbox.ts

@@ -1,7 +1,7 @@
-import { existsSync, readFileSync, readdirSync } from 'node:fs'
+import { existsSync, readFileSync } from 'node:fs'
 import { join } from 'node:path'
 import type { Command } from 'commander'
-import { checkoutMismatchWarning, PROJECT_ROOT } from '@/project-root'
+import { checkoutMismatchWarning, PROJECT_ROOT } from '@/roots/project'
 import {
   assertedPercent,
   collectCensus,
@@ -27,6 +27,7 @@ import {
 } from '@/sandbox/expect'
 import { runHeadless } from '@/sandbox/headless/run'
 import { runSandbox } from '@/sandbox/provision'
+import { listCategories, listScenarioFiles } from '@/sandbox/scenario'
 import { sandboxTree } from '@/sandbox/tree'
 import {
   frameError,
@@ -71,9 +72,6 @@ function reportAbsentScenarioTree(): boolean {
   return true
 }
 
-/** Holds fixture content for scenarios rather than scenarios of its own. */
-const FIXTURES_DIR = 'fixtures'
-
 /**
  * The provision verb takes positional words rather than options, since `reset`
  * and `clean` share its slot with a target, so its usage is written out here
@@ -125,17 +123,16 @@ interface CoverageOptions {
 }
 
 function getCategories(): string[] {
-  return readdirSync(SANDBOX_DIR, { withFileTypes: true })
-    .filter((d) => d.isDirectory() && d.name !== FIXTURES_DIR)
-    .map((d) => d.name)
-    .sort()
+  return listCategories(SANDBOX_DIR)
 }
 
+/** Lists a stem in both forms too, so picking it reaches the refusal that names it. */
 function getCommands(category: string): string[] {
-  return readdirSync(join(SANDBOX_DIR, category), { withFileTypes: true })
-    .filter((f) => f.isFile() && f.name.endsWith('.sh'))
-    .map((f) => f.name.replace(/\.sh$/, ''))
-    .sort()
+  const { scenarios, ambiguous } = listScenarioFiles(
+    join(SANDBOX_DIR, category),
+  )
+
+  return [...scenarios.map((s) => s.command), ...ambiguous].sort()
 }
 
 async function interactivePicker(): Promise<string> {

package/src/commands/slides.ts

@@ -1,7 +1,7 @@
 import { resolve } from 'node:path'
 import type { Command } from 'commander'
 import { INSTALL_BROWSER } from '@/browser/engine'
-import { creationRel, SCRATCH } from '@/record-root'
+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'

package/src/commands/sync.ts

@@ -2,7 +2,7 @@ import { existsSync } from 'node:fs'
 import { join } from 'node:path'
 import type { Command } from 'commander'
 import { cliPath, cliRun } from '@/cli-run'
-import { PROJECT_ROOT } from '@/project-root'
+import { PROJECT_ROOT } from '@/roots/project'
 import {
   buildCheckReport,
   type CheckReport,

package/src/commands/tasks.ts

@@ -42,6 +42,7 @@ import {
 import {
   type Finding,
   type FolderClaim,
+  type SharedFiles,
   type WideToken,
   type Unplaced,
   type Untested,
@@ -239,7 +240,8 @@ export function register(program: Command): void {
         '  no Needs a plan row has a live plan, and every Up next row has one',
         '  every task file carries a board row or a backlog line, never both',
         '  no task carries more than one row',
-        '  no two Run now rows touch the same file',
+        '  every Run now row names the files it touches',
+        '  a file two Run now rows share is listed, never failed',
         '',
         'Exit codes:',
         '  0  every check passed',
@@ -1383,7 +1385,7 @@ function reportValidation(
     logStep(outcome.findings.length === 0 ? 'Clean' : 'Findings')
     if (outcome.findings.length === 0) {
       logInfo(
-        'every row resolves, every task sits on one surface, and each touches its own files',
+        'every row resolves, every task sits on one surface, and each run now row names its files',
       )
     } else {
       for (const finding of outcome.findings) logWarn(describe(finding))
@@ -1412,6 +1414,16 @@ function reportValidation(
       for (const claim of outcome.claims) logWarn(describeClaim(claim))
     }
 
+    // A shared file holds nothing under the dispatch gate, so the pairs report
+    // with the warn glyph and move no exit code. They stay listed for merge
+    // order and for the holds a Touches cell cannot state.
+    logStep('Shared files')
+    if (outcome.shared.length === 0) {
+      logInfo('no two run now rows name the same file')
+    } else {
+      for (const pair of outcome.shared) logWarn(describeShared(pair))
+    }
+
     // The width limit is a heuristic over one preview pane, so a wide token
     // reports and moves no exit code, and a measure failing on a cell that
     // fits would teach a reader to skip it.
@@ -1447,6 +1459,7 @@ function reportValidation(
         findings: outcome.findings,
         untested: outcome.untested,
         claims: outcome.claims,
+        shared: outcome.shared,
         wide: outcome.wide,
         unplaced: outcome.unplaced,
       })}\n`,
@@ -1469,6 +1482,10 @@ function describeClaim(claim: FolderClaim): string {
   return `${claim.group}: ${claim.subject} ${claim.message}`
 }
 
+function describeShared(pair: SharedFiles): string {
+  return `${pair.group}: ${pair.subject} ${pair.message}`
+}
+
 function describeWide(token: WideToken): string {
   return `${token.group}: ${token.subject} ${token.message}`
 }

package/src/commands/tooling.ts

@@ -1,6 +1,6 @@
 import { resolve } from 'node:path'
 import type { Command } from 'commander'
-import { checkoutMismatchWarning, PROJECT_ROOT } from '@/project-root'
+import { checkoutMismatchWarning, PROJECT_ROOT } from '@/roots/project'
 import {
   injectConfigs,
   injectGitignore,

package/src/commands/transcripts.ts

@@ -1,6 +1,6 @@
 import { resolve } from 'node:path'
 import type { Command } from 'commander'
-import { recordDir } from '@/record-root'
+import { recordDir } from '@/roots/record'
 import { ensureYtDlp, fetchOne } from '@/transcripts/fetch'
 import { palette } from '@/ui'
 import { mainWorktreeRoot } from '@/git/worktree'

package/src/commands/upgrade.ts

@@ -1,6 +1,6 @@
 import type { Command } from 'commander'
 import { execa } from 'execa'
-import { findCheckoutMismatch, PROJECT_ROOT } from '@/project-root'
+import { findCheckoutMismatch, PROJECT_ROOT } from '@/roots/project'
 import {
   frameError,
   intro,

package/src/commands/wiki.ts

@@ -1,6 +1,6 @@
 import { resolve } from 'node:path'
 import type { Command } from 'commander'
-import { PROJECT_ROOT } from '@/project-root'
+import { PROJECT_ROOT } from '@/roots/project'
 import {
   intro,
   logAdd,

package/src/context/architecture.ts

@@ -2,7 +2,7 @@ import { access, readFile } from 'node:fs/promises'
 import { join, relative } from 'node:path'
 import { AUDITS } from '@/audits/catalog'
 import { type BodyLine, bodyLines } from '@/markdown/scan'
-import { surfaceDir } from '@/surface-root'
+import { surfaceDir } from '@/roots/surface'
 
 /**
  * The record this measures, relative to `root`.

package/src/context/citations.ts

@@ -2,8 +2,8 @@ import { existsSync } from 'node:fs'
 import { readFile } from 'node:fs/promises'
 import { resolve } from 'node:path'
 import { listRepositoryFiles } from '@/git/files'
-import { RECORD_ROOTS } from '@/record-root'
-import { SURFACE_ROOTS } from '@/surface-root'
+import { RECORD_ROOTS } from '@/roots/record'
+import { SURFACE_ROOTS } from '@/roots/surface'
 
 /**
  * Suppresses citation checking for the source line carrying it.

package/src/context/classify/extract.ts

@@ -4,7 +4,7 @@ import { $ } from 'bun'
 import { resolveFolders } from '@/context/folders'
 import { gitEnv } from '@/git/env'
 import { listChangedFiles, resolveBaseRef } from '@/git/files'
-import { surfaceDir } from '@/surface-root'
+import { surfaceDir } from '@/roots/surface'
 
 /**
  * The five canonical doc types the classifier reaches, matching the file

package/src/context/folders.ts

@@ -1,8 +1,8 @@
 import { existsSync } from 'node:fs'
 import { dirname, relative, resolve } from 'node:path'
 import { INDEX_FILE, listIndexes } from '@/indexes/walk'
-import { RECORD_ROOTS } from '@/record-root'
-import { SURFACE_ROOTS } from '@/surface-root'
+import { RECORD_ROOTS } from '@/roots/record'
+import { SURFACE_ROOTS } from '@/roots/surface'
 
 /**
  * Folder names under a record root audited by default.

package/src/context/requirements.ts

@@ -2,7 +2,7 @@ import { readFile } from 'node:fs/promises'
 import { join, relative } from 'node:path'
 import { wordCount } from '@/context/architecture'
 import { bodyLines } from '@/markdown/scan'
-import { surfaceDir } from '@/surface-root'
+import { surfaceDir } from '@/roots/surface'
 
 /**
  * The record this measures, relative to `root`, resolved at either surface

package/src/docs/read.ts

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync, readdirSync } from 'node:fs'
 import { basename, join } from 'node:path'
 import { stripFrontmatter } from '@/markdown/frontmatter'
-import { SURFACE_ROOTS } from '@/surface-root'
+import { SURFACE_ROOTS } from '@/roots/surface'
 
 const INDEX_TOPIC = 'index'
 

package/src/exec.ts

@@ -1,6 +1,6 @@
 import { join } from 'node:path'
 import { execa } from 'execa'
-import { checkoutMismatchWarning, PROJECT_ROOT } from '@/project-root'
+import { checkoutMismatchWarning, PROJECT_ROOT } from '@/roots/project'
 import { logWarn } from '@/ui'
 
 export async function execScript(

package/src/feedback/github.ts

@@ -1,6 +1,6 @@
 import { execa } from 'execa'
 import { gitEnv } from '@/git/env'
-import { PROJECT_ROOT } from '@/project-root'
+import { PROJECT_ROOT } from '@/roots/project'
 import {
   buildIssueArgs,
   failureDetail,