nolo-cli 0.7.0 → 0.8.0

package/index.js

@@ -16077,12 +16077,14 @@ function buildLocalToolExecutors(args2) {
       })();
       const question = String(parsedArgs.question ?? "").trim();
       const choices = Array.isArray(parsedArgs.choices) ? parsedArgs.choices : [];
+      const questions = Array.isArray(parsedArgs.questions) ? parsedArgs.questions : void 0;
       const blocking = parsedArgs.blocking !== false;
-      if (!question || choices.length === 0) {
+      const hasQuestions = questions && questions.length > 0;
+      if (!hasQuestions && (!question || choices.length === 0)) {
         return {
           content: JSON.stringify({
             error: "ui_ask_choice",
-            detail: "ui_ask_choice \u9700\u8981 question \u548C\u81F3\u5C11\u4E00\u4E2A choice\u3002"
+            detail: "ui_ask_choice \u9700\u8981 question+choices \u6216 questions\u3002"
           }),
           metadata: { uiAskChoice: true, error: true }
         };
@@ -16090,10 +16092,28 @@ function buildLocalToolExecutors(args2) {
       if (args2.requestUserChoice) {
         try {
           const result = await args2.requestUserChoice({
-            question,
-            choices,
-            blocking
+            question: hasQuestions ? questions[0].question : question,
+            choices: hasQuestions ? questions[0].choices : choices,
+            blocking,
+            ...hasQuestions ? { questions } : {}
           });
+          if (result.kind === "multi-submitted") {
+            return {
+              content: JSON.stringify({
+                type: "ui_ask_choice",
+                question,
+                choices,
+                blocking,
+                ...hasQuestions ? { questions } : {},
+                answers: result.answers,
+                selected: {
+                  label: result.answers.map((a) => a.userMessage).join(", "),
+                  userMessage: result.userMessage
+                }
+              }),
+              metadata: { uiAskChoice: true, resolved: true }
+            };
+          }
           if (result.kind === "selected") {
             return {
               content: JSON.stringify({
@@ -16101,6 +16121,7 @@ function buildLocalToolExecutors(args2) {
                 question,
                 choices,
                 blocking,
+                ...hasQuestions ? { questions } : {},
                 selected: {
                   label: result.label,
                   userMessage: result.userMessage
@@ -16115,6 +16136,7 @@ function buildLocalToolExecutors(args2) {
               question,
               choices,
               blocking,
+              ...hasQuestions ? { questions } : {},
               selected: { label: "", userMessage: "" },
               cancelled: true
             }),
@@ -16128,7 +16150,8 @@ function buildLocalToolExecutors(args2) {
           type: "ui_ask_choice",
           question,
           choices,
-          blocking
+          blocking,
+          ...hasQuestions ? { questions } : {}
         }),
         metadata: { uiAskChoice: true }
       };
@@ -37355,11 +37378,24 @@ var init_dialogUrl = __esm({
 
 // packages/ai/tools/uiAskChoiceTool.ts
 async function uiAskChoiceFunc(args2, _thunkApi) {
+  const blocking = args2?.blocking !== false;
+  if (Array.isArray(args2?.questions) && args2.questions.length > 0) {
+    const firstQ = args2.questions[0];
+    return {
+      rawData: {
+        type: "ui_ask_choice",
+        question: firstQ?.question ?? "",
+        choices: firstQ?.choices ?? [],
+        blocking,
+        questions: args2.questions
+      },
+      displayData: args2.questions.map((q) => q.question).join(" / ")
+    };
+  }
   const question = String(args2?.question ?? "").trim();
   const choices = Array.isArray(args2?.choices) ? args2.choices : [];
-  const blocking = args2?.blocking !== false;
   if (!question || choices.length === 0) {
-    throw new Error("ui_ask_choice \u9700\u8981 question \u548C\u81F3\u5C11\u4E00\u4E2A choice\u3002");
+    throw new Error("ui_ask_choice \u9700\u8981 question+choices \u6216 questions\u3002");
   }
   return {
     rawData: {
@@ -37408,14 +37444,20 @@ var init_uiAskChoiceTool = __esm({
         "\u5728\u4EE3\u7801\u534F\u4F5C\u573A\u666F\u4E0B\u7684\u63A8\u8350\u7528\u6CD5\uFF1A",
         "- \u5982\u679C\u4F60\u5DF2\u7ECF\u5728\u672C\u8F6E assistant \u7684 content \u4E2D\u7ED9\u51FA\u4E86\u5206\u6790\u3001\u8BF4\u660E\u6216\u591A\u4E2A\u5907\u9009\u65B9\u6848\uFF0C\u53EF\u4EE5\u5728\u540C\u4E00\u8F6E\u6D88\u606F\u7684\u7ED3\u5C3E\u8C03\u7528\u672C\u5DE5\u5177\uFF0C\u8BF7\u7528\u6237\u9009\u62E9\u201C\u662F\u5426\u6839\u636E\u4E0A\u8FF0\u65B9\u6848\u5F00\u59CB\u5B9E\u9645\u4FEE\u6539\u4EE3\u7801\u201D\u6216\u201C\u4F18\u5148\u6267\u884C\u54EA\u4E00\u4E2A\u65B9\u6848/\u6B65\u9AA4\u201D\u3002",
         "- \u5728\u8FD9\u79CD\u60C5\u51B5\u4E0B\uFF0Cquestion \u5B57\u6BB5\u901A\u5E38\u662F\u4E00\u4E2A\u7B80\u77ED\u7684\u95EE\u9898\uFF08\u4F8B\u5982\uFF1A\u201C\u63A5\u4E0B\u6765\u4F60\u5E0C\u671B\u6211\u6309\u54EA\u4E2A\u65B9\u6848\u6765\u5177\u4F53\u4FEE\u6539\u4EE3\u7801\uFF1F\u201D\uFF09\uFF0C\u800C\u8BE6\u7EC6\u7684\u89E3\u91CA\u548C\u65B9\u6848\u63CF\u8FF0\u653E\u5728 content \u4E2D\u3002",
-        "- \u5982\u679C\u5F53\u524D\u5BF9\u8BDD\u53EA\u9700\u8981\u4E00\u4E2A\u7B80\u5355\u7684\u9009\u62E9\uFF0C\u800C\u4E0D\u9700\u8981\u989D\u5916\u89E3\u91CA\uFF0C\u4F60\u4E5F\u53EF\u4EE5\u4E0D\u8F93\u51FA\u989D\u5916\u7684 content\uFF0C\u800C\u53EA\u8C03\u7528\u672C\u5DE5\u5177\uFF0C\u7531 question \u5B57\u6BB5\u76F4\u63A5\u5411\u7528\u6237\u63D0\u95EE\u3002"
+        "- \u5982\u679C\u5F53\u524D\u5BF9\u8BDD\u53EA\u9700\u8981\u4E00\u4E2A\u7B80\u5355\u7684\u9009\u62E9\uFF0C\u800C\u4E0D\u9700\u8981\u989D\u5916\u89E3\u91CA\uFF0C\u4F60\u4E5F\u53EF\u4EE5\u4E0D\u8F93\u51FA\u989D\u5916\u7684 content\uFF0C\u800C\u53EA\u8C03\u7528\u672C\u5DE5\u5177\uFF0C\u7531 question \u5B57\u6BB5\u76F4\u63A5\u5411\u7528\u6237\u63D0\u95EE\u3002",
+        "",
+        "\u591A\u95EE\u9898 & \u591A\u9009\u652F\u6301\uFF1A",
+        "- \u5F53\u4F60\u9700\u8981\u4E00\u6B21\u95EE\u591A\u4E2A\u95EE\u9898\u65F6\uFF0C\u4F7F\u7528 questions \u6570\u7EC4\u4EE3\u66FF question+choices\u3002",
+        "- \u6BCF\u4E2A question \u53EF\u4EE5\u8BBE\u7F6E multiSelect: true \u5141\u8BB8\u591A\u9009\u3002",
+        "- \u6BCF\u4E2A question \u53EF\u4EE5\u8BBE\u7F6E allowOther: false \u9690\u85CF\u201C\u5176\u4ED6\u201D\u8F93\u5165\u6846\u3002",
+        "- \u6BCF\u4E2A choice \u53EF\u4EE5\u52A0 detail \u5B57\u6BB5\u63D0\u4F9B\u66F4\u957F\u7684\u63CF\u8FF0\u3002"
       ].join("\n"),
       parameters: {
         type: "object",
         properties: {
           question: {
             type: "string",
-            description: "\u5C55\u793A\u7ED9\u7528\u6237\u7684\u95EE\u9898\u6587\u6848\uFF0C\u7528\u4E00\u53E5\u8BDD\u8BF4\u660E\u8981\u505A\u4EC0\u4E48\u9009\u62E9\u3002\u4F8B\u5982\uFF1A\u201C\u63A5\u4E0B\u6765\u4F60\u66F4\u5E0C\u671B\u6211\u5E2E\u4F60\u505A\u54EA\u4EF6\u4E8B\uFF1F\u201D\u3002\u4E0D\u8981\u5728\u540C\u4E00\u8F6E assistant \u666E\u901A\u6587\u672C\u91CC\u91CD\u590D\u8FD9\u53E5\u8BDD\u3002"
+            description: "\u5C55\u793A\u7ED9\u7528\u6237\u7684\u95EE\u9898\u6587\u6848\uFF08\u5355\u95EE\u9898\u6A21\u5F0F\uFF09\u3002\u4E0E questions \u4E8C\u9009\u4E00\u3002"
           },
           choices: {
             type: "array",
@@ -37431,6 +37473,10 @@ var init_uiAskChoiceTool = __esm({
                   type: "string",
                   description: "\u663E\u793A\u7ED9\u7528\u6237\u770B\u7684\u6309\u94AE\u6587\u5B57\u3002\u4F8B\u5982\uFF1A\u201C\u751F\u6210\u672C\u5468\u5468\u62A5\u201D\u3002"
                 },
+                detail: {
+                  type: "string",
+                  description: "\u9009\u9879\u7684\u8865\u5145\u63CF\u8FF0\uFF0C\u663E\u793A\u5728 label \u4E0B\u65B9\u3002\u53EF\u9009\u3002"
+                },
                 userMessage: {
                   type: "string",
                   description: [
@@ -37443,6 +37489,56 @@ var init_uiAskChoiceTool = __esm({
               required: ["id", "label"]
             }
           },
+          questions: {
+            type: "array",
+            description: "\u591A\u95EE\u9898\u6A21\u5F0F\uFF1A\u4E00\u6B21\u95EE\u591A\u4E2A\u95EE\u9898\uFF0C\u6BCF\u4E2A\u95EE\u9898\u72EC\u7ACB\u6E32\u67D3\u4E3A\u4E00\u4E2A tab\u3002\u4E0E question+choices \u4E8C\u9009\u4E00\u3002",
+            items: {
+              type: "object",
+              properties: {
+                id: {
+                  type: "string",
+                  description: "\u95EE\u9898\u6807\u8BC6\uFF0C\u7528\u4E8E\u7ED3\u679C\u5BF9\u5E94\u3002"
+                },
+                question: {
+                  type: "string",
+                  description: "\u95EE\u9898\u6587\u6848\u3002"
+                },
+                choices: {
+                  type: "array",
+                  description: "\u8BE5\u95EE\u9898\u7684\u5907\u9009\u9879\u3002",
+                  items: {
+                    type: "object",
+                    properties: {
+                      id: { type: "string" },
+                      label: { type: "string" },
+                      detail: {
+                        type: "string",
+                        description: "\u8865\u5145\u63CF\u8FF0\u3002"
+                      },
+                      userMessage: { type: "string" }
+                    },
+                    required: ["id", "label"]
+                  }
+                },
+                multiSelect: {
+                  type: "boolean",
+                  description: "\u5141\u8BB8\u591A\u9009\u3002\u9ED8\u8BA4 false\u3002",
+                  default: false
+                },
+                allowOther: {
+                  type: "boolean",
+                  description: "\u663E\u793A\u201C\u5176\u4ED6\u201D\u81EA\u7531\u8F93\u5165\u884C\u3002\u9ED8\u8BA4 true\u3002",
+                  default: true
+                },
+                required: {
+                  type: "boolean",
+                  description: "\u662F\u5426\u5FC5\u987B\u56DE\u7B54\u624D\u80FD\u63D0\u4EA4\u3002\u9ED8\u8BA4 true\u3002",
+                  default: true
+                }
+              },
+              required: ["id", "question", "choices"]
+            }
+          },
           blocking: {
             type: "boolean",
             description: [
@@ -37452,7 +37548,7 @@ var init_uiAskChoiceTool = __esm({
             default: true
           }
         },
-        required: ["question", "choices"]
+        required: []
       }
     };
   }
@@ -106909,13 +107005,15 @@ function renderDialogOverflow(text, colorEnabled = resolveCliColorEnabled()) {
 function renderDialogCommand(text, colorEnabled = resolveCliColorEnabled()) {
   return themeText(`  ${text}`, "danger", colorEnabled);
 }
-var DIALOG_CURSOR;
+var DIALOG_CURSOR, DIALOG_CHECKED, DIALOG_UNCHECKED;
 var init_dialogFrame = __esm({
   "packages/cli/tui/dialogFrame.ts"() {
     "use strict";
     init_terminalStyles();
     init_theme();
     DIALOG_CURSOR = "\u276F";
+    DIALOG_CHECKED = "\u25C9";
+    DIALOG_UNCHECKED = "\u25CB";
   }
 });
 
@@ -107257,6 +107355,496 @@ var init_confirmDialog = __esm({
   }
 });
 
+// packages/ai/tools/askChoiceState.ts
+function normalizeAskChoiceArgs(args2) {
+  const blocking = args2.blocking !== false;
+  if (Array.isArray(args2.questions) && args2.questions.length > 0) {
+    return {
+      questions: args2.questions.map(
+        (q, i) => normalizeQuestion(q, i)
+      ),
+      blocking
+    };
+  }
+  const question = String(args2.question ?? "").trim();
+  const choices = Array.isArray(args2.choices) ? args2.choices : [];
+  if (!question || choices.length === 0) {
+    return { questions: [], blocking };
+  }
+  return {
+    questions: [
+      normalizeQuestion(
+        { question, choices, multiSelect: false, allowOther: true, required: true },
+        0
+      )
+    ],
+    blocking
+  };
+}
+function normalizeQuestion(raw, index) {
+  return {
+    id: String(raw?.id ?? `q${index}`),
+    question: String(raw?.question ?? "").trim(),
+    choices: (Array.isArray(raw?.choices) ? raw.choices : []).map(
+      (c, ci) => ({
+        id: String(c?.id ?? `c${ci}`),
+        label: String(c?.label ?? "").trim(),
+        ...typeof c?.detail === "string" && c.detail.trim() ? { detail: c.detail.trim() } : {},
+        ...typeof c?.userMessage === "string" && c.userMessage.trim() ? { userMessage: c.userMessage.trim() } : {}
+      })
+    ),
+    multiSelect: raw?.multiSelect === true,
+    allowOther: raw?.allowOther !== false,
+    required: raw?.required !== false
+  };
+}
+function createInitialAskChoiceState(questions) {
+  return {
+    questions,
+    activeIndex: 0,
+    questionStates: questions.map(() => ({
+      cursorIndex: 0,
+      selectedIds: [],
+      pickedId: null,
+      otherText: "",
+      otherFocused: false
+    })),
+    phase: "active"
+  };
+}
+function askChoiceReducer(state4, action3) {
+  if (state4.phase !== "active") return state4;
+  switch (action3.type) {
+    case "CANCEL":
+      return { ...state4, phase: "cancelled" };
+    case "SUBMIT": {
+      if (!canSubmit(state4)) return state4;
+      return { ...state4, phase: "submitted" };
+    }
+    case "SWITCH_TAB": {
+      const idx = clamp3(action3.index, 0, state4.questions.length - 1);
+      return { ...state4, activeIndex: idx };
+    }
+    case "NEXT_TAB": {
+      const idx = Math.min(state4.activeIndex + 1, state4.questions.length - 1);
+      return { ...state4, activeIndex: idx };
+    }
+    case "PREV_TAB": {
+      const idx = Math.max(state4.activeIndex - 1, 0);
+      return { ...state4, activeIndex: idx };
+    }
+    case "MOVE_CURSOR": {
+      const qs = state4.questionStates[state4.activeIndex];
+      const q = state4.questions[state4.activeIndex];
+      const maxIndex = q.allowOther ? q.choices.length : q.choices.length - 1;
+      const next = clamp3(qs.cursorIndex + action3.delta, 0, maxIndex);
+      const newQs = [...state4.questionStates];
+      newQs[state4.activeIndex] = {
+        ...qs,
+        cursorIndex: next,
+        otherFocused: false
+      };
+      return { ...state4, questionStates: newQs };
+    }
+    case "TOGGLE_AT_CURSOR": {
+      const qs = state4.questionStates[state4.activeIndex];
+      const q = state4.questions[state4.activeIndex];
+      if (!q.multiSelect) return state4;
+      const isOtherRow = qs.cursorIndex >= q.choices.length;
+      if (isOtherRow) {
+        const newQs2 = [...state4.questionStates];
+        newQs2[state4.activeIndex] = { ...qs, otherFocused: !qs.otherFocused };
+        return { ...state4, questionStates: newQs2 };
+      }
+      const choiceId = q.choices[qs.cursorIndex]?.id;
+      if (!choiceId) return state4;
+      const has = qs.selectedIds.includes(choiceId);
+      const newSelected = has ? qs.selectedIds.filter((id) => id !== choiceId) : [...qs.selectedIds, choiceId];
+      const newQs = [...state4.questionStates];
+      newQs[state4.activeIndex] = { ...qs, selectedIds: newSelected };
+      return { ...state4, questionStates: newQs };
+    }
+    case "SELECT_AT_CURSOR": {
+      const qs = state4.questionStates[state4.activeIndex];
+      const q = state4.questions[state4.activeIndex];
+      const isOtherRow = qs.cursorIndex >= q.choices.length;
+      if (isOtherRow) {
+        const newQs2 = [...state4.questionStates];
+        newQs2[state4.activeIndex] = { ...qs, otherFocused: true };
+        return { ...state4, questionStates: newQs2 };
+      }
+      const choiceId = q.choices[qs.cursorIndex]?.id;
+      if (!choiceId) return state4;
+      if (q.multiSelect) {
+        const has = qs.selectedIds.includes(choiceId);
+        const newSelected = has ? qs.selectedIds.filter((id) => id !== choiceId) : [...qs.selectedIds, choiceId];
+        const newQs2 = [...state4.questionStates];
+        newQs2[state4.activeIndex] = { ...qs, selectedIds: newSelected };
+        return { ...state4, questionStates: newQs2 };
+      }
+      const newQs = [...state4.questionStates];
+      newQs[state4.activeIndex] = { ...qs, pickedId: choiceId, otherFocused: false };
+      if (state4.questions.length === 1) {
+        return {
+          ...state4,
+          questionStates: newQs,
+          phase: "submitted"
+        };
+      }
+      const nextTab = Math.min(
+        state4.activeIndex + 1,
+        state4.questions.length - 1
+      );
+      return {
+        ...state4,
+        questionStates: newQs,
+        activeIndex: nextTab
+      };
+    }
+    case "FOCUS_OTHER": {
+      const qs = state4.questionStates[state4.activeIndex];
+      const newQs = [...state4.questionStates];
+      newQs[state4.activeIndex] = { ...qs, otherFocused: true };
+      return { ...state4, questionStates: newQs };
+    }
+    case "BLUR_OTHER": {
+      const qs = state4.questionStates[state4.activeIndex];
+      const newQs = [...state4.questionStates];
+      newQs[state4.activeIndex] = { ...qs, otherFocused: false };
+      return { ...state4, questionStates: newQs };
+    }
+    case "SET_OTHER_TEXT": {
+      const qs = state4.questionStates[state4.activeIndex];
+      const newQs = [...state4.questionStates];
+      newQs[state4.activeIndex] = { ...qs, otherText: action3.text };
+      return { ...state4, questionStates: newQs };
+    }
+    default:
+      return state4;
+  }
+}
+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(state4) {
+  return state4.questions.every(
+    (q, i) => isQuestionAnswered(q, state4.questionStates[i])
+  );
+}
+function buildAskChoiceResult(state4) {
+  if (state4.phase === "cancelled") return { kind: "cancelled" };
+  if (state4.phase !== "submitted") return { kind: "cancelled" };
+  const answers = state4.questions.map((q, i) => {
+    const qs = state4.questionStates[i];
+    const selectedIds = q.multiSelect ? qs.selectedIds : qs.pickedId ? [qs.pickedId] : [];
+    const otherText = qs.otherText.trim();
+    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);
+    }
+    return {
+      questionId: q.id,
+      selectedIds,
+      otherText,
+      userMessage: parts.join("\n")
+    };
+  });
+  return { kind: "submitted", answers };
+}
+function clamp3(value, min, max) {
+  return Math.max(min, Math.min(max, value));
+}
+var init_askChoiceState = __esm({
+  "packages/ai/tools/askChoiceState.ts"() {
+    "use strict";
+  }
+});
+
+// packages/cli/tui/askChoiceDialog.ts
+function renderTabBar(questions, activeIndex, colorEnabled) {
+  const tabs = questions.map((q, i) => {
+    const label = `Q${i + 1}`;
+    if (i === activeIndex) {
+      return colorEnabled ? `${themeColorSequence("accent")}\x1B[1m ${label} \x1B[0m` : `[${label}]`;
+    }
+    return colorEnabled ? themeText(` ${label} `, "muted", colorEnabled) : ` ${label} `;
+  });
+  const submitLabel = "Submit";
+  return tabs.join("  ") + "  " + (colorEnabled ? themeText(submitLabel, "chrome", colorEnabled) : submitLabel);
+}
+function renderFooter(colorEnabled) {
+  const hints = "type answer  \u21B5save  tab switch  s submit  esc cancel";
+  return colorEnabled ? themeText(`  ${hints}`, "chrome", colorEnabled) : `  ${hints}`;
+}
+function renderAskChoiceFrame(state4) {
+  const colorEnabled = resolveCliColorEnabled();
+  const q = state4.questions[state4.activeIndex];
+  const qs = state4.questionStates[state4.activeIndex];
+  const lines = [];
+  lines.push(renderDialogTitle("question"));
+  lines.push("");
+  if (state4.questions.length > 1) {
+    lines.push(renderTabBar(state4.questions, state4.activeIndex, colorEnabled));
+    lines.push("");
+  }
+  lines.push(
+    colorEnabled ? `${themeColorSequence("accent")}? ${q.question}\x1B[0m` : `? ${q.question}`
+  );
+  if (q.multiSelect) {
+    lines.push(
+      colorEnabled ? themeText("  Space to toggle, Enter to confirm selection.", "muted", colorEnabled) : "  Space to toggle, Enter to confirm selection."
+    );
+  } else {
+    lines.push(
+      colorEnabled ? themeText("  Type your answer, then press Enter to save.", "muted", colorEnabled) : "  Type your answer, then press Enter to save."
+    );
+  }
+  lines.push("");
+  const totalRows = q.choices.length + (q.allowOther ? 1 : 0);
+  const window2 = computeVisibleWindow({
+    selectedIndex: qs.cursorIndex,
+    total: totalRows
+  });
+  if (window2.start > 0) {
+    lines.push(
+      colorEnabled ? themeText(`  \u2191 ${window2.start} more`, "chrome", colorEnabled) : `  \u2191 ${window2.start} more`
+    );
+  }
+  for (let i = window2.start; i < window2.end; i++) {
+    if (i < q.choices.length) {
+      const choice = q.choices[i];
+      const focused = qs.cursorIndex === i;
+      const checkbox = q.multiSelect ? qs.selectedIds.includes(choice.id) ? DIALOG_CHECKED : DIALOG_UNCHECKED : qs.pickedId === choice.id ? DIALOG_CHECKED : void 0;
+      lines.push(
+        renderDialogRow({
+          label: `[${i + 1}] ${choice.label}`,
+          ...choice.detail ? { detail: choice.detail } : {},
+          focused,
+          ...checkbox ? { checkbox } : {}
+        })
+      );
+    } else {
+      const focused = qs.cursorIndex === i;
+      const marker = focused ? DIALOG_CURSOR : " ";
+      const otherContent = qs.otherFocused ? `${qs.otherText}\u2588` : qs.otherText || "";
+      const row = `${marker} [${i + 1}] Other: ${otherContent}`;
+      if (focused && colorEnabled) {
+        lines.push(
+          `\x1B[1m${themeColorSequence("accent")}${row}\x1B[0m`
+        );
+      } else {
+        lines.push(row);
+      }
+    }
+  }
+  if (window2.end < totalRows) {
+    lines.push(
+      colorEnabled ? themeText(`  \u2193 ${totalRows - window2.end} more`, "chrome", colorEnabled) : `  \u2193 ${totalRows - window2.end} more`
+    );
+  }
+  lines.push("");
+  lines.push(renderFooter(colorEnabled));
+  return lines.join("\n");
+}
+async function runAskChoiceDialog(args2) {
+  const { request } = args2;
+  const normalized = normalizeAskChoiceArgs({
+    question: request.question,
+    choices: request.choices,
+    questions: request.questions,
+    blocking: request.blocking
+  });
+  if (normalized.questions.length === 0) {
+    return { kind: "cancelled" };
+  }
+  const q0 = normalized.questions[0];
+  if (normalized.questions.length === 1 && !q0.multiSelect && !q0.allowOther) {
+  }
+  let state4 = createInitialAskChoiceState(normalized.questions);
+  const output2 = args2.output ?? process.stdout;
+  const input2 = args2.input ?? process.stdin;
+  const readKey = args2.readKey ?? createRawKeyReader(input2);
+  const wasRaw = Boolean(input2.isTTY && input2.isRaw);
+  let renderedLineCount = 0;
+  const bottomAnchored = Boolean(args2.bottomAnchored && args2.bottomRow);
+  const resolveBottomRow = () => Math.max(
+    1,
+    typeof args2.bottomRow === "function" ? args2.bottomRow() : args2.bottomRow ?? 0
+  );
+  let lastBottomRow = 0;
+  const paint = () => {
+    const frame = renderAskChoiceFrame(state4);
+    const lines = frame.split("\n");
+    const lineCount = lines.length;
+    const canPosition = outputIsTty(output2) && typeof output2.write === "function";
+    if (bottomAnchored && canPosition) {
+      const anchorRow = resolveBottomRow();
+      clearAnchoredLines(
+        output2,
+        lastBottomRow > 0 ? lastBottomRow : anchorRow,
+        renderedLineCount
+      );
+      for (let i = 0; i < lines.length; i++) {
+        const row = anchorRow - (lines.length - 1 - i);
+        if (row < 1) break;
+        output2.write(`\x1B[${row};1H\x1B[2K${lines[i]}`);
+      }
+      lastBottomRow = anchorRow;
+      renderedLineCount = lineCount;
+      return;
+    }
+    if (canPosition) {
+      for (let i = 0; i < renderedLineCount; i++) {
+        output2.write("\x1B[1A\x1B[2K");
+      }
+      output2.write(`${frame}
+`);
+      renderedLineCount = lineCount;
+      return;
+    }
+    if (typeof output2.write === "function") {
+      output2.write(`${frame}
+`);
+    }
+    renderedLineCount = lineCount;
+  };
+  const resizeTarget = output2;
+  const onOutputResize = () => paint();
+  if (input2.isTTY && !wasRaw) {
+    input2.setRawMode?.(true);
+  }
+  if (bottomAnchored && outputIsTty(output2)) {
+    resizeTarget.on?.("resize", onOutputResize);
+  }
+  paint();
+  try {
+    while (state4.phase === "active") {
+      const sequence = await readKey();
+      if (sequence == null) {
+        state4 = askChoiceReducer(state4, { type: "CANCEL" });
+        break;
+      }
+      let action3 = null;
+      if (isCancel(sequence)) {
+        action3 = { type: "CANCEL" };
+      } else if (sequence === CSI_TAB) {
+        action3 = { type: "NEXT_TAB" };
+      } else if (sequence === CSI_SHIFT_TAB) {
+        action3 = { type: "PREV_TAB" };
+      } else if (isArrowUp(sequence)) {
+        action3 = { type: "MOVE_CURSOR", delta: -1 };
+      } else if (isArrowDown(sequence)) {
+        action3 = { type: "MOVE_CURSOR", delta: 1 };
+      } else if (sequence === CSI_SPACE) {
+        action3 = { type: "TOGGLE_AT_CURSOR" };
+      } else if (sequence === "s" && !state4.questionStates[state4.activeIndex].otherFocused && canSubmit(state4)) {
+        action3 = { type: "SUBMIT" };
+      } else if (isSubmit(sequence)) {
+        const qs = state4.questionStates[state4.activeIndex];
+        const q = state4.questions[state4.activeIndex];
+        const isOtherRow = qs.cursorIndex >= q.choices.length;
+        if (qs.otherFocused) {
+          action3 = { type: "BLUR_OTHER" };
+        } else if (isOtherRow && !qs.otherFocused) {
+          action3 = { type: "FOCUS_OTHER" };
+        } else {
+          action3 = { type: "SELECT_AT_CURSOR" };
+        }
+      } else if (sequence === CSI_BACKSPACE || sequence === CSI_BACKSPACE_ALT) {
+        const qs = state4.questionStates[state4.activeIndex];
+        if (qs.otherFocused && qs.otherText.length > 0) {
+          action3 = {
+            type: "SET_OTHER_TEXT",
+            text: qs.otherText.slice(0, -1)
+          };
+        }
+      } else if (sequence.length === 1 && sequence.charCodeAt(0) >= 32) {
+        const qs = state4.questionStates[state4.activeIndex];
+        if (qs.otherFocused) {
+          action3 = {
+            type: "SET_OTHER_TEXT",
+            text: qs.otherText + sequence
+          };
+        }
+      }
+      if (action3) {
+        const prev = state4;
+        state4 = askChoiceReducer(state4, action3);
+        if (state4.phase !== "active") break;
+        if (action3.type === "BLUR_OTHER" && state4.questions.length === 1 && canSubmit(state4)) {
+          state4 = askChoiceReducer(state4, { type: "SUBMIT" });
+          break;
+        }
+        paint();
+      }
+    }
+  } finally {
+    resizeTarget.off?.("resize", onOutputResize);
+    readKey.dispose?.();
+    if (input2.isTTY) {
+      drainInputBuffer(input2);
+      if (!wasRaw) input2.setRawMode?.(false);
+      if (bottomAnchored) {
+        clearAnchoredLines(
+          output2,
+          lastBottomRow > 0 ? lastBottomRow : resolveBottomRow(),
+          renderedLineCount
+        );
+      } else {
+        for (let i = 0; i < renderedLineCount; i++) {
+          output2.write("\x1B[1A\x1B[2K");
+        }
+      }
+      renderedLineCount = 0;
+    }
+  }
+  const result = buildAskChoiceResult(state4);
+  if (result.kind === "cancelled") {
+    return { kind: "cancelled" };
+  }
+  if (result.answers.length === 1) {
+    const a = result.answers[0];
+    return {
+      kind: "selected",
+      userMessage: a.userMessage,
+      label: a.selectedIds.map((id) => {
+        const q = normalized.questions[0];
+        return q.choices.find((c) => c.id === id)?.label ?? "";
+      }).join(", ") || a.otherText || ""
+    };
+  }
+  return {
+    kind: "multi-submitted",
+    answers: result.answers,
+    userMessage: result.answers.map((a) => a.userMessage).filter(Boolean).join("\n\n")
+  };
+}
+var CSI_TAB, CSI_SHIFT_TAB, CSI_BACKSPACE, CSI_BACKSPACE_ALT, CSI_SPACE;
+var init_askChoiceDialog = __esm({
+  "packages/cli/tui/askChoiceDialog.ts"() {
+    "use strict";
+    init_askChoiceState();
+    init_dialogFrame();
+    init_selectDialog();
+    init_terminalStyles();
+    init_theme();
+    CSI_TAB = "	";
+    CSI_SHIFT_TAB = "\x1B[Z";
+    CSI_BACKSPACE = "\x7F";
+    CSI_BACKSPACE_ALT = "\b";
+    CSI_SPACE = " ";
+  }
+});
+
 // packages/cli/tui/dialogHost.ts
 function resolveTtyRows(output2) {
   if (typeof output2 === "object" && output2 !== null && "rows" in output2 && typeof output2.rows === "number") {
@@ -107294,6 +107882,92 @@ var init_dialogHost = __esm({
   }
 });
 
+// packages/cli/tui/activityIndicator.ts
+function createActivityIndicator(deps) {
+  const now = deps.now ?? (() => Date.now());
+  const frameIntervalMs = deps.frameIntervalMs ?? ACTIVITY_FRAME_INTERVAL_MS;
+  const fallbackDelayMs = deps.fallbackDelayMs ?? ACTIVITY_FALLBACK_DELAY_MS;
+  const setIntervalFn = deps.setIntervalFn ?? ((cb, ms) => setInterval(cb, ms));
+  const clearIntervalFn = deps.clearIntervalFn ?? ((handle) => clearInterval(handle));
+  let explicitLabel = null;
+  let explicitStartedAt = 0;
+  let fallbackActive = false;
+  let fallbackStartedAt = 0;
+  let lastActivityAt = 0;
+  let frameIndex = 0;
+  let timer = null;
+  const elapsedSecFrom = (startedAt) => startedAt > 0 ? Math.max(0, Math.floor((now() - startedAt) / 1e3)) : 0;
+  const tick = () => {
+    frameIndex += 1;
+    if (explicitLabel === null && !fallbackActive && deps.isTurnActive() && lastActivityAt > 0 && now() - lastActivityAt >= fallbackDelayMs) {
+      fallbackActive = true;
+      fallbackStartedAt = now();
+    }
+    deps.onRepaint();
+  };
+  const ensureTimer = () => {
+    if (timer === null) {
+      timer = setIntervalFn(tick, frameIntervalMs);
+    }
+  };
+  const report = (label) => {
+    lastActivityAt = now();
+    if (label !== null) {
+      explicitLabel = label;
+      if (explicitStartedAt === 0) explicitStartedAt = lastActivityAt;
+      fallbackActive = false;
+      fallbackStartedAt = 0;
+    } else {
+      explicitLabel = null;
+      explicitStartedAt = 0;
+      fallbackActive = false;
+      fallbackStartedAt = 0;
+    }
+    ensureTimer();
+    deps.onRepaint();
+  };
+  const getView = () => {
+    if (!deps.isTurnActive()) return null;
+    const frame = ACTIVITY_FRAMES[frameIndex % ACTIVITY_FRAMES.length];
+    if (explicitLabel !== null) {
+      return {
+        frame,
+        label: explicitLabel,
+        elapsedSec: elapsedSecFrom(explicitStartedAt)
+      };
+    }
+    if (fallbackActive) {
+      return {
+        frame,
+        label: deps.fallbackLabel(),
+        elapsedSec: elapsedSecFrom(fallbackStartedAt)
+      };
+    }
+    return null;
+  };
+  const stop = () => {
+    if (timer !== null) {
+      clearIntervalFn(timer);
+      timer = null;
+    }
+    explicitLabel = null;
+    explicitStartedAt = 0;
+    fallbackActive = false;
+    fallbackStartedAt = 0;
+    lastActivityAt = 0;
+  };
+  return { report, getView, stop };
+}
+var ACTIVITY_FRAMES, ACTIVITY_FRAME_INTERVAL_MS, ACTIVITY_FALLBACK_DELAY_MS;
+var init_activityIndicator = __esm({
+  "packages/cli/tui/activityIndicator.ts"() {
+    "use strict";
+    ACTIVITY_FRAMES = ["\xB7", "~", "\u2248", "\u223F", "\u2248", "~"];
+    ACTIVITY_FRAME_INTERVAL_MS = 150;
+    ACTIVITY_FALLBACK_DELAY_MS = 1200;
+  }
+});
+
 // packages/ai/agent/utils/sortUtils.ts
 function sortAgentsFavoriteOwnedPublic(items) {
   const map = /* @__PURE__ */ new Map();
@@ -110678,44 +111352,21 @@ async function startTuiWorkspace(options) {
   let buffer = "";
   let cursorPos = 0;
   let activeTurnAbort = null;
-  let activityLabel = null;
-  let activityStartedAt = 0;
-  let activityFrameIndex = 0;
-  let activityTimer = null;
-  const stopActivity = () => {
-    if (activityTimer !== null) {
-      clearInterval(activityTimer);
-      activityTimer = null;
-    }
-    activityLabel = null;
-    activityStartedAt = 0;
-  };
-  const activityReporter = (label) => {
-    if (label !== null) {
-      activityLabel = label;
-      if (activityStartedAt === 0) {
-        activityStartedAt = Date.now();
-      }
-      if (activityTimer === null) {
-        activityTimer = setInterval(() => {
-          activityFrameIndex += 1;
-          if (fixedInput.active && !fixedInput.isPaused()) {
-            output2.write("\x1B[?2026h\x1B[?25l");
-            try {
-              fixedInput.repaint(buffer);
-            } finally {
-              output2.write("\x1B[?25h\x1B[?2026l");
-            }
-          }
-        }, 150);
-      }
-    } else {
-      stopActivity();
+  const activityIndicator = createActivityIndicator({
+    isTurnActive: () => activeTurnAbort !== null,
+    fallbackLabel: () => `${state4.agentName} -> working`,
+    onRepaint: () => {
       if (fixedInput.active && !fixedInput.isPaused()) {
-        fixedInput.repaint(buffer);
+        output2.write("\x1B[?2026h\x1B[?25l");
+        try {
+          fixedInput.repaint(buffer);
+        } finally {
+          output2.write("\x1B[?25h\x1B[?2026l");
+        }
       }
     }
-  };
+  });
+  const activityReporter = (label) => activityIndicator.report(label);
   let explicitAgentSwitch = false;
   let copyViewExitResolver = null;
   const history = createTurnHistory();
@@ -110814,25 +111465,15 @@ ${t("copyViewHint")}
       scheduleRender();
     }) : output2;
     const requestUserChoice = isInteractiveInput(input2) && dialogHost ? async (req) => {
-      const items = req.choices.map((c) => ({
-        label: c.label
-      }));
       try {
-        const pickResult = await dialogHost.run(
-          (anchor) => runSelectDialog({
-            items,
-            title: req.question,
+        return await dialogHost.run(
+          (anchor) => runAskChoiceDialog({
+            request: req,
             input: input2,
             output: output2,
             ...anchor
           })
         );
-        if (pickResult.kind === "selected") {
-          const choice = req.choices[pickResult.index];
-          const userMessage = choice?.userMessage?.trim() || choice?.label || "";
-          return { kind: "selected", userMessage, label: choice?.label ?? "" };
-        }
-        return { kind: "cancelled" };
       } catch {
         return { kind: "cancelled" };
       }
@@ -110885,7 +111526,7 @@ ${t("copyViewHint")}
       }
       return { ok: !wasAborted, aborted: wasAborted };
     } finally {
-      stopActivity();
+      activityIndicator.stop();
       activeTurnAbort = null;
       explicitAgentSwitch = false;
     }
@@ -111244,17 +111885,15 @@ ${err.message}` : ""}`
         return base;
       },
       getActivityLine: () => {
-        if (activityLabel === null) return null;
+        const view = activityIndicator.getView();
+        if (view === null) return null;
         const colorEnabled = resolveCliColorEnabled();
-        const FRAMES = ["\xB7", "~", "\u2248", "\u223F", "\u2248", "~"];
-        const frame = FRAMES[activityFrameIndex % FRAMES.length];
-        const elapsedSec = activityStartedAt > 0 ? Math.max(0, Math.floor((Date.now() - activityStartedAt) / 1e3)) : 0;
-        const elapsed = formatElapsedSeconds(elapsedSec);
+        const elapsed = formatElapsedSeconds(view.elapsedSec);
         const stopHint = t("stopHint");
         if (!colorEnabled) {
-          return `${frame} ${activityLabel} (${elapsed}) \xB7 ${stopHint}`;
+          return `${view.frame} ${view.label} (${elapsed}) \xB7 ${stopHint}`;
         }
-        return themeText(frame, "accent") + " " + themeText(activityLabel, "muted") + themeText(` (${elapsed})`, "chrome") + themeText(` \xB7 ${stopHint}`, "chrome");
+        return themeText(view.frame, "accent") + " " + themeText(view.label, "muted") + themeText(` (${elapsed})`, "chrome") + themeText(` \xB7 ${stopHint}`, "chrome");
       },
       getQueueLines: () => {
         if (!chatQueueBinding || chatQueueBinding.queueLength() === 0) return [];
@@ -111343,12 +111982,27 @@ ${err.message}` : ""}`
         if (busyLock) {
           const submittedText2 = result.submit;
           const trimmedText = submittedText2.trim();
-          if (trimmedText === "/context" || trimmedText === "/ctx") {
+          const busySlashCommand = trimmedText.split(/\s+/)[0]?.toLowerCase();
+          const isBusyLocalSlash = busySlashCommand === "/context" || busySlashCommand === "/ctx" || busySlashCommand === "/switch";
+          if (isBusyLocalSlash) {
+            const beforeAgentKey = state4.agentKey;
             const res = handleTuiInput(submittedText2, state4);
-            state4 = res.nextState;
-            if (res.output) {
-              output2.write(`${res.output}
+            if (res.action) {
+              output2.write(
+                "Model picker isn't available while a reply is running. Use `/switch <name>` to switch now (takes effect on the next turn), or wait for the reply to finish.\n"
+              );
+            } else {
+              state4 = res.nextState;
+              let msg = res.output;
+              if (busySlashCommand === "/switch" && res.nextState.agentKey !== beforeAgentKey) {
+                const hint = "Note: the new model takes effect on the next turn. Switching models may consume more tokens because the conversation context is re-sent to the new model.";
+                msg = msg ? `${msg}
+${hint}` : hint;
+              }
+              if (msg) {
+                output2.write(`${msg}
 `);
+              }
             }
             buffer = "";
             cursorPos2 = 0;
@@ -111571,8 +112225,9 @@ var init_readlineWorkspace = __esm({
     init_updateCommands();
     init_processSpawn();
     init_confirmDialog();
-    init_selectDialog();
+    init_askChoiceDialog();
     init_dialogHost();
+    init_activityIndicator();
     init_agentPicker();
     init_agentCatalog();
     init_dialogPicker();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nolo-cli",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "type": "module",
   "description": "Agent-first terminal workspace for Nolo",
   "bin": {