added proper webhook handling, github workflow generation, better ux and bug fixes

Author: skssmd

.goreleaser.yaml

@@ -26,12 +26,6 @@ archives:
       - goos: windows
         formats: [zip]
 
-changelog:
-  sort: asc
-  filters:
-    exclude:
-      - "^docs:"
-      - "^test:"
 
 checksum:
   name_template: "checksums.txt"
@@ -40,7 +34,17 @@ snapshot:
   version_template: "{{ .Tag }}-next"
 
 release:
-  
+  header: |
+    ## Major Feature Update with Graft  🚀
+    
+    This release introduces significant enhancements to Graft, moving from basic local-to-server deployments to a more robust CI/CD-driven workflow using GitHub Actions and our new `graft-hook` service.
+    
+    ### Key Highlights:
+    1. **Git Remote Modes**: Move away from direct local-to-server channels. Deployments now go through GitHub Workflows and CI/CD channels.
+    2. **Graft-Hook**: A new webhook service personalized specifically for Graft-based servers, maintaining a zero-config solution with proper security.
+    3. **Automated GitHub Workflows**: Graft now generates production-ready workflows automatically from your `graft-compose.yml` context.
+    4. **Enhanced Monitoring**: Easy CLI-based monitoring for `graft-hook`, including real-time build error logs.
+    5. **Bug Fixes & UX**: Numerous performance improvements and user experience refinements.
   footer: |
     ---
     Released by **skssmd** using [GoReleaser](https://github.com/goreleaser/goreleaser).

COMMANDS.md

@@ -440,6 +440,21 @@ graft logs frontend
 
 ---
 
+### `graft hook logs`
+Monitor the `graft-hook` service logs, including build errors and deployment events.
+
+```bash
+graft hook logs graft-hook
+```
+
+**Features:**
+- ✅ Real-time monitoring of webhook events
+- ✅ View detailed build and deployment errors
+- ✅ Perfect for debugging CI/CD pipeline failures
+- ✅ Press Ctrl+C to stop
+
+---
+
 ## Docker Compose Passthrough
 
 **Any command not listed above is automatically passed to `docker compose` on the remote server!**

cmd/graft/main.go

@@ -587,6 +587,7 @@ func runInit(args []string) {
 	}
 
 	// Graft-Hook detection and deployment for automated modes
+	var currentHookURL string
 	if deploymentMode == "git-images" || deploymentMode == "git-repo-serverbuild" || deploymentMode == "git-manual" {
 		if client != nil {
 			installHook := false
@@ -601,6 +602,10 @@ func runInit(args []string) {
 					installHook = true
 				} else {
 					fmt.Println("\n✅ graft-hook is already installed on the server.")
+					// Fetch existing hook URL from global registry if available
+					if srv, exists := gCfg.Servers[registryName]; exists {
+						currentHookURL = srv.GraftHookURL
+					}
 				}
 			}
 
@@ -643,6 +648,14 @@ networks:
 				os.Remove(tmpFile)
 				client.RunCommand("sudo docker compose -f /opt/graft/webhook/docker-compose.yml up -d", os.Stdout, os.Stderr)
 				fmt.Println("✅ graft-hook deployed.")
+				currentHookURL = fmt.Sprintf("https://%s", hookDomain)
+
+				// Save to global registry
+				if srv, exists := gCfg.Servers[registryName]; exists {
+					srv.GraftHookURL = currentHookURL
+					gCfg.Servers[registryName] = srv
+					config.SaveGlobalConfig(gCfg)
+				}
 			}
 		}
 	}
@@ -690,6 +703,7 @@ networks:
 		Name:           projName,
 		RemotePath:     fmt.Sprintf("/opt/graft/projects/%s", projName),
 		DeploymentMode: deploymentMode,
