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

package/{readlineWorkspace-5A2BHFDV.js → readlineWorkspace-UPNB3WUE.js}

@@ -72,7 +72,7 @@ import {
   wrapTextToLines,
   wrapTranscriptLine,
   wrapTranscriptLineWithLayout
-} from "./chunk-JFPBCEFP.js";
+} from "./chunk-ETVDF66U.js";
 import "./chunk-S7Z2HMCN.js";
 import {
   listFavoriteAgentIdsAcrossServers,
@@ -80,7 +80,7 @@ import {
   listRemoteAgents,
   listRemoteAgentsAcrossServers,
   normalizeListedAgent
-} from "./chunk-IOZR6BLM.js";
+} from "./chunk-3U3EA3BO.js";
 import "./chunk-ID4G2MAR.js";
 import {
   listUserRecordsFromServers,
@@ -96,8 +96,8 @@ import {
   readTimestamp,
   setCliLocale,
   t
-} from "./chunk-HFC7I2SI.js";
-import "./chunk-BNATE77Z.js";
+} from "./chunk-5CCXNZTD.js";
+import "./chunk-GBPZKFYK.js";
 import "./chunk-EADNWBAZ.js";
 import {
   backfillRunRecordParentDialog,
@@ -129,17 +129,17 @@ import "./chunk-MP64VFGD.js";
 import "./chunk-ESHYE7WU.js";
 import "./chunk-JBTJAPUF.js";
 import "./chunk-LTRXGFMS.js";
-import "./chunk-RJ5HQDHL.js";
+import "./chunk-3QPYFHAH.js";
 import "./chunk-ATNTHIZI.js";
 import "./chunk-JEXVIMYZ.js";
 import {
   prepareTools
-} from "./chunk-LMEH4C4G.js";
+} from "./chunk-WGBSEJ5K.js";
 import {
   buildResponseGuidelines
 } from "./chunk-EDKF7RX4.js";
 import "./chunk-HS7MLR74.js";
-import "./chunk-6RNOFHEM.js";
+import "./chunk-GUR5O7MB.js";
 import "./chunk-5XTOKQLW.js";
 import "./chunk-NF64D32W.js";
 import "./chunk-3L2WKC3W.js";
@@ -154,30 +154,30 @@ import {
   runShowsLogTail,
   shortRunId
 } from "./chunk-NTW5GWDM.js";
-import "./chunk-UFTOGLCE.js";
+import "./chunk-FPTQQSS6.js";
 import "./chunk-KQHGZWSV.js";
-import "./chunk-5TJQUZQ7.js";
-import "./chunk-K647EQV3.js";
+import "./chunk-UDQWGU7F.js";
+import "./chunk-PZM3EENV.js";
 import "./chunk-OZX2IPKM.js";
-import "./chunk-7JS3F5ZR.js";
+import "./chunk-4EJ5QYB5.js";
 import "./chunk-N4G4PKQ6.js";
 import "./chunk-FZGV4FGK.js";
 import "./chunk-MEYIRKDN.js";
 import "./chunk-63W5N6P3.js";
 import "./chunk-VF4K2QE6.js";
-import "./chunk-PADUIVUU.js";
-import "./chunk-SKWZFK56.js";
-import "./chunk-2L7EUBRN.js";
+import "./chunk-VD2NV6C5.js";
+import "./chunk-FUZRQKU2.js";
+import "./chunk-3BIRZJCI.js";
 import "./chunk-ZJ7UHBJS.js";
 import {
   extractReferenceKeysFromMessage
-} from "./chunk-C2SHPJSS.js";
+} from "./chunk-LW2BWHRM.js";
 import "./chunk-EVBFYPDC.js";
 import "./chunk-HQUORJTM.js";
 import "./chunk-YYLHWIW6.js";
 import "./chunk-AGGIDPCZ.js";
-import "./chunk-4ENGEYUY.js";
-import "./chunk-76JAMDUT.js";
+import "./chunk-R2PJ4WKV.js";
+import "./chunk-BJCWNHVU.js";
 import "./chunk-5RGU3J7P.js";
 import "./chunk-6YTOJY35.js";
 import "./chunk-M76ECQRD.js";
