Skip to content

Use model catalog collaboration mode messages - #36351

Merged
copyberry[bot] merged 1 commit into
mainfrom
copyberry/codex-internal-to-codex-oss/d4c6c0028423bc50b0e8175e55586f3e7bc1c3a8
Jul 31, 2026
Merged

Use model catalog collaboration mode messages#36351
copyberry[bot] merged 1 commit into
mainfrom
copyberry/codex-internal-to-codex-oss/d4c6c0028423bc50b0e8175e55586f3e7bc1c3a8

Conversation

@copyberry

@copyberry copyberry Bot commented Jul 31, 2026

Copy link
Copy Markdown

Use model catalog collaboration mode messages

What changed

  • Add optional default and plan collaboration-mode messages to model catalog metadata.
  • Prefer the active mode's catalog message, including an explicit empty value, while falling back to the existing developer instructions when the catalog variant is absent.
  • Track the model in collaboration-mode world state so mode and model changes append the appropriate instructions, and clear prior instructions when no current message exists.
  • Preserve catalog collaboration messages when instruction overrides remove other model instruction fields.

Testing

  • Cover catalog deserialization, variant selection, fallback and empty-message behavior, legacy snapshot migration, mode changes, and model changes.

## What changed

- Add optional `default` and `plan` collaboration-mode messages to model catalog metadata.
- Prefer the active mode's catalog message, including an explicit empty value, while falling back to the existing developer instructions when the catalog variant is absent.
- Track the model in collaboration-mode world state so mode and model changes append the appropriate instructions, and clear prior instructions when no current message exists.
- Preserve catalog collaboration messages when instruction overrides remove other model instruction fields.

## Testing

- Cover catalog deserialization, variant selection, fallback and empty-message behavior, legacy snapshot migration, mode changes, and model changes.

GitOrigin-RevId: d4c6c0028423bc50b0e8175e55586f3e7bc1c3a8
@copyberry
copyberry Bot force-pushed the copyberry/codex-internal-to-codex-oss/d4c6c0028423bc50b0e8175e55586f3e7bc1c3a8 branch from c8ad5ac to 2c005ab Compare July 31, 2026 15:42
@copyberry
copyberry Bot merged commit 2c005ab into main Jul 31, 2026
24 of 26 checks passed
@copyberry
copyberry Bot deleted the copyberry/codex-internal-to-codex-oss/d4c6c0028423bc50b0e8175e55586f3e7bc1c3a8 branch July 31, 2026 15:43
@github-actions github-actions Bot locked and limited conversation to collaborators Jul 31, 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.

3 participants