@agi-fans/dsh-tui 0.20.0 → 0.22.0

package/lib/runtime/btw.js

@@ -0,0 +1,200 @@
+/** Durable side consultations over the public Harness Agent and fork seams. */
+import { Service } from '@deepseek-ai/cordis';
+import { randomUUID, createHash } from 'node:crypto';
+import { mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { Session, SessionId, SessionLogOffset, buildForkSeed, SESSION_FORMAT_VERSION } from '@deepseek-ai/dsh-session';
+import { createUserMessage } from '@deepseek-ai/dsh-llm';
+import { deriveTurnTokenUsage } from '@deepseek-ai/dsh-token-meter/client';
+import { configureAgentContext } from "./agent-profile.js";
+import { BTW_PRESET } from "./btw-policy.js";
+import { currentWorkingDirectory } from "../session/working-directory.js";
+import { blocksText } from "../session/content-text.js";
+import { readColdSessionLog } from '@deepseek-ai/dsh-session-query';
+/** Preserve the exact source prefix, then select the child's independent world. */
+export function btwSeed(parent, id, cwd) {
+    const prefix = parent.snapshotEvents();
+    const seed = prefix.length === 0 ? [] : buildForkSeed(prefix, prefix.at(-1).seq);
+    const snapshot = Session.create(id, seed, { id, version: SESSION_FORMAT_VERSION, createdAt: Date.now(), cwd,
+        parentSession: parent.id, isSeeded: true, agentPreset: BTW_PRESET }, SessionLogOffset(prefix.length));
+    snapshot.append('agent-preset/selected', { agentPreset: BTW_PRESET });
+    return snapshot.snapshotEvents();
+}
+function lastTurn(events) {
+    const at = events.findLastIndex(event => event.type === 'turn/start');
+    return at < 0 ? [] : events.slice(at);
+}
+export class BtwService extends Service {
+    static inject = ['agents', 'agentPresets', 'sessions', 'permissionPresets'];
+    ownerContext;
+    stateDir;
+    topics = new Map();
+    active = new Map();
+    tasks = new Set();
+    closing = new AbortController();
+    constructor(ctx, config = {}) {
+        super(ctx, 'omdshBtw');
+        this.ownerContext = ctx;
+        this.stateDir = config.stateDir;
+        if (this.stateDir !== undefined) {
+            let names;
+            try {
+                names = readdirSync(this.stateDir);
+            }
+            catch (error) {
+                if (error.code !== 'ENOENT')
+                    throw error;
+                names = [];
+            }
+            for (const name of names.filter(name => name.endsWith('.json'))) {
+                const topic = JSON.parse(readFileSync(join(this.stateDir, name), 'utf8'));
+                if (!validTopic(topic))
+                    throw new Error(`Invalid side consultation record: ${name}`);
+                this.topics.set(topic.sessionId, { ...topic, status: topic.status === 'running' ? 'cancelled' : topic.status });
+            }
+        }
+        ctx.on('agent/disposed', ({ agent }) => { this.active.get(agent)?.abort(new Error('The parent session was closed.')); });
+        ctx.effect(() => async () => { this.closing.abort(new Error('Side consultations unloaded.')); await Promise.allSettled(this.tasks); }, 'side consultation lifetime');
+    }
+    list(parent) {
+        return [...this.topics.values()].filter(topic => topic.parentSessionId === parent.id)
+            .sort((left, right) => right.updatedAt - left.updatedAt).map(topic => ({ ...topic }));
+    }
+    async read(parent, id, signal) {
+        const topic = this.topics.get(id);
+        if (topic?.parentSessionId !== parent.id)
+            throw new Error('That side consultation belongs to another session or is unavailable.');
+        const persistence = this.ownerContext.get('sessionPersistence');
+        if (persistence === undefined)
+            throw new Error('Session persistence is required to read a saved side consultation.');
+        const log = await readColdSessionLog(persistence, SessionId(id), signal);
+        if (log.header.parentSession !== parent.id || log.inheritedEventCount !== topic.prefixEvents)
+            throw new Error('The saved consultation no longer matches its parent snapshot.');
+        return log.events.slice(log.inheritedEventCount).flatMap(event => event.type === 'user/message' && event.data.source.kind === 'user'
+            ? ['### Question\n\n' + blocksText(event.data.content)]
+            : event.type === 'assistant/message' ? [blocksText(event.data.message.content)] : []).join('\n\n');
+    }
+    consult(parent, question, selection, signal, update, topicId) {
+        if (this.active.has(parent))
+            throw new Error('A side consultation is already running for this session.');
+        if (question.trim() === '')
+            throw new Error('Enter a side question.');
+        if (this.ownerContext.get('sessionPersistence') === undefined)
+            throw new Error('Session persistence is required for side consultations.');
+        const abort = new AbortController();
+        this.active.set(parent, abort);
+        const task = this.runQuestion(parent, question, selection, AbortSignal.any([signal, abort.signal, this.closing.signal]), update, topicId)
+            .finally(() => { this.active.delete(parent); this.tasks.delete(task); });
+        this.tasks.add(task);
+        return task;
+    }
+    async runQuestion(parent, question, selection, signal, update, topicId) {
+        const ctx = this.ownerContext;
+        const existing = topicId === undefined ? undefined : this.topics.get(topicId);
+        if (topicId !== undefined && existing?.parentSessionId !== parent.id)
+            throw new Error('That side consultation belongs to another session or is unavailable.');
+        const id = SessionId(existing?.sessionId ?? 'session-' + randomUUID());
+        const prefixEvents = existing?.prefixEvents ?? parent.session.snapshotEvents().length;
+        let topic = existing === undefined ? { version: 1, sessionId: id, parentSessionId: parent.id, prefixEvents,
+            question, createdAt: Date.now(), updatedAt: Date.now(), status: 'running' } : { ...existing, status: 'running', updatedAt: Date.now() };
+        let handle, text = '', attempt = '';
+        const ref = { current: { ...selection }, assembled: undefined };
+        const setup = async (agentCtx, agent) => {
+            const configured = await configureAgentContext(agentCtx, agent, ref);
+            if (configured.agentPreset !== BTW_PRESET)
+                throw new Error('The saved consultation no longer uses its tool-free composition.');
+        };
+        let offStream;
+        const cancel = () => { handle?.agent.cancel({ kind: 'user' }); };
+        signal.addEventListener('abort', cancel, { once: true });
+        try {
+            signal.throwIfAborted();
+            if (existing === undefined) {
+                const cwd = currentWorkingDirectory(ctx, parent.session);
+                const seed = btwSeed(parent.session, id, cwd);
+                handle = await ctx.get('agents').create({ sessionId: id, seed, inheritedEventCount: SessionLogOffset(prefixEvents),
+                    meta: { cwd, parentSession: parent.id, isSeeded: true, agentPreset: BTW_PRESET }, agentOptions: { ...selection, maxTokens: 8192 }, signal, setup });
+            }
+            else {
+                const stored = await ctx.get('sessionPersistence').stat(id, { signal });
+                if (stored === undefined || stored.header.parentSession !== parent.id)
+                    throw new Error('The saved consultation no longer matches its parent session.');
+                if (stored.formatStatus === 'migration-required')
+                    throw new Error('This consultation requires session-format migration before it can continue.');
+                handle = await ctx.get('agents').resume({ resumeSessionId: id, agentOptions: { ...selection, maxTokens: 8192 }, signal, setup });
+            }
+            const agent = handle.agent;
+            signal.throwIfAborted();
+            ctx.get('goals')?.disarm(agent);
+            const goal = ctx.get('goals')?.get(agent);
+            if (goal !== undefined)
+                ctx.get('goals').clear(agent, goal);
+            ctx.get('planMode')?.set(agent, false);
+            ctx.get('permissionPresets').set(agent.session, 'read-only');
+            if (existing === undefined)
+                ctx.get('sessionTitles')?.rename(agent.session, 'Side question: ' + question);
+            this.saveTopic(topic);
+            offStream = agent.ctx.on('agent/assistant-stream', ({ frame }) => {
+                if (frame.type === 'start') {
+                    attempt = '';
+                    update('');
+                }
+                if (frame.type === 'chunk' && frame.chunk.type === 'text-delta') {
+                    attempt += frame.chunk.text;
+                    update(attempt);
+                }
+            });
+            agent.followup(createUserMessage({ content: [{ type: 'text', text: question }], source: { kind: 'user' } }));
+            await agent.whenIdle();
+            const events = lastTurn(agent.session.ownEvents());
+            const message = events.findLast(event => event.type === 'assistant/message');
+            text = message?.type === 'assistant/message' ? blocksText(message.data.message.content) : attempt;
+            update(text);
+            const end = events.findLast(event => event.type === 'turn/end');
+            const reason = end?.type === 'turn/end' ? end.data.reason : undefined;
+            const error = reason?.kind === 'error' ? reason.error.message : reason?.kind === 'completed' || signal.aborted ? undefined : `Side question ended without completion (${reason?.kind ?? 'no turn'}).`;
+            topic = { ...topic, updatedAt: Date.now(), status: signal.aborted ? 'cancelled' : reason?.kind === 'completed' ? 'completed' : 'failed' };
+            await ctx.get('sessions').flush(agent.session);
+            this.saveTopic(topic);
+            const usage = deriveTurnTokenUsage(events);
+            return { topic, text, ...(usage === undefined ? {} : { usage }), ...(error === undefined ? {} : { error }) };
+        }
+        catch (error) {
+            topic = { ...topic, updatedAt: Date.now(), status: signal.aborted ? 'cancelled' : 'failed' };
+            if (handle !== undefined)
+                this.saveTopic(topic);
+            return { topic, text: text || attempt, ...(signal.aborted ? {} : { error: error instanceof Error ? error.message : String(error) }) };
+        }
+        finally {
+            signal.removeEventListener('abort', cancel);
+            offStream?.();
+            await handle?.dispose();
+        }
+    }
+    saveTopic(topic) {
+        if (this.stateDir !== undefined) {
+            mkdirSync(this.stateDir, { recursive: true });
+            const path = join(this.stateDir, createHash('sha256').update(topic.sessionId).digest('hex') + '.json');
+            const temp = path + '.' + randomUUID() + '.tmp';
+            try {
+                writeFileSync(temp, JSON.stringify(topic) + '\n', { mode: 0o600 });
+                renameSync(temp, path);
+            }
+            finally {
+                rmSync(temp, { force: true });
+            }
+        }
+        this.topics.set(topic.sessionId, topic);
+    }
+}
+function validTopic(value) {
+    if (value === null || typeof value !== 'object')
+        return false;
+    const item = value;
+    return item.version === 1 && typeof item.sessionId === 'string' && typeof item.parentSessionId === 'string'
+        && typeof item.question === 'string' && Number.isSafeInteger(item.prefixEvents) && item.prefixEvents >= 0
+        && Number.isSafeInteger(item.createdAt) && Number.isSafeInteger(item.updatedAt)
+        && ['running', 'completed', 'cancelled', 'failed'].includes(String(item.status));
+}
+export default BtwService;
+//# sourceMappingURL=btw.js.map

package/lib/runtime/btw.js.map

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

package/lib/runtime/cancellable.d.ts

@@ -0,0 +1,75 @@
+/**
+ * One cancellable long operation with its own progress surface.
+ *
+ * A long command needs three things wired together, and every call site used to
+ * write the same wiring by hand:
+ *
+ * 1. a signal that combines the caller's own cancellation with the reader's;
+ * 2. a prompt that gives the reader a way to cancel — Enter, Escape, `Ctrl+C`;
+ * 3. a "finished" signal so that dismissing the prompt because the *work* ended
+ *    is not mistaken for the reader cancelling the work.
+ *
+ * The third point is where hand-written copies went wrong: the prompt's promise
+ * settles both when the reader cancels and when the operation completes, so a
+ * naive `.then(() => controller.abort())` aborted the operation on its own
+ * success. Each site had to guard it with a second `finished` controller, and
+ * each site wrote that guard differently.
+ *
+ * `run()` owns the whole lifecycle: the body receives the combined signal, and
+ * the prompt is dismissed when the body settles either way.
+ *
+ * @module @agi-fans/dsh-tui/cancellable
+ */
+import type { TuiService } from '../definition.ts';
+/** One progress surface the reader can cancel from. */
+export interface CancellableProgress {
+    /** Title of the surface, such as `Creating worktree`. */
+    title: string;
+    /** The subject line: what is being done, in one row. */
+    question: string;
+    /** What cancelling does and does not undo. Shown under the subject. */
+    detail?: string;
+    /** Label of the cancel option. */
+    cancelLabel?: string;
+    /**
+     * Progress card, or a reading surface that updates while the work streams.
+     *
+     * A streaming operation (a side question's answer) needs a document the reader
+     * can watch and scroll; a file restore only needs to say what is happening. The
+     * lifecycle is identical, so both are one option rather than two helpers.
+     */
+    presentation?: 'progress' | 'document';
+    /** Repaint the open document; read on each refresh. */
+    document?: () => string;
+    /**
+     * Whether to open the surface at all.
+     *
+     * The caller decides, because the three operations disagreed: a worktree and a
+     * side question are interactive-only, while a file restore reports progress even
+     * when the caller did not claim an interactive screen. Inferring this from
+     * `tui.interactive` silently dropped the restore's progress surface.
+     */
+    surface: boolean;
+}
+/**
+ * Why a cancellable operation stopped early.
+ *
+ * The two are not the same event: a reader who presses cancel is watching, and
+ * knows the work stopped, while a superseded surface means the screen was taken
+ * by something else and the reader never saw the result. Callers that report a
+ * partial outcome treat them differently.
+ */
+export type CancellationReason = 'cancelled' | 'superseded';
+/**
+ * Run one long operation behind a cancel surface.
+ *
+ * Returns `undefined` when the operation never started because the caller was
+ * already aborted, so callers can skip their success path without checking.
+ *
+ * A non-interactive host runs the body without a surface: there is no reader to
+ * cancel it, and opening a prompt would claim a screen the pipe does not have.
+ */
+export declare function cancellable<T>(tui: Pick<TuiService, 'interactive' | 'prompt'>, progress: CancellableProgress, parent: AbortSignal, run: (signal: AbortSignal) => Promise<T>): Promise<{
+    value: T;
+    reason: CancellationReason | undefined;
+} | undefined>;

package/lib/runtime/cancellable.js

@@ -0,0 +1,76 @@
+/**
+ * One cancellable long operation with its own progress surface.
+ *
+ * A long command needs three things wired together, and every call site used to
+ * write the same wiring by hand:
+ *
+ * 1. a signal that combines the caller's own cancellation with the reader's;
+ * 2. a prompt that gives the reader a way to cancel — Enter, Escape, `Ctrl+C`;
+ * 3. a "finished" signal so that dismissing the prompt because the *work* ended
+ *    is not mistaken for the reader cancelling the work.
+ *
+ * The third point is where hand-written copies went wrong: the prompt's promise
+ * settles both when the reader cancels and when the operation completes, so a
+ * naive `.then(() => controller.abort())` aborted the operation on its own
+ * success. Each site had to guard it with a second `finished` controller, and
+ * each site wrote that guard differently.
+ *
+ * `run()` owns the whole lifecycle: the body receives the combined signal, and
+ * the prompt is dismissed when the body settles either way.
+ *
+ * @module @agi-fans/dsh-tui/cancellable
+ */
+/**
+ * Run one long operation behind a cancel surface.
+ *
+ * Returns `undefined` when the operation never started because the caller was
+ * already aborted, so callers can skip their success path without checking.
+ *
+ * A non-interactive host runs the body without a surface: there is no reader to
+ * cancel it, and opening a prompt would claim a screen the pipe does not have.
+ */
+export async function cancellable(tui, progress, parent, run) {
+    if (parent.aborted)
+        return undefined;
+    const cancel = new AbortController();
+    const finished = new AbortController();
+    const signal = AbortSignal.any([parent, cancel.signal]);
+    let superseded = false;
+    const surface = progress.surface
+        ? tui.prompt({
+            title: progress.title,
+            question: progress.question,
+            ...(progress.detail === undefined ? {} : { detail: progress.detail }),
+            ...(progress.document === undefined ? {} : { refreshDocument: progress.document }),
+            // Both surfaces report cancellation through the `interrupt` hook instead of
+            // the returned value, because the reader may be reading while it runs; the
+            // option list is only the keyboard affordance.
+            presentation: progress.presentation ?? 'progress',
+            options: [{ label: progress.cancelLabel ?? 'Cancel', value: 'cancel' }],
+            allowCustom: false,
+            notify: false,
+            signal: AbortSignal.any([parent, finished.signal]),
+            interrupt: () => { cancel.abort(); return true; },
+            // A superseding prompt takes the screen, which ends this operation rather
+            // than letting it run behind a surface nobody can see.
+            onSuperseded: () => { superseded = true; cancel.abort(); },
+        })
+            .then(() => { if (!finished.signal.aborted)
+            cancel.abort(); }, () => { cancel.abort(); })
+        : Promise.resolve();
+    try {
+        const value = await run(signal);
+        // `cancel` also fires when the parent aborted; only a stop the reader caused
+        // is reported as one.
+        const stopped = cancel.signal.aborted && !parent.aborted;
+        return { value, reason: stopped ? (superseded ? 'superseded' : 'cancelled') : undefined };
+    }
+    finally {
+        // Dismiss the surface exactly once, whether the work finished, failed, or
+        // was cancelled. Aborting `finished` first is what tells the prompt's own
+        // `.then` that this dismissal is not a cancellation.
+        finished.abort();
+        await surface;
+    }
+}
+//# sourceMappingURL=cancellable.js.map

package/lib/runtime/cancellable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cancellable.js","sourceRoot":"","sources":["../../src/runtime/cancellable.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AA6CH;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,GAA+C,EAC/C,QAA6B,EAC7B,MAAmB,EACnB,GAAwC;IAExC,IAAI,MAAM,CAAC,OAAO;QAAE,OAAO,SAAS,CAAA;IACpC,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAA;IACpC,MAAM,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAA;IACtC,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;IACvD,IAAI,UAAU,GAAG,KAAK,CAAA;IAEtB,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO;QAC9B,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC;YACX,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,GAAG,CAAC,QAAQ,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrE,GAAG,CAAC,QAAQ,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC;YAClF,4EAA4E;YAC5E,2EAA2E;YAC3E,+CAA+C;YAC/C,YAAY,EAAE,QAAQ,CAAC,YAAY,IAAI,UAAU;YACjD,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,WAAW,IAAI,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;YACvE,WAAW,EAAE,KAAK;YAClB,MAAM,EAAE,KAAK;YACb,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;YAClD,SAAS,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,OAAO,IAAI,CAAA,CAAC,CAAC;YAChD,0EAA0E;YAC1E,uDAAuD;YACvD,YAAY,EAAE,GAAG,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA,CAAC,CAAC;SAC1D,CAAC;aACC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO;YAAE,MAAM,CAAC,KAAK,EAAE,CAAA,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,CAAA,CAAC,CAAC,CAAC;QACzF,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;IAErB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,CAAA;QAC/B,6EAA6E;QAC7E,sBAAsB;QACtB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAA;QACxD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAA;IAC3F,CAAC;YAAS,CAAC;QACT,0EAA0E;QAC1E,0EAA0E;QAC1E,qDAAqD;QACrD,QAAQ,CAAC,KAAK,EAAE,CAAA;QAChB,MAAM,OAAO,CAAA;IACf,CAAC;AACH,CAAC"}

package/lib/runtime/composer-images.js

@@ -7,7 +7,7 @@
  * decoding, and the prompt/settings/search branches that decide whether a
  * paste is an image at all stay in the provider.
  */
-import { imageMarker, probeImageDimensions } from "../input/image-paste.js";
+import { imageMarker, probeImageDimensions, submissionDraftText } from "../input/image-paste.js";
 export class ComposerImages {
     #deps;
     #images = [];
@@ -139,15 +139,16 @@ export class ComposerImages {
             const image = currentImages[index];
             rebasedCurrent = rebasedCurrent.replaceAll(imageMarker(index, image), imageMarker(index + submission.images.length, image));
         }
-        const separator = submission.text !== '' && rebasedCurrent !== '' ? '\n' : '';
+        const restored = submissionDraftText(submission);
+        const separator = restored !== '' && rebasedCurrent !== '' ? '\n' : '';
         this.#images = [...submission.images.map(image => ({ ...image })), ...currentImages];
-        editor.replaceText(submission.text + separator + rebasedCurrent);
+        editor.replaceText(restored + separator + rebasedCurrent);
     }
     /** Replace drafts and text with a queued/edited submission. */
     replace(submission) {
         this.#revision++;
         this.#images = submission.images.map(image => ({ ...image }));
-        this.#deps.editor.setText(submission.text);
+        this.#deps.editor.setText(submissionDraftText(submission));
     }
     clear() {
         this.#revision++;

package/lib/runtime/composer-images.js.map

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

package/lib/runtime/composer-shell.d.ts

@@ -0,0 +1,30 @@
+/** Composer shortcut over the same owner-scoped Shell used by `/terminal`. */
+import type { Context } from '@deepseek-ai/cordis';
+import type { Agent } from '@deepseek-ai/dsh-agent';
+import type { TuiSubmission } from '../definition.ts';
+/** Only deliberate, attachment-free composer input may execute a Shell line. */
+export declare function composerShellCommand(submission: TuiSubmission): string | undefined;
+/** `!!<command>` runs in the session Shell and shares its output to the conversation. */
+export declare function composerShellShare(submission: TuiSubmission): boolean;
+/**
+ * Run one Shell line in the session Shell, streaming its output to a live card.
+ *
+ * The card is the surface. There is no reader to enter and leave: the command
+ * streams into the transcript where the reader asked for it, and finishes when
+ * the command finishes. `!` keeps the output outside the model's context; `!!`
+ * shares it once the command settles.
+ */
+export declare function runComposerShell(ctx: Context, owner: Agent, command: string, upstream: AbortSignal, options?: {
+    share?: boolean;
+}): Promise<void>;
+/**
+ * Close the composer Shell when it is not running anything.
+ *
+ * The Shell is reused across `!` lines so a directory change or an environment
+ * variable survives, which is the whole point of it. That reuse also pins the
+ * session to the Access level it was created in: the Harness refuses to change
+ * sandbox mode while a persistent terminal is open, and a reader driving `!`
+ * cards would otherwise be stuck on one level forever with no way out. A Shell
+ * with a command still running is left alone — closing it would kill work.
+ */
+export declare function closeIdleComposerShell(ctx: Context, owner: Agent): Promise<boolean>;

package/lib/runtime/composer-shell.js

@@ -0,0 +1,150 @@
+/** Composer shortcut over the same owner-scoped Shell used by `/terminal`. */
+import { shareTerminalOutputToConversation } from "../commands/terminal.js";
+import { currentWorkingDirectory } from "../session/working-directory.js";
+/** Only deliberate, attachment-free composer input may execute a Shell line. */
+export function composerShellCommand(submission) {
+    if (submission.literal || submission.images.length > 0 || submission.files?.length)
+        return undefined;
+    if (!submission.text.startsWith('!'))
+        return undefined;
+    return submission.text.replace(/^!{1,2}/u, '').trim();
+}
+/** `!!<command>` runs in the session Shell and shares its output to the conversation. */
+export function composerShellShare(submission) {
+    if (submission.literal || submission.images.length > 0 || submission.files?.length)
+        return false;
+    return submission.text.startsWith('!!');
+}
+/**
+ * Run one Shell line in the session Shell, streaming its output to a live card.
+ *
+ * The card is the surface. There is no reader to enter and leave: the command
+ * streams into the transcript where the reader asked for it, and finishes when
+ * the command finishes. `!` keeps the output outside the model's context; `!!`
+ * shares it once the command settles.
+ */
+export async function runComposerShell(ctx, owner, command, upstream, options = {}) {
+    if (ctx.tui.interactive !== true)
+        throw new Error('Shell shortcuts require an interactive terminal.');
+    if (command === '')
+        throw new Error('Enter a command after ! to run it in the session Shell.');
+    const terminals = ctx.get('terminals');
+    if (terminals === undefined)
+        throw new Error('The terminal provider is not enabled. Enable the terminal plugins to run Shell commands.');
+    if (ctx.tui.shellCommand === undefined)
+        throw new Error('This deployment cannot run Shell lines from the composer.');
+    const interruption = new AbortController();
+    const signal = AbortSignal.any([upstream, interruption.signal]);
+    signal.throwIfAborted();
+    // Cordis service access is context-bound; proxy identity is not a registry
+    // identity. The registry already owns exact-Agent names and liveness.
+    const previous = terminals.list(owner).find(item => item.name === 'Composer shell' && item.type === 'shell');
+    let id = previous?.sessionId;
+    if (id !== undefined && previous?.status.kind !== 'running') {
+        await terminals.kill(owner, id, 'Composer shell exited');
+        id = undefined;
+    }
+    if (id === undefined) {
+        const session = await terminals.spawn(owner, { type: 'shell', name: 'Composer shell', cwd: currentWorkingDirectory(ctx, owner.session) }, signal);
+        id = session.sessionId;
+    }
+    signal.throwIfAborted();
+    const sessionId = id;
+    let produced = '';
+    await ctx.tui.shellCommand({
+        command,
+        signal,
+        abort: () => { interruption.abort(new Error('Shell interrupted by user')); },
+        ...(options.share === true ? { share: true } : {}),
+        run: async (onOutput, runSignal) => {
+            // The Shell is persistent, so its scrollback holds everything typed into it
+            // across earlier `!` lines — and the shell's own prompt echoes each line.
+            // Reading the whole snapshot into the card would repeat the command under
+            // our own `$ command` header and replay history from before this line ran.
+            // The line count is the boundary: everything above it belongs to an
+            // earlier line, everything below it is this command's output.
+            const baseline = terminals.read(owner, sessionId).totalLines;
+            const operation = terminals.startSend(owner, sessionId, { text: command, submit: true, signal: runSignal });
+            const since = () => {
+                const fresh = terminals.read(owner, sessionId).totalLines - baseline;
+                if (fresh <= 0)
+                    return '';
+                return terminals.read(owner, sessionId, { offset: 0, count: fresh }).text;
+            };
+            let done = false;
+            const pump = () => {
+                if (done)
+                    return;
+                onOutput(since());
+            };
+            const tick = setInterval(pump, SHELL_STREAM_TICK_MS);
+            tick.unref?.();
+            // Race the send against the abort. A provider is not obliged to settle
+            // `done` when a signal fires, and waiting on it would leave the card
+            // running after the reader already asked it to stop.
+            const aborted = new Promise((resolve) => {
+                if (runSignal.aborted)
+                    resolve('aborted');
+                else
+                    runSignal.addEventListener('abort', () => { resolve('aborted'); }, { once: true });
+            });
+            try {
+                const settled = await Promise.race([operation.done.then(() => 'done').catch(() => 'failed'), aborted]);
+                // A settled send means the line was delivered, not that the command
+                // exited; the card reports the delivery rather than inventing an exit
+                // code the Shell never gave us.
+                if (settled === 'done') {
+                    // Publish the settled delta to the card as well: the tick that would
+                    // have shown it may never fire, and the card must not stop on a frame
+                    // older than the command.
+                    produced = since();
+                    if (produced !== '')
+                        onOutput(produced);
+                    return { output: produced };
+                }
+                // An interrupted line still needs the send cancelled and the shell
+                // signalled, or the command keeps running in the background while the
+                // card claims it stopped.
+                if (!operation.cancel() && terminals.list(owner).some(item => item.sessionId === sessionId && item.status.kind === 'running')) {
+                    await terminals.signal(owner, sessionId, 'SIGINT');
+                }
+                return { output: since(), interrupted: true };
+            }
+            finally {
+                done = true;
+                clearInterval(tick);
+            }
+        },
+    });
+    if (options.share === true && !signal.aborted) {
+        // Share what this line produced, for the same reason the card shows that.
+        shareTerminalOutputToConversation(owner, `Shell · \`${command}\``, produced);
+    }
+}
+/**
+ * Close the composer Shell when it is not running anything.
+ *
+ * The Shell is reused across `!` lines so a directory change or an environment
+ * variable survives, which is the whole point of it. That reuse also pins the
+ * session to the Access level it was created in: the Harness refuses to change
+ * sandbox mode while a persistent terminal is open, and a reader driving `!`
+ * cards would otherwise be stuck on one level forever with no way out. A Shell
+ * with a command still running is left alone — closing it would kill work.
+ */
+export async function closeIdleComposerShell(ctx, owner) {
+    const terminals = ctx.get('terminals');
+    if (terminals === undefined)
+        return false;
+    // A persistent shell reports `running` for as long as it is alive, whether or
+    // not a command is in it, so "idle" cannot be read from that status. The
+    // composer Shell is closed unconditionally: it exists only to serve the last
+    // `!` line, and the reader is asking to change Access rather than to keep a
+    // session pinned to the old one.
+    const shells = terminals.list(owner).filter(item => item.name === 'Composer shell' && item.type === 'shell');
+    for (const item of shells)
+        await terminals.kill(owner, item.sessionId, 'Composer shell closed for an Access change');
+    return shells.length > 0;
+}
+/** How often the live card re-reads the terminal while a command writes. */
+const SHELL_STREAM_TICK_MS = 120;
+//# sourceMappingURL=composer-shell.js.map