@@ -201,22 +201,22 @@ import {
   buildLocalWorkspaceToolset,
   getProcessRegistry,
   readCommandActionGatePayload
-} from "./chunk-RXYIUZU5.js";
-import "./chunk-ZCVO2HLZ.js";
+} from "./chunk-LWFMRMP2.js";
+import "./chunk-HXAINXPQ.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-Y7PULBIA.js";
+import "./chunk-KIS76A2P.js";
 import "./chunk-2QDDKFG5.js";
 import "./chunk-N7J63Q6C.js";
 import {
   buildIdentityBlock,
   buildRuntimeGuidanceBlocks,
   resolveToolGuidedSections
-} from "./chunk-KRR3AG7T.js";
-import "./chunk-XTJTN3RW.js";
-import "./chunk-ZW22L5ES.js";
+} from "./chunk-ZLPA7K55.js";
+import "./chunk-PUOC4YRO.js";
+import "./chunk-PGSKWZCB.js";
 import {
   resolvePlatformAuthToken
-} from "./chunk-VLQRD7ZJ.js";
+} from "./chunk-CMH2SYHX.js";
 import "./chunk-V3ZKNK5D.js";
 import {
   isQuotaExhaustedError
@@ -226,7 +226,7 @@ import {
   DEFAULT_CONTEXT_WINDOW,
   getModelContextWindow,
   normalizeUsage
-} from "./chunk-2XENHR3P.js";
+} from "./chunk-DSRXPQWA.js";
 import {
   buildCompactionMetricsFromPlan,
   buildCompactionUserContent,
@@ -236,13 +236,13 @@ import {
   formatMessagesForSummaryWithTruncation,
   planCompression,
   serializeMessageContent
-} from "./chunk-3E67YXGD.js";
-import "./chunk-SQDGTW2T.js";
+} from "./chunk-E36HZARC.js";
+import "./chunk-K7AG465Q.js";
 import {
   estimateTokenCount
 } from "./chunk-PSCNXBYA.js";
 import "./chunk-BYXBJQAS.js";
-import "./chunk-TQC77XVE.js";
+import "./chunk-UJ63UXGE.js";
 import {
   compactWhitespace
 } from "./chunk-DWLEOOGR.js";
@@ -292,16 +292,16 @@ import {
 import {
   DEFAULT_NOLO_SERVER_URL
 } from "./chunk-OLZBQWZU.js";
-import "./chunk-6IT5ECCC.js";
-import "./chunk-5YIL5WDC.js";
-import "./chunk-WMRPXIZY.js";
-import "./chunk-OPNHMILE.js";
+import "./chunk-NG4UT4K4.js";
+import "./chunk-AJHEFRGJ.js";
+import "./chunk-SZLVDREM.js";
+import "./chunk-XWNRAIUL.js";
 import "./chunk-Y5GCAMGP.js";
 import "./chunk-UZ6XXCVR.js";
 import "./chunk-KX6YBIHG.js";
-import "./chunk-IM5EETJX.js";
+import "./chunk-ZZCJUXUI.js";
 import "./chunk-UAD2WT54.js";
-import "./chunk-4K6DB3GJ.js";
+import "./chunk-YFADVSZE.js";
 import "./chunk-NHRQCXIQ.js";
 import "./chunk-WWC7I6TA.js";
 import "./chunk-I42VC5KR.js";
@@ -314,7 +314,7 @@ import {
   BUILTIN_NOLO_AGENT_MODEL,
   BUILTIN_NOLO_AGENT_NAME,
   builtinAgentCatalogEntryById
-} from "./chunk-4MKPBCTN.js";
+} from "./chunk-5J7W2VWW.js";
 import {
   extractCustomId,
   parsePublicAgentId
@@ -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)
   };
 }
 

package/{removeDialogAgentAction-BVU6E27N.js → removeDialogAgentAction-F5GPTALR.js}

@@ -1,6 +1,6 @@
 import {
   cleanupCliSessionForDialog
-} from "./chunk-76JAMDUT.js";
+} from "./chunk-BJCWNHVU.js";
 import {
   getPrimaryDialogAgentId,
   removeDialogAgentId
@@ -13,20 +13,20 @@ import {
 } from "./chunk-M76ECQRD.js";
 import "./chunk-YDH3FDFQ.js";
 import "./chunk-W7XHHYWM.js";
-import "./chunk-OPNHMILE.js";
+import "./chunk-XWNRAIUL.js";
 import "./chunk-Y5GCAMGP.js";
 import "./chunk-UZ6XXCVR.js";
 import "./chunk-KX6YBIHG.js";
 import {
   patch,
   selectById
-} from "./chunk-4K6DB3GJ.js";
+} from "./chunk-YFADVSZE.js";
 import "./chunk-NHRQCXIQ.js";
 import "./chunk-WWC7I6TA.js";
 import "./chunk-I42VC5KR.js";
 import "./chunk-SREASRV5.js";
 import "./chunk-QSJ3HFEF.js";
-import "./chunk-4MKPBCTN.js";
+import "./chunk-5J7W2VWW.js";
 import "./chunk-BJIRLHJR.js";
 import "./chunk-3RAG2NAD.js";
 import "./chunk-QOKAKDPE.js";