@antst/dashi 0.1.0-alpha.8 → 0.1.0

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';
@@ -14,6 +14,23 @@ const OVERSCAN_CELLS = 8;
 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';
 }
@@ -137,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 {
@@ -159,15 +192,25 @@ export function createRenderer(options) {
     const osc52 = supportsOsc52(terminalType);
     const tui = options.inline
         ? new TuiMainScreen(terminal, true)
-        : new TuiAltScreen(terminal, true, undefined, { mouse: true });
-    const editor = new Editor(tui, theme(), { paddingX: 1 });
+        : 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 => {
+        const decision = options.readState().decisions[0];
         const caret = caretOffset(text, editor.getCursor());
         options.dispatch({
-            type: 'composer-changed', text, caret, completion: hasCompletionTrigger(text, caret),
+            type: 'composer-changed', text: decision?.kind === 'question' && decision.questions[decision.index]?.secret === true ? editor.getExpandedText() : text, caret, completion: hasCompletionTrigger(text, caret),
         });
     };
+    const replaceEditor = () => {
+        const discarded = editor;
+        editor = new Editor(tui, theme(), { paddingX: 1 });
+        editor.disableSubmit = true;
+        editor.onChange = discarded.onChange;
+        tui.setFocus(editor);
+    };
     const lineCache = new Map();
     let animationTimer;
     const cellLines = (cell, width, toolMode, now) => {
@@ -175,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)
@@ -203,14 +250,18 @@ export function createRenderer(options) {
             return [`${RED}Invalid empty question batch${RESET}`];
         const planReview = question.intent?.kind === 'plan-review';
         const heading = planReview ? 'Plan review' : question.header ?? `Question ${String(decision.index + 1)}/${String(decision.questions.length)}`;
+        const customAllowed = question.allowCustom !== false;
         const selected = question.options[decision.cursor]?.label ?? 'Other (type an answer)';
-        const announced = announcement(plain(heading), question.options.length + 1, selected, decision.cursor);
+        const announced = announcement(plain(heading), question.options.length + Number(customAllowed), selected, decision.cursor);
         const prompt = wrapTextWithAnsi(`${BOLD_CYAN}${announced}${RESET}\n${plain(question.question, true)}`, width);
         const choiceRows = question.options.map((option, index) => optionLine(option.description === undefined ? option.label : `${option.label} — ${option.description}`, index + 1, decision.cursor === index, decision.selected.includes(option.label)));
-        choiceRows.push(optionLine('Other (type an answer)', question.options.length + 1, decision.cursor === question.options.length, false));
+        if (customAllowed)
+            choiceRows.push(optionLine('Other (type an answer)', question.options.length + 1, decision.cursor === question.options.length, false));
         const detailLimit = planReview ? Math.max(3, rows - prompt.length - choiceRows.length - 5) : 3;
         const detail = question.detail === undefined ? [] : wrapTextWithAnsi(`${DIM}${plain(question.detail, true)}${RESET}`, width).slice(0, detailLimit);
-        const custom = decision.cursor === question.options.length ? editor.render(width) : [];
+        const editorLines = decision.cursor === question.options.length ? editor.render(width) : [];
+        const custom = question.secret === true
+            ? editorLines.map((value, index) => index === 0 || index === editorLines.length - 1 ? value : value.replace(MASK_TOKEN, token => token.startsWith('\u001B') ? token : '•')) : editorLines;
         const rendered = [...prompt, ...detail, ...choiceRows, ...custom];
         return rows < 12 ? rendered.slice(0, Math.max(2, rows - 4)) : rendered;
     };
@@ -262,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'];
@@ -290,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(); },
@@ -345,8 +401,8 @@ export function createRenderer(options) {
                                 : root === undefined
                                     ? `${DIM}no session · cards ${state.toolMode} · Ctrl+J newline · Ctrl+L redraw${RESET}`
                                     : root.status === 'running'
-                                        ? `${DIM}running · ${plain(root.model)} · Enter ${state.sendMode === 'steer' ? 'steer' : 'queue next turn'} · Ctrl+T toggle · cards ${state.toolMode} · Esc interrupt${RESET}`
-                                        : `${DIM}idle · ${plain(root.model)} · Enter send · cards ${state.toolMode}${RESET}`;
+                                        ? `${DIM}running${accessible ? ` · ${plain(root.model)}` : ''} · Enter ${state.sendMode === 'steer' ? 'steer' : 'queue next turn'} · Ctrl+T toggle · cards ${state.toolMode} · Esc interrupt${RESET}`
+                                        : `${DIM}idle${accessible ? ` · ${plain(root.model)}` : ''} · Enter send · cards ${state.toolMode}${RESET}`;
             const activityCount = activities(state).length;
             const baseStatus = `${baseStatusText}${root?.contextPercent === undefined ? '' : ` · ${String(root.contextPercent)}% context`}${activityCount === 0 ? '' : ' · Ctrl+B activity'}`;
             const status = state.newOutput === 0 ? baseStatus
@@ -355,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
@@ -366,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;
@@ -392,7 +453,15 @@ 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'); },
+        insertText: text => { editor.insertTextAtCursor(text); },
         readComposerCursor: () => editor.getCursor(),
     });
     return {
@@ -406,6 +475,7 @@ export function createRenderer(options) {
             terminal.write(`\u001B]52;c;${Buffer.from(safe).toString('base64')}\u0007`);
             return 'ok';
         },
+        discardSecretComposer: replaceEditor,
         drainInput: () => terminal.drainInput(),
         materializedCells: () => materializedCount,
         render: force => { tui.renderNow(force); },

package/lib/rewind.d.ts

@@ -1,3 +1,4 @@
+import type { ModelSelection } from '@deepseek-ai/dsh-api-session-controller';
 import type { SessionEvent } from '@deepseek-ai/dsh-session';
 import type { Overlay, OverlayValue } from './state.js';
 export interface RewindBoundary {
@@ -5,10 +6,22 @@ export interface RewindBoundary {
     readonly label: string;
     readonly prompt: string;
 }
+export declare function latestCompletedTurn(events: readonly SessionEvent[]): {
+    readonly atSeq?: number;
+    readonly open: boolean;
+    readonly turn?: number;
+};
+/** Return only a selection that DSH recorded for the source session. */
+export declare function rewindModelSelection(projection: {
+    readonly lastUsed: ModelSelection | null;
+    readonly next: ModelSelection | null;
+} | undefined): ModelSelection | undefined;
 /** Return the text of a direct human message, excluding injected context. */
 export declare function humanPrompt(event: SessionEvent): string | undefined;
-export declare function humanPrompts(events: readonly SessionEvent[]): readonly string[];
-/** Derive each human prompt and its controller-valid containing-turn cut. */
+/** Recover one composer input from DSH's durable log. */
+export declare function historyInput(event: SessionEvent): string | undefined;
+export declare function historyInputs(events: readonly SessionEvent[]): readonly string[];
+/** Derive each recalled input and its controller-valid preceding-turn cut. */
 export declare function rewindBoundaries(events: readonly SessionEvent[]): readonly RewindBoundary[];
 export declare function rewindOverlay(events: readonly SessionEvent[], roller: boolean): Overlay;
 export declare function rewindActionOverlay(boundary: Extract<OverlayValue, {

package/lib/rewind.js

@@ -1,3 +1,13 @@
+export function latestCompletedTurn(events) {
+    const end = events.filter((event) => event.type === 'turn/end' && event.data.reason.kind !== 'interrupted').at(-1);
+    const start = events.filter((event) => event.type === 'turn/start').at(-1);
+    return { open: start !== undefined && (end === undefined || start.seq > end.seq),
+        ...(end === undefined ? {} : { atSeq: end.seq, turn: end.data.turn }) };
+}
+/** Return only a selection that DSH recorded for the source session. */
+export function rewindModelSelection(projection) {
+    return projection?.next ?? projection?.lastUsed ?? undefined;
+}
 /** Return the text of a direct human message, excluding injected context. */
 export function humanPrompt(event) {
     if (event.type !== 'user/message' || event.data.source.kind !== 'user')
@@ -7,10 +17,29 @@ export function humanPrompt(event) {
         .map(block => block.text).join('');
     return text === '' ? undefined : text;
 }
-export function humanPrompts(events) {
-    return events.flatMap(event => humanPrompt(event) ?? []);
+function shellInput(message) {
+    if (message.source.kind !== 'plugin' || message.source.plugin !== 'dashi'
+        || message.source.form !== 'notice')
+        return undefined;
+    const first = message.content.find(block => block.type === 'text')?.text.split(/\r?\n/u)[0];
+    return first?.startsWith('$ ') === true ? `!${first.slice(2)}` : undefined;
+}
+/** Recover one composer input from DSH's durable log. */
+export function historyInput(event) {
+    const prompt = humanPrompt(event);
+    if (prompt !== undefined)
+        return prompt;
+    if (event.type === 'command/run' && event.data.args !== undefined) {
+        return `/${event.data.name}${event.data.args}`;
+    }
+    if (event.type !== 'agent/inbox/spliced')
+        return undefined;
+    return event.data.inserted.map(shellInput).find(input => input !== undefined);
 }
-/** Derive each human prompt and its controller-valid containing-turn cut. */
+export function historyInputs(events) {
+    return events.flatMap(event => historyInput(event) ?? []);
+}
+/** Derive each recalled input and its controller-valid preceding-turn cut. */
 export function rewindBoundaries(events) {
     const boundaries = [];
     let previousEnd;
@@ -21,27 +50,28 @@ export function rewindBoundaries(events) {
             openTurn = event.data.turn;
             prompted = false;
         }
-        else if (event.type === 'user/message' && openTurn !== undefined) {
-            const prompt = humanPrompt(event);
-            if (prompt !== undefined) {
-                boundaries.push({
-                    ...(previousEnd === undefined ? {} : { atSeq: previousEnd.seq }),
-                    label: `${prompt.replaceAll(/\s+/gu, ' ')}${prompted ? ' · mid-turn' : ''}`,
-                    prompt,
-                });
-                prompted = true;
-            }
-        }
-        else if (event.type === 'turn/end') {
+        else if (event.type === 'turn/end' && event.data.reason.kind !== 'interrupted') {
             previousEnd = event;
             openTurn = undefined;
             prompted = false;
         }
+        const prompt = historyInput(event);
+        if (prompt === undefined)
+            continue;
+        const human = humanPrompt(event) !== undefined;
+        boundaries.push({
+            ...(previousEnd === undefined ? {} : { atSeq: previousEnd.seq }),
+            label: `${prompt.replaceAll(/\s+/gu, ' ')}${human && prompted ? ' · mid-turn' : ''}`,
+            prompt,
+        });
+        if (human && openTurn !== undefined)
+            prompted = true;
     }
     return boundaries;
 }
 export function rewindOverlay(events, roller) {
     const boundaries = rewindBoundaries(events);
+    const trailing = latestCompletedTurn(events);
     return {
         cursor: Math.max(0, boundaries.length - 1),
         kind: 'list',
@@ -53,7 +83,7 @@ export function rewindOverlay(events, roller) {
             },
         })),
         purpose: 'rewind',
-        title: 'Rewind to a prompt',
+        title: `Rewind to a prompt${trailing.open ? ' · trailing turn open; completed boundaries only' : ''}`,
     };
 }
 export function rewindActionOverlay(boundary) {

package/lib/session-runtime.d.ts

@@ -2,16 +2,25 @@ import type { Context } from '@deepseek-ai/cordis';
 import type { ActivatableOverlayValue, DecisionAnswer, DraftAttachment, OverlayOption, PendingDecision, RootView, SendMode, TerminalCell, UiAction } from './state.js';
 import type { TuiRoot } from './tui-root.js';
 export interface RootLaunchOptions {
+    readonly agentPreset?: string;
     readonly continue: boolean;
+    readonly appendSystemPrompt?: string;
     readonly cwd: string;
     readonly effort?: string;
+    readonly forkSession: boolean;
     readonly name?: string;
     readonly images?: readonly string[];
     readonly model?: string;
     readonly permission?: string;
     readonly prompt?: string;
     readonly provider?: string;
+    readonly tools?: readonly string[];
+    readonly disallowedTools?: readonly string[];
     readonly resume?: string;
+    readonly sessionId?: string;
+    readonly systemPrompt?: string;
+}
+export declare class LaunchArgumentError extends Error {
 }
 export interface SessionRuntime {
     readonly initialAttachments: readonly DraftAttachment[];
@@ -19,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>;