refactor: move service wrappers from main.go to their respective packages

Author: joshuapare

CLAUDE.md

@@ -0,0 +1,25 @@
+# Claude Code Guidelines
+
+## Wails Bindings
+
+**Always use the Taskfile task to generate bindings.** Never run `wails3 generate bindings` manually.
+
+```bash
+task bindings
+```
+
+This ensures bindings are generated with the correct flags, output directory (`packages/omniviewdev-runtime/src/bindings`), and cleanup. The raw `wails3` command generates to the wrong location.
+
+## Build & Test
+
+```bash
+GOWORK=off go build .           # Build the Go backend
+GOWORK=off go test ./... -count=1  # Run all Go tests
+task dev                        # Run the full app in dev mode
+```
+
+Use `GOWORK=off` for all Go commands — the module is not in the parent `go.work` file.
+
+## Commits
+
+- Do not add `Co-Authored-By` or any Claude attribution to commits or PRs.

backend/pkg/plugin/adapters.go

@@ -0,0 +1,20 @@
+package plugin
+
+// PluginRefAdapter adapts plugin.Manager to devserver.PluginRef.
+type PluginRefAdapter struct{ Mgr Manager }
+
+func (a *PluginRefAdapter) GetDevPluginInfo(pluginID string) (bool, string, error) {
+	info, err := a.Mgr.GetPlugin(pluginID)
+	if err != nil {
+		return false, "", err
+	}
+	return info.DevMode, info.DevPath, nil
+}
+
+// PluginReloaderAdapter adapts plugin.Manager to devserver.PluginReloader.
+type PluginReloaderAdapter struct{ Mgr Manager }
+
+func (a *PluginReloaderAdapter) ReloadPlugin(id string) error {
+	_, err := a.Mgr.ReloadPlugin(id)
+	return err
+}

backend/pkg/plugin/data/service_wrapper.go

@@ -0,0 +1,39 @@
+package data
+
+import (
+	"context"
+
+	"github.com/wailsapp/wails/v3/pkg/application"
+)
+
+// ServiceWrapper is an explicit delegation wrapper around data.Controller.
+type ServiceWrapper struct {
+	Ctrl Controller
+}
+
+func (s *ServiceWrapper) ServiceStartup(ctx context.Context, options application.ServiceOptions) error {
+	if ss, ok := s.Ctrl.(interface {
+		ServiceStartup(context.Context, application.ServiceOptions) error
+	}); ok {
+		return ss.ServiceStartup(ctx, options)
+	}
+	return nil
+}
+func (s *ServiceWrapper) ServiceShutdown() error {
+	if ss, ok := s.Ctrl.(interface{ ServiceShutdown() error }); ok {
+		return ss.ServiceShutdown()
+	}
+	return nil
+}
+func (s *ServiceWrapper) Get(pluginID, key string) (any, error) {
+	return s.Ctrl.Get(pluginID, key)
+}
+func (s *ServiceWrapper) Set(pluginID, key string, value any) error {
+	return s.Ctrl.Set(pluginID, key, value)
+}
+func (s *ServiceWrapper) Delete(pluginID, key string) error {
+	return s.Ctrl.Delete(pluginID, key)
+}
+func (s *ServiceWrapper) Keys(pluginID string) ([]string, error) {
+	return s.Ctrl.Keys(pluginID)
+}

backend/pkg/plugin/devserver/service_wrapper.go

