@deepseek-harness-tui/dsh-tui 0.8.6 → 0.8.7

package/lib/types/dsh-adapter/index.js

@@ -64,11 +64,17 @@ export const Config = Schema.object({
  * @returns a promise settling when the TUI teardown completes.
  */
 export async function apply(ctx, config) {
-    const { upstreamDrift, UPSTREAM_VALIDATED_VERSION } = await import('./contract.js');
+    const { upstreamDrift, installedUpstreamLines, UPSTREAM_VALIDATED_LABEL } = await import('./contract.js');
     for (const entry of upstreamDrift()) {
         console.warn(`[dsh-tui] upstream drift: ${entry.package} installed=${entry.installed ?? 'missing'} ` +
-            `validated=${UPSTREAM_VALIDATED_VERSION} — the TUI was validated against ` +
-            `${UPSTREAM_VALIDATED_VERSION}; upgrade the profile when upstream is bumped.`);
+            `validated=${entry.validated} — the TUI is validated against ${UPSTREAM_VALIDATED_LABEL}; ` +
+            `upgrade or downgrade the profile when the upstream line changes.`);
+    }
+    const installedLines = installedUpstreamLines();
+    if (installedLines.length > 1) {
+        console.warn(`[dsh-tui] mixed upstream lines detected (${installedLines.map(n => `rc.${n}`).join(', ')}) — ` +
+            `blessed packages are on different rc lines; the TUI is validated against ${UPSTREAM_VALIDATED_LABEL} ` +
+            `and a coherent install is strongly recommended.`);
     }
     const { apply: ccTuiApply } = await import('./plugin.js');
     return ccTuiApply(ctx, config);

package/lib/types/dsh-adapter/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAe,MAAM,wBAAwB,CAAA;AAGhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAoCnC;;;;;;;;GAQG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsyBvE;AA6GD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;CAAE,GAAG;IACjF,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;IACrC,YAAY,EAAE,MAAM,IAAI,CAAA;CACzB,CAcA;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE;IACpC,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,KAAK,GAAG,SAAS,CAAA;IAC5B,YAAY,EAAE,KAAK,CAAA;CACpB,GAAG,OAAO,CAQV"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAe,MAAM,wBAAwB,CAAA;AAGhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAqCnC;;;;;;;;GAQG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA60BvE;AA6GD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;CAAE,GAAG;IACjF,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;IACrC,YAAY,EAAE,MAAM,IAAI,CAAA;CACzB,CAcA;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE;IACpC,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,KAAK,GAAG,SAAS,CAAA;IAC5B,YAAY,EAAE,KAAK,CAAA;CACpB,GAAG,OAAO,CAQV"}

package/lib/types/dsh-adapter/plugin.js

@@ -25,6 +25,7 @@ import { checkForTuiUpdate, installedTuiVersion, isBootDeadlockTarget, isVersion
 import { getLang, isLang, resolveStartupLang, setLang, t, writeLangPref } from '../i18n.js';
 import { DEFAULT_STATUS_BAR, normalizeStatusBar, normalizeToolBackground } from '../tuiDisplayPrefs.js';
 import { detectLegacyEnv, migrateLegacyDataDir, RENAMED_ENV } from '../utils/paths.js';
+import { attachHerdrIntegration } from '../herdr.js';
 import { Chat } from '../screens/Chat.js';
 import { getHostDialogStore } from './dialogs.js';
 import { getHostStatusStore } from './status.js';
@@ -357,6 +358,11 @@ export async function apply(ctx, config) {
                 trajectory: Schema.boolean().default(DEFAULT_STATUS_BAR.trajectory),
                 shortcutHint: Schema.boolean().default(DEFAULT_STATUS_BAR.shortcutHint),
             }).default({ ...DEFAULT_STATUS_BAR }),
+            // Header pixel whale art; on unless settings.yaml says otherwise.
+            whale: Schema.boolean().default(true),
+            // Minimal mode: strips the header splash, emoji glyphs, and
+            // decorative colors; code highlight and tool colors stay.
+            minimal: Schema.boolean().default(false),
             // No default on purpose: an unset `lang` keeps the field showing
             // the effective language (see the section's format below) and lets
             // cordis.yml / lang.json keep their precedence.
@@ -365,6 +371,12 @@ export async function apply(ctx, config) {
         const applyLayout = (value) => {
             channel.setDiffLayout(value.diffLayout ?? config.diffLayout ?? 'auto');
         };
+        const applyWhale = (value) => {
+            channel.setWhale(value.whale ?? true);
+        };
+        const applyMinimal = (value) => {
+            channel.setMinimal(value.minimal ?? false);
+        };
         // The /settings language field writes `lang` through the settings
         // service (user layer): apply it live and mirror it to lang.json so
         // the /lang command and next-boot resolution agree. DSH_TUI_LANG
@@ -385,6 +397,8 @@ export async function apply(ctx, config) {
         };
         const apply = (next) => {
             applyLayout(next);
+            applyWhale(next);
+            applyMinimal(next);
             applyLang(next);
             applyDisplay(next);
         };
@@ -595,6 +609,22 @@ export async function apply(ctx, config) {
                     group: 'status-bar',
                     kind: 'boolean',
                 },
+                {
+                    path: ['whale'],
+                    label: 'Whale art',
+                    descriptions: { zh: '鲸鱼娘' },
+                    hint: 'Show the pixel whale in the header splash.',
+                    hintDescriptions: { zh: '开屏头部显示像素鲸鱼娘。' },
+                    kind: 'boolean',
+                },
+                {
+                    path: ['minimal'],
+                    label: 'Minimal mode',
+                    descriptions: { zh: '极简模式' },
+                    hint: 'Hide the header splash, emoji glyphs, and decorative colors; code highlight and tool colors stay. Trims the status bar to model + cwd.',
+                    hintDescriptions: { zh: '隐藏开屏头部、emoji 状态符与装饰性配色；代码高亮与工具配色保留，底栏只留模型与目录。' },
+                    kind: 'boolean',
+                },
             ],
         });
         ctx.effect(() => unregister);
