fix(storage): persist registry origin/provenance on UpstreamRecord (MCP-866)

CI caught the new ServerConfig fields tripping the storage field-coverage
canary (TestSaveServerSyncFieldCoverage) — they were unpersisted. Persist them
so a server's registry origin survives a restart; otherwise a reloaded
custom-origin server would lose its provenance and the skip_quarantine guard
plus the approval/quarantine view would silently stop working.

- Add SourceRegistryID + SourceRegistryProvenance to UpstreamRecord.
- Carry them through every config<->record conversion (async saveServerSync,
  Manager.SaveUpstreamServer, GetUpstreamServer, ListUpstreamServers,
  ListQuarantinedUpstreamServers).
- Extend the field-coverage canary's expectedFields; add a save->reload
  round-trip test (incl. via the quarantine listing).

Fixes the Unit Tests / E2E / Build Binaries CI failures on #573 (all ran
go test ./... and hit the same storage canary). storage suite green with -race;
go build ./... clean; gofmt clean.

Related MCP-866

Co-Authored-By: Paperclip <noreply@paperclip.ing>

Author: Dumbris

internal/storage/async_ops.go

@@ -169,14 +169,14 @@ func (am *AsyncManager) quarantineServerSync(name string, quarantined bool) erro
 
 func (am *AsyncManager) saveServerSync(serverConfig *config.ServerConfig) error {
 	record := &UpstreamRecord{
-		ID:          serverConfig.Name,
-		Name:        serverConfig.Name,
-		URL:         serverConfig.URL,
-		Protocol:    serverConfig.Protocol,
-		Command:     serverConfig.Command,
-		Args:        serverConfig.Args,
-		Env:         serverConfig.Env,
-		WorkingDir:  serverConfig.WorkingDir,
+		ID:                  serverConfig.Name,
+		Name:                serverConfig.Name,
+		URL:                 serverConfig.URL,
+		Protocol:            serverConfig.Protocol,
+		Command:             serverConfig.Command,
+		Args:                serverConfig.Args,
+		Env:                 serverConfig.Env,
+		WorkingDir:          serverConfig.WorkingDir,
 		Enabled:             serverConfig.Enabled,
 		Quarantined:         serverConfig.Quarantined,
 		Headers:             serverConfig.Headers,
@@ -189,6 +189,9 @@ func (am *AsyncManager) saveServerSync(serverConfig *config.ServerConfig) error
 		OAuth:         serverConfig.OAuth,
 		EnabledTools:  serverConfig.EnabledTools,
 		DisabledTools: serverConfig.DisabledTools,
+
+		SourceRegistryID:         serverConfig.SourceRegistryID,
+		SourceRegistryProvenance: serverConfig.SourceRegistryProvenance,
 	}
 	return am.db.SaveUpstream(record)
 }

internal/storage/async_ops_test.go

@@ -248,6 +248,10 @@ func TestSaveServerSyncFieldCoverage(t *testing.T) {
 		"LauncherWaitTimeout": true, // Spec 046: persisted to BBolt so REST-API-added launcher servers survive restarts
 		"EnabledTools":        true, // feat/config-tool-allowlist: persisted to BBolt
 		"DisabledTools":       true, // feat/config-tool-allowlist: persisted to BBolt
+		// MCP-866: persisted to BBolt so a server's registry origin/provenance
+		// (and the custom-origin skip_quarantine guard) survive a restart.
+		"SourceRegistryID":         true,
+		"SourceRegistryProvenance": true,
 	}
 
 	// Get all fields from ServerConfig

internal/storage/manager.go

@@ -104,6 +104,9 @@ func (m *Manager) SaveUpstreamServer(serverConfig *config.ServerConfig) error {
 		LauncherWaitTimeout: serverConfig.LauncherWaitTimeout,
 		EnabledTools:        serverConfig.EnabledTools,
 		DisabledTools:       serverConfig.DisabledTools,
+
+		SourceRegistryID:         serverConfig.SourceRegistryID,
+		SourceRegistryProvenance: serverConfig.SourceRegistryProvenance,
 	}
 
 	return m.db.SaveUpstream(record)
