@erclx/canon 5.42.0 → 5.44.0

package/src/commands/migrate.ts

@@ -1,5 +1,5 @@
 import { existsSync, readFileSync } from 'node:fs'
-import { join } from 'node:path'
+import { join, resolve } from 'node:path'
 import type { Command } from 'commander'
 import { listRepositoryFiles } from '@/git/files'
 import { indexSourceRules } from '@/gov/adapter'
@@ -25,6 +25,11 @@ import {
   type RuleLayoutPlan,
   walkFlatRules,
 } from '@/migrate/rule-layout'
+import {
+  applySessionDefaults,
+  readSessionDefaults,
+  type SessionDefaultsRead,
+} from '@/migrate/session-defaults'
 import {
   SKILL_CITATION_MAP,
   SKILL_NAME_MAP,
@@ -50,7 +55,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 '@/cli/ui'
+import { logAdd, logError, logInfo, logStep, logWarn, plural } from '@/cli/ui'
 
 interface SweepOptions {
   readonly json?: boolean
@@ -959,6 +964,81 @@ function toRuleLayoutRecord(
   }
 }
 
+interface SessionDefaultsOptions {
+  readonly json?: boolean
+  readonly write?: boolean
+  readonly root?: string
+}
+
+/**
+ * Adds the seeded session defaults to a target settings file that predates
+ * them. A missing file is nothing to do, since `canon claude init` seeds the
+ * whole file with the defaults already in it.
+ */
+async function runSessionDefaults(
+  opts: SessionDefaultsOptions,
+): Promise<number> {
+  const root = resolve(opts.root ?? process.cwd())
+
+  const mismatch = checkoutMismatchWarning(process.cwd())
+  if (mismatch !== undefined) logWarn(mismatch)
+
+  const read = await readSessionDefaults(root, PROJECT_ROOT)
+
+  if (opts.json) {
+    process.stdout.write(
+      `${JSON.stringify(toSessionDefaultsRecord(read, opts.write))}\n`,
+    )
+  }
+
+  if (read.kind === 'refused') {
+    logError(read.reason)
+    return 1
+  }
+
+  if (read.kind === 'absent') {
+    logInfo(`No ${read.path}, so there is nothing to migrate.`)
+    return 0
+  }
+
+  for (const key of read.plan.keys) {
+    if (key.changed) logAdd(key.label)
+    else logInfo(key.label)
+  }
+
+  if (!read.plan.changed) {
+    logInfo('Session defaults already present.')
+    return 0
+  }
+
+  if (!opts.write) {
+    logWarn('Nothing was written. Pass --write to apply this plan.')
+    return 2
+  }
+
+  await applySessionDefaults(read)
+  logStep(`Wrote ${read.path}.`)
+  return 0
+}
+
+function toSessionDefaultsRecord(
+  read: SessionDefaultsRead,
+  wrote: boolean | undefined,
+): unknown {
+  if (read.kind === 'refused') {
+    return { ok: false, wrote: false, reason: read.reason }
+  }
+  if (read.kind === 'absent') {
+    return { ok: true, wrote: false, path: read.path, keys: [] }
+  }
+  return {
+    ok: true,
+    wrote: wrote === true && read.plan.changed,
+    path: read.path,
+    keys: read.plan.keys,
+  }
+}
+
 export function register(program: Command): void {
   const migrate = program
     .command('migrate')
@@ -1255,6 +1335,10 @@ export function register(program: Command): void {
         '',
         `Rewrites ${Object.keys(SKILL_NAME_MAP).length} skill names and moves the folders that carry them.`,
         `It also carries ${Object.keys(SKILL_CITATION_MAP).length} namespaced-only rows for a skill renamed from a single word.`,
+        'The seven draft- skills move onto verb-first names, such as',
+        // The old spellings below are the rename itself. canon-keep-retired
+        'draft-doc to write-doc and draft-and-pick to pick-by-eye, and a',
+        'pointer left under each old name is never moved.',
         '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.',
@@ -1322,4 +1406,43 @@ export function register(program: Command): void {
     .action(async (opts: RuleLayoutOptions) => {
       process.exitCode = await runRuleLayout(opts)
     })
+
+  migrate
+    .command('session-defaults')
+    .description('Add the seeded session defaults to a target settings file')
+    .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',
+      [
+        '',
+        'Adds Agent and Task to permissions.deny in .claude/settings.json,',
+        'appending to the list without reordering it, and sets',
+        'autoMemoryEnabled to false only when the key is absent. A deny entry',
+        'is never removed and an existing autoMemoryEnabled is never changed.',
+        '',
+        'A missing settings file is nothing to do. A file that is not valid',
+        'JSON, or whose permissions or deny has an unexpected shape, is',
+        'refused by name and never partly written.',
+        '',
+        'Exit codes:',
+        '  0  nothing to add, or --write applied the plan',
+        '  1  refused: the toolkit root, or an unreadable settings file',
+        '  2  a plan exists and --write was not passed',
+        '',
+        'Examples:',
+        '  canon migrate session-defaults',
+        '  canon migrate session-defaults --write',
+        '  canon migrate session-defaults --json',
+        '',
+      ].join('\n'),
+    )
+    .action(async (opts: SessionDefaultsOptions) => {
+      process.exitCode = await runSessionDefaults(opts)
+    })
 }

package/src/commands/pr.ts

@@ -1,5 +1,5 @@
-import { existsSync } from 'node:fs'
-import { readdir, readFile, readlink, realpath } from 'node:fs/promises'
+import { existsSync, statSync } from 'node:fs'
+import { readFile, realpath } from 'node:fs/promises'
 import { basename, join, resolve } from 'node:path'
 import { $ } from 'bun'
 import type { Command } from 'commander'
@@ -57,6 +57,7 @@ import {
   pruneFramesWithLegacy,
   pushFrame,
   readFrame,
+  isDesignReference,
   referenceSlug,
   type TreeEntry,
 } from '@/pr/frames'
@@ -72,15 +73,13 @@ import {
   readBaseStanding,
   readChangedPaths,
 } from '@/pr/lift'
+import { machineListenerReader } from '@/listeners/machine'
 import { loadPaintedPatterns } from '@/pr/painted'
 import {
   dropAddressLine,
   findLocalServer,
-  type Listener,
   type LocalRefusal,
   type LocalRunner,
-  parseLsofListeners,
-  parseProcNetTcp,
 } from '@/pr/local'
 import { KEY_CHANGES } from '@/pr/paths'
 import {
@@ -224,9 +223,9 @@ const FRAMES_REFUSALS: Record<FramesCommandRefusal, string> = {
   'no-number':
     '--add and --drop write for one pull request, so name its number.',
   'bad-box':
-    '--add takes --box <n>, a positive whole number naming the checklist box, or --reference <page>/<frame>, never both.',
+    '--add takes --box <n>, a positive whole number naming the checklist box, or --reference, as <page>/<frame> or a tracked canon/design/<surface>/<name> path, never both.',
   'bad-reference':
-    '--reference takes <page>/<frame>, each half opening on a letter or digit and holding only letters, digits, dots, underscores, and dashes, with no `--` in either, so the capture files under a name that reads back as the frame.',
+    '--reference takes <page>/<frame> or a tracked canon/design/<surface>/<name> path, each half opening on a letter or digit and holding only letters, digits, dots, underscores, and dashes, with no `--` in either, so the capture files under a name that reads back as the frame.',
   'bad-head':
     '--head takes a commit sha, 7 to 40 lowercase hex characters. A branch name or a path would file the frame under a folder that names no commit.',
   'bad-pass':
@@ -1062,7 +1061,7 @@ export function register(program: Command): void {
     .option('--box <n>', 'The checklist box the frame shows, with --add')
     .option(
       '--reference <address>',
-      'The design reference the capture shows, as <page>/<frame>, with --add in place of --box',
+      'The design reference the capture shows, as <page>/<frame> or a tracked canon/design/<surface>/<name> path, with --add in place of --box',
     )
     .option(
       '--head <sha>',
@@ -1089,7 +1088,9 @@ export function register(program: Command): void {
         'so nothing is checked out and no other branch is touched. A frame lands',
         'at pr-<number>/<short-head>/<pass>/box-<n>.png, or box-<n>-<theme>.png',
         'with --theme, or ref-<page>--<frame>.png for a design reference capture',
-        'passed as --reference <page>/<frame> in place of --box, and `link` names that',
+        'passed as --reference <page>/<frame> in place of --box, or',
+        'ref-design--<surface>--<name>.png for a tracked canon/design/<surface>/<name>',
+        'reference, whose --add must name that same file, and `link` names that',
         `path on ${FRAMES_BRANCH}, so it survives a rewrite that drops other pull`,
         'requests and resolves until its own pull request is dropped. The pass',
         'segment keeps a second pass at one head and box from replacing an image',
@@ -1111,7 +1112,7 @@ export function register(program: Command): void {
         '  bad-mode          not exactly one of --add, --drop, --prune',
         '  no-number         --add or --drop named no pull request',
         '  bad-box           --add with both --box and --reference, or neither',
-        '  bad-reference     --reference is not <page>/<frame> in the safe name form',
+        '  bad-reference     --reference is not <page>/<frame> or canon/design/<surface>/<name> in the safe name form, or the tracked path is no file',
         '  bad-head          --head is not 7 to 40 lowercase hex characters',
         '  bad-pass          --add without a compact UTC --pass stamp',
         '  bad-theme         --theme is not dark or light, or no --add, or rides a --reference',
@@ -2730,81 +2731,10 @@ async function runPreviewCheck(
   return reading.reason === 'fresh' ? 0 : 1
 }
 
-async function readText(path: string): Promise<string | undefined> {
-  return readFile(path, 'utf8').catch(() => undefined)
-}
-
-/**
- * Every listening socket's owning pid, read from `/proc`. Only a process this
- * user owns exposes its `fd` table, which is also the only process whose
- * server this user's worktree could have started.
- */
-async function readProcListeners(): Promise<Listener[] | undefined> {
-  const tables = await Promise.all(
-    ['/proc/net/tcp', '/proc/net/tcp6'].map(readText),
-  )
-  if (tables.every((text) => text === undefined)) return undefined
-  const byInode = new Map(
-    tables.flatMap((text) =>
-      text === undefined
-        ? []
-        : parseProcNetTcp(text).map((s) => [s.inode, s.port] as const),
-    ),
-  )
-
-  const processIds = (await readdir('/proc').catch(() => [])).filter((name) =>
-    /^\d+$/.test(name),
-  )
-  const listeners: Listener[] = []
-  for (const pid of processIds) {
-    const fds = await readdir(`/proc/${pid}/fd`).catch(() => [])
-    for (const fd of fds) {
-      const target = await readlink(`/proc/${pid}/fd/${fd}`).catch(() => '')
-      const inode = /^socket:\[(\d+)\]$/.exec(target)?.[1]
-      const port = inode === undefined ? undefined : byInode.get(inode)
-      if (port !== undefined) listeners.push({ pid: Number(pid), port })
-    }
-  }
-  return listeners
-}
-
-/**
- * The machine half of a detection: `/proc` wherever it exists, lsof on a
- * machine without it, and no reader anywhere else.
- */
+/** The listener reads come from the machine, and the HTML probe from here. */
 function machineLocalRunner(): LocalRunner {
-  const hasLsof = Bun.which('lsof') !== null
   return {
-    async listListeners() {
-      // lsof 4.95 drops every process whose kernel-truncated name holds an
-      // unmatched `(`, which Next's `next-server (vX.Y.Z)` title cuts down to,
-      // so `/proc` goes first despite costing several times what lsof does.
-      if (existsSync('/proc/net/tcp')) {
-        const listeners = await readProcListeners()
-        if (listeners !== undefined) return listeners
-      }
-      if (hasLsof) {
-        const result = await $`lsof -nP -iTCP -sTCP:LISTEN -Fpn`
-          .quiet()
-          .nothrow()
-        // lsof exits 1 both when it matched nothing and when it could not
-        // read some process, and the rows it did print are real either way.
-        if (result.exitCode <= 1) return parseLsofListeners(result.text())
-      }
-      return undefined
-    },
-    async cwdOf(pid) {
-      if (existsSync(`/proc/${pid}/cwd`)) {
-        return readlink(`/proc/${pid}/cwd`).catch(() => undefined)
-      }
-      if (!hasLsof) return undefined
-      const result = await $`lsof -a -p ${pid} -d cwd -Fn`.quiet().nothrow()
-      const line = result
-        .text()
-        .split('\n')
-        .find((row) => row.startsWith('n'))
-      return line?.slice(1)
-    },
+    ...machineListenerReader(),
     // An HTML page rather than any answer, since a test runner's server or a
     // reload socket in the same tree answers too, and a reviewer opening one
     // gets a bare 404 instead of the branch.
@@ -3265,6 +3195,27 @@ async function runFrames(
   const invalid = framesArgumentRefusal(number, opts)
   if (invalid !== undefined) return refuseFrames(invalid)
 
+  if (opts.reference !== undefined && isDesignReference(opts.reference)) {
+    const tracked = resolve(
+      root,
+      opts.reference.endsWith('.png')
+        ? opts.reference
+        : `${opts.reference}.png`,
+    )
+    const refuseTracked = (message: string) =>
+      refuseWith('bad-reference', message, emitJson, root)
+    if (!statSync(tracked, { throwIfNoEntry: false })?.isFile()) {
+      return refuseTracked(
+        `${opts.reference} is not a file under the repository, so no tracked reference can be filed from it.`,
+      )
+    }
+    if (opts.add === undefined || resolve(opts.add) !== tracked) {
+      return refuseTracked(
+        `--add must name ${tracked}, since a tracked reference files its own image and a different one would disagree with its label.`,
+      )
+    }
+  }
+
   const bytes =
     opts.add === undefined ? undefined : await readFrame(resolve(opts.add))
   if (opts.add !== undefined && bytes === undefined) {