Skip to content

feat: load project skills in chats - #30838

Merged
jaaydenh merged 42 commits into
mainfrom
chat-project-skills/chatd
Oct 21, 2026
Merged

jaaydenh merged 42 commits into
mainfrom
chat-project-skills/chatd

Conversation

@jaaydenh

@jaaydenh jaaydenh commented Oct 15, 2026 •

Copy link
Copy Markdown
Collaborator

Chats that belong to a chat project now get the project's skills, next to personal, organization and workspace skills. They show up in the model's skill list, load through read_skill, and appear in a "Project skills" group in the / menu.

  • coderd/x/skills adds the project source. MergeSkills now takes a list of sources in merge order (personal, organization, project, workspace). Bare names stay bare unless two sources share a name, in which case they get project/<name> style aliases.
  • chatd loads project skills only when the chat owner owns the project or the project is shared with them. Role grants don't count. This is the same usableChatProject check that project instructions and memory use, and one check per turn covers both instructions and skills. Disabled skills are skipped. A failed load logs a warning and the turn continues without them. Subagents use their root chat's project; that lookup is now a helper shared with project instructions.
  • The site loads project skills for the composer on the project page and in project chats, behind the chat-projects experiment. /clear and /compact defer to a project skill with the same name, as they already do for other sources. When the user can't use the project, the site treats it as no project skills, like chatd, so those commands keep working and the / menu shows no retry prompt for project skills. That covers a 403 or 404 from the project skills request and a project missing from the user's project list, which holds only owned and shared projects, so an administrator role that can read the project doesn't count. Other failures are retried and leave the list unknown. A cached project list is also unknown while it refetches or after a failed refetch, so a share revoked since it was cached keeps those commands pending instead of deferring to stale project skills.
  • Docs gain a "Project skills" section in the extending agents page. coderd/x/chatd/ARCHITECTURE.md gains a paragraph on project skills.

Dogfood UAT on this branch passed: project skills appear in the project page / menu and in project chats, read_skill loads them, disabled and deleted skills report not found, chats outside the project don't see them, and a subagent gets them through its root chat. The site reads project skills from the chat's own project_id, so subagent chats show them in the composer once sub-chats carry their root's project (#30683).

Project page / menu read_skill in a project chat
Project skills group in the project page slash menu read_skill loading a project skill in a project chat

Stack (merge top to bottom):

Add sqlc queries for skills owned by a chat project and authorize them
through the parent project in dbauthz: reading needs chat_project:read
and writing needs chat_project:update. Skill.RBACObject keeps denying
project rows so any unwrapped path fails closed.

Add the chat_project_skill audit resource type and
AuditableChatProjectSkill so the upcoming project skill API can record
audit entries.
Add experimental routes to list, create, read, update and delete skills
on a chat project. Reading needs read on the project and writes need
update; callers who lack the permission get a 404 like the project
instructions routes. The handlers reuse the shared skill create and
update path, map the per-project cap and name index to 409, and audit
every write as a chat_project_skill.

Add matching ExperimentalClient methods.
Chats in a project now get the project's enabled skills as a new
"project" skill source, read as the chat owner each turn. Subagents use
the root chat's project. read_skill loads project skill bodies, and
MergeSkills takes sources in merge order so new sources do not change
its signature.
The "/" menu offers the skills of the chat's project, next to personal,
organization and workspace skills, and /clear and /compact defer to a
project skill with the same name. Documents project skills.
…g in the slash menu

Organization and project skills load through one hook, and the menu
renders its skill groups from one ordered list. Adds project loading and
error stories.
Cover the project-only skill tool check in the integration test, the
project skill body loader's not-found mapping, and the chat-projects
experiment gate in the composer.
@github-actions

github-actions Bot commented Oct 15, 2026 •

Copy link
Copy Markdown
Contributor

Docs preview

Check off each page once it's been reviewed. If a page changes in a later push, its checkbox clears automatically so it gets a fresh look. Pages not yet wired into the docs navigation aren't listed here.

@jaaydenh

Copy link
Copy Markdown
Collaborator Author

@codex review

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 15, 2026 •

Copy link
Copy Markdown

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-21T12:35:23.647270Z e9a4adf 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.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

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: 681b37465f

ℹ️ 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".

Comment thread coderd/x/chatd/ARCHITECTURE.md Resolved
@jaaydenh

Copy link
Copy Markdown
Collaborator Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Nice work!

Reviewed commit: 2a72a92635

ℹ️ 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".

