@antst/dashi 0.1.0-alpha.9 → 0.1.1

package/lib/state.js

@@ -1,9 +1,9 @@
 import { FLAG_HELP, VERSION_LINE } from './help.js';
-export function initialViewState(cwd, inline, root, cells = [], prompts = [], historyHasMore = false, attachments = []) {
+export function initialViewState(cwd, inline, root, cells = [], prompts = [], historyHasMore = false, attachments = [], toolMode = 'collapsed') {
     return {
         attachments, cells, composer: '', cwd, decisions: [], exitArmed: false, historyHasMore, inline,
         newOutput: 0, prompts, rewindArmed: false, scrollOffset: 0,
-        sendMode: 'steer', toolMode: 'collapsed',
+        sendMode: 'steer', toolMode,
         ...(root === undefined ? {} : { root }),
     };
 }
@@ -41,8 +41,8 @@ function help() {
             'Ctrl+B activity details for jobs and subagents',
             '@ paths require DSH file-reference · Ctrl+V pastes an image · Backspace removes it',
             'Ctrl+S stash · Ctrl+G editor · F1 help · Ctrl+L redraw · Ctrl+Z suspend',
-            '/new /clear /reset /resume /continue [--all] [NAME|UUID] /fork /branch /rewind /rename /model /effort /permission /agents /queue /status /context',
-            '/init /memory /skills /config /login /logout /diff /plugins /plugin /tasks /history /export /copy /exit /quit',
+            '/new /clear /reset /resume /continue [--all] [NAME|UUID] /fork /branch /rewind /rename /model /effort /permission /agents /queue /status /usage /context',
+            '/init /memory /skills /config /login /logout /diff /plugins /plugin /tasks /bashes /subtask /loop /btw /recap /history /export /copy /exit /quit',
             ...FLAG_HELP,
         ],
     };
@@ -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 === '')
@@ -104,6 +104,13 @@ function codeBlockOptions(text) {
         };
     });
 }
+function exitChord(state) {
+    if (state.exitArmed)
+        return reduce(state, { type: 'exit' });
+    return [{ ...state, exitArmed: true, rewindArmed: false }, [
+            { type: 'exit-timer', armed: true }, ...redraw(),
+        ]];
+}
 export function reduce(state, action) {
     const head = state.decisions[0];
     switch (action.type) {
@@ -114,6 +121,7 @@ export function reduce(state, action) {
                     ...(replace ? { composer: action.text } : {}),
                 }, [...(replace ? [{ type: 'set-composer', text: action.text }] : []), ...redraw()]];
         }
+        case 'attachment-path': return [state, [{ type: 'attach', path: action.path, source: state.composer, text: state.composer }]];
         case 'attachment-remove': {
             if (action.index < 0 || action.index >= state.attachments.length)
                 return [state, []];
@@ -167,16 +175,12 @@ export function reduce(state, action) {
                         ...state, attachments: [], composer: '', exitArmed: false, recall: undefined, rewindArmed: false,
                     }, [{ type: 'set-composer', text: '' }, ...redraw()]];
             }
-            if (state.exitArmed)
-                return reduce(state, { type: 'exit' });
-            return [{ ...state, exitArmed: true, rewindArmed: false }, [{ type: 'exit-timer', armed: true }, ...redraw()]];
+            return exitChord(state);
         }
         case 'ctrl-d':
             if (state.composer !== '')
                 return [state, []];
