fix: verify daemon readable push previews

Author: mohammedahmed18

crates/loc-cli/src/commands.rs

@@ -4106,6 +4106,7 @@ fn verify_daemon_push_plan_matches_cli_preview(
 fn push_preview_plan_matches(cli_preview: &PushReport, daemon_preview: &PushReport) -> bool {
     cli_preview.validation == daemon_preview.validation
         && cli_preview.plan == daemon_preview.plan
+        && cli_preview.readable_diff == daemon_preview.readable_diff
         && cli_preview.guardrail == daemon_preview.guardrail
 }
 
@@ -4235,7 +4236,7 @@ fn diff(args: &[String], json: bool) -> i32 {
             exit_code
         }
         Ok(report) => {
-            let exit_code = diff_plain_report_exit_code(&report);
+            let exit_code = diff_report_exit_code(&report);
             print_diff_report(&report);
             exit_code
         }
@@ -6637,13 +6638,6 @@ fn diff_report_exit_code(report: &crate::diff::DiffReport) -> i32 {
     }
 }
 
-fn diff_plain_report_exit_code(report: &crate::diff::DiffReport) -> i32 {
-    match report.action.as_str() {
-        "confirm_plan" | "confirm_dangerous_plan" => 4,
-        _ => diff_report_exit_code(report),
-    }
-}
-
 fn pull_report_exit_code(report: &PullReport) -> i32 {
     if report.ok {
         EXIT_SUCCESS
@@ -7192,9 +7186,9 @@ mod tests {
         print_push_confirmation_preview, projection_mode_for_target,
         projection_usage_options_for_target, prompt_for_push_confirmation,
         pull_direct_fallback_error, push_confirmation_preview_matches_displayed,
-        should_prompt_for_push_confirmation, should_refresh_notion_url_search,
-        spinner_config_for_command, spinner_enabled, status as run_status_command,
-        validate_virtual_projection_registration, write_log_report,
+        push_preview_plan_matches, should_prompt_for_push_confirmation,
+        should_refresh_notion_url_search, spinner_config_for_command, spinner_enabled,
+        status as run_status_command, validate_virtual_projection_registration, write_log_report,
     };
 
     #[test]
@@ -7798,6 +7792,18 @@ mod tests {
         assert_eq!(diff_report_exit_code(&report(false)), EXIT_VALIDATION);
     }
 
+    #[test]
+    fn confirm_plan_diff_report_exits_successfully_when_clean() {
+        let mut report = report(true);
+        report.action = "confirm_plan".to_string();
+        report.readable_diff = Some(locality_core::readable_diff::ReadableDiffOutput {
+            files: Vec::new(),
+            text: "diff --locality a/Roadmap.md b/Roadmap.md\n".to_string(),
+        });
+
+        assert_eq!(diff_report_exit_code(&report), EXIT_SUCCESS);
+    }
+
     #[test]
     fn push_report_exit_codes_track_gate_states() {
         assert_eq!(
@@ -7929,6 +7935,25 @@ mod tests {
         ));
     }
 
+    #[test]
+    fn daemon_push_preview_match_includes_readable_diff() {
+        let mut cli_preview = push_report("confirm_plan");
+        cli_preview.readable_diff = Some(locality_core::readable_diff::ReadableDiffOutput {
+            files: Vec::new(),
+            text: "diff --locality a/Roadmap.md b/Roadmap.md\n-Old\n+New\n".to_string(),
+        });
+        let mut daemon_preview = cli_preview.clone();
+
+        assert!(push_preview_plan_matches(&cli_preview, &daemon_preview));
+
+        daemon_preview.readable_diff = Some(locality_core::readable_diff::ReadableDiffOutput {
+            files: Vec::new(),
+            text: "diff --locality a/Roadmap.md b/Roadmap.md\n-Old\n+Different\n".to_string(),
+        });
+
+        assert!(!push_preview_plan_matches(&cli_preview, &daemon_preview));
+    }
+
     #[test]
     fn spinner_is_only_enabled_for_human_terminal_output() {
         assert!(spinner_enabled(false, true));

crates/loc-cli/src/push.rs

@@ -223,6 +223,7 @@ impl PushReport {
             mount_id,
             entity_id,
             pipeline,
+            readable_diff,
             action,
             execution,
             push_id,
@@ -252,7 +253,7 @@ impl PushReport {
                 .map(ValidationIssueOutput::from)
                 .collect(),
             plan: pipeline.plan.map(PushPlanOutput::from),
-            readable_diff: None,
+            readable_diff,
             guardrail: GuardrailOutput::from(pipeline.guardrail),
             action: daemon_action_name(&action, &pipeline_action, error.as_ref()).to_string(),
             pipeline_action,

crates/loc-cli/tests/diff.rs

@@ -640,7 +640,7 @@ fn diff_plain_text_summary_includes_entity_creates() {
         .expect("run loc diff");
 
     assert!(
-        output.status.code() == Some(4),
+        output.status.success(),
         "stdout:\n{}\nstderr:\n{}",
         String::from_utf8_lossy(&output.stdout),
         String::from_utf8_lossy(&output.stderr)
@@ -686,7 +686,7 @@ fn diff_plain_text_output_includes_readable_patch() {
         .expect("run loc diff");
 
     assert!(
-        output.status.code() == Some(4),
+        output.status.success(),
         "stdout:\n{}\nstderr:\n{}",
         String::from_utf8_lossy(&output.stdout),
         String::from_utf8_lossy(&output.stderr)

crates/loc-cli/tests/push.rs

@@ -10,7 +10,7 @@ use std::thread;
 use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
 
 use loc_cli::push::{
-    PushOptions, push_report_exit_code, run_push, run_push_with_daemon,
+    PushOptions, PushReport, push_report_exit_code, run_push, run_push_with_daemon,
     run_push_with_daemon_at_state_root, select_push_targets,
 };
 use locality_connector::{
@@ -28,6 +28,7 @@ use locality_core::model::{
 };
 use locality_core::planner::{GuardrailDecision, PushOperation, PushPlan};
 use locality_core::push::{PushPipelineAction, PushPipelineResult, PushStage};
+use locality_core::readable_diff::ReadableDiffOutput;
 use locality_core::shadow::ShadowDocument;
 use locality_core::validation::ValidationReport;
 use locality_core::{LocalityError, LocalityResult};
@@ -710,6 +711,22 @@ fn push_json_preview_uses_cli_diff_plan_when_running_daemon_has_stale_planner()
     );
 }
 
+#[test]
+fn daemon_push_report_preserves_readable_diff_for_cli_preview() {
+    let fixture = PushFixture::new();
+    let mut daemon_report =
+        stale_daemon_push_report(&fixture.root.join("Roadmap.md"), &fixture.mount_id);
+    let readable_diff = ReadableDiffOutput {
+        files: Vec::new(),
+        text: "diff --locality a/Roadmap.md b/Roadmap.md\n-Old\n+New\n".to_string(),
+    };
+    daemon_report.readable_diff = Some(readable_diff.clone());
+
+    let report = PushReport::from_daemon(daemon_report);
+
+    assert_eq!(report.readable_diff, Some(readable_diff));
+}
+
 #[test]
 fn approved_push_refuses_stale_daemon_plan_before_apply() {
     let fixture = PushFixture::new();
@@ -1065,6 +1082,7 @@ fn stale_daemon_push_report(path: &Path, mount_id: &MountId) -> PushJobReport {
                 PushStage::PlanAndConfirm,
             ],
         },
+        readable_diff: None,
         action: PushJobAction::NotReady,
         execution: None,
         push_id: None,

crates/localityd/src/execution.rs

@@ -13,6 +13,7 @@ use locality_core::hydration::HydrationRequest;
 use locality_core::journal::{JournalStatus, PushId};
 use locality_core::model::{MountId, RemoteId};
 use locality_core::push::{PushExecutionResult, PushPipelineResult};
+use locality_core::readable_diff::ReadableDiffOutput;
 use serde::{Deserialize, Serialize};
 
 use crate::hydration::{HydrationDrainReport, HydrationOutcome, HydrationSource};
@@ -70,6 +71,7 @@ pub struct PushJobReport {
     pub mount_id: MountId,
     pub entity_id: RemoteId,
     pub pipeline: PushPipelineResult,
+    pub readable_diff: Option<ReadableDiffOutput>,
     pub action: PushJobAction,
     pub execution: Option<PushExecutionResult>,
     pub push_id: Option<PushId>,

crates/localityd/src/push.rs

@@ -171,6 +171,7 @@ where
             mount_id: prepared.mount.mount_id,
             entity_id: prepared.entity.remote_id,
             pipeline: prepared.pipeline,
+            readable_diff: prepared.readable_diff,
             action: PushJobAction::NotReady,
             execution: None,
             push_id: None,
@@ -334,7 +335,7 @@ where
         previous_push_id,
         created_at_unix_ms,
     ))
-    .with_readable_diff(readable_diff);
+    .with_readable_diff(readable_diff.clone());
 
     if !prepared.shadows.is_empty() {
         execution_request = execution_request.with_preimages(
@@ -372,6 +373,7 @@ where
             mount_id: prepared.mount.mount_id,
             entity_id: prepared.entity.remote_id,
             pipeline: prepared.pipeline,
+            readable_diff: readable_diff.clone(),
             action: PushJobAction::from_execution(&result),
             push_id: Some(result.push_id.clone()),
             journal_status: result.journal_status.clone(),
@@ -383,6 +385,7 @@ where
             mount_id: prepared.mount.mount_id,
             entity_id: prepared.entity.remote_id,
             pipeline: prepared.pipeline,
+            readable_diff,
             action: PushJobAction::Failed,
             execution: None,
             push_id: Some(push_id.clone()),