@joshuafolkken/kit 1.1050.0 → 1.1094.0

package/scripts/gate/project-checks.ts

@@ -2,6 +2,7 @@ import { existsSync, globSync, readFileSync } from 'node:fs'
 import path from 'node:path'
 import { find_local_bin_upwards } from '#scripts/build/local-bin'
 import { project_profile } from '#scripts/init/project-profile'
+import { json_value } from '#scripts/lib/json-value'
 import { SKIP_MARKER } from '#scripts/test/skip-marker'
 import { z } from 'zod'
 
@@ -70,23 +71,23 @@ function has_bin(directory: string, bin_name: string): boolean {
 }
 
 function josh_settings(manifest: unknown): unknown {
-	if (typeof manifest !== 'object' || manifest === null || !('josh' in manifest)) return undefined
-
-	return manifest.josh
+	return json_value.is_record(manifest) ? manifest['josh'] : undefined
 }
 
 function is_basic_manifest(manifest: unknown): boolean {
 	const josh = josh_settings(manifest)
-	if (typeof josh !== 'object' || josh === null || !('profile' in josh)) return false
+	if (!json_value.is_record(josh)) return false
 
-	return project_profile.parse_profile(josh.profile) === 'basic'
+	return project_profile.parse_profile(josh['profile']) === 'basic'
 }
 
