diff --git a/.gitignore b/.gitignore
index 4e43614..55f5550 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,9 @@ demo.mp4
 demo.webm
 web/node_modules/
 web/dist/
+# Vite output embedded via go:embed — rebuild with `make web` / `make build-server`
+internal/webembed/dist/**
+!internal/webembed/dist/.gitkeep
 *.db
 *.db-wal
 *.db-shm
diff --git a/Makefile b/Makefile
index d4c7216..b7bdc76 100644
--- a/Makefile
+++ b/Makefile
@@ -12,18 +12,24 @@ PREFIX      ?= $(GOPATH)
 INSTALL_BIN := $(PREFIX)/bin
 DEV_HOME    := $(CURDIR)/.dev-home
 
-.PHONY: build build-server build-all web run run-dev run-server-dev install uninstall test version demo
+.PHONY: build build-server build-all web web-build run run-dev run-server-dev install uninstall test version demo
 
 build:
 	go build -ldflags "$(LDFLAGS)" -o bin/$(BINARY) $(CMD)
 
 web:
 	cd web && npm ci && npm run build
+	@mkdir -p internal/webembed/dist && touch internal/webembed/dist/.gitkeep
+
+# Rebuild frontend only (assumes web/node_modules already installed).
+web-build:
+	cd web && npm run build
+	@mkdir -p internal/webembed/dist && touch internal/webembed/dist/.gitkeep
 
 build-server: web
 	go build -ldflags "$(LDFLAGS)" -o bin/$(BINARY_SERVER) $(CMD_SERVER)
 
-# Build server binary without rebuilding frontend (uses committed/placeholder dist).
+# Build server binary without rebuilding frontend (uses local webembed/dist).
 build-server-go:
 	go build -ldflags "$(LDFLAGS)" -o bin/$(BINARY_SERVER) $(CMD_SERVER)
 
@@ -40,7 +46,7 @@ run-dev: build
 
 # Web test environment: SQLite demo against tm_server only (no YouTrack).
 # Seeds 50 demo projects (Test + samples); login admin/admin (alice/alice as member).
-run-server-dev: build-server-go
+run-server-dev: web-build build-server-go
 	@rm -f $(DEV_HOME)/.local/share/task-master/task-master.db \
 		$(DEV_HOME)/.local/share/task-master/task-master.db-wal \
 		$(DEV_HOME)/.local/share/task-master/task-master.db-shm
diff --git a/internal/webembed/dist/.gitkeep b/internal/webembed/dist/.gitkeep
new file mode 100644
index 0000000..e69de29