fix: resolve merge conflict with upstream main

Author: Nishant Gaurav

.github/workflows/ci.yml

@@ -5,14 +5,25 @@ on:
     branches: [ main, dev ]
   pull_request:
     branches: [ main, dev ]
+  issues:
+    types: [opened, edited]
+  issue_comment:
+    types: [created, edited]
+  pull_request_target:
+    types: [opened, edited, synchronize]
+  pull_request_review_comment:
+    types: [created, edited]
 
 permissions:
   contents: read
   security-events: write
+  issues: write
+  pull-requests: write
 
 jobs:
   test:
     runs-on: ubuntu-latest
+    if: github.event_name == 'push' || github.event_name == 'pull_request'
     strategy:
       matrix:
         go-version: ['1.24']
@@ -64,6 +75,7 @@ jobs:
 
   lint:
     runs-on: ubuntu-latest
+    if: github.event_name == 'push' || github.event_name == 'pull_request'
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
@@ -85,6 +97,7 @@ jobs:
 
   security:
     runs-on: ubuntu-latest
+    if: github.event_name == 'push' || github.event_name == 'pull_request'
     permissions:
       security-events: write
       actions: read
@@ -124,6 +137,7 @@ jobs:
 
   build:
     runs-on: ubuntu-latest
+    if: github.event_name == 'push' || github.event_name == 'pull_request'
     needs: [test, lint]
     strategy:
       matrix:
@@ -166,6 +180,7 @@ jobs:
 
   integration:
     runs-on: ubuntu-latest
+    if: github.event_name == 'push' || github.event_name == 'pull_request'
     needs: [test]
     steps:
     - name: Checkout code
@@ -214,6 +229,7 @@ jobs:
 
   dependency-check:
     runs-on: ubuntu-latest
+    if: github.event_name == 'push' || github.event_name == 'pull_request'
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
@@ -238,3 +254,51 @@ jobs:
           git diff
           exit 1
         fi
+
+  ai-pr-detection:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request_target' || github.event_name == 'pull_request_review_comment'
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+    - name: AI PR Detection
+      uses: github/ai-moderator@v1.1.2
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        spam-label: spam
+        ai-label: ai-generated
+        minimize-detected-comments: false
+        enable-spam-detection: false
+        enable-link-spam-detection: false
+        enable-ai-detection: true
+
+  ai-issue-moderation:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'issues' || github.event_name == 'issue_comment'
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+    - name: AI Issue and Comment Moderator
+      uses: github/ai-moderator@v1.1.2
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        spam-label: spam
+        ai-label: ai-generated
+        minimize-detected-comments: true
+        enable-spam-detection: true
+        enable-link-spam-detection: true
+        enable-ai-detection: true
+
+  contributors-readme:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+    - name: Contribute List
+      uses: akhilmhdh/contributors-readme-action@v2.3.11
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -240,9 +240,37 @@ Built with ❤️ in Go by the open source community.
 
 ## Contributors
 
