fix(review): SOP 模板更新保 run 链/步数校验/收尾幂等守卫/存量回填

Author: Aparencia

app/src-tauri/src/commands_after.rs

@@ -16,7 +16,6 @@ use crate::db::Db;
 use crate::db_completion::EV_EXPORT_MANUAL_DONE;
 use crate::db_practice::PracticeItem;
 use crate::db_questions::QuestionItem;
-use crate::tasks_core::{migrate_status, TaskStatus};
 
 /// 迁出文件导出（保存对话框返回路径由用户授权；仅 .txt + 大小护栏）。
 #[tauri::command]
@@ -169,7 +168,9 @@ pub(crate) fn weekly_resolve_core(
                 view.failed.push(format!("行 {} 内容已变化（任务“{}”失效，请刷新）", p.line_no, p.payload));
                 continue;
             }
-            if let Some(next) = crate::tasks_core::migrate_status(&line, TaskStatus::Done) {
+            if let Some(next) =
+                crate::tasks_core::migrate_status(&line, crate::tasks_core::TaskStatus::Done)
+            {
                 if next != line {
                     body_lines[p.line_no as usize] = next;
                     changed = true;

app/src-tauri/src/commands_sop.rs

@@ -10,8 +10,8 @@ use tauri::State;
 
 use crate::commands::AppState;
 use crate::db_sop::{
-    lines_to_steps, EVIDENCE_PREFIX, MAX_SOP_STEPS, MODE_READDO, RUN_ABORTED,
-    RUN_DONE, SopRunDetail, SopTemplate,
+    EVIDENCE_PREFIX, MAX_SOP_STEPS, MODE_READDO, RUN_ABORTED, RUN_DONE, SopRunDetail,
+    SopTemplate,
 };
 
 /// 建模板（编辑器工具栏「生成 SOP」入口：当前选中段落行范围）。
@@ -39,11 +39,12 @@ pub fn sop_template_create(
         .get_note(note_id)
         .map_err(|e| e.to_string())?
         .ok_or_else(|| "笔记不存在".to_string())?;
-    let steps = lines_to_steps(&note.content, start_line, end_line);
-    if steps.is_empty() {
+    // 审查中-6：非截断计数先判（lines_to_steps 的 truncate 只是 DB 层兜底）
+    let steps_count = crate::db::Db::count_template_steps(&note.content, start_line, end_line);
+    if steps_count == 0 {
         return Err("所选段落无内容（无法生成空 SOP）".to_string());
     }
-    if steps.len() > MAX_SOP_STEPS {
+    if steps_count > MAX_SOP_STEPS {
         return Err(format!("所选段落超过 {} 步上限——请缩小范围", MAX_SOP_STEPS));
     }
     let mode = mode.unwrap_or_else(|| MODE_READDO.to_string());

app/src-tauri/src/db_migrations.rs

@@ -514,6 +514,22 @@ CREATE TABLE IF NOT EXISTS contracts (
     crate::db_questions::init(conn)?;
     // v0.20.4（REQ-303）：web 会话页面表（kind=web 1:1；正文/元数据/降级附件）
     crate::db_web::init(conn)?;
+    // v0.20.3（REQ-292，审查中-8）：升级存量回填——task_index 空表时对既有
+    // 笔记全量重扫（老库升级后行动中心不得“假空”；重复启动幂等：有行即跳过）
+    let has_rows: i64 = conn
+        .query_row("SELECT COUNT(*) FROM task_index", [], |r| r.get(0))
+        .unwrap_or(1);
+    if has_rows == 0 {
+        if let Ok(mut stmt) = conn.prepare("SELECT id, content FROM notes") {
+            if let Ok(rows) = stmt.query_map([], |r| Ok((r.get::<_, i64>(0)?, r.get::<_, String>(1)?))) {
+                for row in rows {
+                    if let Ok((id, content)) = row {
+                        crate::db_task_index::rebuild_note_tasks(conn, id, &content);
+                    }
+                }
+            }
+        }
+    }
     Ok(())
 }
 

app/src-tauri/src/db_sop.rs

@@ -9,7 +9,7 @@
 //!              执行面=前端 Overlay（commands_sop.rs 出口）。证据路径白名单
 //!              `notes-images/` 前缀在命令层校验（G3）。
 
-use rusqlite::{params, Connection};
+use rusqlite::{params, Connection, OptionalExtension};
 use serde::Serialize;
 
 use crate::db::Db;
@@ -150,7 +150,8 @@ pub fn lines_to_steps(content: &str, start_line: i64, end_line: i64) -> Vec<Stri
 }
 
 impl Db {
-    /// 建模板（范围行数 ≤50；同笔记同名先删后插=覆盖校准）。
+    /// 建/校准模板（审查中-5：同名存在=原地 UPDATE——覆盖校准不得级联销毁
+    /// run 档案链/失败聚合，REQ-297 演进原料必须保留）。
     pub fn create_sop_template(
         &self,
         note_id: i64,
@@ -162,19 +163,43 @@ impl Db {
         let mode = if mode == MODE_CONFIRM { MODE_CONFIRM } else { MODE_READDO };
         let now = crate::db::unix_seconds();
         self.with_conn(|conn| {
-            conn.execute(
-                "DELETE FROM sop_templates WHERE note_id = ?1 AND name = ?2",
-                params![note_id, name],
-            )?;
-            conn.execute(
-                "INSERT INTO sop_templates (note_id, name, start_line, end_line, mode, created_at, updated_at)
-                 VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?6)",
-                params![note_id, name, start_line, end_line, mode, now],
-            )?;
-            Ok(conn.last_insert_rowid())
+            let existing: Option<i64> = conn
+                .query_row(
+                    "SELECT id FROM sop_templates WHERE note_id = ?1 AND name = ?2",
+                    params![note_id, name],
+                    |r| r.get(0),
+                )
+                .optional()?;
+            match existing {
+                Some(id) => {
+                    conn.execute(
+                        "UPDATE sop_templates SET start_line = ?1, end_line = ?2, mode = ?3, updated_at = ?4 WHERE id = ?5",
+                        params![start_line, end_line, mode, now, id],
+                    )?;
+                    Ok(id)
+                }
+                None => {
+                    conn.execute(
+                        "INSERT INTO sop_templates (note_id, name, start_line, end_line, mode, created_at, updated_at)
+                         VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?6)",
+                        params![note_id, name, start_line, end_line, mode, now],
+                    )?;
+                    Ok(conn.last_insert_rowid())
+                }
+            }
         })
     }
 
+    /// 行范围步骤数（不截断——命令层 ≤50 校验用；审查中-6：先判后建，
+    /// truncate 只作 DB 层兜底）。
+    pub fn count_template_steps(content: &str, start_line: i64, end_line: i64) -> usize {
+        let lines: Vec<&str> = content.split('\n').collect();
+        (start_line..=end_line)
+            .filter_map(|i| lines.get(i as usize))
+            .filter(|l| !l.trim().is_empty())
+            .count()
+    }
+
     pub fn list_sop_templates(&self, note_id: Option<i64>) -> Result<Vec<SopTemplate>> {
         self.with_conn(|conn| {
             let base = "SELECT t.id, t.note_id, t.name, t.start_line, t.end_line, t.mode, n.title
@@ -313,7 +338,8 @@ impl Db {
         })
     }
 
-    /// 步状态更新（done|skipped|failed；失败必填 failure_note 或忽略——命令层校验）。
+    /// 步状态更新（done|skipped|failed；审查中-7：DB 层守卫 run active——
+    /// 已收尾 run 拒写，防层间复用裸奔）。
     pub fn update_sop_step(
         &self,
         run_id: i64,
@@ -328,6 +354,16 @@ impl Db {
             )));
         }
         self.with_conn(|conn| {
+            let run_status: Option<String> = conn
+                .query_row(
+                    "SELECT status FROM sop_runs WHERE id = ?1",
+                    params![run_id],
+                    |r| r.get(0),
+                )
+                .optional()?;
+            if run_status.as_deref() != Some(RUN_ACTIVE) {
+                return Ok(false); // 不存在或已收尾——统一不可写语义
+            }
             let affected = conn.execute(
                 "UPDATE sop_run_steps SET status = ?1, evidence_path = ?2, failure_note = ?3, checked_at = ?4
                  WHERE run_id = ?5 AND step_no = ?6",
@@ -338,16 +374,23 @@ impl Db {
     }
 
     /// 结束 run（done/aborted）→ 结算统计写史（sop_run 事件；meta=统计 JSON）。
+    /// 审查中-7：幂等守卫——仅 active run 可收尾（重复 finish 报错且不重复入史）。
     pub fn finish_sop_run(&self, run_id: i64, status: &str) -> Result<SopRunDetail> {
         if !matches!(status, RUN_DONE | RUN_ABORTED) {
             return Err(crate::error::AppError::Asr("仅支持 done/aborted 收尾".to_string()));
         }
         let Some(detail) = self.sop_run_detail(run_id)? else {
             return Err(crate::error::AppError::Io("run 不存在".to_string()));
         };
+        if detail.run.status != RUN_ACTIVE {
+            return Err(crate::error::AppError::Asr(format!(
+                "run 已收尾（{}）——不可重复结算",
+                detail.run.status
+            )));
+        }
         self.with_conn(|conn| {
             conn.execute(
-                "UPDATE sop_runs SET status = ?1, finished_at = ?2 WHERE id = ?3",
+                "UPDATE sop_runs SET status = ?1, finished_at = ?2 WHERE id = ?3 AND status = 'active'",
                 params![status, crate::db::unix_seconds(), run_id],
             )?;
             Ok(())

app/src-tauri/src/db_sop_tests.rs

@@ -78,8 +78,12 @@ fn run_lifecycle_steps_history() {
     assert_eq!(hist.len(), 1);
     assert!(hist[0].meta_json.as_deref().unwrap_or("").contains("\"failed\":1"));
     assert_eq!(db.get_sop_run(run_id).unwrap().unwrap().status, RUN_DONE);
-    // 已结束再收尾（幂等外层拦截前）——直接调两次不崩（status 覆盖）即可
-    let _ = db.finish_sop_run(run_id, RUN_ABORTED).unwrap();
+    // 已收尾 run：重复收尾拒绝（审查中-7 幂等守卫）+ 步骤拒写
+    assert!(db.finish_sop_run(run_id, RUN_ABORTED).is_err(), "重复收尾必须拒绝");
+    assert!(!db.update_sop_step(run_id, 3, "done", None, None).unwrap(), "已收尾 run 步骤不可写");
+    // 非法状态仍拒绝
+    assert!(db.update_sop_step(run_id, 3, "weird", None, None).is_err());
+    assert!(db.update_sop_step(999_999, 1, "done", None, None).unwrap() == false, "不存在 run 不可写");
 }
 
 #[test]