@@ -138,6 +141,9 @@ func (m *Manager) GetUpstreamServer(name string) (*config.ServerConfig, error) {
 		LauncherWaitTimeout: record.LauncherWaitTimeout,
 		EnabledTools:        record.EnabledTools,
 		DisabledTools:       record.DisabledTools,
+
+		SourceRegistryID:         record.SourceRegistryID,
+		SourceRegistryProvenance: record.SourceRegistryProvenance,
 	}, nil
 }
 
@@ -172,6 +178,9 @@ func (m *Manager) ListUpstreamServers() ([]*config.ServerConfig, error) {
 			LauncherWaitTimeout: record.LauncherWaitTimeout,
 			EnabledTools:        record.EnabledTools,
 			DisabledTools:       record.DisabledTools,
+
+			SourceRegistryID:         record.SourceRegistryID,
+			SourceRegistryProvenance: record.SourceRegistryProvenance,
 		})
 	}
 
@@ -220,6 +229,9 @@ func (m *Manager) ListQuarantinedUpstreamServers() ([]*config.ServerConfig, erro
 				Isolation:     record.Isolation,
 				EnabledTools:  record.EnabledTools,
 				DisabledTools: record.DisabledTools,
+
+				SourceRegistryID:         record.SourceRegistryID,
+				SourceRegistryProvenance: record.SourceRegistryProvenance,
 			})
 
 			m.logger.Debugw("Added server to quarantined list",

internal/storage/models.go

@@ -101,6 +101,11 @@ type UpstreamRecord struct {
 	LauncherWaitTimeout config.Duration         `json:"launcher_wait_timeout,omitempty"` // Spec 046: max wait for locally-launched HTTP/SSE upstream URL to become reachable
 	EnabledTools        []string                `json:"enabled_tools,omitempty"`         // Allowlist: only these tools are exposed
 	DisabledTools       []string                `json:"disabled_tools,omitempty"`        // Denylist: these tools are hidden
+	// MCP-866: persist a server's registry origin + provenance so the
+	// approval/quarantine view and the custom-origin skip_quarantine guard
+	// survive a restart.
+	SourceRegistryID         string `json:"source_registry_id,omitempty"`
+	SourceRegistryProvenance string `json:"source_registry_provenance,omitempty"`
 }
 
 // ToolStatRecord represents tool usage statistics

internal/storage/registry_provenance_test.go

@@ -0,0 +1,41 @@
+package storage
+
+import (
+	"testing"
+
+	"github.com/smart-mcp-proxy/mcpproxy-go/internal/config"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"go.uber.org/zap"
+)
+
+// MCP-866: a server's registry origin + provenance must survive a save→reload
+// so the approval/quarantine view and the custom-origin skip_quarantine guard
+// keep working after a restart.
+func TestUpstreamServer_ProvenanceRoundTrips(t *testing.T) {
+	m, err := NewManager(t.TempDir(), zap.NewNop().Sugar())
+	require.NoError(t, err)
+	defer m.Close()
+
+	require.NoError(t, m.SaveUpstreamServer(&config.ServerConfig{
+		Name:                     "acme-widget",
+		Protocol:                 "stdio",
+		Command:                  "npx",
+		Enabled:                  true,
+		Quarantined:              true,
+		SourceRegistryID:         "acme",
+		SourceRegistryProvenance: config.RegistryProvenanceCustom,
+	}))
+
+	got, err := m.GetUpstreamServer("acme-widget")
+	require.NoError(t, err)
+	assert.Equal(t, "acme", got.SourceRegistryID)
+	assert.Equal(t, config.RegistryProvenanceCustom, got.SourceRegistryProvenance)
+
+	// And it surfaces through the quarantine listing (the approval view).
+	q, err := m.ListQuarantinedUpstreamServers()
+	require.NoError(t, err)
+	require.Len(t, q, 1)
+	assert.Equal(t, "acme", q[0].SourceRegistryID)
+	assert.Equal(t, config.RegistryProvenanceCustom, q[0].SourceRegistryProvenance)
+}