@joshuafolkken/kit 1.1453.0 → 1.1471.0

package/scripts/behavior/behavior-rules.ts

@@ -53,8 +53,9 @@ const INDEX_ASSERTION_NAME = 'no-direct-git-index-mutation'
 // a tool result, or a call to any tool but `Bash`. Read through `json_value.is_record` so a malformed
 // input is treated as absent rather than throwing mid-scan.
 function command_of(block: Block): string | undefined {
-	if (block.type !== TOOL_USE || block.name !== BASH_TOOL) return undefined
-	if (!json_value.is_record(block.input)) return undefined
+	if (block.type !== TOOL_USE || block.name !== BASH_TOOL || !json_value.is_record(block.input)) {
+		return undefined
+	}
 
 	const command = block.input[COMMAND_KEY]
 

package/scripts/cost-runtime/codex-usage.ts

@@ -56,8 +56,10 @@ function measurement_from(
 		return parsed.success ? [parsed.data.payload.info] : []
 	})
 	const session = metadata.find((entry) => entry.payload.id === thread_id)
-	if (session === undefined || usages.length === 0) return undefined
-	if (!same_project(session.payload.cwd, target)) return undefined
+
+	if (session === undefined || usages.length === 0 || !same_project(session.payload.cwd, target)) {
+		return undefined
+	}
 
 	return { billed_input_per_request: billed_per_request(usages) }
 }

package/scripts/cost-runtime/cost-cli.ts

