@joshuafolkken/kit 1.887.0 → 1.929.0

package/scripts/init/hook-command-rewrite.ts

@@ -1,3 +1,4 @@
+import { GIT_LOCATION_VARIABLES } from '#scripts/git/git-location-environment'
 import { claude_plugin_config } from './claude-plugin-config'
 import { hook_launch } from './hook-launch'
 
@@ -15,7 +16,7 @@ import { hook_launch } from './hook-launch'
 
 const PNPM_JOSH_PREFIX = 'pnpm josh '
 const CODEX_ADAPTER_SOURCE = 'pnpm exec tsx scripts/hooks/codex-hook-adapter.ts'
-// Relative to the consumer's project root, which is the working directory a Claude Code hook runs in.
+// Relative to the consumer's project root, which hook commands select before using this path.
 // The path is the plugin marketplace's `node_modules` location plus the built entry `bin.josh` names.
 const BUNDLE_INVOCATION = `node ${claude_plugin_config.MARKETPLACE_PATH}/dist/josh.js `
 // The per-hook bundle directory a fresh clone builds, and where it lives inside the installed package.
@@ -26,7 +27,8 @@ const MISSING_INSTALL_NOTICE = 'kit hooks inactive: run pnpm install, then rerea
 const MISSING_INSTALL_GUARD = `if [ ! -f ${CONSUMER_PACKAGE_MANIFEST} ]; then echo '${MISSING_INSTALL_NOTICE}' >&2; exit 0; fi; `
 const CODEX_ADAPTER_BUNDLE = `node ${CONSUMER_HOOK_BUNDLE_DIR}codex-hook-adapter.js`
 const CODEX_HOOKS_DESTINATION = '.codex/hooks.json'
