ajmallesh 8df9eb3db4 merge: integrate xAI subscription auth from main ...

Both conflicts were adjacency rather than intent. Main rewrote only the Pi
Credential Reuse bullet while Capella rewrote the Audit System bullet beside it,
and the two branches added grok-mermaid and handlebars at the same alphabetical
slot in the lockfile. The pi bump to 0.84.2 also widened StopReason with two
states the Capella structured-generation port could not compile against.

- keep main's Pi bullet and Capella's Audit bullet, whose prose matches the code
- keep both lockfile entries; pnpm install --lockfile-only reproduces the result
- classify the new pending and deferred stop reasons as a rejected request

2026-08-28 09:23:43 -07:00

..

cli

merge: integrate Shannon 3.0 with public v2.6.0

2026-08-27 14:30:16 -07:00

worker

merge: integrate xAI subscription auth from main

2026-08-28 09:23:43 -07:00