Skip to content

feat(site): detect chat project template changes made elsewhere while editing - #32376

Draft
jaaydenh wants to merge 5 commits into
chat-project-templates/project-pagefrom
chat-project-templates/edit-conflicts
Draft

jaaydenh wants to merge 5 commits into
chat-project-templates/project-pagefrom
chat-project-templates/edit-conflicts

Conversation

@jaaydenh

@jaaydenh jaaydenh commented Nov 18, 2026 •

Copy link
Copy Markdown
Collaborator

A project's templates are shared by everyone who can edit the project, so the Edit templates dialog now notices templates saved elsewhere while it is open. Before this PR a draft could undo them.

  • The dialog refetches the project and the eligible templates when it opens and when the window regains focus.
  • An untouched draft follows the newer templates.
  • An edited draft keeps its changes and blocks Save behind a warning with Keep my draft and Load latest, the ProjectEditConflictAlert that the instructions editor uses. Keeping the draft applies its changes to the newer templates instead of replacing them: templates someone else attached or detached stay that way, and where both changed the limit or the default template, the draft wins.
  • Templates that already match the draft are not a conflict. That covers the dialog's own save arriving before it closes, and a save that failed partway: the draft keeps its edits, and saving again sends what is left of them.
  • Save is disabled while a refresh runs. After a failed refresh it stays paused, with a Retry.

Edit templates dialog with the conflict warning

What to look at: rebaseValues in projectTemplatesDraft.ts decides what Keep my draft saves.

#32377 closes the gap that remains, a save made elsewhere between the last refresh and Save.

Split out of #30898.

Stack (merge top to bottom):

… editing

The Edit templates dialog refreshes the project and the eligible
templates when it opens and when the window regains focus. An untouched
draft follows newer templates. An edited draft keeps its changes and
blocks Save behind the Keep my draft / Load latest warning that the
instructions editor uses. Keeping the draft applies its changes to the
newer templates instead of replacing them.

Save pauses while a refresh runs, and after a failed refresh until
Retry succeeds.
@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:47.113068Z d15d9b0 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: d15d9b047f

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

await user.click(await screen.findByRole("button", { name: "Retry" }));
await waitFor(() => expect(getProjects).toHaveBeenCalledTimes(2));
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.

P1 Badge Wait for the refresh outcome instead of aria-disabled

In the refresh-retry scenario, this waits on the Save button's aria-disabled implementation detail even though the subsequent onSave assertion is the observable behavior being protected. A behavior-preserving change to the button's disabled-state implementation would break this test; synchronize on the completed refresh and retain the callback assertion instead.

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

Useful? React with 👍 / 👎.

failUpdate(mockApiError({ message: "Failed to update chat project." }));

const save = await screen.findByRole("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.

P1 Badge Wait for the failed save to settle without inspecting markup

In the partial-save retry scenario, this assertion couples the test to the Save button's aria-disabled markup rather than the second update request that proves retry behavior. A behavior-preserving button refactor would fail the test unnecessarily; await the rejected save through the test's async boundary, click Save, and keep the existing second updateProject assertion as the outcome.

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