新增: 任务灵感归档后端

crates/df-storage/src/crud/idea_repo.rs

@@ -44,11 +44,12 @@ const KNOWLEDGE_COLS_WITH_EMBEDDING: &str = concat!(
 /// 定义 + 配合 `IDEA_COL_COUNT` 断言 + 测试 `test_idea_cols_matches_record`,加列漏改即捕获。
 ///
 /// V24 新增 related_ids 列(灵感间关联关系持久化打底),已纳入列清单 + 计数。
+/// V47 新增 archived 列(灵感归档,归档功能 P1),已纳入列清单 + 计数(14→15)。
 #[cfg_attr(not(test), allow(dead_code))]
-const IDEA_COLS: &str = "id,title,description,status,priority,score,tags,source,promoted_to,ai_analysis,scores,related_ids,created_at,updated_at";
+const IDEA_COLS: &str = "id,title,description,status,priority,score,tags,source,promoted_to,ai_analysis,scores,related_ids,archived,created_at,updated_at";
 /// `IdeaRecord` 字段数(与上面列清单的逗号分隔项数一致,被测试断言)。
 #[cfg_attr(not(test), allow(dead_code))]
-const IDEA_COL_COUNT: usize = 14;
+const IDEA_COL_COUNT: usize = 15;
 
 // ============================================================
 // 向量工具 — embedding BLOB 序列化 + 余弦相似度
@@ -123,6 +124,8 @@ fn idea_from_row(row: &Row<'_>) -> std::result::Result<IdeaRecord, rusqlite::Err
         ai_analysis: row.get("ai_analysis")?,
         scores: row.get("scores")?,
         related_ids: row.get("related_ids")?,
+        // 归档功能 P1 V47:15 列同步之一(SQLite 无真 BOOLEAN,0→false/非0→true)。
+        archived: row.get::<_, i32>("archived")? != 0,
         created_at: row.get("created_at")?,
         updated_at: row.get("updated_at")?,
     })
@@ -218,22 +221,22 @@ impl_repo!(
     from_row => |row| idea_from_row(row),
     insert  => |conn, rec| {
         conn.execute(
-            "INSERT INTO ideas (id, title, description, status, priority, score, tags, source, promoted_to, ai_analysis, scores, related_ids, created_at, updated_at)
-             VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14)",
+            "INSERT INTO ideas (id, title, description, status, priority, score, tags, source, promoted_to, ai_analysis, scores, related_ids, archived, created_at, updated_at)
+             VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15)",
             params![
                 rec.id, rec.title, rec.description, rec.status.as_str(), rec.priority,
                 rec.score, rec.tags, rec.source, rec.promoted_to, rec.ai_analysis,
-                rec.scores, rec.related_ids, rec.created_at, rec.updated_at
+                rec.scores, rec.related_ids, rec.archived as i32, rec.created_at, rec.updated_at
             ],
         )
     },
     update  => |conn, rec| {
         conn.execute(
-            "UPDATE ideas SET title = ?1, description = ?2, status = ?3, priority = ?4, score = ?5, tags = ?6, source = ?7, promoted_to = ?8, ai_analysis = ?9, scores = ?10, related_ids = ?11, updated_at = ?12 WHERE id = ?13",
+            "UPDATE ideas SET title = ?1, description = ?2, status = ?3, priority = ?4, score = ?5, tags = ?6, source = ?7, promoted_to = ?8, ai_analysis = ?9, scores = ?10, related_ids = ?11, archived = ?12, updated_at = ?13 WHERE id = ?14",
             params![
                 rec.title, rec.description, rec.status.as_str(), rec.priority,
                 rec.score, rec.tags, rec.source, rec.promoted_to, rec.ai_analysis,
-                rec.scores, rec.related_ids, rec.updated_at, rec.id
+                rec.scores, rec.related_ids, rec.archived as i32, rec.updated_at, rec.id
             ],
         )
     }
