) : null}
@@ -5609,7 +5627,7 @@ const ProviderModelPicker = memo(function ProviderModelPicker(props: {
variant="ghost"
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",
+ props.compact ? "max-w-42" : "sm:px-3",
)}
disabled={props.disabled}
/>
@@ -5618,7 +5636,7 @@ const ProviderModelPicker = memo(function ProviderModelPicker(props: {
diff --git a/apps/web/src/components/PlanSidebar.tsx b/apps/web/src/components/PlanSidebar.tsx
index 5ab2f5e32c..b2a9744f07 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 ? (
diff --git a/apps/web/src/proposedPlan.test.ts b/apps/web/src/proposedPlan.test.ts
index b8431bdbcc..e5e917bd4c 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 3bd4f62e60..8a5f18b6f0 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()