@adhdev/daemon-core 0.8.58 → 0.8.60

package/src/providers/provider-patch-state.ts

@@ -0,0 +1,91 @@
+import type { ProviderControlDef } from './contracts.js'
+import { extractProviderControlValues } from './control-effects.js'
+import { resolveProviderStateSummaryMetadata } from './summary-metadata.js'
+
+
+export type ProviderControlValue = string | number | boolean
+export type ProviderControlValueMap = Record<string, ProviderControlValue>
+
+function isControlValue(value: unknown): value is ProviderControlValue {
+  return typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean'
+}
+
+function asControlValueMap(value: unknown): ProviderControlValueMap | undefined {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return undefined
+
+  const result: ProviderControlValueMap = {}
+  for (const [entryKey, entryValue] of Object.entries(value as Record<string, unknown>)) {
+    if (isControlValue(entryValue)) result[entryKey] = entryValue
+  }
+
+  return Object.keys(result).length > 0 ? result : undefined
+}
+
+function getLegacyModelModeValues(data: any): ProviderControlValueMap | undefined {
+  if (!data || typeof data !== 'object') return undefined
+
+  const legacy: ProviderControlValueMap = {}
+  if (typeof data.model === 'string' && data.model.trim()) legacy.model = data.model.trim()
+  if (typeof data.mode === 'string' && data.mode.trim()) legacy.mode = data.mode.trim()
+
+  return Object.keys(legacy).length > 0 ? legacy : undefined
+}
+
+export function mergeProviderPatchState(params: {
+  providerControls?: ProviderControlDef[]
+  data: any
+  currentControlValues?: ProviderControlValueMap
+  currentSummaryMetadata?: unknown
+  mergeWithCurrent?: boolean
+}): {
+  controlValues: ProviderControlValueMap
+  summaryMetadata: unknown
+} {
+  const {
+    providerControls,
+    data,
+    currentControlValues,
+    currentSummaryMetadata,
+    mergeWithCurrent = true,
+  } = params
+
+  const sources = [
+    mergeWithCurrent ? asControlValueMap(currentControlValues) : undefined,
+    asControlValueMap(data?.controlValues),
+    asControlValueMap(extractProviderControlValues(providerControls, data)),
+    getLegacyModelModeValues(data),
+  ]
+
+  const controlValues = Object.assign({}, ...sources.filter(Boolean)) as ProviderControlValueMap
+  return {
+    controlValues,
+    summaryMetadata: data?.summaryMetadata !== undefined ? data.summaryMetadata : currentSummaryMetadata,
+  }
+}
+
+export function normalizeProviderStateControlValues(
+  controlValues: ProviderControlValueMap | undefined,
+): ProviderControlValueMap | undefined {
+  return controlValues && Object.keys(controlValues).length > 0 ? controlValues : undefined
+}
+
+export function resolveProviderStateSurface(params: {
+  controlValues?: ProviderControlValueMap
+  summaryMetadata?: unknown
+  modelLabel?: string | null
+  modeLabel?: string | null
+}): {
+  controlValues: ProviderControlValueMap | undefined
+  summaryMetadata: unknown
+} {
+  const controlValues = normalizeProviderStateControlValues(params.controlValues)
+  return {
+    controlValues,
+    summaryMetadata: resolveProviderStateSummaryMetadata({
+      summaryMetadata: params.summaryMetadata as any,
+      controlValues,
+      modelLabel: params.modelLabel,
+      modeLabel: params.modeLabel,
+    }),
+  }
+}

package/src/providers/summary-metadata.ts

