Merge pull request #141 from gruntwork-io/josh-padnick/m4-mutating-streaming-services

[Wails] M4: Forward PR #139 into feat/wails-rewrite

Author: josh-padnick

services/services.go

@@ -64,7 +64,7 @@ func NewServices(initialPath string, emitter ports.Emitter) (*Services, error) {
 		Boilerplate:    &BoilerplateService{servers: servers},
 		Tf:             &TfService{servers: servers},
 		GeneratedFiles: &GeneratedFilesService{servers: servers},
-		Workspace:      &WorkspaceService{},
+		Workspace:      &WorkspaceService{servers: servers},
 		Exec:           NewExecService(servers, emitter),
 		Aws:            NewAwsService(servers, adapters.NewSdkAwsClient()),
 		GitHub:         NewGitHubService(servers, adapters.NewHttpGitHubClient()),

services/workspace_service.go

@@ -1,18 +1,20 @@
 package services
 
 import (
+	"fmt"
+
 	"github.com/gruntwork-io/runbooks/api"
 )
 
-// WorkspaceService exposes the read-only workspace introspection
-// endpoints to the frontend over Wails IPC. These are used by the
-// Workspace, RepositoryFileBrowser, ChangedFilesView, DirPicker and
-// GitHubPullRequest components.
-//
-// Stateful actions (register/set-active worktree) stay on the HTTP
-// path through M3 because they mutate SessionManager; they'll move
-// over in M4 alongside the exec migration.
-type WorkspaceService struct{}
+// WorkspaceService exposes workspace introspection + worktree
+// registration to the frontend over Wails IPC. Read-only methods
+// (Tree, Dirs, File, Changes) are session-agnostic and take only a
+// path; mutating methods (Register, SetActive) require a session
+// token so they match the HTTP path's SessionAuthMiddleware
+// semantics.
+type WorkspaceService struct {
+	servers *serverManager
+}
 
 // ServiceName satisfies the optional application.ServiceName interface.
 func (s *WorkspaceService) ServiceName() string {
@@ -44,3 +46,51 @@ func (s *WorkspaceService) File(absPath string) (*api.WorkspaceFileResponse, err
 func (s *WorkspaceService) Changes(absPath, singleFile string) (*api.WorkspaceChangesResponse, error) {
 	return api.GetWorkspaceChanges(absPath, singleFile)
 }
+
+// Register adds a worktree path to the session's registered worktree
+// list. Matches POST /api/workspace/register — used by
+// GitWorkTreeContext when a clone completes or a worktree is discovered
+// on session bootstrap.
+func (s *WorkspaceService) Register(sessionID, path string) error {
+	sessions, err := s.authed(sessionID)
+	if err != nil {
+		return err
+	}
+	if path == "" {
+		return fmt.Errorf("path is required")
+	}
+	sessions.RegisterWorkTreePath(path)
+	return nil
+}
+
+// SetActive sets the explicitly selected active worktree path.
+// Matches POST /api/workspace/set-active — used when the user
+// switches worktrees in the UI so that target="worktree" templates
+// and REPO_FILES resolve against the selected repo.
+func (s *WorkspaceService) SetActive(sessionID, path string) error {
+	sessions, err := s.authed(sessionID)
+	if err != nil {
+		return err
+	}
+	if path == "" {
+		return fmt.Errorf("path is required")
+	}
+	sessions.SetActiveWorkTreePath(path)
+	return nil
+}
+
+// authed mirrors SessionService.authed: resolve the gruntbook's
+// SessionManager and verify the caller's token before any mutation.
+func (s *WorkspaceService) authed(sessionID string) (*api.SessionManager, error) {
+	sessions := s.servers.Sessions()
+	if sessions == nil {
+		return nil, fmt.Errorf("no gruntbook is open")
+	}
+	if sessionID == "" {
+		return nil, fmt.Errorf("missing session token")
+	}
+	if _, ok := sessions.ValidateToken(sessionID); !ok {
+		return nil, fmt.Errorf("invalid or expired session token")
+	}
+	return sessions, nil
+}

web/src/bindings/github.com/gruntwork-io/runbooks/services/workspaceservice.ts

@@ -2,14 +2,12 @@
 // This file is automatically generated. DO NOT EDIT
 
 /**
- * WorkspaceService exposes the read-only workspace introspection
- * endpoints to the frontend over Wails IPC. These are used by the
- * Workspace, RepositoryFileBrowser, ChangedFilesView, DirPicker and
- * GitHubPullRequest components.
- * 
- * Stateful actions (register/set-active worktree) stay on the HTTP
- * path through M3 because they mutate SessionManager; they'll move
- * over in M4 alongside the exec migration.
+ * WorkspaceService exposes workspace introspection + worktree
+ * registration to the frontend over Wails IPC. Read-only methods
+ * (Tree, Dirs, File, Changes) are session-agnostic and take only a
+ * path; mutating methods (Register, SetActive) require a session
+ * token so they match the HTTP path's SessionAuthMiddleware
+ * semantics.
  * @module
  */
 
@@ -52,6 +50,26 @@ export function File(absPath: string): $CancellablePromise<api$0.WorkspaceFileRe
     });
 }
 
+/**
+ * Register adds a worktree path to the session's registered worktree
+ * list. Matches POST /api/workspace/register — used by
+ * GitWorkTreeContext when a clone completes or a worktree is discovered
+ * on session bootstrap.
+ */
+export function Register(sessionID: string, path: string): $CancellablePromise<void> {
+    return $Call.ByID(1188286724, sessionID, path);
+}
+
+/**
+ * SetActive sets the explicitly selected active worktree path.
+ * Matches POST /api/workspace/set-active — used when the user
+ * switches worktrees in the UI so that target="worktree" templates
+ * and REPO_FILES resolve against the selected repo.
+ */
+export function SetActive(sessionID: string, path: string): $CancellablePromise<void> {
+    return $Call.ByID(1521614913, sessionID, path);
+}
+
 /**
  * Tree returns the structure-only file tree (plus git metadata) for
  * an absolute workspace path. Callers must pass an absolute path —