Merge pull request #15 from KashifKhn/dev

Dev

Author: KashifKhn

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.25'
           cache: true
 
       - name: Run tests
@@ -38,7 +38,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.25'
           cache: true
 
       - name: Get version from tag
@@ -47,6 +47,7 @@ jobs:
 
       - name: Build binaries
         run: |
+          mkdir -p dist
           VERSION=${{ steps.version.outputs.VERSION }}
           LDFLAGS="-s -w -X main.version=${VERSION}"
           

docs/docs/commands/dev.md

@@ -27,12 +27,51 @@ The `dev` command provides a unified interface for common development tasks. It
 | `build` | `b`, `compile` | Build the project |
 | `test` | `t` | Run tests |
 | `clean` | - | Clean build artifacts |
+| `restart` | - | Trigger restart of running dev server |
 
 ---
 
 ## haft dev serve
 
-Start the Spring Boot application with DevTools for hot-reload.
+Start the Spring Boot application in **supervisor mode** with interactive restart support.
+
+### Interactive Mode (Default)
+
+When running in a terminal, `haft dev serve` runs as a supervisor that manages your Spring Boot process. You can use keyboard commands to control the server:
+
+| Key | Action |
+|-----|--------|
+| `r` | **Restart** - Compiles first, then restarts (keeps old server if compile fails) |
+| `q` | **Quit** - Gracefully stops the server and exits |
+| `c` | **Clear** - Clears the screen |
+| `h` | **Help** - Shows available commands |
+| `Ctrl+C` | Same as `q` - Graceful shutdown |
+
+```
+╭─────────────────────────────────────────╮
+│  Haft Dev Server                        │
+│  Press r to restart, q to quit          │
+│  Press h for more commands              │
+╰─────────────────────────────────────────╯
+
+INFO Starting application build-tool=Maven
+
+  .   ____          _            __ _ _
+ /\\ / ___'_ __ _ _(_)_ __  __ _ \ \ \ \
+...
+```
+
+### Restart Behavior
+
+The restart command (`r`) follows a **compile-first** strategy:
+
+1. Runs compilation (`mvn compile -DskipTests` or `gradle classes -x test`)
+2. **If compilation fails**: Shows error, keeps the old server running
+3. **If compilation succeeds**: 
+   - Gracefully stops the old server (SIGTERM → 2s wait → SIGKILL)
+   - Starts a new server instance
+
+This prevents the "dead server" situation where a syntax error leaves you with no running application.
 
 ### Usage
 
@@ -49,11 +88,12 @@ haft dev start [flags]   # Alias
 | `--profile` | `-p` | Spring profile to activate (e.g., dev, prod) |
 | `--debug` | `-d` | Enable remote debugging on port 5005 |
 | `--port` | - | Server port (overrides application config) |
+| `--no-interactive` | - | Disable interactive mode (for CI/scripts) |
 
 ### Examples
 
 ```bash
-# Start with default settings
+# Start with default settings (interactive mode)
 haft dev serve
 
 # Start with dev profile
@@ -67,14 +107,157 @@ haft dev serve --port 8081
 
 # Combine options
 haft dev serve -p dev -d --port 8081
+
+# Non-interactive mode (for CI/scripts)
+haft dev serve --no-interactive
 ```
 
 ### Build Tool Commands
 