@@ -0,0 +1,118 @@
+import type { ProviderSummaryItem, ProviderSummaryMetadata } from '../shared-types.js'
+
+function normalizeSummaryItem(item: ProviderSummaryItem | null | undefined): ProviderSummaryItem | null {
+  if (!item || typeof item !== 'object') return null
+
+  const id = String(item.id || '').trim()
+  const value = String(item.value || '').trim()
+  if (!id || !value) return null
+
+  const normalized: ProviderSummaryItem = {
+    id,
+    value,
+  }
+
+  if (typeof item.label === 'string' && item.label.trim()) normalized.label = item.label.trim()
+  if (typeof item.shortValue === 'string' && item.shortValue.trim()) normalized.shortValue = item.shortValue.trim()
+  if (typeof item.icon === 'string' && item.icon.trim()) normalized.icon = item.icon.trim()
+  if (typeof item.order === 'number' && Number.isFinite(item.order)) normalized.order = item.order
+
+  return normalized
+}
+
+export function normalizeProviderSummaryMetadata(
+  summary: ProviderSummaryMetadata | null | undefined,
+): ProviderSummaryMetadata | undefined {
+  if (!summary || !Array.isArray(summary.items)) return undefined
+
+  const items = summary.items
+    .map((item) => normalizeSummaryItem(item))
+    .filter((item): item is ProviderSummaryItem => !!item)
+    .sort((left, right) => {
+      const orderDiff = (left.order ?? Number.MAX_SAFE_INTEGER) - (right.order ?? Number.MAX_SAFE_INTEGER)
+      if (orderDiff !== 0) return orderDiff
+      return left.id.localeCompare(right.id)
+    })
+
+  return items.length > 0 ? { items } : undefined
+}
+
+export function buildProviderSummaryMetadata(
+  items: Array<ProviderSummaryItem | null | undefined>,
+): ProviderSummaryMetadata | undefined {
+  return normalizeProviderSummaryMetadata({ items: items.filter(Boolean) as ProviderSummaryItem[] })
+}
+
+export function getProviderSummaryItem(
+  summary: ProviderSummaryMetadata | null | undefined,
+  id: string,
+): ProviderSummaryItem | undefined {
+  const normalized = normalizeProviderSummaryMetadata(summary)
+  const targetId = String(id || '').trim()
+  if (!normalized || !targetId) return undefined
+  return normalized.items.find((item) => item.id === targetId)
+}
+
+export function getProviderSummaryValue(
+  summary: ProviderSummaryMetadata | null | undefined,
+  id: string,
+  options: { preferShortValue?: boolean } = {},
+): string | undefined {
+  const item = getProviderSummaryItem(summary, id)
+  if (!item) return undefined
+  if (options.preferShortValue) return item.shortValue || item.value
+  return item.value || item.shortValue
+}
+
+export function buildLegacyModelModeSummaryMetadata(params: {
+  model?: string | null
+  mode?: string | null
+  modelLabel?: string | null
+  modeLabel?: string | null
+}): ProviderSummaryMetadata | undefined {
+  return buildProviderSummaryMetadata([
+    params.model
+      ? {
+          id: 'model',
+          label: 'Model',
+          value: String(params.modelLabel || params.model).trim(),
+          shortValue: String(params.model).trim(),
+          order: 10,
+        }
+      : null,
+    params.mode
+      ? {
+          id: 'mode',
+          label: 'Mode',
+          value: String(params.modeLabel || params.mode).trim(),
+          shortValue: String(params.mode).trim(),
+          order: 20,
+        }
+      : null,
+  ])
+}
+
+export function resolveProviderStateSummaryMetadata(params: {
+  summaryMetadata?: ProviderSummaryMetadata | null
+  controlValues?: Record<string, string | number | boolean> | null
+  modelLabel?: string | null
+  modeLabel?: string | null
+}): ProviderSummaryMetadata | undefined {
+  const explicit = normalizeProviderSummaryMetadata(params.summaryMetadata)
+  if (explicit) return explicit
+
+  const model = typeof params.controlValues?.model === 'string' ? params.controlValues.model : undefined
+  const mode = typeof params.controlValues?.mode === 'string' ? params.controlValues.mode : undefined
+  return buildLegacyModelModeSummaryMetadata({
+    model,
+    mode,
+    modelLabel: params.modelLabel,
+    modeLabel: params.modeLabel,
+  })
+}
+
+export function normalizePersistedSummaryMetadata(params: {
+  summaryMetadata?: ProviderSummaryMetadata | null
+}): ProviderSummaryMetadata | undefined {
+  return normalizeProviderSummaryMetadata(params.summaryMetadata)
+}

