From 6000c5c3f932e29d2385251e1d78c544e2742652 Mon Sep 17 00:00:00 2001 From: tomoaki Date: Tue, 30 Dec 2025 18:07:38 +0900 Subject: [PATCH] docs(phase29ao): add p40 stage2 pattern3 instructions --- docs/development/current/main/10-Now.md | 2 +- docs/development/current/main/30-Backlog.md | 2 +- .../design/coreplan-migration-roadmap-ssot.md | 2 +- ...DOPT-PATTERN3-IFPHI-SUBSET-INSTRUCTIONS.md | 98 +++++++++++++++++++ .../current/main/phases/phase-29ao/README.md | 3 +- 5 files changed, 103 insertions(+), 4 deletions(-) create mode 100644 docs/development/current/main/phases/phase-29ao/P40-RELEASE-ADOPT-PATTERN3-IFPHI-SUBSET-INSTRUCTIONS.md diff --git a/docs/development/current/main/10-Now.md b/docs/development/current/main/10-Now.md index 11068df3..0f60ce4f 100644 --- a/docs/development/current/main/10-Now.md +++ b/docs/development/current/main/10-Now.md @@ -3,7 +3,7 @@ ## Current Focus - Phase: `docs/development/current/main/phases/phase-29ao/README.md` -- Next: TBD (see `docs/development/current/main/phases/phase-29ao/README.md`) +- Next: `docs/development/current/main/phases/phase-29ao/P40-RELEASE-ADOPT-PATTERN3-IFPHI-SUBSET-INSTRUCTIONS.md` ## Gate (SSOT) diff --git a/docs/development/current/main/30-Backlog.md b/docs/development/current/main/30-Backlog.md index 014cff7a..42d1107e 100644 --- a/docs/development/current/main/30-Backlog.md +++ b/docs/development/current/main/30-Backlog.md @@ -5,7 +5,7 @@ Scope: 「次にやる候補」を短く列挙するメモ。入口は `docs/dev ## Active -- CorePlan migration: `docs/development/current/main/phases/phase-29ao/README.md`（Next: TBD） +- CorePlan migration: `docs/development/current/main/phases/phase-29ao/README.md`（Next: P40） ## Near-Term Candidates diff --git a/docs/development/current/main/design/coreplan-migration-roadmap-ssot.md b/docs/development/current/main/design/coreplan-migration-roadmap-ssot.md index 20c4c6cb..98c4e1bc 100644 --- a/docs/development/current/main/design/coreplan-migration-roadmap-ssot.md +++ b/docs/development/current/main/design/coreplan-migration-roadmap-ssot.md @@ -34,7 +34,7 @@ Related: ## 1.1 Current (active) - Active phase: `docs/development/current/main/phases/phase-29ao/README.md` -- Next step: TBD +- Next step: `docs/development/current/main/phases/phase-29ao/P40-RELEASE-ADOPT-PATTERN3-IFPHI-SUBSET-INSTRUCTIONS.md` ## 2. すでに固めた SSOT（再発防止の土台） diff --git a/docs/development/current/main/phases/phase-29ao/P40-RELEASE-ADOPT-PATTERN3-IFPHI-SUBSET-INSTRUCTIONS.md b/docs/development/current/main/phases/phase-29ao/P40-RELEASE-ADOPT-PATTERN3-IFPHI-SUBSET-INSTRUCTIONS.md new file mode 100644 index 00000000..8ad2fa1a --- /dev/null +++ b/docs/development/current/main/phases/phase-29ao/P40-RELEASE-ADOPT-PATTERN3-IFPHI-SUBSET-INSTRUCTIONS.md @@ -0,0 +1,98 @@ +--- +Status: Ready +Scope: Stage-2（release既定）を Pattern3(If‑Phi) の “planner subset” へ拡張する（仕様不変） +Related: +- docs/development/current/main/phases/phase-29ao/README.md +- docs/development/current/main/phases/phase-29ae/README.md +- docs/development/current/main/design/coreplan-migration-roadmap-ssot.md +- docs/development/current/main/design/coreplan-shadow-adopt-tag-coverage-ssot.md +--- + +# Phase 29ao P40: Stage-2 — release adopt Pattern3(If‑Phi) subset (planner-derived only) + +## 目的 + +- P36–P39 で Pattern1/6/7/2 の planner subset を release 既定で composer 経由に寄せられた。 +- P40 は同じ安全方針で、Pattern3(If‑Phi) のうち **planner subset（outcome.plan が Pattern3IfPhi）** を release 既定で `facts → composer → CorePlan` に寄せる。 +- strict/dev の shadow adopt は引き続き「タグ必須」で回帰固定する（観測/Fail-Fast 維持）。 + +## 非目的 + +- Pattern3 の subset 拡張（誤マッチ防止のため、既存 subset のまま） +- 新しい env var 追加 +- release でタグ出力（恒常ログ増加） +- エラー文字列の変更 + +## 実装（P37/P38/P39と同型） + +### Step 1: composer に Pattern3 release adopt 入口を追加 + +対象: +- `src/mir/builder/control_flow/plan/composer/shadow_adopt.rs` +- `src/mir/builder/control_flow/plan/composer/mod.rs`（re-export） + +追加する関数（例）: +- `try_release_adopt_core_plan_for_pattern3_ifphi(...) -> Result, String>` + +採用条件（安全ゲート）: +- `domain_plan` が `DomainPlan::Pattern3IfPhi(_)` のときだけ +- `outcome.plan` が `Some(DomainPlan::Pattern3IfPhi(_))` のときだけ（planner 由来のみ採用） +- `outcome.facts` が存在し、`facts.facts.pattern3_ifphi` が `Some` のときだけ + +合成: +- 既存の `compose_coreplan_for_pattern3_ifphi(builder, facts, ctx)` を再利用 + +失敗時（release既定）: +- `Ok(None)` または `Err(_)` はすべて `Ok(None)` に丸めて、従来経路へフォールバック（仕様不変） + +### Step 2: router の非strict経路で Pattern3 release adopt を接続 + +対象: +- `src/mir/builder/control_flow/joinir/patterns/router.rs` + +位置: +- `if !strict_or_dev { ... }` ブロック内（Pattern1/6/7/2 の後） +- `lower_via_plan(...)` の前 + +処理: +- `PlanVerifier::verify(&core_plan)?; PlanLowerer::lower(...)` +- タグ出力はしない（strict/dev のみ tag） + +### Step 3: 非strict smoke を追加して gate に入れる + +狙い: +- 既存の Pattern3 smoke は strict/dev でタグ検証に寄っているため、release adopt 経路が踏まれない。 +- “strictを付けない” integration smoke を 1 本追加して、非strict 実行でも安定することを固定する。 + +追加（例）: +- `tools/smokes/v2/profiles/integration/joinir/phase29ao_pattern3_release_adopt_vm.sh` + +要件: +- `HAKO_JOINIR_STRICT=1` を設定しない（`env -u` で外す） +- fixture は既存の Pattern3 minimal を使用: + - `apps/tests/phase118_pattern3_if_sum_min.hako` +- 期待: + - exit code = 0 + - output 数値が `12` + - タグ（`[coreplan/shadow_adopt:pattern3_ifphi]`）は出ない（releaseでタグ出力禁止） + +配線: +- `tools/smokes/v2/profiles/integration/joinir/phase29ae_regression_pack_vm.sh` に filter 1 行追加 +- `docs/development/current/main/phases/phase-29ae/README.md` の pack 項目追記 + +### Step 4: docs 更新 + +- `docs/development/current/main/phases/phase-29ao/README.md`（P40完了/Next） +- `docs/development/current/main/10-Now.md` / `docs/development/current/main/30-Backlog.md` +- `docs/development/current/main/design/coreplan-migration-roadmap-ssot.md` + +## 検証（必須） + +- `cargo build --release` +- `./tools/smokes/v2/run.sh --profile quick` +- `./tools/smokes/v2/profiles/integration/joinir/phase29ae_regression_pack_vm.sh` + +## コミット + +- `git add -A` +- `git commit -m "phase29ao(p40): release adopt pattern3 if-phi subset"` diff --git a/docs/development/current/main/phases/phase-29ao/README.md b/docs/development/current/main/phases/phase-29ao/README.md index bb1d9562..95618929 100644 --- a/docs/development/current/main/phases/phase-29ao/README.md +++ b/docs/development/current/main/phases/phase-29ao/README.md @@ -223,4 +223,5 @@ Gate（SSOT）: ## Next（planned） -- Next: TBD +- Next: P40（Stage-2 expand: Pattern3） +- 指示書: `docs/development/current/main/phases/phase-29ao/P40-RELEASE-ADOPT-PATTERN3-IFPHI-SUBSET-INSTRUCTIONS.md`