@@ -0,0 +1,52 @@
+package devserver
+
+import (
+	"context"
+
+	"github.com/wailsapp/wails/v3/pkg/application"
+)
+
+// ServiceWrapper exposes only frontend-safe methods of devserver.DevServerManager.
+// The DevServerManager implements ServiceStartup/ServiceShutdown directly,
+// but registering it raw causes service/model shadowing. This wrapper separates
+// the service identity from the model type.
+type ServiceWrapper struct {
+	Mgr *DevServerManager
+}
+
+func (s *ServiceWrapper) ServiceStartup(ctx context.Context, options application.ServiceOptions) error {
+	return s.Mgr.ServiceStartup(ctx, options)
+}
+func (s *ServiceWrapper) ServiceShutdown() error {
+	return s.Mgr.ServiceShutdown()
+}
+func (s *ServiceWrapper) StartDevServer(pluginID string) (DevServerState, error) {
+	return s.Mgr.StartDevServer(pluginID)
+}
+func (s *ServiceWrapper) StartDevServerForPath(pluginID, devPath string) (DevServerState, error) {
+	return s.Mgr.StartDevServerForPath(pluginID, devPath)
+}
+func (s *ServiceWrapper) StopDevServer(pluginID string) error {
+	return s.Mgr.StopDevServer(pluginID)
+}
+func (s *ServiceWrapper) RestartDevServer(pluginID string) (DevServerState, error) {
+	return s.Mgr.RestartDevServer(pluginID)
+}
+func (s *ServiceWrapper) RebuildPlugin(pluginID string) error {
+	return s.Mgr.RebuildPlugin(pluginID)
+}
+func (s *ServiceWrapper) GetDevServerState(pluginID string) DevServerState {
+	return s.Mgr.GetDevServerState(pluginID)
+}
+func (s *ServiceWrapper) ListDevServerStates() []DevServerState {
+	return s.Mgr.ListDevServerStates()
+}
+func (s *ServiceWrapper) GetDevServerLogs(pluginID string, count int) []LogEntry {
+	return s.Mgr.GetDevServerLogs(pluginID, count)
+}
+func (s *ServiceWrapper) IsManaged(pluginID string) bool {
+	return s.Mgr.IsManaged(pluginID)
+}
+func (s *ServiceWrapper) GetExternalPluginInfo(pluginID string) *DevInfoFile {
+	return s.Mgr.GetExternalPluginInfo(pluginID)
+}

backend/pkg/plugin/exec/service_wrapper.go

@@ -0,0 +1,73 @@
+package exec
+
+import (
+	"context"
+
+	execsdk "github.com/omniviewdev/plugin-sdk/pkg/v1/exec"
+	"github.com/wailsapp/wails/v3/pkg/application"
+)
+
+// ServiceWrapper is an explicit delegation wrapper around exec.Controller.
+// Excluded: OnPluginInit, OnPluginStart, OnPluginStop, OnPluginShutdown,
+//
+//	OnPluginDestroy
+type ServiceWrapper struct {
+	Ctrl Controller
+}
+
+func (s *ServiceWrapper) ServiceStartup(ctx context.Context, options application.ServiceOptions) error {
+	if ss, ok := s.Ctrl.(interface {
+		ServiceStartup(context.Context, application.ServiceOptions) error
+	}); ok {
+		return ss.ServiceStartup(ctx, options)
+	}
+	return nil
+}
+func (s *ServiceWrapper) ServiceShutdown() error {
+	if ss, ok := s.Ctrl.(interface{ ServiceShutdown() error }); ok {
+		return ss.ServiceShutdown()
+	}
+	return nil
+}
+func (s *ServiceWrapper) CreateSession(plugin, connectionID string, opts execsdk.SessionOptions) (*execsdk.Session, error) {
+	return s.Ctrl.CreateSession(plugin, connectionID, opts)
+}
+func (s *ServiceWrapper) CreateTerminal(opts execsdk.SessionOptions) (*execsdk.Session, error) {
+	return s.Ctrl.CreateTerminal(opts)
+}
+func (s *ServiceWrapper) ListSessions() ([]*execsdk.Session, error) {
+	return s.Ctrl.ListSessions()
+}
+func (s *ServiceWrapper) GetSession(sessionID string) (*execsdk.Session, error) {
+	return s.Ctrl.GetSession(sessionID)
+}
+func (s *ServiceWrapper) AttachSession(sessionID string) (*execsdk.Session, []byte, error) {
+	return s.Ctrl.AttachSession(sessionID)
+}
+func (s *ServiceWrapper) DetachSession(sessionID string) (*execsdk.Session, error) {
+	return s.Ctrl.DetachSession(sessionID)
+}
+func (s *ServiceWrapper) WriteSession(sessionID string, data []byte) error {
+	return s.Ctrl.WriteSession(sessionID, data)
+}
+func (s *ServiceWrapper) CloseSession(sessionID string) error {
+	return s.Ctrl.CloseSession(sessionID)
+}
+func (s *ServiceWrapper) ResizeSession(sessionID string, rows, cols uint16) error {
+	return s.Ctrl.ResizeSession(sessionID, rows, cols)
+}
+func (s *ServiceWrapper) GetHandler(plugin, resource string) *execsdk.Handler {
+	return s.Ctrl.GetHandler(plugin, resource)
+}
+func (s *ServiceWrapper) GetHandlers() map[string]map[string]execsdk.Handler {
+	return s.Ctrl.GetHandlers()
+}
+func (s *ServiceWrapper) GetPluginHandlers(plugin string) map[string]execsdk.Handler {
+	return s.Ctrl.GetPluginHandlers(plugin)
+}
+func (s *ServiceWrapper) ListPlugins() ([]string, error) {
+	return s.Ctrl.ListPlugins()
+}
+func (s *ServiceWrapper) HasPlugin(pluginID string) bool {
+	return s.Ctrl.HasPlugin(pluginID)
+}

