fix(workspace): normalize stored directory paths

Store workspace directory paths in a canonical format and normalize lookup paths so notifications can resolve Windows-style workspace paths reliably.

Author: DoSun

server/internal/notification/handlers_test.go

@@ -7,7 +7,6 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/costrict/costrict-web/server/internal/models"
 	"github.com/costrict/costrict-web/server/internal/middleware"
 	"github.com/costrict/costrict-web/server/internal/systemrole"
 	"github.com/gin-gonic/gin"
@@ -24,7 +23,8 @@ func setupNotificationTestDB(t *testing.T) *gorm.DB {
 	}
 	stmts := []string{
 		`CREATE TABLE users (
-			id TEXT PRIMARY KEY,
+			id INTEGER PRIMARY KEY,
+			subject_id TEXT,
 			username TEXT NOT NULL,
 			display_name TEXT,
 			email TEXT,
@@ -96,14 +96,11 @@ func setupNotificationTestDB(t *testing.T) *gorm.DB {
 			t.Fatalf("migrate test db: %v", err)
 		}
 	}
-	seedUsers := []models.User{
-		{ID: "u1", Username: "u1", IsActive: true},
-		{ID: "u2", Username: "u2", IsActive: true},
+	if err := db.Exec(`INSERT INTO users (id, subject_id, username, is_active) VALUES (?, ?, ?, ?)`, 1, "u1", "u1", true).Error; err != nil {
+		t.Fatalf("seed user u1: %v", err)
 	}
-	for _, user := range seedUsers {
-		if err := db.Create(&user).Error; err != nil {
-			t.Fatalf("seed user: %v", err)
-		}
+	if err := db.Exec(`INSERT INTO users (id, subject_id, username, is_active) VALUES (?, ?, ?, ?)`, 2, "u2", "u2", true).Error; err != nil {
+		t.Fatalf("seed user u2: %v", err)
 	}
 	return db
 }
@@ -196,3 +193,53 @@ func TestAdminNotificationRoutesRequirePlatformAdmin(t *testing.T) {
 		t.Fatalf("expected 200, got %d, body=%s", w.Code, w.Body.String())
 	}
 }
+
+func TestGetWorkspaceIDNormalizesWindowsPath(t *testing.T) {
+	db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{Logger: logger.Default.LogMode(logger.Silent)})
+	if err != nil {
+		t.Fatalf("open test db: %v", err)
+	}
+
+	stmts := []string{
+		`CREATE TABLE devices (
+			id TEXT PRIMARY KEY,
+			device_id TEXT NOT NULL,
+			deleted_at DATETIME
+		)`,
+		`CREATE TABLE workspaces (
+			id TEXT PRIMARY KEY,
+			device_id TEXT NOT NULL,
+			deleted_at DATETIME
+		)`,
+		`CREATE TABLE workspace_directories (
+			id TEXT PRIMARY KEY,
+			workspace_id TEXT NOT NULL,
+			path TEXT NOT NULL,
+			deleted_at DATETIME
+		)`,
+	}
+	for _, stmt := range stmts {
+		if err := db.Exec(stmt).Error; err != nil {
+			t.Fatalf("migrate test db: %v", err)
+		}
+	}
+
+	if err := db.Exec(`INSERT INTO devices (id, device_id) VALUES (?, ?)`, "dev-uuid-1", "device-1").Error; err != nil {
+		t.Fatalf("seed device: %v", err)
+	}
+	if err := db.Exec(`INSERT INTO workspaces (id, device_id) VALUES (?, ?)`, "ws-1", "dev-uuid-1").Error; err != nil {
+		t.Fatalf("seed workspace: %v", err)
+	}
+	if err := db.Exec(`INSERT INTO workspace_directories (id, workspace_id, path) VALUES (?, ?, ?)`, "wd-1", "ws-1", "D:/DEV/myclaw").Error; err != nil {
+		t.Fatalf("seed workspace directory: %v", err)
+	}
+
+	svc := NewNotificationService(db, "")
+	workspaceID, err := svc.getWorkspaceID("device-1", `D:\DEV\myclaw`)
+	if err != nil {
+		t.Fatalf("get workspace id: %v", err)
+	}
+	if workspaceID != "ws-1" {
+		t.Fatalf("expected workspace id ws-1, got %s", workspaceID)
+	}
+}

server/internal/notification/service.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/costrict/costrict-web/server/internal/models"
 	"github.com/costrict/costrict-web/server/internal/notification/sender"
+	"github.com/costrict/costrict-web/server/internal/pathutil"
 	"gorm.io/gorm"
 )
 
@@ -63,18 +64,28 @@ func (s *NotificationService) TriggerMessage(userID, eventType string, msg sende
 // 因此需要先 JOIN devices 表进行转换，不能直接用 deviceID 匹配 workspaces.device_id。
 func (s *NotificationService) getWorkspaceID(deviceID, path string) (string, error) {
 	var workspaceID string
+	normalizedPath := pathutil.NormalizeWorkspacePath(path)
 	err := s.db.Table("workspace_directories wd").
 		Select("w.id").
 		Joins("JOIN workspaces w ON w.id = wd.workspace_id").
-		Joins("JOIN devices d ON d.id::text = w.device_id").
-		Where("wd.path = ? AND d.device_id = ?", path, deviceID).
+		Joins("JOIN devices d ON CAST(d.id AS TEXT) = w.device_id").
+		Where("wd.path = ? AND d.device_id = ?", normalizedPath, deviceID).
 		Where("wd.deleted_at IS NULL AND w.deleted_at IS NULL AND d.deleted_at IS NULL").
 		Scan(&workspaceID).Error
+	if err == nil && workspaceID == "" && normalizedPath != path {
+		err = s.db.Table("workspace_directories wd").
+			Select("w.id").
+			Joins("JOIN workspaces w ON w.id = wd.workspace_id").
+			Joins("JOIN devices d ON CAST(d.id AS TEXT) = w.device_id").
+			Where("wd.path = ? AND d.device_id = ?", path, deviceID).
+			Where("wd.deleted_at IS NULL AND w.deleted_at IS NULL AND d.deleted_at IS NULL").
+			Scan(&workspaceID).Error
+	}
 	if err != nil {
 		return "", err
 	}
 	if workspaceID == "" {
-		return "", fmt.Errorf("workspace not found for deviceID=%s, path=%s", deviceID, path)
+		return "", fmt.Errorf("workspace not found for deviceID=%s, path=%s", deviceID, normalizedPath)
 	}
 	return workspaceID, nil
 }

server/internal/pathutil/workspace_path.go

@@ -0,0 +1,28 @@
+package pathutil
+
+import (
+	"path/filepath"
+	"strings"
+)
+
+// NormalizeWorkspacePath standardizes workspace paths so they can be
+// consistently stored and matched across different path separator styles.
+func NormalizeWorkspacePath(p string) string {
+	p = strings.TrimSpace(p)
+	if p == "" {
+		return ""
+	}
+
+	p = filepath.Clean(p)
+	p = filepath.ToSlash(p)
+
+	if p == "/" {
+		return p
+	}
+
+	if len(p) == 3 && p[1] == ':' && p[2] == '/' {
+		return p
+	}
+
+	return strings.TrimSuffix(p, "/")
+}

server/internal/services/workspace_service.go

@@ -1,14 +1,15 @@
 package services
 
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-
-	"github.com/costrict/costrict-web/server/internal/models"
-	"gorm.io/datatypes"
-	"gorm.io/gorm"
-)
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+
+	"github.com/costrict/costrict-web/server/internal/models"
+	"github.com/costrict/costrict-web/server/internal/pathutil"
+	"gorm.io/datatypes"
+	"gorm.io/gorm"
+)
 
 var (
 	ErrWorkspaceNotFound            = errors.New("workspace not found")
@@ -176,14 +177,14 @@ func (s *WorkspaceService) CreateWorkspace(userID string, req CreateWorkspaceReq
 
 	// 创建工作目录
 	hasDefault := false
-	for i, dirReq := range req.Directories {
-		directory := &models.WorkspaceDirectory{
-			WorkspaceID: workspace.ID,
-			Name:        dirReq.Name,
-			Path:        dirReq.Path,
-			IsDefault:   dirReq.IsDefault,
-			OrderIndex:  i,
-		}
+	for i, dirReq := range req.Directories {
+		directory := &models.WorkspaceDirectory{
+			WorkspaceID: workspace.ID,
+			Name:        dirReq.Name,
+			Path:        pathutil.NormalizeWorkspacePath(dirReq.Path),
+			IsDefault:   dirReq.IsDefault,
+			OrderIndex:  i,
+		}
 		if dirReq.Settings != nil {
 			directory.Settings = toDatatypesJSON(dirReq.Settings)
 		}
@@ -417,13 +418,13 @@ func (s *WorkspaceService) AddDirectory(workspaceID, userID string, req CreateDi
 		}
 	}
 
-	directory := &models.WorkspaceDirectory{
-		WorkspaceID: workspaceID,
-		Name:        req.Name,
-		Path:        req.Path,
-		IsDefault:   req.IsDefault,
-		OrderIndex:  maxOrder + 1,
-	}
+	directory := &models.WorkspaceDirectory{
+		WorkspaceID: workspaceID,
+		Name:        req.Name,
+		Path:        pathutil.NormalizeWorkspacePath(req.Path),
+		IsDefault:   req.IsDefault,
+		OrderIndex:  maxOrder + 1,
+	}
 
 	if req.Settings != nil {
 		directory.Settings = toDatatypesJSON(req.Settings)
@@ -468,9 +469,9 @@ func (s *WorkspaceService) UpdateDirectory(workspaceID, directoryID, userID stri
 		updates["name"] = req.Name
 	}
 
-	if req.Path != "" {
-		updates["path"] = req.Path
-	}
+	if req.Path != "" {
+		updates["path"] = pathutil.NormalizeWorkspacePath(req.Path)
+	}
 
 	if req.Settings != nil {
 		updates["settings"] = req.Settings