Merge branch 'improve-plan-mode'

Author: qorzj

packages/cli/src/cli-args.ts

@@ -47,6 +47,7 @@ const EPILOG = [
   "Inside the TUI:",
   "  enter            Send the prompt",
   "  shift+enter      Insert a newline",
+  "  shift+tab        Cycle Plan Mode for the next submitted prompt",
   "  home/end         Move within the current line",
   "  alt+left/right   Move by word",
   "  ctrl+w           Delete the previous word",
@@ -56,6 +57,7 @@ const EPILOG = [
   "  /                Open the skills/commands menu",
   "  /skills          List available skills",
   "  /model           Select model, thinking mode and effort control",
+  "  /plan            Switch the input to Plan Mode",
   "  /new             Start a fresh conversation",
   "  /init            Initialize an AGENTS.md file with instructions for LLM",
   "  /resume          Pick a previous conversation to continue",

packages/cli/src/tests/prompt-input-keys.test.ts

@@ -22,6 +22,9 @@ import {
   renderBufferWithCursor,
   buildInitPromptSubmission,
   buildPromptDraftFromSessionMessage,
+  extractProposedPlan,
+  getImplementationPrompt,
+  getPlanImplementationChoice,
   disableTerminalExtendedKeys,
   enableTerminalExtendedKeys,
   EMPTY_BUFFER,
@@ -140,6 +143,28 @@ test("parseTerminalInput recognizes shifted return sequences", () => {
   assert.equal(key.meta, false);
 });
 
+test("parseTerminalInput recognizes shift+tab for Plan Mode cycling", () => {
+  const { input, key } = parseTerminalInput("\u001B[Z");
+  assert.equal(input, "");
+  assert.equal(key.tab, true);
+  assert.equal(key.shift, true);
+});
+
+test("extractProposedPlan only returns a complete non-empty plan", () => {
+  assert.equal(extractProposedPlan("<proposed_plan>\nPlan\n</proposed_plan>"), "Plan");
+  assert.equal(extractProposedPlan("<proposed_plan>Plan"), null);
+  assert.equal(extractProposedPlan("<proposed_plan>\n</proposed_plan>"), null);
+});
+
+test("getImplementationPrompt uses Chinese only above five full-width punctuation marks", () => {
+  assert.equal(getImplementationPrompt("，、；。；"), "Implement the plan.");
+  assert.equal(getImplementationPrompt("，、；。；。"), "实现此方案。");
+});
+
+test("getPlanImplementationChoice treats escape as staying in Plan Mode", () => {
+  assert.equal(getPlanImplementationChoice("", { escape: true, return: false }, 0), "stay");
+});
+
 test("prompt return key action submits on plain enter", () => {
   const { key } = parseTerminalInput("\r");
   assert.equal(getPromptReturnKeyAction(key), "submit");

packages/cli/src/tests/slash-commands.test.ts

@@ -22,6 +22,7 @@ test("buildSlashCommands prefixes skills before built-ins", () => {
   assert.deepEqual(builtinNames, [
     "skills",
     "model",
+    "plan",
     "new",
     "init",
     "resume",
@@ -98,6 +99,13 @@ test("findExactSlashCommand returns built-in /model", () => {
   assert.equal(item?.kind, "model");
 });
 
+test("findExactSlashCommand returns built-in /plan", () => {
+  const items = buildSlashCommands(skills);
+  const item = findExactSlashCommand(items, "/plan");
+  assert.ok(item);
+  assert.equal(item?.kind, "plan");
+});
+
 test("findExactSlashCommand returns built-in /raw", () => {
   const items = buildSlashCommands(skills);
   const item = findExactSlashCommand(items, "/raw");

packages/cli/src/ui/core/slash-commands.ts

@@ -4,6 +4,7 @@ export type SlashCommandKind =
   | "skill"
   | "skills"
   | "model"
+  | "plan"
   | "new"
   | "init"
   | "resume"
@@ -35,6 +36,12 @@ export const BUILTIN_SLASH_COMMANDS: SlashCommandItem[] = [
     label: "/model",
     description: "Select model, thinking mode and effort control",
   },
+  {
+    kind: "plan",
+    name: "plan",
+    label: "/plan",
+    description: "Switch the input to Plan Mode",
+  },
   {
     kind: "new",
     name: "new",

packages/cli/src/ui/index.ts

@@ -15,6 +15,12 @@ export {
 } from "./hooks/cursor";
 export { default as AppContainer } from "./views/AppContainer";
 export { AskUserQuestionPrompt } from "./views/AskUserQuestionPrompt";
+export {
+  PlanImplementationPrompt,
+  extractProposedPlan,
+  getImplementationPrompt,
+  getPlanImplementationChoice,
+} from "./views/PlanImplementationPrompt";
 export { MessageView } from "./components";
 export { parseDiffPreview } from "./components/MessageView/utils";
 export {

packages/cli/src/ui/views/App.tsx

@@ -20,6 +20,7 @@ import {
   formatAskUserQuestionAnswers,
 } from "../core/ask-user-question";
 import { PermissionPrompt, type PermissionPromptResult } from "./PermissionPrompt";
+import { PlanImplementationPrompt, extractProposedPlan, getImplementationPrompt } from "./PlanImplementationPrompt";
 import { buildExitSummaryText, buildResumeHintText } from "../exit-summary";
 import { RawMode, useRawModeContext } from "../contexts";
 import { renderMessageToStdout } from "../components/MessageView/utils";
@@ -133,6 +134,8 @@ function App({ projectRoot, initialPrompt, resumeSessionId, onRestart }: AppProp
   const [nowTick, setNowTick] = useState(0);
   const [mcpStatuses, setMcpStatuses] = useState<ReturnType<typeof sessionManager.getMcpStatus>>([]);
   const [showProcessStdout, setShowProcessStdout] = useState(false);
+  const [planMode, setPlanMode] = useState(false);
+  const [pendingPlanImplementation, setPendingPlanImplementation] = useState<string | null>(null);
 
   rawModeRef.current = mode;
   messagesRef.current = messages;
@@ -253,6 +256,8 @@ function App({ projectRoot, initialPrompt, resumeSessionId, onRestart }: AppProp
     setActiveStatus(null);
     setActiveAskPermissions(undefined);
     setPendingPermissionReply(null);
+    setPlanMode(false);
+    setPendingPlanImplementation(null);
     setDismissedQuestionIds(new Set());
     await resetStaticView([]);
     await refreshSkills();
@@ -369,6 +374,7 @@ function App({ projectRoot, initialPrompt, resumeSessionId, onRestart }: AppProp
           submission.selectedSkills && submission.selectedSkills.length > 0 ? submission.selectedSkills : undefined,
         permissions: submission.permissions,
         alwaysAllows: submission.alwaysAllows,
+        planMode: submission.planMode ?? planMode,
       };
       const activeSessionId = sessionManager.getActiveSessionId();
       const permissionReply =
@@ -404,6 +410,12 @@ function App({ projectRoot, initialPrompt, resumeSessionId, onRestart }: AppProp
         }
         await refreshSkills();
         refreshSessionsList();
+        const completedSession = sessionManager.getSession(sessionManager.getActiveSessionId() ?? "");
+        const proposedPlan =
+          prompt.planMode && completedSession?.status === "completed"
+            ? extractProposedPlan(completedSession.assistantReply)
+            : null;
+        setPendingPlanImplementation(proposedPlan);
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
         setErrorLine(message);
@@ -425,6 +437,7 @@ function App({ projectRoot, initialPrompt, resumeSessionId, onRestart }: AppProp
       refreshSessionsList,
       navigateToSubView,
       resetToWelcome,
+      planMode,
     ]
   );
 
@@ -496,6 +509,25 @@ function App({ projectRoot, initialPrompt, resumeSessionId, onRestart }: AppProp
     [handlePrompt]
   );
 
+  const handlePlanImplementationChoice = useCallback(
+    (choice: "implement" | "stay" | "default") => {
+      const proposedPlan = pendingPlanImplementation;
+      setPendingPlanImplementation(null);
+      if (choice === "stay") {
+        return;
+      }
+      setPlanMode(false);
+      if (choice === "implement" && proposedPlan) {
+        handleSubmit({
+          text: getImplementationPrompt(proposedPlan),
+          imageUrls: [],
+          planMode: false,
+        });
+      }
+    },
+    [handleSubmit, pendingPlanImplementation]
+  );
+
   const handleExitShortcut = useCallback(() => {
     handleExit({ showCommand: false, showSummary: false });
   }, [handleExit]);
@@ -517,6 +549,8 @@ function App({ projectRoot, initialPrompt, resumeSessionId, onRestart }: AppProp
       setRunningProcesses(session?.processes ?? null);
       setActiveStatus(session?.status ?? null);
       setActiveAskPermissions(session?.askPermissions);
+      setPlanMode(session?.planMode === true);
+      setPendingPlanImplementation(null);
       if (pendingPermissionReply && pendingPermissionReply.sessionId !== sessionId) {
         setPendingPermissionReply(null);
       }
@@ -965,6 +999,8 @@ function App({ projectRoot, initialPrompt, resumeSessionId, onRestart }: AppProp
           onSubmit={handlePermissionResult}
           onCancel={handlePermissionCancel}
         />
+      ) : pendingPlanImplementation && !busy ? (
+        <PlanImplementationPrompt onSelect={handlePlanImplementationChoice} />
       ) : isExiting ? null : (
         <PromptInput
           projectRoot={projectRoot}
@@ -986,6 +1022,8 @@ function App({ projectRoot, initialPrompt, resumeSessionId, onRestart }: AppProp
           placeholder="Type your message..."
           statusLineSegments={statusLineSegments}
           statusLineSeparator={resolvedSettings.statusline.separator}
+          planMode={planMode}
+          onPlanModeChange={setPlanMode}
         />
       )}
     </Box>

packages/cli/src/ui/views/PlanImplementationPrompt.tsx

@@ -0,0 +1,88 @@
+import React, { useEffect, useState } from "react";
+import { Box, Text } from "ink";
+import { useTerminalInput } from "../hooks";
+import type { InputKey } from "../hooks";
+
+type PlanImplementationChoice = "implement" | "stay" | "default";
+
+type Props = {
+  onSelect: (choice: PlanImplementationChoice) => void;
+};
+
+const CHOICES: Array<{ value: PlanImplementationChoice; label: string }> = [
+  { value: "implement", label: "implement this plan" },
+  { value: "stay", label: "stay in Plan mode" },
+  { value: "default", label: "switch to Default mode" },
+];
+
+/** Return only a complete proposed plan, so historical or partial tags cannot trigger the chooser. */
+export function extractProposedPlan(reply: string | null): string | null {
+  if (!reply) {
+    return null;
+  }
+  const match = reply.match(/<proposed_plan>\s*([\s\S]*?\S[\s\S]*?)\s*<\/proposed_plan>/);
+  return match?.[1] ?? null;
+}
+
+export function getImplementationPrompt(plan: string): string {
+  const fullWidthPunctuationCount = (plan.match(/[，、；。]/g) ?? []).length;
+  return fullWidthPunctuationCount > 5 ? "实现此方案。" : "Implement the plan.";
+}
+
+export function getPlanImplementationChoice(
+  input: string,
+  key: Pick<InputKey, "escape" | "return">,
+  cursor: number
+): PlanImplementationChoice | null {
+  if (key.escape) {
+    return "stay";
+  }
+  if (input && /^[1-3]$/.test(input)) {
+    return CHOICES[Number(input) - 1]!.value;
+  }
+  return key.return ? CHOICES[cursor]!.value : null;
+}
+
+export function PlanImplementationPrompt({ onSelect }: Props): React.ReactElement {
+  const [cursor, setCursor] = useState(0);
+
+  useEffect(() => {
+    setCursor(0);
+  }, []);
+
+  useTerminalInput((input, key) => {
+    const choice = getPlanImplementationChoice(input, key, cursor);
+    if (choice) {
+      onSelect(choice);
+      return;
+    }
+    if (key.upArrow) {
+      setCursor((value) => Math.max(0, value - 1));
+      return;
+    }
+    if (key.downArrow) {
+      setCursor((value) => Math.min(CHOICES.length - 1, value + 1));
+      return;
+    }
+  });
+
+  return (
+    <Box flexDirection="column" borderStyle="round" borderColor="yellow" paddingX={1} marginY={1}>
+      <Text color="yellow" bold>
+        Plan ready
+      </Text>
+      <Text dimColor>Choose what to do next:</Text>
+      <Box flexDirection="column" marginTop={1}>
+        {CHOICES.map((choice, index) => (
+          <Text key={choice.value} color={index === cursor ? "cyanBright" : undefined}>
+            {index === cursor ? "> " : "  "}
+            {index + 1}. {choice.label}
+          </Text>
+        ))}
+      </Box>
+      <Box marginTop={1}>
+        <Text dimColor>1-3 select · ↑/↓ move · Enter select</Text>
+      </Box>
+    </Box>
+  );
+}

packages/cli/src/ui/views/PromptInput.tsx

@@ -72,6 +72,7 @@ export type PromptSubmission = {
   selectedSkills?: SkillInfo[];
   permissions?: UserToolPermission[];
   alwaysAllows?: PermissionScope[];
+  planMode?: boolean;
   command?: "new" | "resume" | "continue" | "undo" | "mcp" | "exit";
 };
 
@@ -96,9 +97,11 @@ type Props = {
   promptDraft?: PromptDraft | null;
   statusLineSegments?: StatusSegment[];
   statusLineSeparator?: string;
+  planMode: boolean;
   onSubmit: (submission: PromptSubmission) => void;
   onModelConfigChange: (selection: ModelConfigSelection) => string | Promise<string>;
   onRawModeChange?: (mode: string) => void;
+  onPlanModeChange: (enabled: boolean) => void;
   onInterrupt: () => void;
   onToggleProcessStdout?: () => void;
   onExitShortcut?: () => void;
@@ -129,12 +132,14 @@ export const PromptInput = React.memo(function PromptInput({
   promptDraft,
   statusLineSegments,
   statusLineSeparator,
+  planMode,
   onSubmit,
   onModelConfigChange,
   onInterrupt,
   onToggleProcessStdout,
   onExitShortcut,
   onRawModeChange,
+  onPlanModeChange,
 }: Props): React.ReactElement {
   const { stdout } = useStdout();
   const inputTextRef = useRef<DOMElement | null>(null);
@@ -226,9 +231,10 @@ export const PromptInput = React.memo(function PromptInput({
         screenWidth,
         cursorLayoutKey ?? "default",
         imageUrls.length,
+        planMode ? "plan-mode" : "default-mode",
         selectedSkills.map((skill) => skill.name).join("\u001F"),
       ].join("\u001E"),
-    [cursorLayoutKey, imageUrls.length, screenWidth, selectedSkills]
+    [cursorLayoutKey, imageUrls.length, planMode, screenWidth, selectedSkills]
   );
   useTerminalFocusReporting(stdout, !disabled);
   useTerminalExtendedKeys(stdout, !disabled);
@@ -429,6 +435,11 @@ export const PromptInput = React.memo(function PromptInput({
       const returnAction = getPromptReturnKeyAction(key);
       const isPlainReturn = returnAction === "submit";
 
+      if (key.shift && key.tab) {
+        onPlanModeChange(!planMode);
+        return;
+      }
+
       if (showFileMentionMenu) {
         if (key.upArrow || key.downArrow || key.tab || returnAction === "submit") {
           return;
@@ -678,6 +689,11 @@ export const PromptInput = React.memo(function PromptInput({
       setShowModelDropdown(true);
       return;
     }
+    if (item.kind === "plan") {
+      clearSlashToken();
+      onPlanModeChange(true);
+      return;
+    }
     if (item.kind === "raw") {
       clearSlashToken();
       setOpenRawModelDropdown(true);
@@ -744,6 +760,7 @@ export const PromptInput = React.memo(function PromptInput({
       text: expandPasteMarkers(buffer.text, pastesRef.current),
       imageUrls,
       selectedSkills,
+      planMode,
     });
     resetPromptInput();
   }
@@ -781,6 +798,12 @@ export const PromptInput = React.memo(function PromptInput({
           <Text dimColor> (use /skills to edit)</Text>
         </Box>
       ) : null}
+      {planMode ? (
+        <Box width={screenWidth} justifyContent="flex-end">
+          <Text color="yellow">💡 Plan mode</Text>
+          <Text dimColor> (shift+tab to cycle)</Text>
+        </Box>
+      ) : null}
       {/* Input */}
       <Box
         width={screenWidth}