@erclx/canon 5.26.0 → 5.28.0

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,
@@ -25,7 +25,9 @@ import {
   type RunEnvelope,
   type Verdict,
 } 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,
@@ -70,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
@@ -124,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> {
@@ -510,7 +508,7 @@ export function register(program: Command): void {
       if (mismatch !== undefined) logWarn(mismatch)
 
       // `--no-header` is the frame opt-out for a caller that already opened
-      // one, which `sandbox/run.sh` and the picker below both do.
+      // one, which `canon sandbox run` and the picker below both do.
       const isHeader = cmd.args[0] !== '--no-header'
       const args = isHeader ? cmd.args : cmd.args.slice(1)
 
@@ -527,6 +525,57 @@ export function register(program: Command): void {
       })
     })
 
+  sandbox
+    .command('run')
+    .description(
+      'Provision a scenario, drive one claude -p session over it, and print the envelope with its verdict',
+    )
+    .argument('[target]', 'Scenario as <category>:<command>, e.g. git:commit')
+    .argument('[prompt]', 'Skill invocation, e.g. "/canon:git-commit"')
+    .argument('[arm]', 'Named scenario arm, e.g. small')
+    .helpOption('-h, --help', 'Show this help message')
+    .addHelpText(
+      'after',
+      [
+        '',
+        'Env overrides:',
+        '  CANON_SKILL_TEST_MODEL            default sonnet',
+        '  CANON_SKILL_TEST_TOOLS            default Bash,Read,Glob,Grep,Edit,Write',
+        '  CANON_SKILL_TEST_MAX_TURNS        default 30',
+        '  CANON_SKILL_TEST_PERMISSION_MODE  default bypassPermissions',
+        '',
+        'Examples:',
+        '  canon sandbox run git:commit "/canon:git-commit"',
+        '  canon sandbox run claude:plan-feature "/canon:plan-feature add a widget" small',
+        '',
+        'Bills a real session through the claude binary on PATH.',
+        'Exit codes: the verdict, 1 when the envelope does not parse, or the',
+        'provisioning or session code when either stops the run first.',
+      ].join('\n'),
+    )
+    .action(
+      async (
+        target: string | undefined,
+        prompt: string | undefined,
+        arm: string | undefined,
+        _opts: unknown,
+        cmd: Command,
+      ) => {
+        if (target === undefined) {
+          cmd.help()
+          return
+        }
+        if (reportAbsentScenarioTree()) return
+
+        process.exitCode = await runHeadless({
+          projectRoot: PROJECT_ROOT,
+          target,
+          prompt,
+          arm,
+        })
+      },
+    )
+
   sandbox
     .command('check')
     .description('Check a provisioned sandbox against a scenario expectation')
@@ -628,7 +677,7 @@ export function register(program: Command): void {
         '  canon sandbox equivalence claude --json',
         '  canon sandbox equivalence claude:plan-feature --base origin/main',
         '',
-        'Provisions offline only and never runs sandbox/run.sh or a claude binary.',
+        'Provisions offline only and never runs canon sandbox run or a claude binary.',
         '--stub-remote also runs the anchor arms, and wins over --include-anchor.',
         'Exit codes: 0 when every compared arm is identical or red the same way',
         'on both sides, 1 on any difference, exit mismatch, or enumeration error.',

package/src/commands/sessions.ts

@@ -24,7 +24,7 @@ import {
   pipeOutput,
   plural,
 } from '@/ui'
-import { mainWorktreeRoot } from '@/worktree'
+import { mainWorktreeRoot } from '@/git/worktree'
 
 interface ListCommandOptions {
   readonly json?: boolean

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,
@@ -20,7 +20,7 @@ import {
 } from '@/sync/target'
 import type { UnclaimedFolder } from '@/sync/reverse'
 import { runGitWorkflow } from '@/sync/workflow'
-import { resolveTarget } from '@/target'
+import { resolveTarget } from '@/targets/validate'
 import {
   intro,
   isNonInteractive,

package/src/commands/tasks.ts

@@ -1,7 +1,7 @@
 import { relative } from 'node:path'
 import type { Command } from 'commander'
 import { execa } from 'execa'
-import { gitEnv } from '@/git-env'
+import { gitEnv } from '@/git/env'
 import { type AnswersOutcome, planAnswers } from '@/tasks/answers'
 import { type BranchOutcome, planBranch } from '@/tasks/branch'
 import {
@@ -42,6 +42,7 @@ import {
 import {
   type Finding,
   type FolderClaim,
+  type SharedFiles,
   type WideToken,
   type Unplaced,
   type Untested,
@@ -59,7 +60,7 @@ import {
   outro,
   pipeOutput,
 } from '@/ui'
-import { mainWorktreeRoot } from '@/worktree'
+import { mainWorktreeRoot } from '@/git/worktree'
 
 /** Returned when the board carries a finding, which is the gating result. */
 const EXIT_FINDINGS = 2
@@ -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/teach.ts

@@ -43,7 +43,7 @@ import {
   outro,
   pipeOutput,
 } from '@/ui'
-import { mainWorktreeRoot } from '@/worktree'
+import { mainWorktreeRoot } from '@/git/worktree'
 
 /**
  * A pair as the command line spells it, split on the first `=` so a value

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,9 +1,9 @@
 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 '@/worktree'
+import { mainWorktreeRoot } from '@/git/worktree'
 
 interface TranscriptOptions {
   out?: string

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/commands/worktrees.ts

@@ -16,7 +16,7 @@ import {
   type Unreadable,
   type WorktreeVerdict,
 } from '@/worktrees/reclaim'
-import { mainWorktreeRoot } from '@/worktree'
+import { mainWorktreeRoot } from '@/git/worktree'
 import { repairBareFlag } from '@/worktrees/bare-flag'
 import {
   removeReclaimable,

package/src/comments/scan.ts

@@ -1,6 +1,6 @@
 import { readFile } from 'node:fs/promises'
 import { resolve } from 'node:path'
-import { listIgnored } from '@/git-ignore'
+import { listIgnored } from '@/git/ignore'
 
 export type Language = 'ts' | 'sh'
 

package/src/comments/trend.ts

@@ -1,5 +1,5 @@
 import { $ } from 'bun'
-import { gitEnv } from '@/git-env'
+import { gitEnv } from '@/git/env'
 import {
   countFiles,
   isPruned,

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

@@ -1,9 +1,9 @@
 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 { listRepositoryFiles } from '@/git/files'
+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

@@ -2,9 +2,9 @@ import { existsSync, readFileSync } from 'node:fs'
 import { basename, relative, resolve } from 'node:path'
 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 { gitEnv } from '@/git/env'
+import { listChangedFiles, resolveBaseRef } from '@/git/files'
+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