-            if (state.root?.status !== 'idle' || state.attachments.length > 0)
-                return reduce(state, { type: 'exit' });
-            return reduce(state, { type: 'ctrl-c' });
+            return exitChord(state);
         case 'decision-cancel': {
             if (head === undefined)
                 return [state, []];
@@ -366,6 +370,7 @@ export function reduce(state, action) {
             return head === undefined
                 ? [{ ...state, overlay: action.overlay, exitArmed: false, rewindArmed: false }, redraw()]
                 : [state, []];
+        case 'open-file': return [state, [{ type: 'activate-overlay', value: { kind: 'open-file', path: action.path } }]];
         case 'overlay-close': {
             if (state.overlay === undefined)
                 return [state, []];
@@ -375,8 +380,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': {
@@ -393,10 +404,12 @@ export function reduce(state, action) {
                 return reduce(state, { type: 'history-toggle' });
             if (overlay.kind === 'info')
                 return reduce(state, { type: 'overlay-close' });
-            if (overlay.kind === 'details')
-                return [{
-                        ...state, overlay: { ...overlay, expanded: !overlay.expanded },
-                    }, redraw()];
+            if (overlay.kind === 'details') {
+                const job = state.root?.jobs?.[overlay.cursor - (state.root?.subagents?.length ?? 0)];
+                if (job !== undefined)
+                    return [state, [{ type: 'activate-overlay', value: { jobId: job.id, kind: 'job-output' } }]];
+                return [{ ...state, overlay: { ...overlay, expanded: !overlay.expanded } }, redraw()];
+            }
             if (overlay.kind === 'confirm') {
                 if (overlay.cursor !== 0)
                     return reduce(state, { type: 'overlay-close' });
@@ -563,6 +576,13 @@ export function reduce(state, action) {
                 return reduce(state, { type: 'decision-submit' });
             if (state.root === undefined || state.composer === '' && state.attachments.length === 0)
                 return [state, []];
+            if (state.root.status === 'running' && /^\/(?:btw|recap)(?:\s|$)/u.test(state.composer)) {
+                const cleared = { ...state, attachments: [], composer: '', exitArmed: false, recall: undefined, rewindArmed: false };
+                const [reported, effects] = reduce(cleared, {
+                    type: 'runtime-error', message: 'finish or interrupt the turn first', rootId: state.root.id,
+                });
+                return [reported, [{ type: 'set-composer', text: '' }, ...effects]];
+            }
             const mode = state.root.status === 'running' ? state.sendMode : 'next-turn';
             return [{
                     ...state, attachments: [], composer: '', exitArmed: false, recall: undefined, rewindArmed: false,

package/lib/transcript.d.ts

@@ -1,4 +1,4 @@
-import type { UserMessage } from '@deepseek-ai/dsh-llm';
+import type { StreamChunk, UserMessage } from '@deepseek-ai/dsh-llm';
 import type { SessionEvent } from '@deepseek-ai/dsh-session';
 import type { TerminalCell } from './state.js';
 import { type ToolPresenter } from './tool-presentation.js';
@@ -7,6 +7,8 @@ interface FoldOptions {
 }
 /** Project DSH-owned pending injections beside the durable transcript. */
 export declare function pendingShellCells(messages: readonly UserMessage[]): readonly TerminalCell[];
+/** Fold one transient DSH Assistant frame into the current pending cells. */
+export declare function foldAssistantStream(current: readonly TerminalCell[], turn: number, step: number, chunk: StreamChunk): readonly TerminalCell[];
 /** Fold one chronological DSH event slice into terminal-owned presentation cells. */
 export declare function foldCells(events: readonly SessionEvent[], presenter?: ToolPresenter | undefined, options?: FoldOptions): readonly TerminalCell[];
 export {};

package/lib/transcript.js

@@ -81,6 +81,57 @@ function compactSource(event) {
         ...(typeof source.sourceCommandId === 'string' ? { sourceCommandId: source.sourceCommandId } : {}),
     };
 }
+function putAssistant(cells, assistants, turn, step, kind, text, complete) {
+    const key = `${turn}:${step}`;
+    const pair = assistants.get(key) ?? {};
+    const slot = kind === 'text' ? pair.text : pair.reasoning;
+    const cellKind = kind === 'text' ? 'assistant' : 'reasoning';
+    if (slot === undefined) {
+        const next = cells.length;
+        cells.push({
+            key: `assistant:${key}:${kind}`,
+            kind: cellKind,
+            ...(!complete && kind === 'text' ? { pending: true } : {}),
+            text,
+            ...(complete && kind === 'reasoning' ? { collapsed: true } : {}),
+        });
+        if (kind === 'text')
+            pair.text = next;
+        else
+            pair.reasoning = next;
+        assistants.set(key, pair);
+        return;
+    }
+    const previous = cells[slot];
+    if (previous === undefined)
+        return;
+    const { pending: _pending, ...settled } = previous;
+    cells[slot] = {
+        ...(complete ? settled : previous),
+        text: complete ? text : previous.text + text,
+        ...(complete && kind === 'reasoning' ? { collapsed: true } : {}),
+    };
+}
+/** Fold one transient DSH Assistant frame into the current pending cells. */
+export function foldAssistantStream(current, turn, step, chunk) {
+    const cells = [...current];
+    const pair = {};
+    cells.forEach((cell, slot) => {
+        if (cell.kind === 'assistant')
+            pair.text = slot;
+        else if (cell.kind === 'reasoning')
+            pair.reasoning = slot;
+    });
+    const assistants = new Map([[`${turn}:${step}`, pair]]);
+    if (chunk.type === 'text-delta')
+        putAssistant(cells, assistants, turn, step, 'text', chunk.text, false);
+    else if (chunk.type === 'reasoning-delta')
+        putAssistant(cells, assistants, turn, step, 'reasoning', chunk.text, false);
+    else if (chunk.type === 'block-end' && (chunk.block.type === 'text' || chunk.block.type === 'reasoning')) {
+        putAssistant(cells, assistants, turn, step, chunk.block.type, chunk.block.text, true);
+    }
+    return cells;
+}
 /** Fold one chronological DSH event slice into terminal-owned presentation cells. */
 export function foldCells(events, presenter = createToolPresenter(() => undefined), options = {}) {
     const toolPresenter = presenter ?? createToolPresenter(() => undefined);
@@ -94,39 +145,10 @@ export function foldCells(events, presenter = createToolPresenter(() => undefine
     let planSlot;
     let todoSlot;
     let truncatedPrefix = options.truncatedStart === true;
-    const putAssistant = (turn, step, kind, text, complete) => {
-        const key = `${turn}:${step}`;
-        const pair = assistants.get(key) ?? {};
-        const slot = kind === 'text' ? pair.text : pair.reasoning;
-        const cellKind = kind === 'text' ? 'assistant' : 'reasoning';
-        if (slot === undefined) {
-            const next = cells.length;
-            cells.push({
-                key: `assistant:${key}:${kind}`,
-                kind: cellKind,
-                ...(!complete && kind === 'text' ? { pending: true } : {}),
-                text,
-                ...(complete && kind === 'reasoning' ? { collapsed: true } : {}),
-            });
-            if (kind === 'text')
-                pair.text = next;
-            else
-                pair.reasoning = next;
-            assistants.set(key, pair);
-            return;
-        }
-        const previous = cells[slot];
-        if (previous === undefined)
-            return;
-        const { pending: _pending, ...settled } = previous;
-        cells[slot] = {
-            ...(complete ? settled : previous),
-            text: complete ? text : previous.text + text,
-            ...(complete && kind === 'reasoning' ? { collapsed: true } : {}),
-        };
-    };
     for (const event of events) {
         switch (event.type) {
+            case 'system/message':
+                break;
             case 'turn/start':
                 truncatedPrefix = false;
                 openTurns.add(event.data.turn);
@@ -160,25 +182,14 @@ export function foldCells(events, presenter = createToolPresenter(() => undefine
                     });
                 break;
             }
-            case 'assistant/chunk': {
-                const { chunk, step, turn } = event.data;
-                if (chunk.type === 'text-delta')
-                    putAssistant(turn, step, 'text', chunk.text, false);
-                else if (chunk.type === 'reasoning-delta')
-                    putAssistant(turn, step, 'reasoning', chunk.text, false);
-                else if (chunk.type === 'block-end' && (chunk.block.type === 'text' || chunk.block.type === 'reasoning')) {
-                    putAssistant(turn, step, chunk.block.type, chunk.block.text, true);
-                }
-                break;
-            }
             case 'assistant/message': {
                 const { message, step, turn } = event.data;
                 const text = blockText(message.content, 'text');
                 const reasoning = blockText(message.content, 'reasoning');
                 if (reasoning !== '')
-                    putAssistant(turn, step, 'reasoning', reasoning, true);
+                    putAssistant(cells, assistants, turn, step, 'reasoning', reasoning, true);
                 if (text !== '')
-                    putAssistant(turn, step, 'text', text, true);
+                    putAssistant(cells, assistants, turn, step, 'text', text, true);
                 break;
             }
             case 'tool/call': {
@@ -299,6 +310,8 @@ export function foldCells(events, presenter = createToolPresenter(() => undefine
                 break;
             }
             case 'turn/end':
+                if (event.data.reason.kind === 'interrupted')
+                    break;
                 if (!openTurns.delete(event.data.turn)) {
                     if (!truncatedPrefix) {
                         cells.push({ key: `${event.seq}:error`, kind: 'error', text: `turn ${event.data.turn} ended without starting` });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antst/dashi",
-  "version": "0.1.0-alpha.9",
+  "version": "0.1.1",
   "description": "A terminal UI for DeepSeek Harness",
   "publishConfig": {
     "access": "public"
@@ -25,8 +25,7 @@
   },
   "files": [
     "lib/**/*.js",
-    "lib/**/*.d.ts",
-    "validated-dsh-versions.json"
+    "lib/**/*.d.ts"
   ],
   "license": "MIT",
   "engines": {
@@ -36,37 +35,41 @@
     "@earendil-works/pi-tui": "0.84.4"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "4.0.2",
-    "@deepseek-ai/cordis-plugin-loader": "1.0.3",
-    "@deepseek-ai/dsh-agent": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-agent-instructions": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-agent-presets": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-api-session-controller": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-attachment": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-authorization": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-cmdline": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-commands": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-credentials": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-compaction": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-file-reference": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-fs": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-home-paths": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-host-plugin-inventory": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-llm": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-permission-presets": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-plan-mode": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-sandbox-policy": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-session": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-session-projection": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-session-query": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-settings": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-shell": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-skill": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-subagent": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-token-meter": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tool-todo": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tools": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-user-approval": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-user-questions": "0.1.2-rc.1"
+    "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/cordis-plugin-loader": "^1.0.3",
+    "@deepseek-ai/dsh-agent": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-agent-instructions": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-agent-presets": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-api-session-controller": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-attachment": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-authorization": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-cmdline": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-commands": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-credentials": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-compaction": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-file-reference": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-fs": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-home-paths": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-host-plugin-inventory": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-jobs": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-llm": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-permission-presets": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-plan-mode": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-sandbox-policy": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-schedule": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-session": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-session-projection": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-session-query": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-session-stats": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-settings": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-shell": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-skill": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-subagent": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-system-prompt": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-token-meter": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-todo": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-tools": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-user-approval": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-user-questions": ">=0.1.5-rc.2"
   }
 }

package/validated-dsh-versions.json

@@ -1,3 +0,0 @@
-[
-  "0.1.2-rc.1"
-]