@deepseek-harness-tui/dsh-tui 0.13.0 → 0.14.0

package/lib/types/components/messages/subagentTranscript.js

@@ -0,0 +1,304 @@
+/**
+ * Fold, paging and live-merge helpers for a child's transcript, shared by
+ * the subagent Detail scene and the main-screen AgentTranscriptScene so a
+ * child row reads the same wherever it is shown.
+ */
+import React from 'react';
+import { ARGS_PREVIEW_LIMIT, preview, RESULT_PREVIEW_LIMIT } from '../../channel/transcript.js';
+/** Presentations that never earn a duplicate card here either (the main
+ *  projector's rule): a nested delegation renders as the subagent card, a
+ *  todo write lives in the todo panel, a question in its dialog. */
+export const TRANSCRIPT_SUPPRESSED_CARDS = new Set(['subagent', 'todo', 'question']);
+/** Settle a tool card with its recorded result. */
+function applyToolResult(tool, event) {
+    tool.durationMs = Math.max(0, event.time - tool.startedAt);
+    if (event.isError) {
+        tool.status = 'error';
+        tool.errorText = event.errorText ?? '';
+    }
+    else {
+        tool.status = 'ok';
+        tool.resultText = event.text !== '' ? preview(event.text, RESULT_PREVIEW_LIMIT) : undefined;
+        tool.resultFull = event.text !== '' ? event.text : undefined;
+        tool.resultView = event.presentation;
+    }
+}
+/** Fold one history page's lane events into leaf rows (oldest first;
+ *  `into` may already hold the older pages' rows). A tool result whose
+ *  call is not on this page goes to `page.orphans` (or is dropped without
+ *  one) until the older page with the call is folded; consecutive blocks
+ *  of one API message join (the store splits a message into per-block
+ *  entries sharing the anchor).
+ *
+ *  `messages` (the agent↔agent feed for THIS child, newest last) is
+ *  interleaved by observedAt: each is flushed as an `agent-message` leaf
+ *  before the first event observed at/after it. Only the messages that
+ *  fall inside this page's span are placed (see TranscriptPagePlacement),
+ *  so loading an older page never repeats one. Returns the lower bound of
+ *  the span this page took — the `before` for the next older page. */
+export function foldTranscriptLeaves(events, into, messages = [], page = {}) {
+    const start = events.find(event => eventTime(event) !== undefined);
+    const from = page.olderPagesRemain === true && start !== undefined ? eventTime(start) : Number.NEGATIVE_INFINITY;
+    const until = page.before ?? Number.POSITIVE_INFINITY;
+    const own = messages.filter(message => message.observedAt >= from && message.observedAt < until);
+    let next = 0;
+    const flushMessages = (before) => {
+        while (next < own.length && own[next].observedAt <= before) {
+            const message = own[next];
+            into.push({ kind: 'agent-message', key: `am-${message.messageId}`, message });
+            next += 1;
+        }
+    };
+    for (const event of events) {
+        const at = eventTime(event);
+        if (at !== undefined)
+            flushMessages(at);
+        if (event.type === 'tool.call') {
+            if (event.presentation !== undefined && TRANSCRIPT_SUPPRESSED_CARDS.has(event.presentation.card))
+                continue;
+            into.push({ kind: 'tool', key: event.callId, tool: {
+                    callId: event.callId,
+                    name: event.name,
+                    argsText: preview(event.argsJson, ARGS_PREVIEW_LIMIT),
+                    argsFull: event.argsJson,
+                    status: 'running',
+                    callView: event.presentation,
+                    startedAt: event.time,
+                } });
+            continue;
+        }
+        if (event.type === 'tool.result') {
+            let row;
+            for (let i = into.length - 1; i >= 0; i -= 1) {
+                const leaf = into[i];
+                if (leaf.kind === 'tool' && leaf.tool.callId === event.callId) {
+                    row = leaf;
+                    break;
+                }
+            }
+            if (row === undefined) {
+                page.orphans?.set(event.callId, event);
+                continue;
+            }
+            applyToolResult(row.tool, event);
+            continue;
+        }
+        if (event.type === 'assistant.message') {
+            for (const block of event.blocks) {
+                if (block.type === 'reasoning') {
+                    const last = into.at(-1);
+                    if (last !== undefined && last.kind === 'thinking' && last.key === event.anchor)
+                        last.text = last.text === '' ? block.text ?? '' : `${last.text}\n${block.text ?? ''}`;
+                    else
+                        into.push({ kind: 'thinking', key: event.anchor, text: block.text ?? '' });
+                    continue;
+                }
+                if (block.type === 'reasoning-tokens' || block.type === 'reasoning-signature') {
+                    into.push({ kind: 'thinking-unavailable', key: `${event.anchor}:ua`, tokens: block.type === 'reasoning-tokens' && Number.isFinite(Number(block.text)) ? Number(block.text) : undefined });
+                    continue;
+                }
+                if (block.type === 'text') {
+                    const last = into.at(-1);
+                    if (last !== undefined && last.kind === 'text' && last.key === event.anchor)
+                        last.text = `${last.text}\n${block.text ?? ''}`;
+                    else
+                        into.push({ kind: 'text', key: event.anchor, text: block.text ?? '' });
+                }
+            }
+        }
+    }
+    flushMessages(Number.POSITIVE_INFINITY);
+    return from;
+}
+const eventTime = (event) => event.type === 'tool.call' || event.type === 'tool.result' || event.type === 'assistant.message' ? event.time : undefined;
+/** The newest page of a child's transcript, folded. */
+export function foldNewestPage(agentId, page, messages) {
+    const leaves = [];
+    const orphans = new Map();
+    const messagesFrom = foldTranscriptLeaves(page.events, leaves, messages, { olderPagesRemain: page.hasOlder, orphans });
+    // The newest page can itself repeat one anchor (text, tool, text of one
+    // message): its rows carry unique render keys from the start.
+    return { status: 'ready', agentId, leaves: uniqueRenderKeys(leaves), parentAgentId: page.parentAgentId, hasOlder: page.hasOlder, skippedFromStart: page.skippedFromStart, ...(page.sourceCursor === undefined ? {} : { sourceCursor: page.sourceCursor }), loadingOlder: false, messagesFrom, orphanResults: orphans };
+}
+/** One older page folded in front of a loaded transcript: its agent
+ *  messages are the ones before the loaded span, and the results the newer
+ *  pages held for its calls settle those calls' cards. */
+export function foldOlderPage(current, page, messages) {
+    const fresh = [];
+    const orphans = new Map();
+    const messagesFrom = foldTranscriptLeaves(page.events, fresh, messages, { olderPagesRemain: page.hasOlder, before: current.messagesFrom, orphans });
+    const carried = new Map(current.orphanResults);
+    for (const leaf of fresh) {
+        if (leaf.kind !== 'tool')
+            continue;
+        const result = carried.get(leaf.tool.callId);
+        if (result === undefined)
+            continue;
+        applyToolResult(leaf.tool, result);
+        carried.delete(leaf.tool.callId);
+    }
+    for (const [callId, result] of orphans)
+        carried.set(callId, result);
+    const { sourceCursor: previousCursor, ...previous } = current;
+    return { ...previous, leaves: prependOlderLeaves(fresh, current.leaves), hasOlder: page.hasOlder, skippedFromStart: page.skippedFromStart, ...(page.sourceCursor === undefined ? {} : { sourceCursor: page.sourceCursor }), loadingOlder: false, messagesFrom, orphanResults: carried };
+}
+/** One load-older window (messages; matches the backend's newest page). */
+export const TRANSCRIPT_OLDER_CHUNK = 400;
+/** The retained output window both stores keep (channel/activity.ts and
+ *  dsh-adapter/subagents.ts): a tail at this size is a WINDOW, and the
+ *  output page says so when no transcript source can show the rest. */
+export const OUTPUT_WINDOW_CAP = 160;
+/** Render keys must be unique per row: the store's block-per-entry split can
+ *  repeat one anchor inside a page (a text, a tool and another text of one
+ *  message), so a repeated key gets an ordinal suffix; a leaf is never
+ *  dropped for its key. The first occurrence keeps its key, later ones are
+ *  copied. */
+export function uniqueRenderKeys(leaves) {
+    const seen = new Map();
+    return leaves.map(leaf => {
+        const n = seen.get(leaf.key) ?? 0;
+        seen.set(leaf.key, n + 1);
+        return n === 0 ? leaf : { ...leaf, key: `${leaf.key}#${n + 1}` };
+    });
+}
+/** Prepend one older page's folded leaves. The store splits one API message
+ *  into per-block entries sharing the anchor, so a block can only be cut
+ *  across pages at the boundary: the older page's last leaf against the
+ *  current list's first. Those two merge when they share the key and the
+ *  text/thinking kind (the fold already joined everything consecutive
+ *  within a page). Every other leaf keeps its own row in the older page's
+ *  order: a different kind under the same key is kept, and a tool between
+ *  two text parts of one message stays between them. No current leaf is
+ *  mutated. */
+export function prependOlderLeaves(fresh, current) {
+    let older = fresh;
+    let head = current;
+    const last = fresh.at(-1);
+    const first = current[0];
+    if (last !== undefined && first !== undefined &&
+        (first.kind === 'text' || first.kind === 'thinking') &&
+        first.kind === last.kind && first.key === last.key) {
+        // Same-kind boundary blocks of one message: one continuous block the
+        // page slice cut — the older text precedes, the order it was written in.
+        head = [{ ...first, text: `${last.text}\n${first.text}` }, ...current.slice(1)];
+        older = fresh.slice(0, -1);
+    }
+    return uniqueRenderKeys([...older, ...head]);
+}
+const capLike = (line) => (line.length > 400 ? `${line.slice(0, 400)}…` : line);
+/** Merge the channel's live window into the folded history: tool records
+ *  pair by call id (live status/previews win while the disk has not
+ *  recorded the result; a call the history never saw appends as live),
+ *  and text/thinking tail lines the loaded history already paints are
+ *  suppressed — a settled block's lines are identical on both sides — so
+ *  history and live neither double a row nor drop a tail. */
+export function mergeLiveWindow(leaves, subagent, hasHistory) {
+    const rows = [...leaves];
+    subagent.toolCalls.forEach((call, callIndex) => {
+        let at = -1;
+        for (let i = rows.length - 1; i >= 0; i -= 1) {
+            const row = rows[i];
+            if (row.kind === 'tool' && row.tool.callId === call.id) {
+                at = i;
+                break;
+            }
+        }
+        if (at >= 0) {
+            const leaf = rows[at];
+            // A copy: the history leaves are the transcript state, read again on
+            // every render — the live status only overlays them here.
+            if (leaf.tool.status === 'running' && call.status !== 'running') {
+                rows[at] = { ...leaf, tool: {
+                        ...leaf.tool,
+                        status: call.status === 'failed' ? 'error' : 'ok',
+                        errorText: call.error,
+                        resultText: call.resultPreview,
+                        ...(call.endedAt !== undefined ? { durationMs: Math.max(0, call.endedAt - leaf.tool.startedAt) } : {}),
+                    } };
+            }
+            return;
+        }
+        rows.push({ kind: 'tool', key: call.id ?? `live-call-${callIndex}`, tool: {
+                callId: call.id ?? call.name,
+                name: call.name,
+                argsText: call.argsPreview ?? '',
+                status: call.status === 'failed' ? 'error' : call.status === 'running' ? 'running' : 'ok',
+                startedAt: call.startedAt,
+                ...(call.endedAt !== undefined ? { durationMs: Math.max(0, call.endedAt - call.startedAt) } : {}),
+                ...(call.resultPreview !== undefined ? { resultText: call.resultPreview } : {}),
+                ...(call.error !== undefined ? { errorText: call.error } : {}),
+            } });
+    });
+    if (!hasHistory) {
+        for (const line of subagent.outputEvents)
+            rows.push({ kind: 'live', line });
+        return rows;
+    }
+    const seen = new Set();
+    for (const leaf of leaves) {
+        if (leaf.kind !== 'text' && leaf.kind !== 'thinking')
+            continue;
+        for (const line of leaf.text.split('\n'))
+            if (line.trim() !== '')
+                seen.add(capLike(line));
+    }
+    for (const line of subagent.outputEvents) {
+        if (line.text.trim() !== '' && seen.has(capLike(line.text)))
+            continue;
+        rows.push({ kind: 'live', line });
+    }
+    return rows;
+}
+/**
+ * The paged history of one child: loads the newest page while `active`,
+ * reloads once when `reloadKey` changes (settlement makes the disk copy
+ * final), and prepends older windows on demand.
+ *
+ * The loader and the message feed ride refs: the channel UI proxy mints a
+ * fresh loader per read, and a reload must key on what changed (the child,
+ * activation, settlement), not on a churning identity. An older window is
+ * dropped when the state it was requested for is gone (the view switched
+ * to another agent, or a reload moved the newest page under it).
+ */
+export function useSubagentTranscript(loadTranscript, agentId, active, reloadKey, messages) {
+    const [transcript, setTranscript] = React.useState({ status: 'idle' });
+    const loaderRef = React.useRef(loadTranscript);
+    loaderRef.current = loadTranscript;
+    const messagesRef = React.useRef(messages);
+    messagesRef.current = messages;
+    React.useEffect(() => {
+        const load = loaderRef.current;
+        if (!active || load === undefined)
+            return;
+        let alive = true;
+        setTranscript(prev => prev.status === 'ready' && prev.agentId === agentId ? prev : { status: 'loading' });
+        load(agentId).then(loaded => {
+            if (!alive)
+                return;
+            setTranscript(loaded === null ? { status: 'unavailable' } : foldNewestPage(agentId, loaded, messagesRef.current));
+        }, () => { if (alive)
+            setTranscript({ status: 'unavailable' }); });
+        return () => { alive = false; };
+    }, [active, agentId, reloadKey]);
+    const loadOlder = () => {
+        const load = loaderRef.current;
+        if (transcript.status !== 'ready' || !transcript.hasOlder || transcript.loadingOlder || load === undefined)
+            return;
+        const requestedFor = transcript;
+        const count = requestedFor.sourceCursor === undefined ? Math.min(TRANSCRIPT_OLDER_CHUNK, requestedFor.skippedFromStart) : TRANSCRIPT_OLDER_CHUNK;
+        setTranscript(prev => prev === requestedFor ? { ...prev, loadingOlder: true } : prev);
+        const current = (prev) => prev.status === 'ready' && prev.agentId === requestedFor.agentId && prev.skippedFromStart === requestedFor.skippedFromStart && prev.sourceCursor === requestedFor.sourceCursor;
+        load(requestedFor.agentId, { count, skipFromStart: requestedFor.skippedFromStart, ...(requestedFor.sourceCursor === undefined ? {} : { sourceCursor: requestedFor.sourceCursor }) }).then(older => {
+            setTranscript(prev => {
+                if (!current(prev))
+                    return prev;
+                if (older === null)
+                    return { ...prev, loadingOlder: false };
+                return foldOlderPage(prev, older, messagesRef.current);
+            });
+        }, () => {
+            setTranscript(prev => current(prev) ? { ...prev, loadingOlder: false } : prev);
+        });
+    };
+    return { transcript, loadOlder };
+}

