## Stack Organization skills load into every member's Coder Agents chats in their organization, with no way for a member to opt out. This stack adds a per-organization setting that lets members turn them off for their own chats, bottom to top: 1. **#31134** data model, API, and chatd (this PR) 2. #31135 admin and member controls in the dashboard, the `/` menu, and docs ## What changes Organizations get `members_can_disable_skills`, off by default. Users who can update organization skills change it with `PUT /api/experimental/organizations/{organization}/skill-settings`, which writes an organization audit entry. Anyone who can read the organization can `GET` it. While the setting is on, each member saves their own choices with `PATCH /api/experimental/organizations/{organization}/members/{user}/skill-preferences`: `all_skills_disabled` (a master switch that also covers skills created later) and `skills`, a sparse map from skill ID to on or off. `GET` returns the setting, the master switch, and `disabled_skill_ids`. The routes follow the personal-settings rules: without `read_personal` or `update_personal` on that user the caller gets 404, a PATCH while the setting is off gets 403, and a key that is not an organization skill that member can read gets a 400 that names the key. The check runs as the member, not the caller, so an owner or user admin editing someone else's choices is held to that member's skills. Turning the setting off keeps the choices but ignores them. Migration 000636 adds the column and two tables keyed by organization membership. Both cascade when the membership goes away, and the per-skill table also cascades when the skill is deleted, so a recreated skill loads by default. chatd reads the preferences as the chat owner when it builds the skill index and when it loads a body for `read_skill` or for a structured skill invocation (#30861). A skill the member turned off is left out of the index, and both loads report it as not found, including later in a running chat. If the preferences cannot be read, turn preparation fails, as it already does when the skill metadata cannot be read. Older migration tests created organizations with `dbgen.Organization` and `GetDefaultOrganization`, which now select the new column before it exists, so they insert organizations with raw SQL instead. ## Review focus - Authorization in `coderd/organizationskillpreferences.go` and the five new dbauthz methods (`read_personal` and `update_personal` on the user, `organization_skill` update for the setting). - `GetOrganizationSkillMemberPreferencesRow.Excludes` is the one rule chatd applies; #31135 mirrors it in `activeOrganizationSkills`. ## Testing - Go tests cover the queries and cascades, dbauthz, both routes (including the audit diff and each 400 case), and chatd (index, `read_skill`, skill invocations, master switch, a change during a chat). Each new test fails with its code path removed. - Remote dogfood UAT (10 scenarios, real model) passed on the pre-split branch head `186c28d81ab`, which has the same code except the fix below. It found one issue: two spellings of one skill ID with opposite values stored a random result. The PATCH now rejects every aliased key with a 400. A second run on the stack's top head at the time, `718dd6d1bd1`, passed: every aliased form returns 400 and stores nothing, and chats leave out a skill the member turned off, including in `read_skill`. - Polish and the test audit stayed inside the implementation diff. No new dependencies. - Rebased on main as one commit. The migration is now 000636, after main's 000634 and 000635. Every organization skill load passes the chat owner, including main's skill invocation path, so `/skill` invocations honor the opt-out too. The model's skill index leaves out a skill that is not model-invocable or that the member turned off. Apart from that, the diff is unchanged. > Xum, an AI agent, opened this PR for @ibetitsmike and wrote this description.
167 lines
3.2 KiB
SQL
167 lines
3.2 KiB
SQL
-- name: GetDefaultOrganization :one
|
|
SELECT
|
|
*
|
|
FROM
|
|
organizations
|
|
WHERE
|
|
is_default = true
|
|
LIMIT
|
|
1;
|
|
|
|
-- name: GetOrganizations :many
|
|
SELECT
|
|
*
|
|
FROM
|
|
organizations
|
|
WHERE
|
|
-- Optionally include deleted organizations
|
|
deleted = @deleted
|
|
-- Filter by ids
|
|
AND CASE
|
|
WHEN array_length(@ids :: uuid[], 1) > 0 THEN
|
|
id = ANY(@ids)
|
|
ELSE true
|
|
END
|
|
AND CASE
|
|
WHEN @name::text != '' THEN
|
|
LOWER("name") = LOWER(@name)
|
|
ELSE true
|
|
END
|
|
;
|
|
|
|
-- name: GetOrganizationByID :one
|
|
SELECT
|
|
*
|
|
FROM
|
|
organizations
|
|
WHERE
|
|
id = $1;
|
|
|
|
-- name: GetOrganizationByName :one
|
|
SELECT
|
|
*
|
|
FROM
|
|
organizations
|
|
WHERE
|
|
-- Optionally include deleted organizations
|
|
deleted = @deleted AND
|
|
LOWER("name") = LOWER(@name)
|
|
LIMIT
|
|
1;
|
|
|
|
-- name: GetOrganizationsByUserID :many
|
|
SELECT
|
|
*
|
|
FROM
|
|
organizations
|
|
WHERE
|
|
-- Optionally provide a filter for deleted organizations.
|
|
CASE WHEN
|
|
sqlc.narg('deleted') :: boolean IS NULL THEN
|
|
true
|
|
ELSE
|
|
deleted = sqlc.narg('deleted')
|
|
END AND
|
|
id = ANY(
|
|
SELECT
|
|
organization_id
|
|
FROM
|
|
organization_members
|
|
WHERE
|
|
user_id = $1
|
|
);
|
|
|
|
-- name: GetOrganizationResourceCountByID :one
|
|
SELECT
|
|
(
|
|
SELECT
|
|
count(*)
|
|
FROM
|
|
workspaces
|
|
WHERE
|
|
workspaces.organization_id = $1
|
|
AND workspaces.deleted = FALSE) AS workspace_count,
|
|
(
|
|
SELECT
|
|
count(*)
|
|
FROM
|
|
GROUPS
|
|
WHERE
|
|
groups.organization_id = $1) AS group_count,
|
|
(
|
|
SELECT
|
|
count(*)
|
|
FROM
|
|
templates
|
|
WHERE
|
|
templates.organization_id = $1
|
|
AND templates.deleted = FALSE) AS template_count,
|
|
(
|
|
SELECT
|
|
count(*)
|
|
FROM
|
|
organization_members
|
|
LEFT JOIN users ON organization_members.user_id = users.id
|
|
WHERE
|
|
organization_members.organization_id = $1
|
|
AND users.deleted = FALSE) AS member_count,
|
|
(
|
|
SELECT
|
|
count(*)
|
|
FROM
|
|
provisioner_keys
|
|
WHERE
|
|
provisioner_keys.organization_id = $1) AS provisioner_key_count;
|
|
|
|
|
|
-- name: InsertOrganization :one
|
|
INSERT INTO
|
|
organizations (id, "name", display_name, description, icon, created_at, updated_at, is_default, default_org_member_roles)
|
|
VALUES
|
|
-- If no organizations exist, and this is the first, make it the default.
|
|
(@id, @name, @display_name, @description, @icon, @created_at, @updated_at, (SELECT TRUE FROM organizations LIMIT 1) IS NULL, @default_org_member_roles) RETURNING *;
|
|
|
|
-- name: UpdateOrganization :one
|
|
UPDATE
|
|
organizations
|
|
SET
|
|
updated_at = @updated_at,
|
|
name = @name,
|
|
display_name = @display_name,
|
|
description = @description,
|
|
icon = @icon,
|
|
default_org_member_roles = @default_org_member_roles
|
|
WHERE
|
|
id = @id
|
|
RETURNING *;
|
|
|
|
-- name: UpdateOrganizationMembersCanDisableSkills :one
|
|
UPDATE
|
|
organizations
|
|
SET
|
|
members_can_disable_skills = @members_can_disable_skills,
|
|
updated_at = @updated_at
|
|
WHERE
|
|
id = @id
|
|
RETURNING *;
|
|
|
|
-- name: UpdateOrganizationDeletedByID :exec
|
|
UPDATE organizations
|
|
SET
|
|
deleted = true,
|
|
updated_at = @updated_at
|
|
WHERE
|
|
id = @id AND
|
|
is_default = false;
|
|
|
|
-- name: UpdateOrganizationWorkspaceSharingSettings :one
|
|
UPDATE
|
|
organizations
|
|
SET
|
|
shareable_workspace_owners = @shareable_workspace_owners,
|
|
updated_at = @updated_at
|
|
WHERE
|
|
id = @id
|
|
RETURNING *;
|
|
|