@agi-fans/dsh-tui 0.26.0 → 0.27.0

package/lib/runtime/runner.js

@@ -169,7 +169,7 @@ async function run(ctx, tui, cancelled) {
                         await Promise.race([agent.whenIdle(), stopped.promise]);
                         if (cancelled.aborted)
                             break;
-                        const joined = await Promise.race([ctx.get('subagents')?.waitForChildren(agent), stopped.promise]);
+                        const joined = await Promise.race([ctx.get('subagents')?.waitForTreeWork(agent), stopped.promise]);
                         if (!joined)
                             break;
                     }

package/lib/runtime/terminal-state.d.ts

@@ -8,6 +8,7 @@ export interface AgentActivityStatus {
 export type TerminalProgramState = AgentActivityState | 'done' | 'error';
 export interface TerminalProgramStatus {
     readonly state: TerminalProgramState;
+    readonly title?: string;
     readonly message?: string;
     readonly kind?: TerminalAttentionKind;
 }
@@ -24,13 +25,15 @@ export declare function terminalProgressSequence(state: TerminalProgramState | '
 /** These lifecycle reports can themselves create a terminal notification. */
 export declare function programStatusNeedsAttention(state: TerminalProgramState): boolean;
 export declare function settledProgramState(reason?: string): 'idle' | 'done' | 'error';
-export declare function terminalTitle(mode: TerminalTitleMode, status: TerminalProgramStatus, session: string | undefined, cwd: string, branch?: string): string;
+export declare function terminalTitle(mode: TerminalTitleMode, status: TerminalProgramStatus, session: string | undefined, cwd: string, branch?: string, nativeStatus?: boolean): string;
 export declare class AgentActivityController {
     #private;
     get current(): AgentActivityStatus;
     get program(): TerminalProgramStatus;
     start(): AgentActivityStatus;
     setRunning(running: boolean): AgentActivityStatus | undefined;
+    compactionStart(id?: string): AgentActivityStatus | undefined;
+    compactionEnd(id?: string, error?: string): AgentActivityStatus | undefined;
     settled(reason: string): void;
     resetResult(): void;
     prompt(message?: string, kind?: TerminalAttentionKind): AgentActivityStatus | undefined;

package/lib/runtime/terminal-state.js

@@ -15,9 +15,10 @@ function clean(value, limit) {
 export function programStatusSequence(status) {
     if (status === 'clear')
         return '\x1b]7501;state=clear:app=omdsh\x1b\\';
+    const title = clean(status.title, 240);
     const message = clean(status.message, 240);
     const kind = status.state === 'blocked' && status.kind !== undefined ? `:kind=${status.kind}` : '';
-    return `\x1b]7501;state=${status.state}:app=omdsh${kind}${message === undefined ? '' : `:msg=${Buffer.from(message).toString('base64')}`}\x1b\\`;
+    return `\x1b]7501;state=${status.state}:app=omdsh${kind}${title === undefined ? '' : `:title=${Buffer.from(title).toString('base64')}`}${message === undefined ? '' : `:msg=${Buffer.from(message).toString('base64')}`}\x1b\\`;
 }
 export function workingDirectorySequence(cwd) {
     // A directory separator also preserves trailing control bytes in Node's URL conversion.
@@ -45,22 +46,28 @@ export function settledProgramState(reason = 'completed') {
     return 'error';
 }
 const STATE_LABELS = { idle: 'Ready', working: 'Working', blocked: 'Needs input', done: 'Done', error: 'Failed' };
-export function terminalTitle(mode, status, session, cwd, branch) {
+export function terminalTitle(mode, status, session, cwd, branch, nativeStatus = false) {
     if (mode === 'off')
         return '';
-    if (mode === 'session')
+    if (mode === 'session' || (mode === 'status' && nativeStatus))
         return clean(session, 120) ?? '';
-    const subject = mode === 'workspace' ? [basename(cwd), branch].filter(Boolean).join(' · ') : session ?? basename(cwd);
+    const workspace = [basename(cwd), branch].filter(Boolean).join(' · ');
+    if (nativeStatus)
+        return clean(workspace, 120) ?? '';
+    const subject = mode === 'workspace' ? workspace : session ?? basename(cwd);
     return clean([STATE_LABELS[status.state], subject, 'omdsh'].filter(Boolean).join(' · '), 120) ?? '';
 }
 export class AgentActivityController {
     #running = false;
+    #compacting;
     #prompts = [];
     #last;
     #result = 'idle';
     get current() {
         const prompt = this.#prompts.at(-1);
-        return prompt === undefined ? { state: this.#running ? 'working' : 'idle' } : { state: 'blocked', ...prompt };
+        return prompt === undefined
+            ? { state: this.#running || this.#compacting !== undefined ? 'working' : 'idle' }
+            : { state: 'blocked', ...prompt };
     }
     get program() {
         const current = this.current;
@@ -68,13 +75,27 @@ export class AgentActivityController {
     }
     start() { return this.#publish(true); }
     setRunning(running) {
-        if (running && !this.#running)
+        if (running && !this.#running && this.#compacting === undefined)
             this.#result = 'idle';
         this.#running = running;
         return this.#publish();
     }
+    compactionStart(id = '') {
+        if (!this.#running && this.#compacting === undefined)
+            this.#result = 'idle';
+        this.#compacting = id;
+        return this.#publish();
+    }
+    compactionEnd(id, error) {
+        if (this.#compacting === undefined || (id !== undefined && this.#compacting !== id))
+            return undefined;
+        this.#compacting = undefined;
+        if (!this.#running)
+            this.#result = error === undefined ? 'done' : 'error';
+        return this.#publish();
+    }
     settled(reason) { this.#result = settledProgramState(reason); }
-    resetResult() { this.#result = 'idle'; }
+    resetResult() { this.#result = 'idle'; this.#compacting = undefined; }
     prompt(message, kind = 'question') {
         const text = clean(message, 240);
         this.#prompts.push({ kind, ...(text === undefined ? {} : { message: text }) });

package/lib/runtime/terminal-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-state.js","sourceRoot":"","sources":["../../src/runtime/terminal-state.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal-state.js","sourceRoot":"","sources":["../../src/runtime/terminal-state.ts"],"names":[],"mappings":"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"}

package/lib/session/session-controller.js

@@ -20,7 +20,6 @@ import { isModelInvocable, isUserInvocable } from '@deepseek-ai/dsh-skill';
 import { BUILTIN_SLASH_COMMANDS } from "../views/autocomplete.js";
 import { readColdSessionLog } from '@deepseek-ai/dsh-session-query';
 import { appendPluginRecord, pluginRecordOf, SessionId, SessionLogOffset } from '@deepseek-ai/dsh-session';
-import { queueHostSubagentPrompt, steerHostSubagentPrompt } from '@deepseek-ai/dsh-subagent/internal';
 import { firstVisibleStreamTime } from "../views/stream-time.js";
 import { LiveAttemptTracker } from "./live-attempt-tracker.js";
 import { blocksText } from "./content-text.js";
@@ -364,6 +363,47 @@ export async function createSubmissionMessage(submission, attachments) {
         throw new Error('Cannot submit an empty message.');
     return createUserMessage({ content, source: { kind: 'user' } });
 }
+/**
+ * Build the host prompt parts for a subagent continuation. Unlike an ordinary
+ * Session prompt, the subagent Host admits browser images itself, so the draft
+ * crosses the seam as encoded bytes and files are refused here.
+ */
+function submissionPromptContent(submission) {
+    const imagePart = (image) => ({
+        type: 'image',
+        mediaType: image.mediaType,
+        data: Buffer.from(image.data).toString('base64'),
+        ...(image.name === undefined ? {} : { name: image.name }),
+    });
+    const rejectFiles = () => {
+        throw new Error('Subagent follow-up does not accept files.');
+    };
+    const parts = [];
+    if (submission.segments === undefined || submission.segments.length === 0) {
+        if (submission.text !== '')
+            parts.push({ type: 'text', text: submission.text });
+        for (const image of submission.images)
+            parts.push(imagePart(image));
+        if ((submission.files?.length ?? 0) > 0)
+            rejectFiles();
+        return parts;
+    }
+    for (const segment of submission.segments) {
+        if (segment.kind === 'text') {
+            if (segment.text !== '')
+                parts.push({ type: 'text', text: segment.text });
+        }
+        else if (segment.kind === 'image') {
+            const image = submission.images[segment.index];
+            if (image !== undefined)
+                parts.push(imagePart(image));
+        }
+        else {
+            rejectFiles();
+        }
+    }
+    return parts;
+}
 /** Rehydrate one durable human inbox message into an editable composer draft. */
 export async function restoreSubmissionMessage(message, attachments) {
     const text = blocksText(message.content);
@@ -468,7 +508,14 @@ export class SessionRuntime {
             },
             agentStatus: id => this.#ctx.get('agents')?.get(SessionId(id))?.status,
             sessions: () => this.#ctx.get('sessions')?.list() ?? [],
-            listChildren: rootId => this.#ctx.get('subagents')?.listChildren(SessionId(rootId)),
+            listChildren: rootId => this.#ctx.get('subagents')?.listDescendants(SessionId(rootId))
+                .then(entries => entries
+                .filter((entry) => entry.kind === 'child' && entry.depth === 1)
+                .map((entry) => ({
+                id: entry.id,
+                mode: entry.mode,
+                ...(entry.label === undefined ? {} : { label: entry.label }),
+            }))),
             publish: (roster) => {
                 this.#tui.setSubagents(this.#workflows.roster(roster));
                 if (this.#inspectedId === undefined)
@@ -584,6 +631,22 @@ export class SessionRuntime {
             if (session === active.handle.agent.session) {
                 if (event.type === 'turn/end')
                     tui.setStatus(active.handle.agent.status, { root: true, outcome: event.data.reason.kind });
+                else if (this.#inspectedId !== undefined && event.type === 'compaction/start') {
+                    tui.setStatus(active.handle.agent.status, {
+                        root: true,
+                        compaction: { phase: 'start', id: event.data.compactionId },
+                    });
+                }
+                else if (this.#inspectedId !== undefined && event.type === 'compaction/end') {
+                    tui.setStatus(active.handle.agent.status, {
+                        root: true,
+                        compaction: {
+                            phase: 'end',
+                            id: event.data.compactionId,
+                            ...(event.data.error === undefined ? {} : { error: event.data.error }),
+                        },
+                    });
+                }
                 if (this.#workflows.apply(event))
                     tui.setSubagents(this.#workflows.roster(this.#tracker.snapshot()));
                 if (this.#inspectedId === undefined) {
@@ -679,20 +742,19 @@ export class SessionRuntime {
         return true;
     }
     #isOwnedDescendant(agent, root) {
+        if (agent === root)
+            return false;
         const agents = this.#ctx.get('agents');
-        if (agents?.get(agent.id) !== agent
-            || descendantDepth(agent.session, root.id, this.#lookupSession) === undefined)
+        if (agents?.get(agent.id) !== agent || agents.get(root.id) !== root)
+            return false;
+        try {
+            // Runtime tree membership replaced registry ownership; durable lineage
+            // alone still matches an independently resumed runtime root.
+            return this.#ctx.get('subagents')?.rootOf(agent) === root;
+        }
+        catch {
             return false;
-        // Durable lineage alone also matches an independently resumed runtime root.
-        let child = agent;
-        while (child !== root) {
-            const parentId = child.session.header.parentSession;
-            const parent = parentId === undefined ? undefined : agents.get(parentId);
-            if (parent === undefined || !agents.isOwnedBy(child.id, parent))
-                return false;
-            child = parent;
         }
-        return true;
     }
     /** Accept only live descendants of the active root for shared approval prompts. */
     beginSubagentApproval(agent) {
@@ -1972,18 +2034,10 @@ export class SessionRuntime {
             this.#tui.notice('This subagent is a completed run and cannot take more messages.');
             return;
         }
-        const live = this.#ctx.get('sessions')?.get(SessionId(childId));
-        const rosterParent = this.#tracker.snapshot()?.agents.find(agent => agent.id === childId)?.parentId;
-        const parentId = live?.header.parentSession ?? rosterParent;
-        const parent = parentId === undefined || parentId === root.id
-            ? root
-            : this.#ctx.get('agents')?.get(SessionId(parentId));
         const subagents = this.#ctx.get('subagents');
-        if (parent === undefined || subagents === undefined) {
+        if (subagents === undefined) {
             this.#tui.restoreInput(submission, childId);
-            this.#tui.notice(parent === undefined
-                ? 'The parent of this subagent is not live, so it cannot take a follow-up.'
-                : 'Subagent follow-up is unavailable in this composition.');
+            this.#tui.notice('Subagent follow-up is unavailable in this composition.');
             return;
         }
         const previous = this.#inspectDeliveryTail;
@@ -1991,24 +2045,24 @@ export class SessionRuntime {
         this.#inspectDeliveryTail = new Promise(resolve => { release = resolve; });
         const delivery = new AbortController();
         this.#inspectDeliveries.add(delivery);
-        let cancelUpload = () => { };
+        let cancelWait = () => { };
         const cancelled = new Promise((_resolve, reject) => {
-            cancelUpload = () => { reject(delivery.signal.reason); };
-            delivery.signal.addEventListener('abort', cancelUpload, { once: true });
+            cancelWait = () => { reject(delivery.signal.reason); };
+            delivery.signal.addEventListener('abort', cancelWait, { once: true });
         });
         try {
             // Recalled messages can include attachments; admission must retain submission order.
             await Promise.race([previous, cancelled]);
             delivery.signal.throwIfAborted();
-            // Attachment storage need not support cancellation; release the draft now
-            // and ignore a later upload result before crossing Harness admission.
-            const message = await Promise.race([createSubmissionMessage(submission, this.#ctx.get('attachments')), cancelled]);
-            delivery.signal.removeEventListener('abort', cancelUpload);
-            delivery.signal.throwIfAborted();
             if (this.#inspectedId !== childId || this.#active?.handle.agent !== root)
                 throw new Error('The viewed session changed before delivery.');
-            const send = submission.delivery === 'steer' ? steerHostSubagentPrompt : queueHostSubagentPrompt;
-            const messageId = await send(subagents, parent, SessionId(childId), message.content, { kind: 'user' }, delivery.signal);
+            const content = submissionPromptContent(submission);
+            const messageId = (await subagents.prompt({
+                requestId: randomUUID(),
+                childSessionId: SessionId(childId),
+                delivery: submission.delivery === 'steer' ? 'steer' : 'queue',
+                content,
+            }, delivery.signal)).messageId;
             this.#tui.pendingInputs?.prepare?.(submission, messageId);
             this.#tui.pendingInputs?.acknowledge?.(submission);
         }
@@ -2018,7 +2072,7 @@ export class SessionRuntime {
                 this.#tui.notice(error instanceof Error ? error.message : String(error), { level: 'error' });
         }
         finally {
-            delivery.signal.removeEventListener('abort', cancelUpload);
+            delivery.signal.removeEventListener('abort', cancelWait);
             this.#inspectDeliveries.delete(delivery);
             release();
         }