Commit 010ba70561cff75af0188213e87f8c418b0c3b81 | the-knife

author	Julius Marminge <julius0216@outlook.com> 2026-03-05 23:00:32-08:00
committer	Julius Marminge <jmarminge@gmail.com> 2026-03-05 23:00:41-08:00
log	010ba70561cff75af0188213e87f8c418b0c3b81
tree	d80e0ae417b2bda10b884561b72deb68b4de3256
parent	6ee057e25bd4f4dad85445571ffb0cc1ce3c6980

Fix plan follow-up mode switching and submission text

- Extract follow-up submission resolution into `resolvePlanFollowUpSubmission`
- Send implementation prompt in default mode when follow-up text is empty
- Keep composer mode toggle synced when starting same-thread implementation turns
- Add tests for follow-up submission behavior

3 files changed, 60 insertions(+), 7 deletions(-)

apps
- web
  - src
    components
    ChatView.tsx
    proposedPlan.test.ts
    proposedPlan.ts

apps/web/src/components/ChatView.tsx+12-7

 @@ -92,6 +92,7 @@ import {
   buildPlanImplementationPrompt,
   buildProposedPlanMarkdownFilename,
   proposedPlanTitle,
+  resolvePlanFollowUpSubmission,
 } from "../proposedPlan";
 import { truncateTitle } from "../truncateTitle";
 import {
 @@ -2318,19 +2319,18 @@ export default function ChatView({ threadId }: ChatViewProps) {
     }
     const trimmed = prompt.trim();
     if (showPlanFollowUpPrompt && activeProposedPlan) {
-      const followUpText =
+      const followUp = resolvePlanFollowUpSubmission({
-        trimmed.length > 0
+        draftText: trimmed,
-          ? trimmed
+        planMarkdown: activeProposedPlan.planMarkdown,
-          : buildPlanImplementationPrompt(activeProposedPlan.planMarkdown);
+      });
-      const nextInteractionMode = trimmed.length > 0 ? "plan" : "default";
       promptRef.current = "";
       clearComposerDraftContent(activeThread.id);
       setComposerHighlightedItemId(null);
       setComposerCursor(0);
       setComposerTrigger(null);
       await onSubmitPlanFollowUp({
-        text: followUpText,
+        text: followUp.text,
-        interactionMode: nextInteractionMode,
+        interactionMode: followUp.interactionMode,
       });
       return;
     }
 @@ -2795,6 +2795,10 @@ export default function ChatView({ threadId }: ChatViewProps) {
           interactionMode: nextInteractionMode,
         });
+        // Keep the mode toggle and plan-follow-up banner in sync immediately
+        // while the same-thread implementation turn is starting.
+        setComposerDraftInteractionMode(threadIdForSend, nextInteractionMode);
         await api.orchestration.dispatchCommand({
           type: "thread.turn.start",
           commandId: newCommandId(),
 @@ -2840,6 +2844,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
       selectedModel,
       selectedModelOptionsForDispatch,
       selectedProvider,
+      setComposerDraftInteractionMode,
       setThreadError,
       settings.enableAssistantStreaming,
     ],

apps/web/src/proposedPlan.test.ts+27

...	@@ -5,6 +5,7 @@ import {	...	@@ -5,6 +5,7 @@ import {
5	buildPlanImplementationPrompt,	5	buildPlanImplementationPrompt,
6	buildProposedPlanMarkdownFilename,	6	buildProposedPlanMarkdownFilename,
7	proposedPlanTitle,	7	proposedPlanTitle,
		8	resolvePlanFollowUpSubmission,
8	} from "./proposedPlan";	9	} from "./proposedPlan";
9		10
10	describe("proposedPlanTitle", () => {	11	describe("proposedPlanTitle", () => {
...	@@ -25,6 +26,32 @@ describe("buildPlanImplementationPrompt", () => {	...	@@ -25,6 +26,32 @@ describe("buildPlanImplementationPrompt", () => {
25	});	26	});
26	});	27	});
27		28
		29	describe("resolvePlanFollowUpSubmission", () => {
		30	it("switches to default mode when implementing the ready plan without extra text", () => {
		31	expect(
		32	resolvePlanFollowUpSubmission({
		33	draftText: " ",
		34	planMarkdown: "## Ship it\n\n- step 1\n",
		35	}),
		36	).toEqual({
		37	text: "PLEASE IMPLEMENT THIS PLAN:\n## Ship it\n\n- step 1",
		38	interactionMode: "default",
		39	});
		40	});
		41
		42	it("stays in plan mode when the user adds a follow-up prompt", () => {
		43	expect(
		44	resolvePlanFollowUpSubmission({
		45	draftText: "Refine step 2 first",
		46	planMarkdown: "## Ship it\n\n- step 1\n",
		47	}),
		48	).toEqual({
		49	text: "Refine step 2 first",
		50	interactionMode: "plan",
		51	});
		52	});
		53	});
		54
28	describe("buildPlanImplementationThreadTitle", () => {	55	describe("buildPlanImplementationThreadTitle", () => {
29	it("uses the plan heading when building the implementation thread title", () => {	56	it("uses the plan heading when building the implementation thread title", () => {
30	expect(buildPlanImplementationThreadTitle("# Integrate RPC\n\nBody")).toBe(	57	expect(buildPlanImplementationThreadTitle("# Integrate RPC\n\nBody")).toBe(

apps/web/src/proposedPlan.ts+21

...	@@ -16,6 +16,27 @@ export function buildPlanImplementationPrompt(planMarkdown: string): string {	...	@@ -16,6 +16,27 @@ export function buildPlanImplementationPrompt(planMarkdown: string): string {
16	return `PLEASE IMPLEMENT THIS PLAN:\n${planMarkdown.trim()}`;	16	return `PLEASE IMPLEMENT THIS PLAN:\n${planMarkdown.trim()}`;
17	}	17	}
18		18
		19	export function resolvePlanFollowUpSubmission(input: {
		20	draftText: string;
		21	planMarkdown: string;
		22	}): {
		23	text: string;
		24	interactionMode: "default" \| "plan";
		25	} {
		26	const trimmedDraftText = input.draftText.trim();
		27	if (trimmedDraftText.length > 0) {
		28	return {
		29	text: trimmedDraftText,
		30	interactionMode: "plan",
		31	};
		32	}
		33
		34	return {
		35	text: buildPlanImplementationPrompt(input.planMarkdown),
		36	interactionMode: "default",
		37	};
		38	}
		39
19	export function buildPlanImplementationThreadTitle(planMarkdown: string): string {	40	export function buildPlanImplementationThreadTitle(planMarkdown: string): string {
20	const title = proposedPlanTitle(planMarkdown);	41	const title = proposedPlanTitle(planMarkdown);
21	if (!title) {	42	if (!title) {