@ryusenkei/conventions 0.2.0 → 0.2.1

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

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryusenkei/conventions",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "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 のブランチから
 
 ## 完了の条件