fix(deploy): preserve content.md changes in personal mode during deployment

- Add content_md field to SiteBuilder to hold pre-loaded content
- Create new_with_config_and_content() method for deployment scenarios
- Read content.md before git stashing to preserve uncommitted changes
- Update generate_personal_index() to use pre-loaded content when available
- Bump version to 0.4.1

Fixes issue where blogr deploy would not include uncommitted changes
to content.md for personal mode sites, as the file was being stashed
before the build process.

Author: bahdotsh

Cargo.lock

@@ -10,7 +10,7 @@ thiserror = "2.0"
 walkdir = "2.3"
 
 [workspace.package]
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 authors = ["bahdotsh"]
 license = "MIT"

Cargo.toml

@@ -12,7 +12,7 @@ name = "blogr"
 path = "src/main.rs"
 
 [dependencies]
-blogr-themes = { version = "0.4.0", path = "../blogr-themes" }
+blogr-themes = { version = "0.4.1", path = "../blogr-themes" }
 clap = { version = "4.0", features = ["derive"] }
 ratatui = "0.24"
 crossterm = "0.27"

blogr-cli/Cargo.toml

@@ -36,6 +36,21 @@ pub async fn handle_deploy(branch: String, message: Option<String>) -> Result<()
     let github_config = config.github.as_ref()
         .ok_or_else(|| anyhow!("GitHub configuration not found. Initialize with GitHub integration or configure manually."))?;
 
+    // For personal mode, read content.md BEFORE stashing to preserve uncommitted changes
+    let content_md = if config.site.site_type == "personal" {
+        let content_md_path = project.root.join("content.md");
+        if content_md_path.exists() {
+            Some(
+                fs::read_to_string(&content_md_path)
+                    .with_context(|| "Failed to read content.md")?,
+            )
+        } else {
+            None
+        }
+    } else {
+        None
+    };
+
     Console::step(2, 7, "Preparing git repository...");
 
     // Open the git repository
@@ -78,10 +93,11 @@ pub async fn handle_deploy(branch: String, message: Option<String>) -> Result<()
     // Build the site AFTER handling git state to ensure build directory exists
     // Use a temporary directory outside the project to avoid conflicts
     let temp_output = std::env::temp_dir().join(format!("blogr-deploy-{}", Uuid::new_v4()));
-    // Use the pre-loaded config to avoid issues with git stashing
-    let site_builder = SiteBuilder::new_with_config(
+    // Use the pre-loaded config and content.md to avoid issues with git stashing
+    let site_builder = SiteBuilder::new_with_config_and_content(
         project.clone(),
         config.clone(),
+        content_md,
         Some(temp_output.clone()),
         false,
         false,

blogr-cli/src/commands/deploy.rs

@@ -31,6 +31,8 @@ pub struct SiteBuilder {
     include_drafts: bool,
     /// Include future posts in build
     include_future: bool,
+    /// Pre-loaded content.md (used during deploy to preserve uncommitted changes)
+    content_md: Option<String>,
 }
 
 impl SiteBuilder {
@@ -211,9 +213,26 @@ Thank you!`);
             output_dir,
             include_drafts,
             include_future,
+            content_md: None,
         })
     }
 
+    /// Create a new site builder with pre-loaded config and content.md
+    /// Used during deployment to preserve uncommitted changes
+    pub fn new_with_config_and_content(
+        project: Project,
+        config: Config,
+        content_md: Option<String>,
+        output_dir: Option<PathBuf>,
+        include_drafts: bool,
+        include_future: bool,
+    ) -> Result<Self> {
+        let mut builder =
+            Self::new_with_config(project, config, output_dir, include_drafts, include_future)?;
+        builder.content_md = content_md;
+        Ok(builder)
+    }
+
     /// Build the entire site
     pub fn build(&self) -> Result<()> {
         println!("🚀 Building site with theme '{}'", self.config.theme.name);
@@ -370,11 +389,23 @@ Thank you!`);
         context.insert("current_year", &Utc::now().year());
 
         // Read and parse content.md for sections data
-        let content_md_path = self.project.root.join("content.md");
-        if content_md_path.exists() {
-            let content_md = fs::read_to_string(&content_md_path)
-                .map_err(|e| anyhow!("Failed to read content.md: {}", e))?;
+        // Use pre-loaded content if available (for deployment with uncommitted changes),
+        // otherwise read from disk
+        let content_md = if let Some(preloaded) = &self.content_md {
+            Some(preloaded.clone())
+        } else {
+            let content_md_path = self.project.root.join("content.md");
+            if content_md_path.exists() {
+                Some(
+                    fs::read_to_string(&content_md_path)
+                        .map_err(|e| anyhow!("Failed to read content.md: {}", e))?,
+                )
+            } else {
+                None
+            }
+        };
 
+        if let Some(content_md) = content_md {
             // Parse frontmatter to get sections
             if let Ok((frontmatter, _)) = self.parse_frontmatter(&content_md) {
                 if let Ok(frontmatter_data) =

blogr-cli/src/generator/site.rs

@@ -1,6 +1,6 @@
 [package]
 name = "blogr-themes"
-version = "0.4.0"
+version = "0.4.1"
 edition.workspace = true
 authors.workspace = true
 license.workspace = true