mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-09-21 16:02:36 +00:00
Main rewrote parts of the chat view this branch had just moved behind ChatViewHost, so the conflicts were the same lines under two names. Resolved by keeping main's behaviour and reading it through the host: - `runHeldElsewhere` and `operatingWorkspace` join the interface, so the typing indicator, the past-chats buttons and a message's workspace mean the same thing for a flow chat as for a session. - The skills and MCP menus main added take an AIChatManager and render only under GLOBAL, so AIChatDisplay resolves the manager for those two alone. - `AIChatModelSettings` keeps this branch's config-object form and gains main's `promptSettings` prop, which now gates the Parameters entries and the prompts modal. - `composerBoxClass(disabled)` replaces the `COMPOSER_BOX` constant, so main's disabled treatment applies to both composer branches. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01QN7VboDEm9HAB1t4sMxMdE
1.1 MiB
1.1 MiB