@joshuafolkken/kit 1.1050.0 → 1.1128.0

package/scripts/init/start-steps.ts

@@ -1,4 +1,5 @@
 import path from 'node:path'
+import { git_spawn_sync } from '#scripts/git/git-spawn-sync'
 import { error_text } from '#scripts/lib/error-message'
 import { repository_labels } from '#scripts/repo/repository-labels'
 import { self_sync_guard } from '#scripts/self-sync-guard/self-sync-guard-logic'
@@ -44,7 +45,7 @@ function read_git_state(root: string, shape: ProjectShape): GitState {
 		}
 	}
 
-	const has_origin = succeeds('git', ['remote', 'get-url', 'origin'], root)
+	const has_origin = git_spawn_sync.origin_url(root) !== undefined
 	const branch = read_output('git', ['symbolic-ref', '--short', 'HEAD'], root)
 	const has_commits = succeeds('git', ['rev-parse', '--verify', '--quiet', 'HEAD'], root)
 	const has_kit_committed = kit_setup_state.is_kit_committed(root)
@@ -163,6 +164,7 @@ async function run_steps(steps: ReadonlyArray<StartStep>, context: StepContext):
 		const position = `${String(index + 1)}/${String(steps.length)}`
 
 		console.info(`\n[${position}] ${labels[step]}`)
+		// eslint-disable-next-line no-await-in-loop -- each step builds on what the earlier ones set up
 		await run_step(step, run_context, steps.slice(0, index))
 	}
 }

package/scripts/issue/behavior-change-lint.ts

