Merge branch 'fn-24-json-storage': core data to JSON files, DB for memory only

Author: z23cc

flowctl/Cargo.lock

@@ -16,13 +16,6 @@ use flowctl_core::types::{
 
 use super::get_flow_dir;
 
-/// Open DB connection (hard error on failure, DB is sole source of truth).
-fn require_db() -> crate::commands::db_shim::Connection {
-    crate::commands::db_shim::require_db()
-        .unwrap_or_else(|e| {
-            crate::output::error_exit(&format!("Cannot open database: {e}"));
-        })
-}
 
 // ── Status command ──────────────────────────────────────────────────
 
@@ -156,13 +149,10 @@ pub fn cmd_status(json: bool, interrupted: bool) {
     }
 }
 
-/// Try to get status counts from SQLite database.
+/// Try to get status counts from JSON files.
 fn status_from_db() -> Option<(serde_json::Value, serde_json::Value)> {
-    let cwd = env::current_dir().ok()?;
-    let conn = crate::commands::db_shim::open(&cwd).ok()?;
-
-    let epic_repo = crate::commands::db_shim::EpicRepo::new(&conn);
-    let epics = epic_repo.list(None).ok()?;
+    let flow_dir = crate::commands::helpers::get_flow_dir();
+    let epics = flowctl_core::json_store::epic_list(&flow_dir).ok()?;
 
     let mut epic_open = 0u64;
     let mut epic_done = 0u64;
@@ -173,8 +163,7 @@ fn status_from_db() -> Option<(serde_json::Value, serde_json::Value)> {
         }
     }
 
-    let task_repo = crate::commands::db_shim::TaskRepo::new(&conn);
-    let tasks = task_repo.list_all(None, None).ok()?;
+    let tasks = flowctl_core::json_store::task_list_all(&flow_dir).ok()?;
 
     let mut todo = 0u64;
     let mut in_progress = 0u64;
@@ -219,29 +208,21 @@ fn is_daemon_heartbeat_alive(flow_dir: &Path) -> bool {
         .unwrap_or(false)
 }
 
