@adhdev/daemon-core 0.8.34 → 0.8.36

package/src/shared-types.ts

@@ -69,6 +69,192 @@ export interface AgentSessionStream {
     activeModal: { message: string; buttons: string[] } | null;
 }
 
+export type ReadChatSyncMode = 'full' | 'append' | 'replace_tail' | 'noop';
+
+export interface ReadChatCursor {
+    knownMessageCount?: number;
+    lastMessageSignature?: string;
+    tailLimit?: number;
+}
+
+export interface ReadChatSyncResult {
+    messages: ChatMessage[];
+    status: string;
+    title?: string;
+    activeModal?: { message: string; buttons: string[] } | null;
+    syncMode: ReadChatSyncMode;
+    replaceFrom: number;
+    totalMessages: number;
+    lastMessageSignature: string;
+}
+
+export interface SessionHostAttachedClient {
+    clientId: string;
+    type: string;
+    readOnly: boolean;
+    attachedAt: number;
+    lastSeenAt: number;
+}
+
+export interface SessionHostWriteOwner {
+    clientId: string;
+    ownerType: 'agent' | 'user';
+    acquiredAt: number;
+}
+
+export interface SessionHostRecord {
+    sessionId: string;
+    runtimeKey: string;
+    displayName: string;
+    workspaceLabel: string;
+    providerType: string;
+    workspace: string;
+    lifecycle: 'starting' | 'running' | 'stopping' | 'stopped' | 'failed' | 'interrupted';
+    writeOwner: SessionHostWriteOwner | null;
+    attachedClients: SessionHostAttachedClient[];
+    osPid?: number;
+    lastActivityAt: number;
+    createdAt: number;
+    startedAt?: number;
+    meta?: Record<string, unknown>;
+}
+
+export interface SessionHostLogEntry {
+    timestamp: number;
+    level: 'debug' | 'info' | 'warn' | 'error';
+    message: string;
+    sessionId?: string;
+}
+
+export interface SessionHostRequestTrace {
+    timestamp: number;
+    requestId: string;
+    type: string;
+    sessionId?: string;
+    clientId?: string;
+    success: boolean;
+    durationMs: number;
+    error?: string;
+}
+
+export interface SessionHostRuntimeTransition {
+    timestamp: number;
+    sessionId: string;
+    action: string;
+    lifecycle?: string;
+    detail?: string;
+    success?: boolean;
+    error?: string;
+}
+
+export interface SessionHostDiagnosticsSnapshot {
+    hostStartedAt: number;
+    endpoint: string;
+    runtimeCount: number;
+    sessions?: SessionHostRecord[];
+    recentLogs: SessionHostLogEntry[];
+    recentRequests: SessionHostRequestTrace[];
+    recentTransitions: SessionHostRuntimeTransition[];
+}
+
+export type TransportTopic = 'session.chat_tail' | 'machine.runtime' | 'session_host.diagnostics' | 'session.modal' | 'daemon.metadata';
+
+export interface SessionChatTailSubscriptionParams extends ReadChatCursor {
+    targetSessionId: string;
+    historySessionId?: string;
+}
+
+export interface MachineRuntimeSubscriptionParams {
+    intervalMs?: number;
+}
+
+export interface SessionModalSubscriptionParams {
+    targetSessionId: string;
+}
+
+export interface DaemonMetadataSubscriptionParams {
+    includeSessions?: boolean;
+}
+
+export interface SessionHostDiagnosticsSubscriptionParams {
+    includeSessions?: boolean;
+    limit?: number;
+    intervalMs?: number;
+}
+
+export interface SessionChatTailUpdate extends ReadChatSyncResult {
+    topic: 'session.chat_tail';
+    key: string;
+    sessionId: string;
+    historySessionId?: string;
+    seq: number;
+    timestamp: number;
+}
+
+export interface MachineRuntimeUpdate {
+    topic: 'machine.runtime';
+    key: string;
+    machine: MachineInfo;
+    seq: number;
+    timestamp: number;
+}
+
+export interface SessionHostDiagnosticsUpdate {
+    topic: 'session_host.diagnostics';
+    key: string;
+    diagnostics: SessionHostDiagnosticsSnapshot;
+    seq: number;
+    timestamp: number;
+}
+
+export interface SessionModalUpdate {
+    topic: 'session.modal';
+    key: string;
+    sessionId: string;
+    status: string;
+    title?: string;
+    modalMessage?: string;
+    modalButtons?: string[];
+    seq: number;
+    timestamp: number;
+}
+
+export interface DaemonMetadataUpdate {
+    topic: 'daemon.metadata';
+    key: string;
+    daemonId: string;
+    status: StatusReportPayload;
+    userName?: string;
+    seq: number;
+    timestamp: number;
+}
+
+export interface TopicUpdateEnvelopeMap {
+    'session.chat_tail': SessionChatTailUpdate;
+    'machine.runtime': MachineRuntimeUpdate;
+    'session_host.diagnostics': SessionHostDiagnosticsUpdate;
+    'session.modal': SessionModalUpdate;
+    'daemon.metadata': DaemonMetadataUpdate;
+}
+
+export type TopicUpdateEnvelope = TopicUpdateEnvelopeMap[TransportTopic];
+
+export interface SubscribeRequestMap {
+    'session.chat_tail': SessionChatTailSubscriptionParams;
+    'machine.runtime': MachineRuntimeSubscriptionParams;
+    'session_host.diagnostics': SessionHostDiagnosticsSubscriptionParams;
+    'session.modal': SessionModalSubscriptionParams;
+    'daemon.metadata': DaemonMetadataSubscriptionParams;
+}
+
+export type SubscribeRequest =
+    { [K in TransportTopic]: { type: 'subscribe'; topic: K; key: string; params: SubscribeRequestMap[K] } }[TransportTopic];
+
+export type UnsubscribeRequest =
+    { [K in TransportTopic]: { type: 'unsubscribe'; topic: K; key: string } }[TransportTopic];
+
+export type StandaloneWsStatusPayload = StatusReportPayload;
+
 export type SessionTransport = 'cdp-page' | 'cdp-webview' | 'pty' | 'acp';
 
 export type SessionKind = 'workspace' | 'agent';
