@joshuafolkken/kit 1.1514.0 → 1.1784.0

package/scripts/init/init-ai-copy.ts

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { existsSync, readFileSync } from 'node:fs'
 import path from 'node:path'
 import { is_workflow_destination } from '#scripts/claude/workflow-destination'
 import { gh_spawn } from '#scripts/gh/gh-spawn'
@@ -9,7 +9,7 @@ import {
 	copy_directory_failure,
 	directory_copy_blocker,
 } from '#scripts/sync/directory-copy-guard'
-import { basic_path_migration } from './basic-path-migration'
+import { file_content } from '#scripts/sync/file-content'
 import { distributed_paths } from './distributed-paths'
 import { transform_copied_content } from './init-copy-content'
 import { init_logic } from './init-logic'
@@ -76,8 +76,7 @@ function copied_content(source_path: string, destination_path: string): string {
 }
 
 function copy_ai_file(source_path: string, destination_path: string): void {
-	mkdirSync(path.dirname(destination_path), { recursive: true })
-	writeFileSync(destination_path, copied_content(source_path, destination_path))
+	file_content.write_contained(destination_path, copied_content(source_path, destination_path))
 }
 
 // `init` declines to modify a file that already exists, and that includes not stamping it: the
@@ -139,7 +138,7 @@ function merge_existing_workspace_yaml(source_path: string, destination_path: st
 		return
 	}
 
-	writeFileSync(destination_path, merged)
+	file_content.write_contained(destination_path, merged)
 	console.info(`  ✔ updated   ${WORKSPACE_YAML}`)
 }
 
@@ -158,7 +157,7 @@ function did_skip_workspace_yaml_copy(source_path: string, destination_path: str
 		return false
 	}
 
-	writeFileSync(destination_path, workspace_content(source_path, destination_path))
+	file_content.write_contained(destination_path, workspace_content(source_path, destination_path))
 	console.info(`  ✔ created   ${WORKSPACE_YAML}`)
 
 	return false
