@duetso/agent 0.1.59 → 0.1.61

package/dist/src/tui/app.js

@@ -2,7 +2,7 @@ import { BoxRenderable, createCliRenderer, decodePasteBytes, fg, ScrollBoxRender
 import { writeClipboardText } from "./clipboard.js";
 import { describeMacClipboardTypes, loadImageFromPath, looksLikeImageFilePath, persistPastedImage, sniffImageMimeType, tryReadClipboardImage, tryReadClipboardText, } from "./paste.js";
 import { parseCopyArgument, selectCopyText } from "./transcript-log.js";
-import { activeFileAutocompleteToken, activeSkillAutocompleteToken, AUTOCOMPLETE_LIMITS, BUILT_IN_SLASH_COMMANDS, fileAutocompleteMatches, formatQuestionOptionDescription, formatSkillAutocompleteDescription, moveQuestionOptionSelection, moveSkillAutocompleteSelection, questionPickerAnswerPayload, skillAutocompleteMatches, } from "./autocomplete.js";
+import { activeFileAutocompleteToken, activeSkillAutocompleteToken, AUTOCOMPLETE_LIMITS, BUILT_IN_SLASH_COMMANDS, commitActiveAnswer, fileAutocompleteMatches, formatQuestionOptionDescription, formatSkillAutocompleteDescription, moveQuestionHighlight, moveSkillAutocompleteSelection, NO_HIGHLIGHT, restoreSavedAnswer, skillAutocompleteMatches, } from "./autocomplete.js";
 import { homedir } from "node:os";
 import { buildFileIndex } from "./file-index.js";
 import { DUET_BANNER_LINES_COMPACT, historyDisplayBlocks, limitHistoryDisplayMessages, } from "./history.js";
@@ -12,7 +12,7 @@ import { orderedSelectableStarters, selectStarters } from "./starters.js";
 import { COLORS, HINT_IDLE, HINT_RUNNING, HINT_SELECTION_COPY } from "./theme.js";
 // Re-exports preserve the historical `tui/app.js` entry point used by tests
 // and external callers; the implementations live in focused leaf modules.
-export { activeFileAutocompleteToken, activeSkillAutocompleteToken, fileAutocompleteMatches, formatQuestionOptionDescription, formatSkillAutocompleteDescription, moveQuestionOptionSelection, moveSkillAutocompleteSelection, questionPickerAnswerPayload, replaceFileAutocompleteToken, replaceSkillAutocompleteToken, skillAutocompleteMatches, } from "./autocomplete.js";
+export { activeFileAutocompleteToken, activeSkillAutocompleteToken, commitActiveAnswer, fileAutocompleteMatches, formatQuestionOptionDescription, formatSkillAutocompleteDescription, moveQuestionHighlight, moveSkillAutocompleteSelection, NO_HIGHLIGHT, questionPickerAnswer, replaceFileAutocompleteToken, replaceSkillAutocompleteToken, restoreSavedAnswer, skillAutocompleteMatches, } from "./autocomplete.js";
 export { formatSkillAutocompleteItem } from "./autocomplete.js";
 export { DUET_BANNER_LINES, historyDisplayBlocks, limitHistoryDisplayMessages, startupHeaderLines, } from "./history.js";
 import { assembleToolBlock, formatToolBlock, truncateToolText } from "./tool-formatters.js";
@@ -872,11 +872,16 @@ export async function runTui(input) {
         }
     }
     function formatMemoryEventBody(event) {
-        if (!event.observations || event.observations.length === 0) {
+        const hasObservations = Boolean(event.observations && event.observations.length > 0);
+        const hasBumps = Boolean(event.usageBumpedObservations && event.usageBumpedObservations.length > 0);
+        if (!hasObservations && !hasBumps) {
             return "";
         }
-        const content = event.observations.map((observation) => observation.content).join("\n\n");
-        return truncateToolText(`${event.message}\n${content}`);
+        const sections = [event.message];
+        if (hasObservations) {
+            sections.push(event.observations.map((observation) => observation.content).join("\n\n"));
+        }
+        return truncateToolText(sections.join("\n"));
     }
     // ---- input handling --------------------------------------------------------
     let skillAutocompleteSkills = [];
@@ -892,7 +897,20 @@ export async function runTui(input) {
     let fileAutocompleteItems = [];
     let fileAutocompleteSelectedIndex = 0;
     let pendingQuestions = [];
-    let questionOptionSelectedIndex = 0;
+    let questionActiveIndex = 0;
+    // `NO_HIGHLIGHT` (-1) means no row is highlighted yet — the user must press
+    // Up/Down to land on a concrete row. Single-select live-records the
+    // highlight as the answer; multi-select uses highlight purely for
+    // navigation and toggles the checked set on Space/Enter.
+    let questionOptionSelectedIndex = NO_HIGHLIGHT;
+    // Per-question checked indices for the active multi-select question. Reset
+    // when the picker advances to the next question; single-select questions
+    // simply ignore this set and use `questionOptionSelectedIndex` instead.
+    let questionMultiSelectChecked = new Set();
+    // Answers collected while walking the picker, keyed by question text. We
+    // dispatch the full map once the user finishes the last question, or flush
+    // it early when they decide to type a free-form prompt instead.
+    let questionAccumulatedAnswers = {};
     let suppressNextEscapeExit = false;
     function skillAutocompleteIsOpen() {
         return Boolean(skillAutocompleteToken && skillAutocompleteItems.length > 0);
@@ -901,9 +919,12 @@ export async function runTui(input) {
         return Boolean(fileAutocompleteToken && fileAutocompleteItems.length > 0);
     }
     function questionPickerIsOpen() {
-        const question = pendingQuestions[0];
+        const question = pendingQuestions[questionActiveIndex];
         return Boolean(question && question.options.length > 0);
     }
+    function activeQuestion() {
+        return pendingQuestions[questionActiveIndex];
+    }
     function hideSkillAutocomplete() {
         skillAutocompleteToken = undefined;
         skillAutocompleteItems = [];
@@ -928,7 +949,10 @@ export async function runTui(input) {
     }
     function hideQuestions() {
         pendingQuestions = [];
-        questionOptionSelectedIndex = 0;
+        questionActiveIndex = 0;
+        questionOptionSelectedIndex = NO_HIGHLIGHT;
+        questionMultiSelectChecked = new Set();
+        questionAccumulatedAnswers = {};
         questionPanel.visible = false;
         for (const row of questionRows) {
             row.visible = false;
@@ -937,46 +961,176 @@ export async function runTui(input) {
     }
     function showQuestions(questions) {
         pendingQuestions = questions;
-        questionOptionSelectedIndex = 0;
+        questionActiveIndex = 0;
+        questionOptionSelectedIndex = NO_HIGHLIGHT;
+        questionMultiSelectChecked = new Set();
+        questionAccumulatedAnswers = {};
         renderQuestions();
     }
+    /**
+     * Total navigable rows for the active question. The Up/Down handler clamps
+     * navigation to what is actually rendered on screen so a user cannot land
+     * the highlight on a row they cannot see.
+     */
+    function activeRowCount() {
+        const question = activeQuestion();
+        if (!question)
+            return 0;
+        const optionLimit = question.multiSelect ? QUESTION_OPTION_LIMIT - 1 : QUESTION_OPTION_LIMIT;
+        const visibleOptionCount = Math.min(question.options.length, optionLimit);
+        return visibleOptionCount + (question.multiSelect ? 1 : 0);
+    }
+    /**
+     * Row index of the synthetic Done row when the active question is
+     * multi-select; `undefined` otherwise so callers don't compare against a
+     * sentinel value. The Done row sits one past the last visible option,
+     * clamped to the same limit `renderQuestions` uses.
+     */
+    function activeQuestionDoneIndex() {
+        const question = activeQuestion();
+        if (!question?.multiSelect)
+            return undefined;
+        const optionLimit = QUESTION_OPTION_LIMIT - 1;
+        return Math.min(question.options.length, optionLimit);
+    }
     function renderQuestions() {
-        const question = pendingQuestions[0];
+        const question = activeQuestion();
         if (!question || question.options.length === 0) {
             hideQuestions();
             return;
         }
         questionPanel.visible = true;
-        questionTitle.content = question.header
+        const baseTitle = question.header
             ? `${question.header}: ${question.question}`
             : question.question;
-        const visibleOptions = question.options.slice(0, QUESTION_OPTION_LIMIT);
+        const positionPrefix = pendingQuestions.length > 1 ? `(${questionActiveIndex + 1}/${pendingQuestions.length}) ` : "";
+        const navHint = pendingQuestions.length > 1 ? " [←/→ navigate]" : "";
+        questionTitle.content = `${positionPrefix}${baseTitle}${navHint}`;
+        const optionLimit = question.multiSelect ? QUESTION_OPTION_LIMIT - 1 : QUESTION_OPTION_LIMIT;
+        const visibleOptions = question.options.slice(0, optionLimit);
+        const doneIndex = activeQuestionDoneIndex();
         for (const [index, row] of questionRows.entries()) {
-            const option = visibleOptions[index];
-            if (!option) {
-                row.visible = false;
-                row.content = "";
+            if (index < visibleOptions.length) {
+                const option = visibleOptions[index];
+                const highlighted = index === questionOptionSelectedIndex;
+                const checkbox = question.multiSelect
+                    ? questionMultiSelectChecked.has(index)
+                        ? "[x] "
+                        : "[ ] "
+                    : "";
+                const labelColor = highlighted ? COLORS.status : COLORS.user;
+                const description = formatQuestionOptionDescription(option.description);
+                const labelLine = `${checkbox}${option.label}`;
+                row.content = description
+                    ? t `${fg(labelColor)(labelLine)}\n${description}`
+                    : t `${fg(labelColor)(labelLine)}`;
+                row.fg = highlighted ? COLORS.agent : COLORS.hint;
+                row.visible = true;
                 continue;
             }
-            const selected = index === questionOptionSelectedIndex;
-            const labelColor = selected ? COLORS.status : COLORS.user;
-            const description = formatQuestionOptionDescription(option.description);
-            row.content = description
-                ? t `${fg(labelColor)(option.label)}\n${description}`
-                : t `${fg(labelColor)(option.label)}`;
-            row.fg = selected ? COLORS.agent : COLORS.hint;
-            row.visible = true;
+            if (question.multiSelect && index === visibleOptions.length) {
+                // Synthetic Done row carries no checkbox prefix and self-documents
+                // its purpose so users discover how to advance from a multi-select.
+                const highlighted = doneIndex === questionOptionSelectedIndex;
+                const labelColor = highlighted ? COLORS.status : COLORS.user;
+                const description = formatQuestionOptionDescription("Advance to next question");
+                row.content = t `${fg(labelColor)("Done")}\n${description}`;
+                row.fg = highlighted ? COLORS.agent : COLORS.hint;
+                row.visible = true;
+                continue;
+            }
+            row.visible = false;
+            row.content = "";
+        }
+    }
+    function moveActiveQuestionHighlight(direction) {
+        const question = activeQuestion();
+        if (!question)
+            return;
+        questionOptionSelectedIndex = moveQuestionHighlight(questionOptionSelectedIndex, activeRowCount(), direction);
+        // Single-select live-records the highlight as the answer so a
+        // prompt-flush or arrow-nav captures it without requiring Space/Enter.
+        // Multi-select keeps highlight separate from the toggled set.
+        if (!question.multiSelect) {
+            questionAccumulatedAnswers = commitActiveAnswer(question, questionOptionSelectedIndex, questionMultiSelectChecked, questionAccumulatedAnswers);
+        }
+        renderQuestions();
+    }
+    function toggleActiveMultiSelectOption() {
+        const question = activeQuestion();
+        if (!question?.multiSelect)
+            return;
+        if (questionMultiSelectChecked.has(questionOptionSelectedIndex)) {
+            questionMultiSelectChecked.delete(questionOptionSelectedIndex);
+        }
+        else {
+            questionMultiSelectChecked.add(questionOptionSelectedIndex);
         }
+        questionAccumulatedAnswers = commitActiveAnswer(question, questionOptionSelectedIndex, questionMultiSelectChecked, questionAccumulatedAnswers);
+        renderQuestions();
+    }
+    function navigateActiveQuestion(direction) {
+        if (pendingQuestions.length <= 1)
+            return false;
+        const nextIndex = questionActiveIndex + direction;
+        if (nextIndex < 0 || nextIndex >= pendingQuestions.length)
+            return false;
+        questionAccumulatedAnswers = commitActiveAnswer(activeQuestion(), questionOptionSelectedIndex, questionMultiSelectChecked, questionAccumulatedAnswers);
+        questionActiveIndex = nextIndex;
+        const restored = restoreSavedAnswer(activeQuestion(), questionAccumulatedAnswers);
+        questionOptionSelectedIndex = restored.selectedIndex;
+        questionMultiSelectChecked = restored.checked;
+        renderQuestions();
+        return true;
+    }
+    function describeAnswerLabels(question, labels) {
+        if (labels.length === 0)
+            return question.multiSelect ? "(no selection)" : "";
+        return labels.join(", ");
+    }
+    /**
+     * Handle Space/Enter when the picker is open and the composer is empty.
+     * Multi-select on a regular row toggles; multi-select on the Done row
+     * advances. Single-select always advances (highlight = answer is already
+     * live-recorded by Up/Down). No-op when nothing is highlighted yet so the
+     * user is forced to make an explicit choice (or skip via Right-arrow).
+     */
+    function confirmActiveSelection() {
+        const question = activeQuestion();
+        if (!question)
+            return false;
+        if (questionOptionSelectedIndex === NO_HIGHLIGHT)
+            return false;
+        if (question.multiSelect && questionOptionSelectedIndex !== activeQuestionDoneIndex()) {
+            toggleActiveMultiSelectOption();
+            return true;
+        }
+        return advanceOrSubmit();
     }
-    function submitSelectedQuestionOption() {
-        const answers = questionPickerAnswerPayload(pendingQuestions, questionOptionSelectedIndex);
-        if (!answers)
+    function advanceOrSubmit() {
+        const question = activeQuestion();
+        if (!question)
             return false;
-        const answerText = Object.values(answers).join("\n");
-        recordTranscriptEntry("user", answerText);
-        appendBlock("you:", answerText, COLORS.user);
+        const accumulatedForActive = questionAccumulatedAnswers[question.question] ?? [];
+        const transcriptText = describeAnswerLabels(question, accumulatedForActive);
+        if (transcriptText) {
+            recordTranscriptEntry("user", transcriptText);
+            appendBlock("you:", transcriptText, COLORS.user);
+        }
+        if (questionActiveIndex < pendingQuestions.length - 1) {
+            questionActiveIndex += 1;
+            const restored = restoreSavedAnswer(activeQuestion(), questionAccumulatedAnswers);
+            questionOptionSelectedIndex = restored.selectedIndex;
+            questionMultiSelectChecked = restored.checked;
+            renderQuestions();
+            return true;
+        }
         void input.session
-            .answer({ questions: pendingQuestions, answers, behavior: "follow_up" })
+            .answer({
+            questions: pendingQuestions,
+            answers: questionAccumulatedAnswers,
+            behavior: "follow_up",
+        })
             .catch(reportError);
         hideQuestions();
         markRunning();
@@ -1314,17 +1468,33 @@ export async function runTui(input) {
         }
         if (questionPickerIsOpen()) {
             if (key.name === "up") {
-                questionOptionSelectedIndex = moveQuestionOptionSelection(questionOptionSelectedIndex, Math.min(pendingQuestions[0]?.options.length ?? 0, QUESTION_OPTION_LIMIT), -1);
-                renderQuestions();
+                moveActiveQuestionHighlight(-1);
                 key.preventDefault();
                 return;
             }
             if (key.name === "down") {
-                questionOptionSelectedIndex = moveQuestionOptionSelection(questionOptionSelectedIndex, Math.min(pendingQuestions[0]?.options.length ?? 0, QUESTION_OPTION_LIMIT), 1);
-                renderQuestions();
+                moveActiveQuestionHighlight(1);
+                key.preventDefault();
+                return;
+            }
+            // Space confirms the active selection only when the composer is empty
+            // so users can still type a free-form prompt that includes spaces.
+            if (key.name === "space" && inputField.plainText.length === 0) {
                 key.preventDefault();
+                confirmActiveSelection();
                 return;
             }
+            // Left/Right navigate between questions, but only when the composer is
+            // empty so editing a typed prompt with arrow keys still works.
+            if ((key.name === "left" || key.name === "right") &&
+                inputField.plainText.length === 0 &&
+                pendingQuestions.length > 1) {
+                const direction = key.name === "left" ? -1 : 1;
+                if (navigateActiveQuestion(direction)) {
+                    key.preventDefault();
+                    return;
+                }
+            }
             if (key.name === "escape") {
                 key.preventDefault();
                 suppressNextEscapeExit = true;
@@ -1348,7 +1518,7 @@ export async function runTui(input) {
                 submit(value);
             }
             else if (questionPickerIsOpen()) {
-                submitSelectedQuestionOption();
+                confirmActiveSelection();
             }
             else if (startersAreVisible()) {
                 submitHighlightedStarter();
@@ -1631,11 +1801,29 @@ export async function runTui(input) {
             const lines = submittedImages.map((p) => `📎 ${p.label}: ${p.path}`).join("\n");
             appendBlock(null, lines, COLORS.hint);
         }
-        hideQuestions();
         const images = submittedImages.map((p) => p.attachment);
         // Reset before dispatch so an in-flight error does not leave the user
         // double-charged with the same attachments on retry.
         clearPendingImages();
+        // If the question picker is open, treat the typed message as a flush:
+        // dispatch whatever answers were already collected together with the new
+        // prompt text so the model sees one combined turn instead of dropping
+        // the partial answers on the floor.
+        if (pendingQuestions.length > 0) {
+            void input.session
+                .answer({
+                questions: pendingQuestions,
+                answers: questionAccumulatedAnswers,
+                behavior: "follow_up",
+                message,
+                images,
+            })
+                .catch(reportError);
+            hideQuestions();
+            if (!running)
+                markRunning();
+            return;
+        }
         // Every submit — running or idle — is a follow_up. While the agent is
         // running this queues; while idle it kicks off a fresh turn. Single
         // mental model: type, press Enter, your message lands.