GeezerVison is showing github.com — feat(coderd/x): merge skills from personal, org, and workspace sources by ibetitsmike · Pull Request #30593 · coder/coder
Conversation
ibetitsmike
commented
Oct 10, 2026
•
edited
Loading
Uh oh!
There was an error while loading. Please reload this page.
Part of CODAGT-1341.
This layer prepares chatd for a third skill source without loading it yet. coderd/x/skills gains SourceOrganization = "org", and MergeSkills becomes one merge over personal, org and workspace lists in that order, sorted by name. A name in one source keeps its bare alias; a name in several sources gets a qualified alias (personal/x, org/x, workspace/x) in every source that has it, so no source overrides another. Lookup still rejects an ambiguous bare name with ErrSkillAmbiguous. chatd passes nil for the org list; the next layer fills it.
- The
<available-skills> index cuts descriptions over 1,024 runes (the Agent Skills spec limit) on a rune boundary and adds …. Stored descriptions and the API keep the full text.
- Skill parse and lookup errors put the wrapped sentinel last, so the cause is not repeated. The qualified-alias hint no longer names only two sources: "When a skill is listed with a source prefix, such as personal/name, pass that qualified alias to read_skill."
read_skill loads personal and org skills through one source-aware ReadSkillOptions.LoadStoredSkillBody, which replaces LoadPersonalSkillBody. read_skill_file reports that any non-workspace skill has no supporting files.
Behavior change for existing personal skills: rows with enabled = false are left out of the index, and read_skill returns not found for them.
Testing
TestMergeSkills (every collision shape, qualified lookups, an ambiguous bare lookup naming the sentinel once, bare aliases without collisions), TestLookup (org/x), and TestFormatResolvedSkillIndex (three-source output, the exact hint line, and TruncatesLongDescriptionsOnRuneBoundary with 3-byte runes at and over the limit).
TestReadSkillTool/OrganizationSkillUsesStoredLoader, TestReadSkillFileTool/StoredSkillUnsupported, TestFetchPersonalSkillMetadata with a disabled row, and TestLoadPersonalSkillBody/DisabledSkill.
- Red-green: the tests fail if the org source is never qualified, if truncation is removed or done by byte, if the org case leaves the
read_skill switch, or if either personal enabled check is removed.
- Ran
go build ./..., the coderd/x/skills, chattool and chatd skill tests, golangci-lint on the touched packages, and make pre-commit.
Review record
- Remote UAT round 6 through Coder Agents: PASS on the final stack tip
afdd4a9f954 (chat); its low notes are in docs(docs/ai-coder/agents): document organization skills #30604.
- Codex round 1: declined trimming truncated index descriptions to 1,023 runes, because the index only previews descriptions that may be stored longer and the ellipsis marks the cut.
This stack adds organization skills to Coder Agents: admins publish a skill once per organization, share it with groups or members, and chats in that organization load it next to personal and workspace skills.
Stack, bottom to top: #30584, #30585, #30586, #30587, #30588, #30589, #30590, #30591, #30592, #30593, #30594, #30595, #30596, #30597, #30598, #30599, #30600, #30601, #30602, #30603, #30604.
Xum opened this PR on behalf of @ibetitsmike.
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
chatgpt-codex-connector[bot] reacted with thumbs up emoji
Add the org skill source and make MergeSkills one merge over personal, org, and workspace skills: a name found in more than one source gets a qualified alias in each. The skill index now truncates descriptions to 1,024 runes and uses a source-neutral qualified-alias hint.
…kills by source
Disabled personal skills are left out of the skill index and read as not found. read_skill now loads personal and org skills through one source-aware loader, and read_skill_file reports that any stored skill has no supporting files.
This was referenced Oct 10, 2026
ibetitsmike
changed the title
mike/org skills/skill sources
feat(coderd/x): merge skills from personal, org, and workspace sources
Oct 10, 2026
This was referenced Oct 10, 2026
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Codex Review Summary
This comment shows the latest Codex review activity on this pull request.
| Review |
Status |
Commit |
Review trigger |
| 📝 Code Review |
✅ Completed 2026-10-10T03:42:29.302566Z |
2aa3833 |
Manual request |
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review" or "@codex security review".
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.
|
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: e3adfee5db
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
|
Codex Review: Didn't find any major issues. Nice work!
Reviewed commit: 2aa3833186
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
|
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Milestone
No milestone
Development
Successfully merging this pull request may close these issues.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
|