修复: 前端UX一致性(Dashboard状态映射/状态徽章全局/Knowledge下一条与失败反馈/Ideas筛选与错误条/ConfirmDialog安全/快捷菜单状态机/分页越界) + 后端校验(queue/count-list一致/软删拒改/父聚合/promote CAS/MCP状态机收口/update白名单剔除id/created_at) + 销账

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

@@ -455,12 +455,20 @@ impl TaskRepo {
     ///
     /// 复用 list_by_query 的 WHERE 构造逻辑(仅 WHERE,无 ORDER BY/LIMIT),
     /// 返回满足条件的总行数(忽略分页裁剪)。
+    ///
+    /// LW-5(BE-CMD-2):补齐 assignee/queue/parent_id/module_id 维度,与 list_by_query
+    /// 全维度对齐——此前 count 缺四维导致「count 超算、list 空页」翻页不一致
+    /// (前端分页 total 与页数据对不上)。
     pub async fn count_by_query(&self, query: &TaskQuery) -> Result<i64> {
         let conn = self.conn.clone();
         let project_id = query.project_id.clone();
         let status = query.status.clone();
         let priority = query.priority;
+        let assignee = query.assignee.clone();
         let keyword = query.keyword.clone();
+        let queue = query.queue.clone();
+        let parent_id = query.parent_id.clone();
+        let module_id = query.module_id.clone();
 
         tokio::task::spawn_blocking(move || {
             let guard = conn.blocking_lock();
@@ -480,6 +488,11 @@ impl TaskRepo {
                 where_clauses.push(format!("priority = ?{}", params_vec.len() + 1));
                 params_vec.push(Box::new(p));
             }
+            // LW-5: assignee 维度(与 list_by_query 同 WHERE 构造,防 count/list 漂移)
+            if let Some(ref a) = assignee {
+                where_clauses.push(format!("assignee = ?{}", params_vec.len() + 1));
+                params_vec.push(Box::new(a.clone()));
+            }
             if let Some(ref kw) = keyword {
                 let escaped = kw.replace('%', "\\%").replace('_', "\\_");
                 let pat = format!("%{escaped}%");
@@ -489,6 +502,19 @@ impl TaskRepo {
                 params_vec.push(Box::new(pat.clone()));
                 params_vec.push(Box::new(pat));
             }
+            // LW-5: queue / parent_id / module_id 维度(知识图谱 V29 + 工程 V41)
+            if let Some(ref q) = queue {
+                where_clauses.push(format!("queue = ?{}", params_vec.len() + 1));
+                params_vec.push(Box::new(q.clone()));
+            }
+            if let Some(ref pid) = parent_id {
+                where_clauses.push(format!("parent_id = ?{}", params_vec.len() + 1));
+                params_vec.push(Box::new(pid.clone()));
+            }
+            if let Some(ref mid) = module_id {
+                where_clauses.push(format!("module_id = ?{}", params_vec.len() + 1));
+                params_vec.push(Box::new(mid.clone()));
+            }
 
             let sql = format!(
                 "SELECT COUNT(*) FROM tasks WHERE {}",
@@ -781,11 +807,34 @@ impl TaskRepo {
         .await
         .map_err(storage_err)?
     }
-}
 
-// ============================================================
-// 单元测试 — 知识图谱 Phase 1:queue/parent_id 筛选 + get_children(内存 DB)
-// ============================================================
+    /// 更新单字段,**仅作用于未软删记录**(`WHERE id AND deleted_at IS NULL`)。
+    ///
+    /// LW-6(BE-CMD-5):通用 [`update_field`] 不过滤软删(回收站任务仍可改字段),
+    /// 本方法收口软删防护,供命令层 `update_task` 使用——软删任务(回收站)返回 `false`,
+    /// 调用方据此报「已删除」,杜绝回收站任务被字段更新复活/改动。
+    /// 字段名走同款 [`validate_column_name`] 白名单(防注入 + 按表隔离)。
+    pub async fn update_field_active(&self, id: &str, field: &str, value: &str) -> Result<bool> {
+        validate_column_name(field, "tasks")?;
+        let conn = self.conn.clone();
+        let sql = format!(
+            "UPDATE tasks SET {} = ?1, updated_at = ?2 WHERE id = ?3 AND deleted_at IS NULL",
+            field
+        );
+        let id = id.to_owned();
+        let value = value.to_owned();
+        let now = now_millis_str();
+        tokio::task::spawn_blocking(move || {
+            let guard = conn.blocking_lock();
+            let affected = guard
+                .execute(&sql, params![value, now, id])
+                .map_err(storage_err)?;
+            Ok(affected > 0)
+        })
+        .await
+        .map_err(storage_err)?
+    }
+}
 
 #[cfg(test)]
 mod tests {
@@ -1244,4 +1293,69 @@ mod tests {
         assert_eq!(after.title, "他人已改", "CAS 冲突不得覆盖他人修改");
         assert_eq!(after.updated_at, "1800000000000");
     }
+
+    // ============================================================
+    // LW-5 count_by_query 维度对齐 list_by_query(防 count/list 漂移翻页)
+    // ============================================================
+
+    #[tokio::test]
+    async fn count_by_query_matches_list_by_query_dimensions() {
+        let repo = setup().await;
+        // 父任务 + 3 子/叶任务,覆盖 queue/assignee/parent_id 三维(module_id 需 FK 另测)
+        repo.insert(trec("parent", "todo", None)).await.unwrap();
+        let mut c1 = trec("c1", "backlog", Some("parent"));
+        c1.assignee = Some("alice".to_string());
+        let mut c2 = trec("c2", "todo", Some("parent"));
+        c2.assignee = Some("bob".to_string());
+        let mut c3 = trec("c3", "active", None);
+        c3.assignee = Some("alice".to_string());
+        repo.insert(c1).await.unwrap();
+        repo.insert(c2).await.unwrap();
+        repo.insert(c3).await.unwrap();
+
+        // 单维度:queue=backlog → 1(c1)
+        let q = TaskQuery { queue: Some("backlog".to_string()), ..Default::default() };
+        assert_eq!(repo.count_by_query(&q).await.unwrap(), 1);
+        // assignee=alice → 2(c1 + c3)
+        let q = TaskQuery { assignee: Some("alice".to_string()), ..Default::default() };
+        assert_eq!(repo.count_by_query(&q).await.unwrap(), 2);
+        // parent_id=parent → 2(c1 + c2)
+        let q = TaskQuery { parent_id: Some("parent".to_string()), ..Default::default() };
+        assert_eq!(repo.count_by_query(&q).await.unwrap(), 2);
+        // 组合:queue=backlog AND parent_id=parent → 1(c1)
+        let q = TaskQuery {
+            queue: Some("backlog".to_string()),
+            parent_id: Some("parent".to_string()),
+            ..Default::default()
+        };
+        assert_eq!(repo.count_by_query(&q).await.unwrap(), 1);
+
+        // 关键契约:count 与 list_by_query 对同一 query 结果数一致(翻页 total 与页数据对齐)
+        for q in [
+            TaskQuery { queue: Some("backlog".to_string()), ..Default::default() },
+            TaskQuery { assignee: Some("alice".to_string()), ..Default::default() },
+            TaskQuery { parent_id: Some("parent".to_string()), ..Default::default() },
+        ] {
+            let count = repo.count_by_query(&q).await.unwrap();
+            let list_len = repo.list_by_query(&q).await.unwrap().len() as i64;
+            assert_eq!(count, list_len, "count 与 list 维度必须一致,query={q:?}");
+        }
+    }
+
+    // ============================================================
+    // LW-6 update_field_active 软删过滤(回收站任务不可改字段)
+    // ============================================================
+
+    #[tokio::test]
+    async fn update_field_active_skips_soft_deleted() {
+        let repo = setup().await;
+        repo.insert(trec("t1", "todo", None)).await.unwrap();
+        // 未软删:可改
+        assert!(repo.update_field_active("t1", "title", "新标题").await.unwrap());
+        // 软删后:update_field_active 拒(0 行),字段不被改动
+        repo.soft_delete("t1").await.unwrap();
+        assert!(!repo.update_field_active("t1", "title", "又改").await.unwrap());
+        let after = repo.get_by_id("t1").await.unwrap().unwrap();
+        assert_eq!(after.title, "新标题", "软删后字段不应被改动");
+    }
 }