@@ -306,7 +309,7 @@ impl IdeaRepo {
             // 累积 WHERE 子句 + 收集参数(按出现顺序绑定占位符)。
             // deleted_at IS NULL 恒带(常量条件无占位符),回收站任务不进结果
             // (对标 task_repo list_by_query 同款模式,防回收站泄漏,不可被 query 关闭)。
-            let mut where_clauses: Vec<String> = vec!["deleted_at IS NULL".to_string()];
+            let mut where_clauses: Vec<String> = vec!["deleted_at IS NULL".to_string(), "archived = 0".to_string()];
             let mut params_vec: Vec<Box<dyn rusqlite::ToSql>> = Vec::new();
 
             if let Some(s) = &status {
@@ -428,7 +431,7 @@ impl IdeaRepo {
         validate_column_name(field, "ideas")?;
         let conn = self.conn.clone();
         let sql = format!(
-            "UPDATE ideas SET {} = ?1, updated_at = ?2 WHERE id = ?3 AND deleted_at IS NULL",
+            "UPDATE ideas SET {} = ?1, updated_at = ?2 WHERE id = ?3 AND deleted_at IS NULL AND archived = 0",
             field
         );
         let id = id.to_owned();
@@ -445,6 +448,54 @@ impl IdeaRepo {
         .map_err(storage_err)?
     }
 
+    /// 归档/取消归档(归档功能 P1,V47)。
+    ///
+    /// 纯元数据标记,仅作用于未软删灵感(回收站优先级高于归档,先恢复再操作)。
+    /// archived=true 后灵感退出主视图(list_by_query 恒带 archived = 0),仅在归档视图可见。
+    /// 对标 TaskRepo::set_archived。返回是否命中。
+    pub async fn set_archived(&self, id: &str, archived: bool) -> Result<bool> {
+        let conn = self.conn.clone();
+        let id = id.to_owned();
+        let now = now_millis_str();
+        tokio::task::spawn_blocking(move || {
+            let guard = conn.blocking_lock();
+            let affected = guard
+                .execute(
+                    "UPDATE ideas SET archived = ?1, updated_at = ?2 WHERE id = ?3 AND deleted_at IS NULL",
+                    params![if archived { 1 } else { 0 }, now, id],
+                )
+                .map_err(storage_err)?;
+            Ok(affected > 0)
+        })
+        .await
+        .map_err(storage_err)?
+    }
+
+    /// 列出归档灵感(archived = 1 且未软删),按更新时间降序(最近归档在前)。
+    ///
+    /// 归档视图数据源,与 list_by_query 对偶(恒带 archived = 1)。
+    pub async fn list_archived(&self) -> Result<Vec<IdeaRecord>> {
+        let conn = self.conn.clone();
+        tokio::task::spawn_blocking(move || {
+            let guard = conn.blocking_lock();
+            let mut stmt = guard
+                .prepare(&format!(
+                    "SELECT {IDEA_COLS} FROM ideas WHERE deleted_at IS NULL AND archived = 1 ORDER BY updated_at DESC"
+                ))
+                .map_err(storage_err)?;
+            let rows = stmt
+                .query_map([], |row| idea_from_row(row))
+                .map_err(storage_err)?;
+            let mut results = Vec::new();
+            for r in rows {
+                results.push(r.map_err(storage_err)?);
+            }
+            Ok(results)
+        })
+        .await
+        .map_err(storage_err)?
+    }
+
     /// 原子「立项认领」:CAS 写回 status=promoted + promoted_to(`WHERE id AND promoted_to IS NULL`)。
     ///
     /// promote_idea 读-改-写竞态的原子关闭。promote_idea 先建项目再回写灵感,
@@ -622,7 +673,8 @@ impl IdeaRepo {
     ///
     /// 不动 GUI 的无条件 [`update_full`](无 expected 语义,保持现状);本方法仅服务
     /// 需要乐观锁版本的调用方(df-mcp update_idea / score_idea)。
-    /// `Ok(false)` = id 不存在、已进回收站(deleted_at IS NULL 守卫,V28 灵感软删)或版本冲突。
+    /// `Ok(false)` = id 不存在、已进回收站(deleted_at IS NULL 守卫,V28 灵感软删)、
+    /// 已归档(archived = 0 守卫,V47 灵感归档,须先取消归档)或版本冲突。
     pub async fn update_full_cas(
         &self,
         record: &IdeaRecord,
@@ -635,8 +687,9 @@ impl IdeaRepo {
             let guard = conn.blocking_lock();
             let affected = guard
                 .execute(
-                    // deleted_at IS NULL:回收站灵感不可被 CAS 覆盖(同 tasks/projects 同族守卫)
-                    "UPDATE ideas SET title = ?1, description = ?2, status = ?3, priority = ?4, score = ?5, tags = ?6, source = ?7, promoted_to = ?8, ai_analysis = ?9, scores = ?10, related_ids = ?11, updated_at = ?12 WHERE id = ?13 AND updated_at = ?14 AND deleted_at IS NULL",
+                    // deleted_at IS NULL:回收站灵感不可被 CAS 覆盖(同 tasks/projects 同族守卫);
+                    // archived = 0:归档灵感冻结(同 tasks update_full_cas 同族守卫,须先取消归档再改)。
+                    "UPDATE ideas SET title = ?1, description = ?2, status = ?3, priority = ?4, score = ?5, tags = ?6, source = ?7, promoted_to = ?8, ai_analysis = ?9, scores = ?10, related_ids = ?11, updated_at = ?12 WHERE id = ?13 AND updated_at = ?14 AND deleted_at IS NULL AND archived = 0",
                     params![
                         rec.title, rec.description, rec.status.as_str(), rec.priority,
                         rec.score, rec.tags, rec.source, rec.promoted_to, rec.ai_analysis,
@@ -1837,7 +1890,7 @@ mod tests {
 
     // ---------- IdeaRepo 软删回收站(对标 task_repo 软删测试,V28) ----------
 
-    /// 构造一条 IdeaRecord fixture(14 字段全填,IdeaRecord 不含 deleted_at —— 纯 SQL 过滤)。
+    /// 构造一条 IdeaRecord fixture(15 字段全填,IdeaRecord 不含 deleted_at —— 纯 SQL 过滤)。
     fn irec(id: &str, title: &str) -> IdeaRecord {
         IdeaRecord {
             id: id.to_string(),
@@ -1852,6 +1905,7 @@ mod tests {
             ai_analysis: None,
             scores: None,
             related_ids: None,
+            archived: false,
             created_at: "1700000000000".to_string(),
             updated_at: "1700000000000".to_string(),
         }
@@ -2023,6 +2077,28 @@ mod tests {
         assert_eq!(after.updated_at, current.updated_at, "updated_at 不应抖动");
     }
 
+    #[tokio::test]
+    async fn idea_update_full_cas_skips_archived() {
+        // 归档灵感不可被 CAS 命中(archived = 0 守卫,V47 归档,对标 tasks 同族):
+        // 归档=冻结,须先取消归档(set_archived(false))再改,防 MCP 对归档灵感静默改写。
+        let repo = setup_idea_repo().await;
+        repo.insert(irec("i1", "原标题")).await.unwrap();
+        assert!(repo.set_archived("i1", true).await.unwrap());
+        // set_archived 刷新了 updated_at,取当前值作 expected(排除版本不匹配干扰)
+        let current = repo.get_by_id("i1").await.unwrap().unwrap();
+        let mut rec = current.clone();
+        rec.title = "归档里改标题".to_string();
+        rec.updated_at = "1900000000000".to_string();
+        let ok = repo
+            .update_full_cas(&rec, &current.updated_at)
+            .await
+            .unwrap();
+        assert!(!ok, "归档灵感 CAS 应拒绝(archived 守卫)");
+        let after = repo.get_by_id("i1").await.unwrap().unwrap();
+        assert_eq!(after.title, "原标题", "归档灵感内容不应被改写");
+        assert_eq!(after.updated_at, current.updated_at, "updated_at 不应抖动");
+    }
+
     #[tokio::test]
     async fn idea_update_full_cas_conflict_when_expected_stale() {
         let repo = setup_idea_repo().await;