backend/pkg/plugin/logs/service_wrapper.go

@@ -0,0 +1,58 @@
+package logs
+
+import (
+	"context"
+
+	logssdk "github.com/omniviewdev/plugin-sdk/pkg/v1/logs"
+	"github.com/wailsapp/wails/v3/pkg/application"
+)
+
+// ServiceWrapper is an explicit delegation wrapper around logs.Controller.
+// Excluded: OnPluginInit, OnPluginStart, OnPluginStop, OnPluginShutdown,
+//
+//	OnPluginDestroy
+type ServiceWrapper struct {
+	Ctrl Controller
+}
+
+func (s *ServiceWrapper) ServiceStartup(ctx context.Context, options application.ServiceOptions) error {
+	if ss, ok := s.Ctrl.(interface {
+		ServiceStartup(context.Context, application.ServiceOptions) error
+	}); ok {
+		return ss.ServiceStartup(ctx, options)
+	}
+	return nil
+}
+func (s *ServiceWrapper) ServiceShutdown() error {
+	if ss, ok := s.Ctrl.(interface{ ServiceShutdown() error }); ok {
+		return ss.ServiceShutdown()
+	}
+	return nil
+}
+func (s *ServiceWrapper) GetSupportedResources(pluginID string) []logssdk.Handler {
+	return s.Ctrl.GetSupportedResources(pluginID)
+}
+func (s *ServiceWrapper) CreateSession(plugin, connectionID string, opts logssdk.CreateSessionOptions) (*logssdk.LogSession, error) {
+	return s.Ctrl.CreateSession(plugin, connectionID, opts)
+}
+func (s *ServiceWrapper) GetSession(sessionID string) (*logssdk.LogSession, error) {
+	return s.Ctrl.GetSession(sessionID)
+}
+func (s *ServiceWrapper) ListSessions() ([]*logssdk.LogSession, error) {
+	return s.Ctrl.ListSessions()
+}
+func (s *ServiceWrapper) CloseSession(sessionID string) error {
+	return s.Ctrl.CloseSession(sessionID)
+}
+func (s *ServiceWrapper) SendCommand(sessionID string, cmd logssdk.LogStreamCommand) error {
+	return s.Ctrl.SendCommand(sessionID, cmd)
+}
+func (s *ServiceWrapper) UpdateSessionOptions(sessionID string, opts logssdk.LogSessionOptions) (*logssdk.LogSession, error) {
+	return s.Ctrl.UpdateSessionOptions(sessionID, opts)
+}
+func (s *ServiceWrapper) ListPlugins() ([]string, error) {
+	return s.Ctrl.ListPlugins()
+}
+func (s *ServiceWrapper) HasPlugin(pluginID string) bool {
+	return s.Ctrl.HasPlugin(pluginID)
+}

backend/pkg/plugin/metric/service_wrapper.go

