jackherd 1.9.0 → 1.10.0

package/src/watch/task-parallel.ts

@@ -2,8 +2,11 @@ import { ellipsize, terminalSafe } from '../plan-format/terminal-text'
 
 export const TASK_PARALLEL_EVENT = 'parallel tasks'
 
-/** A proposal for the non-stream watcher: the line `formatTaskParallelLine` made for `lane`. */
-export type TaskParallelEvent = { kind: typeof TASK_PARALLEL_EVENT; lane: string; line: string }
+/**
+ * A proposal: the line `formatTaskParallelLine` made for `lane`; with `lane` null, the line that the switch
+ * `watch.parallelTasks.auto` ended.
+ */
+export type TaskParallelEvent = { kind: typeof TASK_PARALLEL_EVENT; lane: string | null; line: string }
 
 /** Lane → the fingerprint last seen at a heartbeat; a lane without an entry has had none. */
 export type TaskParallelFingerprints = Record<string, string>
@@ -25,6 +28,8 @@ export type TaskParallelInput = {
   active: ActiveWork[]
   /** Phase id → the paths of its writes cell; `''` is the whole repository. Absent for a phase without one. */
   phaseWrites: Record<string, string[]>
+  /** The same from the plan at the base branch, which the lane cannot change; what an `auto` mark trusts. */
+  baseWrites: Record<string, string[]>
   doneCount: number
   /** Tokens a fresh agent costs before it does anything, measured by the caller. */
   baselineTokens: number
@@ -45,11 +50,22 @@ export type TaskParallelResult =
 
 export type TaskParallelProposal = Extract<TaskParallelResult, { proposed: true }>
 
+export const AUTO_VERDICT = { auto: 'auto', off: 'off', asks: 'asks' } as const
+
+/**
+ * Whether a proposal starts without a question (`task-parallel-auto.ts`): `auto` with the switch's last day, `off`
+ * without a switch, `asks` with the limit that held it back.
+ */
+export type AutoVerdict =
+  | { kind: typeof AUTO_VERDICT.auto; until: string }
+  | { kind: typeof AUTO_VERDICT.off }
+  | { kind: typeof AUTO_VERDICT.asks; reason: string }
+
 const MIN_TASKS_BESIDE_AGENT = 1
 const MIN_TASKS_WITHOUT_AGENT = 2
 const TEXT_LIMIT = 60
 const TOKENS_PER_K = 1000
-const GLOB_CHARACTER = /[*?[{]/
+export const GLOB_CHARACTER = /[*?[{]/
 const LINE_SUFFIX = /(?::\d+(?:[-:]\d+)*|#L\d+.*)$/
 const PATH_EXTENSIONS = 'ts|tsx|js|mjs|json|md|sh|yml|yaml|css|html|toml|sql'
 const BARE_FILE = new RegExp(`(?<![\\w./\`-])[\\w./-]+\\.(?:${PATH_EXTENSIONS})(?::\\d+(?:[-:]\\d+)*)?(?![\\w/])`, 'g')
@@ -194,13 +210,26 @@ export const taskParallelReport = (
 }
 
 const CHECKBOX = /^\s*(?:[-*]\s*)?\[[ xX]\]\s*/
+/** The separators of the line itself, so a task's text cannot fake a mark such as `· auto until`. */
+const SEPARATORS = /[·∥]/g
 
 const proposalTaskText = (text: string): string =>
-  ellipsize(terminalSafe(text.replace(/\s+/g, ' ')).replace(CHECKBOX, '').replaceAll('"', "'").trim(), TEXT_LIMIT)
+  ellipsize(
+    terminalSafe(text.replace(/\s+/g, ' ')).replace(CHECKBOX, '').replaceAll('"', "'").replace(SEPARATORS, '-').trim(),
+    TEXT_LIMIT,
+  )
+
+const autoSuffix = (verdict: AutoVerdict): string => {
+  if (verdict.kind === AUTO_VERDICT.auto) return ` · auto until ${verdict.until}`
+  return verdict.kind === AUTO_VERDICT.asks ? ` · asks: ${terminalSafe(verdict.reason)}` : ''
+}
 
-/** `parallel tasks <lane>: "<a>" ∥ "<b>" · ~<n>k tokens for 1 extra agent`, one line. */
-export const formatTaskParallelLine = (lane: string, proposal: TaskParallelProposal): string => {
+/**
+ * `parallel tasks <lane>: "<a>" ∥ "<b>" · ~<n>k tokens for 1 extra agent`, one line; under a set switch it ends in
+ * `· auto until <day>` or `· asks: <the limit that held>`.
+ */
+export const formatTaskParallelLine = (lane: string, proposal: TaskParallelProposal, verdict: AutoVerdict): string => {
   const tasks = proposal.tasks.map((task) => `"${proposalTaskText(task.text)}"`).join(' ∥ ')
   const agents = proposal.extraAgents === 1 ? 'agent' : 'agents'
-  return `parallel tasks ${proposalTaskText(lane)}: ${tasks} · ~${kilo(proposal.estimateTokens)} tokens for ${proposal.extraAgents} extra ${agents}`
+  return `parallel tasks ${proposalTaskText(lane)}: ${tasks} · ~${kilo(proposal.estimateTokens)} tokens for ${proposal.extraAgents} extra ${agents}${autoSuffix(verdict)}`
 }

package/src/watch/task-signal-missing.ts

@@ -0,0 +1,69 @@
+import { MS_PER_MINUTE } from '../plan-format/clock'
+import { isRecord } from '../shared/is-record'
+
+export const NO_TASK_SIGNAL_EVENT = 'no task signal'
+
+/** The key a lane without a current phase is reported under, so it too is reported once. */
+const NO_PHASE = ''
+
+/** What the heartbeat read of a lane: whether its agent works, whether a task signal is open, its current phase. */
+export type NoSignalReading = { working: boolean; signalled: boolean; phaseId: string | null }
+
+/**
+ * Per lane: since when it works without a signal (null while it does not), and the phase it was last reported for
+ * (`''` for a lane without a phase, null before any report).
+ */
+export type NoSignalState = Record<string, { since: number | null; reported: string | null }>
+
+export type NoTaskSignalEvent = { kind: typeof NO_TASK_SIGNAL_EVENT; lane: string; phaseId: string | null }
+
+type LaneEntry = NoSignalState[string]
+
+const nextEntry = (
+  previous: LaneEntry | undefined,
+  { working, signalled }: NoSignalReading,
+  now: number,
+): LaneEntry => ({
+  since: working && !signalled ? (previous?.since ?? now) : null,
+  reported: previous?.reported ?? null,
+})
+
+const isDue = (entry: LaneEntry, phaseKey: string, now: number, limitMinutes: number): boolean =>
+  entry.since !== null && now - entry.since >= limitMinutes * MS_PER_MINUTE && entry.reported !== phaseKey
+
+/**
+ * The lanes that worked `limitMinutes` or longer without a task signal (`jh task start` or an entry of their own task
+ * list), one event per lane and phase (D112): a signal or a lane that stops working starts the clock again, a phase
+ * already reported is not reported again, a new one is. A lane without a reading keeps what it had.
+ */
+export const noTaskSignalEvents = (
+  previous: NoSignalState,
+  readings: Readonly<Record<string, NoSignalReading>>,
+  now: number,
+  limitMinutes: number,
+): { events: NoTaskSignalEvent[]; state: NoSignalState } => {
+  const events: NoTaskSignalEvent[] = []
+  const state: NoSignalState = { ...previous }
+  for (const [lane, reading] of Object.entries(readings)) {
+    const entry = nextEntry(previous[lane], reading, now)
+    const phaseKey = reading.phaseId ?? NO_PHASE
+    if (isDue(entry, phaseKey, now, limitMinutes)) {
+      events.push({ kind: NO_TASK_SIGNAL_EVENT, lane, phaseId: reading.phaseId })
+      entry.reported = phaseKey
+    }
+    state[lane] = entry
+  }
+  return { events, state }
+}
+
+/** The line the coordinator reads: `lane <name> no task signal` with the phase when one is known. */
+export const noTaskSignalLine = ({ lane, phaseId }: NoTaskSignalEvent): string =>
+  `lane ${lane} ${NO_TASK_SIGNAL_EVENT}${phaseId === null ? '' : ` (P${phaseId})`}`
+
+const isEntry = (value: unknown): boolean =>
+  isRecord(value) &&
+  (value.since === null || typeof value.since === 'number') &&
+  (value.reported === null || typeof value.reported === 'string')
+
+export const isNoSignalState = (value: unknown): value is NoSignalState =>
+  isRecord(value) && Object.values(value).every(isEntry)

package/src/watch/task-signal-read.ts

@@ -0,0 +1,29 @@
+import { join } from 'node:path'
+import { defaultProjectsDirectory } from '../context/session-log'
+import { laneOfDirectory } from '../plans/active-tasks'
+import { readAllSignals } from '../plans/signals-read'
+
+export type SignalSources = {
+  /** The main checkout, which holds `.jackherd/tasks/`. */
+  root: string
+  /** The lanes' worktree directory, relative to `root`. */
+  worktreeDirectory: string
+  now: number
+  /** Where Claude Code keeps its session logs; the user's by default. */
+  projectsDirectory?: string
+}
+
+/**
+ * The lanes with an open task signal, read as the herd reads them (`readAllSignals`, the lane by the signal's
+ * directory): a task in progress in a recent session of the lane's worktree, a subagent's among them, or an open
+ * `jh task` record whose directory lies in that worktree.
+ */
+export const signalledLanes = (lanes: readonly string[], sources: SignalSources): Set<string> => {
+  const worktrees = join(sources.root, sources.worktreeDirectory)
+  const signals = readAllSignals(
+    { projects: sources.projectsDirectory ?? defaultProjectsDirectory(), root: sources.root, worktrees },
+    sources.now,
+  )
+  const signalled = new Set(signals.flatMap(({ cwd }) => laneOfDirectory(cwd, worktrees) ?? []))
+  return new Set(lanes.filter((lane) => signalled.has(lane)))
+}

package/src/watch/texts.ts

@@ -26,8 +26,14 @@ export type WatchTexts = {
   laneModelDuty: string
   /** What phases of one lane that can run together ask of the coordinator, with the phases as `P19 ∥ P20`. */
   parallelDuty: (phases: string) => string
+  /** What a lane that works without a task signal asks of the coordinator. */
+  noTaskSignalDuty: string
   /** What a lane's call waiting for approval asks of the coordinator, with the mark (request id and call hash) the question must carry. */
   approvalDuty: (id: string, hash: string) => string
+  /** The standing duty while the main checkout is behind its base branch on the remote (`origin/main`), with the count of commits. */
+  mainCheckoutBehind: (remoteBase: string, count: number) => string
+  /** The standing duty while the main checkout has another branch than the base checked out (null for a detached head). */
+  mainCheckoutOffBase: (branch: string | null, baseBranch: string) => string
   /** The reminder after the coordinator line: `<term>: <count> rows only in the checkout`. */
   checkoutRows: (term: string, count: number) => string
   /** The head of the status line of the user's own open pull requests without a lane. */
@@ -63,8 +69,12 @@ export const watchTexts = (dialogLanguage: PlanLanguage): WatchTexts => ({
   laneAlertDuty: 'request the hand-over at the next phase boundary (§ 8)',
   parallelDuty: (phases) =>
     `${phases} can run in parallel: propose it to the user, check content and release files yourself (the table covers paths and markers only)`,
+  noTaskSignalDuty: 'remind the lane to report its task with jh task start; do not stop it',
   laneModelDuty:
     'switch it while idle: /exit, then claude --resume <session> --model <id> in the same pane (§ 2 step 6)',
+  mainCheckoutBehind: (remoteBase, count) =>
+    `main checkout behind ${remoteBase} by ${count} (git merge --ff-only ${remoteBase})`,
+  mainCheckoutOffBase: (branch, baseBranch) => `main checkout on ${branch ?? 'a detached head'}, not ${baseBranch}`,
   checkoutRows: (term, count) => `${term}: ${count} ${count === 1 ? 'row' : 'rows'} only in the checkout`,
   otherPullRequests: 'other PRs',
   approvalDuty: (id, hash) =>

package/src/watch/update-available.ts

@@ -1,26 +1,29 @@
 import { latestVersionIfDue, type UpdateCheck } from '../sync/if-changed'
 import { isNewerVersion } from '../version/release'
+import { UPDATE_AVAILABLE_EVENT } from './watch-events'
 
 /** The one line that wakes the coordinator when npm has a newer release; the orchestrate skill asks the user. */
 export const updateAvailableLine = (installed: string, latest: string): string =>
-  `=== update available ${installed} → ${latest}`
+  `=== ${UPDATE_AVAILABLE_EVENT} ${installed} → ${latest}`
 
 /**
  * The watcher's daily look at npm, on the hook's timestamp and check, so a day holds one registry question across
  * both. Prints a line only for a newer plain release it has not announced yet; otherwise nothing, so a quiet
- * day costs no tokens. Call it on every poll: the timestamp decides whether npm is asked at all.
+ * day costs no tokens. Call it on every poll: the timestamp decides whether npm is asked at all. `hint` is what the line
+ * carries after it, the path of the reference that holds the handling (`referenceHint`).
  */
 export const updateAnnouncer = (
   home: string,
   installed: string,
   check: UpdateCheck,
   log: (line: string) => void,
+  hint: () => string = () => '',
 ): (() => Promise<void>) => {
   let announced: string | null = null
   return async () => {
     const latest = await latestVersionIfDue(home, check)
     if (latest === null || latest === announced || !isNewerVersion(latest, installed)) return
     announced = latest
-    log(updateAvailableLine(installed, latest))
+    log(`${updateAvailableLine(installed, latest)}${hint()}`)
   }
 }

package/src/watch/watch-events.ts

@@ -24,8 +24,17 @@ import {
   type TaskParallelEvent,
   type TaskParallelFingerprints,
 } from './task-parallel'
+import {
+  isNoSignalState,
+  NO_TASK_SIGNAL_EVENT,
+  type NoSignalState,
+  type NoTaskSignalEvent,
+} from './task-signal-missing'
 import { RUN_EVENT, RUN_STATUS, type WorkflowRun } from './workflow-runs'
 
+/** The event `updateAvailableLine` prints; it is no `WatchEvent`, the announcer logs it on its own. */
+export const UPDATE_AVAILABLE_EVENT = 'update available'
+
 /** What the coordinator is told besides a lane that stopped. The values are the words of the report. */
 export const WATCH_EVENT = {
   merged: 'merged',
@@ -41,6 +50,7 @@ export const WATCH_EVENT = {
   laneModel: LANE_MODEL_EVENT,
   laneParallel: LANE_PARALLEL_EVENT,
   taskParallel: TASK_PARALLEL_EVENT,
+  noTaskSignal: NO_TASK_SIGNAL_EVENT,
   approval: APPROVAL_EVENT,
   source: SOURCE_EVENT,
   due: APPOINTMENT_EVENT.due,
@@ -95,12 +105,18 @@ export type WatchState = {
   laneParallels: LaneParallels
   /** The fingerprint of the parallel-task situation of each watched lane at the last heartbeat; a proposal is made only when it moved. */
   taskParallels: TaskParallelFingerprints
+  /** The last day of `watch.parallelTasks.auto` whose end was reported, so it is said once; null before any. */
+  parallelAutoEnded: string | null
+  /** Per watched lane: since when it works without a task signal and the phase last reported as `no task signal`. */
+  noTaskSignals: NoSignalState
   /** The ids of the approval requests on disk when they were last read, each reported once while it is open. */
   approvals: string[]
   /** Per configured source of `watch.sources`: the entries seen (`[id, fingerprint]`) and the start of a failure streak. */
   sources: SourceState
   /** Lane → change time of the report file last shown for it, null when it had none; a lane without an entry is unseen. */
   reportMtimes: Record<string, number | null>
+  /** Lane → the questions of its report last shown or seen (`questionsFingerprint`); a lane without an entry is unseen. */
+  reportQuestions: Record<string, string>
   /** The lane lines of the status block last printed; null before the first report. */
   statusLines: string[] | null
   /** The board's appointments reported as due and its unreadable appointment rows reported, each once (`appointments.ts`). */
@@ -149,6 +165,7 @@ export type WatchEvent =
   | LaneModelEvent
   | LaneParallelEvent
   | TaskParallelEvent
+  | NoTaskSignalEvent
   | ApprovalEvent
   | SourceEvent
   | AppointmentEvent
@@ -184,9 +201,12 @@ export const emptyWatchState = (): WatchState => ({
   laneModels: {},
   laneParallels: {},
   taskParallels: {},
+  parallelAutoEnded: null,
+  noTaskSignals: {},
   approvals: [],
   sources: emptySourceState(),
   reportMtimes: {},
+  reportQuestions: {},
   statusLines: null,
   appointments: emptyAppointmentState(),
 })
@@ -230,10 +250,13 @@ const isWatchState = (value: Record<string, unknown>): value is WatchState =>
   isLaneModels(value.laneModels) &&
   isLaneParallels(value.laneParallels) &&
   isTaskParallelFingerprints(value.taskParallels) &&
+  (value.parallelAutoEnded === null || typeof value.parallelAutoEnded === 'string') &&
+  isNoSignalState(value.noTaskSignals) &&
   Array.isArray(value.approvals) &&
   value.approvals.every((id) => typeof id === 'string') &&
   isSourceState(value.sources) &&
   everyValue(value.reportMtimes, isSeq) &&
+  everyValue(value.reportQuestions, (entry) => typeof entry === 'string') &&
   (value.statusLines === null ||
     (Array.isArray(value.statusLines) && value.statusLines.every((line) => typeof line === 'string'))) &&
   isAppointmentState(value.appointments)

package/src/watch/watcher-lock.ts

@@ -1,7 +1,15 @@
 import { createHash } from 'node:crypto'
-import { mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { basename, join } from 'node:path'
+import { rmSync } from 'node:fs'
+import { basename, dirname, join } from 'node:path'
+import { writePrivateFile } from '../../kit/hooks/hooks/shared/private-directory'
+import {
+  ensurePrivateLevels,
+  type LocationSystem,
+  readPrivateText,
+  runtimeBaseOf,
+  systemLocation,
+  userDirectoryOf,
+} from '../shared/private-location'
 import { CLI_NAME, PACKAGE_NAME } from '../version/release'
 
 /** Looks up the command line of a process; null when there is no such process. */
@@ -17,8 +25,6 @@ const RUNTIME = 'bun'
 const DIRECTORY_PREFIX = 'jackherd-watch'
 const KEY_HASH_LENGTH = 12
 const NOT_A_SEGMENT = /[^A-Za-z0-9._-]+/g
-const PRIVATE_DIRECTORY = 0o700
-const PRIVATE_FILE = 0o600
 const STOP_WAIT_MS = 5_000
 const STOP_POLL_MS = 50
 
@@ -73,14 +79,6 @@ export const repositoryKey = (root: string): string => {
   return `${name}-${hash}`
 }
 
-const readText = (file: string): string | null => {
-  try {
-    return readFileSync(file, 'utf8')
-  } catch {
-    return null
-  }
-}
-
 const commandLineOf: CommandLineOf = (pid) => {
   const result = Bun.spawnSync(['ps', '-o', 'command=', '-p', String(pid)], { stdout: 'pipe', stderr: 'ignore' })
   return result.exitCode === 0 ? result.stdout.toString().trim() || null : null
@@ -96,36 +94,34 @@ const isAlive = (pid: number): boolean => {
 }
 
 /** Where `ensureWatcherDirectory` puts the watcher's files, without creating anything: for readers such as the herd. */
-export const watcherDirectoryOf = (root: string): string =>
-  join(tmpdir(), `${DIRECTORY_PREFIX}-${process.getuid?.() ?? 'user'}`, repositoryKey(root))
+export const watcherDirectoryOf = (root: string, system: LocationSystem = systemLocation()): string =>
+  join(userDirectoryOf(runtimeBaseOf(system), DIRECTORY_PREFIX, system.uid), repositoryKey(root))
 
 /**
  * The directory for the lock and state of the watcher of the repository at `root`, one per user and repository,
- * readable by that user only: with `TMPDIR` unset, `tmpdir()` is the shared `/tmp`, where another account could
- * plant the files. A watcher in another repository has its own lock and does not supersede this one.
+ * readable by that user only: without a private runtime directory the base is the temporary directory, which may be
+ * the shared `/tmp`, where another account could plant the files, so both levels are verified (`ensurePrivateLevels`)
+ * and this throws for a level that is a link or someone else's. A watcher in another repository has its own lock and
+ * does not supersede this one.
  */
-export const ensureWatcherDirectory = (root: string): string => {
-  const directory = watcherDirectoryOf(root)
-  mkdirSync(directory, { recursive: true, mode: PRIVATE_DIRECTORY })
-  return directory
+export const ensureWatcherDirectory = (root: string, system: LocationSystem = systemLocation()): string => {
+  const directory = watcherDirectoryOf(root, system)
+  return ensurePrivateLevels(dirname(directory), directory)
 }
 
 /** Whether the lock names a live process that is a watcher, so its saved state is being kept up to date. */
 export const isWatcherRunning = (lockFile: string, lookUp: CommandLineOf = commandLineOf): boolean => {
-  const pid = lockedPid(readText(lockFile))
+  const pid = lockedPid(readPrivateText(lockFile))
   return pid !== null && isAlive(pid) && isWatcherCommand(lookUp(pid) ?? '')
 }
 
-/** Writes a file only the user can read. */
-export const writePrivate = (file: string, content: string) => writeFileSync(file, content, { mode: PRIVATE_FILE })
-
 /**
  * Takes the lock for this process. A watcher that held it gets SIGTERM and is waited for, so the state
  * file it writes on the way out is complete before this one reads it.
  */
 export const takeOverLock = async (lockFile: string): Promise<TakeOver> => {
-  const previous = supersedeTarget(readText(lockFile), process.pid, commandLineOf)
-  writePrivate(lockFile, String(process.pid))
+  const previous = supersedeTarget(readPrivateText(lockFile), process.pid, commandLineOf)
+  writePrivateFile(lockFile, String(process.pid))
   if (previous === null || !isAlive(previous)) return { replaced: null, stillRunning: null }
   try {
     process.kill(previous, 'SIGTERM')
@@ -137,9 +133,9 @@ export const takeOverLock = async (lockFile: string): Promise<TakeOver> => {
   return isAlive(previous) ? { replaced: null, stillRunning: previous } : { replaced: previous, stillRunning: null }
 }
 
-export const stopNoticeOf = (lockFile: string): string => stopNotice(readText(lockFile), process.pid)
+export const stopNoticeOf = (lockFile: string): string => stopNotice(readPrivateText(lockFile), process.pid)
 
 /** Removes the lock only while it still names this process; a successor's lock stays. */
 export const releaseLock = (lockFile: string) => {
-  if (lockedPid(readText(lockFile)) === process.pid) rmSync(lockFile, { force: true })
+  if (lockedPid(readPrivateText(lockFile)) === process.pid) rmSync(lockFile, { force: true })
 }

package/kit/hooks/hooks/merge-guard/plan-approval-record.ts

@@ -1,23 +0,0 @@
-// PostToolUse hook for AskUserQuestion, shipped by jackherd. When the call asked about a plan (``Plan `<path>` ``) and
-// offered the label that approves it or the one that revokes it, it leaves a pointer to that dialog in the main
-// checkout's `.jackherd/approvals/plans/`, so the merge guard finds the answer again after the session ended. It writes
-// only the pointer; the merge guard reads the answer from the transcript itself. argv[2] and argv[3] are the two labels,
-// rendered into the hook entry by `sync`. It never blocks and prints nothing: a pointer it fails to write costs a question.
-// The other way round it costs a revocation: when no pointer is written for a "revoke" answer, the merge guard never
-// sees that answer, and an older approval keeps holding until the next plan question that is recorded.
-import { mainCheckoutOf } from '../shared/checkout'
-import { planPointersDirectory, pointerOf, writePointer } from './plan-pointers'
-
-const record = async (): Promise<void> => {
-  const pointer = pointerOf(JSON.parse(await Bun.stdin.text()), process.argv.slice(2, 4), Date.now())
-  if (pointer === undefined) return
-  const projectDirectory = process.env.CLAUDE_PROJECT_DIR ?? process.cwd()
-  writePointer(planPointersDirectory(mainCheckoutOf(projectDirectory)), pointer)
-}
-
-try {
-  await record()
-} catch {
-  // Nothing to do: without a pointer the merge asks.
-}
-process.exit(0)

package/kit/hooks/hooks/merge-guard/plan-approval-sources.ts

@@ -1,196 +0,0 @@
-/**
- * Where plan approval reads its facts: git in the main checkout for the base branch, the worktrees and the boards, the
- * pointer directory and the transcripts for the answers. Every git call runs without a shell and with a timeout; any
- * failure answers nothing, so the guard asks.
- */
-import { existsSync } from 'node:fs'
-import { join, posix, relative, resolve } from 'node:path'
-import { lanePlansOf } from '../shared/board-lanes'
-import { laneOf } from '../shared/lane'
-import type { PlanApprovalSources } from './plan-approval'
-import { FULL_COMMIT } from '../shared/commit'
-import { isPlainPath } from './plain-path'
-import { planAnswers, planPointersDirectory } from './plan-pointers'
-import { checksPassed } from './pull-request'
-import { baseBranchOf } from '../shared/base-branch'
-import { type PlanApprovalSettings, PROJECT_CONFIG, planApprovalSettingsOf } from './plan-approval-settings'
-import { readConfigOrNull } from './settings'
-
-/** The base commit plan approval reads, just fetched, and the settings its project config holds. */
-export type PlanBase = { commit: string; settings: PlanApprovalSettings }
-
-export type PlanSourceContext = {
-  /** The main checkout, where the worktrees, the base branch and the pointers are. */
-  main: string
-  base: PlanBase
-  /** The transcript of the session that merges. */
-  transcript: string | undefined
-  /** The label that approves a plan. */
-  label: string
-  files: () => readonly string[] | undefined
-  /** The `gh pr view` answer for the pull request, which carries its checks. */
-  view: string
-}
-
-const GIT_TIMEOUT_MS = 3000
-const BASE_REMOTE = 'origin'
-const HEADER = /^[0-9a-f]+ blob (\d+)$/
-
-/**
- * The output of `git cat-file --batch`, one entry per requested path in order: the text of a blob, null for a path the
- * commit lacks or that is no blob. Undefined when the output does not hold one entry per path.
- */
-export const parseCatFileBatch = (output: Buffer, count: number): (string | null)[] | undefined => {
-  const texts: (string | null)[] = []
-  let at = 0
-  while (texts.length < count) {
-    const newline = output.indexOf('\n', at)
-    if (newline === -1) return undefined
-    const size = HEADER.exec(output.subarray(at, newline).toString('utf8'))?.[1]
-    if (size === undefined) {
-      texts.push(null)
-      at = newline + 1
-      continue
-    }
-    const end = newline + 1 + Number(size)
-    if (end > output.length) return undefined
-    texts.push(output.subarray(newline + 1, end).toString('utf8'))
-    at = end + 1
-  }
-  return texts
-}
-
-/** The lane whose worktree, directly below the worktree directory, has `branch` checked out. */
-export const laneInWorktreeList = (
-  worktreeList: string,
-  main: string,
-  worktreeDirectory: string,
-  branch: string,
-): string | undefined => {
-  const blocks = worktreeList.split('\n\n').map((block) => block.split('\n'))
-  const block = blocks.find((lines) => lines.includes(`branch refs/heads/${branch}`))
-  const path = block?.find((line) => line.startsWith('worktree '))?.slice('worktree '.length)
-  if (path === undefined) return undefined
-  const lane = laneOf({ cwd: path, main, worktreeDirectory })
-  return lane !== null && relative(resolve(main, worktreeDirectory), resolve(path)) === lane ? lane : undefined
-}
-
-/** Whether `name` is the directory of a lane's worktree below the worktree directory. */
-export const isLaneIn =
-  (main: string, worktreeDirectory: string) =>
-  (name: string): boolean => {
-    const worktree = join(resolve(main, worktreeDirectory), name)
-    return laneOf({ cwd: worktree, main, worktreeDirectory }) === name && existsSync(worktree)
-  }
-
-/** Only the base branch into its remote ref: no tags, no FETCH_HEAD written, no maintenance started. */
-export const baseFetchArguments = (baseBranch: string): string[] => [
-  'fetch',
-  '--quiet',
-  '--no-tags',
-  '--no-write-fetch-head',
-  '--no-auto-maintenance',
-  BASE_REMOTE,
-  `+refs/heads/${baseBranch}:refs/remotes/${BASE_REMOTE}/${baseBranch}`,
-]
-
-/** No prompt for a password or a host key: a fetch that would wait for one fails at once instead. */
-export const NON_INTERACTIVE = { GIT_TERMINAL_PROMPT: '0', GIT_SSH_COMMAND: 'ssh -o BatchMode=yes' }
-
-const git = (main: string, args: readonly string[], stdin?: string): Buffer | undefined => {
-  const result = Bun.spawnSync(['git', '-C', main, ...args], {
-    stdin: stdin === undefined ? 'ignore' : new TextEncoder().encode(stdin),
-    stdout: 'pipe',
-    stderr: 'ignore',
-    timeout: GIT_TIMEOUT_MS,
-    env: { ...process.env, ...NON_INTERACTIVE },
-  })
-  return result.exitCode === 0 ? result.stdout : undefined
-}
-
-const baseCommitOf = (main: string, baseBranch: string): string | undefined => {
-  const commit = git(main, ['rev-parse', '--verify', '--quiet', `${BASE_REMOTE}/${baseBranch}^{commit}`])
-    ?.toString()
-    .trim()
-  return commit !== undefined && FULL_COMMIT.test(commit) ? commit : undefined
-}
-
-/** The texts of the paths at the commit, in one `git cat-file --batch`; null for each one it lacks or cannot read. */
-const readAtCommit = (main: string, commit: string, paths: readonly string[]): Map<string, string | null> => {
-  const asked = paths.filter(isPlainPath)
-  const output =
-    asked.length === 0
-      ? undefined
-      : git(main, ['cat-file', '--batch'], asked.map((path) => `${commit}:${path}\n`).join(''))
-  const texts = output === undefined ? undefined : parseCatFileBatch(output, asked.length)
-  return new Map(paths.map((path) => [path, texts?.[asked.indexOf(path)] ?? null]))
-}
-
-/** The board directories under the plan directory at the commit whose name matches the board pattern. */
-const boardDirectories = (main: string, commit: string, settings: PlanApprovalSettings): string[] => {
-  const listing = git(main, ['ls-tree', '-d', '--name-only', commit, '--', `${settings.planDirectory}/`])
-  const pattern = new Bun.Glob(settings.board.pattern)
-  return (listing?.toString() ?? '')
-    .split('\n')
-    .filter((path) => path !== '' && pattern.match(posix.basename(path)))
-}
-
-/** Brings `origin/<baseBranch>` up to date, so a stale ref cannot hold an approval GitHub's base no longer does. */
-const fetchBase = (main: string, baseBranch: string): boolean => git(main, baseFetchArguments(baseBranch)) !== undefined
-
-/** The newest first-parent commit of the base from before the time; undefined when there is none. */
-const commitBefore = (main: string, commit: string, time: number): string | undefined => {
-  const found = git(main, ['rev-list', '-1', '--first-parent', `--before=@${Math.floor(time / 1000)}`, commit])
-    ?.toString()
-    .trim()
-  return found !== undefined && FULL_COMMIT.test(found) ? found : undefined
-}
-
-/**
- * The plan as the base held it at the time of the answer; undefined when the base did not hold it then, or not
- * readably. A plan that was only in a pull request when the user approved it could have grown before it landed, and
- * the state the user saw is nowhere on the base, so the guard asks once more after it landed.
- */
-const planAtApproval = (main: string, commit: string, plan: string, answeredAt: number): string | undefined => {
-  const before = commitBefore(main, commit, answeredAt)
-  return (before === undefined ? undefined : readAtCommit(main, before, [plan]).get(plan)) ?? undefined
-}
-
-/**
- * The base plan approval reads: `origin/<baseBranch>` right after a fetch, and the settings of the project config at
- * that commit, never of the checkout. The base branch comes from the checkout's config (the base cannot name itself)
- * and must agree with the one the base's config names. Undefined, so the guard asks, when any step fails.
- */
-export const planBaseOf = (main: string): PlanBase | undefined => {
-  const baseBranch = baseBranchOf(readConfigOrNull([main]))
-  if (baseBranch === undefined || !fetchBase(main, baseBranch)) return undefined
-  const commit = baseCommitOf(main, baseBranch)
-  if (commit === undefined) return undefined
-  const settings = planApprovalSettingsOf(readAtCommit(main, commit, [PROJECT_CONFIG]).get(PROJECT_CONFIG) ?? null)
-  return settings !== null && settings.baseBranch === baseBranch ? { commit, settings } : undefined
-}
-
-export const planApprovalSources = ({ main, base, transcript, label, files, view }: PlanSourceContext): PlanApprovalSources => {
-  const { commit, settings } = base
-  return {
-    checksPassed: (requiredChecks) => checksPassed(view, requiredChecks),
-    containsBase: (headCommit) =>
-      FULL_COMMIT.test(headCommit) && git(main, ['merge-base', '--is-ancestor', commit, headCommit]) !== undefined,
-    files,
-    readAtBase: (paths) => readAtCommit(main, commit, paths),
-    laneOfBranch: (branch) => {
-      const list = git(main, ['worktree', 'list', '--porcelain'])?.toString()
-      return list === undefined ? undefined : laneInWorktreeList(list, main, settings.worktreeDirectory, branch)
-    },
-    lanePlans: (lane) => {
-      const boards = boardDirectories(main, commit, settings)
-      const texts = readAtCommit(main, commit, boards.map((directory) => `${directory}/${settings.board.file}`))
-      return boards.flatMap((directory) => {
-        const text = texts.get(`${directory}/${settings.board.file}`)
-        return (text ? lanePlansOf(text, directory, lane, settings.planLanguage) : undefined) ?? []
-      })
-    },
-    answers: (plan) => planAnswers({ directory: planPointersDirectory(main), currentTranscript: transcript, plan, label }),
-    readAtCommitBefore: (plan, answeredAt) => (isPlainPath(plan) ? planAtApproval(main, commit, plan, answeredAt) : undefined),
-  }
-}