@deepseek-harness-tui/dsh-tui 0.14.1 → 0.16.0

package/lib/types/dsh-adapter/channel/settings-host.js

@@ -1,6 +1,122 @@
 import { t } from '../../i18n.js';
 import { isReservedCredentialRef } from '../credentialRefGuard.js';
+import { getPath } from '../settingsEditor.js';
 import { settingsValue } from '../compat/settings.js';
+import { concreteService } from '../host-access.js';
+// An opaque leaf survives the renderer's detached read projections. Plain
+// metadata cannot forge it; writes still pass the Channel UI lifetime/policy gate.
+class WebCredentialAuthorization {
+}
+const webCredentialFields = new WeakMap();
+/** Forms over the host's web settings; provider selection remains owned by DSH. */
+export function webSettingsSections(ctx, namespaces) {
+    const available = new Set(namespaces.map(view => view.ns));
+    const loader = ctx.get('loader');
+    const web = ctx.get('web');
+    const webOwner = web === undefined ? undefined : concreteService(web).ctx.fiber;
+    let webNs;
+    let apiNs;
+    let messagesNs;
+    let apiOwner;
+    let messagesOwner;
+    // Settings namespaces belong to Config-owning fibers, not package or row names.
+    for (const entry of loader?.entries() ?? []) {
+        // entry.id includes an Include tree path; settings uses the raw Config owner ID.
+        const ns = entry.options.id;
+        if (entry.fiber === undefined || !available.has(ns))
+            continue;
+        if (webOwner !== undefined && concreteService(entry.fiber) === concreteService(webOwner))
+            webNs = ns;
+        if (entry.fiber.runtime?.name === 'web-deepseek-api') {
+            apiNs = ns;
+            apiOwner = concreteService(entry.fiber);
+        }
+        if (entry.fiber.runtime?.name === 'web-search-deepseek') {
+            messagesNs = ns;
+            messagesOwner = concreteService(entry.fiber);
+        }
+    }
+    // This section is introduced together with live provider selection in rc.2.
+    // Older hosts keep their existing search route without an ineffective picker.
+    if (apiNs === undefined)
+        return [];
+    const sections = [];
+    if (webNs !== undefined)
+        sections.push({
+            ns: webNs, title: 'Web search', descriptions: { zh: '网页搜索' },
+            fields: [
+                {
+                    path: ['searchProvider'], label: 'Search', descriptions: { zh: '搜索' }, kind: 'text',
+                    hint: 'Select DeepSeek Search API or Messages search. Custom provider IDs are also accepted.',
+                    hintDescriptions: { zh: '选择 DeepSeek Search API 或 Messages 搜索，也可输入自定义提供者 ID。' },
+                    options: [
+                        { value: 'deepseek-search-api', label: 'Search API', descriptions: { zh: '搜索 API' } },
+                        { value: 'deepseek-official', label: 'Messages' },
+                    ],
+                },
+                {
+                    path: ['fetchProvider'], label: 'Fetch', descriptions: { zh: '抓取' }, kind: 'text',
+                    hint: 'Select DeepSeek Fetch API or local HTTP fetch. Changes apply to the next operation.',
+                    hintDescriptions: { zh: '选择 DeepSeek Fetch API 或本地 HTTP 抓取，保存后从下一次操作生效。' },
+                    options: [
+                        { value: 'deepseek-fetch-api', label: 'Fetch API', descriptions: { zh: '抓取 API' } },
+                        { value: 'http', label: 'HTTP' },
+                    ],
+                },
+                ...(() => {
+                    const searchApi = getPath(namespaces.find(view => view.ns === webNs)?.value, ['searchProvider']) === 'deepseek-search-api';
+                    const ns = searchApi ? apiNs : messagesNs ?? apiNs;
+                    const owner = searchApi ? apiOwner : messagesOwner ?? apiOwner;
+                    const ref = getPath(namespaces.find(view => view.ns === ns)?.value, ['apiKeyEnv']) ?? 'DEEPSEEK_API_KEY';
+                    const store = ctx.get('credentials');
+                    if (owner === undefined || store === undefined || typeof ref !== 'string' || !/^[A-Za-z_][A-Za-z0-9_]*$/u.test(ref))
+                        return [];
+                    const authorization = Object.freeze(new WebCredentialAuthorization());
+                    const field = {
+                        path: ['apiKey'], label: 'API key', descriptions: { zh: 'API 密钥' }, kind: 'text', secret: { ref, authorization },
+                        hint: 'Paste a key for the selected search API. Saved keys are never displayed.',
+                        hintDescriptions: { zh: '粘贴当前搜索 API 的密钥，保存后不再显示原值。' },
+                    };
+                    webCredentialFields.set(authorization, { store: concreteService(store), owner, ns, ref });
+                    return [field];
+                })(),
+            ],
+        });
+    sections.push({
+        ns: apiNs, title: 'DeepSeek Search / Fetch API',
+        descriptions: { zh: 'DeepSeek 搜索 / 抓取 API' },
+        fields: [
+            { path: ['baseURL'], label: 'API base URL', descriptions: { zh: 'API 基础地址' }, kind: 'text',
+                hint: 'Include the path prefix, without /search or /fetch.',
+                hintDescriptions: { zh: '包含路径前缀，不含末尾的 /search 或 /fetch。' } },
+            { path: ['count'], label: 'Search result count', descriptions: { zh: '搜索结果数' }, kind: 'number',
+                parse(text) {
+                    if (text.trim() === '')
+                        return { kind: 'clear' };
+                    const value = Number(text);
+                    return Number.isInteger(value) && value >= 1 && value <= 50 ? { kind: 'set', value } : undefined;
+                } },
+            { path: ['sendOriginalQuestion'], label: 'Send original question', descriptions: { zh: '发送原始问题' }, kind: 'boolean',
+                hint: 'Send up to 128 characters of the latest user prompt with the search query.',
+                hintDescriptions: { zh: '搜索时附带最近一条用户提示，最多 128 个字符。' } },
+        ],
+    });
+    if (messagesNs !== undefined)
+        sections.push({
+            ns: messagesNs, title: 'DeepSeek Messages search', descriptions: { zh: 'DeepSeek Messages 搜索' },
+            fields: [
+                { path: ['baseURL'], label: 'Messages API base URL', descriptions: { zh: 'Messages API 基础地址' }, kind: 'text' },
+                { path: ['maxUses'], label: 'Maximum searches per request', descriptions: { zh: '每次请求的最大搜索次数' }, kind: 'number',
+                    parse(text) {
+                        if (text.trim() === '')
+                            return { kind: 'clear' };
+                        const value = Number(text);
+                        return Number.isInteger(value) && value > 0 ? { kind: 'set', value } : undefined;
+                    } },
+            ],
+        });
+    return sections;
+}
 export function createSettingsHosts(ctx, assertActive = () => undefined) {
     let settingsHostResolved = false;
     let settingsHostCache;
@@ -14,7 +130,7 @@ export function createSettingsHosts(ctx, assertActive = () => undefined) {
             // revision-fenced mutate) and credentials (secret writes). Structurally
             // typed like the other optional seams in this file.
             const settings = ctx.get('settings');
-            const credentials = ctx.get('credentials');
+            const credentials = () => ctx.get('credentials');
             if (!settings)
                 return undefined;
             settingsHostCache = {
@@ -27,6 +143,7 @@ export function createSettingsHosts(ctx, assertActive = () => undefined) {
                         applies: descriptor.applies,
                         value: descriptor.value,
                         user: descriptor.user,
+                        warning: descriptor.warning,
                     }));
                 },
                 write(ns, ops, expectedRevision) {
@@ -37,11 +154,25 @@ export function createSettingsHosts(ctx, assertActive = () => undefined) {
                     // an env-provided key counts as configured.
                     if (process.env[ref] !== undefined)
                         return true;
-                    return credentials !== undefined && (await credentials.resolve(ref)) !== undefined;
+                    return (await credentials()?.resolve(ref)) !== undefined;
                 },
-                async writeCredential(ref, value) {
-                    if (!credentials)
+                async writeCredential(ref, value, authorization) {
+                    const store = credentials();
+                    if (!store)
                         throw new Error('credentials service unavailable');
+                    const authorized = authorization === undefined ? undefined : webCredentialFields.get(authorization);
+                    if (authorized !== undefined) {
+                        const currentFields = webSettingsSections(ctx, settingsHostCache.listNamespaces()).flatMap(section => section.fields);
+                        const current = currentFields.flatMap(candidate => {
+                            const binding = candidate.secret?.authorization === undefined ? undefined : webCredentialFields.get(candidate.secret.authorization);
+                            return binding === undefined ? [] : [binding];
+                        }).some(binding => binding.owner === authorized.owner && binding.ns === authorized.ns && binding.ref === ref);
+                        if (!current || authorized.ref !== ref || authorized.store !== concreteService(store)) {
+                            throw new Error(t('settings-web-key-changed'));
+                        }
+                        await store.set(ref, value);
+                        return;
+                    }
                     // Second layer of the secret-ref reservation guard: the
                     // registration layer already rejects plugin sections with
                     // host-owned refs, but this seam must not trust it — a stale
@@ -50,7 +181,7 @@ export function createSettingsHosts(ctx, assertActive = () => undefined) {
                     // writes go through providerSetup().writeCredential instead.
                     if (isReservedCredentialRef(ref))
                         throw new Error(t('settings-secret-ref-reserved', { ref }));
-                    await credentials.set(ref, value);
+                    await store.set(ref, value);
                 },
             };
             return settingsHostCache;

package/lib/types/dsh-adapter/channel/state.d.ts

@@ -5,6 +5,7 @@ import type { AgentSession } from '../../agent/session.js';
 import type { PermissionStore } from '../../channel/permissions.js';
 import type { QuestionStoreLike } from '../../channel/questions.js';
 import type { ContextPressureSource } from '../context-occupancy.js';
+import type { TeamSource } from '../team-roster.js';
 import type { ActivityView } from '../activity-store.js';
 import type { SessionModeSpec } from '../../sessionModes.js';
 import { type JobGroupFoldMode, type PageMarginSetting, type ScrollGutterMode, type StatusBarConfig, type ToolBackground } from '../../tuiDisplayPrefs.js';
@@ -13,8 +14,31 @@ import { type BrandSetting } from '../../branding.js';
 import type { ChannelState } from './types.js';
 /** The DSH backend's user-facing name (capability snapshot default). */
 export declare const DSH_BACKEND_LABEL = "DSH";
+/** The settled startup open (`ChannelLaunchOptions.startup`). */
+export interface ChannelStartup {
+    readonly session: AgentSession;
+    readonly history: readonly AgentEvent[];
+    readonly route?: {
+        readonly provider: string;
+        readonly model: string;
+    };
+    readonly agentPreset?: string;
+}
+/**
+ * A startup open that failed for a reason `/new` cannot fix (the in-process
+ * DSH kernel's composition failed: there is no DSH to open a session on).
+ * Its `hint` replaces the failure row's `/new` hint (`startup-open-failed-hint`).
+ */
+export declare class StartupOpenError extends Error {
+    readonly hint: string;
+    constructor(message: string, hint: string, options?: {
+        cause?: unknown;
+    });
+}
 /** Launch configuration belongs to channel construction, not the composition root. */
 export interface ChannelLaunchOptions {
+    /** Host notification effect with the last settled reply's preview, when present. */
+    onTaskComplete?: (preview?: string) => void;
     model: string;
     cwd: string;
     provider: string;
@@ -47,6 +71,11 @@ export interface ChannelLaunchOptions {
     /** Read that source's current value when a session binds (see
      *  {@link ChannelLaunchOptions.contextPressure}). */
     seedContextOccupancy?: (session: unknown) => void;
+    /** Agent Teams roster/task-board source (see `dsh-adapter/team-roster.ts`);
+     *  a cached read, republished through its change feed. Absent → no team. */
+    team?: TeamSource;
+    /** Point that source at the bound session's team and read its baseline. */
+    seedTeam?: (session: unknown) => void;
     activityFrames?: string;
     /** Settings namespace this boot registered its section under: the Config
      *  owner's Loader id (`resolveSettingsNamespace`), which is NOT always the
@@ -55,6 +84,11 @@ export interface ChannelLaunchOptions {
      *  `'dsh-tui'` (direct `createChannel` embedders and fixtures). */
     settingsNs?: string;
     diffLayout?: 'auto' | 'split' | 'unified';
+    /** Seed the upstream auto-retry policy (upstream-retry.ts) on the
+     *  llm-pi-ai route the bound session actually uses, when that route
+     *  declares no retryPolicy. Absent means enabled (the Config schema's
+     *  default); false opts out without touching settings. */
+    upstreamRetry?: boolean;
     thinkingFold?: 'preview' | 'full';
     jobGroupFold?: JobGroupFoldMode;
     toolBackground?: ToolBackground;
@@ -120,6 +154,14 @@ export interface ChannelLaunchOptions {
     /** The startup session's durable history, read before construction so
      *  the first bind paints it ahead of any live event. */
     initialHistory?: readonly AgentEvent[];
+    /** The `/settings` service (../tui-settings.ts); absent → the host's `settings`. */
+    settingsService?: unknown;
+    /**
+     * The startup session still opening: the channel starts on a placeholder
+     * (`ready` false) and `start()` adopts the real one once this settles; a
+     * rejection stays on the placeholder and `/new` retries. `route`/`agentPreset` override the construction options.
+     */
+    startup?: Promise<ChannelStartup>;
     /** How a user re-enters a session of this backend from a shell (the
      *  `/fork` notice); absent → the in-TUI `/resume` hint. */
     resumeCommand?: (sessionId: string) => string;
@@ -149,5 +191,5 @@ export declare function createInitialChannelView(options: ChannelLaunchOptions,
     sessionId: string;
     mode: ChannelState['mode'];
     cwdDescription: string;
-}): Pick<ChannelState, 'effortLevels' | 'version' | 'rows' | 'status' | 'sessionTitle' | 'sessionColor' | 'agentId' | 'sessionId' | 'agentBindingGeneration' | 'model' | 'modelDisplay' | 'provider' | 'tokens' | 'cwd' | 'displayCwd' | 'gitBranch' | 'working' | 'compaction' | 'cancelPending' | 'spinnerMode' | 'responseChars' | 'activeToolCount' | 'turnStart' | 'lastUserText' | 'notifications' | 'contextWindow' | 'reasoningEffort' | 'mode' | 'modeIndex' | 'activityFrames' | 'configuredProvider' | 'configuredModel' | 'configuredPreset' | 'configuredActivityFrames' | 'configuredLang' | 'diffLayout' | 'thinkingFold' | 'jobGroupFold' | 'toolBackground' | 'scrollGutter' | 'pageMargin' | 'foldTerminalCommand' | 'turnUsageRow' | 'promptSessionLabel' | 'expandEditor' | 'smoothStreaming' | 'statusBar' | 'whale' | 'whaleIdle' | 'splashFont' | 'brand' | 'minimalUi' | 'activityEnabled' | 'contextBarEnabled' | 'statusBar' | 'whale' | 'whaleIdle' | 'whaleGirl' | 'minimalUi' | 'activityEnabled' | 'contextBarEnabled' | 'agentPreset' | 'goal' | 'todos' | 'loadedContext' | 'pending' | 'commandList' | 'lastUsage' | 'turnUsage' | 'tps' | 'tpsSamples' | 'contextSegments' | 'mainCost' | 'subagentCost' | 'subagents' | 'backgroundJobs' | 'selection'>;
+}): Pick<ChannelState, 'effortLevels' | 'version' | 'ready' | 'startupFailure' | 'rows' | 'status' | 'sessionTitle' | 'sessionColor' | 'agentId' | 'sessionId' | 'agentBindingGeneration' | 'model' | 'modelDisplay' | 'provider' | 'tokens' | 'cwd' | 'displayCwd' | 'gitBranch' | 'working' | 'compaction' | 'cancelPending' | 'spinnerMode' | 'responseChars' | 'activeToolCount' | 'turnStart' | 'lastUserText' | 'notifications' | 'contextWindow' | 'reasoningEffort' | 'mode' | 'modeIndex' | 'activityFrames' | 'configuredProvider' | 'configuredModel' | 'configuredPreset' | 'configuredActivityFrames' | 'configuredLang' | 'diffLayout' | 'thinkingFold' | 'jobGroupFold' | 'toolBackground' | 'scrollGutter' | 'pageMargin' | 'foldTerminalCommand' | 'turnUsageRow' | 'promptSessionLabel' | 'expandEditor' | 'smoothStreaming' | 'statusBar' | 'whale' | 'whaleIdle' | 'splashFont' | 'brand' | 'minimalUi' | 'activityEnabled' | 'contextBarEnabled' | 'statusBar' | 'whale' | 'whaleIdle' | 'whaleGirl' | 'minimalUi' | 'activityEnabled' | 'contextBarEnabled' | 'agentPreset' | 'goal' | 'todos' | 'loadedContext' | 'pending' | 'commandList' | 'lastUsage' | 'turnUsage' | 'tps' | 'tpsSamples' | 'contextSegments' | 'mainCost' | 'subagentCost' | 'subagents' | 'backgroundJobs' | 'selection'>;
 //# sourceMappingURL=state.d.ts.map

package/lib/types/dsh-adapter/channel/state.d.ts.map

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

package/lib/types/dsh-adapter/channel/state.js

@@ -4,6 +4,19 @@ import { normalizeSplashFont } from '../../components/splashFonts.js';
 import { normalizeBrandSetting } from '../../branding.js';
 /** The DSH backend's user-facing name (capability snapshot default). */
 export const DSH_BACKEND_LABEL = 'DSH';
+/**
+ * A startup open that failed for a reason `/new` cannot fix (the in-process
+ * DSH kernel's composition failed: there is no DSH to open a session on).
+ * Its `hint` replaces the failure row's `/new` hint (`startup-open-failed-hint`).
+ */
+export class StartupOpenError extends Error {
+    hint;
+    constructor(message, hint, options) {
+        super(message, options);
+        this.hint = hint;
+        this.name = 'StartupOpenError';
+    }
+}
 /**
  * Neutral observable fields only. Behaviour is assembled explicitly by the
  * composition root after each specialist owner exists, so this factory cannot
@@ -11,7 +24,7 @@ export const DSH_BACKEND_LABEL = 'DSH';
  */
 export function createInitialChannelView(options, input) {
     return {
-        effortLevels: undefined, version: 0, rows: [], selection: undefined, status: 'starting', sessionTitle: '', sessionColor: '',
+        effortLevels: undefined, version: 0, ready: options.startup === undefined, startupFailure: undefined, rows: [], selection: undefined, status: 'starting', sessionTitle: '', sessionColor: '',
         agentId: input.agentId, sessionId: input.sessionId, agentBindingGeneration: 0, model: options.model, modelDisplay: undefined, provider: options.provider,
         tokens: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, peak: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }, idle: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 } },
         cwd: options.cwd, displayCwd: input.cwdDescription, gitBranch: undefined, working: false,

package/lib/types/dsh-adapter/channel/subagent-projection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-projection.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/subagent-projection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"subagent-projection.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/subagent-projection.ts"],"names":[],"mappings":"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"}

