nolo-cli 0.69.0-alpha.1 → 0.69.0-alpha.2

package/{agentEmailCommands-LXGAJ3WU.js → agentEmailCommands-LVUZQHBF.js}

@@ -8,8 +8,8 @@ import {
 } from "./chunk-JYYZCK2Z.js";
 import {
   runAgentCreateCommand
-} from "./chunk-MNIB5JKP.js";
-import "./chunk-HFC7I2SI.js";
+} from "./chunk-36G25COQ.js";
+import "./chunk-Z3XXUE2E.js";
 import "./chunk-BNATE77Z.js";
 import "./chunk-EADNWBAZ.js";
 import "./chunk-HH65VA5U.js";

package/{agentMachineCommands-W35VHNJN.js → agentMachineCommands-XNIBG4L2.js}

@@ -89,7 +89,7 @@ async function defaultExecuteCli(provider, prompt, options) {
   return executeCli(provider, prompt, options);
 }
 async function forwardConnectorRunMessage(machine, message, pushMessage, executeCli, env, fetchImpl) {
-  const { handleConnectorRunMessage } = await import("./machineWsRunDispatch-5I4IU4FF.js");
+  const { handleConnectorRunMessage } = await import("./machineWsRunDispatch-RSVSJ4D7.js");
   return handleConnectorRunMessage(message, pushMessage, executeCli, env, fetchImpl);
 }
 async function detectLaunchableMachineInfo() {

package/{agentRecordCommands-JKA6W77W.js → agentRecordCommands-ID3URU2J.js}

@@ -2,8 +2,8 @@ import {
   runAgentCreateCommand,
   runAgentReadCommand,
   runAgentUpdateCommand
-} from "./chunk-MNIB5JKP.js";
-import "./chunk-HFC7I2SI.js";
+} from "./chunk-36G25COQ.js";
+import "./chunk-Z3XXUE2E.js";
 import "./chunk-BNATE77Z.js";
 import "./chunk-EADNWBAZ.js";
 import "./chunk-HH65VA5U.js";

package/{agentRunCommand-DFMXY5SI.js → agentRunCommand-KZMPUI53.js}

@@ -8,12 +8,12 @@ import {
   resolveRunSettlementNote,
   resolveWorkflowReference,
   runAgentRunCommand
-} from "./chunk-JFPBCEFP.js";
+} from "./chunk-JKAWV72Y.js";
 import "./chunk-S7Z2HMCN.js";
 import {
   parseAgentRunArgs
 } from "./chunk-JYYZCK2Z.js";
-import "./chunk-HFC7I2SI.js";
+import "./chunk-Z3XXUE2E.js";
 import "./chunk-BNATE77Z.js";
 import "./chunk-EADNWBAZ.js";
 import "./chunk-HH65VA5U.js";

package/{chunk-MNIB5JKP.js → chunk-36G25COQ.js}

@@ -1,6 +1,6 @@
 import {
   clearCliLocalRuntimePreparedAgentCache
-} from "./chunk-HFC7I2SI.js";
+} from "./chunk-Z3XXUE2E.js";
 import {
   getReadableCliDb
 } from "./chunk-RXX4GDIH.js";

package/{chunk-JFPBCEFP.js → chunk-JKAWV72Y.js}

