koneck 2.128.26 → 2.128.28

package/dist/ink-chat.js

@@ -14,7 +14,7 @@ import { normaliseEndpoint, withEndpoint, savedEndpoints, shortSource, resolveMo
 import { loadProjectConfig, loadGlobalConfig, saveGlobalConfig, withoutStoredApiKey } from './config.js';
 import { rememberKey, forgetAllKeys } from './credentials.js';
 import { ImageDraft, pastedImagePath } from './image-draft.js';
-import { readClipboard, readClipboardImage, startSelectionCopy, cleanPastedSecret } from './clipboard.js';
+import { readClipboard, readClipboardImage, startSelectionCopy, cleanPastedSecret, copyViaTerminal } from './clipboard.js';
 import { paceFrom } from './pace.js';
 import { policyFrom, FAILOVER_OFF } from './failover.js';
 import { listCheckpoints, revertCheckpoint, previewCheckpoint, snapshotTree, filesTouchedBy, createWorkspaceCheckpoint, checkpointScope } from './checkpoint.js';
@@ -510,17 +510,19 @@ export const HEARTBEAT_MS = 1_000;
  * scrollback that trade is a bad one — the terminal's own buffer already scrolls with the wheel,
  * so turning it on loses selection and gains nothing. Hence opt-in.
  *
- * On the alternate screen there is nothing on the other side of the trade. The terminal has no
- * scrollback there to scroll, and a selection does not survive the next repaint — both of which
- * are already the stated reasons for avoiding the alternate screen where it is not needed. So the
- * wheel does nothing at all unless KONECK asks for it, and "koneck does not scroll" is the whole
- * of the experience: the transcript runs off the top and the obvious gesture is inert.
+ * It was briefly defaulted on for the alternate screen, on the reasoning that a screen with no
+ * scrollback of its own has nothing to lose. That was answered directly: "select must happen on
+ * mouse like selecting in a document" and "mouse move should be by default, not to be turned
+ * on/off". Shift+drag is a workaround for a cost that should not be imposed, and the real fix was
+ * not to take the mouse but to stop taking the screen — see `defaultAltScreen`. In ordinary
+ * scrollback the terminal scrolls with the wheel and selects with a drag, both without being
+ * asked, which is the behaviour being described.
  *
- * So the default follows the screen. An explicit `mouse` in the config still wins, in both
- * directions, and `/mouse off` is still there for anyone who wants the trade back.
+ * So this stays off unless somebody asks for it. `/mouse on` is there for anyone who wants the
+ * wheel to drive the transcript inside the alternate screen and will take Shift+drag for it.
  */
-export function defaultMouseTracking(saved, altScreen) {
-    return saved ?? altScreen;
+export function defaultMouseTracking(saved, _altScreen) {
+    return saved ?? false;
 }
 /**
  * Where a tool's file changes are drawn, if anywhere.
@@ -1353,13 +1355,28 @@ compositesRedraws = false) {
  * a frame when nobody has expressed a view.
  */
 export function initialAltScreen(cfg, compositesRedraws, stdout = process.stdout, env = process.env) {
-    if (cfg.altScreen === false)
-        return false;
-    // A panel explicitly enabled in saved settings needs a frame from the first render. Previously
-    // it was marked on but silently had nowhere to draw until `/diff off` then `/diff on` happened.
-    if (cfg.diffPanel === true || cfg.altScreen === true)
+    /*
+     * Opt-in, on every terminal, however good it is.
+     *
+     * The alternate screen was the default wherever a redraw composites, because it pins the prompt
+     * to the last row. Everything else about it is a loss, and the losses are the ones people
+     * actually notice: the terminal's own scrollback is gone, so the wheel does nothing; a
+     * selection does not survive the next repaint, so text cannot be copied out; and the whole
+     * transcript is re-rendered on every frame instead of being written once into scrollback.
+     *
+     * Each of those was reported separately — "koneck does not scroll", "i can't select anything or
+     * copy anything", and the repainting. They are one cause. Asked for plainly in the end: "select
+     * must happen on mouse like selecting in a document ... mouse move should be by default, not to
+     * be turned on/off". In ordinary scrollback all of that is simply true, because the terminal is
+     * doing it rather than KONECK imitating it.
+     *
+     * So the pinned prompt is the thing you opt into now, with `/altscreen on` or `altScreen: true`.
+     * `diffPanel` no longer implies it either: the panel is a reason to want a frame, not a reason
+     * to take one from somebody who never asked, and with no frame the diffs render inline.
+     */
+    if (cfg.altScreen === true)
         return true;
-    return defaultAltScreen(stdout, env, compositesRedraws);
+    return false;
 }
 /**
  * One diff line, syntax-coloured, on its tinted band.
@@ -1470,6 +1487,39 @@ export function DiffPanel({ files, width, height, activity, activityRows = 0 })
  * Typechecking passes on that code and no test could reach it, because nothing in the suite mounted
  * an Ink app. Something does now.
  */
+/**
+ * The selected span of the composer, or null when nothing is selected.
+ *
+ * Held as an anchor plus the caret rather than as a pair, because that is what makes Shift+arrow
+ * behave the way it does everywhere else: the anchor is where selecting began and stays put, the
+ * caret is the end being dragged, and which of the two is on the left depends on which way it
+ * was dragged. Clamped to the text, so a draft replaced underneath a stale anchor cannot produce
+ * a range that is not there.
+ */
+export function selectionRange(anchor, caret, length) {
+    if (anchor === null)
+        return null;
+    const a = Math.max(0, Math.min(anchor, length));
+    const c = Math.max(0, Math.min(caret, length));
+    if (a === c)
+        return null;
+    return a < c ? [a, c] : [c, a];
+}
+/**
+ * The draft after typing over, or deleting, whatever is selected.
+ *
+ * One function for both, because they are the same operation: a selection is replaced by what
+ * was typed, and deleting is replacing it with nothing. With no selection it is an ordinary
+ * insert at the caret, so every editing path can call this without first asking which case it is
+ * in.
+ */
+export function replaceSelection(text, range, caret, insert) {
+    if (!range) {
+        return { text: text.slice(0, caret) + insert + text.slice(caret), caret: caret + insert.length };
+    }
+    const [from, to] = range;
+    return { text: text.slice(0, from) + insert + text.slice(to), caret: from + insert.length };
+}
 export function App({ config: initialConfig, clearFrame, synchronizedFrames = false }) {
     const { exit } = useApp();
     const [cfg, setCfg] = useState(initialConfig);
@@ -1933,6 +1983,13 @@ export function App({ config: initialConfig, clearFrame, synchronizedFrames = fa
     const readOnlyReviewRef = useRef(false);
     /** Caret offset into `draft`. Kept beside it so every edit can place the caret deliberately. */
     const [caret, setCaret] = useState(0);
+    /**
+     * Where a keyboard selection began, or null when nothing is selected.
+     *
+     * Shift with an arrow drops the anchor and drags the caret away from it; anything that moves
+     * the caret without Shift lifts it again. See `selectionRange`.
+     */
+    const [selAnchor, setSelAnchor] = useState(null);
     const [busy, setBusy] = useState(false);
     const [agentState, setAgentState] = useState('ready');
     // A shell normally uses the machine name as its tab title. Keep the KONECK mark and workspace
@@ -2332,6 +2389,14 @@ export function App({ config: initialConfig, clearFrame, synchronizedFrames = fa
     }, [effort]);
     const [showAnalytics, setShowAnalytics] = useState(false);
     const [updatePane, setUpdatePane] = useState(null);
+    /**
+     * The version installed in the background, if one was; see auto-update.ts.
+     *
+     * Only ever says "installed", never "updated": the code this session is running was read into
+     * memory when it started, and replacing the files on disk does not change it. The restart is
+     * the part that matters and so it is the part the line ends on.
+     */
+    const [autoUpdated, setAutoUpdated] = useState(null);
     const [updating, setUpdating] = useState('idle');
     const [updateLog, setUpdateLog] = useState('');
     // Settable, because resuming has to adopt the restored session's id. Without that, every save
@@ -2747,6 +2812,35 @@ export function App({ config: initialConfig, clearFrame, synchronizedFrames = fa
         timer = setTimeout(tick, interval);
         return () => clearTimeout(timer);
     }, [busy, animate, ask]);
+    /*
+     * Check for a new version and install it, quietly, in the background.
+     *
+     * Deliberately late and deliberately silent. It is network and a subprocess, neither of which
+     * should compete with the first turn, and there is nothing to report unless it succeeds — a
+     * registry that cannot be reached or an npm that cannot write to its global prefix is not the
+     * user's problem to hear about mid-task. See auto-update.ts for what it refuses to do.
+     */
+    useEffect(() => {
+        if (cfg.autoUpdate === false)
+            return;
+        let live = true;
+        const timer = setTimeout(() => {
+            void (async () => {
+                try {
+                    const { autoUpdate } = await import('./auto-update.js');
+                    const outcome = await autoUpdate({
+                        currentVersion: VERSION,
+                        modulePath: fileURLToPath(import.meta.url),
+                        enabled: cfg.autoUpdate !== false,
+                    });
+                    if (live && outcome.state === 'installed')
+                        setAutoUpdated(outcome.version);
+                }
+                catch { /* an update that cannot happen is not worth interrupting anyone over */ }
+            })();
+        }, 4_000);
+        return () => { live = false; clearTimeout(timer); };
+    }, [cfg.autoUpdate]);
     // A queued prompt runs the moment the agent is free again. Keyed on `busy` rather than done
     // inside the turn's own exit paths, so every way a turn can end — success, failure, cancel —
     // drains the queue the same way.
@@ -5085,6 +5179,8 @@ export function App({ config: initialConfig, clearFrame, synchronizedFrames = fa
         setCaret(c => c + token.length);
     }
     useInput((input, key) => {
+        /** What is selected in the composer right now, if anything. See `selectionRange`. */
+        const composerSel = selectionRange(selAnchor, caret, draft.length);
         /*
          * When a key was last pressed, so the animation can get out of the way.
          *
@@ -5141,6 +5237,25 @@ export function App({ config: initialConfig, clearFrame, synchronizedFrames = fa
                 closePicker();
                 return;
             }
+            /*
+             * With something selected this copies it, as it would in any other text box, and only
+             * leaves when there is nothing selected.
+             *
+             * Overloading the key that quits is not done lightly. It is what everyone's hands already
+             * do, the selection is visible on screen so the branch taken is never a surprise, and the
+             * second press — with the selection now lifted — quits as it always did.
+             *
+             * The copy goes through the terminal rather than the operating system, because the
+             * terminal is where the person is: over SSH, a clipboard on this machine is one nobody can
+             * paste from.
+             */
+            if (composerSel) {
+                const picked = draft.slice(composerSel[0], composerSel[1]);
+                copyViaTerminal(picked, process.stdout);
+                setSelAnchor(null);
+                setCopyNotice(`Copied ${picked.length} chars · ctrl+c again to exit`);
+                return;
+            }
             void doSave().catch(() => { }).then(() => exit());
             return;
         }
@@ -5598,12 +5713,38 @@ export function App({ config: initialConfig, clearFrame, synchronizedFrames = fa
             recallDraft(historyDirection);
             return;
         }
+        /*
+         * Shift with an arrow selects, the way it does in every other text box.
+         *
+         * The anchor is dropped where selecting began and left alone; the caret is what moves. Ctrl
+         * with it extends by a word, matching what Ctrl alone already does to the caret.
+         */
+        if ((key.leftArrow || key.rightArrow) && key.shift) {
+            if (selAnchor === null)
+                setSelAnchor(caret);
+            setCaret(key.leftArrow
+                ? (key.ctrl || key.meta ? wordStart(draft, caret) : Math.max(0, caret - 1))
+                : (key.ctrl || key.meta ? wordEnd(draft, caret) : Math.min(draft.length, caret + 1)));
+            return;
+        }
         if (key.leftArrow) {
+            // An arrow without Shift lifts the selection and puts the caret on the edge it moved
+            // towards, rather than jumping from wherever the caret happened to be dragged to.
+            if (composerSel) {
+                setSelAnchor(null);
+                setCaret(composerSel[0]);
+                return;
+            }
             const step = 1 + takeBurst('left');
             setCaret(c => (key.ctrl || key.meta ? wordStart(draft, c) : Math.max(0, c - step)));
             return;
         }
         if (key.rightArrow) {
+            if (composerSel) {
+                setSelAnchor(null);
+                setCaret(composerSel[1]);
+                return;
+            }
             const step = 1 + takeBurst('right');
             setCaret(c => (key.ctrl || key.meta ? wordEnd(draft, c) : Math.min(draft.length, c + step)));
             return;
@@ -5611,10 +5752,12 @@ export function App({ config: initialConfig, clearFrame, synchronizedFrames = fa
         // ctrl+a / ctrl+e are line start and end, as in bash. Home/End arrive as these on most
         // terminals, so both spellings land here.
         if (key.ctrl && input === 'a') {
+            setSelAnchor(null);
             setCaret(0);
             return;
         }
         if (key.ctrl && input === 'e') {
+            setSelAnchor(null);
             setCaret(draft.length);
             return;
         }
@@ -5635,6 +5778,13 @@ export function App({ config: initialConfig, clearFrame, synchronizedFrames = fa
             return;
         }
         if (key.backspace || key.delete) {
+            if (composerSel) {
+                const next = replaceSelection(draft, composerSel, caret, '');
+                setDraft(next.text);
+                setCaret(next.caret);
+                setSelAnchor(null);
+                return;
+            }
             if (delKindRef.current === 'forward') {
                 setDraft(d => d.slice(0, caret) + d.slice(caret + 1)); // caret stays put
                 return;
@@ -5676,8 +5826,12 @@ export function App({ config: initialConfig, clearFrame, synchronizedFrames = fa
                 filePaste(text);
                 return;
             }
-            const next = draft.slice(0, caret) + text + draft.slice(caret);
-            const nextCaret = caret + text.length;
+            // Typing over a selection replaces it, which is the other half of selecting being useful.
+            const edited = replaceSelection(draft, composerSel, caret, text);
+            if (composerSel)
+                setSelAnchor(null);
+            const next = edited.text;
+            const nextCaret = edited.caret;
             // Once the recalled line is edited it is a new draft, not a history cursor position.
             historyIndexRef.current = null;
             setDraft(next);
@@ -5713,6 +5867,8 @@ export function App({ config: initialConfig, clearFrame, synchronizedFrames = fa
     }
     /** Sends the composer contents: a slash command, or a task for the agent. */
     function submitDraft(raw) {
+        // The draft is about to be replaced, so an anchor into it no longer points at anything.
+        setSelAnchor(null);
         {
             // Tokens are expanded here, at the last moment. The model gets the text as it was copied —
             // blank lines, indentation and all — while the transcript shows the compact form so a
@@ -6552,11 +6708,17 @@ 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, 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 }) }))] }), _jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: busy ? DIM : CYAN, paddingX: 1, width: uiWidth - 5, flexShrink: 0, children: [_jsxs(Text, { color: CYAN, bold: true, children: [G.caret, " "] }), _jsx(Text, { color: INK, children: draft.slice(0, caret) }), busy
-                        ? _jsx(Text, { color: INK, children: draft.slice(caret) })
-                        : caret < draft.length
-                            ? _jsxs(_Fragment, { children: [_jsx(Text, { backgroundColor: CYAN, color: "#10222A", children: draft[caret] }), _jsx(Text, { color: INK, children: draft.slice(caret + 1) })] })
-                            : _jsx(Text, { color: CYAN, children: "\u2588" })] }), copyNotice && _jsx(Text, { color: CYAN, children: copyNotice }), _jsx(Box, { marginTop: 1, paddingX: 1, width: uiWidth - 4, flexShrink: 0, children: _jsxs(Text, { wrap: "truncate", backgroundColor: "#24343B", children: [repaint % 2 === 1 ? '\u200b' : '', _jsx(Text, { color: MUTED, children: "TAB " }), _jsx(Text, { color: INK, children: "Analytics" }), _jsx(Text, { color: MUTED, children: " / " }), _jsx(Text, { color: CYAN, children: "/HELP" }), _jsx(Text, { color: INK, children: " Commands" }), _jsx(Text, { color: MUTED, children: " / SHIFT+TAB " }), _jsx(Text, { color: INK, children: "Mode" }), _jsx(Text, { color: MUTED, children: " / " }), _jsx(Text, { color: statusColor, children: statusLabel.toLowerCase() }), plan && planSummary(plan) && (_jsxs(_Fragment, { children: [_jsx(Text, { color: MUTED, children: " / PLAN: " }), _jsx(Text, { color: CYAN, children: planSummary(plan) })] })), _jsx(Text, { color: MUTED, children: " / MODE: " }), _jsx(Text, { color: mode === 'auto' ? INK : AMBER, children: modeSpec(mode).label }), _jsx(Text, { color: MUTED, children: " / EFFORT: " }), _jsx(Text, { color: effort === 'medium' ? INK : AMBER, children: effort }), mouse && (_jsxs(_Fragment, { children: [_jsx(Text, { color: MUTED, children: " / " }), _jsx(Text, { color: AMBER, children: "WHEEL: on \u2014 shift to select \u00B7 /mouse off" })] })), _jsx(Text, { color: MUTED, children: " / MODEL: " }), _jsx(Text, { color: INK, children: modelShort }), _jsx(Text, { color: MUTED, children: " / v" }), _jsx(Text, { color: updatePane?.behind ? AMBER : INK, children: VERSION }), updatePane?.behind && _jsx(Text, { color: AMBER, children: " \u2191" }), pasteCount > 0 && (_jsxs(_Fragment, { children: [_jsx(Text, { color: MUTED, children: " / " }), _jsxs(Text, { color: AMBER, children: [pasteCount, " paste", pasteCount === 1 ? '' : 's', " held, sent in full"] })] })), ' '.repeat(uiWidth)] }) })] }));
+                                            ? '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 }) }))] }), _jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: busy ? DIM : CYAN, paddingX: 1, width: uiWidth - 5, flexShrink: 0, 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]) })] }));
+                        }
+                        return (_jsxs(_Fragment, { children: [_jsx(Text, { color: INK, children: draft.slice(0, caret) }), busy
+                                    ? _jsx(Text, { color: INK, children: draft.slice(caret) })
+                                    : caret < draft.length
+                                        ? _jsxs(_Fragment, { children: [_jsx(Text, { backgroundColor: CYAN, color: "#10222A", children: draft[caret] }), _jsx(Text, { color: INK, children: draft.slice(caret + 1) })] })
+                                        : _jsx(Text, { color: CYAN, children: "\u2588" })] }));
+                    })()] }), copyNotice && _jsx(Text, { color: CYAN, children: copyNotice }), _jsx(Box, { marginTop: 1, paddingX: 1, width: uiWidth - 4, flexShrink: 0, children: _jsxs(Text, { wrap: "truncate", backgroundColor: "#24343B", children: [repaint % 2 === 1 ? '\u200b' : '', _jsx(Text, { color: MUTED, children: "TAB " }), _jsx(Text, { color: INK, children: "Analytics" }), _jsx(Text, { color: MUTED, children: " / " }), _jsx(Text, { color: CYAN, children: "/HELP" }), _jsx(Text, { color: INK, children: " Commands" }), _jsx(Text, { color: MUTED, children: " / SHIFT+TAB " }), _jsx(Text, { color: INK, children: "Mode" }), _jsx(Text, { color: MUTED, children: " / " }), _jsx(Text, { color: statusColor, children: statusLabel.toLowerCase() }), plan && planSummary(plan) && (_jsxs(_Fragment, { children: [_jsx(Text, { color: MUTED, children: " / PLAN: " }), _jsx(Text, { color: CYAN, children: planSummary(plan) })] })), _jsx(Text, { color: MUTED, children: " / MODE: " }), _jsx(Text, { color: mode === 'auto' ? INK : AMBER, children: modeSpec(mode).label }), _jsx(Text, { color: MUTED, children: " / EFFORT: " }), _jsx(Text, { color: effort === 'medium' ? INK : AMBER, children: effort }), autoUpdated && (_jsxs(_Fragment, { children: [_jsx(Text, { color: MUTED, children: " / " }), _jsxs(Text, { color: GREEN, children: [G.ok, " Update installed \u00B7 restart to use it"] })] })), mouse && (_jsxs(_Fragment, { children: [_jsx(Text, { color: MUTED, children: " / " }), _jsx(Text, { color: AMBER, children: "WHEEL: on \u2014 shift to select \u00B7 /mouse off" })] })), _jsx(Text, { color: MUTED, children: " / MODEL: " }), _jsx(Text, { color: INK, children: modelShort }), _jsx(Text, { color: MUTED, children: " / v" }), _jsx(Text, { color: updatePane?.behind ? AMBER : INK, children: VERSION }), updatePane?.behind && _jsx(Text, { color: AMBER, children: " \u2191" }), pasteCount > 0 && (_jsxs(_Fragment, { children: [_jsx(Text, { color: MUTED, children: " / " }), _jsxs(Text, { color: AMBER, children: [pasteCount, " paste", pasteCount === 1 ? '' : 's', " held, sent in full"] })] })), ' '.repeat(uiWidth)] }) })] }));
 }
 export async function runInkChatMode(config) {
     // Nothing is written before the first frame. Filling the screen to push the prompt to the foot