package/src/shared-types.d.ts

@@ -52,6 +52,17 @@ export interface ReadChatSyncResult {
     totalMessages: number;
     lastMessageSignature: string;
 }
+export interface ProviderSummaryItem {
+    id: string;
+    value: string;
+    label?: string;
+    shortValue?: string;
+    icon?: string;
+    order?: number;
+}
+export interface ProviderSummaryMetadata {
+    items: ProviderSummaryItem[];
+}
 export type TransportTopic = 'session.chat_tail' | 'machine.runtime' | 'session_host.diagnostics' | 'session.modal' | 'daemon.metadata';
 export interface SessionChatTailSubscriptionParams extends ReadChatCursor {
     targetSessionId: string;
@@ -171,15 +182,12 @@ export interface SessionEntry {
     activeChat: _ActiveChatData | null;
     capabilities?: SessionCapability[];
     cdpConnected?: boolean;
-    currentModel?: string;
-    currentPlan?: string;
-    currentAutoApprove?: string;
-    acpConfigOptions?: AcpConfigOption[];
-    acpModes?: AcpMode[];
     /** Dynamic control current values (generic key-value) */
     controlValues?: Record<string, string | number | boolean>;
     /** Provider-declared controls schema (transmitted once, cached by frontend) */
     providerControls?: ProviderControlSchema[];
+    /** Flexible always-visible metadata for compact/live surfaces. */
+    summaryMetadata?: ProviderSummaryMetadata;
     errorMessage?: string;
     errorReason?: _ProviderErrorReason;
     lastUpdated?: number;
@@ -203,9 +211,7 @@ export interface CompactSessionEntry {
     title: string;
     workspace: string | null;
     cdpConnected?: boolean;
-    currentModel?: string;
-    currentPlan?: string;
-    currentAutoApprove?: string;
+    summaryMetadata?: ProviderSummaryMetadata;
 }
 /** Available provider information */
 export interface AvailableProviderInfo {
@@ -303,7 +309,7 @@ export interface RecentLaunchEntry {
     providerSessionId?: string;
     title?: string;
     workspace?: string | null;
-    currentModel?: string;
+    summaryMetadata?: ProviderSummaryMetadata;
     lastLaunchedAt: number;
 }
 /** Compact machine payload broadcast by UserSessionDO to cloud dashboards. */

package/src/shared-types.ts

@@ -88,6 +88,19 @@ export interface ReadChatSyncResult {
     lastMessageSignature: string;
 }
 
+export interface ProviderSummaryItem {
+    id: string;
+    value: string;
+    label?: string;
+    shortValue?: string;
+    icon?: string;
+    order?: number;
+}
+
+export interface ProviderSummaryMetadata {
+    items: ProviderSummaryItem[];
+}
+
 export interface SessionHostAttachedClient {
     clientId: string;
     type: string;
@@ -303,15 +316,12 @@ export interface SessionEntry {
     activeChat: _ActiveChatData | null;
     capabilities?: SessionCapability[];
     cdpConnected?: boolean;
-    currentModel?: string;
-    currentPlan?: string;
-    currentAutoApprove?: string;
-    acpConfigOptions?: AcpConfigOption[];
-    acpModes?: AcpMode[];
     /** Dynamic control current values (generic key-value) */
     controlValues?: Record<string, string | number | boolean>;
     /** Provider-declared controls schema (transmitted once, cached by frontend) */
     providerControls?: ProviderControlSchema[];
+    /** Flexible always-visible metadata for compact/live surfaces. */
+    summaryMetadata?: ProviderSummaryMetadata;
     errorMessage?: string;
     errorReason?: _ProviderErrorReason;
     lastMessagePreview?: string;
@@ -340,9 +350,7 @@ export interface CompactSessionEntry {
     title: string;
     workspace: string | null;
     cdpConnected?: boolean;
-    currentModel?: string;
-    currentPlan?: string;
-    currentAutoApprove?: string;
+    summaryMetadata?: ProviderSummaryMetadata;
 }
 
 export type VersionUpdateReason =
@@ -457,7 +465,7 @@ export interface RecentLaunchEntry {
     providerSessionId?: string;
     title?: string;
     workspace?: string | null;
-    currentModel?: string;
+    summaryMetadata?: ProviderSummaryMetadata;
     lastLaunchedAt: number;
 }
 

package/src/status/builders.ts

@@ -23,6 +23,8 @@ import {
     normalizeManagedStatus,
     type NormalizeActiveChatOptions,
 } from './normalize.js';
+import { normalizeProviderStateControlValues } from '../providers/provider-patch-state.js';
+import { normalizeProviderSummaryMetadata } from '../providers/summary-metadata.js';
 
 export type SessionEntryProfile = 'full' | 'live' | 'metadata';
 
@@ -159,6 +161,8 @@ function buildIdeWorkspaceSession(
 ): SessionEntry {
     const profile = options.profile || 'full';
     const activeChat = normalizeActiveChatData(state.activeChat, getActiveChatOptions(profile));
+    const summaryMetadata = normalizeProviderSummaryMetadata(state.summaryMetadata);
+    const controlValues = normalizeProviderStateControlValues(state.controlValues);
     const includeSessionMetadata = shouldIncludeSessionMetadata(profile);
     const includeSessionControls = shouldIncludeSessionControls(profile);
     const title = activeChat?.title || state.name;
@@ -175,13 +179,11 @@ function buildIdeWorkspaceSession(
         title,
         ...(includeSessionMetadata && { workspace: state.workspace || null }),
         activeChat,
+        ...(summaryMetadata && { summaryMetadata }),
         ...(includeSessionMetadata && { capabilities: IDE_SESSION_CAPABILITIES }),
         cdpConnected: state.cdpConnected ?? isCdpConnected(cdpManagers, state.type),
-        currentModel: state.currentModel,
-        currentPlan: state.currentPlan,
-        currentAutoApprove: state.currentAutoApprove,
         ...(includeSessionControls && {
-            controlValues: state.controlValues,
+            ...(controlValues && { controlValues }),
             providerControls: state.providerControls,
         }),
         errorMessage: state.errorMessage,
@@ -197,6 +199,8 @@ function buildExtensionAgentSession(
 ): SessionEntry {
     const profile = options.profile || 'full';
     const activeChat = normalizeActiveChatData(ext.activeChat, getActiveChatOptions(profile));
+    const summaryMetadata = normalizeProviderSummaryMetadata(ext.summaryMetadata);
+    const controlValues = normalizeProviderStateControlValues(ext.controlValues);
     const includeSessionMetadata = shouldIncludeSessionMetadata(profile);
     const includeSessionControls = shouldIncludeSessionControls(profile);
     return {
@@ -212,11 +216,10 @@ function buildExtensionAgentSession(
         title: activeChat?.title || ext.name,
         ...(includeSessionMetadata && { workspace: parent.workspace || null }),
         activeChat,
+        ...(summaryMetadata && { summaryMetadata }),
         ...(includeSessionMetadata && { capabilities: EXTENSION_SESSION_CAPABILITIES }),
-        currentModel: ext.currentModel,
-        currentPlan: ext.currentPlan,
         ...(includeSessionControls && {
-            controlValues: ext.controlValues,
+            ...(controlValues && { controlValues }),
             providerControls: ext.providerControls,
         }),
         errorMessage: ext.errorMessage,
@@ -228,6 +231,8 @@ function buildExtensionAgentSession(
 function buildCliSession(state: CliProviderState, options: SessionEntryBuildOptions): SessionEntry {
     const profile = options.profile || 'full';
     const activeChat = normalizeActiveChatData(state.activeChat, getActiveChatOptions(profile));
+    const summaryMetadata = normalizeProviderSummaryMetadata(state.summaryMetadata);
+    const controlValues = normalizeProviderStateControlValues(state.controlValues);
     const includeSessionMetadata = shouldIncludeSessionMetadata(profile);
     const includeRuntimeMetadata = shouldIncludeRuntimeMetadata(profile);
     const includeSessionControls = shouldIncludeSessionControls(profile);
@@ -254,11 +259,12 @@ function buildCliSession(state: CliProviderState, options: SessionEntryBuildOpti
         mode: state.mode,
         resume: state.resume,
         activeChat,
+        ...(summaryMetadata && { summaryMetadata }),
         ...(includeSessionMetadata && {
             capabilities: state.mode === 'terminal' ? PTY_SESSION_CAPABILITIES : CLI_CHAT_SESSION_CAPABILITIES,
         }),
         ...(includeSessionControls && {
-            controlValues: state.controlValues,
+            ...(controlValues && { controlValues }),
             providerControls: state.providerControls,
         }),
         errorMessage: state.errorMessage,
@@ -270,6 +276,8 @@ function buildCliSession(state: CliProviderState, options: SessionEntryBuildOpti
 function buildAcpSession(state: AcpProviderState, options: SessionEntryBuildOptions): SessionEntry {
     const profile = options.profile || 'full';
     const activeChat = normalizeActiveChatData(state.activeChat, getActiveChatOptions(profile));
+    const summaryMetadata = normalizeProviderSummaryMetadata(state.summaryMetadata);
+    const controlValues = normalizeProviderStateControlValues(state.controlValues);
     const includeSessionMetadata = shouldIncludeSessionMetadata(profile);
     const includeSessionControls = shouldIncludeSessionControls(profile);
     return {
@@ -285,13 +293,10 @@ function buildAcpSession(state: AcpProviderState, options: SessionEntryBuildOpti
         title: activeChat?.title || state.name,
         ...(includeSessionMetadata && { workspace: state.workspace || null }),
         activeChat,
+        ...(summaryMetadata && { summaryMetadata }),
         ...(includeSessionMetadata && { capabilities: ACP_SESSION_CAPABILITIES }),
-        currentModel: state.currentModel,
-        currentPlan: state.currentPlan,
         ...(includeSessionControls && {
-            acpConfigOptions: state.acpConfigOptions,
-            acpModes: state.acpModes,
-            controlValues: state.controlValues,
+            ...(controlValues && { controlValues }),
             providerControls: state.providerControls,
         }),
         errorMessage: state.errorMessage,

package/src/status/reporter.ts

@@ -224,7 +224,7 @@ export class DaemonStatusReporter {
         const ideSummary = ideStates.map((s) => {
             const msgs = s.activeChat?.messages?.length || 0;
             const exts = s.extensions.length;
-            return `${s.type}(${s.status},${msgs}msg,${exts}ext${s.currentModel ? ',model=' + s.currentModel : ''})`;
+            return `${s.type}(${s.status},${msgs}msg,${exts}ext)`;
         }).join(', ');
 
  // CLI summary
@@ -302,9 +302,7 @@ export class DaemonStatusReporter {
                 workspace: session.workspace ?? null,
                 title: session.title,
                 cdpConnected: session.cdpConnected,
-                currentModel: session.currentModel,
-                currentPlan: session.currentPlan,
-                currentAutoApprove: session.currentAutoApprove,
+                summaryMetadata: session.summaryMetadata,
             })),
             p2p: payload.p2p,
             timestamp: now,

package/src/status/snapshot.ts

@@ -64,6 +64,49 @@ export interface StatusSnapshotOptions {
 export type StatusSnapshot = StatusReportPayload;
 
 const READ_DEBUG_ENABLED = process.argv.includes('--dev') || process.env.ADHDEV_READ_DEBUG === '1';
+const recentReadDebugSignatureBySession = new Map<string, string>();
+
+export interface RecentReadDebugSnapshot {
+    sessionId: string;
+    providerType: string;
+    status: string;
+    inboxBucket: RecentSessionBucket;
+    unread: boolean;
+    lastSeenAt: number;
+    completionMarker: string;
+    seenCompletionMarker: string;
+    lastUpdated: number;
+    lastUsedAt: number;
+    lastRole: string;
+    messageUpdatedAt: number;
+}
+
+function buildRecentReadDebugSignature(snapshot: RecentReadDebugSnapshot): string {
+    return [
+        snapshot.providerType,
+        snapshot.status,
+        snapshot.inboxBucket,
+        snapshot.unread ? '1' : '0',
+        String(snapshot.lastSeenAt),
+        snapshot.completionMarker,
+        snapshot.seenCompletionMarker,
+        String(snapshot.lastUpdated),
+        String(snapshot.lastUsedAt),
+        snapshot.lastRole,
+        String(snapshot.messageUpdatedAt),
+    ].join('|');
+}
+
+export function shouldEmitRecentReadDebugLog(
+    cache: Map<string, string>,
+    snapshot: RecentReadDebugSnapshot,
+): boolean {
+    const nextSignature = buildRecentReadDebugSignature(snapshot);
+    const previousSignature = cache.get(snapshot.sessionId);
+    if (previousSignature === nextSignature) return false;
+    cache.set(snapshot.sessionId, nextSignature);
+    return true;
+}
 
 function buildDetectedIdeInfos(
     detectedIdes: StatusSnapshotOptions['detectedIdes'],
@@ -297,7 +340,7 @@ function buildRecentLaunches(
             providerSessionId: item.providerSessionId,
             title: item.title || item.providerName,
             workspace: item.workspace,
-            currentModel: item.currentModel,
+            summaryMetadata: item.summaryMetadata,
             lastLaunchedAt: item.lastUsedAt,
         }))
         .sort((a, b) => b.lastLaunchedAt - a.lastLaunchedAt)
@@ -345,9 +388,24 @@ export function buildStatusSnapshot(options: StatusSnapshotOptions): StatusSnaps
         session.unread = unread;
         session.inboxBucket = inboxBucket;
         if (READ_DEBUG_ENABLED && (session.unread || session.inboxBucket !== 'idle' || session.providerType.includes('codex'))) {
+            const recentReadSnapshot: RecentReadDebugSnapshot = {
+                sessionId: session.id,
+                providerType: session.providerType,
+                status: String(session.status || ''),
+                inboxBucket,
+                unread,
+                lastSeenAt,
+                completionMarker: completionMarker || '-',
+                seenCompletionMarker: seenCompletionMarker || '-',
+                lastUpdated: Number(session.lastUpdated || 0),
+                lastUsedAt,
+                lastRole: getLastMessageRole(sourceSession),
+                messageUpdatedAt: getSessionMessageUpdatedAt(sourceSession),
+            };
+            if (!shouldEmitRecentReadDebugLog(recentReadDebugSignatureBySession, recentReadSnapshot)) continue;
             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(sourceSession)} msgUpdatedAt=${getSessionMessageUpdatedAt(sourceSession)}`,
+                `snapshot session id=${recentReadSnapshot.sessionId} provider=${recentReadSnapshot.providerType} status=${recentReadSnapshot.status} bucket=${recentReadSnapshot.inboxBucket} unread=${String(recentReadSnapshot.unread)} lastSeenAt=${recentReadSnapshot.lastSeenAt} completionMarker=${recentReadSnapshot.completionMarker} seenMarker=${recentReadSnapshot.seenCompletionMarker} lastUpdated=${String(recentReadSnapshot.lastUpdated)} lastUsedAt=${recentReadSnapshot.lastUsedAt} lastRole=${recentReadSnapshot.lastRole} msgUpdatedAt=${recentReadSnapshot.messageUpdatedAt}`,
             );
         }
         const lastDisplayMessage = getLastDisplayMessage(sourceSession);