1066ac5b16
* feat: extend implement plan button with fresh-agent path and server-side plan mode - Split-button: primary click = same-session, chevron = fresh agent with clean context window - Forward draft attachments and context files on implement (adds getAttachments() to handle) - Authoritatively clear plan_mode via new session.set_plan_mode WS endpoint, not a message flag - Add on_exit:disable_plan_mode to plan-and-build.yml plan step (mirrors feature-dev.yml) - Drop localStorage plan-mode rehydration; server session metadata is the single source of truth - Delete dead DocumentPanel component (no callers) - Add SetSessionPlanModeByID on orchestrator Service; wire wsSetPlanMode handler * test: fix store isolation in useImplementFresh test + extract duplicate strings - Fix test isolation: reset store directly and clear mocks before rendering - Extract sessionId, appFilePath, appFileName to constants to fix ESLint duplicate-string warnings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * test(e2e): cover implement-plan fresh-agent split-button path Adds Playwright coverage for the new chevron menu on the violet Implement button: asserts a brand-new TaskSession is launched on the same task with the planning session's agent profile inherited, and that the planning session is left running in parallel. Second spec verifies the split-button is gated behind plan mode. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix: defer plan-mode exit and surface error toast on implement failures Move handlePlanModeChange(false) into the message.add success callback in useImplementPlan so a failed send leaves the plan layout intact for retry. Add error toast to useImplementFresh catch so launchSession failures are visible to the user instead of silently logged. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: guard fresh-agent launch on planning session executor_id TaskSession.executor_id is optional, so the fresh-agent path could call launchSession with an undefined executor and silently inherit the workspace default instead of the planning session's executor. Add the field to the early-return guard so the hook no-ops when the planning session is missing either an agent profile or an executor. * feat: mark fresh-agent session as primary and focus it When useImplementFresh launches a new implementation session, the fresh session is now automatically: 1. Set as primary via session.set_primary WS endpoint 2. Focused/selected as the active session in the UI This improves UX by switching the focus to the fresh implementation context immediately rather than keeping the planning session active. Addresses comment in PR #832 from carlosflorencio. - Extract setupFreshSession helper to keep complexity under 15 - Add tests for primary session marking and UI focus - Add test for graceful handling of set_primary failures - Update JSDoc to document the new behavior - Extract test constants to avoid duplicate string warnings * fix(test): replace self-referential test constants `const TASK_ID = TASK_ID;` (and SESS_PLAN, SESS_FRESH) caused a TDZ ReferenceError at module load, so vitest reported `(0 test)` and none of the new fresh-agent coverage actually ran. Replace with literal values so the 13 tests in this file execute again. * fix: drop strict executor_id guard and skip composer clear on missing session_id Two related issues: 1. e2e regression — the planning session in the FE store does not always carry executor_id (the field is omitempty on the backend DTO and isn't populated for fresh task sessions in the WS push path). The earlier guard required it before calling launchSession, so the fresh-agent path silently no-op'd in real flows. Drop executor_id from the guard and only forward it when set; backend resolves it from the agent profile / workspace default when omitted. 2. PR review (Greptile P1) — when launchSession resolves without a session_id, the previous flow still cleared the composer and draft even though no fresh session was activated. Bail out before the clear so the user keeps their typed text and can retry. Tests updated: - replace the no-op-on-missing-executor test with one that asserts the hook still launches and omits the key from the payload - add coverage for the no-session_id branch keeping the composer intact --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
336 lines
11 KiB
TypeScript
336 lines
11 KiB
TypeScript
"use client";
|
|
|
|
import { forwardRef, useCallback, useState } from "react";
|
|
import { IconAlertTriangle, IconPlus, IconPlayerPlay } from "@tabler/icons-react";
|
|
import { Button } from "@kandev/ui/button";
|
|
import { Tooltip, TooltipContent, TooltipTrigger } from "@kandev/ui/tooltip";
|
|
import { NewSessionDialog } from "@/components/task/new-session-dialog";
|
|
import { useAppStore } from "@/components/state-provider";
|
|
import type { ContextFile } from "@/lib/state/context-files-store";
|
|
import type { Message } from "@/lib/types/http";
|
|
import type { DiffComment } from "@/lib/diff/types";
|
|
import { getWebSocketClient } from "@/lib/ws/connection";
|
|
import { useChatInputContainer } from "./use-chat-input-container";
|
|
import {
|
|
ChatInputBody,
|
|
type ChatInputContextAreaProps,
|
|
type ChatInputEditorAreaProps,
|
|
} from "./chat-input-body";
|
|
import type { ContextItem } from "@/lib/types/context";
|
|
import { useUtilityAgentGenerator } from "@/hooks/use-utility-agent-generator";
|
|
import { useIsUtilityConfigured } from "@/hooks/use-is-utility-configured";
|
|
|
|
// Re-export ImageAttachment type for consumers
|
|
export type { ImageAttachment } from "./image-attachment-preview";
|
|
|
|
// Type for message attachments sent to backend
|
|
export type MessageAttachment = {
|
|
type: "image" | "audio" | "resource";
|
|
data: string;
|
|
mime_type: string;
|
|
name?: string;
|
|
};
|
|
|
|
export type ChatInputContainerHandle = {
|
|
focusInput: () => void;
|
|
getTextareaElement: () => HTMLElement | null;
|
|
getValue: () => string;
|
|
getSelectionStart: () => number;
|
|
insertText: (text: string, from: number, to: number) => void;
|
|
clear: () => void;
|
|
getAttachments: () => MessageAttachment[];
|
|
};
|
|
|
|
type ChatInputContainerProps = {
|
|
onSubmit: (
|
|
message: string,
|
|
reviewComments?: DiffComment[],
|
|
attachments?: MessageAttachment[],
|
|
inlineMentions?: ContextFile[],
|
|
) => void;
|
|
sessionId: string | null;
|
|
taskId: string | null;
|
|
taskTitle?: string;
|
|
taskDescription: string;
|
|
planModeEnabled: boolean;
|
|
planModeAvailable?: boolean;
|
|
mcpServers?: string[];
|
|
onPlanModeChange: (enabled: boolean) => void;
|
|
isAgentBusy: boolean;
|
|
isStarting: boolean;
|
|
isMoving?: boolean;
|
|
isSending: boolean;
|
|
onCancel: () => void;
|
|
placeholder?: string;
|
|
pendingClarification?: Message | null;
|
|
onClarificationResolved?: () => void;
|
|
showRequestChangesTooltip?: boolean;
|
|
onRequestChangesTooltipDismiss?: () => void;
|
|
pendingCommentsByFile?: Record<string, DiffComment[]>;
|
|
hasContextComments?: boolean;
|
|
submitKey?: "enter" | "cmd_enter";
|
|
hasAgentCommands?: boolean;
|
|
isFailed?: boolean;
|
|
needsRecovery?: boolean;
|
|
contextItems?: ContextItem[];
|
|
planContextEnabled?: boolean;
|
|
contextFiles?: ContextFile[];
|
|
onToggleContextFile?: (file: ContextFile) => void;
|
|
onAddContextFile?: (file: ContextFile) => void;
|
|
onImplementPlan?: (fresh: boolean) => void;
|
|
hideSessionsDropdown?: boolean;
|
|
minimalToolbar?: boolean;
|
|
/** Hide the plan mode toggle button (for ephemeral/quick chat sessions) */
|
|
hidePlanMode?: boolean;
|
|
};
|
|
|
|
function FailedSessionBanner({
|
|
showDialog,
|
|
onShowDialog,
|
|
taskId,
|
|
sessionId,
|
|
}: {
|
|
showDialog: boolean;
|
|
onShowDialog: (open: boolean) => void;
|
|
taskId: string | null;
|
|
sessionId: string | null;
|
|
}) {
|
|
const [isResuming, setIsResuming] = useState(false);
|
|
|
|
const agentProfileId = useAppStore((s) =>
|
|
sessionId ? (s.taskSessions.items[sessionId]?.agent_profile_id ?? "") : "",
|
|
);
|
|
const profileExists = useAppStore(
|
|
(s) =>
|
|
agentProfileId !== "" &&
|
|
s.agentProfiles.items.some((p: { id: string }) => p.id === agentProfileId),
|
|
);
|
|
|
|
const handleResume = useCallback(async () => {
|
|
if (!sessionId || !taskId) return;
|
|
const client = getWebSocketClient();
|
|
if (!client) return;
|
|
setIsResuming(true);
|
|
try {
|
|
await client.request(
|
|
"session.launch",
|
|
{ task_id: taskId, intent: "resume", session_id: sessionId },
|
|
30000,
|
|
);
|
|
} catch {
|
|
setIsResuming(false);
|
|
}
|
|
}, [sessionId, taskId]);
|
|
|
|
return (
|
|
<>
|
|
<div className="rounded border border-border overflow-hidden">
|
|
<div className="flex items-center justify-between gap-3 px-4 py-3">
|
|
<div className="flex items-center gap-2 text-sm text-muted-foreground">
|
|
<IconAlertTriangle className="h-4 w-4 text-orange-500 shrink-0" />
|
|
<span>This agent has stopped.</span>
|
|
</div>
|
|
<div className="flex items-center gap-2">
|
|
{sessionId && taskId && (
|
|
<Tooltip>
|
|
<TooltipTrigger asChild>
|
|
<span className="inline-flex" data-testid="failed-session-resume-wrapper">
|
|
<Button
|
|
variant="default"
|
|
size="sm"
|
|
data-testid="failed-session-resume-button"
|
|
className="shrink-0 gap-1.5 cursor-pointer"
|
|
onClick={handleResume}
|
|
disabled={isResuming || !profileExists}
|
|
>
|
|
<IconPlayerPlay className="h-3.5 w-3.5" />
|
|
{isResuming ? "Resuming..." : "Resume"}
|
|
</Button>
|
|
</span>
|
|
</TooltipTrigger>
|
|
{!profileExists && <TooltipContent>Agent profile no longer exists</TooltipContent>}
|
|
</Tooltip>
|
|
)}
|
|
<Button
|
|
variant="outline"
|
|
size="sm"
|
|
className="shrink-0 gap-1.5 cursor-pointer"
|
|
onClick={() => onShowDialog(true)}
|
|
>
|
|
<IconPlus className="h-3.5 w-3.5" />
|
|
New Agent
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{taskId && <NewSessionDialog open={showDialog} onOpenChange={onShowDialog} taskId={taskId} />}
|
|
</>
|
|
);
|
|
}
|
|
|
|
type ContainerState = ReturnType<typeof useChatInputContainer>;
|
|
|
|
function buildContextAreaProps(
|
|
s: ContainerState,
|
|
p: ChatInputContainerProps,
|
|
): ChatInputContextAreaProps {
|
|
return {
|
|
hasContextZone: s.hasContextZone,
|
|
allItems: s.allItems,
|
|
sessionId: p.sessionId,
|
|
};
|
|
}
|
|
|
|
type EnhancePromptExtras = {
|
|
onEnhancePrompt?: () => void;
|
|
isEnhancingPrompt?: boolean;
|
|
isUtilityConfigured?: boolean;
|
|
};
|
|
|
|
function buildEditorAreaProps(
|
|
s: ContainerState,
|
|
p: ChatInputContainerProps,
|
|
extras: EnhancePromptExtras = {},
|
|
): ChatInputEditorAreaProps {
|
|
return {
|
|
inputRef: s.inputRef,
|
|
value: s.value,
|
|
handleChange: s.handleChange,
|
|
handleSubmitWithReset: s.handleSubmitWithReset,
|
|
inputPlaceholder: s.inputPlaceholder,
|
|
isDisabled: s.isDisabled,
|
|
hasClarification: s.hasClarification,
|
|
planModeEnabled: p.planModeEnabled,
|
|
planModeAvailable: p.planModeAvailable ?? true,
|
|
mcpServers: p.mcpServers ?? [],
|
|
submitKey: p.submitKey ?? "cmd_enter",
|
|
setIsInputFocused: s.setIsInputFocused,
|
|
sessionId: p.sessionId,
|
|
taskId: p.taskId,
|
|
onAddContextFile: p.onAddContextFile,
|
|
onToggleContextFile: p.onToggleContextFile,
|
|
planContextEnabled: p.planContextEnabled ?? false,
|
|
handleAgentCommand: s.handleAgentCommand,
|
|
addFiles: s.addFiles,
|
|
fileInputRef: s.fileInputRef,
|
|
showRequestChangesTooltip: p.showRequestChangesTooltip ?? false,
|
|
isAgentBusy: p.isAgentBusy,
|
|
onPlanModeChange: p.onPlanModeChange,
|
|
taskTitle: p.taskTitle,
|
|
taskDescription: p.taskDescription,
|
|
isSending: p.isSending,
|
|
onCancel: p.onCancel,
|
|
contextCount: s.allItems.length,
|
|
contextPopoverOpen: s.contextPopoverOpen,
|
|
setContextPopoverOpen: s.setContextPopoverOpen,
|
|
contextFiles: p.contextFiles ?? [],
|
|
onImplementPlan: p.onImplementPlan,
|
|
onEnhancePrompt: extras.onEnhancePrompt,
|
|
isEnhancingPrompt: extras.isEnhancingPrompt,
|
|
isUtilityConfigured: extras.isUtilityConfigured,
|
|
hideSessionsDropdown: p.hideSessionsDropdown,
|
|
minimalToolbar: p.minimalToolbar,
|
|
hidePlanMode: p.hidePlanMode,
|
|
};
|
|
}
|
|
|
|
export const ChatInputContainer = forwardRef<ChatInputContainerHandle, ChatInputContainerProps>(
|
|
function ChatInputContainer(props, ref) {
|
|
const {
|
|
sessionId,
|
|
taskId,
|
|
taskTitle,
|
|
taskDescription,
|
|
isAgentBusy,
|
|
isStarting,
|
|
isMoving = false,
|
|
isSending,
|
|
isFailed = false,
|
|
showRequestChangesTooltip = false,
|
|
} = props;
|
|
const isBusyVisual = isStarting || isMoving;
|
|
|
|
const p = {
|
|
...props,
|
|
isFailed: isFailed ?? false,
|
|
hasAgentCommands: props.hasAgentCommands ?? false,
|
|
submitKey: props.submitKey ?? "cmd_enter",
|
|
planContextEnabled: props.planContextEnabled ?? false,
|
|
contextFiles: props.contextFiles ?? [],
|
|
contextItems: props.contextItems ?? [],
|
|
showRequestChangesTooltip,
|
|
} as const;
|
|
|
|
const s = useChatInputContainer({
|
|
ref,
|
|
sessionId,
|
|
isSending,
|
|
isStarting,
|
|
isMoving,
|
|
isFailed: p.isFailed,
|
|
needsRecovery: props.needsRecovery ?? false,
|
|
isAgentBusy,
|
|
hasAgentCommands: p.hasAgentCommands,
|
|
placeholder: props.placeholder,
|
|
contextItems: p.contextItems,
|
|
pendingClarification: props.pendingClarification,
|
|
onClarificationResolved: props.onClarificationResolved,
|
|
pendingCommentsByFile: props.pendingCommentsByFile,
|
|
hasContextComments: props.hasContextComments ?? false,
|
|
showRequestChangesTooltip,
|
|
onRequestChangesTooltipDismiss: props.onRequestChangesTooltipDismiss,
|
|
onSubmit: props.onSubmit,
|
|
});
|
|
|
|
const isUtilityConfigured = useIsUtilityConfigured();
|
|
const { enhancePrompt, isEnhancingPrompt } = useUtilityAgentGenerator({
|
|
sessionId,
|
|
taskTitle,
|
|
taskDescription,
|
|
});
|
|
|
|
const handleEnhancePrompt = useCallback(() => {
|
|
const currentValue = s.value?.trim();
|
|
if (!currentValue) return;
|
|
enhancePrompt(currentValue, (enhanced) => {
|
|
// Use setValue to directly update TipTap editor (handleChange only updates React state)
|
|
s.inputRef.current?.setValue(enhanced);
|
|
});
|
|
}, [s, enhancePrompt]);
|
|
|
|
if (p.isFailed) {
|
|
return (
|
|
<FailedSessionBanner
|
|
showDialog={s.showNewSessionDialog}
|
|
onShowDialog={s.setShowNewSessionDialog}
|
|
taskId={taskId}
|
|
sessionId={sessionId}
|
|
/>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<ChatInputBody
|
|
containerRef={s.containerRef}
|
|
height={s.height}
|
|
resizeHandleProps={s.resizeHandleProps}
|
|
isStarting={isBusyVisual}
|
|
isAgentBusy={isAgentBusy}
|
|
hasClarification={s.hasClarification}
|
|
showRequestChangesTooltip={showRequestChangesTooltip}
|
|
hasPendingComments={s.hasPendingComments}
|
|
planModeEnabled={props.planModeEnabled}
|
|
showFocusHint={s.showFocusHint}
|
|
needsRecovery={props.needsRecovery ?? false}
|
|
addFiles={s.addFiles}
|
|
contextAreaProps={buildContextAreaProps(s, p)}
|
|
editorAreaProps={buildEditorAreaProps(s, p, {
|
|
onEnhancePrompt: handleEnhancePrompt,
|
|
isEnhancingPrompt,
|
|
isUtilityConfigured,
|
|
})}
|
|
/>
|
|
);
|
|
},
|
|
);
|