* feat: add dialog for "Start new session from this answer" Replace the one-click fork action on assistant messages with a dialog (ForkSessionDialog) that lets the user pick model, thinking level, and agent, plus edit the instructions sent to the new session. The instructions field is prefilled with the previous fixed fork prompt and is mandatory. The composed message is now fully visible (no synthetic preface): the user's instructions sit above a short fixed connective that opens the assistant content. createSessionFromAssistantMessage takes the chosen execution params instead of reading from config. Also fix TodoSendDialog visuals: narrower vertical layout, model trigger no longer stretches with centered text, and the agent/thinking dropdowns portal to body so opening them no longer nudges the dialog height. Extract the shared ThinkingPill into its own component. * fix: address review feedback on fork session dialog - Fix "bellow" -> "below" typo in the fork content preface (now user-visible since the message is no longer synthetic) - Reset ForkSessionDialog state only on open transition, reading the config store snapshot via getState() so background store refreshes can't discard in-progress instruction edits
194 lines
7.4 KiB
TypeScript
194 lines
7.4 KiB
TypeScript
import React from 'react';
|
|
import { Button } from '@/components/ui/button';
|
|
import {
|
|
Dialog,
|
|
DialogContent,
|
|
DialogHeader,
|
|
DialogTitle,
|
|
} from '@/components/ui/dialog';
|
|
import { ModelSelector } from '@/components/sections/agents/ModelSelector';
|
|
import { AgentSelector } from '@/components/sections/commands/AgentSelector';
|
|
import { ThinkingPill } from '@/components/session/ThinkingPill';
|
|
import { useConfigStore } from '@/stores/useConfigStore';
|
|
import { useAgentsStore } from '@/stores/useAgentsStore';
|
|
import { isPrimaryMode } from '@/components/chat/mobileControlsUtils';
|
|
import { useI18n } from '@/lib/i18n';
|
|
|
|
type TodoSendTarget = 'session' | 'worktree';
|
|
|
|
export type TodoSendExecution = {
|
|
providerID: string;
|
|
modelID: string;
|
|
variant: string;
|
|
agent: string;
|
|
};
|
|
|
|
type TodoSendDialogProps = {
|
|
open: boolean;
|
|
onOpenChange: (open: boolean) => void;
|
|
target: TodoSendTarget;
|
|
projectDirectory: string | null;
|
|
submitting?: boolean;
|
|
onConfirm: (execution: TodoSendExecution) => Promise<void> | void;
|
|
};
|
|
|
|
const getInitialExecution = (params: {
|
|
providerID: string;
|
|
modelID: string;
|
|
variant: string;
|
|
agent: string;
|
|
}): TodoSendExecution => ({
|
|
providerID: params.providerID,
|
|
modelID: params.modelID,
|
|
variant: params.variant,
|
|
agent: params.agent,
|
|
});
|
|
|
|
export function TodoSendDialog(props: TodoSendDialogProps) {
|
|
const { t } = useI18n();
|
|
const { open, onOpenChange, target, projectDirectory, submitting = false, onConfirm } = props;
|
|
|
|
const loadProviders = useConfigStore((state) => state.loadProviders);
|
|
const loadConfigAgents = useConfigStore((state) => state.loadAgents);
|
|
const loadAgentsStoreAgents = useAgentsStore((state) => state.loadAgents);
|
|
const providers = useConfigStore((state) => state.providers);
|
|
const currentProviderID = useConfigStore((state) => state.currentProviderId);
|
|
const currentModelID = useConfigStore((state) => state.currentModelId);
|
|
const currentVariant = useConfigStore((state) => state.currentVariant || '');
|
|
const currentAgentName = useConfigStore((state) => state.currentAgentName || '');
|
|
|
|
const [execution, setExecution] = React.useState<TodoSendExecution>(() => getInitialExecution({
|
|
providerID: currentProviderID,
|
|
modelID: currentModelID,
|
|
variant: currentVariant,
|
|
agent: currentAgentName,
|
|
}));
|
|
|
|
React.useEffect(() => {
|
|
if (!open) return;
|
|
void loadProviders({ directory: projectDirectory });
|
|
void loadConfigAgents({ directory: projectDirectory });
|
|
void loadAgentsStoreAgents();
|
|
}, [open, loadProviders, loadConfigAgents, loadAgentsStoreAgents, projectDirectory]);
|
|
|
|
React.useEffect(() => {
|
|
if (!open) return;
|
|
setExecution(getInitialExecution({
|
|
providerID: currentProviderID,
|
|
modelID: currentModelID,
|
|
variant: currentVariant,
|
|
agent: currentAgentName,
|
|
}));
|
|
}, [open, currentProviderID, currentModelID, currentVariant, currentAgentName]);
|
|
|
|
React.useEffect(() => {
|
|
if (!open || providers.length === 0) return;
|
|
|
|
const provider = providers.find((item) => item.id === execution.providerID) ?? providers[0];
|
|
const models = Array.isArray(provider?.models) ? provider.models : [];
|
|
const hasModel = models.some((item) => item.id === execution.modelID);
|
|
const fallbackModelID = models[0]?.id ?? '';
|
|
|
|
if (provider?.id === execution.providerID && hasModel) return;
|
|
|
|
setExecution((prev) => ({
|
|
...prev,
|
|
providerID: provider?.id ?? '',
|
|
modelID: hasModel ? prev.modelID : fallbackModelID,
|
|
variant: '',
|
|
}));
|
|
}, [open, providers, execution.providerID, execution.modelID]);
|
|
|
|
const agentFilter = React.useCallback((agent: { mode?: string }) => isPrimaryMode(agent.mode), []);
|
|
|
|
const variantOptions = React.useMemo(() => {
|
|
const provider = providers.find((item) => item.id === execution.providerID);
|
|
const model = provider?.models?.find((item) => item.id === execution.modelID) as { variants?: Record<string, unknown> } | undefined;
|
|
return model?.variants ? Object.keys(model.variants) : [];
|
|
}, [providers, execution.providerID, execution.modelID]);
|
|
|
|
const hasVariantOptions = variantOptions.length > 0;
|
|
|
|
React.useEffect(() => {
|
|
if (hasVariantOptions || !execution.variant) return;
|
|
setExecution((prev) => ({ ...prev, variant: '' }));
|
|
}, [hasVariantOptions, execution.variant]);
|
|
|
|
const canConfirm = execution.providerID.trim().length > 0 && execution.modelID.trim().length > 0;
|
|
|
|
const handleSubmit = React.useCallback(() => {
|
|
if (!canConfirm || submitting) return;
|
|
void onConfirm(execution);
|
|
}, [canConfirm, submitting, onConfirm, execution]);
|
|
|
|
React.useEffect(() => {
|
|
if (!open) return;
|
|
const onKeyDown = (event: KeyboardEvent) => {
|
|
if ((event.metaKey || event.ctrlKey) && event.key === 'Enter') {
|
|
event.preventDefault();
|
|
handleSubmit();
|
|
}
|
|
};
|
|
window.addEventListener('keydown', onKeyDown);
|
|
return () => window.removeEventListener('keydown', onKeyDown);
|
|
}, [open, handleSubmit]);
|
|
|
|
const title = target === 'worktree'
|
|
? t('rightSidebar.contextNotesTodo.sendDialog.title.newWorktree')
|
|
: t('rightSidebar.contextNotesTodo.sendDialog.title.newSession');
|
|
|
|
return (
|
|
<Dialog open={open} onOpenChange={(nextOpen) => { if (!submitting) onOpenChange(nextOpen); }}>
|
|
<DialogContent className="max-w-md overflow-visible">
|
|
<DialogHeader>
|
|
<DialogTitle>{title}</DialogTitle>
|
|
</DialogHeader>
|
|
|
|
<div className="flex flex-col gap-4">
|
|
<div className="flex min-w-0 flex-col gap-1.5">
|
|
<span className="typography-meta font-medium text-muted-foreground">{t('chat.modelControls.model')}</span>
|
|
<ModelSelector
|
|
providerId={execution.providerID}
|
|
modelId={execution.modelID}
|
|
className="max-w-[320px] justify-between"
|
|
dropdownPortalToBody
|
|
onChange={(providerID, modelID) => {
|
|
setExecution((prev) => ({ ...prev, providerID, modelID, variant: '' }));
|
|
}}
|
|
/>
|
|
</div>
|
|
<div className="flex flex-col gap-1.5">
|
|
<span className="typography-meta font-medium text-muted-foreground">{t('sessions.scheduledTasks.editor.thinkingLevel.label')}</span>
|
|
<ThinkingPill
|
|
value={execution.variant}
|
|
options={variantOptions}
|
|
disabled={!hasVariantOptions}
|
|
onChange={(variant) => setExecution((prev) => ({ ...prev, variant }))}
|
|
/>
|
|
</div>
|
|
<div className="flex flex-col gap-1.5">
|
|
<span className="typography-meta font-medium text-muted-foreground">{t('sessions.scheduledTasks.editor.agent.label')}</span>
|
|
<AgentSelector
|
|
agentName={execution.agent}
|
|
filter={agentFilter}
|
|
dropdownPortalToBody
|
|
onChange={(agent) => setExecution((prev) => ({ ...prev, agent }))}
|
|
/>
|
|
</div>
|
|
</div>
|
|
|
|
<div className="flex items-center justify-end gap-2">
|
|
<Button variant="ghost" size="sm" onClick={() => onOpenChange(false)} disabled={submitting}>
|
|
{t('rightSidebar.contextNotesTodo.sendDialog.actions.cancel')}
|
|
</Button>
|
|
<Button size="sm" onClick={handleSubmit} disabled={!canConfirm || submitting}>
|
|
{submitting
|
|
? t('rightSidebar.contextNotesTodo.sendDialog.actions.sending')
|
|
: t('rightSidebar.contextNotesTodo.sendDialog.actions.send')}
|
|
</Button>
|
|
</div>
|
|
</DialogContent>
|
|
</Dialog>
|
|
);
|
|
}
|