fix: show model save scope selector only on confirmation page

Author: qorzj

packages/cli/src/tests/models-dropdown.test.ts

@@ -64,7 +64,7 @@ test("model dropdown offers all reasoning effort levels", () => {
   assert.equal(getThinkingOptionIndex({ thinkingEnabled: true, reasoningEffort: "low" }), 2);
 });
 
-test("model scope selector is gray, retains the model cursor and carries the destination to thinking confirmation", async (t) => {
+test("model scope selector is only active on thinking confirmation and retains the thinking cursor", async (t) => {
   const inkRequire = createRequire(createRequire(import.meta.url).resolve("ink"));
   const { default: chalk } = await import(pathToFileURL(inkRequire.resolve("chalk")).href);
   const level = chalk.level;
@@ -73,29 +73,38 @@ test("model scope selector is gray, retains the model cursor and carries the des
     chalk.level = level;
   });
   const h = await editor(t, true);
+  assert.doesNotMatch(h.frame(), /Remember this choice|All Projects|This Project/);
+  await h.send(DOWN);
+  await h.send(LEFT); // Scope cannot change while hidden.
+  assert.match(h.frame(), /> ○ deepseek-v4-pro/);
+  assert.deepEqual(h.saves, []);
+  await h.send(ENTER);
+  assert.match(h.frame(), /Select Thinking Mode/);
   assert.match(h.frame(), /All Projects +\[This Project\]/);
   assert.match(h.rawFrame(), /\u001b\[90mRemember this choice for {2}\(←→ to switch\)/);
-  assert.ok(h.frame().indexOf("Remember this choice") < h.frame().indexOf("Space/Enter select model"));
+  assert.ok(h.frame().indexOf("Remember this choice") < h.frame().indexOf("Space/Enter apply"));
   await h.send(DOWN);
   await h.send(LEFT);
   assert.match(h.frame(), /\[All Projects\] +This Project/);
-  assert.match(h.frame(), /> ○ deepseek-v4-pro/);
+  assert.match(h.frame(), /> ○ Thinking mode \[low\]/);
+  await h.send(RIGHT);
+  assert.match(h.frame(), /All Projects +\[This Project\]/);
+  assert.match(h.frame(), /> ○ Thinking mode \[low\]/);
+  await h.send(LEFT);
   await h.send(LEFT);
   assert.match(h.frame(), /\[All Projects\]/);
   assert.deepEqual(h.saves, []);
   await h.send(ENTER);
-  assert.match(h.frame(), /Select Thinking Mode/);
-  assert.doesNotMatch(h.frame(), /Remember this choice/);
-  await h.send(RIGHT); // Scope cannot change while hidden.
-  await h.send(DOWN);
-  await h.send(ENTER);
   assert.deepEqual(h.saves, [
     { selection: { model: "deepseek-v4-pro", thinkingEnabled: true, reasoningEffort: "low" }, target: "user" },
   ]);
 });
 
 test("missing project settings default to all projects and cancellation saves nothing", async (t) => {
   const h = await editor(t, false, 36);
+  assert.doesNotMatch(h.frame(), /Remember this choice|All Projects|This Project/);
+  await h.send(RIGHT); // Scope cannot change while hidden.
+  await h.send(ENTER);
   assert.match(h.frame(), /\[All Projects\] +This Project/);
   // The shared scope control must fit inside the narrow dialog.
   const scopeLines = h
@@ -112,8 +121,8 @@ test("missing project settings default to all projects and cancellation saves no
 
 test("reopening recomputes the default destination and thinking cancellation does not save", async (t) => {
   const h = await editor(t);
-  await h.send(RIGHT);
   await h.send(ENTER);
+  await h.send(RIGHT);
   await h.send(ESC);
   assert.deepEqual(h.saves, []);
   h.rerender(React.createElement(Text, null, "closed"));
@@ -122,8 +131,9 @@ test("reopening recomputes the default destination and thinking cancellation doe
   fs.writeFileSync(h.projectFile, "{}");
   h.rerender(React.createElement(h.Probe));
   await h.send("");
-  assert.match(h.frame(), /All Projects +\[This Project\]/);
+  assert.doesNotMatch(h.frame(), /Remember this choice|All Projects|This Project/);
   await h.send(ENTER);
+  assert.match(h.frame(), /All Projects +\[This Project\]/);
   await h.send(ENTER);
   assert.deepEqual(h.saves, [{ selection: current, target: "project" }]);
 });

packages/cli/src/tests/permissions-dropdown.test.ts

@@ -69,14 +69,17 @@ test("default mode returns home with a draft and saves only from home", async (t
   assert.match(h.frame(), /> defaultMode +askAll/);
   assert.match(h.frame(), /scopes +│/);
   assert.match(h.frame(), /Save +│/);
+  assert.match(h.frame(), /Remember this choice/);
   assert.doesNotMatch(h.frame(), /Tab/);
   await h.send(ENTER);
+  assert.doesNotMatch(h.frame(), /Remember this choice/);
   assert.match(h.frame(), /> ● askAll/);
   assert.match(h.frame(), /askAll +│/);
   assert.match(h.frame(), /allowAll +│/);
   await h.send(DOWN);
   await h.send(" ");
   assert.match(h.frame(), /Permissions · User/);
+  assert.match(h.frame(), /Remember this choice/);
   assert.match(h.frame(), /> defaultMode +allowAll/);
   assert.deepEqual(h.saves, []);
   assert.equal(h.closed(), 0);
@@ -95,7 +98,9 @@ test("scope edits accumulate, preserve list position and save only after Save",
   await h.send(DOWN);
   await h.send(ENTER);
   assert.doesNotMatch(h.frame(), /Save/);
+  assert.doesNotMatch(h.frame(), /Remember this choice/);
   await h.send(ENTER);
+  assert.doesNotMatch(h.frame(), /Remember this choice/);
   assert.match(h.frame(), /> ● default/);
   await h.send(DOWN); // wrap from default to allow
   await h.send(ENTER);
@@ -108,6 +113,7 @@ test("scope edits accumulate, preserve list position and save only after Save",
   assert.match(h.frame(), /> read-in-tmp/);
   assert.deepEqual(h.saves, []);
   await h.send(ESC); // home retains the draft
+  assert.match(h.frame(), /Remember this choice/);
   await h.send(DOWN);
   assert.match(h.frame(), /> Save/);
   await h.send(ENTER);
@@ -448,10 +454,11 @@ test("slash command opens the editor, persists settings, and isolates menu keys
   assert.equal(planModeChanges, 0);
   await h.send("/model");
   await h.send(ENTER);
+  assert.doesNotMatch(h.frame(), /Remember this choice|All Projects|This Project/);
+  await h.send(ENTER);
   assert.match(h.frame(), /All Projects +\[This Project\]/);
   await h.send(LEFT);
   await h.send(ENTER);
-  await h.send(ENTER);
   assert.deepEqual(modelSaves, [
     { selection: { model: "deepseek-flash", thinkingEnabled: false, reasoningEffort: "high" }, target: "user" },
   ]);

packages/cli/src/tests/settings-file.test.ts

@@ -59,9 +59,10 @@ for (const hasProject of [true, false]) {
     assert.match(h.frame(), /deepseek-v4-pro/);
     await h.send("/model");
     await h.send("\r");
-    assert.match(h.frame(), hasProject ? /All Projects +\[This Project\]/ : /\[All Projects\] +This Project/);
+    assert.doesNotMatch(h.frame(), /Remember this choice|All Projects|This Project/);
     await h.send("\u001b[A"); // Select the preceding model (deepseek-flash).
     await h.send("\r");
+    assert.match(h.frame(), hasProject ? /All Projects +\[This Project\]/ : /\[All Projects\] +This Project/);
     await h.send("\r");
     const targetFile = hasProject ? projectFile : userFile;
     assert.equal(JSON.parse(fs.readFileSync(targetFile, "utf8")).model, "deepseek-flash");

packages/cli/src/ui/components/ModelsDropdown/index.tsx

@@ -126,7 +126,7 @@ const ModelsDropdown: React.FC<Props> = ({
 
       const optionCount = step === "model" ? MODEL_COMMAND_MODELS.length : MODEL_COMMAND_THINKING_OPTIONS.length;
 
-      if (step === "model" && !key.ctrl && !key.meta && !key.shift && (key.leftArrow || key.rightArrow)) {
+      if (step === "thinking" && !key.ctrl && !key.meta && !key.shift && (key.leftArrow || key.rightArrow)) {
         setTarget(key.leftArrow ? "user" : "project");
         return;
       }
@@ -178,7 +178,7 @@ const ModelsDropdown: React.FC<Props> = ({
       activeIndex={activeIndex}
       activeColor="#229ac3"
       maxVisible={6}
-      footer={step === "model" ? <SaveScopeSelector target={target} /> : undefined}
+      footer={step === "thinking" ? <SaveScopeSelector target={target} /> : undefined}
     />
   );
 };