@adhdev/daemon-core 0.7.38 → 0.7.40

package/src/shared-types.ts

@@ -86,6 +86,9 @@ export type SessionCapability =
     | 'set_mode'
     | 'set_thought_level';
 
+import type { RuntimeWriteOwner, RuntimeAttachedClient, SessionStatus } from './shared-types-extra.js';
+export type { RuntimeWriteOwner, RuntimeAttachedClient, SessionStatus } from './shared-types-extra.js';
+
 export interface SessionEntry {
     id: string;
     parentId: string | null;
@@ -93,21 +96,14 @@ export interface SessionEntry {
     providerName: string;
     kind: SessionKind;
     transport: SessionTransport;
-    status: 'idle' | 'generating' | 'waiting_approval' | 'error' | 'stopped' | 'starting' | 'panel_hidden' | 'not_monitored' | 'disconnected';
+    status: SessionStatus;
     title: string;
     workspace: string | null;
     runtimeKey?: string;
     runtimeDisplayName?: string;
     runtimeWorkspaceLabel?: string;
-    runtimeWriteOwner?: {
-        clientId: string;
-        ownerType: 'agent' | 'user';
-    } | null;
-    runtimeAttachedClients?: {
-        clientId: string;
-        type: 'daemon' | 'web' | 'local-terminal';
-        readOnly: boolean;
-    }[];
+    runtimeWriteOwner?: RuntimeWriteOwner | null;
+    runtimeAttachedClients?: RuntimeAttachedClient[];
     resume?: ProviderResumeCapability;
     activeChat: _ActiveChatData | null;
     capabilities: SessionCapability[];
@@ -124,10 +120,10 @@ export interface SessionEntry {
     errorMessage?: string;
     errorReason?: _ProviderErrorReason;
     lastUpdated?: number;
-    recentKey?: string;
     unread?: boolean;
     lastSeenAt?: number;
     inboxBucket?: RecentSessionBucket;
+    surfaceHidden?: boolean;
 }
 
 /** Available provider information */
@@ -214,44 +210,26 @@ export interface DetectedIdeInfo {
     path?: string;
 }
 
-/** Workspace recent activity */
-export interface WorkspaceActivity {
-    path: string;
-    lastUsedAt: number;
-    kind?: string;
-    agentType?: string;
-}
+export type { RecentSessionBucket, TerminalBackendStatus } from './shared-types-extra.js';
+import type { RecentSessionBucket } from './shared-types-extra.js';
+import type { TerminalBackendStatus } from './shared-types-extra.js';
 
-export interface RecentSessionEntry {
+export interface RecentLaunchEntry {
     id: string;
-    recentKey: string;
-    sessionId?: string | null;
     providerType: string;
     providerName: string;
     kind: 'ide' | 'cli' | 'acp';
-    title: string;
+    title?: string;
     workspace?: string | null;
     currentModel?: string;
-    status?: SessionEntry['status'];
-    lastUsedAt: number;
-    unread?: boolean;
-    lastSeenAt?: number;
-    inboxBucket?: RecentSessionBucket;
-}
-
-export type RecentSessionBucket = 'needs_attention' | 'working' | 'task_complete' | 'idle';
-
-export interface TerminalBackendStatus {
-    backend: 'xterm' | 'ghostty-vt';
-    preference: 'auto' | 'xterm' | 'ghostty-vt';
-    ghosttyAvailable: boolean;
+    lastLaunchedAt: number;
 }
 
 // ─── Status Report Payload (daemon → server) ────────────────────────
 // Full payload shape sent via WebSocket status_report
 
 export interface StatusReportPayload {
-    /** Daemon instance ID */
+    /** Unique daemon instance identifier */
     instanceId: string;
     /** Daemon version */
     version: string;
@@ -273,7 +251,8 @@ export interface StatusReportPayload {
     workspaces?: WorkspaceEntry[];
     defaultWorkspaceId?: string | null;
     defaultWorkspacePath?: string | null;
-    workspaceActivity?: WorkspaceActivity[];
-    recentSessions?: RecentSessionEntry[];
+    recentLaunches?: RecentLaunchEntry[];
     terminalBackend?: TerminalBackendStatus;
+    /** Available providers (present in StatusSnapshot, optional in raw payload) */
+    availableProviders?: AvailableProviderInfo[];
 }

package/src/status/builders.ts

@@ -337,5 +337,17 @@ export function buildSessionEntries(
         sessions.push(buildAcpSession(state));
     }
 
+    // Hide native IDE parent rows from inbox/recent surfaces when extension tabs exist.
+    const extensionParentIds = new Set(
+        sessions
+            .filter((session) => session.transport === 'cdp-webview' && !!session.parentId)
+            .map((session) => session.parentId as string)
+    );
+    for (const session of sessions) {
+        if (session.transport === 'cdp-page' && extensionParentIds.has(session.id)) {
+            session.surfaceHidden = true;
+        }
+    }
+
     return sessions;
 }

package/src/status/reporter.ts

@@ -203,10 +203,11 @@ export class DaemonStatusReporter {
                 currentModel: session.currentModel,
                 currentPlan: session.currentPlan,
                 currentAutoApprove: session.currentAutoApprove,
-                recentKey: (session as any).recentKey,
+                lastUpdated: session.lastUpdated,
                 unread: (session as any).unread,
                 lastSeenAt: (session as any).lastSeenAt,
                 inboxBucket: (session as any).inboxBucket,
+                surfaceHidden: (session as any).surfaceHidden,
                 controlValues: session.controlValues,
                 providerControls: session.providerControls,
                 acpConfigOptions: session.acpConfigOptions,

package/src/status/snapshot.ts

@@ -8,18 +8,18 @@
 
 import * as os from 'os';
 import { loadConfig } from '../config/config.js';
-import { buildRecentActivityKey, getRecentActivity, getRecentSessionSeenAt } from '../config/recent-activity.js';
+import { getRecentActivity, getSessionSeenAt, getSessionSeenMarker } from '../config/recent-activity.js';
 import { getWorkspaceState } from '../config/workspaces.js';
-import { getWorkspaceActivity } from '../config/workspace-activity.js';
 import { getHostMemorySnapshot } from '../system/host-memory.js';
 import { getTerminalBackendRuntimeStatus } from '../cli-adapters/terminal-screen.js';
+import { LOG } from '../logging/logger.js';
 import { buildSessionEntries, isCdpConnected } from './builders.js';
 import type { ProviderState } from '../providers/provider-instance.js';
 import type {
     AvailableProviderInfo,
     DetectedIdeInfo,
+    RecentLaunchEntry,
     RecentSessionBucket,
-    RecentSessionEntry,
     SessionEntry,
     StatusReportPayload,
 } from '../shared-types.js';
@@ -54,6 +54,8 @@ export interface StatusSnapshot extends StatusReportPayload {
     availableProviders: AvailableProviderInfo[];
 }
 
+const READ_DEBUG_ENABLED = process.argv.includes('--dev') || process.env.ADHDEV_READ_DEBUG === '1';
+
 function buildDetectedIdeInfos(
     detectedIdes: StatusSnapshotOptions['detectedIdes'],
     cdpManagers: StatusSnapshotOptions['cdpManagers'],
@@ -105,6 +107,30 @@ function getSessionMessageUpdatedAt(session: {
     );
 }
 
+export function getSessionCompletionMarker(session: {
+    activeChat?: {
+        messages?: Array<{
+            role?: string;
+            id?: string;
+            index?: number;
+            timestamp?: number | string;
+            receivedAt?: number | string;
+            createdAt?: number | string;
+            _turnKey?: string;
+        }> | null
+    } | null
+}) {
+    const lastMessage = session.activeChat?.messages?.at?.(-1) as any;
+    if (!lastMessage) return '';
+    const role = typeof lastMessage.role === 'string' ? lastMessage.role : '';
+    if (role === 'user' || role === 'human') return '';
+    if (typeof lastMessage._turnKey === 'string' && lastMessage._turnKey) return `turn:${lastMessage._turnKey}`;
+    if (typeof lastMessage.id === 'string' && lastMessage.id) return `id:${lastMessage.id}`;
+    if (typeof lastMessage.index === 'number' && Number.isFinite(lastMessage.index)) return `idx:${lastMessage.index}`;
+    const timestamp = parseMessageTime(lastMessage.timestamp) || parseMessageTime(lastMessage.receivedAt) || parseMessageTime(lastMessage.createdAt);
+    return timestamp > 0 ? `ts:${timestamp}` : '';
+}
+
 function getSessionLastUsedAt(session: {
     activeChat?: {
         messages?: Array<{ timestamp?: number | string; receivedAt?: number | string; createdAt?: number | string }> | null
@@ -114,7 +140,7 @@ function getSessionLastUsedAt(session: {
     return getSessionMessageUpdatedAt(session) || session.lastUpdated || Date.now();
 }
 
-function getSessionKind(session: SessionEntry): RecentSessionEntry['kind'] {
+function getSessionKind(session: SessionEntry): RecentLaunchEntry['kind'] {
     return session.transport === 'cdp-page' || session.transport === 'cdp-webview'
         ? 'ide'
         : session.transport === 'acp'
@@ -133,6 +159,8 @@ function getUnreadState(
     lastUsedAt: number,
     lastSeenAt: number,
     lastRole: string,
+    completionMarker: string,
+    seenCompletionMarker: string,
 ): { unread: boolean; inboxBucket: RecentSessionBucket } {
     if (status === 'waiting_approval') {
         return { unread: false, inboxBucket: 'needs_attention' };
@@ -140,75 +168,27 @@ function getUnreadState(
     if (status === 'generating' || status === 'starting') {
         return { unread: false, inboxBucket: 'working' };
     }
-    const unread = hasContentChange && lastUsedAt > lastSeenAt && lastRole !== 'user' && lastRole !== 'human';
+    const unread = completionMarker
+        ? completionMarker !== seenCompletionMarker
+        : hasContentChange && lastUsedAt > lastSeenAt && lastRole !== 'user' && lastRole !== 'human';
     return { unread, inboxBucket: unread ? 'task_complete' : 'idle' };
 }
 
-function buildRecentSessions(
-    sessions: ReturnType<typeof buildSessionEntries>,
+function buildRecentLaunches(
     recentActivity: ReturnType<typeof getRecentActivity>,
-    readState: Record<string, number>,
-): RecentSessionEntry[] {
-    const live = sessions
-        .filter((session) => !session.parentId && session.status !== 'stopped')
-        .map((session) => {
-            const kind = getSessionKind(session);
-            const recentKey = buildRecentActivityKey({
-                kind,
-                providerType: session.providerType,
-                workspace: session.workspace,
-            });
-            const lastSeenAt = readState[recentKey] || 0;
-            const lastUsedAt = getSessionLastUsedAt(session);
-            const { unread, inboxBucket } = getUnreadState(
-                getSessionMessageUpdatedAt(session) > 0,
-                session.status,
-                lastUsedAt,
-                lastSeenAt,
-                getLastMessageRole(session),
-            );
-            return {
-                id: session.id,
-                recentKey,
-                sessionId: session.id,
-                providerType: session.providerType,
-                providerName: session.providerName,
-                kind,
-                title: session.activeChat?.title || session.title || session.providerName,
-                workspace: session.workspace,
-                currentModel: session.currentModel,
-                status: session.status,
-                lastUsedAt,
-                unread,
-                lastSeenAt,
-                inboxBucket,
-            };
-        })
-    const seen = new Set(live.map((item) => `${item.kind}:${item.providerType}:${item.workspace || ''}`));
-    const persisted = recentActivity
-        .filter((item) => !seen.has(`${item.kind}:${item.providerType}:${item.workspace || ''}`))
-        .map((item) => {
-            const lastSeenAt = readState[item.id] || 0;
-            const unread = item.lastUsedAt > lastSeenAt;
-            return {
-                id: item.id,
-                recentKey: item.id,
-                sessionId: item.sessionId || null,
-                providerType: item.providerType,
-                providerName: item.providerName,
-                kind: item.kind,
-                title: item.title || item.providerName,
-                workspace: item.workspace,
-                currentModel: item.currentModel,
-                lastUsedAt: item.lastUsedAt,
-                unread,
-                lastSeenAt,
-                inboxBucket: unread ? 'task_complete' : 'idle' as RecentSessionBucket,
-            };
-        });
-
-    return [...live, ...persisted]
-        .sort((a, b) => b.lastUsedAt - a.lastUsedAt)
+): RecentLaunchEntry[] {
+    return recentActivity
+        .map((item) => ({
+            id: item.id,
+            providerType: item.providerType,
+            providerName: item.providerName,
+            kind: item.kind,
+            title: item.title || item.providerName,
+            workspace: item.workspace,
+            currentModel: item.currentModel,
+            lastLaunchedAt: item.lastUsedAt,
+        }))
+        .sort((a, b) => b.lastLaunchedAt - a.lastLaunchedAt)
         .slice(0, 12);
 }
 
@@ -221,27 +201,31 @@ export function buildStatusSnapshot(options: StatusSnapshotOptions): StatusSnaps
         options.allStates,
         options.cdpManagers as Map<string, any>,
     );
-    const readState = cfg.recentSessionReads || {};
     for (const session of sessions) {
-        const kind = getSessionKind(session);
-        const recentKey = buildRecentActivityKey({
-            kind,
-            providerType: session.providerType,
-            workspace: session.workspace,
-        });
-        const lastSeenAt = getRecentSessionSeenAt(cfg, recentKey);
+        const lastSeenAt = getSessionSeenAt(cfg, session.id);
+        const seenCompletionMarker = getSessionSeenMarker(cfg, session.id);
         const lastUsedAt = getSessionLastUsedAt(session);
-        const { unread, inboxBucket } = getUnreadState(
-            getSessionMessageUpdatedAt(session) > 0,
-            session.status,
-            lastUsedAt,
-            lastSeenAt,
-            getLastMessageRole(session),
-        );
-        session.recentKey = recentKey;
+        const completionMarker = getSessionCompletionMarker(session);
+        const { unread, inboxBucket } = session.surfaceHidden
+            ? { unread: false, inboxBucket: 'idle' as RecentSessionBucket }
+            : getUnreadState(
+                getSessionMessageUpdatedAt(session) > 0,
+                session.status,
+                lastUsedAt,
+                lastSeenAt,
+                getLastMessageRole(session),
+                completionMarker,
+                seenCompletionMarker,
+            );
         session.lastSeenAt = lastSeenAt;
         session.unread = unread;
         session.inboxBucket = inboxBucket;
+        if (READ_DEBUG_ENABLED && (session.unread || session.inboxBucket !== 'idle' || session.providerType.includes('codex'))) {
+            LOG.info(
+                'RecentRead',
+                `snapshot session id=${session.id} provider=${session.providerType} status=${String(session.status || '')} bucket=${inboxBucket} unread=${String(unread)} lastSeenAt=${lastSeenAt} completionMarker=${completionMarker || '-'} seenMarker=${seenCompletionMarker || '-'} lastUpdated=${String(session.lastUpdated || 0)} lastUsedAt=${lastUsedAt} lastRole=${getLastMessageRole(session)} msgUpdatedAt=${getSessionMessageUpdatedAt(session)}`,
+            );
+        }
     }
     const terminalBackend = getTerminalBackendRuntimeStatus();
 
@@ -269,8 +253,7 @@ export function buildStatusSnapshot(options: StatusSnapshotOptions): StatusSnaps
         workspaces: wsState.workspaces,
         defaultWorkspaceId: wsState.defaultWorkspaceId,
         defaultWorkspacePath: wsState.defaultWorkspacePath,
-        workspaceActivity: getWorkspaceActivity(cfg, 15),
-        recentSessions: buildRecentSessions(sessions, recentActivity, readState),
+        recentLaunches: buildRecentLaunches(recentActivity),
         terminalBackend,
         availableProviders: buildAvailableProviders(options.providerLoader),
     };

package/src/types.ts

@@ -4,7 +4,7 @@
  * Shared types referenced by daemon-core, daemon-standalone, and web-core.
  * When modifying this file, also update interface contracts in AGENT_PROTOCOL.md.
  */
-import type { StatusReportPayload } from './shared-types.js';
+import type { StatusReportPayload, AvailableProviderInfo } from './shared-types.js';
 
 // ── Daemon Status ──
 
@@ -18,7 +18,7 @@ export interface StatusResponse extends StatusReportPayload {
   /** User display name from config */
   userName?: string;
   /** Available providers */
-  availableProviders: ProviderInfo[];
+  availableProviders: AvailableProviderInfo[];
   /** System info (legacy compat) */
   system?: SystemInfo;
 }
@@ -111,12 +111,7 @@ export interface DetectedIde {
   running: boolean;
 }
 
-export interface ProviderInfo {
-  type: string;
-  icon: string;
-  displayName: string;
-  category: string;
-}
+export interface ProviderInfo extends AvailableProviderInfo {}
 
 
 /** Flattened agent entry from /api/v1/agents */