refactor(cli): centralize JSON output helpers across dispatch commands

Author: rexleimo

crates/loopforge-cli/src/dispatch.rs

@@ -7,6 +7,7 @@ mod daemon;
 mod doctor;
 mod harness;
 mod init;
+mod json_output;
 mod mcp;
 mod mcp_sanitize;
 mod release;

crates/loopforge-cli/src/dispatch/acp.rs

@@ -1,3 +1,4 @@
+use super::json_output::{print_pretty_json, to_json_value};
 use crate::{
     acp::{load_acp_checkpoints, load_acp_events},
     cli::AcpCommand,
@@ -16,10 +17,7 @@ pub(super) fn run(command: AcpCommand) -> anyhow::Result<()> {
 
             let events = load_acp_events(&memory, session.as_deref(), limit)?;
             if json {
-                println!(
-                    "{}",
-                    serde_json::to_string_pretty(&build_acp_events_json(&events)?)?
-                );
+                print_pretty_json(&build_acp_events_json(&events)?)?;
             } else {
                 for event in events {
                     let session = event
@@ -45,10 +43,7 @@ pub(super) fn run(command: AcpCommand) -> anyhow::Result<()> {
 
             let checkpoints = load_acp_checkpoints(&memory, &session)?;
             if json {
-                println!(
-                    "{}",
-                    serde_json::to_string_pretty(&build_acp_checkpoints_json(&checkpoints)?)?
-                );
+                print_pretty_json(&build_acp_checkpoints_json(&checkpoints)?)?;
             } else if checkpoints.is_empty() {
                 println!("no checkpoints for session {}", session);
             } else {
@@ -74,13 +69,13 @@ pub(super) fn run(command: AcpCommand) -> anyhow::Result<()> {
 }
 
 fn build_acp_events_json(events: &[serde_json::Value]) -> anyhow::Result<serde_json::Value> {
-    Ok(serde_json::to_value(events)?)
+    to_json_value(events)
 }
 
 fn build_acp_checkpoints_json(
     checkpoints: &[serde_json::Value],
 ) -> anyhow::Result<serde_json::Value> {
-    Ok(serde_json::to_value(checkpoints)?)
+    to_json_value(checkpoints)
 }
 
 #[cfg(test)]

crates/loopforge-cli/src/dispatch/config.rs

@@ -1,5 +1,6 @@
 use rexos::paths::RexosPaths;
 
+use super::json_output::{print_pretty_json, to_json_value};
 use crate::{cli::ConfigCommand, config_validation::validate_config};
 
 pub(super) fn run(command: ConfigCommand) -> anyhow::Result<()> {
@@ -8,10 +9,7 @@ pub(super) fn run(command: ConfigCommand) -> anyhow::Result<()> {
             let paths = RexosPaths::discover()?;
             let report = validate_config(&paths);
             if json {
-                println!(
-                    "{}",
-                    serde_json::to_string_pretty(&build_config_validate_json(&report)?)?
-                );
+                print_pretty_json(&build_config_validate_json(&report)?)?;
             } else if report.valid {
                 println!("config valid: {}", report.config_path);
             } else {
@@ -32,7 +30,7 @@ pub(super) fn run(command: ConfigCommand) -> anyhow::Result<()> {
 fn build_config_validate_json(
     report: &crate::config_validation::ConfigValidationReport,
 ) -> anyhow::Result<serde_json::Value> {
-    Ok(serde_json::to_value(report)?)
+    to_json_value(report)
 }
 
 #[cfg(test)]

crates/loopforge-cli/src/dispatch/doctor.rs

@@ -1,5 +1,6 @@
 use rexos::paths::RexosPaths;
 
+use super::json_output::{print_pretty_json, to_json_value};
 use crate::doctor;
 
 pub(super) async fn run(json: bool, strict: bool, timeout_ms: u64) -> anyhow::Result<()> {
@@ -11,10 +12,7 @@ pub(super) async fn run(json: bool, strict: bool, timeout_ms: u64) -> anyhow::Re
     .await?;
 
     if json {
-        println!(
-            "{}",
-            serde_json::to_string_pretty(&build_doctor_json(&report)?)?
-        );
+        print_pretty_json(&build_doctor_json(&report)?)?;
     } else {
         println!("{}", report.to_text());
     }
@@ -27,7 +25,7 @@ pub(super) async fn run(json: bool, strict: bool, timeout_ms: u64) -> anyhow::Re
 }
 
 fn build_doctor_json(report: &doctor::DoctorReport) -> anyhow::Result<serde_json::Value> {
-    Ok(serde_json::to_value(report)?)
+    to_json_value(report)
 }
 
 #[cfg(test)]

crates/loopforge-cli/src/dispatch/json_output.rs

@@ -0,0 +1,10 @@
+use serde::Serialize;
+
+pub(crate) fn to_json_value<T: Serialize + ?Sized>(value: &T) -> anyhow::Result<serde_json::Value> {
+    Ok(serde_json::to_value(value)?)
+}
+
+pub(crate) fn print_pretty_json<T: Serialize + ?Sized>(value: &T) -> anyhow::Result<()> {
+    println!("{}", serde_json::to_string_pretty(value)?);
+    Ok(())
+}

crates/loopforge-cli/src/dispatch/release.rs

@@ -1,3 +1,4 @@
+use super::json_output::{print_pretty_json, to_json_value};
 use crate::{
     cli::ReleaseCommand,
     release_check::{format_release_check_report, run_release_check},
@@ -13,10 +14,7 @@ pub(super) fn run(command: ReleaseCommand) -> anyhow::Result<()> {
         } => {
             let report = run_release_check(&repo_root, tag.as_deref(), run_tests)?;
             if json {
-                println!(
-                    "{}",
-                    serde_json::to_string_pretty(&build_release_check_json(&report)?)?
-                );
+                print_pretty_json(&build_release_check_json(&report)?)?;
             } else {
                 println!("{}", format_release_check_report(&report));
             }
@@ -31,7 +29,7 @@ pub(super) fn run(command: ReleaseCommand) -> anyhow::Result<()> {
 fn build_release_check_json(
     report: &crate::release_check::ReleaseCheckReport,
 ) -> anyhow::Result<serde_json::Value> {
-    Ok(serde_json::to_value(report)?)
+    to_json_value(report)
 }
 
 #[cfg(test)]

crates/loopforge-cli/src/dispatch/skills/doctor.rs

@@ -1,14 +1,12 @@
 use std::path::PathBuf;
 
+use super::super::json_output::{print_pretty_json, to_json_value};
 use crate::skills;
 
 pub(super) fn run_doctor(workspace: PathBuf, json: bool, strict: bool) -> anyhow::Result<()> {
     let report = skills::doctor(&workspace)?;
     if json {
-        println!(
-            "{}",
-            serde_json::to_string_pretty(&build_skills_doctor_json(&report)?)?
-        );
+        print_pretty_json(&build_skills_doctor_json(&report)?)?;
     } else {
         println!("discovered_skills: {}", report.discovered_count);
         if report.issues.is_empty() {
@@ -45,7 +43,7 @@ pub(super) fn run_doctor(workspace: PathBuf, json: bool, strict: bool) -> anyhow
 fn build_skills_doctor_json(
     report: &skills::SkillsDoctorReport,
 ) -> anyhow::Result<serde_json::Value> {
-    Ok(serde_json::to_value(report)?)
+    to_json_value(report)
 }
 
 #[cfg(test)]

crates/loopforge-cli/src/dispatch/skills/listing.rs

@@ -1,14 +1,12 @@
 use std::path::PathBuf;
 
+use super::super::json_output::{print_pretty_json, to_json_value};
 use crate::skills;
 
 pub(super) fn run_list(workspace: PathBuf, json: bool) -> anyhow::Result<()> {
     let list = skills::list_skills(&workspace)?;
     if json {
-        println!(
-            "{}",
-            serde_json::to_string_pretty(&build_skills_list_json(&list)?)?
-        );
+        print_pretty_json(&build_skills_list_json(&list)?)?;
     } else if list.is_empty() {
         println!("no skills discovered");
     } else {
@@ -43,7 +41,7 @@ pub(super) fn run_show(name: String, workspace: PathBuf, json: bool) -> anyhow::
             .collect::<Vec<_>>(),
     });
     if json {
-        println!("{}", serde_json::to_string_pretty(&item)?);
+        print_pretty_json(&item)?;
     } else {
         println!("name: {}", item["name"].as_str().unwrap_or("-"));
         println!("version: {}", item["version"].as_str().unwrap_or("-"));
@@ -88,7 +86,7 @@ pub(super) fn run_show(name: String, workspace: PathBuf, json: bool) -> anyhow::
 }
 
 fn build_skills_list_json(list: &[skills::SkillListItem]) -> anyhow::Result<serde_json::Value> {
-    Ok(serde_json::to_value(list)?)
+    to_json_value(list)
 }
 
 #[cfg(test)]