+ {{ session.name || session.id }}
+
+
+ {{ session.command }}
+ {{ session.status }} +
+
+ Frontend not built yet. Run make frontend-build.
+ + diff --git a/internal/static/embed.go b/internal/static/embed.go new file mode 100644 index 0000000..447a66b --- /dev/null +++ b/internal/static/embed.go @@ -0,0 +1,7 @@ +package static + +import "embed" + +// DistFS contains built frontend assets copied into internal/static/dist. +//go:embed dist dist/* +var DistFS embed.FS diff --git a/internal/static/serve.go b/internal/static/serve.go new file mode 100644 index 0000000..f812190 --- /dev/null +++ b/internal/static/serve.go @@ -0,0 +1,52 @@ +package static + +import ( + "io/fs" + "net/http" + "path" +) + +type SPAHandler struct { + assets fs.FS + files http.Handler +} + +func NewSPAHandler() (http.Handler, error) { + sub, err := fs.Sub(DistFS, "dist") + if err != nil { + return nil, err + } + return &SPAHandler{ + assets: sub, + files: http.FileServer(http.FS(sub)), + }, nil +} + +func (h *SPAHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { + requested := path.Clean(r.URL.Path) + if requested == "." || requested == "/" { + h.serveIndex(w, r) + return + } + candidate := requested[1:] + if candidate == "" { + h.serveIndex(w, r) + return + } + if file, err := h.assets.Open(candidate); err == nil { + _ = file.Close() + h.files.ServeHTTP(w, r) + return + } + h.serveIndex(w, r) +} + +func (h *SPAHandler) serveIndex(w http.ResponseWriter, r *http.Request) { + index, err := fs.ReadFile(h.assets, "index.html") + if err != nil { + http.Error(w, "index.html not found", http.StatusNotFound) + return + } + w.Header().Set("Content-Type", "text/html; charset=utf-8") + _, _ = w.Write(index) +} diff --git a/internal/store/memory/store.go b/internal/store/memory/store.go new file mode 100644 index 0000000..c72b58a --- /dev/null +++ b/internal/store/memory/store.go @@ -0,0 +1,51 @@ +package memory + +import ( + "context" + "sort" + "supervisor/internal/domain" + "sync" +) + +type Store struct { + mu sync.RWMutex + sessions map[string]domain.Session +} + +func NewStore() *Store { + return &Store{sessions: make(map[string]domain.Session)} +} + +func (s *Store) Upsert(_ context.Context, session domain.Session) error { + s.mu.Lock() + defer s.mu.Unlock() + s.sessions[session.ID] = session + return nil +} + +func (s *Store) Get(_ context.Context, id string) (domain.Session, bool, error) { + s.mu.RLock() + defer s.mu.RUnlock() + session, ok := s.sessions[id] + return session, ok, nil +} + +func (s *Store) List(_ context.Context) ([]domain.Session, error) { + s.mu.RLock() + defer s.mu.RUnlock() + items := make([]domain.Session, 0, len(s.sessions)) + for _, session := range s.sessions { + items = append(items, session) + } + sort.Slice(items, func(i, j int) bool { + return items[i].CreatedAt.After(items[j].CreatedAt) + }) + return items, nil +} + +func (s *Store) Delete(_ context.Context, id string) error { + s.mu.Lock() + defer s.mu.Unlock() + delete(s.sessions, id) + return nil +} diff --git a/internal/store/types.go b/internal/store/types.go new file mode 100644 index 0000000..e5c01df --- /dev/null +++ b/internal/store/types.go @@ -0,0 +1,13 @@ +package store + +import ( + "context" + "supervisor/internal/domain" +) + +type SessionStore interface { + Upsert(ctx context.Context, session domain.Session) error + Get(ctx context.Context, id string) (domain.Session, bool, error) + List(ctx context.Context) ([]domain.Session, error) + Delete(ctx context.Context, id string) error +} diff --git a/internal/supervisor/manager.go b/internal/supervisor/manager.go new file mode 100644 index 0000000..ca3790a --- /dev/null +++ b/internal/supervisor/manager.go @@ -0,0 +1,13 @@ +package supervisor + +import "sync" + +// Manager is a future extension point for high-level orchestration. +type Manager struct { + mu sync.RWMutex + assignments map[string]AgentAssignment +} + +func NewManager() *Manager { + return &Manager{assignments: make(map[string]AgentAssignment)} +} diff --git a/internal/supervisor/models.go b/internal/supervisor/models.go new file mode 100644 index 0000000..c429ffe --- /dev/null +++ b/internal/supervisor/models.go @@ -0,0 +1,9 @@ +package supervisor + +import "time" + +type AgentAssignment struct { + AgentID string `json:"agentId"` + SessionID string `json:"sessionId"` + AssignedAt time.Time `json:"assignedAt"` +} diff --git a/internal/util/ids.go b/internal/util/ids.go new file mode 100644 index 0000000..ff00917 --- /dev/null +++ b/internal/util/ids.go @@ -0,0 +1,12 @@ +package util + +import ( + "crypto/rand" + "encoding/hex" +) + +func NewID(prefix string) string { + buf := make([]byte, 8) + _, _ = rand.Read(buf) + return prefix + "_" + hex.EncodeToString(buf) +} diff --git a/internal/util/logger.go b/internal/util/logger.go new file mode 100644 index 0000000..f286f8a --- /dev/null +++ b/internal/util/logger.go @@ -0,0 +1,10 @@ +package util + +import ( + "log" + "os" +) + +func NewLogger() *log.Logger { + return log.New(os.Stdout, "[supervisor] ", log.LstdFlags|log.Lmicroseconds) +} diff --git a/internal/ws/messages.go b/internal/ws/messages.go new file mode 100644 index 0000000..719bd90 --- /dev/null +++ b/internal/ws/messages.go @@ -0,0 +1,31 @@ +package ws + +import "encoding/json" + +type Envelope struct { + Type string `json:"type"` + Session string `json:"session"` + Payload json.RawMessage `json:"payload"` +} + +type TerminalInputPayload struct { + Data string `json:"data"` +} + +type TerminalOutputPayload struct { + Data string `json:"data"` +} + +type TerminalResizePayload struct { + Cols int `json:"cols"` + Rows int `json:"rows"` +} + +type SessionStatusPayload struct { + Status string `json:"status"` + ExitCode *int `json:"exitCode,omitempty"` +} + +type ErrorPayload struct { + Message string `json:"message"` +} diff --git a/scripts/build-all.sh b/scripts/build-all.sh new file mode 100755 index 0000000..8f7e663 --- /dev/null +++ b/scripts/build-all.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +set -euo pipefail + +ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" + +"$ROOT_DIR/scripts/build-frontend.sh" + +mkdir -p "$ROOT_DIR/bin" +cd "$ROOT_DIR" +go build -o "$ROOT_DIR/bin/supervisor" ./cmd/supervisor + +echo "Built binary: $ROOT_DIR/bin/supervisor" diff --git a/scripts/build-frontend.sh b/scripts/build-frontend.sh new file mode 100755 index 0000000..3c8a544 --- /dev/null +++ b/scripts/build-frontend.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +set -euo pipefail + +ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" +WEB_DIR="$ROOT_DIR/web" +EMBED_DIST_DIR="$ROOT_DIR/internal/static/dist" + +cd "$WEB_DIR" +npm install +npm run build + +rm -rf "$EMBED_DIST_DIR" +mkdir -p "$EMBED_DIST_DIR" +cp -R "$WEB_DIR/dist/." "$EMBED_DIST_DIR/" + +echo "Frontend built into $WEB_DIR/dist and copied to $EMBED_DIST_DIR" diff --git a/web/index.html b/web/index.html new file mode 100644 index 0000000..9963490 --- /dev/null +++ b/web/index.html @@ -0,0 +1,23 @@ + + + + + +{{ session.command }}
+ {{ session.status }} +Total sessions: {{ store.sessions.length }}
+Running: {{ runningCount }}
+