@@ -27,7 +27,7 @@ import {
   resolveLocalUserId,
   t,
   toolLabel
-} from "./chunk-HFC7I2SI.js";
+} from "./chunk-Z3XXUE2E.js";
 import {
   createRunActivityTracker,
   popSingleQueueMessage,
@@ -1477,11 +1477,10 @@ function surfaceBackgroundSequence(env = process.env, brightness = resolveTuiBri
   return hexToBgSgr((SURFACE_HEX[activeThemeName] ?? SURFACE_HEX.trail)[brightness]);
 }
 function userSurfaceBackgroundSequence(env = process.env, brightness = resolveTuiBrightness(env)) {
-  if (resolveTuiThemeMode(env) === "terminal") return "";
   if (!supportsTruecolor(env)) return "";
   const palette = THEME_PALETTES[activeThemeName] ?? THEME_PALETTES.trail;
   const accentHex = palette[brightness].accent.hex;
-  const weight = brightness === "dark" ? 0.24 : 0.16;
+  const weight = brightness === "dark" ? 0.3 : 0.2;
   return hexToBgSgr(blendHex(accentHex, resolveTerminalBaseHex(brightness), weight));
 }
 function themeColorSequence(token, env = process.env, brightness = resolveTuiBrightness(env)) {

package/{chunk-ZXB3C27J.js → chunk-O2X6R45W.js}

@@ -1,7 +1,7 @@
 import {
   createCliLocalRuntimeAdapter,
   summarizeEndpoint
-} from "./chunk-HFC7I2SI.js";
+} from "./chunk-Z3XXUE2E.js";
 import {
   clipMultilineText
 } from "./chunk-6RNOFHEM.js";

package/{chunk-HFC7I2SI.js → chunk-Z3XXUE2E.js}

@@ -795,6 +795,10 @@ var STRINGS = {
     zh: "\u2191 Shift+\u6EDA\u8F6E\u53EF\u56DE\u770B\u4E0A\u65B9\u6D88\u606F"
   },
   askChoiceSubmit: {
+    en: "submit \u2193",
+    zh: "\u63D0\u4EA4 \u2193"
+  },
+  askChoiceSubmitRow: {
     en: "Submit",
     zh: "\u63D0\u4EA4"
   },
@@ -803,20 +807,24 @@ var STRINGS = {
     zh: "\u5176\u4ED6"
   },
   askChoiceHintSingle: {
-    en: "Type your answer, then press Enter to save.",
-    zh: "\u8F93\u5165\u56DE\u7B54\u540E\u6309 Enter \u4FDD\u5B58\u3002"
+    en: "Enter/Space picks \xB7 in Other, Enter only saves \xB7 \u2193 to Submit row, Enter sends",
+    zh: "Enter/\u7A7A\u683C \u9009\u62E9 \xB7 \u5176\u4ED6\u4E2D\u8F93\u5165\u540E Enter \u4EC5\u4E3A\u4FDD\u5B58 \xB7 \u2193 \u5230\u63D0\u4EA4\u884C Enter \u53D1\u9001"
   },
   askChoiceHintMulti: {
-    en: "Space to toggle, Enter to confirm selection.",
-    zh: "\u7A7A\u683C\u5207\u6362\u9009\u4E2D\uFF0CEnter \u786E\u8BA4\u63D0\u4EA4\u3002"
+    en: "Enter/Space toggles \xB7 \u2193 to Submit row, Enter sends",
+    zh: "Enter/\u7A7A\u683C \u5207\u6362\u9009\u4E2D \xB7 \u2193 \u5230\u63D0\u4EA4\u884C Enter \u53D1\u9001"
   },
   askChoiceFooterSingle: {
-    en: "\u21B5 pick/submit \xB7 tab switch \xB7 esc cancel",
-    zh: "\u21B5 \u9009\u62E9/\u63D0\u4EA4 \xB7 tab \u5207\u6362 \xB7 esc \u53D6\u6D88"
+    en: "\u21B5 select \xB7 \u2193 submit row \u21B5 send \xB7 ctrl+s send \xB7 tab switch \xB7 esc cancel",
+    zh: "\u21B5 \u9009\u62E9 \xB7 \u2193 \u63D0\u4EA4\u884C \u21B5 \u53D1\u9001 \xB7 ctrl+s \u53D1\u9001 \xB7 tab \u5207\u6362 \xB7 esc \u53D6\u6D88"
   },
   askChoiceFooterMulti: {
-    en: "\u21B5 submit \xB7 space toggle \xB7 tab switch \xB7 esc cancel",
-    zh: "\u21B5 \u63D0\u4EA4 \xB7 space \u5207\u6362 \xB7 tab \u5207\u6362 \xB7 esc \u53D6\u6D88"
+    en: "\u21B5 toggle \xB7 \u2193 submit row \u21B5 send \xB7 ctrl+s send \xB7 tab switch \xB7 esc cancel",
+    zh: "\u21B5 \u5207\u6362 \xB7 \u2193 \u63D0\u4EA4\u884C \u21B5 \u53D1\u9001 \xB7 ctrl+s \u53D1\u9001 \xB7 tab \u5207\u6362 \xB7 esc \u53D6\u6D88"
+  },
+  askChoiceValidationRequired: {
+    en: "Required questions are unanswered \u2014 jumped to the first one.",
+    zh: "\u5FC5\u586B\u95EE\u9898\u5C1A\u672A\u56DE\u7B54 \u2014 \u5DF2\u8DF3\u8F6C\u5230\u7B2C\u4E00\u4E2A\u672A\u7B54\u9898\u3002"
   },
   askChoiceHistoryHint: {
     en: "Type a number to choose, or reply directly:",

package/index.js

@@ -127,7 +127,7 @@ function createDaemonShortcutCommand(path, description, command2) {
 // packages/cli/agentInternalCommandEntries.ts
 function getAgentInternalCommandEntries() {
   const createAgentRunCommand = (path, description) => createContextCommand(path, description, async (args2, ctx) => {
-    const { runAgentRunCommand } = await import("./agentRunCommand-DFMXY5SI.js");
+    const { runAgentRunCommand } = await import("./agentRunCommand-KZMPUI53.js");
     return runAgentRunCommand(args2, {
       env: ctx.env,
       scriptDir: ctx.scriptDir,
@@ -143,7 +143,7 @@ function getAgentInternalCommandEntries() {
       return runAgentListCommand(args2, deps);
     }),
     createEnvCommand(["agent", "create"], "Create a new agent", async (args2, deps) => {
-      const { runAgentCreateCommand } = await import("./agentRecordCommands-JKA6W77W.js");
+      const { runAgentCreateCommand } = await import("./agentRecordCommands-ID3URU2J.js");
       return runAgentCreateCommand(args2, deps);
     }),
     createEnvCommand(["agent", "models"], "List models available on an OpenAI-compatible provider", async (args2, deps) => {
@@ -155,7 +155,7 @@ function getAgentInternalCommandEntries() {
       return runAgentPullCommand(args2, deps);
     }),
     createEnvCommand(["agent", "read"], "Read a single agent", async (args2, deps) => {
-      const { runAgentReadCommand } = await import("./agentRecordCommands-JKA6W77W.js");
+      const { runAgentReadCommand } = await import("./agentRecordCommands-ID3URU2J.js");
       return runAgentReadCommand(args2, deps);
     }),
     createAgentRunCommand(["agent", "run"], "Run an agent"),
@@ -184,26 +184,26 @@ function getAgentInternalCommandEntries() {
       return runSetupOfflineMarxistsAgentCommand(args2, deps);
     }),
     createEnvCommand(["agent", "update"], "Update agent fields", async (args2, deps) => {
-      const { runAgentUpdateCommand } = await import("./agentRecordCommands-JKA6W77W.js");
+      const { runAgentUpdateCommand } = await import("./agentRecordCommands-ID3URU2J.js");
       return runAgentUpdateCommand(args2, deps);
     }),
     createEnvCommand(["agent", "email", "provision"], "Provision a controlled inbox for an agent", async (args2, deps) => {
-      const { runAgentEmailProvisionCommand } = await import("./agentEmailCommands-LXGAJ3WU.js");
+      const { runAgentEmailProvisionCommand } = await import("./agentEmailCommands-LVUZQHBF.js");
       return runAgentEmailProvisionCommand(args2, deps);
     }),
     createEnvCommand(["agent", "email", "bind"], "Bind an existing email address to an agent", async (args2, deps) => {
-      const { runAgentEmailBindCommand } = await import("./agentEmailCommands-LXGAJ3WU.js");
+      const { runAgentEmailBindCommand } = await import("./agentEmailCommands-LVUZQHBF.js");
       return runAgentEmailBindCommand(args2, deps);
     }),
     createEnvCommand(["agent", "email", "transfer"], "Transfer an email identity from one agent to another (cross-account)", async (args2, deps) => {
-      const { runAgentEmailTransferCommand } = await import("./agentEmailCommands-LXGAJ3WU.js");
+      const { runAgentEmailTransferCommand } = await import("./agentEmailCommands-LVUZQHBF.js");
       return runAgentEmailTransferCommand(args2, deps);
     }),
     createEnvCommand(
       ["agent", "email", "create-and-provision"],
       "Create an agent and provision its controlled inbox",
       async (args2, deps) => {
-        const { runAgentEmailCreateAndProvisionCommand } = await import("./agentEmailCommands-LXGAJ3WU.js");
+        const { runAgentEmailCreateAndProvisionCommand } = await import("./agentEmailCommands-LVUZQHBF.js");
         return runAgentEmailCreateAndProvisionCommand(args2, deps);
       }
     ),
@@ -224,15 +224,15 @@ function getAgentInternalCommandEntries() {
       return runAgentRevokeGrantCommand(args2, deps);
     }),
     createEnvCommand(["agent", "bind-current"], "Bind an agent to this machine", async (args2, deps) => {
-      const { runAgentBindCurrentCommand } = await import("./agentMachineCommands-W35VHNJN.js");
+      const { runAgentBindCurrentCommand } = await import("./agentMachineCommands-XNIBG4L2.js");
       return runAgentBindCurrentCommand(args2, deps);
     }),
     createEnvCommand(["agent", "smoke-current"], "Smoke test a bound agent through this machine", async (args2, deps) => {
-      const { runAgentSmokeCurrentCommand } = await import("./agentMachineCommands-W35VHNJN.js");
+      const { runAgentSmokeCurrentCommand } = await import("./agentMachineCommands-XNIBG4L2.js");
       return runAgentSmokeCurrentCommand(args2, deps);
     }),
     createEnvCommand(["agent", "runtime-doctor"], "Diagnose current machine runtime compatibility", async (args2, deps) => {
-      const { runAgentRuntimeDoctorCommand } = await import("./agentMachineCommands-W35VHNJN.js");
+      const { runAgentRuntimeDoctorCommand } = await import("./agentMachineCommands-XNIBG4L2.js");
       return runAgentRuntimeDoctorCommand(args2, deps);
     }),
     createAgentRunCommand(["agent", "chat"], "Chat with an agent")
@@ -417,15 +417,15 @@ function getSystemInternalCommandEntries(renderHelpText2) {
       return runWhoamiCommand({ args: args2, env: ctx.env });
     }),
     createEntrypointEnvCommand(["connect"], "Send machine heartbeats or hold a connector websocket", async (args2, deps) => {
-      const { runMachineConnectCommand } = await import("./machineCommands-7G33TEID.js");
+      const { runMachineConnectCommand } = await import("./machineCommands-3Y3EHK2H.js");
       return runMachineConnectCommand(args2, deps);
     }),
     createDaemonShortcutCommand(["daemon"], "Run the connector daemon shortcut", async (args2, deps) => {
-      const { runMachineConnectCommand } = await import("./machineCommands-7G33TEID.js");
+      const { runMachineConnectCommand } = await import("./machineCommands-3Y3EHK2H.js");
       return runMachineConnectCommand(args2, deps);
     }),
     createEnvCommand(["machine", "status"], "List machines registered to the current profile", async (args2, deps) => {
-      const { runMachineStatusCommand } = await import("./machineCommands-7G33TEID.js");
+      const { runMachineStatusCommand } = await import("./machineCommands-3Y3EHK2H.js");
       return runMachineStatusCommand(args2, deps);
     }),
     createEnvCommand(["doctor", "runtime"], "Diagnose local-first agent runtime selection", async (args2, deps) => {
@@ -815,7 +815,7 @@ async function runScript(script, forwardedArgs, env) {
   return proc.exited;
 }
 async function launchTuiWorkspace(args2) {
-  const { startTuiWorkspace } = await import("./readlineWorkspace-5A2BHFDV.js");
+  const { startTuiWorkspace } = await import("./readlineWorkspace-7FZA4JYG.js");
   const { createTuiSummaryLlmCaller } = await import("./tuiSummaryLlmCaller-ZGATEM35.js");
   return startTuiWorkspace({
     ...args2,

package/{machineCommands-7G33TEID.js → machineCommands-3Y3EHK2H.js}

@@ -2,13 +2,13 @@ import {
   buildMachinePermissionPromptBlock,
   handleConnectorRunMessage,
   resolveMachineRunPermissionPolicy
-} from "./chunk-ZXB3C27J.js";
+} from "./chunk-O2X6R45W.js";
 import {
   isConnectorWebSocketAuthError,
   isConnectorWebSocketRetryableError,
   resolveConnectorWebSocketTarget
 } from "./chunk-ALXHV7NK.js";
-import "./chunk-HFC7I2SI.js";
+import "./chunk-Z3XXUE2E.js";
 import "./chunk-BNATE77Z.js";
 import "./chunk-EADNWBAZ.js";
 import "./chunk-HH65VA5U.js";

package/{machineWsRunDispatch-5I4IU4FF.js → machineWsRunDispatch-RSVSJ4D7.js}

@@ -11,8 +11,8 @@ import {
   runtimeWorkspacePermissionPolicy,
   scopePermissionPolicyToRuntimeWorkspace,
   summarizeAgentConfigForLogs
-} from "./chunk-ZXB3C27J.js";
-import "./chunk-HFC7I2SI.js";
+} from "./chunk-O2X6R45W.js";
+import "./chunk-Z3XXUE2E.js";
 import "./chunk-BNATE77Z.js";
 import "./chunk-EADNWBAZ.js";
 import "./chunk-HH65VA5U.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nolo-cli",
-  "version": "0.69.0-alpha.1",
+  "version": "0.69.0-alpha.2",
   "type": "module",
   "description": "Agent-first terminal workspace for Nolo",
   "bin": {

package/{readlineWorkspace-5A2BHFDV.js → readlineWorkspace-7FZA4JYG.js}

@@ -72,7 +72,7 @@ import {
   wrapTextToLines,
   wrapTranscriptLine,
   wrapTranscriptLineWithLayout
-} from "./chunk-JFPBCEFP.js";
+} from "./chunk-JKAWV72Y.js";
 import "./chunk-S7Z2HMCN.js";
 import {
   listFavoriteAgentIdsAcrossServers,
@@ -96,7 +96,7 @@ import {
   readTimestamp,
   setCliLocale,
   t
-} from "./chunk-HFC7I2SI.js";
+} from "./chunk-Z3XXUE2E.js";
 import "./chunk-BNATE77Z.js";
 import "./chunk-EADNWBAZ.js";
 import {
@@ -6806,18 +6806,50 @@ function normalizeQuestion(raw, index) {
     required: raw?.required !== false
   };
 }
-function createInitialAskChoiceState(questions) {
+function createInitialAskChoiceState(questions, savedAnswers) {
+  const hasSaved = Boolean(
+    savedAnswers?.answers?.length || savedAnswers?.selected || savedAnswers?.phase === "submitted"
+  );
   return {
     questions,
     activeIndex: 0,
-    questionStates: questions.map(() => ({
-      cursorIndex: 0,
-      selectedIds: [],
-      pickedId: null,
-      otherText: "",
-      otherFocused: false
-    })),
-    phase: "active"
+    questionStates: questions.map((q, i) => {
+      let pickedId = null;
+      let selectedIds = [];
+      let otherText = "";
+      if (savedAnswers?.answers?.length) {
+        const byId = savedAnswers.answers.find((a) => a.questionId === q.id);
+        const byPosition = savedAnswers.answers[i]?.questionId ? void 0 : savedAnswers.answers[i];
+        const found = byId ?? byPosition;
+        if (found) {
+          selectedIds = Array.isArray(found.selectedIds) ? found.selectedIds : [];
+          otherText = typeof found.otherText === "string" ? found.otherText : "";
+          if (!q.multiSelect && selectedIds.length > 0) {
+            pickedId = selectedIds[0];
+          }
+        }
+      } else if (savedAnswers?.selected) {
+        const label = savedAnswers.selected.label;
+        const matched = q.choices.find(
+          (c) => c.label === label || savedAnswers.selected?.userMessage && c.userMessage === savedAnswers.selected.userMessage
+        );
+        if (matched) {
+          pickedId = matched.id;
+          selectedIds = [matched.id];
+        } else if (label) {
+          otherText = label;
+        }
+      }
+      return {
+        cursorIndex: 0,
+        selectedIds,
+        pickedId,
+        otherText,
+        otherFocused: false
+      };
+    }),
+    phase: savedAnswers?.phase ?? (hasSaved ? "submitted" : "active"),
+    validationAttempted: false
   };
 }
 function askChoiceReducer(state, action) {
@@ -6847,8 +6879,15 @@ function askChoiceReducer(state, action) {
     case "CANCEL":
       return { ...state, phase: "cancelled" };
     case "SUBMIT": {
-      if (!canSubmit(state)) return state;
-      return { ...state, phase: "submitted" };
+      const firstUnanswered = findFirstUnansweredIndex(state);
+      if (firstUnanswered !== -1) {
+        return {
+          ...state,
+          activeIndex: firstUnanswered,
+          validationAttempted: true
+        };
+      }
+      return { ...state, phase: "submitted", validationAttempted: false };
     }
     case "SWITCH_TAB": {
       const idx = clamp(action.index, 0, state.questions.length - 1);
@@ -6878,58 +6917,62 @@ function askChoiceReducer(state, action) {
     case "TOGGLE_AT_CURSOR": {
       const qs = state.questionStates[state.activeIndex];
       const q = state.questions[state.activeIndex];
-      if (!q.multiSelect) return state;
+      if (!q.multiSelect) {
+        return askChoiceReducer(state, { type: "SELECT_AT_CURSOR" });
+      }
       const isOtherRow = qs.cursorIndex >= q.choices.length;
       if (isOtherRow) {
-        const newQs2 = [...state.questionStates];
-        newQs2[state.activeIndex] = { ...qs, otherFocused: !qs.otherFocused };
-        return { ...state, questionStates: newQs2 };
+        const newQs = [...state.questionStates];
+        newQs[state.activeIndex] = { ...qs, otherFocused: !qs.otherFocused };
+        return { ...state, questionStates: newQs };
       }
       const choiceId = q.choices[qs.cursorIndex]?.id;
       if (!choiceId) return state;
-      const has = qs.selectedIds.includes(choiceId);
-      const newSelected = has ? qs.selectedIds.filter((id) => id !== choiceId) : [...qs.selectedIds, choiceId];
+      return askChoiceReducer(state, { type: "SELECT_CHOICE", choiceId });
+    }
+    // The one explicit "choose this option" action, addressed by choice id so
+    // that click / tap handlers on every platform share the same behaviour as
+    // cursor-driven keys. Multi-select toggles, single-select picks. It never
+    // advances the tab and never submits.
+    case "SELECT_CHOICE": {
+      const qs = state.questionStates[state.activeIndex];
+      const q = state.questions[state.activeIndex];
+      const choiceIndex = q.choices.findIndex((c) => c.id === action.choiceId);
+      if (choiceIndex === -1) return state;
       const newQs = [...state.questionStates];
-      newQs[state.activeIndex] = { ...qs, selectedIds: newSelected };
-      return { ...state, questionStates: newQs };
+      if (q.multiSelect) {
+        const has = qs.selectedIds.includes(action.choiceId);
+        const newSelected = has ? qs.selectedIds.filter((id) => id !== action.choiceId) : [...qs.selectedIds, action.choiceId];
+        newQs[state.activeIndex] = {
+          ...qs,
+          cursorIndex: choiceIndex,
+          selectedIds: newSelected,
+          otherText: "",
+          otherFocused: false
+        };
+      } else {
+        newQs[state.activeIndex] = {
+          ...qs,
+          cursorIndex: choiceIndex,
+          pickedId: action.choiceId,
+          otherText: "",
+          otherFocused: false
+        };
+      }
+      return { ...state, questionStates: newQs, validationAttempted: false };
     }
     case "SELECT_AT_CURSOR": {
       const qs = state.questionStates[state.activeIndex];
       const q = state.questions[state.activeIndex];
       const isOtherRow = qs.cursorIndex >= q.choices.length;
       if (isOtherRow) {
-        const newQs2 = [...state.questionStates];
-        newQs2[state.activeIndex] = { ...qs, otherFocused: true };
-        return { ...state, questionStates: newQs2 };
+        const newQs = [...state.questionStates];
+        newQs[state.activeIndex] = { ...qs, otherFocused: true };
+        return { ...state, questionStates: newQs };
       }
       const choiceId = q.choices[qs.cursorIndex]?.id;
       if (!choiceId) return state;
-      if (q.multiSelect) {
-        const has = qs.selectedIds.includes(choiceId);
-        const newSelected = has ? qs.selectedIds.filter((id) => id !== choiceId) : [...qs.selectedIds, choiceId];
-        const newQs2 = [...state.questionStates];
-        newQs2[state.activeIndex] = { ...qs, selectedIds: newSelected };
-        return { ...state, questionStates: newQs2 };
-      }
-      const newQs = [...state.questionStates];
-      newQs[state.activeIndex] = { ...qs, pickedId: choiceId, otherFocused: false };
-      if (state.questions.length === 1) {
-        return {
-          ...state,
-          questionStates: newQs,
-          phase: "submitted"
-        };
-      }
-      const nextState = { ...state, questionStates: newQs };
-      const isLastTab = state.activeIndex >= state.questions.length - 1;
-      if (isLastTab && canSubmit(nextState)) {
-        return { ...nextState, phase: "submitted" };
-      }
-      const nextTab = Math.min(
-        state.activeIndex + 1,
-        state.questions.length - 1
-      );
-      return { ...nextState, activeIndex: nextTab };
+      return askChoiceReducer(state, { type: "SELECT_CHOICE", choiceId });
     }
     case "FOCUS_OTHER": {
       const qs = state.questionStates[state.activeIndex];
@@ -6946,40 +6989,47 @@ function askChoiceReducer(state, action) {
     case "SET_OTHER_TEXT": {
       const qs = state.questionStates[state.activeIndex];
       const newQs = [...state.questionStates];
-      newQs[state.activeIndex] = { ...qs, otherText: action.text };
-      return { ...state, questionStates: newQs };
+      const hasText = action.text.trim().length > 0;
+      newQs[state.activeIndex] = {
+        ...qs,
+        otherText: action.text,
+        // Non-empty Other is mutually exclusive with predefined choices
+        ...hasText ? { pickedId: null, selectedIds: [] } : {}
+      };
+      return { ...state, questionStates: newQs, validationAttempted: false };
     }
     default:
       return state;
   }
 }
+function findFirstUnansweredIndex(state) {
+  return state.questions.findIndex(
+    (q, i) => !isQuestionAnswered(q, state.questionStates[i])
+  );
+}
 function isQuestionAnswered(q, qs) {
   if (!q.required) return true;
-  const hasSelection = q.multiSelect ? qs.selectedIds.length > 0 : qs.pickedId !== null;
   const hasOther = q.allowOther && qs.otherText.trim().length > 0;
-  return hasSelection || hasOther;
-}
-function canSubmit(state) {
-  return state.questions.every(
-    (q, i) => isQuestionAnswered(q, state.questionStates[i])
-  );
+  const hasSelection = q.multiSelect ? qs.selectedIds.length > 0 : qs.pickedId !== null;
+  return hasOther || hasSelection;
 }
 function buildAskChoiceResult(state) {
   if (state.phase === "cancelled") return { kind: "cancelled" };
   if (state.phase !== "submitted") return { kind: "cancelled" };
   const answers = state.questions.map((q, i) => {
     const qs = state.questionStates[i];
-    const selectedIds = q.multiSelect ? qs.selectedIds : qs.pickedId ? [qs.pickedId] : [];
     const otherText = qs.otherText.trim();
+    const selectedIds = otherText ? [] : q.multiSelect ? qs.selectedIds : qs.pickedId ? [qs.pickedId] : [];
     const parts = [];
-    for (const id of selectedIds) {
-      const choice = q.choices.find((c) => c.id === id);
-      if (choice) {
-        parts.push(choice.userMessage || choice.label);
-      }
-    }
     if (otherText) {
       parts.push(otherText);
+    } else {
+      for (const id of selectedIds) {
+        const choice = q.choices.find((c) => c.id === id);
+        if (choice) {
+          parts.push(choice.userMessage || choice.label);
+        }
+      }
     }
     return {
       questionId: q.id,
@@ -6990,6 +7040,19 @@ function buildAskChoiceResult(state) {
   });
   return { kind: "submitted", answers };
 }
+function formatOutboundUserMessage(questions, answers) {
+  if (answers.length <= 1) {
+    return answers[0]?.userMessage ?? "";
+  }
+  return answers.map((a) => {
+    const q = questions.find((item) => item.id === a.questionId);
+    const title = q?.header || q?.question;
+    if (title && a.userMessage) {
+      return `[${title}]: ${a.userMessage}`;
+    }
+    return a.userMessage;
+  }).filter(Boolean).join("\n\n");
+}
 function clamp(value, min, max) {
   return Math.max(min, Math.min(max, value));
 }
@@ -7000,10 +7063,17 @@ var KEY_SHIFT_TAB = "\x1B[Z";
 var KEY_BACKSPACE = "\x7F";
 var KEY_BACKSPACE_ALT = "\b";
 var KEY_SPACE = " ";
-function renderTabBar(questions, activeIndex, colorEnabled) {
-  const tabs = questions.map((q, i) => {
-    const label = q.header || `Q${i + 1}`;
-    if (i === activeIndex) {
+var KEY_CTRL_S = "";
+var TAB_DONE = "\u2713";
+var TAB_MISSING = "!";
+var TAB_OPTIONAL = "\xB7";
+function renderTabBar(state, colorEnabled) {
+  const tabs = state.questions.map((q, i) => {
+    const qs = state.questionStates[i];
+    const hasAnswer = qs.pickedId !== null || qs.selectedIds.length > 0 || qs.otherText.trim().length > 0;
+    const mark = hasAnswer ? TAB_DONE : q.required ? TAB_MISSING : TAB_OPTIONAL;
+    const label = `${mark} ${q.header || `Q${i + 1}`}`;
+    if (i === state.activeIndex) {
       return colorEnabled ? `${themeColorSequence("accent")} ${label} \x1B[0m` : `[${label}]`;
     }
     return colorEnabled ? themeText(` ${label} `, "muted", colorEnabled) : ` ${label} `;
@@ -7020,6 +7090,7 @@ function otherRowPrefix(index) {
 }
 function renderAskChoiceFrame(state, options) {
   const colorEnabled = resolveCliColorEnabled();
+  const submitFocused = options?.submitFocused === true;
   const q = state.questions[state.activeIndex];
   const qs = state.questionStates[state.activeIndex];
   const lines = [];
@@ -7032,7 +7103,13 @@ function renderAskChoiceFrame(state, options) {
   }
   lines.push("");
   if (state.questions.length > 1) {
-    lines.push(renderTabBar(state.questions, state.activeIndex, colorEnabled));
+    lines.push(renderTabBar(state, colorEnabled));
+    lines.push("");
+  }
+  if (state.validationAttempted) {
+    lines.push(
+      colorEnabled ? themeText(`  ${t("askChoiceValidationRequired")}`, "warning", colorEnabled) : `  ${t("askChoiceValidationRequired")}`
+    );
     lines.push("");
   }
   lines.push(
@@ -7059,7 +7136,7 @@ function renderAskChoiceFrame(state, options) {
   for (let i = window.start; i < window.end; i++) {
     if (i < q.choices.length) {
       const choice = q.choices[i];
-      const focused = qs.cursorIndex === i;
+      const focused = qs.cursorIndex === i && !submitFocused;
       const checkbox = q.multiSelect ? qs.selectedIds.includes(choice.id) ? DIALOG_CHECKED : DIALOG_UNCHECKED : qs.pickedId === choice.id ? DIALOG_CHECKED : void 0;
       lines.push(
         renderDialogRow({
@@ -7070,7 +7147,7 @@ function renderAskChoiceFrame(state, options) {
         })
       );
     } else {
-      const focused = qs.cursorIndex === i;
+      const focused = qs.cursorIndex === i && !submitFocused;
       const marker = focused ? DIALOG_CURSOR : " ";
       const plainPrefix = `${marker}${otherRowPrefix(i)}`;
       const plainRow = `${plainPrefix}${qs.otherText}`;
@@ -7092,6 +7169,12 @@ function renderAskChoiceFrame(state, options) {
   if (window.end < totalRows) {
     lines.push(renderOverflowBelow(totalRows - window.end));
   }
+  lines.push(
+    renderDialogRow({
+      label: t("askChoiceSubmitRow"),
+      focused: submitFocused
+    })
+  );
   lines.push("");
   lines.push(renderFooter(q.multiSelect, colorEnabled));
   return { text: lines.join("\n"), otherCursor };
@@ -7114,6 +7197,7 @@ async function runAskChoiceDialog(args) {
   const session = args.session ?? createStandaloneDialogSession({ input, output });
   const wheelThrottle = createWheelThrottle();
   let rawAcquired = false;
+  let submitFocused = false;
   const bottomAnchored = Boolean(args.bottomAnchored && args.bottomRow);
   const resolveBottomRow = () => Math.max(
     1,
@@ -7122,7 +7206,7 @@ async function runAskChoiceDialog(args) {
   const painter = createDialogFramePainter({
     output,
     render: () => {
-      const frame = renderAskChoiceFrame(state, { bottomAnchored });
+      const frame = renderAskChoiceFrame(state, { bottomAnchored, submitFocused });
       return {
         text: frame.text,
         cursor: frame.otherCursor
@@ -7164,6 +7248,7 @@ async function runAskChoiceDialog(args) {
         }
         const direction = scrollAction === "wheel-up" ? -1 : 1;
         if (wheelThrottle.step(direction) === 0) continue;
+        submitFocused = false;
         state = askChoiceReducer(state, {
           type: "MOVE_CURSOR",
           delta: direction
@@ -7185,29 +7270,49 @@ async function runAskChoiceDialog(args) {
       } else if (isCancel(sequence)) {
         action = { type: "CANCEL" };
       } else if (isArrowUp(sequence)) {
+        if (submitFocused) {
+          submitFocused = false;
+          paint();
+          continue;
+        }
         action = { type: "MOVE_CURSOR", delta: -1 };
       } else if (isArrowDown(sequence)) {
+        const maxRowIndex = q.allowOther ? q.choices.length : q.choices.length - 1;
+        if (submitFocused) {
+          continue;
+        }
+        if (qs.cursorIndex >= maxRowIndex) {
+          submitFocused = true;
+          state = askChoiceReducer(state, { type: "MOVE_CURSOR", delta: 1 });
+          paint();
+          continue;
+        }
         action = { type: "MOVE_CURSOR", delta: 1 };
+      } else if (sequence === KEY_CTRL_S) {
+        action = { type: "SUBMIT" };
       } else if (sequence === KEY_SPACE) {
+        if (submitFocused) {
+          continue;
+        }
         if (qs.otherFocused) {
           action = {
             type: "SET_OTHER_TEXT",
             text: qs.otherText + " "
           };
-        } else if (q.multiSelect) {
-          action = { type: "TOGGLE_AT_CURSOR" };
         } else if (isOtherRow) {
           action = { type: "FOCUS_OTHER" };
+        } else {
+          action = { type: "TOGGLE_AT_CURSOR" };
         }
       } else if (isSubmit(sequence)) {
-        if (qs.otherFocused) {
+        if (submitFocused) {
+          action = { type: "SUBMIT" };
+        } else if (qs.otherFocused) {
           action = { type: "BLUR_OTHER" };
-        } else if (isOtherRow && !qs.otherFocused) {
+        } else if (isOtherRow) {
           action = { type: "FOCUS_OTHER" };
-        } else if (q.multiSelect) {
-          action = { type: "SUBMIT" };
         } else {
-          action = { type: "SELECT_AT_CURSOR" };
+          action = { type: "TOGGLE_AT_CURSOR" };
         }
       } else if (sequence === KEY_BACKSPACE || sequence === KEY_BACKSPACE_ALT) {
         if (qs.otherFocused && qs.otherText.length > 0) {
@@ -7217,6 +7322,16 @@ async function runAskChoiceDialog(args) {
             text: chars.slice(0, -1).join("")
           };
         }
+      } else if (submitFocused) {
+        continue;
+      } else if (sequence.length === 1 && sequence >= "1" && sequence <= "9" && !qs.otherFocused) {
+        const rowIndex = Number(sequence) - 1;
+        if (rowIndex < q.choices.length) {
+          const choice = q.choices[rowIndex];
+          if (choice) action = { type: "SELECT_CHOICE", choiceId: choice.id };
+        } else if (rowIndex === q.choices.length && q.allowOther) {
+          action = { type: "FOCUS_OTHER" };
+        }
       } else if (sequence.length >= 1 && sequence.charCodeAt(0) >= 32 && !sequence.startsWith("\x1B")) {
         if (qs.otherFocused || isOtherRow && q.allowOther) {
           const cleaned = sequence.replace(/[\x00-\x1f\x7f]/g, "");
@@ -7235,10 +7350,7 @@ async function runAskChoiceDialog(args) {
       if (action) {
         state = askChoiceReducer(state, action);
         if (state.phase !== "active") break;
-        if (action.type === "BLUR_OTHER" && state.activeIndex >= state.questions.length - 1 && canSubmit(state)) {
-          state = askChoiceReducer(state, { type: "SUBMIT" });
-          break;
-        }
+        submitFocused = false;
         paint();
       }
     }
@@ -7270,7 +7382,7 @@ async function runAskChoiceDialog(args) {
   return {
     kind: "multi-submitted",
     answers: result.answers,
-    userMessage: result.answers.map((a) => a.userMessage).filter(Boolean).join("\n\n")
+    userMessage: formatOutboundUserMessage(normalized.questions, result.answers)
   };
 }