Merge origin/main into main

Author: genedna

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## [Unreleased]
 
+### Changed (plan-20260715 W0-02, 2026-08-09)
+
+- **W0-02 freeze TUI-owned workflow baselines before Web migration.**
+  Add `workflow_baseline` choice/threshold contracts, named
+  `plan_workflow`/`plan_review`/`repair`/`user_input`/`goal_task` filters, and
+  an INDEX inventory of baseline test names + expected outputs so later Web
+  harness work can retarget these behaviors instead of deleting them.
+
 ### Changed (plan-20260715 W0-01, 2026-08-09)
 
 - **W0-01 source-anchor refresh for the Web-only migration plan.**

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "libra"
-version = "0.19.105"
+version = "0.19.106"
 edition = "2024"
 license = "MIT"
 description = "AI agent-native version control system with Git on-disk compatibility, SQLite-backed metadata, and tiered cloud storage"

Cargo.toml

@@ -350,7 +350,7 @@
 | 状态 | 任务 |
 |---|---|
 | 已勾完（实现 + Codex PASS；部分尚未按本 loop 发布） | W1-01、W1-02、W1-03、W1-05、W1-07 |
-| 本 loop 正在闭合 Checkpoint A | W0-01（Codex PASS，待本切片发布）→ W0-02 → W0-03 |
+| 本 loop 正在闭合 Checkpoint A | W0-01（已发布 `c98c211` / v0.19.105）→ W0-02（Codex PASS，待本切片发布）→ W0-03 |
 | 实现中 / 未勾（仍 FAIL 或未闭合） | W1-04、W1-06、W1-08（及部分 W2 试探） |
 
 **主线续做序（强制）：**
@@ -572,24 +572,26 @@ R27 已消除 L 卡与条目超限；R30 进一步把仍跨 focused session、
 **Description:** 在迁移前为 TUI 当前独占行为补或确认测试，防止迁移时误删：IntentSpec review、Plan review、network policy、repair loop、resume、goal/task control、approval/user-input。测试只覆盖 `libra code` 行为；20260708 A0 已覆盖的 `libra agent` tracing/review/investigate 行为不在本任务内重复补测。
 
 **Acceptance criteria:**
-- [ ] 每个 TUI-owned 行为至少有一个测试名和期望输出。
-- [ ] 测试不依赖真实外部 LLM，使用 `test-provider` / fixture。
-- [ ] 迁移后这些测试可以逐项改指 Web harness，而不是删除。
+- [x] 每个 TUI-owned 行为至少有一个测试名和期望输出。
+- [x] 测试不依赖真实外部 LLM，使用 `test-provider` / fixture。
+- [x] 迁移后这些测试可以逐项改指 Web harness，而不是删除。
 
 **Verification:**（行为→既有 target 映射；缺映射项须补 `(new)` filter 或 fixture，不得以删除行为过关）