@@ -112,7 +112,6 @@ function problems(body: string): ReadonlyArray<string> {
 
 const behavior_change_lint = {
 	is_target,
-	missing_headings,
 	firing_point_name,
 	problems,
 	REQUIRED_HEADINGS,

package/scripts/issue/defect-rate-cli.ts

@@ -1,16 +1,24 @@
 #!/usr/bin/env tsx
 import { fileURLToPath } from 'node:url'
-import { parseArgs } from 'node:util'
-import { git_gh_command } from '#scripts/git/git-gh-command'
-import { git_gh_exec } from '#scripts/git/git-gh-exec'
-import { parse_json_array_or_undefined } from '#scripts/git/parse-json-array'
+import { git_gh_command } from '#scripts/gh/git-gh-command'
+import { git_gh_exec } from '#scripts/gh/git-gh-exec'
+import { parse_json } from '#scripts/git/parse-json-array'
 import { issue_label_schema } from '#scripts/git/schemas'
+import { bounded_pool } from '#scripts/lib/bounded-pool'
+import { cli_flags } from '#scripts/lib/cli-flags'
 import { z } from 'zod'
 import { defect_rate, type DefectRate, type RateIssue } from './defect-rate'
 
 const SUCCESS_EXIT_CODE = 0
 const FAILURE_EXIT_CODE = 1
 const PER_PAGE = '100'
+const FIRST_PAGE = 1
+const SECOND_PAGE = 2
+// The search API serves at most this many results, so a window past it holds no further page.
+const SEARCH_RESULT_CEILING = 1000
+// The search API allows 30 requests a minute; both searches together stay at the ~10 requests the
+// sequential walk made, so this bounds only how many are in flight at once.
+const PAGE_CONCURRENCY = 4
 const USAGE = 'Usage: pnpm josh defect:rate [--days <n>]'
 const UNKNOWN_REPO_MESSAGE =
 	'Could not read this repository from `git remote`, so no issue can be searched — check `gh auth status` and that this is a checkout with an `origin` remote.'
@@ -33,7 +41,7 @@ const search_item_schema = z.object({
 	labels: z.array(issue_label_schema),
 })
 
-// One page of `search/issues`. `--paginate --slurp` hands back every page as one array.
+// One page of `search/issues`.
 const search_page_schema = z.object({
 	total_count: z.number(),
 	incomplete_results: z.boolean(),
@@ -48,22 +56,60 @@ interface SearchResult {
 }
 
 function read_days(argv: ReadonlyArray<string>): number | undefined {
-	try {
-		const { values } = parseArgs({ args: [...argv], options: OPTIONS, strict: true })
-		const raw = values.days ?? String(defect_rate.DEFAULT_WINDOW_DAYS)
+	const values = cli_flags.values_of(argv, OPTIONS)
 
-		if (!DAYS_PATTERN.test(raw)) return undefined
+	if (values === undefined) return undefined
 
-		const days = Number(raw)
+	const raw = values.days ?? String(defect_rate.DEFAULT_WINDOW_DAYS)
 
-		return days <= MAX_WINDOW_DAYS ? days : undefined
-	} catch {
-		return undefined
-	}
+	if (!DAYS_PATTERN.test(raw)) return undefined
+
+	const days = Number(raw)
+
+	return days <= MAX_WINDOW_DAYS ? days : undefined
+}
+
+function search_path(query: string, page: number = FIRST_PAGE): string {
+	const parameters = new URLSearchParams({ q: query, per_page: PER_PAGE })
+
+	if (page !== FIRST_PAGE) parameters.set('page', String(page))
+
+	return `search/issues?${parameters.toString()}`
 }
 
-function search_path(query: string): string {
-	return `search/issues?${new URLSearchParams({ q: query, per_page: PER_PAGE }).toString()}`
+// How many pages the search holds, read off the first page's own count. Bounded by the API's
+// ceiling, past which GitHub serves no page at all — so this asks for exactly the pages `gh api
+// --paginate` used to walk to.
+function page_count(first: SearchPage): number {
+	return Math.ceil(Math.min(first.total_count, SEARCH_RESULT_CEILING) / Number(PER_PAGE))
+}
+
+async function read_page(query: string, page: number): Promise<SearchPage | undefined> {
+	const raw = await git_gh_exec.exec_gh_api({ path: search_path(query, page) })
+
+	return parse_json.parse_json_object_safe(raw, search_page_schema)
+}
+
+// Every page of one search. joshuafolkken/kit#3103: `--paginate` follows each page's `next` link, so
+// a two-week window of ~5 pages cost ~1.5 s a page, one after another, on every `backlog:plan`. The
+// first page names the total, so the rest are fetched together; any page that does not read fails
+// the whole search, as a failed `--paginate` did.
+async function read_pages(query: string): Promise<ReadonlyArray<SearchPage> | undefined> {
+	const first = await read_page(query, FIRST_PAGE)
+
+	if (first === undefined) return undefined
+
+	const rest_numbers = Array.from(
+		{ length: Math.max(page_count(first) - FIRST_PAGE, 0) },
+		(_value, index) => index + SECOND_PAGE,
+	)
+	const rest = await bounded_pool.bounded_map(
+		rest_numbers,
+		PAGE_CONCURRENCY,
+		async (page) => await read_page(query, page),
+	)
+
+	return rest.every((page) => page !== undefined) ? [first, ...rest] : undefined
 }
 
 function to_result(pages: ReadonlyArray<SearchPage>): SearchResult {
@@ -83,12 +129,7 @@ function to_result(pages: ReadonlyArray<SearchPage>): SearchResult {
 
 async function search(query: string): Promise<SearchResult | undefined> {
 	try {
-		const raw = await git_gh_exec.exec_gh_api({
-			path: search_path(query),
-			should_paginate: true,
-			should_slurp: true,
-		})
-		const pages = parse_json_array_or_undefined(raw, search_page_schema)
+		const pages = await read_pages(query)
 
 		return pages === undefined ? undefined : to_result(pages)
 	} catch {
@@ -160,7 +201,7 @@ async function main(argv: ReadonlyArray<string>): Promise<void> {
 	process.exitCode = await run(argv)
 }
 
-const defect_rate_cli = { USAGE, read_days, search_path, measure_window, run, main }
+const defect_rate_cli = { USAGE, read_days, search_path, measure_window, run }
 
 if (process.argv[1] === fileURLToPath(import.meta.url)) await main(process.argv.slice(ARGV_OFFSET))
 

package/scripts/issue/defect-rate.ts

@@ -1,5 +1,5 @@
-import { has_label_name, INTERRUPT_ROUTE_LABEL } from '#scripts/git/issue-labels'
 import { behavior_change_lint } from './behavior-change-lint'
+import { has_label_name, INTERRUPT_ROUTE_LABEL } from './issue-labels'
 import { markdown_section } from './markdown-section'
 
 // The defect rate of merged work over a window (joshuafolkken/kit#2449): issues filed as defects
@@ -132,7 +132,6 @@ const defect_rate = {
 	filed_query,
 	format,
 	is_above_baseline,
-	is_behavior_change,
 	is_defect,
 	kind_of,
 	measure,

package/scripts/{git → issue}/git-next-issues.ts

@@ -1,8 +1,8 @@
-import { git_gh_command } from './git-gh-command'
+import { git_gh_command } from '#scripts/gh/git-gh-command'
+import { parse_json_array_safe } from '#scripts/git/parse-json-array'
+import { open_issue_schema, type OpenIssueData } from '#scripts/git/schemas'
 import { has_any_label, NOT_DIRECTLY_RUNNABLE_LABELS } from './issue-labels'
 import { issue_rank, type DependencyRow } from './issue-rank'
-import { parse_json_array_safe } from './parse-json-array'
-import { open_issue_schema, type OpenIssueData } from './schemas'
 
 // The next-issues display printed when a workflow completes (#821): up to five open issues in
 // priority order, so the user picks the next run from the completion output instead of opening the

package/scripts/issue/issue-backlinks-cli.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env tsx
 import { fileURLToPath } from 'node:url'
-import { git_gh_command } from '#scripts/git/git-gh-command'
+import { git_gh_command } from '#scripts/gh/git-gh-command'
 import { parse_json_object_safe } from '#scripts/git/parse-json-array'
 import { z } from 'zod'
 import { issue_backlinks, type UpstreamEntry } from './issue-backlinks'
@@ -90,8 +90,4 @@ async function main(argv: ReadonlyArray<string>): Promise<void> {
 	process.exitCode = await run(argv)
 }
 
-const issue_backlinks_cli = { run, USAGE }
-
 if (process.argv[1] === fileURLToPath(import.meta.url)) await main(process.argv.slice(ARGV_OFFSET))
-
-export { issue_backlinks_cli }

package/scripts/issue/issue-backlinks.ts

@@ -4,12 +4,13 @@
 // undetected. This classifies an origin issue's filed backlinks into one of four fixed words
 // (joshuafolkken/kit#2123). The headings are the single source's, pinned by the document test.
 
+import { markdown_section } from './markdown-section'
+
 const ORIGIN_HEADING = '## Origin'
 const UPSTREAM_ISSUES_HEADING = '## Upstream issues'
 const UPSTREAM_CANDIDATE_HEADING = '## Upstream candidate'
 const CHECKBOX_PATTERN = /^\s*-\s*\[[ xX]\]/u
 const WRONG_UPSTREAM_HEADING_PATTERN = /^##\s+Upstream\b/iu
-const SUBHEADING_PATTERN = /^##\s/u
 const BARE_REFERENCE_PATTERN = /^#\d+$/u
 const DIGITS_PATTERN = /^\d+$/u
 const REFERENCE_MARK = '#'
@@ -27,31 +28,23 @@ interface UpstreamEntry {
 	body: string
 }
 
-function trimmed_lines(body: string): ReadonlyArray<string> {
-	return body.split('\n').map((line) => line.trimEnd())
-}
-
+// A heading inside a code fence is example text, so neither lookup counts one (joshuafolkken/kit#3066).
 function has_heading(body: string, heading: string): boolean {
-	return trimmed_lines(body).some((line) => line.trim() === heading)
+	return markdown_section.has_line(body, heading)
 }
 
 // The lines under `heading`, up to the next `##` heading; `undefined` when the heading is absent.
 function section_lines(body: string, heading: string): ReadonlyArray<string> | undefined {
-	const lines = trimmed_lines(body)
-	const start = lines.findIndex((line) => line.trim() === heading)
-	if (start === -1) return undefined
-
-	const rest = lines.slice(start + 1)
-	const end = rest.findIndex((line) => SUBHEADING_PATTERN.test(line.trim()))
+	if (!has_heading(body, heading)) return undefined
 
-	return end === -1 ? rest : rest.slice(0, end)
+	return markdown_section.section_lines(body, heading)
 }
 
 // A heading that looks like the upstream one but is not exactly it (`## Upstream`, `## Upstreams`,
 // wrong case) — the grep the template promises would miss it, so it is a wrong-heading rather than a
 // missing one. `## Upstream candidate` is a legitimate separate heading and is excluded.
 function has_wrong_upstream_heading(body: string): boolean {
-	return trimmed_lines(body).some((line) => {
+	return markdown_section.unfenced_lines(body).some((line) => {
 		const heading = line.trim()
 		if (heading === UPSTREAM_ISSUES_HEADING || heading === UPSTREAM_CANDIDATE_HEADING) return false
 

package/scripts/issue/issue-cite-cli.ts

@@ -1,8 +1,8 @@
 #!/usr/bin/env tsx
 import { fileURLToPath } from 'node:url'
 import { parseArgs } from 'node:util'
-import { git_gh_command } from '#scripts/git/git-gh-command'
-import type { IssueRead } from '#scripts/git/git-gh-issue-read'
+import { git_gh_command } from '#scripts/gh/git-gh-command'
+import type { IssueRead } from '#scripts/gh/git-gh-issue-read'
 import { bounded_pool } from '#scripts/lib/bounded-pool'
 import { z } from 'zod'
 import { issue_cite, type CiteTarget } from './issue-cite'
@@ -145,12 +145,8 @@ async function main(args: ReadonlyArray<string>): Promise<void> {
 
 const issue_cite_cli = {
 	USAGE,
-	main,
 	parse_targets,
-	parse_title,
-	report,
 	run,
-	to_line,
 }
 
 if (process.argv[1] === fileURLToPath(import.meta.url)) await main(process.argv.slice(ARGV_OFFSET))

package/scripts/issue/issue-cite.ts

@@ -46,14 +46,19 @@ function citation_line(slug: string, number: string, summary: string): string {
 // and the plain `#N` only when the repository could not be read at all.
 type IssueCiter = (number: string) => string
 
+// One issue, named from what the caller holds — the single decision every listing's citation goes
+// through (joshuafolkken/kit#3099), so a renderer holding one title never re-derives the fallback.
+function reference(slug: string | undefined, number: string, title: string | undefined): string {
+	if (slug === undefined) return `#${number}`
+
+	return title === undefined
+		? `[#${number}](${issue_url(slug, number)})`
+		: citation_line(slug, number, title)
+}
+
 function citer(slug: string | undefined, titles: ReadonlyMap<string, string>): IssueCiter {
 	return function cite(number: string): string {
-		if (slug === undefined) return `#${number}`
-		const title = titles.get(number)
-
-		return title === undefined
-			? `[#${number}](${issue_url(slug, number)})`
-			: citation_line(slug, number, title)
+		return reference(slug, number, titles.get(number))
 	}
 }
 
@@ -105,14 +110,13 @@ function no_repo_line(target: CiteTarget): string {
 }
 
 const issue_cite = {
-	SUMMARY_SEPARATOR,
 	citation_line,
 	citer,
 	issue_url,
-	label,
 	missing_line,
 	no_repo_line,
 	parse_target,
+	reference,
 	unreadable_line,
 }
 

package/scripts/issue/issue-classification.ts

@@ -1,10 +1,5 @@
-import {
-	BREAKING_CHANGE_LABEL,
-	BUG_LABEL,
-	ENHANCEMENT_LABEL,
-	has_label_name,
-} from '#scripts/git/issue-labels'
 import { issue_bug_label } from './issue-bug-label'
+import { BREAKING_CHANGE_LABEL, BUG_LABEL, ENHANCEMENT_LABEL, has_label_name } from './issue-labels'
 import { markdown_section } from './markdown-section'
 
 const FEATURE_DECLARATIONS = ['- 目的: 機能追加', '- 目的: 機能改善']
@@ -62,10 +57,7 @@ function problems(body: string): ReadonlyArray<string> {
 }
 
 const issue_classification = {
-	BREAKING_DECLARATION,
 	CLASSIFICATION_LABELS,
-	FEATURE_DECLARATIONS,
-	NON_BUG_DECLARATION,
 	labels_for,
 	problems,
 	required_labels,

package/scripts/issue/issue-closing-pr.ts

@@ -1,7 +1,7 @@
+import { git_gh_api_path } from '#scripts/gh/git-gh-api-path'
+import { git_gh_exec } from '#scripts/gh/git-gh-exec'
+import { git_gh_repo } from '#scripts/gh/git-gh-repo'
 import { git_closes_keyword } from '#scripts/git/git-closes-keyword'
-import { git_gh_api_path } from '#scripts/git/git-gh-api-path'
-import { git_gh_exec } from '#scripts/git/git-gh-exec'
-import { git_gh_repo } from '#scripts/git/git-gh-repo'
 import { parse_json_object_safe } from '#scripts/git/parse-json-array'
 import { z } from 'zod'
 
@@ -88,6 +88,6 @@ async function read_closing_pr(issue: string): Promise<string | undefined> {
 	}
 }
 
-const issue_closing_pr = { parse_references, pick_closing_pr, read_closing_pr }
+const issue_closing_pr = { read_closing_pr }
 
 export { issue_closing_pr }

package/scripts/issue/issue-comment-cli.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env tsx
 import { fileURLToPath } from 'node:url'
-import { git_gh_command } from '#scripts/git/git-gh-command'
+import { git_gh_command } from '#scripts/gh/git-gh-command'
 import { cli_body } from '#scripts/josh/cli-body'
 import { error_text } from '#scripts/lib/error-message'
 
@@ -89,7 +89,7 @@ async function main(argv: ReadonlyArray<string>): Promise<void> {
 	process.exitCode = await run(argv)
 }
 
-const issue_comment_cli = { USAGE, main, parse_request, run }
+const issue_comment_cli = { USAGE, run }
 
 if (process.argv[1] === fileURLToPath(import.meta.url)) await main(process.argv.slice(ARGV_OFFSET))
 

package/scripts/issue/issue-file-cli.ts

@@ -3,10 +3,10 @@ import { readFile } from 'node:fs/promises'
 import { fileURLToPath } from 'node:url'
 import { repo_party } from '#scripts/discovery/repo-party'
 import { epic_bundle_cli } from '#scripts/epic/epic-bundle-cli'
-import { git_gh_command } from '#scripts/git/git-gh-command'
-import { git_gh_exec } from '#scripts/git/git-gh-exec'
-import { git_gh_issue_write } from '#scripts/git/git-gh-issue-write'
-import { github_issue_url } from '#scripts/git/github-issue-url'
+import { git_gh_command } from '#scripts/gh/git-gh-command'
+import { git_gh_exec } from '#scripts/gh/git-gh-exec'
+import { git_gh_issue_write } from '#scripts/gh/git-gh-issue-write'
+import { github_issue_url } from '#scripts/gh/github-issue-url'
 import { error_text } from '#scripts/lib/error-message'
 import { issue_file, type FileArguments } from './issue-file'
 import { issue_lint_cli } from './issue-lint-cli'
@@ -182,7 +182,7 @@ async function main(argv: ReadonlyArray<string>): Promise<void> {
 	process.exitCode = await run(argv)
 }
 
-const issue_file_cli = { USAGE, THIRD_PARTY_MESSAGE, UNKNOWN_REPO_MESSAGE, run, main }
+const issue_file_cli = { THIRD_PARTY_MESSAGE, run }
 
 if (process.argv[1] === fileURLToPath(import.meta.url)) await main(process.argv.slice(ARGV_OFFSET))
 

package/scripts/issue/issue-file.ts

@@ -1,9 +1,10 @@
-import { parseArgs } from 'node:util'
+import type { parseArgs } from 'node:util'
 import { epic_issue } from '#scripts/epic/epic-issue'
-import { github_issue_url } from '#scripts/git/github-issue-url'
-import { DEPTH_LABEL_ORDER, FILING_ROUTE_LABELS, has_label_name } from '#scripts/git/issue-labels'
+import { github_issue_url } from '#scripts/gh/github-issue-url'
+import { cli_flags } from '#scripts/lib/cli-flags'
 import { issue_backlinks } from './issue-backlinks'
 import { issue_classification } from './issue-classification'
+import { DEPTH_LABEL_ORDER, FILING_ROUTE_LABELS, has_label_name } from './issue-labels'
 import { markdown_section } from './markdown-section'
 
 // The decisions behind `josh issue:file` (joshuafolkken/kit#2808), kept apart from the command that
@@ -103,19 +104,11 @@ function arguments_of(values: ParsedValues, title: string | undefined): FileArgu
 	return { title, body_file, ...labelled, labels: values.label ?? [], repo: values.repo }
 }
 
-// An unknown flag makes `parseArgs` throw; caught so the answer is the usage line, not a stack trace.
+// An unknown flag is `undefined` rather than a throw, so the answer is the usage line, not a stack trace.
 function parse(argv: ReadonlyArray<string>): FileArguments | undefined {
-	try {
-		const { values, positionals } = parseArgs({
-			args: [...argv],
-			options: OPTIONS,
-			allowPositionals: true,
-		})
+	const parsed = cli_flags.arguments_of(argv, OPTIONS)
 
-		return arguments_of(values, positionals[0])
-	} catch {
-		return undefined
-	}
+	return parsed === undefined ? undefined : arguments_of(parsed.values, parsed.positionals[0])
 }
 
 // A classification label is the body's to declare, so an extra `--label` naming one the body does not

package/scripts/issue/issue-fold-cli.ts

@@ -90,7 +90,7 @@ async function main(argv: ReadonlyArray<string>): Promise<void> {
 	process.exitCode = await run(argv)
 }
 
-const issue_fold_cli = { JSON_KEY, USAGE, REASONS, read_arguments, size_verdict, run, main }
+const issue_fold_cli = { read_arguments, size_verdict, run }
 
 if (process.argv[1] === fileURLToPath(import.meta.url)) await main(process.argv.slice(ARGV_OFFSET))
 

package/scripts/issue/issue-fold-existing-cli.ts

@@ -74,7 +74,7 @@ async function main(argv: ReadonlyArray<string>): Promise<void> {
 	process.exitCode = await run(argv)
 }
 
-const issue_fold_existing_cli = { run, main, USAGE }
+const issue_fold_existing_cli = { run }
 
 if (process.argv[1] === fileURLToPath(import.meta.url)) await main(process.argv.slice(ARGV_OFFSET))
 

package/scripts/{git → issue}/issue-labels.ts

@@ -6,6 +6,11 @@ const BUG_LABEL = 'bug'
 const ENHANCEMENT_LABEL = 'enhancement'
 const BREAKING_CHANGE_LABEL = 'breaking-change'
 const IN_PROGRESS_LABEL = 'in-progress'
+// Applied by `kickoff` once its plan is on the issue, so the next command's `run:entry` reads the issue
+// as planned and starts at the implementation rather than planning again (joshuafolkken/kit#3042).
+// Namespaced like `run:solo`: a bare `planned` is a common roadmap label a person may already apply,
+// and reading one as kickoff's mark would skip the planning that never happened.
+const PLANNED_LABEL = 'run:planned'
 // Parks a child that cannot advance without a person deciding something. `epic:next` is what reads
 // it: a parked child is why a run reports "nothing left that time will fix" rather than waiting
 // forever (joshuafolkken/kit#860).
@@ -207,6 +212,7 @@ const WORKFLOW_LABELS: ReadonlyArray<LabelDefinition> = [
 		description: 'Tracks a batch of child issues from one split',
 	},
 	{ name: IN_PROGRESS_LABEL, color: '0075ca', description: 'Work is actively in progress' },
+	{ name: PLANNED_LABEL, color: 'c2e0c6', description: 'kickoff posted the plan' },
 	{
 		name: RUN_SOLO_LABEL,
 		color: 'b60205',
@@ -328,6 +334,7 @@ const ALL_LABELS: ReadonlySet<string> = new Set([
 	ENHANCEMENT_LABEL,
 	BREAKING_CHANGE_LABEL,
 	IN_PROGRESS_LABEL,
+	PLANNED_LABEL,
 	NEEDS_DECISION_LABEL,
 	AUTO_OK_LABEL,
 	NEEDS_HUMAN_REVIEW_LABEL,
@@ -375,6 +382,7 @@ export {
 	NEEDS_HUMAN_REVIEW_LABEL,
 	NOT_DIRECTLY_RUNNABLE_LABELS,
 	OTHER_CHANGE_LABEL,
+	PLANNED_LABEL,
 	PRIORITY_HIGH_LABEL,
 	RELEASE_CLASSIFICATION_LABELS,
 	RELEASE_CLASSIFICATION_NAMES,

package/scripts/issue/issue-lint-cli.ts

@@ -58,7 +58,7 @@ async function main(argv: ReadonlyArray<string>): Promise<void> {
 	process.exitCode = await run(argv[0])
 }
 
-const issue_lint_cli = { problems, run, OK_MESSAGE, USAGE }
+const issue_lint_cli = { problems, run }
 
 const ARGV_OFFSET = 2
 

package/scripts/issue/issue-merged.ts

@@ -1,5 +1,5 @@
-import { git_gh_api_path } from '#scripts/git/git-gh-api-path'
-import { git_gh_exec } from '#scripts/git/git-gh-exec'
+import { git_gh_api_path } from '#scripts/gh/git-gh-api-path'
+import { git_gh_exec } from '#scripts/gh/git-gh-exec'
 
 // Whether an issue was closed by a merge, read from its REST timeline (joshuafolkken/kit#2701). The
 // issue's own `state_reason` cannot tell: a pull request's `closes #N` and a person's "Close as

package/scripts/{git → issue}/issue-rank.ts

@@ -83,7 +83,7 @@ function rank<T>(items: ReadonlyArray<T>, row_of: (item: T) => RankRow): Array<T
 		.map((entry) => entry.item)
 }
 
-const issue_rank = { compare, count_dependents, is_priority, is_verification_defect, rank }
+const issue_rank = { count_dependents, rank }
 
 export { issue_rank }
 export type { DependencyRow, RankRow }

package/scripts/issue/issue-read-cli.ts

@@ -1,8 +1,9 @@
 #!/usr/bin/env tsx
 import { fileURLToPath } from 'node:url'
-import { git_gh_command } from '#scripts/git/git-gh-command'
+import { git_gh_command } from '#scripts/gh/git-gh-command'
 import { bounded_pool } from '#scripts/lib/bounded-pool'
 import { issue_read, type IssueComment, type IssueFields } from './issue-read'
+import { issue_report_failures, type ReadFailureKind } from './issue-report-failures'
 
 // `josh issue:read <N> [<N> ...]` — the body *and* the comments of every issue named, in one call
 // (joshuafolkken/kit#1715).
@@ -25,7 +26,6 @@ import { issue_read, type IssueComment, type IssueFields } from './issue-read'
 // "no comments" — the block says which of the two it holds, because §2g's rule is that the later text
 // wins, and a comment nobody read cannot win anything.
 
-const SUCCESS_EXIT_CODE = 0
 const FAILURE_EXIT_CODE = 1
 const ARGV_OFFSET = 2
 const ISSUE_NUMBER_PATTERN = /^[1-9]\d*$/u
@@ -35,8 +35,7 @@ const BLOCK_SEPARATOR = '\n\n---\n\n'
 // process, and an unbounded fan-out is answered with secondary rate limiting rather than with issues.
 const READ_CONCURRENCY = 8
 const ISSUE_FIELDS = 'title,state,body'
-
-type ReadFailureKind = 'missing' | 'unreadable'
+const FAILURE_TERMS = { success_kind: 'issue', misreading: 'the issue is empty' } as const
 
 interface IssueContent {
 	fields: IssueFields
@@ -69,16 +68,6 @@ function parse_numbers(argv: ReadonlyArray<string>): ReadonlyArray<string> | und
 	return [...new Set(numbers)]
 }
 
-function report_failure(kind: ReadFailureKind, issue_number: string): void {
-	if (kind === 'missing') {
-		console.error(`✖ issue #${issue_number} does not resolve — check the number and the repository`)
-	} else {
-		console.error(
-			`✖ could not read issue #${issue_number} — a rate limit, expired auth, or a dropped connection. This is not "the issue is empty"`,
-		)
-	}
-}
-
 // The comments are read beside the fields rather than after them: the two requests need nothing from
 // one another, and reading them in sequence would put back one of the two round trips this command
 // exists to remove.
@@ -126,34 +115,6 @@ function issue_blocks(report: IssueReport): ReadonlyArray<string> {
 	return [issue_read.format_issue(report.issue_number, fields, comments)]
 }
 
-function print_issues(reports: ReadonlyArray<IssueReport>): void {
-	const blocks = reports.flatMap((report) => issue_blocks(report))
-
-	if (blocks.length === 0) return
-
-	console.info(blocks.join(BLOCK_SEPARATOR))
-}
-
-function report_one_failure(report: IssueReport): boolean {
-	if (report.result.kind === 'issue') return false
-
-	report_failure(report.result.kind, report.issue_number)
-
-	return true
-}
-
-// Every number that produced no issue is named, so a caller is told which ones it has no answer for
-// rather than being left to subtract the printed blocks from what it asked.
-function report_failures(reports: ReadonlyArray<IssueReport>): number {
-	let has_failure = false
-
-	for (const report of reports) {
-		has_failure = report_one_failure(report) || has_failure
-	}
-
-	return has_failure ? FAILURE_EXIT_CODE : SUCCESS_EXIT_CODE
-}
-
 async function run(argv: ReadonlyArray<string>): Promise<number> {
 	const issue_numbers = parse_numbers(argv)
 
@@ -165,9 +126,12 @@ async function run(argv: ReadonlyArray<string>): Promise<number> {
 
 	const reports = await read_all(issue_numbers)
 
-	print_issues(reports)
+	issue_report_failures.print_blocks(
+		reports.flatMap((report) => issue_blocks(report)),
+		BLOCK_SEPARATOR,
+	)
 
-	return report_failures(reports)
+	return issue_report_failures.report_failures(reports, FAILURE_TERMS)
 }
 
 async function main(argv: ReadonlyArray<string>): Promise<void> {
@@ -175,10 +139,7 @@ async function main(argv: ReadonlyArray<string>): Promise<void> {
 }
 
 const issue_read_cli = {
-	BLOCK_SEPARATOR,
-	ISSUE_FIELDS,
 	USAGE,
-	main,
 	parse_numbers,
 	read_block,
 	run,

package/scripts/issue/issue-read.ts

@@ -130,8 +130,6 @@ function format_issue(
 
 const issue_read = {
 	ISSUE_LABEL,
-	TITLE_LABEL,
-	STATE_LABEL,
 	NO_BODY,
 	NO_COMMENTS,
 	COMMENTS_UNREADABLE,