Skip to content

feat(site): check for newer chat project templates right before saving - #32377

Draft
jaaydenh wants to merge 5 commits into
chat-project-templates/edit-conflictsfrom
chat-project-templates/pre-save-check
Draft

jaaydenh wants to merge 5 commits into
chat-project-templates/edit-conflictsfrom
chat-project-templates/pre-save-check

Conversation

@jaaydenh

@jaaydenh jaaydenh commented Nov 18, 2026 •

Copy link
Copy Markdown
Collaborator

Closes the last gap in the Edit templates dialog's conflict handling: a save made elsewhere between the dialog's last refresh (#32376) and the click on Save.

Save now refetches the project and the eligible templates first, and sends nothing when:

  • a newer save elsewhere conflicts with the draft. The conflict warning appears and takes focus. Focus lands on the warning, not on Load latest, so a repeated Enter cannot discard the draft.
  • a refetch fails. Saving pauses and focus moves to Retry.
  • the draft changed during the check, which leaves the fields editable.
  • one of the draft's templates changed in the eligible list, for example to a new active version. The request is rebuilt and the user saves again.
  • the dialog closed. Closing also cancels a check that is still running, so the next open does not wait for it.

A second submit while the check runs is ignored.

The tests include three that moved here unchanged from the lower PRs, because they wait on a number of requests that includes the check's: the 404 path of the save from #30898, and two refresh cases from #32376.

Split out of #30898.

Stack (merge top to bottom):

Save refetches the project and the eligible templates first. It sends
nothing when a newer save elsewhere conflicts with the draft, when a
refetch fails, when the draft or an eligible template of the draft
changed during the check, or when the dialog closed.

A found conflict moves focus to the warning, and a failed check moves
it to Retry. Closing the dialog cancels a check that is still running.
@jaaydenh

Copy link
Copy Markdown
Collaborator Author

@codex review

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 18, 2026 •

Copy link
Copy Markdown
Codex Review Summary: ✅ Completed

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-18T08:13:23.494211Z 8fcd463 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: 8fcd4638bc

ℹ️ 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 on lines +422 to +425
<div
ref={conflictAlertRef}
tabIndex={-1}
className="rounded-md outline-none focus-visible:ring-2 focus-visible:ring-content-link"

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Capture the focused-conflict state in Storybook

When the pre-save refetch discovers a conflict, this new wrapper receives focus and renders a visible focus ring, but the existing Conflict story only changes serverProject without submitting, so Pixel never captures this newly introduced visual state. Update that story or add one that submits against a newer mocked project and finishes with the conflict warning focused.

AGENTS.md reference: site/AGENTS.md:L72-L75

Useful? React with 👍 / 👎.

const getProjects = vi.mocked(API.experimental.getChatProjects);
await user.click(await screen.findByRole("button", { name: "Select all" }));
const save = screen.getByRole("button", { name: /Save/ });
await waitFor(() => expect(save).toHaveAttribute("aria-disabled", "false"));

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Replace DOM-attribute waits with behavioral synchronization

This and the other newly added toHaveAttribute("aria-disabled", "false") waits couple the tests to the Button implementation instead of synchronizing on an observable request or state outcome; a behavior-preserving change to how disabled submission is represented would therefore break these tests. Remove these assertions or wait for the relevant asynchronous prerequisite or nonvisual behavior instead.

AGENTS.md reference: site/AGENTS.md:L74-L76

Useful? React with 👍 / 👎.

jaaydenh added a commit that referenced this pull request Nov 18, 2026
Adds the API for attaching workspace templates to a chat project, on the
schema and queries in #32309. A project can attach templates, turn on a
limit that restricts its chats to them, and set a default template with
either a default preset or default parameter values. Attaching a
template never grants access to it: every reader is checked against the
template's own sharing. This PR stores and returns `limit_templates`;
#32310 enforces it.

- The limit is opt-in. `limit_templates` is off unless a request turns
it on, which is what every existing project gets.
- Templates are attached and detached one at a time with `PUT` and
`DELETE /chats/projects/{project}/templates/{template}`, so a caller
never replaces a list they can only partly see. Attaching needs project
`update` and template `use`. Detaching needs project `update` and
template `read`, and a template the caller cannot read is reported as
not found. `POST /chats/projects` accepts `template_ids`,
`limit_templates`, and `default_template` for the new project.
- `PATCH /chats/projects/{project}` sets `limit_templates` and
`default_template`, and no longer changes which templates are attached.
The default must be an attached template the caller can read, and its
preset must belong to the template's active version. Default parameter
names and values are checked against that version for templates on the
classic parameter flow; dynamic parameters are checked when a workspace
is built. Detaching the default template clears the default.
- Project responses list only the attached templates the caller can
read, as `templates`, and count the rest as `hidden_template_count`.
`default_template` is omitted when the caller cannot read it. Deleted,
deprecated, and agent-disabled templates are left out and are not
counted as hidden.
- Editing uses `chat_project:update`, which the project owner and the
project `admin` ACL role have.
- Attaching and detaching are audited as writes to the project, with the
template list before and after, including the templates attached while
creating a project. Changes to `limit_templates` and the default
template are part of the project's own audit diff.

Not included: showing which project members lack access to an attached
template, and MCP server attachments.

Stack (merge top to bottom):
- #32309
- #30754 👈
- #32310
- #30755
- #32371
- #32372
- #30756
- #32373
- #32374
- #32375
- #30898
- #32376
- #32377
- #32378
- #32379

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant