sensorium-mcp 3.0.4 → 3.0.5

package/supervisor/updater.go

@@ -1,613 +0,0 @@
-package main
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"syscall"
-	"time"
-)
-
-const registryURL = "https://registry.npmjs.org/sensorium-mcp/latest"
-const supervisorReleaseURL = "https://api.github.com/repos/andriyshevchenko/remote-copilot-mcp/releases/tags/supervisor-latest"
-
-var (
-	notifyUpdaterOperator      = NotifyOperator
-	mcpUpdateReadyPollInterval = 3 * time.Second
-	mcpUpdateReadyTimeout      = 60 * time.Second
-)
-
-// Updater checks the npm registry for new versions and performs updates.
-type Updater struct {
-	cfg     Config
-	mcp     *MCPClient
-	log     *Logger
-	state   *UpdateStateStore
-	startAt time.Time
-	cancel  context.CancelFunc
-	done    chan struct{}
-}
-
-func NewUpdater(cfg Config, mcp *MCPClient, log *Logger) *Updater {
-	return &Updater{
-		cfg:     cfg,
-		mcp:     mcp,
-		log:     log,
-		state:   NewUpdateStateStore(cfg.Paths.UpdateState, log),
-		startAt: time.Now(),
-		done:    make(chan struct{}),
-	}
-}
-
-// Start begins the update check loop.
-func (u *Updater) Start() {
-	ctx, cancel := context.WithCancel(context.Background())
-	u.cancel = cancel
-	go u.run(ctx)
-}
-
-// Stop signals the updater to shut down and waits.
-func (u *Updater) Stop() {
-	if u.cancel != nil {
-		u.cancel()
-	}
-	<-u.done
-}
-
-func (u *Updater) run(ctx context.Context) {
-	defer close(u.done)
-	u.log.Info("Updater started (mode=%s)", u.cfg.Mode)
-
-	// In development mode, check every PollInterval.
-	// In production, check once per day at PollAtHour.
-	for {
-		var sleepDuration time.Duration
-		if u.cfg.Mode == "development" {
-			sleepDuration = u.cfg.PollInterval
-		} else {
-			sleepDuration = u.timeUntilNextPoll()
-		}
-		u.log.Debug("Updater: next version check in %v", sleepDuration.Round(time.Second))
-
-		select {
-		case <-ctx.Done():
-			return
-		case <-time.After(sleepDuration):
-		}
-
-		if ctx.Err() != nil {
-			return
-		}
-
-		u.checkAndUpdate(ctx)
-		if ctx.Err() != nil {
-			return
-		}
-		u.checkSupervisorUpdate(ctx)
-	}
-}
-
-func (u *Updater) timeUntilNextPoll() time.Duration {
-	now := time.Now()
-	next := time.Date(now.Year(), now.Month(), now.Day(), u.cfg.PollAtHour, 0, 0, 0, now.Location())
-	if next.Before(now) {
-		next = next.Add(24 * time.Hour)
-	}
-	return time.Until(next)
-}
-
-// getRemoteVersion fetches the latest version from npm registry.
-func (u *Updater) getRemoteVersion(ctx context.Context) (string, error) {
-	ctx2, cancel := context.WithTimeout(ctx, 15*time.Second)
-	defer cancel()
-
-	req, err := http.NewRequestWithContext(ctx2, "GET", registryURL, nil)
-	if err != nil {
-		return "", err
-	}
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return "", err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != 200 {
-		return "", fmt.Errorf("npm registry HTTP %d", resp.StatusCode)
-	}
-
-	var pkg struct {
-		Version string `json:"version"`
-	}
-	if err := json.NewDecoder(resp.Body).Decode(&pkg); err != nil {
-		return "", err
-	}
-	return pkg.Version, nil
-}
-
-// getLocalVersion reads the current version from the version file.
-func (u *Updater) getLocalVersion() string {
-	data, err := os.ReadFile(u.cfg.Paths.VersionFile)
-	if err != nil {
-		return ""
-	}
-	return strings.TrimSpace(string(data))
-}
-
-func (u *Updater) setLocalVersion(v string) {
-	os.MkdirAll(u.cfg.DataDir, 0755)
-	if err := atomicWrite(u.cfg.Paths.VersionFile, []byte(v)); err != nil {
-		u.log.Warn("Failed to write version file: %v", err)
-	}
-}
-
-func (u *Updater) checkAndUpdate(ctx context.Context) {
-	// Enforce minimum uptime before updating
-	uptime := time.Since(u.startAt)
-	if uptime < u.cfg.MinUptime {
-		u.log.Info("Deferring update — too early (uptime %v < %v)", uptime.Round(time.Second), u.cfg.MinUptime)
-		return
-	}
-
-	remote, err := u.getRemoteVersion(ctx)
-	if err != nil {
-		u.log.Warn("Failed to check npm registry: %v", err)
-		return
-	}
-
-	local := u.getLocalVersion()
-	if local == "" {
-		u.log.Info("No local version recorded — storing %s", remote)
-		u.setLocalVersion(remote)
-		return
-	}
-
-	if local == remote {
-		u.log.Debug("Updater: version %s is up to date", local)
-		return
-	}
-
-	u.log.Info("Update available: %s → %s", local, remote)
-	coordLock, ok := AcquireUpdateCoordinatorLock(u.cfg.Paths.UpdateApplyLock, updateScopeMCP, u.log)
-	if !ok {
-		u.log.Info("Deferring MCP update %s → %s due to active update apply lock", local, remote)
-		return
-	}
-	defer coordLock.Release()
-
-	u.state.Transition(updateScopeMCP, updatePhaseApplying, remote, local, "")
-	markFailed := func(err error) {
-		u.state.Transition(updateScopeMCP, updatePhaseFailed, remote, local, err.Error())
-	}
-
-	notifyUpdaterOperator(u.cfg, u.log, fmt.Sprintf("⚙️ Supervisor: updating MCP server v%s → v%s. Grace period %v. MCP server will restart — threads will reconnect automatically.", local, remote, u.cfg.GracePeriod), 0)
-
-	// Grace period
-	u.log.Info("Grace period %v...", u.cfg.GracePeriod)
-	select {
-	case <-ctx.Done():
-		markFailed(ctx.Err())
-		return
-	case <-time.After(u.cfg.GracePeriod):
-	}
-
-	// Set maintenance flag — always clean up on exit.
-	// Written as JSON so TypeScript's checkMaintenanceFlag() can parse the
-	// version and timestamp fields for accurate maintenance notifications.
-	maintenanceJSON, err := json.Marshal(map[string]string{
-		"version":   remote,
-		"timestamp": time.Now().Format(time.RFC3339),
-	})
-	if err != nil {
-		u.log.Warn("Failed to marshal maintenance flag: %v", err)
-	} else if err := atomicWrite(u.cfg.Paths.MaintenanceFlag, maintenanceJSON); err != nil {
-		u.log.Warn("Failed to write maintenance flag: %v", err)
-	}
-	defer os.Remove(u.cfg.Paths.MaintenanceFlag)
-
-	// Kill the current MCP server
-	if ctx.Err() != nil {
-		markFailed(ctx.Err())
-		return
-	}
-	u.state.Transition(updateScopeMCP, updatePhaseRestarting, remote, local, "")
-	u.killServer()
-
-	// Clean npx cache
-	if ctx.Err() != nil {
-		markFailed(ctx.Err())
-		return
-	}
-	u.clearNpxCache()
-
-	// Spawn new server — retry up to 3 times on failure
-	var pid int
-	for attempt := 1; attempt <= 3; attempt++ {
-		if ctx.Err() != nil {
-			markFailed(ctx.Err())
-			return
-		}
-		pid, err = SpawnMCPServer(u.cfg, u.log)
-		if err == nil {
-			break
-		}
-		u.log.Error("Failed to spawn updated MCP server (attempt %d/3): %v", attempt, err)
-		if attempt < 3 {
-			time.Sleep(2 * time.Second)
-		}
-	}
-	if err != nil {
-		u.log.Error("All spawn attempts failed — server is down!")
-		markFailed(err)
-		notifyUpdaterOperator(u.cfg, u.log, "🔴 Supervisor: MCP server update FAILED — server is down! Manual intervention required.", 0)
-		return
-	}
-
-	if !u.verifyUpdatedMCPServerReady(ctx, remote, local, pid) {
-		return
-	}
-
-	u.setLocalVersion(remote)
-	u.state.Transition(updateScopeMCP, updatePhaseIdle, remote, local, "")
-
-	notifyUpdaterOperator(u.cfg, u.log, fmt.Sprintf("✅ Supervisor: MCP server updated to v%s. Server ready — threads reconnected.", remote), 0)
-	u.log.Info("Update complete: v%s → v%s", local, remote)
-
-	// Reset start time for min uptime tracking
-	u.startAt = time.Now()
-}
-
-func (u *Updater) verifyUpdatedMCPServerReady(ctx context.Context, remote, local string, pid int) bool {
-	u.state.Transition(updateScopeMCP, updatePhaseVerifying, remote, local, "")
-	if u.mcp.WaitForReady(ctx, mcpUpdateReadyPollInterval, mcpUpdateReadyTimeout) {
-		u.log.Info("Updated MCP server ready (PID %d)", pid)
-		return true
-	}
-
-	errMsg := fmt.Sprintf("updated MCP server did not become ready within %v after restart (pid=%d)", mcpUpdateReadyTimeout, pid)
-	u.log.Error(errMsg)
-	u.state.Transition(updateScopeMCP, updatePhaseFailed, remote, local, errMsg)
-	notifyUpdaterOperator(u.cfg, u.log, fmt.Sprintf("🔴 Supervisor: MCP server update to v%s FAILED verification. Server did not become ready after restart.", remote), 0)
-	return false
-}
-
-type githubRelease struct {
-	TagName string `json:"tag_name"`
-	Name    string `json:"name"`
-	Assets  []struct {
-		Name string `json:"name"`
-		URL  string `json:"browser_download_url"`
-		Size int64  `json:"size"`
-	} `json:"assets"`
-}
-
-func (u *Updater) getSupervisorRelease(ctx context.Context) (string, string, error) {
-	ctx2, cancel := context.WithTimeout(ctx, 20*time.Second)
-	defer cancel()
-
-	req, err := http.NewRequestWithContext(ctx2, http.MethodGet, supervisorReleaseURL, nil)
-	if err != nil {
-		return "", "", err
-	}
-	req.Header.Set("Accept", "application/vnd.github+json")
-	req.Header.Set("User-Agent", "sensorium-supervisor-updater")
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return "", "", err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		return "", "", fmt.Errorf("GitHub releases HTTP %d", resp.StatusCode)
-	}
-
-	var release githubRelease
-	if err := json.NewDecoder(resp.Body).Decode(&release); err != nil {
-		return "", "", err
-	}
-
-	assetName := supervisorAssetName()
-	for _, asset := range release.Assets {
-		if asset.Name != assetName {
-			continue
-		}
-
-		version := strings.TrimSpace(release.Name)
-		if version == "" {
-			version = strings.TrimSpace(release.TagName)
-		}
-		if version == "" {
-			return "", "", fmt.Errorf("release version missing for %s", assetName)
-		}
-		if strings.TrimSpace(asset.URL) == "" {
-			return "", "", fmt.Errorf("release asset URL missing for %s", assetName)
-		}
-
-		return version, asset.URL, nil
-	}
-
-	return "", "", fmt.Errorf("release asset %q not found", assetName)
-}
-
-func supervisorAssetName() string {
-	suffix := ""
-	if runtime.GOOS == "windows" {
-		suffix = ".exe"
-	}
-	return fmt.Sprintf("sensorium-supervisor-%s-%s%s", runtime.GOOS, runtime.GOARCH, suffix)
-}
-
-func (u *Updater) getLocalSupervisorVersion() string {
-	data, err := os.ReadFile(u.cfg.Paths.SupervisorVersion)
-	if err != nil {
-		return ""
-	}
-	return strings.TrimSpace(string(data))
-}
-
-func (u *Updater) setLocalSupervisorVersion(v string) {
-	os.MkdirAll(u.cfg.DataDir, 0755)
-	if err := atomicWrite(u.cfg.Paths.SupervisorVersion, []byte(v)); err != nil {
-		u.log.Warn("Failed to write supervisor version file: %v", err)
-	}
-}
-
-func (u *Updater) stagePendingSupervisorVersion(v string) error {
-	if err := os.MkdirAll(filepath.Dir(u.cfg.Paths.PendingVersion), 0755); err != nil {
-		return fmt.Errorf("create pending supervisor version dir: %w", err)
-	}
-	if err := atomicWrite(u.cfg.Paths.PendingVersion, []byte(v)); err != nil {
-		return fmt.Errorf("write pending supervisor version: %w", err)
-	}
-	return nil
-}
-
-func (u *Updater) checkSupervisorUpdate(ctx context.Context) {
-	uptime := time.Since(u.startAt)
-	if uptime < u.cfg.MinUptime {
-		u.log.Info("Deferring supervisor update — too early (uptime %v < %v)", uptime.Round(time.Second), u.cfg.MinUptime)
-		return
-	}
-
-	remote, downloadURL, err := u.getSupervisorRelease(ctx)
-	if err != nil {
-		u.log.Warn("Failed to check supervisor release: %v", err)
-		return
-	}
-
-	local := u.getLocalSupervisorVersion()
-	if local == "" {
-		u.log.Info("No local supervisor version recorded — storing %s", remote)
-		u.setLocalSupervisorVersion(remote)
-		return
-	}
-
-	if local == remote {
-		u.log.Debug("Supervisor updater: version %s is up to date", local)
-		return
-	}
-
-	u.log.Info("Supervisor update available: %s → %s", local, remote)
-	coordLock, ok := AcquireUpdateCoordinatorLock(u.cfg.Paths.UpdateApplyLock, updateScopeSupervisor, u.log)
-	if !ok {
-		u.log.Info("Deferring supervisor binary update %s → %s due to active update apply lock", local, remote)
-		return
-	}
-	defer coordLock.Release()
-
-	markFailed := func(err error) {
-		u.state.Transition(updateScopeSupervisor, updatePhaseFailed, remote, local, err.Error())
-	}
-
-	notifyUpdaterOperator(u.cfg, u.log, fmt.Sprintf("⚙️ Supervisor: updating supervisor binary %s → %s. Grace period %v. Supervisor process will restart — MCP server unaffected.", local, remote, u.cfg.GracePeriod), 0)
-
-	select {
-	case <-ctx.Done():
-		markFailed(ctx.Err())
-		return
-	case <-time.After(u.cfg.GracePeriod):
-	}
-
-	if err := u.downloadSupervisorBinary(ctx, downloadURL); err != nil {
-		markFailed(err)
-		u.log.Error("Supervisor binary download failed: %v", err)
-		notifyUpdaterOperator(u.cfg, u.log, fmt.Sprintf("🔴 Supervisor: supervisor binary update to %s failed during download.", remote), 0)
-		return
-	}
-
-	if err := u.stagePendingSupervisorVersion(remote); err != nil {
-		_ = os.Remove(u.cfg.Paths.PendingBinary)
-		markFailed(err)
-		u.log.Error("Failed to stage supervisor version %s: %v", remote, err)
-		notifyUpdaterOperator(u.cfg, u.log, fmt.Sprintf("🔴 Supervisor: supervisor binary update to %s failed during staging.", remote), 0)
-		return
-	}
-	u.state.Transition(updateScopeSupervisor, updatePhaseStaged, remote, local, "")
-	notifyUpdaterOperator(u.cfg, u.log, fmt.Sprintf("⚙️ Supervisor: supervisor binary %s downloaded. Restarting supervisor to apply update — MCP server will continue running.", remote), 0)
-
-	// Reset start time so minimum uptime is re-enforced after restart
-	u.startAt = time.Now()
-
-	isService, err := isWindowsService()
-	if err != nil {
-		markFailed(err)
-		u.log.Error("Failed to detect service mode for restart: %v", err)
-		notifyUpdaterOperator(u.cfg, u.log, "🔴 Supervisor: supervisor binary downloaded but service detection failed.", 0)
-		return
-	}
-	u.state.Transition(updateScopeSupervisor, updatePhaseRestarting, remote, local, "")
-
-	if isService {
-		if err := scheduleServiceRestartForUpdate(u.log); err != nil {
-			markFailed(err)
-			u.log.Error("Failed to schedule service restart: %v", err)
-			notifyUpdaterOperator(u.cfg, u.log, "🔴 Supervisor: supervisor binary downloaded but service restart scheduling failed.", 0)
-		}
-		return
-	}
-
-	if err := requestSupervisorRestart(u.log); err != nil {
-		markFailed(err)
-		u.log.Error("Failed to signal supervisor for restart: %v", err)
-		notifyUpdaterOperator(u.cfg, u.log, "🔴 Supervisor: supervisor binary downloaded but restart signal failed.", 0)
-	}
-}
-
-func (u *Updater) downloadSupervisorBinary(ctx context.Context, downloadURL string) error {
-	if err := os.MkdirAll(u.cfg.Paths.BinaryDir, 0755); err != nil {
-		return fmt.Errorf("create binary dir: %w", err)
-	}
-
-	tmpPath := u.cfg.Paths.PendingBinary + ".download"
-	defer os.Remove(tmpPath)
-
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, downloadURL, nil)
-	if err != nil {
-		return err
-	}
-	req.Header.Set("User-Agent", "sensorium-supervisor-updater")
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("download HTTP %d", resp.StatusCode)
-	}
-
-	f, err := os.OpenFile(tmpPath, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0755)
-	if err != nil {
-		return err
-	}
-
-	written, copyErr := io.Copy(f, resp.Body)
-	closeErr := f.Close()
-	if copyErr != nil {
-		return copyErr
-	}
-	if closeErr != nil {
-		return closeErr
-	}
-	if written <= 0 {
-		return fmt.Errorf("downloaded empty binary")
-	}
-
-	if err := os.Remove(u.cfg.Paths.PendingBinary); err != nil && !os.IsNotExist(err) {
-		return err
-	}
-	if err := os.Rename(tmpPath, u.cfg.Paths.PendingBinary); err != nil {
-		return err
-	}
-
-	u.log.Info("Supervisor binary downloaded to %s (%d bytes)", u.cfg.Paths.PendingBinary, written)
-	return nil
-}
-
-func signalSelf(sig os.Signal) error {
-	proc, err := os.FindProcess(os.Getpid())
-	if err != nil {
-		return err
-	}
-	return proc.Signal(sig)
-}
-
-func requestSupervisorRestart(log *Logger) error {
-	if runtime.GOOS != "windows" {
-		return signalSelf(syscall.SIGTERM)
-	}
-
-	exePath, err := os.Executable()
-	if err != nil {
-		return fmt.Errorf("resolve executable path: %w", err)
-	}
-
-	cmd := exec.Command(exePath)
-	cmd.Env = os.Environ()
-	setSysProcAttr(cmd)
-	if err := cmd.Start(); err != nil {
-		return fmt.Errorf("start replacement supervisor: %w", err)
-	}
-
-	if log != nil {
-		log.Info("Spawned replacement supervisor process PID %d", cmd.Process.Pid)
-	}
-
-	go func() {
-		time.Sleep(2 * time.Second)
-		os.Exit(0)
-	}()
-
-	return nil
-}
-
-func (u *Updater) killServer() {
-	u.log.Info("Updater: stopping current MCP server for update")
-
-	// Ask the MCP server to write a reconnect snapshot before we kill it.
-	// On Windows, taskkill /F doesn't allow graceful shutdown, so this is
-	// the only way the snapshot gets written.
-	u.mcp.PrepareShutdown(context.Background())
-
-	pid, err := ReadPIDFile(u.cfg.Paths.ServerPID)
-	if err != nil {
-		u.log.Warn("Could not read server PID file: %v", err)
-		// Try killing by port as fallback
-		KillByPort(u.cfg.MCPHttpPort, u.log)
-		return
-	}
-	if err := KillProcess(pid, u.log); err != nil {
-		u.log.Error("Failed to kill server (PID %d): %v", pid, err)
-		KillByPort(u.cfg.MCPHttpPort, u.log)
-	}
-}
-
-// clearNpxCache removes the cached sensorium-mcp package from the npx cache
-// so the next `npx -y sensorium-mcp@latest` fetches the new version.
-func (u *Updater) clearNpxCache() {
-	u.log.Info("Updater: clearing npx cache")
-	var base string
-	if runtime.GOOS == "windows" {
-		localAppData := os.Getenv("LOCALAPPDATA")
-		if localAppData == "" {
-			home, _ := os.UserHomeDir()
-			localAppData = filepath.Join(home, "AppData", "Local")
-		}
-		base = filepath.Join(localAppData, "npm-cache", "_npx")
-	} else {
-		home, _ := os.UserHomeDir()
-		base = filepath.Join(home, ".npm", "_npx")
-	}
-
-	u.log.Info("Clearing sensorium-mcp from npx cache (%s)", base)
-
-	entries, err := os.ReadDir(base)
-	if err != nil {
-		return
-	}
-
-	for _, e := range entries {
-		if !e.IsDir() {
-			continue
-		}
-		pkgDir := filepath.Join(base, e.Name(), "node_modules", "sensorium-mcp")
-		// Validate path doesn't escape base directory
-		if !strings.HasPrefix(pkgDir, base+string(os.PathSeparator)) {
-			continue
-		}
-		if _, err := os.Stat(pkgDir); err == nil {
-			if err := os.RemoveAll(pkgDir); err != nil {
-				u.log.Warn("Failed to clear npx cache entry %s: %v", pkgDir, err)
-			}
-		}
-	}
-}