@@ -268,40 +267,15 @@ function did_skip_ai_directory_copy(directory_name: string): boolean {
 // AI file — leaves an existing one untouched so a consumer's additions are never disturbed. `josh sync`
 // is what ensures the import line on an existing file (sync.ts). CLAUDE.md is no longer byte-copied,
 // so it is handled here rather than through AI_COPY_FILES.
-//
-// The one edit made to an existing file is the rules import written under the static profile name,
-// moved onto the basic path — only that kit-written line, never the consumer's additions.
-// An unreadable file is left as it is and reported as skipped, as it was before the migration.
-function read_if_readable(destination_path: string): string | undefined {
-	return file_reader.read_if_readable(destination_path)
-}
-
-function report_existing_claude_md(destination_path: string): void {
-	const existing = read_if_readable(destination_path) ?? ''
-	const migrated = basic_path_migration.migrate_basic_paths(existing)
-
-	if (migrated === existing) {
-		console.info(`  ⏭ skipped   ${CLAUDE_MD_FILENAME} (already exists)`)
-
-		return
-	}
-
-	writeFileSync(destination_path, migrated)
-	console.info(`  ✔ updated   ${CLAUDE_MD_FILENAME} (rules import moved to the basic path)`)
-}
-
 function basic_claude_md(): string {
 	return `> If kit is not installed, run \`pnpm install\` first.\n\n${BASIC_CLAUDE_IMPORT}\n`
 }
 
-// A basic CLAUDE.md imports the basic rules alone: the full bootstrap and import are removed, a
-// pre-rename path is moved, and the basic header is restored when no basic import is left.
-// The project's own lines stay as they are.
+// A basic CLAUDE.md imports the basic rules alone: the full bootstrap and import are removed, and the
+// basic header is restored when no basic import is left. The project's own lines stay as they are.
 function ensure_basic_claude_md(existing: string | undefined): string {
 	if (existing === undefined) return basic_claude_md()
-	const kept = basic_path_migration.migrate_basic_paths(
-		distributed_paths.remove_claude_md_import(existing),
-	)
+	const kept = distributed_paths.remove_claude_md_import(existing)
 
 	if (kept.includes(BASIC_CLAUDE_IMPORT)) return kept
 
@@ -312,7 +286,7 @@ function did_skip_claude_md_import(shape?: ProjectShape): boolean {
 	const destination_path = path.join(PROJECT_ROOT, CLAUDE_MD_FILENAME)
 
 	if (existsSync(destination_path)) {
-		report_existing_claude_md(destination_path)
+		console.info(`  ⏭ skipped   ${CLAUDE_MD_FILENAME} (already exists)`)
 
 		return true
 	}
@@ -320,7 +294,7 @@ function did_skip_claude_md_import(shape?: ProjectShape): boolean {
 	const content =
 		shape?.profile === 'basic' ? basic_claude_md() : init_logic.ensure_claude_md_import(undefined)
 
-	writeFileSync(destination_path, content)
+	file_content.write_contained(destination_path, content)
 	console.info(`  ✔ created   ${CLAUDE_MD_FILENAME}`)
 
 	return false

package/scripts/init/init-bootstrap.ts

@@ -1,5 +1,7 @@
-import { existsSync, readFileSync, realpathSync, writeFileSync } from 'node:fs'
+import { existsSync, readFileSync, realpathSync } from 'node:fs'
 import path from 'node:path'
+import { package_manifest } from '#scripts/lib/package-manifest'
+import { file_content } from '#scripts/sync/file-content'
 import { z } from 'zod'
 import { init_basic } from './init-basic'
 import { init_install, type InstallStep } from './init-install'
@@ -8,7 +10,6 @@ import { project_profile } from './project-profile'
 
 const KIT_PACKAGE_NAME = '@joshuafolkken/kit'
 const NODE_MODULES = 'node_modules'
-const PACKAGE_JSON = 'package.json'
 // The basic template lists exactly the build scripts kit's own dependency tree carries, which is
 // what installing kit alone needs approved.
 const KIT_BUILDS_TEMPLATE = 'templates/pnpm-workspace.basic.yaml'
@@ -45,10 +46,8 @@ function kit_build_flags(template: string): Array<string> {
 }
 
 function has_kit_dependency(project_root: string): boolean {
-	const manifest_path = path.join(project_root, PACKAGE_JSON)
-	if (!existsSync(manifest_path)) return false
-	const parsed: unknown = JSON.parse(readFileSync(manifest_path, 'utf8'))
-	const manifest = dependency_fields_schema.parse(parsed)
+	if (!existsSync(package_manifest.manifest_path(project_root))) return false
+	const manifest = package_manifest.read_manifest(project_root, dependency_fields_schema)
 	const names = Object.keys({ ...manifest.dependencies, ...manifest.devDependencies })
 
 	return names.includes(KIT_PACKAGE_NAME)
@@ -77,9 +76,11 @@ function handoff_step(args: ReadonlyArray<string>): InstallStep {
 // pnpm walks up to the nearest `package.json`, so without one here it installs kit into whatever
 // project an ancestor directory holds and rewrites that project's files.
 function ensure_project_manifest(project_root: string): void {
-	const manifest_path = path.join(project_root, PACKAGE_JSON)
+	const manifest_path = package_manifest.manifest_path(project_root)
 
-	if (!existsSync(manifest_path)) writeFileSync(manifest_path, init_basic.initial_manifest())
+	if (existsSync(manifest_path)) return
+
+	file_content.write_contained(manifest_path, init_basic.initial_manifest())
 }
 
 function is_handed_off(): boolean {

package/scripts/init/init-dry-run-report.ts

@@ -1,4 +1,5 @@
 import { json_value } from '#scripts/lib/json-value'
+import { PACKAGE_JSON } from '#scripts/lib/package-manifest'
 
 type ChangeKind = 'create' | 'merge' | 'overwrite' | 'delete'
 
@@ -10,7 +11,6 @@ interface FileChange {
 
 type JsonRecord = Record<string, unknown>
 
-const PACKAGE_JSON = 'package.json'
 const JSON_EXTENSION = '.json'
 const KIND_WIDTH = 'overwrite'.length
 const NO_CHANGES = '  (no file changes)'

package/scripts/init/init-dry-run.ts

@@ -41,7 +41,7 @@ interface DryRunSplit {
 }
 
 const DRY_RUN_FLAG = '--dry-run'
-const INIT_SCRIPT = 'scripts/init/init.ts'
+const INIT_SCRIPT = 'scripts/init/init-main.ts'
 const SCRATCH_PREFIX = 'josh-init-dry-run-'
 const DEFAULT_BRANCH = 'main'
 const TITLE = 'josh init --dry-run — nothing was written. The setup would:'

package/scripts/init/init-file-action.ts

@@ -1,13 +1,13 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { existsSync, readFileSync } from 'node:fs'
 import path from 'node:path'
+import { file_content } from '#scripts/sync/file-content'
 import type { FileAction } from './init-actions'
 
 const SAMPLE_INDENT_WIDTH = 4
 const SAMPLE_INDENT = ' '.repeat(SAMPLE_INDENT_WIDTH)
 
 function write_new_file(action: FileAction, destination_path: string): void {
-	mkdirSync(path.dirname(destination_path), { recursive: true })
-	writeFileSync(destination_path, action.create())
+	file_content.write_contained(destination_path, action.create())
 	console.info(`  ✔ created   ${action.dest}`)
 }
 
@@ -17,14 +17,12 @@ function show_sample(action: FileAction): void {
 	console.info(action.create().replaceAll(/^/gmu, () => SAMPLE_INDENT))
 }
 
-// A file that already holds the sample needs nothing added, so only one that differs gets it shown —
-// for a create-only file (no merge) as for a merge that only migrates a kit-written line (#3069).
+// A file that already holds the sample needs nothing added, so only a create-only file (no merge)
+// that differs gets it shown (#3069).
 function report_unchanged(action: FileAction, existing: string): void {
 	const is_sample_missing = existing !== action.create()
-	const should_show_sample =
-		action.merge === undefined || action.should_show_sample_when_unchanged === true
 
-	if (is_sample_missing && should_show_sample) show_sample(action)
+	if (is_sample_missing && action.merge === undefined) show_sample(action)
 	else console.info(`  ✔ unchanged ${action.dest}`)
 }
 
@@ -38,7 +36,7 @@ function merge_existing_file(action: FileAction, destination_path: string): void
 		return
 	}
 
-	writeFileSync(destination_path, merged)
+	file_content.write_contained(destination_path, merged)
 	console.info(`  ✔ updated   ${action.dest}`)
 }
 

package/scripts/init/init-logic-json-merge.ts

@@ -4,7 +4,7 @@ import { parse_jsonc } from '#scripts/config-merge/parse-jsonc'
 import { patch_json_key } from '#scripts/config-merge/patch-json-key'
 import { json_object_schema, string_array_schema, string_record_schema } from '#scripts/lib/schemas'
 import { safe_chain_preinstall } from '#scripts/safe-chain/preinstall-command'
-import { apply_jf_migrations, remove_retired_scripts } from './init-logic-migrate'
+import { init_logic_migrate } from './init-logic-migrate'
 import { PACKAGE_JSON_KEY_ORDER } from './init-logic-package-key-order'
 import { kit_base_preset } from './kit-base-preset'
 import { EXTENDS_FIELD, tsconfig_preset_migration } from './tsconfig-preset-migration'
@@ -203,7 +203,7 @@ function merge_package_scripts(content: string, scripts: Record<string, string>)
 	const parsed = parse_jsonc(content)
 	const raw = parsed['scripts']
 	const existing = raw === undefined ? {} : string_record_schema.parse(raw)
-	const migrated = remove_retired_scripts(apply_jf_migrations(existing))
+	const migrated = init_logic_migrate.migrate_scripts(existing)
 	const to_add = missing_entries(migrated, scripts)
 	const did_migrate = JSON.stringify(migrated) !== JSON.stringify(existing)
 

package/scripts/init/init-logic-migrate.ts

@@ -1,89 +1,16 @@
 import { safe_chain_preinstall } from '#scripts/safe-chain/preinstall-command'
 
-const PREINSTALL_KEY = 'preinstall'
-const JF_PREFIX = 'jf-'
-const JOSH_PREFIX = 'josh '
+// The one `scripts` migration `josh init` still makes: a safe-chain `preinstall` an earlier kit
+// wrote. The `jf-` values, the pre-josh values and the retired managed scripts were dropped once no
+// consumer carried them (joshuafolkken/kit#4187); this one is removable from kit 2.0.0.
+function migrate_scripts(scripts: Record<string, string>): Record<string, string> {
+	const current = scripts['preinstall']
 
-// The plain values kit wrote before its scripts became josh subcommands (#80). `check` is left out:
-// its value is the one `sv create` writes itself, so it cannot be told apart from the project's own.
-const PRE_JOSH_SCRIPT_VALUES: ReadonlyMap<string, string> = new Map([
-	['lint', 'pnpm lint:prettier && pnpm lint:eslint'],
-	['lint:prettier', 'prettier --check .'],
-	['lint:eslint', 'eslint . --cache --cache-strategy content'],
-	['format', 'pnpm format:prettier && pnpm format:eslint'],
-	['format:prettier', 'prettier --write .'],
-	['format:eslint', 'eslint . --fix --cache --cache-strategy content'],
-	['cspell', 'cspell lint --no-must-find-files --no-progress "**/*.{ts,js,md,yaml,yml,json}"'],
-	['cspell:dot', 'pnpm cspell . --dot'],
-	['test:unit', 'vitest run'],
-	['lefthook:install', 'lefthook install'],
-	['lefthook:uninstall', 'lefthook uninstall'],
-	['lefthook:commit', 'lefthook run pre-commit'],
-	['lefthook:push', 'lefthook run pre-push'],
-	['main:sync', 'git checkout main && git pull'],
-	['main:merge', 'git pull origin main'],
-	['check:ci', 'svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --threshold error'],
-])
+	if (current === undefined) return scripts
 
-const RETIRED_MANAGED_SCRIPTS = new Set<string>([
-	'git',
-	'git:followup',
-	'telegram:test',
-	'audit:security',
-	'prep',
-	'issue:prep',
-	'prevent-main-commit',
-	'check-commit-message',
-	'version:major',
-	'version:minor',
-	'version:patch',
-	'version:current',
-	'overrides:check',
-	'test:e2e',
-	'test',
-	'latest',
-	'latest:corepack',
-	'latest:update',
-	'check',
-	'check:svelte',
-	'check:svelte:ci',
-	...PRE_JOSH_SCRIPT_VALUES.keys(),
-])
-
-function migrate_jf_value(value: string): string {
-	if (!value.startsWith(JF_PREFIX)) return value
-
-	return `${JOSH_PREFIX}${value.slice(JF_PREFIX.length)}`
-}
-
-function migrate_script(key: string, value: string): string {
-	const migrated = migrate_jf_value(value)
-
-	return key === PREINSTALL_KEY ? safe_chain_preinstall.migrate_preinstall(migrated) : migrated
-}
-
-function apply_jf_migrations(scripts: Record<string, string>): Record<string, string> {
-	return Object.fromEntries(
-		Object.entries(scripts).map(([key, value]) => [key, migrate_script(key, value)]),
-	)
+	return { ...scripts, preinstall: safe_chain_preinstall.migrate_preinstall(current) }
 }
 
-function is_kit_written(key: string, value: string): boolean {
-	if (value.startsWith(JOSH_PREFIX) || value.startsWith(JF_PREFIX)) return true
-
-	return PRE_JOSH_SCRIPT_VALUES.get(key) === value
-}
-
-// A retired name alone does not make a script kit's: `sv create` writes its own `check`, which must
-// survive `josh init`. Only a value kit itself wrote is retired.
-function is_retired_script(key: string, value: string): boolean {
-	return RETIRED_MANAGED_SCRIPTS.has(key) && is_kit_written(key, value)
-}
-
-function remove_retired_scripts(scripts: Record<string, string>): Record<string, string> {
-	return Object.fromEntries(
-		Object.entries(scripts).filter(([key, value]) => !is_retired_script(key, value)),
-	)
-}
+const init_logic_migrate = { migrate_scripts }
 
-export { apply_jf_migrations, remove_retired_scripts, RETIRED_MANAGED_SCRIPTS }
+export { init_logic_migrate }

package/scripts/init/init-logic.ts

@@ -83,7 +83,6 @@ const AI_COPY_FILES: ReadonlyArray<string> = [
 	'.coderabbit.yaml',
 	'.gitattributes',
 	'.mcp.json',
-	'.ncurc.json',
 	'.prettierignore',
 	'SECURITY.md',
 	'pnpm-workspace.yaml',
@@ -100,7 +99,6 @@ const AI_COPY_FILES: ReadonlyArray<string> = [
 	'.github/actions/setup-node/action.yml',
 	'.github/pull_request_template.md',
 	'.github/release.yml',
-	'.github/dependabot.yml',
 	'.claude/settings.json',
 	'.codex/config.toml',
 	'.codex/hooks.json',
@@ -117,6 +115,9 @@ interface FileCopyMapping {
 // hand-edit stay here.
 const AI_COPY_FILE_MAPPINGS: ReadonlyArray<FileCopyMapping> = [
 	{ src: 'templates/workflows/ci.yml', dest: '.github/workflows/ci.yml' },
+	// A template rather than a copy of kit's own file: kit groups its github-actions bumps, which a
+	// consumer's auto-merge would hold whole once one bump touches an upstream-managed workflow.
+	{ src: 'templates/dependabot.yml', dest: '.github/dependabot.yml' },
 	// The counterpart to the distributed `.github/dependabot.yml`: without it a consumer receives
 	// the machinery that opens Dependabot pull requests and none of the machinery that closes them,
 	// so every github-actions bump sits green and unmerged.

package/scripts/init/init-main.ts

@@ -0,0 +1,12 @@
+#!/usr/bin/env tsx
+import { fileURLToPath } from 'node:url'
+import { run_cli } from './init'
+
+// The `josh init` entry, kept apart from `init.ts` because other modules import that one: a bundle is
+// one file, so a main guard there would fire for every command that carries it
+// (joshuafolkken/kit#4186). `run_cli` sets its own exit code.
+if (process.argv[1] === fileURLToPath(import.meta.url)) {
+	const ARGV_OFFSET = 2
+
+	run_cli(process.argv.slice(ARGV_OFFSET))
+}

package/scripts/init/init.ts

@@ -1,16 +1,15 @@
-#!/usr/bin/env tsx
-import { existsSync, readFileSync, writeFileSync } from 'node:fs'
+import { existsSync, readFileSync } from 'node:fs'
 import path from 'node:path'
-import { fileURLToPath } from 'node:url'
 import { resolve_local_bin } from '#scripts/build/local-bin'
 import { doctor_io } from '#scripts/doctor/doctor-io'
 import { error_text } from '#scripts/lib/error-message'
+import { PACKAGE_JSON } from '#scripts/lib/package-manifest'
 import { package_version_schema, with_package_manager_schema } from '#scripts/lib/schemas'
 import { auto_merge_setting } from '#scripts/repo/auto-merge-setting'
 import { pack_hook } from '#scripts/safe-chain/pack-hook'
-import { project_config } from '#scripts/safe-chain/project-config'
 import { security_updates } from '#scripts/security/security-updates'
 import { did_refuse_self_run } from '#scripts/self-sync-guard/self-sync-refusal'
+import { file_content } from '#scripts/sync/file-content'
 import { sync } from '#scripts/sync/sync'
 import { package_manager_version } from '#scripts/version/package-manager-version'
 import { execaSync } from 'execa'
@@ -28,10 +27,8 @@ import { package_manager_pin } from './package-manager-pin'
 import { project_profile, type ProjectProfile, type ProjectShape } from './project-profile'
 import { working_tree } from './working-tree'
 
-const PACKAGE_JSON = 'package.json'
 const KIT_PACKAGE_NAME = '@joshuafolkken/kit'
 const LEFTHOOK_BIN = 'lefthook'
-const ARGUMENT_START_INDEX = 2
 const INSTALL_HINT = '→ run `pnpm install` to install what package.json lists'
 const INIT_USAGE = 'josh init [--profile basic|full] [--no-install] [--dry-run]'
 
@@ -152,7 +149,7 @@ function merge_project_package_json(shape: ProjectShape): void {
 		return
 	}
 
-	writeFileSync(package_json_path, merged)
+	file_content.write_contained(package_json_path, merged)
 	console.info(`  ✔ ${is_existing ? 'updated' : 'created'}   package.json`)
 }
 
@@ -230,7 +227,7 @@ function initialize_project(shape: ProjectShape): void {
 
 	run_ai_file_actions(shape)
 	pack_hook.sync_pack_hook(PROJECT_ROOT, PACKAGE_DIR)
-	if (shape.profile === 'full') project_config.sync_project_config(PROJECT_ROOT)
+	if (shape.profile === 'full') sync.sync_release_window_mirrors(PROJECT_ROOT)
 }
 
 // A tool `init` just listed is absent until the user installs it — and `josh lint` then fails on it
@@ -337,10 +334,6 @@ function run_cli(args: ReadonlyArray<string>): void {
 	}
 }
 
-if (process.argv[1] === fileURLToPath(import.meta.url)) {
-	run_cli(process.argv.slice(ARGUMENT_START_INDEX))
-}
-
 const init = {
 	copy_ai_file: init_ai_copy.copy_ai_file,
 	apply_package_json_merges,

package/scripts/init/kit-development-versions.ts

@@ -1,8 +1,6 @@
-import { readFileSync } from 'node:fs'
+import { package_manifest } from '#scripts/lib/package-manifest'
 import { z } from 'zod'
-import { package_path } from './init-paths'
-
-const PACKAGE_JSON = 'package.json'
+import { PACKAGE_DIR } from './init-paths'
 
 const kit_manifest_schema = z.object({
 	peerDependencies: z.record(z.string(), z.string()).default({}),
@@ -12,9 +10,7 @@ const kit_manifest_schema = z.object({
 type KitManifest = z.infer<typeof kit_manifest_schema>
 
 function read_kit_manifest(): KitManifest {
-	const content = readFileSync(package_path(PACKAGE_JSON), 'utf8')
-
-	return kit_manifest_schema.parse(JSON.parse(content))
+	return package_manifest.read_manifest(PACKAGE_DIR, kit_manifest_schema)
 }
 
 // The version kit's own devDependencies carry for each name, so a consumer runs the toolchain kit

package/scripts/init/kit-written-paths.ts

@@ -1,10 +1,10 @@
+import { PACKAGE_JSON } from '#scripts/lib/package-manifest'
 import { PACK_HOOK_FILE } from '#scripts/safe-chain/pack-hook'
 import { PROJECT_CONFIG_FILE } from '#scripts/safe-chain/project-config'
 import { managed_config_scope } from '#scripts/sync/managed-config-scope'
 import { BASIC_PRETTIER_CONFIG } from './init-actions'
 import { CLAUDE_MD_FILENAME } from './init-ai-copy'
 
-const MANIFEST_FILE = 'package.json'
 const LOCKFILE = 'pnpm-lock.yaml'
 
 // The paths `josh init` writes beyond what `managed_config_scope` enumerates. They stay out of that
@@ -15,7 +15,7 @@ const SETUP_ONLY_PATHS: ReadonlySet<string> = new Set([
 	BASIC_PRETTIER_CONFIG,
 	PROJECT_CONFIG_FILE,
 	PACK_HOOK_FILE,
-	MANIFEST_FILE,
+	PACKAGE_JSON,
 	LOCKFILE,
 ])
 

package/scripts/init/project-profile.ts

@@ -1,9 +1,11 @@
-import { existsSync, readdirSync, readFileSync, type Dirent } from 'node:fs'
+import { existsSync, readdirSync, type Dirent } from 'node:fs'
 import path from 'node:path'
 import { repo_origin } from '#scripts/discovery/repo-origin'
 import { git_spawn_sync } from '#scripts/git/git-spawn-sync'
 import { json_value } from '#scripts/lib/json-value'
+import { package_manifest } from '#scripts/lib/package-manifest'
 import { KIT_PACKAGE_NAME } from '#scripts/version/kit-descriptor'
+import { z } from 'zod'
 import { kit_written_paths } from './kit-written-paths'
 import { own_formatter } from './own-formatter'
 import { workflow_mark } from './workflow-mark'
@@ -76,9 +78,8 @@ function requested_profile(
 }
 
 function read_manifest(root: string): Record<string, unknown> | undefined {
-	const filename = path.join(root, 'package.json')
-	if (!existsSync(filename)) return undefined
-	const parsed: unknown = JSON.parse(readFileSync(filename, 'utf8'))
+	if (!existsSync(package_manifest.manifest_path(root))) return undefined
+	const parsed = package_manifest.read_manifest(root, z.unknown())
 
 	if (!json_value.is_record(parsed)) throw new Error('package.json must contain an object')
 

package/scripts/init/tsconfig-preset-migration.ts

@@ -12,7 +12,8 @@ import { string_array_schema } from '#scripts/lib/schemas'
 // `*.json`; a consumer whose `extends` still points at the old path would never be repaired by the
 // ensure-based merge — an `@joshuafolkken/*` tsconfig entry is already present, so nothing is added
 // — hence the rewrite here. Scoped to `@joshuafolkken/*/tsconfig/*` paths so an unrelated
-// project-local `.jsonc` config is left alone.
+// project-local `.jsonc` config is left alone. Removable from kit 2.0.0; a consumer still extended
+// a `.jsonc` preset at joshuafolkken/kit#4187.
 const LEGACY_PRESET_ENTRY = /@joshuafolkken\/[^/]+\/tsconfig\/[^/]+\.jsonc$/u
 const LEGACY_SUFFIX = '.jsonc'
 const CURRENT_SUFFIX = '.json'

package/scripts/init/vscode-tasks.ts

@@ -13,7 +13,7 @@ const VSCODE_TASKS_FILENAME = 'tasks.json'
 
 // A label kit once shipped a task under, mapped to the label that replaced it. A consumer's task still
 // carrying the retired label is the same kit task under its old name, so it is replaced in place — an
-// append would leave the retired folder-open pane starting beside its successor.
+// append would leave the retired task beside its successor.
 const RETIRED_LABELS: ReadonlyMap<unknown, string> = new Map([
 	['josh: run event watch', 'josh: run board'],
 ])

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

@@ -0,0 +1,106 @@
+import { git_gh_command } from '#scripts/gh/git-gh-command'
+import type { IssueRead } from '#scripts/gh/git-gh-issue-read'
+import { git_spawn } from '#scripts/git/git-spawn'
+import { parse_json } from '#scripts/git/parse-json-array'
+import { issue_number_shape } from '#scripts/issue/issue-number-shape'
+import { run_prep_locate } from '#scripts/run/run-prep-locate'
+import { z } from 'zod'
+import { defect_origin, type Candidate, type Merge, type TargetMerges } from './defect-origin'
+import { issue_read_cli } from './issue-read-cli'
+import { session_cite } from './session-cite'
+
+const SUCCESS_EXIT_CODE = 0
+const FAILURE_EXIT_CODE = 1
+const USAGE = 'Usage: pnpm josh defect:origin <N>'
+const UNREADABLE_MESSAGE = 'Could not read the issue, so no origin candidate is listed:'
+const UNSEARCHABLE_MESSAGE = 'Could not search the merge history for'
+
+const filed_schema = z.object({ createdAt: z.string() })
+
+interface IssueText {
+	text: string
+	filed_at: string | undefined
+}
+
+// A target that git cannot search is named on stderr and contributes nothing, rather than ending the
+// listing or passing for a target no merge touched.
+async function read_merges(
+	target: string,
+	arguments_: Array<string>,
+): Promise<ReadonlyArray<Merge>> {
+	try {
+		return defect_origin.parse_merges(await git_spawn.read(arguments_))
+	} catch {
+		console.error(`${UNSEARCHABLE_MESSAGE} ${target}`)
+
+		return []
+	}
+}
+
+// A path is looked up by pathspec; a name no path matches, by the merges that added or removed it.
+async function merges_for(target: string, before: string | undefined): Promise<TargetMerges> {
+	const by_path = await read_merges(target, defect_origin.path_arguments(target, before))
+	const merges =
+		by_path.length > 0
+			? by_path
+			: await read_merges(target, defect_origin.pickaxe_arguments(target, before))
+
+	return { target, merges }
+}
+
+async function candidates_for(issue: IssueText): Promise<ReadonlyArray<Candidate>> {
+	const targets = run_prep_locate.extract_targets(issue.text)
+	const found = await Promise.all(
+		targets.map(async (target) => await merges_for(target, issue.filed_at)),
+	)
+
+	return defect_origin.rank(found)
+}
+
+async function listing(issue_number: string, issue: IssueText): Promise<string> {
+	return defect_origin.format(issue_number, await candidates_for(issue))
+}
+
+// An unreadable filing time leaves the log unbounded rather than listing nothing.
+function filed_at_of(read: IssueRead): string | undefined {
+	if (read.kind !== 'read') return undefined
+
+	return parse_json.parse_json_object_or_undefined(read.json, filed_schema)?.createdAt
+}
+
+// The body and trusted comments as `issue:read` prints them, and when the issue was filed; the
+// failure kind when the issue could not be read.
+async function read_issue(issue_number: string): Promise<IssueText | string> {
+	const [read, filed] = await Promise.all([
+		issue_read_cli.read_block(issue_number),
+		git_gh_command.issue_view_json_classified(issue_number, 'createdAt'),
+	])
+
+	return read.kind === 'ok' ? { text: read.block, filed_at: filed_at_of(filed) } : read.kind
+}
+
+async function run(argv: ReadonlyArray<string>): Promise<number> {
+	const [issue_number = ''] = argv
+
+	if (argv.length !== 1 || !issue_number_shape.is_issue_number(issue_number)) {
+		console.error(USAGE)
+
+		return FAILURE_EXIT_CODE
+	}
+
+	const issue = await read_issue(issue_number)
+
+	if (typeof issue === 'string') {
+		console.error(`${UNREADABLE_MESSAGE} ${issue}`)
+
+		return FAILURE_EXIT_CODE
+	}
+
+	console.info(session_cite.text(await listing(issue_number, issue)))
+
+	return SUCCESS_EXIT_CODE
+}
+
+const defect_origin_cli = { USAGE, run }
+
+export { defect_origin_cli }