dsh-ssh-tui 0.8.1 → 0.8.2

package/lib/theme.js

@@ -11,7 +11,12 @@ const DEFAULT_THEME = {
     tokens: {
         user: '36',
         assistant: '',
-        reasoning: '2;3',
+        // `2` (faint) is not implemented everywhere — a 256-colour terminal that
+        // ignores it draws the reasoning rows in the *default* foreground, i.e. as
+        // bright as the reply beside them, which is how the card was reported as
+        // white. The colour is what carries "muted"; the attributes only sharpen it
+        // where the terminal honours them.
+        reasoning: '2;3;90',
         brand: '1;38;2;77;107;253',
         tool: '',
         'tool-result': '',
@@ -24,6 +29,9 @@ const DEFAULT_THEME = {
         'todo-skipped': '2;33',
         'todo-pending': '90',
         'plan-dock': '38;5;180',
+        'setup-step': '1;36',
+        'setup-choice': '33',
+        'setup-field': '1;37',
         'subagent-header': '38;5;141',
         diag: '2;36',
         error: '31',
@@ -61,7 +69,7 @@ const CATPPUCCIN_THEME = {
     tokens: {
         user: '38;2;137;180;250',
         assistant: '',
-        reasoning: '2;3',
+        reasoning: '2;3;38;2;166;173;200',
         brand: '1;38;2;203;166;247',
         tool: '',
         'tool-result': '',
@@ -74,6 +82,9 @@ const CATPPUCCIN_THEME = {
         'todo-skipped': '2;38;2;249;226;175',
         'todo-pending': '38;2;108;112;134',
         'plan-dock': '38;2;250;179;135',
+        'setup-step': '1;36',
+        'setup-choice': '33',
+        'setup-field': '1;37',
         'subagent-header': '38;2;203;166;247',
         diag: '2;38;2;148;226;213',
         error: '38;2;243;139;168',
@@ -111,7 +122,7 @@ const GRUVBOX_THEME = {
     tokens: {
         user: '38;2;131;165;152',
         assistant: '',
-        reasoning: '2;3',
+        reasoning: '2;3;38;2;168;153;132',
         brand: '1;38;2;211;134;155',
         tool: '',
         'tool-result': '',
@@ -124,6 +135,9 @@ const GRUVBOX_THEME = {
         'todo-skipped': '2;38;2;250;189;47',
         'todo-pending': '38;2;146;131;116',
         'plan-dock': '38;2;254;128;25',
+        'setup-step': '1;36',
+        'setup-choice': '33',
+        'setup-field': '1;37',
         'subagent-header': '38;2;211;134;155',
         diag: '2;38;2;142;192;124',
         error: '38;2;251;73;52',
@@ -182,6 +196,9 @@ const MONO_THEME = {
         'todo-skipped': '2;3',
         'todo-pending': '2',
         'plan-dock': '1',
+        'setup-step': '1',
+        'setup-choice': '4',
+        'setup-field': '',
         'subagent-header': '4',
         diag: '2;3',
         error: '1;4',

package/lib/theme.js.map

@@ -1 +1 @@
-{"version":3,"file":"theme.js","sourceRoot":"","sources":["../src/theme.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"theme.js","sourceRoot":"","sources":["../src/theme.ts"],"names":[],"mappings":"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"}

package/lib/throughput.js

@@ -0,0 +1,305 @@
+/**
+ * Live decode throughput for the status row.
+ *
+ * The harness never publishes tokens per second. What it does publish, per
+ * step, is authoritative: `assistant/message` carries the step's output-token
+ * count and the packed stream's first-token time, so `decodeTokens / decodeMs`
+ * over settled steps is a real measurement. What it does *not* publish is any
+ * per-token count while a step is still streaming — adapters emit text deltas
+ * and only hand over `usage` as the stream closes (verified against
+ * `dsh-llm-deepseek` and `dsh-llm-pi-ai`).
+ *
+ * So there are exactly two honest numbers, and this module keeps them apart:
+ *
+ * 1. **Settled** — tokens and milliseconds of a completed step. Exact, and the
+ *    only number that is ever comparable across steps or sessions.
+ * 2. **Live** — characters per second while a step streams, converted with a
+ *    ratio calibrated from this session's own settled steps. It is an estimate,
+ *    it is labelled with `~`, and it exists so a long reply shows *something*
+ *    that moves instead of a number frozen at the previous step.
+ *
+ * There is deliberately no health grading here. Tokens per second is a property
+ * of the model, the provider, the reasoning effort and the prompt, not a signal
+ * that something is wrong: 20 tok/s from a reasoning model and 20 tok/s from a
+ * small fast one mean different things. The row paints it neutral.
+ *
+ * @module dsh-ssh-tui/throughput
+ */
+/** How much of the recent past the live rate is measured over. */
+export const THROUGHPUT_WINDOW_MS = 4_000;
+/** Minimum span between the two samples a rate is taken from. */
+export const THROUGHPUT_MIN_SPAN_MS = 400;
+/** A live rate older than this describes a stream that stopped, not one running. */
+export const THROUGHPUT_FRESH_MS = 2_500;
+/** Samples kept in the window; the cadence is the paint interval, not per token. */
+const MAX_SAMPLES = 64;
+/**
+ * Tokens per character, for the two ends of the script spectrum.
+ *
+ * Latin text averages roughly a third of a token per character; CJK is close to
+ * one, because a Chinese character is usually its own token and most words are one
+ * or two characters. Between those ends the estimate is interpolated by the
+ * *measured* script mix of the stream being estimated, continuously: a threshold
+ * ("30% CJK means Chinese") would put a mostly-English reply with one Chinese
+ * paragraph on the wrong side of a cliff, and the number it produces is shown to
+ * the reader.
+ */
+export const DEFAULT_TOKENS_PER_CHAR_LATIN = 0.32;
+export const DEFAULT_TOKENS_PER_CHAR_CJK = 0.85;
+/** The Latin end under its original name: the fallback for a stream with no text. */
+export const DEFAULT_TOKENS_PER_CHAR = DEFAULT_TOKENS_PER_CHAR_LATIN;
+/** Calibration bounds: below the first a tokenizer is lying, above the second too. */
+const MIN_TOKENS_PER_CHAR = 0.1;
+const MAX_TOKENS_PER_CHAR = 1.5;
+/** Weight of the newest settled step in the calibration average. */
+const CALIBRATION_WEIGHT = 0.5;
+/** Rates kept for the median; three is what the link chip's RTT median uses. */
+const RATE_HISTORY = 3;
+/**
+ * Characters to tokens, bounded and finite.
+ *
+ * The default is an average over mixed prose and code; every settled step
+ * replaces half of it with this session's own measurement, which is what makes
+ * the live estimate usable on CJK output (where one character is close to one
+ * token) without hardcoding a language.
+ */
+export function boundTokensPerChar(value, fallback = DEFAULT_TOKENS_PER_CHAR) {
+    if (!Number.isFinite(value) || value <= 0)
+        return fallback;
+    return Math.min(MAX_TOKENS_PER_CHAR, Math.max(MIN_TOKENS_PER_CHAR, value));
+}
+/**
+ * The median of up to the last three rates, or the newest one alone.
+ *
+ * A single frame in which the terminal coalesced a burst of tokens into one
+ * delta reads as a spike; a median of three ignores it, while a real change
+ * survives because two agreeing samples decide it. Same rule, and the same
+ * reasoning, as the link chip's RTT median.
+ */
+export function medianRate(values) {
+    const recent = values.filter(value => Number.isFinite(value) && value > 0).slice(-RATE_HISTORY);
+    if (recent.length === 0)
+        return undefined;
+    const sorted = [...recent].sort((a, b) => a - b);
+    return sorted[Math.floor(sorted.length / 2)];
+}
+/**
+ * Tracks one step's live decode rate from character deltas.
+ *
+ * Sampling is the caller's job (`note` per fragment): the window's own
+ * minimum span is what keeps the number stable, so a burst of tiny deltas and
+ * one coalesced delta produce the same answer.
+ */
+/**
+ * Whether one code point is written in a script whose characters are close to one
+ * token each: CJK ideographs, kana, Hangul syllables, and the fullwidth or CJK
+ * punctuation that travels with them.
+ *
+ * Deliberately a property of the *text* rather than of the reader's locale: a
+ * Chinese reader's English reply is Latin text and costs Latin tokens per
+ * character, and `~tok/s` has to describe the tokens, not the person.
+ */
+export function isCjkCodePoint(codePoint) {
+    return (codePoint >= 0x3040 && codePoint <= 0x30ff) // hiragana + katakana
+        || (codePoint >= 0x3400 && codePoint <= 0x4dbf) // CJK extension A
+        || (codePoint >= 0x4e00 && codePoint <= 0x9fff) // CJK unified ideographs
+        || (codePoint >= 0xac00 && codePoint <= 0xd7af) // hangul syllables
+        || (codePoint >= 0xf900 && codePoint <= 0xfaff) // CJK compatibility ideographs
+        || (codePoint >= 0xff00 && codePoint <= 0xff60) // fullwidth forms
+        || (codePoint >= 0x3000 && codePoint <= 0x303f) // CJK punctuation
+        || (codePoint >= 0x20000 && codePoint <= 0x3fffd); // extensions B and up
+}
+/**
+ * The starting ratio for a stream of a given script mix: `cjkShare` of the
+ * characters read as CJK, the rest as Latin. Continuous by construction, so a
+ * reply that is 70% English and 30% Chinese lands 30% of the way up the range
+ * instead of being classified as one or the other.
+ */
+export function scriptTokensPerChar(cjkShare) {
+    const share = Number.isFinite(cjkShare) ? Math.min(1, Math.max(0, cjkShare)) : 0;
+    return DEFAULT_TOKENS_PER_CHAR_LATIN
+        + (DEFAULT_TOKENS_PER_CHAR_CJK - DEFAULT_TOKENS_PER_CHAR_LATIN) * share;
+}
+export class ThroughputTracker {
+    /** The session's own ratio, once a step has settled. */
+    calibrated;
+    /** Characters and CJK characters seen in the step being estimated. */
+    observedChars = 0;
+    observedCjk = 0;
+    samples = [];
+    chars = 0;
+    baseAt;
+    startedAt;
+    lastDeltaAt = 0;
+    lastStepChars;
+    /** Rates already computed this step, kept for the median. */
+    recentRates = [];
+    lastRate;
+    settledRate;
+    /**
+     * The ratio the estimate is using right now: this session's own measurement once
+     * a step has settled, and the script mix of the stream being estimated before
+     * that. `/status` and the tests read it.
+     */
+    tokensPerChar() {
+        return this.calibrated ?? scriptTokensPerChar(this.cjkShare());
+    }
+    /** Share of this step's characters that were CJK, 0 when none have arrived. */
+    cjkShare() {
+        return this.observedChars === 0 ? 0 : this.observedCjk / this.observedChars;
+    }
+    /** Whether the ratio is a settled measurement rather than a script estimate. */
+    calibratedRatio() {
+        return this.calibrated !== undefined;
+    }
+    /** Drop a finished step's stream state, keeping calibration and last settle. */
+    reset() {
+        this.samples = [];
+        this.chars = 0;
+        this.observedChars = 0;
+        this.observedCjk = 0;
+        this.baseAt = undefined;
+        this.startedAt = undefined;
+        this.lastDeltaAt = 0;
+        this.lastStepChars = undefined;
+        this.recentRates = [];
+        this.lastRate = undefined;
+    }
+    /**
+     * One observed fragment of model output.
+     *
+     * The fragment itself, not a count: the estimate is tokens per character, and
+     * how many tokens a character is worth depends on which characters they are, so
+     * the script mix has to be measured here rather than assumed once for the
+     * session. Code points rather than UTF-16 units, so an emoji or a rare ideograph
+     * outside the BMP counts as the one character the reader sees.
+     * @param text - the fragment; empty is ignored.
+     * @param time - wall clock the fragment arrived at, for tests and replay.
+     */
+    note(text, time = Date.now()) {
+        if (text === '')
+            return;
+        let chars = 0;
+        let cjk = 0;
+        for (const char of text) {
+            chars += 1;
+            if (isCjkCodePoint(char.codePointAt(0) ?? 0))
+                cjk += 1;
+        }
+        if (chars === 0)
+            return;
+        if (this.startedAt === undefined) {
+            this.startedAt = time;
+            this.baseAt = time;
+        }
+        this.chars += chars;
+        this.observedChars += chars;
+        this.observedCjk += cjk;
+        this.lastDeltaAt = time;
+        const at = time - (this.baseAt ?? time);
+        const last = this.samples[this.samples.length - 1];
+        if (last !== undefined && last.at === at) {
+            // Two fragments inside one millisecond: one sample, or the window fills
+            // with points that share a timestamp and the span stays zero.
+            last.chars = this.chars;
+        }
+        else {
+            this.samples.push({ at, chars: this.chars });
+        }
+        this.trim(at);
+        this.sampleRate();
+    }
+    /**
+     * Settle a step: fold its exact decode rate into the calibration and into the
+     * number an idle row shows.
+     * @param outputTokens - the step's authoritative output tokens.
+     * @param decodeMs - milliseconds from first token to the settled message.
+     */
+    settle(outputTokens, decodeMs) {
+        const chars = this.chars;
+        if (Number.isFinite(outputTokens) && outputTokens > 0 && Number.isFinite(decodeMs) && decodeMs > 0) {
+            this.settledRate = outputTokens / (decodeMs / 1_000);
+            if (chars > 0) {
+                // The session's own measurement takes over from the script estimate here,
+                // and then keeps tracking it: half of the new sample, half of what was
+                // already known, so one unusual reply cannot redefine the session.
+                const before = this.tokensPerChar();
+                const observed = boundTokensPerChar(outputTokens / chars, before);
+                this.calibrated = before * (1 - CALIBRATION_WEIGHT) + observed * CALIBRATION_WEIGHT;
+            }
+        }
+        this.reset();
+    }
+    /** What the status row paints, and what `/status` reports. */
+    view(now = Date.now()) {
+        const liveRate = this.lastRate;
+        const fresh = liveRate !== undefined
+            && this.lastDeltaAt > 0
+            && now - this.lastDeltaAt <= THROUGHPUT_FRESH_MS;
+        return {
+            ...(this.settledRate === undefined ? {} : { settledRate: this.settledRate }),
+            liveChars: this.chars,
+            ...(liveRate === undefined ? {} : { liveRate }),
+            fresh,
+        };
+    }
+    /** Drop samples that fell out of the window, and keep the newest few. */
+    trim(at) {
+        const cutoff = at - THROUGHPUT_WINDOW_MS;
+        let drop = 0;
+        while (drop + 2 < this.samples.length && (this.samples[drop + 1]?.at ?? 0) <= cutoff)
+            drop += 1;
+        if (drop > 0)
+            this.samples.splice(0, drop);
+        if (this.samples.length > MAX_SAMPLES)
+            this.samples.splice(0, this.samples.length - MAX_SAMPLES);
+    }
+    /** Recompute the window's rate and fold it into the median buffer. */
+    sampleRate() {
+        const newest = this.samples[this.samples.length - 1];
+        if (newest === undefined)
+            return;
+        // The oldest sample still inside the minimum span, so a rate is never taken
+        // over a 20 ms sliver where one chunk decides the answer.
+        let oldest;
+        for (const sample of this.samples) {
+            if (newest.at - sample.at >= THROUGHPUT_MIN_SPAN_MS)
+                oldest = sample;
+            else
+                break;
+        }
+        oldest ??= this.samples[0];
+        if (oldest === undefined)
+            return;
+        const span = newest.at - oldest.at;
+        const chars = newest.chars - oldest.chars;
+        if (span < THROUGHPUT_MIN_SPAN_MS || chars <= 0)
+            return;
+        // The ratio is sampled per rate, so a step that starts in English and drifts
+        // into Chinese follows the text instead of one classification for the whole
+        // reply.
+        const rate = chars / (span / 1_000) * this.tokensPerChar();
+        if (!Number.isFinite(rate) || rate <= 0)
+            return;
+        this.lastStepChars = this.chars;
+        this.recentRates.push(rate);
+        if (this.recentRates.length > RATE_HISTORY * 3)
+            this.recentRates.shift();
+        this.lastRate = medianRate(this.recentRates) ?? rate;
+    }
+}
+/**
+ * A rate as the row paints it: whole numbers, `<1` rather than nothing.
+ *
+ * A slow step that decoded 3 tokens over 30 seconds is still decoding; rounding
+ * it to `0` reads as a stalled model. Above 1000 the number is compacted, since
+ * four digits is cells the quota and context meters want more.
+ */
+export function formatRate(tokensPerSecond) {
+    if (!Number.isFinite(tokensPerSecond) || tokensPerSecond < 1)
+        return '<1';
+    if (tokensPerSecond >= 1_000)
+        return `${(Math.round(tokensPerSecond / 10) / 100).toFixed(2)}K`;
+    return String(Math.round(tokensPerSecond));
+}
+//# sourceMappingURL=throughput.js.map

package/lib/throughput.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"throughput.js","sourceRoot":"","sources":["../src/throughput.ts"],"names":[],"mappings":"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"}

package/lib/tool-present.js

@@ -8,6 +8,7 @@ import { padToWidth, sliceCodePoints, truncate, wrap } from './term-text.js';
 import { firstString, parseJsonArgs, scalarText } from './json-args.js';
 import { parsePlanTodos, planTitleFromMarkdown, todoProgressBar, todoProgressLabel, todoSummary, askSummary, TODO_STATUS_MARK, todoItemKind, planMarkdownFromArgs, } from './plan.js';
 import { activeTheme, themeExtraToken, themeToken } from './theme.js';
+import { approvalProvenanceKey, approvalStateKey } from './approval-state.js';
 export const SHELL_TOOL_NAMES = new Set(['bash', 'pwsh']);
 export const DIFF_TOOL_NAMES = new Set(['edit', 'write', 'str_replace_editor']);
 export const JOB_TOOL_NAMES = new Set(['job_list', 'job_output', 'job_kill']);
@@ -246,6 +247,26 @@ export const SUBAGENT_TOOL_NAMES = new Set(['subagent', 'subagent_fork', 'task']
  * just duplicates chrome.
  */
 export const HIDDEN_TOOL_NAMES = new Set(['get_goal']);
+/**
+ * Tools whose card is the *question* they asked, not a generic tool card (B2.4).
+ *
+ * `ask_user_question` is the only one: its durable representation is the question
+ * card built from the call's arguments, and drawing both was the duplicate this
+ * round removes. It is a separate set from {@link HIDDEN_TOOL_NAMES} on purpose —
+ * hidden means "no representation at all" (`get_goal`), while this means "the
+ * representation is drawn by the question projection". A tool card that never
+ * appears is a *different* decision from one whose content is shown elsewhere, and
+ * the audit has to be able to tell them apart.
+ */
+export const QUESTION_TOOL_NAMES = new Set(['ask_user_question']);
+/**
+ * Tools whose card is the *artifact* they act on, not a tool card of their own.
+ *
+ * `exit_plan_mode` is the plan review: the plan artifact carries the reviewed body,
+ * the review's outcome and the lifecycle lines, so a generic card beside all of that
+ * was a third representation of one event (B2.5 §15).
+ */
+export const PLAN_TOOL_NAMES = new Set(['exit_plan_mode']);
 const TOOL_TITLE_KEYS = [
     'edit', 'write', 'str_replace_editor', 'fetch', 'list_files', 'list', 'ls',
     'find', 'search', 'delete', 'rm', 'rename', 'mv', 'mkdir', 'skills', 'skill',
@@ -470,15 +491,23 @@ export function buildToolHeader(input) {
     const flipping = input.flipping === true;
     const marker = flipping ? '◇' : input.expanded ? '▾' : '▸';
     const lead = `${prefix}${marker} ● ${input.title}`;
-    const summaryText = input.summary === '' ? '' : `  ${input.summary}`;
+    // The summary is a *row*: a `bash` call hands over the command as written, so a
+    // heredoc arrives with its newlines intact and would break the frame's absolute
+    // row addressing (see `truncateToWidth`). Collapsed here rather than at paint time
+    // so the colour offsets below are computed against the text that is actually
+    // drawn.
+    const summary = input.summary.replace(/\s+/gu, ' ').trim();
+    const summaryText = summary === '' ? '' : `  ${summary}`;
     const statToken = input.diffStat === undefined ? '' : diffStatToken(input.diffStat.add, input.diffStat.del);
     const statText = statToken === '' ? '' : `  ${statToken}`;
     const stateGap = stateToken === '' ? '' : '  ';
     const tail = `${stateGap}${stateToken}${exit}${spinner}`;
-    const plain = `${lead}${summaryText}${statText}${tail}`;
+    const approvalChip = input.approval === undefined ? '' : approvalChipText(input.approval);
+    const approvalText = approvalChip === '' ? '' : `  ${approvalChip}`;
+    const plain = `${lead}${approvalText}${summaryText}${statText}${tail}`;
     const stateCode = toolStateColor(input.status);
     const dotIndex = lead.indexOf('●');
-    const stateIndex = stateToken === '' ? -1 : lead.length + summaryText.length + statText.length + stateGap.length;
+    const stateIndex = stateToken === '' ? -1 : lead.length + approvalText.length + summaryText.length + statText.length + stateGap.length;
     const segments = [];
     if (flipping) {
         const markerIndex = prefix.length;
@@ -486,13 +515,20 @@ export function buildToolHeader(input) {
     }
     if (dotIndex >= 0)
         segments.push({ start: dotIndex, end: dotIndex + '●'.length, sgr: stateCode });
+    if (approvalText.length > 0) {
+        segments.push({
+            start: lead.length,
+            end: lead.length + approvalText.length,
+            sgr: themeExtraToken(activeTheme(), input.approval?.state === 'rejected' ? 'accent' : 'tool-ok'),
+        });
+    }
     if (summaryText.length > 0) {
-        segments.push({ start: lead.length, end: lead.length + summaryText.length, sgr: themeToken(activeTheme(), 'system') });
+        segments.push({ start: lead.length + approvalText.length, end: lead.length + approvalText.length + summaryText.length, sgr: themeToken(activeTheme(), 'system') });
     }
     if (statToken !== '') {
         // Git diffstat colors: deletions red, additions green. The token sits
         // two cells after the summary, deletions before the joining space.
-        const statStart = lead.length + summaryText.length + 2;
+        const statStart = lead.length + approvalText.length + summaryText.length + 2;
         const delEnd = statToken.indexOf(' +');
         if (statToken.startsWith('-')) {
             segments.push({
@@ -510,11 +546,11 @@ export function buildToolHeader(input) {
         segments.push({ start: stateIndex, end: stateIndex + stateToken.length + exit.length, sgr: stateCode });
     }
     else if (exit !== '') {
-        const exitIndex = lead.length + summaryText.length + statText.length;
+        const exitIndex = lead.length + approvalText.length + summaryText.length + statText.length;
         segments.push({ start: exitIndex, end: exitIndex + exit.length, sgr: stateCode });
     }
     if (spinner !== '') {
-        const spinnerStart = (stateIndex >= 0 ? stateIndex + stateToken.length + exit.length : lead.length + summaryText.length + statText.length + exit.length);
+        const spinnerStart = (stateIndex >= 0 ? stateIndex + stateToken.length + exit.length : lead.length + approvalText.length + summaryText.length + statText.length + exit.length);
         segments.push({
             start: spinnerStart,
             end: plain.length,
@@ -523,6 +559,20 @@ export function buildToolHeader(input) {
     }
     return { plain, segments: segments.filter(segment => segment.end > segment.start) };
 }
+/**
+ * The title chip: the state, and — when the reader is being told something
+ * weaker — why they can trust it less.
+ *
+ * `live` and `durable` are the same fact at two moments (a person decided, and
+ * the log still says so), so they print the state alone. `policy` adds `auto`,
+ * and `inferred` says so: a resume that found only the Harness's refusal sentence
+ * in a tool result is a reading, and the card has to admit it.
+ */
+export function approvalChipText(approval) {
+    const state = t(approvalStateKey(approval.state));
+    const note = approvalProvenanceKey(approval);
+    return note === undefined ? state : `${state}·${t(note)}`;
+}
 /** How many terminal rows a tool body occupies after wrapping. */
 export function wrappedToolBodyLineCount(lines, width) {
     const inner = Math.max(1, width - 2);