+		GraftHookURL:   currentHookURL,
 	}
 	if err := config.SaveProjectMetadata(meta); err != nil {
 		fmt.Printf("Warning: Could not save project metadata: %v\n", err)
@@ -947,7 +961,7 @@ func runSync(args []string) {
 		}
 
 		// Generate Workflows
-		if err := deploy.GenerateWorkflows(p, remoteURL, meta.DeploymentMode ); err != nil {
+		if err := deploy.GenerateWorkflows(p, remoteURL, meta.DeploymentMode, meta.GraftHookURL); err != nil {
 			fmt.Printf("Error generating workflows: %v\n", err)
 			return
 		}
@@ -957,11 +971,7 @@ func runSync(args []string) {
 		// Ask for compose generation and transfer
 
 
-			// Save project to ensure graft-compose.yml is local
-			if err := p.Save("."); err != nil {
-				fmt.Printf("Error saving project: %v\n", err)
-				return
-			}
+			
 
 			client, err := ssh.NewClient(cfg.Server.Host, cfg.Server.Port, cfg.Server.User, cfg.Server.KeyPath)
 			if err != nil {

internal/config/config.go

@@ -18,6 +18,7 @@ type ServerConfig struct {
 	Port         int    `json:"port"`
 	User         string `json:"user"`
 	KeyPath      string `json:"key_path"`
+	GraftHookURL string `json:"graft_hook_url,omitempty"`
 }
 
 type InfraConfig struct {
@@ -181,6 +182,7 @@ type ProjectMetadata struct {
 	RemotePath     string `json:"remote_path"`
 	Initialized    bool   `json:"initialized"`
 	DeploymentMode string `json:"deployment_mode,omitempty"` // "git-images", "git-repo-serverbuild", "git-manual", "direct-serverbuild", "direct-localbuild"
+	GraftHookURL   string `json:"graft_hook_url,omitempty"`
 }
 
 // SaveProjectMetadata saves project metadata to .graft/project.json and registers it globally

internal/deploy/compose_sync.go

@@ -139,13 +139,13 @@ func SyncComposeOnly(client *ssh.Client, p *Project, heave bool, stdout, stderr
 		if err := client.UploadFile("docker-compose.yml", remoteCompose); err != nil {
 			return fmt.Errorf("failed to upload docker-compose.yml: %v", err)
 		}
-		fmt.Fprintln(stdout, "✅ docker-compose.yml uploaded successfully!")
+		
 	}
 
-	if heave {
+	
 		fmt.Fprintf(stdout, "✅ %s file uploaded!\n", printstr)
-		return nil
-	}
+		
+	
 
 	if !heave {
 		// Restart services without rebuilding

internal/deploy/project.go

@@ -340,7 +340,7 @@ func EnsureGitignore(dir string) error {
 }
 
 // GenerateWorkflows creates .github/workflows directory and populates it with CI and Deploy templates
-func GenerateWorkflows(p *Project, remoteURL string, mode string) error {
+func GenerateWorkflows(p *Project, remoteURL string, mode string, webhook string) error {
 	fmt.Println("received workflow mode: ", mode)
 	workflowsDir := filepath.Join(".github", "workflows")
 	if err := os.MkdirAll(workflowsDir, 0755); err != nil {
@@ -389,10 +389,23 @@ func GenerateWorkflows(p *Project, remoteURL string, mode string) error {
 			}
 		}
 
+		// Prepare webhook URL
+		hookURL := webhook
+		if hookURL == "" {
+			hookURL = "https://graft-hook.example.com"
+		}
+		if !strings.HasSuffix(hookURL, "/webhook") && !strings.Contains(hookURL, "/webhook?") {
+			if strings.HasSuffix(hookURL, "/") {
+				hookURL += "webhook"
+			} else {
+				hookURL += "/webhook"
+			}
+		}
+
 		deployTemplate := `name: Deploy
 
 on:
-%s
+%%s
   release:
     types: [published]
   workflow_dispatch:
@@ -401,16 +414,16 @@ jobs:
   deploy:
     name: Deploy via Webhook
     runs-on: ubuntu-latest
-    %s
+    %%s
     environment: CI CD
     
     steps:
       - name: Send Webhook Request
         run: |
-          curl -X POST https://graft-hook.example.com/webhook \
+          curl -X POST %s \
             -H "Content-Type: application/json" \
             -d '{
-              "project": "%%s",
+              "project": "%%%%s",
               "repository": "${{ github.event.repository.name }}",
               "token": "${{ secrets.GITHUB_TOKEN }}",
               "user": "${{ github.actor }}",
@@ -419,8 +432,10 @@ jobs:
             }'
 `
 		deployPath := filepath.Join(workflowsDir, "deploy.yml")
-		deployContent := fmt.Sprintf(deployTemplate, triggers, condition, deployType)
-		// Now format the project name into the content
+		deployContent := fmt.Sprintf(deployTemplate, hookURL, deployType)
+		// Now format the triggers and condition into the content (%%s -> %s)
+		deployContent = fmt.Sprintf(deployContent, triggers, condition)
+		// Now format the project name into the content (%%%%s -> %s)
 		deployContent = fmt.Sprintf(deployContent, p.Name)
 
 		if err := os.WriteFile(deployPath, []byte(deployContent), 0644); err != nil {