@@ -56,8 +56,7 @@ interface RunContext {
 // `--over=` does not arrive as "hand off after any request" and stop an unattended run after its
 // first child.
 function to_threshold(raw: string | undefined): number | undefined {
-	if (raw === undefined) return undefined
-	if (raw.trim() === '') return undefined
+	if (raw === undefined || raw.trim() === '') return undefined
 
 	const parsed = Number(raw)
 

package/scripts/delegation/investigation-guard.ts

@@ -69,7 +69,7 @@ function should_notify(
 // A dispatched lane child ends its turn on a denial, so
 // the same guidance is carried without a `permissionDecision`: the read proceeds and the child is nudged
 // to delegate rather than killed. It carries no ⛔, so a person watching reads it as advice.
-const NOTICE = `💡 investigation: files read and not edited, or search turns, since the last delegated unit reached the threshold, so the reading from here should go to a unit of its own. This is a notice, not a refusal — the read proceeds, because a dispatched lane child ends its turn on a denial. Ask \`pnpm josh delegate investigation\`, then dispatch the \`${investigation_reads.INVESTIGATOR_AGENT}\` agent (\`kit:${investigation_reads.INVESTIGATOR_AGENT}\` in a consumer) with a brief of what the main line has already concluded and what is left to find out; it returns the conclusion plus its \`file:line\` citations, never the file text. Keep a read in the main line only where this run will edit that file. This recurs on the next accumulation.`
+const NOTICE = `💡 investigation: files read and not edited, or search turns, since the last delegated unit reached the threshold; the read proceeds. Run \`pnpm josh delegate investigation\`, then dispatch the \`${investigation_reads.INVESTIGATOR_AGENT}\` agent (\`kit:${investigation_reads.INVESTIGATOR_AGENT}\` in a consumer); it returns \`file:line\` citations, never the file text. Keep main-line reads to files you will edit.`
 
 // The notice as it reaches the model: the base guidance with the concrete unedited reads named, so a
 // lane child is shown *which* reads to send to a unit rather than only told to delegate. An empty

package/scripts/delegation/investigation-reads.ts

@@ -42,7 +42,7 @@ const SEARCH_LABELS: ReadonlySet<string> = new Set(
 const INVESTIGATOR_AGENT = 'investigator'
 
 // The deny reason is the only text that reaches the model, so it names the count, command and return shape.
-const REASON = `⛔ investigation: ${String(delegation_policy.INVESTIGATION_FILE_THRESHOLD)} files read and not edited, or ${String(delegation_policy.INVESTIGATION_SEARCH_TURN_THRESHOLD)} search turns, since the last delegated unit, so the reading from here goes to a unit of its own (a successful write also starts the search count over). Ask \`pnpm josh delegate investigation\`, then dispatch the \`${INVESTIGATOR_AGENT}\` agent (\`kit:${INVESTIGATOR_AGENT}\` in a consumer) with a brief of what the main line has already concluded and what is left to find out; it returns the conclusion plus its \`file:line\` citations, never the file text. Keep a read in the main line only where this run will edit that file — an \`Edit\` cannot be issued against text you do not hold. This run's own instructions and the harness's own session files — a backgrounded call's output, a persisted tool result, this session's scratchpad — never count toward the files, so they are not what took the file count here; every read-only search turn counts, whatever it names. The rule is \`.claude/skills/workflow-commands/delegation.md\` → "The pre-implementation reading".`
+const REASON = `⛔ investigation: ${String(delegation_policy.INVESTIGATION_FILE_THRESHOLD)} files read and not edited, or ${String(delegation_policy.INVESTIGATION_SEARCH_TURN_THRESHOLD)} search turns, since the last delegated unit. Run \`pnpm josh delegate investigation\`, then dispatch the \`${INVESTIGATOR_AGENT}\` agent (\`kit:${INVESTIGATOR_AGENT}\` in a consumer); it returns \`file:line\` citations, never the file text. Keep main-line reads to files you will edit; every read-only search turn counts. \`.claude/skills/workflow-commands/delegation.md\``
 
 interface ReadTally {
 	// The files read and not since edited, resolved.

package/scripts/discovery/repo-discovery.ts

@@ -138,8 +138,10 @@ function resolve_current_owner(repository_path: string): string | undefined {
 // all — the very failure this function exists to close, moved somewhere else.
 function main_worktree(repository_path: string): string {
 	const git_directory = resolve_git_directory(repository_path)
-	if (git_directory === undefined) return repository_path
-	if (path.basename(git_directory) !== GIT_DIRECTORY) return repository_path
+
+	if (git_directory === undefined || path.basename(git_directory) !== GIT_DIRECTORY) {
+		return repository_path
+	}
 
 	return path.dirname(git_directory)
 }

package/scripts/discovery/repo-origin.ts

@@ -68,8 +68,7 @@ function parse_scp_like(url: string): RepoIdentity | undefined {
 	const user_end = url.indexOf(USER_SEPARATOR)
 	const authority = user_end === NOT_FOUND ? url : url.slice(user_end + 1)
 	const host_end = authority.indexOf(HOST_SEPARATOR)
-	if (host_end === NOT_FOUND) return undefined
-	if (!is_github_ssh_host(authority.slice(0, host_end))) return undefined
+	if (host_end === NOT_FOUND || !is_github_ssh_host(authority.slice(0, host_end))) return undefined
 
 	return to_identity(authority.slice(host_end + 1))
 }
@@ -115,8 +114,7 @@ function origin_section_lines(lines: ReadonlyArray<string>): Array<string> {
 // the first separator rather than matched, for the reason `parse_scp_like` is split by hand.
 function url_value(line: string): string | undefined {
 	const separator = line.indexOf('=')
-	if (separator === NOT_FOUND) return undefined
-	if (line.slice(0, separator).trim() !== URL_KEY) return undefined
+	if (separator === NOT_FOUND || line.slice(0, separator).trim() !== URL_KEY) return undefined
 
 	return line.slice(separator + 1).trim()
 }

package/scripts/doctor/doctor-logic.ts

@@ -69,9 +69,12 @@ function decide_reclaim(
 	global_josh: string | undefined,
 	shim_content: string,
 ): ReclaimDecision {
-	if (!is_shadowed(path_josh, global_josh)) return { action: 'none', reason: NO_SHADOW_REASON }
-	// is_shadowed already guarantees path_josh is defined; this narrows the type for the return.
-	if (path_josh === undefined) return { action: 'none', reason: NO_SHADOW_REASON }
+	// is_shadowed already implies path_josh is defined; the undefined check narrows the type for the
+	// return.
+	if (path_josh === undefined || !is_shadowed(path_josh, global_josh)) {
+		return { action: 'none', reason: NO_SHADOW_REASON }
+	}
+
 	if (!is_kit_shim(shim_content)) return { action: 'none', reason: NOT_KIT_SHIM_REASON }
 
 	return { action: 'remove', target: path_josh, reason: RECLAIM_REASON }

package/scripts/document/document-byte-budget.ts

@@ -57,52 +57,52 @@ function block_ceiling(size: number): number {
 // a stale entry (a file that no longer exists or that an entry now reads) and on an un-budgeted
 // unreached file, so the definition cannot rot as documents move on or off the execution path.
 const DOCUMENT_BYTE_BUDGET: ReadonlyArray<DocumentBudget> = [
-	{ path: '.claude/skills/dependency-update/SKILL.md', bytes: 8192 },
-	{ path: '.claude/skills/epic-commands/SKILL.md', bytes: 16_384 },
-	{ path: '.claude/skills/epic-commands/epic-bundle.md', bytes: 8192 },
-	{ path: '.claude/skills/epic-commands/execution-waves.md', bytes: 8192 },
-	{ path: '.claude/skills/verify-ui/SKILL.md', bytes: 8192 },
+	{ path: '.claude/skills/dependency-update/SKILL.md', bytes: 4096 },
+	{ path: '.claude/skills/epic-commands/SKILL.md', bytes: 12_288 },
+	{ path: '.claude/skills/epic-commands/epic-bundle.md', bytes: 4096 },
+	{ path: '.claude/skills/epic-commands/execution-waves.md', bytes: 4096 },
+	{ path: '.claude/skills/verify-ui/SKILL.md', bytes: 4096 },
 	{ path: '.claude/skills/workflow-commands/backlogrun-handoff-report.md', bytes: 4096 },
 	{ path: '.claude/skills/workflow-commands/fullrun-steps.md', bytes: 8192 },
 	{ path: '.claude/skills/workflow-commands/into-target.md', bytes: 4096 },
 	{ path: '.claude/skills/workflow-commands/issue-comments.md', bytes: 8192 },
 	{ path: '.claude/skills/workflow-commands/issue-fold-existing.md', bytes: 4096 },
 	{ path: '.claude/skills/workflow-commands/needs-human-review.md', bytes: 4096 },
-	{ path: '.claude/skills/workflow-commands/observation-filing.md', bytes: 12_288 },
-	{ path: '.claude/skills/workflow-commands/observation-ledger.md', bytes: 12_288 },
+	{ path: '.claude/skills/workflow-commands/observation-filing.md', bytes: 8192 },
+	{ path: '.claude/skills/workflow-commands/observation-ledger.md', bytes: 8192 },
 	{ path: '.claude/skills/workflow-commands/prerequisite.md', bytes: 8192 },
 	{ path: '.claude/skills/workflow-commands/target-repository.md', bytes: 4096 },
 	{ path: '.claude/skills/workflow-commands/working-tree-hold.md', bytes: 8192 },
-	{ path: 'docs/josh-commands-automation.md', bytes: 53_248 },
-	{ path: 'docs/josh-commands-run.md', bytes: 77_824 },
-	{ path: 'docs/josh-commands-backlog.md', bytes: 61_440 },
-	{ path: 'docs/josh-commands.md', bytes: 57_344 },
+	{ path: 'docs/josh-commands-automation.md', bytes: 45_056 },
+	{ path: 'docs/josh-commands-run.md', bytes: 61_440 },
+	{ path: 'docs/josh-commands-backlog.md', bytes: 49_152 },
+	{ path: 'docs/josh-commands.md', bytes: 45_056 },
 	{ path: 'docs/labels-and-run-states.md', bytes: 8192 },
-	{ path: 'prompts/coding-standards.md', bytes: 8192 },
-	{ path: 'prompts/collaboration-workflow.md', bytes: 8192 },
-	{ path: 'prompts/collaboration-workflow/file-edits.md', bytes: 12_288 },
-	{ path: 'prompts/collaboration-workflow/gh-rest.md', bytes: 8192 },
+	{ path: 'prompts/coding-standards.md', bytes: 4096 },
+	{ path: 'prompts/collaboration-workflow.md', bytes: 4096 },
+	{ path: 'prompts/collaboration-workflow/file-edits.md', bytes: 8192 },
+	{ path: 'prompts/collaboration-workflow/gh-rest.md', bytes: 4096 },
 	{ path: 'prompts/collaboration-workflow/glossary.md', bytes: 4096 },
 	{ path: 'prompts/collaboration-workflow/issue-citation.md', bytes: 4096 },
-	{ path: 'prompts/collaboration-workflow/issue-template.md', bytes: 12_288 },
-	{ path: 'prompts/collaboration-workflow/operating-rules.md', bytes: 12_288 },
+	{ path: 'prompts/collaboration-workflow/issue-template.md', bytes: 8192 },
+	{ path: 'prompts/collaboration-workflow/operating-rules.md', bytes: 8192 },
 	{ path: 'prompts/collaboration-workflow/output-bounds.md', bytes: 4096 },
 	{ path: 'prompts/collaboration-workflow/overview.md', bytes: 4096 },
-	{ path: 'prompts/collaboration-workflow/plan-comment.md', bytes: 8192 },
-	{ path: 'prompts/collaboration-workflow/principles.md', bytes: 16_384 },
+	{ path: 'prompts/collaboration-workflow/plan-comment.md', bytes: 4096 },
+	{ path: 'prompts/collaboration-workflow/principles.md', bytes: 12_288 },
 	{ path: 'prompts/collaboration-workflow/proposal-request.md', bytes: 4096 },
-	{ path: 'prompts/collaboration-workflow/report-format.md', bytes: 16_384 },
+	{ path: 'prompts/collaboration-workflow/report-format.md', bytes: 12_288 },
 	{ path: 'prompts/collaboration-workflow/residency.md', bytes: 8192 },
 	{ path: 'prompts/collaboration-workflow/rule-delivery.md', bytes: 4096 },
-	{ path: 'prompts/collaboration-workflow/shell-body.md', bytes: 8192 },
-	{ path: 'prompts/collaboration-workflow/turn-batching.md', bytes: 8192 },
-	{ path: 'prompts/collaboration-workflow/upstream-interrupt.md', bytes: 12_288 },
-	{ path: 'prompts/collaboration-workflow/wip-cap.md', bytes: 12_288 },
+	{ path: 'prompts/collaboration-workflow/shell-body.md', bytes: 4096 },
+	{ path: 'prompts/collaboration-workflow/turn-batching.md', bytes: 4096 },
+	{ path: 'prompts/collaboration-workflow/upstream-interrupt.md', bytes: 8192 },
+	{ path: 'prompts/collaboration-workflow/wip-cap.md', bytes: 8192 },
 	{ path: 'prompts/refactoring.md', bytes: 8192 },
-	{ path: 'prompts/review-rubric.md', bytes: 16_384 },
-	{ path: 'prompts/review.md', bytes: 16_384 },
+	{ path: 'prompts/review-rubric.md', bytes: 12_288 },
+	{ path: 'prompts/review.md', bytes: 12_288 },
 	{ path: 'prompts/sonar-hotspot-handling.md', bytes: 8192 },
-	{ path: 'prompts/testing-guide.md', bytes: 16_384 },
+	{ path: 'prompts/testing-guide.md', bytes: 12_288 },
 ]
 
 // The recorded ceiling for one path, or undefined when it carries no budget entry.

package/scripts/document/document-byte-check.ts

@@ -26,8 +26,7 @@ function ceiling_message(
 	current_bytes: number,
 	recorded_bytes: number | undefined,
 ): string | undefined {
-	if (recorded_bytes === undefined) return undefined
-	if (current_bytes <= recorded_bytes) return undefined
+	if (recorded_bytes === undefined || current_bytes <= recorded_bytes) return undefined
 
 	return document_byte_budget.over_budget_message(relative_path, current_bytes, recorded_bytes)
 }

package/scripts/document/entry-read-budget.ts

@@ -48,8 +48,8 @@ const ENTRY_READ_BUDGET: ReadonlyArray<EntryBudget> = [
 	{ entry: 'fullrun', bytes: 53_248 },
 	{ entry: 'halfrun', bytes: 49_152 },
 	{ entry: 'prrun', bytes: 57_344 },
-	{ entry: 'backlogrun', bytes: 90_112 },
-	{ entry: LANE_CHILD, bytes: 49_152 },
+	{ entry: 'backlogrun', bytes: 86_016 },
+	{ entry: LANE_CHILD, bytes: 45_056 },
 ]
 
 function byte_size(root: string, relative_path: string): number {

package/scripts/epic/epic-audit-rationale.ts

@@ -68,9 +68,15 @@ function order_pairs(
 	return links.flatMap((link) => {
 		const blocker = find_child(children, { repo: epic_repo, number: link.blocker })
 		const blocked = find_child(children, { repo: epic_repo, number: link.blocked })
-		if (blocker === undefined || blocked === undefined) return []
 
-		if (!is_open_local(blocker, current_repo) || !is_open_local(blocked, current_repo)) return []
+		if (
+			blocker === undefined ||
+			blocked === undefined ||
+			!is_open_local(blocker, current_repo) ||
+			!is_open_local(blocked, current_repo)
+		) {
+			return []
+		}
 
 		// eslint-disable-next-line unicorn/no-unnecessary-array-flat-map -- one return type (sonarjs/function-return-type)
 		return [{ blocker, blocked }]

package/scripts/epic/epic-bundle-cli.ts

@@ -323,12 +323,11 @@ async function widen_with_referenced(
 	backlog: FetchedBacklog,
 ): Promise<FetchedBacklog> {
 	const { context } = backlog
-	if (context === undefined) return backlog
 	// An issue an epic already tracks has nothing to bundle — `decide_bundle` answers from that alone
 	// and never looks at the candidates. Widening first spends a request per reference on a verdict
 	// that ignores them, and prints "⚠ Could not read #891." above "Already in an epic", which reads
 	// as a gap in an answer the read was never part of.
-	if (subject.epic !== undefined) return backlog
+	if (context === undefined || subject.epic !== undefined) return backlog
 	const known = new Set(backlog.issues.map((issue) => issue.number))
 	const found = await epic_bundle_referenced.referenced_candidates(subject, known, context)
 	if (found === undefined) return backlog

package/scripts/epic/epic-chains.ts

@@ -190,8 +190,12 @@ function find_position_ambiguity(
 	chains: Chains,
 	position: InsertPosition | undefined,
 ): string | undefined {
-	if (position?.kind !== 'before') return undefined
-	if (chains_containing(chains, position.target).length < AMBIGUOUS_MATCH_COUNT) return undefined
+	if (
+		position?.kind !== 'before' ||
+		chains_containing(chains, position.target).length < AMBIGUOUS_MATCH_COUNT
+	) {
+		return undefined
+	}
 
 	return to_ambiguous_position_error(position)
 }

package/scripts/epic/epic-close-comment.ts

@@ -66,8 +66,7 @@ function marker_children(line: string): Array<string> | undefined {
 	if (indent_of(line) >= INDENTED_CODE_SPACES) return undefined
 
 	const trimmed = line.trim()
-	if (!trimmed.startsWith(MARKER_OPEN)) return undefined
-	if (!trimmed.endsWith(MARKER_CLOSE)) return undefined
+	if (!trimmed.startsWith(MARKER_OPEN) || !trimmed.endsWith(MARKER_CLOSE)) return undefined
 
 	const listed = trimmed.slice(MARKER_OPEN.length, -MARKER_CLOSE.length)
 

package/scripts/gate/verification-gate.ts

@@ -328,8 +328,13 @@ interface GateOptions {
 // `--force` is the caller saying to run regardless. `scoped_green` owns the record and the `JOSH_SCOPED_GREEN`
 // escape hatch, so a person can always get past a record that is wrong about their tree.
 function scoped_precheck_refusal(tree: GateTree, options: GateOptions): string | undefined {
-	if (options.is_scoped_enforced !== true) return undefined
-	if (options.is_forced === true || options.is_unit_included === false) return undefined
+	if (
+		options.is_scoped_enforced !== true ||
+		options.is_forced === true ||
+		options.is_unit_included === false
+	) {
+		return undefined
+	}
 
 	return scoped_green.refusal_for(tree.files, tree.base, options.scoped_sources)
 }

package/scripts/gh/git-pr-ai-review.ts

@@ -89,6 +89,10 @@ async function fetch_review_comments(
 	return parsed?.map((comment) => to_review_comment(comment))
 }
 
+// The other choice both AI-review stops offer: a person who has looked records why and moves on.
+const IGNORE_ALTERNATIVE =
+	'Re-run `pnpm josh followup --ai-review-ignore-reason "<reason>"` if the gate does not apply'
+
 async function handle_blockers(input: {
 	branch_name: string
 	ignore_reason: string | undefined
@@ -105,7 +109,12 @@ async function handle_blockers(input: {
 		return
 	}
 
-	await git_pr_confirmation.notify_confirmation({ context: input.context, body })
+	await git_pr_confirmation.notify_confirmation({
+		context: input.context,
+		body,
+		recommended: 'Fix the findings and re-run `pnpm josh followup`',
+		alternatives: [IGNORE_ALTERNATIVE],
+	})
 
 	throw new Error(body)
 }
@@ -140,6 +149,8 @@ async function handle_unreadable_comments(input: {
 	await git_pr_confirmation.notify_confirmation({
 		context: input.context,
 		body: UNREADABLE_COMMENTS_BODY,
+		recommended: 'Re-run `pnpm josh followup` once the comments can be read',
+		alternatives: [IGNORE_ALTERNATIVE],
 	})
 
 	throw new Error(UNREADABLE_COMMENTS_BODY)

package/scripts/gh/git-pr-confirmation.ts

@@ -1,3 +1,7 @@
+import {
+	confirmation_options,
+	type ConfirmationOptions,
+} from '#scripts/notify/confirmation-options'
 import { telegram_notify, type TelegramSendInput } from '#scripts/notify/telegram-notify'
 
 // What to type when the confirmation notification itself could not be delivered.
@@ -5,7 +9,7 @@ import { telegram_notify, type TelegramSendInput } from '#scripts/notify/telegra
 // commands and a backtick inside shell double quotes is evaluated before the command runs.
 const CONFIRMATION_RECOVERY =
 	'send it by hand — `pnpm josh notify --task-type confirmation --issue-url <url> ' +
-	'--body-file <path>`'
+	'--body-file <path> --recommended "<choice>"`'
 
 interface TelegramContext {
 	repo_name: string | undefined
@@ -14,15 +18,18 @@ interface TelegramContext {
 	pr_url: string | undefined
 }
 
-function build_confirmation_input(input: {
+interface ConfirmationInput extends ConfirmationOptions {
 	context: TelegramContext
 	body: string
-}): TelegramSendInput {
+}
+
+function build_confirmation_input(input: ConfirmationInput): TelegramSendInput {
 	return {
 		task_type: 'confirmation',
 		repo_name: input.context.repo_name,
 		issue_title: input.context.issue_title,
 		body: input.body,
+		choices: confirmation_options.block(input),
 		issue_url: input.context.issue_url,
 		pr_url: input.context.pr_url,
 	}
@@ -34,10 +41,7 @@ function build_confirmation_input(input: {
 //
 // Unlike the completion notification, this one *has* a recovery: a `confirmation` is exactly what
 // `josh notify` is for, and the run stops here anyway, so re-sending it by hand loses nothing.
-async function notify_confirmation(input: {
-	context: TelegramContext
-	body: string
-}): Promise<void> {
+async function notify_confirmation(input: ConfirmationInput): Promise<void> {
 	await telegram_notify.send_or_report(build_confirmation_input(input), CONFIRMATION_RECOVERY)
 }
 

package/scripts/gh/git-pr.ts

@@ -173,8 +173,12 @@ function build_body(issue_info: IssueInfo, extra_body?: string): string {
 }
 
 async function existing_pr_label(branch_name: string): Promise<ReleaseClassification | undefined> {
-	if (!(await git_gh_command.pr_exists(branch_name))) return undefined
-	if (is_pr_state_merged(await get_pr_state(branch_name))) return undefined
+	if (
+		!(await git_gh_command.pr_exists(branch_name)) ||
+		is_pr_state_merged(await get_pr_state(branch_name))
+	) {
+		return undefined
+	}
 
 	return await git_gh_command.pr_get_classification(branch_name)
 }

package/scripts/git/git-common-directory.ts

@@ -88,9 +88,9 @@ function select_linked(found: ReadonlyArray<string>): string | undefined {
 	const own_directory = found[OWN_GIT_DIRECTORY]
 	const common = found[COMMON_GIT_DIRECTORY]
 
-	return own_directory !== undefined && common !== undefined && own_directory !== common
-		? common
-		: undefined
+	return own_directory === undefined || common === undefined || own_directory === common
+		? undefined
+		: common
 }
 
 function resolve(cwd: string): string | undefined {

package/scripts/git/git-diff-reads.ts

@@ -9,19 +9,24 @@ const REFS_REMOTES_ORIGIN_PREFIX = 'refs/remotes/origin/'
 const NAME_ONLY_FLAG = '--name-only'
 const DEFAULT_BRANCH_FALLBACK = 'main'
 
+const DEFAULT_BRANCH_ARGUMENTS = ['symbolic-ref', 'refs/remotes/origin/HEAD'] as const
+
+// The default branch `DEFAULT_BRANCH_ARGUMENTS` names, or the fallback for a missing or unexpected
+// answer — shared with the synchronous read the implementation-cut guard takes it with.
+function default_branch_of(output: string | undefined): string {
+	const trimmed = output?.trim() ?? ''
+
+	if (!trimmed.startsWith(REFS_REMOTES_ORIGIN_PREFIX)) return DEFAULT_BRANCH_FALLBACK
+
+	return trimmed.slice(REFS_REMOTES_ORIGIN_PREFIX.length)
+}
+
 async function get_default_branch(): Promise<string> {
 	try {
-		const output = await git_spawn.read(['symbolic-ref', 'refs/remotes/origin/HEAD'])
-		const trimmed = output.trim()
-
-		if (trimmed.startsWith(REFS_REMOTES_ORIGIN_PREFIX)) {
-			return trimmed.slice(REFS_REMOTES_ORIGIN_PREFIX.length)
-		}
+		return default_branch_of(await git_spawn.read([...DEFAULT_BRANCH_ARGUMENTS]))
 	} catch {
-		// fall through to default
+		return DEFAULT_BRANCH_FALLBACK
 	}
-
-	return DEFAULT_BRANCH_FALLBACK
 }
 
 const MERGE_BASE_COMMAND = 'merge-base'
@@ -210,8 +215,10 @@ async function untracked_names(): Promise<string> {
 }
 
 const git_diff_reads = {
+	DEFAULT_BRANCH_ARGUMENTS,
 	change_base,
 	change_base_commit,
+	default_branch_of,
 	default_branch_reference,
 	diff_cached_names,
 	diff_main,

package/scripts/git/git-execa-error.ts

@@ -1,8 +1,7 @@
 // Extract the exit code from a thrown execa error. Returns the numeric exit code,
 // or undefined when the process was terminated by a signal or failed to spawn.
 function get_exit_code(error: unknown): number | undefined {
-	if (typeof error !== 'object' || error === null) return undefined
-	if (!('exitCode' in error)) return undefined
+	if (typeof error !== 'object' || error === null || !('exitCode' in error)) return undefined
 
 	const { exitCode: exit_code } = error
 

package/scripts/hooks/format-edited-file.ts

@@ -251,8 +251,13 @@ function plan_daemon_restart(
 ): ReadonlyArray<FormatCommand> {
 	const relative = relative_to_root(project_root, file_path)
 
-	if (relative === undefined || !is_eslint_config_input(relative)) return []
-	if (resolve_daemon_cli(ESLINT_DAEMON, project_root) === undefined) return []
+	if (
+		relative === undefined ||
+		!is_eslint_config_input(relative) ||
+		resolve_daemon_cli(ESLINT_DAEMON, project_root) === undefined
+	) {
+		return []
+	}
 
 	return [{ bin: ESLINT_DAEMON, command_arguments: [DAEMON_RESTART] }]
 }
@@ -325,8 +330,9 @@ async function run_command(command: FormatCommand, project_root: string): Promis
 // something to say. A start failure (non-zero, empty) has already been retried and carries no
 // problems, and prettier's stdout is the list of files it wrote rather than anything to act on.
 function eslint_unfixed(command: FormatCommand, outcome: CommandOutcome): string | undefined {
-	if (command.bin !== ESLINT_BIN) return undefined
-	if (outcome.exit_code === 0 || outcome.stdout.length === 0) return undefined
+	if (command.bin !== ESLINT_BIN || outcome.exit_code === 0 || outcome.stdout.length === 0) {
+		return undefined
+	}
 
 	return outcome.stdout
 }

package/scripts/hooks/pre-push-unit.ts

@@ -1,5 +1,7 @@
 #!/usr/bin/env tsx
 import { fileURLToPath } from 'node:url'
+import { core_budget } from '#scripts/gate/core-budget'
+import { gate_plan } from '#scripts/gate/gate-plan'
 import { gate_skip, type GateReuse } from '#scripts/gate/gate-skip'
 import { gate_tree, type GateTree } from '#scripts/gate/gate-tree'
 import { hook_gate_reuse } from '#scripts/gate/hook-gate-reuse'
@@ -123,6 +125,18 @@ function format_miss(reason: string): string {
 	return `↻ running the whole unit suite — the green gate record does not cover this push: ${reason}.`
 }
 
+// **The whole suite claims its place in the core budget, the one `josh test:unit` claims.** Without it
+// a push's suite ran beside other lanes' gates off the ledger, so their admission saw its workers only
+// as foreign load (joshuafolkken/kit#3874). Only the miss reserves: a reused record runs nothing, and a
+// claim there could make a push wait out a full ledger for a suite it then skips.
+async function run_reserved_suite(vitest_arguments: ReadonlyArray<string>): Promise<number> {
+	return await core_budget.with_command_reservation(
+		gate_plan.direct_unit_weight(),
+		async () => await test_unit_guard.run_guarded_unit(process.cwd(), vitest_arguments),
+		{ memory_mb: gate_plan.direct_unit_memory() },
+	)
+}
+
 async function run_pre_push_unit(
 	extra_arguments: ReadonlyArray<string> = [],
 	source?: string,
@@ -132,10 +146,7 @@ async function run_pre_push_unit(
 	if ('miss' in reuse) {
 		process.stdout.write(`${format_miss(reuse.miss)}\n`)
 
-		return await test_unit_guard.run_guarded_unit(
-			process.cwd(),
-			forwarded_arguments(extra_arguments),
-		)
+		return await run_reserved_suite(forwarded_arguments(extra_arguments))
 	}
 
 	process.stdout.write(`${format_skip(reuse.stamp.taken_at)}\n`)

package/scripts/hooks/pretool-guard.ts

@@ -1,5 +1,5 @@
 import { duplicate_read_outcome } from '#scripts/delegation/duplicate-read-guard'
-import { investigation_refusal } from '#scripts/delegation/investigation-guard'
+import { investigation_outcome } from '#scripts/delegation/investigation-guard'
 import { issue_watch_hook } from '#scripts/issue/issue-watch-hook'
 import { hook_decision, type GuardOutcome } from '#scripts/josh/hook-decision'
 import { lane_phase } from '#scripts/lane/lane-phase'
@@ -25,35 +25,30 @@ import { step_zero_notice } from './step-zero-notice'
 // union matcher (`Bash|Edit|Read|Write|AskUserQuestion`) refuses exactly what the three separate
 // entries did — `AskUserQuestion` is matched for the rule guard's lane-child interactive-ask row,
 // and the batching and investigation guards self-gate away from it. A
-// refusal from any guard wins first; only when none refuses is the batch guard's non-blocking notice
-// (the whole-file-write notice) emitted. Each guard still honours its own
+// refusal from any guard wins first; only when none refuses is a guard's non-blocking notice or fault
+// (the whole-file-write notice, a lane child's investigation notice) emitted. Each guard still honours its own
 // switch (`JOSH_BATCH_GUARD` / `JOSH_INVESTIGATION_GUARD` / `JOSH_RULE_GUARD`) internally, so this
 // process needs no switch of its own.
 
-// Fold the guards' verdicts into one. A refusal wins over everything else, and the batch guard's
-// reason is shown first to match the entry order the separate hooks had. When nothing refuses,
-// whatever the batch guard reported (a notice, a fault, or nothing) passes through untouched.
-function combine_outcomes(batch: GuardOutcome, extra_reason: string | undefined): GuardOutcome {
-	if (batch.reason !== undefined) return batch
-
-	if (extra_reason !== undefined) {
-		return { reason: extra_reason, notice: undefined, fault: undefined }
-	}
-
-	return batch
-}
+const CLEAR: GuardOutcome = { reason: undefined, notice: undefined, fault: undefined }
 
 function is_clear(outcome: GuardOutcome): boolean {
 	return outcome.reason === undefined && outcome.notice === undefined && outcome.fault === undefined
 }
 
-// The duplicate-read guard is `notice`-mode in a lane child, so it is the second guard that can raise a
-// non-refusal notice. Its notice is surfaced only where nothing else spoke —
-// a refusal from any guard, or the batch guard's own notice, wins first.
-function with_duplicate_notice(combined: GuardOutcome, notice: string | undefined): GuardOutcome {
-	if (notice === undefined || !is_clear(combined)) return combined
+// Fold the guards' verdicts into one. A refusal wins over everything else, in the entry order the
+// separate hooks had: the outcomes in the order given, then the rule guard's reason. When nothing
+// refuses, the first guard that spoke passes its notice or fault through untouched — so a lane child's
+// `notice`-mode guidance reaches the model rather than only spending its stamp (joshuafolkken/kit#3877).
+function combine_outcomes(
+	outcomes: ReadonlyArray<GuardOutcome>,
+	rule_reason: string | undefined,
+): GuardOutcome {
+	const reason = outcomes.find((outcome) => outcome.reason !== undefined)?.reason ?? rule_reason
 
-	return { reason: undefined, notice, fault: undefined }
+	if (reason !== undefined) return { reason, notice: undefined, fault: undefined }
+
+	return outcomes.find((outcome) => !is_clear(outcome)) ?? CLEAR
 }
 
 // The Step 0 reminder is the last word: asked only where every guard stayed
@@ -70,14 +65,13 @@ function with_step_zero_notice(outcome: GuardOutcome, raw_payload: string): Guar
 // once-per-run stamp, so short-circuiting on the first refusal would change which guard is allowed to
 // fire on a later call.
 function guard_outcome(raw_payload: string): GuardOutcome {
-	const batch = batch_outcome(raw_payload)
-	const investigation = investigation_refusal(raw_payload)
-	const duplicate = duplicate_read_outcome(raw_payload)
-	const rule = delivered_rules.delivery(raw_payload)
-	const duplicate_refusal = duplicate.reason
-	const combined = combine_outcomes(batch, investigation ?? duplicate_refusal ?? rule)
+	const outcomes = [
+		batch_outcome(raw_payload),
+		investigation_outcome(raw_payload),
+		duplicate_read_outcome(raw_payload),
+	]
 
-	return with_duplicate_notice(combined, duplicate.notice)
+	return combine_outcomes(outcomes, delivered_rules.delivery(raw_payload))
 }
 
 // The synchronous verdict the Codex adapter asks for, with the Step 0 reminder as its last layer.
@@ -191,7 +185,7 @@ function pipefail_envelope(
 ): string | undefined {
 	if (input === undefined || outcome.reason !== undefined) return undefined
 
-	return hook_decision.rewrite_envelope(
+	return hook_decision.flow_rewrite_envelope(
 		input,
 		rewrite_context(piped_verification.PIPEFAIL_NOTE, outcome),
 	)