Every observer of the project skills query now shares its retry policy,
and a 403 or 404 after an earlier load also counts as no project skills.
@jaaydenh

Copy link
Copy Markdown
Collaborator Author

@codex review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

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: 29646530af

ℹ️ 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".

chatd loads project skills only when the chat owner owns the project or it
is shared with them, while the skills list endpoint also honors role
grants. The page and the composer now also consult the caller's project
list, which holds only owned and shared projects, and keep project skills
unknown while that list is unsettled.

The composer tests mock the project list, seed caches with the exported
chatProjectSkillsKey, and wait on query state instead of DOM absence.
@jaaydenh

Copy link
Copy Markdown
Collaborator Author

@codex review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

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: 89a2e9a0a2

ℹ️ 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".

…il refetched

A cached list can predate a share's revocation as well as its creation, so
a project it contains is no more current than one it lacks.
@jaaydenh

Copy link
Copy Markdown
Collaborator Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Another round soon, please!

Reviewed commit: 9231e4eae3

ℹ️ 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".

@jaaydenh
jaaydenh removed this pull request from stack #30842 October 20, 2026 10:53
@jaaydenh
jaaydenh added this pull request to stack #31044 October 20, 2026 10:54
Comment thread coderd/x/chatd/ARCHITECTURE.md Resolved

@nickvigilante nickvigilante left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docs LGTM


Generated by Claude Code

Turns check project access once with resolveUsableChatProjectID and then
load instructions and skills, so resolveProjectInstructions had no
production callers. Its tests now cover resolveUsableChatProjectID and
loadProjectInstructions directly.
@jaaydenh

Copy link
Copy Markdown
Collaborator Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. 🚀

Reviewed commit: 90de6c8fe0

ℹ️ 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".

…retry prompt for unusable projects

A 403 or 404 from the project skills request means the caller lost access
to the project, which the composer already treats as no project skills.
The slash menu still showed "Could not load project skills" with a retry
hint that could never succeed, so a project the caller cannot use no longer
shows a loading or error status. A story covers the menu in that state.
@jaaydenh

Copy link
Copy Markdown
Collaborator Author

@codex review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

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: e9a4adf7c6

ℹ️ 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".

},
parameters: {
queries: [
{ key: organizationSkills(mockOrganizationId).queryKey, data: [] },

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Export and use the organization-skills query key

Export organizationSkillsKey and import it here instead of constructing the full query-options object solely to read .queryKey. The current setup couples the story to unrelated fetch configuration and bypasses the repository's canonical query-key pattern.

AGENTS.md reference: site/AGENTS.md:L13-L13

Useful? React with 👍 / 👎.

Comment on lines +339 to +343
const projectSkillsQuery = useQuery({
...chatProjectSkills(chatOrganizationId, chatProjectId ?? ""),
enabled: hasChatProject,
staleTime: 60_000,
});

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Extract the page-level project-skill orchestration

Move the added project-skills queries and usability derivation into a focused hook. Adding this request and state orchestration directly to an already roughly 870-line page makes the component harder to navigate and exceeds the repository's component-size guidance.

AGENTS.md reference: site/AGENTS.md:L46-L46

Useful? React with 👍 / 👎.

Comment on lines +730 to +734
const projectSource = useStoredSkillSource(
chatProjectSkills(organizationId ?? "", projectId ?? ""),
{ hasSource: hasProject, isTriggerActive: hasSkillsTrigger },
);
const projectQuery = useQuery({

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Extract the composer project-skill state pipeline

Move the project queries and their loading, error, usability, and filtering derivations into a focused hook. This block adds substantial server-state orchestration to an already roughly 1,167-line editor component, making the file increasingly difficult to maintain.

AGENTS.md reference: site/AGENTS.md:L46-L46

Useful? React with 👍 / 👎.

},
play: async ({ canvasElement }) => {
await typeInEditor(canvasElement, "/");
// Built-in commands appear once the project source has resolved.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Remove the redundant wait narration

Delete this comment because it only restates that the immediately following wait looks for the built-in command; the story-level comment already explains why this state matters.

AGENTS.md reference: site/AGENTS.md:L10-L10

Useful? React with 👍 / 👎.

@jaaydenh
jaaydenh merged commit 3216580 into main Oct 21, 2026
40 checks passed
@jaaydenh
jaaydenh deleted the chat-project-skills/chatd branch October 21, 2026 12:47
@github-actions github-actions Bot locked and limited conversation to collaborators Oct 21, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants