sensorium-mcp 3.0.4 → 3.0.6

package/supervisor/config.go

@@ -1,253 +0,0 @@
-package main
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-	"time"
-
-	sv "github.com/andriyshevchenko/SecureVault/securevault-go"
-)
-
-// Config holds all supervisor configuration, sourced from environment variables
-// with sensible defaults matching the TypeScript watcher-service.ts CONFIG object.
-type Config struct {
-	// Watcher
-	Mode               string
-	PollAtHour         int
-	PollInterval       time.Duration
-	GracePeriod        time.Duration
-	MinUptime          time.Duration
-	MCPStartCommand    string
-	HostMode           string
-	DataDir            string
-	KeyringService     string
-	SecureVaultProfile string
-	SecureVaultBaseDir string
-	MCPHttpPort        int
-	MCPHttpSecret      string
-	TelegramToken      string
-	TelegramChatID     string
-	HealthFailThresh   int
-	ResolvedProfileEnv map[string]string
-
-	// Keeper defaults
-	KeeperBaseBackoff         time.Duration
-	KeeperMaxBackoff          time.Duration
-	KeeperHealthCheckInterval time.Duration
-	KeeperMaxRetries          int
-	KeeperCooldown            time.Duration
-	KeeperReadyPollInterval   time.Duration
-	KeeperReadyTimeout        time.Duration
-	FastExitThreshold         time.Duration
-	FastExitMaxCount          int
-	FastExitBaseCooldown      time.Duration
-	FastExitMaxCooldown       time.Duration
-	StuckThreshold            time.Duration
-
-	// Derived paths
-	Paths Paths
-}
-
-// Paths holds all filesystem paths derived from DataDir.
-type Paths struct {
-	BinaryDir         string
-	MaintenanceFlag   string
-	VersionFile       string
-	SupervisorVersion string
-	UpdateState       string
-	UpdateApplyLock   string
-	PendingBinary     string
-	PendingVersion    string
-	LastActivity      string
-	MCPStderrLog      string
-	ServerPID         string
-	WatcherLock       string
-	WatcherLog        string
-	PIDsDir           string
-	HeartbeatsDir     string
-}
-
-func LoadConfig(runningAsService bool) Config {
-	dataDir := filepath.Join(homeDir(), ".remote-copilot-mcp")
-
-	mode := envOr("WATCHER_MODE", "development")
-	graceDef := 300
-	if mode == "development" {
-		graceDef = 10
-	}
-
-	c := Config{
-		Mode:               mode,
-		PollAtHour:         envInt("WATCHER_POLL_HOUR", 4),
-		PollInterval:       time.Duration(envInt("WATCHER_POLL_INTERVAL", 60)) * time.Second,
-		GracePeriod:        time.Duration(envInt("WATCHER_GRACE_PERIOD", graceDef)) * time.Second,
-		MinUptime:          600 * time.Second,
-		MCPStartCommand:    envOr("MCP_START_COMMAND", "npx -y sensorium-mcp@latest"),
-		HostMode:           parseHostMode(os.Getenv("HOST_MODE"), runningAsService),
-		DataDir:            dataDir,
-		KeyringService:     envOr("SUPERVISOR_KEYRING_SERVICE", defaultKeyringService),
-		SecureVaultProfile: os.Getenv("SUPERVISOR_SECUREVAULT_PROFILE"),
-		SecureVaultBaseDir: os.Getenv("SUPERVISOR_SECUREVAULT_BASEDIR"),
-		HealthFailThresh:   3,
-
-		KeeperBaseBackoff:         5 * time.Second,
-		KeeperMaxBackoff:          5 * time.Minute,
-		KeeperHealthCheckInterval: 2 * time.Minute,
-		KeeperMaxRetries:          5,
-		KeeperCooldown:            5 * time.Minute,
-		KeeperReadyPollInterval:   3 * time.Second,
-		KeeperReadyTimeout:        2 * time.Minute,
-		FastExitThreshold:         60 * time.Second,
-		FastExitMaxCount:          3,
-		FastExitBaseCooldown:      10 * time.Minute,
-		FastExitMaxCooldown:       4 * time.Hour,
-		StuckThreshold:            time.Duration(envInt("KEEPER_STUCK_THRESHOLD_MIN", 30)) * time.Minute,
-
-		Paths: Paths{
-			BinaryDir:         filepath.Join(dataDir, "bin"),
-			MaintenanceFlag:   filepath.Join(dataDir, "maintenance.flag"),
-			VersionFile:       filepath.Join(dataDir, "current-version.txt"),
-			SupervisorVersion: filepath.Join(dataDir, "supervisor-version.txt"),
-			UpdateState:       filepath.Join(dataDir, "update-state.json"),
-			UpdateApplyLock:   filepath.Join(dataDir, "update-apply.lock"),
-			PendingBinary:     filepath.Join(dataDir, "bin", "sensorium-supervisor.new.exe"),
-			PendingVersion:    filepath.Join(dataDir, "bin", "sensorium-supervisor.new.exe.version"),
-			LastActivity:      filepath.Join(dataDir, "last-activity.txt"),
-			MCPStderrLog:      filepath.Join(dataDir, "mcp-stderr.log"),
-			ServerPID:         filepath.Join(dataDir, "server.pid"),
-			WatcherLock:       filepath.Join(dataDir, "watcher.lock"),
-			WatcherLog:        filepath.Join(dataDir, "watcher.log"),
-			PIDsDir:           filepath.Join(dataDir, "pids"),
-			HeartbeatsDir:     filepath.Join(dataDir, "heartbeats"),
-		},
-	}
-
-	// Use the full chain (env → SecureVault → keyring) when a profile is configured;
-	// otherwise fall back to the plain env → keyring path.
-	if c.SecureVaultProfile != "" {
-		c.ResolvedProfileEnv = resolveProfileEnv(c.SecureVaultProfile, c.SecureVaultBaseDir)
-		c.MCPHttpPort = resolveIntChain("MCP_HTTP_PORT", c.SecureVaultProfile, c.SecureVaultBaseDir, c.KeyringService, 0)
-		c.MCPHttpSecret = resolveStringChain("MCP_HTTP_SECRET", c.SecureVaultProfile, c.SecureVaultBaseDir, c.KeyringService)
-		c.TelegramToken = resolveStringChain("TELEGRAM_TOKEN", c.SecureVaultProfile, c.SecureVaultBaseDir, c.KeyringService)
-		c.TelegramChatID = resolveStringChain("TELEGRAM_CHAT_ID", c.SecureVaultProfile, c.SecureVaultBaseDir, c.KeyringService)
-	} else {
-		c.ResolvedProfileEnv = map[string]string{}
-		c.MCPHttpPort = resolveIntWithKeyring("MCP_HTTP_PORT", c.KeyringService, 0)
-		c.MCPHttpSecret = resolveSecretWithKeyring("MCP_HTTP_SECRET", c.KeyringService)
-		c.TelegramToken = resolveSecretWithKeyring("TELEGRAM_TOKEN", c.KeyringService)
-		c.TelegramChatID = resolveSecretWithKeyring("TELEGRAM_CHAT_ID", c.KeyringService)
-	}
-
-	return c
-}
-
-func homeDir() string {
-	h, err := os.UserHomeDir()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "FATAL: cannot determine home directory: %v\n", err)
-		os.Exit(1)
-	}
-	return h
-}
-
-func envOr(key, fallback string) string {
-	if v := os.Getenv(key); v != "" {
-		return v
-	}
-	return fallback
-}
-
-func envInt(key string, fallback int) int {
-	s := os.Getenv(key)
-	if s == "" {
-		return fallback
-	}
-	v, err := strconv.Atoi(s)
-	if err != nil {
-		return fallback
-	}
-	return v
-}
-
-func parseHostMode(value string, runningAsService bool) string {
-	normalized := strings.ToLower(strings.TrimSpace(value))
-	if runningAsService {
-		if normalized == "" || normalized == "service" {
-			return "service"
-		}
-		if normalized == "task" {
-			fmt.Fprintf(os.Stderr, "WARN: HOST_MODE=%q ignored because process is running as a Windows service; forcing \"service\"\n", value)
-		} else {
-			fmt.Fprintf(os.Stderr, "WARN: invalid HOST_MODE=%q ignored because process is running as a Windows service; forcing \"service\" (allowed: task|service)\n", value)
-		}
-		return "service"
-	}
-
-	if normalized == "" {
-		return "task"
-	}
-
-	switch normalized {
-	case "task", "service":
-		return normalized
-	default:
-		fmt.Fprintf(os.Stderr, "WARN: invalid HOST_MODE=%q (allowed: task|service); using default \"task\"\n", value)
-		return "task"
-	}
-}
-
-func resolveProfileEnv(profileName, baseDir string) map[string]string {
-	resolved := map[string]string{}
-	if strings.TrimSpace(profileName) == "" {
-		return resolved
-	}
-
-	store := sv.NewStore(baseDir)
-	vals, err := store.ResolveProfile(profileName)
-	if err != nil {
-		if errors.Is(err, sv.ErrNotFound) || errors.Is(err, sv.ErrUnsupportedPlatform) {
-			return resolved
-		}
-		fmt.Fprintf(os.Stderr, "WARN: failed to resolve SecureVault profile %q: %v\n", profileName, err)
-		return resolved
-	}
-
-	for k, v := range vals {
-		if !isAllowedProfileEnvKey(k) {
-			fmt.Fprintf(os.Stderr, "WARN: skipping unsafe profile env key %q\n", k)
-			continue
-		}
-		if envVal := os.Getenv(k); envVal != "" {
-			resolved[k] = envVal
-			continue
-		}
-		resolved[k] = v
-	}
-
-	return resolved
-}
-
-var profileEnvKeyPattern = regexp.MustCompile(`^[A-Z_][A-Z0-9_]*$`)
-
-var deniedProfileEnvKeys = map[string]struct{}{
-	"PATH":         {},
-	"PATHEXT":      {},
-	"COMSPEC":      {},
-	"SYSTEMROOT":   {},
-	"WINDIR":       {},
-	"NODE_OPTIONS": {},
-}
-
-func isAllowedProfileEnvKey(key string) bool {
-	trimmed := strings.TrimSpace(key)
-	if !profileEnvKeyPattern.MatchString(trimmed) {
-		return false
-	}
-	_, denied := deniedProfileEnvKeys[trimmed]
-	return !denied
-}