-/// Find open epics with undone tasks (interrupted work) from DB.
-fn find_interrupted_epics(_flow_dir: &Path) -> Vec<serde_json::Value> {
+/// Find open epics with undone tasks (interrupted work) from JSON files.
+fn find_interrupted_epics(flow_dir: &Path) -> Vec<serde_json::Value> {
     let mut interrupted = Vec::new();
 
-    let conn = match crate::commands::db_shim::require_db() {
-        Ok(c) => c,
-        Err(_) => return interrupted,
-    };
-
-    let epic_repo = crate::commands::db_shim::EpicRepo::new(&conn);
-    let epics = match epic_repo.list(None) {
+    let epics = match flowctl_core::json_store::epic_list(flow_dir) {
         Ok(e) => e,
         Err(_) => return interrupted,
     };
 
-    let task_repo = crate::commands::db_shim::TaskRepo::new(&conn);
-
     for epic in epics {
         if epic.status != flowctl_core::types::EpicStatus::Open {
             continue;
         }
 
-        let tasks = match task_repo.list_by_epic(&epic.id) {
+        let tasks = match flowctl_core::json_store::task_list_by_epic(flow_dir, &epic.id) {
             Ok(t) => t,
             Err(_) => continue,
         };
@@ -337,26 +318,24 @@ pub(super) fn validate_epic(flow_dir: &Path, epic_id: &str) -> (Vec<String>, Vec
     let mut errors = Vec::new();
     let mut warnings = Vec::new();
 
-    // Read tasks from DB (sole source of truth)
+    // Read tasks from JSON files
     let mut tasks: std::collections::HashMap<String, flowctl_core::types::Task> =
         std::collections::HashMap::new();
 
-    let conn = require_db();
-    let task_repo = crate::commands::db_shim::TaskRepo::new(&conn);
-    if let Ok(task_list) = task_repo.list_by_epic(epic_id) {
+    if let Ok(task_list) = flowctl_core::json_store::task_list_by_epic(flow_dir, epic_id) {
         for task in task_list {
             tasks.insert(task.id.clone(), task);
         }
     }
 
     // Validate each task
     for (task_id, task) in &tasks {
-        // Validate task body has required headings (read from DB)
+        // Validate task body has required headings (read from JSON)
         {
-            match task_repo.get_with_body(task_id) {
-                Ok((_t, body)) => {
+            match flowctl_core::json_store::task_spec_read(flow_dir, task_id) {
+                Ok(body) => {
                     if body.is_empty() {
-                        warnings.push(format!("Task {}: no body in DB", task_id));
+                        warnings.push(format!("Task {}: no spec body", task_id));
                     } else {
                         for heading in flowctl_core::types::TASK_SPEC_HEADINGS {
                             if !body.contains(heading) {
@@ -366,7 +345,7 @@ pub(super) fn validate_epic(flow_dir: &Path, epic_id: &str) -> (Vec<String>, Vec
                     }
                 }
                 Err(_) => {
-                    errors.push(format!("Task {}: could not read body from DB", task_id));
+                    errors.push(format!("Task {}: could not read spec", task_id));
                 }
             }
         }
@@ -430,9 +409,7 @@ pub fn cmd_validate(json_mode: bool, epic: Option<String>, all: bool) {
         // Validate all epics
         let root_errors = validate_flow_root(&flow_dir);
 
-        let conn = require_db();
-        let epic_repo = crate::commands::db_shim::EpicRepo::new(&conn);
-        let mut epic_ids: Vec<String> = epic_repo.list(None)
+        let mut epic_ids: Vec<String> = flowctl_core::json_store::epic_list(&flow_dir)
             .unwrap_or_default()
             .into_iter()
             .map(|e| e.id)
@@ -553,9 +530,7 @@ pub fn cmd_doctor(json_mode: bool) {
     let mut validate_errors = root_errors.clone();
 
     {
-        let conn = require_db();
-        let epic_repo = crate::commands::db_shim::EpicRepo::new(&conn);
-        if let Ok(epics) = epic_repo.list(None) {
+        if let Ok(epics) = flowctl_core::json_store::epic_list(&flow_dir) {
             for epic in &epics {
                 let (errors, _, _) = validate_epic(&flow_dir, &epic.id);
                 validate_errors.extend(errors);

flowctl/crates/flowctl-cli/src/commands/admin/status.rs

@@ -1,6 +1,4 @@
-//! Dependency commands: dep add, dep rm.
-//!
-//! DB canonical — all dependency operations go through the DB (sole source of truth).
+//! Dependency management commands: add, remove.
 
 use chrono::Utc;
 use clap::Subcommand;
@@ -38,20 +36,6 @@ fn ensure_flow_exists() -> std::path::PathBuf {
     flow_dir
 }
 
-/// Open DB connection (hard error if unavailable).
-fn require_db() -> crate::commands::db_shim::Connection {
-    crate::commands::db_shim::require_db()
-        .unwrap_or_else(|e| error_exit(&format!("DB required: {e}")))
-}
-
-/// Read a task from DB (sole source of truth).
-fn read_task(task_id: &str) -> flowctl_core::types::Task {
-    let conn = require_db();
-    let repo = crate::commands::db_shim::TaskRepo::new(&conn);
-    repo.get(task_id)
-        .unwrap_or_else(|_| error_exit(&format!("Task not found: {}", task_id)))
-}
-
 pub fn dispatch(cmd: &DepCmd, json: bool) {
     match cmd {
         DepCmd::Add { task, depends_on } => cmd_dep_add(json, task, depends_on),
@@ -60,7 +44,7 @@ pub fn dispatch(cmd: &DepCmd, json: bool) {
 }
 
 fn cmd_dep_add(json: bool, task_id: &str, depends_on: &str) {
-    ensure_flow_exists();
+    let flow_dir = ensure_flow_exists();
 
     if !is_task_id(task_id) {
         error_exit(&format!(
@@ -87,20 +71,15 @@ fn cmd_dep_add(json: bool, task_id: &str, depends_on: &str) {
         ));
     }
 
-    let mut task = read_task(task_id);
+    let mut task = flowctl_core::json_store::task_read(&flow_dir, task_id)
+        .unwrap_or_else(|_| error_exit(&format!("Task not found: {}", task_id)));
 
     if !task.depends_on.contains(&depends_on.to_string()) {
         task.depends_on.push(depends_on.to_string());
         task.updated_at = Utc::now();
-
-        // Write to DB
-        let conn = require_db();
-        let dep_repo = crate::commands::db_shim::DepRepo::new(&conn);
-        if let Err(e) = dep_repo.add_task_dep(task_id, depends_on) {
-            error_exit(&format!("Failed to add dep: {e}"));
+        if let Err(e) = flowctl_core::json_store::task_write_definition(&flow_dir, &task) {
+            error_exit(&format!("Failed to write task: {e}"));
         }
-        let task_repo = crate::commands::db_shim::TaskRepo::new(&conn);
-        let _ = task_repo.upsert(&task);
     }
 
     if json {
@@ -115,7 +94,7 @@ fn cmd_dep_add(json: bool, task_id: &str, depends_on: &str) {
 }
 
 fn cmd_dep_rm(json: bool, task_id: &str, depends_on: &str) {
-    ensure_flow_exists();
+    let flow_dir = ensure_flow_exists();
 
     if !is_task_id(task_id) {
         error_exit(&format!("Invalid task ID: {}", task_id));
@@ -124,20 +103,15 @@ fn cmd_dep_rm(json: bool, task_id: &str, depends_on: &str) {
         error_exit(&format!("Invalid dependency ID: {}", depends_on));
     }
 
-    let mut task = read_task(task_id);
+    let mut task = flowctl_core::json_store::task_read(&flow_dir, task_id)
+        .unwrap_or_else(|_| error_exit(&format!("Task not found: {}", task_id)));
 
     if let Some(pos) = task.depends_on.iter().position(|d| d == depends_on) {
         task.depends_on.remove(pos);
         task.updated_at = Utc::now();
-
-        // Write to DB
-        let conn = require_db();
-        let dep_repo = crate::commands::db_shim::DepRepo::new(&conn);
-        if let Err(e) = dep_repo.remove_task_dep(task_id, depends_on) {
-            error_exit(&format!("Failed to remove dep: {e}"));
+        if let Err(e) = flowctl_core::json_store::task_write_definition(&flow_dir, &task) {
+            error_exit(&format!("Failed to write task: {e}"));
         }
-        let task_repo = crate::commands::db_shim::TaskRepo::new(&conn);
-        let _ = task_repo.upsert(&task);
 
         if json {
             json_output(json!({
@@ -154,9 +128,9 @@ fn cmd_dep_rm(json: bool, task_id: &str, depends_on: &str) {
             "task": task_id,
             "depends_on": task.depends_on,
             "removed": false,
-            "message": format!("{} not in dependencies", depends_on),
+            "message": format!("{} was not in {}'s dependencies", depends_on, task_id),
         }));
     } else {
-        println!("{} is not a dependency of {}", depends_on, task_id);
+        println!("{} was not in {}'s dependencies", depends_on, task_id);
     }
 }