[WIP] Fix merge conflicts with main branch#114

Copilot wants to merge 1 commit into

ade/cancelling-chats-and-subagents-37cbbffearul28/ADE:ade/cancelling-chats-and-subagents-37cbbffefrom

copilot/fix-merge-conflictsarul28/ADE:copilot/fix-merge-conflictsCopy head branch name to clipboard