@vincemakes/kiso-code 0.5.0 → 0.6.0

package/dist/chat.js

@@ -5,7 +5,7 @@
  * estimates. All bodies moved verbatim from index.ts.
  */
 import { readFileSync } from "node:fs";
-import { escapeTerminal, kUnit, palette, renderEvent, renderRecap, toolTarget, } from "@vincemakes/kiso-tui";
+import { escapeTerminal, idleStatus, palette, renderEvent, renderRecap, runningStatus, toolTarget, STATUS_GLYPHS, } from "@vincemakes/kiso-tui";
 import { editFileDiff, writeFileDiff } from "@vincemakes/kiso-tui";
 import { canonicalTargetPath } from "@vincemakes/kiso-tools-node";
 import { canonicalizeUsage } from "@vincemakes/kiso-runtime";
@@ -99,9 +99,9 @@ export function startStatusSpinner(onTick) {
         return () => { };
     // v3 §03/§05: the working glyph family ▖▘▝▗, 200ms rotation — the
     // callback repaints the running status line with the new glyph.
-    const GLYPHS = ["▖", "▘", "▝", "▗"];
+    // KC2 §5: the family itself moved to the tui's status formatters.
     let i = 0;
-    const timer = setInterval(() => onTick(GLYPHS[i++ % GLYPHS.length]), 200);
+    const timer = setInterval(() => onTick(STATUS_GLYPHS[i++ % STATUS_GLYPHS.length]), 200);
     timer.unref();
     return () => clearInterval(timer);
 }
@@ -587,6 +587,30 @@ export async function chat(session, faux, input, autoCompact) {
             currentRun.abort();
         }
     });
+    // KC2 §2/§3 — the redirect: "stop, and do THIS instead". No stream
+    // injection, no new durable or op state — the run aborts (its terminal
+    // is an honest `aborted`) and the buffer's text becomes the next turn.
+    // With no run in flight the gesture is simply an Enter, which is what
+    // the human means by it: there is nothing to stop.
+    input.onRedirect?.((line) => {
+        if (currentRun === null)
+            return dispatch(line, dispatchCtx);
+        console.log("\n[redirecting run]");
+        pendingAsk?.();
+        currentRun.abort();
+        // §3: a correction must run BEFORE the follow-ups queued earlier —
+        // it is a correction OF them. The existing slot mechanics compose
+        // it: every pending slot leaves through the SAME pop the ↑ key uses
+        // (cancelled, so its chain segment skips), then they re-enter
+        // BEHIND the correction, in their original order. Ephemeral
+        // reordering of ephemeral state; the durable log still just records
+        // what ran, in the order it ran.
+        const jumped = pendingTurns.map((s) => s.line);
+        for (let i = jumped.length; i > 0; i -= 1)
+            popQueue();
+        for (const text of [line, ...jumped])
+            submitTurn(text);
+    });
     // round 5 (P1-11): the PERSISTENT line listener is installed BEFORE the
     // startup recovery — a cancelled question's re-emitted "line" needs a
     // listener from the very first instant, or the input is silently lost.
