@deepseek-harness-tui/dsh-tui 0.11.0 → 0.11.2

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

@@ -1,16 +1,155 @@
 import { markChannelReadDirty } from '../../adapter/channel/read-view.js';
 import { SubagentActivityStore } from '../subagents.js';
+import { isSubagentToolName } from './projection-helpers.js';
+/**
+ * Keep each parked parent's reducer alive, including session links and the
+ * stream attempt/settlement cursor. A display snapshot cannot resume either
+ * a run epoch or an in-flight assistant attempt faithfully.
+ */
+export function createSubagentProjection(getState, deps) {
+    const parked = new Map();
+    const hidden = { rows: [], subagents: [], subagentCost: [], emit() { }, emitStream() { } };
+    const make = () => {
+        const projection = createSessionSubagentProjection(() => active === projection ? getState() : hidden, { ...deps, visible: () => active === projection });
+        return projection;
+    };
+    let active = make();
+    let activeParent = deps.agent();
+    let restored = false;
+    const childProjection = (id, parent) => {
+        // A lifecycle carrier names the DIRECT delegating parent. Its visibility
+        // filter also admits ancestors, which is not evidence of ownership.
+        if (parent != null)
+            return parent === activeParent ? active : parked.get(parent);
+        for (const projection of parked.values())
+            if (projection.store.has(id))
+                return projection;
+        if (active.store.has(id))
+            return active;
+        // Legacy unkeyed delivery can still resolve a child through established
+        // catalog membership or the registry's durable parent-session lineage.
+        let session;
+        try {
+            session = deps.lookupChild(id)?.session;
+        }
+        catch { /* discovery may arrive later */ }
+        const parentId = session?.header?.parentSession;
+        if (typeof parentId === 'string') {
+            for (const [parentAgent, projection] of parked)
+                if (String(parentAgent.session.id) === parentId)
+                    return projection;
+            return String(activeParent.session.id) === parentId ? active : undefined;
+        }
+        // Omitted parent is only for direct callers that already scope events.
+        // Transport passes null for an unkeyed event; never guess its ownership.
+        return parent === undefined ? active : undefined;
+    };
+    const park = (agent) => {
+        active.dropRows();
+        parked.set(agent, active);
+    };
+    const restore = (agent) => {
+        const previous = parked.get(agent);
+        if (previous === undefined)
+            return;
+        parked.delete(agent);
+        active = previous;
+        activeParent = agent;
+        restored = true;
+        for (const saved of active.store.snapshot()) {
+            if (saved.status !== 'running' && saved.status !== 'starting')
+                continue;
+            let child;
+            try {
+                child = deps.lookupChild(saved.agentId);
+            }
+            catch {
+                continue;
+            }
+            if (child !== undefined && child.status !== 'running')
+                active.store.patch(saved.agentId, { status: 'unknown' });
+        }
+    };
+    return {
+        get store() { return active.store; },
+        get pendingTaskDescriptions() { return active.pendingTaskDescriptions; },
+        control: { interrupt: (id) => active.control.interrupt(id) },
+        onSessionEvent(session, event) {
+            let handled = false;
+            if (session === activeParent.session) {
+                active.onParentEvent(event);
+                handled = true;
+            }
+            for (const [parent, projection] of parked) {
+                if (session === parent.session) {
+                    projection.onParentEvent(event);
+                    handled = true;
+                }
+                if (projection.onSessionEvent(session, event))
+                    handled = true;
+            }
+            return active.onSessionEvent(session, event) || handled;
+        },
+        onStreamFrame(agent, frame) {
+            for (const projection of parked.values())
+                if (projection.onStreamFrame(agent, frame))
+                    return true;
+            return active.onStreamFrame(agent, frame);
+        },
+        onStart(info, parent) { childProjection(info.id, parent)?.onStart(info); },
+        onEnd(info, parent) { childProjection(info.id, parent)?.onEnd(info); },
+        onParentEvent: (event) => active.onParentEvent(event),
+        bootstrapFromLog(events) {
+            // Live parked reducers already consumed this log. Re-folding historical
+            // workflow edges would overwrite the current epoch and its settlement.
+            if (!restored)
+                active.bootstrapFromLog(events);
+            else
+                active.syncNow();
+        },
+        syncNow: () => active.syncNow(),
+        flush: () => active.flush(),
+        dropRows: () => active.dropRows(),
+        park, restore,
+        forget(agent) { parked.delete(agent); },
+        dispose() { parked.clear(); active.store.reset(); active.dropRows(); active.pendingTaskDescriptions.length = 0; },
+        reset() { active = make(); activeParent = deps.agent(); restored = false; getState().subagents = []; getState().subagentCost = []; },
+    };
+}
 /** Current-session subagent store, row projection and frame-batched stream
  * bridge. The owning channel installs transport subscriptions; this module
- * only accepts scoped events and never captures a replaceable agent itself. */
-export function createSubagentProjection(getState, deps) {
+ * only accepts scoped events and never captures a replaceable agent itself.
+ *
+ * Discovery comes from three seams so the dashboard can mirror EVERY child
+ * the session dispatched (issue #966):
+ *  1. `subagent/start`/`subagent/end` bus edges — per-run lifecycle of
+ *     one-shot runs and continuable epochs, paired by `runId`;
+ *  2. parent-session durable events — `subagent/catalog` (child creation
+ *     fact, written for every child) and `tool-workflow/agent-start|end`
+ *     (workflow/ralph members, which never emit subagent edges) — received
+ *     live AND folded from the log at bind/resume so a restart no longer
+ *     blanks the panel;
+ *  3. lazy registry back-fill — a child session event or stream frame whose
+ *     session link was never established is resolved through the agents
+ *     registry on arrival, healing one-shot `lookupChild` misses.
+ * Transcript cards are gated to children discovered while LIVE: a resumed
+ * session's historical children appear in the dashboard without flooding the
+ * replayed transcript with cards that the durable log never contained. */
+function createSessionSubagentProjection(getState, deps) {
     const store = new SubagentActivityStore();
     const rowsByAgentId = new Map();
     const pendingTaskDescriptions = [];
+    /** Workflow member identity: `tool-workflow/agent-end` carries no childId,
+     * so member starts remember `runId:seq` → agentId for their settlement. */
+    const workflowMembers = new Map();
+    /** Children that earned a transcript card (live discovery only). */
+    const cardedIds = new Set();
     let streamDirty = false;
     const syncRows = (snapshot = store.snapshot()) => {
         const state = getState();
         for (const sub of snapshot) {
+            if (!cardedIds.has(sub.agentId))
+                continue;
             let row = rowsByAgentId.get(sub.agentId);
             if (!row) {
                 row = { id: deps.rowIds.value++, kind: 'subagent', text: sub.description, subagent: undefined };
@@ -33,8 +172,15 @@ export function createSubagentProjection(getState, deps) {
     };
     const syncNow = () => {
         streamDirty = false;
+        if (!deps.visible())
+            return;
         const snapshot = store.snapshot();
-        getState().subagents = snapshot;
+        const state = getState();
+        state.subagents = snapshot;
+        // 费用快照随 dashboard 一起镜像：StatusLine/BalanceReportRow 从这里读
+        // 子代理按 (provider, model) 的 durable 用量桶。与 subagents 同在 visible
+        // 守卫之后——停靠父级的费用留在自己的 store 里，restore 时重新镜像。
+        state.subagentCost = store.costSnapshot().entries;
         syncRows(snapshot);
     };
     const flush = () => {
@@ -44,7 +190,9 @@ export function createSubagentProjection(getState, deps) {
         return true;
     };
     const onSessionEvent = (session, event) => {
-        const id = store.getSubagentIdBySession(session);
+        let id = store.getSubagentIdBySession(session);
+        if (id === undefined)
+            id = backfillSessionLink(session);
         if (id === undefined)
             return false;
         store.onSessionEvent(id, event);
@@ -62,7 +210,9 @@ export function createSubagentProjection(getState, deps) {
     // (not its session), so resolve the subagent through its bound session.
     const onStreamFrame = (agent, frame) => {
         const session = agent?.session;
-        const id = session !== undefined && session !== null ? store.getSubagentIdBySession(session) : undefined;
+        let id = session !== undefined && session !== null ? store.getSubagentIdBySession(session) : undefined;
+        if (id === undefined && session !== undefined && session !== null)
+            id = backfillSessionLink(session);
         if (id === undefined)
             return false;
         store.onStreamFrame(id, frame);
@@ -76,6 +226,145 @@ export function createSubagentProjection(getState, deps) {
         }
         return true;
     };
+    /** Heal a missing session→agent link through the agents registry. The
+     * start-time lookup is one-shot; a miss (service not yet mounted, child not
+     * yet registered) previously left the child's events permanently
+     * unattributed — its row then never left `running`. Only rows the store
+     * already tracks are linked: the registry also holds peer top-level
+     * sessions (a parked `/bg` agent streams on the same bus) that must never
+     * become dashboard rows. */
+    const backfillSessionLink = (session) => {
+        const sessionId = session?.id;
+        if (typeof sessionId !== 'string' || !store.has(sessionId))
+            return undefined;
+        let child;
+        try {
+            child = deps.lookupChild(sessionId);
+        }
+        catch {
+            return undefined;
+        }
+        if (!child || child.session !== session)
+            return undefined;
+        // Registry presence is not liveness: a continuable child stays
+        // registered while idle. Only a running child upgrades a discovered row
+        // and earns a transcript card; the session link itself is established
+        // regardless so attribution heals the moment it starts streaming.
+        const running = child.status === 'running';
+        if (running && store.get(sessionId)?.status === 'unknown')
+            store.patch(sessionId, { status: 'running' });
+        store.linkSession(sessionId, session);
+        if (running)
+            cardedIds.add(sessionId);
+        return sessionId;
+    };
+    /** Register a discovered child and, when the agents registry currently
+     * holds it RUNNING (idle continuable children stay registered without
+     * being live), bind its session so streaming state flows. */
+    const discover = (childId, info) => {
+        let child;
+        try {
+            child = deps.lookupChild(childId);
+        }
+        catch {
+            child = undefined;
+        }
+        const running = child?.status === 'running';
+        store.onDiscovered(childId, {
+            label: info.label,
+            childCreatedAt: info.childCreatedAt,
+            live: running,
+            provider: info.provider ?? child?.options?.provider,
+            model: child?.options?.model,
+        });
+        if (info.runId !== undefined)
+            store.patch(childId, { runId: info.runId });
+        if (child?.session)
+            store.linkSession(childId, child.session);
+        if (running)
+            cardedIds.add(childId);
+    };
+    /** Durable session events stamp their own wall time; a fold from the log
+     * must not date a historical child at resume time. */
+    const eventTime = (event) => {
+        const time = event?.time;
+        return typeof time === 'number' ? time : undefined;
+    };
+    /** Parent-session durable discovery events, live or folded from the log. */
+    const onParentEvent = (event, historical = false) => {
+        if (!event || typeof event !== 'object')
+            return;
+        const ev = event;
+        const data = ev.data ?? {};
+        const childId = typeof data.childId === 'string' ? data.childId : undefined;
+        if (ev.type === 'tool/call') {
+            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)
+                        pendingTaskDescriptions.push(args.description);
+                }
+                catch { /* malformed arguments do not describe a child */ }
+            }
+            return;
+        }
+        else if (ev.type === 'subagent/catalog') {
+            if (childId === undefined)
+                return;
+            discover(childId, {
+                label: typeof data.label === 'string' ? data.label : undefined,
+                childCreatedAt: typeof data.childCreatedAt === 'number' ? data.childCreatedAt : eventTime(event),
+            });
+        }
+        else if (ev.type === 'tool-workflow/agent-start') {
+            if (childId === undefined || typeof data.runId !== 'string' || typeof data.seq !== 'number')
+                return;
+            const memberKey = `${data.runId}:${data.seq}`;
+            workflowMembers.set(memberKey, childId);
+            discover(childId, {
+                label: typeof data.label === 'string' ? data.label : undefined,
+                childCreatedAt: eventTime(event),
+                provider: 'workflow',
+                runId: memberKey,
+            });
+        }
+        else if (ev.type === 'tool-workflow/agent-end') {
+            if (typeof data.runId !== 'string' || typeof data.seq !== 'number')
+                return;
+            const agentId = workflowMembers.get(`${data.runId}:${data.seq}`);
+            if (agentId === undefined)
+                return;
+            // The durable end event stamps the historical wall time; folding it
+            // must close the member at that time, not at fold/resume time.
+            const endedAt = eventTime(event);
+            if (data.outcome === 'failed')
+                store.onFailed(agentId, 'failed', endedAt);
+            else if (data.outcome === 'cancelled')
+                store.onCancelled(agentId, 'cancelled', undefined, endedAt);
+            else
+                store.onCompleted(agentId, undefined, undefined, endedAt);
+        }
+        else {
+            return;
+        }
+        if (!historical) {
+            syncNow();
+            getState().emit();
+        }
+    };
+    /** Seed the dashboard from the durable parent log at bind/resume: catalog
+     * children and workflow members survive a restart. Historical children the
+     * registry no longer holds stay card-less (dashboard-only, `unknown`). */
+    const bootstrapFromLog = (events) => {
+        if (!Array.isArray(events))
+            return;
+        try {
+            for (const event of events)
+                onParentEvent(event, true);
+        }
+        catch { /* bootstrap is best-effort discovery; live events remain authoritative */ }
+        syncNow();
+    };
     const onStart = (info) => {
         if (!info?.id)
             return;
@@ -84,8 +373,10 @@ export function createSubagentProjection(getState, deps) {
         store.onSpawned(info.id, info.provider || 'subagent', info.provider, {
             runId: info.runId ?? info.id,
             local: info.local,
-            description: pendingTaskDescriptions.shift() ?? `${info.provider || 'subagent'} task`,
+            startedAt: Date.now(),
+            description: pendingTaskDescriptions.shift(),
         });
+        cardedIds.add(info.id);
         try {
             const child = deps.lookupChild(info.id);
             if (child?.session) {
@@ -102,6 +393,16 @@ export function createSubagentProjection(getState, deps) {
     const onEnd = (info) => {
         if (!info?.id)
             return;
+        // Host ordering guarantee: a continuable epoch's `subagent/end` may be
+        // published AFTER the next epoch's `subagent/start` already arrived (the
+        // parent delivery runs before the ownership release). An end that names a
+        // runId this row no longer holds belongs to that earlier epoch — the new
+        // run must keep running.
+        if (info.runId !== undefined) {
+            const current = store.get(info.id);
+            if (current?.runId !== undefined && current.runId !== info.runId)
+                return;
+        }
         const output = Array.isArray(info.lastAssistantMessage)
             ? info.lastAssistantMessage.map(block => typeof block === 'object' && block !== null && 'text' in block ? String(block.text ?? '') : '').filter(Boolean).join('\n')
             : '';
@@ -135,6 +436,6 @@ export function createSubagentProjection(getState, deps) {
         },
     };
     const dropRows = () => { streamDirty = false; rowsByAgentId.clear(); };
-    const reset = () => { dropRows(); pendingTaskDescriptions.length = 0; store.reset(); getState().subagents = []; };
-    return { store, control, pendingTaskDescriptions, onSessionEvent, onStreamFrame, onStart, onEnd, syncNow, flush, dropRows, reset };
+    const reset = () => { dropRows(); cardedIds.clear(); workflowMembers.clear(); pendingTaskDescriptions.length = 0; store.reset(); getState().subagents = []; getState().subagentCost = []; };
+    return { store, control, pendingTaskDescriptions, onSessionEvent, onStreamFrame, onParentEvent, bootstrapFromLog, onStart, onEnd, syncNow, flush, dropRows, reset };
 }

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

@@ -1,6 +1,6 @@
 import type { ChannelUi } from '../../adapter/ports/channel-ui.js';
 import type { ChatRow, ToolCallView, ToolResultView, NotificationItem, TodoPanelItem, PendingMessage } from '../../adapter/ports/channel-view.js';
-export type { ChatRow, ToolRow, ToolCallView, ToolFileDiff, ToolResultView, SubagentRow, JobRow, TokenUsage, TokenBucket, NotificationItem, ActivityStatus, ChannelGoal, TodoPanelItem, LoadedContext, LoadedContextEntry, LoadedContextFile, LoadedContextSkill, LoadedContextTool, PendingMessage, SubagentControl, JobControl, StagedImageInput, StagedImageAdjustment, StagedImageHandle, ComposerImageRef, ComposerSubmission, ExternalCommandOutcome, TranscriptImage, ResumeResult, EffortOption, PermissionPresetSnapshot, PermissionPresetAvailability, PermissionPresetOption, PermissionPresetCurrent, PresetOption, SkillInfo, CredentialStatus, AgentViewRow, AgentViewStatus, AgentViewDispatchResult, BackgroundResult } from '../../adapter/ports/channel-view.js';
+export type { ChatRow, ToolRow, ToolCallView, ToolFileDiff, ToolResultView, SubagentRow, JobRow, TokenUsage, TokenBucket, CostTokenBuckets, SessionCostByModel, SubagentCostEntry, NotificationItem, ChannelGoal, TodoPanelItem, LoadedContext, LoadedContextEntry, LoadedContextFile, LoadedContextSkill, LoadedContextTool, PendingMessage, SubagentControl, JobControl, StagedImageInput, StagedImageAdjustment, StagedImageHandle, ComposerImageRef, ComposerSubmission, ExternalCommandOutcome, TranscriptImage, ResumeResult, EffortOption, PermissionPresetSnapshot, PermissionPresetAvailability, PermissionPresetOption, PermissionPresetCurrent, PresetOption, SkillInfo, CredentialStatus, AgentViewRow, AgentViewStatus, AgentViewDispatchResult, BackgroundResult } from '../../adapter/ports/channel-view.js';
 import { type ContentBlock, type StreamChunk } from '@deepseek-ai/dsh-llm';
 import { type SessionEvent } from '@deepseek-ai/dsh-session';
 import { type BackgroundJobState } from '../jobs.js';

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

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

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

@@ -18,6 +18,6 @@ export declare function createChannel(ctx: Context, initialAgent: Agent, options
 export type { ChannelLaunchOptions } from './channel/state.js';
 export { expandMentions } from './channel/mentions.js';
 export { sessionCwdMatches } from './channel/paths.js';
-export type { ActivityStatus, AgentViewDispatchResult, AgentViewRow, AgentViewStatus, BackgroundResult, Channel, ChannelGoal, ChannelState, ChatRow, ComposerImageRef, ComposerSubmission, CredentialStatus, EffortOption, ExternalCommandOutcome, JobControl, JobRow, LoadedContext, LoadedContextEntry, LoadedContextFile, LoadedContextSkill, LoadedContextTool, MentionAttachments, MentionExpansion, MentionFs, NotificationItem, PendingMessage, PermissionPresetAvailability, PermissionPresetCurrent, PermissionPresetOption, PermissionPresetSnapshot, PresetOption, ResumeResult, SkillInfo, StagedImageHandle, StagedImageInput, SubagentControl, SubagentRow, TodoPanelItem, TokenBucket, TokenUsage, ToolCallView, ToolFileDiff, ToolResultView, ToolRow, ToolViewPresenter, TranscriptImage } from './channel/types.js';
+export type { AgentViewDispatchResult, AgentViewRow, AgentViewStatus, BackgroundResult, Channel, ChannelGoal, ChannelState, ChatRow, ComposerImageRef, ComposerSubmission, CredentialStatus, EffortOption, ExternalCommandOutcome, JobControl, JobRow, LoadedContext, LoadedContextEntry, LoadedContextFile, LoadedContextSkill, LoadedContextTool, MentionAttachments, MentionExpansion, MentionFs, NotificationItem, PendingMessage, PermissionPresetAvailability, PermissionPresetCurrent, PermissionPresetOption, PermissionPresetSnapshot, PresetOption, ResumeResult, SkillInfo, StagedImageHandle, StagedImageInput, SubagentControl, SubagentRow, TodoPanelItem, TokenBucket, TokenUsage, ToolCallView, ToolFileDiff, ToolResultView, ToolRow, ToolViewPresenter, TranscriptImage } from './channel/types.js';
 export { emptyTokenUsage } from './channel/usage.js';
 //# sourceMappingURL=channel.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/channel.ts"],"names":[],"mappings":"AAUA,OAAO,EAA4B,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AA4BxF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,KAAK,KAAK,EAAqE,MAAM,wBAAwB,CAAA;AAyCtH,OAAO,KAAK,EAAyE,YAAY,EAA8T,MAAM,oBAAoB,CAAA;AAgCzb,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAkBnD;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,OAAO,EACZ,YAAY,EAAE,KAAK,EACnB,OAAO,EAAE,oBAAoB,GAC5B,YAAY,CAUd;AA26BD,YAAY,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AACtD,YAAY,EAAE,cAAc,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,YAAY,EAAE,sBAAsB,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAE,cAAc,EAAE,4BAA4B,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACryB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA"}
+{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/channel.ts"],"names":[],"mappings":"AASA,OAAO,EAA4B,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AA6BxF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,KAAK,KAAK,EAAqE,MAAM,wBAAwB,CAAA;AAyCtH,OAAO,KAAK,EAAyD,YAAY,EAA8T,MAAM,oBAAoB,CAAA;AAgCza,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAkBnD;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,OAAO,EACZ,YAAY,EAAE,KAAK,EACnB,OAAO,EAAE,oBAAoB,GAC5B,YAAY,CAUd;AA07BD,YAAY,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AACtD,YAAY,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,YAAY,EAAE,sBAAsB,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAE,cAAc,EAAE,4BAA4B,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACrxB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA"}

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

@@ -1,7 +1,6 @@
 import { createSessionTreeReader } from './channel/session-tree.js';
 import { createInputDelivery } from './channel/input-delivery.js';
 import { createChannelBinding } from './channel/binding.js';
-import { createChannelActivity } from './channel/activity.js';
 import { createCommandCompletions } from './channel/command-completions.js';
 import { createLocalActions } from './channel/local-actions.js';
 import { createDetachedHandleFactory } from './channel/lifetime-resources.js';
@@ -24,6 +23,7 @@ import { createModelSwitchAction } from './channel/model-switch.js';
 import { createFileActions } from './channel/file-actions.js';
 import { createReportActions } from './channel/reports.js';
 import { createSessionMetadataActions } from './channel/session-metadata.js';
+import { createForeignBrowser } from './migrate/browse.js';
 import { createAgentViewProjection } from './channel/agent-view-projection.js';
 import { createJobProjection } from './channel/job-projection.js';
 import { createExternalCommandInvoker } from './channel/external-commands.js';
@@ -151,9 +151,8 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
             return agents?.get(id);
         },
     });
-    const subagentStore = subagentProjection.store;
+    owner.own(() => subagentProjection.dispose());
     const subagentControl = subagentProjection.control;
-    const pendingTaskDescriptions = subagentProjection.pendingTaskDescriptions;
     // Job projection owns registry callbacks and transcript rows. The optional
     // service attachment has no authority after its injected lifetime ends.
     const jobProjection = createJobProjection(() => state, {
@@ -365,6 +364,7 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
     // installed after ChannelState initialization below.
     let settleManualCompaction;
     let compactManualSession;
+    let cancelManualCompaction;
     let forkSessionAction;
     let rewindToAction;
     let rewindToNodeAction;
@@ -397,15 +397,19 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
         emitStream: emitter.emitStream,
         ...createSettingsHosts(ctx, owner.assertActive),
         ...createPreferences(() => state),
+        /** Mount-owned settings namespace: the section registers under it, so this
+         *  is the only ns whose section carries the TUI's user layer. */
+        settingsNamespace: options.settingsNs ?? 'dsh-tui',
         get autoRecapOnOpen() {
             const settings = ctx.get('settings');
             if (settings === undefined)
                 return false;
-            const ns = settings.describe({ redactSecrets: true }).find(entry => entry.ns === 'dsh-tui');
+            const ns = settings.describe({ redactSecrets: true }).find(entry => entry.ns === state.settingsNamespace);
             return ns?.value?.recapOnOpen !== false;
         },
         ...createInitialChannelView(options, {
             agentId: binding.agent.id,
+            sessionId: binding.agent.session.id,
             mode: sessionModes[0],
             cwdDescription: workspaceService.describe(options.cwd).description ?? options.cwd,
         }),
@@ -556,6 +560,7 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
         runtime: adapterRuntime,
         grantStore: currentGrantStore,
     });
+    const foreignBrowser = createForeignBrowser(() => ctx.get('sessionPersistence'), owner.signal);
     sessionMetadataActions = createSessionMetadataActions(ctx, {
         owner,
         binding,
@@ -602,7 +607,7 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
     };
     const bash = ctx.get('shell');
     const projector = createChannelProjection(state, {
-        agent: () => binding.agent, rowIds, resetContextWarning, pendingTaskDescriptions, jobs: jobStore, inputConvergence,
+        agent: () => binding.agent, rowIds, resetContextWarning, jobs: jobStore, inputConvergence,
         checkContextWarning, notify: (...args) => notify(...args),
         tools: ctx.get('tools'), renderer: rendererRuntime,
         attachments: () => ctx.get('attachments'),
@@ -622,8 +627,15 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
         shell: bash,
         notify,
     });
-    // Replay the durable transcript first, then follow live events.
-    projector.replayEvents(snapshotLiveSessionEvents(binding.agent.session));
+    // Replay the durable transcript first, then follow live events. The same
+    // seed re-populates the subagent dashboard's durable discovery facts
+    // (`subagent/catalog`, workflow member edges) so a resumed session keeps
+    // its dispatched-children history (issue #966).
+    const replaySessionSeed = (events) => {
+        projector.replayEvents(events);
+        subagentProjection.bootstrapFromLog(events);
+    };
+    replaySessionSeed(snapshotLiveSessionEvents(binding.agent.session));
     projector.settleStreaming();
     // Attached to an idle agent: any replayed turn/start belongs to a previous
     // session run, so the spinner must not come up on boot.
@@ -631,8 +643,6 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
     state.cancelPending = false;
     state.status = binding.agent.status;
     state.emit();
-    // The activity sidecar owns its tracker and interval; it never projects transcript facts.
-    const activity = createChannelActivity(ctx, state, owner, options.activity !== false);
     modelActions = createModelActions(ctx, state, {
         owner,
         binding,
@@ -658,7 +668,7 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
         resetProjector: () => projector.reset(),
         resetSubagents: subagentProjection.reset,
         resetJobs: resetJobProjection,
-        replay: events => projector.replayEvents(events),
+        replay: replaySessionSeed,
         settleReplay: projector.settleStreaming,
         bindAgent: () => bindAgent(),
         refreshCommands: refreshCommandList,
@@ -666,7 +676,6 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
         refreshSkillCommands,
         clearStagedImages,
         dropModelCompletion: () => modelActions.dropModelNodeCache(),
-        onModelSwitch: model => activity.onModelSwitch(model),
         notify,
     });
     workspaceActions = createWorkspaceActions(state, {
@@ -695,7 +704,7 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
         owner,
         binding,
         state,
-        activity,
+        seedActivity: options.seedActivity,
         inputConvergence,
         selection,
         modelActions,
@@ -713,7 +722,7 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
         resetProjector: () => projector.reset(),
         resetSubagents: subagentProjection.reset,
         resetJobs: resetJobProjection,
-        replay: events => projector.replayEvents(events),
+        replay: replaySessionSeed,
         settleReplay: projector.settleStreaming,
         bindAgent,
         refreshCommands: refreshCommandList,
@@ -729,8 +738,10 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
         rowIds,
         resetProjector: () => projector.reset(),
         resetSubagents: subagentProjection.reset,
+        restoreSubagents: subagentProjection.restore,
+        parkSubagents: subagentProjection.park,
         resetJobs: resetJobProjection,
-        replay: events => projector.replayEvents(events),
+        replay: replaySessionSeed,
         settleReplay: projector.settleStreaming,
         describeWorkspace: cwd => workspaceService.describe(cwd),
         refreshGitBranch: () => refreshGitBranch(),
@@ -756,12 +767,13 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
         // a target already running in this process is re-attached rather than
         // resumed twice from its log (which would mount one log in two places).
         adoptLive: target => adoptLiveAgent(target),
+        parkSubagents: subagentProjection.park,
         backgroundHandles,
         rowIds,
         resetProjector: () => projector.reset(),
         resetSubagents: subagentProjection.reset,
         resetJobs: resetJobProjection,
-        replay: events => projector.replayEvents(events),
+        replay: replaySessionSeed,
         settleReplay: projector.settleStreaming,
         describeWorkspace: cwd => workspaceService.describe(cwd),
         refreshGitBranch: () => refreshGitBranch(),
@@ -808,10 +820,10 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
         agent: () => binding.agent,
         withDecisionPending,
         notify,
-        onComplete: () => activity.onCompact(),
     });
     settleManualCompaction = manualCompaction.settle;
     compactManualSession = manualCompaction.compact;
+    cancelManualCompaction = manualCompaction.cancel;
     backgroundCurrentAction = createBackgroundCurrentAction(ctx, state, {
         configuredPreset: options.configuredPreset,
         configuredProvider: options.configuredProvider,
@@ -825,6 +837,7 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
         rowIds,
         resetProjector: () => projector.reset(),
         resetSubagents: subagentProjection.reset,
+        parkSubagents: subagentProjection.park,
         resetJobs: resetJobProjection,
         refreshEffortLevels: () => modelActions.refreshEffortLevels(),
         bindAgent,
@@ -877,8 +890,12 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
         sideQuestion: sessionMetadataActions.sideQuestion,
         listFileCandidates: fileActions.listFileCandidates,
         listFiles: fileActions.listFiles,
+        cachedSessions: sessionMetadataActions.cachedSessions,
         listSessions: sessionMetadataActions.listSessions,
         previewSession: sessionMetadataActions.previewSession,
+        listForeignSources: foreignBrowser.listSources,
+        listForeignSessions: foreignBrowser.listSessions,
+        importForeignSession: foreignBrowser.importSession,
         bindApprovalStore: agentView.bindApprovalStore,
         agentViewRows: agentView.rows,
         subscribeAgentView: agentView.subscribe,
@@ -895,6 +912,7 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
         deleteSession: sessionMetadataActions.deleteSession,
         renameSessionTo: sessionMetadataActions.renameSessionTo,
         compact: compactManualSession,
+        cancelCompact: cancelManualCompaction,
         runExternalCommand: externalCommands.invokeText,
         runExternalCommandOutcome: externalCommands.invoke,
         pushLocal: localActions.pushLocal,
@@ -979,8 +997,6 @@ function createChannelWithOwner(ctx, initialAgent, options, owner) {
                 // only show a branch for sessions this install actually used — which
                 // is exactly what the column claims.
                 noteBranch(binding.agent.session.id, branch);
-                // Feed the working line so git tools can show ` · git <branch>`.
-                activity.onGitBranch(branch);
                 state.emit();
             }
         })

package/lib/types/dsh-adapter/compat/index.d.ts

@@ -25,5 +25,5 @@
  * @module @deepseek-harness-tui/dsh-tui/compat
  */
 export { appendInterruptedTurnEnd, liveSessionCreateOptions, liveSessionListingFields, liveSessionOffset, sliceLiveSessionSeed, snapshotLiveSessionEvents, } from './liveSession.js';
-export { appendSessionTitle, defaultMaxScanned, deleteSessionLog, ensureLegacySessionEventTypes, findSessionLogFile, LEGACY_SESSION_EVENT_TYPES, readPhysicalHeaderSeedLength, readPhysicalHeaderSeedLengthForSession, readSessionEventsFromFile, readSessionEventsFromLog, readSessionTitleFromLog, type SessionLogRead, sessionsRoots, } from './sessionLog.js';
+export { appendSessionTitle, defaultMaxScanned, deleteSessionLog, ensureLegacySessionEventTypes, findSessionLogFile, LEGACY_SESSION_EVENT_TYPES, readPhysicalHeaderSeedLength, readPhysicalHeaderSeedLengthForSession, readSessionEventsFromFile, readSessionEventsFromLog, readSessionTitleFromLog, type SessionLogRead, sessionsRoots, userTitleData, } from './sessionLog.js';
 //# sourceMappingURL=index.d.ts.map

package/lib/types/dsh-adapter/compat/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/compat/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,EACL,wBAAwB,EACxB,wBAAwB,EACxB,wBAAwB,EACxB,iBAAiB,EACjB,oBAAoB,EACpB,yBAAyB,GAC1B,MAAM,kBAAkB,CAAA;AACzB,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,6BAA6B,EAC7B,kBAAkB,EAClB,0BAA0B,EAC1B,4BAA4B,EAC5B,sCAAsC,EACtC,yBAAyB,EACzB,wBAAwB,EACxB,uBAAuB,EACvB,KAAK,cAAc,EACnB,aAAa,GACd,MAAM,iBAAiB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/compat/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,EACL,wBAAwB,EACxB,wBAAwB,EACxB,wBAAwB,EACxB,iBAAiB,EACjB,oBAAoB,EACpB,yBAAyB,GAC1B,MAAM,kBAAkB,CAAA;AACzB,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,6BAA6B,EAC7B,kBAAkB,EAClB,0BAA0B,EAC1B,4BAA4B,EAC5B,sCAAsC,EACtC,yBAAyB,EACzB,wBAAwB,EACxB,uBAAuB,EACvB,KAAK,cAAc,EACnB,aAAa,EACb,aAAa,GACd,MAAM,iBAAiB,CAAA"}