-| Build Tool | Executed Command |
-|------------|------------------|
-| Maven | `mvn spring-boot:run` (or `./mvnw`) |
-| Gradle | `./gradlew bootRun` (or `gradle bootRun`) |
+| Build Tool | Run Command | Compile Command (for restart) |
+|------------|-------------|-------------------------------|
+| Maven | `mvn spring-boot:run -DskipTests` | `mvn compile -DskipTests -q` |
+| Gradle | `./gradlew bootRun -x test` | `./gradlew classes -x test -q` |
+
+---
+
+## Plugin Integration
+
+External tools (Neovim, VSCode, IntelliJ) can trigger a restart without keyboard interaction.
+
+### Option 1: Using `haft dev restart` Command
+
+The simplest way to trigger a restart from any tool:
+
+```bash
+haft dev restart
+```
+
+This command creates the trigger file that signals the running dev server to restart.
+
+### Option 2: Creating the Trigger File Directly
+
+When `haft dev serve` is running, it watches for the creation/modification of:
+
+```
+.haft/restart
+```
+
+To trigger a restart manually:
+
+```bash
+touch .haft/restart
+```
+
+### Neovim Integration
+
+Add to your `init.lua`:
+
+```lua
+-- Auto-restart haft on save (using shell command)
+vim.api.nvim_create_autocmd("BufWritePost", {
+  pattern = { "*.java", "*.kt" },
+  callback = function()
+    vim.fn.jobstart("haft dev restart", { detach = true })
+  end,
+})
+
+-- Manual restart keybinding
+vim.keymap.set("n", "<leader>hr", function()
+  vim.fn.jobstart("haft dev restart", { detach = true })
+  print("Haft restart triggered")
+end, { desc = "Trigger Haft restart" })
+```
+
+Alternative (direct file creation):
+
+```lua
+vim.keymap.set("n", "<leader>hr", function()
+  local trigger = vim.fn.getcwd() .. "/.haft/restart"
+  vim.fn.writefile({}, trigger)
+  print("Haft restart triggered")
+end, { desc = "Trigger Haft restart" })
+```
+
+### VS Code Integration
+
+Add to `.vscode/tasks.json`:
+
+```json
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Haft Restart",
+      "type": "shell",
+      "command": "haft dev restart",
+      "problemMatcher": [],
+      "presentation": {
+        "reveal": "silent"
+      }
+    }
+  ]
+}
+```
+
+Add keybinding in `keybindings.json`:
+
+```json
+{
+  "key": "ctrl+shift+r",
+  "command": "workbench.action.tasks.runTask",
+  "args": "Haft Restart"
+}
+```
+
+### IntelliJ IDEA Integration
+
+1. Go to **Settings → Tools → External Tools**
+2. Add new tool:
+   - **Name**: Haft Restart
+   - **Program**: `haft`
+   - **Arguments**: `dev restart`
+   - **Working directory**: `$ProjectFileDir$`
+3. Assign a keyboard shortcut in **Settings → Keymap**
+
+---
+
+## haft dev restart
+
+Trigger a restart of the running dev server from the command line.
+
+### Usage
+
+```bash
+haft dev restart
+```
+
+### Description
+
+This command creates a trigger file that signals the running dev server (`haft dev serve`) to restart. It's useful for:
+
+- Shell scripts that need to trigger restarts
+- Editor plugins that prefer calling CLI commands
+- CI/CD pipelines for hot-reload testing
+- Any tool that can execute shell commands
+
+### Examples
+
+```bash
+# Trigger restart of running dev server
+haft dev restart
+
+# Use in a shell script
+#!/bin/bash
+# Edit some files...
+haft dev restart
+
+# Use with file watchers
+fswatch -o src/ | xargs -n1 -I{} haft dev restart
+
+# Use with entr (run on file changes)
+find src -name "*.java" | entr haft dev restart
+```
 
 ---
 
@@ -224,9 +407,12 @@ This ensures consistent builds across different environments.
 ## Typical Workflow
 
 ```bash
-# Start development server
+# Start development server (interactive mode)
 haft dev serve -p dev
 
+# Press 'r' to restart after making changes
+# Or trigger restart from your editor
+
 # In another terminal, run tests
 haft dev test
 

go.mod

@@ -47,6 +47,7 @@ require (
 	golang.org/x/crypto v0.43.0 // indirect
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
 	golang.org/x/sync v0.17.0 // indirect
-	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/sys v0.39.0 // indirect
+	golang.org/x/term v0.38.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

go.sum

@@ -93,6 +93,10 @@ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
 golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
+golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
+golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
 golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
 golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

internal/cli/dev/dev.go

@@ -23,13 +23,17 @@ execute the appropriate underlying commands.`,
   haft dev test
 
   # Clean build artifacts
-  haft dev clean`,
+  haft dev clean
+
+  # Trigger restart (for use with haft dev serve)
+  haft dev restart`,
 	}
 
 	cmd.AddCommand(newServeCommand())
 	cmd.AddCommand(newBuildCommand())
 	cmd.AddCommand(newTestCommand())
 	cmd.AddCommand(newCleanCommand())
+	cmd.AddCommand(newRestartCommand())
 
 	return cmd
 }