+// The try covers the read alone — a missing or unreadable manifest — since the parse already answers
+// `undefined` for text that is not JSON.
 function read_manifest(directory: string): unknown {
 	try {
 		const manifest_path = path.join(project_root(directory), PACKAGE_JSON)
 
-		return JSON.parse(readFileSync(manifest_path, 'utf8'))
+		return json_value.parse_or_undefined(readFileSync(manifest_path, 'utf8'))
 	} catch {
 		return undefined
 	}
@@ -158,8 +159,6 @@ function eslint_skip_reason(directory: string): string | undefined {
 const project_checks = {
 	CSPELL_CONFIGS,
 	ESLINT_CONFIGS,
-	SCRIPT_FILES,
-	TYPE_CONFIGS,
 	TYPE_FILES,
 	WEB_FILES,
 	eslint_skip_reason,

package/scripts/gate/scoped-green.ts

@@ -252,7 +252,6 @@ const scoped_green = {
 	read_before,
 	record_green,
 	record_if_green,
-	refusal,
 	refusal_for,
 }
 

package/scripts/gate/type-check-step.ts

@@ -74,6 +74,7 @@ async function resolve_toolkit_step(
 // The command the gate spawns through `pnpm`, so a toolkit step resolves the same shim `pnpm` would.
 async function resolve_type_check_args(start_directory: string): Promise<ReadonlyArray<string>> {
 	for (const bin_name of TOOLKIT_BINS) {
+		// eslint-disable-next-line no-await-in-loop -- the first toolkit bin that resolves wins
 		const step = await resolve_toolkit_step(start_directory, bin_name)
 		if (step !== undefined) return step
 	}
@@ -83,7 +84,6 @@ async function resolve_type_check_args(start_directory: string): Promise<Readonl
 
 const type_check_step = {
 	parse_usage_commands,
-	resolve_toolkit_step,
 	resolve_type_check_args,
 }
 

package/scripts/gate/verification-gate.ts

@@ -488,10 +488,8 @@ const verification_gate = {
 	mark_gate_running,
 	record_green_gate,
 	run_gate_steps,
-	run_marked_gate,
 	scoped_precheck_refusal,
 	with_gate_marker,
-	run_checked_gate,
 	run_gate_command,
 	run_gate_step,
 	run_verification_gate,

package/scripts/gh/fix-gh-packages.ts

@@ -1,7 +1,9 @@
 import { existsSync, readFileSync, realpathSync, writeFileSync } from 'node:fs'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
+import { bounded_pool } from '#scripts/lib/bounded-pool'
 import { file_reader } from '#scripts/lib/read-file'
+import { timed_fetch } from '#scripts/lib/timed-fetch'
 import { z } from 'zod'
 import { fix_gh_packages_logic, type LockfilePackage } from './fix-gh-packages-logic'
 import { gh_cli_token } from './gh-cli-token'
@@ -9,7 +11,8 @@ import { gh_cli_token } from './gh-cli-token'
 const LOCKFILE = 'pnpm-lock.yaml'
 const NPMRC = '.npmrc'
 const GH_PACKAGES_HOST = 'npm.pkg.github.com'
-const FETCH_TIMEOUT_MS = 10_000
+// The packument reads are independent; the width keeps a large lockfile from bursting the registry.
+const FETCH_CONCURRENCY = 8
 
 const npm_distribution_schema = z.looseObject({ tarball: z.string().optional() })
 const npm_version_schema = z.looseObject({ dist: npm_distribution_schema.optional() })
@@ -42,10 +45,7 @@ async function fetch_tarball_url(
 	token: string,
 ): Promise<string | undefined> {
 	const url = `https://${GH_PACKAGES_HOST}/${package_path}`
-	const response = await fetch(url, {
-		headers: { Authorization: `Bearer ${token}` },
-		signal: AbortSignal.timeout(FETCH_TIMEOUT_MS),
-	})
+	const response = await timed_fetch(url, { headers: { Authorization: `Bearer ${token}` } })
 
 	if (!response.ok) {
 		console.warn(`fix-gh-packages: fetch failed for ${package_path} (${String(response.status)})`)
@@ -79,14 +79,13 @@ async function collect_fixes(
 	scopes: Set<string>,
 	token: string,
 ): Promise<Map<string, string>> {
-	const fixes = new Map<string, string>()
-
-	for (const [key, entry] of Object.entries(packages)) {
-		const pair = await process_package_entry(key, entry, scopes, token)
-		if (pair !== undefined) fixes.set(pair[0], pair[1])
-	}
+	const pairs = await bounded_pool.bounded_map(
+		Object.entries(packages),
+		FETCH_CONCURRENCY,
+		async ([key, entry]) => await process_package_entry(key, entry, scopes, token),
+	)
 
-	return fixes
+	return new Map(pairs.filter((pair) => pair !== undefined))
 }
 
 async function apply_fixes(cwd: string, scopes: Set<string>, token: string): Promise<void> {
@@ -128,3 +127,7 @@ async function main(): Promise<void> {
 
 const [, argv1] = process.argv
 if (argv1 !== undefined && realpathSync(argv1) === fileURLToPath(import.meta.url)) await main()
+
+const fix_gh_packages = { collect_fixes }
+
+export { fix_gh_packages }

package/scripts/gh/gh-spawn.ts

@@ -1,6 +1,6 @@
-import { git_gh_api_path } from '#scripts/git/git-gh-api-path'
-import { git_gh_exec } from '#scripts/git/git-gh-exec'
 import { PROJECT_ROOT } from '#scripts/init/init-paths'
+import { git_gh_api_path } from './git-gh-api-path'
+import { git_gh_exec } from './git-gh-exec'
 
 // The synchronous twin of `git_gh_repo.repo_get_name_with_owner`: same fact, read the same way, but
 // synchronously because `josh init` / `josh sync` / `josh doctor` decide before they can await.

package/scripts/{git → gh}/git-ai-review-scan.ts

@@ -146,9 +146,5 @@ function classify_ai_review_comments(comments: ReadonlyArray<ReviewComment>): Cl
 	}
 }
 
-const git_ai_review_scan = {
-	classify_ai_review_comments,
-}
-
-export { git_ai_review_scan, classify_ai_review_comments }
+export { classify_ai_review_comments }
 export type { ReviewComment, ClassifiedFinding, ClassifiedFindings, FindingKind }

package/scripts/{git → gh}/git-gh-check.ts

@@ -1,3 +1,4 @@
+import { COMMAND_TIMEOUT_MS } from '#scripts/lib/timeouts'
 import { execa } from 'execa'
 
 const GH_NOT_INSTALLED_MSG = 'gh CLI is not installed. Install it from https://cli.github.com/'
@@ -6,7 +7,7 @@ const gh_check: { promise?: Promise<void> } = {}
 
 async function run_gh_check(): Promise<void> {
 	try {
-		await execa('gh', ['--version'])
+		await execa('gh', ['--version'], { timeout: COMMAND_TIMEOUT_MS })
 	} catch {
 		delete gh_check.promise
 		throw new Error(GH_NOT_INSTALLED_MSG)

package/scripts/{git → gh}/git-gh-exec.ts

@@ -1,7 +1,7 @@
+import { has_timed_out } from '#scripts/git/git-execa-error'
 import { agent_session_environment } from '#scripts/josh/agent-session-environment'
 import { error_text } from '#scripts/lib/error-message'
 import { execa, execaSync } from 'execa'
-import { has_timed_out } from './git-execa-error'
 import { check_gh_installed } from './git-gh-check'
 import { gh_failure } from './git-gh-failure'
 

package/scripts/{git → gh}/git-gh-failure.ts

@@ -1,5 +1,5 @@
+import { parse_json } from '#scripts/git/parse-json-array'
 import { z } from 'zod'
-import { parse_json } from './parse-json-array'
 
 // Why one `gh api` request failed, taken from **that request** rather than from a later probe
 // (joshuafolkken/kit#1690).

package/scripts/{git → gh}/git-gh-helpers.ts

@@ -36,7 +36,6 @@ function handle_pr_create_error(error: unknown): never {
 
 const git_gh_helpers = {
 	parse_pr_state_string,
-	is_pr_already_exists_message,
 	get_error_message_with_stderr,
 	handle_pr_create_error,
 }

package/scripts/{git → gh}/git-gh-issue-list.ts

@@ -178,6 +178,7 @@ async function fetch_selected(request: IssueListRequest): Promise<SelectedRows>
 	let has_more = true
 
 	while (page <= MAX_PAGES && wants_more(has_more, selected.length, request.limit)) {
+		// eslint-disable-next-line no-await-in-loop -- paging stops as soon as enough rows are selected
 		const result = await fetch_page(request, page)
 
 		selected.push(...result.selected)
@@ -207,6 +208,7 @@ async function read_relations(
 	const relations: Array<BlockedBy> = []
 
 	for (const row of rows) {
+		// eslint-disable-next-line no-await-in-loop -- paced reads, so a rate limit does not fail rows
 		relations.push(await read_blocked_by(String(row.number), row, repo))
 	}
 

package/scripts/{git → gh}/git-gh-issue-read.ts

@@ -1,3 +1,4 @@
+import type { IssueReference } from '#scripts/issue/issue-reference'
 import { git_gh_api_path } from './git-gh-api-path'
 import { git_gh_exec } from './git-gh-exec'
 import { gh_failure, type GhFailure } from './git-gh-failure'
@@ -9,7 +10,6 @@ import {
 	type RestIssue,
 } from './git-gh-issue-rest'
 import { gh_reachability } from './git-gh-reachability'
-import type { IssueReference } from './issue-reference'
 
 // Reading one issue. Split out of `git-gh-issue.ts`, which had grown past the file-length limit
 // while holding both the reads and the writes; the reads are what every epic command goes through,

package/scripts/{git → gh}/git-gh-issue-rest.ts

@@ -1,8 +1,11 @@
+import {
+	parse_json_array_or_undefined,
+	parse_json_object_safe,
+} from '#scripts/git/parse-json-array'
+import { blocking_issue_schema } from '#scripts/git/schemas'
+import type { IssueReference } from '#scripts/issue/issue-reference'
 import { z } from 'zod'
 import { MERGED_STATE, to_gh_state } from './git-gh-rest-state'
-import type { IssueReference } from './issue-reference'
-import { parse_json_array_or_undefined, parse_json_object_safe } from './parse-json-array'
-import { blocking_issue_schema } from './schemas'
 
 // The translation between one REST issue (`repos/{owner}/{repo}/issues/{N}`) and the JSON shape
 // `gh issue view --json <fields>` used to answer with.

package/scripts/{git → gh}/git-gh-pr-read.ts

@@ -77,6 +77,12 @@ async function fetch_pr_number(branch_name: string): Promise<number | undefined>
 // distinction is the point. The *classification* is cheaper here and needs no status probe: a branch
 // with no pull request is a 200 with an empty listing rather than a 404, so the lookup's own outcome
 // already separates them (joshuafolkken/kit#1048).
+interface PullMergeState {
+	is_merged: boolean
+	merged_at: string | undefined
+	head_sha: string | undefined
+}
+
 type PullNumberRead =
 	{ kind: 'read'; pr_number: number } | { kind: 'missing' } | { kind: 'unreadable'; cause: unknown }
 
@@ -215,6 +221,22 @@ async function pr_get_url(branch_name: string): Promise<string | undefined> {
 	return git_gh_helpers.parse_pr_state_string(pull.html_url)
 }
 
+// **Where the branch's pull request stands** — a merge a person made by hand included
+// (joshuafolkken/kit#3023): whether it merged and when, and the commit its head is on, which a push
+// made on GitHub moves without touching the local branch. `undefined` covers both "no pull request"
+// and "nothing could be read": `followup` then takes its ordinary path, whose merge step settles a
+// pull request that did merge after all (`pr_merge`), so an unread answer costs a wait, not a wrong tail.
+async function pr_get_merge_state(branch_name: string): Promise<PullMergeState | undefined> {
+	const pull = await read_pull_of_branch(branch_name)
+	if (pull === undefined) return undefined
+
+	return {
+		is_merged: git_gh_pr_rest.is_merged(pull),
+		merged_at: pull.merged_at ?? undefined,
+		head_sha: pull.head?.sha,
+	}
+}
+
 // REST answers JSON null for a pull request with no body where `gh --json body` answered an empty
 // string, and both used to arrive here as the empty answer this folds to `undefined`.
 async function pr_get_body(branch_name: string): Promise<string | undefined> {
@@ -281,6 +303,7 @@ const git_gh_pr_read = {
 	pr_get_number,
 	pr_get_url,
 	pr_get_body,
+	pr_get_merge_state,
 	pr_view,
 	pr_get_comments,
 	pr_get_review_comments,
@@ -290,6 +313,7 @@ const git_gh_pr_read = {
 // needs them separately: the reviews endpoint is keyed by number while the rollup is keyed by the
 // head commit the detail carries. Exported rather than re-derived so the memo above stays one memo
 // (joshuafolkken/kit#1028).
+export type { PullMergeState }
 export {
 	git_gh_pr_read,
 	forget_pr_numbers,

package/scripts/{git → gh}/git-gh-pr-rest.ts

@@ -1,7 +1,10 @@
+import {
+	parse_json_array_or_undefined,
+	parse_json_object_safe,
+} from '#scripts/git/parse-json-array'
+import { rest_comment_schema } from '#scripts/git/schemas'
 import { z } from 'zod'
 import { MERGED_STATE, to_gh_state } from './git-gh-rest-state'
-import { parse_json_array_or_undefined, parse_json_object_safe } from './parse-json-array'
-import { rest_comment_schema } from './schemas'
 
 // The translation between one REST pull request (`repos/{owner}/{repo}/pulls/{N}`) and the JSON
 // shape `gh pr view --json <fields>` used to answer with.

package/scripts/{git → gh}/git-gh-pr-review.ts

@@ -1,5 +1,5 @@
+import { parse_json_array_or_undefined } from '#scripts/git/parse-json-array'
 import { z } from 'zod'
-import { parse_json_array_or_undefined } from './parse-json-array'
 
 // GraphQL's `reviewDecision`, rebuilt from the review history REST serves.
 //
@@ -90,7 +90,7 @@ function to_review_decision(reviews_json: string): string {
 	return latest.has(REVIEW_APPROVED) ? REVIEW_APPROVED : REVIEW_NONE
 }
 
-const git_gh_pr_review = { to_review_decision, parse_rest_reviews }
+const git_gh_pr_review = { to_review_decision }
 
 export {
 	git_gh_pr_review,

package/scripts/{git → gh}/git-gh-pr-rollup.ts

@@ -1,5 +1,5 @@
+import { parse_json_array_or_undefined } from '#scripts/git/parse-json-array'
 import { z } from 'zod'
-import { parse_json_array_or_undefined } from './parse-json-array'
 
 // The two REST listings `gh pr view --json statusCheckRollup` served as one array, merged back into
 // that one array.
@@ -145,8 +145,6 @@ function to_status_check_rollup(input: {
 }
 
 const git_gh_pr_rollup = {
-	to_check_run_items,
-	to_status_context_items,
 	to_status_check_rollup,
 }
 

package/scripts/{git → gh}/git-gh-pr.ts

@@ -1,7 +1,7 @@
 import { pr_classification, type ReleaseClassification } from '#scripts/ci/pr-classification'
+import { git_command } from '#scripts/git/git-command'
 import { poll } from '#scripts/lib/poll'
 import { z } from 'zod'
-import { git_command } from './git-command'
 import { git_gh_api_path } from './git-gh-api-path'
 import { git_gh_exec } from './git-gh-exec'
 import { git_gh_helpers } from './git-gh-helpers'
@@ -207,9 +207,11 @@ async function sleep_between_read_backs(attempt: number): Promise<void> {
 // happen" from a read nobody got.
 async function has_merge_landed(pr_number: number, merge_error: unknown): Promise<boolean> {
 	for (let attempt = 0; attempt < MERGE_READ_BACK_ATTEMPTS; attempt += 1) {
+		// eslint-disable-next-line no-await-in-loop -- a retry runs only after the previous attempt has answered
 		const is_merged = await read_merge_state(pr_number)
 		if (is_merged !== undefined) return is_merged
 
+		// eslint-disable-next-line no-await-in-loop -- a retry runs only after the previous attempt has answered
 		await sleep_between_read_backs(attempt)
 	}
 

package/scripts/{git → gh}/git-pr-ai-review.ts

@@ -1,4 +1,6 @@
 // cspell:words coderabbit coderabbitai
+import { parse_json_array_or_undefined } from '#scripts/git/parse-json-array'
+import { ai_review_pull_comment_schema } from '#scripts/git/schemas'
 import {
 	classify_ai_review_comments,
 	type ClassifiedFinding,
@@ -6,8 +8,6 @@ import {
 } from './git-ai-review-scan'
 import { git_gh_command } from './git-gh-command'
 import { git_pr_confirmation, has_ignore_reason, type TelegramContext } from './git-pr-confirmation'
-import { parse_json_array_or_undefined } from './parse-json-array'
-import { ai_review_pull_comment_schema } from './schemas'
 
 interface AiReviewPullComment {
 	body?: string | undefined
@@ -163,9 +163,6 @@ async function handle_ai_review_findings(input: {
 
 const git_pr_ai_review = {
 	handle_ai_review_findings,
-	parse_ai_review_comments,
-	to_review_comment,
-	has_ignore_reason,
 }
 
 export {

package/scripts/{git → gh}/git-pr-checks-eval.ts

@@ -240,17 +240,7 @@ function is_auto_merge_blocked(snapshot: PrStateSnapshot): boolean {
 	)
 }
 
-const git_pr_checks_eval = {
-	evaluate_pr_state,
-	is_review_decision_decisive,
-	read_required_statuses,
-	is_coderabbit_check,
-	collect_blocking_failures,
-	describe_pr_failure,
-}
-
 export {
-	git_pr_checks_eval,
 	evaluate_pr_state,
 	is_auto_merge_blocked,
 	is_review_decision_decisive,

package/scripts/{git → gh}/git-pr-checks-parse.ts

@@ -1,4 +1,5 @@
-import { pr_raw_schema, type RollupItemData } from './schemas'
+import { pr_raw_schema, type RollupItemData } from '#scripts/git/schemas'
+import { json_value } from '#scripts/lib/json-value'
 
 const CHECK_STATUS_PASS = 'pass'
 const CHECK_STATUS_PENDING = 'pending'
@@ -92,14 +93,6 @@ function read_rollup_array(parsed: unknown): Array<RollupItemData> {
 	return result.data.statusCheckRollup ?? []
 }
 
-function parse_json_safe(raw_json: string): unknown {
-	try {
-		return JSON.parse(raw_json)
-	} catch {
-		return undefined
-	}
-}
-
 function parse_rollup_item(item: RollupItemData): RollupCheck | undefined {
 	const name = read_string(item[KEY_NAME]) ?? read_string(item[KEY_CONTEXT])
 	if (name === undefined) return undefined
@@ -108,7 +101,7 @@ function parse_rollup_item(item: RollupItemData): RollupCheck | undefined {
 }
 
 function parse_rollup_checks(raw_json: string): Array<RollupCheck> {
-	const parsed = parse_json_safe(raw_json)
+	const parsed = json_value.parse_or_undefined(raw_json)
 	const rollup = read_rollup_array(parsed)
 	const checks: Array<RollupCheck> = []
 
@@ -121,7 +114,7 @@ function parse_rollup_checks(raw_json: string): Array<RollupCheck> {
 }
 
 function parse_pr_state_snapshot(raw_json: string): PrStateSnapshot {
-	const parsed = parse_json_safe(raw_json)
+	const parsed = json_value.parse_or_undefined(raw_json)
 	const result = pr_raw_schema.safeParse(parsed)
 	const data = result.success ? result.data : undefined
 
@@ -132,17 +125,8 @@ function parse_pr_state_snapshot(raw_json: string): PrStateSnapshot {
 	}
 }
 
-const git_pr_checks_parse = {
-	parse_rollup_checks,
-	parse_json_safe,
-	read_string,
-	parse_pr_state_snapshot,
-}
-
 export {
-	git_pr_checks_parse,
 	parse_rollup_checks,
-	parse_json_safe,
 	read_string,
 	parse_pr_state_snapshot,
 	CHECK_STATUS_PASS,

package/scripts/{git → gh}/git-pr-checks.ts

@@ -1,3 +1,4 @@
+import { package_name_schema } from '#scripts/git/schemas'
 import { poll } from '#scripts/lib/poll'
 import { git_gh_pr_auto_merge } from './git-gh-pr-auto-merge'
 import { git_gh_pr_snapshot } from './git-gh-pr-snapshot'
@@ -9,7 +10,6 @@ import {
 	type PrEvaluation,
 } from './git-pr-checks-eval'
 import { parse_pr_state_snapshot, read_string, type PrStateSnapshot } from './git-pr-checks-parse'
-import { package_name_schema } from './schemas'
 
 const SECONDS_TO_MS = 1000
 const CHECK_WAIT_INTERVAL_MS = 10_000
@@ -262,6 +262,7 @@ async function wait_for_pr_success(options: WaitForPrSuccessOptions): Promise<Pr
 
 	for (let attempt = 0; attempt < options.max_attempts; attempt += 1) {
 		console.info(`Checking PR status… (${String(attempt + 1)}/${String(options.max_attempts)})`)
+		// eslint-disable-next-line no-await-in-loop -- polling: each read waits on the state the previous one saw
 		carried = await attempt_pr_success_poll({
 			options,
 			stable_count: carried.next_stable_count,

package/scripts/{git → gh}/git-pr-coderabbit.ts

@@ -1,7 +1,7 @@
+import { parse_json_array_or_undefined } from '#scripts/git/parse-json-array'
+import { pull_comment_schema } from '#scripts/git/schemas'
 import { git_gh_command } from './git-gh-command'
 import { has_ignore_reason } from './git-pr-ai-review'
-import { parse_json_array_or_undefined } from './parse-json-array'
-import { pull_comment_schema } from './schemas'
 
 // cspell:words coderabbit coderabbitai
 
@@ -120,9 +120,6 @@ async function handle_coderabbit_findings(input: {
 }
 
 const git_pr_coderabbit = {
-	parse_pull_comments,
-	read_unresolved_cr_urls,
-	build_ignore_reason_comment,
 	handle_coderabbit_findings,
 }
 

package/scripts/{git → gh}/git-pr-confirmation.ts

@@ -1,4 +1,4 @@
-import { telegram_notify, type TelegramSendInput } from './telegram-notify'
+import { telegram_notify, type TelegramSendInput } from '#scripts/notify/telegram-notify'
 
 // What to type when the confirmation notification itself could not be delivered
 // (joshuafolkken/kit#1564). The `--body-file` spelling rather than `--body`, because the body names
@@ -53,8 +53,6 @@ function has_ignore_reason(reason: string | undefined): reason is string {
 // gates drift apart.
 const git_pr_confirmation = {
 	notify_confirmation,
-	build_confirmation_input,
-	has_ignore_reason,
 }
 
 // `has_ignore_reason` stays a named export beside the namespace: `git-pr-coderabbit.ts` imports it

package/scripts/{git → gh}/git-pr-managed-config.ts

@@ -1,6 +1,6 @@
+import { changed_paths } from '#scripts/git/changed-paths'
+import { git_command } from '#scripts/git/git-command'
 import { managed_config_scope, type ManagedHit } from '#scripts/sync/managed-config-scope'
-import { changed_paths } from './changed-paths'
-import { git_command } from './git-command'
 
 // **The tracked diff against the merge base — untracked files excluded.**
 // `changed_paths.read_changed_paths(false)` appends the untracked files as well, and those are not in
@@ -63,7 +63,6 @@ async function handle_managed_config_changes(input: {
 
 const git_pr_managed_config = {
 	handle_managed_config_changes,
-	build_report,
 }
 
 export { git_pr_managed_config }

package/scripts/{git → gh}/git-pr.ts

@@ -1,10 +1,10 @@
 import { pr_classification, type ReleaseClassification } from '#scripts/ci/pr-classification'
-import { animation_helpers, type AnimationOptions } from './animation-helpers'
+import type { IssueInfo } from '#scripts/git/git-issue'
+import { pr_info_schema } from '#scripts/git/schemas'
+import { animation_helpers, type AnimationOptions } from '#scripts/lib/animation-helpers'
 import { git_gh_command } from './git-gh-command'
-import type { IssueInfo } from './git-issue'
 import { git_pr_error } from './git-pr-error'
 import { git_pr_messages } from './git-pr-messages'
-import { pr_info_schema } from './schemas'
 
 // **Answers the new pull request's URL, and `undefined` when one already existed.** `pr_create`
 // filters its REST response to `.html_url`, so the address is in hand the moment the call returns —

package/scripts/git/changed-file-scope.ts

@@ -194,7 +194,6 @@ const changed_file_scope = {
 	LISTED_FILE_LIMIT,
 	UNREADABLE_REASON,
 	describe_scope,
-	explicit_files_of,
 	flags_of,
 	is_flag,
 	read_changed_files,

package/scripts/git/git-branch.ts

@@ -2,9 +2,9 @@ import {
 	animation_helpers,
 	create_git_operation_config,
 	type AnimationOptions,
-} from './animation-helpers'
+} from '#scripts/lib/animation-helpers'
 import { git_command } from './git-command'
-import { git_error } from './git-error'
+import { BranchMismatchError } from './git-error'
 
 async function current(): Promise<string> {
 	const config: AnimationOptions<string> = {
@@ -124,7 +124,7 @@ async function check_and_create_branch(
 	}
 
 	if (is_mismatch(current_branch, target_branch_name, default_branch)) {
-		git_error.display_branch_mismatch_error(current_branch, target_branch_name)
+		throw new BranchMismatchError({ current_branch, target_branch_name })
 	}
 
 	return current_branch
@@ -132,9 +132,6 @@ async function check_and_create_branch(
 
 const git_branch = {
 	current,
-	create,
-	switch_to,
-	exists,
 	check_and_create_branch,
 	is_mismatch,
 	// Exported so a lane's branch name can be checked against the real matcher rather than against a

package/scripts/git/git-commit.ts

@@ -1,4 +1,4 @@
-import { animation_helpers, create_git_operation_config } from './animation-helpers'
+import { animation_helpers, create_git_operation_config } from '#scripts/lib/animation-helpers'
 import { git_command } from './git-command'
 
 async function commit(commit_message: string): Promise<void> {