@ryusenkei/conventions 0.2.0 → 0.3.0

package/README.md

@@ -53,7 +53,7 @@ The PreToolUse hook blocks the call and tells Claude why, so Claude can fix it a
 | PR title = squash commit message | Checks `gh pr create` / `gh pr edit` titles with prose-lint's commit rules |
 | No AI signature | `attribution` is empty, and the hook blocks PR bodies with an AI signature |
 | Squash merge only | Blocks `gh pr merge --merge` / `--rebase` |
-| Merge only after CI passes | Blocks `gh pr merge` unless every check of the PR has passed (`gh pr checks`). Pending, failed, missing, or unreadable checks are blocked, also with `--auto` |
+| Merge only after CI passes | Blocks `gh pr merge` unless every check of the PR has passed (`gh pr checks`). Pending, failed, missing, or unreadable checks are blocked, also with `--auto` (with the epic flow, a PR into `dev/*` may have no checks) |
 | Epic flow (opt-in) | See [Epic flow](#epic-flow) |
 | Do not edit `node_modules` | Blocks Edit and Write under `node_modules` |
 | Secrets | `permissions.deny` blocks reading `.env` and `.dev.vars` with Claude's file tools (not Bash) |
@@ -74,6 +74,7 @@ Opt in per repository in the root `package.json`:
 - Each epic gets an integration branch `dev/<issue>-<name>` (e.g. `dev/12-search`). Sub-issue PRs target it, and only a `dev/*` branch is merged into `main` (on deploy).
 - `gh pr create` to `main` (`--base main`, or no `--base`) is blocked unless the head (`--head`, or the current branch) is `dev/*`.
 - A PR from any other branch must target a `dev/*` base. `gh pr edit` is checked only when it changes `--base`.
+- A PR into `dev/*` runs no CI; the pre-push `pnpm check` is the gate. `gh pr merge` allows such a PR with no checks, but any checks it has must still pass.
 - Without the opt-in, none of this applies and `dev/*` branch names are rejected.
 
 ## Synced files
@@ -81,6 +82,7 @@ Opt in per repository in the root `package.json`:
 `sync` writes these files and `check` compares them, ignoring line endings:
 
 - `.editorconfig`, `.gitattributes`, `.gitignore`, `.gitleaks.toml`, `mise.toml`, `.github/dependabot.yaml`, `.githooks/commit-msg`, `.githooks/pre-push`
+- `.github/dependabot.yaml` updates npm and GitHub Actions. When the repository has a `go.mod` at the root, a `gomod` entry is appended (same schedule, rebase strategy and cooldown, minor and patch grouped). Without one it is left out, because Dependabot fails on a missing `go.mod`
 - `.claude/settings.json`: only the hooks, `attribution`, and `permissions.deny` are managed. Other settings and hooks are kept
 - `pnpm-workspace.yaml`: `minimumReleaseAge` and `minimumReleaseAgeExclude`, matching the Dependabot `cooldown`
 

package/dist/files.js

@@ -1,6 +1,7 @@
 // 利用側のリポにある共通ファイルの同期・検査
 // - マスタ: パッケージの `files/`（npm は `.gitignore` を同梱しない → 先頭の `.` を除いた名前で格納）
 // - 比較は改行コードを LF に正規化（Windows の作業ツリーは CRLF になりうる）
+// - `append`: 条件のファイルがあるリポのみ末尾に追加（例: go.mod のないリポで gomod の更新はエラー）
 import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { hasStop, managedSettings } from "./settings.js";
@@ -10,7 +11,7 @@ const FILES = [
     { from: 'gitignore', to: '.gitignore' },
     { from: 'gitleaks.toml', to: '.gitleaks.toml' },
     { from: 'mise.toml', to: 'mise.toml' },
-    { from: 'dependabot.yaml', to: '.github/dependabot.yaml' },
+    { from: 'dependabot.yaml', to: '.github/dependabot.yaml', append: { from: 'dependabot-gomod.yaml', if: 'go.mod' } },
     { from: 'commit-msg', to: '.githooks/commit-msg', mode: 0o755 },
     { from: 'pre-push', to: '.githooks/pre-push', mode: 0o755 },
 ];
@@ -27,11 +28,12 @@ const RELEASE_AGE = [
 ];
 const lf = (s) => s.replaceAll('\r\n', '\n');
 const read = (path) => (existsSync(path) ? lf(readFileSync(path, 'utf8')) : undefined);
+const master = (name) => lf(readFileSync(new URL(`../files/${name}`, import.meta.url), 'utf8'));
 /** マスタとの差分 */
 export function drifts(root, options = {}) {
     const out = [];
     for (const f of FILES) {
-        const expected = lf(readFileSync(new URL(`../files/${f.from}`, import.meta.url), 'utf8'));
+        const expected = master(f.from) + (f.append && existsSync(join(root, f.append.if)) ? master(f.append.from) : '');
         if (read(join(root, f.to)) !== expected)
             out.push({ path: f.to, expected, message: 'マスタと不一致' });
     }

package/dist/hook.js

@@ -14,7 +14,7 @@ const root = process.env.CLAUDE_PROJECT_DIR ?? input.cwd ?? process.cwd();
 // Windows の `pnpm` は `.cmd` → シェル経由でのみ起動可能
 const shell = process.platform === 'win32';
 if (input.hook_event_name === 'PreToolUse') {
-    const reason = denyReason(input, { root, titleIssues, readFile, currentBranch, prHead, prChecks });
+    const reason = denyReason(input, { root, titleIssues, readFile, currentBranch, prHead, prBase, prChecks });
     if (reason) {
         process.stderr.write(`${reason}\n`);
         process.exit(2);
@@ -53,6 +53,10 @@ function prHead(pr, cwd) {
     const r = spawnSync('gh', ['pr', 'view', ...(pr ? [pr] : []), '--json', 'headRefName', '--jq', '.headRefName'], { cwd: cwd ?? root, encoding: 'utf8' });
     return (r.status === 0 && r.stdout.trim()) || undefined;
 }
+function prBase(pr, cwd) {
+    const r = spawnSync('gh', ['pr', 'view', ...(pr ? [pr] : []), '--json', 'baseRefName', '--jq', '.baseRefName'], { cwd: cwd ?? root, encoding: 'utf8' });
+    return (r.status === 0 && r.stdout.trim()) || undefined;
+}
 // `gh pr checks` は実行中・失敗で終了コードが0以外（8・1）→ 終了コードではなく出力で判定
 function prChecks(pr, cwd) {
     const r = spawnSync('gh', ['pr', 'checks', ...(pr ? [pr] : []), '--json', 'bucket'], { cwd: cwd ?? root, encoding: 'utf8' });

package/dist/policy.d.ts

@@ -18,6 +18,8 @@ export type Context = {
     currentBranch: (cwd: string | undefined) => string | undefined;
     /** PR の head のブランチ（`pr` の省略時は現在のブランチの PR） */
     prHead: (pr: string | undefined, cwd: string | undefined) => string | undefined;
+    /** PR の base のブランチ（`pr` の省略時は現在のブランチの PR） */
+    prBase: (pr: string | undefined, cwd: string | undefined) => string | undefined;
     /** PR のチェックの集計（`pr` の省略時は現在のブランチの PR） */
     prChecks: (pr: string | undefined, cwd: string | undefined) => Checks;
 };

package/dist/policy.js

@@ -195,11 +195,20 @@ function prReasons(sub, args, cwd, ctx) {
     return reasons;
 }
 // `--auto` も対象（必須のチェックがないリポでは即時にマージされる）
+// - epic のフローの dev/* への PR: チェックなしを許可（CI を実行せず pre-push の `pnpm check` が関門）
 function mergeReasons(args, cwd, ctx) {
     if (args.some((a) => a === '--merge' || a === '--rebase' || a === '-m' || a === '-r'))
         return ['マージは squash のみ（`--squash`）'];
-    const checks = ctx.prChecks(positionals(args, MERGE_VALUE)[0], cwd);
-    return checks === 'pass' ? [] : [CHECKS_REASON[checks]];
+    const pr = positionals(args, MERGE_VALUE)[0];
+    const checks = ctx.prChecks(pr, cwd);
+    if (checks === 'pass')
+        return [];
+    if (checks === 'none' && epicFlow(ctx)) {
+        const base = ctx.prBase(pr, cwd);
+        if (base !== undefined && DEV_BRANCH.test(base))
+            return [];
+    }
+    return [CHECKS_REASON[checks]];
 }
 // epic のフロー: main への PR は dev/* から、それ以外のブランチの PR は dev/* へ
 // - `gh pr create` の base の省略 = main（既定のブランチ）

package/files/dependabot-gomod.yaml

@@ -0,0 +1,19 @@
+
+  # Go のモジュール（ルートに go.mod があるリポのみ `sync` が追加）
+  - package-ecosystem: gomod
+    directory: "/"
+    # 頻度・rebase・公開直後のバージョンの回避は npm と同じ
+    schedule:
+      interval: monthly
+    rebase-strategy: disabled
+    cooldown:
+      default-days: 2
+    commit-message:
+      prefix: build
+      include: scope
+    groups:
+      # minor・patch は1つの PR にまとめる（Go の major はモジュールのパスが変わるため Dependabot の対象外）
+      minor-and-patch:
+        update-types:
+          - minor
+          - patch

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryusenkei/conventions",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "RYUSENKEI のモノリポの共通の規約（Claude Code の規約・hook、共通ファイルの同期）",
   "license": "MIT",
   "author": "RYUSENKEI",

package/rules.md

@@ -39,6 +39,7 @@
 - マージ: CI の全チェックの成功を確認してから（フックで強制）
 - epic のフロー（有効にしたリポのみ）
   - epic ごとに `dev/<issue の番号>-<内容>` を作成し、sub-issue の PR は dev のブランチへ
+  - dev のブランチへのマージは CI なし、pre-push の `pnpm check` が関門（チェックがある場合は成功が必要）
   - `main` へのマージはデプロイのときだけ dev のブランチから
 
 ## 完了の条件