diff --git a/src/modules/beam/gather/BeamGatherPane.tsx b/src/modules/beam/gather/BeamGatherPane.tsx
index 010d290ca..ad1dd0e28 100644
--- a/src/modules/beam/gather/BeamGatherPane.tsx
+++ b/src/modules/beam/gather/BeamGatherPane.tsx
@@ -10,7 +10,6 @@ import { ScrollToBottomButton } from '~/common/scroll-to-bottom/ScrollToBottomBu
import { animationColorBeamGather } from '~/common/util/animUtils';
import { useLLMSelect } from '~/common/components/forms/useLLMSelect';
-import { BeamGatherDropdown } from './BeamGatherPaneDropdown';
import { BeamStoreApi, useBeamStore } from '../store-beam.hooks';
import { FFactoryId, FUSION_FACTORIES } from './instructions/beam.gather.factories';
import { GATHER_COLOR } from '../beam.config';
@@ -109,14 +108,14 @@ export function BeamGatherPane(props: {
}
+ // endDecorator={}
// sx={{ my: 0.25 }}
>
Merge
{/* may merge or not (hasInputs) N replies.. put this in pretty messages */}
- {props.canGather ? `Combine the ${props.raysReady} replies` : /*'Fuse all replies'*/ ''}
+ {props.canGather ? `Combine the ${props.raysReady} replies` : /*'Fuse all replies'*/ 'Combine replies'}
diff --git a/src/modules/beam/gather/BeamGatherPaneDropdown.tsx b/src/modules/beam/gather/BeamGatherPaneDropdown.tsx
deleted file mode 100644
index aff81ea26..000000000
--- a/src/modules/beam/gather/BeamGatherPaneDropdown.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import * as React from 'react';
-import { useShallow } from 'zustand/react/shallow';
-
-import { Dropdown, IconButton, ListItem, ListItemDecorator, Menu, MenuButton, MenuItem, Typography } from '@mui/joy';
-import CheckRoundedIcon from '@mui/icons-material/CheckRounded';
-import MoreHorizRoundedIcon from '@mui/icons-material/MoreHorizRounded';
-
-import { useModuleBeamStore } from '../store-module-beam';
-
-
-export function BeamGatherDropdown() {
-
- // external (persisted) state
- const {
- gatherShowPrompts,
- toggleGatherShowPrompts,
- } = useModuleBeamStore(useShallow(state => ({
- gatherShowPrompts: state.gatherShowPrompts,
- toggleGatherShowPrompts: state.toggleGatherShowPrompts,
- })));
-
- return (
-
-
-
-
-
-
- );
-}
\ No newline at end of file
diff --git a/src/modules/beam/scatter/BeamScatterInput.tsx b/src/modules/beam/scatter/BeamScatterInput.tsx
index 8b05d9a63..cd0c426b6 100644
--- a/src/modules/beam/scatter/BeamScatterInput.tsx
+++ b/src/modules/beam/scatter/BeamScatterInput.tsx
@@ -52,10 +52,10 @@ export function BeamScatterInput(props: {
}) {
// state
- const [showHistoryMessage, setShowHistoryMessage] = React.useState(true);
+ // const [showHistoryMessage, setShowHistoryMessage] = React.useState(true);
// external state
- const gatherShowPrompts = useModuleBeamStore(state => state.gatherShowPrompts);
+ const scatterShowPrevMessages = useModuleBeamStore(state => state.scatterShowPrevMessages);
// derived state
@@ -69,14 +69,14 @@ export function BeamScatterInput(props: {
// user message decorator
const userMessageDecorator = React.useMemo(() => {
- return (showHistoryMessage && otherHistoryCount >= 1 && gatherShowPrompts) ? (
+ return (/*showHistoryMessage &&*/ otherHistoryCount >= 1 && scatterShowPrevMessages) ? (
// } sx={{ my: 1 }}>
- setShowHistoryMessage(on => !on)}>
+ setShowHistoryMessage(on => !on)*/}>
... {otherHistoryCount === 1 ? (isFirstMessageSystem ? '1 system message' : '1 message') : `${otherHistoryCount} messages`} before this input ...
//
) : null;
- }, [gatherShowPrompts, isFirstMessageSystem, otherHistoryCount, showHistoryMessage]);
+ }, [scatterShowPrevMessages, isFirstMessageSystem, otherHistoryCount/*, showHistoryMessage*/]);
// skip rendering if no message
diff --git a/src/modules/beam/scatter/BeamScatterPaneDropdown.tsx b/src/modules/beam/scatter/BeamScatterPaneDropdown.tsx
index e34c1267b..664f70b7a 100644
--- a/src/modules/beam/scatter/BeamScatterPaneDropdown.tsx
+++ b/src/modules/beam/scatter/BeamScatterPaneDropdown.tsx
@@ -1,6 +1,6 @@
import * as React from 'react';
-import { Box, Button, DialogContent, DialogTitle, Dropdown, FormControl, FormLabel, IconButton, Input, ListItem, ListItemDecorator, Menu, MenuButton, MenuItem, Modal, ModalClose, ModalDialog, Typography } from '@mui/joy';
+import { Box, Button, DialogContent, DialogTitle, Dropdown, FormControl, FormLabel, IconButton, Input, ListDivider, ListItem, ListItemDecorator, Menu, MenuButton, MenuItem, Modal, ModalClose, ModalDialog, Typography } from '@mui/joy';
import CheckRoundedIcon from '@mui/icons-material/CheckRounded';
import DeleteOutlineRoundedIcon from '@mui/icons-material/DeleteOutlineRounded';
import DriveFileRenameOutlineRoundedIcon from '@mui/icons-material/DriveFileRenameOutlineRounded';
@@ -67,7 +67,9 @@ export function BeamScatterDropdown(props: {
const {
scatterPresets, addScatterPreset, deleteScatterPreset,
cardScrolling, toggleCardScrolling,
+ scatterShowPrevMessages, toggleScatterShowPrevMessages,
scatterShowLettering, toggleScatterShowLettering,
+ gatherShowPrompts, toggleGatherShowPrompts,
} = useModuleBeamStore();
@@ -146,9 +148,14 @@ export function BeamScatterDropdown(props: {
View
+
+
+
+ Advanced
+
+
+
+
+
+