-const CODEX_ROOT_PREFIX = String.raw`cd \"$(git rev-parse --show-toplevel)\" && `
+const GIT_UNSET_OPTIONS = GIT_LOCATION_VARIABLES.map((name) => `-u ${name}`).join(' ')
+const PROJECT_ROOT_PREFIX = String.raw`if project_root=\"$(env ${GIT_UNSET_OPTIONS} git rev-parse --show-toplevel 2>/dev/null)\"; then unset ${GIT_LOCATION_VARIABLES.join(' ')}; else project_root=\"$(git rev-parse --show-toplevel)\" || exit 1; fi; cd \"$project_root\" && `
 // Capture the value of every `"command"` field, escapes and all, so the rewrites below touch command
 // values alone — never an echo reminder's prose or a `"description"` that merely mentions the string.
 const COMMAND_FIELD = /("command":\s*")((?:[^"\\]|\\.)*)(")/gu
@@ -61,7 +63,9 @@ function rewrite_command_value(value: string): string {
 function rewrite_hook_commands(content: string, is_codex = false): string {
 	return content.replaceAll(COMMAND_FIELD, (_match, open: string, value: string, close: string) => {
 		const rewritten = rewrite_command_value(value)
-		const prefix = is_codex && !rewritten.startsWith(CODEX_ROOT_PREFIX) ? CODEX_ROOT_PREFIX : ''
+		const should_select_root = is_codex || rewritten.includes(claude_plugin_config.MARKETPLACE_PATH)
+		const prefix =
+			should_select_root && !rewritten.startsWith(PROJECT_ROOT_PREFIX) ? PROJECT_ROOT_PREFIX : ''
 
 		return `${open}${prefix}${rewritten}${close}`
 	})

package/scripts/init/init-actions.ts

@@ -1,10 +1,17 @@
 import { readFileSync } from 'node:fs'
 import path from 'node:path'
+import { json_format } from '#scripts/config-merge/json-format'
 import { string_array_schema, vscode_settings_schema } from '#scripts/lib/schemas'
 import { init_logic } from './init-logic'
 import { package_path, PROJECT_ROOT } from './init-paths'
+import type { ProjectShape } from './project-profile'
 
 const PRETTIER_CONFIG_JS = 'prettier.config.js'
+const STATIC_PRETTIER_CONFIG = 'prettier.config.mjs'
+const VSCODE_EXTENSIONS_PATH = '.vscode/extensions.json'
+const VSCODE_SETTINGS_PATH = '.vscode/settings.json'
+const TSCONFIG_PATH = 'tsconfig.json'
+const LEFTHOOK_PATH = 'lefthook.yml'
 
 interface FileAction {
 	dest: string
@@ -38,13 +45,13 @@ function build_vscode_actions(): ReadonlyArray<FileAction> {
 
 	return [
 		{
-			dest: '.vscode/extensions.json',
+			dest: VSCODE_EXTENSIONS_PATH,
 			create: () => read_package_file(extensions_path),
 			merge: (existing) =>
 				init_logic.merge_json_array_field(existing, 'recommendations', recommendations),
 		},
 		{
-			dest: '.vscode/settings.json',
+			dest: VSCODE_SETTINGS_PATH,
 			create: () =>
 				init_logic.strip_kit_only_vscode_settings_content(read_package_file(settings_path)),
 			merge: (existing) => init_logic.merge_json_object(existing, settings_data),
@@ -52,6 +59,64 @@ function build_vscode_actions(): ReadonlyArray<FileAction> {
 	]
 }
 
+const STATIC_EXTENSIONS = [
+	'streetsidesoftware.code-spell-checker',
+	'pkief.material-icon-theme',
+	'usernamehw.errorlens',
+	'anthropic.claude-code',
+	'github.github-vscode-theme',
+]
+const PRETTIER_EXTENSION = 'esbenp.prettier-vscode'
+const DEFAULT_FORMATTER = 'editor.defaultFormatter'
+const FORMAT_ON_SAVE = 'editor.formatOnSave'
+const STATIC_LANGUAGES = ['[html]', '[css]', '[javascript]']
+
+function static_settings(): Record<string, Record<string, unknown>> {
+	const formatter = { [DEFAULT_FORMATTER]: PRETTIER_EXTENSION, [FORMAT_ON_SAVE]: true }
+
+	return Object.fromEntries(STATIC_LANGUAGES.map((language) => [language, formatter]))
+}
+
+function build_static_settings_action(): FileAction {
+	const settings = static_settings()
+
+	return build_action(
+		VSCODE_SETTINGS_PATH,
+		() => json_format.format_json(settings),
+		(existing) => init_logic.merge_json_object(existing, settings),
+	)
+}
+
+function build_static_vscode_actions(shape: ProjectShape): ReadonlyArray<FileAction> {
+	const recommendations = shape.has_web
+		? [...STATIC_EXTENSIONS, PRETTIER_EXTENSION]
+		: STATIC_EXTENSIONS
+	const actions: Array<FileAction> = [
+		build_action(
+			VSCODE_EXTENSIONS_PATH,
+			() => json_format.format_json({ recommendations }),
+			(existing) => init_logic.merge_json_array_field(existing, 'recommendations', recommendations),
+		),
+	]
+
+	if (shape.has_web) actions.push(build_static_settings_action())
+
+	return actions
+}
+
+function build_static_tsconfig_action(): FileAction {
+	return build_action(
+		TSCONFIG_PATH,
+		() => json_format.format_json({ extends: init_logic.get_tsconfig_extends_entry() }),
+		(existing) =>
+			init_logic.merge_tsconfig_extends(
+				existing,
+				init_logic.get_tsconfig_extends_entry(),
+				PROJECT_ROOT,
+			),
+	)
+}
+
 // Create-only: the rule list is a project-owned allowlist once it exists, so a consumer
 // that added custom rules or disabled a noisy one must not have that overwritten.
 function build_secretlint_action(): FileAction {
@@ -65,7 +130,7 @@ function build_secretlint_action(): FileAction {
 // migrate a retired `*.jsonc` preset path only once its renamed target is installed (#681).
 function build_tsconfig_action(): FileAction {
 	return build_action(
-		'tsconfig.json',
+		TSCONFIG_PATH,
 		() => init_logic.generate_tsconfig(),
 		(existing) =>
 			init_logic.merge_tsconfig_exclude(
@@ -89,7 +154,7 @@ function build_config_file_actions(): ReadonlyArray<FileAction> {
 			(existing) => init_logic.merge_cspell_import(existing, init_logic.get_cspell_import_value()),
 		),
 		build_action(
-			'lefthook.yml',
+			LEFTHOOK_PATH,
 			() => init_logic.generate_lefthook_config(),
 			(existing) => init_logic.merge_lefthook_extends(existing, lefthook_extends),
 		),
@@ -122,9 +187,29 @@ function build_gitignore_action(): FileAction {
 	)
 }
 
-function build_file_actions(): ReadonlyArray<FileAction> {
+function build_static_actions(shape: ProjectShape): ReadonlyArray<FileAction> {
+	const actions: Array<FileAction> = []
+	if (shape.has_git) actions.push(build_gitignore_action())
+	if (shape.has_typescript) actions.push(build_static_tsconfig_action())
+
+	if (shape.has_web) {
+		actions.push({
+			dest: STATIC_PRETTIER_CONFIG,
+			create: () =>
+				"import { config } from '@joshuafolkken/kit/prettier/static'\n\nexport default config\n",
+		})
+	}
+
+	actions.push(...build_static_vscode_actions(shape))
+
+	return actions
+}
+
+function build_file_actions(shape?: ProjectShape): ReadonlyArray<FileAction> {
+	if (shape?.profile === 'static') return build_static_actions(shape)
+
 	return [
-		build_gitignore_action(),
+		...(shape?.has_git === false ? [] : [build_gitignore_action()]),
 		build_action(
 			'.npmrc',
 			() => init_logic.generate_npmrc(),
@@ -137,7 +222,9 @@ function build_file_actions(): ReadonlyArray<FileAction> {
 			(existing) => init_logic.merge_prettier_config(existing),
 		),
 		build_playwright_action(),
-		...build_config_file_actions(),
+		...build_config_file_actions().filter(
+			(action) => shape?.has_git !== false || action.dest !== LEFTHOOK_PATH,
+		),
 	]
 }
 

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

@@ -12,9 +12,37 @@ import { transform_copied_content } from './init-copy-content'
 import { init_logic } from './init-logic'
 import { package_path, PROJECT_ROOT } from './init-paths'
 import { init_sonar } from './init-sonar'
+import type { ProjectShape } from './project-profile'
 
 const WORKSPACE_YAML = 'pnpm-workspace.yaml'
 const CLAUDE_MD_FILENAME = 'CLAUDE.md'
+const STATIC_CLAUDE_IMPORT = '@node_modules/@joshuafolkken/kit/dist/CLAUDE.static.md'
+const PRETTIER_IGNORE = '.prettierignore'
+const GIT_ATTRIBUTES = '.gitattributes'
+const CODE_OF_CONDUCT = 'CODE_OF_CONDUCT.md'
+const SECURITY_MD = 'SECURITY.md'
+const STATIC_AI_FILES = [
+	'AGENTS.md',
+	'GEMINI.md',
+	PRETTIER_IGNORE,
+	GIT_ATTRIBUTES,
+	CODE_OF_CONDUCT,
+	SECURITY_MD,
+	WORKSPACE_YAML,
+]
+// A static project gets its own template for these, not kit's development copy (joshuafolkken/kit#2693).
+const STATIC_SOURCES: Readonly<Record<string, string>> = {
+	[PRETTIER_IGNORE]: 'templates/prettierignore.static',
+	[WORKSPACE_YAML]: 'templates/pnpm-workspace.static.yaml',
+}
+const GITHUB_FILES = new Set([CODE_OF_CONDUCT, SECURITY_MD])
+const STATIC_POINTER_MAPPING = { src: 'templates/cursorrules.static', dest: '.cursorrules' }
+const PULL_REQUEST_TEMPLATE = '.github/pull_request_template.md'
+const RELEASE_CONFIG = '.github/release.yml'
+const STATIC_GITHUB_MAPPINGS = [
+	{ src: PULL_REQUEST_TEMPLATE, dest: PULL_REQUEST_TEMPLATE },
+	{ src: RELEASE_CONFIG, dest: RELEASE_CONFIG },
+]
 
 // Whether the existing file is a workflow that carries no header. A read failure answers "no": the
 // point is to warn, and a warning is not worth failing a command that used to open nothing.
@@ -59,7 +87,7 @@ function did_skip_copy_if_absent(
 	label: string,
 ): boolean {
 	if (existsSync(destination_path)) {
-		console.info(`  ⏭ skipped   ${label} (already exists — run josh sync to update)`)
+		console.info(`  ⏭ skipped   ${label} (already exists)`)
 		did_warn_unstamped_workflow(destination_path, label)
 
 		return true
@@ -89,8 +117,9 @@ function did_skip_workspace_yaml_copy(source_path: string, destination_path: str
 	return false
 }
 
-function did_skip_ai_file_copy(filename: string): boolean {
-	const source_path = package_path(filename)
+function did_skip_ai_file_copy(filename: string, shape?: ProjectShape): boolean {
+	const static_source = shape?.profile === 'static' ? STATIC_SOURCES[filename] : undefined
+	const source_path = package_path(static_source ?? filename)
 	const destination_path = path.join(PROJECT_ROOT, filename)
 
 	if (filename === WORKSPACE_YAML) {
@@ -183,16 +212,21 @@ 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
 // (joshuafolkken/kit#1878), so it is handled here rather than through AI_COPY_FILES.
-function did_skip_claude_md_import(): boolean {
+function did_skip_claude_md_import(shape?: ProjectShape): boolean {
 	const destination_path = path.join(PROJECT_ROOT, CLAUDE_MD_FILENAME)
 
 	if (existsSync(destination_path)) {
-		console.info(`  ⏭ skipped   ${CLAUDE_MD_FILENAME} (already exists — run josh sync to update)`)
+		console.info(`  ⏭ skipped   ${CLAUDE_MD_FILENAME} (already exists)`)
 
 		return true
 	}
 
-	writeFileSync(destination_path, init_logic.ensure_claude_md_import(undefined))
+	const content =
+		shape?.profile === 'static'
+			? `> If kit is not installed, run \`pnpm install\` first.\n\n${STATIC_CLAUDE_IMPORT}\n`
+			: init_logic.ensure_claude_md_import(undefined)
+
+	writeFileSync(destination_path, content)
 	console.info(`  ✔ created   ${CLAUDE_MD_FILENAME}`)
 
 	return false
@@ -201,14 +235,69 @@ function did_skip_claude_md_import(): boolean {
 // Returns the repository name resolved for the Sonar config, so `josh init` can reuse it for the
 // security-updates report instead of spawning a second `gh repo view` (joshuafolkken/kit#805).
 // Resolving it here rather than in the caller keeps every AI-file write ahead of the network call.
-function run_ai_copies(): string | undefined {
-	const did_skip_claude_md = did_skip_claude_md_import()
-	const file_skips = init_logic
-		.get_ai_copy_files()
-		.map((filename) => did_skip_ai_file_copy(filename))
-	const mapping_skips = init_logic
-		.get_ai_copy_file_mappings()
-		.map(({ src: source, dest: destination }) => did_skip_ai_file_mapping(source, destination))
+function should_copy_git_file(filename: string, shape?: ProjectShape): boolean {
+	if (shape?.has_git !== false) return true
+
+	return (
+		filename !== GIT_ATTRIBUTES &&
+		!filename.startsWith('.claude/') &&
+		!filename.startsWith('.codex/')
+	)
+}
+
+function should_copy_github_file(filename: string, shape?: ProjectShape): boolean {
+	if (shape?.has_github !== false) return true
+
+	return !GITHUB_FILES.has(filename) && !filename.startsWith('.github/')
+}
+
+function should_copy_static_file(filename: string, shape?: ProjectShape): boolean {
+	if (filename !== PRETTIER_IGNORE || shape?.profile !== 'static') return true
+
+	return shape.has_web
+}
+
+function should_copy_ai_file(filename: string, shape?: ProjectShape): boolean {
+	return (
+		should_copy_git_file(filename, shape) &&
+		should_copy_github_file(filename, shape) &&
+		should_copy_static_file(filename, shape)
+	)
+}
+
+function ai_files(shape?: ProjectShape): ReadonlyArray<string> {
+	const files = shape?.profile === 'static' ? STATIC_AI_FILES : init_logic.get_ai_copy_files()
+
+	return files.filter((filename) => should_copy_ai_file(filename, shape))
+}
+
+function ai_mapping_skips(shape?: ProjectShape): ReadonlyArray<boolean> {
+	const mappings =
+		shape?.profile === 'static'
+			? [STATIC_POINTER_MAPPING, ...(shape.has_github ? STATIC_GITHUB_MAPPINGS : [])]
+			: init_logic.get_ai_copy_file_mappings()
+
+	return mappings
+		.filter(({ dest }) => shape?.has_github !== false || !dest.startsWith('.github/'))
+		.map(({ src, dest }) => did_skip_ai_file_mapping(src, dest))
+}
+
+function repository_name(shape?: ProjectShape): string | undefined {
+	if (shape?.has_github === false || shape?.profile === 'static') return undefined
+
+	return gh_spawn.get_repo_name_with_owner()
+}
+
+function report_sync_hint(has_skips: boolean, shape?: ProjectShape): void {
+	if (!has_skips || shape?.profile === 'static') return
+
+	console.info('\n  💡 Run `josh sync` to overwrite skipped AI files with the latest version.')
+}
+
+function run_ai_copies(shape?: ProjectShape): string | undefined {
+	const did_skip_claude_md = did_skip_claude_md_import(shape)
+	const file_skips = ai_files(shape).map((filename) => did_skip_ai_file_copy(filename, shape))
+	const mapping_skips = ai_mapping_skips(shape)
 	const directory_skips = init_logic
 		.get_ai_copy_directories()
 		.map((directory_name) => did_skip_ai_directory_copy(directory_name))
@@ -216,13 +305,11 @@ function run_ai_copies(): string | undefined {
 		Boolean,
 	)
 
-	const name_with_owner = gh_spawn.get_repo_name_with_owner()
+	const name_with_owner = repository_name(shape)
 
-	init_sonar.copy_sonar_with_template(name_with_owner)
+	if (shape?.profile !== 'static') init_sonar.copy_sonar_with_template(name_with_owner)
 
-	if (has_skips) {
-		console.info('\n  💡 Run `josh sync` to overwrite skipped AI files with the latest version.')
-	}
+	report_sync_hint(has_skips, shape)
 
 	return name_with_owner
 }
@@ -230,6 +317,7 @@ function run_ai_copies(): string | undefined {
 const init_ai_copy = {
 	copy_ai_file,
 	run_ai_copies,
+	ai_files,
 }
 
 export { init_ai_copy }

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

@@ -42,16 +42,49 @@ function remove_deprecated_yaml_keys(content: string): string {
 	return `${result.trimEnd()}\n`
 }
 
+// pnpm 11+ writes this placeholder into `allowBuilds` for every build script it ignored, and fails
+// every later install until it is answered. `pnpm add -D @joshuafolkken/kit` before `josh init`
+// leaves one for esbuild, and the key-level merge below keeps an existing `allowBuilds` whole, so a
+// placeholder the template decides is answered here (joshuafolkken/kit#2693).
+const BUILD_PLACEHOLDER_PATTERN = /^([ \t]+)([^\s:#][^:#]*): set this to true or false$/gmu
+const TEMPLATE_BUILD_PATTERN = /^[ \t]+(?<key>[^\s:#][^:#]*):[ \t]*(?<value>true|false)\b/u
+
+function unquote(key: string): string {
+	return key.trim().replaceAll(/^['"]|['"]$/gu, '')
+}
+
+function template_build_values(template: string): Map<string, string> {
+	const lines = extract_yaml_block(template, 'allowBuilds').split('\n')
+
+	return new Map(
+		lines.flatMap((line) => {
+			const { key, value } = TEMPLATE_BUILD_PATTERN.exec(line)?.groups ?? {}
+
+			return key && value ? [[unquote(key), value] as const] : []
+		}),
+	)
+}
+
+function answer_build_placeholders(existing: string, template: string): string {
+	const values = template_build_values(template)
+
+	return existing.replaceAll(BUILD_PLACEHOLDER_PATTERN, (line, indent: string, key: string) => {
+		const value = values.get(unquote(key))
+
+		return value === undefined ? line : `${indent}${key}: ${value}`
+	})
+}
+
 function merge_workspace_yaml(existing: string, template: string): string {
 	if (!existing.trim()) return template
 	const normalized = existing.endsWith('\n') ? existing : `${existing}\n`
-	const without_deprecated = remove_deprecated_yaml_keys(normalized)
-	if (!without_deprecated.trim()) return template
-	const existing_keys = new Set(extract_yaml_top_level_keys(without_deprecated))
+	const cleaned = answer_build_placeholders(remove_deprecated_yaml_keys(normalized), template)
+	if (!cleaned.trim()) return template
+	const existing_keys = new Set(extract_yaml_top_level_keys(cleaned))
 	const new_keys = extract_yaml_top_level_keys(template).filter((k) => !existing_keys.has(k))
-	if (new_keys.length === 0) return without_deprecated
+	if (new_keys.length === 0) return cleaned
 
-	return append_user_blocks(without_deprecated, new_keys, template)
+	return append_user_blocks(cleaned, new_keys, template)
 }
 
 const init_logic_workspace = { merge_workspace_yaml }

package/scripts/init/init-logic.ts

@@ -451,6 +451,7 @@ const init_logic = {
 	strip_kit_only_vscode_settings,
 	strip_kit_only_vscode_settings_content,
 	VSCODE_EXTENSIONS_FILENAME,
+	SAFE_CHAIN_CMD,
 	GUARDED_LEFTHOOK_CMD,
 	upgrade_prepare_lefthook_warning,
 	get_npmrc_lines,

package/scripts/init/init-static.ts

@@ -0,0 +1,55 @@
+import { json_format } from '#scripts/config-merge/json-format'
+import { z } from 'zod'
+import { init_logic } from './init-logic'
+import type { ProjectShape } from './project-profile'
+
+const KIT_PACKAGE_NAME = '@joshuafolkken/kit'
+const record_schema = z.record(z.string(), z.unknown())
+
+function is_record(value: unknown): value is Record<string, unknown> {
+	return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+interface StaticVersions {
+	kit: string
+	prettier: string
+}
+
+function initial_manifest(): string {
+	return json_format.format_json({ private: true })
+}
+
+function with_recorded_profile(content: string, profile: ProjectShape['profile']): string {
+	const parsed: unknown = JSON.parse(content)
+	const manifest = record_schema.parse(parsed)
+	const existing = manifest['josh']
+	const josh = is_record(existing) ? existing : {}
+
+	manifest['josh'] = { ...josh, profile }
+
+	return json_format.format_json(manifest)
+}
+
+function merge_static_manifest(
+	content: string,
+	shape: ProjectShape,
+	versions: StaticVersions,
+): string {
+	const with_profile = with_recorded_profile(content, shape.profile)
+	const with_script = init_logic.merge_package_scripts(with_profile, {
+		preinstall: init_logic.SAFE_CHAIN_CMD,
+		josh: 'josh',
+	})
+	const with_kit = init_logic.merge_development_dependencies(with_script, {
+		[KIT_PACKAGE_NAME]: versions.kit,
+	})
+	const with_prettier = shape.has_web
+		? init_logic.merge_development_dependencies(with_kit, { prettier: versions.prettier })
+		: with_kit
+
+	return init_logic.sort_package_json_keys(with_prettier)
+}
+
+const init_static = { initial_manifest, with_recorded_profile, merge_static_manifest }
+export { init_static }
+export type { StaticVersions }