{showRaw ? (
{comment.content || "(empty)"}
@@ -378,7 +390,7 @@ export const ChatMessage = memo(function ChatMessage({
// Keep the old card-based layout for task descriptions (amber banner)
if (label === "Task") {
return (
-
+
{comment.requests_input ? (
diff --git a/apps/web/components/task/chat/messages/code-block.tsx b/apps/web/components/task/chat/messages/code-block.tsx
index d997fedda5..515f6bfc84 100644
--- a/apps/web/components/task/chat/messages/code-block.tsx
+++ b/apps/web/components/task/chat/messages/code-block.tsx
@@ -3,6 +3,7 @@
import { useEditorProvider } from "@/hooks/use-editor-resolver";
import { MonacoCodeBlock } from "@/components/editors/monaco/monaco-code-block";
import { CodeMirrorCodeBlock } from "@/components/editors/codemirror/codemirror-code-block";
+import { ShikiCodeBlock } from "@/components/editors/shiki/shiki-code-block";
type CodeBlockProps = {
children: React.ReactNode;
@@ -11,9 +12,7 @@ type CodeBlockProps = {
export function CodeBlock(props: CodeBlockProps) {
const provider = useEditorProvider("chat-code-block");
- return provider === "monaco" ? (
-
- ) : (
-
- );
+ if (provider === "monaco") return ;
+ if (provider === "shiki") return ;
+ return ;
}
diff --git a/apps/web/components/task/chat/messages/message-actions.tsx b/apps/web/components/task/chat/messages/message-actions.tsx
index b54b7c28f1..d77d9c13f0 100644
--- a/apps/web/components/task/chat/messages/message-actions.tsx
+++ b/apps/web/components/task/chat/messages/message-actions.tsx
@@ -6,6 +6,7 @@ import {
IconCode,
IconChevronLeft,
IconChevronRight,
+ IconEyeCode,
} from "@tabler/icons-react";
import { cn } from "@/lib/utils";
import { formatRelativeTime } from "@/lib/utils";
@@ -22,6 +23,7 @@ type MessageActionsProps = {
showCopy?: boolean;
showTimestamp?: boolean;
showRawToggle?: boolean;
+ hasHiddenPrompts?: boolean;
showNavigation?: boolean;
showModel?: boolean;
isRawView?: boolean;
@@ -112,23 +114,27 @@ function NavigationButtons({
function RawToggleButton({
isRawView,
onToggleRaw,
+ hasHiddenPrompts,
}: {
isRawView: boolean;
onToggleRaw: () => void;
+ hasHiddenPrompts?: boolean;
}) {
return (
);
}
@@ -163,6 +169,7 @@ export function MessageActions({
showCopy = true,
showTimestamp = true,
showRawToggle = true,
+ hasHiddenPrompts = false,
showNavigation = false,
showModel = false,
isRawView = false,
@@ -182,7 +189,11 @@ export function MessageActions({
{showCopy &&
}
{showRawToggle && onToggleRaw && (
-
+
)}
{showNavigation && (
void;
onDoubleClick: () => void;
};
-export function ResizeHandle({ visible, onMouseDown, onDoubleClick }: ResizeHandleProps) {
+export function ResizeHandle({
+ visible,
+ planModeEnabled,
+ onMouseDown,
+ onDoubleClick,
+}: ResizeHandleProps) {
return (
);
}
diff --git a/apps/web/components/task/chat/tiptap-input.tsx b/apps/web/components/task/chat/tiptap-input.tsx
index 2eb08b8637..3a3bd17184 100644
--- a/apps/web/components/task/chat/tiptap-input.tsx
+++ b/apps/web/components/task/chat/tiptap-input.tsx
@@ -52,6 +52,7 @@ type TipTapInputProps = {
planContextEnabled?: boolean;
onAgentCommand?: (commandName: string) => void;
onImagePaste?: (files: File[]) => void;
+ onPlanModeChange?: (enabled: boolean) => void;
};
// ── Filter items ────────────────────────────────────────────────────
@@ -341,6 +342,7 @@ export const TipTapInput = forwardRef(funct
disabled = false,
className,
planModeEnabled = false,
+ onPlanModeChange,
submitKey = "cmd_enter",
onFocus,
onBlur,
@@ -385,6 +387,7 @@ export const TipTapInput = forwardRef(funct
disabled,
className,
planModeEnabled,
+ onPlanModeChange,
submitKey,
onFocus,
onBlur,
diff --git a/apps/web/components/task/chat/use-chat-input-container.ts b/apps/web/components/task/chat/use-chat-input-container.ts
index 8a0d562fa9..e7fed4e778 100644
--- a/apps/web/components/task/chat/use-chat-input-container.ts
+++ b/apps/web/components/task/chat/use-chat-input-container.ts
@@ -26,6 +26,7 @@ type UseChatInputContainerParams = {
pendingClarification: Message | null | undefined;
onClarificationResolved: (() => void) | undefined;
pendingCommentsByFile: Record | undefined;
+ hasContextComments: boolean;
queuedMessage: string | null | undefined;
onCancelQueue: (() => void) | undefined;
updateQueueContent: ((content: string) => Promise) | undefined;
@@ -55,6 +56,7 @@ function useInputHandle(
insertText: (text: string, from: number, to: number) => {
inputRef.current?.insertText(text, from, to);
},
+ clear: () => inputRef.current?.clear(),
}),
[inputRef],
);
@@ -101,8 +103,7 @@ function computeDerivedState(params: {
params.updateQueueContent
);
const hasTodos = params.todoItems.length > 0;
- const hasContextZone =
- hasQueuedMessage || hasTodos || params.allItemsLength > 0 || hasClarification;
+ const hasContextZone = hasQueuedMessage || hasTodos || params.allItemsLength > 0;
const showFocusHint = !params.isInputFocused && !hasClarification && !hasPendingComments;
const inputPlaceholder = getInputPlaceholder(
params.placeholder,
@@ -149,7 +150,7 @@ export function useChatInputContainer(params: UseChatInputContainerParams) {
const [showNewSessionDialog, setShowNewSessionDialog] = useState(false);
const [contextPopoverOpen, setContextPopoverOpen] = useState(false);
- const { height, resetHeight, containerRef, resizeHandleProps } = useResizableInput(
+ const { height, resetHeight, autoExpand, containerRef, resizeHandleProps } = useResizableInput(
sessionId ?? undefined,
);
const { value, inputRef, handleImagePaste, handleChange, handleSubmit, allItems } =
@@ -158,6 +159,7 @@ export function useChatInputContainer(params: UseChatInputContainerParams) {
isSending,
contextItems,
pendingCommentsByFile,
+ hasContextComments: params.hasContextComments,
showRequestChangesTooltip,
onRequestChangesTooltipDismiss,
onSubmit,
@@ -165,6 +167,15 @@ export function useChatInputContainer(params: UseChatInputContainerParams) {
useInputHandle(ref, inputRef);
+ // Auto-expand the input container as the user types more lines
+ const handleChangeWithAutoExpand = useCallback(
+ (val: string) => {
+ handleChange(val);
+ requestAnimationFrame(autoExpand);
+ },
+ [handleChange, autoExpand],
+ );
+
useEffect(() => {
if (showRequestChangesTooltip && inputRef.current) inputRef.current.focus();
}, [showRequestChangesTooltip, inputRef]);
@@ -212,7 +223,7 @@ export function useChatInputContainer(params: UseChatInputContainerParams) {
value,
inputRef,
handleImagePaste,
- handleChange,
+ handleChange: handleChangeWithAutoExpand,
handleSubmitWithReset,
handleAgentCommand,
allItems,
diff --git a/apps/web/components/task/chat/use-chat-input-state.ts b/apps/web/components/task/chat/use-chat-input-state.ts
index 87bd24eac6..92d6d01435 100644
--- a/apps/web/components/task/chat/use-chat-input-state.ts
+++ b/apps/web/components/task/chat/use-chat-input-state.ts
@@ -25,6 +25,8 @@ type UseChatInputStateProps = {
isSending: boolean;
contextItems: ContextItem[];
pendingCommentsByFile?: Record;
+ /** Whether there are plan comments or PR feedback that allow empty-text submit */
+ hasContextComments?: boolean;
showRequestChangesTooltip: boolean;
onRequestChangesTooltipDismiss?: () => void;
onSubmit: (
@@ -112,6 +114,7 @@ export function useChatInputState({
isSending,
contextItems,
pendingCommentsByFile,
+ hasContextComments = false,
showRequestChangesTooltip,
onRequestChangesTooltipDismiss,
onSubmit,
@@ -163,7 +166,9 @@ export function useChatInputState({
const trimmed = valueRef.current.trim();
const allComments = collectComments(pendingCommentsRef.current);
const currentAttachments = attachmentsRef.current;
- if (!trimmed && allComments.length === 0 && currentAttachments.length === 0) return;
+ const hasContent =
+ trimmed || allComments.length > 0 || currentAttachments.length > 0 || hasContextComments;
+ if (!hasContent) return;
const messageAttachments = toMessageAttachments(currentAttachments);
const inlineMentions = inputRef.current?.getMentions() ?? [];
onSubmit(
@@ -179,7 +184,7 @@ export function useChatInputState({
resetHeight();
clearDraft(sessionId);
},
- [onSubmit, isSending, sessionId, attachmentsRef, setAttachments],
+ [onSubmit, isSending, sessionId, attachmentsRef, setAttachments, hasContextComments],
);
const allItems = useMemo((): ContextItem[] => {
diff --git a/apps/web/components/task/chat/use-chat-panel-state.ts b/apps/web/components/task/chat/use-chat-panel-state.ts
index fa4cef2cc5..f8bf8395b3 100644
--- a/apps/web/components/task/chat/use-chat-panel-state.ts
+++ b/apps/web/components/task/chat/use-chat-panel-state.ts
@@ -1,13 +1,15 @@
"use client";
-import { useCallback, useEffect, useMemo } from "react";
+import { useCallback, useEffect, useMemo, useRef } from "react";
import { useAppStore } from "@/components/state-provider";
import { getLocalStorage } from "@/lib/local-storage";
import { useLayoutStore } from "@/lib/state/layout-store";
+import { useDockviewStore } from "@/lib/state/dockview-store";
import { usePanelActions } from "@/hooks/use-panel-actions";
import { useSessionMessages } from "@/hooks/domains/session/use-session-messages";
import { useCustomPrompts } from "@/hooks/domains/settings/use-custom-prompts";
import { useSessionState } from "@/hooks/domains/session/use-session-state";
+import { useSessionMcp } from "@/hooks/domains/session/use-session-mcp";
import { useProcessedMessages } from "@/hooks/use-processed-messages";
import { useSessionModel } from "@/hooks/domains/session/use-session-model";
import { useQueue } from "@/hooks/domains/session/use-queue";
@@ -44,54 +46,103 @@ export function usePlanMode(resolvedSessionId: string | null, taskId: string | n
? (state.documentPanel.activeDocumentBySessionId[resolvedSessionId] ?? null)
: null,
);
- const layoutBySession = useLayoutStore((state) => state.columnsBySessionId);
const closeDocument = useLayoutStore((state) => state.closeDocument);
const setActiveDocument = useAppStore((state) => state.setActiveDocument);
const setPlanMode = useAppStore((state) => state.setPlanMode);
const addContextFile = useContextFilesStore((s) => s.addFile);
- const { addPlan } = usePanelActions();
+ const removeContextFile = useContextFilesStore((s) => s.removeFile);
+ const applyBuiltInPreset = useDockviewStore((s) => s.applyBuiltInPreset);
- const planModeEnabled = useMemo(() => {
- if (!resolvedSessionId || !activeDocument || activeDocument.type !== "plan") return false;
- const layout = layoutBySession[resolvedSessionId];
- return layout?.document === true;
- }, [resolvedSessionId, activeDocument, layoutBySession]);
+ const planModeFromStore = useAppStore((state) =>
+ resolvedSessionId ? (state.chatInput.planModeBySessionId[resolvedSessionId] ?? false) : false,
+ );
+
+ const planModeEnabled = planModeFromStore;
+ const planLayoutVisible = activeDocument?.type === "plan";
useEffect(() => {
if (!resolvedSessionId) return;
const stored = getLocalStorage(`plan-mode-${resolvedSessionId}`, false);
if (stored) {
setPlanMode(resolvedSessionId, true);
- addContextFile(resolvedSessionId, { path: PLAN_CONTEXT_PATH, name: "Plan", pinned: true });
+ addContextFile(resolvedSessionId, { path: PLAN_CONTEXT_PATH, name: "Plan" });
}
}, [resolvedSessionId, setPlanMode, addContextFile]);
- const handlePlanModeChange = useCallback(
- (enabled: boolean) => {
+ // Re-focus chat input after dockview layout rebuild completes
+ const refocusChatAfterLayout = useCallback(() => {
+ const unsub = useDockviewStore.subscribe((state) => {
+ if (!state.isRestoringLayout) {
+ unsub();
+ requestAnimationFrame(() => {
+ document.querySelector(".tiptap.ProseMirror")?.focus();
+ });
+ }
+ });
+ }, []);
+
+ // Toggle only the plan layout (plan panel + preset) without changing chat input plan mode state
+ const togglePlanLayout = useCallback(
+ (show: boolean) => {
if (!resolvedSessionId || !taskId) return;
- if (enabled) {
+ if (show) {
setActiveDocument(resolvedSessionId, { type: "plan", taskId });
- addPlan();
- setPlanMode(resolvedSessionId, true);
- addContextFile(resolvedSessionId, { path: PLAN_CONTEXT_PATH, name: "Plan", pinned: true });
+ applyBuiltInPreset("plan");
} else {
+ applyBuiltInPreset("default");
closeDocument(resolvedSessionId);
setActiveDocument(resolvedSessionId, null);
- setPlanMode(resolvedSessionId, false);
}
+ refocusChatAfterLayout();
},
[
resolvedSessionId,
taskId,
setActiveDocument,
- addPlan,
+ applyBuiltInPreset,
closeDocument,
- setPlanMode,
- addContextFile,
+ refocusChatAfterLayout,
],
);
- return { planModeEnabled, activeDocument, handlePlanModeChange };
+ // Full plan mode toggle: layout + chat input state (context file, border, submit style)
+ const handlePlanModeChange = useCallback(
+ (enabled: boolean) => {
+ if (!resolvedSessionId || !taskId) return;
+ if (enabled) {
+ setActiveDocument(resolvedSessionId, { type: "plan", taskId });
+ applyBuiltInPreset("plan");
+ setPlanMode(resolvedSessionId, true);
+ addContextFile(resolvedSessionId, { path: PLAN_CONTEXT_PATH, name: "Plan" });
+ } else {
+ applyBuiltInPreset("default");
+ closeDocument(resolvedSessionId);
+ setActiveDocument(resolvedSessionId, null);
+ setPlanMode(resolvedSessionId, false);
+ removeContextFile(resolvedSessionId, PLAN_CONTEXT_PATH);
+ }
+ refocusChatAfterLayout();
+ },
+ [
+ resolvedSessionId,
+ taskId,
+ setActiveDocument,
+ applyBuiltInPreset,
+ closeDocument,
+ setPlanMode,
+ addContextFile,
+ removeContextFile,
+ refocusChatAfterLayout,
+ ],
+ );
+
+ return {
+ planModeEnabled,
+ planLayoutVisible,
+ activeDocument,
+ handlePlanModeChange,
+ togglePlanLayout,
+ };
}
export function useContextFiles(resolvedSessionId: string | null) {
@@ -320,6 +371,52 @@ export function useChatPanelState({
const sessionState = useSessionState(sessionId);
const { resolvedSessionId, taskId } = sessionState;
const planMode = usePlanMode(resolvedSessionId, taskId);
+ const { supportsMcp, mcpServers } = useSessionMcp(sessionState.session?.agent_profile_id);
+ const planModeAvailable = supportsMcp;
+
+ // When MCP is available: full plan mode toggle (layout + chat input state)
+ // When MCP is unavailable: layout-only toggle (plan panel visible, but no plan context/border)
+ const {
+ handlePlanModeChange: rawHandlePlanModeChange,
+ togglePlanLayout,
+ planModeEnabled,
+ planLayoutVisible,
+ } = planMode;
+ const guardedHandlePlanModeChange = useCallback(
+ (enabled: boolean) => {
+ if (planModeAvailable) {
+ rawHandlePlanModeChange(enabled);
+ } else {
+ // Toggle based on current layout state, ignoring the passed value
+ togglePlanLayout(!planLayoutVisible);
+ }
+ },
+ [planModeAvailable, rawHandlePlanModeChange, togglePlanLayout, planLayoutVisible],
+ );
+
+ // Auto-disable plan mode if agent doesn't support MCP (e.g. started from create dialog)
+ const hasAgentProfile = Boolean(sessionState.session?.agent_profile_id);
+ const hasAutoDisabled = useRef(false);
+ useEffect(() => {
+ if (
+ planModeEnabled &&
+ hasAgentProfile &&
+ !planModeAvailable &&
+ resolvedSessionId &&
+ !hasAutoDisabled.current
+ ) {
+ hasAutoDisabled.current = true;
+ rawHandlePlanModeChange(false);
+ }
+ if (!planModeEnabled) hasAutoDisabled.current = false;
+ }, [
+ planModeEnabled,
+ hasAgentProfile,
+ planModeAvailable,
+ resolvedSessionId,
+ rawHandlePlanModeChange,
+ ]);
+
const contextFilesState = useContextFiles(resolvedSessionId);
const { contextFiles, removeContextFile, unpinFile } = contextFilesState;
const sessionData = useSessionData(
@@ -350,11 +447,14 @@ export function useChatPanelState({
return {
...sessionState,
...planMode,
+ handlePlanModeChange: guardedHandlePlanModeChange,
...contextFilesState,
...sessionData,
...comments,
contextItems,
planContextEnabled,
+ planModeAvailable,
+ mcpServers,
prompts,
};
}
diff --git a/apps/web/components/task/chat/use-tiptap-editor.ts b/apps/web/components/task/chat/use-tiptap-editor.ts
index d43e70f881..d898287751 100644
--- a/apps/web/components/task/chat/use-tiptap-editor.ts
+++ b/apps/web/components/task/chat/use-tiptap-editor.ts
@@ -41,6 +41,7 @@ type UseTipTapEditorOptions = {
disabled: boolean;
className?: string;
planModeEnabled: boolean;
+ onPlanModeChange?: (enabled: boolean) => void;
submitKey: "enter" | "cmd_enter";
onFocus?: () => void;
onBlur?: () => void;
@@ -60,6 +61,8 @@ function useTipTapRefs(opts: UseTipTapEditorOptions) {
const onChangeRef = useRef(opts.onChange);
const onImagePasteRef = useRef(opts.onImagePaste);
const sessionIdRef = useRef(opts.sessionId);
+ const planModeEnabledRef = useRef(opts.planModeEnabled);
+ const onPlanModeChangeRef = useRef(opts.onPlanModeChange);
useLayoutEffect(() => {
onSubmitRef.current = opts.onSubmit;
submitKeyRef.current = opts.submitKey;
@@ -67,8 +70,19 @@ function useTipTapRefs(opts: UseTipTapEditorOptions) {
onChangeRef.current = opts.onChange;
onImagePasteRef.current = opts.onImagePaste;
sessionIdRef.current = opts.sessionId;
+ planModeEnabledRef.current = opts.planModeEnabled;
+ onPlanModeChangeRef.current = opts.onPlanModeChange;
});
- return { onSubmitRef, submitKeyRef, disabledRef, onChangeRef, onImagePasteRef, sessionIdRef };
+ return {
+ onSubmitRef,
+ submitKeyRef,
+ disabledRef,
+ onChangeRef,
+ onImagePasteRef,
+ sessionIdRef,
+ planModeEnabledRef,
+ onPlanModeChangeRef,
+ };
}
export function useTipTapEditor(opts: UseTipTapEditorOptions) {
@@ -87,7 +101,13 @@ export function useTipTapEditor(opts: UseTipTapEditorOptions) {
ref,
} = opts;
const refs = useTipTapRefs(opts);
- const SubmitKeymap = useSubmitKeymap(refs.disabledRef, refs.submitKeyRef, refs.onSubmitRef);
+ const SubmitKeymap = useSubmitKeymap(
+ refs.disabledRef,
+ refs.submitKeyRef,
+ refs.onSubmitRef,
+ refs.planModeEnabledRef,
+ refs.onPlanModeChangeRef,
+ );
const isSyncingRef = useRef(false);
const initialSyncDoneRef = useRef(false);
const editor = useEditor({
@@ -270,6 +290,8 @@ function useSubmitKeymap(
disabledRef: React.RefObject,
submitKeyRef: React.RefObject<"enter" | "cmd_enter">,
onSubmitRef: React.RefObject<(() => void) | undefined>,
+ planModeEnabledRef: React.RefObject,
+ onPlanModeChangeRef: React.RefObject<((enabled: boolean) => void) | undefined>,
) {
return useMemo(() => {
return Extension.create({
@@ -292,6 +314,11 @@ function useSubmitKeymap(
}
return false;
},
+ "Shift-Tab": () => {
+ console.log("[ShiftTab] toggling plan mode", { current: planModeEnabledRef.current });
+ onPlanModeChangeRef.current?.(!planModeEnabledRef.current);
+ return true;
+ },
};
},
});
diff --git a/apps/web/components/task/chat/virtualized-message-list.tsx b/apps/web/components/task/chat/virtualized-message-list.tsx
index f6995613a6..8aa0cab7b5 100644
--- a/apps/web/components/task/chat/virtualized-message-list.tsx
+++ b/apps/web/components/task/chat/virtualized-message-list.tsx
@@ -369,7 +369,7 @@ export const VirtualizedMessageList = memo(function VirtualizedMessageList({
}, [isRunning]);
return (
-
+
void;
@@ -52,6 +53,7 @@ export const TaskChatPanel = memo(function TaskChatPanel({
childrenByParentToolCallId,
agentMessageCount,
cancelQueue,
+ pendingClarification,
} = panelState;
const { handleCancelTurn, handleCancelQueue, handleQueueEditComplete } = useChatPanelHandlers(
resolvedSessionId,
@@ -82,6 +84,14 @@ export const TaskChatPanel = memo(function TaskChatPanel({
onOpenFile={onOpenFile}
/>
+ {pendingClarification && !isArchived && (
+
+
+
+ )}
{isArchived ? (
This task is archived and read-only.
diff --git a/apps/web/components/task/task-top-bar.tsx b/apps/web/components/task/task-top-bar.tsx
index 0fb131b85e..d6ecc67342 100644
--- a/apps/web/components/task/task-top-bar.tsx
+++ b/apps/web/components/task/task-top-bar.tsx
@@ -99,7 +99,6 @@ const TaskTopBar = memo(function TaskTopBar({
displayBranch={displayBranch}
repositoryPath={repositoryPath}
worktreePath={worktreePath}
- gitStatus={git}
isRemoteExecutor={isRemoteExecutor}
remoteExecutorName={remoteExecutorName}
remoteExecutorType={remoteExecutorType}
@@ -120,6 +119,7 @@ const TaskTopBar = memo(function TaskTopBar({
-
void;
isArchived?: boolean;
@@ -424,13 +423,14 @@ function TopBarRight({
)}
+
{!isArchived && (
<>
-
-
+
+
)}
diff --git a/apps/web/hooks/domains/session/use-session-mcp.ts b/apps/web/hooks/domains/session/use-session-mcp.ts
new file mode 100644
index 0000000000..463e0df494
--- /dev/null
+++ b/apps/web/hooks/domains/session/use-session-mcp.ts
@@ -0,0 +1,58 @@
+"use client";
+
+import { useEffect, useMemo, useState } from "react";
+import { useAppStore } from "@/components/state-provider";
+import { getAgentProfileMcpConfigAction } from "@/app/actions/agents";
+
+const EMPTY_SERVERS: string[] = [];
+const DEFAULT_KANDEV: string[] = ["kandev"];
+
+/**
+ * Resolves MCP support and configured MCP server names for the current session's agent.
+ * Returns whether the agent supports MCP and the list of active MCP server names.
+ */
+export function useSessionMcp(agentProfileId: string | null | undefined) {
+ const settingsAgents = useAppStore((state) => state.settingsAgents.items);
+ // Track which profileId the fetched servers belong to, so stale results are ignored
+ const [fetchResult, setFetchResult] = useState<{
+ profileId: string;
+ servers: string[];
+ } | null>(null);
+
+ const agent = useMemo(() => {
+ if (!agentProfileId) return null;
+ for (const a of settingsAgents) {
+ if (a.profiles.some((p) => p.id === agentProfileId)) return a;
+ }
+ return null;
+ }, [agentProfileId, settingsAgents]);
+
+ const supportsMcp = agent?.supports_mcp ?? false;
+
+ useEffect(() => {
+ if (!agentProfileId || !supportsMcp) return;
+ let active = true;
+ const currentProfileId = agentProfileId;
+ getAgentProfileMcpConfigAction(currentProfileId)
+ .then((config) => {
+ if (!active) return;
+ const userServers = config.enabled ? Object.keys(config.servers) : [];
+ setFetchResult({ profileId: currentProfileId, servers: ["kandev", ...userServers] });
+ })
+ .catch(() => {
+ if (!active) return;
+ setFetchResult({ profileId: currentProfileId, servers: DEFAULT_KANDEV });
+ });
+ return () => {
+ active = false;
+ };
+ }, [agentProfileId, supportsMcp]);
+
+ const mcpServers = useMemo(() => {
+ if (!supportsMcp) return EMPTY_SERVERS;
+ if (fetchResult && fetchResult.profileId === agentProfileId) return fetchResult.servers;
+ return DEFAULT_KANDEV;
+ }, [supportsMcp, fetchResult, agentProfileId]);
+
+ return { supportsMcp, mcpServers };
+}
diff --git a/apps/web/hooks/use-message-handler.ts b/apps/web/hooks/use-message-handler.ts
index 9feda48a1e..4499eaf6ec 100644
--- a/apps/web/hooks/use-message-handler.ts
+++ b/apps/web/hooks/use-message-handler.ts
@@ -9,11 +9,14 @@ import type { CustomPrompt } from "@/lib/types/http";
function buildDocumentContext(
activeDocument: ActiveDocument | null,
+ planModeEnabled: boolean,
planComments?: PlanComment[],
): string {
if (!activeDocument) return "";
if (activeDocument.type === "plan") {
+ if (!planModeEnabled) return "";
+
let context = `\n\n\nACTIVE DOCUMENT: The user is editing the task plan side-by-side with this chat.\nRead the current plan using the plan_get MCP tool to understand the context before responding.\nAny plan modifications should use the plan_update MCP tool.`;
if (planComments && planComments.length > 0) {
@@ -66,7 +69,7 @@ export interface UseMessageHandlerParams {
taskId: string | null;
sessionModel: string | null;
activeModel: string | null;
- planMode?: boolean;
+ planModeEnabled?: boolean;
isAgentBusy?: boolean;
activeDocument?: ActiveDocument | null;
planComments?: PlanComment[];
@@ -122,7 +125,7 @@ export function useMessageHandler({
taskId,
sessionModel,
activeModel,
- planMode = false,
+ planModeEnabled = false,
isAgentBusy = false,
activeDocument = null,
planComments = [],
@@ -134,14 +137,14 @@ export function useMessageHandler({
const buildFinalMessage = useCallback(
(message: string, inlineMentions?: ContextFile[]) => {
const allContextFiles = [...contextFiles, ...(inlineMentions || [])];
- const documentContext = buildDocumentContext(activeDocument, planComments);
+ const documentContext = buildDocumentContext(activeDocument, planModeEnabled, planComments);
const contextFilesContext = buildContextFilesContext(allContextFiles, prompts);
return {
finalMessage: message.trim() + documentContext + contextFilesContext,
allContextFiles,
};
},
- [contextFiles, activeDocument, planComments, prompts],
+ [contextFiles, activeDocument, planModeEnabled, planComments, prompts],
);
const handleSendMessage = useCallback(
@@ -170,7 +173,7 @@ export function useMessageHandler({
data: att.data,
mime_type: att.mime_type,
}));
- await queue(taskId, finalMessage, modelToSend, planMode, queueAttachments);
+ await queue(taskId, finalMessage, modelToSend, planModeEnabled, queueAttachments);
return;
}
@@ -179,7 +182,7 @@ export function useMessageHandler({
resolvedSessionId,
finalMessage,
modelToSend,
- planMode,
+ planMode: planModeEnabled,
hasReviewComments,
attachments,
contextFilesMeta,
@@ -190,7 +193,7 @@ export function useMessageHandler({
taskId,
activeModel,
sessionModel,
- planMode,
+ planModeEnabled,
isAgentBusy,
queue,
buildFinalMessage,
diff --git a/apps/web/hooks/use-resizable-input.ts b/apps/web/hooks/use-resizable-input.ts
index 127ac26005..f2e110ce3e 100644
--- a/apps/web/hooks/use-resizable-input.ts
+++ b/apps/web/hooks/use-resizable-input.ts
@@ -100,9 +100,22 @@ export function useResizableInput(sessionId: string | undefined) {
};
}, [persistHeight]);
+ /** Expand the input to fit content, clamped to max height. Does not shrink below user-set height. */
+ const autoExpand = useCallback(() => {
+ const el = containerRef.current;
+ if (!el || isDragging.current) return;
+ const maxHeight = Math.min(window.innerHeight * 0.6, MAX_ABSOLUTE);
+ if (el.scrollHeight > height) {
+ const next = Math.min(el.scrollHeight, maxHeight);
+ setHeight(next);
+ persistHeight(next);
+ }
+ }, [height, persistHeight]);
+
return {
height,
resetHeight,
+ autoExpand,
containerRef,
resizeHandleProps: {
onMouseDown: handleMouseDown,
diff --git a/apps/web/lib/keyboard/constants.ts b/apps/web/lib/keyboard/constants.ts
index 8298e070c9..f7a41a9834 100644
--- a/apps/web/lib/keyboard/constants.ts
+++ b/apps/web/lib/keyboard/constants.ts
@@ -129,4 +129,8 @@ export const SHORTCUTS = {
key: KEYS.P,
modifiers: { ctrlOrCmd: true, shift: true },
},
+ TOGGLE_PLAN_MODE: {
+ key: KEYS.TAB,
+ modifiers: { shift: true },
+ },
} as const;
diff --git a/apps/web/lib/settings/constants.ts b/apps/web/lib/settings/constants.ts
index a5dc016292..1521df8f97 100644
--- a/apps/web/lib/settings/constants.ts
+++ b/apps/web/lib/settings/constants.ts
@@ -4,6 +4,7 @@ export const STORAGE_KEYS = {
LAST_AGENT_PROFILE_ID: "kandev.dialog.lastAgentProfileId",
LAST_REPOSITORY_ID: "kandev.dialog.lastRepositoryId",
LAST_BRANCH: "kandev.dialog.lastBranch",
+ LAST_EXECUTOR_PROFILE_ID: "kandev.dialog.lastExecutorProfileId",
} as const;
export const DEFAULT_BACKEND_URL = "http://localhost:8080";
diff --git a/apps/web/lib/state/dockview-store.ts b/apps/web/lib/state/dockview-store.ts
index 8a2941283e..c7b3b5d213 100644
--- a/apps/web/lib/state/dockview-store.ts
+++ b/apps/web/lib/state/dockview-store.ts
@@ -584,15 +584,28 @@ export const useDockviewStore = create((set, get) => ({
// Clear pinned overrides so fresh default gets clean preset widths
const freshPinned = new Map();
set({ isRestoringLayout: true, pinnedWidths: freshPinned });
- const state = userDefaultLayout ?? getPresetLayout("default");
- const ids = applyLayout(api, state, freshPinned);
- const hasSidebar = state.columns.some((c) => c.id === "sidebar");
- const hasRight = state.columns.length > (hasSidebar ? 2 : 1);
- set({ ...ids, sidebarVisible: hasSidebar, rightPanelsVisible: hasRight });
+ // Check if plan mode was queued before navigation (e.g. task created in plan mode).
+ // If so, use the plan preset directly and consume the deferred actions.
const pending = get().deferredPanelActions;
- if (pending.length > 0) {
+ const hasPlanAction = pending.some((a) => a.id === "plan");
+ if (hasPlanAction) {
set({ deferredPanelActions: [] });
- applyDeferredPanelActions(api, pending);
+ const planState = getPresetLayout("plan");
+ const ids = applyLayout(api, planState, freshPinned);
+ set({ ...ids, sidebarVisible: true, rightPanelsVisible: false });
+ // Apply any remaining non-plan deferred actions
+ const remaining = pending.filter((a) => a.id !== "plan");
+ if (remaining.length > 0) applyDeferredPanelActions(api, remaining);
+ } else {
+ const state = userDefaultLayout ?? getPresetLayout("default");
+ const ids = applyLayout(api, state, freshPinned);
+ const hasSidebar = state.columns.some((c) => c.id === "sidebar");
+ const hasRight = state.columns.length > (hasSidebar ? 2 : 1);
+ set({ ...ids, sidebarVisible: hasSidebar, rightPanelsVisible: hasRight });
+ if (pending.length > 0) {
+ set({ deferredPanelActions: [] });
+ applyDeferredPanelActions(api, pending);
+ }
}
requestAnimationFrame(() => {
syncPinnedWidthsFromApi(api, set);
diff --git a/apps/web/lib/state/editor-resolver-store.ts b/apps/web/lib/state/editor-resolver-store.ts
index e1fa35a692..e51e73646b 100644
--- a/apps/web/lib/state/editor-resolver-store.ts
+++ b/apps/web/lib/state/editor-resolver-store.ts
@@ -8,7 +8,7 @@ export type EditorContext =
| "chat-diff"
| "plan-editor";
-export type EditorProvider = "monaco" | "codemirror" | "pierre-diffs" | "tiptap";
+export type EditorProvider = "monaco" | "codemirror" | "shiki" | "pierre-diffs" | "tiptap";
const MONACO: EditorProvider = "monaco";
const PIERRE_DIFFS: EditorProvider = "pierre-diffs";
@@ -16,7 +16,7 @@ const PIERRE_DIFFS: EditorProvider = "pierre-diffs";
const VALID_PROVIDERS: Record = {
"code-editor": [MONACO, "codemirror"],
"diff-viewer": [MONACO, PIERRE_DIFFS],
- "chat-code-block": [MONACO, "codemirror"],
+ "chat-code-block": ["shiki", MONACO, "codemirror"],
"chat-diff": [MONACO, PIERRE_DIFFS],
"plan-editor": ["tiptap"],
};
@@ -24,7 +24,7 @@ const VALID_PROVIDERS: Record = {
const DEFAULT_PROVIDERS: Record = {
"code-editor": MONACO,
"diff-viewer": PIERRE_DIFFS,
- "chat-code-block": MONACO,
+ "chat-code-block": "shiki",
"chat-diff": PIERRE_DIFFS,
"plan-editor": "tiptap",
};
@@ -51,12 +51,17 @@ export const useEditorResolverStore = create()(
}),
{
name: "kandev-editor-providers",
- version: 1,
+ version: 3,
migrate: (persisted) => {
const state = persisted as { providers: Record };
return {
...state,
- providers: { ...state.providers, "diff-viewer": PIERRE_DIFFS, "chat-diff": PIERRE_DIFFS },
+ providers: {
+ ...state.providers,
+ "diff-viewer": PIERRE_DIFFS,
+ "chat-diff": PIERRE_DIFFS,
+ "chat-code-block": "shiki",
+ },
};
},
},
diff --git a/apps/web/lib/state/layout-manager/presets.ts b/apps/web/lib/state/layout-manager/presets.ts
index 78c5ad1e7e..259b18cc4e 100644
--- a/apps/web/lib/state/layout-manager/presets.ts
+++ b/apps/web/lib/state/layout-manager/presets.ts
@@ -19,7 +19,7 @@ export function defaultLayout(): LayoutState {
pinned: true,
maxWidth: LAYOUT_SIDEBAR_MAX_PX,
groups: [
- { panels: [panel("changes"), panel("files")] },
+ { panels: [panel("files"), panel("changes")] },
{ panels: [panel("terminal-default")] },
],
},
diff --git a/apps/web/lib/types/backend.ts b/apps/web/lib/types/backend.ts
index 9387e868de..4d7595177a 100644
--- a/apps/web/lib/types/backend.ts
+++ b/apps/web/lib/types/backend.ts
@@ -183,6 +183,7 @@ export type MessageAddedPayload = {
author_type: "user" | "agent";
author_id?: string;
content: string;
+ raw_content?: string;
type?: string;
metadata?: Record;
requests_input?: boolean;
diff --git a/apps/web/lib/types/http.ts b/apps/web/lib/types/http.ts
index f3343d3cf0..ca57f5361d 100644
--- a/apps/web/lib/types/http.ts
+++ b/apps/web/lib/types/http.ts
@@ -563,6 +563,7 @@ export type Message = {
author_type: MessageAuthorType;
author_id?: string;
content: string;
+ raw_content?: string;
type: MessageType;
metadata?: Record;
requests_input?: boolean;
diff --git a/apps/web/lib/ws/handlers/messages.ts b/apps/web/lib/ws/handlers/messages.ts
index 2916e403f4..561382ebfe 100644
--- a/apps/web/lib/ws/handlers/messages.ts
+++ b/apps/web/lib/ws/handlers/messages.ts
@@ -18,6 +18,7 @@ export function registerMessagesHandlers(store: StoreApi): WsHandlers
author_type: payload.author_type,
author_id: payload.author_id,
content: payload.content,
+ raw_content: payload.raw_content,
type: (payload.type as MessageType) || "message",
metadata: payload.metadata,
requests_input: payload.requests_input,
@@ -37,6 +38,7 @@ export function registerMessagesHandlers(store: StoreApi): WsHandlers
author_type: payload.author_type,
author_id: payload.author_id,
content: payload.content,
+ raw_content: payload.raw_content,
type: (payload.type as MessageType) || "message",
metadata: payload.metadata,
requests_input: payload.requests_input,
diff --git a/apps/web/package.json b/apps/web/package.json
index 961213b723..a070a9a0c2 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -97,6 +97,7 @@
"remark-breaks": "^4.0.0",
"remark-gfm": "^4.0.1",
"shadcn": "^3.6.3",
+ "shiki": "^3.22.0",
"sonner": "^2.0.7",
"styled-jsx": "5.1.6",
"tailwind-merge": "^3.4.0",