@joshuafolkken/kit 1.1094.0 → 1.1136.0

package/dist/josh.js

@@ -4,6 +4,74 @@
 import { existsSync } from "node:fs";
 import path from "node:path";
 
+// scripts/lib/spawn-exit.ts
+var SPAWN_ERROR_EXIT_CODE = 2;
+var SIGNAL_KILL_EXIT_CODE = 1;
+function resolve_spawn_exit(executable, result) {
+  if (result.exitCode !== void 0) return result.exitCode;
+  if (result.isTerminated === true) return SIGNAL_KILL_EXIT_CODE;
+  console.error(`Failed to execute ${executable}: ${result.shortMessage ?? "spawn failed"}`);
+  return SPAWN_ERROR_EXIT_CODE;
+}
+function read_spawn_stdout(result) {
+  return result.stdout ?? "";
+}
+function read_spawn_stderr(result) {
+  return result.stderr ?? "";
+}
+
+// scripts/git/git-spawn-sync.ts
+import { execaSync } from "execa";
+
+// scripts/git/constants.ts
+import { platform } from "node:os";
+var GIT_COMMAND_UNIX = "/usr/bin/git";
+function get_git_command() {
+  if (platform() === "win32") {
+    return String.raw`"C:\Program Files\Git\cmd\git.exe"`;
+  }
+  return GIT_COMMAND_UNIX;
+}
+function get_git_command_for_spawn() {
+  if (platform() === "win32") {
+    return String.raw`C:\Program Files\Git\cmd\git.exe`;
+  }
+  return GIT_COMMAND_UNIX;
+}
+var git_utilities = {
+  get_git_command,
+  get_git_command_for_spawn
+};
+
+// scripts/git/git-spawn-sync.ts
+var GIT_TIMEOUT_MS = 1e4;
+var SUCCESS_EXIT_CODE = 0;
+var C_LOCALE = { LC_ALL: "C", LANGUAGE: "C" };
+function run(args, options = {}) {
+  const result = execaSync(git_utilities.get_git_command_for_spawn(), args, {
+    ...options,
+    extendEnv: true,
+    reject: false,
+    timeout: options.timeout ?? GIT_TIMEOUT_MS
+  });
+  return {
+    exit_code: result.exitCode,
+    stdout: read_spawn_stdout(result),
+    stderr: read_spawn_stderr(result)
+  };
+}
+function read(args, options = {}) {
+  const result = run(args, options);
+  return result.exit_code === SUCCESS_EXIT_CODE ? result.stdout.trim() : void 0;
+}
+function origin_url(cwd) {
+  return read(["config", "--get", "remote.origin.url"], { cwd });
+}
+function toplevel(timeout = GIT_TIMEOUT_MS) {
+  return run(["rev-parse", "--show-toplevel"], { env: C_LOCALE, timeout });
+}
+var git_spawn_sync = { GIT_TIMEOUT_MS, C_LOCALE, run, read, origin_url, toplevel };
+
 // scripts/lib/json-value.ts
 function parse_or_undefined(text) {
   try {
@@ -43,24 +111,10 @@ function read_if_readable(path5) {
 }
 var file_reader = { read_optional, read_file_or_empty, read_if_readable };
 
-// scripts/lib/spawn-exit.ts
-var SPAWN_ERROR_EXIT_CODE = 2;
-var SIGNAL_KILL_EXIT_CODE = 1;
-function resolve_spawn_exit(executable, result) {
-  if (result.exitCode !== void 0) return result.exitCode;
-  if (result.isTerminated === true) return SIGNAL_KILL_EXIT_CODE;
-  console.error(`Failed to execute ${executable}: ${result.shortMessage ?? "spawn failed"}`);
-  return SPAWN_ERROR_EXIT_CODE;
-}
-function read_spawn_stdout(result) {
-  return result.stdout ?? "";
-}
-
 // scripts/version/kit-descriptor.ts
 var KIT_PACKAGE_NAME = "@joshuafolkken/kit";
 
 // scripts/doctor/doctor-consumer.ts
-import { execaSync } from "execa";
 import { z } from "zod";
 var NODE_MODULES = "node_modules";
 var SETTINGS_PATH = path.join(".claude", "settings.json");
@@ -68,7 +122,7 @@ var CLAUDE_MD = "CLAUDE.md";
 var PLUGIN_ID = "kit@kit";
 var CLAUDE_MD_POINTER = `@${NODE_MODULES}/${KIT_PACKAGE_NAME}/dist/${CLAUDE_MD}`;
 var SECRETLINT_BIN = path.join(NODE_MODULES, ".bin", "secretlint");
-var GIT_TIMEOUT_MS = 2e3;
+var GIT_TIMEOUT_MS2 = 2e3;
 var manifest_schema = z.object({
   name: z.string().optional(),
   dependencies: z.record(z.string(), z.string()).optional(),
@@ -102,11 +156,9 @@ function is_plugin_declared(root) {
   return parsed.success && parsed.data.enabledPlugins?.[PLUGIN_ID] === true;
 }
 function configured_hooks_path(root) {
-  const result = execaSync("git", ["-C", root, "config", "--get", "core.hooksPath"], {
-    reject: false,
-    timeout: GIT_TIMEOUT_MS
+  const value = git_spawn_sync.read(["-C", root, "config", "--get", "core.hooksPath"], {
+    timeout: GIT_TIMEOUT_MS2
   });
-  const value = read_spawn_stdout(result).trim();
   return value === "" ? void 0 : value;
 }
 function claude_md_state(root) {
@@ -166,6 +218,7 @@ function report_consumer_setup(root) {
 var doctor_consumer = {
   claude_md_line,
   claude_md_state,
+  configured_hooks_path,
   hooks_path_line,
   is_kit_consumer,
   is_plugin_declared,
@@ -246,7 +299,7 @@ function resolve_package_bin(base_directory, package_name, bin_name) {
 }
 
 // scripts/josh/josh-logic.ts
-import { execaSync as execaSync3 } from "execa";
+import { execaSync as execaSync2 } from "execa";
 
 // scripts/josh/command-suggest.ts
 var MAX_SUGGESTION_DISTANCE = 3;
@@ -536,7 +589,7 @@ var LANE_COMMANDS = {
     ...LANE_ARGUMENTS,
     description: "Block until any of the named in-flight lane children completes; prints which one finished",
     category: "AI tools",
-    reference: ["<issue> [<issue>...]", "automation", ["processes"]],
+    reference: ["<issue> [<issue>...] [--owner <pid>]", "automation", ["files", "processes"]],
     default_script_arguments: ["await"]
   },
   "lane:launch": {
@@ -1237,6 +1290,13 @@ var PROJECT_COMMANDS = {
       ["files", "git", "network", "processes"]
     ]
   },
+  "dogfood:commit": {
+    script: "scripts/dogfood/dogfood-commit-cli.ts",
+    description: "Make the first commit of a dogfood run's own kit-test-* project",
+    category: "Project",
+    reference: ["<dir>", "automation", ["files", "git"]],
+    is_kit_only: true
+  },
   init: {
     script: "scripts/init/init.ts",
     description: "Initialize config in a new project",
@@ -1255,7 +1315,7 @@ var PROJECT_COMMANDS = {
   },
   "registry:migrate": {
     script: "scripts/registry-migration/migrate.ts",
-    description: "Migrate a kit-only project from GitHub Packages to public npm",
+    description: "Migrate a project from GitHub Packages to public npm",
     category: "Project",
     reference: ["", "developer", ["files", "network", "processes"]]
   },
@@ -1441,7 +1501,7 @@ var WORKFLOW_COMMANDS = {
     script: "scripts/issue/measure-rerun-cli.ts",
     description: "Re-run a merged issue\u2019s baseline command and print the before/after pair",
     category: "Workflow",
-    reference: ["<path>", "automation", ["processes", "files"]]
+    reference: ["<issue-number>", "automation", ["network", "processes", "files"]]
   },
   // A script rather than an `sh -c` chain, because it has a precondition to enforce: run inside a
   // linked work tree it would hijack the default branch from every other one (joshuafolkken/kit#1535).
@@ -1700,7 +1760,6 @@ var repo_origin = {
 };
 
 // scripts/josh/run-github-prerequisite.ts
-import { execaSync as execaSync2 } from "execa";
 var GITHUB_RUN_COMMANDS = /* @__PURE__ */ new Set([
   "run:entry",
   "run:prep",
@@ -1714,11 +1773,8 @@ function explanation(root, command) {
   if (!existsSync3(path3.join(root, ".git"))) {
     return `${command} requires Git and a GitHub origin. Run git init and add a GitHub origin first.`;
   }
-  const result = execaSync2("git", ["config", "--get", "remote.origin.url"], {
-    cwd: root,
-    reject: false
-  });
-  if (result.exitCode === 0 && repo_origin.parse_origin_url(result.stdout)) return void 0;
+  const url = git_spawn_sync.origin_url(root);
+  if (url !== void 0 && repo_origin.parse_origin_url(url)) return void 0;
   return `${command} requires a GitHub origin. Add an origin pointing to GitHub first.`;
 }
 var run_github_prerequisite = { explanation };
@@ -1821,7 +1877,7 @@ function should_use_shell(executable) {
   return process.platform === "win32" && executable !== process.execPath;
 }
 function spawn_script(tsx_executable, script_arguments) {
-  const result = execaSync3(tsx_executable, script_arguments, {
+  const result = execaSync2(tsx_executable, script_arguments, {
     stdio: "inherit",
     shell: should_use_shell(tsx_executable),
     reject: false
@@ -1830,7 +1886,7 @@ function spawn_script(tsx_executable, script_arguments) {
 }
 function run_shell_command(shell, extra) {
   const [executable = "", ...rest_arguments] = shell;
-  const result = execaSync3(executable, [...rest_arguments, ...extra], {
+  const result = execaSync2(executable, [...rest_arguments, ...extra], {
     stdio: "inherit",
     reject: false
   });

package/dist/version/index.js

@@ -565,7 +565,13 @@ var agent_session_environment = {
 function message_of(error) {
   return error instanceof Error ? error.message : String(error);
 }
-var error_text = { message_of };
+var DEBUG_ENV_KEY = "JOSH_DEBUG";
+function trace_swallowed(where, error) {
+  if ((process.env[DEBUG_ENV_KEY] ?? "").trim() === "") return;
+  process.stderr.write(`josh debug: ${where}: ${message_of(error)}
+`);
+}
+var error_text = { message_of, trace_swallowed };
 
 // scripts/gh/git-gh-exec.ts
 import { execa as execa2, execaSync } from "execa";
@@ -1009,18 +1015,23 @@ function is_package_entry(line) {
 function is_github_tarball_line(line) {
   return line.trimStart().startsWith("tarball: https://npm.pkg.github.com/");
 }
-function clean_kit_line(line, version, integrities) {
-  if (!version) return line;
+function package_id(key) {
+  const name = fix_gh_packages_logic.package_path_from_key(key);
+  return `${name}@${fix_gh_packages_logic.package_version_from_key(key)}`;
+}
+function clean_scoped_line(line, id, integrities) {
+  if (!id) return line;
   if (is_github_tarball_line(line)) return void 0;
   const cleaned = remove_flow_tarball(line);
-  const pair = integrities.get(version);
+  const pair = integrities.get(id);
   if (pair === void 0) return cleaned;
   return cleaned.split(`integrity: ${pair[0]}`).join(`integrity: ${pair[1]}`);
 }
-function next_kit_version(line, version) {
-  if (!is_package_entry(line)) return version;
-  const prefix = "  '@joshuafolkken/kit@";
-  return line.startsWith(prefix) ? line.slice(prefix.length).split("'", 1)[0] ?? "" : "";
+function next_scoped_id(line, id) {
+  if (!is_package_entry(line)) return id;
+  const prefix = `  '${SCOPE}/`;
+  if (!line.startsWith(prefix)) return "";
+  return package_id(line.slice("  '".length).split("'", 1)[0] ?? "");
 }
 function integrity_pair(old_integrity, npm_integrity) {
   if (old_integrity === void 0 || npm_integrity === void 0) return void 0;
@@ -1029,24 +1040,24 @@ function integrity_pair(old_integrity, npm_integrity) {
 function lock_integrities(lockfile, npm_integrities) {
   const packages = fix_gh_packages_logic.parse_lockfile_packages(lockfile);
   const pairs = /* @__PURE__ */ new Map();
-  const kit_entries = Object.entries(packages).filter(([key]) => key.startsWith(`${SCOPE}/kit@`));
-  for (const [key, entry] of kit_entries) {
-    const version = fix_gh_packages_logic.package_version_from_key(key);
-    const pair = integrity_pair(entry.resolution?.integrity, npm_integrities.get(version));
-    if (pair !== void 0) pairs.set(version, pair);
+  const scoped_entries = Object.entries(packages).filter(([key]) => key.startsWith(`${SCOPE}/`));
+  for (const [key, entry] of scoped_entries) {
+    const id = package_id(key);
+    const pair = integrity_pair(entry.resolution?.integrity, npm_integrities.get(id));
+    if (pair !== void 0) pairs.set(id, pair);
   }
   return pairs;
 }
 function push_if_defined(lines, cleaned) {
   if (cleaned !== void 0) lines.push(cleaned);
 }
-function rewrite_kit_lockfile(lockfile, npm_integrities) {
-  let kit_version = "";
+function rewrite_scoped_lockfile(lockfile, npm_integrities) {
+  let id = "";
   const lines = [];
   const integrities = lock_integrities(lockfile, npm_integrities);
   for (const line of lockfile.split("\n")) {
-    kit_version = next_kit_version(line, kit_version);
-    const cleaned = clean_kit_line(line, kit_version, integrities);
+    id = next_scoped_id(line, id);
+    const cleaned = clean_scoped_line(line, id, integrities);
     push_if_defined(lines, cleaned);
   }
   return lines.join("\n");
@@ -1076,7 +1087,7 @@ function previous_registry(project_npmrc, user_npmrc) {
 }
 function plan(project_npmrc, user_npmrc, lockfile) {
   const packages = scoped_packages(lockfile);
-  const blocked = packages.filter((name) => name !== `${SCOPE}/kit`);
+  const blocked = [];
   if (has_duplicate_mapping(project_npmrc, user_npmrc)) blocked.push("duplicate registry mappings");
   const unsupported = unsupported_registry(project_npmrc);
   if (unsupported !== void 0) blocked.push(unsupported);
@@ -1088,7 +1099,7 @@ var migrate_logic = {
   plan,
   github_tarballs,
   is_github_tarball,
-  rewrite_kit_lockfile,
+  rewrite_scoped_lockfile,
   scoped_versions
 };
 
@@ -1276,6 +1287,7 @@ var version_targets = {
 var FAILURE_EXIT_CODE = 1;
 var ALREADY_UP_TO_DATE = "Already up to date";
 var NO_QUARANTINE_MINUTES2 = 0;
+var UPGRADE_TIMEOUT_MS = 6e5;
 function read_release_hold(package_config, latest, versions) {
   if (versions.every((version) => version === void 0 || version === latest)) return void 0;
   const minimum_age_minutes = release_age.read_nearest_minimum_release_age(process.cwd());
@@ -1360,7 +1372,11 @@ function run_check(config) {
   );
 }
 function run_upgrade_command(command) {
-  const result = execaSync4("sh", ["-c", command], { stdio: "inherit", reject: false });
+  const result = execaSync4("sh", ["-c", command], {
+    stdio: "inherit",
+    reject: false,
+    timeout: UPGRADE_TIMEOUT_MS
+  });
   return result.exitCode ?? FAILURE_EXIT_CODE;
 }
 function run_all_upgrade_commands(commands) {

package/eslint/rules/unicorn.js

@@ -80,8 +80,9 @@ export const unicorn_rules = {
 	'unicorn/custom-error-definition': 'error',
 	// throw new Error()の形式を強制
 	'unicorn/throw-new-error': 'error',
-	// 空の配列をチェック
-	'unicorn/no-empty-file': 'error',
+	// 空ファイルを禁止する。コメントだけのファイルは許可する: `sv create` の足場 `src/lib/index.ts` は
+	// コメント 1 行だけで、手を加えていないプロジェクトで lint が落ちてしまうため（#3069）
+	'unicorn/no-empty-file': ['error', { allowComments: true }],
 	// 静的なみずからのみのクラスを禁止
 	'unicorn/no-static-only-class': 'error',
 	// this別名を禁止（arrow functionを使うべき）

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1094.0",
+  "version": "1.1136.0",
   "name": "@joshuafolkken/kit",
   "description": "Development toolkit for AI-assisted projects: formatting, AI assistant rules and a Git/GitHub Issue workflow for any repository, plus lint, type check, tests and hooks for Node projects",
   "keywords": [
@@ -42,6 +42,7 @@
     "lefthook",
     ".claude/settings.json",
     ".claude/skills",
+    ".claude/agents",
     ".claude/.claude-plugin",
     ".claude-plugin",
     ".codex",
@@ -59,6 +60,7 @@
     ".ncurc.json",
     ".prettierignore",
     "pnpm-workspace.yaml",
+    ".pnpmfile.mjs",
     "tsconfig.sonar.json",
     "playwright.config.ts",
     "!**/*.test.ts",
@@ -71,6 +73,7 @@
     "!scripts/time",
     "!scripts/cost",
     "!scripts/retrospective",
+    "!scripts/dogfood",
     "!scripts/test/classify-isolation.ts",
     "!scripts/test/http-fault-injection.ts",
     "!scripts/test/josh-harness*.ts",
@@ -161,6 +164,7 @@
   "peerDependencies": {
     "@eslint/compat": "^2.1.1",
     "@eslint/js": "^10.0.1",
+    "@ianvs/prettier-plugin-sort-imports": "^4.7.1",
     "@playwright/test": ">=1.0.0",
     "@stylistic/eslint-plugin": "^5.10.0",
     "eslint": "^10.0.0",
@@ -171,6 +175,9 @@
     "eslint-plugin-sonarjs": "^4.2.1",
     "eslint-plugin-unicorn": "^76.0.0",
     "globals": "^17.12.0",
+    "prettier": "^3.9.9",
+    "prettier-plugin-svelte": "^4.1.1",
+    "prettier-plugin-tailwindcss": "^0.8.1",
     "typescript": "^6.0.3",
     "typescript-eslint": "^8.70.1"
   },
@@ -184,6 +191,9 @@
     "@eslint/js": {
       "optional": true
     },
+    "@ianvs/prettier-plugin-sort-imports": {
+      "optional": true
+    },
     "@stylistic/eslint-plugin": {
       "optional": true
     },
@@ -211,6 +221,15 @@
     "globals": {
       "optional": true
     },
+    "prettier": {
+      "optional": true
+    },
+    "prettier-plugin-svelte": {
+      "optional": true
+    },
+    "prettier-plugin-tailwindcss": {
+      "optional": true
+    },
     "typescript": {
       "optional": true
     },
@@ -224,13 +243,13 @@
     "@eslint/js": "^10.0.1",
     "@ianvs/prettier-plugin-sort-imports": "^4.7.1",
     "@playwright/test": "^1.63.0",
-    "@secretlint/secretlint-rule-preset-recommend": "^13.0.6",
+    "@secretlint/secretlint-rule-preset-recommend": "^13.0.7",
     "@stylistic/eslint-plugin": "^5.10.0",
     "@types/node": "^26.6.4",
     "@types/semver": "^7.8.0",
     "cspell": "^10.3.6",
     "esbuild": "^0.28.2",
-    "eslint": "^10.11.0",
+    "eslint": "^10.12.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-typescript": "^4.4.5",
     "eslint-plugin-import-x": "^4.17.1",
@@ -245,7 +264,7 @@
     "prettier-plugin-tailwindcss": "^0.8.1",
     "rollup": "^4.64.0",
     "rollup-plugin-dts": "^6.5.1",
-    "secretlint": "^13.0.6",
+    "secretlint": "^13.0.7",
     "typescript": "^6.0.3",
     "typescript-eslint": "^8.71.0",
     "vitest": "^5.0.3"
@@ -256,7 +275,6 @@
     "jsonc-parser": "^3.3.1",
     "ora": "^9.4.1",
     "semver": "^7.8.5",
-    "strip-json-comments": "^5.0.3",
     "tsx": "^4.23.15",
     "zod": "^4.6.5"
   },

package/pnpm-workspace.yaml

@@ -28,11 +28,9 @@ minimumReleaseAgeExclude:
 
 overrides:
   svelte: ^5.55.7
-  devalue: ^5.8.1
-  # Indirect deps a within-range re-resolution could not lift past their parents' pins, floored at the
-  # smallest release clearing each OSV advisory (joshuafolkken/kit#2200; user-approved 2026-09-21 to
-  # override indirect packages). Carets so `josh latest`'s re-resolution keeps them current within the
-  # major without reintroducing the advisory.
+  # An indirect dep a within-range re-resolution could not lift past its parents' pins, floored at the
+  # smallest release clearing its OSV advisory (joshuafolkken/kit#2200; user-approved 2026-09-21 to
+  # override indirect packages). A caret so `josh latest`'s re-resolution keeps it current within the
+  # major without reintroducing the advisory. The devalue, postcss and nanoid floors were removed once
+  # their parents' ranges exceeded them (joshuafolkken/kit#3091).
   vite: ^8.0.16 # OSV — vite 8.0.8 → 8.0.16
-  postcss: ^8.5.23 # OSV — postcss 8.5.16 → 8.5.23
-  nanoid: ^3.3.18 # OSV — nanoid 3.3.15 → 3.3.18

package/prompts/collaboration-workflow/glossary.md

@@ -0,0 +1,17 @@
+# ワークフロー用語集
+
+**これは定義集であり、規則を定める場所ではない。** 各語は 1〜2 行の定義と、その語の本文がある単一ソースへのポインタだけを持つ。手順・条件・数値は指し先が持ち、ここでは言い換えない — 言い換えた行は指し先より先に古くなる（joshuafolkken/kit#3080）。
+
+`scripts/document/workflow-glossary.test.ts` が、下の主要語が定義されていることと、各ポインタが実在する節に解決することを検査する。
+
+- **lane** — `backlogrun` が子 Issue を並行実行するための、専用ブランチ・`.env`・ポートを持つ git worktree。実装・ゲート・レビューは並行し、マージは直列。→ `.claude/skills/workflow-commands/backlogrun-lanes.md` → "Lanes — running more than one child at a time"
+- **cut** — 実行中のプロセスを意図して終わらせ、新しいプロセスが同じ作業を引き継ぐ境界。レーン子のゲート前の cut と、`backlogrun` のセッション cut がある。→ `.claude/skills/workflow-commands/pre-gate-cut.md` → "The pre-gate cut"、`.claude/skills/workflow-commands/backlogrun-progress.md` → "The hand-off"
+- **hold** — 1 つの作業ツリーを 1 つのランが占有しているという記録。`pnpm josh run:hold` が取り、`pnpm josh run:release` が外す。→ `.claude/skills/workflow-commands/working-tree-hold.md` → "The working-tree hold"
+- **park** — `backlogrun` が自分で決められない子を `needs-decision` で止め、バッチ全体は止めずに次の子へ進むこと。→ `.claude/skills/workflow-commands/backlogrun-park.md` → "park and continue"
+- **point of use** — 文書を入口ではなく、その文書に従うべき操作と同じターンで、その操作の直前に読むこと。→ `.claude/skills/workflow-commands/SKILL.md` → "Four documents are read at the point of use, not at the entry"
+- **entry read** — コマンド起動時に読む文書の集合。`pnpm josh read:set` がその集合と費用を答える。→ `.claude/skills/workflow-commands/SKILL.md` → "Which file to read"
+- **oracle** — 機械的に読める入力だけから規則の答えを計算するコマンド。一覧は `pnpm josh oracle:list`。→ `prompts/collaboration-workflow/residency.md` → "第 0 問"
+- **interrupt** — WIP 上限を超えても起票できる、3 条件で決まる発見。別パッケージ起因の上流起票（割り込み Issue）とは別の区分。→ `prompts/collaboration-workflow/wip-cap.md` → "割り込み起票"、`prompts/collaboration-workflow/upstream-interrupt.md` → "別パッケージ起因の問題は割り込み Issue で対応する"
+- **Tier** — 判断点の 3 区分。A は可逆で自分で決める、B は拮抗していて人に聞く、C は不可逆・共有状態で明示指示が要る。→ `CLAUDE.md` → "Decision autonomy"、`prompts/collaboration-workflow/operating-rules.md` → "意思決定の自律ポリシー"
+- **carry** — `backlogrun` の 1 回の起動の予算と進捗を、セッション cut をまたいで引き継ぐ記録（`pnpm josh run:carry`）。→ `.claude/skills/workflow-commands/backlogrun-steps.md` → "The session cut is inside the invocation"
+- **wave** — エピックの子をまとめて並行実行する組。仕組みではなく、依存宣言で表す形。→ `.claude/skills/epic-commands/SKILL.md` → "Execution waves"

package/prompts/collaboration-workflow/issue-template.md

@@ -76,7 +76,7 @@ Issue には次の要素を必ず含める。
 - **互換性を壊す変更は影響を本文で宣言する。** 既存の利用者、API、設定の契約を変える場合は、`## 背景` の直下に `- 互換性: 破壊的変更` を書き、廃止対象と影響を説明する。移行措置や事前案内があっても破壊的変更なら宣言する。この宣言があれば `pnpm josh issue:file` が `breaking-change` ラベルを同じ作成リクエストに付ける。互換性を保つ変更には付けない。影響が曖昧なら起票文案で対象の利用者と契約を明確にしてから分類する
 - **本文が宣言する分類ラベルは `pnpm josh issue:file` がすべて起票時に付ける。** `bug`、`enhancement`、`breaking-change` は組み合わせて付くことがある。`depth`・`route` などのラベルと併せて 1 回の作成リクエストで付け、宣言が無いとき（`issue:lint` の `labels: none`）は分類ラベルを付けない。Issue が `enhancement` と `breaking-change` の両方を持つとき、PR のリリース分類は `breaking-change` 一つにする。Issue の目的の分類と PR のリリース分類を区別する
 - **`## 発火点`** には、その規則が破れる瞬間に最初に呼ばれるツールコール名を 1 つ書く。名前は `prompts/collaboration-workflow/rule-delivery.md` の配送表に載る、フックで配送可能なツール（`Bash` / `Edit` / `Read` / `Write` / `AskUserQuestion`）と突き合わせる。**表に無い名前**（そもそもツールコール名でない）と**不一致**（既知のツールだが配送できない）は区別して印字され、joshuafolkken/kit#2201 の「規則は正しいが名指ししたコールが実際に破れるコールの 1 つ後ろ」を起票時に検出する
-- **`## ベースライン`** は **「コマンド + 値」** で書く。``- `<測定コマンド>` → <現在の値>`` の形に限り、自然文だけの測定説明は受け付けない（再実行できないため）。マージ後に `pnpm josh measure:rerun` が同じコマンドをやり直し、**before / after の対**を印字する。値が動かなかったとき、反証された前提として `docs/maintainers/observations/` の、その時点のブランチが指す Issue のファイルに 1 行追記される（既存の append-only 台帳を使い、別の台帳は作らない）
+- **`## ベースライン`** は **「コマンド + 値」** で書く。``- `<測定コマンド>` → <現在の値>`` の形に限り、自然文だけの測定説明は受け付けない（再実行できないため）。マージ後に `pnpm josh measure:rerun <N>` が同じコマンドをやり直し（本文は shell として実行されるため、作者が `OWNER` / `MEMBER` / `COLLABORATOR` の Issue に限る）、**before / after の対**を印字する。値が動かなかったとき、反証された前提として `docs/maintainers/observations/` の、その時点のブランチが指す Issue のファイルに 1 行追記される（既存の append-only 台帳を使い、別の台帳は作らない）
 - **`## 再現`** は **「コマンド + 実際の出力」** で書く。コマンドを backtick、出力をフェンス（``` または ~~~）で囲む。自然文の「確認した」は再実行できないため受け付けない（`## ベースライン` と同じ理由）。読みだけの起票を起票時に弾くためである
 - **検査は `pnpm josh issue:lint <path>` が行う。** 対象判定・3 見出しの有無・発火点の配送可否・ベースラインが「コマンド + 値」か・再現が「コマンド + 実際の出力」かと、起票時に必要な分類ラベルを、起票前の本文ファイルからまとめて答える（`pnpm josh issue:file` は起票前に同じ検査を行い、問題があれば起票しない）
 

package/prompts/collaboration-workflow/operating-rules.md

@@ -27,7 +27,7 @@
 
 PR マージ・ブランチ削除・force push・共有ブランチへの push・外部通知の追加送信・リポジトリ設定の変更など、**共有状態に影響する操作はその場でユーザーに明示指示されたものだけ実行する**。
 
-- `fullrun` の auto-merge は `fullrun` の指示自体に含まれるため許可される（本文は [`followup.md`](../../.claude/skills/workflow-commands/followup.md)）。それ以外の状況で勝手にマージしてはならない
+- `fullrun` と `backlogrun` の auto-merge は、それぞれの指示自体に含まれるため許可される（本文は [`followup.md`](../../.claude/skills/workflow-commands/followup.md)、`backlogrun` の子への継承は [`backlogrun-child.md`](../../.claude/skills/workflow-commands/backlogrun-child.md)）。`prrun` はマージを認可しない。それ以外の状況で勝手にマージしてはならない
 - `kickoff` / `pnpm josh followup` 単独実行は文書化されたスコープで終了する。PR が OPEN のまま完了したら状態を報告して停止する
 - 「チェックが全部 green だから次のステップに進む」は承認ではない
 - **`gh pr merge` の直接実行は kit 配布の `.claude/settings.json` の `permissions.deny` で機械的に遮断されている。** パターンの一覧はそのファイルが一次情報であり、ここでは書き写さない。 `fullrun` の auto-merge は `pnpm josh followup` が node スクリプト内部から gh を起動するため影響を受けない — Bash マッチャに見えるのは `pnpm josh …` だけである。**ただし deny は実装であって規則ではない** — パターンが取りこぼす綴りを禁じているのは本節の規則のほうである

package/prompts/collaboration-workflow/principles.md

@@ -72,3 +72,12 @@
 - **導線文書に規則を書き戻さない。** そこに書かれた規則は、次の改訂で更新し忘れる 4 つ目の置き場になる
 - `scripts/document/ai-document-pointers.test.ts` が機械的に守る。導線文書に規則本体が再出現した場合、導線の一文が消えた場合、`CLAUDE.md` が単一ソースであることの記述が消えた場合に落ちる
 - 経緯は `docs/maintainers/principles-rationale.md` → "Why AGENTS and GEMINI are pointers"、`@CLAUDE.md` 行と他ツールでの未検証は `docs/maintainers/principles-rationale.md` → "The include line, and what has not been verified"
+
+### Claude Code 以外のエージェントでの読み替え
+
+`CLAUDE.md` は Claude Code 向けに書かれており、その機能を名指しする。Codex・Gemini CLI など別のエージェントは次のように読み替える。導線文書が持つのはツール固有の 1 行だけで、共通の読み替えはこの節にしか無い（joshuafolkken/kit#3079）。
+
+- **フック**: フックが走らない、または出力が見えないツールでは、フックが届ける規則を自分で適用する。その一覧は手書きせず、[`rule-delivery.md`](./rule-delivery.md) →「配送されている規則」の表を正とする — 表の各行が、そのツールでは自分で守る規則である。表の外でフックが担う 3 つも同じく自分で行う — 最初の実行時コード編集の前に Step 0 の作業サマリを提示する、編集ごとの整形フックに頼らず編集後に `pnpm josh lint:related` と `pnpm josh cspell:dot` を走らせる、`JOSH_SESSION_LANG` は注入を待たずに `.env` から解決する。フックの全体は `.claude/settings.json` の `hooks` が正である
+- **Skill・`/verify-ui`・`/code-review`**: `CLAUDE.md` が skill のロードやサブエージェントでの実行を指示する箇所では、その skill の `SKILL.md` を読み、自分のセッションで従う
+- **`.claude/settings.json` の deny list** は効かない。それが裏付ける規則 — 指示なしのコミット・マージ・ステージングその他の共有状態変更をしない — はそのまま拘束する
+- **`AskUserQuestion`** は、ユーザーに平文で尋ねることを指す

package/prompts/collaboration-workflow.md

@@ -29,6 +29,7 @@
 | 引き金つき配送 — 規則を効く瞬間に届ける                                                           | [`rule-delivery.md`](./collaboration-workflow/rule-delivery.md)           |
 | コマンド出力が文脈へ持ち込む量の上限                                                              | [`output-bounds.md`](./collaboration-workflow/output-bounds.md)           |
 | 運用ルール                                                                                        | [`operating-rules.md`](./collaboration-workflow/operating-rules.md)       |
+| 用語集 — lane・cut・hold・park などの定義と単一ソース                                             | [`glossary.md`](./collaboration-workflow/glossary.md)                     |
 
 **どの 1 本を開けばよいかを決めるのに必要なのは、この索引だけである。** バイト数はここに書かない — 手で保守した数字は本文より先に古くなり、古い数字は無いより悪い。実サイズは `ls -l prompts/collaboration-workflow/` が答える。
 

package/scripts/backlog/backlog-arrival.ts

@@ -18,10 +18,11 @@ import { backlog_stalled } from './backlog-stalled'
 //
 // **"New" is measured against the watcher's own start**, so one issue wakes the parent once: the next
 // `--wait` the parent starts takes the pool as it stands then — the woken issue included, dispatched or
-// not — as its baseline. A reading that fails is not an arrival; the probe says nothing and the
-// interval still wakes the parent. A baseline that cannot be read leaves that one wait inert rather than
-// reading it as empty — an empty one would wake the parent for the whole pool — and the next `--wait`
-// reads it again.
+// not — as its baseline. A reading that fails is not an arrival; the probe says nothing and reads again
+// a minute later. A baseline that cannot be read is never read as empty — an empty one would wake the
+// parent for the whole pool — but it is not given up on either: the scheduled report no longer ends the
+// wait (joshuafolkken/kit#3102), so an inert probe would leave the parent without a wake until `--hours`. The
+// probe reads the baseline again each minute until one answers.
 //
 // **Every read is bounded.** The probe is awaited inside the watcher's tick loop, so a `gh` call that
 // hangs would otherwise freeze the loop — its `--hours` bound, its liveness ping and the exit that is
@@ -116,19 +117,40 @@ async function never_arrives(): Promise<boolean> {
 
 const INERT: ArrivalProbe = { has_arrived: never_arrives }
 
-// Only the next-probe instant changes between probes, and it is set before the read is awaited.
+// A probe spent on the baseline reports no arrival, whether or not the baseline answered.
+async function retry_baseline(
+	answered: Array<ReadonlySet<string>>,
+	ports: ReadyPorts,
+): Promise<boolean> {
+	const late = await read_baseline(ports)
+
+	if (late !== undefined) answered.push(late)
+
+	return false
+}
+
+// The next-probe instant is set before any read is awaited. A baseline that did not answer is read again
+// at the next probe instead of the reading, and the first one that answers is the baseline from then on
+// — never an arrival itself, since it is the pool as it stands.
 function probe_of(
-	baseline: ReadonlySet<string>,
+	initial: ReadonlySet<string> | undefined,
 	first_ms: number,
 	ports: ReadyPorts,
 ): ArrivalProbe {
 	let next_ms = first_ms
+	// At most one entry, held in a list so the baseline that answers after an await is added rather than
+	// reassigned over the value read before it.
+	const answered: Array<ReadonlySet<string>> = initial === undefined ? [] : [initial]
 
 	async function has_arrived(now_ms: number): Promise<boolean> {
 		if (now_ms < next_ms) return false
 
 		next_ms = now_ms + PROBE_INTERVAL_MS
 
+		const [baseline] = answered
+
+		if (baseline === undefined) return await retry_baseline(answered, ports)
+
 		const reading = await read_reading(ports)
 
 		return reading !== undefined && arrivals(baseline, reading).length > NONE
@@ -146,12 +168,10 @@ async function start(
 ): Promise<ArrivalProbe> {
 	if (!(await is_parent_safely(is_parent))) return INERT
 
-	const baseline = await read_baseline(ports)
-
-	return baseline === undefined ? INERT : probe_of(baseline, now_ms + PROBE_INTERVAL_MS, ports)
+	return probe_of(await read_baseline(ports), now_ms + PROBE_INTERVAL_MS, ports)
 }
 
-const backlog_arrival = { INERT, PROBE_INTERVAL_MS, answered_issues, arrivals, start }
+const backlog_arrival = { PROBE_INTERVAL_MS, answered_issues, arrivals, start }
 
 export type { ArrivalProbe }
 export { backlog_arrival }