package/lib/types/dsh-adapter/channel/subagent-projection.js

@@ -3,6 +3,20 @@ import { markChannelReadDirty } from '../../adapter/channel/read-view.js';
 import { agentMessageFailureOf, agentMessageTextOf, agentRelaySourceOf, foldAgentMessage } from '../../agent/messages.js';
 import { SubagentActivityStore } from '../subagents.js';
 import { isSubagentToolName } from './projection-helpers.js';
+import { teamMailboxAsRelay } from '../compat/agent-team-0.2.0.js';
+import { teamMessageOf } from '../team-tools.js';
+/** A relay's body as the agent-message feed shows it: a team message without
+ *  its `Team message from <name>:` framing block (the sender is `from`). */
+function relayTextOf(source, content) {
+    const team = Array.isArray(content) ? teamMessageOf(source, content) : undefined;
+    return team?.text ?? agentMessageTextOf(content);
+}
+/**
+ * Bound the retained description text. Evicting an older term does not cancel
+ * its pending spawn: a separate count keeps those unmatched starts from
+ * consuming a later delegation's title without retaining unbounded text.
+ */
+const MAX_PENDING_TASK_DESCRIPTIONS = 32;
 /**
  * Keep each parked parent's reducer alive, including session links and the
  * stream attempt/settlement cursor. A display snapshot cannot resume either
@@ -158,7 +172,7 @@ export function createSubagentProjection(getState, deps) {
         dropRows: () => active.dropRows(),
         park, restore,
         forget(agent) { parked.delete(agent); },
-        dispose() { parked.clear(); active.store.reset(); active.dropRows(); active.pendingTaskDescriptions.length = 0; },
+        dispose() { parked.clear(); active.reset(); },
         reset() { active = make(); activeParent = deps.agent(); restored = false; getState().subagents = []; getState().subagentCost = []; },
     };
 }
@@ -187,7 +201,9 @@ function createSessionSubagentProjection(getState, deps) {
      *  oldest first, folded by durable message id. */
     const agentMessages = [];
     const rowsByAgentId = new Map();
