koneck 2.128.41 → 2.128.42

package/dist/ink-chat.js

@@ -221,7 +221,17 @@ function fitCells(text, width, ellipsis = false) {
 }
 /** A picker label uses all of its allocated column, only ellipsising at the actual boundary. */
 export function pickerLabel(text, width) {
-    return fitCells(text, width, true);
+    /*
+     * One column of the field always stays blank, so the label cannot touch what follows it.
+     *
+     * Padding to exactly `width` left no gap for a label that filled the field, and the row ran
+     * together: `muse-glimmer:latestlibrary · local` in an Ollama list, where the name ends and its
+     * group begins is anybody's guess. Every shorter label already had a gap, so this only ever
+     * showed up on the longest one — which is also the one the field was sized from.
+     *
+     * A label one cell shorter beats a label welded to its description.
+     */
+    return fitCells(text, Math.max(1, width - 1), true) + ' ';
 }
 /**
  * Wraps text while keeping the shape it was written in.
@@ -1033,7 +1043,9 @@ export function pickerLabelWidth(labels, descs, width) {
     // Terminal cells, not JS code units: one wide glyph in a model name or session title used to
     // make a supposedly exact row spill past the palette edge.
     const longestDesc = Math.max(0, ...descs.map(displayWidth));
-    const longestLabel = Math.max(18, ...labels.map(displayWidth));
+    // Plus the blank column pickerLabel always keeps, so the longest label is sized to fit whole
+    // rather than being the one label the field truncates.
+    const longestLabel = Math.max(18, ...labels.map(l => displayWidth(l) + 1));
     return Math.max(18, Math.min(longestLabel, width - longestDesc - 4));
 }
 /**
@@ -2205,6 +2217,37 @@ export function App({ config: initialConfig, clearFrame, synchronizedFrames = fa
      */
     const [selAnchor, setSelAnchor] = useState(null);
     const [busy, setBusy] = useState(false);
+    /**
+     * Whether a turn is running, readable from an async path.
+     *
+     * A command started while the agent works must not take ownership of this flag, and cannot know
+     * from a captured render whether it already belonged to somebody.
+     */
+    const busyRef = useRef(false);
+    busyRef.current = busy;
+    /**
+     * Run a command, holding `busy` only if nothing else already is.
+     *
+     * Both callers used to do `setBusy(true)` and then clear it unconditionally when the command
+     * finished — including when a turn was already running, whose flag it then cleared. The live
+     * region is gated on `busy` and the status bar on `agentState`, so the working line vanished
+     * while the bar went on saying "processing" and the turn carried on unseen. Reported as the
+     * agent looking stuck: "it is working on the background, that is bad".
+     *
+     * The command is not what makes the interface busy. A turn is.
+     */
+    async function runCommandDetached(cmd, arg) {
+        const alreadyBusy = busyRef.current;
+        if (!alreadyBusy)
+            setBusy(true);
+        try {
+            await handleCommand(cmd, arg);
+        }
+        finally {
+            if (!alreadyBusy)
+                setBusy(false);
+        }
+    }
     const [agentState, setAgentState] = useState('ready');
     // A shell normally uses the machine name as its tab title. Keep the KONECK mark and workspace
     // there instead. The working marker changes in the terminal chrome only: it does not set React
@@ -3648,10 +3691,16 @@ export function App({ config: initialConfig, clearFrame, synchronizedFrames = fa
         }
     }
     /** The provider's own model listing, kept so the models tab and picker agree on the facts. */
+    const catalogEndpoint = useRef('');
     async function loadModelCatalog() {
         const { listModels } = await import('./model-catalog.js');
         const catalog = await listModels(cfg);
         setModelCatalog(catalog.entries);
+        // The host that answered, kept for the picker's header. endpointFor() resolves from the saved
+        // layers and does not see the session's live baseURL, so it reported ollama's default
+        // localhost:11434 for a list fetched from somewhere else entirely — the one label whose whole
+        // job is to show that the request went to the wrong place.
+        catalogEndpoint.current = catalog.endpoint;
         catalogNote.current = catalog.listed ? null : (catalog.note ?? null);
         return catalog.entries; // empty says so rather than showing zeroes
     }
