phase29aj(p2): planner-first pattern1 simplewhile subset

This commit is contained in:
2025-12-29 12:54:32 +09:00
parent ff3af90b4c
commit 97d5d3ef77
12 changed files with 274 additions and 11 deletions

View File

@ -2,7 +2,12 @@
## Current Focus: Phase 29ajPlannerOutcome SSOT
Next: Phase 29aj P2TBD: promotion hint を JoinIR 側の orchestrator へ配線、挙動不変)
Next: Phase 29aj P3TBD: promotion hint を JoinIR 側の orchestrator へ配線、挙動不変)
**2025-12-29: Phase 29aj P2 完了**
- 目的: chosen_rule を撤去し、Pattern1 を Facts→Planner-first に移行(仕様不変)
- 実装: `src/mir/builder/control_flow/plan/planner/outcome.rs` / `src/mir/builder/control_flow/plan/facts/pattern1_simplewhile_facts.rs` / `src/mir/builder/control_flow/plan/planner/build.rs` / `src/mir/builder/control_flow/plan/single_planner/rules.rs`
- 検証: `cargo build --release` / `./tools/smokes/v2/run.sh --profile quick` / `./tools/smokes/v2/profiles/integration/joinir/phase29ae_regression_pack_vm.sh` PASS
**2025-12-29: Phase 29aj P1 完了**
- 目的: single_planner の legacy_rules を撤去し、plan extractor を SSOT に集約(仕様不変)

View File

@ -19,8 +19,8 @@ Related:
- **Phase 29ajcandidate: PlannerOutcome observability SSOT**
- 入口: `docs/development/current/main/phases/phase-29aj/README.md`
- 状況: P0/P1 ✅ 完了
- Next: Phase 29aj P2TBD: promotion hint を JoinIR 側の orchestrator へ配線、挙動不変)
- 状況: P0/P1/P2 ✅ 完了
- Next: Phase 29aj P3TBD: promotion hint を JoinIR 側の orchestrator へ配線、挙動不変)
- **Phase 29aicandidate: Plan/Frag single-plannerFacts SSOT**
- 入口: `docs/development/current/main/phases/phase-29ai/README.md`

View File

@ -32,7 +32,6 @@ Goal: facts の直抽出を撤去し、strict/dev 観測が planner outcome の
構造(例):
- `facts: Option<CanonicalLoopFacts>`
- `plan: Option<DomainPlan>`
- `chosen_rule: Option<&'static str>`(任意。未使用なら None
## Implementation Steps

View File

@ -0,0 +1,82 @@
# Phase 29aj P2: chosen_rule 撤去 + Pattern1 planner-firstsubset
Date: 2025-12-29
Status: Ready for execution
Scope: planner outcome の整理 + Pattern1 Facts→Planner-first仕様不変
Goal: unused outcome field を削除し、Pattern1 の extractor 依存を 1 つ減らす
## Objective
- `PlanBuildOutcome::chosen_rule` を撤去し、outcome SSOT を引き締める
- Pattern1SimpleWhileを Facts→Planner-first に移す(超保守 subset
- 既定挙動・観測・エラー文字列は不変P15 タグ維持)
## Non-goals
- Pattern3/4/5/8/9 の planner-first 化
- ルール順序 SSOT の CandidateSet への移管
- 新しい env var 追加
- 追加ログ
## Implementation Steps
### Step 1: chosen_rule を削除
Files:
- `src/mir/builder/control_flow/plan/planner/outcome.rs`
やること:
- `PlanBuildOutcome` から `chosen_rule` を削除
- `build_plan_with_facts()` の返却からも削除
### Step 2: Pattern1 Facts を追加subset
Files:
- `src/mir/builder/control_flow/plan/facts/pattern1_simplewhile_facts.rs`(新規)
- `src/mir/builder/control_flow/plan/facts/mod.rs`
- `src/mir/builder/control_flow/plan/facts/loop_facts.rs`
Subset 条件:
- condition: `<var> < <int_lit>` のみ
- body: break/continue/return なし
- if-else 禁止if は許可)
- loop_increment: `var = var + <int_lit>`PoC は `<int_lit> == 1`
### Step 3: Planner candidate に Pattern1 を追加
Files:
- `src/mir/builder/control_flow/plan/planner/build.rs`
やること:
- `pattern1_simplewhile` が Some のとき `DomainPlan::Pattern1SimpleWhile` を候補に追加
- unit test を追加
### Step 4: single_planner を Pattern1 planner-first に
Files:
- `src/mir/builder/control_flow/plan/single_planner/rules.rs`
やること:
- RuleKind に Pattern1 を追加
- planner_opt が `Pattern1SimpleWhile` のとき採用
- それ以外は `extract_pattern1_plan()` にフォールバック
- 既存の Pattern1 guard は維持
### Step 5: docs / CURRENT_TASK 更新
Files:
- `docs/development/current/main/phases/phase-29aj/README.md`
- `docs/development/current/main/10-Now.md`
- `docs/development/current/main/30-Backlog.md`
- `CURRENT_TASK.md`
## Acceptance Criteria
- `cargo build --release`
- `./tools/smokes/v2/run.sh --profile quick`
- `./tools/smokes/v2/profiles/integration/joinir/phase29ae_regression_pack_vm.sh`
- `rg -n "chosen_rule" src/mir/builder/control_flow/plan/planner/outcome.rs` がヒットしない
## Commit
- `git add -A && git commit -m "phase29aj(p2): planner-first pattern1 simplewhile subset"`

View File

@ -16,6 +16,13 @@ Goal: planner の facts/plan を 1 本の outcome に集約し、観測の SSOT
- 完了: Pattern1/3/4/5/8/9 を plan/extractors へ移設、legacy_rules を削除
- 検証: `cargo build --release` / `./tools/smokes/v2/run.sh --profile quick` / `./tools/smokes/v2/profiles/integration/joinir/phase29ae_regression_pack_vm.sh`
## P2: chosen_rule 撤去 + Pattern1 planner-firstsubset
- 指示書: `docs/development/current/main/phases/phase-29aj/P2-CHOSEN_RULE-REMOVE-PATTERN1-PLANNER-FIRST-INSTRUCTIONS.md`
- ねらい: outcome の未使用フィールド撤去と Pattern1 の planner-first 化(仕様不変)
- 完了: chosen_rule を削除し、Pattern1 facts→planner を single_planner に接続
- 検証: `cargo build --release` / `./tools/smokes/v2/run.sh --profile quick` / `./tools/smokes/v2/profiles/integration/joinir/phase29ae_regression_pack_vm.sh`
## Verification (SSOT)
- `cargo build --release`