⭐️⭐️⭐️ Open-source, self-hosted alternative to Linear and Plane. Project management and issue tracking where teams and AI agents work side by side to plan and ship products.
TypeScript agenticagileai-agentsbug-reportingbug-trackerganttissue-trackerjirajira-alternativekanbanlinearlinear-alternativeopen-sourceproduct-managementproject-managementroadmapself-hostedsprint-planningteam-collaborationtrello-alternative
feat: give workspace owners and admins access to every team and project (#483)
Croffc29acdf0f4f4
diff --git a/apps/api/AGENTS.md b/apps/api/AGENTS.mdindex 4856c814..5c5c0052 100644--- a/apps/api/AGENTS.md+++ b/apps/api/AGENTS.md@@ -103,9 +103,21 @@ Enforced declaratively through macros, never imperative calls in handlers.`user` on context, throws 401 with none. `planner.ts` gates every planner route;a feature also `.use(authContext)` when its handlers/macros reference `user`. An`x-api-key` header resolves through `getSession` — no special-casing.-- **Membership:** access is strictly by a `project_member` row (`owner` | `member`).- Owners bypass the permission matrix; the global `user.role` (`god` | `user`) does- **not**. Keep at least one owner per project.+- **Membership:** access is by a `project_member` row (`owner` | `member`), raised by+ the caller's role in the workspace that holds the project. Owners bypass the+ permission matrix; the global `user.role` (`god` | `user`) does **not**. Keep at least+ one owner per project.+- **Workspace roles reach every team and project of the workspace** without a membership+ row: the owner as an owner of each, an admin with a matrix that only reads. The table+ is `shared/workspace-roles.ts`; `setWorkspaceRoleGrant(role, grant)` changes what a role+ grants or adds a role, for a build that has more. `getProjectAccess` and+ `getTeamAccess` in `shared/access.ts` merge the membership with the grant, and every+ guard reads them. The lists that decide what the caller sees — `listProjects`, the+ team list, `readRevs` — take the reached teams the same way, and answer `via:+ 'workspace'` for what the caller reaches only through the workspace. Everything that+ asks whether *someone else* is a member — assignees, mentions, watchers, notification+ recipients, seats, the last-owner check, SCIM — still reads the rows, so a workspace+ manager is in none of the member lists, gets no notifications and takes no seat.- **`:projectKey` routes:** `.use(guards)` and set `permission: ["<resource>","<action>"]` / `projectMember: true` / `projectOwner: true`; read the resolved`project` from context.diff --git a/apps/api/src/modules/documents/index.ts b/apps/api/src/modules/documents/index.tsindex 71f12f55..a9df955a 100644--- a/apps/api/src/modules/documents/index.ts+++ b/apps/api/src/modules/documents/index.ts@@ -1,13 +1,12 @@import { documentCollaborationRoutes } from './collaboration-routes';import { Elysia, t } from 'elysia';import { authContext } from '#shared/auth-context';-import { assertPermission, requireUser } from '#shared/access';+import { assertPermission, getProjectAccess, requireUser } from '#shared/access';import { guards } from '#shared/guards';import { noContent } from '#shared/http';import { HttpError } from '#shared/lib';import { mcpTool } from '#mcp/generate';import { commonErrors, errors } from '#shared/responses';-import { getMembership } from '#modules/members/service';import { rawAttachmentQuery } from '#modules/attachments/model';import {assertAttachmentUploadAllowed,@@ -102,7 +101,7 @@ function documentAssetDto(}async function isProjectOwner(projectId: number, userId: string): Promise<boolean> {- return (await getMembership(projectId, userId)) === 'owner';+ return (await getProjectAccess(projectId, userId))?.role === 'owner';}export const documentRoutes = new Elysia({diff --git a/apps/api/src/modules/invites/service.ts b/apps/api/src/modules/invites/service.tsindex 5133640d..01235483 100644--- a/apps/api/src/modules/invites/service.ts+++ b/apps/api/src/modules/invites/service.ts@@ -1,6 +1,7 @@import { db, teamInvite, teamMember, projectMember, teamRole, team, project, user } from '@repo/db';import { and, desc, eq, inArray, sql } from 'drizzle-orm';import { HttpError, iso, pgErrorCode } from '#shared/lib';+import { getProjectAccess, getTeamAccess } from '#shared/access';import { teamRef } from '#modules/teams/ref';import { getMembership, type MemberRole } from '#modules/members/service';import { assertSeatFree, getTeamMembership, runsTeam, type TeamRole } from '#modules/teams/service';@@ -199,10 +200,10 @@ export async function mayGrantInviteRanks(if (!grantsTeamRank && !grantsProjectOwner) return true;if (!senderId) return false;- const standing = await getTeamMembership(invite.teamId, senderId);+ const standing = (await getTeamAccess(invite.teamId, senderId))?.role ?? null;if (grantsTeamRank && standing !== 'owner') return false;if (grantsProjectOwner && !runsTeam(standing)) {- return (await getMembership(invite.projectId!, senderId)) === 'owner';+ return (await getProjectAccess(invite.projectId!, senderId))?.role === 'owner';}return true;}diff --git a/apps/api/src/modules/note-boards/index.ts b/apps/api/src/modules/note-boards/index.tsindex c1033d30..958b83b9 100644--- a/apps/api/src/modules/note-boards/index.ts+++ b/apps/api/src/modules/note-boards/index.ts@@ -2,8 +2,7 @@ import { Elysia, t } from 'elysia';import { noContent } from '#shared/http';import { guards } from '#shared/guards';import { authContext } from '#shared/auth-context';-import { requireUser } from '#shared/access';-import { getMembership } from '#modules/members/service';+import { getProjectAccess, requireUser } from '#shared/access';import { HttpError } from '#shared/lib';import { mcpTool } from '#mcp/generate';import { accessErrors, commonErrors } from '#shared/responses';@@ -212,7 +211,7 @@ export const noteBoardRoutes = new Elysia({if (!board || board.projectId !== project.id) throw new HttpError(404, 'Board not found');// A project owner deletes any board, a private one included: the board of a// member who left the project would otherwise stay for good.- if ((await getMembership(project.id, userId)) !== 'owner') {+ if ((await getProjectAccess(project.id, userId))?.role !== 'owner') {assertBoardVisible(board, userId);// A private or restricted board belongs to the member who made it, and// being granted a view of one does not carry deleting it. A public boarddiff --git a/apps/api/src/modules/projects/copy.ts b/apps/api/src/modules/projects/copy.tsindex 3d3ed3c5..e119b691 100644--- a/apps/api/src/modules/projects/copy.ts+++ b/apps/api/src/modules/projects/copy.ts@@ -21,6 +21,7 @@ import { HttpError } from '#shared/lib';import {DEFAULT_COLUMNS,getProjectById,+ joinTeamAsCreator,mapProject,targetTeam,type ProjectRow,@@ -291,6 +292,7 @@ export async function copyProject(teamSlug: ownerTeam.slug,teamMcpEnabled: ownerTeam.mcpEnabled,});+ await joinTeamAsCreator(tx, ownerTeam.id, ownerId);await tx.insert(projectMember).values({ projectId: proj.id, userId: ownerId, role: 'owner' });// States (columns). When copied, every source column is carried over so views,diff --git a/apps/api/src/modules/projects/index.ts b/apps/api/src/modules/projects/index.tsindex 8e22478b..77c58693 100644--- a/apps/api/src/modules/projects/index.ts+++ b/apps/api/src/modules/projects/index.ts@@ -4,15 +4,14 @@ import { noContent } from '#shared/http';import { HttpError } from '#shared/lib';import { authContext } from '#shared/auth-context';import { guards } from '#shared/guards';-import { requireUser } from '#shared/access';+import { getProjectAccess, getTeamAccess, requireUser } from '#shared/access';import { isMcpRequest } from '#shared/mcp-request';import { accessErrors, commonErrors, errors } from '#shared/responses';-import { getMemberContext, listAssigneeCandidates } from '#modules/members/service';+import { listAssigneeCandidates } from '#modules/members/service';import { listColumns } from '#modules/columns/service';import { listIssueTypes } from '#modules/issue-types/service';import { listLabels, listLabelGroups } from '#modules/labels/service';import { listCustomFields } from '#modules/custom-fields/service';-import { getTeamMembership } from '#modules/teams/service';import { listIssueTemplates } from '#modules/issue-templates/service';import {AutoArchiveResponse,@@ -142,7 +141,7 @@ export const projectRoutes = new Elysia({ name: 'projects', detail: { tags: ['PrcustomFields,issueTemplates,viewer,- teamRole,+ teamAccess,] = await Promise.all([listColumns(project.id),listIssueTypes(project.id),@@ -151,11 +150,11 @@ export const projectRoutes = new Elysia({ name: 'projects', detail: { tags: ['PrlistAssigneeCandidates(project.id),listCustomFields(project.id, { allTypes: true }),listIssueTemplates(project.id),- getMemberContext(project.id, userId),- getTeamMembership(project.teamId, userId),+ getProjectAccess(project.id, userId),+ getTeamAccess(project.teamId, userId),]);- // The permission guard already asserted membership, so a context always- // exists here; guard against a race (membership revoked mid-request).+ // The permission guard already asserted access, so it always exists here; guard+ // against a race (access revoked mid-request).if (!viewer) throw new HttpError(403, 'You do not have access to this project');return {project,@@ -166,7 +165,7 @@ export const projectRoutes = new Elysia({ name: 'projects', detail: { tags: ['Prassignees,customFields,issueTemplates,- viewer: { role: viewer.role, teamRole },+ viewer: { role: viewer.role, teamRole: teamAccess?.role ?? null, via: viewer.via },permissions: viewer.permissions,};},diff --git a/apps/api/src/modules/projects/model.ts b/apps/api/src/modules/projects/model.tsindex 06b5e8f4..7a310846 100644--- a/apps/api/src/modules/projects/model.ts+++ b/apps/api/src/modules/projects/model.ts@@ -7,6 +7,7 @@ import { IssueTemplateResponse } from '#modules/issue-templates/model';import { IssueTypeResponse } from '#modules/issue-types/model';import { LabelGroupResponse, LabelResponse } from '#modules/labels/model';import { PermissionMatrixSchema } from '#shared/permissions';+import { AccessViaSchema } from '#shared/workspace-roles';import { ISSUE_TYPE_PRESET_KEYS } from './service';import { COPY_INCLUDE_KEYS } from './copy';@@ -139,6 +140,7 @@ export const ProjectListResponse = t.Array(ProjectResponse,t.Object({role: t.Union([t.Literal('owner'), t.Literal('member')]),+ via: AccessViaSchema,lastActivityAt: t.Nullable(t.String({description: 'Newest readable work-item activity or comment timestamp, or null.',@@ -178,6 +180,9 @@ const ViewerResponse = t.Object({teamRole: t.Nullable(t.Union([t.Literal('owner'), t.Literal('manager'), t.Literal('member'), t.Literal('agent')]),),+ // 'workspace' when the caller is not a member of the project and reaches it through+ // their role in the workspace that holds it.+ via: AccessViaSchema,});// The project board scaffold (GET /projects/:projectKey): the project plus itsdiff --git a/apps/api/src/modules/projects/preferences.ts b/apps/api/src/modules/projects/preferences.tsindex 426bbf2a..53e18494 100644--- a/apps/api/src/modules/projects/preferences.ts+++ b/apps/api/src/modules/projects/preferences.ts@@ -20,7 +20,7 @@ async function updatePreferences(.set(preferences).where(and(eq(projectMember.projectId, projectId), eq(projectMember.userId, userId))).returning({ isFavorite: projectMember.isFavorite, isHidden: projectMember.isHidden });- if (!updated) throw new HttpError(403, 'You do not have access to this project');+ if (!updated) throw new HttpError(403, 'Only a member of the project keeps preferences for it');return updated;}diff --git a/apps/api/src/modules/projects/service.ts b/apps/api/src/modules/projects/service.tsindex be6296b3..bb9d8352 100644--- a/apps/api/src/modules/projects/service.ts+++ b/apps/api/src/modules/projects/service.ts@@ -17,6 +17,7 @@ import {projectSetting,team,teamMember,+ type DbExecutor,} from '@repo/db';import {and,@@ -25,6 +26,7 @@ import {getTableColumns,ilike,inArray,+ isNotNull,isNull,or,sql,@@ -32,15 +34,14 @@ import {} from 'drizzle-orm';import { HttpError, iso } from '#shared/lib';import { PROJECT_KEY_PATTERN } from './key';-import {- defaultMemberPermissions,- fullPermissions,- normalizePermissions,- type Permissions,-} from '#shared/permissions';+import type { Permissions } from '#shared/permissions';import { getProjectSetting, setProjectSetting } from '#shared/project-settings';import { PROJECT_FEATURES, featureLabel, type ProjectFeature } from '#shared/features';import { getTeamLimits } from '#shared/limits';+import { projectAccess, type AccessVia } from '#shared/workspace-roles';+import { toMemberContext, type MemberRole } from '#modules/members/service';+import { workspaceGrants } from '#modules/workspaces/service';+import { assertSeatFree } from '#modules/teams/service';import { deleteThreadsWhere } from '#modules/agents/core/runtime/memory';import { getProjectDefaults } from '#modules/settings/service';import { getDefaultRoleId } from '#modules/roles/service';@@ -106,6 +107,7 @@ export interface ProjectFeatures {// actions like deletion; the API still enforces the permission on every request.export interface ProjectListItem extends ProjectRow {role: 'owner' | 'member';+ via: AccessVia;lastActivityAt: string | null;isFavorite: boolean;isHidden: boolean;@@ -172,9 +174,18 @@ export async function listProjects(teamId?: number;} = {},): Promise<ProjectListItem[]> {+ const grants = await workspaceGrants(userId);+ const grantedTeams = [...grants.keys()];const term = opts.q?.trim().replace(/[\\%_]/g, '\\$&');- const where = and(+ const callerMember = and(+ eq(projectMember.projectId, project.id),eq(projectMember.userId, userId),+ );+ const where = and(+ or(+ isNotNull(projectMember.userId),+ grantedTeams.length > 0 ? inArray(project.teamId, grantedTeams) : undefined,+ ),isNull(project.archivedAt),opts.mcpOnly ? and(eq(project.mcpEnabled, true), eq(team.mcpEnabled, true)) : undefined,opts.teamId !== undefined ? eq(project.teamId, opts.teamId) : undefined,@@ -186,6 +197,9 @@ export async function listProjects(): undefined,);+ const readingTeams = [...grants]+ .filter(([, grant]) => grant === 'owner' || grant.work_items.read)+ .map(([teamId]) => teamId);const latestActivity = db.selectDistinctOn([issue.projectId], {projectId: issue.projectId,@@ -195,15 +209,21 @@ export async function listProjects(.innerJoin(issue, eq(issue.id, issueActivity.issueId)).innerJoin(project, eq(project.id, issue.projectId)).innerJoin(team, eq(team.id, project.teamId))- .innerJoin(projectMember, eq(projectMember.projectId, project.id))+ .leftJoin(projectMember, callerMember).leftJoin(teamRole, eq(teamRole.id, projectMember.roleId)).where(and(where,or(- eq(projectMember.role, 'owner'),- isNull(teamRole.permissions),- sql`${teamRole.permissions} -> 'work_items' -> 'read' = 'true'::jsonb`,+ and(+ isNotNull(projectMember.userId),+ or(+ eq(projectMember.role, 'owner'),+ isNull(teamRole.permissions),+ sql`${teamRole.permissions} -> 'work_items' -> 'read' = 'true'::jsonb`,+ ),+ ),+ readingTeams.length > 0 ? inArray(project.teamId, readingTeams) : undefined,),),)@@ -224,7 +244,7 @@ export async function listProjects(}).from(project).innerJoin(team, eq(team.id, project.teamId))- .innerJoin(projectMember, eq(projectMember.projectId, project.id))+ .leftJoin(projectMember, callerMember).leftJoin(teamRole, eq(teamRole.id, projectMember.roleId)).leftJoin(latestActivity, eq(latestActivity.projectId, project.id)).where(where)@@ -232,19 +252,19 @@ export async function listProjects(return Promise.all(rows.map(async ({ memberRole, rolePermissions, lastActivityAt, isFavorite, isHidden, ...row }) => {- const role = memberRole === 'owner' ? 'owner' : 'member';+ const member = memberRole+ ? toMemberContext(memberRole as MemberRole, rolePermissions)+ : null;+ const access = projectAccess(member, grants.get(row.teamId) ?? null)!;const item: ProjectListItem = {...(await mapProject(row)),- role,+ role: access.role,+ via: access.via,lastActivityAt: lastActivityAt ? iso(lastActivityAt) : null,- isFavorite,- isHidden,+ isFavorite: isFavorite ?? false,+ isHidden: isHidden ?? false,};- if (opts.withPermissions) {- if (role === 'owner') item.permissions = fullPermissions();- else if (rolePermissions) item.permissions = normalizePermissions(rolePermissions);- else item.permissions = defaultMemberPermissions();- }+ if (opts.withPermissions) item.permissions = access.permissions;return item;},),@@ -278,19 +298,24 @@ export async function getProjectByRef(ref: string, userId: string): Promise<Proj.where(eq(project.key, ref));if (rows.length <= 1) return rows[0] ? mapProject(rows[0]) : null;- const teamIds = await db- .select({ teamId: teamMember.teamId })- .from(teamMember)- .where(- and(- eq(teamMember.userId, userId),- inArray(- teamMember.teamId,- rows.map((r) => r.teamId),+ const [teamIds, grants] = await Promise.all([+ db+ .select({ teamId: teamMember.teamId })+ .from(teamMember)+ .where(+ and(+ eq(teamMember.userId, userId),+ inArray(+ teamMember.teamId,+ rows.map((r) => r.teamId),+ ),),),- );- const mine = rows.filter((r) => teamIds.some((m) => m.teamId === r.teamId));+ workspaceGrants(userId),+ ]);+ const mine = rows.filter(+ (r) => teamIds.some((m) => m.teamId === r.teamId) || grants.has(r.teamId),+ );if (mine.length === 0) return null;if (mine.length > 1) {throw new HttpError(@@ -337,9 +362,21 @@ export async function targetTeam(userId: string, teamId?: number): Promise<Targe.from(team).where(eq(team.id, teamId));if (!row) throw new HttpError(404, 'Team not found');+ // The creator joins the team with the project (joinTeamAsCreator).+ await assertSeatFree(row.id, userId);return row;}+// A project membership stands on a team one. The workspace owner runs every team of the+// workspace without being in it, so a project they create there makes them a member.+export async function joinTeamAsCreator(+ tx: DbExecutor,+ teamId: number,+ userId: string,+): Promise<void> {+ await tx.insert(teamMember).values({ teamId, userId, role: 'member' }).onConflictDoNothing();+}+// The team a project is created in, with what mapProject needs from it.export interface TargetTeam {id: number;@@ -481,6 +518,7 @@ export async function createProject(mcpEnabled: defaults.mcpEnabled,}).returning();+ await joinTeamAsCreator(tx, ownerTeam.id, ownerId);await tx.insert(projectMember).values({ projectId: row.id, userId: ownerId, role: 'owner' });if (defaultAgents.length) {await tx.insert(projectMember).values(diff --git a/apps/api/src/modules/sync/service.ts b/apps/api/src/modules/sync/service.tsindex 6b7a62b9..be2a90b5 100644--- a/apps/api/src/modules/sync/service.ts+++ b/apps/api/src/modules/sync/service.ts@@ -1,7 +1,9 @@-import { db, projectMember, teamRole, revision } from '@repo/db';-import { and, eq, inArray } from 'drizzle-orm';+import { db, project, projectMember, teamRole, revision } from '@repo/db';+import { and, eq, inArray, isNotNull, or } from 'drizzle-orm';import { toMemberContext, type MemberRole } from '#modules/members/service';+import { workspaceGrants } from '#modules/workspaces/service';import { hasPermission, type PermissionResource } from '#shared/permissions';+import { projectAccess } from '#shared/workspace-roles';// The revision engine's read side. The counters themselves are written by the// triggers in migration 0070 — no application code bumps them, so a write moves@@ -37,24 +39,31 @@ export interface ScopeRead {resource: PermissionResource | null;}-// The markers a client is watching, in one query. The join against the membership-// is the access check: a scope of a project the user is not a member of returns no-// row and reads as unchanged. The role decides the rest — a scope whose resource-// the member may not read is dropped the same way, so it also reads as unchanged.+// The markers a client is watching, in one query. A scope of a project the user neither+// belongs to nor reaches through their workspace role returns no row and reads as+// unchanged. A scope whose resource their access may not read is dropped the same way,+// so it also reads as unchanged.export async function readRevs(wanted: ScopeRead[],userId: string,): Promise<Record<string, string>> {if (wanted.length === 0) return {};+ const grants = await workspaceGrants(userId);+ const grantedTeams = [...grants.keys()];const rows = await db.select({scope: revision.scope,rev: revision.rev,+ teamId: project.teamId,role: projectMember.role,permissions: teamRole.permissions,}).from(revision)- .innerJoin(projectMember, eq(projectMember.projectId, revision.projectId))+ .innerJoin(project, eq(project.id, revision.projectId))+ .leftJoin(+ projectMember,+ and(eq(projectMember.projectId, revision.projectId), eq(projectMember.userId, userId)),+ ).leftJoin(teamRole, eq(teamRole.id, projectMember.roleId)).where(and(@@ -62,7 +71,10 @@ export async function readRevs(revision.scope,wanted.map((w) => w.key),),- eq(projectMember.userId, userId),+ or(+ isNotNull(projectMember.userId),+ grantedTeams.length > 0 ? inArray(project.teamId, grantedTeams) : undefined,+ ),),);@@ -71,8 +83,9 @@ export async function readRevs(for (const row of rows) {const resource = resources.get(row.scope);if (resource) {- const { permissions } = toMemberContext(row.role as MemberRole, row.permissions);- if (!hasPermission(permissions, resource, 'read')) continue;+ const member = row.role ? toMemberContext(row.role as MemberRole, row.permissions) : null;+ const access = projectAccess(member, grants.get(row.teamId) ?? null);+ if (!access || !hasPermission(access.permissions, resource, 'read')) continue;}out[row.scope] = String(row.rev);}diff --git a/apps/api/src/modules/teams/__tests__/integration/teams.test.ts b/apps/api/src/modules/teams/__tests__/integration/teams.test.tsindex 877434fa..2557d438 100644--- a/apps/api/src/modules/teams/__tests__/integration/teams.test.ts+++ b/apps/api/src/modules/teams/__tests__/integration/teams.test.ts@@ -219,7 +219,8 @@ describe('teams', () => {const created = await api.teams.post({ name: 'Design', slug: 'design' });expect(created.status).toBe(409);- expect(await api.teams.get().then((list) => list.data)).toHaveLength(0);+ const names = (await api.teams.get()).data!.map((team) => team.name);+ expect(names).not.toContain('Design');});it('creates the team under the slug it is given', async () => {@@ -403,8 +404,9 @@ describe('teams', () => {});it('hides the members and the projects of a team the caller is not in', async () => {- const { api } = await signUpClient();+ // The first account owns the instance workspace, which reaches every team in it.const other = await signUpClient();+ const { api } = await signUpClient();const otherTeamId = (await other.api.teams.get()).data![0].id;expect((await api.teams({ teamId: otherTeamId }).members.get()).status).toBe(404);@@ -412,8 +414,9 @@ describe('teams', () => {});it('hides a team the caller is not a member of', async () => {- const { api } = await signUpClient();+ // The first account owns the instance workspace, which reaches every team in it.const other = await signUpClient();+ const { api } = await signUpClient();const otherTeamId = (await other.api.teams.get()).data![0].id;const detail = await api.teams({ teamId: otherTeamId }).get();@@ -457,8 +460,9 @@ describe('teams', () => {});it("404s for a project of another account's team", async () => {- const { api } = await signUpClient();+ // The first account owns the instance workspace, which reaches every team in it.const other = await signUpClient();+ const { api } = await signUpClient();const otherProject = await other.api.projects.post({ key: 'OTH', name: 'Other' });const teamId = (await api.teams.get()).data![0].id;@@ -470,8 +474,9 @@ describe('teams', () => {});it('404s for a team the caller is not a member of', async () => {- const { api } = await signUpClient();+ // The first account owns the instance workspace, which reaches every team in it.const other = await signUpClient();+ const { api } = await signUpClient();const otherProject = await other.api.projects.post({ key: 'OTH', name: 'Other' });const otherTeamId = (await other.api.teams.get()).data![0].id;@@ -625,8 +630,9 @@ describe('teams', () => {});it("404s for another account's team", async () => {- const { api } = await signUpClient();+ // The first account owns the instance workspace, which reaches every team in it.const other = await signUpClient();+ const { api } = await signUpClient();const otherTeamId = await ownTeamId(other.api);const created = await api@@ -987,8 +993,9 @@ describe('teams', () => {});it("rejects a rename of another account's team", async () => {- const { api } = await signUpClient();+ // The first account owns the instance workspace, which reaches every team in it.const other = await signUpClient();+ const { api } = await signUpClient();const otherTeamId = (await other.api.teams.get()).data![0].id;const renamed = await api.teams({ teamId: otherTeamId }).patch({ name: 'Growth' });@@ -1239,7 +1246,9 @@ describe('teams', () => {expect(results.map((result) => result.status).sort()).toEqual([204, 409]);const teams = await Promise.all([owner.api.teams.get(), second.api.teams.get()]);expect(- teams.flatMap((result) => result.data ?? []).filter((row) => row.id === teamId),+ teams+ .flatMap((result) => result.data ?? [])+ .filter((row) => row.id === teamId && row.via === 'member'),).toHaveLength(1);});@@ -1294,8 +1303,9 @@ describe('teams', () => {});it('404s for a team the caller is not a member of', async () => {- const { api } = await signUpClient();+ // The first account owns the instance workspace, which reaches every team in it.const other = await signUpClient();+ const { api } = await signUpClient();const otherTeamId = (await other.api.teams.get()).data![0].id;expect((await api.teams({ teamId: otherTeamId }).leave.post()).status).toBe(404);diff --git a/apps/api/src/modules/teams/index.ts b/apps/api/src/modules/teams/index.tsindex 0001478c..5b740978 100644--- a/apps/api/src/modules/teams/index.ts+++ b/apps/api/src/modules/teams/index.ts@@ -155,7 +155,8 @@ export const teamRoutes = new Elysia({ name: 'teams', detail: { tags: ['Teams']summary: 'List team projects',description:'One page of the projects a team owns, by key. `search` matches the key or the ' +- 'name. An owner or a manager sees them all; anyone else only the ones they belong to.',+ 'name. An owner or a manager, and anyone whose workspace role reaches the team, sees ' ++ 'them all; anyone else only the ones they belong to.',},},)diff --git a/apps/api/src/modules/teams/model.ts b/apps/api/src/modules/teams/model.tsindex 3d0cda2a..fd1a2b79 100644--- a/apps/api/src/modules/teams/model.ts+++ b/apps/api/src/modules/teams/model.ts@@ -1,6 +1,7 @@import { t } from 'elysia';import { pageQueryFields, pageResponse } from '#shared/pagination';import { PermissionMatrixSchema } from '#shared/permissions';+import { AccessViaSchema } from '#shared/workspace-roles';import { StatsDto } from '#modules/analytics/model';import { TEAM_SLUG_PATTERN } from './ref';@@ -58,6 +59,11 @@ export const TeamResponse = t.Object({[t.Literal('owner'), t.Literal('manager'), t.Literal('member'), t.Literal('agent')],{ description: 'Your standing in this team.' },),+ via: t.Union([t.Literal('member'), t.Literal('workspace')], {+ description:+ "'workspace' when you are not in the team and reach it through your role in its " ++ 'workspace.',+ }),source: t.Union([t.Literal('invite'), t.Literal('scim')], {description:"How your membership came about. A provisioned one is the identity provider's: you " +@@ -162,6 +168,7 @@ export const TeamProjectDetailResponse = t.Object({viewer: t.Nullable(t.Object({role: t.Union([t.Literal('owner'), t.Literal('member')]),+ via: AccessViaSchema,source: t.Union([t.Literal('invite'), t.Literal('scim')], {description: "A provisioned membership is the identity provider's: it cannot be left.",}),diff --git a/apps/api/src/modules/teams/service.ts b/apps/api/src/modules/teams/service.tsindex fd08e992..8c65970e 100644--- a/apps/api/src/modules/teams/service.ts+++ b/apps/api/src/modules/teams/service.ts@@ -18,7 +18,7 @@ import {workspace,workspaceManager,} from '@repo/db';-import { and, desc, eq, ilike, inArray, isNull, or, sql } from 'drizzle-orm';+import { and, desc, eq, ilike, inArray, isNotNull, isNull, or, sql } from 'drizzle-orm';import { HttpError, iso, pgErrorCode } from '#shared/lib';import { isReservedSlug, projectRefSql, teamRef } from './ref';import { getLimits } from '#shared/limits';@@ -35,7 +35,19 @@ import {type MemberSource,} from '#modules/members/service';import { getStats, type StatsDto } from '#modules/analytics/service';-import { assertMayCreateTeam, workspaceHoldsWork } from '#modules/workspaces/service';+import {+ assertMayCreateTeam,+ projectWorkspaceGrant,+ workspaceGrant,+ workspaceGrants,+ workspaceHoldsWork,+} from '#modules/workspaces/service';+import {+ mergePermissions,+ projectAccess,+ teamAccess,+ type AccessVia,+} from '#shared/workspace-roles';// The rank a person holds in a team.export type TeamRole = 'owner' | 'manager' | 'member';@@ -64,6 +76,9 @@ export interface TeamRow {// The caller's standing in the team, not a property of the team itself. An agent// reading its own team is 'agent', which runs nothing.role: TeamStanding;+ // 'workspace' when the caller is not in the team and reaches it through their role+ // in its workspace. Their source and joinedAt are then the team's defaults.+ via: AccessVia;// How the caller's own membership came about. 'scim' is the identity provider's, and// is left there rather than here.source: MemberSource;@@ -163,9 +178,14 @@ export interface TeamProjectDetail {// happened in it yet.lastActivityAt: string | null;stats: StatsDto;- // The reader's own membership in this project, or null when they only reach it- // through the team. What they may do with its members is decided from it.- viewer: { role: MemberRole; source: MemberSource; permissions: Permissions } | null;+ // The reader's access to this project, or null when they only reach it through the+ // team. What they may do with its members is decided from it.+ viewer: {+ role: MemberRole;+ via: AccessVia;+ source: MemberSource;+ permissions: Permissions;+ } | null;}// One page of the team's members, with how many match the search.@@ -198,9 +218,11 @@ export interface TeamLeadRow {role: 'owner' | 'manager';}-// The caller's teams as DTOs, optionally narrowed to one. Membership is the join,-// so a team the caller left is not returned at all.+// The caller's teams as DTOs, optionally narrowed to one: the teams they are in and+// the ones their role in a workspace reaches (workspace-roles.ts).async function loadTeamRows(userId: string, teamId?: number): Promise<TeamRow[]> {+ const grants = await workspaceGrants(userId);+ const grantedTeams = [...grants.keys()];const rows = await db.select({id: team.id,@@ -213,12 +235,16 @@ async function loadTeamRows(userId: string, teamId?: number): Promise<TeamRow[]>joinedAt: teamMember.createdAt,createdAt: team.createdAt,})- .from(teamMember)- .innerJoin(team, eq(team.id, teamMember.teamId))+ .from(team)+ .leftJoin(teamMember, and(eq(teamMember.teamId, team.id), eq(teamMember.userId, userId))).where(- teamId === undefined- ? eq(teamMember.userId, userId)- : and(eq(teamMember.userId, userId), eq(team.id, teamId)),+ and(+ or(+ isNotNull(teamMember.userId),+ grantedTeams.length > 0 ? inArray(team.id, grantedTeams) : undefined,+ ),+ teamId === undefined ? undefined : eq(team.id, teamId),+ ),).orderBy(team.id);if (rows.length === 0) return [];@@ -290,7 +316,9 @@ async function loadTeamRows(userId: string, teamId?: number): Promise<TeamRow[]>const tools = new Map(toolCounts.map((r) => [r.teamId, r.count]));return rows.map((row) => {- const standing = row.role as TeamStanding;+ const grant = grants.get(row.id) ?? null;+ const access = teamAccess(row.role as TeamStanding | null, grant)!;+ const standing = access.role;const projectCount = projects.get(row.id);return {id: row.id,@@ -300,9 +328,10 @@ async function loadTeamRows(userId: string, teamId?: number): Promise<TeamRow[]>ref: teamRef(row),mcpEnabled: row.mcpEnabled,role: standing,- source: row.source as MemberSource,- joinedAt: iso(row.joinedAt),- projectCount: (runsTeam(standing) ? projectCount?.count : projectCount?.joined) ?? 0,+ via: access.via,+ source: (row.source as MemberSource | null) ?? 'invite',+ joinedAt: iso(row.joinedAt ?? row.createdAt),+ projectCount: (runsTeam(standing) || grant ? projectCount?.count : projectCount?.joined) ?? 0,memberCount: members.get(row.id)?.count ?? 0,ownerCount: members.get(row.id)?.owners ?? 0,roleCount: roles.get(row.id) ?? 0,@@ -429,7 +458,11 @@ export async function getTeam(teamId: number, userId: string): Promise<TeamDetaiif (!row) return null;const [permissions, leads] = await Promise.all([- runsTeam(row.role) ? fullPermissions() : getTeamPermissions(teamId, userId),+ runsTeam(row.role)+ ? fullPermissions()+ : Promise.all([getTeamPermissions(teamId, userId), workspaceGrant(teamId, userId)]).then(+ ([own, grant]) => mergePermissions(own, grant === 'owner' ? null : grant),+ ),listTeamLeads(teamId),]);return { ...row, permissions, leads };@@ -511,18 +544,20 @@ export async function listTeamMembers(};}-// The projects of the team a caller reads: owners and managers see every one of them,-// everyone else only the ones they joined. The search matches the key or the name.-function visibleTeamProjects(+// The projects of the team a caller reads: owners, managers and anyone whose workspace+// role reaches the team see every one of them, everyone else only the ones they joined.+// The search matches the key or the name.+async function visibleTeamProjects(teamId: number,userId: string,standing: TeamStanding,search?: string,) {+ const seesAll = runsTeam(standing) || (await workspaceGrant(teamId, userId)) !== null;const term = search?.trim();return and(eq(project.teamId, teamId),- runsTeam(standing)+ seesAll? undefined: sql`exists (select 1 from ${projectMember} where ${projectMember.projectId} = ${project.id}and ${projectMember.userId} = ${userId})`,@@ -539,7 +574,7 @@ export async function listTeamProjects(standing: TeamStanding,options: { search?: string; limit: number; offset: number },): Promise<TeamProjectPage> {- const where = visibleTeamProjects(teamId, userId, standing, options.search);+ const where = await visibleTeamProjects(teamId, userId, standing, options.search);const [projects, counted] = await Promise.all([db.select({@@ -632,7 +667,7 @@ export async function listTeamProjectOptions(}).from(project).innerJoin(team, eq(team.id, project.teamId))- .where(visibleTeamProjects(teamId, userId, standing))+ .where(await visibleTeamProjects(teamId, userId, standing)).orderBy(project.key);}@@ -671,7 +706,10 @@ export async function getTeamProject(): Promise<TeamProjectDetail | null> {if (!(await teamOwnsProject(teamId, projectId))) return null;- const viewer = await getMemberContext(projectId, userId);+ const viewer = projectAccess(+ await getMemberContext(projectId, userId),+ await projectWorkspaceGrant(projectId, userId),+ );if (!runsTeam(standing) && !viewer) return null;const [activity, stats, source] = await Promise.all([@@ -684,7 +722,12 @@ export async function getTeamProject(lastActivityAt: activity,stats,viewer: viewer- ? { role: viewer.role, source: source ?? 'invite', permissions: viewer.permissions }+ ? {+ role: viewer.role,+ via: viewer.via,+ source: source ?? 'invite',+ permissions: viewer.permissions,+ }: null,};}@@ -700,7 +743,13 @@ export async function listTeamProjectMembers(options: MemberFilters & { limit: number; offset: number },): Promise<TeamProjectMemberPage | null> {if (!(await teamOwnsProject(teamId, projectId))) return null;- if (!runsTeam(standing) && !(await getMembership(projectId, userId))) return null;+ if (+ !runsTeam(standing) &&+ !(await getMembership(projectId, userId)) &&+ !(await projectWorkspaceGrant(projectId, userId))+ ) {+ return null;+ }const { items, total } = await listMembersPage(projectId, { ...options, order: 'owners' });@@ -795,6 +844,7 @@ export async function createTeam(ref: teamRef(row),mcpEnabled: row.mcpEnabled,role: 'owner',+ via: 'member',source: 'invite',joinedAt: iso(membership.createdAt),projectCount: 0,@@ -860,10 +910,30 @@ async function membershipInTransaction(return row ? (row.role as TeamStanding) : null;}+// The actor's standing raised to their workspace grant (getTeamAccess), read inside the+// transaction that locks the team.+async function actorStandingInTransaction(+ tx: Transaction,+ teamId: number,+ userId: string,+): Promise<TeamStanding | null> {+ const standing = await membershipInTransaction(tx, teamId, userId);+ return teamAccess(standing, await workspaceGrant(teamId, userId))?.role ?? null;+}++// The last owner row is kept even against the workspace owner, who acts as an owner+// without one.+async function assertKeepsAnOwner(tx: Transaction, teamId: number): Promise<void> {+ const owners = await tx.$count(+ teamMember,+ and(eq(teamMember.teamId, teamId), eq(teamMember.role, 'owner')),+ );+ if (owners === 1) throw new HttpError(409, 'A team must keep at least one owner');+}+// Changes what a member ranks as in the team. An agent's standing comes from its// agent settings, and nobody sets their own rank. Only an owner grants the owner rank-// or changes what another owner holds, which is also what keeps the last owner in-// place: demoting an owner takes a second one.+// or changes what another owner holds.export async function setTeamMemberRole(teamId: number,actor: { userId: string; role: TeamStanding },@@ -872,7 +942,7 @@ export async function setTeamMemberRole(): Promise<void> {await db.transaction(async (tx) => {await tx.select({ id: team.id }).from(team).where(eq(team.id, teamId)).for('update');- const actorRole = await membershipInTransaction(tx, teamId, actor.userId);+ const actorRole = await actorStandingInTransaction(tx, teamId, actor.userId);if (!runsTeam(actorRole))throw new HttpError(403, 'Only a team owner or manager can change ranks');if (userId === actor.userId) throw new HttpError(409, 'You cannot change your own rank');@@ -883,6 +953,7 @@ export async function setTeamMemberRole(if (actorRole !== 'owner' && (role === 'owner' || current === 'owner')) {throw new HttpError(403, 'Only a team owner can grant or take the owner rank');}+ if (current === 'owner' && role !== 'owner') await assertKeepsAnOwner(tx, teamId);await tx.update(teamMember).set({ role })@@ -968,8 +1039,7 @@ async function assertNotProvisioned(}// Removes a member from the team. Nobody removes themselves — that is leaving the-// team. Removing an owner is possible because the actor is one and stays, so the team-// never loses its last owner.+// team.export async function removeTeamMember(teamId: number,actorId: string,@@ -977,7 +1047,7 @@ export async function removeTeamMember(): Promise<void> {await db.transaction(async (tx) => {await tx.select({ id: team.id }).from(team).where(eq(team.id, teamId)).for('update');- if ((await membershipInTransaction(tx, teamId, actorId)) !== 'owner') {+ if ((await actorStandingInTransaction(tx, teamId, actorId)) !== 'owner') {throw new HttpError(403, 'Only a team owner can remove members');}if (userId === actorId) throw new HttpError(409, 'Leave the team instead of removing yourself');@@ -985,6 +1055,7 @@ export async function removeTeamMember(if (!current) throw new HttpError(404, 'Member not found');if (current === 'agent')throw new HttpError(409, 'An agent is removed with its agent settings');+ if (current === 'owner') await assertKeepsAnOwner(tx, teamId);await assertNotProvisioned(tx, teamId, userId);await assertLeavesNoProjectOwnerless(tx, teamId, userId, 'They');await dropTeamMembership(tx, teamId, userId);diff --git a/apps/api/src/modules/user-preferences/index.ts b/apps/api/src/modules/user-preferences/index.tsindex d4aeadbf..de470163 100644--- a/apps/api/src/modules/user-preferences/index.ts+++ b/apps/api/src/modules/user-preferences/index.ts@@ -1,9 +1,8 @@import { Elysia } from 'elysia';-import { requireUser } from '#shared/access';+import { getProjectAccess, requireUser } from '#shared/access';import { authContext } from '#shared/auth-context';import { HttpError } from '#shared/lib';import { errors } from '#shared/responses';-import { getMembership } from '#modules/members/service';import { PreferencePatch, PreferenceResponse } from './model';import { getPreferences, isValidTimezone, updatePreferences } from './service';import { localeFromAcceptLanguage } from './locale';@@ -45,9 +44,7 @@ export const userPreferenceRoutes = new Elysia({if (body.timezone !== undefined && !isValidTimezone(body.timezone)) {throw new HttpError(400, 'Unknown timezone');}- // Only a project the user belongs to can be remembered, so the stored id can- // never point at one they cannot open.- if (body.lastProjectId != null && !(await getMembership(body.lastProjectId, current.id))) {+ if (body.lastProjectId != null && !(await getProjectAccess(body.lastProjectId, current.id))) {throw new HttpError(403, 'You do not have access to this project');}return updatePreferences(diff --git a/apps/api/src/modules/workspaces/__tests__/integration/workspace-access.test.ts b/apps/api/src/modules/workspaces/__tests__/integration/workspace-access.test.tsnew file mode 100644index 00000000..71077276--- /dev/null+++ b/apps/api/src/modules/workspaces/__tests__/integration/workspace-access.test.ts@@ -0,0 +1,153 @@+import { afterEach, beforeEach, describe, expect, it } from 'bun:test';+import { authedApi, type Api } from '#tests/helpers/app';+import { signUpTestUser } from '#tests/helpers/auth';+import { resetDb } from '#tests/helpers/db';+import { readOnlyPermissions, setWorkspaceRoleGrant } from '#shared/workspace-roles';++// The owner and the admins of a workspace reach every team and project in it without+// being members: the owner as an owner, an admin with read access.++async function setup() {+ const owner = await signUpTestUser({ team: false });+ const lead = await signUpTestUser();+ const admin = await signUpTestUser();+ const outsider = await signUpTestUser();+ const asOwner = authedApi(owner.cookie);+ const asLead = authedApi(lead.cookie);++ await asLead.projects.post({ key: 'MKT', name: 'Marketing' });+ const scaffold = (await asLead.projects({ projectKey: 'MKT' }).get()).data!;+ const workspaceId = (await asOwner.workspaces.get()).data!.find((w) => w.role === 'owner')!.id;+ await asOwner.workspaces({ workspaceId }).managers.post({ userId: admin.userId });++ return {+ owner,+ lead,+ admin,+ workspaceId,+ asOwner,+ asLead,+ asAdmin: authedApi(admin.cookie),+ asOutsider: authedApi(outsider.cookie),+ teamId: scaffold.project.teamId,+ columnId: scaffold.columns[0]!.id,+ };+}++function createIssue(api: Api, columnId: number) {+ return api.projects({ projectKey: 'MKT' }).issues.post({ columnId, title: 'Task' });+}++describe('workspace access', () => {+ beforeEach(resetDb);+ afterEach(() => setWorkspaceRoleGrant('admin', readOnlyPermissions()));++ it('lets the workspace owner work in every project as its owner', async () => {+ const { asOwner, teamId, columnId } = await setup();++ const listed = (await asOwner.projects.get()).data!;+ expect(listed).toEqual([+ expect.objectContaining({ key: 'MKT', role: 'owner', via: 'workspace' }),+ ]);+ const board = await asOwner.projects({ projectKey: 'MKT' }).get();+ expect(board.data!.viewer).toEqual({ role: 'owner', teamRole: 'owner', via: 'workspace' });+ expect((await createIssue(asOwner, columnId)).status).toBe(201);++ const teams = (await asOwner.teams.get()).data!;+ expect(teams.find((t) => t.id === teamId)).toMatchObject({ role: 'owner', via: 'workspace' });+ expect(+ (await asOwner.teams({ teamId }).patch({ name: 'Renamed', slug: 'renamed' })).status,+ ).toBe(200);+ });++ it('lets a workspace admin read every project and change nothing', async () => {+ const { asAdmin, teamId, columnId } = await setup();++ const listed = (await asAdmin.projects.get()).data!;+ expect(listed.find((p) => p.key === 'MKT')).toMatchObject({ role: 'member', via: 'workspace' });+ const board = (await asAdmin.projects({ projectKey: 'MKT' }).get()).data!;+ expect(board.viewer.via).toBe('workspace');+ expect(board.permissions.work_items).toEqual({+ create: false,+ edit: false,+ read: true,+ delete: false,+ });+ expect((await asAdmin.projects({ projectKey: 'MKT' }).issues.get()).status).toBe(200);+ expect((await createIssue(asAdmin, columnId)).status).toBe(403);++ const team = (await asAdmin.teams.get()).data!.find((t) => t.id === teamId);+ expect(team).toMatchObject({ role: 'member', via: 'workspace' });+ expect(+ (await asAdmin.teams({ teamId }).patch({ name: 'Renamed', slug: 'renamed' })).status,+ ).toBe(403);+ expect(+ (await asAdmin.projects({ projectKey: 'MKT' }).preferences.patch({ isFavorite: true }))+ .status,+ ).toBe(403);+ });++ it('shows a workspace admin every project of a team', async () => {+ const { asAdmin, teamId } = await setup();+ const page = (await asAdmin.teams({ teamId }).projects.get({ query: {} })).data!;+ expect(page.items.map((p) => p.key)).toEqual(['MKT']);+ });++ it('lets the workspace owner set ranks in a team and keeps its last owner', async () => {+ const { asOwner, asLead, lead, teamId } = await setup();+ const member = await signUpTestUser();+ const invite = await asLead+ .teams({ teamId })+ .invites.post({ email: member.email, role: 'member' });+ await authedApi(member.cookie).invites({ token: invite.data!.token }).accept.post();+ const team = asOwner.teams({ teamId });++ expect((await team.members({ userId: member.userId }).patch({ role: 'manager' })).status).toBe(+ 204,+ );+ expect((await team.members({ userId: lead.userId }).patch({ role: 'member' })).status).toBe(+ 409,+ );+ expect((await team.members({ userId: lead.userId }).delete()).status).toBe(409);+ expect((await team.members({ userId: member.userId }).delete()).status).toBe(204);+ });++ it('makes the workspace owner a member of the team they create a project in', async () => {+ const { asOwner, owner, teamId } = await setup();+ const created = await asOwner.teams({ teamId }).projects.post({ key: 'OPS', name: 'Ops' });+ expect(created.status).toBe(201);+ const team = (await asOwner.teams.get()).data!.find((t) => t.id === teamId);+ expect(team).toMatchObject({ role: 'owner', via: 'member' });+ const members = (await asOwner.teams({ teamId }).members.get()).data!;+ expect(members.items.map((m) => m.userId)).toContain(owner.userId);+ });++ it('adds neither of them to the members', async () => {+ const { asOwner, owner, admin } = await setup();+ const members = (await asOwner.projects({ projectKey: 'MKT' }).members.get({ query: {} }))+ .data!;+ const ids = members.items.map((m) => m.userId);+ expect(ids).not.toContain(owner.userId);+ expect(ids).not.toContain(admin.userId);+ });++ it('reaches nothing for someone who only has a team in the workspace', async () => {+ const { asOutsider } = await setup();+ expect((await asOutsider.projects.get()).data!.map((p) => p.key)).not.toContain('MKT');+ expect((await asOutsider.projects({ projectKey: 'MKT' }).get()).status).toBe(403);+ });++ it('ends with the role in the workspace', async () => {+ const { asOwner, asAdmin, admin, workspaceId } = await setup();+ await asOwner.workspaces({ workspaceId }).managers({ userId: admin.userId }).delete();+ expect((await asAdmin.projects({ projectKey: 'MKT' }).get()).status).toBe(403);+ });++ it('follows what a build grants a role', async () => {+ const { asAdmin, columnId } = await setup();+ setWorkspaceRoleGrant('admin', 'owner');+ expect((await createIssue(asAdmin, columnId)).status).toBe(201);+ setWorkspaceRoleGrant('admin', null);+ expect((await asAdmin.projects({ projectKey: 'MKT' }).get()).status).toBe(403);+ });+});diff --git a/apps/api/src/modules/workspaces/service.ts b/apps/api/src/modules/workspaces/service.tsindex a4fc1d9b..5b210606 100644--- a/apps/api/src/modules/workspaces/service.ts+++ b/apps/api/src/modules/workspaces/service.ts@@ -28,6 +28,7 @@ import {import { requireUser, type AuthUser } from '#shared/access';import { HttpError } from '#shared/lib';import { getOwnedWorkspaceLimit } from '#shared/limits';+import { workspaceRoleGrant, type WorkspaceGrant } from '#shared/workspace-roles';export type WorkspaceRole = 'owner' | 'admin';@@ -42,6 +43,53 @@ export async function getWorkspaceRole(return (row?.role as WorkspaceRole | undefined) ?? null;}+// What the person's role in the workspace that holds the team grants there.+export async function workspaceGrant(+ teamId: number,+ userId: string,+): Promise<WorkspaceGrant | null> {+ const [row] = await db+ .select({ role: workspaceManager.role })+ .from(team)+ .innerJoin(+ workspaceManager,+ and(eq(workspaceManager.workspaceId, team.workspaceId), eq(workspaceManager.userId, userId)),+ )+ .where(eq(team.id, teamId));+ return row ? workspaceRoleGrant(row.role) : null;+}++export async function projectWorkspaceGrant(+ projectId: number,+ userId: string,+): Promise<WorkspaceGrant | null> {+ const [row] = await db+ .select({ role: workspaceManager.role })+ .from(project)+ .innerJoin(team, eq(team.id, project.teamId))+ .innerJoin(+ workspaceManager,+ and(eq(workspaceManager.workspaceId, team.workspaceId), eq(workspaceManager.userId, userId)),+ )+ .where(eq(project.id, projectId));+ return row ? workspaceRoleGrant(row.role) : null;+}++// Every team the person reaches through a workspace role, with what the role grants.+export async function workspaceGrants(userId: string): Promise<Map<number, WorkspaceGrant>> {+ const rows = await db+ .select({ teamId: team.id, role: workspaceManager.role })+ .from(workspaceManager)+ .innerJoin(team, eq(team.workspaceId, workspaceManager.workspaceId))+ .where(eq(workspaceManager.userId, userId));+ const out = new Map<number, WorkspaceGrant>();+ for (const row of rows) {+ const grant = workspaceRoleGrant(row.role);+ if (grant) out.set(row.teamId, grant);+ }+ return out;+}+export interface WorkspaceStanding {workspaceId: number;role: WorkspaceRole;diff --git a/apps/api/src/shared/access.ts b/apps/api/src/shared/access.tsindex 3c7cb4fa..82aa40d0 100644--- a/apps/api/src/shared/access.ts+++ b/apps/api/src/shared/access.ts@@ -6,14 +6,22 @@ import {type ProjectRow,} from '#modules/projects/service';import { featureLabel, type ProjectFeature } from './features';-import { getMembership, getMemberContext, getTeamPermissions } from '#modules/members/service';+import { getMemberContext, getTeamPermissions } from '#modules/members/service';import { getTeamMembership, runsTeam, type TeamStanding } from '#modules/teams/service';+import { projectWorkspaceGrant, workspaceGrant } from '#modules/workspaces/service';import { hasPermission, type PermissionAction, type PermissionResource } from './permissions';+import {+ mergePermissions,+ projectAccess,+ teamAccess,+ type ProjectAccess,+ type TeamAccess,+} from './workspace-roles';// The authenticated user carried on the request context. Populated by the// session guard in planner.ts from the better-auth session. Access checks only// need the id; role is the global better-auth role ("god" | "user") and is not-// used for project access (access is strictly by project membership).+// used for project access (that is membership and the role in the workspace).export interface AuthUser {id: string;email?: string | null;@@ -30,15 +38,36 @@ export function requireUser(user: AuthUser | undefined | null): AuthUser {}// Asserts the session belongs to the instance owner ("god"), the role the first-// registered user gets. It gates instance-wide administration (god mode) only —-// project access stays strictly by membership, so this never bypasses a project-// permission check.+// registered user gets. It gates instance-wide administration (god mode) only and+// never bypasses a project permission check.export function requireGod(user: AuthUser | undefined | null): AuthUser {const current = requireUser(user);if (current.role !== 'god') throw new HttpError(403, 'Instance administration is owner-only');return current;}+// What the person holds in a project: their membership, raised to what their role in+// the workspace grants (see workspace-roles.ts). Every access check below reads it.+export async function getProjectAccess(+ projectId: number,+ userId: string,+): Promise<ProjectAccess | null> {+ const [member, grant] = await Promise.all([+ getMemberContext(projectId, userId),+ projectWorkspaceGrant(projectId, userId),+ ]);+ return projectAccess(member, grant);+}++// The same for a team: their standing in it, raised to the workspace grant.+export async function getTeamAccess(teamId: number, userId: string): Promise<TeamAccess | null> {+ const [standing, grant] = await Promise.all([+ getTeamMembership(teamId, userId),+ workspaceGrant(teamId, userId),+ ]);+ return teamAccess(standing, grant);+}+// Resolves the :projectKey path param (see getProjectByRef), throwing 404 for an// unknown project.async function requireProject(projectKey: string, userId: string): Promise<ProjectRow> {@@ -48,7 +77,7 @@ async function requireProject(projectKey: string, userId: string): Promise<Proje}// Resolves the :projectKey path param to a project the user may access. Throws-// 404 for an unknown project and 403 when the user is not a member. Wrapped by+// 404 for an unknown project and 403 when the user has no access to it. Wrapped by// the projectMember and projectOwner guards.export async function requireProjectAccess(projectKey: string,@@ -56,24 +85,22 @@ export async function requireProjectAccess(): Promise<ProjectRow> {const current = requireUser(user);const project = await requireProject(projectKey, current.id);- const role = await getMembership(project.id, current.id);- if (!role) throw new HttpError(403, 'You do not have access to this project');+ if (!(await getProjectAccess(project.id, current.id))) {+ throw new HttpError(403, 'You do not have access to this project');+ }return project;}// Resolves the :projectKey path param to a project and asserts the user is an-// owner, in a single membership lookup. Wrapped by the projectOwner guard, used-// for role and member management. Throws 404 for an unknown project, and 403 for-// a non-member or a member who is not an owner.+// owner of it. Wrapped by the projectOwner guard, used for role and member+// management. Throws 404 for an unknown project, and 403 for anyone else.export async function requireProjectOwner(projectKey: string,user: AuthUser | undefined | null,): Promise<ProjectRow> {const current = requireUser(user);const project = await requireProject(projectKey, current.id);- const role = await getMembership(project.id, current.id);- if (!role) throw new HttpError(403, 'You do not have access to this project');- if (role !== 'owner') throw new HttpError(403, 'Only a project owner can do this');+ await assertProjectOwner(project.id, current);return project;}@@ -101,8 +128,8 @@ export async function assertProjectAdmin(user: AuthUser | undefined | null,): Promise<void> {const current = requireUser(user);- if ((await getMembership(project.id, current.id)) === 'owner') return;- if (runsTeam(await getTeamMembership(project.teamId, current.id))) return;+ if ((await getProjectAccess(project.id, current.id))?.role === 'owner') return;+ if (runsTeam((await getTeamAccess(project.teamId, current.id))?.role ?? null)) return;throw new HttpError(403, 'Only a project owner or a team owner or manager can do this');}@@ -118,7 +145,7 @@ export async function requireTeamRunsProject(): Promise<ProjectRow> {const current = requireUser(user);const project = await requireProject(projectKey, current.id);- if (!runsTeam(await getTeamMembership(project.teamId, current.id)))+ if (!runsTeam((await getTeamAccess(project.teamId, current.id))?.role ?? null))throw new HttpError(403, 'Only a team owner or manager can do this');return project;}@@ -135,8 +162,7 @@ export async function requireMemberAdmin(): Promise<ProjectRow> {const current = requireUser(user);const project = await requireProject(projectKey, current.id);- const standing = await getTeamMembership(project.teamId, current.id);- if (runsTeam(standing)) return project;+ if (runsTeam((await getTeamAccess(project.teamId, current.id))?.role ?? null)) return project;await assertPermission(project.id, current, resource, action);return project;}@@ -204,9 +230,9 @@ function resourceLabel(resource: PermissionResource): string {return resource.replace(/_/g, ' ');}-// Asserts the user is a member of the project and their role grants the given-// action on the given resource. Owners bypass the matrix (always allowed).-// Throws 403 for a non-member or a member whose role lacks the permission. The+// Asserts the user has access to the project and it grants the given action on the+// given resource. Owners bypass the matrix (always allowed). Throws 403 for anyone+// without access and for access that lacks the permission. The// underlying permission check behind the permission guard and the feature-local// entity guards.export async function assertPermission(@@ -216,7 +242,7 @@ export async function assertPermission(action: PermissionAction,): Promise<void> {const current = requireUser(user);- const ctx = await getMemberContext(projectId, current.id);+ const ctx = await getProjectAccess(projectId, current.id);if (!ctx) throw new HttpError(403, 'You do not have access to this project');if (ctx.role === 'owner') return;if (!hasPermission(ctx.permissions, resource, action)) {@@ -232,9 +258,9 @@ export async function assertProjectOwner(user: AuthUser | undefined | null,): Promise<void> {const current = requireUser(user);- const role = await getMembership(projectId, current.id);- if (!role) throw new HttpError(403, 'You do not have access to this project');- if (role !== 'owner') throw new HttpError(403, 'Only a project owner can do this');+ const access = await getProjectAccess(projectId, current.id);+ if (!access) throw new HttpError(403, 'You do not have access to this project');+ if (access.role !== 'owner') throw new HttpError(403, 'Only a project owner can do this');}// Whether the user may perform the action, without throwing. For field-level@@ -247,7 +273,7 @@ export async function checkPermission(action: PermissionAction,): Promise<boolean> {if (!user) return false;- const ctx = await getMemberContext(projectId, user.id);+ const ctx = await getProjectAccess(projectId, user.id);if (!ctx) return false;return ctx.role === 'owner' || hasPermission(ctx.permissions, resource, action);}@@ -267,15 +293,16 @@ export async function requireProjectPermission(return project;}-// The caller's standing in the team a :teamId route addresses.+// The caller's standing in the team a :teamId route addresses, raised to the workspace+// grant (getTeamAccess).export interface TeamMembership {teamId: number;role: TeamStanding;userId: string;}-// Resolves the :teamId path param to the caller's membership in it. 404 for an-// unknown team and for one the caller is not a member of: a team the caller cannot+// Resolves the :teamId path param to the caller's standing in it. 404 for an+// unknown team and for one the caller has no access to: a team the caller cannot// see should not be distinguishable from one that does not exist. Wrapped by the// team guards.export async function requireTeamMembership(@@ -283,9 +310,9 @@ export async function requireTeamMembership(user: AuthUser | undefined | null,): Promise<TeamMembership> {const current = requireUser(user);- const role = await getTeamMembership(teamId, current.id);- if (!role) throw new HttpError(404, 'Team not found');- return { teamId, role, userId: current.id };+ const access = await getTeamAccess(teamId, current.id);+ if (!access) throw new HttpError(404, 'Team not found');+ return { teamId, role: access.role, userId: current.id };}// Asserts the caller may perform the action on a resource the team owns and every@@ -300,9 +327,12 @@ export async function requireTeamPermission(resource: PermissionResource,action: PermissionAction,): Promise<TeamMembership> {- const membership = await requireTeamMembership(teamId, user);- if (runsTeam(membership.role)) return membership;- const permissions = await getTeamPermissions(teamId, membership.userId);+ const current = requireUser(user);+ const access = await getTeamAccess(teamId, current.id);+ if (!access) throw new HttpError(404, 'Team not found');+ const membership = { teamId, role: access.role, userId: current.id };+ if (runsTeam(access.role)) return membership;+ const permissions = mergePermissions(await getTeamPermissions(teamId, current.id), access.grant);if (!hasPermission(permissions, resource, action)) {throw new HttpError(403, `You do not have permission to ${action} ${resourceLabel(resource)}`);}diff --git a/apps/api/src/shared/workspace-roles.ts b/apps/api/src/shared/workspace-roles.tsnew file mode 100644index 00000000..d1b9a47a--- /dev/null+++ b/apps/api/src/shared/workspace-roles.ts@@ -0,0 +1,98 @@+import { t } from 'elysia';+import type { TeamStanding } from '#modules/teams/service';+import {+ emptyPermissions,+ fullPermissions,+ PERMISSION_ACTIONS,+ PERMISSION_RESOURCES,+ resourceActions,+ type Permissions,+} from './permissions';++// What a role in a workspace grants in every team and project of the workspace: the+// standing of their owner, or a permission matrix. It reaches the projects of the+// workspace that the person is not a member of, and raises the ones they are. A role+// with no entry grants nothing.+export type WorkspaceGrant = 'owner' | Permissions;++// Where a person's access to a team or a project comes from: their membership, or+// only their role in the workspace that holds it.+export type AccessVia = 'member' | 'workspace';++export const AccessViaSchema = t.Union([t.Literal('member'), t.Literal('workspace')]);++export function readOnlyPermissions(): Permissions {+ const matrix = emptyPermissions();+ for (const resource of PERMISSION_RESOURCES) {+ matrix[resource].read = resourceActions(resource).includes('read');+ }+ return matrix;+}++const grants = new Map<string, WorkspaceGrant>([+ ['owner', 'owner'],+ ['admin', readOnlyPermissions()],+]);++// Sets what a workspace role grants, or with null that it grants nothing. A build that+// adds roles of its own, or grants the core's differently, calls it at startup.+export function setWorkspaceRoleGrant(role: string, grant: WorkspaceGrant | null): void {+ if (grant) grants.set(role, grant);+ else grants.delete(role);+}++export function workspaceRoleGrant(role: string): WorkspaceGrant | null {+ return grants.get(role) ?? null;+}++export function mergePermissions(...matrices: (Permissions | null | undefined)[]): Permissions {+ const merged = emptyPermissions();+ for (const matrix of matrices) {+ if (!matrix) continue;+ for (const resource of PERMISSION_RESOURCES) {+ for (const action of PERMISSION_ACTIONS) {+ merged[resource][action] ||= matrix[resource][action];+ }+ }+ }+ return merged;+}++export interface ProjectAccess {+ role: 'owner' | 'member';+ permissions: Permissions;+ via: AccessVia;+}++// A project membership raised to the workspace grant. Null when there is neither.+export function projectAccess(+ member: { role: 'owner' | 'member'; permissions: Permissions } | null,+ grant: WorkspaceGrant | null,+): ProjectAccess | null {+ if (!member && !grant) return null;+ const via = member ? 'member' : 'workspace';+ if (member?.role === 'owner' || grant === 'owner') {+ return { role: 'owner', permissions: fullPermissions(), via };+ }+ return { role: 'member', permissions: mergePermissions(member?.permissions, grant), via };+}++export interface TeamAccess {+ role: TeamStanding;+ via: AccessVia;+ // The matrix the workspace grants, merged into the team permissions of someone who+ // does not run the team. Null when it grants none, and when it makes them its owner.+ grant: Permissions | null;+}++// A team standing raised to the workspace grant: an owner grant runs the team, any+// other makes a non-member a member. Null when there is neither.+export function teamAccess(+ standing: TeamStanding | null,+ grant: WorkspaceGrant | null,+): TeamAccess | null {+ const via = standing ? 'member' : 'workspace';+ if (grant === 'owner') return { role: 'owner', via, grant: null };+ if (!standing && !grant) return null;+ return { role: standing ?? 'member', via, grant };+}diff --git a/apps/web/AGENTS.md b/apps/web/AGENTS.mdindex 791ab9d3..bd2e52b0 100644--- a/apps/web/AGENTS.md+++ b/apps/web/AGENTS.md@@ -154,6 +154,11 @@ next-intl, language from the `NEXT_LOCALE` cookie — no `[locale]` route segmendepend on them change nothing until it is on. One read-only state looks the same everywhere:the same icon and the same wording for on and off, in the row the control would have taken —reuse the component that already renders it rather than styling a second variant.+- **A workspace's owner and admins reach its projects and teams without being members.**+ The API says so with `via: 'workspace'` on the project viewer (`usePermissions().isMember`+ is false), on a project in the list and on a team. What hangs on the membership itself+ is left out for them: starring and hiding a project, leaving it or the team, and the+ project's notification settings. Everything else follows `can()` as for a member.- Add shadcn components with `bunx shadcn@latest add <name>` (config in `components.json`).- **Don't edit `src/components/ui/`** — those files are generated and re-adding a componentoverwrites them. Style them from the outside instead: every primitive carries a `data-slot`diff --git a/apps/web/messages/ar/teams.json b/apps/web/messages/ar/teams.jsonindex d453f0fc..39ae8f43 100644--- a/apps/web/messages/ar/teams.json+++ b/apps/web/messages/ar/teams.json@@ -552,6 +552,10 @@"owner": "المالك","admin": "مسؤول"},+ "titles": {+ "owner": "مالك مساحة العمل",+ "admin": "مسؤول مساحة العمل"+ },"info": {"title": "مساحة العمل","description": "مساحة العمل التي تتبع لها فرقك.",diff --git a/apps/web/messages/en/teams.json b/apps/web/messages/en/teams.jsonindex 5667a54c..e032d416 100644--- a/apps/web/messages/en/teams.json+++ b/apps/web/messages/en/teams.json@@ -552,6 +552,10 @@"owner": "Owner","admin": "Admin"},+ "titles": {+ "owner": "Workspace owner",+ "admin": "Workspace admin"+ },"info": {"title": "Workspace","description": "The workspace that owns your teams.",diff --git a/apps/web/messages/es-ES/teams.json b/apps/web/messages/es-ES/teams.jsonindex 8c0432ac..f610b3d7 100644--- a/apps/web/messages/es-ES/teams.json+++ b/apps/web/messages/es-ES/teams.json@@ -552,6 +552,10 @@"owner": "Propietario","admin": "Administrador"},+ "titles": {+ "owner": "Propietario del espacio",+ "admin": "Administrador del espacio"+ },"info": {"title": "Espacio de trabajo","description": "El espacio de trabajo al que pertenecen tus equipos.",diff --git a/apps/web/messages/fr/teams.json b/apps/web/messages/fr/teams.jsonindex 0e606347..911f7e28 100644--- a/apps/web/messages/fr/teams.json+++ b/apps/web/messages/fr/teams.json@@ -552,6 +552,10 @@"owner": "Propriétaire","admin": "Administrateur"},+ "titles": {+ "owner": "Propriétaire de l'espace",+ "admin": "Administrateur de l'espace"+ },"info": {"title": "Espace de travail","description": "L'espace de travail auquel appartiennent vos équipes.",diff --git a/apps/web/messages/id/teams.json b/apps/web/messages/id/teams.jsonindex 10e4fb0d..2e75606c 100644--- a/apps/web/messages/id/teams.json+++ b/apps/web/messages/id/teams.json@@ -552,6 +552,10 @@"owner": "Pemilik","admin": "Admin"},+ "titles": {+ "owner": "Pemilik workspace",+ "admin": "Admin workspace"+ },"info": {"title": "Workspace","description": "Workspace yang memiliki tim Anda.",diff --git a/apps/web/messages/pt-BR/teams.json b/apps/web/messages/pt-BR/teams.jsonindex ed89e994..7e5cc557 100644--- a/apps/web/messages/pt-BR/teams.json+++ b/apps/web/messages/pt-BR/teams.json@@ -552,6 +552,10 @@"owner": "Proprietário","admin": "Administrador"},+ "titles": {+ "owner": "Proprietário do workspace",+ "admin": "Administrador do workspace"+ },"info": {"title": "Workspace","description": "O workspace ao qual suas equipes pertencem.",diff --git a/apps/web/messages/ru/teams.json b/apps/web/messages/ru/teams.jsonindex 65d6bb03..0e0ff5f9 100644--- a/apps/web/messages/ru/teams.json+++ b/apps/web/messages/ru/teams.json@@ -552,6 +552,10 @@"owner": "Владелец","admin": "Админ"},+ "titles": {+ "owner": "Владелец воркспейса",+ "admin": "Админ воркспейса"+ },"info": {"title": "Воркспейс","description": "Воркспейс, которому принадлежат ваши команды.",diff --git a/apps/web/messages/uk/teams.json b/apps/web/messages/uk/teams.jsonindex 85513ce8..3df2f1b1 100644--- a/apps/web/messages/uk/teams.json+++ b/apps/web/messages/uk/teams.json@@ -552,6 +552,10 @@"owner": "Власник","admin": "Адмін"},+ "titles": {+ "owner": "Власник воркспейсу",+ "admin": "Адмін воркспейсу"+ },"info": {"title": "Воркспейс","description": "Воркспейс, якому належать ваші команди.",diff --git a/apps/web/messages/zh-CN/teams.json b/apps/web/messages/zh-CN/teams.jsonindex dbd15333..c190dfb3 100644--- a/apps/web/messages/zh-CN/teams.json+++ b/apps/web/messages/zh-CN/teams.json@@ -552,6 +552,10 @@"owner": "所有者","admin": "管理员"},+ "titles": {+ "owner": "工作区所有者",+ "admin": "工作区管理员"+ },"info": {"title": "工作区","description": "你的团队所属的工作区。",diff --git a/apps/web/src/components/layout/ProjectSwitcher.test.tsx b/apps/web/src/components/layout/ProjectSwitcher.test.tsxindex e1a0f7e9..a400ae27 100644--- a/apps/web/src/components/layout/ProjectSwitcher.test.tsx+++ b/apps/web/src/components/layout/ProjectSwitcher.test.tsx@@ -74,6 +74,7 @@ function team(id: number, workspaceId: number): Team {ref: String(id),mcpEnabled: true,role: 'owner',+ via: 'member',source: 'invite',joinedAt: '2026-01-01T00:00:00Z',projectCount: 0,diff --git a/apps/web/src/components/layout/ProjectSwitcherList.tsx b/apps/web/src/components/layout/ProjectSwitcherList.tsxindex ecb31172..ff83ca38 100644--- a/apps/web/src/components/layout/ProjectSwitcherList.tsx+++ b/apps/web/src/components/layout/ProjectSwitcherList.tsx@@ -2,6 +2,7 @@ import { useState, type Ref } from 'react';import { useLocale, useTranslations } from 'next-intl';import type { Project } from '@/lib/api/endpoints/projects';import type { Team } from '@/lib/api/endpoints/teams';+import type { WorkspaceRole } from '@/lib/api/endpoints/workspaces';import { Command, CommandInput, CommandList } from '@/components/ui/command';import ProjectSwitcherTeamGroup from './ProjectSwitcherTeamGroup';import ProjectSwitcherHiddenProjects from './ProjectSwitcherHiddenProjects';@@ -20,6 +21,7 @@ export default function ProjectSwitcherList({onOpenTeam,onSelectProject,inputRef,+ workspaceRole,}: {projects: Project[];teams: Team[];@@ -32,6 +34,7 @@ export default function ProjectSwitcherList({onOpenTeam: (teamId: number, open: boolean) => void;onSelectProject: (key: string) => void;inputRef: Ref<HTMLInputElement>;+ workspaceRole: WorkspaceRole | null;}) {const t = useTranslations('nav');const locale = useLocale();@@ -94,6 +97,7 @@ export default function ProjectSwitcherList({searching={searching}onOpenChange={(open) => onOpenTeam(group.teamId, open)}onSelectProject={onSelectProject}+ workspaceRole={workspaceRole}/>))}{hiddenCount > 0 && (diff --git a/apps/web/src/components/layout/ProjectSwitcherMenu.tsx b/apps/web/src/components/layout/ProjectSwitcherMenu.tsxindex cb92d789..5a1151d8 100644--- a/apps/web/src/components/layout/ProjectSwitcherMenu.tsx+++ b/apps/web/src/components/layout/ProjectSwitcherMenu.tsx@@ -93,6 +93,7 @@ export default function ProjectSwitcherMenu({onOpenTeam={onOpenTeam}onSelectProject={onSelectProject}inputRef={inputRef}+ workspaceRole={workspace?.role ?? null}/><ProjectSwitcherFooter isMobile={isMobile} onClose={onClose} /></div>diff --git a/apps/web/src/components/layout/ProjectSwitcherProjectRow.tsx b/apps/web/src/components/layout/ProjectSwitcherProjectRow.tsxindex 84088472..960703b8 100644--- a/apps/web/src/components/layout/ProjectSwitcherProjectRow.tsx+++ b/apps/web/src/components/layout/ProjectSwitcherProjectRow.tsx@@ -1,5 +1,6 @@import { useTranslations } from 'next-intl';import type { Project } from '@/lib/api/endpoints/projects';+import type { WorkspaceRole } from '@/lib/api/endpoints/workspaces';import { cn } from '@/lib/utils';import { useRelativeTime } from '@/context/relativeTimeContext';import { CommandItem } from '@/components/ui/command';@@ -10,13 +11,19 @@ export default function ProjectSwitcherProjectRow({project,currentProjectKey,onSelectProject,+ workspaceRole = null,}: {project: Project;currentProjectKey: string | null;onSelectProject: (key: string) => void;+ workspaceRole?: WorkspaceRole | null;}) {const t = useTranslations('nav.projectPicker');+ const tw = useTranslations('teams.workspace');const current = project.ref === currentProjectKey;+ // Stars and hiding are kept on the membership, which a project reached through the+ // workspace does not have.+ const viaWorkspace = project.via === 'workspace';const relativeTime = useRelativeTime();return (@@ -52,11 +59,17 @@ export default function ProjectSwitcherProjectRow({</time></>)}+ {viaWorkspace && workspaceRole && (+ <>+ <span aria-hidden>·</span>+ <span>{tw(`titles.${workspaceRole}`)}</span>+ </>+ )}</span></div></CommandItem>- <ProjectSwitcherHideButton project={project} />- {!project.isHidden && <ProjectSwitcherStarButton project={project} />}+ {!viaWorkspace && <ProjectSwitcherHideButton project={project} />}+ {!viaWorkspace && !project.isHidden && <ProjectSwitcherStarButton project={project} />}</div>);}diff --git a/apps/web/src/components/layout/ProjectSwitcherTeamGroup.tsx b/apps/web/src/components/layout/ProjectSwitcherTeamGroup.tsxindex 35b6b324..d26a8887 100644--- a/apps/web/src/components/layout/ProjectSwitcherTeamGroup.tsx+++ b/apps/web/src/components/layout/ProjectSwitcherTeamGroup.tsx@@ -4,6 +4,7 @@ import { cn } from '@/lib/utils';import { Button } from '@/components/ui/button';import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible';import ProjectSwitcherProjectRow from './ProjectSwitcherProjectRow';+import type { WorkspaceRole } from '@/lib/api/endpoints/workspaces';import type { TeamGroup } from './utils/projectSwitcher';export default function ProjectSwitcherTeamGroup({@@ -13,6 +14,7 @@ export default function ProjectSwitcherTeamGroup({searching,onOpenChange,onSelectProject,+ workspaceRole,}: {group: TeamGroup;currentProjectKey: string | null;@@ -20,6 +22,7 @@ export default function ProjectSwitcherTeamGroup({searching: boolean;onOpenChange: (open: boolean) => void;onSelectProject: (key: string) => void;+ workspaceRole: WorkspaceRole | null;}) {const t = useTranslations('nav');@@ -57,6 +60,7 @@ export default function ProjectSwitcherTeamGroup({project={project}currentProjectKey={currentProjectKey}onSelectProject={onSelectProject}+ workspaceRole={workspaceRole}/>))}</CollapsibleContent>diff --git a/apps/web/src/components/layout/SidebarConfigNav.tsx b/apps/web/src/components/layout/SidebarConfigNav.tsxindex 75baacb0..d198e9e7 100644--- a/apps/web/src/components/layout/SidebarConfigNav.tsx+++ b/apps/web/src/components/layout/SidebarConfigNav.tsx@@ -20,7 +20,7 @@ export default function SidebarConfigNav({ projectKey }: { projectKey: string |const pathname = usePathname();const disabled = !projectKey;const { firstHref } = useSettingsNavGroups(projectKey);- const { can } = usePermissions();+ const { can, isMember } = usePermissions();return (<SidebarGroup>@@ -36,13 +36,15 @@ export default function SidebarConfigNav({ projectKey }: { projectKey: string |disabled={disabled}/>)}- <SidebarNavItem- href={projectKey ? notificationsPath(projectKey) : '#'}- icon={Bell}- label={t('notifications')}- active={!!projectKey && pathname === notificationsPath(projectKey)}- disabled={disabled}- />+ {isMember && (+ <SidebarNavItem+ href={projectKey ? notificationsPath(projectKey) : '#'}+ icon={Bell}+ label={t('notifications')}+ active={!!projectKey && pathname === notificationsPath(projectKey)}+ disabled={disabled}+ />+ )}{firstHref && (<SidebarNavItemhref={firstHref}diff --git a/apps/web/src/components/layout/utils/projectSwitcher.test.ts b/apps/web/src/components/layout/utils/projectSwitcher.test.tsindex ed8899e9..2e3b2dec 100644--- a/apps/web/src/components/layout/utils/projectSwitcher.test.ts+++ b/apps/web/src/components/layout/utils/projectSwitcher.test.ts@@ -43,6 +43,7 @@ function team(overrides: Partial<Team> = {}): Team {ref: 'eng',mcpEnabled: true,role: 'owner',+ via: 'member',source: 'invite',joinedAt: '2026-01-01T00:00:00Z',projectCount: 1,diff --git a/apps/web/src/features/teams/ManageTeamsLayout.tsx b/apps/web/src/features/teams/ManageTeamsLayout.tsxindex c910e986..5f542a48 100644--- a/apps/web/src/features/teams/ManageTeamsLayout.tsx+++ b/apps/web/src/features/teams/ManageTeamsLayout.tsx@@ -57,6 +57,7 @@ export default function ManageTeamsLayout({ children }: { children: ReactNode })isPending={isPending}activeId={routeTeam?.id ?? null}onCreate={workspace?.canCreateTeam ? () => setCreating(true) : undefined}+ workspaceRole={workspace?.role ?? null}/></div>}diff --git a/apps/web/src/features/teams/components/TeamsRail.tsx b/apps/web/src/features/teams/components/TeamsRail.tsxindex adc2ee1f..175f9f6e 100644--- a/apps/web/src/features/teams/components/TeamsRail.tsx+++ b/apps/web/src/features/teams/components/TeamsRail.tsx@@ -4,6 +4,7 @@ import Link from 'next/link';import { Plus } from 'lucide-react';import { useTranslations } from 'next-intl';import type { Team } from '@/lib/api/endpoints/teams';+import type { WorkspaceRole } from '@/lib/api/endpoints/workspaces';import { cn } from '@/lib/utils';import { teamPath } from '@/utils/paths';import ListSkeleton from '@/components/common/skeleton/ListSkeleton';@@ -17,13 +18,16 @@ export default function TeamsRail({isPending,activeId,onCreate,+ workspaceRole,}: {teams: Team[];isPending: boolean;activeId: number | null;onCreate?: () => void;+ workspaceRole: WorkspaceRole | null;}) {const t = useTranslations('teams.manage');+ const tw = useTranslations('teams.workspace');return (<div className="space-y-2">@@ -71,7 +75,9 @@ export default function TeamsRail({><span className="min-w-0 flex-1 truncate">{team.name}</span><span className="shrink-0 text-xs text-muted-foreground">- {t(`roles.${team.role}`)}+ {team.via === 'workspace' && workspaceRole+ ? tw(`titles.${workspaceRole}`)+ : t(`roles.${team.role}`)}</span></Link></li>diff --git a/apps/web/src/features/teams/components/info/TeamInfoSection.tsx b/apps/web/src/features/teams/components/info/TeamInfoSection.tsxindex dc0059a9..739b2b50 100644--- a/apps/web/src/features/teams/components/info/TeamInfoSection.tsx+++ b/apps/web/src/features/teams/components/info/TeamInfoSection.tsx@@ -25,6 +25,7 @@ import { TEAM_SLUG_PATTERN } from '../../utils/teamSlug';// the team over to, and a membership a provisioned group granted ends at the identity// provider.function canLeave(team: Team): boolean {+ if (team.via === 'workspace') return false;if (team.role === 'owner' && team.ownerCount === 1) return false;return !(team.source === 'scim' && team.role === 'member');}diff --git a/apps/web/src/features/teams/components/projects/TeamProjectActions.tsx b/apps/web/src/features/teams/components/projects/TeamProjectActions.tsxindex 0f193c7c..7614b4ef 100644--- a/apps/web/src/features/teams/components/projects/TeamProjectActions.tsx+++ b/apps/web/src/features/teams/components/projects/TeamProjectActions.tsx@@ -6,6 +6,7 @@ import { Archive, ArchiveRestore, Copy, LogOut, Pencil, Trash2 } from 'lucide-reimport { useTranslations } from 'next-intl';import { toast } from 'sonner';import type { MemberRole } from '@/lib/api/endpoints/members';+import type { AccessVia } from '@/lib/api/endpoints/projects';import type { TeamProject, TeamRole } from '@/lib/api/endpoints/teams';import { useSession } from '@/lib/auth-client';import { useSetTeamProjectArchived } from '@/services/projects.service';@@ -30,7 +31,7 @@ export default function TeamProjectActions({teamId: number;teamRole: TeamRole;project: TeamProject;- viewer: { role: MemberRole; source: 'invite' | 'scim' } | null;+ viewer: { role: MemberRole; via: AccessVia; source: 'invite' | 'scim' } | null;}) {const t = useTranslations('projects');const router = useRouter();@@ -44,7 +45,7 @@ export default function TeamProjectActions({const userId = session?.user.id;const isLastOwner = viewer?.role === 'owner' && project.owners.length === 1;// A provisioned membership ends at the identity provider, so it is not given up here.- const canLeave = !!viewer && !isLastOwner && viewer.source !== 'scim';+ const canLeave = viewer?.via === 'member' && !isLastOwner && viewer.source !== 'scim';const canEdit = teamRole !== 'member';const canDelete = teamRole === 'owner';const archived = project.archivedAt != null;diff --git a/apps/web/src/hooks/useNavigationCommands.tsx b/apps/web/src/hooks/useNavigationCommands.tsxindex 64974c4a..5e3106f3 100644--- a/apps/web/src/hooks/useNavigationCommands.tsx+++ b/apps/web/src/hooks/useNavigationCommands.tsx@@ -53,7 +53,7 @@ export function useNavigationCommands(projectKey: string | null): CommandSectionconst godText = useGodSectionText();const accountLabel = useAccountSectionLabel();const router = useRouter();- const { can } = usePermissions();+ const { can, isMember } = usePermissions();const features = useProjectFeatures();const { data: session } = useSession();const { groups } = useSettingsNavGroups(projectKey);@@ -106,13 +106,14 @@ export function useNavigationCommands(projectKey: string | null): CommandSection'ai team agents',);add('nav.members', t('members'), <Users />, membersPath(key), 'team people invite');- add(- 'nav.notifications',- t('notificationPreferences'),- <Bell />,- notificationsPath(key),- 'email telegram',- );+ if (isMember)+ add(+ 'nav.notifications',+ t('notificationPreferences'),+ <Bell />,+ notificationsPath(key),+ 'email telegram',+ );// The settings destinations, already permission-filtered by the hook the// settings sidebar uses. The group label is a keyword so "workflow" or// "automation" finds its sections.diff --git a/apps/web/src/hooks/usePermissions.ts b/apps/web/src/hooks/usePermissions.tsindex 7ce133b1..7de73ba0 100644--- a/apps/web/src/hooks/usePermissions.ts+++ b/apps/web/src/hooks/usePermissions.ts@@ -32,5 +32,9 @@ export function usePermissions(source?: ProjectDetail | null) {const isAdmin =viewer?.role === 'owner' || viewer?.teamRole === 'owner' || viewer?.teamRole === 'manager';- return { can, role: viewer?.role ?? null, isOwner: viewer?.role === 'owner', isAdmin };+ // Someone who reaches the project only through their role in its workspace keeps no+ // preferences in it and gets none of its notifications.+ const isMember = viewer?.via === 'member';++ return { can, role: viewer?.role ?? null, isOwner: viewer?.role === 'owner', isAdmin, isMember };}diff --git a/apps/web/src/lib/api/endpoints/projects.ts b/apps/web/src/lib/api/endpoints/projects.tsindex 614648ba..e8fdac3f 100644--- a/apps/web/src/lib/api/endpoints/projects.ts+++ b/apps/web/src/lib/api/endpoints/projects.ts@@ -56,9 +56,11 @@ export interface Project {lastActivityAt?: string | null;isFavorite?: boolean;isHidden?: boolean;- // The caller's role in this project. Only present on the /projects list+ // The caller's role in this project, and whether it comes from their membership or+ // only from their role in the workspace. Only present on the /projects list// response; absent on the create/copy responses.role?: MemberRole;+ via?: AccessVia;}export interface Assignee {@@ -88,8 +90,13 @@ export interface ProjectViewer {// project's own owner; 'agent' is a bot user reading its own board, which governs// nothing.teamRole: TeamRole | 'agent' | null;+ // 'workspace' when the caller is not a member of the project and reaches it through+ // their role in the workspace that holds it.+ via: AccessVia;}+export type AccessVia = 'member' | 'workspace';+// The board scaffold, returned by getProject: everything the work-items UI needs// except the issues themselves (those come from getBoardIssues).export interface ProjectScaffold {diff --git a/apps/web/src/lib/api/endpoints/teams.ts b/apps/web/src/lib/api/endpoints/teams.tsindex 15a5b163..6c05cef4 100644--- a/apps/web/src/lib/api/endpoints/teams.ts+++ b/apps/web/src/lib/api/endpoints/teams.ts@@ -1,5 +1,5 @@import type { AnalyticsStats } from '@/lib/api/endpoints/analytics';-import type { Project } from '@/lib/api/endpoints/projects';+import type { AccessVia, Project } from '@/lib/api/endpoints/projects';import { request } from '@/lib/api/core/client';import type { Permissions } from '@/lib/api/endpoints/roles';import { pageQuery, type Page, type PageParams } from '@/lib/api/core/paging';@@ -24,6 +24,9 @@ export interface Team {// The caller's rank in the team. The API also answers an agent's own key, which reads// 'agent' there; an agent never opens this app, so a person's rank is what arrives.role: TeamRole;+ // 'workspace' when the caller is not in the team and reaches it through their role in+ // its workspace; source and joinedAt are then the team's defaults.+ via: AccessVia;// How the caller's own membership came about. A provisioned one is the identity// provider's: the team cannot be left while it stands.source: 'invite' | 'scim';@@ -118,9 +121,14 @@ export interface TeamLead {export interface TeamProjectDetail {lastActivityAt: string | null;stats: AnalyticsStats;- // The reader's own membership in the project, null when they only run the team.- // A provisioned one ends at the identity provider, so it cannot be left here.- viewer: { role: MemberRole; source: 'invite' | 'scim'; permissions: Permissions } | null;+ // The reader's access to the project, null when they only run the team. A+ // provisioned membership ends at the identity provider, so it cannot be left here.+ viewer: {+ role: MemberRole;+ via: AccessVia;+ source: 'invite' | 'scim';+ permissions: Permissions;+ } | null;}// One member of a project the team owns. The access their membership resolves to isdiff --git a/apps/web/src/utils/publicProject.ts b/apps/web/src/utils/publicProject.tsindex 4e4dff0d..dbb55beb 100644--- a/apps/web/src/utils/publicProject.ts+++ b/apps/web/src/utils/publicProject.ts@@ -28,7 +28,7 @@ export function toPublicProjectDetail(customFields: scaffold.customFields,// A public page creates nothing, so it needs no templates.issueTemplates: [],- viewer: { role: 'member', teamRole: null },+ viewer: { role: 'member', teamRole: null, via: 'member' },permissions: {} as Permissions,issues,// A share bundle carries no cycle list; a view grouped by cycle gets its lanes