package/lib/types/components/questions/AskUserQuestionPanel.d.ts

@@ -10,6 +10,8 @@
  * appends into that input row (single-select also attaches the option's
  * label, so the answer can carry both `selected` and `custom`); focusing
  * the input row itself and typing gives a pure custom answer.
+ * Local /provider model lists additionally offer a Tab capability editor;
+ * ordinary questionnaires retain the inline-answer behavior.
  *
  * Paste works on the input row like the composer: Ctrl+V/Alt+V (the keymap
  * `paste` binding, remappable in /settings) reads the system clipboard,
@@ -25,7 +27,8 @@
  * never be split into a lone surrogate by ←/→/⌫/Del or a paste boundary.
  */
 import React from 'react';
-import type { QuestionDraft, QuestionSelection } from '../../dsh-adapter/questions.js';
+import type { QuestionDraft, QuestionSelection } from '../../channel/questions.js';
+import type { ProviderModelEditor as ModelEditor } from '../../adapter/ports/channel-settings.js';
 import { type ClipboardRead } from '../../utils/clipboard.js';
 export type AskUserQuestionPanelProps = {
     /** The question to render (from the QuestionStore snapshot). */
@@ -46,11 +49,23 @@ export type AskUserQuestionPanelProps = {
          *  (single-select) shown on first display, before any saved draft — e.g.
          *  the models already enabled on a provider being edited. */
         readonly defaultSelected?: readonly string[];
+        /** A URL the question is about (an MCP server's sign-in page): one line
+         *  under the detail, an OSC 8 hyperlink where the terminal supports it
+         *  (plain otherwise; a scheme that is not http(s)/file/mailto shows
+         *  nothing — the notice row still names it). */
+        readonly link?: string;
+        /** A secret answer (a token, a password): the input row shows one `•`
+         *  per typed code point; the submitted answer is the real text. */
+        readonly secret?: boolean;
+        /** Local /provider draft editor. Ordinary model-facing asks carry none. */
+        readonly modelEditor?: ModelEditor;
         /** Presentation intent tag (rc.6): 'plan-review' switches to the
          *  decision-card layout; an intent never changes the protocol. */
         readonly intent?: {
             readonly kind: 'plan-review';
             readonly approve: string;
+            readonly approveAlso?: readonly string[];
+            readonly decline?: string;
         };
     };
     /** 1-based position within the batch (progress header). */

package/lib/types/components/questions/AskUserQuestionPanel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AskUserQuestionPanel.d.ts","sourceRoot":"","sources":["../../../../src/components/questions/AskUserQuestionPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAMtF,OAAO,EAAiB,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAuB5E,MAAM,MAAM,yBAAyB,GAAG;IACtC,gEAAgE;IAChE,QAAQ,CAAC,QAAQ,EAAE;QACjB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;QACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;YAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;QAC3F,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAA;QAC9B;;oEAE4D;QAC5D,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAA;QAClC;;qEAE6D;QAC7D,QAAQ,CAAC,eAAe,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;QAC5C;0EACkE;QAClE,QAAQ,CAAC,MAAM,CAAC,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;YAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;SAAE,CAAA;KAC7E,CAAA;IACD,2DAA2D;IAC3D,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,sDAAsD;IACtD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,iDAAiD;IACjD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,8EAA8E;IAC9E,QAAQ,CAAC,YAAY,CAAC,EAAE,aAAa,CAAA;IACrC,QAAQ,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACzD,iEAAiE;IACjE,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAA;IAC7B;;;;OAIG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAA;IAClD,uEAAuE;IACvE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAA;IAChD;;;;OAIG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAA;IACnD;;;;OAIG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAA;IAC7D;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAA;IAC5B,yEAAyE;IACzE,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IAC9B,kEAAkE;IAClE,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,IAAI,CAAA;IAClC;;gEAE4D;IAC5D,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAC9B,CAAA;AAED,wBAAgB,oBAAoB,CAAC,EACnC,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,YAAY,EACZ,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,SAAS,EACT,qBAAqB,EACrB,SAAiB,EACjB,QAAQ,EACR,YAAY,EACZ,UAAkB,GACnB,EAAE,yBAAyB,GAAG,KAAK,CAAC,SAAS,CA2pB7C"}
+{"version":3,"file":"AskUserQuestionPanel.d.ts","sourceRoot":"","sources":["../../../../src/components/questions/AskUserQuestionPanel.tsx"],"names":[],"mappings":"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"}

package/lib/types/components/questions/AskUserQuestionPanel.js

@@ -11,6 +11,8 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
  * appends into that input row (single-select also attaches the option's
  * label, so the answer can carry both `selected` and `custom`); focusing
  * the input row itself and typing gives a pure custom answer.
+ * Local /provider model lists additionally offer a Tab capability editor;
+ * ordinary questionnaires retain the inline-answer behavior.
  *
  * Paste works on the input row like the composer: Ctrl+V/Alt+V (the keymap
  * `paste` binding, remappable in /settings) reads the system clipboard,
@@ -32,11 +34,13 @@ import { useDeclaredCursor } from '../../ink/hooks/use-declared-cursor.js';
 import { Divider } from '../design-system/Divider.js';
 import { POINTER } from '../../terminal-utils/figures.js';
 import { PlanReviewPanel } from './PlanReviewPanel.js';
+import { ProviderModelEditor } from './ProviderModelEditor.js';
 import { QuestionMinimizedBar } from './QuestionMinimizedBar.js';
 import { isPlainReturnInput } from '../../utils/modifiers.js';
 import { actionMatches, comboDisplay, effectiveComboDisplay, primaryComboString } from '../../utils/keymap.js';
 import { flattenPasteInline } from '../../dsh-adapter/sanitize.js';
 import { readClipboard } from '../../utils/clipboard.js';
+import { createHyperlink } from '../../terminal-utils/hyperlink.js';
 import { listWindow } from '../listWindow.js';
 /** Unmodified arrows switch questions; Ctrl/Alt/Super/Shift stay caret motion. */
 function isPlainArrow(key) {
@@ -45,6 +49,8 @@ function isPlainArrow(key) {
 const CHECKED = '◉';
 const UNCHECKED = '○';
 const PENCIL = '✎';
+/** One masked code point of a secret answer (`question.secret`). */
+const SECRET_MASK = '•';
 /**
  * Paste cap for one answer field, in code points. Typing is naturally
  * bounded (humans cannot type unboundedly) and the protocol places no
@@ -65,6 +71,13 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
     const options = question.options ?? [];
     const multiSelect = question.multiSelect === true;
     const hideCustomInput = question.hideCustomInput === true && options.length > 0;
+    const modelEditor = typeof question.modelEditor?.read === 'function'
+        && typeof question.modelEditor.save === 'function' && typeof question.modelEditor.edited === 'function'
+        ? question.modelEditor : undefined;
+    const [editingModel, setEditingModel] = React.useState(null);
+    // Opening Tab and later keys may share one stdin batch. Stop the list
+    // synchronously, before the nested editor has had a chance to mount.
+    const editingRef = React.useRef(false);
     const { rows: terminalRows } = useTerminalSize();
     /** Rows: the real options plus the inline input row at the tail. */
     const rowCount = options.length + (hideCustomInput ? 0 : 1);
@@ -143,7 +156,9 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
     // Optional header/detail/input/error rows are charged explicitly. Long
     // lists then use fixed one/two-line rows so listWindow's budget is exact;
     // short questionnaires retain their existing wrapped presentation.
-    const detailRows = question.detail === undefined ? 0 : question.detail.split('\n').length + 1;
+    const linkText = question.link === undefined || question.link === '' ? '' : createHyperlink(question.link);
+    const detailRows = (question.detail === undefined ? 0 : question.detail.split('\n').length + 1)
+        + (linkText === '' ? 0 : question.detail === undefined ? 2 : 1);
     const reservedRows = 12
         + (question.header === undefined ? 0 : 1)
         + detailRows
@@ -166,7 +181,7 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
     // three visual variants): its nodeCache rect IS the caret cell, so (0, 0)
     // stays exact under CJK widths and line wrapping without any
     // layout-affecting wrapper Box.
-    const caretRef = useDeclaredCursor({ line: 0, column: 0, active: !hideCustomInput && !collapsed });
+    const caretRef = useDeclaredCursor({ line: 0, column: 0, active: !hideCustomInput && !collapsed && editingModel === null });
     const moveFocus = (delta) => {
         if (rowCount <= 1)
             return;
@@ -309,7 +324,34 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
             ...(textRef.current !== '' ? { custom: textRef.current } : {}),
         };
     };
+    const openModelEditor = (model, event) => {
+        editingRef.current = true;
+        setEditingModel(model);
+        event.stopImmediatePropagation();
+    };
+    const manualModelAtCaret = () => {
+        const points = [...textRef.current];
+        const isSeparator = (char) => char === undefined || /[,，\s]/u.test(char);
+        let at = Math.min(cursorRef.current, points.length);
+        if (at === points.length || isSeparator(points[at]))
+            at -= 1;
+        while (at >= 0 && isSeparator(points[at]))
+            at -= 1;
+        if (at < 0)
+            return '';
+        let start = at;
+        let end = at + 1;
+        while (start > 0 && !isSeparator(points[start - 1]))
+            start -= 1;
+        while (end < points.length && !isSeparator(points[end]))
+            end += 1;
+        return points.slice(start, end).join('');
+    };
     useInput((input, key, event) => {
+        if (editingRef.current) {
+            event.stopImmediatePropagation();
+            return;
+        }
         // The mounted panel owns folding, just like answering: hidden asks
         // cannot steal approval/dialog keys, and an interrupting questionnaire
         // still works when Chat yields to an underlying screen's open flag.
@@ -362,6 +404,16 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
             return;
         }
         if (onInputRow()) {
+            if (key.tab && modelEditor !== undefined) {
+                const manualModel = manualModelAtCaret();
+                if (manualModel !== '') {
+                    openModelEditor(manualModel, event);
+                    return;
+                }
+                placeFocus(0);
+                event.stopImmediatePropagation();
+                return;
+            }
             if (key.upArrow) {
                 moveFocus(-1);
                 return;
@@ -447,6 +499,13 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
                 onForward(currentDraft());
             return;
         }
+        if (key.tab && !key.shift && !key.ctrl && !key.meta && !key.super && modelEditor !== undefined) {
+            const model = options[focusRef.current]?.label;
+            if (model !== undefined) {
+                openModelEditor(model, event);
+            }
+            return;
+        }
         if (key.tab && !hideCustomInput) {
             placeFocus(options.length);
             setError(null);
@@ -483,8 +542,11 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
     const questionText = question.question.split('\n')[0]?.replace(/\s+/gu, ' ').trim() ?? '';
     // The caret counts code points (see the module header), so the caret
     // char and the visual split index into the point array — never raw
-    // UTF-16 offsets, which could land inside a surrogate pair.
-    const textPoints = [...customText];
+    // UTF-16 offsets, which could land inside a surrogate pair. A secret
+    // question paints one mask per code point instead: the same caret math,
+    // nothing of the typed text on screen.
+    const typedPoints = [...customText];
+    const textPoints = question.secret === true ? typedPoints.map(() => SECRET_MASK) : typedPoints;
     const cursorChar = customCursor < textPoints.length ? textPoints[customCursor] : ' ';
     /** Mouse: click the input row to focus it (same as Tab). */
     const focusInputRow = () => {
@@ -533,11 +595,12 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
                 const description = windowedOptions
                     ? option.description?.replace(/\s+/gu, ' ').trim()
                     : option.description;
-                return (_jsxs(Box, { flexDirection: "row", marginTop: !windowedOptions && focused ? 1 : 0, onClick: () => clickOption(absoluteIndex), onMouseEnter: () => setHoverIndex(absoluteIndex), onMouseLeave: () => setHoverIndex(current => (current === absoluteIndex ? -1 : current)), backgroundColor: hoverIndex === absoluteIndex && !focused ? 'userMessageBackgroundHover' : undefined, children: [_jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { color: focused ? 'accent' : undefined, bold: focused, children: pointer }) }), _jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { color: focused ? 'accent' : undefined, bold: selected, children: selected ? (multiSelect ? CHECKED : '●') : UNCHECKED }) }), _jsxs(Box, { flexDirection: "column", marginLeft: 1, children: [_jsx(Text, { bold: focused || selected, color: focused ? 'accent' : undefined, wrap: windowedOptions ? 'truncate' : 'wrap', children: label }), description !== undefined && (_jsx(Text, { dimColor: true, wrap: windowedOptions ? 'truncate' : 'wrap', children: description }))] })] }, `${absoluteIndex}:${option.label}`));
+                return (_jsxs(Box, { flexDirection: "row", marginTop: !windowedOptions && focused ? 1 : 0, onClick: () => clickOption(absoluteIndex), onMouseEnter: () => setHoverIndex(absoluteIndex), onMouseLeave: () => setHoverIndex(current => (current === absoluteIndex ? -1 : current)), backgroundColor: hoverIndex === absoluteIndex && !focused ? 'userMessageBackgroundHover' : undefined, children: [_jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { color: focused ? 'accent' : undefined, bold: focused, children: pointer }) }), _jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { color: focused ? 'accent' : undefined, bold: selected, children: selected ? (multiSelect ? CHECKED : '●') : UNCHECKED }) }), _jsxs(Box, { flexDirection: "column", marginLeft: 1, children: [_jsxs(Text, { bold: focused || selected, color: focused ? 'accent' : undefined, wrap: windowedOptions ? 'truncate' : 'wrap', children: [label, modelEditor?.edited(option.label) ? ` ${t('provider-model-edited')}` : ''] }), description !== undefined && (_jsx(Text, { dimColor: true, wrap: windowedOptions ? 'truncate' : 'wrap', children: description }))] })] }, `${absoluteIndex}:${option.label}`));
             }), hideCustomInput ? null : renderInputRow(), multiSelect && fullscreen && (checked.size > 0 || textRef.current !== '') && (_jsxs(Box, { flexDirection: "row", height: 1, marginTop: 1, onClick: submitOptions, onMouseEnter: () => setSubmitHovered(true), onMouseLeave: () => setSubmitHovered(false), backgroundColor: submitHovered ? 'userMessageBackgroundHover' : undefined, children: [_jsx(Text, { color: "accent", children: "\u2713 " }), _jsx(Text, { dimColor: true, children: t('question-submit-selection') })] }))] }));
     const hintParts = inputFocused
         ? [
             t('question-hint-type'),
+            ...(modelEditor === undefined ? [] : [t('provider-model-edit-hint')]),
             t('question-hint-paste', { key: comboDisplay(primaryComboString('paste')) }),
             t('question-hint-enter'),
             ...(options.length > 0 ? [t('question-hint-back')] : []),
@@ -550,6 +613,7 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
         : [
             t('question-hint-select'),
             ...(multiSelect ? [t('question-hint-multi')] : []),
+            ...(modelEditor === undefined ? [] : [t('provider-model-edit-hint')]),
             ...(hideCustomInput ? [] : [t('question-hint-paste', { key: comboDisplay(primaryComboString('paste')) }), t('question-hint-attach')]),
             t('question-hint-enter'),
             onBack === undefined ? t('question-hint-esc') : t('question-hint-previous'),
@@ -564,5 +628,11 @@ export function AskUserQuestionPanel({ question, position, total, answered, init
     if (collapsed) {
         return _jsx(QuestionMinimizedBar, { progress: headerTitle, questionText: questionText, onExpand: onExpand ?? (() => { }) });
     }
-    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, paddingLeft: 2, paddingRight: 2, width: "100%", children: [_jsx(Box, { flexDirection: "column", onClick: onToggleFold, onMouseEnter: () => setHeaderHovered(true), onMouseLeave: () => setHeaderHovered(false), backgroundColor: headerHovered ? 'userMessageBackgroundHover' : undefined, children: _jsx(Divider, { color: "permission", title: `▾${headerTitle}` }) }), _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [question.header !== undefined && (_jsxs(Text, { color: "suggestion", bold: true, children: ["\u25C8 ", question.header] })), _jsx(Text, { bold: true, wrap: "wrap", children: question.question }), question.detail !== undefined && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: question.detail.split('\n').map((line, index) => (_jsx(Text, { dimColor: true, italic: true, wrap: "wrap", children: line }, index))) }))] }), renderOptions(), error !== null && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "error", children: error }) })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: hintParts.join(' · ') }) })] }));
+    if (editingModel !== null && modelEditor !== undefined) {
+        return _jsx(ProviderModelEditor, { model: editingModel, editor: modelEditor, onClose: () => {
+                editingRef.current = false;
+                setEditingModel(null);
+            }, onAbort: onCancel, readClipboardOverride: readClipboardOverride });
+    }
+    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, paddingLeft: 2, paddingRight: 2, width: "100%", children: [_jsx(Box, { flexDirection: "column", onClick: onToggleFold, onMouseEnter: () => setHeaderHovered(true), onMouseLeave: () => setHeaderHovered(false), backgroundColor: headerHovered ? 'userMessageBackgroundHover' : undefined, children: _jsx(Divider, { color: "permission", title: `▾${headerTitle}` }) }), _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [question.header !== undefined && (_jsxs(Text, { color: "suggestion", bold: true, children: ["\u25C8 ", question.header] })), _jsx(Text, { bold: true, wrap: "wrap", children: question.question }), (question.detail !== undefined || linkText !== '') && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [question.detail?.split('\n').map((line, index) => (_jsx(Text, { dimColor: true, italic: true, wrap: "wrap", children: line }, index))), linkText !== '' && _jsx(Text, { wrap: "wrap", children: linkText })] }))] }), renderOptions(), error !== null && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "error", children: error }) })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: hintParts.join(' · ') }) })] }));
 }

