@joshuafolkken/kit 1.983.0 → 1.1003.0

package/prompts/testing-guide.md

@@ -23,7 +23,7 @@ Req N: ...
 
 - **Every user-facing behavior change** (UI interaction, keyboard shortcut, visible state change) must have a corresponding E2E test.
 - **Every logic/utility change** (pure functions, filters, transforms) must have a unit test.
-- **static の HTML/CSS だけの変更:** `package.json` に `josh.profile: static` が記録されていれば自動テストは不要。ブラウザーで対象ページを開き、想定する画面幅でレイアウト・リンク・HTML 内の操作を確認して結果を記録する。同じ変更に JavaScript または TypeScript のファイルが含まれれば自動テストを行う。
+- **basic で kit がテストできない言語だけの変更:** `package.json` に `josh.profile: basic`（改名前の `static` も同じ）が記録され、変更が HTML/CSS や Lua などのソースだけなら自動テストは不要。HTML/CSS はブラウザーで対象ページを開き、想定する画面幅でレイアウト・リンク・HTML 内の操作を確認する。そのほかのソースは変更した処理を実際に動かす。どちらも結果を記録する。同じ変更に JavaScript または TypeScript のファイルが含まれれば自動テストを行う。
 - If a test is genuinely infeasible (e.g., native OS date-picker popup cannot be driven by Playwright), write a comment in the test file explaining why and test the closest observable behavior instead (e.g., that the editor remains open after the `change` event fires).
 - Do **not** report a requirement as done if its test is missing.
 

package/scripts/agent/agent-diagnostics.ts

