diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..7f5bcec
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,28 @@
+name: Tests
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+
+      - name: Build binaries
+        run: |
+          go build -o /tmp/taskmasterd cmd/server/main.go
+          go build -o /tmp/taskmasterctl cmd/client/main.go
+
+      - name: Prepare test directory
+        run: mkdir -p /tmp/test_taskmaster
+
+      - name: Run tests
+        run: bash tests/full_test.sh
diff --git a/cmd/client/main.go b/cmd/client/main.go
index 5963bf0..3a08618 100644
--- a/cmd/client/main.go
+++ b/cmd/client/main.go
@@ -69,7 +69,7 @@ func main() {
 
 		res := client.Read(server.DEL)
 		if res.Err != nil {
-			utils.Errorf(err.Error())
+			utils.Errorf(res.Err.Error())
 		} else if res.HasContent() {
 			utils.Logf(res.Data)
 		}
diff --git a/compose.yaml b/compose.yaml
index bdfa554..0bed521 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -7,3 +7,5 @@ services:
       dockerfile: Dockerfile
     ports:
       - "8080:8080"
+    volumes:
+      - /dev/log:/dev/log
diff --git a/internal/job/job.go b/internal/job/job.go
index 402111c..09ab39f 100644
--- a/internal/job/job.go
+++ b/internal/job/job.go
@@ -36,14 +36,15 @@ type Job struct {
 	StderrWriter  *utils.DynamicWriter
 	NumProcs      int
 	pgid          int
-	mustart       sync.Mutex
+	startReady    chan struct{}
+	startOnce     sync.Once
 	mustop        sync.Mutex
 }
 
 func NewJob(name string, prog *config.Program) *Job {
 	has_zero := false
 	exit_codes := prog.ExitCodes
-	for exit := range exit_codes {
+	for _, exit := range exit_codes {
 		if exit == 0 {
 			has_zero = true
 			break
@@ -64,6 +65,9 @@ func NewJob(name string, prog *config.Program) *Job {
 		running[i] = false
 	}
 
+	ch := make(chan struct{})
+	close(ch)
+
 	return &Job{
 		Name:          name,
 		Command:       prog.Command,
@@ -86,69 +90,72 @@ func NewJob(name string, prog *config.Program) *Job {
 		NumProcs:      prog.NumProcs,
 		cmds:          make([]*exec.Cmd, prog.NumProcs),
 		pgid:          0,
+		startReady:    ch,
 	}
 }
 
+func (j *Job) closeStartReady() {
+	j.startOnce.Do(func() {
+		close(j.startReady)
+	})
+}
+
 type WorkerFn = func(j *Job, wg *sync.WaitGroup, _done chan bool) error
 
 func (j *Job) Start(wg *sync.WaitGroup, _done chan bool) error {
 	defer func() { _done <- true }()
 
-	j.mustart.Lock()
-	done := make(chan bool, j.NumProcs)
-	defer close(done)
+	j.mustop.Lock()
+	defer j.mustop.Unlock()
+
+	startReady := make(chan struct{})
+	j.startReady = startReady
+	j.startOnce = sync.Once{}
 
 	for i := range j.NumProcs {
 		if j.Is(STOPPING, i) || j._running[i] {
-			done <- true
 			continue
 		}
 
 		j._running[i] = true
 
 		if j.HasPgid() {
-			go j.startJobWorker(wg, i, done, j.pgid)
+			go j.startJobWorker(wg, i, j.pgid)
 			continue
 		}
 
-		go j.startJobWorker(wg, i, done, 0)
-		<-done
-		done <- true
+		go j.startJobWorker(wg, i, 0)
+		<-startReady
 		if !j.Is(RUNNING, 0) {
 			return fmt.Errorf("process could not be running")
 		}
 		j.pgid = j.cmds[i].Process.Pid
 	}
 
-	for range j.NumProcs {
-		<-done
-	}
-	j.mustart.Unlock()
 	return nil
 }
 
-func (j *Job) startJobWorker(wg *sync.WaitGroup, id int, done chan bool, pgid int) {
+func (j *Job) startJobWorker(wg *sync.WaitGroup, id int, pgid int) {
 	wg.Add(1)
 	defer wg.Done()
 
-	cmd_list := []string{
-		"sh",
-		"-c",
-		fmt.Sprintf("umask %v && %v", j.Umask, j.Command),
-	}
-
-	cmd := exec.Command(cmd_list[0], cmd_list[1:]...)
-	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true, Pgid: pgid}
-
-	j.cmds[id] = cmd
-
 	retries := 0
 	for {
+		usePgid := pgid
+		if j.cmds[id] != nil && j.cmds[id].Process != nil {
+			usePgid = 0
+		}
+
+		cmd := exec.Command("sh", "-c", fmt.Sprintf("umask %v && %v", j.Umask, j.Command))
+		cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true, Pgid: usePgid}
+		j.cmds[id] = cmd
+
 		j.SetState(STARTING, id)
 		err := j.tryStart(id)
 		if err != nil {
 			logger.Error(err)
 			j.SetState(BACKOFF, id)
+			j.closeStartReady()
 			retries++
 			if j.StartRetries == retries {
 				break
@@ -159,7 +166,7 @@ func (j *Job) startJobWorker(wg *sync.WaitGroup, id int, done chan bool, pgid in
 
 		cur_ts := int(time.Now().Unix())
 		j.SetState(RUNNING, id)
-		done <- true
+		j.closeStartReady()
 		state, _ := j.cmds[id].Process.Wait()
 		j.cmds[id].ProcessState = state
 
@@ -181,11 +188,16 @@ func (j *Job) startJobWorker(wg *sync.WaitGroup, id int, done chan bool, pgid in
 			break
 		}
 		if j.Autorestart == AUTORESTART_UNEXPECTED {
-			for exit := range j.ExitCodes {
+			expected := false
+			for _, exit := range j.ExitCodes {
 				if exit == j.cmds[id].ProcessState.ExitCode() {
+					expected = true
 					break
 				}
 			}
+			if expected {
+				break
+			}
 		}
 	}
 	if j.Is(BACKOFF, id) {
@@ -245,25 +257,30 @@ func (j *Job) Restart(wg *sync.WaitGroup, _done chan bool) error {
 
 func (j *Job) Stop(wg *sync.WaitGroup, _done chan bool) error {
 	defer func() { _done <- true }()
+	<-j.startReady
 	j.mustop.Lock()
+	defer j.mustop.Unlock()
 
 	if j.HasPgid() {
 		for i := range j.NumProcs {
 			j.SetState(STOPPING, i)
 		}
-		cur := time.Now().Unix()
-		err := syscall.Kill(-j.pgid, syscall.SIGKILL)
+
+		err := syscall.Kill(-j.pgid, j.StopSignal)
 		if err != nil {
 			return err
 		}
 
+		cur := time.Now().Unix()
 		for time.Now().Unix()-cur < int64(j.StopWaitSecs) && j.IsRunning() {
 			time.Sleep(100 * time.Millisecond)
 		}
 
-		if j.HasPgid() {
-			err = syscall.Kill(-j.pgid, j.StopSignal)
-			return err
+		if j.HasPgid() && j.IsRunning() {
+			err = syscall.Kill(-j.pgid, syscall.SIGKILL)
+			if err != nil {
+				return err
+			}
 		}
 
 		for j.IsRunning() {
@@ -272,7 +289,6 @@ func (j *Job) Stop(wg *sync.WaitGroup, _done chan bool) error {
 	}
 
 	j.SetPgid(0)
-	j.mustop.Unlock()
 	return nil
 }
 
diff --git a/internal/logger/logger.go b/internal/logger/logger.go
index 9962fe3..7025b28 100644
--- a/internal/logger/logger.go
+++ b/internal/logger/logger.go
@@ -6,8 +6,6 @@ import (
 	"os"
 	"sync"
 	"time"
-
-	"github.com/Archer-01/taskmaster/internal/utils"
 )
 
 type LogLevel uint8
@@ -46,7 +44,11 @@ func Init() {
 	syslogger, err := syslog.New(syslog.LOG_INFO, "taskmaster")
 
 	if err != nil {
-		utils.Errorf(err.Error())
+		fmt.Fprintln(os.Stderr, "ERROR: syslog unavailable. To fix this, configure a syslog log driver in Docker:")
+		fmt.Fprintln(os.Stderr, "  compose.yaml:  logging:\n                  driver: syslog\n                  options:\n                    syslog-address: \"unix:///dev/log\"\n                    tag: \"taskmaster\"")
+		fmt.Fprintln(os.Stderr, "  or run with:    docker run --log-driver=syslog --log-opt syslog-address=unix:///dev/log ...")
+		fmt.Fprintln(os.Stderr, "  or set as default in /etc/docker/daemon.json: { \"log-driver\": \"syslog\" }")
+		fmt.Fprintln(os.Stderr, "Original error:", err)
 		os.Exit(1)
 	}
 
diff --git a/internal/manager/manager.go b/internal/manager/manager.go
index bd5afb9..d7c0543 100644
--- a/internal/manager/manager.go
+++ b/internal/manager/manager.go
@@ -161,10 +161,14 @@ func (m *JobManager) Run() {
 			action.Done <- true
 			return
 
-		case RELOAD:
-			logger.Warn("Reloading...")
-			m.reload()
+	case RELOAD:
+		logger.Warn("Reloading...")
+		if err := m.reload(); err != nil {
+			action.Data <- err.Error()
+			action.Done <- false
+		} else {
 			action.Done <- true
+		}
 
 		case START:
 			m.setJobs("STARTING", (*job.Job).Start, action)
diff --git a/tests/ar_config.toml b/tests/ar_config.toml
new file mode 100644
index 0000000..5018c02
--- /dev/null
+++ b/tests/ar_config.toml
@@ -0,0 +1,7 @@
+[program.shortlived]
+command = "sleep 0.5"
+autostart = true
+autorestart = "true"
+numprocs = 1
+startsecs = 0
+startretries = 5
diff --git a/tests/bug_tests.sh b/tests/bug_tests.sh
new file mode 100644
index 0000000..08ba5cf
--- /dev/null
+++ b/tests/bug_tests.sh
@@ -0,0 +1,369 @@
+#!/bin/bash
+# Focused bug verification tests (no strace)
+
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m'
+PASS=0
+FAIL=0
+
+pass() { echo -e "${GREEN}PASS${NC}: $1"; PASS=$((PASS+1)); }
+fail() { echo -e "${RED}FAIL${NC}: $1"; FAIL=$((FAIL+1)); }
+bug() { echo -e "${YELLOW}BUG${NC}: $1"; FAIL=$((FAIL+1)); }
+
+send_cmd() {
+    echo -ne "$1\r" | nc -U /tmp/test_taskmaster.sock -w 3 2>/dev/null
+}
+
+cleanup() {
+    kill -9 $(pgrep -d, taskmasterd) 2>/dev/null || true
+    kill -9 $(pgrep -d, -f "sleep 3600") 2>/dev/null || true
+    kill -9 $(pgrep -d, -f "sleep 0.5") 2>/dev/null || true
+    kill -9 $(pgrep -d, -f "exit ") 2>/dev/null || true
+    rm -f /tmp/test_taskmaster.sock
+    rm -f /tmp/test_taskmaster/*.log
+}
+
+# ========================
+# TEST A: autorestart=true - process should keep restarting
+# ========================
+echo ""
+echo "=== TEST A: autorestart=true ==="
+cleanup
+sleep 1
+
+cat > /tmp/test_taskmaster/setup.toml << 'SETUP'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/ar_config.toml"
+SETUP
+
+cat > /tmp/test_taskmaster/ar_config.toml << 'CFG'
+[program.shortlived]
+command = "sleep 0.5"
+autostart = true
+autorestart = "true"
+numprocs = 1
+startsecs = 0
+startretries = 5
+CFG
+
+cd /tmp/test_taskmaster
+/tmp/taskmasterd > /tmp/test_taskmaster/server_a.log 2>&1 &
+sleep 4
+
+RESULT=$(send_cmd "status shortlived")
+echo "  Status: '$RESULT'"
+
+if echo "$RESULT" | grep -q "FATAL"; then
+    bug "autorestart=true: process went FATAL instead of restarting"
+elif echo "$RESULT" | grep -q "BACKOFF"; then
+    bug "autorestart=true: process stuck in BACKOFF"
+elif echo "$RESULT" | grep -q "RUNNING"; then
+    pass "autorestart=true: process running (restart works)"
+elif echo "$RESULT" | grep -q "STARTING"; then
+    pass "autorestart=true: process starting (restart works)"
+elif echo "$RESULT" | grep -q "EXITED"; then
+    bug "autorestart=true: process EXITED but not restarted"
+else
+    bug "autorestart=true: unexpected state: $RESULT"
+fi
+
+# ========================
+# TEST B: autorestart=unexpected with expected exit code -> should NOT restart
+# ========================
+echo ""
+echo "=== TEST B: autorestart=unexpected with expected exit code ==="
+cleanup
+sleep 1
+
+cat > /tmp/test_taskmaster/setup.toml << 'SETUP'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/unexpected_config.toml"
+SETUP
+
+cat > /tmp/test_taskmaster/unexpected_config.toml << 'CFG'
+[program.exit0]
+command = "exit 0"
+autostart = true
+autorestart = "unexpected"
+numprocs = 1
+startsecs = 0
+startretries = 3
+exitcodes = [0]
+CFG
+
+cd /tmp/test_taskmaster
+/tmp/taskmasterd > /tmp/test_taskmaster/server_b.log 2>&1 &
+sleep 4
+
+RESULT=$(send_cmd "status exit0")
+echo "  Status (exit 0, expected=[0]): '$RESULT'"
+if echo "$RESULT" | grep -q "EXITED"; then
+    pass "autorestart=unexpected: expected exit -> EXITED (correct, no restart)"
+elif echo "$RESULT" | grep -q "FATAL"; then
+    fail "autorestart=unexpected: expected exit -> FATAL (incorrect)"
+elif echo "$RESULT" | grep -q "RUNNING\|STARTING"; then
+    bug "autorestart=unexpected: expected exit -> still running (should have stopped)"
+else
+    bug "autorestart=unexpected: unexpected state: $RESULT"
+fi
+
+# ========================
+# TEST C: autorestart=unexpected with UNEXPECTED exit code -> should restart
+# ========================
+echo ""
+echo "=== TEST C: autorestart=unexpected with unexpected exit code ==="
+cleanup
+sleep 1
+
+cat > /tmp/test_taskmaster/setup.toml << 'SETUP'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/unexpected_config2.toml"
+SETUP
+
+cat > /tmp/test_taskmaster/unexpected_config2.toml << 'CFG'
+[program.exitbad]
+command = "exit 42"
+autostart = true
+autorestart = "unexpected"
+numprocs = 1
+startsecs = 0
+startretries = 3
+exitcodes = [0]
+CFG
+
+cd /tmp/test_taskmaster
+/tmp/taskmasterd > /tmp/test_taskmaster/server_c.log 2>&1 &
+sleep 4
+
+RESULT=$(send_cmd "status exitbad")
+echo "  Status (exit 42, expected=[0]): '$RESULT'"
+if echo "$RESULT" | grep -q "RUNNING\|STARTING"; then
+    pass "autorestart=unexpected: unexpected exit -> restarted (correct)"
+elif echo "$RESULT" | grep -q "FATAL"; then
+    bug "autorestart=unexpected: unexpected exit -> should restart but got FATAL"
+elif echo "$RESULT" | grep -q "BACKOFF"; then
+    bug "autorestart=unexpected: unexpected exit -> stuck in BACKOFF"
+elif echo "$RESULT" | grep -q "EXITED"; then
+    bug "autorestart=unexpected: unexpected exit -> should restart but stayed EXITED"
+else
+    bug "autorestart=unexpected: unexpected exit -> unexpected state: $RESULT"
+fi
+
+# ========================
+# TEST D: stop sends SIGKILL immediately instead of graceful signal first
+# ========================
+echo ""
+echo "=== TEST D: Stop logic - SIGKILL vs graceful signal ordering ==="
+cleanup
+sleep 1
+
+cat > /tmp/test_taskmaster/setup.toml << 'SETUP'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/stop_config.toml"
+SETUP
+
+cat > /tmp/test_taskmaster/stop_config.toml << 'CFG'
+[program.termtest]
+command = "sleep 3600"
+autostart = true
+autorestart = "false"
+numprocs = 1
+startsecs = 0
+stopsignal = "TERM"
+stopwaitsecs = 5
+CFG
+
+cd /tmp/test_taskmaster
+/tmp/taskmasterd > /tmp/test_taskmaster/server_d.log 2>&1 &
+sleep 2
+
+PROC_PID=$(pgrep -f "sleep 3600" | head -1)
+echo "  Process PID: $PROC_PID"
+
+if [ -n "$PROC_PID" ]; then
+    # Record start time
+    START=$(date +%s%N)
+    send_cmd "stop termtest" > /dev/null
+    sleep 1
+    ALIVE=$(kill -0 $PROC_PID 2>/dev/null && echo "yes" || echo "no")
+    END=$(date +%s%N)
+    ELAPSED_MS=$(( (END - START) / 1000000 ))
+    echo "  Process alive after 1s: $ALIVE (${ELAPSED_MS}ms elapsed)"
+
+    if [ "$ALIVE" = "yes" ]; then
+        # Process is still alive after 1s - this is consistent with
+        # either: (a) SIGKILL was sent but process somehow survived (impossible),
+        # or (b) SIGTERM was sent and process is handling it gracefully
+        echo "  Process still alive after stop command - checking code..."
+
+        # The key test: code sends SIGKILL first, then stop signal
+        # If SIGKILL was sent first, process would die instantly
+        # If stop signal was sent first, process might survive briefly
+        pass "Process survived 1s after stop (good - graceful signal before kill)"
+    else
+        # Process died within 1s - SIGKILL was sent immediately (inverted logic)
+        bug "Process died instantly after stop (SIGKILL sent first, should send graceful signal first, then SIGKILL after stopwaitsecs)"
+    fi
+fi
+
+# ========================
+# TEST E: Kill supervised process -> should auto-restart
+# ========================
+echo ""
+echo "=== TEST E: Kill supervised process -> auto-restart ==="
+cleanup
+sleep 1
+
+cat > /tmp/test_taskmaster/setup.toml << 'SETUP'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/kill_config.toml"
+SETUP
+
+cat > /tmp/test_taskmaster/kill_config.toml << 'CFG'
+[program.pingtest]
+command = "sleep 3600"
+autostart = true
+autorestart = "true"
+numprocs = 1
+startsecs = 0
+startretries = 3
+CFG
+
+cd /tmp/test_taskmaster
+/tmp/taskmasterd > /tmp/test_taskmaster/server_e.log 2>&1 &
+sleep 2
+
+PROC_PID=$(pgrep -f "sleep 3600" | head -1)
+echo "  Original PID: $PROC_PID"
+
+RESULT=$(send_cmd "status pingtest")
+echo "  Status before kill: '$RESULT'"
+
+if [ -n "$PROC_PID" ]; then
+    kill -9 $PROC_PID 2>/dev/null
+    sleep 4
+
+    NEW_PID=$(pgrep -f "sleep 3600" | head -1)
+    RESULT=$(send_cmd "status pingtest")
+    echo "  Status after kill: '$RESULT'"
+    echo "  New PID: $NEW_PID"
+
+    if echo "$RESULT" | grep -q "RUNNING"; then
+        if [ -n "$NEW_PID" ] && [ "$NEW_PID" != "$PROC_PID" ]; then
+            pass "Killed process was restarted with new PID ($NEW_PID)"
+        else
+            pass "Killed process was restarted (same PID or new PID)"
+        fi
+    elif echo "$RESULT" | grep -q "FATAL"; then
+        bug "Killed process went FATAL instead of restarting"
+    else
+        bug "Killed process not restarted, status: $RESULT"
+    fi
+fi
+
+# ========================
+# TEST F: startretries -> FATAL after max retries
+# ========================
+echo ""
+echo "=== TEST F: startretries exhaustion -> FATAL ==="
+cleanup
+sleep 1
+
+cat > /tmp/test_taskmaster/setup.toml << 'SETUP'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/retry_config.toml"
+SETUP
+
+cat > /tmp/test_taskmaster/retry_config.toml << 'CFG'
+[program.failstart]
+command = "exit 1"
+autostart = true
+autorestart = "false"
+numprocs = 1
+startsecs = 0
+startretries = 2
+exitcodes = [0]
+CFG
+
+cd /tmp/test_taskmaster
+/tmp/taskmasterd > /tmp/test_taskmaster/server_f.log 2>&1 &
+sleep 15
+
+RESULT=$(send_cmd "status failstart")
+echo "  Status: '$RESULT'"
+if echo "$RESULT" | grep -q "FATAL"; then
+    pass "startretries exhausted -> FATAL state"
+else
+    fail "expected FATAL, got: $RESULT"
+fi
+
+# ========================
+# TEST G: stopwaitsecs - stop should respect the timeout
+# ========================
+echo ""
+echo "=== TEST G: stopwaitsecs ==="
+cleanup
+sleep 1
+
+cat > /tmp/test_taskmaster/setup.toml << 'SETUP'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/stopwait_config.toml"
+SETUP
+
+cat > /tmp/test_taskmaster/stopwait_config.toml << 'CFG'
+[program.slowstop]
+command = "trap '' TERM; sleep 3600"
+autostart = true
+autorestart = "false"
+numprocs = 1
+startsecs = 0
+stopsignal = "TERM"
+stopwaitsecs = 2
+CFG
+
+cd /tmp/test_taskmaster
+/tmp/taskmasterd > /tmp/test_taskmaster/server_g.log 2>&1 &
+sleep 2
+
+PROC_PID=$(pgrep -f "sleep 3600" | head -1)
+echo "  Process PID: $PROC_PID (trap ignores SIGTERM)"
+
+if [ -n "$PROC_PID" ]; then
+    START=$(date +%s)
+    send_cmd "stop slowstop" > /dev/null
+    sleep 1
+    ALIVE1=$(kill -0 $PROC_PID 2>/dev/null && echo "yes" || echo "no")
+    echo "  Alive after 1s: $ALIVE1"
+
+    sleep 3
+    ALIVE2=$(kill -0 $PROC_PID 2>/dev/null && echo "yes" || echo "no")
+    END=$(date +%s)
+    ELAPSED=$((END - START))
+    echo "  Alive after ${ELAPSED}s: $ALIVE2"
+
+    RESULT=$(send_cmd "status slowstop")
+    echo "  Status: '$RESULT'"
+
+    if echo "$RESULT" | grep -q "STOPPED"; then
+        pass "Process stopped after stopwaitsecs (SIGKILL fallback works)"
+    else
+        fail "Process not stopped after stopwaitsecs: $RESULT"
+    fi
+fi
+
+# ========================
+# SUMMARY
+# ========================
+echo ""
+echo "=============================="
+echo -e "RESULTS: ${GREEN}$PASS passed${NC}, ${RED}$FAIL failed${NC}"
+echo "=============================="
diff --git a/tests/c1_config.toml b/tests/c1_config.toml
new file mode 100644
index 0000000..a04bf15
--- /dev/null
+++ b/tests/c1_config.toml
@@ -0,0 +1,6 @@
+[program.shortlived]
+command = "sleep 0.5"
+autostart = true
+autorestart = "true"
+startsecs = 0
+startretries = 5
diff --git a/tests/c2_config.toml b/tests/c2_config.toml
new file mode 100644
index 0000000..53933f4
--- /dev/null
+++ b/tests/c2_config.toml
@@ -0,0 +1,6 @@
+[program.fastexit]
+command = "exit 0"
+autostart = true
+autorestart = "false"
+startsecs = 1
+startretries = 3
diff --git a/tests/c3a_config.toml b/tests/c3a_config.toml
new file mode 100644
index 0000000..49e6f17
--- /dev/null
+++ b/tests/c3a_config.toml
@@ -0,0 +1,7 @@
+[program.exitok]
+command = "exit 0"
+autostart = true
+autorestart = "unexpected"
+startsecs = 0
+exitcodes = [0]
+startretries = 3
diff --git a/tests/c3b_config.toml b/tests/c3b_config.toml
new file mode 100644
index 0000000..22b547c
--- /dev/null
+++ b/tests/c3b_config.toml
@@ -0,0 +1,7 @@
+[program.exitbad]
+command = "exit 42"
+autostart = true
+autorestart = "unexpected"
+startsecs = 0
+exitcodes = [0]
+startretries = 2
diff --git a/tests/cfg_config.toml b/tests/cfg_config.toml
new file mode 100644
index 0000000..af8a96b
--- /dev/null
+++ b/tests/cfg_config.toml
@@ -0,0 +1,34 @@
+[program.numtest]
+command = "sleep 3600"
+autostart = true
+autorestart = "false"
+numprocs = 3
+startsecs = 0
+[program.envtest]
+command = "env"
+autostart = false
+autorestart = "false"
+environment = ["MY_VAR=hello42", "ANOTHER=world"]
+stdout_logfile = "/tmp/test_taskmaster/env.log"
+startsecs = 0
+[program.dirtest]
+command = "pwd"
+autostart = false
+autorestart = "false"
+directory = "/tmp"
+stdout_logfile = "/tmp/test_taskmaster/dir.log"
+startsecs = 0
+[program.umasktest]
+command = "umask"
+autostart = false
+autorestart = "false"
+umask = "0077"
+stdout_logfile = "/tmp/test_taskmaster/umask.log"
+startsecs = 0
+[program.logtest]
+command = "sleep 3600"
+autostart = false
+autorestart = "false"
+stdout_logfile = "/tmp/test_taskmaster/stdout.log"
+stderr_logfile = "/tmp/test_taskmaster/stderr.log"
+startsecs = 0
diff --git a/tests/config.toml b/tests/config.toml
new file mode 100644
index 0000000..36c249c
--- /dev/null
+++ b/tests/config.toml
@@ -0,0 +1,62 @@
+[program.stayalive]
+command = "sleep 3600"
+autostart = true
+autorestart = "true"
+numprocs = 1
+stdout_logfile = "/tmp/test_taskmaster/stayalive.log"
+stderr_logfile = "/tmp/test_taskmaster/stayalive_err.log"
+
+[program.fastexit]
+command = "exit 0"
+autostart = false
+autorestart = "false"
+exitcodes = [0]
+
+[program.error_exit]
+command = "exit 1"
+autostart = false
+autorestart = "true"
+exitcodes = [0]
+startretries = 3
+startsecs = 1
+
+[program.multihello]
+command = "echo hello"
+autostart = false
+autorestart = "false"
+numprocs = 3
+stdout_logfile = "/tmp/test_taskmaster/multi.log"
+startsecs = 0
+
+[program.envcheck]
+command = "env"
+autostart = false
+autorestart = "false"
+environment = ["MY_VAR=hello42", "ANOTHER_VAR=world"]
+stdout_logfile = "/tmp/test_taskmaster/env.log"
+startsecs = 0
+
+[program.dircheck]
+command = "pwd"
+autostart = false
+autorestart = "false"
+directory = "/tmp"
+stdout_logfile = "/tmp/test_taskmaster/dir.log"
+startsecs = 0
+
+[program.umaskcheck]
+command = "umask"
+autostart = false
+autorestart = "false"
+umask = "0077"
+stdout_logfile = "/tmp/test_taskmaster/umask.log"
+startsecs = 0
+
+[program.graceful]
+command = "sleep 3600"
+autostart = false
+autorestart = "false"
+stopsignal = "TERM"
+stopwaitsecs = 3
+numprocs = 1
+startsecs = 0
diff --git a/tests/definitive_tests.sh b/tests/definitive_tests.sh
new file mode 100644
index 0000000..b834c79
--- /dev/null
+++ b/tests/definitive_tests.sh
@@ -0,0 +1,524 @@
+#!/bin/bash
+# Definitive taskmaster test suite
+# Tests each feature against supervisor documentation
+
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m'
+PASS=0
+FAIL=0
+
+pass() { echo -e "  ${GREEN}PASS${NC}: $1"; PASS=$((PASS+1)); }
+fail() { echo -e "  ${RED}FAIL${NC}: $1"; FAIL=$((FAIL+1)); }
+
+send_cmd() {
+    echo -ne "$1\r" | nc -U /tmp/test_taskmaster.sock -w 3 2>/dev/null
+}
+
+cleanup() {
+    kill -9 $(pgrep -d, taskmasterd) 2>/dev/null || true
+    kill -9 $(pgrep -d, -f "sleep 3600") 2>/dev/null || true
+    kill -9 $(pgrep -d, -f "sleep 0.5") 2>/dev/null || true
+    rm -f /tmp/test_taskmaster.sock
+    rm -f /tmp/test_taskmaster/*.log
+    sleep 1
+}
+
+start_server() {
+    cleanup
+    cd /tmp/test_taskmaster
+    /tmp/taskmasterd > /tmp/test_taskmaster/server.log 2>&1 &
+    sleep 2
+    if ! kill -0 $(pgrep -d, taskmasterd) 2>/dev/null; then
+        echo "FATAL: Server failed to start"
+        cat /tmp/test_taskmaster/server.log
+        exit 1
+    fi
+}
+
+stop_server() {
+    kill -9 $(pgrep -d, taskmasterd) 2>/dev/null || true
+    sleep 1
+}
+
+# ================================================
+echo "=== SECTION A: Control Shell ==="
+# ================================================
+
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/shell_config.toml"
+EOF
+
+cat > /tmp/test_taskmaster/shell_config.toml << 'EOF'
+[program.procname]
+command = "sleep 3600"
+autostart = false
+autorestart = "false"
+EOF
+
+start_server
+
+R=$(send_cmd "status procname")
+echo "$R" | grep -q "STOPPED" && pass "CS-1: status returns STOPPED for non-started program" || fail "CS-1: got '$R'"
+
+R=$(send_cmd "start procname")
+sleep 2
+R=$(send_cmd "status procname")
+echo "$R" | grep -q "RUNNING" && pass "CS-2a: start works → RUNNING" || fail "CS-2a: got '$R'"
+
+R=$(send_cmd "stop procname")
+sleep 2
+R=$(send_cmd "status procname")
+echo "$R" | grep -q "STOPPED" && pass "CS-2b: stop works → STOPPED" || fail "CS-2b: got '$R'"
+
+send_cmd "start procname" > /dev/null
+sleep 2
+send_cmd "restart procname" > /dev/null
+sleep 3
+R=$(send_cmd "status procname")
+echo "$R" | grep -q "RUNNING" && pass "CS-2c: restart works → RUNNING" || fail "CS-2c: got '$R'"
+
+R=$(send_cmd "status all")
+echo "$R" | grep -q "procname" && pass "CS-3: status all shows programs" || fail "CS-3: got '$R'"
+
+R=$(send_cmd "bogus")
+echo "$R" | grep -qi "unknown\|error" && pass "CS-6: invalid command returns error" || fail "CS-6: got '$R'"
+
+R=$(send_cmd "start nonexistent")
+echo "$R" | grep -qi "not recognized\|error" && pass "CS-7: non-existent job returns error" || fail "CS-7: got '$R'"
+
+R=$(send_cmd "reload")
+[ -z "$R" ] && pass "CS-5: reload accepted (empty response)" || fail "CS-5: got '$R'"
+
+stop_server
+
+# ================================================
+echo ""
+echo "=== SECTION B: Configuration Options ==="
+# ================================================
+
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/cfg_config.toml"
+EOF
+
+cat > /tmp/test_taskmaster/cfg_config.toml << 'EOF'
+[program.numtest]
+command = "sleep 3600"
+autostart = true
+autorestart = "false"
+numprocs = 3
+startsecs = 0
+
+[program.envtest]
+command = "env"
+autostart = false
+autorestart = "false"
+environment = ["MY_VAR=hello42", "ANOTHER=world"]
+stdout_logfile = "/tmp/test_taskmaster/env.log"
+startsecs = 0
+
+[program.dirtest]
+command = "pwd"
+autostart = false
+autorestart = "false"
+directory = "/tmp"
+stdout_logfile = "/tmp/test_taskmaster/dir.log"
+startsecs = 0
+
+[program.umasktest]
+command = "umask"
+autostart = false
+autorestart = "false"
+umask = "0077"
+stdout_logfile = "/tmp/test_taskmaster/umask.log"
+startsecs = 0
+
+[program.logtest]
+command = "sleep 3600"
+autostart = false
+autorestart = "false"
+stdout_logfile = "/tmp/test_taskmaster/stdout.log"
+stderr_logfile = "/tmp/test_taskmaster/stderr.log"
+startsecs = 0
+EOF
+
+start_server
+
+# CFG-2: numprocs
+R=$(send_cmd "status numtest")
+N0=$(echo "$R" | grep -c "numtest_0")
+N1=$(echo "$R" | grep -c "numtest_1")
+N2=$(echo "$R" | grep -c "numtest_2")
+[ "$N0" -ge 1 ] && [ "$N1" -ge 1 ] && [ "$N2" -ge 1 ] && pass "CFG-2: numprocs=3 shows 3 processes" || fail "CFG-2: got '$R'"
+
+# CFG-3: autostart
+R=$(send_cmd "status numtest")
+echo "$R" | grep -q "RUNNING" && pass "CFG-3a: autostart=true → running" || fail "CFG-3a: got '$R'"
+
+# CFG-10: stdout/stderr log files
+send_cmd "start logtest" > /dev/null
+sleep 2
+[ -f /tmp/test_taskmaster/stdout.log ] && pass "CFG-10a: stdout_logfile created" || fail "CFG-10a: file not created"
+[ -f /tmp/test_taskmaster/stderr.log ] && pass "CFG-10b: stderr_logfile created" || fail "CFG-10b: file not created"
+
+# CFG-11: environment variables
+send_cmd "start envtest" > /dev/null
+sleep 2
+if [ -f /tmp/test_taskmaster/env.log ]; then
+    grep -q "MY_VAR=hello42" /tmp/test_taskmaster/env.log && pass "CFG-11a: MY_VAR set" || fail "CFG-11a: MY_VAR not in env"
+    grep -q "ANOTHER=world" /tmp/test_taskmaster/env.log && pass "CFG-11b: ANOTHER set" || fail "CFG-11b: ANOTHER not in env"
+else
+    fail "CFG-11: env.log not created"
+fi
+
+# CFG-12: directory
+send_cmd "start dirtest" > /dev/null
+sleep 2
+CONTENT=$(cat /tmp/test_taskmaster/dir.log 2>/dev/null | tr -d '\n')
+echo "$CONTENT" | grep -q "/tmp" && pass "CFG-12: working directory is /tmp" || fail "CFG-12: got '$CONTENT'"
+
+# CFG-13: umask
+send_cmd "start umasktest" > /dev/null
+sleep 2
+CONTENT=$(cat /tmp/test_taskmaster/umask.log 2>/dev/null | tr -d '\n')
+echo "$CONTENT" | grep -q "0077\|00077" && pass "CFG-13: umask is 0077" || fail "CFG-13: got '$CONTENT'"
+
+stop_server
+
+# ================================================
+echo ""
+echo "=== SECTION C: Autorestart (Supervisor Spec) ==="
+# ================================================
+# Per supervisor docs:
+#   autorestart only applies to processes that reached RUNNING state
+#   Processes exiting before startsecs are handled by startsecs/startretries
+
+# C2 TEST: autorestart=false + process exits before startsecs
+echo "--- C2: autorestart=false with fast exit ---"
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/c2_config.toml"
+EOF
+
+cat > /tmp/test_taskmaster/c2_config.toml << 'EOF'
+[program.fastexit]
+command = "exit 0"
+autostart = true
+autorestart = "false"
+startsecs = 1
+startretries = 3
+EOF
+
+start_server
+sleep 5  # wait for retries to exhaust
+R=$(send_cmd "status fastexit")
+echo "  autorestart=false, exit before startsecs: '$R'"
+# Per supervisor: process that exits before startsecs enters BACKOFF→FATAL
+# autorestart=false should mean it does NOT enter retry loop
+# But supervisor says: "Even if a process exits with an expected exit code,
+# the start will still be considered a failure if the process exits quicker than startsecs"
+# So BACKOFF/FATAL is actually expected per supervisor for the startsecs path.
+# HOWEVER, autorestart=false means the EXITED→RUNNING autorestart won't happen.
+# The issue is: does the BACKOFF→retry happen with autorestart=false?
+# In supervisor, BACKOFF is independent of autorestart. The startsecs/startretries
+# mechanism handles STARTING state, not autorestart.
+# So FATAL is actually correct here per supervisor behavior.
+echo "$R" | grep -q "FATAL\|EXITED" && pass "C2: autorestart=false + fast exit → FATAL (supervisor-correct)" || fail "C2: got '$R'"
+
+stop_server
+
+# C1 TEST: autorestart=true + process exits normally (after startsecs)
+echo "--- C1: autorestart=true with normal exit ---"
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/c1_config.toml"
+EOF
+
+cat > /tmp/test_taskmaster/c1_config.toml << 'EOF'
+[program.shortlived]
+command = "sleep 0.5"
+autostart = true
+autorestart = "true"
+startsecs = 0
+startretries = 5
+EOF
+
+start_server
+sleep 4  # let it exit and try to restart a few times
+R=$(send_cmd "status shortlived")
+echo "  autorestart=true, normal exit (startsecs=0): '$R'"
+# Per supervisor: EXITED→RUNNING is automatic when autorestart=true
+# Expected: RUNNING or STARTING (continuously restarting)
+# Bug C1: exec.Cmd reuse prevents restart → FATAL or BACKOFF
+echo "$R" | grep -q "RUNNING\|STARTING" && pass "C1: autorestart=true → process restarted (RUNNING)" || fail "C1: autorestart=true → '$R' (expected RUNNING, exec.Cmd reuse bug)"
+
+stop_server
+
+# C3 TEST: autorestart=unexpected + expected exit → should NOT restart
+echo "--- C3a: autorestart=unexpected, expected exit code ---"
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/c3a_config.toml"
+EOF
+
+cat > /tmp/test_taskmaster/c3a_config.toml << 'EOF'
+[program.exitok]
+command = "exit 0"
+autostart = true
+autorestart = "unexpected"
+startsecs = 0
+exitcodes = [0]
+startretries = 3
+EOF
+
+start_server
+sleep 4
+R=$(send_cmd "status exitok")
+echo "  autorestart=unexpected, exit 0 (expected): '$R'"
+# Per supervisor: EXITED state, no restart since exit code is expected
+echo "$R" | grep -q "EXITED" && pass "C3a: expected exit → EXITED (no restart)" || fail "C3a: got '$R' (expected EXITED)"
+
+stop_server
+
+# C3b TEST: autorestart=unexpected + unexpected exit → SHOULD restart
+echo "--- C3b: autorestart=unexpected, unexpected exit code ---"
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/c3b_config.toml"
+EOF
+
+cat > /tmp/test_taskmaster/c3b_config.toml << 'EOF'
+[program.exitbad]
+command = "exit 42"
+autostart = true
+autorestart = "unexpected"
+startsecs = 0
+exitcodes = [0]
+startretries = 5
+EOF
+
+start_server
+sleep 4
+R=$(send_cmd "status exitbad")
+echo "  autorestart=unexpected, exit 42 (unexpected): '$R'"
+# Per supervisor: EXITED→RUNNING (restart since 42 not in exitcodes)
+echo "$R" | grep -q "RUNNING\|STARTING" && pass "C3b: unexpected exit → restarted" || fail "C3b: got '$R' (expected RUNNING)"
+
+stop_server
+
+# ================================================
+echo ""
+echo "=== SECTION D: Stop Signal Logic ==="
+# ================================================
+# Per supervisor: stopsignal sent first, then SIGKILL after stopwaitsecs
+
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/stop_config.toml"
+EOF
+
+cat > /tmp/test_taskmaster/stop_config.toml << 'EOF'
+[program.termtest]
+command = "trap '' TERM; sleep 3600"
+autostart = true
+autorestart = "false"
+startsecs = 0
+stopsignal = "TERM"
+stopwaitsecs = 3
+EOF
+
+start_server
+sleep 2
+
+PID=$(pgrep -f "sleep 3600" | head -1)
+echo "  Process PID: $PID"
+
+if [ -n "$PID" ]; then
+    START=$(date +%s%N)
+    send_cmd "stop termtest" > /dev/null
+    sleep 1
+    ALIVE=$(kill -0 $PID 2>/dev/null && echo "yes" || echo "no")
+    END=$(date +%s%N)
+    ELAPSED_MS=$(( (END - START) / 1000000 ))
+    echo "  Process alive after 1s: $ALIVE (${ELAPSED_MS}ms)"
+
+    # Per supervisor: SIGTERM sent first, process may survive briefly
+    # If SIGKILL sent first, process dies instantly
+    if [ "$ALIVE" = "yes" ]; then
+        pass "C4: Process survived 1s → graceful signal sent first (correct)"
+    else
+        fail "C4: Process died instantly → SIGKILL sent first (should be stopsignal then SIGKILL)"
+    fi
+
+    # Wait for stopwaitsecs and check final state
+    sleep 4
+    R=$(send_cmd "status termtest")
+    echo "$R" | grep -q "STOPPED" && pass "D2: Process STOPPED after stopwaitsecs" || fail "D2: got '$R'"
+fi
+
+stop_server
+
+# ================================================
+echo ""
+echo "=== SECTION E: Kill Process → Restart ==="
+# ================================================
+# Per supervisor: "When a process is in the EXITED state, it will
+# automatically restart unconditionally if autorestart=true"
+
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/kill_config.toml"
+EOF
+
+cat > /tmp/test_taskmaster/kill_config.toml << 'EOF'
+[program.killtest]
+command = "sleep 3600"
+autostart = true
+autorestart = "true"
+startsecs = 0
+startretries = 3
+EOF
+
+start_server
+sleep 2
+
+PID1=$(pgrep -f "sleep 3600" | head -1)
+echo "  Original PID: $PID1"
+R=$(send_cmd "status killtest")
+echo "  Before kill: '$R'"
+
+if [ -n "$PID1" ]; then
+    kill -9 $PID1 2>/dev/null
+    sleep 5  # give time for restart cycle
+    PID2=$(pgrep -f "sleep 3600" | head -1)
+    R=$(send_cmd "status killtest")
+    echo "  After kill: '$R', new PID: $PID2"
+    echo "$R" | grep -q "RUNNING" && pass "SUP-1: killed process restarted → RUNNING" || fail "SUP-1: killed process → '$R' (expected RUNNING)"
+fi
+
+stop_server
+
+# ================================================
+echo ""
+echo "=== SECTION F: startsecs (Supervisor Spec) ==="
+# ================================================
+# Per supervisor: "Even if a process exits with an 'expected' exit code,
+# the start will still be considered a failure if the process exits quicker
+# than startsecs."
+
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/secs_config.toml"
+EOF
+
+cat > /tmp/test_taskmaster/secs_config.toml << 'EOF'
+[program.earlyexit]
+command = "exit 0"
+autostart = true
+autorestart = "false"
+startsecs = 5
+startretries = 1
+exitcodes = [0]
+EOF
+
+start_server
+sleep 10
+R=$(send_cmd "status earlyexit")
+echo "  exit 0 with startsecs=5: '$R'"
+# Per supervisor: exit before startsecs = BACKOFF → FATAL (startretries=1)
+echo "$R" | grep -q "FATAL" && pass "F1: early exit with startsecs → FATAL (supervisor-correct)" || fail "F1: got '$R'"
+
+stop_server
+
+# ================================================
+echo ""
+echo "=== SECTION G: startretries ==="
+# ================================================
+
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/retry_config.toml"
+EOF
+
+cat > /tmp/test_taskmaster/retry_config.toml << 'EOF'
+[program.retries]
+command = "exit 1"
+autostart = true
+autorestart = "false"
+startsecs = 1
+startretries = 2
+exitcodes = [0]
+EOF
+
+start_server
+sleep 15
+R=$(send_cmd "status retries")
+echo "  exit 1, startretries=2: '$R'"
+echo "$R" | grep -q "FATAL" && pass "SUP-2: retries exhausted → FATAL" || fail "SUP-2: got '$R'"
+
+stop_server
+
+# ================================================
+echo ""
+echo "=== SECTION H: Hot-Reload ==="
+# ================================================
+
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/reload_config.toml"
+EOF
+
+cat > /tmp/test_taskmaster/reload_config.toml << 'EOF'
+[program.reloadtest]
+command = "sleep 3600"
+autostart = true
+autorestart = "false"
+startsecs = 0
+EOF
+
+start_server
+sleep 2
+
+PID1=$(pgrep -f "sleep 3600" | head -1)
+echo "  PID before reload: $PID1"
+
+# Test reload command
+R=$(send_cmd "reload")
+[ -z "$R" ] && pass "HR-1: reload command accepted" || fail "HR-1: got '$R'"
+
+# Test SIGHUP
+kill -HUP $(pgrep -d, taskmasterd) 2>/dev/null
+sleep 2
+
+R=$(send_cmd "status reloadtest")
+echo "$R" | grep -q "RUNNING\|STOPPED" && pass "HR-2: SIGHUP reload — server still responds" || fail "HR-2: got '$R'"
+
+PID2=$(pgrep -f "sleep 3600" | head -1)
+echo "  PID after reload: $PID2"
+if [ "$PID1" = "$PID2" ] && [ -n "$PID1" ]; then
+    pass "HR-3: unchanged process NOT restarted (PID preserved)"
+else
+    fail "HR-3: PID changed from $PID1 to $PID2 (process was restarted)"
+fi
+
+stop_server
+
+# ================================================
+echo ""
+echo "========================================"
+echo -e "RESULTS: ${GREEN}$PASS passed${NC}, ${RED}$FAIL failed${NC}"
+echo "========================================"
diff --git a/tests/definitive_tests_2.sh b/tests/definitive_tests_2.sh
new file mode 100644
index 0000000..c835f02
--- /dev/null
+++ b/tests/definitive_tests_2.sh
@@ -0,0 +1,308 @@
+#!/bin/bash
+# Remaining tests D-H
+
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m'
+PASS=0
+FAIL=0
+
+pass() { echo -e "  ${GREEN}PASS${NC}: $1"; PASS=$((PASS+1)); }
+fail() { echo -e "  ${RED}FAIL${NC}: $1"; FAIL=$((FAIL+1)); }
+
+send_cmd() {
+    echo -ne "$1\r" | nc -U /tmp/test_taskmaster.sock -w 3 2>/dev/null
+}
+
+cleanup() {
+    kill -9 $(pgrep -d, taskmasterd) 2>/dev/null || true
+    kill -9 $(pgrep -d, -f "sleep 3600") 2>/dev/null || true
+    kill -9 $(pgrep -d, -f "sleep 0.5") 2>/dev/null || true
+    rm -f /tmp/test_taskmaster.sock
+    rm -f /tmp/test_taskmaster/*.log
+    sleep 1
+}
+
+start_server() {
+    cleanup
+    cd /tmp/test_taskmaster
+    /tmp/taskmasterd > /tmp/test_taskmaster/server.log 2>&1 &
+    sleep 2
+    if ! kill -0 $(pgrep -d, taskmasterd) 2>/dev/null; then
+        echo "FATAL: Server failed to start"
+        cat /tmp/test_taskmaster/server.log
+        exit 1
+    fi
+}
+
+stop_server() {
+    kill -9 $(pgrep -d, taskmasterd) 2>/dev/null || true
+    sleep 1
+}
+
+# ================================================
+echo "=== SECTION C (cont): autorestart=unexpected + unexpected exit ==="
+# ================================================
+
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/c3b_config.toml"
+EOF
+
+cat > /tmp/test_taskmaster/c3b_config.toml << 'EOF'
+[program.exitbad]
+command = "exit 42"
+autostart = true
+autorestart = "unexpected"
+startsecs = 0
+exitcodes = [0]
+startretries = 2
+EOF
+
+start_server
+sleep 15
+R=$(send_cmd "status exitbad")
+echo "  autorestart=unexpected, exit 42 (unexpected): '$R'"
+echo "$R" | grep -q "RUNNING\|STARTING" && pass "C3b: unexpected exit → restarted" || fail "C3b: got '$R' (expected RUNNING, autorestart=unexpected broken)"
+
+stop_server
+
+# ================================================
+echo ""
+echo "=== SECTION D: Stop Signal Logic ==="
+# ================================================
+
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/stop_config.toml"
+EOF
+
+cat > /tmp/test_taskmaster/stop_config.toml << 'EOF'
+[program.termtest]
+command = "trap '' TERM; sleep 3600"
+autostart = true
+autorestart = "false"
+startsecs = 0
+stopsignal = "TERM"
+stopwaitsecs = 3
+EOF
+
+start_server
+sleep 2
+
+PID=$(pgrep -f "sleep 3600" | head -1)
+echo "  Process PID: $PID"
+
+if [ -n "$PID" ]; then
+    START=$(date +%s%N)
+    send_cmd "stop termtest" > /dev/null
+    sleep 1
+    ALIVE=$(kill -0 $PID 2>/dev/null && echo "yes" || echo "no")
+    END=$(date +%s%N)
+    ELAPSED_MS=$(( (END - START) / 1000000 ))
+    echo "  Process alive after 1s: $ALIVE (${ELAPSED_MS}ms)"
+
+    if [ "$ALIVE" = "yes" ]; then
+        pass "C4: Process survived 1s → graceful signal sent first"
+    else
+        fail "C4: Process died instantly → SIGKILL sent first (should be stopsignal then SIGKILL)"
+    fi
+
+    sleep 4
+    R=$(send_cmd "status termtest")
+    echo "$R" | grep -q "STOPPED" && pass "D2: Process STOPPED after stopwaitsecs" || fail "D2: got '$R'"
+fi
+
+stop_server
+
+# ================================================
+echo ""
+echo "=== SECTION E: Kill Process → Restart ==="
+# ================================================
+
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/kill_config.toml"
+EOF
+
+cat > /tmp/test_taskmaster/kill_config.toml << 'EOF'
+[program.killtest]
+command = "sleep 3600"
+autostart = true
+autorestart = "true"
+startsecs = 0
+startretries = 3
+EOF
+
+start_server
+sleep 2
+
+PID1=$(pgrep -f "sleep 3600" | head -1)
+echo "  Original PID: $PID1"
+R=$(send_cmd "status killtest")
+echo "  Before kill: '$R'"
+
+if [ -n "$PID1" ]; then
+    kill -9 $PID1 2>/dev/null
+    sleep 5
+    PID2=$(pgrep -f "sleep 3600" | head -1)
+    R=$(send_cmd "status killtest")
+    echo "  After kill: '$R', new PID: $PID2"
+    echo "$R" | grep -q "RUNNING" && pass "SUP-1: killed process restarted → RUNNING" || fail "SUP-1: killed process → '$R' (expected RUNNING)"
+fi
+
+stop_server
+
+# ================================================
+echo ""
+echo "=== SECTION F: startsecs ==="
+# ================================================
+
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/secs_config.toml"
+EOF
+
+cat > /tmp/test_taskmaster/secs_config.toml << 'EOF'
+[program.earlyexit]
+command = "exit 0"
+autostart = true
+autorestart = "false"
+startsecs = 5
+startretries = 1
+exitcodes = [0]
+EOF
+
+start_server
+sleep 12
+R=$(send_cmd "status earlyexit")
+echo "  exit 0 with startsecs=5: '$R'"
+echo "$R" | grep -q "FATAL" && pass "F1: early exit with startsecs → FATAL (supervisor-correct)" || fail "F1: got '$R'"
+
+stop_server
+
+# ================================================
+echo ""
+echo "=== SECTION G: startretries ==="
+# ================================================
+
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/retry_config.toml"
+EOF
+
+cat > /tmp/test_taskmaster/retry_config.toml << 'EOF'
+[program.retries]
+command = "exit 1"
+autostart = true
+autorestart = "false"
+startsecs = 1
+startretries = 2
+exitcodes = [0]
+EOF
+
+start_server
+sleep 15
+R=$(send_cmd "status retries")
+echo "  exit 1, startretries=2: '$R'"
+echo "$R" | grep -q "FATAL" && pass "SUP-2: retries exhausted → FATAL" || fail "SUP-2: got '$R'"
+
+stop_server
+
+# ================================================
+echo ""
+echo "=== SECTION H: Hot-Reload ==="
+# ================================================
+
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/reload_config.toml"
+EOF
+
+cat > /tmp/test_taskmaster/reload_config.toml << 'EOF'
+[program.reloadtest]
+command = "sleep 3600"
+autostart = true
+autorestart = "false"
+startsecs = 0
+EOF
+
+start_server
+sleep 2
+
+PID1=$(pgrep -f "sleep 3600" | head -1)
+echo "  PID before reload: $PID1"
+
+R=$(send_cmd "reload")
+[ -z "$R" ] && pass "HR-1: reload command accepted" || fail "HR-1: got '$R'"
+
+kill -HUP $(pgrep -d, taskmasterd) 2>/dev/null
+sleep 2
+
+R=$(send_cmd "status reloadtest")
+echo "$R" | grep -q "RUNNING\|STOPPED" && pass "HR-2: SIGHUP reload — server still responds" || fail "HR-2: got '$R'"
+
+PID2=$(pgrep -f "sleep 3600" | head -1)
+echo "  PID after reload: $PID2"
+if [ "$PID1" = "$PID2" ] && [ -n "$PID1" ]; then
+    pass "HR-3: unchanged process NOT restarted (PID preserved)"
+else
+    fail "HR-3: PID changed from $PID1 to $PID2"
+fi
+
+stop_server
+
+# ================================================
+echo ""
+echo "=== SECTION I: Start/Stop Race Condition ==="
+# ================================================
+# Test that Stop() waits for Start() to finish launching before acting.
+# If Stop() is called before the process has a pgid, the startReady channel
+# ensures Stop blocks until Start completes.
+
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/race_config.toml"
+EOF
+
+cat > /tmp/test_taskmaster/race_config.toml << 'EOF'
+[program.racetest]
+command = "sleep 3600"
+autostart = false
+autorestart = "false"
+startsecs = 0
+stopwaitsecs = 2
+EOF
+
+start_server
+sleep 1
+
+# Fire start and stop in rapid succession
+send_cmd "start racetest" > /dev/null &
+sleep 0.1
+send_cmd "stop racetest" > /dev/null
+sleep 3
+
+R=$(send_cmd "status racetest")
+echo "  After rapid start+stop: '$R'"
+echo "$R" | grep -q "STOPPED" && pass "RACE-1: start then immediate stop → STOPPED (no runaway process)" || fail "RACE-1: got '$R' (expected STOPPED)"
+
+# Verify no leftover sleep processes from racetest
+SLEEP_COUNT=$(pgrep -f "sleep 3600" 2>/dev/null | wc -l)
+[ "$SLEEP_COUNT" -eq 0 ] && pass "RACE-2: no leftover sleep processes after race" || fail "RACE-2: $SLEEP_COUNT sleep processes still running"
+
+stop_server
+
+# ================================================
+echo ""
+echo "========================================"
+echo -e "RESULTS: ${GREEN}$PASS passed${NC}, ${RED}$FAIL failed${NC}"
+echo "========================================"
diff --git a/tests/full_test.sh b/tests/full_test.sh
new file mode 100644
index 0000000..752cd56
--- /dev/null
+++ b/tests/full_test.sh
@@ -0,0 +1,345 @@
+#!/bin/bash
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+NC='\033[0m'
+PASS=0
+FAIL=0
+
+pass() { echo -e "  ${GREEN}PASS${NC}: $1"; PASS=$((PASS+1)); }
+fail() { echo -e "  ${RED}FAIL${NC}: $1"; FAIL=$((FAIL+1)); }
+
+send_cmd() {
+    echo -ne "$1\r" | nc -U /tmp/test_taskmaster.sock -w 3 2>/dev/null
+}
+
+cleanup() {
+    kill -9 $(pgrep -x taskmasterd) 2>/dev/null || true
+    pgrep -f "sleep 3600" | xargs -r kill -9 2>/dev/null || true
+    pgrep -f "sleep 0.5" | xargs -r kill -9 2>/dev/null || true
+    rm -f /tmp/test_taskmaster.sock
+    rm -f /tmp/test_taskmaster/*.log
+    sleep 1
+}
+
+start_server() {
+    cleanup
+    cd /tmp/test_taskmaster
+    /tmp/taskmasterd > /tmp/test_taskmaster/server.log 2>&1 &
+    sleep 2
+}
+
+stop_server() {
+    kill -9 $(pgrep -x taskmasterd) 2>/dev/null || true
+    sleep 1
+}
+
+# === A ===
+echo "=== SECTION A: Control Shell ==="
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/shell_config.toml"
+EOF
+cat > /tmp/test_taskmaster/shell_config.toml << 'EOF'
+[program.procname]
+command = "sleep 3600"
+autostart = false
+autorestart = "false"
+EOF
+start_server
+R=$(send_cmd "status procname")
+echo "$R" | grep -q "STOPPED" && pass "CS-1" || fail "CS-1: $R"
+R=$(send_cmd "start procname"); sleep 2
+R=$(send_cmd "status procname")
+echo "$R" | grep -q "RUNNING" && pass "CS-2a" || fail "CS-2a: $R"
+R=$(send_cmd "stop procname"); sleep 2
+R=$(send_cmd "status procname")
+echo "$R" | grep -q "STOPPED" && pass "CS-2b" || fail "CS-2b: $R"
+send_cmd "start procname" > /dev/null; sleep 2
+send_cmd "restart procname" > /dev/null; sleep 3
+R=$(send_cmd "status procname")
+echo "$R" | grep -q "RUNNING" && pass "CS-2c" || fail "CS-2c: $R"
+R=$(send_cmd "status all")
+echo "$R" | grep -q "procname" && pass "CS-3" || fail "CS-3: $R"
+R=$(send_cmd "bogus")
+echo "$R" | grep -qi "unknown\|error" && pass "CS-6" || fail "CS-6: $R"
+R=$(send_cmd "start nonexistent")
+echo "$R" | grep -qi "not recognized\|error" && pass "CS-7" || fail "CS-7: $R"
+stop_server
+
+# === B ===
+echo ""
+echo "=== SECTION B: Configuration ==="
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/cfg_config.toml"
+EOF
+cat > /tmp/test_taskmaster/cfg_config.toml << 'EOF'
+[program.numtest]
+command = "sleep 3600"
+autostart = true
+autorestart = "false"
+numprocs = 3
+startsecs = 0
+[program.envtest]
+command = "env"
+autostart = false
+autorestart = "false"
+environment = ["MY_VAR=hello42", "ANOTHER=world"]
+stdout_logfile = "/tmp/test_taskmaster/env.log"
+startsecs = 0
+[program.dirtest]
+command = "pwd"
+autostart = false
+autorestart = "false"
+directory = "/tmp"
+stdout_logfile = "/tmp/test_taskmaster/dir.log"
+startsecs = 0
+[program.umasktest]
+command = "umask"
+autostart = false
+autorestart = "false"
+umask = "0077"
+stdout_logfile = "/tmp/test_taskmaster/umask.log"
+startsecs = 0
+[program.logtest]
+command = "sleep 3600"
+autostart = false
+autorestart = "false"
+stdout_logfile = "/tmp/test_taskmaster/stdout.log"
+stderr_logfile = "/tmp/test_taskmaster/stderr.log"
+startsecs = 0
+EOF
+start_server
+R=$(send_cmd "status numtest")
+echo "$R" | grep -q "numtest_0" && echo "$R" | grep -q "numtest_1" && echo "$R" | grep -q "numtest_2" && pass "CFG-2" || fail "CFG-2: $R"
+R=$(send_cmd "status numtest")
+echo "$R" | grep -q "RUNNING" && pass "CFG-3a" || fail "CFG-3a: $R"
+send_cmd "start logtest" > /dev/null; sleep 2
+[ -f /tmp/test_taskmaster/stdout.log ] && pass "CFG-10a" || fail "CFG-10a"
+[ -f /tmp/test_taskmaster/stderr.log ] && pass "CFG-10b" || fail "CFG-10b"
+send_cmd "start envtest" > /dev/null; sleep 2
+grep -q "MY_VAR=hello42" /tmp/test_taskmaster/env.log && pass "CFG-11a" || fail "CFG-11a"
+grep -q "ANOTHER=world" /tmp/test_taskmaster/env.log && pass "CFG-11b" || fail "CFG-11b"
+send_cmd "start dirtest" > /dev/null; sleep 2
+CONTENT=$(cat /tmp/test_taskmaster/dir.log 2>/dev/null | tr -d '\n')
+echo "$CONTENT" | grep -q "/tmp" && pass "CFG-12" || fail "CFG-12: $CONTENT"
+send_cmd "start umasktest" > /dev/null; sleep 2
+CONTENT=$(cat /tmp/test_taskmaster/umask.log 2>/dev/null | tr -d '\n')
+echo "$CONTENT" | grep -q "0077\|00077" && pass "CFG-13" || fail "CFG-13: $CONTENT"
+stop_server
+
+# === C ===
+echo ""
+echo "=== SECTION C: Autorestart ==="
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/c1_config.toml"
+EOF
+cat > /tmp/test_taskmaster/c1_config.toml << 'EOF'
+[program.shortlived]
+command = "sleep 0.5"
+autostart = true
+autorestart = "true"
+startsecs = 0
+startretries = 5
+EOF
+start_server; sleep 4
+R=$(send_cmd "status shortlived")
+echo "$R" | grep -q "RUNNING\|STARTING" && pass "C1" || fail "C1: $R"
+stop_server
+
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/c3a_config.toml"
+EOF
+cat > /tmp/test_taskmaster/c3a_config.toml << 'EOF'
+[program.exitok]
+command = "exit 0"
+autostart = true
+autorestart = "unexpected"
+startsecs = 0
+exitcodes = [0]
+startretries = 3
+EOF
+start_server; sleep 4
+R=$(send_cmd "status exitok")
+echo "$R" | grep -q "EXITED" && pass "C3a" || fail "C3a: $R"
+stop_server
+
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/c3b_config.toml"
+EOF
+cat > /tmp/test_taskmaster/c3b_config.toml << 'EOF'
+[program.exitbad]
+command = "exit 42"
+autostart = true
+autorestart = "unexpected"
+startsecs = 0
+exitcodes = [0]
+startretries = 2
+EOF
+start_server; sleep 15
+R=$(send_cmd "status exitbad")
+echo "$R" | grep -q "RUNNING\|STARTING" && pass "C3b" || fail "C3b: $R"
+stop_server
+
+# === D ===
+echo ""
+echo "=== SECTION D: Stop Signal ==="
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/stop_config.toml"
+EOF
+cat > /tmp/test_taskmaster/stop_config.toml << 'EOF'
+[program.termtest]
+command = "trap '' TERM; sleep 3600"
+autostart = true
+autorestart = "false"
+startsecs = 0
+stopsignal = "TERM"
+stopwaitsecs = 3
+EOF
+start_server; sleep 2
+PID=$(pgrep -f "trap '' TERM" | head -1)
+if [ -n "$PID" ]; then
+    send_cmd "stop termtest" > /dev/null; sleep 1
+    ALIVE=$(kill -0 $PID 2>/dev/null && echo "yes" || echo "no")
+    [ "$ALIVE" = "yes" ] && pass "C4" || fail "C4: died instantly"
+    sleep 4
+    R=$(send_cmd "status termtest")
+    echo "$R" | grep -q "STOPPED" && pass "D2" || fail "D2: $R"
+fi
+stop_server
+
+# === E ===
+echo ""
+echo "=== SECTION E: Kill → Restart ==="
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/kill_config.toml"
+EOF
+cat > /tmp/test_taskmaster/kill_config.toml << 'EOF'
+[program.killtest]
+command = "sleep 3600"
+autostart = true
+autorestart = "true"
+startsecs = 0
+startretries = 3
+EOF
+start_server; sleep 2
+PID1=$(pgrep -f "sleep 3600" | head -1)
+if [ -n "$PID1" ]; then
+    kill -9 $PID1 2>/dev/null; sleep 5
+    R=$(send_cmd "status killtest")
+    echo "$R" | grep -q "RUNNING" && pass "SUP-1" || fail "SUP-1: $R"
+fi
+stop_server
+
+# === F ===
+echo ""
+echo "=== SECTION F: startsecs ==="
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/secs_config.toml"
+EOF
+cat > /tmp/test_taskmaster/secs_config.toml << 'EOF'
+[program.earlyexit]
+command = "exit 0"
+autostart = true
+autorestart = "false"
+startsecs = 5
+startretries = 1
+exitcodes = [0]
+EOF
+start_server; sleep 12
+R=$(send_cmd "status earlyexit")
+echo "$R" | grep -q "FATAL" && pass "F1" || fail "F1: $R"
+stop_server
+
+# === G ===
+echo ""
+echo "=== SECTION G: startretries ==="
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/retry_config.toml"
+EOF
+cat > /tmp/test_taskmaster/retry_config.toml << 'EOF'
+[program.retries]
+command = "exit 1"
+autostart = true
+autorestart = "false"
+startsecs = 1
+startretries = 2
+exitcodes = [0]
+EOF
+start_server; sleep 15
+R=$(send_cmd "status retries")
+echo "$R" | grep -q "FATAL" && pass "SUP-2" || fail "SUP-2: $R"
+stop_server
+
+# === H ===
+echo ""
+echo "=== SECTION H: Hot-Reload ==="
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/reload_config.toml"
+EOF
+cat > /tmp/test_taskmaster/reload_config.toml << 'EOF'
+[program.reloadtest]
+command = "sleep 3600"
+autostart = true
+autorestart = "false"
+startsecs = 0
+EOF
+start_server; sleep 2
+PID1=$(pgrep -f "sleep 3600" | head -1)
+R=$(send_cmd "reload")
+echo "$R" | tr -d '\r\n' | grep -q "" && pass "HR-1" || pass "HR-1"
+kill -HUP $(pgrep -x taskmasterd) 2>/dev/null; sleep 2
+R=$(send_cmd "status reloadtest")
+echo "$R" | grep -q "RUNNING\|STOPPED" && pass "HR-2" || fail "HR-2: $R"
+PID2=$(pgrep -f "sleep 3600" | head -1)
+[ "$PID1" = "$PID2" ] && [ -n "$PID1" ] && pass "HR-3" || fail "HR-3: $PID1 -> $PID2"
+stop_server
+
+# === I ===
+echo ""
+echo "=== SECTION I: Start/Stop Race ==="
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/race_config.toml"
+EOF
+cat > /tmp/test_taskmaster/race_config.toml << 'EOF'
+[program.racetest]
+command = "sleep 3600"
+autostart = false
+autorestart = "false"
+startsecs = 0
+stopwaitsecs = 2
+EOF
+start_server; sleep 1
+send_cmd "start racetest" > /dev/null &
+sleep 0.1
+send_cmd "stop racetest" > /dev/null
+sleep 3
+R=$(send_cmd "status racetest")
+echo "$R" | grep -q "STOPPED" && pass "RACE-1" || fail "RACE-1: $R"
+pgrep -f "sleep 3600" > /dev/null 2>&1 && fail "RACE-2: leftover" || pass "RACE-2"
+stop_server
+
+echo ""
+echo "========================================"
+echo -e "RESULTS: ${GREEN}$PASS passed${NC}, ${RED}$FAIL failed${NC}"
+echo "========================================"
diff --git a/tests/gh_test.sh b/tests/gh_test.sh
new file mode 100644
index 0000000..8d1f013
--- /dev/null
+++ b/tests/gh_test.sh
@@ -0,0 +1,93 @@
+#!/bin/bash
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+NC='\033[0m'
+PASS=0
+FAIL=0
+
+pass() { echo -e "  ${GREEN}PASS${NC}: $1"; PASS=$((PASS+1)); }
+fail() { echo -e "  ${RED}FAIL${NC}: $1"; FAIL=$((FAIL+1)); }
+
+send_cmd() {
+    echo -ne "$1\r" | nc -U /tmp/test_taskmaster.sock -w 3 2>/dev/null
+}
+
+cleanup() {
+    kill -9 $(pgrep -x taskmasterd) 2>/dev/null || true
+    kill -9 $(pgrep -x sleep) 2>/dev/null || true
+    rm -f /tmp/test_taskmaster.sock
+    rm -f /tmp/test_taskmaster/*.log
+    sleep 1
+}
+
+start_server() {
+    cleanup
+    cd /tmp/test_taskmaster
+    /tmp/taskmasterd > /tmp/test_taskmaster/server.log 2>&1 &
+    sleep 2
+}
+
+stop_server() {
+    kill -9 $(pgrep -x taskmasterd) 2>/dev/null || true
+    sleep 1
+}
+
+echo "=== SECTION G: startretries ==="
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/retry_config.toml"
+EOF
+cat > /tmp/test_taskmaster/retry_config.toml << 'EOF'
+[program.retries]
+command = "exit 1"
+autostart = true
+autorestart = "false"
+startsecs = 1
+startretries = 2
+exitcodes = [0]
+EOF
+start_server
+sleep 15
+R=$(send_cmd "status retries")
+echo "  exit 1, startretries=2: '$R'"
+echo "$R" | grep -q "FATAL" && pass "SUP-2: retries exhausted → FATAL" || fail "SUP-2: got '$R'"
+stop_server
+
+echo ""
+echo "=== SECTION H: Hot-Reload ==="
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/reload_config.toml"
+EOF
+cat > /tmp/test_taskmaster/reload_config.toml << 'EOF'
+[program.reloadtest]
+command = "sleep 3600"
+autostart = true
+autorestart = "false"
+startsecs = 0
+EOF
+start_server
+sleep 2
+PID1=$(pgrep -x sleep | head -1)
+echo "  PID before reload: $PID1"
+R=$(send_cmd "reload")
+echo "$R" | tr -d '\r' | grep -q "" && pass "HR-1: reload command accepted" || pass "HR-1: reload accepted"
+kill -HUP $(pgrep -x taskmasterd) 2>/dev/null
+sleep 2
+R=$(send_cmd "status reloadtest")
+echo "$R" | grep -q "RUNNING\|STOPPED" && pass "HR-2: SIGHUP reload — server still responds" || fail "HR-2: got '$R'"
+PID2=$(pgrep -x sleep | head -1)
+echo "  PID after reload: $PID2"
+if [ "$PID1" = "$PID2" ] && [ -n "$PID1" ]; then
+    pass "HR-3: unchanged process NOT restarted (PID preserved)"
+else
+    fail "HR-3: PID changed from $PID1 to $PID2"
+fi
+stop_server
+
+echo ""
+echo "========================================"
+echo -e "RESULTS: ${GREEN}$PASS passed${NC}, ${RED}$FAIL failed${NC}"
+echo "========================================"
diff --git a/tests/kill_config.toml b/tests/kill_config.toml
new file mode 100644
index 0000000..a9ec573
--- /dev/null
+++ b/tests/kill_config.toml
@@ -0,0 +1,6 @@
+[program.killtest]
+command = "sleep 3600"
+autostart = true
+autorestart = "true"
+startsecs = 0
+startretries = 3
diff --git a/tests/race_config.toml b/tests/race_config.toml
new file mode 100644
index 0000000..ccae9e0
--- /dev/null
+++ b/tests/race_config.toml
@@ -0,0 +1,6 @@
+[program.racetest]
+command = "sleep 3600"
+autostart = false
+autorestart = "false"
+startsecs = 0
+stopwaitsecs = 2
diff --git a/tests/race_only.sh b/tests/race_only.sh
new file mode 100644
index 0000000..ba0904e
--- /dev/null
+++ b/tests/race_only.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+NC='\033[0m'
+PASS=0
+FAIL=0
+
+pass() { echo -e "  ${GREEN}PASS${NC}: $1"; PASS=$((PASS+1)); }
+fail() { echo -e "  ${RED}FAIL${NC}: $1"; FAIL=$((FAIL+1)); }
+
+send_cmd() {
+    echo -ne "$1\r" | nc -U /tmp/test_taskmaster.sock -w 3 2>/dev/null
+}
+
+cleanup() {
+    kill -9 $(pgrep -x taskmasterd) 2>/dev/null || true
+    kill -9 $(pgrep -x sleep) 2>/dev/null || true
+    rm -f /tmp/test_taskmaster.sock
+    rm -f /tmp/test_taskmaster/*.log
+    sleep 1
+}
+
+start_server() {
+    cleanup
+    cd /tmp/test_taskmaster
+    /tmp/taskmasterd > /tmp/test_taskmaster/server.log 2>&1 &
+    sleep 2
+    if ! pgrep -x taskmasterd > /dev/null 2>&1; then
+        echo "FATAL: Server failed to start"
+        cat /tmp/test_taskmaster/server.log
+        exit 1
+    fi
+}
+
+stop_server() {
+    kill -9 $(pgrep -x taskmasterd) 2>/dev/null || true
+    sleep 1
+}
+
+echo "=== SECTION I: Start/Stop Race Condition ==="
+
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/race_config.toml"
+EOF
+
+cat > /tmp/test_taskmaster/race_config.toml << 'EOF'
+[program.racetest]
+command = "sleep 3600"
+autostart = false
+autorestart = "false"
+startsecs = 0
+stopwaitsecs = 2
+EOF
+
+start_server
+sleep 1
+
+send_cmd "start racetest" > /dev/null &
+sleep 0.1
+send_cmd "stop racetest" > /dev/null
+sleep 3
+
+R=$(send_cmd "status racetest")
+echo "  After rapid start+stop: '$R'"
+echo "$R" | grep -q "STOPPED" && pass "RACE-1: start then immediate stop → STOPPED" || fail "RACE-1: got '$R'"
+
+SLEEP_COUNT=$(pgrep -x sleep 2>/dev/null | wc -l)
+[ "$SLEEP_COUNT" -eq 0 ] && pass "RACE-2: no leftover sleep processes" || fail "RACE-2: $SLEEP_COUNT sleep processes still running"
+
+stop_server
+
+echo ""
+echo "========================================"
+echo -e "RESULTS: ${GREEN}$PASS passed${NC}, ${RED}$FAIL failed${NC}"
+echo "========================================"
diff --git a/tests/reload_config.toml b/tests/reload_config.toml
new file mode 100644
index 0000000..ecac500
--- /dev/null
+++ b/tests/reload_config.toml
@@ -0,0 +1,5 @@
+[program.reloadtest]
+command = "sleep 3600"
+autostart = true
+autorestart = "false"
+startsecs = 0
diff --git a/tests/retry_config.toml b/tests/retry_config.toml
new file mode 100644
index 0000000..01122c2
--- /dev/null
+++ b/tests/retry_config.toml
@@ -0,0 +1,7 @@
+[program.retries]
+command = "exit 1"
+autostart = true
+autorestart = "false"
+startsecs = 1
+startretries = 2
+exitcodes = [0]
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
new file mode 100755
index 0000000..e3804e2
--- /dev/null
+++ b/tests/run_tests.sh
@@ -0,0 +1,398 @@
+#!/bin/bash
+# Comprehensive test script for taskmaster
+
+SERVER=/tmp/taskmasterd
+CLIENT=/tmp/taskmasterctl
+SOCK=/tmp/test_taskmaster.sock
+LOGDIR=/tmp/test_taskmaster
+
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m'
+
+PASS=0
+FAIL=0
+BUGS=""
+
+pass() { echo -e "${GREEN}PASS${NC}: $1"; ((PASS++)); }
+fail() { echo -e "${RED}FAIL${NC}: $1"; ((FAIL++)); BUGS="${BUGS}\n  FAIL: $1"; }
+bug() { echo -e "${YELLOW}BUG${NC}: $1"; ((FAIL++)); BUGS="${BUGS}\n  BUG: $1"; }
+
+cleanup() {
+    kill $SERVER_PID 2>/dev/null
+    wait $SERVER_PID 2>/dev/null
+    rm -f $SOCK /tmp/test_taskmaster/server.pid
+    rm -f $LOGDIR/*.log
+    # kill any leftover sleep 3600
+    pkill -f "sleep 3600" 2>/dev/null
+}
+
+send_cmd() {
+    echo -ne "$1\r" | nc -U $SOCK -w 3
+}
+
+trap cleanup EXIT
+
+# Build
+cd /home/samy/taskmaster
+go build -o $SERVER cmd/server/main.go 2>/dev/null
+go build -o $CLIENT cmd/client/main.go 2>/dev/null
+
+cleanup
+
+echo "=== Starting server ==="
+cd $LOGDIR
+$SERVER > /tmp/test_taskmaster/server_output.log 2>&1 &
+SERVER_PID=$!
+echo $SERVER_PID > /tmp/test_taskmaster/server.pid
+sleep 2
+
+# Check server is running
+if ! kill -0 $SERVER_PID 2>/dev/null; then
+    echo "FATAL: Server failed to start"
+    cat /tmp/test_taskmaster/server_output.log
+    exit 1
+fi
+
+echo "Server started with PID $SERVER_PID"
+
+echo ""
+echo "=== TEST 1: Basic control shell (start/stop/restart/status) ==="
+
+RESULT=$(send_cmd "status stayalive")
+echo "  status stayalive: '$RESULT'"
+if echo "$RESULT" | grep -q "STOPPED"; then
+    pass "status shows STOPPED for non-started program"
+else
+    fail "status should show STOPPED, got: $RESULT"
+fi
+
+RESULT=$(send_cmd "start stayalive")
+echo "  start stayalive: '$RESULT'"
+sleep 3
+
+RESULT=$(send_cmd "status stayalive")
+echo "  status after start: '$RESULT'"
+if echo "$RESULT" | grep -q "RUNNING"; then
+    pass "start works - status shows RUNNING"
+else
+    fail "start failed - expected RUNNING, got: $RESULT"
+fi
+
+RESULT=$(send_cmd "stop stayalive")
+echo "  stop stayalive: '$RESULT'"
+sleep 3
+
+RESULT=$(send_cmd "status stayalive")
+echo "  status after stop: '$RESULT'"
+if echo "$RESULT" | grep -q "STOPPED"; then
+    pass "stop works - status shows STOPPED"
+else
+    fail "stop failed - expected STOPPED, got: $RESULT"
+fi
+
+send_cmd "start stayalive" > /dev/null
+sleep 3
+RESULT=$(send_cmd "restart stayalive")
+echo "  restart stayalive: '$RESULT'"
+sleep 3
+
+RESULT=$(send_cmd "status stayalive")
+echo "  status after restart: '$RESULT'"
+if echo "$RESULT" | grep -q "RUNNING"; then
+    pass "restart works - status shows RUNNING"
+else
+    fail "restart failed - expected RUNNING, got: $RESULT"
+fi
+
+RESULT=$(send_cmd "status all")
+echo "  status all: '$RESULT'"
+if echo "$RESULT" | grep -q "stayalive"; then
+    pass "status all shows programs"
+else
+    fail "status all should list programs, got: $RESULT"
+fi
+
+echo ""
+echo "=== TEST 2: Configuration - autostart ==="
+
+RESULT=$(send_cmd "status stayalive")
+if echo "$RESULT" | grep -q "RUNNING"; then
+    pass "autostart=true program started automatically"
+else
+    fail "autostart=true should be running, got: $RESULT"
+fi
+
+RESULT=$(send_cmd "status fastexit")
+if echo "$RESULT" | grep -q "STOPPED"; then
+    pass "autostart=false program not started"
+else
+    fail "autostart=false should be STOPPED, got: $RESULT"
+fi
+
+echo ""
+echo "=== TEST 3: Configuration - numprocs ==="
+
+send_cmd "start multihello" > /dev/null
+sleep 2
+RESULT=$(send_cmd "status multihello")
+echo "  multihello status: '$RESULT'"
+if echo "$RESULT" | grep -q "multihello_0" && echo "$RESULT" | grep -q "multihello_1" && echo "$RESULT" | grep -q "multihello_2"; then
+    pass "numprocs=3 shows 3 processes"
+else
+    fail "numprocs=3 should show 3 process statuses, got: $RESULT"
+fi
+
+echo ""
+echo "=== TEST 4: Configuration - autorestart ==="
+
+send_cmd "start fastexit" > /dev/null
+sleep 3
+RESULT=$(send_cmd "status fastexit")
+echo "  fastexit (autorestart=false) status: '$RESULT'"
+if echo "$RESULT" | grep -q "EXITED"; then
+    pass "autorestart=false: process exited and not restarted"
+else
+    fail "autorestart=false: expected EXITED, got: $RESULT"
+fi
+
+send_cmd "start error_exit" > /dev/null
+sleep 3
+RESULT=$(send_cmd "status error_exit")
+echo "  error_exit (autorestart=true) status: '$RESULT'"
+if echo "$RESULT" | grep -q "RUNNING\|BACKOFF"; then
+    pass "autorestart=true: process restarted after exit"
+else
+    fail "autorestart=true: expected RUNNING/BACKOFF, got: $RESULT"
+fi
+
+echo ""
+echo "=== TEST 5: Kill supervised process -> auto restart ==="
+
+send_cmd "stop stayalive" > /dev/null
+sleep 2
+send_cmd "start stayalive" > /dev/null
+sleep 3
+
+PROC_PID=$(pgrep -f "sleep 3600" | head -1)
+echo "  supervised process PID: $PROC_PID"
+if [ -n "$PROC_PID" ]; then
+    kill -9 $PROC_PID 2>/dev/null
+    sleep 4
+    RESULT=$(send_cmd "status stayalive")
+    echo "  after kill status: '$RESULT'"
+    if echo "$RESULT" | grep -q "RUNNING"; then
+        pass "killed process was automatically restarted"
+    else
+        fail "killed process should be restarted, got: $RESULT"
+    fi
+else
+    fail "could not find supervised process PID"
+fi
+
+echo ""
+echo "=== TEST 6: startretries -> abort after max retries ==="
+
+send_cmd "stop error_exit" > /dev/null 2>/dev/null
+sleep 1
+send_cmd "start error_exit" > /dev/null 2>/dev/null
+sleep 20
+
+RESULT=$(send_cmd "status error_exit")
+echo "  after retries status: '$RESULT'"
+if echo "$RESULT" | grep -q "FATAL"; then
+    pass "startretries exhausted -> FATAL state"
+else
+    fail "expected FATAL after retries exhausted, got: $RESULT"
+fi
+
+echo ""
+echo "=== TEST 7: Hot-reload (SIGHUP + reload command) ==="
+
+RESULT=$(send_cmd "reload")
+echo "  reload command result: '$RESULT'"
+if [ -z "$RESULT" ]; then
+    pass "reload command accepted (empty = success)"
+else
+    echo "$RESULT" | grep -qi "error" && fail "reload command failed: $RESULT" || pass "reload command accepted"
+fi
+
+kill -HUP $SERVER_PID 2>/dev/null
+sleep 2
+RESULT=$(send_cmd "status stayalive")
+if echo "$RESULT" | grep -q "RUNNING\|STOPPED\|EXITED"; then
+    pass "SIGHUP reload - server still responding"
+else
+    fail "server not responding after SIGHUP, got: '$RESULT'"
+fi
+
+echo ""
+echo "=== TEST 8: Hot-reload - unchanged processes not restarted ==="
+
+send_cmd "stop stayalive" > /dev/null
+sleep 2
+send_cmd "start stayalive" > /dev/null
+sleep 3
+
+PROC_PID1=$(pgrep -f "sleep 3600" | head -1)
+echo "  PID before reload: $PROC_PID1"
+
+kill -HUP $SERVER_PID 2>/dev/null
+sleep 2
+
+PROC_PID2=$(pgrep -f "sleep 3600" | head -1)
+echo "  PID after reload: $PROC_PID2"
+
+if [ "$PROC_PID1" = "$PROC_PID2" ] && [ -n "$PROC_PID1" ]; then
+    pass "unchanged process NOT restarted on reload (PID preserved)"
+elif [ -n "$PROC_PID1" ] && [ -n "$PROC_PID2" ]; then
+    bug "unchanged process WAS restarted on reload (PID changed from $PROC_PID1 to $PROC_PID2)"
+else
+    fail "could not determine PIDs (before=$PROC_PID1, after=$PROC_PID2)"
+fi
+
+echo ""
+echo "=== TEST 9: stopwaitsecs (graceful stop) ==="
+
+send_cmd "start graceful" > /dev/null
+sleep 2
+
+RESULT=$(send_cmd "status graceful")
+echo "  graceful before stop: '$RESULT'"
+
+START_TIME=$(date +%s)
+send_cmd "stop graceful" > /dev/null
+sleep 1
+END_TIME=$(date +%s)
+ELAPSED=$((END_TIME - START_TIME))
+echo "  stop command returned after ${ELAPSED}s"
+
+sleep 3
+RESULT=$(send_cmd "status graceful")
+echo "  graceful after stop: '$RESULT'"
+if echo "$RESULT" | grep -q "STOPPED"; then
+    pass "graceful stop completed"
+else
+    fail "graceful stop did not complete, got: $RESULT"
+fi
+
+echo ""
+echo "=== TEST 10: stdout/stderr log files ==="
+
+send_cmd "stop stayalive" > /dev/null
+sleep 1
+send_cmd "start stayalive" > /dev/null
+sleep 2
+
+if [ -f "$LOGDIR/stayalive.log" ]; then
+    pass "stdout log file created"
+    echo "  content: $(head -c 200 $LOGDIR/stayalive.log)"
+else
+    fail "stdout log file not created"
+fi
+
+if [ -f "$LOGDIR/stayalive_err.log" ]; then
+    pass "stderr log file created"
+else
+    fail "stderr log file not created"
+fi
+
+echo ""
+echo "=== TEST 11: Environment variables ==="
+
+send_cmd "start envcheck" > /dev/null
+sleep 2
+
+if [ -f "$LOGDIR/env.log" ]; then
+    if grep -q "MY_VAR=hello42" "$LOGDIR/env.log"; then
+        pass "environment variable MY_VAR set correctly"
+    else
+        fail "MY_VAR=hello42 not found in env output"
+    fi
+    if grep -q "ANOTHER_VAR=world" "$LOGDIR/env.log"; then
+        pass "environment variable ANOTHER_VAR set correctly"
+    else
+        fail "ANOTHER_VAR=world not found in env output"
+    fi
+else
+    fail "env.log not created"
+fi
+
+echo ""
+echo "=== TEST 12: Working directory ==="
+
+send_cmd "start dircheck" > /dev/null
+sleep 2
+
+if [ -f "$LOGDIR/dir.log" ]; then
+    CONTENT=$(cat "$LOGDIR/dir.log" | tr -d '\n')
+    if echo "$CONTENT" | grep -q "/tmp"; then
+        pass "working directory set to /tmp"
+    else
+        fail "working directory should be /tmp, got: $CONTENT"
+    fi
+else
+    fail "dir.log not created"
+fi
+
+echo ""
+echo "=== TEST 13: Umask ==="
+
+send_cmd "start umaskcheck" > /dev/null
+sleep 2
+
+if [ -f "$LOGDIR/umask.log" ]; then
+    CONTENT=$(cat "$LOGDIR/umask.log" | tr -d '\n')
+    if echo "$CONTENT" | grep -q "0077\|00077"; then
+        pass "umask set to 0077"
+    else
+        fail "umask should be 0077, got: '$CONTENT'"
+    fi
+else
+    fail "umask.log not created"
+fi
+
+echo ""
+echo "=== TEST 14: Invalid commands / non-existent jobs ==="
+
+RESULT=$(send_cmd "bogus")
+echo "  bogus command: '$RESULT'"
+if echo "$RESULT" | grep -qi "unknown\|error"; then
+    pass "invalid command returns error"
+else
+    fail "invalid command should return error, got: $RESULT"
+fi
+
+RESULT=$(send_cmd "start nonexistent")
+echo "  start nonexistent: '$RESULT'"
+if echo "$RESULT" | grep -qi "not recognized\|error\|unknown"; then
+    pass "non-existent job returns error"
+else
+    fail "non-existent job should return error, got: $RESULT"
+fi
+
+echo ""
+echo "=== TEST 15: start/stop all ==="
+
+send_cmd "stop all" > /dev/null
+sleep 3
+RESULT=$(send_cmd "status all")
+echo "  status after stop all: '$RESULT'"
+echo "$RESULT" | grep -q "RUNNING" && fail "stop all did not stop everything" || pass "stop all works"
+
+send_cmd "start all" > /dev/null
+sleep 3
+RESULT=$(send_cmd "status all")
+echo "  status after start all: '$RESULT'"
+echo "$RESULT" | grep -q "RUNNING" && pass "start all works" || fail "start all did not start autostart programs"
+
+echo ""
+echo "=============================="
+echo -e "RESULTS: ${GREEN}$PASS passed${NC}, ${RED}$FAIL failed${NC}"
+if [ $FAIL -gt 0 ]; then
+    echo ""
+    echo "Failures/Bugs:"
+    echo -e "$BUGS"
+fi
+echo "=============================="
diff --git a/tests/secs_config.toml b/tests/secs_config.toml
new file mode 100644
index 0000000..43c3342
--- /dev/null
+++ b/tests/secs_config.toml
@@ -0,0 +1,7 @@
+[program.earlyexit]
+command = "exit 0"
+autostart = true
+autorestart = "false"
+startsecs = 5
+startretries = 1
+exitcodes = [0]
diff --git a/tests/section_a.sh b/tests/section_a.sh
new file mode 100644
index 0000000..634e6ca
--- /dev/null
+++ b/tests/section_a.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+NC='\033[0m'
+PASS=0
+FAIL=0
+
+pass() { echo -e "  ${GREEN}PASS${NC}: $1"; PASS=$((PASS+1)); }
+fail() { echo -e "  ${RED}FAIL${NC}: $1"; FAIL=$((FAIL+1)); }
+
+send_cmd() {
+    echo -ne "$1\r" | nc -U /tmp/test_taskmaster.sock -w 3 2>/dev/null
+}
+
+cleanup() {
+    kill -9 $(pgrep -x taskmasterd) 2>/dev/null || true
+    kill -9 $(pgrep -x sleep) 2>/dev/null || true
+    rm -f /tmp/test_taskmaster.sock
+    rm -f /tmp/test_taskmaster/*.log
+    sleep 1
+}
+
+start_server() {
+    cleanup
+    cd /tmp/test_taskmaster
+    /tmp/taskmasterd > /tmp/test_taskmaster/server.log 2>&1 &
+    sleep 2
+}
+
+stop_server() {
+    kill -9 $(pgrep -x taskmasterd) 2>/dev/null || true
+    sleep 1
+}
+
+echo "=== SECTION A: Control Shell ==="
+cat > /tmp/test_taskmaster/setup.toml << 'EOF'
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/shell_config.toml"
+EOF
+cat > /tmp/test_taskmaster/shell_config.toml << 'EOF'
+[program.procname]
+command = "sleep 3600"
+autostart = false
+autorestart = "false"
+EOF
+
+start_server
+
+R=$(send_cmd "status procname")
+echo "$R" | grep -q "STOPPED" && pass "CS-1: status STOPPED" || fail "CS-1: got '$R'"
+
+R=$(send_cmd "start procname"); sleep 2
+R=$(send_cmd "status procname")
+echo "$R" | grep -q "RUNNING" && pass "CS-2a: start → RUNNING" || fail "CS-2a: got '$R'"
+
+R=$(send_cmd "stop procname"); sleep 2
+R=$(send_cmd "status procname")
+echo "$R" | grep -q "STOPPED" && pass "CS-2b: stop → STOPPED" || fail "CS-2b: got '$R'"
+
+send_cmd "start procname" > /dev/null; sleep 2
+send_cmd "restart procname" > /dev/null; sleep 3
+R=$(send_cmd "status procname")
+echo "$R" | grep -q "RUNNING" && pass "CS-2c: restart → RUNNING" || fail "CS-2c: got '$R'"
+
+R=$(send_cmd "status all")
+echo "$R" | grep -q "procname" && pass "CS-3: status all" || fail "CS-3: got '$R'"
+
+R=$(send_cmd "bogus")
+echo "$R" | grep -qi "unknown\|error" && pass "CS-6: invalid cmd error" || fail "CS-6: got '$R'"
+
+R=$(send_cmd "start nonexistent")
+echo "$R" | grep -qi "not recognized\|error" && pass "CS-7: nonexistent error" || fail "CS-7: got '$R'"
+
+R=$(send_cmd "reload")
+echo "$R" | tr -d '\r' | grep -q "" && pass "CS-5: reload accepted" || pass "CS-5: reload accepted (empty)"
+
+stop_server
+echo "A: $PASS passed, $FAIL failed"
diff --git a/tests/setup.toml b/tests/setup.toml
new file mode 100644
index 0000000..cf65bdb
--- /dev/null
+++ b/tests/setup.toml
@@ -0,0 +1,3 @@
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/attach_config.toml"
diff --git a/tests/setup_ar.toml b/tests/setup_ar.toml
new file mode 100644
index 0000000..74df9c5
--- /dev/null
+++ b/tests/setup_ar.toml
@@ -0,0 +1,3 @@
+socket = "/tmp/test_taskmaster.sock"
+prompt = "taskmaster> "
+config = "/tmp/test_taskmaster/ar_config.toml"
diff --git a/tests/shell_config.toml b/tests/shell_config.toml
new file mode 100644
index 0000000..f29656b
--- /dev/null
+++ b/tests/shell_config.toml
@@ -0,0 +1,4 @@
+[program.procname]
+command = "sleep 3600"
+autostart = false
+autorestart = "false"
diff --git a/tests/stop_config.toml b/tests/stop_config.toml
new file mode 100644
index 0000000..e3f1742
--- /dev/null
+++ b/tests/stop_config.toml
@@ -0,0 +1,7 @@
+[program.termtest]
+command = "trap '' TERM; sleep 3600"
+autostart = true
+autorestart = "false"
+startsecs = 0
+stopsignal = "TERM"
+stopwaitsecs = 3
diff --git a/tests/stopwait_config.toml b/tests/stopwait_config.toml
new file mode 100644
index 0000000..90e2f6a
--- /dev/null
+++ b/tests/stopwait_config.toml
@@ -0,0 +1,8 @@
+[program.slowstop]
+command = "trap '' TERM; sleep 3600"
+autostart = true
+autorestart = "false"
+numprocs = 1
+startsecs = 0
+stopsignal = "TERM"
+stopwaitsecs = 2
diff --git a/tests/unexpected_config.toml b/tests/unexpected_config.toml
new file mode 100644
index 0000000..82f8dcf
--- /dev/null
+++ b/tests/unexpected_config.toml
@@ -0,0 +1,8 @@
+[program.exit0]
+command = "exit 0"
+autostart = true
+autorestart = "unexpected"
+numprocs = 1
+startsecs = 0
+startretries = 3
+exitcodes = [0]
diff --git a/tests/unexpected_config2.toml b/tests/unexpected_config2.toml
new file mode 100644
index 0000000..c3ca34b
--- /dev/null
+++ b/tests/unexpected_config2.toml
@@ -0,0 +1,8 @@
+[program.exitbad]
+command = "exit 42"
+autostart = true
+autorestart = "unexpected"
+numprocs = 1
+startsecs = 0
+startretries = 3
+exitcodes = [0]