koneck 2.25.19 → 2.25.21

package/dist/ink-chat.js

@@ -2,9 +2,9 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import React, { useState, useEffect, useRef } from 'react';
 import { Box, Static, Text, render, useApp, useInput, useStdin } from 'ink';
 import { execa } from 'execa';
-import { createAgentSession, buildClient, resolveAgentConcurrency } from './engine.js';
+import { createAgentSession, buildClient, resolveAgentConcurrency, toolsUnsupportedNotice } from './engine.js';
 import { estimateCost, formatCost } from './pricing.js';
-import { generateSessionId, saveSession, listSessions, loadSession } from './session.js';
+import { generateSessionId, saveSession, listSessions, loadSession, relativeAge } from './session.js';
 import { loadMemory } from './memory.js';
 import { loadKoneckConfig, saveKoneckConfig, setConfigKey, configKeyDescriptions, CONFIG_FILE, CONFIG_SCHEMA, stepValue, displayValue } from './config-store.js';
 import { PROVIDERS, resolveProvider, getApiKey, addUserProvider, userProvidersPath } from './providers.js';
@@ -14,6 +14,7 @@ import { listWorkspaceEntries, filterEntries, activeReference } from './workspac
 import { isSlashCommand, findMentions, shortenMentions } from './mentions.js';
 import { bar, humanTokens, humanDuration, diffStatSince, modelInfoFrom, contextWindowFor, recordStatus, classifyResponse, stateLabel, readModelStatus, computeUiWidth, } from './usage.js';
 import { Markdown, Panel, panelWidth, safeCommitPoint, displayWidth, sliceToWidth } from './markdown-ink.js';
+import { G } from './glyphs.js';
 import { fetchUpdateStatus, updateCommand } from './update-check.js';
 import { readFileSync, statSync } from 'fs';
 import { fileURLToPath } from 'url';
@@ -179,7 +180,7 @@ export function liveReplyLines(termRows) {
     const rows = termRows && termRows > 0 ? termRows : 24;
     return rows < 12 ? 1 : 2;
 }
-const SPINNER = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+const SPINNER = G.spinner;
 /**
  * A highlight that sweeps left to right through the word, so the label itself looks like it is
  * working rather than sitting still. The gap after the word's end pauses briefly between passes;
@@ -510,6 +511,15 @@ function App({ config: initialConfig }) {
     const thinkingRef = useRef({ chars: 0, at: 0 });
     /** Why the current turn stopped short, when it did. Cleared at the start of each turn. */
     const incompleteRef = useRef(null);
+    /** The model already reported as unable to call tools, so the notice is not repeated. */
+    const toolsWarnedRef = useRef(null);
+    /**
+     * The id to save under, mirrored in a ref.
+     *
+     * `sessionId` is state, so a save fired from inside a turn closure would use the value captured
+     * when the turn began — which is the pre-resume id if the two happen close together.
+     */
+    const resumedIdRef = useRef(null);
     /**
      * Text pasted into the composer, held aside so the prompt stays readable.
      *
@@ -668,6 +678,13 @@ function App({ config: initialConfig }) {
         },
         onStreamActivity: (frames) => setProviderFrames(frames),
         onIncomplete: (reason) => { incompleteRef.current = reason; },
+        onToolsUnsupported: (model) => {
+            // Said once per session, not once per turn — it is a property of the model, not an event.
+            if (toolsWarnedRef.current === model)
+                return;
+            toolsWarnedRef.current = model;
+            addSystem(toolsUnsupportedNotice(model));
+        },
         onThinking: (_text, totalChars) => {
             thinkingRef.current = { chars: totalChars, at: Date.now() };
             lastActivityRef.current = Date.now();
@@ -692,7 +709,10 @@ function App({ config: initialConfig }) {
     const [updatePane, setUpdatePane] = useState(null);
     const [updating, setUpdating] = useState('idle');
     const [updateLog, setUpdateLog] = useState('');
-    const [sessionId] = useState(() => generateSessionId());
+    // Settable, because resuming has to adopt the restored session's id. Without that, every save
+    // after a resume wrote a new file and left the session you resumed frozen at its old state —
+    // which is exactly what made /resume look like it always returned to the old one.
+    const [sessionId, setSessionId] = useState(() => generateSessionId());
     /** Messages that arrived while a turn was running; drained when the agent goes idle. */
     const inboxRef = useRef([]);
     const busRef = useRef(null);
