@antst/dashi 0.1.0-alpha.11 → 0.1.0-alpha.12

package/lib/application.d.ts

@@ -27,6 +27,7 @@ export interface TerminalShellOptions {
     readonly onReleased?: () => void;
     readonly pasteImage?: () => Promise<DraftAttachment>;
     readonly search?: (query: string, rootId: string) => Promise<void>;
+    readonly statusLine?: () => string | undefined;
     readonly submit?: (text: string, mode: 'next-turn' | 'steer', attachments: readonly DraftAttachment[]) => Promise<void> | void;
     readonly suspend?: () => Promise<void>;
     readonly writeError?: (message: string) => void;

package/lib/application.js

@@ -26,7 +26,7 @@ export function createTerminalShell(options) {
         readState: () => state,
     };
     const renderer = options.createView?.(bindings) ?? createRenderer({
-        ...bindings, ...(options.accessible === undefined ? {} : { accessible: options.accessible }), inline: options.inline,
+        ...bindings, ...(options.accessible === undefined ? {} : { accessible: options.accessible }), ...(options.statusLine === undefined ? {} : { statusLine: options.statusLine }), inline: options.inline,
     });
     const guard = createTerminalGuard(renderer);
     const writeError = options.writeError ?? (message => { process.stderr.write(message); });

package/lib/catalogs.d.ts

@@ -14,6 +14,7 @@ export declare function sessionOverlay(items: readonly SessionSummary[], current
 export declare function modelOverlay(catalog: ModelCatalog, selected?: ModelSelection): Overlay;
 /** Build the preset picker from the native preset service. */
 export declare function permissionOverlay(ctx: Context, agent: Agent): Overlay;
+export declare function sessionStatusLine(ctx: Context, agent: Agent, root: RootView, branch?: string): string;
 /** Read DSH-owned root facts for /status in one projection cut. */
 export declare function statusOverlay(ctx: Context, agent: Agent, root: RootView): Overlay;
 /** Show DSH's heuristic next-request composition without treating it as an exact total. */

package/lib/catalogs.js

@@ -156,6 +156,20 @@ function number(value) {
 function milliseconds(value) {
     return typeof value === 'number' ? `${number(value)} ms` : 'unavailable';
 }
+export function sessionStatusLine(ctx, agent, root, branch) {
+    const { modelSelection, permissions, tokenUsage, contextPressure } = ctx.sessionProjections
+        .snapshot(agent.session, ['modelSelection', 'permissions', 'tokenUsage', 'contextPressure']).values;
+    const model = modelSelection?.next ?? modelSelection?.lastUsed;
+    const input = tokenUsage === undefined ? 0 : tokenUsage.uncachedInputTokens + tokenUsage.cacheReadTokens + tokenUsage.cacheWriteTokens;
+    const used = contextPressure?.projectedTokens ?? contextPressure?.pressureTokens;
+    return [
+        `model ${model == null ? `${root.provider === undefined ? '' : `${root.provider}/`}${root.model}` : `${model.provider}/${model.model}`}`,
+        `permission ${permissions?.currentValue ?? root.permission ?? 'unknown'}`,
+        ...(used === undefined || contextPressure?.contextWindow === undefined ? [] : [`context ${number(used)}/${number(contextPressure.contextWindow)}`]),
+        ...(input === 0 ? [] : [`cache ${String(Math.min(tokenUsage?.cacheReadTokens === input ? 100 : 99, Math.round((tokenUsage?.cacheReadTokens ?? 0) / input * 100)))}%`]),
+        ...(branch === undefined ? [] : [`branch ${branch}`]),
+    ].join(' · ');
+}
 /** Read DSH-owned root facts for /status in one projection cut. */
 export function statusOverlay(ctx, agent, root) {
     const values = ctx.sessionProjections.snapshot(agent.session, [

package/lib/index.js

@@ -299,6 +299,7 @@ export function apply(ctx) {
                 onReleased: () => { process.stdout.write(`${runtime?.summary ?? ''}\n`); },
                 pasteImage: readClipboardImage,
                 search: (query, rootId) => runtime?.search(query, rootId) ?? Promise.resolve(),
+                statusLine: () => runtime?.statusLine,
                 submit: (text, mode, attachments) => runtime?.submit(text, mode, attachments),
             });
             shell.start();

package/lib/input.d.ts

@@ -1,5 +1,5 @@
 import { type TUI } from '@earendil-works/pi-tui';
-import type { ComposerCursor, UiAction, ViewState } from './state.js';
+import { type ComposerCursor, type UiAction, type ViewState } from './state.js';
 export interface InputBindings {
     readonly dispatch: (action: UiAction) => void;
     readonly insertNewline?: () => void;

package/lib/input.js

@@ -1,4 +1,5 @@
 import { isKeyRelease, matchesKey } from '@earendil-works/pi-tui';
+import { PAGE_CELLS } from './state.js';
 export function caretOffset(text, cursor) {
     const lines = text.split('\n');
     let offset = 0;
@@ -98,6 +99,10 @@ export function installInput(tui, bindings) {
                 bindings.dispatch({ type: 'search-open', scope: 'history' });
             else if (overlay.kind === 'history' && matchesKey(data, 'y'))
                 bindings.dispatch({ type: 'history-copy' });
+            else if (overlay.kind === 'info' && matchesKey(data, 'pageUp'))
+                bindings.dispatch({ type: 'overlay-move', offset: -PAGE_CELLS });
+            else if (overlay.kind === 'info' && matchesKey(data, 'pageDown'))
+                bindings.dispatch({ type: 'overlay-move', offset: PAGE_CELLS });
             else if (matchesKey(data, 'up'))
                 bindings.dispatch({ type: 'overlay-move', offset: -1 });
             else if (matchesKey(data, 'down'))

package/lib/renderer.d.ts

@@ -13,6 +13,7 @@ export interface Renderer extends TerminalSession {
 export interface RendererOptions extends InputBindings {
     readonly accessible?: boolean;
     readonly inline: boolean;
+    readonly statusLine?: () => string | undefined;
     readonly terminal?: Terminal;
     readonly terminalType?: string;
 }

package/lib/renderer.js

@@ -1,4 +1,4 @@
-import { Editor, TuiAltScreen, TuiMainScreen, stripTerminalSequences, truncateToWidth, wrapTextWithAnsi, } from '@earendil-works/pi-tui';
+import { Editor, Markdown, TuiAltScreen, TuiMainScreen, stripTerminalSequences, truncateToWidth, wrapTextWithAnsi, } from '@earendil-works/pi-tui';
 import { caretOffset, installInput } from './input.js';
 import { hasCompletionTrigger } from './completion-trigger.js';
 import { createProcessTerminal } from './terminal-guard.js';
@@ -15,6 +15,22 @@ const THEME_GENERATION = 1;
 const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 const SPINNER_INTERVAL_MS = 80;
 const MASK_TOKEN = new RegExp(String.raw `\u001B(?:\[[0-?]*[ -/]*[@-~]|[_P^X][^\u0007]*(?:\u0007|\u001B\\))|[^\s]`, 'gu');
+const markdownTheme = {
+    heading: text => `\u001B[36m${text}${RESET}`,
+    link: text => `\u001B[36m${text}${RESET}`,
+    linkUrl: text => `${DIM}${text}${RESET}`,
+    code: text => `${YELLOW}${text}${RESET}`,
+    codeBlock: text => `${GREEN}${text}${RESET}`,
+    codeBlockBorder: text => `${DIM}${text}${RESET}`,
+    quote: text => `${DIM}${text}${RESET}`,
+    quoteBorder: text => `${DIM}${text}${RESET}`,
+    hr: text => `${DIM}${text}${RESET}`,
+    listBullet: text => `\u001B[36m${text}${RESET}`,
+    bold: text => `\u001B[1m${text}\u001B[22m`,
+    italic: text => `\u001B[3m${text}\u001B[23m`,
+    strikethrough: text => `\u001B[9m${text}\u001B[29m`,
+    underline: text => `\u001B[4m${text}\u001B[24m`,
+};
 export function supportsOsc52(terminalType) {
     return terminalType?.toLocaleLowerCase() !== 'dumb';
 }
@@ -138,6 +154,22 @@ function plain(text, preserveNewlines = false) {
 function line(text, width) {
     return truncateToWidth(text, Math.max(1, width), '…');
 }
+function windowRows(values, size, position, follow) {
+    if (values.length <= size)
+        return [...values];
+    if (size < 3)
+        return [values[Math.max(0, Math.min(values.length - 1, position))] ?? ''];
+    const start = Math.max(0, Math.min(values.length - Math.max(1, size - 1), follow ? position - Math.floor((size - 2) / 2) : position));
+    const above = start > 0;
+    let end = Math.min(values.length, start + size - Number(above));
+    if (end < values.length)
+        end--;
+    return [
+        ...(above ? [`${DIM}↑ ${String(start)} more${RESET}`] : []),
+        ...values.slice(start, end),
+        ...(end < values.length ? [`${DIM}↓ ${String(values.length - end)} more${RESET}`] : []),
+    ];
+}
 function theme() {
     const identity = (text) => text;
     return {
@@ -160,7 +192,9 @@ export function createRenderer(options) {
     const osc52 = supportsOsc52(terminalType);
     const tui = options.inline
         ? new TuiMainScreen(terminal, true)
-        : new TuiAltScreen(terminal, true, undefined, { mouse: true });
+        : new class extends TuiAltScreen {
+            isOverlayFocused() { return options.readState().overlay !== undefined || super.isOverlayFocused(); }
+        }(terminal, true, undefined, { mouse: true });
     let editor = new Editor(tui, theme(), { paddingX: 1 });
     editor.disableSubmit = true;
     editor.onChange = text => {
@@ -184,7 +218,11 @@ export function createRenderer(options) {
         const cached = cell.pending === true ? undefined : lineCache.get(key);
         if (cached !== undefined)
             return cached;
-        const rendered = wrapTextWithAnsi(cellText(cell, toolMode, accessible, now), Math.max(1, width - 2)).map(value => `  ${value}`);
+        const cellWidth = Math.max(1, width - 2);
+        const lines = !accessible && cell.kind === 'assistant' && cell.pending !== true
+            ? [`${BOLD_CYAN}Assistant${RESET}`, ...new Markdown(plain(cell.text, true), 0, 0, markdownTheme).render(cellWidth).map(value => value.trimEnd())]
+            : wrapTextWithAnsi(cellText(cell, toolMode, accessible, now), cellWidth);
+        const rendered = lines.map(value => `  ${value}`);
         if (cell.pending !== true) {
             lineCache.set(key, rendered);
             if (lineCache.size > 512)
@@ -275,19 +313,19 @@ export function createRenderer(options) {
         result.push(`${DIM}↑↓ select · Enter details · Esc close${RESET}`);
         return result.slice(0, Math.max(2, rows - 3));
     };
+    const infoRows = (overlay, state, width) => overlay.lines.flatMap(value => wrapTextWithAnsi(plain(value, true), width)).concat(overlay.cells?.flatMap(cell => wrapTextWithAnsi(cellText(cell, state.toolMode, accessible), width)) ?? []);
     const overlayPanel = (overlay, state, width, rows) => {
         if (overlay.kind === 'history')
             return historyPanel(overlay, state, width, rows);
         if (overlay.kind === 'details')
             return detailsPanel(overlay, state, width, rows);
         if (overlay.kind === 'info') {
-            const cards = overlay.cells?.flatMap(cell => wrapTextWithAnsi(cellText(cell, state.toolMode, accessible), width)) ?? [];
+            const body = infoRows(overlay, state, width);
             return [
                 `${BOLD_CYAN}${announcement(plain(overlay.title), overlay.lines.length + (overlay.cells?.length ?? 0))}${RESET}`,
-                ...overlay.lines.flatMap(value => wrapTextWithAnsi(plain(value, true), width)),
-                ...cards,
-                `${DIM}Enter or Esc to close${RESET}`,
-            ].slice(0, Math.max(2, rows - 3));
+                ...windowRows(body, Math.max(1, rows - 5), overlay.scrollOffset ?? 0, false),
+                `${DIM}↑↓ scroll · PageUp/PageDown · Enter or Esc close${RESET}`,
+            ];
         }
         if (overlay.kind === 'confirm') {
             const choices = [overlay.acceptLabel, 'Cancel'];
@@ -303,18 +341,23 @@ export function createRenderer(options) {
             line(`${BOLD_CYAN}${announcement(plain(overlay.title), overlay.options.length, selected === undefined ? undefined : plain(selected.label), overlay.cursor)}${RESET}`, width),
             ...(overlay.notice === undefined ? [] : [`${DIM}${plain(overlay.notice)}${RESET}`]),
         ];
+        const body = [];
+        let selectedRow = 0;
         let group;
         for (const [index, option] of overlay.options.entries()) {
             if (option.group !== undefined && option.group !== group) {
                 group = option.group;
-                result.push(`${DIM}${plain(group)}${RESET}`);
+                body.push(`${DIM}${plain(group)}${RESET}`);
             }
             const detail = option.detail === undefined ? '' : ` — ${plain(option.detail)}`;
             const active = option.active === true ? accessible ? ' [active]' : ' ●' : '';
             const danger = option.danger === true ? ` ${YELLOW}${accessible ? '[danger]' : '!'}${RESET}` : '';
-            result.push(line(`${index === overlay.cursor ? BOLD_CYAN : DIM}${index === overlay.cursor ? accessible ? '>' : '›' : ' '} ${String(index + 1)} ${plain(option.label)}${active}${detail}${RESET}${danger}`, width));
+            if (index === overlay.cursor)
+                selectedRow = body.length;
+            body.push(line(`${index === overlay.cursor ? BOLD_CYAN : DIM}${index === overlay.cursor ? accessible ? '>' : '›' : ' '} ${String(index + 1)} ${plain(option.label)}${active}${detail}${RESET}${danger}`, width));
         }
-        return result.slice(0, Math.max(2, rows - (overlay.purpose === 'completion' ? 6 : 3)));
+        const limit = Math.max(2, rows - (overlay.purpose === 'completion' ? 6 : 3));
+        return [...result, ...windowRows(body, Math.max(1, limit - result.length), selectedRow, true)];
     };
     const document = {
         invalidate() { editor.invalidate(); },
@@ -368,6 +411,11 @@ export function createRenderer(options) {
             const attachmentRows = state.attachments.map((attachment, index) => line(`${YELLOW}[image ${String(index + 1)}]${RESET} ${plain(attachment.name)} · ${attachment.mediaType} · ${String(attachment.bytes)} B · ${plain(attachment.path)}`, width));
             const activityRows = decision !== undefined || state.search !== undefined || state.overlay !== undefined
                 ? [] : activities(state).map(item => line(`${DIM}${activityText(item, now)}${RESET}`, width));
+            const persistentStatus = accessible || state.exitArmed ? undefined : options.statusLine?.();
+            const composer = () => [
+                ...(persistentStatus === undefined ? [] : [line(`${DIM}${plain(persistentStatus)}${RESET}`, width)]),
+                ...editor.render(width),
+            ];
             const control = decision !== undefined
                 ? decisionPanel(decision, width, rows)
                 : state.search !== undefined
@@ -379,11 +427,11 @@ export function createRenderer(options) {
                         `${DIM}${state.search.matches.length === 0 ? 'no matches' : `${String(state.search.cursor + 1)}/${String(state.search.matches.length)}`} · Enter next · Shift+Enter previous${RESET}`,
                     ]
                     : state.overlay === undefined
-                        ? [...activityRows, ...attachmentRows, ...editor.render(width)]
+                        ? [...activityRows, ...attachmentRows, ...composer()]
                         : [
                             ...overlayPanel(state.overlay, state, width, rows),
                             ...(state.overlay.kind === 'list' && state.overlay.purpose === 'completion'
-                                ? [...attachmentRows, ...editor.render(width)]
+                                ? [...attachmentRows, ...composer()]
                                 : []),
                         ];
             const fixedRows = header.length + control.length + 2;
@@ -405,6 +453,13 @@ export function createRenderer(options) {
     tui.setFocus(editor);
     installInput(tui, {
         ...options,
+        dispatch: action => {
+            const overlay = options.readState().overlay;
+            const size = Math.max(1, terminal.rows - 5);
+            options.dispatch(action.type === 'overlay-move' && overlay?.kind === 'info'
+                ? { ...action, limit: Math.max(0, infoRows(overlay, options.readState(), terminal.columns).length - Math.max(1, size - 1)) }
+                : action);
+        },
         insertNewline: () => { editor.insertTextAtCursor('\n'); },
         readComposerCursor: () => editor.getCursor(),
     });

package/lib/session-runtime.d.ts

@@ -28,6 +28,7 @@ export interface SessionRuntime {
     readonly initialHasMore: boolean;
     readonly initialPrompts: readonly string[];
     readonly root: RootView;
+    readonly statusLine: string;
     readonly summary: string;
     activate(value: ActivatableOverlayValue): Promise<void>;
     attach(path: string): Promise<DraftAttachment | undefined>;

package/lib/session-runtime.js

@@ -4,7 +4,7 @@ import { parseCredentialKey } from '@deepseek-ai/dsh-credentials';
 import { JobId } from '@deepseek-ai/dsh-jobs';
 import { createUserMessage, ToolCallId } from '@deepseek-ai/dsh-llm';
 import { SessionId, SessionSeq } from '@deepseek-ai/dsh-session';
-import { agentPresetOverlay, completionOptions, contextOverlay, currentModel, modelOverlay, permissionOverlay, searchOverlay, sessionOverlay, skillOverlay, statusOverlay, usageOverlay, } from './catalogs.js';
+import { agentPresetOverlay, completionOptions, contextOverlay, currentModel, modelOverlay, permissionOverlay, searchOverlay, sessionStatusLine, sessionOverlay, skillOverlay, statusOverlay, usageOverlay, } from './catalogs.js';
 import { diffOverlay } from './diff-view.js';
 import { eventsFromRecords } from './history-records.js';
 import { admitDraftImages, encodeDraftImages, readDraftImages } from './image-input.js';
@@ -80,6 +80,18 @@ async function firstControl(iterator) {
     }
     return first.value;
 }
+async function gitBranch(ctx, agent, signal) {
+    try {
+        const result = await ctx.shell.run(ctx.shell.resolve({
+            command: 'git branch --show-current', sandboxPolicy: ctx.sandboxPolicy.resolve({ mode: 'read-only' }),
+            signal, stdoutMaxBytes: 512, timeoutMs: 2_000, workdir: agent.session.header.cwd,
+        }));
+        return result.exitCode === 0 && result.stdout.text.trim() !== '' ? result.stdout.text.trim() : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 function usage(raw, expected) {
     return raw.trim() === '' ? undefined : { kind: 'error', text: `usage: ${expected}` };
 }
@@ -153,8 +165,9 @@ export async function createSessionRuntime(ctx, options, tuiRoot, dispatch, deci
                 address: { kind: 'session', sessionId }, maxMessages: 50,
             }, abort.signal)[Symbol.asyncIterator]();
             const controlIterator = ctx.sessionController.control(abort.signal)[Symbol.asyncIterator]();
-            const [opening, controlOpening, subagents] = await Promise.all([
+            const [opening, controlOpening, subagents, branch] = await Promise.all([
                 firstSnapshot(iterator), firstControl(controlIterator), subagentViews(ctx, sessionId, abort.signal),
+                gitBranch(ctx, agent, abort.signal),
             ]);
             title ??= projectionString(opening.projections, 'title');
             const selected = projectionModel(opening.projections);
@@ -166,6 +179,7 @@ export async function createSessionRuntime(ctx, options, tuiRoot, dispatch, deci
             return {
                 abort,
                 agent,
+                branch,
                 controlIterator,
                 cursor: opening.cursor,
                 disposers,
@@ -275,12 +289,20 @@ export async function createSessionRuntime(ctx, options, tuiRoot, dispatch, deci
             });
         }, 34);
     };
+    const refreshBranch = async (bound) => {
+        const branch = await gitBranch(ctx, bound.agent, bound.abort.signal);
+        if (bound.abort.signal.aborted || current() !== bound || bound.branch === branch)
+            return;
+        bound.branch = branch;
+        dispatch({ type: 'redraw' });
+    };
     const consume = (bound, frame) => {
         const [event] = eventsFromRecords([frame]);
         if (event === undefined)
             return;
         bound.events.push(event);
         if (event.type === 'turn/end') {
+            void refreshBranch(bound);
             const startedAt = turnStartTime(bound.events, event.data.turn);
             if (startedAt !== undefined) {
                 dispatch({
@@ -1257,6 +1279,7 @@ export async function createSessionRuntime(ctx, options, tuiRoot, dispatch, deci
         get initialHasMore() { return current().hasMore; },
         get initialPrompts() { return humanPrompts(current().events); },
         get root() { return current().root; },
+        get statusLine() { const bound = current(); return sessionStatusLine(ctx, bound.agent, bound.root, bound.branch); },
         get summary() { return `Resume with: dsh --profile dashi --resume ${current().root.id}`; },
         activate,
         async attach(path) {

package/lib/state.d.ts

@@ -216,6 +216,7 @@ export type Overlay = {
     readonly cells?: readonly TerminalCell[];
     readonly kind: 'info';
     readonly lines: readonly string[];
+    readonly scrollOffset?: number;
     readonly title: string;
 } | {
     readonly cursor: number;
@@ -346,6 +347,7 @@ export type UiAction = {
 } | {
     readonly type: 'overlay-close';
 } | {
+    readonly limit?: number;
     readonly type: 'overlay-move';
     readonly offset: number;
 } | {
@@ -508,4 +510,5 @@ export type UiEffect = {
 };
 export declare function initialViewState(cwd: string, inline: boolean, root?: RootView, cells?: readonly TerminalCell[], prompts?: readonly string[], historyHasMore?: boolean, attachments?: readonly DraftAttachment[], toolMode?: ToolMode): ViewState;
 export declare const TURN_BELL_THRESHOLD_MS = 10000;
+export declare const PAGE_CELLS = 8;
 export declare function reduce(state: ViewState, action: UiAction): readonly [ViewState, readonly UiEffect[]];

package/lib/state.js

@@ -55,7 +55,7 @@ function moveOverlay(overlay, cursor, detailsCount = 0) {
             : Math.max(0, overlay.options.length - 1);
     return { ...overlay, cursor: Math.max(0, Math.min(limit, cursor)) };
 }
-const PAGE_CELLS = 8;
+export const PAGE_CELLS = 8;
 function matches(cells, query) {
     const needle = query.trim().toLocaleLowerCase();
     if (needle === '')
@@ -376,8 +376,14 @@ export function reduce(state, action) {
         case 'overlay-move': {
             if (state.overlay === undefined)
                 return [state, []];
+            if (state.overlay.kind === 'info') {
+                const current = state.overlay.scrollOffset ?? 0;
+                const scrollOffset = Math.max(0, Math.min(action.limit ?? current, current + action.offset));
+                return scrollOffset === current ? [state, []]
+                    : [{ ...state, overlay: { ...state.overlay, scrollOffset } }, redraw()];
+            }
             const count = (state.root?.jobs?.length ?? 0) + (state.root?.subagents?.length ?? 0);
-            const overlay = moveOverlay(state.overlay, state.overlay.kind === 'info' ? 0 : state.overlay.cursor + action.offset, count);
+            const overlay = moveOverlay(state.overlay, state.overlay.cursor + action.offset, count);
             return overlay === state.overlay ? [state, []] : [{ ...state, overlay }, redraw()];
         }
         case 'overlay-number': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antst/dashi",
-  "version": "0.1.0-alpha.11",
+  "version": "0.1.0-alpha.12",
   "description": "A terminal UI for DeepSeek Harness",
   "publishConfig": {
     "access": "public"