package/supervisor/updater_test.go

@@ -1,64 +0,0 @@
-package main
-
-import (
-	"context"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-)
-
-func TestVerifyUpdatedMCPServerReady_FailureSetsFailedStateAndNoSuccessMessage(t *testing.T) {
-	dir := t.TempDir()
-	log := NewLogger(filepath.Join(dir, "test.log"))
-	defer log.Close()
-
-	cfg := Config{
-		DataDir: dir,
-		Paths: Paths{
-			UpdateState: filepath.Join(dir, "update-state.json"),
-		},
-	}
-
-	u := NewUpdater(cfg, NewMCPClient(1, ""), log)
-	u.state = NewUpdateStateStore(cfg.Paths.UpdateState, log)
-
-	origNotify := notifyUpdaterOperator
-	origPoll := mcpUpdateReadyPollInterval
-	origTimeout := mcpUpdateReadyTimeout
-	defer func() {
-		notifyUpdaterOperator = origNotify
-		mcpUpdateReadyPollInterval = origPoll
-		mcpUpdateReadyTimeout = origTimeout
-	}()
-
-	mcpUpdateReadyPollInterval = 1 * time.Millisecond
-	mcpUpdateReadyTimeout = 5 * time.Millisecond
-
-	var messages []string
-	notifyUpdaterOperator = func(_ Config, _ *Logger, text string, _ int) {
-		messages = append(messages, text)
-	}
-
-	ok := u.verifyUpdatedMCPServerReady(context.Background(), "2.0.0", "1.0.0", 4242)
-	if ok {
-		t.Fatal("expected verification to fail")
-	}
-
-	state, err := u.state.Load()
-	if err != nil {
-		t.Fatalf("load update state: %v", err)
-	}
-	if state.Phase != updatePhaseFailed {
-		t.Fatalf("state phase = %q, want %q", state.Phase, updatePhaseFailed)
-	}
-	if !strings.Contains(state.LastError, "did not become ready") {
-		t.Fatalf("last error = %q, want readiness failure detail", state.LastError)
-	}
-	if len(messages) == 0 {
-		t.Fatal("expected failure notification message")
-	}
-	if strings.Contains(messages[len(messages)-1], "complete") {
-		t.Fatalf("unexpected success message: %q", messages[len(messages)-1])
-	}
-}