@@ -0,0 +1,59 @@
+package metric
+
+import (
+	"context"
+	"time"
+
+	metricsdk "github.com/omniviewdev/plugin-sdk/pkg/v1/metric"
+	"github.com/wailsapp/wails/v3/pkg/application"
+)
+
+// ServiceWrapper is an explicit delegation wrapper around metric.Controller.
+// Excluded: OnPluginInit, OnPluginStart, OnPluginStop, OnPluginShutdown,
+//
+//	OnPluginDestroy
+type ServiceWrapper struct {
+	Ctrl Controller
+}
+
+func (s *ServiceWrapper) ServiceStartup(ctx context.Context, options application.ServiceOptions) error {
+	if ss, ok := s.Ctrl.(interface {
+		ServiceStartup(context.Context, application.ServiceOptions) error
+	}); ok {
+		return ss.ServiceStartup(ctx, options)
+	}
+	return nil
+}
+func (s *ServiceWrapper) ServiceShutdown() error {
+	if ss, ok := s.Ctrl.(interface{ ServiceShutdown() error }); ok {
+		return ss.ServiceShutdown()
+	}
+	return nil
+}
+func (s *ServiceWrapper) GetProviders() []MetricProviderSummary {
+	return s.Ctrl.GetProviders()
+}
+func (s *ServiceWrapper) GetProvidersForResource(resourceKey string) []MetricProviderSummary {
+	return s.Ctrl.GetProvidersForResource(resourceKey)
+}
+func (s *ServiceWrapper) Query(pluginID, connectionID string, req metricsdk.QueryRequest) (*metricsdk.QueryResponse, error) {
+	return s.Ctrl.Query(pluginID, connectionID, req)
+}
+func (s *ServiceWrapper) QueryAll(connectionID, resourceKey, resourceID, namespace string,
+	resourceData map[string]interface{}, metricIDs []string,
+	shape metricsdk.MetricShape, startTime, endTime time.Time, step time.Duration,
+) (map[string]*metricsdk.QueryResponse, error) {
+	return s.Ctrl.QueryAll(connectionID, resourceKey, resourceID, namespace, resourceData, metricIDs, shape, startTime, endTime, step)
+}
+func (s *ServiceWrapper) Subscribe(pluginID, connectionID string, req SubscribeRequest) (string, error) {
+	return s.Ctrl.Subscribe(pluginID, connectionID, req)
+}
+func (s *ServiceWrapper) Unsubscribe(subscriptionID string) error {
+	return s.Ctrl.Unsubscribe(subscriptionID)
+}
+func (s *ServiceWrapper) ListPlugins() ([]string, error) {
+	return s.Ctrl.ListPlugins()
+}
+func (s *ServiceWrapper) HasPlugin(pluginID string) bool {
+	return s.Ctrl.HasPlugin(pluginID)
+}

backend/pkg/plugin/networker/service_wrapper.go

@@ -0,0 +1,58 @@
+package networker
+
+import (
+	"context"
+
+	networkersdk "github.com/omniviewdev/plugin-sdk/pkg/v1/networker"
+	"github.com/wailsapp/wails/v3/pkg/application"
+)
+
+// ServiceWrapper is an explicit delegation wrapper around networker.Controller.
+// Excluded: OnPluginInit, OnPluginStart, OnPluginStop, OnPluginShutdown,
+//
+//	OnPluginDestroy
+type ServiceWrapper struct {
+	Ctrl Controller
+}
+
+func (s *ServiceWrapper) ServiceStartup(ctx context.Context, options application.ServiceOptions) error {
+	if ss, ok := s.Ctrl.(interface {
+		ServiceStartup(context.Context, application.ServiceOptions) error
+	}); ok {
+		return ss.ServiceStartup(ctx, options)
+	}
+	return nil
+}
+func (s *ServiceWrapper) ServiceShutdown() error {
+	if ss, ok := s.Ctrl.(interface{ ServiceShutdown() error }); ok {
+		return ss.ServiceShutdown()
+	}
+	return nil
+}
+func (s *ServiceWrapper) GetSupportedPortForwardTargets(pluginID string) ([]string, error) {
+	return s.Ctrl.GetSupportedPortForwardTargets(pluginID)
+}
+func (s *ServiceWrapper) GetPortForwardSession(sessionID string) (*networkersdk.PortForwardSession, error) {
+	return s.Ctrl.GetPortForwardSession(sessionID)
+}
+func (s *ServiceWrapper) ListPortForwardSessions(pluginID, connectionID string) ([]*networkersdk.PortForwardSession, error) {
+	return s.Ctrl.ListPortForwardSessions(pluginID, connectionID)
+}
+func (s *ServiceWrapper) ListAllPortForwardSessions() ([]*networkersdk.PortForwardSession, error) {
+	return s.Ctrl.ListAllPortForwardSessions()
+}
+func (s *ServiceWrapper) FindPortForwardSessions(pluginID, connectionID string, request networkersdk.FindPortForwardSessionRequest) ([]*networkersdk.PortForwardSession, error) {
+	return s.Ctrl.FindPortForwardSessions(pluginID, connectionID, request)
+}
+func (s *ServiceWrapper) StartResourcePortForwardingSession(pluginID, connectionID string, opts networkersdk.PortForwardSessionOptions) (*networkersdk.PortForwardSession, error) {
+	return s.Ctrl.StartResourcePortForwardingSession(pluginID, connectionID, opts)
+}
+func (s *ServiceWrapper) ClosePortForwardSession(sessionID string) (*networkersdk.PortForwardSession, error) {
+	return s.Ctrl.ClosePortForwardSession(sessionID)
+}
+func (s *ServiceWrapper) ListPlugins() ([]string, error) {
+	return s.Ctrl.ListPlugins()
+}
+func (s *ServiceWrapper) HasPlugin(pluginID string) bool {
+	return s.Ctrl.HasPlugin(pluginID)
+}