@erclx/canon 5.75.0 → 5.76.0

package/src/capture/render.ts

@@ -34,10 +34,13 @@ const FONT_PROBE_SIZE = 72
 const FONT_PROBE_TEXT = 'canon capture 0123456789'
 const ABSENT_FAMILY = '__canon_absent_family__'
 
+export type ColorScheme = 'light' | 'dark'
+
 export interface CaptureOptions {
   selector: string
   outDir?: string
   width?: number
+  colorScheme?: ColorScheme
 }
 
 export type CaptureResult =
@@ -60,9 +63,7 @@ export async function captureSources(
   const browser = await chromium.launch()
   try {
     return await Promise.all(
-      sources.map((source) =>
-        captureOne(browser, source, options.selector, options.width),
-      ),
+      sources.map((source) => captureOne(browser, source, options)),
     )
   } finally {
     await browser.close()
@@ -76,8 +77,7 @@ export async function captureSources(
 async function captureOne(
   browser: Browser,
   source: CaptureSource,
-  selector: string,
-  width: number | undefined,
+  { selector, width, colorScheme }: CaptureOptions,
 ): Promise<CaptureResult> {
   /**
    * A viewport rather than a wrapper, since a media query answers to the
@@ -90,11 +90,13 @@ async function captureOne(
     ...(width === undefined
       ? {}
       : { viewport: { width, height: DEFAULT_VIEWPORT_HEIGHT } }),
+    ...(colorScheme === undefined ? {} : { colorScheme }),
   })
   try {
     await page.goto(
       source.kind === 'url' ? source.url : pathToFileURL(source.htmlPath).href,
     )
+    if (colorScheme !== undefined) await applyColorScheme(page, colorScheme)
     const element = page.locator(selector).first()
     if ((await element.count()) === 0) {
       return failed(source, `no element matched ${selector}`)
@@ -177,6 +179,29 @@ function sourceIdentifier(source: CaptureSource): string {
   return source.kind === 'url' ? source.url : source.htmlPath
 }
 
+/**
+ * Writes the theme the three switches a stylesheet reads, being the media
+ * query, a `data-theme` attribute, and a `light` or `dark` class on the root,
+ * which is the set Frameboard's theme toggle writes on every frame. The media
+ * query alone leaves a stylesheet keyed on the attribute in its default set,
+ * which is dark for one `canon design css` emits.
+ *
+ * Written after the load event, so a page script restoring a stored theme on
+ * load has already run and cannot overwrite it.
+ */
+async function applyColorScheme(
+  page: Page,
+  scheme: ColorScheme,
+): Promise<void> {
+  await page.evaluate((theme) => {
+    const root = document.documentElement
+    root.setAttribute('data-theme', theme)
+    root.style.colorScheme = theme
+    root.classList.remove('light', 'dark')
+    root.classList.add(theme)
+  }, scheme)
+}
+
 function failed(source: CaptureSource, reason: string): CaptureResult {
   return { status: 'failed', source: sourceIdentifier(source), reason }
 }

package/src/claude/cases/git.ts

@@ -22,6 +22,11 @@ export const GIT_CASES: readonly SkillCase[] = [
     prompt: 'Turn this bug into a GitHub issue and file it.',
     expect: 'git-issue',
   },
+  {
+    prompt:
+      'Log this bug, but add it to the open issue if one already covers it.',
+    expect: 'git-issue',
+  },
   {
     prompt: 'Close #42 without merging, #57 supersedes it.',
     expect: 'git-pr-close',

package/src/claude/cases/workflow.ts

@@ -96,6 +96,10 @@ export const WORKFLOW_CASES: readonly SkillCase[] = [
       'Our backlog only ever grows, measure each row and suggest which to decline.',
     expect: 'backlog-triage',
   },
+  {
+    prompt: 'File the open issues on this repo into an intake folder.',
+    expect: 'issue-triage',
+  },
   // Rot across documents nobody changed is what this reads, rather than a
   // stated rule broken on a given line. It is also not `target-check`, which
   // asks whether a document exists and holds its sections rather than whether

package/src/commands/capture.ts

@@ -31,6 +31,9 @@ const DEFAULT_SOURCE = 'assets'
  */
 type Renderer = typeof import('@/capture/render')
 type CaptureResult = Awaited<ReturnType<Renderer['captureSources']>>[number]
+type ColorScheme = import('@/capture/render').ColorScheme
+
+const COLOR_SCHEMES: readonly ColorScheme[] = ['light', 'dark']
 
 /**
  * Holds wiring only. Every browser reference sits behind a dynamic import,
@@ -58,6 +61,10 @@ export function register(program: Command): void {
       '--width <px>',
       'Viewport width in pixels, so a media query resolves at that width',
     )
+    .option(
+      '--color-scheme <scheme>',
+      'Theme to render in, light or dark; defaults to whichever theme the page renders unset',
+    )
     .addHelpText(
       'after',
       [
@@ -70,12 +77,21 @@ export function register(program: Command): void {
         'font-family. --width takes one whole number and sets the viewport, so',
         'run it once per breakpoint with its own --out.',
         '',
+        '--color-scheme sets prefers-color-scheme, a data-theme attribute, and',
+        'a light or dark class on the root, so a stylesheet keyed on any of the',
+        'three renders that theme. Run it once per scheme with its own --out.',
+        '',
       ].join('\n'),
     )
     .action(
       async (
         source: string,
-        opts: { out?: string; selector?: string; width?: string },
+        opts: {
+          out?: string
+          selector?: string
+          width?: string
+          colorScheme?: string
+        },
       ): Promise<void> => {
         /**
          * Refused rather than defaulted, and refused ahead of every other
@@ -102,6 +118,15 @@ export function register(program: Command): void {
           return
         }
 
+        const colorScheme = parseColorScheme(opts.colorScheme)
+        if (colorScheme === null) {
+          frameError(
+            `--color-scheme takes ${COLOR_SCHEMES.join(' or ')}, got ${JSON.stringify(opts.colorScheme)}.`,
+          )
+          process.exitCode = 1
+          return
+        }
+
         const isUrl = isUrlSource(source)
         const sourcePath = isUrl ? source : resolve(process.cwd(), source)
         if (!isUrl && !existsSync(sourcePath)) {
@@ -117,6 +142,7 @@ export function register(program: Command): void {
           results = await renderer.captureSources(sourcePath, {
             selector,
             width,
+            colorScheme,
             outDir: opts.out ? resolve(process.cwd(), opts.out) : undefined,
           })
         } catch (error) {
@@ -160,6 +186,17 @@ function parseWidth(raw: string | undefined): number | undefined {
   return Number.isInteger(value) && value >= 1 ? value : Number.NaN
 }
 
+/**
+ * Undefined for an absent flag and `null` for a value naming no scheme, so the
+ * caller can tell no scheme from a bad one.
+ */
+function parseColorScheme(
+  raw: string | undefined,
+): ColorScheme | undefined | null {
+  if (raw === undefined) return undefined
+  return COLOR_SCHEMES.find((scheme) => scheme === raw) ?? null
+}
+
 /**
  * Closes an open frame around a failure that stopped the whole run rather than
  * one source. Two of them are setup states rather than defects and each names

package/src/commands/claude.ts

@@ -713,6 +713,10 @@ async function runSync(target: string): Promise<number> {
     logWarn(
       'settings.json lacks the merge deny entries. Run `canon migrate session-defaults --write`',
     )
+  } else if (defaults.kind === 'planned' && defaults.plan.lacksPushAllow) {
+    logWarn(
+      'settings.json lacks the lease push allow. Run `canon migrate session-defaults --write`',
+    )
   }
 
   logStep('Scanning .gitignore')

package/src/markdown/scope.ts

@@ -260,6 +260,8 @@ export const GATED_PATHS: readonly string[] = [
   'claude/skills/git-worktree/REQUIREMENT.md',
   'claude/skills/git-worktree/SKILL.md',
   'claude/skills/git-worktree/references/cleanup.md',
+  'claude/skills/issue-triage/REQUIREMENT.md',
+  'claude/skills/issue-triage/SKILL.md',
   'claude/skills/markdown-craft/REQUIREMENT.md',
   'claude/skills/markdown-craft/SKILL.md',
   'claude/skills/markdown-craft/references/markdown.md',

package/src/migrate/session-defaults.ts

@@ -1,8 +1,8 @@
 /**
  * Adds the session defaults the seeded `.claude/settings.json` carries to a
  * target that was seeded before them: the subagent deny, the memory default,
- * the merge deny entries, and the plan guard's PreToolUse wiring where the
- * project holds the guard script.
+ * the merge deny entries, the lease push allow entries, and the plan guard's
+ * PreToolUse wiring where the project holds the guard script.
  *
  * `canon claude init` copies a seed only when the file is absent, so a target
  * holding its own settings never sees a later seed change. This verb adds each
@@ -29,6 +29,17 @@ export const MERGE_DENIED: readonly string[] = [
   'Bash(gh pr merge:*)',
 ]
 
+/**
+ * The two lease pushes a worker runs after rebasing onto a merged pull request,
+ * each pushing the current branch to its own name. An allow rule resolves
+ * before auto mode's classifier, so each entry is exact: a wildcard would also
+ * approve a refspec, a remote, or a flag that reaches the default branch.
+ */
+export const PUSH_ALLOWED: readonly string[] = [
+  'Bash(git push --force-with-lease)',
+  'Bash(git push --force-with-lease origin HEAD)',
+]
+
 /** The command the seed wires, as the seeded settings spell it. */
 export const PLAN_GUARD_COMMAND =
   '"$CLAUDE_PROJECT_DIR"/.claude/hooks/plan-guard.sh'
@@ -61,6 +72,8 @@ export interface SessionDefaultsPlan {
   readonly predates: boolean
   /** True when the deny list lacks any merge entry, whatever else it holds. */
   readonly lacksMergeDeny: boolean
+  /** True when the allow list lacks any lease push entry. */
+  readonly lacksPushAllow: boolean
 }
 
 export type SessionDefaultsRead =
@@ -92,12 +105,20 @@ export function planSessionDefaults(
   const next: SettingsRecord = { ...current }
   const permissions = isRecord(current.permissions) ? current.permissions : {}
   const deny = Array.isArray(permissions.deny) ? permissions.deny : []
+  const allow = Array.isArray(permissions.allow) ? permissions.allow : []
 
   const subagentsMissing = DENIED_TOOLS.filter((tool) => !deny.includes(tool))
   const mergeMissing = MERGE_DENIED.filter((entry) => !deny.includes(entry))
   const missing = [...subagentsMissing, ...mergeMissing]
-  if (missing.length > 0) {
-    next.permissions = { ...permissions, deny: [...deny, ...missing] }
+  const allowMissing = PUSH_ALLOWED.filter((entry) => !allow.includes(entry))
+
+  const nextPermissions: SettingsRecord = { ...permissions }
+  if (missing.length > 0) nextPermissions.deny = [...deny, ...missing]
+  if (allowMissing.length > 0) {
+    nextPermissions.allow = [...allow, ...allowMissing]
+  }
+  if (missing.length + allowMissing.length > 0) {
+    next.permissions = nextPermissions
   }
 
   const memoryAbsent = !('autoMemoryEnabled' in current)
@@ -111,6 +132,7 @@ export function planSessionDefaults(
 
   const keys: SettingsKey[] = [
     { label: 'permissions.deny', changed: missing.length > 0 },
+    { label: 'permissions.allow', changed: allowMissing.length > 0 },
     { label: 'autoMemoryEnabled', changed: memoryAbsent },
     { label: 'hooks.PreToolUse', changed: preToolUse !== undefined },
   ]
@@ -123,6 +145,7 @@ export function planSessionDefaults(
       subagentsMissing.length === DENIED_TOOLS.length &&
       mergeMissing.length === MERGE_DENIED.length,
     lacksMergeDeny: mergeMissing.length > 0,
+    lacksPushAllow: allowMissing.length > 0,
   }
 }
 
@@ -222,10 +245,15 @@ export async function readSessionDefaults(
   if (permissions !== undefined && !isRecord(permissions)) {
     return { kind: 'refused', reason: `${path}: permissions is not an object` }
   }
-  if (permissions?.deny !== undefined && !Array.isArray(permissions.deny)) {
-    return {
-      kind: 'refused',
-      reason: `${path}: permissions.deny is not a list`,
+  for (const list of ['deny', 'allow'] as const) {
+    if (
+      permissions?.[list] !== undefined &&
+      !Array.isArray(permissions[list])
+    ) {
+      return {
+        kind: 'refused',
+        reason: `${path}: permissions.${list} is not a list`,
+      }
     }
   }
 

package/tooling/claude/seeds/.claude/settings.json

@@ -1,6 +1,10 @@
 {
   "autoMemoryEnabled": false,
   "permissions": {
+    "allow": [
+      "Bash(git push --force-with-lease)",
+      "Bash(git push --force-with-lease origin HEAD)"
+    ],
     "deny": ["Agent", "Task", "Bash(canon pr merge:*)", "Bash(gh pr merge:*)"]
   },
   "hooks": {