From f7a61532ae5efacc1a40a9839b7de9c54d96f7cf Mon Sep 17 00:00:00 2001 From: tomoaki Date: Mon, 29 Dec 2025 07:14:42 +0900 Subject: [PATCH] docs(phase29ai): add P3 typed Freeze/candidateset implementation instructions --- docs/development/current/main/10-Now.md | 2 +- docs/development/current/main/30-Backlog.md | 2 +- ...ANDIDATESET-IMPLEMENTATION-INSTRUCTIONS.md | 66 +++++++++++++++++++ .../current/main/phases/phase-29ai/README.md | 5 ++ 4 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 docs/development/current/main/phases/phase-29ai/P3-TYPED-FREEZE-CANDIDATESET-IMPLEMENTATION-INSTRUCTIONS.md diff --git a/docs/development/current/main/10-Now.md b/docs/development/current/main/10-Now.md index b141254d..25bcc469 100644 --- a/docs/development/current/main/10-Now.md +++ b/docs/development/current/main/10-Now.md @@ -2,7 +2,7 @@ ## Current Focus: Phase 29ai（Plan/Frag single-planner） -Next: `docs/development/current/main/phases/phase-29ai/P1-PLANNER-CANDIDATES-FREEZE-SSOT-INSTRUCTIONS.md` +Next: `docs/development/current/main/phases/phase-29ai/P3-TYPED-FREEZE-CANDIDATESET-IMPLEMENTATION-INSTRUCTIONS.md` **2025-12-29: Phase 29ag P1 完了** ✅ - 目的: coordinator の ValueId(idx) 前提を撤去し、boundary.join_inputs を SSOT 化（仕様不変） diff --git a/docs/development/current/main/30-Backlog.md b/docs/development/current/main/30-Backlog.md index 17eba43e..264ddd63 100644 --- a/docs/development/current/main/30-Backlog.md +++ b/docs/development/current/main/30-Backlog.md @@ -19,7 +19,7 @@ Related: - **Phase 29ai（candidate）: Plan/Frag single-planner（Facts SSOT）** - 入口: `docs/development/current/main/phases/phase-29ai/README.md` - - Next: P1（Planner candidate-set + Freeze SSOT） + - Next: P3（Typed Freeze + CandidateSet implementation） - **Phase 29ae P1（✅ COMPLETE）: JoinIR Regression Pack (SSOT固定)** - 入口: `docs/development/current/main/phases/phase-29ae/README.md` diff --git a/docs/development/current/main/phases/phase-29ai/P3-TYPED-FREEZE-CANDIDATESET-IMPLEMENTATION-INSTRUCTIONS.md b/docs/development/current/main/phases/phase-29ai/P3-TYPED-FREEZE-CANDIDATESET-IMPLEMENTATION-INSTRUCTIONS.md new file mode 100644 index 00000000..e5eec5c5 --- /dev/null +++ b/docs/development/current/main/phases/phase-29ai/P3-TYPED-FREEZE-CANDIDATESET-IMPLEMENTATION-INSTRUCTIONS.md @@ -0,0 +1,66 @@ +# Phase 29ai P3: Typed Freeze + CandidateSet implementation (code) — Instructions + +Status: Ready for execution +Scope: planner の型/契約をコードに落とす（仕様不変） + +## Goal + +`Result, Freeze>` の境界（NotApplicable vs Fail-Fast）を “型” と “候補集合→一意化” で固定し、入口の if 地獄を増やさない。 + +このP3は、Facts がまだ `Ok(None)` を返す限り、実行経路は変化しない（仕様不変）。 + +## Non-goals + +- Facts の実装（P4以降） +- 既存 pattern/normalizer の置換 +- 新しい env 変数 / トグルの追加 +- 永続ログの追加 + +## Target Files + +- `src/mir/builder/control_flow/plan/planner/mod.rs` +- `src/mir/builder/control_flow/plan/planner/build.rs` +- （必要なら追加）`src/mir/builder/control_flow/plan/planner/freeze.rs` +- （必要なら追加）`src/mir/builder/control_flow/plan/planner/candidates.rs` +- `src/mir/builder/control_flow/plan/facts/loop_facts.rs`（Freeze 型参照の調整のみ） + +## Implementation Steps + +1) `Freeze` を `type Freeze = String` から構造体へ + - `Freeze { tag: &'static str, message: String, hint: Option }` + - `Display` は SSOT として安定化する: + - 例: `"[plan/freeze:{tag}] {message}"` + - 生成ヘルパーを用意: + - `Freeze::contract(msg)` + - `Freeze::ambiguous(msg)` + - `Freeze::unsupported(msg)` + - `Freeze::bug(msg)` + +2) CandidateSet（候補集合→一意化）を追加 + - `PlanCandidate { kind: PlanKind, rule: &'static str }` + - `CandidateSet::finalize()`: + - 0件 → `Ok(None)` + - 1件 → `Ok(Some(plan))` + - 2件以上 → `Err(Freeze::ambiguous(...))` + - `rule` は診断用の内部名のみ（公開APIに pattern 名を漏らさない） + +3) `build_plan_from_facts` を candidate-set 方式に変更 + - `rules::*` は未実装でよいが、`unreachable!/todo!` は避ける + - 未対応は `Freeze::unsupported("...")` で SSOT の“失敗形”を明確化 + - Facts が `Ok(None)` の現状では到達しないため、挙動は不変 + +4) docs の参照整合を確認 + - Tag/分類は `docs/development/current/main/design/planfrag-freeze-taxonomy.md` と一致させる + +## Verification (SSOT) + +- `cargo build --release` +- `./tools/smokes/v2/run.sh --profile quick` +- `./tools/smokes/v2/profiles/integration/joinir/phase29ae_regression_pack_vm.sh` + +## Acceptance Criteria + +- 仕様不変（quick/回帰パックが緑） +- Planner の入口が “候補集合→一意化” で固定され、入口分岐が増えない +- `Ok(None)` / `Err(Freeze)` の境界が “型” で表現され、将来の Facts 実装で揺れない + diff --git a/docs/development/current/main/phases/phase-29ai/README.md b/docs/development/current/main/phases/phase-29ai/README.md index 7cc8b16b..0635b07d 100644 --- a/docs/development/current/main/phases/phase-29ai/README.md +++ b/docs/development/current/main/phases/phase-29ai/README.md @@ -19,6 +19,11 @@ Goal: pattern 名による分岐を外部APIから消し、Facts（事実）→ - SSOT Registry: `docs/development/current/main/design/planfrag-ssot-registry.md` - Freeze taxonomy: `docs/development/current/main/design/planfrag-freeze-taxonomy.md` +## P3: Typed Freeze + CandidateSet implementation（code） + +- 指示書: `docs/development/current/main/phases/phase-29ai/P3-TYPED-FREEZE-CANDIDATESET-IMPLEMENTATION-INSTRUCTIONS.md` +- ねらい: Planner の契約を型/候補集合で固定（Facts 未実装の間は未到達、仕様不変） + ## Verification (SSOT) - `cargo build --release`