@adhdev/daemon-core 0.9.18 → 0.9.20

package/src/cli-adapters/provider-cli-shared.ts

@@ -26,7 +26,15 @@ export interface CliSessionStatus {
     errorReason?: string;
 }
 
+export interface ParsedSession {
+    status: string;
+    messages: any[];
+    modal: { message: string; buttons: string[] } | null;
+    parsedStatus: string | null;
+}
+
 export interface CliScripts {
+    parseSession?: (input: CliScriptInput & { tail?: string; tailScreen?: CliScreenSnapshot }) => ParsedSession | null;
     parseOutput?: (input: CliScriptInput) => any;
     detectStatus?: (input: CliStatusInput) => string | null;
     parseApproval?: (input: CliApprovalInput) => { message: string; buttons: string[] } | null;

package/src/commands/chat-commands.ts

@@ -190,30 +190,31 @@ function buildReadChatReplayCollapseSignature(message: ChatMessage | null | unde
 function shouldCollapseReadChatReplayDuplicate(message: ChatMessage | null | undefined): boolean {
     if (!message) return false;
     const role = typeof message.role === 'string' ? message.role.trim().toLowerCase() : '';
-    if (role !== 'assistant' && role !== 'system') return false;
-    const kind = typeof message.kind === 'string' ? message.kind.trim().toLowerCase() : 'standard';
-    return kind === 'tool' || kind === 'terminal' || kind === 'thought' || kind === 'system';
+    return role === 'assistant' || role === 'system';
 }
 
 function collapseReplayDuplicatesFromReadChat(messages: ChatMessage[]): ChatMessage[] {
     const collapsed: ChatMessage[] = [];
-    let lastReplayTurnSignature = '';
+    const replaySignaturesInCurrentTurn = new Set<string>();
 
     for (const message of messages) {
+        const role = typeof message.role === 'string' ? message.role.trim().toLowerCase() : '';
+        if (role === 'user') {
+            replaySignaturesInCurrentTurn.clear();
+        }
+
         const signature = buildReadChatReplayCollapseSignature(message);
         const previous = collapsed[collapsed.length - 1];
         const previousSignature = buildReadChatReplayCollapseSignature(previous);
 
         if (shouldCollapseReadChatReplayDuplicate(message) && signature) {
             if (previousSignature === signature) continue;
-            if (lastReplayTurnSignature === signature) continue;
+            if (replaySignaturesInCurrentTurn.has(signature)) continue;
         }
 
         collapsed.push(message);
         if (shouldCollapseReadChatReplayDuplicate(message) && signature) {
-            lastReplayTurnSignature = signature;
-        } else if ((message.role || '').toLowerCase() === 'user') {
-            lastReplayTurnSignature = '';
+            replaySignaturesInCurrentTurn.add(signature);
         }
     }
 

package/src/index.d.ts

@@ -4,7 +4,7 @@
  * Core logic for daemon: CDP, Provider, IDE detection, CLI/ACP adapters and more.
  */
 export type { ChatBubbleState, ChatMessage, ExtensionInfo, CommandResult as CoreCommandResult, ProviderConfig, DaemonEvent, StatusResponse, SystemInfo, DetectedIde, ProviderInfo, AgentEntry, } from './types.js';
-export type { SessionEntry, CompactSessionEntry, CompactDaemonEntry, SessionTransport, SessionKind, SessionCapability, AgentSessionStream, ReadChatCursor, ReadChatSyncMode, ReadChatSyncResult, TransportTopic, SessionChatTailSubscriptionParams, MachineRuntimeSubscriptionParams, SessionHostDiagnosticsSubscriptionParams, SessionModalSubscriptionParams, DaemonMetadataSubscriptionParams, SessionChatTailUpdate, MachineRuntimeUpdate, SessionHostDiagnosticsUpdate, SessionModalUpdate, DaemonMetadataUpdate, TopicUpdateEnvelope, SubscribeRequest, UnsubscribeRequest, StandaloneWsStatusPayload, AvailableProviderInfo, AcpConfigOption, AcpMode, ProviderControlSchema, StatusReportPayload, MachineInfo, SessionHostDiagnosticsSnapshot, SessionHostRecord, SessionHostWriteOwner, SessionHostAttachedClient, SessionHostLogEntry, SessionHostRequestTrace, SessionHostRuntimeTransition, DetectedIdeInfo, WorkspaceEntry, ProviderSummaryItem, ProviderSummaryMetadata, ProviderState, ProviderStatus, ProviderErrorReason, ActiveChatData, IdeProviderState, CliProviderState, AcpProviderState, ExtensionProviderState, } from './shared-types.js';
+export type { SessionEntry, CompactSessionEntry, CompactDaemonEntry, SessionTransport, SessionKind, SessionCapability, AgentSessionStream, ReadChatCursor, ReadChatSyncMode, ReadChatSyncResult, TransportTopic, SessionChatTailSubscriptionParams, SessionRuntimeOutputSubscriptionParams, MachineRuntimeSubscriptionParams, SessionHostDiagnosticsSubscriptionParams, SessionModalSubscriptionParams, DaemonMetadataSubscriptionParams, SessionChatTailUpdate, SessionRuntimeOutputUpdate, MachineRuntimeUpdate, SessionHostDiagnosticsUpdate, SessionModalUpdate, DaemonMetadataUpdate, TopicUpdateEnvelope, SubscribeRequest, UnsubscribeRequest, StandaloneWsStatusPayload, AvailableProviderInfo, AcpConfigOption, AcpMode, ProviderControlSchema, StatusReportPayload, MachineInfo, SessionHostDiagnosticsSnapshot, SessionHostRecord, SessionHostWriteOwner, SessionHostAttachedClient, SessionHostLogEntry, SessionHostRequestTrace, SessionHostRuntimeTransition, DetectedIdeInfo, WorkspaceEntry, ProviderSummaryItem, ProviderSummaryMetadata, ProviderState, ProviderStatus, ProviderErrorReason, ActiveChatData, IdeProviderState, CliProviderState, AcpProviderState, ExtensionProviderState, } from './shared-types.js';
 import type { RuntimeWriteOwner as _RuntimeWriteOwner } from './shared-types-extra.js';
 import type { RuntimeAttachedClient as _RuntimeAttachedClient } from './shared-types-extra.js';
 import type { RecentLaunchEntry as _RecentLaunchEntry } from './shared-types.js';

package/src/index.ts

@@ -39,6 +39,7 @@ export type {
   ReadChatSyncResult,
   TransportTopic,
   SessionChatTailSubscriptionParams,
+  SessionRuntimeOutputSubscriptionParams,
   MachineRuntimeSubscriptionParams,
   SessionHostDiagnosticsSubscriptionParams,
   SessionModalSubscriptionParams,

package/src/shared-types.d.ts

@@ -66,11 +66,14 @@ export interface ProviderSummaryItem {
 export interface ProviderSummaryMetadata {
     items: ProviderSummaryItem[];
 }
-export type TransportTopic = 'session.chat_tail' | 'machine.runtime' | 'session_host.diagnostics' | 'session.modal' | 'daemon.metadata';
+export type TransportTopic = 'session.chat_tail' | 'session.runtime_output' | 'machine.runtime' | 'session_host.diagnostics' | 'session.modal' | 'daemon.metadata';
 export interface SessionChatTailSubscriptionParams extends ReadChatCursor {
     targetSessionId: string;
     historySessionId?: string;
 }
+export interface SessionRuntimeOutputSubscriptionParams {
+    targetSessionId: string;
+}
 export interface MachineRuntimeSubscriptionParams {
     intervalMs?: number;
 }
@@ -93,6 +96,13 @@ export interface SessionChatTailUpdate extends ReadChatSyncResult {
     seq: number;
     timestamp: number;
 }
+export interface SessionRuntimeOutputUpdate {
+    topic: 'session.runtime_output';
+    key: string;
+    sessionId: string;
+    seq: number;
+    timestamp: number;
+}
 export interface MachineRuntimeUpdate {
     topic: 'machine.runtime';
     key: string;
@@ -129,6 +139,7 @@ export interface DaemonMetadataUpdate {
 }
 export interface TopicUpdateEnvelopeMap {
     'session.chat_tail': SessionChatTailUpdate;
+    'session.runtime_output': SessionRuntimeOutputUpdate;
     'machine.runtime': MachineRuntimeUpdate;
     'session_host.diagnostics': SessionHostDiagnosticsUpdate;
     'session.modal': SessionModalUpdate;
@@ -137,6 +148,7 @@ export interface TopicUpdateEnvelopeMap {
 export type TopicUpdateEnvelope = TopicUpdateEnvelopeMap[TransportTopic];
 export interface SubscribeRequestMap {
     'session.chat_tail': SessionChatTailSubscriptionParams;
+    'session.runtime_output': SessionRuntimeOutputSubscriptionParams;
     'machine.runtime': MachineRuntimeSubscriptionParams;
     'session_host.diagnostics': SessionHostDiagnosticsSubscriptionParams;
     'session.modal': SessionModalSubscriptionParams;

package/src/shared-types.ts

@@ -178,13 +178,17 @@ export interface SessionHostDiagnosticsSnapshot {
     recentTransitions: SessionHostRuntimeTransition[];
 }
 
-export type TransportTopic = 'session.chat_tail' | 'machine.runtime' | 'session_host.diagnostics' | 'session.modal' | 'daemon.metadata';
+export type TransportTopic = 'session.chat_tail' | 'session.runtime_output' | 'machine.runtime' | 'session_host.diagnostics' | 'session.modal' | 'daemon.metadata';
 
 export interface SessionChatTailSubscriptionParams extends ReadChatCursor {
     targetSessionId: string;
     historySessionId?: string;
 }
 
+export interface SessionRuntimeOutputSubscriptionParams {
+    targetSessionId: string;
+}
+
 export interface MachineRuntimeSubscriptionParams {
     intervalMs?: number;
 }
@@ -213,6 +217,14 @@ export interface SessionChatTailUpdate extends ReadChatSyncResult {
     timestamp: number;
 }
 
+export interface SessionRuntimeOutputUpdate {
+    topic: 'session.runtime_output';
+    key: string;
+    sessionId: string;
+    seq: number;
+    timestamp: number;
+}
+
 export interface MachineRuntimeUpdate {
     topic: 'machine.runtime';
     key: string;
@@ -254,6 +266,7 @@ export interface DaemonMetadataUpdate {
 
 export interface TopicUpdateEnvelopeMap {
     'session.chat_tail': SessionChatTailUpdate;
+    'session.runtime_output': SessionRuntimeOutputUpdate;
     'machine.runtime': MachineRuntimeUpdate;
     'session_host.diagnostics': SessionHostDiagnosticsUpdate;
     'session.modal': SessionModalUpdate;
@@ -264,6 +277,7 @@ export type TopicUpdateEnvelope = TopicUpdateEnvelopeMap[TransportTopic];
 
 export interface SubscribeRequestMap {
     'session.chat_tail': SessionChatTailSubscriptionParams;
+    'session.runtime_output': SessionRuntimeOutputSubscriptionParams;
     'machine.runtime': MachineRuntimeSubscriptionParams;
     'session_host.diagnostics': SessionHostDiagnosticsSubscriptionParams;
     'session.modal': SessionModalSubscriptionParams;

package/src/status/builders.ts

@@ -155,14 +155,14 @@ function buildIdeWorkspaceSession(
         id: state.instanceId || state.type,
         parentId: null,
         providerType: state.type,
-        ...(includeSessionMetadata && { providerName: state.name }),
+        providerName: state.name,
         kind: 'workspace',
         transport: 'cdp-page',
         status: normalizeManagedStatus(activeChat?.status || state.status, {
             activeModal: activeChat?.activeModal || null,
         }),
         title,
-        ...(includeSessionMetadata && { workspace: state.workspace || null }),
+        workspace: state.workspace || null,
         activeChat,
         ...(summaryMetadata && { summaryMetadata }),
         ...(includeSessionMetadata && { capabilities: state.sessionCapabilities || IDE_SESSION_CAPABILITIES }),
@@ -192,7 +192,7 @@ function buildExtensionAgentSession(
         id: ext.instanceId || `${parent.instanceId}:${ext.type}`,
         parentId: parent.instanceId || parent.type,
         providerType: ext.type,
-        ...(includeSessionMetadata && { providerName: ext.name }),
+        providerName: ext.name,
         providerSessionId: ext.providerSessionId,
         kind: 'agent',
         transport: 'cdp-webview',
@@ -200,7 +200,7 @@ function buildExtensionAgentSession(
             activeModal: activeChat?.activeModal || null,
         }),
         title: activeChat?.title || ext.name,
-        ...(includeSessionMetadata && { workspace: parent.workspace || null }),
+        workspace: parent.workspace || null,
         activeChat,
         ...(summaryMetadata && { summaryMetadata }),
         ...(includeSessionMetadata && { capabilities: ext.sessionCapabilities || EXTENSION_SESSION_CAPABILITIES }),
@@ -253,7 +253,7 @@ function buildCliSession(state: CliProviderState, options: SessionEntryBuildOpti
         id: state.instanceId,
         parentId: null,
         providerType: state.type,
-        ...(includeSessionMetadata && { providerName: state.name }),
+        providerName: state.name,
         providerSessionId: state.providerSessionId,
         kind: 'agent',
         transport: 'pty',
@@ -261,7 +261,7 @@ function buildCliSession(state: CliProviderState, options: SessionEntryBuildOpti
             activeModal: activeChat?.activeModal || null,
         }),
         title: activeChat?.title || state.name,
-        ...(includeSessionMetadata && { workspace: state.workspace || null }),
+        workspace: state.workspace || null,
         ...(includeRuntimeMetadata && {
             runtimeKey: state.runtime?.runtimeKey,
             runtimeDisplayName: state.runtime?.displayName,
@@ -301,14 +301,14 @@ function buildAcpSession(state: AcpProviderState, options: SessionEntryBuildOpti
         id: state.instanceId,
         parentId: null,
         providerType: state.type,
-        ...(includeSessionMetadata && { providerName: state.name }),
+        providerName: state.name,
         kind: 'agent',
         transport: 'acp',
         status: normalizeManagedStatus(activeChat?.status || state.status, {
             activeModal: activeChat?.activeModal || null,
         }),
         title: activeChat?.title || state.name,
-        ...(includeSessionMetadata && { workspace: state.workspace || null }),
+        workspace: state.workspace || null,
         activeChat,
         ...(summaryMetadata && { summaryMetadata }),
         ...(includeSessionMetadata && { capabilities: ACP_SESSION_CAPABILITIES }),

package/src/status/reporter.ts

@@ -14,7 +14,6 @@ import {
 import type { DaemonCdpManager } from '../cdp/manager.js';
 import type { MachineInfo } from '../shared-types.js';
 import type { CloudStatusReportPayload, DaemonStatusEventPayload } from '../shared-types.js';
-import { buildSessionEntries } from './builders.js';
 import { buildStatusSnapshot } from './snapshot.js';
 import type {
     ProviderState,
@@ -258,13 +257,7 @@ export class DaemonStatusReporter {
             }
         }
 
- // IDE/CLI/ACP states → managed entries (shared builder)
-        const sessions = buildSessionEntries(
-            allStates,
-            this.deps.cdpManagers,
-        );
-
- // ═══ Assemble payload (P2P — required data only) ═══
+// ═══ Assemble payload (P2P — required data only) ═══
         const payload: Record<string, any> = {
             ...buildStatusSnapshot({
                 allStates,
@@ -286,9 +279,9 @@ export class DaemonStatusReporter {
         };
 
 // ═══ P2P transmit ═══
-        const payloadBytes = JSON.stringify(payload).length;
         const p2pSent = this.sendP2PPayload(payload);
         if (p2pSent) {
+            const payloadBytes = JSON.stringify(payload).length;
             LOG.debug('P2P', `sent (${payloadBytes} bytes)`);
             if (payloadBytes > 256 * 1024) {
                 LOG.warn(
@@ -300,10 +293,12 @@ export class DaemonStatusReporter {
 
  // ═══ Server transmit (minimal routing meta only) ═══
         if (opts?.p2pOnly) return;
+        if (!serverConnected || !serverConn) return;
         // Server relay only needs compact session metadata for routing, compact status,
         // initial_state fallback, and lightweight API/session inspection.
+        const payloadSessions = Array.isArray(payload.sessions) ? payload.sessions : [];
         const wsPayload: CloudStatusReportPayload = {
-            sessions: sessions.map((session) => ({
+            sessions: payloadSessions.map((session) => ({
                 id: session.id,
                 parentId: session.parentId,
                 providerType: session.providerType,
@@ -329,8 +324,9 @@ export class DaemonStatusReporter {
             return;
         }
         this.lastServerStatusHash = wsHash;
+        const wsPayloadBytes = JSON.stringify(wsPayload).length;
         serverConn.sendMessage('status_report', wsPayload);
-        LOG.debug('Server', `sent status_report (${JSON.stringify(wsPayload).length} bytes)${opts?.reason ? ` [${opts.reason}]` : ''}`);
+        LOG.debug('Server', `sent status_report (${wsPayloadBytes} bytes)${opts?.reason ? ` [${opts.reason}]` : ''}`);
     }
 
  // ─── P2P ─────────────────────────────────────────

package/src/status/snapshot.ts

@@ -16,6 +16,7 @@ import { getTerminalBackendRuntimeStatus } from '../cli-adapters/terminal-screen
 import { LOG } from '../logging/logger.js';
 import type { DaemonCdpManager } from '../cdp/manager.js';
 import { buildSessionEntries, isCdpConnected, type SessionEntryProfile } from './builders.js';
+import { LIVE_STATUS_ACTIVE_CHAT_OPTIONS, normalizeActiveChatData } from './normalize.js';
 import type { ProviderState } from '../providers/provider-instance.js';
 import type {
     AvailableProviderInfo,
@@ -336,6 +337,19 @@ function getUnreadState(
     return { unread, inboxBucket: unread ? 'task_complete' : 'idle' };
 }
 
+function projectLiveSessionFromFull(session: SessionEntry): SessionEntry {
+    const {
+        capabilities: _capabilities,
+        controlValues: _controlValues,
+        providerControls: _providerControls,
+        ...rest
+    } = session as SessionEntry & Record<string, unknown>;
+    return {
+        ...rest,
+        activeChat: normalizeActiveChatData(session.activeChat as any, LIVE_STATUS_ACTIVE_CHAT_OPTIONS),
+    } as SessionEntry;
+}
+
 function buildRecentLaunches(
     recentActivity: ReturnType<typeof getRecentActivity>,
 ): RecentLaunchEntry[] {
@@ -368,11 +382,13 @@ export function buildStatusSnapshot(options: StatusSnapshotOptions): StatusSnaps
     );
     const sessions = profile === 'full'
         ? unreadSourceSessions
-        : buildSessionEntries(
-            options.allStates,
-            options.cdpManagers,
-            { profile },
-        );
+        : profile === 'live'
+            ? unreadSourceSessions.map(projectLiveSessionFromFull)
+            : buildSessionEntries(
+                options.allStates,
+                options.cdpManagers,
+                { profile },
+            );
     const sessionsById = new Map(sessions.map((session) => [session.id, session]));
     for (const sourceSession of unreadSourceSessions) {
         const session = sessionsById.get(sourceSession.id);