package/supervisor/config_test.go

@@ -1,78 +0,0 @@
-package main
-
-import "testing"
-
-func TestParseHostMode_DefaultsAndValidation(t *testing.T) {
-	tests := []struct {
-		name             string
-		value            string
-		runningAsService bool
-		want             string
-	}{
-		{
-			name:             "empty defaults to service when running as service",
-			value:            "",
-			runningAsService: true,
-			want:             "service",
-		},
-		{
-			name:             "empty defaults to task when not running as service",
-			value:            "",
-			runningAsService: false,
-			want:             "task",
-		},
-		{
-			name:             "invalid falls back to service default for service mode",
-			value:            "invalid",
-			runningAsService: true,
-			want:             "service",
-		},
-		{
-			name:             "invalid falls back to task default for task mode",
-			value:            "invalid",
-			runningAsService: false,
-			want:             "task",
-		},
-		{
-			name:             "valid task accepted",
-			value:            "task",
-			runningAsService: true,
-			want:             "service",
-		},
-		{
-			name:             "valid service accepted",
-			value:            "service",
-			runningAsService: false,
-			want:             "service",
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			got := parseHostMode(tc.value, tc.runningAsService)
-			if got != tc.want {
-				t.Fatalf("parseHostMode(%q, runningAsService=%v) = %q, want %q", tc.value, tc.runningAsService, got, tc.want)
-			}
-		})
-	}
-}
-
-func TestIsAllowedProfileEnvKey(t *testing.T) {
-	tests := []struct {
-		key  string
-		want bool
-	}{
-		{key: "TELEGRAM_TOKEN", want: true},
-		{key: "MCP_HTTP_PORT", want: true},
-		{key: "PATH", want: false},
-		{key: "NODE_OPTIONS", want: false},
-		{key: "bad-key", want: false},
-		{key: "1BAD", want: false},
-	}
-
-	for _, tc := range tests {
-		if got := isAllowedProfileEnvKey(tc.key); got != tc.want {
-			t.Fatalf("isAllowedProfileEnvKey(%q) = %v, want %v", tc.key, got, tc.want)
-		}
-	}
-}