+    /** Empty entries reserve starts whose ambiguous description was discarded. */
     const pendingTaskDescriptions = [];
+    let evictedDescriptionCount = 0;
     /** Workflow member identity: `tool-workflow/agent-end` carries no childId,
      * so member starts remember `runId:seq` → agentId for their settlement. */
     const workflowMembers = new Map();
@@ -245,29 +261,46 @@ function createSessionSubagentProjection(getState, deps) {
      *  provable from the log alone; a plain user/message (no relay source)
      *  never becomes one. */
     const noteChildRelay = (childId, event) => {
-        const data = event.data;
-        if (data === undefined || typeof data.id !== 'string' || data.id === '')
+        const raw = event.data;
+        if (raw === undefined || typeof raw.id !== 'string' || raw.id === '')
             return;
+        // compat(dsh 0.2.0, log): a 0.2.0 mailbox delivery reads as the relay it became.
+        const data = teamMailboxAsRelay(raw);
         const relay = agentRelaySourceOf(data.source);
         if (relay === undefined)
             return;
         foldAgentMessage(agentMessages, {
-            messageId: data.id,
+            messageId: raw.id,
             from: relay.senderSessionId,
             to: childId,
             via: 'agent-relay',
-            text: agentMessageTextOf(data.content),
+            text: relayTextOf(data.source, data.content),
             state: 'queued',
             ...(typeof event.seq === 'number' ? { sourceRef: `seq:${event.seq}` } : {}),
             observedAt: eventTime(event) ?? Date.now(),
         });
     };
+    /** A child session's own descriptor can beat the host's spawn edge. With no
+     *  row to attribute it to the label would be lost for good — an external
+     *  child never gets a catalog to re-state it — so park it under the session
+     *  id (the child id the host links rows by) for the row born later to adopt. */
+    const rememberEarlyLabel = (session, event) => {
+        if (event.type !== 'subagent/descriptor')
+            return;
+        const sessionId = session?.id;
+        const label = event.data?.label;
+        if (typeof sessionId !== 'string' || sessionId === '')
+            return;
+        store.holdKeyedLabel(sessionId, label);
+    };
     const onSessionEvent = (session, event) => {
         let id = store.getSubagentIdBySession(session);
         if (id === undefined)
             id = backfillSessionLink(session);
-        if (id === undefined)
+        if (id === undefined) {
+            rememberEarlyLabel(session, event);
             return false;
+        }
         if (event.type === 'user/message')
             noteChildRelay(id, event);
         store.onSessionEvent(id, event);
@@ -378,14 +411,16 @@ function createSessionSubagentProjection(getState, deps) {
             // names the sending session. Plain user text, injected context and
             // settlement notices are not relays; they stay invisible here, just as
             // the translator keeps them out of bubbles.
-            const relay = agentRelaySourceOf(data.source);
+            // compat(dsh 0.2.0, log): a 0.2.0 mailbox delivery reads as the relay it became.
+            const delivered = teamMailboxAsRelay(data);
+            const relay = agentRelaySourceOf(delivered.source);
             if (relay !== undefined && typeof data.id === 'string' && data.id !== '') {
                 foldAgentMessage(agentMessages, {
                     messageId: data.id,
                     from: relay.senderSessionId,
                     ...(parentSessionId === undefined ? {} : { to: parentSessionId, parentSessionId }),
                     via: 'agent-relay',
-                    text: agentMessageTextOf(data.content),
+                    text: relayTextOf(delivered.source, delivered.content),
                     state: 'queued',
                     ...(typeof ev.seq === 'number' ? { sourceRef: `seq:${ev.seq}` } : {}),
                     observedAt: eventTime(event) ?? Date.now(),
@@ -397,8 +432,13 @@ function createSessionSubagentProjection(getState, deps) {
             if (!historical && typeof data.name === 'string' && isSubagentToolName(data.name) && typeof data.arguments === 'string') {
                 try {
                     const args = JSON.parse(data.arguments);
-                    if (typeof args.description === 'string' && args.description)
+                    if (typeof args.description === 'string' && args.description) {
+                        if (pendingTaskDescriptions.length >= MAX_PENDING_TASK_DESCRIPTIONS) {
+                            pendingTaskDescriptions.shift();
+                            evictedDescriptionCount += 1;
+                        }
                         pendingTaskDescriptions.push(args.description);
+                    }
                 }
                 catch { /* malformed arguments do not describe a child */ }
             }
@@ -469,11 +509,43 @@ function createSessionSubagentProjection(getState, deps) {
             return;
         // The fact that the host spawned a child is authoritative even when its
         // optional discovery seam is absent, unloading, or throws.
+        // The queue is keyed by nothing, so only a NEW run may consume a term from
+        // it: a re-announced edge for the same runId (a continuable epoch's
+        // refresh) must leave the queue alone, or every later row shifts by one.
+        // An edge without a run key is itself such a refresh (the store's epoch
+        // rule) — only a real, different key opens a new epoch.
+        const knownRunId = store.runIdOf(info.id);
+        // A row that does not exist yet is a fresh run even when the edge carries
+        // no run key: the store's refresh rule is about a row it already tracks,
+        // and treating the first edge of an untracked child as a refresh would
+        // skip its term and hand that term to the next spawn instead.
+        const freshRun = !store.has(info.id)
+            || (info.runId !== undefined && (knownRunId === undefined || knownRunId !== info.runId));
+        // A queued term is a first-frame guess; `subagent/catalog`'s childId-keyed
+        // label is the authority and corrects it in the store (describeFromLabel).
+        // A row a keyed label already settled still consumes the term here — the
+        // store drops it instead of applying it, so the FIFO stays aligned.
+        //
+        // The queue carries no childId, so a term is only usable while exactly one
+        // delegation is outstanding. With two or more, any pick is a coin flip
+        // that puts a concurrent child's name on this card until its keyed label
+        // arrives. Discard the text, but retain every unmatched start slot: a new
+        // call can arrive before the rest of this batch starts. Forgetting those
+        // slots would let an older start consume that new call's title.
+        let description;
+        if (freshRun) {
+            if (evictedDescriptionCount + pendingTaskDescriptions.length > 1)
+                pendingTaskDescriptions.fill('');
+            if (evictedDescriptionCount > 0)
+                evictedDescriptionCount -= 1;
+            else
+                description = pendingTaskDescriptions.shift() || undefined;
+        }
         store.onSpawned(info.id, info.provider || 'subagent', info.provider, {
-            runId: info.runId ?? info.id,
+            ...(freshRun ? { runId: info.runId } : {}),
             local: info.local,
             startedAt: Date.now(),
-            description: pendingTaskDescriptions.shift(),
+            ...(description === undefined ? {} : { description, descriptionFromQueue: true }),
         });
         cardedIds.add(info.id);
         try {
@@ -585,6 +657,6 @@ function createSessionSubagentProjection(getState, deps) {
         },
     };
     const dropRows = () => { streamDirty = false; rowsByAgentId.clear(); };
-    const reset = () => { dropRows(); cardedIds.clear(); workflowMembers.clear(); pendingTaskDescriptions.length = 0; agentMessages.length = 0; store.reset(); getState().subagents = []; getState().subagentCost = []; };
+    const reset = () => { dropRows(); cardedIds.clear(); workflowMembers.clear(); pendingTaskDescriptions.length = 0; evictedDescriptionCount = 0; agentMessages.length = 0; store.reset(); getState().subagents = []; getState().subagentCost = []; };
     return { store, control, pendingTaskDescriptions, agentMessages, onSessionEvent, onStreamFrame, onParentEvent, bootstrapFromLog, onStart, onEnd, syncNow, flush, dropRows, reset, submitPrompt };
 }

package/lib/types/dsh-adapter/channel/task-completion.d.ts

@@ -0,0 +1,6 @@
+import type { AgentEvent, AgentEventMeta } from '../../agent/events.js';
+import type { ChannelOwner } from './owner.js';
+import type { ChannelState } from './types.js';
+/** Notify once a successful live turn has settled with no automatic follow-up. */
+export declare function createTaskCompletion(state: ChannelState, owner: ChannelOwner, notify: (preview?: string) => void): (batch: readonly AgentEvent[], meta: AgentEventMeta, current: () => boolean) => void;
+//# sourceMappingURL=task-completion.d.ts.map

package/lib/types/dsh-adapter/channel/task-completion.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"task-completion.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/channel/task-completion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAKvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,kFAAkF;AAClF,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,IAAI,IAmBvG,OAAO,SAAS,UAAU,EAAE,EAAE,MAAM,cAAc,EAAE,SAAS,MAAM,OAAO,KAAG,IAAI,CAwC1F"}

package/lib/types/dsh-adapter/channel/task-completion.js

@@ -0,0 +1,114 @@
+import stripAnsi from 'strip-ansi';
+import { Lexer } from 'marked';
+import { textOfBlocks } from '../../channel/projection.js';
+import { getGraphemeSegmenter } from '../../utils/intl.js';
+/** Notify once a successful live turn has settled with no automatic follow-up. */
+export function createTaskCompletion(state, owner, notify) {
+    let generation = -1;
+    let completedTurn = -1;
+    let pending = false;
+    let responseTurn;
+    let responseSeq = -1;
+    let preview;
+    let timer;
+    const reset = () => {
+        if (timer !== undefined)
+            clearImmediate(timer);
+        timer = undefined;
+        completedTurn = -1;
+        pending = false;
+        responseTurn = undefined;
+        responseSeq = -1;
+        preview = undefined;
+    };
+    owner.own(reset);
+    return (batch, meta, current) => {
+        if (!current() || meta.replay)
+            return;
+        if (generation !== state.agentBindingGeneration) {
+            reset();
+            generation = state.agentBindingGeneration;
+        }
+        for (const event of batch) {
+            if (event.type === 'session.reset')
+                reset();
+            else if (event.type === 'turn.start') {
+                pending = false;
+                responseTurn = event.turn;
+                responseSeq = -1;
+                preview = undefined;
+            }
+            else if (event.type === 'assistant.message' && event.parentCallId === undefined && !event.interrupted) {
+                // Only settled main-session replies; provisional stream output and
+                // child agents must never become the completion notification body.
+                responseTurn ??= event.turn;
+                if (event.turn !== responseTurn || event.seq <= responseSeq)
+                    continue;
+                responseSeq = event.seq;
+                const text = textOfBlocks(event.blocks);
+                if (text.trim())
+                    preview = notificationPreview(text);
+            }
+            else if (event.type === 'turn.end' && event.turn > completedTurn) {
+                completedTurn = event.turn;
+                pending = event.reason.kind === 'completed';
+            }
+        }
+        if (!pending || timer !== undefined)
+            return;
+        // Queue/status changes can follow turn.end in the same dispatch. Wait
+        // for that dispatch, then retain the candidate until status is idle.
+        timer = setImmediate(() => {
+            timer = undefined;
+            if (!current()) {
+                pending = false;
+                return;
+            }
+            if (pending && !state.working && state.status !== 'running') {
+                pending = false;
+                if (state.status !== 'disposed' && !state.pending.some(item => !item.docked) && state.goal?.phase !== 'active') {
+                    notify(responseTurn === completedTurn ? preview : undefined);
+                }
+            }
+        });
+    };
+}
+/** Plain-text preview; notification daemons may interpret raw Markdown headings. */
+function notificationPreview(text) {
+    const plain = markdownText(Lexer.lex(stripAnsi(text), { gfm: true }));
+    const flat = plain.replace(/[\x00-\x1f\x7f-\x9f]/g, ' ').replace(/\s+/g, ' ').trim();
+    const graphemes = [];
+    for (const { segment } of getGraphemeSegmenter().segment(flat)) {
+        if (graphemes.length === 200)
+            return `${graphemes.slice(0, 199).join('')}…`;
+        graphemes.push(segment);
+    }
+    return graphemes.join('') || undefined;
+}
+function isMarkdownToken(token, kind) {
+    return token.type === kind;
+}
+/** Extract visible text before flattening lines or truncating emphasis/link pairs. */
+function markdownText(tokens) {
+    return tokens.map(token => {
+        if (isMarkdownToken(token, 'heading') || isMarkdownToken(token, 'paragraph') || isMarkdownToken(token, 'blockquote'))
+            return `${markdownText(token.tokens)}\n`;
+        if (isMarkdownToken(token, 'strong') || isMarkdownToken(token, 'em') || isMarkdownToken(token, 'del') || isMarkdownToken(token, 'link'))
+            return markdownText(token.tokens);
+        if (isMarkdownToken(token, 'text'))
+            return token.tokens === undefined ? token.text : markdownText(token.tokens);
+        if (isMarkdownToken(token, 'codespan') || isMarkdownToken(token, 'escape') || isMarkdownToken(token, 'image'))
+            return token.text;
+        if (isMarkdownToken(token, 'code'))
+            return `${token.text}\n`;
+        if (isMarkdownToken(token, 'list'))
+            return `${token.items.map(item => markdownText(item.tokens)).join('\n')}\n`;
+        if (isMarkdownToken(token, 'table'))
+            return `${[token.header, ...token.rows].map(row => row.map(cell => markdownText(cell.tokens)).join(' ')).join('\n')}\n`;
+        if (isMarkdownToken(token, 'html'))
+            return token.text.replace(/<[^>]*>/g, '');
+        if (isMarkdownToken(token, 'space') || isMarkdownToken(token, 'br') || isMarkdownToken(token, 'hr'))
+            return '\n';
+        return '';
+    }).join('');
+}