@erclx/canon 4.66.0 → 4.68.0

package/src/claude/cases/{claude-workflow.ts → workflow.ts}

@@ -1,8 +1,8 @@
 import type { SkillCase } from '@/claude/skills-rank'
 
 /**
- * The `claude-*` skill family: feature planning, review, and the session
- * artifacts that coordinate work across sessions.
+ * The session workflow skills: feature planning, review, and the artifacts
+ * that coordinate work across sessions.
  *
  * Every positive is phrased away from its skill's own quoted trigger, since a
  * verbatim trigger passes by construction and proves nothing about a prompt in
@@ -10,33 +10,33 @@ import type { SkillCase } from '@/claude/skills-rank'
  * an explicit `Do NOT` boundary against each other, since a boundary in a
  * body does not reach the field a router reads.
  */
-export const CLAUDE_WORKFLOW_CASES: readonly SkillCase[] = [
+export const WORKFLOW_CASES: readonly SkillCase[] = [
   {
     prompt: 'Go fix everything the reviewer flagged on my open PR.',
-    expect: 'claude-address-review',
+    expect: 'review-address',
   },
   {
     prompt:
       'Run the whole implement, verify, review, and ship pipeline for the approved plan.',
-    expect: 'claude-autoship',
+    expect: 'auto-ship',
   },
   {
     prompt: "Pull together a design system from what's already in the app.",
-    expect: 'claude-design-extract',
+    expect: 'design-extract',
   },
   {
     prompt: 'Draw me a diagram of how the pieces of this system connect.',
-    expect: 'claude-diagram',
+    expect: 'draft-diagram',
   },
   {
     prompt:
       'Bring the internal planning docs under .claude up to date with what we decided this session.',
-    expect: 'claude-docs',
+    expect: 'docs-fold',
   },
   {
     prompt:
       'Sketch out a plan for adding this new capability before we touch any code.',
-    expect: 'claude-feature',
+    expect: 'plan-feature',
   },
   {
     prompt:
@@ -46,43 +46,43 @@ export const CLAUDE_WORKFLOW_CASES: readonly SkillCase[] = [
   {
     prompt:
       'We need to measure this properly before committing to an approach.',
-    expect: 'claude-groundwork',
+    expect: 'plan-groundwork',
   },
   {
     prompt: 'Take this pile of raw notes and turn it into filed items.',
-    expect: 'claude-intake',
+    expect: 'plan-intake',
   },
   {
     prompt: 'Walk me through the open intake items so I can decide on each.',
-    expect: 'claude-intake-answer',
+    expect: 'plan-intake-answer',
   },
   {
     prompt:
       "Draft a diff-based proposal for tightening this passage in the standard, don't just edit it.",
-    expect: 'claude-markdown-propose',
+    expect: 'markdown-propose',
   },
   {
     prompt: 'Pull the durable lessons out of this session before it ends.',
-    expect: 'claude-memory-capture',
+    expect: 'memory-capture',
   },
   {
     prompt:
       'Go through the memory folder and propose what to do with each entry.',
-    expect: 'claude-memory-review',
+    expect: 'memory-review',
   },
   {
     prompt:
       'Take on the orchestrator role and coordinate the parallel feature builds.',
-    expect: 'claude-orchestrate',
+    expect: 'role-orchestrator',
   },
   {
     prompt:
       'I am writing the plan for a row another session will build. What may I write, and where do I read what is already in flight?',
-    expect: 'claude-planner',
+    expect: 'role-planner',
   },
   {
     prompt: 'Post a formal review with findings on that open pull request.',
-    expect: 'claude-pr-review',
+    expect: 'review-pr',
   },
   {
     prompt:
@@ -92,7 +92,7 @@ export const CLAUDE_WORKFLOW_CASES: readonly SkillCase[] = [
   {
     prompt:
       'Look over everything that changed on this branch for bugs and edge cases.',
-    expect: 'claude-review',
+    expect: 'review-branch',
   },
   {
     prompt: 'Draft me a script with beats for a screencast recording.',
@@ -101,7 +101,7 @@ export const CLAUDE_WORKFLOW_CASES: readonly SkillCase[] = [
   {
     prompt:
       "Check whether my installed Claude seed docs have drifted from the toolkit's.",
-    expect: 'claude-seed-sync',
+    expect: 'seed-sync',
   },
   {
     prompt: 'Turn this topic into a slide deck I can render.',
@@ -110,37 +110,37 @@ export const CLAUDE_WORKFLOW_CASES: readonly SkillCase[] = [
   {
     prompt:
       'Check whether the markdown I changed violates any authoring standards.',
-    expect: 'claude-standards-audit',
+    expect: 'standards-audit',
   },
   {
     prompt: 'Open a new entry on the task board for this piece of work.',
-    expect: 'claude-tasks',
+    expect: 'task-board',
   },
   {
     prompt: 'Open a learning workspace so I can study this topic properly.',
-    expect: 'claude-teach',
+    expect: 'teach-workspace',
   },
   {
     prompt: 'Generate the Playwright tests I need after this UI change.',
-    expect: 'claude-ui-test',
+    expect: 'ui-test',
   },
   {
     prompt:
       'Look over the interface and tell me what feels unfinished or confusing.',
-    expect: 'claude-ux-audit',
+    expect: 'ux-audit',
   },
   {
     prompt: 'Tell me the paint and layout cost of this page right now.',
-    expect: 'claude-ux-measure',
+    expect: 'ux-measure',
   },
   {
     prompt:
       'I am building this branch for another session. What am I on the hook for, and what is off limits?',
-    expect: 'claude-worker',
+    expect: 'role-worker',
   },
   {
     prompt: 'Get me set up in a fresh Claude Code worktree for this branch.',
-    expect: 'claude-worktree',
+    expect: 'session-worktree',
   },
 
   // Negatives: pairs whose bodies already carry an explicit Do NOT boundary.
@@ -151,23 +151,23 @@ export const CLAUDE_WORKFLOW_CASES: readonly SkillCase[] = [
   },
   {
     prompt: 'Sort through this brain dump and write it up as findings.',
-    expect: 'claude-intake',
+    expect: 'plan-intake',
   },
   {
     prompt:
       "Go through what's still unanswered in the intake folder and decide.",
-    expect: 'claude-intake-answer',
+    expect: 'plan-intake-answer',
   },
   {
     prompt: 'Check this markdown against the house style rules.',
-    expect: 'claude-standards-audit',
+    expect: 'standards-audit',
   },
   {
     prompt: 'Find the rough, unfinished-feeling spots in this interface.',
-    expect: 'claude-ux-audit',
+    expect: 'ux-audit',
   },
   {
     prompt: 'Tell me the render cost of this page in the browser.',
-    expect: 'claude-ux-measure',
+    expect: 'ux-measure',
   },
 ]

package/src/commands/migrate.ts

@@ -5,6 +5,7 @@ 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'
+import { AITK_RULES, type RenameRules } from '@/migrate/rename'
 import {
   applyRecordTree,
   planRecordTree,
@@ -24,6 +25,7 @@ import {
   type RuleLayoutPlan,
   walkFlatRules,
 } from '@/migrate/rule-layout'
+import { SKILL_NAME_MAP, SKILL_NAME_RULES } from '@/migrate/skill-names'
 import {
   applyScratchEvidence,
   planScratchEvidence,
@@ -33,12 +35,15 @@ import {
 } from '@/migrate/scratch-evidence'
 import { checkoutMismatchWarning, PROJECT_ROOT } from '@/project-root'
 import { readStamp, stampedHashes } from '@/sync/stamp'
-import { logError, logInfo, logStep, logWarn, pipeOutput, plural } from '@/ui'
+import { logError, logInfo, logStep, logWarn, plural } from '@/ui'
 
-interface RenameOptions {
+interface SweepOptions {
   readonly json?: boolean
   readonly write?: boolean
   readonly root?: string
+}
+
+interface RenameOptions extends SweepOptions {
   readonly scope?: string
 }
 
@@ -51,12 +56,11 @@ function isScope(value: string): value is Scope {
 }
 
 /**
- * Reports rather than writes without `--write`, matching `canon records
- * migrate`. A rename touching this many files has no undo short of the branch
- * it ran on, so the safe outcome sits on the default path.
+ * The `aitk` sweep, which is the one rename with a second population to name.
+ * A target holds toolkit-owned folders whose content came from here beside
+ * prose that project wrote, and the scope is what separates them.
  */
 async function runRename(opts: RenameOptions): Promise<number> {
-  const root = opts.root ?? process.cwd()
   const scope = opts.scope ?? 'self'
 
   if (!isScope(scope)) {
@@ -64,6 +68,33 @@ async function runRename(opts: RenameOptions): Promise<number> {
     return 1
   }
 
+  return runSweep(opts, AITK_RULES, scope)
+}
+
+/**
+ * The skill rename owns no scope. Every folder it moves is authored here, and
+ * no target holds a copy of this repository's skill catalog, so there is no
+ * second population for a caller to name.
+ */
+async function runSkillNames(opts: SweepOptions): Promise<number> {
+  return runSweep(opts, SKILL_NAME_RULES, undefined)
+}
+
+/**
+ * One sweep over a repository's tracked files under whichever rules it was
+ * handed.
+ *
+ * Reports rather than writes without `--write`, matching `canon records
+ * migrate`. A rename touching this many files has no undo short of the branch
+ * it ran on, so the safe outcome sits on the default path.
+ */
+async function runSweep(
+  opts: SweepOptions,
+  rules: RenameRules,
+  scope: Scope | undefined,
+): Promise<number> {
+  const root = opts.root ?? process.cwd()
+
   const files = await listRepositoryFiles(root)
   if (files === undefined) {
     logError(`Could not list files under ${root}. Is it a git repository?`)
@@ -72,7 +103,7 @@ async function runRename(opts: RenameOptions): Promise<number> {
 
   const scoped = scope === 'target' ? files.filter(isToolkitOwned) : files
   const sources = await readSources(root, scoped)
-  const plan = planRename(sources)
+  const plan = planRename(sources, rules)
 
   // A target scope reports the citations it did not rewrite, since prose the
   // project wrote is theirs to change and a sweep editing it underneath them
@@ -84,12 +115,15 @@ async function runRename(opts: RenameOptions): Promise<number> {
             root,
             files.filter((f) => !isToolkitOwned(f)),
           ),
+          rules,
         ).entries.length
       : 0
 
+  // stdout, so the record pipes clean. `pipeOutput` frames to stderr, which is
+  // where this command's report belongs and where a JSON record does not.
   if (opts.json) {
-    pipeOutput(
-      JSON.stringify(toRecord(plan, scope, citations, opts.write), null, 2),
+    process.stdout.write(
+      `${JSON.stringify(toRecord(plan, scope, citations, opts.write), null, 2)}\n`,
     )
   }
 
@@ -115,8 +149,12 @@ async function runRename(opts: RenameOptions): Promise<number> {
   return 0
 }
 
-function report(plan: RenamePlan, scope: Scope, citations: number): void {
-  logInfo(`Scope ${scope}.`)
+function report(
+  plan: RenamePlan,
+  scope: Scope | undefined,
+  citations: number,
+): void {
+  if (scope !== undefined) logInfo(`Scope ${scope}.`)
   logInfo(
     `${plural(plan.entries.length, 'file')} to change, ${plural(plan.renamed, 'occurrence')} to rewrite.`,
   )
@@ -138,12 +176,12 @@ function report(plan: RenamePlan, scope: Scope, citations: number): void {
 
 function toRecord(
   plan: RenamePlan,
-  scope: Scope,
+  scope: Scope | undefined,
   citations: number,
   wrote: boolean | undefined,
 ): unknown {
   return {
-    scope,
+    ...(scope === undefined ? {} : { scope }),
     wrote: wrote === true,
     files: plan.entries.length,
     renamed: plan.renamed,
@@ -851,6 +889,45 @@ export function register(program: Command): void {
       process.exitCode = await runRename(opts)
     })
 
+  migrate
+    .command('skill-names')
+    .description('Move the prefixed skill folders onto their two-word names')
+    .helpOption('-h, --help', 'Show this help message')
+    .option('--json', 'Add a machine-readable record on stdout')
+    .option('--write', 'Apply the plan rather than reporting it')
+    .option(
+      '--root <path>',
+      'Project root, defaulting to the working directory',
+    )
+    .addHelpText(
+      'after',
+      [
+        '',
+        `Rewrites ${Object.keys(SKILL_NAME_MAP).length} skill names and moves the folders that carry them.`,
+        'It takes no scope. The skill folders it moves are authored in the',
+        'toolkit and no target holds a copy of that catalog, so in a target it',
+        'rewrites citations of a renamed skill and moves nothing.',
+        '',
+        'Exit codes:',
+        '  0  nothing to rewrite, or --write applied the whole plan',
+        '  1  refused, or a move failed',
+        '  2  a plan exists and --write was not passed',
+        '',
+        'The changelog is never rewritten, and neither is an eval transcript.',
+        'Each records what shipped or what a session ran under the name that',
+        'was current then.',
+        '',
+        'Examples:',
+        '  canon migrate skill-names',
+        '  canon migrate skill-names --write',
+        '  canon migrate skill-names --json',
+        '',
+      ].join('\n'),
+    )
+    .action(async (opts: SweepOptions) => {
+      process.exitCode = await runSkillNames(opts)
+    })
+
   migrate
     .command('rule-layout')
     .description('Move installed rules from the flat layout onto canon/')

package/src/commands/sync.ts

@@ -265,7 +265,7 @@ function renderTooling(report: CheckReport): void {
 /**
  * Seeds print their own section because no sync command applies them. A `stale`
  * seed is safe to take whole and a `drifted` one holds edits, which is the split
- * `claude-seed-sync` reads to decide what needs a section-level merge.
+ * `seed-sync` reads to decide what needs a section-level merge.
  */
 function renderSeeds(report: CheckReport): void {
   const notable = report.seeds.entries.filter(
@@ -283,7 +283,7 @@ function renderSeeds(report: CheckReport): void {
     logWarn(`${entry.rel} (${entry.state})`)
   }
 
-  logInfo('Run /canon:claude-seed-sync to reconcile these section by section.')
+  logInfo('Run /canon:seed-sync to reconcile these section by section.')
 }
 
 /**
@@ -399,7 +399,7 @@ async function runSync(target: string): Promise<number> {
 
   if (existsSync(join(resolved, '.claude'))) {
     process.stderr.write(
-      `${GREY}Tip: run \`/claude-seed-sync\` to audit seed drift per section, preserving local customizations.${NC}\n`,
+      `${GREY}Tip: run \`/seed-sync\` to audit seed drift per section, preserving local customizations.${NC}\n`,
     )
   }