Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

Defer proposed plan rendering until expand in ChatView

Julius Marmingeeb7c428a2d34
diff --git a/apps/web/src/components/ChatView.browser.tsx b/apps/web/src/components/ChatView.browser.tsx
index e2fd573fe..0f0250e48 100644
--- a/apps/web/src/components/ChatView.browser.tsx
+++ b/apps/web/src/components/ChatView.browser.tsx
@@ -256,6 +256,61 @@ function createDraftOnlySnapshot(): OrchestrationReadModel {
};
}
+function createSnapshotWithLongProposedPlan(): OrchestrationReadModel {
+ const snapshot = createSnapshotForTargetUser({
+ targetMessageId: "msg-user-plan-target" as MessageId,
+ targetText: "plan thread",
+ });
+ const planMarkdown = [
+ "# Ship plan mode follow-up",
+ "",
+ "- Step 1: capture the thread-open trace",
+ "- Step 2: identify the main-thread bottleneck",
+ "- Step 3: keep collapsed cards cheap",
+ "- Step 4: render the full markdown only on demand",
+ "- Step 5: preserve export and save actions",
+ "- Step 6: add regression coverage",
+ "- Step 7: verify route transitions stay responsive",
+ "- Step 8: confirm no server-side work changed",
+ "- Step 9: confirm short plans still render normally",
+ "- Step 10: confirm long plans stay collapsed by default",
+ "- Step 11: confirm preview text is still useful",
+ "- Step 12: confirm plan follow-up flow still works",
+ "- Step 13: confirm timeline virtualization still behaves",
+ "- Step 14: confirm theme styling still looks correct",
+ "- Step 15: confirm save dialog behavior is unchanged",
+ "- Step 16: confirm download behavior is unchanged",
+ "- Step 17: confirm code fences do not parse until expand",
+ "- Step 18: confirm preview truncation ends cleanly",
+ "- Step 19: confirm markdown links still open in editor after expand",
+ "- Step 20: confirm deep hidden detail only appears after expand",
+ "",
+ "```ts",
+ "export const hiddenPlanImplementationDetail = 'deep hidden detail only after expand';",
+ "```",
+ ].join("\n");
+
+ return {
+ ...snapshot,
+ threads: snapshot.threads.map((thread) =>
+ thread.id === THREAD_ID
+ ? Object.assign({}, thread, {
+ proposedPlans: [
+ {
+ id: "plan-browser-test",
+ turnId: null,
+ planMarkdown,
+ createdAt: isoAt(1_000),
+ updatedAt: isoAt(1_001),
+ },
+ ],
+ updatedAt: isoAt(1_001),
+ })
+ : thread,
+ ),
+ };
+}
+
function resolveWsRpc(tag: string): unknown {
if (tag === ORCHESTRATION_WS_METHODS.getSnapshot) {
return fixture.snapshot;
@@ -867,4 +922,41 @@ describe("ChatView timeline estimator parity (full app)", () => {
await mounted.cleanup();
}
});
+
+ it("keeps long proposed plans lightweight until the user expands them", async () => {
+ const mounted = await mountChatView({
+ viewport: DEFAULT_VIEWPORT,
+ snapshot: createSnapshotWithLongProposedPlan(),
+ });
+
+ try {
+ await waitForElement(
+ () =>
+ Array.from(document.querySelectorAll("button")).find(
+ (button) => button.textContent?.trim() === "Expand plan",
+ ) as HTMLButtonElement | null,
+ "Unable to find Expand plan button.",
+ );
+
+ expect(document.body.textContent).not.toContain("deep hidden detail only after expand");
+
+ const expandButton = await waitForElement(
+ () =>
+ Array.from(document.querySelectorAll("button")).find(
+ (button) => button.textContent?.trim() === "Expand plan",
+ ) as HTMLButtonElement | null,
+ "Unable to find Expand plan button.",
+ );
+ expandButton.click();
+
+ await vi.waitFor(
+ () => {
+ expect(document.body.textContent).toContain("deep hidden detail only after expand");
+ },
+ { timeout: 8_000, interval: 16 },
+ );
+ } finally {
+ await mounted.cleanup();
+ }
+ });
});
diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index 5d91dd2a1..12fd18db2 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -31,6 +31,7 @@ import {
} from "@t3tools/shared/model";
import {
memo,
+ startTransition,
useCallback,
useEffect,
useLayoutEffect,
@@ -89,6 +90,7 @@ import {
} from "../pendingUserInput";
import { useStore } from "../store";
import {
+ buildCollapsedProposedPlanPreviewMarkdown,
buildPlanImplementationThreadTitle,
buildPlanImplementationPrompt,
buildProposedPlanMarkdownFilename,
@@ -96,6 +98,7 @@ import {
normalizePlanMarkdownForExport,
proposedPlanTitle,
resolvePlanFollowUpSubmission,
+ stripDisplayedPlanMarkdown,
} from "../proposedPlan";
import { truncateTitle } from "../truncateTitle";
import {
@@ -201,11 +204,7 @@ import { Toggle } from "./ui/toggle";
import { SidebarTrigger } from "./ui/sidebar";
import { newCommandId, newMessageId, newThreadId } from "~/lib/utils";
import { readNativeApi } from "~/nativeApi";
-import {
- getAppModelOptions,
- resolveAppModelSelection,
- useAppSettings,
-} from "../appSettings";
+import { getAppModelOptions, resolveAppModelSelection, useAppSettings } from "../appSettings";
import {
type ComposerImageAttachment,
type DraftThreadEnvMode,
@@ -292,8 +291,6 @@ function workToneClass(tone: "thinking" | "tool" | "info" | "error"): string {
return "text-muted-foreground/40";
}
-
-
interface ExpandedImageItem {
src: string;
name: string;
@@ -1963,8 +1960,6 @@ export default function ChatView({ threadId }: ChatViewProps) {
planSidebarDismissedForTurnRef.current = null;
}, [activeThread?.id]);
-
-
useEffect(() => {
if (!composerMenuOpen) {
setComposerHighlightedItemId(null);
@@ -2688,9 +2683,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
...(selectedModelOptionsForDispatch
? { modelOptions: selectedModelOptionsForDispatch }
: {}),
- ...(providerOptionsForDispatch
- ? { providerOptions: providerOptionsForDispatch }
- : {}),
+ ...(providerOptionsForDispatch ? { providerOptions: providerOptionsForDispatch } : {}),
provider: selectedProvider,
assistantDeliveryMode: settings.enableAssistantStreaming ? "streaming" : "buffered",
runtimeMode,
@@ -2968,9 +2961,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
...(selectedModelOptionsForDispatch
? { modelOptions: selectedModelOptionsForDispatch }
: {}),
- ...(providerOptionsForDispatch
- ? { providerOptions: providerOptionsForDispatch }
- : {}),
+ ...(providerOptionsForDispatch ? { providerOptions: providerOptionsForDispatch } : {}),
assistantDeliveryMode: settings.enableAssistantStreaming ? "streaming" : "buffered",
runtimeMode,
interactionMode: nextInteractionMode,
@@ -3079,9 +3070,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
...(selectedModelOptionsForDispatch
? { modelOptions: selectedModelOptionsForDispatch }
: {}),
- ...(providerOptionsForDispatch
- ? { providerOptions: providerOptionsForDispatch }
- : {}),
+ ...(providerOptionsForDispatch ? { providerOptions: providerOptionsForDispatch } : {}),
assistantDeliveryMode: settings.enableAssistantStreaming ? "streaming" : "buffered",
runtimeMode,
interactionMode: "default",
@@ -3503,513 +3492,537 @@ export default function ChatView({ threadId }: ChatViewProps) {
<div className="flex min-h-0 min-w-0 flex-1">
{/* Chat column */}
<div className="flex min-h-0 min-w-0 flex-1 flex-col">
-
- {/* Messages */}
- <div
- ref={setMessagesScrollContainerRef}
- className="min-h-0 flex-1 overflow-x-hidden overflow-y-auto overscroll-y-contain px-3 py-3 sm:px-5 sm:py-4"
- onScroll={onMessagesScroll}
- onClickCapture={onMessagesClickCapture}
- onWheel={onMessagesWheel}
- onPointerDown={onMessagesPointerDown}
- onPointerUp={onMessagesPointerUp}
- onPointerCancel={onMessagesPointerCancel}
- onTouchStart={onMessagesTouchStart}
- onTouchMove={onMessagesTouchMove}
- onTouchEnd={onMessagesTouchEnd}
- onTouchCancel={onMessagesTouchEnd}
- >
- <MessagesTimeline
- key={activeThread.id}
- hasMessages={timelineEntries.length > 0}
- isWorking={isWorking}
- activeTurnInProgress={isWorking || !latestTurnSettled}
- activeTurnStartedAt={activeWorkStartedAt}
- scrollContainer={messagesScrollElement}
- timelineEntries={timelineEntries}
- completionDividerBeforeEntryId={completionDividerBeforeEntryId}
- completionSummary={completionSummary}
- turnDiffSummaryByAssistantMessageId={turnDiffSummaryByAssistantMessageId}
- nowIso={nowIso}
- expandedWorkGroups={expandedWorkGroups}
- onToggleWorkGroup={onToggleWorkGroup}
- onOpenTurnDiff={onOpenTurnDiff}
- revertTurnCountByUserMessageId={revertTurnCountByUserMessageId}
- onRevertUserMessage={onRevertUserMessage}
- isRevertingCheckpoint={isRevertingCheckpoint}
- onImageExpand={onExpandTimelineImage}
- markdownCwd={gitCwd ?? undefined}
- resolvedTheme={resolvedTheme}
- workspaceRoot={activeProject?.cwd ?? undefined}
- />
- </div>
-
- {/* Input bar */}
- <div className={cn("px-3 pt-1.5 sm:px-5 sm:pt-2", isGitRepo ? "pb-1" : "pb-3 sm:pb-4")}>
- <form
- ref={composerFormRef}
- onSubmit={onSend}
- className="mx-auto w-full min-w-0 max-w-3xl"
- data-chat-composer-form="true"
- >
+ {/* Messages */}
<div
- className={`group rounded-[20px] border bg-card transition-colors duration-200 focus-within:border-ring/45 ${
- isDragOverComposer ? "border-primary/70 bg-accent/30" : "border-border"
- }`}
- onDragEnter={onComposerDragEnter}
- onDragOver={onComposerDragOver}
- onDragLeave={onComposerDragLeave}
- onDrop={onComposerDrop}
+ ref={setMessagesScrollContainerRef}
+ className="min-h-0 flex-1 overflow-x-hidden overflow-y-auto overscroll-y-contain px-3 py-3 sm:px-5 sm:py-4"
+ onScroll={onMessagesScroll}
+ onClickCapture={onMessagesClickCapture}
+ onWheel={onMessagesWheel}
+ onPointerDown={onMessagesPointerDown}
+ onPointerUp={onMessagesPointerUp}
+ onPointerCancel={onMessagesPointerCancel}
+ onTouchStart={onMessagesTouchStart}
+ onTouchMove={onMessagesTouchMove}
+ onTouchEnd={onMessagesTouchEnd}
+ onTouchCancel={onMessagesTouchEnd}
>
- {activePendingApproval ? (
- <div className="rounded-t-[19px] border-b border-border/65 bg-muted/20">
- <ComposerPendingApprovalPanel
- approval={activePendingApproval}
- pendingCount={pendingApprovals.length}
- />
- </div>
- ) : pendingUserInputs.length > 0 ? (
- <div className="rounded-t-[19px] border-b border-border/65 bg-muted/20">
- <ComposerPendingUserInputPanel
- pendingUserInputs={pendingUserInputs}
- respondingRequestIds={respondingUserInputRequestIds}
- answers={activePendingDraftAnswers}
- questionIndex={activePendingQuestionIndex}
- onSelectOption={onSelectActivePendingUserInputOption}
- onAdvance={onAdvanceActivePendingUserInput}
- />
- </div>
- ) : showPlanFollowUpPrompt && activeProposedPlan ? (
- <div className="rounded-t-[19px] border-b border-border/65 bg-muted/20">
- <ComposerPlanFollowUpBanner
- key={activeProposedPlan.id}
- planTitle={proposedPlanTitle(activeProposedPlan.planMarkdown) ?? null}
- />
- </div>
- ) : null}
+ <MessagesTimeline
+ key={activeThread.id}
+ hasMessages={timelineEntries.length > 0}
+ isWorking={isWorking}
+ activeTurnInProgress={isWorking || !latestTurnSettled}
+ activeTurnStartedAt={activeWorkStartedAt}
+ scrollContainer={messagesScrollElement}
+ timelineEntries={timelineEntries}
+ completionDividerBeforeEntryId={completionDividerBeforeEntryId}
+ completionSummary={completionSummary}
+ turnDiffSummaryByAssistantMessageId={turnDiffSummaryByAssistantMessageId}
+ nowIso={nowIso}
+ expandedWorkGroups={expandedWorkGroups}
+ onToggleWorkGroup={onToggleWorkGroup}
+ onOpenTurnDiff={onOpenTurnDiff}
+ revertTurnCountByUserMessageId={revertTurnCountByUserMessageId}
+ onRevertUserMessage={onRevertUserMessage}
+ isRevertingCheckpoint={isRevertingCheckpoint}
+ onImageExpand={onExpandTimelineImage}
+ markdownCwd={gitCwd ?? undefined}
+ resolvedTheme={resolvedTheme}
+ workspaceRoot={activeProject?.cwd ?? undefined}
+ />
+ </div>
- {/* Textarea area */}
- <div
- className={cn(
- "relative px-3 pb-2 sm:px-4",
- hasComposerHeader ? "pt-2.5 sm:pt-3" : "pt-3.5 sm:pt-4",
- )}
+ {/* Input bar */}
+ <div className={cn("px-3 pt-1.5 sm:px-5 sm:pt-2", isGitRepo ? "pb-1" : "pb-3 sm:pb-4")}>
+ <form
+ ref={composerFormRef}
+ onSubmit={onSend}
+ className="mx-auto w-full min-w-0 max-w-3xl"
+ data-chat-composer-form="true"
>
- {composerMenuOpen && !isComposerApprovalState && (
- <div className="absolute inset-x-0 bottom-full z-20 mb-2 px-1">
- <ComposerCommandMenu
- items={composerMenuItems}
- resolvedTheme={resolvedTheme}
- isLoading={isComposerMenuLoading}
- triggerKind={composerTriggerKind}
- activeItemId={activeComposerMenuItem?.id ?? null}
- onHighlightedItemChange={onComposerMenuItemHighlighted}
- onSelect={onSelectComposerItem}
- />
- </div>
- )}
-
- {!isComposerApprovalState && pendingUserInputs.length === 0 && composerImages.length > 0 && (
- <div className="mb-3 flex flex-wrap gap-2">
- {composerImages.map((image) => (
- <div
- key={image.id}
- className="relative h-16 w-16 overflow-hidden rounded-lg border border-border/80 bg-background"
- >
- {image.previewUrl ? (
- <button
- type="button"
- className="h-full w-full cursor-zoom-in"
- aria-label={`Preview ${image.name}`}
- onClick={() => {
- const preview = buildExpandedImagePreview(composerImages, image.id);
- if (!preview) return;
- setExpandedImage(preview);
- }}
- >
- <img
- src={image.previewUrl}
- alt={image.name}
- className="h-full w-full object-cover"
- />
- </button>
- ) : (
- <div className="flex h-full w-full items-center justify-center px-1 text-center text-[10px] text-muted-foreground/70">
- {image.name}
- </div>
- )}
- {nonPersistedComposerImageIdSet.has(image.id) && (
- <Tooltip>
- <TooltipTrigger
- render={
- <span
- role="img"
- aria-label="Draft attachment may not persist"
- className="absolute left-1 top-1 inline-flex items-center justify-center rounded bg-background/85 p-0.5 text-amber-600"
- >
- <CircleAlertIcon className="size-3" />
- </span>
- }
- />
- <TooltipPopup
- side="top"
- className="max-w-64 whitespace-normal leading-tight"
- >
- Draft attachment could not be saved locally and may be lost on
- navigation.
- </TooltipPopup>
- </Tooltip>
- )}
- <Button
- variant="ghost"
- size="icon-xs"
- className="absolute right-1 top-1 bg-background/80 hover:bg-background/90"
- onClick={() => removeComposerImage(image.id)}
- aria-label={`Remove ${image.name}`}
- >
- <XIcon />
- </Button>
- </div>
- ))}
- </div>
- )}
- <ComposerPromptEditor
- ref={composerEditorRef}
- value={
- isComposerApprovalState
- ? ""
- : activePendingProgress
- ? activePendingProgress.customAnswer
- : prompt
- }
- cursor={composerCursor}
- onChange={onPromptChange}
- onCommandKeyDown={onComposerCommandKey}
- onPaste={onComposerPaste}
- placeholder={
- isComposerApprovalState
- ? (activePendingApproval?.detail ?? "Resolve this approval request to continue")
- : activePendingProgress
- ? "Type your own answer, or leave this blank to use the selected option"
- : showPlanFollowUpPrompt && activeProposedPlan
- ? "Add feedback to refine the plan, or leave this blank to implement it"
- : phase === "disconnected"
- ? "Ask for follow-up changes or attach images"
- : "Ask anything, @tag files/folders, or use /model"
- }
- disabled={isConnecting || isComposerApprovalState}
- />
- </div>
-
- {/* Bottom toolbar */}
- {activePendingApproval ? (
- <div className="flex items-center justify-end gap-2 px-2.5 pb-2.5 sm:px-3 sm:pb-3">
- <ComposerPendingApprovalActions
- requestId={activePendingApproval.requestId}
- isResponding={respondingRequestIds.includes(activePendingApproval.requestId)}
- onRespondToApproval={onRespondToApproval}
- />
- </div>
- ) : (
<div
- data-chat-composer-footer="true"
- className={cn(
- "flex items-center justify-between px-2.5 pb-2.5 sm:px-3 sm:pb-3",
- isComposerFooterCompact ? "gap-1.5" : "flex-wrap gap-2 sm:flex-nowrap sm:gap-0",
- )}
+ className={`group rounded-[20px] border bg-card transition-colors duration-200 focus-within:border-ring/45 ${
+ isDragOverComposer ? "border-primary/70 bg-accent/30" : "border-border"
+ }`}
+ onDragEnter={onComposerDragEnter}
+ onDragOver={onComposerDragOver}
+ onDragLeave={onComposerDragLeave}
+ onDrop={onComposerDrop}
>
+ {activePendingApproval ? (
+ <div className="rounded-t-[19px] border-b border-border/65 bg-muted/20">
+ <ComposerPendingApprovalPanel
+ approval={activePendingApproval}
+ pendingCount={pendingApprovals.length}
+ />
+ </div>
+ ) : pendingUserInputs.length > 0 ? (
+ <div className="rounded-t-[19px] border-b border-border/65 bg-muted/20">
+ <ComposerPendingUserInputPanel
+ pendingUserInputs={pendingUserInputs}
+ respondingRequestIds={respondingUserInputRequestIds}
+ answers={activePendingDraftAnswers}
+ questionIndex={activePendingQuestionIndex}
+ onSelectOption={onSelectActivePendingUserInputOption}
+ onAdvance={onAdvanceActivePendingUserInput}
+ />
+ </div>
+ ) : showPlanFollowUpPrompt && activeProposedPlan ? (
+ <div className="rounded-t-[19px] border-b border-border/65 bg-muted/20">
+ <ComposerPlanFollowUpBanner
+ key={activeProposedPlan.id}
+ planTitle={proposedPlanTitle(activeProposedPlan.planMarkdown) ?? null}
+ />
+ </div>
+ ) : null}
+
+ {/* Textarea area */}
<div
className={cn(
- "flex min-w-0 flex-1 items-center",
- isComposerFooterCompact
- ? "gap-1 overflow-hidden"
- : "gap-1 overflow-x-auto [scrollbar-width:none] [&::-webkit-scrollbar]:hidden sm:min-w-max sm:overflow-visible",
+ "relative px-3 pb-2 sm:px-4",
+ hasComposerHeader ? "pt-2.5 sm:pt-3" : "pt-3.5 sm:pt-4",
)}
>
- {/* Provider/model picker */}
- <ProviderModelPicker
- compact={isComposerFooterCompact}
- provider={selectedProvider}
- model={selectedModelForPickerWithCustomFallback}
- lockedProvider={lockedProvider}
- modelOptionsByProvider={modelOptionsByProvider}
- onProviderModelChange={onProviderModelSelect}
+ {composerMenuOpen && !isComposerApprovalState && (
+ <div className="absolute inset-x-0 bottom-full z-20 mb-2 px-1">
+ <ComposerCommandMenu
+ items={composerMenuItems}
+ resolvedTheme={resolvedTheme}
+ isLoading={isComposerMenuLoading}
+ triggerKind={composerTriggerKind}
+ activeItemId={activeComposerMenuItem?.id ?? null}
+ onHighlightedItemChange={onComposerMenuItemHighlighted}
+ onSelect={onSelectComposerItem}
+ />
+ </div>
+ )}
+
+ {!isComposerApprovalState &&
+ pendingUserInputs.length === 0 &&
+ composerImages.length > 0 && (
+ <div className="mb-3 flex flex-wrap gap-2">
+ {composerImages.map((image) => (
+ <div
+ key={image.id}
+ className="relative h-16 w-16 overflow-hidden rounded-lg border border-border/80 bg-background"
+ >
+ {image.previewUrl ? (
+ <button
+ type="button"
+ className="h-full w-full cursor-zoom-in"
+ aria-label={`Preview ${image.name}`}
+ onClick={() => {
+ const preview = buildExpandedImagePreview(
+ composerImages,
+ image.id,
+ );
+ if (!preview) return;
+ setExpandedImage(preview);
+ }}
+ >
+ <img
+ src={image.previewUrl}
+ alt={image.name}
+ className="h-full w-full object-cover"
+ />
+ </button>
+ ) : (
+ <div className="flex h-full w-full items-center justify-center px-1 text-center text-[10px] text-muted-foreground/70">
+ {image.name}
+ </div>
+ )}
+ {nonPersistedComposerImageIdSet.has(image.id) && (
+ <Tooltip>
+ <TooltipTrigger
+ render={
+ <span
+ role="img"
+ aria-label="Draft attachment may not persist"
+ className="absolute left-1 top-1 inline-flex items-center justify-center rounded bg-background/85 p-0.5 text-amber-600"
+ >
+ <CircleAlertIcon className="size-3" />
+ </span>
+ }
+ />
+ <TooltipPopup
+ side="top"
+ className="max-w-64 whitespace-normal leading-tight"
+ >
+ Draft attachment could not be saved locally and may be lost on
+ navigation.
+ </TooltipPopup>
+ </Tooltip>
+ )}
+ <Button
+ variant="ghost"
+ size="icon-xs"
+ className="absolute right-1 top-1 bg-background/80 hover:bg-background/90"
+ onClick={() => removeComposerImage(image.id)}
+ aria-label={`Remove ${image.name}`}
+ >
+ <XIcon />
+ </Button>
+ </div>
+ ))}
+ </div>
+ )}
+ <ComposerPromptEditor
+ ref={composerEditorRef}
+ value={
+ isComposerApprovalState
+ ? ""
+ : activePendingProgress
+ ? activePendingProgress.customAnswer
+ : prompt
+ }
+ cursor={composerCursor}
+ onChange={onPromptChange}
+ onCommandKeyDown={onComposerCommandKey}
+ onPaste={onComposerPaste}
+ placeholder={
+ isComposerApprovalState
+ ? (activePendingApproval?.detail ??
+ "Resolve this approval request to continue")
+ : activePendingProgress
+ ? "Type your own answer, or leave this blank to use the selected option"
+ : showPlanFollowUpPrompt && activeProposedPlan
+ ? "Add feedback to refine the plan, or leave this blank to implement it"
+ : phase === "disconnected"
+ ? "Ask for follow-up changes or attach images"
+ : "Ask anything, @tag files/folders, or use /model"
+ }
+ disabled={isConnecting || isComposerApprovalState}
/>
+ </div>
- {isComposerFooterCompact ? (
- <CompactComposerControlsMenu
- activePlan={Boolean(activePlan || activeProposedPlan || planSidebarOpen)}
- interactionMode={interactionMode}
- planSidebarOpen={planSidebarOpen}
- runtimeMode={runtimeMode}
- selectedEffort={selectedEffort}
- selectedProvider={selectedProvider}
- selectedCodexFastModeEnabled={selectedCodexFastModeEnabled}
- reasoningOptions={reasoningOptions}
- onEffortSelect={onEffortSelect}
- onCodexFastModeChange={onCodexFastModeChange}
- onToggleInteractionMode={toggleInteractionMode}
- onTogglePlanSidebar={togglePlanSidebar}
- onToggleRuntimeMode={toggleRuntimeMode}
+ {/* Bottom toolbar */}
+ {activePendingApproval ? (
+ <div className="flex items-center justify-end gap-2 px-2.5 pb-2.5 sm:px-3 sm:pb-3">
+ <ComposerPendingApprovalActions
+ requestId={activePendingApproval.requestId}
+ isResponding={respondingRequestIds.includes(activePendingApproval.requestId)}
+ onRespondToApproval={onRespondToApproval}
/>
- ) : (
- <>
- {selectedProvider === "codex" && selectedEffort != null ? (
- <>
- <Separator orientation="vertical" className="mx-0.5 hidden h-4 sm:block" />
- <CodexTraitsPicker
- effort={selectedEffort}
- fastModeEnabled={selectedCodexFastModeEnabled}
- options={reasoningOptions}
- onEffortChange={onEffortSelect}
- onFastModeChange={onCodexFastModeChange}
- />
- </>
- ) : null}
+ </div>
+ ) : (
+ <div
+ data-chat-composer-footer="true"
+ className={cn(
+ "flex items-center justify-between px-2.5 pb-2.5 sm:px-3 sm:pb-3",
+ isComposerFooterCompact
+ ? "gap-1.5"
+ : "flex-wrap gap-2 sm:flex-nowrap sm:gap-0",
+ )}
+ >
+ <div
+ className={cn(
+ "flex min-w-0 flex-1 items-center",
+ isComposerFooterCompact
+ ? "gap-1 overflow-hidden"
+ : "gap-1 overflow-x-auto [scrollbar-width:none] [&::-webkit-scrollbar]:hidden sm:min-w-max sm:overflow-visible",
+ )}
+ >
+ {/* Provider/model picker */}
+ <ProviderModelPicker
+ compact={isComposerFooterCompact}
+ provider={selectedProvider}
+ model={selectedModelForPickerWithCustomFallback}
+ lockedProvider={lockedProvider}
+ modelOptionsByProvider={modelOptionsByProvider}
+ onProviderModelChange={onProviderModelSelect}
+ />
- <Separator orientation="vertical" className="mx-0.5 hidden h-4 sm:block" />
+ {isComposerFooterCompact ? (
+ <CompactComposerControlsMenu
+ activePlan={Boolean(activePlan || activeProposedPlan || planSidebarOpen)}
+ interactionMode={interactionMode}
+ planSidebarOpen={planSidebarOpen}
+ runtimeMode={runtimeMode}
+ selectedEffort={selectedEffort}
+ selectedProvider={selectedProvider}
+ selectedCodexFastModeEnabled={selectedCodexFastModeEnabled}
+ reasoningOptions={reasoningOptions}
+ onEffortSelect={onEffortSelect}
+ onCodexFastModeChange={onCodexFastModeChange}
+ onToggleInteractionMode={toggleInteractionMode}
+ onTogglePlanSidebar={togglePlanSidebar}
+ onToggleRuntimeMode={toggleRuntimeMode}
+ />
+ ) : (
+ <>
+ {selectedProvider === "codex" && selectedEffort != null ? (
+ <>
+ <Separator
+ orientation="vertical"
+ className="mx-0.5 hidden h-4 sm:block"
+ />
+ <CodexTraitsPicker
+ effort={selectedEffort}
+ fastModeEnabled={selectedCodexFastModeEnabled}
+ options={reasoningOptions}
+ onEffortChange={onEffortSelect}
+ onFastModeChange={onCodexFastModeChange}
+ />
+ </>
+ ) : null}
- <Button
- variant="ghost"
- className="shrink-0 whitespace-nowrap px-2 text-muted-foreground/70 hover:text-foreground/80 sm:px-3"
- size="sm"
- type="button"
- onClick={toggleInteractionMode}
- title={
- interactionMode === "plan"
- ? "Plan mode — click to return to normal chat mode"
- : "Default mode — click to enter plan mode"
- }
- >
- <BotIcon />
- <span className="sr-only sm:not-sr-only">
- {interactionMode === "plan" ? "Plan" : "Chat"}
- </span>
- </Button>
+ <Separator
+ orientation="vertical"
+ className="mx-0.5 hidden h-4 sm:block"
+ />
- <Separator orientation="vertical" className="mx-0.5 hidden h-4 sm:block" />
+ <Button
+ variant="ghost"
+ className="shrink-0 whitespace-nowrap px-2 text-muted-foreground/70 hover:text-foreground/80 sm:px-3"
+ size="sm"
+ type="button"
+ onClick={toggleInteractionMode}
+ title={
+ interactionMode === "plan"
+ ? "Plan mode — click to return to normal chat mode"
+ : "Default mode — click to enter plan mode"
+ }
+ >
+ <BotIcon />
+ <span className="sr-only sm:not-sr-only">
+ {interactionMode === "plan" ? "Plan" : "Chat"}
+ </span>
+ </Button>
- <Button
- variant="ghost"
- className="shrink-0 whitespace-nowrap px-2 text-muted-foreground/70 hover:text-foreground/80 sm:px-3"
- size="sm"
- type="button"
- onClick={() =>
- void handleRuntimeModeChange(
- runtimeMode === "full-access" ? "approval-required" : "full-access",
- )
- }
- title={
- runtimeMode === "full-access"
- ? "Full access — click to require approvals"
- : "Approval required — click for full access"
- }
- >
- {runtimeMode === "full-access" ? <LockOpenIcon /> : <LockIcon />}
- <span className="sr-only sm:not-sr-only">
- {runtimeMode === "full-access" ? "Full access" : "Supervised"}
- </span>
- </Button>
+ <Separator
+ orientation="vertical"
+ className="mx-0.5 hidden h-4 sm:block"
+ />
- {(activePlan || activeProposedPlan || planSidebarOpen) ? (
- <>
- <Separator orientation="vertical" className="mx-0.5 hidden h-4 sm:block" />
<Button
variant="ghost"
- className={cn(
- "shrink-0 whitespace-nowrap px-2 sm:px-3",
- planSidebarOpen
- ? "text-blue-400 hover:text-blue-300"
- : "text-muted-foreground/70 hover:text-foreground/80",
- )}
+ className="shrink-0 whitespace-nowrap px-2 text-muted-foreground/70 hover:text-foreground/80 sm:px-3"
size="sm"
type="button"
- onClick={togglePlanSidebar}
- title={planSidebarOpen ? "Hide plan sidebar" : "Show plan sidebar"}
+ onClick={() =>
+ void handleRuntimeModeChange(
+ runtimeMode === "full-access" ? "approval-required" : "full-access",
+ )
+ }
+ title={
+ runtimeMode === "full-access"
+ ? "Full access — click to require approvals"
+ : "Approval required — click for full access"
+ }
>
- <ListTodoIcon />
- <span className="sr-only sm:not-sr-only">Plan</span>
+ {runtimeMode === "full-access" ? <LockOpenIcon /> : <LockIcon />}
+ <span className="sr-only sm:not-sr-only">
+ {runtimeMode === "full-access" ? "Full access" : "Supervised"}
+ </span>
</Button>
- </>
- ) : null}
- </>
- )}
- </div>
- {/* Right side: send / stop button */}
- <div data-chat-composer-actions="right" className="flex shrink-0 items-center gap-2">
- {isPreparingWorktree ? (
- <span className="text-muted-foreground/70 text-xs">Preparing worktree...</span>
- ) : null}
- {activePendingProgress ? (
- <div className="flex items-center gap-2">
- {activePendingProgress.questionIndex > 0 ? (
- <Button
- size="sm"
- variant="outline"
- className="rounded-full"
- onClick={onPreviousActivePendingUserInputQuestion}
- disabled={activePendingIsResponding}
- >
- Previous
- </Button>
- ) : null}
- <Button
- type="submit"
- size="sm"
- className="rounded-full px-4"
- disabled={
- activePendingIsResponding ||
- (activePendingProgress.isLastQuestion
- ? !activePendingResolvedAnswers
- : !activePendingProgress.canAdvance)
- }
- >
- {activePendingIsResponding
- ? "Submitting..."
- : activePendingProgress.isLastQuestion
- ? "Submit answers"
- : "Next question"}
- </Button>
+ {activePlan || activeProposedPlan || planSidebarOpen ? (
+ <>
+ <Separator
+ orientation="vertical"
+ className="mx-0.5 hidden h-4 sm:block"
+ />
+ <Button
+ variant="ghost"
+ className={cn(
+ "shrink-0 whitespace-nowrap px-2 sm:px-3",
+ planSidebarOpen
+ ? "text-blue-400 hover:text-blue-300"
+ : "text-muted-foreground/70 hover:text-foreground/80",
+ )}
+ size="sm"
+ type="button"
+ onClick={togglePlanSidebar}
+ title={planSidebarOpen ? "Hide plan sidebar" : "Show plan sidebar"}
+ >
+ <ListTodoIcon />
+ <span className="sr-only sm:not-sr-only">Plan</span>
+ </Button>
+ </>
+ ) : null}
+ </>
+ )}
</div>
- ) : phase === "running" ? (
- <button
- type="button"
- className="flex size-8 items-center justify-center rounded-full bg-rose-500/90 text-white transition-all duration-150 hover:bg-rose-500 hover:scale-105 sm:h-8 sm:w-8"
- onClick={() => void onInterrupt()}
- aria-label="Stop generation"
+
+ {/* Right side: send / stop button */}
+ <div
+ data-chat-composer-actions="right"
+ className="flex shrink-0 items-center gap-2"
>
- <svg
- width="12"
- height="12"
- viewBox="0 0 12 12"
- fill="currentColor"
- aria-hidden="true"
- >
- <rect x="2" y="2" width="8" height="8" rx="1.5" />
- </svg>
- </button>
- ) : pendingUserInputs.length === 0 ? (
- showPlanFollowUpPrompt ? (
- prompt.trim().length > 0 ? (
- <Button
- type="submit"
- size="sm"
- className="h-9 rounded-full px-4 sm:h-8"
- disabled={isSendBusy || isConnecting}
- >
- {isConnecting || isSendBusy ? "Sending..." : "Refine"}
- </Button>
- ) : (
- <div className="flex items-center">
+ {isPreparingWorktree ? (
+ <span className="text-muted-foreground/70 text-xs">
+ Preparing worktree...
+ </span>
+ ) : null}
+ {activePendingProgress ? (
+ <div className="flex items-center gap-2">
+ {activePendingProgress.questionIndex > 0 ? (
+ <Button
+ size="sm"
+ variant="outline"
+ className="rounded-full"
+ onClick={onPreviousActivePendingUserInputQuestion}
+ disabled={activePendingIsResponding}
+ >
+ Previous
+ </Button>
+ ) : null}
<Button
type="submit"
size="sm"
- className="h-9 rounded-l-full rounded-r-none px-4 sm:h-8"
- disabled={isSendBusy || isConnecting}
+ className="rounded-full px-4"
+ disabled={
+ activePendingIsResponding ||
+ (activePendingProgress.isLastQuestion
+ ? !activePendingResolvedAnswers
+ : !activePendingProgress.canAdvance)
+ }
>
- {isConnecting || isSendBusy ? "Sending..." : "Implement"}
+ {activePendingIsResponding
+ ? "Submitting..."
+ : activePendingProgress.isLastQuestion
+ ? "Submit answers"
+ : "Next question"}
</Button>
- <Menu>
- <MenuTrigger
- render={
- <Button
- size="sm"
- variant="default"
- className="h-9 rounded-l-none rounded-r-full border-l-white/12 px-2 sm:h-8"
- aria-label="Implementation actions"
- disabled={isSendBusy || isConnecting}
- />
- }
- >
- <ChevronDownIcon className="size-3.5" />
- </MenuTrigger>
- <MenuPopup align="end" side="top">
- <MenuItem
- disabled={isSendBusy || isConnecting}
- onClick={() => void onImplementPlanInNewThread()}
- >
- Implement in new thread
- </MenuItem>
- </MenuPopup>
- </Menu>
</div>
- )
- ) : (
- <button
- type="submit"
- className="flex h-9 w-9 items-center justify-center rounded-full bg-primary/90 text-primary-foreground transition-all duration-150 hover:bg-primary hover:scale-105 disabled:opacity-30 disabled:hover:scale-100 sm:h-8 sm:w-8"
- disabled={
- isSendBusy ||
- isConnecting ||
- (!prompt.trim() && composerImages.length === 0)
- }
- aria-label={
- isConnecting
- ? "Connecting"
- : isPreparingWorktree
- ? "Preparing worktree"
- : isSendBusy
- ? "Sending"
- : "Send message"
- }
- >
- {isConnecting || isSendBusy ? (
+ ) : phase === "running" ? (
+ <button
+ type="button"
+ className="flex size-8 items-center justify-center rounded-full bg-rose-500/90 text-white transition-all duration-150 hover:bg-rose-500 hover:scale-105 sm:h-8 sm:w-8"
+ onClick={() => void onInterrupt()}
+ aria-label="Stop generation"
+ >
<svg
- width="14"
- height="14"
- viewBox="0 0 14 14"
- fill="none"
- className="animate-spin"
+ width="12"
+ height="12"
+ viewBox="0 0 12 12"
+ fill="currentColor"
aria-hidden="true"
>
- <circle
- cx="7"
- cy="7"
- r="5.5"
- stroke="currentColor"
- strokeWidth="1.5"
- strokeLinecap="round"
- strokeDasharray="20 12"
- />
+ <rect x="2" y="2" width="8" height="8" rx="1.5" />
</svg>
+ </button>
+ ) : pendingUserInputs.length === 0 ? (
+ showPlanFollowUpPrompt ? (
+ prompt.trim().length > 0 ? (
+ <Button
+ type="submit"
+ size="sm"
+ className="h-9 rounded-full px-4 sm:h-8"
+ disabled={isSendBusy || isConnecting}
+ >
+ {isConnecting || isSendBusy ? "Sending..." : "Refine"}
+ </Button>
+ ) : (
+ <div className="flex items-center">
+ <Button
+ type="submit"
+ size="sm"
+ className="h-9 rounded-l-full rounded-r-none px-4 sm:h-8"
+ disabled={isSendBusy || isConnecting}
+ >
+ {isConnecting || isSendBusy ? "Sending..." : "Implement"}
+ </Button>
+ <Menu>
+ <MenuTrigger
+ render={
+ <Button
+ size="sm"
+ variant="default"
+ className="h-9 rounded-l-none rounded-r-full border-l-white/12 px-2 sm:h-8"
+ aria-label="Implementation actions"
+ disabled={isSendBusy || isConnecting}
+ />
+ }
+ >
+ <ChevronDownIcon className="size-3.5" />
+ </MenuTrigger>
+ <MenuPopup align="end" side="top">
+ <MenuItem
+ disabled={isSendBusy || isConnecting}
+ onClick={() => void onImplementPlanInNewThread()}
+ >
+ Implement in new thread
+ </MenuItem>
+ </MenuPopup>
+ </Menu>
+ </div>
+ )
) : (
- <svg
- width="14"
- height="14"
- viewBox="0 0 14 14"
- fill="none"
- aria-hidden="true"
+ <button
+ type="submit"
+ className="flex h-9 w-9 items-center justify-center rounded-full bg-primary/90 text-primary-foreground transition-all duration-150 hover:bg-primary hover:scale-105 disabled:opacity-30 disabled:hover:scale-100 sm:h-8 sm:w-8"
+ disabled={
+ isSendBusy ||
+ isConnecting ||
+ (!prompt.trim() && composerImages.length === 0)
+ }
+ aria-label={
+ isConnecting
+ ? "Connecting"
+ : isPreparingWorktree
+ ? "Preparing worktree"
+ : isSendBusy
+ ? "Sending"
+ : "Send message"
+ }
>
- <path
- d="M7 11.5V2.5M7 2.5L3 6.5M7 2.5L11 6.5"
- stroke="currentColor"
- strokeWidth="1.8"
- strokeLinecap="round"
- strokeLinejoin="round"
- />
- </svg>
- )}
- </button>
- )
- ) : null}
- </div>
+ {isConnecting || isSendBusy ? (
+ <svg
+ width="14"
+ height="14"
+ viewBox="0 0 14 14"
+ fill="none"
+ className="animate-spin"
+ aria-hidden="true"
+ >
+ <circle
+ cx="7"
+ cy="7"
+ r="5.5"
+ stroke="currentColor"
+ strokeWidth="1.5"
+ strokeLinecap="round"
+ strokeDasharray="20 12"
+ />
+ </svg>
+ ) : (
+ <svg
+ width="14"
+ height="14"
+ viewBox="0 0 14 14"
+ fill="none"
+ aria-hidden="true"
+ >
+ <path
+ d="M7 11.5V2.5M7 2.5L3 6.5M7 2.5L11 6.5"
+ stroke="currentColor"
+ strokeWidth="1.8"
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ />
+ </svg>
+ )}
+ </button>
+ )
+ ) : null}
+ </div>
+ </div>
+ )}
</div>
- )}
+ </form>
</div>
- </form>
- </div>
-
- {isGitRepo && (
- <BranchToolbar
- threadId={activeThread.id}
- onEnvModeChange={onEnvModeChange}
- envLocked={envLocked}
- onComposerFocusRequest={scheduleComposerFocus}
- />
- )}
- </div>{/* end chat column */}
+ {isGitRepo && (
+ <BranchToolbar
+ threadId={activeThread.id}
+ onEnvModeChange={onEnvModeChange}
+ envLocked={envLocked}
+ onComposerFocusRequest={scheduleComposerFocus}
+ />
+ )}
+ </div>
+ {/* end chat column */}
{/* Plan sidebar */}
{planSidebarOpen ? (
@@ -4028,7 +4041,8 @@ export default function ChatView({ threadId }: ChatViewProps) {
}}
/>
) : null}
- </div>{/* end horizontal flex container */}
+ </div>
+ {/* end horizontal flex container */}
{(() => {
if (!terminalState.terminalOpen || !activeProject) {
@@ -4465,10 +4479,7 @@ const ComposerPendingUserInputCard = memo(function ComposerPendingUserInputCard(
const handler = (event: globalThis.KeyboardEvent) => {
if (event.metaKey || event.ctrlKey || event.altKey) return;
const target = event.target;
- if (
- target instanceof HTMLInputElement ||
- target instanceof HTMLTextAreaElement
- ) {
+ if (target instanceof HTMLInputElement || target instanceof HTMLTextAreaElement) {
return;
}
// If the user has started typing a custom answer in the contenteditable
@@ -4542,12 +4553,12 @@ const ComposerPendingUserInputCard = memo(function ComposerPendingUserInputCard(
<div className="min-w-0 flex-1">
<span className="text-sm font-medium">{option.label}</span>
{option.description && option.description !== option.label ? (
- <span className="ml-2 text-xs text-muted-foreground/50">{option.description}</span>
+ <span className="ml-2 text-xs text-muted-foreground/50">
+ {option.description}
+ </span>
) : null}
</div>
- {isSelected ? (
- <CheckIcon className="size-3.5 shrink-0 text-blue-400" />
- ) : null}
+ {isSelected ? <CheckIcon className="size-3.5 shrink-0 text-blue-400" /> : null}
</button>
);
})}
@@ -4754,13 +4765,34 @@ const ProposedPlanCard = memo(function ProposedPlanCard({
const [isSaveDialogOpen, setIsSaveDialogOpen] = useState(false);
const [savePath, setSavePath] = useState("");
const [isSavingToWorkspace, setIsSavingToWorkspace] = useState(false);
+ const [renderCollapsedMarkdown, setRenderCollapsedMarkdown] = useState(false);
const savePathInputId = useId();
const title = proposedPlanTitle(planMarkdown) ?? "Proposed plan";
const lineCount = planMarkdown.split("\n").length;
const canCollapse = planMarkdown.length > 900 || lineCount > 20;
+ const displayedPlanMarkdown = stripDisplayedPlanMarkdown(planMarkdown);
+ const collapsedPreview = canCollapse
+ ? buildCollapsedProposedPlanPreviewMarkdown(planMarkdown, { maxLines: 10 })
+ : null;
const downloadFilename = buildProposedPlanMarkdownFilename(planMarkdown);
const saveContents = normalizePlanMarkdownForExport(planMarkdown);
+ useEffect(() => {
+ if (!canCollapse || expanded) {
+ setRenderCollapsedMarkdown(false);
+ return;
+ }
+ setRenderCollapsedMarkdown(false);
+ const frame = window.requestAnimationFrame(() => {
+ startTransition(() => {
+ setRenderCollapsedMarkdown(true);
+ });
+ });
+ return () => {
+ window.cancelAnimationFrame(frame);
+ };
+ }, [canCollapse, expanded, collapsedPreview]);
+
const handleDownload = () => {
downloadPlanAsTextFile(downloadFilename, saveContents);
};
@@ -4847,7 +4879,17 @@ const ProposedPlanCard = memo(function ProposedPlanCard({
</div>
<div className="mt-4">
<div className={cn("relative", canCollapse && !expanded && "max-h-104 overflow-hidden")}>
- <ChatMarkdown text={planMarkdown} cwd={cwd} isStreaming={false} />
+ {canCollapse && !expanded ? (
+ renderCollapsedMarkdown ? (
+ <ChatMarkdown text={collapsedPreview ?? ""} cwd={cwd} isStreaming={false} />
+ ) : (
+ <pre className="whitespace-pre-wrap wrap-break-word text-sm leading-relaxed text-foreground/80">
+ {collapsedPreview}
+ </pre>
+ )
+ ) : (
+ <ChatMarkdown text={displayedPlanMarkdown} cwd={cwd} isStreaming={false} />
+ )}
{canCollapse && !expanded ? (
<div className="pointer-events-none absolute inset-x-0 bottom-0 h-24 bg-linear-to-t from-card/95 via-card/80 to-transparent" />
) : null}
@@ -5601,7 +5643,7 @@ const ProviderModelPicker = memo(function ProviderModelPicker(props: {
}
setIsMenuOpen(open);
}}
- >
+ >max-w-42
<MenuTrigger
render={
<Button
@@ -5610,7 +5652,7 @@ const ProviderModelPicker = memo(function ProviderModelPicker(props: {
className={cn(
"min-w-0 shrink-0 whitespace-nowrap px-2 text-muted-foreground/70 hover:text-foreground/80",
props.compact ? "max-w-[10.5rem]" : "sm:px-3",
- )}
+ )}max-w-36
disabled={props.disabled}
/>
}
diff --git a/apps/web/src/components/PlanSidebar.tsx b/apps/web/src/components/PlanSidebar.tsx
index 5ab2f5e32..b2a9744f0 100644
--- a/apps/web/src/components/PlanSidebar.tsx
+++ b/apps/web/src/components/PlanSidebar.tsx
@@ -20,6 +20,7 @@ import {
buildProposedPlanMarkdownFilename,
normalizePlanMarkdownForExport,
downloadPlanAsTextFile,
+ stripDisplayedPlanMarkdown,
} from "../proposedPlan";
import { Menu, MenuItem, MenuPopup, MenuTrigger } from "./ui/menu";
import { readNativeApi } from "~/nativeApi";
@@ -67,6 +68,7 @@ const PlanSidebar = memo(function PlanSidebar({
const [copied, setCopied] = useState(false);
const planMarkdown = activeProposedPlan?.planMarkdown ?? null;
+ const displayedPlanMarkdown = planMarkdown ? stripDisplayedPlanMarkdown(planMarkdown) : null;
const planTitle = planMarkdown ? proposedPlanTitle(planMarkdown) : null;
const handleCopyPlan = useCallback(() => {
@@ -237,7 +239,7 @@ const PlanSidebar = memo(function PlanSidebar({
{proposedPlanExpanded ? (
<div className="rounded-lg border border-border/50 bg-background/50 p-3">
<ChatMarkdown
- text={planMarkdown}
+ text={displayedPlanMarkdown ?? ""}
cwd={markdownCwd}
isStreaming={false}
/>
diff --git a/apps/web/src/proposedPlan.test.ts b/apps/web/src/proposedPlan.test.ts
index b8431bdbc..e5e917bd4 100644
--- a/apps/web/src/proposedPlan.test.ts
+++ b/apps/web/src/proposedPlan.test.ts
@@ -1,11 +1,13 @@
import { describe, expect, it } from "vitest";
import {
+ buildCollapsedProposedPlanPreviewMarkdown,
buildPlanImplementationThreadTitle,
buildPlanImplementationPrompt,
buildProposedPlanMarkdownFilename,
proposedPlanTitle,
resolvePlanFollowUpSubmission,
+ stripDisplayedPlanMarkdown,
} from "./proposedPlan";
describe("proposedPlanTitle", () => {
@@ -26,6 +28,38 @@ describe("buildPlanImplementationPrompt", () => {
});
});
+describe("buildCollapsedProposedPlanPreviewMarkdown", () => {
+ it("drops the redundant title heading and preserves the following markdown lines", () => {
+ expect(
+ buildCollapsedProposedPlanPreviewMarkdown("# Integrate RPC\n\n## Summary\n\n- step 1\n- step 2", {
+ maxLines: 4,
+ }),
+ ).toBe("- step 1\n- step 2");
+ });
+
+ it("appends an overflow marker when the preview truncates remaining content", () => {
+ expect(
+ buildCollapsedProposedPlanPreviewMarkdown("# Integrate RPC\n\n- step 1\n- step 2\n- step 3", {
+ maxLines: 2,
+ }),
+ ).toBe("- step 1\n- step 2\n\n...");
+ });
+});
+
+describe("stripDisplayedPlanMarkdown", () => {
+ it("drops the leading title heading from displayed plan markdown", () => {
+ expect(stripDisplayedPlanMarkdown("# Integrate RPC\n\n## Summary\n\n- step 1\n")).toBe(
+ "- step 1",
+ );
+ });
+
+ it("preserves non-summary headings after dropping the title heading", () => {
+ expect(stripDisplayedPlanMarkdown("# Integrate RPC\n\n## Scope\n\n- step 1\n")).toBe(
+ "## Scope\n\n- step 1",
+ );
+ });
+});
+
describe("resolvePlanFollowUpSubmission", () => {
it("switches to default mode when implementing the ready plan without extra text", () => {
expect(
diff --git a/apps/web/src/proposedPlan.ts b/apps/web/src/proposedPlan.ts
index 3bd4f62e6..8a5f18b6f 100644
--- a/apps/web/src/proposedPlan.ts
+++ b/apps/web/src/proposedPlan.ts
@@ -3,6 +3,65 @@ export function proposedPlanTitle(planMarkdown: string): string | null {
return heading && heading.length > 0 ? heading : null;
}
+export function stripDisplayedPlanMarkdown(planMarkdown: string): string {
+ const lines = planMarkdown.trimEnd().split(/\r?\n/);
+ const sourceLines =
+ lines[0] && /^\s{0,3}#{1,6}\s+/.test(lines[0]) ? lines.slice(1) : [...lines];
+ while (sourceLines[0]?.trim().length === 0) {
+ sourceLines.shift();
+ }
+ const firstHeadingMatch = sourceLines[0]?.match(/^\s{0,3}#{1,6}\s+(.+)$/);
+ if (firstHeadingMatch?.[1]?.trim().toLowerCase() === "summary") {
+ sourceLines.shift();
+ while (sourceLines[0]?.trim().length === 0) {
+ sourceLines.shift();
+ }
+ }
+ return sourceLines.join("\n");
+}
+
+export function buildCollapsedProposedPlanPreviewMarkdown(
+ planMarkdown: string,
+ options?: {
+ maxLines?: number;
+ },
+): string {
+ const maxLines = options?.maxLines ?? 8;
+ const lines = stripDisplayedPlanMarkdown(planMarkdown)
+ .trimEnd()
+ .split(/\r?\n/)
+ .map((line) => line.trimEnd());
+ const previewLines: string[] = [];
+ let visibleLineCount = 0;
+ let hasMoreContent = false;
+
+ for (const line of lines) {
+ const isVisibleLine = line.trim().length > 0;
+ if (isVisibleLine && visibleLineCount >= maxLines) {
+ hasMoreContent = true;
+ break;
+ }
+ previewLines.push(line);
+ if (isVisibleLine) {
+ visibleLineCount += 1;
+ }
+ }
+
+ while (previewLines.length > 0 && previewLines.at(-1)?.trim().length === 0) {
+ previewLines.pop();
+ }
+
+ if (previewLines.length === 0) {
+ return proposedPlanTitle(planMarkdown) ?? "Plan preview unavailable.";
+ }
+
+ if (hasMoreContent) {
+ previewLines.push("", "...");
+ }
+
+ return previewLines.join("\n");
+}
+
function sanitizePlanFileSegment(input: string): string {
const sanitized = input
.toLowerCase()