-- [ ] IntentSpec / Plan review / network policy：`LIBRA_ENABLE_TEST_PROVIDER=1 cargo test --features test-provider --test code_ui_scenarios -- --test-threads=1`（含 plan_workflow/plan_review 骨架或基线场景名）
-- [ ] approval / user-input：`LIBRA_ENABLE_TEST_PROVIDER=1 cargo test --features test-provider --test code_ui_remote_approval_matrix -- --test-threads=1`
-- [ ] resume：`LIBRA_ENABLE_TEST_PROVIDER=1 cargo test --features test-provider --test code_resume_test -- --test-threads=1`
-- [ ] repair / goal-task 控制面：`LIBRA_ENABLE_TEST_PROVIDER=1 cargo test --features test-provider --test code_ui_remote_state_matrix -- --test-threads=1` 与 `cargo test --test ai_goal_state_test`（或等价命名 filter；缺口须新增命名 filter 并在 INDEX 登记）
-- [ ] generation / CLI 入口不回归：`LIBRA_ENABLE_TEST_PROVIDER=1 cargo test --features test-provider --test code_ui_remote_generation_matrix -- --test-threads=1`；`cargo test --test code_cli_dispatch_test`
-- [ ] `tests/INDEX.md` 为上列每个行为登记「基线测试名 + 期望输出」一行（AC1 机器可读清单）
+- [x] IntentSpec / Plan review / network policy：`LIBRA_ENABLE_TEST_PROVIDER=1 cargo test --features test-provider --test code_ui_scenarios -- --test-threads=1`（含 plan_workflow/plan_review 骨架或基线场景名）
+- [x] approval / user-input：`LIBRA_ENABLE_TEST_PROVIDER=1 cargo test --features test-provider --test code_ui_remote_approval_matrix -- --test-threads=1`
+- [x] resume：`LIBRA_ENABLE_TEST_PROVIDER=1 cargo test --features test-provider --test code_resume_test -- --test-threads=1`
+- [x] repair / goal-task 控制面：`LIBRA_ENABLE_TEST_PROVIDER=1 cargo test --features test-provider --test code_ui_remote_state_matrix -- --test-threads=1` 与 `cargo test --test ai_goal_state_test`（或等价命名 filter；缺口须新增命名 filter 并在 INDEX 登记）
+- [x] generation / CLI 入口不回归：`LIBRA_ENABLE_TEST_PROVIDER=1 cargo test --features test-provider --test code_ui_remote_generation_matrix -- --test-threads=1`；`cargo test --test code_cli_dispatch_test`
+- [x] `tests/INDEX.md` 为上列每个行为登记「基线测试名 + 期望输出」一行（AC1 机器可读清单）
 
 **Dependencies:** W0-01.
 
 **Files likely touched:** `tests/code_ui_scenarios.rs`, `tests/code_ui_remote_generation_matrix.rs`, `tests/code_ui_remote_approval_matrix.rs`, `tests/code_resume_test.rs`, `tests/code_ui_remote_state_matrix.rs`, `tests/ai_goal_state_test.rs`, `tests/fixtures/code_ui/*`, `tests/INDEX.md`.
 
 **Estimated scope:** M.
 
+**实现轮 Codex review（2026-08-09，model=`gpt-5.6-terra`）**：**PASS**（r1，无 findings）。冻结 `workflow_baseline` 选择集与 repair 阈值文案；`code_ui_scenarios` 补 `plan_workflow`/`plan_review`/`repair`/`user_input`/`goal_task` 命名 filter；`code_ui_remote_state_matrix` 补 repair filter；`tests/INDEX.md` 登记基线测试名+期望输出。验证：scenarios 29/29、approval 14/14、resume 11/11、state 17/17、generation 10/10、`ai_goal_state_test` 32/32、`code_cli_dispatch_test` 11/11。
+
 ### Task W0-03: 定义 Web-only completion gate
 
 **Description:** 把“可以删除 TUI”的完成定义写成机器可验收 gate，避免 Phase 4 前误切默认入口。

docs/development/plan/plan-20260715.md

@@ -22,7 +22,7 @@ $ErrorActionPreference = "Stop"
 # One of the release version surfaces. `compat_version_surface_sync` pins it
 # to Cargo.toml: this value is substituted verbatim into the download URL, so
 # a stale value silently installs an old binary when -Version is not given.
-$DefaultVersion = "v0.19.105"
+$DefaultVersion = "v0.19.106"
 $ExeName = "libra.exe"
 $ReleaseAsset = "libra-windows-amd64.exe"
 

install.ps1

@@ -18,7 +18,7 @@ INSTALL_DIR="${LIBRA_INSTALL_DIR:-$LIBRA_HOME/bin}"
 # user opts in with LIBRA_ALLOW_FALLBACK=1. Default behaviour is fail-fast so
 # offline installs cannot silently regress to a stale version. Bump this on
 # every release so the opt-in fallback remains useful.