@@ -3937,8 +3986,7 @@ export function App({ config: initialConfig, clearFrame, synchronizedFrames = fa
             }
             setDraft('');
             setCaret(0);
-            setBusy(true);
-            await handleCommand(item.value, '').finally(() => setBusy(false));
+            await runCommandDetached(item.value, '');
             return;
         }
         if (kind === 'resume') {
@@ -4829,9 +4877,15 @@ export function App({ config: initialConfig, clearFrame, synchronizedFrames = fa
                     ? 'File changes hidden. Edits are still listed with what they touched, just not shown.'
                     : canPin
                         ? 'Live diff panel open and pinned beside the conversation, until `/diff off`.'
+                        // Names where the setting came from. "off for this workspace" was true and unusable:
+                        // reported as `/diff` looking right on one machine and printing this on another, with
+                        // no way to tell that the difference was a saved `altScreen: false` on one of them
+                        // rather than the platform.
                         : 'File changes shown inline in the conversation, until `/diff off`.\n\n'
-                            + 'The side panel needs the alternate screen, which is off for this workspace. '
-                            + '`/altscreen on` moves them into a pinned panel instead.');
+                            + 'The pinned side panel needs the alternate screen, and `altScreen: false` is set '
+                            + 'in this workspace\'s config — so it is off by your choice, not by platform. '
+                            + '`/altscreen on` turns it back on and moves the changes into a pinned panel; '
+                            + '`/config altScreen` shows the current value.');
                 return;
             }
             case '/compact': {
@@ -6431,8 +6485,7 @@ export function App({ config: initialConfig, clearFrame, synchronizedFrames = fa
                 const spaceIdx = task.indexOf(' ');
                 const cmd = spaceIdx === -1 ? task : task.slice(0, spaceIdx);
                 const arg = spaceIdx === -1 ? '' : task.slice(spaceIdx + 1).trim();
-                setBusy(true);
-                void handleCommand(cmd, arg).finally(() => setBusy(false));
+                void runCommandDetached(cmd, arg);
                 return;
             }
             if (!containsSecret(task))
@@ -7241,61 +7294,6 @@ export function App({ config: initialConfig, clearFrame, synchronizedFrames = fa
                                 lines.push('**Sessions**  /sessions · /send <repo> <task> · /ask <repo> <q> · /resume');
                                 lines.push('**Changelog**  github.com/Gubevu/konech/commits/main');
                                 return (_jsx(Box, { marginTop: 1, justifyContent: "flex-end", children: _jsx(Panel, { width: Math.min(barWidth, 62), color: AMBER, title: "KONECK \u00B7 updates & guide", children: lines }) }));
-                            })(), picker && (() => {
-                                const list = visiblePickerItems;
-                                // In the alternate screen, the picker shares a fixed frame with a bordered composer and
-                                // footer. They consume six rows and the picker itself has six non-choice rows (margin,
-                                // border, title/search and pager), so reserve thirteen in total. Letting 16 choices into
-                                // a 24-row frame made Ink reflow the live region and visibly blink on every keypress.
-                                const pickerRows = pickerRowLimit(picker.kind, list.length, termRows, altScreen ? 13 : undefined);
-                                // Keep the highlighted row inside the visible window as the selection moves.
-                                const start = Math.max(0, Math.min(pickIndex - Math.floor(pickerRows / 2), list.length - pickerRows));
-                                const shown = list.slice(Math.max(0, start), Math.max(0, start) + pickerRows);
-                                const title = picker.kind === 'command' ? 'Commands'
-                                    /*
-                                     * The provider's name and the address the list actually came from.
-                                     *
-                                     * The name alone was a claim the list could not support: a header reading "Models -
-                                     * b.ai" over `muse-glimmer:latest`, `qwen2.5-coder:14b` and `qwen3-coder:30b` — an
-                                     * Ollama library, listed from an Ollama endpoint, under somebody else's name. Nothing
-                                     * on screen said where the answer had come from, so a misrouted endpoint looked like a
-                                     * provider serving the wrong models rather than a request going to the wrong host.
-                                     *
-                                     * The host is enough: it is the part that differs when this goes wrong, and a full URL
-                                     * would push the count and the hint off a narrow palette.
-                                     */
-                                    : picker.kind === 'model' ? `Models - ${cfg.provider} · ${endpointHost(endpointFor(cfg.provider).url)}`
-                                        : picker.kind === 'effort' ? 'Reasoning effort'
-                                            : picker.kind === 'resume' ? 'Resume a saved session'
-                                                : picker.kind === 'file' ? 'Reference a file or directory'
-                                                    : 'Connect provider';
-                                // The palette is sized to the rows it is showing rather than to the terminal. On a wide
-                                // screen a list of short model names in a full-width box is mostly empty box.
-                                // The header is a title on the left and a count on the right, on one line. Estimating the
-                                // right-hand side at a constant made "Reference a file or directory" wrap onto two rows.
-                                const countText = pickerCountText(pickIndex, list.length, picker.items.length);
-                                const headWidth = displayWidth(title) + displayWidth(countText) + 3;
-                                // Measure the filtered list, not just its current scroll window. A palette whose right
-                                // edge breathes as the highlight crosses a long description feels broken even when the
-                                // selection itself is correct.
-                                const rowWidth = Math.max(headWidth, ...list.map(it => 38 + (it.current ? 10 : 0) + displayWidth(it.desc) + displayWidth(it.group ?? '') + 3));
-                                const boxWidth = pickerBoxWidth(barWidth, rowWidth + 4);
-                                const width = boxWidth - 4;
-                                // Room for the longest label the list actually holds, rather than a constant. A session
-                                // title is what identifies the row, and 36 cells cut most of them in half.
-                                const labelWidth = pickerLabelWidth(list.map(it => it.label), list.map(it => it.desc), width);
-                                let lastGroup;
-                                return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: CYAN, paddingX: 1, marginTop: 1, width: boxWidth, children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsx(Text, { color: CYAN, bold: true, children: title }), _jsx(Text, { color: DIM, children: countText })] }), _jsxs(Box, { children: [_jsxs(Text, { color: DIM, children: [G.search, " "] }), pickQuery === ''
-                                                    ? _jsx(Text, { color: DIM, children: "type to search" })
-                                                    : _jsx(Text, { color: INK, children: pickQuery }), _jsx(Text, { color: CYAN, children: pickQuery === '' ? '' : '▌' })] }), list.length === 0 && _jsxs(Text, { color: MUTED, children: ["Nothing matches \"", pickQuery, "\""] }), shown.map((item, i) => {
-                                            const absolute = Math.max(0, start) + i;
-                                            const selected = absolute === pickIndex;
-                                            const header = item.group && item.group !== lastGroup ? item.group : null;
-                                            lastGroup = item.group;
-                                            const label = pickerLabel(item.label, labelWidth);
-                                            return (_jsx(Box, { flexDirection: "column", children: _jsx(Text, { backgroundColor: selected ? CYAN : undefined, color: selected ? '#10222A' : INK, bold: selected, children: fitCells(`${selected ? G.caret + ' ' : '  '}${label}` +
-                                                        `${item.current ? '(current) ' : ''}${header ? `${header} · ` : ''}${item.desc}`, width) }) }, item.value + absolute));
-                                        }), list.length > pickerRows && (_jsxs(Text, { color: DIM, children: ["\u2191\u2193 navigate \u00B7 pgup/pgdn jump \u00B7 enter select \u00B7 showing ", Math.max(0, start) + 1, "\u2013", Math.max(0, start) + shown.length, " of ", list.length] }))] }));
                             })(), addProv && (() => {
                                 const shadowed = BUILT_IN_PROVIDERS[addProv.name];
                                 const ask = addProv.step === 'name' ? { label: 'name', hint: 'short and lowercase, e.g. openrouter' }
@@ -7368,7 +7366,69 @@ export function App({ config: initialConfig, clearFrame, synchronizedFrames = fa
                                 return (_jsx(Box, { marginTop: 1, children: _jsx(Panel, { width: panelWidth(lines, barWidth, 46), color: AMBER, title: `Permission — ${modeSpec(mode).label} mode`, children: lines }) }));
                             })()] }), sidePanelOpen && (_jsx(Box, { flexDirection: "column", width: diffPanelWidth, flexShrink: 0, children: diffPanelOpen && _jsx(DiffPanel, { files: liveDiffs, width: diffPanelWidth, scroll: panelScroll, height: Math.max(6, frameRows - 6), activityRows: activityPanelOpen ? 4 : 0, activity: activityPanelOpen ? _jsxs(_Fragment, { children: [_jsxs(Text, { color: CYAN, bold: true, children: ["Activity \u00B7 ", fmtElapsed(busyStart.current ? Date.now() - busyStart.current : 0)] }), _jsx(Text, { color: AMBER, wrap: "truncate", children: ask ? 'Waiting for your approval' : liveToolRef.current
                                             ? 'Running ' + liveToolRef.current.name : thinkingRef.current.chars > 0
-                                            ? 'Waiting for model · reasoning received' : 'Waiting for model' }), _jsx(Text, { color: MUTED, wrap: "truncate", children: liveToolRef.current?.detail || plan?.steps.find(s => s.state !== 'done')?.text || 'esc to interrupt' })] }) : undefined }) }))] }), _jsx(Box, { marginTop: 1, borderStyle: "round", borderColor: busy ? DIM : CYAN, paddingX: 1, width: uiWidth - 5, flexShrink: 0, children: _jsxs(Text, { wrap: "wrap", children: [_jsxs(Text, { color: CYAN, bold: true, children: [G.caret, " "] }), (() => {
+                                            ? 'Waiting for model · reasoning received' : 'Waiting for model' }), _jsx(Text, { color: MUTED, wrap: "truncate", children: liveToolRef.current?.detail || plan?.steps.find(s => s.state !== 'done')?.text || 'esc to interrupt' })] }) : undefined }) }))] }), picker && (() => {
+                const list = visiblePickerItems;
+                // In the alternate screen, the picker shares a fixed frame with a bordered composer and
+                // footer. They consume six rows and the picker itself has six non-choice rows (margin,
+                // border, title/search and pager), so reserve thirteen in total. Letting 16 choices into
+                // a 24-row frame made Ink reflow the live region and visibly blink on every keypress.
+                const pickerRows = pickerRowLimit(picker.kind, list.length, termRows, altScreen ? 13 : undefined);
+                // Keep the highlighted row inside the visible window as the selection moves.
+                const start = Math.max(0, Math.min(pickIndex - Math.floor(pickerRows / 2), list.length - pickerRows));
+                const shown = list.slice(Math.max(0, start), Math.max(0, start) + pickerRows);
+                const title = picker.kind === 'command' ? 'Commands'
+                    /*
+                     * The provider's name and the address the list actually came from.
+                     *
+                     * The name alone was a claim the list could not support: a header reading "Models -
+                     * b.ai" over `muse-glimmer:latest`, `qwen2.5-coder:14b` and `qwen3-coder:30b` — an
+                     * Ollama library, listed from an Ollama endpoint, under somebody else's name. Nothing
+                     * on screen said where the answer had come from, so a misrouted endpoint looked like a
+                     * provider serving the wrong models rather than a request going to the wrong host.
+                     *
+                     * The host is enough: it is the part that differs when this goes wrong, and a full URL
+                     * would push the count and the hint off a narrow palette.
+                     */
+                    : picker.kind === 'model' ? `Models - ${cfg.provider} · ${endpointHost(catalogEndpoint.current || endpointFor(cfg.provider).url)}`
+                        : picker.kind === 'effort' ? 'Reasoning effort'
+                            : picker.kind === 'resume' ? 'Resume a saved session'
+                                : picker.kind === 'file' ? 'Reference a file or directory'
+                                    : 'Connect provider';
+                // The palette is sized to the rows it is showing rather than to the terminal. On a wide
+                // screen a list of short model names in a full-width box is mostly empty box.
+                // The header is a title on the left and a count on the right, on one line. Estimating the
+                // right-hand side at a constant made "Reference a file or directory" wrap onto two rows.
+                const countText = pickerCountText(pickIndex, list.length, picker.items.length);
+                const headWidth = displayWidth(title) + displayWidth(countText) + 3;
+                // Measure the filtered list, not just its current scroll window. A palette whose right
+                // edge breathes as the highlight crosses a long description feels broken even when the
+                // selection itself is correct.
+                const rowWidth = Math.max(headWidth, ...list.map(it => 38 + (it.current ? 10 : 0) + displayWidth(it.desc) + displayWidth(it.group ?? '') + 3));
+                /*
+                 * The frame's width, not the conversation column's. `barWidth` is narrowed to make room
+                 * for the diff panel, and the palette no longer lives in that column — measuring it
+                 * against barWidth is what squeezed the box to 37 cells beside an open panel and turned
+                 * `muse-glimmer:latest` into `muse-glimmer:la...`. The composer below uses the same
+                 * width for the same reason.
+                 */
+                const boxWidth = pickerBoxWidth(uiWidth - 5, rowWidth + 4);
+                const width = boxWidth - 4;
+                // Room for the longest label the list actually holds, rather than a constant. A session
+                // title is what identifies the row, and 36 cells cut most of them in half.
+                const labelWidth = pickerLabelWidth(list.map(it => it.label), list.map(it => it.desc), width);
+                let lastGroup;
+                return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: CYAN, paddingX: 1, marginTop: 1, width: boxWidth, flexShrink: 0, children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsx(Text, { color: CYAN, bold: true, children: title }), _jsx(Text, { color: DIM, children: countText })] }), _jsxs(Box, { children: [_jsxs(Text, { color: DIM, children: [G.search, " "] }), pickQuery === ''
+                                    ? _jsx(Text, { color: DIM, children: "type to search" })
+                                    : _jsx(Text, { color: INK, children: pickQuery }), _jsx(Text, { color: CYAN, children: pickQuery === '' ? '' : '▌' })] }), list.length === 0 && _jsxs(Text, { color: MUTED, children: ["Nothing matches \"", pickQuery, "\""] }), shown.map((item, i) => {
+                            const absolute = Math.max(0, start) + i;
+                            const selected = absolute === pickIndex;
+                            const header = item.group && item.group !== lastGroup ? item.group : null;
+                            lastGroup = item.group;
+                            const label = pickerLabel(item.label, labelWidth);
+                            return (_jsx(Box, { flexDirection: "column", children: _jsx(Text, { backgroundColor: selected ? CYAN : undefined, color: selected ? '#10222A' : INK, bold: selected, children: fitCells(`${selected ? G.caret + ' ' : '  '}${label}` +
+                                        `${item.current ? '(current) ' : ''}${header ? `${header} · ` : ''}${item.desc}`, width) }) }, item.value + absolute));
+                        }), list.length > pickerRows && (_jsxs(Text, { color: DIM, children: ["\u2191\u2193 navigate \u00B7 pgup/pgdn jump \u00B7 enter select \u00B7 showing ", Math.max(0, start) + 1, "\u2013", Math.max(0, start) + shown.length, " of ", list.length] }))] }));
+            })(), _jsx(Box, { marginTop: 1, borderStyle: "round", borderColor: busy ? DIM : CYAN, paddingX: 1, width: uiWidth - 5, flexShrink: 0, children: _jsxs(Text, { wrap: "wrap", children: [_jsxs(Text, { color: CYAN, bold: true, children: [G.caret, " "] }), (() => {
                             const sel = selectionRange(selAnchor, caret, draft.length);
                             if (sel) {
                                 return (_jsxs(_Fragment, { children: [_jsx(Text, { color: INK, children: draft.slice(0, sel[0]) }), _jsx(Text, { backgroundColor: CYAN, color: "#10222A", children: draft.slice(sel[0], sel[1]) }), _jsx(Text, { color: INK, children: draft.slice(sel[1]) })] }));