@@ -935,10 +955,15 @@ function App({ config: initialConfig }) {
         const firstUser = s?.messages.find((m) => m.role === 'user');
         const task = firstUser && typeof firstUser.content === 'string'
             ? firstUser.content.slice(0, 120) : '(chat session)';
-        return saveSession(cfg.cwd, sessionId, {
-            id: sessionId, task, provider: cfg.provider, model: cfg.model,
+        // Both of these come from the live session rather than from React state: a save fired at the
+        // end of a turn runs inside a closure that captured state as it was when the turn began, so
+        // reading `stats` here recorded turn counts one behind and, after a resume, the wrong id.
+        const id = resumedIdRef.current ?? sessionId;
+        const live = s?.stats ?? { turns: stats.turns, totalTokens: stats.totalTokens };
+        return saveSession(cfg.cwd, id, {
+            id, task, provider: cfg.provider, model: cfg.model,
             cwd: cfg.cwd, startedAt: new Date().toISOString(),
-            turns: stats.turns, totalTokens: stats.totalTokens,
+            turns: live.turns, totalTokens: live.totalTokens,
         }, s?.messages ?? []);
     }
     /**
@@ -990,7 +1015,9 @@ function App({ config: initialConfig }) {
     async function resumeSession(id) {
         try {
             const { meta, messages } = await loadSession(cfg.cwd, id);
-            activeSession.p = createAgentSession({ ...cfg, silent: true, ...sessionOpts }, messages);
+            activeSession.p = createAgentSession({ ...cfg, silent: true, ...sessionOpts }, messages, { turns: meta.turns, totalTokens: meta.totalTokens });
+            setSessionId(id); // continue this session rather than forking a new one
+            resumedIdRef.current = id;
             const restored = [{ role: 'header' }];
             for (const m of messages) {
                 if (m.role === 'user' && typeof m.content === 'string' && !m.content.startsWith('[')) {
@@ -1317,12 +1344,18 @@ function App({ config: initialConfig }) {
             }
             case '/clear':
             case '/reset':
-            case '/new':
+            case '/new': {
+                // A new id, or the autosave that now runs every turn would overwrite the session just
+                // cleared with the empty conversation replacing it — turning a clear into a deletion.
                 await resetSession();
+                const fresh = generateSessionId();
+                setSessionId(fresh);
+                resumedIdRef.current = fresh;
                 setRows([{ role: 'header' }]);
                 setStats({ turns: 0, promptTokens: 0, completionTokens: 0, totalTokens: 0 });
-                addSystem('Conversation cleared.');
+                addSystem('Conversation cleared. The previous session is kept; /resume lists it.');
                 return;
+            }
             case '/model': {
                 if (!arg) {
                     addSystem(`Current model: ${cfg.model}\nUsage: /model <name>`);
@@ -1481,10 +1514,13 @@ function App({ config: initialConfig }) {
                 // With an id, restore straight away; without one, offer a picker.
                 const pick = arg.trim();
                 if (pick === '') {
-                    openPicker('resume', saved.slice(0, 20).map(x => ({
+                    openPicker('resume', saved.slice(0, 20).map((x, i) => ({
                         value: x.id,
                         label: x.id,
-                        desc: `${x.turns} turns  ${x.totalTokens.toLocaleString()} tok  ${x.task.slice(0, 44)}`,
+                        // Ordered by last write, so the first entry is the one you were last in — said out
+                        // loud rather than left to be inferred from a timestamp buried in the id.
+                        desc: `${i === 0 ? 'latest · ' : ''}${relativeAge(x.updatedAt)}  ` +
+                            `${x.turns} turns  ${x.totalTokens.toLocaleString()} tok  ${x.task.slice(0, 36)}`,
                     })));
                     return;
                 }
@@ -2343,6 +2379,10 @@ function App({ config: initialConfig }) {
                                 recovered: turnRecoveredRef.current,
                             }, turnWordRef.current)[1] },
                     ]);
+                    // Persisted on every turn, not just on /save, /clear and ctrl+c. Resuming restored
+                    // whichever of those three happened last, which for anyone who closes the terminal
+                    // normally was an old snapshot — the reported "always resumes the old one".
+                    void doSave().catch(() => { });
                     // A run that stopped short says so, rather than letting the footer imply it finished.
                     if (incompleteRef.current) {
                         addSystem(incompleteRef.current);
@@ -2367,6 +2407,7 @@ function App({ config: initialConfig }) {
                     sayRef.current = '';
                     liveToolRef.current = null;
                     flushAgents();
+                    void doSave().catch(() => { });
                     setRows(prev => [
                         ...prev,
                         ...(trailing ? [{ role: 'steps', steps: [{ kind: 'say', text: trailing }] }] : []),
@@ -2446,14 +2487,14 @@ function App({ config: initialConfig }) {
         }
         const running = step.endedAt == null;
         const ms = (step.endedAt ?? Date.now()) - step.startedAt;
-        const glyph = running ? SPINNER[spinFrame] : step.ok === false ? '✖' : '✓';
+        const glyph = running ? SPINNER[spinFrame] : step.ok === false ? G.fail : G.ok;
         const color = running ? AMBER : step.ok === false ? CRIMSON : GREEN;
         return (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: color, children: glyph }), _jsx(Text, { color: AMBER, bold: true, children: step.name }), _jsx(Text, { color: DIM, children: "\u00B7" }), _jsx(Text, { color: MUTED, children: fmtElapsed(ms) })] }), step.detail !== '' && (step.diffs ?? []).length === 0 && (_jsxs(Box, { paddingLeft: 2, gap: 1, children: [_jsx(Text, { color: DIM, children: "\u2514" }), _jsx(Text, { color: MUTED, children: step.detail })] })), running && step.output && (_jsx(Box, { paddingLeft: 4, children: _jsx(Text, { color: DIM, children: fitCells(step.output, Math.max(20, barWidth - 6)) }) })), (step.diffs ?? []).map((d, i) => renderDiff(d, i))] }, key));
     };
     return (_jsxs(Box, { flexDirection: "column", width: uiWidth, paddingX: 2, children: [showAnalytics && (_jsxs(Box, { borderStyle: "round", borderColor: AMBER, paddingX: 1, marginBottom: 1, flexDirection: "column", width: barWidth, children: [_jsx(Text, { color: AMBER, bold: true, children: "\u25C6 Session Analytics" }), _jsxs(Text, { color: MUTED, children: ["Turns      : ", _jsx(Text, { color: INK, children: stats.turns })] }), _jsxs(Text, { color: MUTED, children: ["Prompt tok : ", _jsx(Text, { color: INK, children: stats.promptTokens.toLocaleString() })] }), _jsxs(Text, { color: MUTED, children: ["Output tok : ", _jsx(Text, { color: INK, children: stats.completionTokens.toLocaleString() })] }), _jsxs(Text, { color: MUTED, children: ["Total tok  : ", _jsx(Text, { color: INK, children: stats.totalTokens.toLocaleString() })] }), _jsxs(Text, { color: MUTED, children: ["Model      : ", _jsx(Text, { color: INK, children: modelShort }), "  Provider: ", _jsx(Text, { color: INK, children: cfg.provider })] }), _jsx(Text, { color: DIM, children: "Tab to close" })] })), _jsx(Static, { items: rows, children: (row, index) => row.role === 'header' ? (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "column", alignItems: "center", marginTop: 1, marginBottom: 1, children: [_jsx(Text, { color: CYAN, bold: true, children: "KONECK  /  SOFTWARE DELIVERY SYSTEM" }), _jsx(Text, { color: MUTED, children: "Deliberate engineering, with control at every change." })] }), _jsx(Panel, { width: barWidth, color: CYAN, title: "KONECK", children: [`MODEL: \`${modelShort}\`   PROVIDER: \`${cfg.provider}\`   WORKSPACE: \`${workspace}\``] })] }, index)) : row.role === 'user' ? (
                 // Painted as a filled bar so the user's own words are the most findable thing
                 // on screen when scrolling back through a long session.
-                _jsx(Box, { marginTop: 1, flexDirection: "column", children: wrapToWidth(row.text ?? '', barWidth - 2).map((line, li) => (_jsx(Text, { backgroundColor: USER_BG, color: USER_FG, bold: li === 0, children: (li === 0 ? '❯ ' : '  ') + fitCells(line, barWidth - 2) }, li))) }, index)) : row.role === 'error' ? (() => {
+                _jsx(Box, { marginTop: 1, flexDirection: "column", children: wrapToWidth(row.text ?? '', barWidth - 2).map((line, li) => (_jsx(Text, { backgroundColor: USER_BG, color: USER_FG, bold: li === 0, children: (li === 0 ? `${G.caret} ` : '  ') + fitCells(line, barWidth - 2) }, li))) }, index)) : row.role === 'error' ? (() => {
                     const lines = [row.text ?? '', '', 'Fix the above, then retry. /status shows the active provider and model.'];
                     return (_jsx(Box, { marginTop: 1, children: _jsx(Panel, { width: panelWidth(lines, barWidth, 40), color: CRIMSON, title: "[!] ERROR", children: lines }) }, index));
                 })() : row.role === 'system' ? (() => {
@@ -2464,7 +2505,7 @@ function App({ config: initialConfig }) {
                 // content, so the right edge stepped in and out; and a box inside a box left
                 // markdown tables needlessly narrow. A marker plus the content reads better and
                 // cannot misalign, which is how Claude Code presents its own answers.
-                _jsxs(Box, { flexDirection: "column", marginTop: row.continued ? 0 : 1, children: [_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: CYAN, bold: true, children: row.continued ? '  ' : 'ꞰK' }), _jsx(Box, { flexDirection: "column", children: _jsx(Markdown, { text: row.text ?? '', width: barWidth - 3 }) })] }), row.tokens != null && (_jsxs(Text, { color: MUTED, children: [_jsx(Text, { color: GREEN, children: "* " }), row.done ? `${row.done} in ${fmtElapsed(row.elapsed ?? 0)}` : fmtElapsed(row.elapsed ?? 0), '  |  ', row.tokens, " tokens", '  |  ', cfg.provider, " ", modelShort] }))] }, index)) }), _jsx(Box, { flexDirection: "column", children: busy && (agentState === 'processing' || agentState === 'syncing') && (_jsxs(Box, { flexDirection: "column", children: [sayRef.current.trim() !== '' && (_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: CYAN, bold: true, children: replyStartedRef.current ? '  ' : 'ꞰK' }), _jsx(Box, { flexDirection: "column", children: tailLines(sayRef.current, liveReplyLines(termRows), replyWidth - 3)
+                _jsxs(Box, { flexDirection: "column", marginTop: row.continued ? 0 : 1, children: [_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: CYAN, bold: true, children: row.continued ? '  ' : G.brand }), _jsx(Box, { flexDirection: "column", children: _jsx(Markdown, { text: row.text ?? '', width: barWidth - 3 }) })] }), row.tokens != null && (_jsxs(Text, { color: MUTED, children: [_jsx(Text, { color: GREEN, children: "* " }), row.done ? `${row.done} in ${fmtElapsed(row.elapsed ?? 0)}` : fmtElapsed(row.elapsed ?? 0), '  |  ', row.tokens, " tokens", '  |  ', cfg.provider, " ", modelShort] }))] }, index)) }), _jsx(Box, { flexDirection: "column", children: busy && (agentState === 'processing' || agentState === 'syncing') && (_jsxs(Box, { flexDirection: "column", children: [sayRef.current.trim() !== '' && (_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: CYAN, bold: true, children: replyStartedRef.current ? '  ' : G.brand }), _jsx(Box, { flexDirection: "column", children: tailLines(sayRef.current, liveReplyLines(termRows), replyWidth - 3)
                                         .split('\n').map((line, i) => _jsx(Text, { color: INK, children: line }, i)) })] })), liveToolRef.current && renderStep(liveToolRef.current, 1), queued.length > 0 && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: AMBER, children: "\u25AA" }), _jsxs(Text, { color: MUTED, children: [queued.length, " queued, will run when this finishes \u00B7 /aside to ask without waiting"] })] }), queued.map((q, i) => (_jsx(Box, { paddingLeft: 2, children: _jsx(Text, { color: DIM, children: fitCells(q.split('\n')[0] ?? '', Math.max(20, barWidth - 6), true) }) }, i)))] })), agents.length > 0 && (() => {
                             const done = agents.filter(a => a.status !== 'running').length;
                             const failed = agents.filter(a => a.status === 'failed').length;
@@ -2475,7 +2516,7 @@ function App({ config: initialConfig }) {
                             const taskWidth = Math.max(16, barWidth - 34);
                             return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: CYAN, children: "\u25C6" }), _jsxs(Text, { color: INK, bold: true, children: [agents.length, " agents"] }), _jsx(Text, { color: DIM, children: "\u00B7" }), _jsxs(Text, { color: done === agents.length ? GREEN : AMBER, children: [done, "/", agents.length, " complete"] }), _jsx(Text, { color: DIM, children: "\u00B7" }), _jsxs(Text, { color: MUTED, children: [humanTokens(tokens), " tok"] }), _jsx(Text, { color: DIM, children: "\u00B7" }), _jsx(Text, { color: MUTED, children: fmtElapsed(Date.now() - started) }), failed > 0 && _jsxs(Text, { color: CRIMSON, children: ["\u00B7 ", failed, " failed"] })] }), agents.map(a => {
                                         const glyph = a.status === 'running' ? SPINNER[spinFrame]
-                                            : a.status === 'failed' ? '✖' : '✓';
+                                            : a.status === 'failed' ? G.fail : G.ok;
                                         const color = a.status === 'running' ? AMBER
                                             : a.status === 'failed' ? CRIMSON : GREEN;
                                         const took = (a.endedAt ?? Date.now()) - a.startedAt;
@@ -2648,7 +2689,7 @@ function App({ config: initialConfig }) {
                     lines.push('show a real bar here with no further work.');
                 }
                 lines.push('---');
-                lines.push('**←/→** switch tabs · **esc** to close');
+                lines.push('**{left}/{right}** switch tabs · **esc** to close');
                 return (_jsx(Box, { marginTop: 1, justifyContent: "flex-end", children: _jsx(Panel, { width: width, color: CYAN, title: "KONECK \u00B7 usage", children: lines }) }));
             })(), updatePane && (() => {
                 const u = updatePane;
@@ -2716,7 +2757,7 @@ function App({ config: initialConfig }) {
                             const header = item.group && item.group !== lastGroup ? item.group : null;
                             lastGroup = item.group;
                             const label = item.label.length > 34 ? item.label.slice(0, 31) + '...' : item.label;
-                            return (_jsxs(Box, { flexDirection: "column", children: [header && _jsx(Text, { color: DIM, children: header }), _jsx(Text, { backgroundColor: selected ? CYAN : undefined, color: selected ? '#10222A' : INK, bold: selected, children: fitCells(`${selected ? '❯ ' : '  '}${fitCells(label, 36)}${item.current ? '(current) ' : ''}${item.desc}`, width) })] }, item.value + absolute));
+                            return (_jsxs(Box, { flexDirection: "column", children: [header && _jsx(Text, { color: DIM, children: header }), _jsx(Text, { backgroundColor: selected ? CYAN : undefined, color: selected ? '#10222A' : INK, bold: selected, children: fitCells(`${selected ? G.caret + ' ' : '  '}${fitCells(label, 36)}${item.current ? '(current) ' : ''}${item.desc}`, width) })] }, item.value + absolute));
                         }), list.length > PICKER_ROWS && (_jsxs(Text, { color: DIM, children: ["\u2191\u2193 navigate \u00B7 enter select \u00B7 showing ", Math.max(0, start) + 1, "\u2013", Math.max(0, start) + shown.length, " of ", list.length] }))] }));
             })(), keyPrompt && (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: AMBER, paddingX: 1, marginTop: 1, width: barWidth, children: [_jsxs(Text, { color: AMBER, bold: true, children: ["API key for ", keyPrompt.provider] }), _jsx(Text, { color: MUTED, children: "Paste it and press enter. Held in memory for this session only; esc to cancel." }), _jsxs(Box, { marginTop: 1, children: [_jsxs(Text, { color: MUTED, children: [keyPrompt.env, ": "] }), _jsx(Text, { color: INK, children: '*'.repeat(Math.min(keyPrompt.value.length, 48)) }), _jsx(Text, { color: CYAN, children: "\u2588" })] })] })), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: CYAN, bold: true, children: "\u276F " }), _jsx(Text, { color: INK, children: draft.slice(0, caret) }), busy
                         ? _jsx(Text, { color: INK, children: draft.slice(caret) })