package/supervisor/go.mod

@@ -1,15 +0,0 @@
-module github.com/andriyshevchenko/sensorium-supervisor
-
-go 1.22
-
-require (
-	github.com/zalando/go-keyring v0.2.8
-	golang.org/x/sys v0.30.0
-)
-
-require github.com/andriyshevchenko/SecureVault/securevault-go v0.1.2
-
-require (
-	github.com/danieljoos/wincred v1.2.3 // indirect
-	github.com/godbus/dbus/v5 v5.2.2 // indirect
-)

package/supervisor/go.sum

@@ -1,20 +0,0 @@
-github.com/andriyshevchenko/SecureVault/securevault-go v0.1.2 h1:4PyakSOgHmBnN0Oqapoh3/Ik92fvmR8R2ksE5qCXXOE=
-github.com/andriyshevchenko/SecureVault/securevault-go v0.1.2/go.mod h1:oEb5uTPCvex+efofFySxxbe55z13LbAO3JSaxcjVq2Q=
-github.com/danieljoos/wincred v1.2.3 h1:v7dZC2x32Ut3nEfRH+vhoZGvN72+dQ/snVXo/vMFLdQ=
-github.com/danieljoos/wincred v1.2.3/go.mod h1:6qqX0WNrS4RzPZ1tnroDzq9kY3fu1KwE7MRLQK4X0bs=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=
-github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/zalando/go-keyring v0.2.8 h1:6sD/Ucpl7jNq10rM2pgqTs0sZ9V3qMrqfIIy5YPccHs=
-github.com/zalando/go-keyring v0.2.8/go.mod h1:tsMo+VpRq5NGyKfxoBVjCuMrG47yj8cmakZDO5QGii0=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=