@@ -93,13 +279,13 @@ export interface SessionEntry {
     id: string;
     parentId: string | null;
     providerType: string;
-    providerName: string;
+    providerName?: string;
     providerSessionId?: string;
     kind: SessionKind;
     transport: SessionTransport;
     status: SessionStatus;
     title: string;
-    workspace: string | null;
+    workspace?: string | null;
     runtimeKey?: string;
     runtimeDisplayName?: string;
     runtimeWorkspaceLabel?: string;
@@ -109,7 +295,7 @@ export interface SessionEntry {
     runtimeAttachedClients?: RuntimeAttachedClient[];
     resume?: ProviderResumeCapability;
     activeChat: _ActiveChatData | null;
-    capabilities: SessionCapability[];
+    capabilities?: SessionCapability[];
     cdpConnected?: boolean;
     currentModel?: string;
     currentPlan?: string;
@@ -129,6 +315,26 @@ export interface SessionEntry {
     surfaceHidden?: boolean;
 }
 
+/**
+ * Compact session metadata stored in UserSessionDO and reused by server-side
+ * status/convenience APIs. This intentionally excludes rich UI-only fields.
+ */
+export interface CompactSessionEntry {
+    id: string;
+    parentId: string | null;
+    providerType: string;
+    providerName: string;
+    kind: SessionKind;
+    transport: SessionTransport;
+    status: SessionStatus;
+    title: string;
+    workspace: string | null;
+    cdpConnected?: boolean;
+    currentModel?: string;
+    currentPlan?: string;
+    currentAutoApprove?: string;
+}
+
 /** Available provider information */
 export interface AvailableProviderInfo {
     type: string;
@@ -195,15 +401,15 @@ export interface ProviderControlSchema {
 export interface MachineInfo {
     hostname: string;
     platform: string;
-    arch: string;
-    cpus: number;
-    totalMem: number;
-    freeMem: number;
+    arch?: string;
+    cpus?: number;
+    totalMem?: number;
+    freeMem?: number;
     /** macOS: reclaimable-inclusive; prefer for UI used% */
     availableMem?: number;
-    loadavg: number[];
-    uptime: number;
-    release: string;
+    loadavg?: number[];
+    uptime?: number;
+    release?: string;
 }
 
 /** Detected IDE on a machine */
@@ -231,24 +437,121 @@ export interface RecentLaunchEntry {
     lastLaunchedAt: number;
 }
 
+/** Compact machine payload broadcast by UserSessionDO to cloud dashboards. */
+export interface CompactDaemonEntry {
+    id: string;
+    type?: string;
+    machineId?: string;
+    platform?: string;
+    hostname?: string;
+    nickname?: string;
+    p2p?: StatusReportPayload['p2p'];
+    cdpConnected?: boolean;
+    timestamp?: number;
+    version?: string;
+    serverVersion?: string;
+    versionMismatch?: boolean;
+    terminalBackend?: TerminalBackendStatus;
+    detectedIdes?: DetectedIdeInfo[];
+    availableProviders?: AvailableProviderInfo[];
+    sessions?: CompactSessionEntry[];
+}
+
+/** Minimal daemon list payload returned by the cloud server REST API. */
+export interface CloudDaemonSummaryEntry {
+    id: string;
+    type?: string;
+    machineId?: string;
+    platform?: string;
+    hostname?: string;
+    nickname?: string;
+    p2p?: StatusReportPayload['p2p'];
+    cdpConnected?: boolean;
+    timestamp?: number;
+    version?: string;
+    serverVersion?: string;
+    versionMismatch?: boolean;
+    terminalBackend?: TerminalBackendStatus;
+}
+
+/** Minimal daemon bootstrap payload used by dashboard WS to initiate P2P. */
+export interface DashboardBootstrapDaemonEntry {
+    id: string;
+    p2p?: StatusReportPayload['p2p'];
+    timestamp?: number;
+}
+
+export type DaemonStatusEventName =
+    | 'agent:generating_started'
+    | 'agent:waiting_approval'
+    | 'agent:generating_completed'
+    | 'agent:stopped'
+    | 'monitor:long_generating';
+
+/** Minimal daemon-originated event payload relayed through the server. */
+export interface DaemonStatusEventPayload {
+    event: DaemonStatusEventName;
+    timestamp: number;
+    targetSessionId?: string;
+    providerType?: string;
+    duration?: number;
+    elapsedSec?: number;
+    modalMessage?: string;
+    modalButtons?: string[];
+}
+
+export type DashboardStatusEventName =
+    | DaemonStatusEventName
+    | 'daemon:disconnect'
+    | 'team:session_viewed'
+    | 'team:view_request'
+    | 'team:view_request_approved'
+    | 'team:view_request_rejected';
+
+/** Sanitized event payload delivered to dashboard clients. */
+export interface DashboardStatusEventPayload {
+    event: DashboardStatusEventName;
+    timestamp: number;
+    daemonId?: string;
+    providerType?: string;
+    targetSessionId?: string;
+    duration?: number;
+    elapsedSec?: number;
+    modalMessage?: string;
+    modalButtons?: string[];
+    requestId?: string;
+    requesterName?: string;
+    targetName?: string;
+    orgId?: string;
+    permission?: string;
+    shareUrl?: string;
+    shareToken?: string;
+    viewerName?: string;
+}
+
+/** Minimal daemon->cloud status payload used for routing, fallback, and server APIs. */
+export interface CloudStatusReportPayload {
+    sessions: CompactSessionEntry[];
+    p2p?: StatusReportPayload['p2p'];
+    timestamp: number;
+}
+
 // ─── Status Report Payload (daemon → server) ────────────────────────
 // Full payload shape sent via WebSocket status_report
 
 export interface StatusReportPayload {
     /** Unique daemon instance identifier */
     instanceId: string;
-    /** Daemon version */
-    version: string;
-    /** Daemon mode flag */
-    daemonMode: boolean;
+    /** Daemon version (metadata/full snapshots only) */
+    version?: string;
     /** Machine info */
     machine: MachineInfo;
     /** Machine nickname (user-set) */
     machineNickname?: string | null;
     /** Timestamp */
     timestamp: number;
-    /** Detected IDEs on this machine */
-    detectedIdes: DetectedIdeInfo[];
+    /** Detected IDEs on this machine (metadata snapshot only) */
+    detectedIdes?: DetectedIdeInfo[];
     /** P2P state */
     p2p?: { available: boolean; state: string; peers: number; screenshotActive?: boolean };
     /** Canonical daemon runtime sessions */

package/src/status/builders.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Status Builders — shared conversion functions for ProviderState → ManagedEntry
+ *
+ * Used by:
+ *   - daemon-standalone (StandaloneServer.getStatus)
+ *   - DaemonStatusReporter
+ *
+ * Consolidates ProviderState→ManagedEntry mapping logic.
+ */
+import type { DaemonCdpManager } from '../cdp/manager.js';
+import type { SessionEntry } from '../shared-types.js';
+import type { ProviderState } from '../providers/provider-instance.js';
+/**
+ * Find a CDP manager by key, with prefix matching for multi-window support.
+ *
+ * Lookup order:
+ *   1. Exact match: cdpManagers.get(key)
+ *   2. Prefix match: key starts with `${ideType}_` (multi-window: "cursor_remote_vs")
+ *   3. null
+ *
+ * This replaces raw `cdpManagers.get(ideType)` calls that broke when
+ * multi-window keys like "cursor_remote_vs" were used.
+ */
+export declare function findCdpManager(cdpManagers: Map<string, DaemonCdpManager>, key: string): DaemonCdpManager | null;
+/**
+ * Check if any CDP manager matches the given key (exact or prefix).
+ */
+export declare function hasCdpManager(cdpManagers: Map<string, DaemonCdpManager>, key: string): boolean;
+/**
+ * Check if any CDP manager matching the key is connected.
+ */
+export declare function isCdpConnected(cdpManagers: Map<string, DaemonCdpManager>, key: string): boolean;
+export declare function buildSessionEntries(allStates: ProviderState[], cdpManagers: Map<string, DaemonCdpManager>): SessionEntry[];