-DEFAULT_VERSION="v0.19.105"
+DEFAULT_VERSION="v0.19.106"
 
 # ─── theme (Dusk) ────────────────────────────────────────────────────────────
 if [ -t 1 ] && [ -z "${NO_COLOR:-}" ] && [ -z "${LIBRA_NO_TUI:-}" ] && [ "${TERM:-dumb}" != "dumb" ]; then

install.sh

@@ -11175,11 +11175,10 @@ Use this failure evidence as the source of truth:\n{report}",
 }
 
 fn automatic_plan_repair_threshold_message(report: &str, attempts: u8, max_attempts: u8) -> String {
-    format!(
-        "Automatic plan repair stopped after {attempts} failed repair attempts (automatic threshold: {max_attempts}).\n\
-Developer confirmation is required before more automatic correction.\n\
-{report}\n\
-Reply `continue` or `/plan continue <max-attempts>` to allow more automatic repair attempts, describe specific Plan repair guidance, or use `/plan cancel` to stop."
+    crate::internal::tui::workflow_baseline::plan_repair_threshold_baseline_message(
+        report,
+        attempts,
+        max_attempts,
     )
 }
 

src/internal/tui/app.rs

@@ -861,41 +861,68 @@ impl BottomPane {
 
     /// Render the post-plan dialog (Execute Plan / Modify Plan / Cancel).
     fn render_post_plan_dialog(&self, area: Rect, buf: &mut Buffer) -> Option<Position> {
-        self.render_choice_dialog(
-            area,
-            buf,
-            &[
-                ("Execute Plan", "Run the Scheduler"),
-                ("Modify Plan", "Edit the plan"),
-                ("Cancel", "Return to chat"),
-            ],
-        )
+        self.render_choice_dialog(area, buf, &Self::post_plan_options())
     }
 
     /// Render the network policy dialog shown after the developer approves the plan.
     fn render_network_policy_dialog(&self, area: Rect, buf: &mut Buffer) -> Option<Position> {
-        self.render_choice_dialog(
-            area,
-            buf,
-            &[
-                ("Network: Deny", "Run shell/gates offline"),
-                ("Network: Allow", "Shell/gates may use network"),
-                ("Back", "Return to plan choices"),
-            ],
-        )
+        self.render_choice_dialog(area, buf, &Self::network_policy_options())
     }
 
     /// Render the IntentSpec dialog (Confirm / Modify / Cancel).
     fn render_intent_review_dialog(&self, area: Rect, buf: &mut Buffer) -> Option<Position> {
-        self.render_choice_dialog(
-            area,
-            buf,
-            &[
-                ("Confirm Intent", "Generate plan"),
-                ("Modify Intent", "Revise spec"),
-                ("Cancel", "Return to chat"),
-            ],
-        )
+        self.render_choice_dialog(area, buf, &Self::intent_review_options())
+    }
+
+    fn intent_review_options() -> [(&'static str, &'static str); 3] {
+        [
+            (
+                super::workflow_baseline::INTENT_REVIEW_CHOICES[0],
+                super::workflow_baseline::INTENT_REVIEW_HELP[0],
+            ),
+            (
+                super::workflow_baseline::INTENT_REVIEW_CHOICES[1],
+                super::workflow_baseline::INTENT_REVIEW_HELP[1],
+            ),
+            (
+                super::workflow_baseline::INTENT_REVIEW_CHOICES[2],
+                super::workflow_baseline::INTENT_REVIEW_HELP[2],
+            ),
+        ]
+    }
+
+    fn post_plan_options() -> [(&'static str, &'static str); 3] {
+        [
+            (
+                super::workflow_baseline::POST_PLAN_CHOICES[0],
+                super::workflow_baseline::POST_PLAN_HELP[0],
+            ),
+            (
+                super::workflow_baseline::POST_PLAN_CHOICES[1],
+                super::workflow_baseline::POST_PLAN_HELP[1],
+            ),
+            (
+                super::workflow_baseline::POST_PLAN_CHOICES[2],
+                super::workflow_baseline::POST_PLAN_HELP[2],
+            ),
+        ]
+    }
+
+    fn network_policy_options() -> [(&'static str, &'static str); 3] {
+        [
+            (
+                super::workflow_baseline::NETWORK_POLICY_CHOICES[0],
+                super::workflow_baseline::NETWORK_POLICY_HELP[0],
+            ),
+            (
+                super::workflow_baseline::NETWORK_POLICY_CHOICES[1],
+                super::workflow_baseline::NETWORK_POLICY_HELP[1],
+            ),
+            (
+                super::workflow_baseline::NETWORK_POLICY_CHOICES[2],
+                super::workflow_baseline::NETWORK_POLICY_HELP[2],
+            ),
+        ]
     }
 
     fn render_choice_dialog(
@@ -1803,9 +1830,12 @@ mod tests {
             .map(|y| row_text(&plan_buf, y, plan_area.width))
             .collect::<Vec<_>>()
             .join("\n");
-        assert!(plan_text.contains("Execute Plan"));
-        assert!(plan_text.contains("Modify Plan"));
-        assert!(plan_text.contains("Cancel"));
+        for label in crate::internal::tui::workflow_baseline::POST_PLAN_CHOICES {
+            assert!(
+                plan_text.contains(label),
+                "post-plan dialog missing baseline choice {label:?}: {plan_text}"
+            );
+        }
         assert!(!plan_text.contains("Network: Deny"));
         assert!(!plan_text.contains("Network: Allow"));
         assert!(!plan_text.contains("Execute Spec"));
@@ -1819,9 +1849,12 @@ mod tests {
             .map(|y| row_text(&network_buf, y, plan_area.width))
             .collect::<Vec<_>>()
             .join("\n");
-        assert!(network_text.contains("Network: Deny"));
-        assert!(network_text.contains("Network: Allow"));
-        assert!(network_text.contains("Back"));
+        for label in crate::internal::tui::workflow_baseline::NETWORK_POLICY_CHOICES {
+            assert!(
+                network_text.contains(label),
+                "network-policy dialog missing baseline choice {label:?}: {network_text}"
+            );
+        }
         assert!(!network_text.contains("Execute Plan"));
         assert!(!network_text.contains("Modify Plan"));
 
@@ -1834,8 +1867,12 @@ mod tests {
             .map(|y| row_text(&intent_buf, y, area.width))
             .collect::<Vec<_>>()
             .join("\n");
-        assert!(intent_text.contains("Confirm Intent"));
-        assert!(intent_text.contains("Modify Intent"));
+        for label in crate::internal::tui::workflow_baseline::INTENT_REVIEW_CHOICES {
+            assert!(
+                intent_text.contains(label),
+                "intent-review dialog missing baseline choice {label:?}: {intent_text}"
+            );
+        }
         assert!(!intent_text.contains("Execute Plan"));
         assert!(!intent_text.contains("Modify Plan"));
     }

src/internal/tui/bottom_pane.rs

@@ -70,6 +70,8 @@ mod terminal;
 mod theme;
 // Animated welcome screen.
 mod welcome_shader;
+// W0-02 frozen IntentSpec / Plan / network / repair baseline contracts.
+pub mod workflow_baseline;
 
 // Curated public surface: only types that callers outside the module need.
 pub use agent_run_pane::{
@@ -83,3 +85,7 @@ pub use history_cell::{AssistantHistoryCell, DiffHistoryCell, HistoryCell, PlanU
 pub use slash_command::{BuiltinCommand, parse_builtin};
 pub use status_indicator::StatusIndicator;
 pub use terminal::{Tui, TuiEvent, init as tui_init, restore as tui_restore};
+pub use workflow_baseline::{
+    INTENT_REVIEW_CHOICES, NETWORK_POLICY_CHOICES, POST_PLAN_CHOICES,
+    plan_repair_threshold_baseline_message,
+};

src/internal/tui/mod.rs

@@ -0,0 +1,72 @@
+//! W0-02 frozen TUI-owned workflow contracts.
+//!
+//! These labels and repair hints are the machine-readable baseline for
+//! IntentSpec review, Plan review, network policy, and the automatic plan
+//! repair threshold. Later Web harness work (W2-16 / W3-02 / W3-15) must
+//! **retarget** these contracts, not delete the behaviors they pin.
+
+/// IntentSpec review dialog choices shown while
+/// [`crate::internal::tui::AgentStatus::AwaitingIntentReviewChoice`].
+pub const INTENT_REVIEW_CHOICES: &[&str] = &["Confirm Intent", "Modify Intent", "Cancel"];
+
+/// Post-plan dialog choices shown while
+/// [`crate::internal::tui::AgentStatus::AwaitingPostPlanChoice`].
+pub const POST_PLAN_CHOICES: &[&str] = &["Execute Plan", "Modify Plan", "Cancel"];
+
+/// Network policy dialog choices shown while
+/// [`crate::internal::tui::AgentStatus::AwaitingNetworkPolicyChoice`].
+pub const NETWORK_POLICY_CHOICES: &[&str] = &["Network: Deny", "Network: Allow", "Back"];
+
+/// Help line fragments for each IntentSpec review choice.
+pub const INTENT_REVIEW_HELP: &[&str] = &["Generate plan", "Revise spec", "Return to chat"];
+
+/// Help line fragments for each post-plan choice.
+pub const POST_PLAN_HELP: &[&str] = &["Run the Scheduler", "Edit the plan", "Return to chat"];
+
+/// Help line fragments for each network policy choice.
+pub const NETWORK_POLICY_HELP: &[&str] = &[
+    "Run shell/gates offline",
+    "Shell/gates may use network",
+    "Return to plan choices",
+];
+
+/// Frozen threshold message when automatic plan repair stops for developer
+/// confirmation. Callers must keep the `/plan continue` affordance.
+pub fn plan_repair_threshold_baseline_message(
+    report: &str,
+    attempts: u8,
+    max_attempts: u8,
+) -> String {
+    format!(
+        "Automatic plan repair stopped after {attempts} failed repair attempts (automatic threshold: {max_attempts}).\n\
+Developer confirmation is required before more automatic correction.\n\
+{report}\n\
+Reply `continue` or `/plan continue <max-attempts>` to allow more automatic repair attempts, describe specific Plan repair guidance, or use `/plan cancel` to stop."
+    )
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn workflow_baseline_choice_sets_are_phase_specific() {
+        assert_eq!(INTENT_REVIEW_CHOICES.len(), 3);
+        assert_eq!(POST_PLAN_CHOICES.len(), 3);
+        assert_eq!(NETWORK_POLICY_CHOICES.len(), 3);
+        assert!(INTENT_REVIEW_CHOICES.contains(&"Confirm Intent"));
+        assert!(POST_PLAN_CHOICES.contains(&"Execute Plan"));
+        assert!(NETWORK_POLICY_CHOICES.contains(&"Network: Deny"));
+        assert!(!INTENT_REVIEW_CHOICES.iter().any(|c| c.contains("Execute")));
+        assert!(!POST_PLAN_CHOICES.iter().any(|c| c.contains("Network")));
+        assert!(!NETWORK_POLICY_CHOICES.iter().any(|c| c.contains("Execute")));
+    }
+
+    #[test]
+    fn plan_repair_threshold_baseline_keeps_plan_continue_affordance() {
+        let message = plan_repair_threshold_baseline_message("boom", 3, 3);
+        assert!(message.contains("Automatic plan repair stopped after 3 failed repair attempts"));
+        assert!(message.contains("/plan continue"));
+        assert!(message.contains("boom"));
+    }
+}