@@ -37,6 +37,7 @@ const PROVIDER_CLI_TABLE: Readonly<Record<AgentProvider, ProviderCli>> = {
 const MODEL_CLI_FLOORS: ReadonlyMap<string, string> = new Map([
 	['claude-opus-5-5', '2.1.280'],
 	['gpt-6-sol', '0.155.0'],
+	['gpt-6.1-sol', '0.159.1'],
 ])
 
 const default_ports: DiagnosticPorts = {

package/scripts/agent/agent-role-profile.ts

@@ -44,7 +44,7 @@ const OPENAI_PROVIDER: AgentProvider = 'openai'
 // whenever the CLI moves it, so a run log could not say which model produced it and a model migration
 // could not be measured apart from everything else. A new lane records the id it resolved; a lane
 // created before a migration keeps the model it recorded (`with_phase_effort` leaves it untouched).
-const OPENAI_MODEL = 'gpt-6-sol'
+const OPENAI_MODEL = 'gpt-6.1-sol'
 const ANTHROPIC_MODEL = 'claude-opus-5-5'
 const CODEX_SESSION_KEY = 'CODEX_THREAD_ID'
 

package/scripts/behavior/behavior-rules.ts

@@ -1,4 +1,5 @@
 import { json_value } from '#scripts/lib/json-value'
+import { time_shell } from '#scripts/time-runtime/time-shell'
 import type { Block, TranscriptLine } from '#scripts/time-runtime/time-transcript-line'
 import type { Assertion, Finding } from './behavior-assertion'
 
@@ -57,8 +58,14 @@ function command_of(block: Block): string | undefined {
 // Whether any segment of a command directly mutates the index: it begins with a staging or commit
 // subcommand and is not a dry run. Each `;`/`&&`/`|`-separated segment is judged on its own, so a
 // mutation anywhere in a chain is caught while a mention inside another command's argument is not.
+//
+// Quoted spans are removed before the split (joshuafolkken/kit#2841): a `|` inside a quoted pattern —
+// `grep -E "commit|git add" file` — is not a separator, and cutting there synthesized a segment that
+// began with `git add` out of a read-only search. `unquoted` honors escapes and heredoc bodies, so a
+// stray `it's` cannot pair with a later quote and erase the real `git add` between them.
 function is_index_mutation(command: string): boolean {
-	return command
+	return time_shell
+		.unquoted(command)
 		.split(SEGMENT_SEPARATOR)
 		.map((segment) => segment.trim())
 		.some((segment) => INDEX_MUTATION_HEAD.test(segment) && !is_dry_run(segment))

package/scripts/build/build-claude-md.ts

@@ -7,11 +7,17 @@ import { init_logic } from '#scripts/init/init-logic'
 const SCRIPT_DIR = path.dirname(fileURLToPath(import.meta.url))
 const REPO_ROOT = path.resolve(SCRIPT_DIR, '..', '..')
 const DIST_ROOT = path.join(REPO_ROOT, 'dist')
-const STATIC_CLAUDE_FILENAME = 'CLAUDE.static.md'
+const BASIC_CLAUDE_FILENAME = 'CLAUDE.basic.md'
 const SOURCE_CLAUDE_MD = path.join(REPO_ROOT, 'CLAUDE.md')
 const DIST_CLAUDE_MD = path.join(DIST_ROOT, 'CLAUDE.md')
-const SOURCE_STATIC_CLAUDE_MD = path.join(REPO_ROOT, 'templates', STATIC_CLAUDE_FILENAME)
-const DIST_STATIC_CLAUDE_MD = path.join(DIST_ROOT, STATIC_CLAUDE_FILENAME)
+const SOURCE_BASIC_CLAUDE_MD = path.join(REPO_ROOT, 'templates', BASIC_CLAUDE_FILENAME)
+// A basic project's `CLAUDE.md` imports the rules from dist/. One initialized before
+// joshuafolkken/kit#2829 imports them under the profile's old name until `josh init` is re-run
+// and migrates that import, so the same rules ship under both names.
+const DIST_BASIC_CLAUDE_MDS: ReadonlyArray<string> = [
+	path.join(DIST_ROOT, BASIC_CLAUDE_FILENAME),
+	path.join(DIST_ROOT, 'CLAUDE.static.md'),
+]
 
 // Read kit's own CLAUDE.md and apply the distribution path transform. kit's source keeps relative
 // paths so it resolves inside the kit repository; the published copy rewrites them so every backtick
@@ -27,7 +33,9 @@ function generate_distributed_claude_md(): string {
 function build_claude_md(): string {
 	mkdirSync(path.dirname(DIST_CLAUDE_MD), { recursive: true })
 	writeFileSync(DIST_CLAUDE_MD, generate_distributed_claude_md())
-	writeFileSync(DIST_STATIC_CLAUDE_MD, readFileSync(SOURCE_STATIC_CLAUDE_MD, 'utf8'))
+	const basic_rules = readFileSync(SOURCE_BASIC_CLAUDE_MD, 'utf8')
+
+	for (const destination of DIST_BASIC_CLAUDE_MDS) writeFileSync(destination, basic_rules)
 
 	return DIST_CLAUDE_MD
 }
@@ -40,6 +48,7 @@ if (process.argv[1] === fileURLToPath(import.meta.url)) main()
 
 export {
 	build_claude_md,
+	DIST_BASIC_CLAUDE_MDS,
 	generate_distributed_claude_md,
 	SOURCE_CLAUDE_MD,
 	DIST_CLAUDE_MD,

package/scripts/ci/pr-classification.ts

@@ -12,7 +12,11 @@ import { z } from 'zod'
 
 const CLASSIFICATION_SET: ReadonlySet<string> = new Set(CLASSIFICATION_LABELS)
 const ISSUE_BUG_LABEL = 'bug'
-const DECLARATION = /^- リリース分類: (.+)$/gmu
+// The line an Issue body declares its release classification with. A body written by a script
+// (`josh propagate`'s upgrade issue) builds it with `declaration`, so the writer and this parser share
+// one format (joshuafolkken/kit#2858).
+const DECLARATION_PREFIX = '- リリース分類: '
+const DECLARATION = new RegExp(`^${DECLARATION_PREFIX}(.+)$`, 'gmu')
 const LEGACY_LABELS: ReadonlySet<string> = new Set(['semver-major', 'semver-minor'])
 
 const LABEL = z.object({ name: z.string() })
@@ -38,6 +42,10 @@ function classification_error(labels: ReadonlyArray<string>, author: string): st
 	return `Choose one release classification: ${CLASSIFICATION_LABELS.join(', ')}`
 }
 
+function declaration(label: ReleaseClassification): string {
+	return `${DECLARATION_PREFIX}${label}`
+}
+
 function is_classification(value: string): value is ReleaseClassification {
 	return CLASSIFICATION_SET.has(value)
 }
@@ -75,7 +83,7 @@ function select_issue_classification(issue_json: string): ReleaseClassification
 
 	if (label === undefined || selected.length > 1) {
 		throw new Error(
-			`Choose one release classification before opening the PR: ${CLASSIFICATION_LABELS.join(', ')}; found: ${selected.join(', ') || 'none'}. Add "- リリース分類: <label>" to the Issue body.`,
+			`Choose one release classification before opening the PR: ${CLASSIFICATION_LABELS.join(', ')}; found: ${selected.join(', ') || 'none'}. Add "${DECLARATION_PREFIX}<label>" to the Issue body.`,
 		)
 	}
 
@@ -125,6 +133,7 @@ if (process.argv[1] === fileURLToPath(import.meta.url)) {
 const pr_classification = {
 	classification_error,
 	check_event,
+	declaration,
 	is_classification,
 	select_issue_classification,
 }

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

@@ -82,7 +82,7 @@ const DOCUMENT_BYTE_BUDGET: ReadonlyArray<DocumentBudget> = [
 	{ path: '.claude/skills/workflow-commands/rule-residency.md', bytes: 24_576 },
 	{ path: '.claude/skills/workflow-commands/target-repository.md', bytes: 8192 },
 	{ path: '.claude/skills/workflow-commands/working-tree-hold.md', bytes: 8192 },
-	{ path: 'docs/josh-commands.md', bytes: 176_128 },
+	{ path: 'docs/josh-commands.md', bytes: 180_224 },
 	{ path: 'prompts/agent-rules.md', bytes: 4096 },
 	{ path: 'prompts/coding-standards.md', bytes: 16_384 },
 	{ path: 'prompts/collaboration-workflow.md', bytes: 8192 },

package/scripts/gate/gate-steps.ts

@@ -19,7 +19,7 @@ async function build_gate_step(
 	start_directory: string,
 	plan: GatePlan = gate_plan.resolve_gate_plan(),
 ): Promise<GateStep> {
-	const cwd = project_checks.is_static(start_directory)
+	const cwd = project_checks.is_basic(start_directory)
 		? project_checks.project_root(start_directory)
 		: undefined
 

package/scripts/gate/project-checks.ts

@@ -1,6 +1,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 { SKIP_MARKER } from '#scripts/test/skip-marker'
 import { z } from 'zod'
 
@@ -74,11 +75,11 @@ function josh_settings(manifest: unknown): unknown {
 	return manifest.josh
 }
 
-function is_static_manifest(manifest: unknown): boolean {
+function is_basic_manifest(manifest: unknown): boolean {
 	const josh = josh_settings(manifest)
 	if (typeof josh !== 'object' || josh === null || !('profile' in josh)) return false
 
-	return josh.profile === 'static'
+	return project_profile.parse_profile(josh.profile) === 'basic'
 }
 
 function read_manifest(directory: string): unknown {
@@ -91,8 +92,8 @@ function read_manifest(directory: string): unknown {
 	}
 }
 
-function is_static(directory: string): boolean {
-	return is_static_manifest(read_manifest(directory))
+function is_basic(directory: string): boolean {
+	return is_basic_manifest(read_manifest(directory))
 }
 
 function is_declared(directory: string, package_name: string): boolean {
@@ -124,30 +125,30 @@ function skip_notice(check: string, reason: string): string {
 	return `josh ${check}: ${reason} ${SKIP_MARKER} ${check}.`
 }
 
-// Shared by `josh check` and the gate's type-check step, so neither reaches `tsc` on a static
+// Shared by `josh check` and the gate's type-check step, so neither reaches `tsc` on a basic
 // project that has nothing to type-check (joshuafolkken/kit#2709).
 function type_check_skip_reason(directory: string): string | undefined {
-	if (!is_static(directory)) return undefined
+	if (!is_basic(directory)) return undefined
 	if (!has_files(directory, TYPE_FILES)) return 'no TypeScript files were found'
 	if (!has_config(directory, TYPE_CONFIGS)) return 'no TypeScript configuration was found'
 
 	return missing_tool_reason(directory, 'typescript', 'tsc')
 }
 
-// Shared by `josh lint`, `josh lint:related` and `josh format`, so a static project without Web
+// Shared by `josh lint`, `josh lint:related` and `josh format`, so a basic project without Web
 // files — a Python or Rust project, which `josh init` gives no Prettier — is skipped for the same
 // reason by all three (joshuafolkken/kit#2606, joshuafolkken/kit#2709).
 function prettier_skip_reason(directory: string): string | undefined {
-	if (!is_static(directory)) return undefined
+	if (!is_basic(directory)) return undefined
 	if (!has_files(directory, WEB_FILES)) return 'no HTML, CSS or JavaScript files were found'
 
 	return missing_tool_reason(directory, 'prettier', 'prettier')
 }
 
-// Shared by `josh lint`, `josh lint:related` and `josh format`, so a static project without ESLint
+// Shared by `josh lint`, `josh lint:related` and `josh format`, so a basic project without ESLint
 // is skipped for the same reason by all three (joshuafolkken/kit#2693, joshuafolkken/kit#2709).
 function eslint_skip_reason(directory: string): string | undefined {
-	if (!is_static(directory)) return undefined
+	if (!is_basic(directory)) return undefined
 	if (!has_files(directory, SCRIPT_FILES)) return 'no JavaScript or TypeScript files were found'
 	if (!has_config(directory, ESLINT_CONFIGS)) return 'no ESLint configuration was found'
 
@@ -165,7 +166,7 @@ const project_checks = {
 	has_bin,
 	has_config,
 	has_files,
-	is_static,
+	is_basic,
 	prettier_skip_reason,
 	project_root,
 	skip_notice,

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

@@ -5,7 +5,7 @@ import { execa } from 'execa'
 import { project_checks } from './project-checks'
 
 // `josh check` — the project-wide TypeScript check. It used to be a bare `tsc --noEmit` shell entry,
-// so on a static project with nothing to type-check it failed with `Command "tsc" not found` while
+// so on a basic project with nothing to type-check it failed with `Command "tsc" not found` while
 // the gate, which asks `type_check_skip_reason` first, skipped the same step
 // (joshuafolkken/kit#2709). Both now read that one decision.
 

package/scripts/git/git-branch.ts

@@ -84,6 +84,18 @@ function has_same_issue_prefix(branch_a: string, branch_b: string): boolean {
 	return prefix_a !== undefined && prefix_a === prefix_b
 }
 
+// The one rule `check_and_create_branch` refuses on, kept pure so `git-preflight.ts` asks it before
+// anything is pulled, switched or staged.
+function is_mismatch(
+	current_branch: string,
+	target_branch_name: string,
+	default_branch: string,
+): boolean {
+	if (current_branch === default_branch || current_branch === target_branch_name) return false
+
+	return !has_same_issue_prefix(current_branch, target_branch_name)
+}
+
 async function handle_default_branch(target_branch_name: string): Promise<void> {
 	await pull_latest()
 	const is_branch_exists: boolean = await exists(target_branch_name)
@@ -103,9 +115,7 @@ async function check_and_create_branch(
 		return target_branch_name
 	}
 
-	if (current_branch !== target_branch_name) {
-		if (has_same_issue_prefix(current_branch, target_branch_name)) return current_branch
-
+	if (is_mismatch(current_branch, target_branch_name, default_branch)) {
 		git_error.display_branch_mismatch_error(current_branch, target_branch_name)
 	}
 
@@ -118,6 +128,7 @@ const git_branch = {
 	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
 	// second copy of the pattern (joshuafolkken/kit#1497). A copy is what let `lane/<N>` ship: nothing
 	// asserted that the name `lane:open` writes is one this function accepts.

package/scripts/git/git-command.ts

@@ -19,8 +19,11 @@ async function branch(): Promise<string> {
 // recognizes the observation ledger by its path then misses it: `git-staging.ts` stages the directory
 // — ledger included — into an unrelated pull request, and the flush refuses the directory as "other
 // changes".
-async function status(): Promise<string> {
-	return await git_spawn.read(['status', PORCELAIN_FLAG, UNTRACKED_FILES_FLAG])
+// `directory` reads another work tree of the repository — a lane — instead of this one.
+async function status(directory?: string): Promise<string> {
+	const location = directory === undefined ? [] : ['-C', directory]
+
+	return await git_spawn.read([...location, 'status', PORCELAIN_FLAG, UNTRACKED_FILES_FLAG])
 }
 
 // The absolute path every other git command's output is relative to. Asking git rather than reading

package/scripts/git/git-issue.ts

@@ -92,14 +92,18 @@ async function lane_issue_title(branch_name: string, issue_number: string): Prom
 	return title
 }
 
+function branch_derivation_error(branch_name: string): string {
+	return `Cannot derive issue info from branch "${branch_name}" in non-interactive mode. ${argument_hint(EXAMPLE_ISSUE_NUMBER)}`
+}
+
+function branch_number(branch_name: string): string | undefined {
+	return BRANCH_NUMBER_PATTERN.exec(branch_name)?.[1]
+}
+
 async function derive_issue_input_from_branch(branch_name: string): Promise<string> {
 	const match = BRANCH_NUMBER_PATTERN.exec(branch_name)
 
-	if (match === null) {
-		throw new Error(
-			`Cannot derive issue info from branch "${branch_name}" in non-interactive mode. ${argument_hint(EXAMPLE_ISSUE_NUMBER)}`,
-		)
-	}
+	if (match === null) throw new Error(branch_derivation_error(branch_name))
 
 	const [, number = '', slug = ''] = match
 	const title = is_lane_branch(branch_name, number)
@@ -162,6 +166,10 @@ const git_issue = {
 	get_and_display,
 	resolve_and_display,
 	derive_from_branch,
+	// The pure halves of the two resolutions above, read by `git-preflight.ts` before anything changes.
+	parse: parse_issue_input,
+	branch_number,
+	branch_derivation_error,
 }
 
 export type { IssueInfo }

package/scripts/git/git-pr.ts

@@ -202,22 +202,27 @@ async function create_for_issue(
 	)
 }
 
-async function create_with_issue_info(issue_info: IssueInfo, extra_body?: string): Promise<void> {
-	const existing_label = await existing_pr_label(issue_info.branch_name)
-
-	if (existing_label !== undefined) {
-		await create_for_issue(issue_info, extra_body, existing_label)
+// The label the pull request is opened with — also asked by `git-preflight.ts` before the commit, so
+// a missing classification is reported beside the other unmet preconditions (joshuafolkken/kit#2817).
+async function release_classification(
+	issue_number: string,
+	branch_name: string,
+): Promise<ReleaseClassification> {
+	const existing_label = await existing_pr_label(branch_name)
 
-		return
-	}
+	if (existing_label !== undefined) return existing_label
 
-	const issue_json = await git_gh_command.issue_view_json(issue_info.number, 'labels,body')
+	const issue_json = await git_gh_command.issue_view_json(issue_number, 'labels,body')
 
 	if (issue_json === undefined) {
-		throw new Error(`Could not read issue #${issue_info.number} for release classification`)
+		throw new Error(`Could not read issue #${issue_number} for release classification`)
 	}
 
-	const label = pr_classification.select_issue_classification(issue_json)
+	return pr_classification.select_issue_classification(issue_json)
+}
+
+async function create_with_issue_info(issue_info: IssueInfo, extra_body?: string): Promise<void> {
+	const label = await release_classification(issue_info.number, issue_info.branch_name)
 
 	await create_for_issue(issue_info, extra_body, label)
 }
@@ -225,6 +230,7 @@ async function create_with_issue_info(issue_info: IssueInfo, extra_body?: string
 const git_pr = {
 	create,
 	create_with_issue_info,
+	release_classification,
 }
 
 export { git_pr }

package/scripts/git/git-preflight.ts

@@ -0,0 +1,138 @@
+import { live_evidence } from '#scripts/review/live-evidence'
+import { changed_paths } from './changed-paths'
+import { git_branch } from './git-branch'
+import { git_command } from './git-command'
+import { git_gh_command } from './git-gh-command'
+import { git_issue, type IssueInfo } from './git-issue'
+import { git_pr } from './git-pr'
+
+// joshuafolkken/kit#2817. A first `josh git -y` was refused once per unmet precondition — the title's
+// issue number, the branch name, the issue's release classification — each only after the stage
+// before it had already staged, switched or pushed. **Every precondition decidable at the start is
+// asked here, before anything changes, and all of them are reported at once.** No rule is new: each
+// answer comes from the function the later stage refuses with, so the two cannot drift apart.
+
+interface PreflightInput {
+	cli_input: string | undefined
+	will_open_pr: boolean
+}
+
+// The issue the run resolves to and the branch it will commit on, when both are known.
+interface Target {
+	number: string
+	branch_name: string
+}
+
+interface Resolution {
+	target: Target | undefined
+	problems: Array<string>
+}
+
+function error_message(error: unknown): string {
+	return error instanceof Error ? error.message : String(error)
+}
+
+function resolve_from_branch(current_branch: string): Resolution {
+	const number = git_issue.branch_number(current_branch)
+
+	if (number === undefined) {
+		return { target: undefined, problems: [git_issue.branch_derivation_error(current_branch)] }
+	}
+
+	return { target: { number, branch_name: current_branch }, problems: [] }
+}
+
+// A branch is created only from the default branch, so on any other the run commits where it stands.
+function resolve_parsed(
+	parsed: IssueInfo,
+	current_branch: string,
+	default_branch: string,
+): Resolution {
+	const branch_name = current_branch === default_branch ? parsed.branch_name : current_branch
+	const target = { number: parsed.number, branch_name }
+
+	if (!git_branch.is_mismatch(current_branch, parsed.branch_name, default_branch)) {
+		return { target, problems: [] }
+	}
+
+	return {
+		target,
+		problems: [
+			`Branch mismatch: on "${current_branch}", but the title resolves to "${parsed.branch_name}".`,
+		],
+	}
+}
+
+function resolve_from_title(
+	cli_input: string,
+	current_branch: string,
+	default_branch: string,
+): Resolution {
+	try {
+		return resolve_parsed(git_issue.parse(cli_input), current_branch, default_branch)
+	} catch (error) {
+		return { target: undefined, problems: [error_message(error)] }
+	}
+}
+
+async function resolve_target(cli_input: string | undefined): Promise<Resolution> {
+	const current_branch = await git_branch.current()
+
+	if (cli_input === undefined) return resolve_from_branch(current_branch)
+
+	return resolve_from_title(cli_input, current_branch, await git_command.get_default_branch())
+}
+
+async function classification_problems(target: Target): Promise<Array<string>> {
+	try {
+		await git_pr.release_classification(target.number, target.branch_name)
+
+		return []
+	} catch (error) {
+		return [error_message(error)]
+	}
+}
+
+// A notice rather than a refusal: the evidence is the output of running the change, which does not
+// exist before the commit. Saying so now is what spares the round trip at `josh followup`.
+async function announce_evidence(branch_name: string): Promise<void> {
+	// Before staging, a new file is still untracked, so the tracked diff alone would miss it.
+	const [paths, body] = await Promise.all([
+		changed_paths.read_changed_paths(false),
+		git_gh_command.pr_get_body(branch_name),
+	])
+
+	if (live_evidence.verdict_for(paths, body) !== 'required') return
+
+	console.info(
+		`💡 This change touches runtime code: the PR body needs a ${live_evidence.EVIDENCE_HEADING} section before \`josh followup\` merges it.`,
+	)
+}
+
+function refusal(problems: ReadonlyArray<string>): Error {
+	const lines = problems.map((problem) => `  - ${problem}`)
+
+	return new Error(
+		[
+			`Preflight found ${String(problems.length)} unmet precondition(s); nothing was changed:`,
+			...lines,
+		].join('\n'),
+	)
+}
+
+async function check(input: PreflightInput): Promise<void> {
+	const { target, problems } = await resolve_target(input.cli_input)
+	// The classification and the evidence belong to the pull request, so a `--skip-pr` run asks neither.
+	const pr_target = input.will_open_pr ? target : undefined
+	const pr_problems = pr_target === undefined ? [] : await classification_problems(pr_target)
+	const all_problems = [...problems, ...pr_problems]
+
+	if (all_problems.length > 0) throw refusal(all_problems)
+
+	if (pr_target !== undefined) await announce_evidence(pr_target.branch_name)
+}
+
+const git_preflight = { check }
+
+export type { PreflightInput }
+export { git_preflight }

package/scripts/git/telegram-notify.ts

@@ -61,6 +61,8 @@ const TASK_DEFINITIONS: Record<TelegramTaskType, TaskDefinition> = {
 	stranded: { icon: '🚨', label: 'Run stranded — nobody is driving it' },
 }
 
+const NOTIFY_SWITCH_KEY = 'JOSH_NOTIFY'
+const NOTIFY_OFF_VALUE = 'off'
 const NOT_CONFIGURED_PREFIX = 'Telegram is not configured'
 const SEND_FAILED_PREFIX = 'Telegram notification failed'
 const REDACTED = '<redacted>'
@@ -136,6 +138,14 @@ function load_config(): TelegramConfig {
 	return { bot_token: result.data.telegram_bot_token, chat_id: result.data.telegram_chat_id }
 }
 
+// **An explicit opt-out is not a missing credential** (joshuafolkken/kit#2821). A consumer who never
+// meant to use Telegram had no way to say so, so every stop printed the #1564 failure as noise. Only
+// the stated value `off` disables the send: an unset or mistyped switch still falls through to
+// `load_config`, so a forgotten setup stays the loud failure #1564 made it.
+function is_notify_disabled(): boolean {
+	return parse_environment_string(process.env[NOTIFY_SWITCH_KEY]).toLowerCase() === NOTIFY_OFF_VALUE
+}
+
 function build_header(task_type: TelegramTaskType, repo_name: string | undefined): string {
 	const { icon, label } = TASK_DEFINITIONS[task_type]
 	if (repo_name === undefined || repo_name.length === 0) return `${icon} ${label}`
@@ -210,7 +220,18 @@ function build_send_failure(error: unknown, config: TelegramConfig): Error {
 // warning and exiting 0, so a message that reached nobody looked exactly like one that arrived.
 //
 // The failure it throws carries a `cause`, and that cause is redacted too — see `build_send_failure`.
+//
+// The opt-out is checked here, before `load_config`, so every caller — the tolerant form included —
+// skips the same way and none has to repeat the check.
 async function send(input: TelegramSendInput): Promise<void> {
+	if (is_notify_disabled()) {
+		console.info(
+			`🔕 Telegram notifications are disabled (${NOTIFY_SWITCH_KEY}=${NOTIFY_OFF_VALUE}).`,
+		)
+
+		return
+	}
+
 	const config = load_config()
 	const text = build_text(input)
 

package/scripts/hooks/stop-guard.ts

@@ -10,6 +10,7 @@ import { lane_child_marker } from '#scripts/lane/lane-child-marker'
 import { filing_cap } from '#scripts/rules/filing-cap'
 import { lane_background } from '#scripts/rules/lane-background'
 import { lane_park } from '#scripts/rules/lane-park'
+import { last_prompt } from '#scripts/rules/last-prompt'
 import { stop_rules, type StopContext, type StopOutcome } from '#scripts/rules/stop-rules'
 import { run_cut } from '#scripts/run/run-cut'
 import { run_headless } from '#scripts/run/run-headless'
@@ -70,6 +71,7 @@ async function build_context(
 		tree_clean: !(await run_hold.is_tree_dirty()),
 		notified: lane_park.mentions_confirmation_notify(tail),
 		message: payload_tail.message,
+		prompt: last_prompt.prompt_text(tail),
 		stop_hook_active: payload_tail.stop_hook_active,
 		cut_pending: run_cut.carried_cut_sync() !== undefined,
 		filed: was_filed(tail),

package/scripts/init/basic-path-migration.ts

@@ -0,0 +1,24 @@
+// The two references `josh init` writes into a basic project, under the paths they had before
+// joshuafolkken/kit#2829 renamed the static profile. kit still ships both old paths so an earlier
+// project keeps working; re-running `josh init` moves the project onto the new ones, which is what
+// lets the old paths be retired once projects have moved.
+const RENAMED_REFERENCES: ReadonlyArray<readonly [RegExp, string]> = [
+	[
+		/@node_modules\/@joshuafolkken\/kit\/dist\/CLAUDE\.static\.md(?![\w.])/gu,
+		'@node_modules/@joshuafolkken/kit/dist/CLAUDE.basic.md',
+	],
+	[/@joshuafolkken\/kit\/prettier\/static(?=['"])/gu, '@joshuafolkken/kit/prettier/basic'],
+]
+
+function migrate_basic_paths(content: string): string {
+	let migrated = content
+
+	for (const [pattern, replacement] of RENAMED_REFERENCES) {
+		migrated = migrated.replaceAll(pattern, () => replacement)
+	}
+
+	return migrated
+}
+
+const basic_path_migration = { migrate_basic_paths }
+export { basic_path_migration }

package/scripts/init/distributed-paths.ts

@@ -97,10 +97,32 @@ function ensure_claude_md_import(existing: string | undefined): string {
 	return `${CLAUDE_MD_BOOTSTRAP}\n\n${CLAUDE_MD_IMPORT_LINE}\n\n${updated}`
 }
 
+// The lines `ensure_claude_md_import` writes. A basic project imports other rules, so a sync from
+// before joshuafolkken/kit#2827, or a switch from full, leaves these behind for it to remove.
+const FULL_CLAUDE_MD_LINES = new Set([
+	CLAUDE_MD_BOOTSTRAP,
+	OLD_CLAUDE_MD_BOOTSTRAP,
+	CLAUDE_MD_IMPORT_LINE,
+])
+
+// Each written line goes with the blank line after it, so the rest of the file is left as it was.
+function remove_claude_md_import(content: string): string {
+	const lines = content.split('\n')
+
+	return lines
+		.filter((line, index) => {
+			if (FULL_CLAUDE_MD_LINES.has(line)) return false
+
+			return line !== '' || !FULL_CLAUDE_MD_LINES.has(lines[index - 1] ?? '')
+		})
+		.join('\n')
+}
+
 const distributed_paths = {
 	transform_prompt_paths,
 	transform_distributed_paths,
 	ensure_claude_md_import,
+	remove_claude_md_import,
 	CLAUDE_MD_IMPORT_LINE,
 }