@@ -617,23 +641,18 @@ export async function chat(session, faux, input, autoCompact) {
     let runUsage = { in: null, out: null, cache: null, known: false };
     let runGlyph = "▖";
     let runStart = Date.now();
+    // KC2 §5: the STATE (the glyph, the run's start, the usage, the dock)
+    // stays here; the ROW's text is the tui's status formatter.
     const paintRunning = () => {
-        if (!dock.active)
-            return;
-        const ratio = estimateCtxRatio(session);
-        const pct = Number.isFinite(ratio) ? Math.round((1 - ratio) * 100) : null;
-        const out = runUsage.out !== null ? ` ↓ ${kUnit(runUsage.out)} tokens` : "";
-        dock.setStatus(`${runGlyph} working ${Math.max(1, Math.round((Date.now() - runStart) / 1000))}s${out} · esc to interrupt · ctx left ~${pct}%`);
+        if (dock.active)
+            dock.setStatus(runningStatus(runGlyph, runStart, runUsage.out, estimateCtxRatio(session)));
     };
+    // W19: under plan the idle row makes the posture unmistakable — the W4
+    // parentheses idiom names the read-only constraint. The tier is the
+    // CALLER's word (the recovery flow passes the bare mode).
     const paintIdle = () => {
-        if (!dock.active)
-            return;
-        const ratio = estimateCtxRatio(session);
-        const pct = Number.isFinite(ratio) ? Math.round((1 - ratio) * 100) : null;
-        // W19: under plan the idle row makes the posture unmistakable —
-        // the W4 parentheses idiom names the read-only constraint.
-        const tier = getMode() === "plan" ? "plan (read-only)" : getMode();
-        dock.setStatus(`▸ ${tier} · /mode to switch · ${agentModel} · ctx left ~${pct}%`);
+        if (dock.active)
+            dock.setStatus(idleStatus(getMode() === "plan" ? "plan (read-only)" : getMode(), agentModel, estimateCtxRatio(session)));
     };
     const statusCb = (u, ctx) => {
         runUsage = u;
@@ -643,13 +662,34 @@ export async function chat(session, faux, input, autoCompact) {
         const slot = { line, cancelled: false };
         pendingTurns.push(slot);
         queued += 1;
-        chainRef.current = chainRef.current.then(() => {
+        chainRef.current = chainRef.current.then(async () => {
             if (slot.cancelled)
                 return; // the pop already dropped it — no double count
             const idx = pendingTurns.indexOf(slot);
             if (idx >= 0)
                 pendingTurns.splice(idx, 1); // the chip leaves when the turn STARTS
-            return turn(line);
+            // KC2 §4 — the FRESH-TURN uncertainty gate. The runtime's fresh
+            // path checks only the open-run gate before persisting
+            // user_input (ResumeBlockedError guards the RESUME derivation
+            // alone), and the CLI resolved uncertains at startup recovery
+            // only — so a turn queued behind an abort-mid-tool could reach
+            // the model before the human said whether the side effect
+            // applied. It asks HERE, before the turn starts, with the same
+            // recovery UI; a human who declines leaves it uncertain and the
+            // turn does not start. The resolution's own model-facing fill
+            // also answers the dangling tool_use, so the next request never
+            // carries an unanswered call. Composed from existing APIs: zero
+            // core lines, zero runtime lines.
+            if (session.uncertainExecutions().length > 0)
+                await resolveUncertains(session, input, () => cancelled);
+            if (session.uncertainExecutions().length === 0)
+                return turn(line);
+            // The human declined (round 10: a cancelled ask records NOTHING —
+            // the execution stays uncertain and durable), so the turn does not
+            // start. It is never swallowed in silence: the held text is
+            // printed back, so the human can see what is waiting on them.
+            queued = Math.max(0, queued - 1);
+            body.notice(`[turn held — the interrupted execution is still undecided] ${escapeTerminal(line)}`);
         });
     };
     // W22: the ↑/esc pop — the LAST queued slot leaves the queue

package/dist/dispatch.js

@@ -28,8 +28,9 @@ export function dispatch(line, ctx) {
             bodyLog(cmd("/model", "list model profiles; /model <name|provider/model> switches"));
             bodyLog(cmd("/compact", "summarize the older conversation to free context"));
             // KC1: the composer's keys ride the SAME bodyLog call (it splits
-            // on \n) — the help gains a row, the cli source does not
-            bodyLog(`${cmd("exit", "leave the session")}\n${cmd("keys", "enter sends · ctrl+J inserts a newline (shift+enter where the terminal encodes it)")}`);
+            // on \n) — the help gains a row, the cli source does not.
+            // KC2: the redirect joins the same row for the same reason.
+            bodyLog(`${cmd("exit", "leave the session")}\n${cmd("keys", "enter sends · ctrl+J newline (shift+enter where encoded) · esc stops the run · alt+⏎ stops it and sends this instead")}`);
             ctx.input.prompt();
         });
         return;

package/dist/index.js

@@ -140,6 +140,11 @@ function editorInput(editor) {
         onExpand(cb) {
             editor.onExpand(cb);
         },
+        // KC2 §2: the redirect gesture — the editor decides WHEN (the
+        // same-chunk pair, the precedence gate); chat decides what it MEANS.
+        onRedirect(cb) {
+            editor.onRedirect(cb);
+        },
         question(query, cb) {
             editor.question(query, cb);
         },

package/dist/resume.js

@@ -2,7 +2,7 @@
  * The ergonomics batch B4 (pure move) — resume: the RECOVERY flow (Area 2/7). The body
  * moved verbatim from index.ts.
  */
-import { kUnit } from "@vincemakes/kiso-tui";
+import { idleStatus, runningStatus } from "@vincemakes/kiso-tui";
 import { getMode } from "./mode.js";
 import { agentModel, dock } from "./state.js";
 import { pendingAsk, resolveUncertains } from "./trust-ui.js";
@@ -23,20 +23,18 @@ export async function resume(session, prompt, faux, input) {
     let runUsage = { in: null, out: null, cache: null, known: false };
     let runGlyph = "▖";
     let runStart = Date.now();
+    // KC2 §5: the rows the REPL and this flow used to build separately are
+    // ONE formatter now — the running row was duplicated verbatim.
     const statusCb = (u, ctx) => {
         runUsage = u;
-        if (!dock.active)
-            return;
-        const pct = Number.isFinite(ctx) ? Math.round((1 - ctx) * 100) : null;
-        const out = runUsage.out !== null ? ` ↓ ${kUnit(runUsage.out)} tokens` : "";
-        dock.setStatus(`${runGlyph} working ${Math.max(1, Math.round((Date.now() - runStart) / 1000))}s${out} · esc to interrupt · ctx left ~${pct}%`);
+        if (dock.active)
+            dock.setStatus(runningStatus(runGlyph, runStart, u.out, ctx));
     };
+    // the recovery flow prints the BARE mode (chat spells plan's posture) —
+    // the extraction keeps that difference, it was not asked to settle it.
     const paintIdle = () => {
-        if (!dock.active)
-            return;
-        const ratio = estimateCtxRatio(session);
-        const pct = Number.isFinite(ratio) ? Math.round((1 - ratio) * 100) : null;
-        dock.setStatus(`▸ ${getMode()} · /mode to switch · ${agentModel} · ctx left ~${pct}%`);
+        if (dock.active)
+            dock.setStatus(idleStatus(getMode(), agentModel, estimateCtxRatio(session)));
     };
     const withRun = async (run) => {
         currentRun = run;

package/dist/state.d.ts

@@ -30,6 +30,11 @@ export interface LineInput {
     /** W15: the expand key (ctrl+r) — the chain-level action, never the
      *  editor's own interpretation. */
     onExpand(cb: () => void): void;
+    /** KC2 §2: the redirect gesture (Alt+Enter / Ctrl+Enter) — the
+     *  buffer's text arrives as a line at the same instant the run is told
+     *  to stop. OPTIONAL: the pipe path has no raw keys and never wires
+     *  it, so readline stays exactly as it was. */
+    onRedirect?(cb: (line: string) => void): void;
     question(query: string, cb: (answer: string) => void): void;
     cancelQuestion(): void;
     /** W21: open the approval panel — the editor's state machine takes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vincemakes/kiso-code",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "kiso CLI — the durable coding agent that survives kill -9: kiso chat / kiso resume / kiso sessions.",
   "type": "module",
   "license": "MIT",
@@ -18,18 +18,18 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@vincemakes/kiso-core": "0.5.0",
-    "@vincemakes/kiso-evals": "0.5.0",
-    "@vincemakes/kiso-mcp-ext": "0.5.0",
-    "@vincemakes/kiso-provider-anthropic": "0.5.0",
-    "@vincemakes/kiso-provider-openai": "0.5.0",
-    "@vincemakes/kiso-runtime": "0.5.0",
-    "@vincemakes/kiso-skills-ext": "0.5.0",
-    "@vincemakes/kiso-subagent-ext": "0.5.0",
-    "@vincemakes/kiso-task-ext": "0.5.0",
-    "@vincemakes/kiso-tools-node": "0.5.0",
-    "@vincemakes/kiso-tui": "0.5.0",
-    "@vincemakes/kiso-tui-cells": "0.5.0"
+    "@vincemakes/kiso-core": "0.6.0",
+    "@vincemakes/kiso-evals": "0.6.0",
+    "@vincemakes/kiso-mcp-ext": "0.6.0",
+    "@vincemakes/kiso-provider-anthropic": "0.6.0",
+    "@vincemakes/kiso-provider-openai": "0.6.0",
+    "@vincemakes/kiso-runtime": "0.6.0",
+    "@vincemakes/kiso-skills-ext": "0.6.0",
+    "@vincemakes/kiso-subagent-ext": "0.6.0",
+    "@vincemakes/kiso-task-ext": "0.6.0",
+    "@vincemakes/kiso-tools-node": "0.6.0",
+    "@vincemakes/kiso-tui": "0.6.0",
+    "@vincemakes/kiso-tui-cells": "0.6.0"
   },
   "devDependencies": {
     "@types/node": "^26.1.2",