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

package/lib/catalogs.js

@@ -1,7 +1,10 @@
+import { readdir, readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { formatFileMention } from '@deepseek-ai/dsh-file-reference/grammar';
 import { isUserInvocable } from '@deepseek-ai/dsh-skill';
 import { detectAtTrigger } from './at-trigger.js';
-import { slashCompletionQuery } from './completion-trigger.js';
+import { pluginCompletionQuery, slashCompletionQuery } from './completion-trigger.js';
 import { isImagePath } from './image-input.js';
 import { sessionTitle } from './session-list.js';
 function matchRank(name, query) {
@@ -15,6 +18,24 @@ function selectedModel(ctx, agent) {
 }
 /** Build command and skill completion rows for one exact root. */
 export async function completionOptions(ctx, agent, input, caret = input.length, signal) {
+    const plugin = pluginCompletionQuery(input, caret);
+    if (plugin !== undefined) {
+        let candidates = ['add', 'remove', 'update', 'outdated', 'list', 'why', 'exec', 'licenses'];
+        if (plugin.command !== undefined) {
+            const profile = fileURLToPath(new URL('.', ctx.baseUrl));
+            if (plugin.command === 'exec') {
+                candidates = (await readdir(join(profile, 'node_modules', '.bin')).catch((error) => error.code === 'ENOENT' ? [] : Promise.reject(error))).sort();
+            }
+            else {
+                const manifest = JSON.parse(await readFile(join(profile, 'package.json'), 'utf8'));
+                candidates = Object.keys(manifest.dependencies ?? {}).sort();
+            }
+        }
+        return candidates.filter(name => matchRank(name, plugin.query) < 2).map(name => ({
+            group: 'Commands', label: name,
+            value: { kind: 'insert', text: `/plugin ${plugin.command === undefined ? '' : `${plugin.command} `}${name} ` },
+        }));
+    }
     const at = detectAtTrigger(input, caret);
     if (at !== undefined) {
         const service = ctx.get('fileReferences');

package/lib/completion-trigger.d.ts

@@ -1,2 +1,6 @@
 export declare function slashCompletionQuery(input: string): string | undefined;
+export declare function pluginCompletionQuery(input: string, caret: number): {
+    readonly command?: string;
+    readonly query: string;
+} | undefined;
 export declare function hasCompletionTrigger(input: string, caret: number): boolean;

package/lib/completion-trigger.js

@@ -2,6 +2,18 @@ import { detectAtTrigger } from './at-trigger.js';
 export function slashCompletionQuery(input) {
     return /^\/([a-z0-9_-]*)$/u.exec(input)?.[1];
 }
+export function pluginCompletionQuery(input, caret) {
+    if (caret !== input.length)
+        return undefined;
+    const match = /^\/plugin +([^\s]*)(?: +([^\s]*))?$/u.exec(input);
+    if (match === null)
+        return undefined;
+    const command = match[1] ?? '';
+    if (match[2] === undefined)
+        return { query: command };
+    return /^(?:exec|remove|update|why)$/u.test(command) ? { command, query: match[2] } : undefined;
+}
 export function hasCompletionTrigger(input, caret) {
-    return slashCompletionQuery(input) !== undefined || detectAtTrigger(input, caret) !== undefined;
+    return slashCompletionQuery(input) !== undefined || pluginCompletionQuery(input, caret) !== undefined
+        || detectAtTrigger(input, caret) !== undefined;
 }

package/lib/rewind.d.ts

@@ -7,8 +7,10 @@ export interface RewindBoundary {
 }
 /** 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

@@ -7,10 +7,24 @@ export function humanPrompt(event) {
         .map(block => block.text).join('');
     return text === '' ? undefined : text;
 }
-export function humanPrompts(events) {
-    return events.flatMap(event => humanPrompt(event) ?? []);
+/** 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 !== 'user/message' || event.data.source.kind !== 'plugin'
+        || event.data.source.plugin !== 'dashi' || event.data.source.form !== 'notice')
+        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;
 }
-/** 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,22 +35,22 @@ 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') {
             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;
 }

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 { humanPrompt, humanPrompts, inheritedTurn, rewindActionOverlay, rewindOverlay, } from './rewind.js';
+import { historyInput, historyInputs, humanPrompt, inheritedTurn, rewindActionOverlay, rewindOverlay, } from './rewind.js';
 import { createToolPresenter } from './tool-presentation.js';
 import { quoteShellWord, runHumanShell } from './shell-command.js';
 import { markdownTranscript } from './session-export.js';
@@ -327,7 +327,7 @@ export async function createSessionRuntime(ctx, options, tuiRoot, dispatch, deci
                 ...(model.reasoningEffort === undefined ? {} : { effort: model.reasoningEffort }),
             });
         }
-        const prompt = humanPrompt(event);
+        const prompt = historyInput(event);
         if (prompt !== undefined)
             dispatch({ type: 'prompt-recorded', rootId: bound.root.id, text: prompt });
         schedule(bound);
@@ -406,7 +406,7 @@ export async function createSessionRuntime(ctx, options, tuiRoot, dispatch, deci
         tuiRoot.bind(candidate.agent);
         dispatch({
             type: 'root-bound', cells: transcriptCells(candidate),
-            hasMore: candidate.hasMore, prompts: humanPrompts(candidate.events), root: candidate.root,
+            hasMore: candidate.hasMore, prompts: historyInputs(candidate.events), root: candidate.root,
         });
         if (started) {
             candidate.pump = follow(candidate);
@@ -505,7 +505,7 @@ export async function createSessionRuntime(ctx, options, tuiRoot, dispatch, deci
                 const roller = ctx.commands.list(bound.agent).some(command => command.name === 'roller-restore');
                 const overlay = rewindOverlay(bound.agent.session.snapshotEvents(), roller);
                 if (overlay.kind !== 'list' || overlay.options.length === 0) {
-                    throw new Error('the current session has no human prompt to rewind');
+                    throw new Error('the current session has no input to rewind');
                 }
                 dispatch({ type: 'open-overlay', overlay });
                 return;
@@ -795,7 +795,7 @@ export async function createSessionRuntime(ctx, options, tuiRoot, dispatch, deci
                     if (invocation.rawInput.trim() === '')
                         return { kind: 'error', text: 'usage: /plugin ARGS' };
                     const command = `dsh plugin --profile ${quoteShellWord(decodeURIComponent(new URL(ctx.baseUrl).pathname).split('/').at(-2))}${invocation.rawInput}`;
-                    const [message, result] = await bound.agent.runMaintenance(signal => runHumanShell(ctx, bound.agent, command, signal, 'changes load on the next launch; exit and run dashi again', false));
+                    const [message, result] = await bound.agent.runMaintenance(signal => runHumanShell(ctx, bound.agent, command, signal, 'bundles load on the next launch; plain plugins need a patch row', false));
                     bound.agent.inject(message);
                     await ctx.sessions.flush(bound.agent.session);
                     publish(bound);
@@ -1277,7 +1277,7 @@ export async function createSessionRuntime(ctx, options, tuiRoot, dispatch, deci
         initialAttachments,
         get initialCells() { return transcriptCells(current()); },
         get initialHasMore() { return current().hasMore; },
-        get initialPrompts() { return humanPrompts(current().events); },
+        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 summary() { return `Resume with: dsh --profile dashi --resume ${current().root.id}`; },

package/package.json

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