-Thanks to all our amazing contributors!  
-
-[![Contributors](https://contrib.rocks/image?repo=substantialcattle5/sietch)](https://github.com/substantialcattle5/sietch/graphs/contributors)
+Thanks to all our amazing contributors!
+
+<!-- readme: contributors -start -->
+<table>
+	<tbody>
+		<tr>
+            <td align="center">
+                <a href="https://github.com/SubstantialCattle5">
+                    <img src="https://avatars.githubusercontent.com/u/92233871?v=4" width="100;" alt="SubstantialCattle5"/>
+                    <br />
+                    <sub><b>Nilay Nath Sharan</b></sub>
+                </a>
+            </td>
+            <td align="center">
+                <a href="https://github.com/MrKeiKun">
+                    <img src="https://avatars.githubusercontent.com/u/4362134?v=4" width="100;" alt="MrKeiKun"/>
+                    <br />
+                    <sub><b>Lorenzo (Kei) Buitizon</b></sub>
+                </a>
+            </td>
+            <td align="center">
+                <a href="https://github.com/ABHINAVGARG05">
+                    <img src="https://avatars.githubusercontent.com/u/143117260?v=4" width="100;" alt="ABHINAVGARG05"/>
+                    <br />
+                    <sub><b>Abhinav Garg</b></sub>
+                </a>
+            </td>
+		</tr>
+	<tbody>
+</table>
+<!-- readme: contributors -end -->
 
 ## License
 

cmd/add.go

@@ -23,6 +23,14 @@ import (
 	"github.com/substantialcattle5/sietch/util"
 )
 
+// SpaceSavings represents space savings statistics for a file
+type SpaceSavings struct {
+	OriginalSize   int64
+	CompressedSize int64
+	SpaceSaved     int64
+	SpaceSavedPct  float64
+}
+
 // addCmd represents the add command
 var addCmd = &cobra.Command{
 	Use:   "add <source_path> <destination_path> [source_path2] [destination_path2]...",
@@ -128,6 +136,7 @@ Examples:
 		// Process each file pair
 		successCount := 0
 		var failedFiles []string
+		var totalSpaceSavings SpaceSavings
 
 		// Show initial progress for multiple files
 		if len(filePairs) > 1 {
@@ -312,14 +321,21 @@ Examples:
 
 			fmt.Printf("  • Compression: %s\n", vaultConfig.Compression)
 
-			// Calculate and show space savings if compression is used
-			if vaultConfig.Compression != "none" {
-				// TODO: Calculate actual space savings during processing
-				// For now, show compression info
-				fmt.Printf("  • Compression: %s (space savings calculated during processing)\n", vaultConfig.Compression)
-			}
-
 			fmt.Printf("  • Chunking: %s (size: %s)\n", vaultConfig.Chunking.Strategy, vaultConfig.Chunking.ChunkSize)
+
+			// Show total space savings if compression is used
+			if vaultConfig.Compression != "none" && totalSpaceSavings.SpaceSaved > 0 {
+				totalSpaceSavedPct := float64(0)
+				if totalSpaceSavings.OriginalSize > 0 {
+					totalSpaceSavedPct = float64(totalSpaceSavings.SpaceSaved) / float64(totalSpaceSavings.OriginalSize) * 100
+				}
+				fmt.Printf("\n💾 Total Space Savings:\n")
+				fmt.Printf("  • Original size: %s\n", util.HumanReadableSize(totalSpaceSavings.OriginalSize))
+				fmt.Printf("  • Compressed size: %s\n", util.HumanReadableSize(totalSpaceSavings.CompressedSize))
+				fmt.Printf("  • Space saved: %s (%.1f%%)\n",
+					util.HumanReadableSize(totalSpaceSavings.SpaceSaved),
+					totalSpaceSavedPct)
+			}
 		}
 
 		// Return error only if all files failed
@@ -337,6 +353,35 @@ type FilePair struct {
 	Destination string
 }
 
+// calculateSpaceSavings calculates space savings for a file based on its chunks
+func calculateSpaceSavings(chunks []config.ChunkRef) SpaceSavings {
+	originalSize := int64(0)
+	compressedSize := int64(0)
+
+	for _, chunk := range chunks {
+		originalSize += chunk.Size
+		if chunk.CompressedSize > 0 {
+			compressedSize += chunk.CompressedSize
+		} else {
+			// If no compressed size is recorded, use original size
+			compressedSize += chunk.Size
+		}
+	}
+
+	spaceSaved := originalSize - compressedSize
+	var spaceSavedPct float64
+	if originalSize > 0 {
+		spaceSavedPct = float64(spaceSaved) / float64(originalSize) * 100
+	}
+
+	return SpaceSavings{
+		OriginalSize:   originalSize,
+		CompressedSize: compressedSize,
+		SpaceSaved:     spaceSaved,
+		SpaceSavedPct:  spaceSavedPct,
+	}
+}
+
 // parseFileArguments parses command line arguments into source-destination pairs
 // Supports two patterns:
 // 1. Paired: source1 dest1 source2 dest2 ... (even number of args)

internal/chunk/chunkFile.go

@@ -138,6 +138,7 @@ func processFileChunks(ctx context.Context, file *os.File, chunkSize int64, vaul
 		chunkRef := config.ChunkRef{
 			Hash:            chunkHash,
 			Size:            int64(bytesRead),
+			CompressedSize:  int64(len(compressedData)),
 			Index:           chunkCount - 1, // Convert 1-based chunkCount to 0-based index
 			Compressed:      vaultConfig.Compression != "none",
 			CompressionType: vaultConfig.Compression,

internal/config/vault.go

@@ -166,6 +166,7 @@ type ChunkRef struct {
 	Hash            string `yaml:"hash"`                       // Hash of chunk content (pre-encryption)
 	EncryptedHash   string `yaml:"encrypted_hash,omitempty"`   // Hash of encrypted chunk (filename in storage)
 	Size            int64  `yaml:"size"`                       // Size of plaintext chunk
+	CompressedSize  int64  `yaml:"compressed_size,omitempty"`  // Size after compression but before encryption
 	EncryptedSize   int64  `yaml:"encrypted_size,omitempty"`   // Size after encryption
 	Index           int    `yaml:"index"`                      // Position in the file
 	Deduplicated    bool   `yaml:"deduplicated,omitempty"`     // Whether this chunk was deduplicated