@antst/dashi 0.1.0-alpha.13 → 0.1.0-alpha.15

package/lib/catalogs.d.ts

@@ -14,7 +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;
+export declare function sessionStatusLine(ctx: Context, agent: Agent, root: RootView, repo?: 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

@@ -177,18 +177,32 @@ function number(value) {
 function milliseconds(value) {
     return typeof value === 'number' ? `${number(value)} ms` : 'unavailable';
 }
-export function sessionStatusLine(ctx, agent, root, branch) {
+function compactTokens(value) {
+    return Intl.NumberFormat('en-US', { maximumFractionDigits: 1, notation: 'compact' }).format(value).replace('K', 'k');
+}
+export function sessionStatusLine(ctx, agent, root, repo) {
     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 total = input + (tokenUsage?.outputTokens ?? 0);
     const used = contextPressure?.projectedTokens ?? contextPressure?.pressureTokens;
+    const context = used === undefined ? undefined
+        : contextPressure?.contextWindow === undefined ? `ctx ${compactTokens(used)}`
+            : `ctx ${compactTokens(used)}/${compactTokens(contextPressure.contextWindow)} ${String(Math.min(100, Math.round(used / contextPressure.contextWindow * 100)))}%`;
+    const agents = root.subagents?.filter(item => item.state === 'running').length ?? 0;
+    const jobs = root.jobs?.filter(item => item.status === 'running' || item.status === 'stopping').length ?? 0;
     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)}`]),
+        model?.model ?? root.model,
+        ...(model?.reasoningEffort === undefined ? [] : [model.reasoningEffort]),
+        permissions?.currentValue ?? root.permission ?? 'unknown',
+        ...(context === undefined ? [] : [context]),
         ...(input === 0 ? [] : [`cache ${String(Math.min(tokenUsage?.cacheReadTokens === input ? 100 : 99, Math.round((tokenUsage?.cacheReadTokens ?? 0) / input * 100)))}%`]),
-        ...(branch === undefined ? [] : [`branch ${branch}`]),
+        ...(tokenUsage === undefined ? [] : [`${compactTokens(total)} tok`]),
+        ...(agents === 0 ? [] : [`${String(agents)} agents`]),
+        ...(jobs === 0 ? [] : [`${String(jobs)} jobs`]),
+        ...(root.title === undefined ? [] : [root.title]),
+        ...(repo === undefined ? [] : [repo]),
     ].join(' · ');
 }
 /** Read DSH-owned root facts for /status in one projection cut. */

package/lib/renderer.js

@@ -401,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

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,6 +6,11 @@ export interface RewindBoundary {
     readonly label: string;
     readonly prompt: string;
 }
+/** 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;
 /** Recover one composer input from DSH's durable log. */

package/lib/rewind.js

@@ -1,3 +1,7 @@
+/** 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,6 +11,13 @@ export function humanPrompt(event) {
         .map(block => block.text).join('');
     return text === '' ? undefined : text;
 }
+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);
@@ -15,11 +26,9 @@ export function historyInput(event) {
     if (event.type === 'command/run' && event.data.args !== undefined) {
         return `/${event.data.name}${event.data.args}`;
     }
-    if (event.type !== 'user/message' || event.data.source.kind !== 'plugin'
-        || event.data.source.plugin !== 'dashi' || event.data.source.form !== 'notice')
+    if (event.type !== 'agent/inbox/spliced')
         return undefined;
-    const first = event.data.content.find(block => block.type === 'text')?.text.split(/\r?\n/u)[0];
-    return first?.startsWith('$ ') === true ? `!${first.slice(2)}` : undefined;
+    return event.data.inserted.map(shellInput).find(input => input !== undefined);
 }
 export function historyInputs(events) {
     return events.flatMap(event => historyInput(event) ?? []);

package/lib/session-runtime.js

@@ -9,7 +9,7 @@ import { diffOverlay } from './diff-view.js';
 import { eventsFromRecords } from './history-records.js';
 import { admitDraftImages, encodeDraftImages, readDraftImages } from './image-input.js';
 import { contextPercent, jobViews, subagentViews } from './presentation.js';
-import { historyInput, historyInputs, humanPrompt, inheritedTurn, rewindActionOverlay, rewindOverlay, } from './rewind.js';
+import { historyInput, historyInputs, humanPrompt, inheritedTurn, rewindActionOverlay, rewindOverlay, rewindModelSelection, } from './rewind.js';
 import { createToolPresenter } from './tool-presentation.js';
 import { quoteShellWord, runHumanShell } from './shell-command.js';
 import { markdownTranscript } from './session-export.js';
@@ -80,16 +80,18 @@ async function firstControl(iterator) {
     }
     return first.value;
 }
-async function gitBranch(ctx, agent, signal) {
+async function gitRepo(ctx, agent, signal) {
+    const fallback = basename(agent.session.header.cwd ?? '');
     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,
+            command: 'git rev-parse --show-toplevel && git branch --show-current', sandboxPolicy: ctx.sandboxPolicy.resolve({ mode: 'read-only' }),
+            signal, stdoutMaxBytes: 1_024, timeoutMs: 2_000, workdir: agent.session.header.cwd,
         }));
-        return result.exitCode === 0 && result.stdout.text.trim() !== '' ? result.stdout.text.trim() : undefined;
+        const [root, branch] = result.stdout.text.trim().split(/\r?\n/u);
+        return result.exitCode === 0 && root !== undefined && branch !== undefined ? `${basename(root)}/${branch}` : fallback;
     }
     catch {
-        return undefined;
+        return fallback;
     }
 }
 function usage(raw, expected) {
@@ -165,9 +167,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, branch] = await Promise.all([
+            const [opening, controlOpening, subagents, repo] = await Promise.all([
                 firstSnapshot(iterator), firstControl(controlIterator), subagentViews(ctx, sessionId, abort.signal),
-                gitBranch(ctx, agent, abort.signal),
+                gitRepo(ctx, agent, abort.signal),
             ]);
             title ??= projectionString(opening.projections, 'title');
             const selected = projectionModel(opening.projections);
@@ -179,7 +181,7 @@ export async function createSessionRuntime(ctx, options, tuiRoot, dispatch, deci
             return {
                 abort,
                 agent,
-                branch,
+                repo,
                 controlIterator,
                 cursor: opening.cursor,
                 disposers,
@@ -289,11 +291,11 @@ 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)
+    const refreshRepo = async (bound) => {
+        const repo = await gitRepo(ctx, bound.agent, bound.abort.signal);
+        if (bound.abort.signal.aborted || current() !== bound || bound.repo === repo)
             return;
-        bound.branch = branch;
+        bound.repo = repo;
         dispatch({ type: 'redraw' });
     };
     const consume = (bound, frame) => {
@@ -302,7 +304,7 @@ export async function createSessionRuntime(ctx, options, tuiRoot, dispatch, deci
             return;
         bound.events.push(event);
         if (event.type === 'turn/end') {
-            void refreshBranch(bound);
+            void refreshRepo(bound);
             const startedAt = turnStartTime(bound.events, event.data.turn);
             if (startedAt !== undefined) {
                 dispatch({
@@ -327,7 +329,7 @@ export async function createSessionRuntime(ctx, options, tuiRoot, dispatch, deci
                 ...(model.reasoningEffort === undefined ? {} : { effort: model.reasoningEffort }),
             });
         }
-        const prompt = historyInput(event);
+        const prompt = event.type === 'agent/inbox/spliced' ? undefined : historyInput(event);
         if (prompt !== undefined)
             dispatch({ type: 'prompt-recorded', rootId: bound.root.id, text: prompt });
         schedule(bound);
@@ -447,13 +449,12 @@ export async function createSessionRuntime(ctx, options, tuiRoot, dispatch, deci
             ?? ctx.agentPresets.defaultId;
         const modelProjection = ctx.sessionProjections.snapshot(bound.agent.session, ['modelSelection'])
             .values.modelSelection;
-        const selection = modelProjection?.next ?? modelProjection?.lastUsed ?? undefined;
+        const selection = rewindModelSelection(modelProjection);
         const created = await ctx.sessionController.create({ cwd: bound.root.cwd, agentPreset });
         let selectionFailure;
         try {
-            if (selection === undefined)
-                throw new Error('the current session has no durable model selection');
-            await ctx.sessionController.selectModel({ sessionId: created.sessionId, ...selection });
+            if (selection !== undefined)
+                await ctx.sessionController.selectModel({ sessionId: created.sessionId, ...selection });
         }
         catch (error) {
             selectionFailure = error;
@@ -1279,7 +1280,7 @@ export async function createSessionRuntime(ctx, options, tuiRoot, dispatch, deci
         get initialHasMore() { return current().hasMore; },
         get initialPrompts() { return historyInputs(current().events); },
         get root() { return current().root; },
-        get statusLine() { const bound = current(); return sessionStatusLine(ctx, bound.agent, bound.root, bound.branch); },
+        get statusLine() { const bound = current(); return sessionStatusLine(ctx, bound.agent, bound.root, bound.repo); },
         get summary() { return `Resume with: dsh --profile dashi --resume ${current().root.id}`; },
         activate,
         async attach(path) {
@@ -1428,6 +1429,7 @@ export async function createSessionRuntime(ctx, options, tuiRoot, dispatch, deci
                         bound.agent.inject(message);
                         await ctx.sessions.flush(bound.agent.session);
                     });
+                    dispatch({ type: 'prompt-recorded', rootId: bound.root.id, text: `!${command}` });
                     publish(bound);
                     return;
                 }

package/package.json

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