mirror of
https://github.com/KeygraphHQ/shannon.git
synced 2026-09-13 21:49:04 +02:00
ajmallesh
8df9eb3db4
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