@@ -612,6 +642,14 @@ export async function apply(ctx, config) {
         ctx.on('approval/request', (req, next) => String(req.agent.id) === channel.agentId ? approvalStore.park(req) : next());
         ctx.effect(() => () => approvalStore.settleAll('cancelled'));
     }
+    const herdr = attachHerdrIntegration({
+        channel,
+        questions: questionStore,
+        approvals: approvalStore,
+    });
+    if (herdr !== undefined) {
+        ctx.effect(() => () => herdr.dispose());
+    }
     // Positional command-line arguments are the initial prompt (issue #53):
     // `dsh-tui "run the tests"` forwards positionals through the dsh CLI,
     // which mounts them as ctx.cmdlineArgs. Submit once the channel exists —

package/lib/types/dsh-adapter/shortcuts.js

@@ -43,9 +43,9 @@ const NAMED_KEYS = {
  * Combos the TUI owns, globally or inside the prompt editor (the editor's
  * bindings are checked AFTER plugin shortcuts, so refusing them here is
  * what keeps "locals win" true). Built-in handlers match a MODIFIER SUBSET
- * (`isMod(key) && input === 'x'` — they never exclude an extra Shift), so
+ * (`key.ctrl && input === 'g'` — they never exclude an extra Shift), so
  * the reserved check below refuses a plugin combo whose SHIFTLESS form is
- * reserved: ctrl+shift+x would shadow Ctrl+X on terminals that report both
+ * reserved: ctrl+shift+g would shadow Ctrl+G on terminals that report both
  * as the same keypress (ConPTY does), and would be dead weight on terminals
  * that don't.
  */
@@ -54,7 +54,7 @@ const RESERVED_COMBOS = new Set([
     'ctrl+d', // exit on empty input
     'ctrl+t', // startup context panel
     'ctrl+r', // history search
-    'ctrl+x', // external editor
+    'ctrl+g', // external editor
     'ctrl+o', // transcript mode toggle
     'ctrl+l', // terminal redraw
     'ctrl+e', // show all messages / line end

package/lib/types/dsh-adapter/subagents.d.ts

@@ -0,0 +1,87 @@
+/** Unified subagent activity domain model used by the adapter and every view. */
+export type SubagentStatus = 'starting' | 'running' | 'completed' | 'failed' | 'cancelled' | 'unknown';
+export type SubagentOutputKind = 'text' | 'thinking' | 'tool' | 'error' | 'system';
+export interface SubagentOutputLine {
+    kind: SubagentOutputKind;
+    text: string;
+    at: number;
+    /** False while the line is still absorbing streaming deltas. */
+    settled?: boolean;
+}
+export interface SubagentToolCall {
+    id?: string;
+    name: string;
+    status: 'running' | 'completed' | 'failed';
+    startedAt: number;
+    endedAt?: number;
+    argsPreview?: string;
+    resultPreview?: string;
+    error?: string;
+}
+export interface SubagentTokenUsage {
+    input?: number;
+    output?: number;
+    total?: number;
+    context?: number;
+}
+export interface SubagentState {
+    agentId: string;
+    runId?: string;
+    description: string;
+    provider?: string;
+    model?: string;
+    effort?: string;
+    status: SubagentStatus;
+    startedAt: number;
+    completedAt?: number;
+    endedAt?: number;
+    local?: boolean;
+    parentSessionId?: string;
+    sessionId?: string;
+    stopReason?: string;
+    error?: string;
+    /** Compatibility projection for older consumers. */
+    output: string[];
+    outputEvents: SubagentOutputLine[];
+    toolCalls: SubagentToolCall[];
+    tokens?: SubagentTokenUsage;
+    summary?: string;
+}
+export declare class SubagentActivityStore {
+    private states;
+    private sessionToAgent;
+    private listeners;
+    private commitLine;
+    private pushLine;
+    onSpawned(agentId: string, provider?: string, model?: string, info?: Partial<SubagentState>): void;
+    linkSession(agentId: string, session: unknown): void;
+    getSubagentIdBySession(session: unknown): string | undefined;
+    appendOutput(agentId: string, text: string, kind?: SubagentOutputKind): void;
+    /** Mark the streaming tail line complete (run settlement). */
+    flushOutput(agentId: string): void;
+    onSessionEvent(agentId: string, event: unknown): void;
+    /** Merge partial updates (model discovery, session id) into one subagent. */
+    patch(agentId: string, partial: Partial<SubagentState>): void;
+    /** One-line preview of a tool-result content block (text or item list). */
+    private previewOf;
+    recordTool(agentId: string, input: Partial<SubagentToolCall> & {
+        name?: string;
+    }): void;
+    setTokens(agentId: string, usage: {
+        inputTokens?: number;
+        outputTokens?: number;
+        input?: number;
+        output?: number;
+        total?: number;
+        context?: number;
+    }): void;
+    onCompleted(agentId: string, summary?: string, stopReason?: string): void;
+    onFailed(agentId: string, error: string): void;
+    onCancelled(agentId: string, reason?: string, summary?: string): void;
+    private finish;
+    snapshot(): SubagentState[];
+    get(agentId: string): SubagentState | undefined;
+    subscribe(listener: () => void): () => void;
+    private notify;
+}
+//# sourceMappingURL=subagents.d.ts.map

package/lib/types/dsh-adapter/subagents.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"subagents.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/subagents.ts"],"names":[],"mappings":"AAAA,iFAAiF;AAEjF,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,WAAW,GAAG,SAAS,CAAA;AACtG,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAA;AAElF,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,kBAAkB,CAAA;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,MAAM,CAAA;IACV,gEAAgE;IAChE,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAA;IAC1C,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,cAAc,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,oDAAoD;IACpD,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,YAAY,EAAE,kBAAkB,EAAE,CAAA;IAClC,SAAS,EAAE,gBAAgB,EAAE,CAAA;IAC7B,MAAM,CAAC,EAAE,kBAAkB,CAAA;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAKD,qBAAa,qBAAqB;IAChC,OAAO,CAAC,MAAM,CAAmC;IACjD,OAAO,CAAC,cAAc,CAA6B;IACnD,OAAO,CAAC,SAAS,CAAwB;IAEzC,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,QAAQ;IAOhB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,SAAa,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,GAAE,OAAO,CAAC,aAAa,CAAM,GAAG,IAAI;IA0B1G,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAMpD,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS;IAE5D,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,kBAA2B,GAAG,IAAI;IA0BpF,8DAA8D;IAC9D,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IASlC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IA2CrD,6EAA6E;IAC7E,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI;IAO7D,2EAA2E;IAC3E,OAAO,CAAC,SAAS;IAUjB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IASvF,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAU3J,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,UAAU,SAAc,GAAG,IAAI;IAC9E,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAC9C,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAc,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAE1E,OAAO,CAAC,MAAM;IAYd,QAAQ,IAAI,aAAa,EAAE;IAC3B,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAC/C,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAC3C,OAAO,CAAC,MAAM;CACf"}

package/lib/types/dsh-adapter/subagents.js

@@ -0,0 +1,204 @@
+/** Unified subagent activity domain model used by the adapter and every view. */
+const MAX_OUTPUT_EVENTS = 160;
+const MAX_OUTPUT_LINES = 160;
+export class SubagentActivityStore {
+    states = new Map();
+    sessionToAgent = new Map();
+    listeners = new Set();
+    commitLine(agentId, kind, text) {
+        const state = this.states.get(agentId);
+        if (!state)
+            return;
+        this.pushLine(state, { kind, text, at: Date.now(), settled: true });
+    }
+    pushLine(state, line) {
+        state.outputEvents.push(line);
+        if (state.outputEvents.length > MAX_OUTPUT_EVENTS)
+            state.outputEvents.splice(0, state.outputEvents.length - MAX_OUTPUT_EVENTS);
+        state.output = state.outputEvents.map(entry => entry.text);
+        if (state.output.length > MAX_OUTPUT_LINES)
+            state.output.splice(0, state.output.length - MAX_OUTPUT_LINES);
+    }
+    onSpawned(agentId, provider = 'subagent', model, info = {}) {
+        const existing = this.states.get(agentId);
+        const state = existing ?? {
+            agentId,
+            runId: info.runId ?? agentId,
+            description: info.description ?? 'Subagent task',
+            provider,
+            model: model ?? info.model ?? provider,
+            effort: info.effort,
+            status: 'running',
+            startedAt: info.startedAt ?? Date.now(),
+            local: info.local,
+            parentSessionId: info.parentSessionId,
+            sessionId: info.sessionId,
+            output: [],
+            outputEvents: [],
+            toolCalls: [],
+        };
+        if (existing) {
+            Object.assign(existing, info, { provider, model: model ?? existing.model, status: existing.status === 'completed' ? existing.status : 'running' });
+        }
+        else {
+            this.states.set(agentId, state);
+        }
+        this.notify();
+    }
+    linkSession(agentId, session) {
+        if (session !== undefined && session !== null)
+            this.sessionToAgent.set(session, agentId);
+        const state = this.states.get(agentId);
+        if (state && typeof session === 'string')
+            state.sessionId = session;
+    }
+    getSubagentIdBySession(session) { return this.sessionToAgent.get(session); }
+    appendOutput(agentId, text, kind = 'text') {
+        const state = this.states.get(agentId);
+        if (!state || !text)
+            return;
+        const last = state.outputEvents[state.outputEvents.length - 1];
+        if (last === undefined || last.settled || last.kind !== kind) {
+            if (last !== undefined && !last.settled)
+                last.settled = true;
+            this.pushLine(state, { kind, text, at: Date.now(), settled: false });
+            this.notify();
+            return;
+        }
+        last.text += text;
+        const parts = last.text.split('\n');
+        if (parts.length > 1) {
+            last.text = parts[0];
+            last.settled = true;
+            for (const middle of parts.slice(1, -1)) {
+                this.pushLine(state, { kind, text: middle, at: Date.now(), settled: true });
+            }
+            const tail = parts[parts.length - 1] ?? '';
+            if (tail)
+                this.pushLine(state, { kind, text: tail, at: Date.now(), settled: false });
+        }
+        else {
+            state.output = state.outputEvents.map(entry => entry.text);
+        }
+        this.notify();
+    }
+    /** Mark the streaming tail line complete (run settlement). */
+    flushOutput(agentId) {
+        const state = this.states.get(agentId);
+        const last = state?.outputEvents[state.outputEvents.length - 1];
+        if (last !== undefined && !last.settled) {
+            last.settled = true;
+            this.notify();
+        }
+    }
+    onSessionEvent(agentId, event) {
+        if (!event || typeof event !== 'object')
+            return;
+        const ev = event;
+        const data = ev.data ?? {};
+        switch (ev.type) {
+            case 'assistant/chunk': {
+                const chunk = data.chunk ?? {};
+                if (chunk.type === 'text-delta' && chunk.text)
+                    this.appendOutput(agentId, chunk.text, 'text');
+                else if (chunk.type === 'reasoning-delta' && chunk.text)
+                    this.appendOutput(agentId, chunk.text, 'thinking');
+                else if (chunk.type === 'usage' && chunk.usage)
+                    this.setTokens(agentId, chunk.usage);
+                break;
+            }
+            case 'assistant/message': {
+                if (data.usage)
+                    this.setTokens(agentId, data.usage);
+                break;
+            }
+            case 'tool/call': {
+                this.recordTool(agentId, { id: data.callId, name: data.name, status: 'running', startedAt: Date.now(), argsPreview: data.arguments });
+                break;
+            }
+            case 'tool/result': {
+                const callId = data?.message?.source?.callId;
+                const state = this.states.get(agentId);
+                const tool = callId !== undefined ? state?.toolCalls.find(entry => entry.id === callId) : undefined;
+                if (tool) {
+                    tool.status = data.error !== undefined ? 'failed' : 'completed';
+                    tool.endedAt = Date.now();
+                    if (data.error !== undefined)
+                        tool.error = String(data.error);
+                    else {
+                        const block = data.message?.content?.[0];
+                        tool.resultPreview = block !== undefined && block.type === 'tool-result'
+                            ? this.previewOf(block.content)
+                            : undefined;
+                    }
+                    this.notify();
+                }
+                break;
+            }
+            default:
+                break;
+        }
+    }
+    /** Merge partial updates (model discovery, session id) into one subagent. */
+    patch(agentId, partial) {
+        const state = this.states.get(agentId);
+        if (!state)
+            return;
+        Object.assign(state, partial);
+        this.notify();
+    }
+    /** One-line preview of a tool-result content block (text or item list). */
+    previewOf(content) {
+        const text = typeof content === 'string'
+            ? content
+            : Array.isArray(content)
+                ? content.map(item => (typeof item === 'object' && item !== null && 'text' in item ? String(item.text ?? '') : '')).join(' ')
+                : '';
+        const flat = text.replace(/\s+/g, ' ').trim();
+        return flat ? (flat.length > 80 ? `${flat.slice(0, 80)}…` : flat) : undefined;
+    }
+    recordTool(agentId, input) {
+        const state = this.states.get(agentId);
+        if (!state || !input.name)
+            return;
+        const current = input.id ? state.toolCalls.find(tool => tool.id === input.id) : undefined;
+        if (current)
+            Object.assign(current, input);
+        else
+            state.toolCalls.push({ name: input.name, status: input.status ?? 'completed', startedAt: input.startedAt ?? Date.now(), ...input });
+        this.notify();
+    }
+    setTokens(agentId, usage) {
+        const state = this.states.get(agentId);
+        if (!state)
+            return;
+        const input = usage.input ?? usage.inputTokens;
+        const output = usage.output ?? usage.outputTokens;
+        if (input === undefined && output === undefined && usage.total === undefined)
+            return;
+        state.tokens = { ...state.tokens, input, output, total: usage.total ?? ((input ?? 0) + (output ?? 0) || undefined) };
+        this.notify();
+    }
+    onCompleted(agentId, summary, stopReason = 'completed') { this.finish(agentId, 'completed', stopReason, summary); }
+    onFailed(agentId, error) { this.finish(agentId, 'failed', error, undefined); }
+    onCancelled(agentId, reason = 'cancelled', summary) { this.finish(agentId, 'cancelled', reason, summary); }
+    finish(agentId, status, reason, summary) {
+        const state = this.states.get(agentId);
+        if (!state || (state.status !== 'running' && state.status !== 'starting'))
+            return;
+        state.status = status;
+        state.completedAt = Date.now();
+        state.endedAt = state.completedAt;
+        state.stopReason = reason;
+        if (summary)
+            state.summary = summary;
+        if (status === 'failed')
+            state.error = reason;
+        this.notify();
+    }
+    snapshot() { return Array.from(this.states.values()).map(state => ({ ...state, output: [...state.output], outputEvents: [...state.outputEvents], toolCalls: state.toolCalls.map(tool => ({ ...tool })), tokens: state.tokens ? { ...state.tokens } : undefined })); }
+    get(agentId) { return this.snapshot().find(state => state.agentId === agentId); }
+    subscribe(listener) { this.listeners.add(listener); return () => this.listeners.delete(listener); }
+    notify() { for (const listener of this.listeners)
+        listener(); }
+}

package/lib/types/herdr.d.ts

@@ -0,0 +1,28 @@
+import { type ExecFileNoThrowResult } from './utils/execFileNoThrow.js';
+interface HerdrChannel {
+    readonly working: boolean;
+    subscribe(listener: () => void): () => void;
+}
+interface BlockingStore {
+    subscribe(listener: () => void): () => void;
+    getSnapshot(): unknown | null;
+}
+type RunCommand = (file: string, args: readonly string[]) => Promise<ExecFileNoThrowResult>;
+export interface HerdrIntegration {
+    settled(): Promise<void>;
+    dispose(): Promise<void>;
+}
+export interface HerdrIntegrationOptions {
+    readonly channel: HerdrChannel;
+    readonly questions: BlockingStore;
+    readonly approvals: BlockingStore;
+    readonly env?: NodeJS.ProcessEnv;
+    readonly run?: RunCommand;
+    readonly reportTimeoutMs?: number;
+    readonly releaseTimeoutMs?: number;
+    readonly retryDelaysMs?: readonly number[];
+}
+/** Report this TUI's lifecycle to the owning Herdr pane when Herdr launches it. */
+export declare function attachHerdrIntegration(options: HerdrIntegrationOptions): HerdrIntegration | undefined;
+export {};
+//# sourceMappingURL=herdr.d.ts.map

package/lib/types/herdr.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"herdr.d.ts","sourceRoot":"","sources":["../../src/herdr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAQxF,UAAU,YAAY;IACpB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAA;CAC5C;AAED,UAAU,aAAa;IACrB,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAA;IAC3C,WAAW,IAAI,OAAO,GAAG,IAAI,CAAA;CAC9B;AAED,KAAK,UAAU,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAE3F,MAAM,WAAW,gBAAgB;IAC/B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACxB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACzB;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAA;IAC9B,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAA;IACjC,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAA;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;IAChC,QAAQ,CAAC,GAAG,CAAC,EAAE,UAAU,CAAA;IACzB,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;IACjC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAClC,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAC3C;AAkBD,mFAAmF;AACnF,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,uBAAuB,GAC/B,gBAAgB,GAAG,SAAS,CAgH9B"}

package/lib/types/herdr.js

@@ -0,0 +1,133 @@
+import { execFileNoThrow } from './utils/execFileNoThrow.js';
+const REPORT_TIMEOUT_MS = 2000;
+const RELEASE_TIMEOUT_MS = 500;
+const RETRY_DELAYS_MS = [100, 250, 500, 1000];
+function withTimeout(promise, timeoutMs) {
+    return new Promise(resolve => {
+        const timer = setTimeout(() => resolve(undefined), timeoutMs);
+        void promise.then(value => {
+            clearTimeout(timer);
+            resolve(value);
+        }, () => {
+            clearTimeout(timer);
+            resolve(undefined);
+        });
+    });
+}
+/** Report this TUI's lifecycle to the owning Herdr pane when Herdr launches it. */
+export function attachHerdrIntegration(options) {
+    const env = options.env ?? process.env;
+    const executable = env.HERDR_BIN_PATH?.trim();
+    const paneId = env.HERDR_PANE_ID?.trim();
+    if (env.HERDR_ENV !== '1' || !executable || !paneId)
+        return undefined;
+    const reportTimeoutMs = options.reportTimeoutMs ?? REPORT_TIMEOUT_MS;
+    const releaseTimeoutMs = options.releaseTimeoutMs ?? RELEASE_TIMEOUT_MS;
+    const retryDelays = options.retryDelaysMs ?? RETRY_DELAYS_MS;
+    const run = options.run ?? ((file, args) => execFileNoThrow(file, args, { timeout: reportTimeoutMs }));
+    const runSafely = (args) => {
+        try {
+            return Promise.resolve(run(executable, args));
+        }
+        catch {
+            return Promise.reject(new Error('Herdr command could not be started'));
+        }
+    };
+    let sequence = 0;
+    let lastConfirmedReport = '';
+    let disposed = false;
+    let running = false;
+    let wakeDelay;
+    let settledPromise = Promise.resolve();
+    const computeState = () => {
+        const blocked = options.questions.getSnapshot() !== null || options.approvals.getSnapshot() !== null;
+        return { state: blocked ? 'blocked' : options.channel.working ? 'working' : 'idle', blocked };
+    };
+    const waitForRetry = (delayMs) => new Promise(resolve => {
+        const timer = setTimeout(() => {
+            wakeDelay = undefined;
+            resolve();
+        }, delayMs);
+        wakeDelay = () => {
+            clearTimeout(timer);
+            wakeDelay = undefined;
+            resolve();
+        };
+    });
+    const processQueue = async () => {
+        let failedState = '';
+        let attempts = 0;
+        try {
+            while (!disposed) {
+                const { state, blocked } = computeState();
+                if (state === lastConfirmedReport)
+                    break;
+                if (state !== failedState) {
+                    failedState = state;
+                    attempts = 0;
+                }
+                attempts += 1;
+                const result = await withTimeout(runSafely([
+                    'pane', 'report-agent', paneId,
+                    '--source', 'custom:dsh-tui',
+                    '--agent', 'dsh-tui',
+                    '--state', state,
+                    ...(blocked ? ['--message', 'Waiting for user input'] : []),
+                    '--seq', String(++sequence),
+                ]), reportTimeoutMs);
+                if (disposed)
+                    break;
+                if (result?.code === 0) {
+                    lastConfirmedReport = state;
+                    failedState = '';
+                    attempts = 0;
+                    continue;
+                }
+                if (attempts > retryDelays.length)
+                    break;
+                await waitForRetry(retryDelays[attempts - 1] ?? 0);
+            }
+        }
+        finally {
+            running = false;
+        }
+    };
+    const report = () => {
+        if (disposed)
+            return;
+        if (running) {
+            wakeDelay?.();
+            return;
+        }
+        if (computeState().state === lastConfirmedReport)
+            return;
+        running = true;
+        settledPromise = processQueue();
+    };
+    const unsubscribes = [
+        options.channel.subscribe(report),
+        options.questions.subscribe(report),
+        options.approvals.subscribe(report),
+    ];
+    report();
+    let disposePromise;
+    return {
+        settled: () => settledPromise,
+        dispose: () => {
+            if (disposePromise !== undefined)
+                return disposePromise;
+            disposed = true;
+            wakeDelay?.();
+            for (const unsubscribe of unsubscribes)
+                unsubscribe();
+            const release = runSafely([
+                'pane', 'release-agent', paneId,
+                '--source', 'custom:dsh-tui',
+                '--agent', 'dsh-tui',
+                '--seq', String(++sequence),
+            ]);
+            disposePromise = withTimeout(release, releaseTimeoutMs).then(() => undefined);
+            return disposePromise;
+        },
+    };
+}