From 304bf25bf14bcbbbb35cf0d725c1100c730aa854 Mon Sep 17 00:00:00 2001
From: Levi Neely <lkn@darkstar.example.net>
Date: Wed, 18 Mar 2026 23:07:45 +0100
Subject: [PATCH] resolve prjdir from worktree/workspace dir

---
 internal/p9/beads.go | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/internal/p9/beads.go b/internal/p9/beads.go
index 636c594..3cdca55 100644
--- a/internal/p9/beads.go
+++ b/internal/p9/beads.go
@@ -170,20 +170,33 @@ func (b *BeadsFS) Mount(name, cwd string) error {
 	} else if err != nil {
 		return fmt.Errorf("failed to stat directory: %w", err)
 	}
-	// Validate mount depth: must be exactly 1 level deep from a project dir
+	// Resolve and validate mount path against project dirs.
+	// Must be exactly 1 level deep from a project dir.
+	// If 2 levels deep (immediate child of a valid prjdir), resolve up to the prjdir.
 	if len(config.ProjectDirs) > 0 {
-		valid := false
+		resolved := false
 		for _, dir := range config.ProjectDirs {
-			if strings.HasPrefix(cwd, dir+"/") {
-				rel := strings.TrimPrefix(cwd, dir+"/")
-				if !strings.Contains(rel, "/") && rel != "" {
-					valid = true
-					break
+			if !strings.HasPrefix(cwd, dir+"/") {
+				continue
+			}
+			rel := strings.TrimPrefix(cwd, dir+"/")
+			parts := strings.SplitN(rel, "/", 3)
+			switch len(parts) {
+			case 1:
+				if parts[0] != "" {
+					resolved = true
 				}
+			case 2:
+				// Immediate child of prjdir — resolve up
+				cwd = filepath.Join(dir, parts[0])
+				resolved = true
+			}
+			if resolved {
+				break
 			}
 		}
-		if !valid {
-			return fmt.Errorf("mount path must be exactly 1 level deep from project dirs (%v)", config.ProjectDirs)
+		if !resolved {
+			return fmt.Errorf("mount path must be at most 1 level below a project dir (%v)", config.ProjectDirs)
 		}
 	}
 	// Reject if cwd is a git worktree (not the main repo)