package/lib/types/components/questions/PlanReviewPanel.d.ts

@@ -8,9 +8,12 @@
  *
  * Protocol-exact answer mapping (dsh-plan-mode):
  * - Approve: `{ selected: [intent.approve] }` — custom MUST be absent, or
- *   plan-mode treats it as keep-planning-with-feedback.
+ *   plan-mode treats it as keep-planning-with-feedback. An asker may name
+ *   further approving options (`intent.approveAlso`, e.g. Claude's "approve,
+ *   but keep asking for edits"): they follow the same clean-answer rule.
  * - Keep planning / feedback: `{ selected: [declineLabel], custom? }` where
- *   declineLabel is the first option that is not the approve label.
+ *   declineLabel is `intent.decline` when the asker names it, else the first
+ *   option that does not approve (dsh-plan-mode names none).
  * - Esc / Ctrl+C: the store rejects with ASK_CANCELLED, which plan-mode
  *   reads as "the user dismissed the review to speak instead".
  *
@@ -25,7 +28,7 @@
  * never be split by ←/→/⌫/Del (same contract as the plugin InputDialog).
  */
 import React from 'react';
-import type { QuestionSelection } from '../../dsh-adapter/questions.js';
+import type { QuestionSelection } from '../../channel/questions.js';
 import { type ClipboardRead } from '../../utils/clipboard.js';
 export type PlanReviewPanelProps = {
     /** The plan-review question (intent.kind === 'plan-review'). */
@@ -40,6 +43,8 @@ export type PlanReviewPanelProps = {
         readonly intent?: {
             readonly kind: 'plan-review';
             readonly approve: string;
+            readonly approveAlso?: readonly string[];
+            readonly decline?: string;
         };
     };
     readonly onAnswer: (selection: QuestionSelection) => void;

package/lib/types/components/questions/PlanReviewPanel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PlanReviewPanel.d.ts","sourceRoot":"","sources":["../../../../src/components/questions/PlanReviewPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAIvE,OAAO,EAAiB,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAa5E,MAAM,MAAM,oBAAoB,GAAG;IACjC,gEAAgE;IAChE,QAAQ,CAAC,QAAQ,EAAE;QACjB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;QACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;YAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;QAC3F,QAAQ,CAAC,MAAM,CAAC,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;YAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;SAAE,CAAA;KAC7E,CAAA;IACD,QAAQ,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACzD,iEAAiE;IACjE,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAA;IAC7B;;;OAGG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAA;CAC9D,CAAA;AAED,wBAAgB,eAAe,CAAC,EAC9B,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,qBAAqB,GACtB,EAAE,oBAAoB,GAAG,KAAK,CAAC,SAAS,CA4ZxC"}
+{"version":3,"file":"PlanReviewPanel.d.ts","sourceRoot":"","sources":["../../../../src/components/questions/PlanReviewPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAInE,OAAO,EAAiB,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAa5E,MAAM,MAAM,oBAAoB,GAAG;IACjC,gEAAgE;IAChE,QAAQ,CAAC,QAAQ,EAAE;QACjB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;QACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;YAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;QAC3F,QAAQ,CAAC,MAAM,CAAC,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;YAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;YAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAClJ,CAAA;IACD,QAAQ,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACzD,iEAAiE;IACjE,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAA;IAC7B;;;OAGG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAA;CAC9D,CAAA;AAED,wBAAgB,eAAe,CAAC,EAC9B,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,qBAAqB,GACtB,EAAE,oBAAoB,GAAG,KAAK,CAAC,SAAS,CA8ZxC"}

package/lib/types/components/questions/PlanReviewPanel.js

@@ -9,9 +9,12 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  *
  * Protocol-exact answer mapping (dsh-plan-mode):
  * - Approve: `{ selected: [intent.approve] }` — custom MUST be absent, or
- *   plan-mode treats it as keep-planning-with-feedback.
+ *   plan-mode treats it as keep-planning-with-feedback. An asker may name
+ *   further approving options (`intent.approveAlso`, e.g. Claude's "approve,
+ *   but keep asking for edits"): they follow the same clean-answer rule.
  * - Keep planning / feedback: `{ selected: [declineLabel], custom? }` where
- *   declineLabel is the first option that is not the approve label.
+ *   declineLabel is `intent.decline` when the asker names it, else the first
+ *   option that does not approve (dsh-plan-mode names none).
  * - Esc / Ctrl+C: the store rejects with ASK_CANCELLED, which plan-mode
  *   reads as "the user dismissed the review to speak instead".
  *
@@ -48,7 +51,9 @@ const ANSWER_PASTE_MAX_POINTS = 8000;
 export function PlanReviewPanel({ question, onAnswer, onCancel, readClipboardOverride, }) {
     const options = question.options ?? [];
     const approveLabel = question.intent?.approve ?? options[0]?.label;
-    const declineLabel = options.find(option => option.label !== approveLabel)?.label;
+    const approveAlso = question.intent?.approveAlso ?? [];
+    const approves = (label) => label !== undefined && (label === approveLabel || approveAlso.includes(label));
+    const declineLabel = question.intent?.decline ?? options.find(option => !approves(option.label))?.label;
     /** Rows: the asker's options plus the feedback input row at the tail. */
     const rowCount = options.length + 1;
     const [focusIndex, setFocusIndex] = React.useState(0);
@@ -193,11 +198,11 @@ export function PlanReviewPanel({ question, onAnswer, onCancel, readClipboardOve
         if (label === undefined)
             return;
         const text = textRef.current.trim();
-        if (label === approveLabel && text !== '') {
+        if (approves(label) && text !== '') {
             setError(t('plan-review-approve-needs-empty'));
             return;
         }
-        if (label === approveLabel) {
+        if (approves(label)) {
             onAnswer({ selected: [label] });
             return;
         }
@@ -343,7 +348,7 @@ export function PlanReviewPanel({ question, onAnswer, onCancel, readClipboardOve
     };
     return (_jsxs(Box, { flexDirection: "column", marginTop: 1, paddingLeft: 2, paddingRight: 2, width: "100%", children: [_jsx(Divider, { color: "permission", title: ` ${question.header ?? t('plan-review-fallback-header')} ` }), _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { bold: true, wrap: "wrap", children: question.question }), question.detail !== undefined && detailMax > 0 && (_jsx(Box, { flexDirection: "column", marginTop: 1, height: detailMax, flexShrink: 0, children: _jsx(ScrollBox, { ref: detailScrollRef, flexDirection: "column", flexGrow: 1, height: detailMax, children: _jsx(Markdown, { children: question.detail }) }) }))] }), _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [options.map((option, index) => {
                         const focused = index === focusIndex;
-                        const isApprove = option.label === approveLabel;
+                        const isApprove = approves(option.label);
                         return (_jsxs(Box, { flexDirection: "row", marginTop: focused ? 1 : 0, onClick: () => clickOption(index), onMouseEnter: () => setHoverIndex(index), onMouseLeave: () => setHoverIndex(current => (current === index ? -1 : current)), backgroundColor: hoverIndex === index && !focused ? 'userMessageBackgroundHover' : undefined, children: [_jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { color: focused ? 'accent' : undefined, bold: focused, children: focused ? POINTER : ' ' }) }), _jsxs(Box, { flexDirection: "column", marginLeft: 1, children: [_jsxs(Text, { bold: focused, color: focused || isApprove ? 'accent' : undefined, wrap: "wrap", children: [index + 1, ". ", option.label] }), option.description !== undefined && (_jsx(Text, { dimColor: true, wrap: "wrap", children: option.description }))] })] }, option.label));
                     }), _jsxs(Box, { flexDirection: "row", marginTop: inputFocused ? 1 : 0, onClick: focusFeedbackRow, onMouseEnter: () => setHoverIndex(options.length), onMouseLeave: () => setHoverIndex(current => (current === options.length ? -1 : current)), backgroundColor: hoverIndex === options.length && !inputFocused ? 'userMessageBackgroundHover' : undefined, children: [_jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { color: inputFocused ? 'accent' : undefined, bold: inputFocused, children: inputFocused ? POINTER : ' ' }) }), _jsx(Box, { width: 1, flexShrink: 0, children: _jsx(Text, { color: inputFocused ? 'accent' : 'suggestion', children: PENCIL }) }), _jsx(Box, { flexDirection: "row", marginLeft: 1, children: feedback === '' && !inputFocused ? (_jsxs(_Fragment, { children: [_jsx(Text, { ref: caretRef, children: ' ' }), _jsx(Text, { dimColor: true, children: t('plan-review-feedback-placeholder') })] })) : (_jsxs(_Fragment, { children: [_jsx(Text, { wrap: "wrap", children: feedbackPoints.slice(0, cursor).join('') }), inputFocused
                                             ? _jsx(Text, { ref: caretRef, inverse: true, children: cursorChar })