@adhdev/daemon-core 0.9.8 → 0.9.10

package/dist/providers/contracts.d.ts

@@ -8,6 +8,7 @@
  */
 import type { ProviderSummaryMetadata } from '../shared-types.js';
 import type { ChatMessageKind } from './chat-message-normalization.js';
+export type ReadChatTurnStatus = 'open' | 'waiting_approval' | 'complete' | 'error';
 export interface ReadChatResult {
     messages: ChatMessage[];
     status: AgentStatus;
@@ -15,6 +16,9 @@ export interface ReadChatResult {
     /** IDE/Extension only: session info */
     id?: string;
     title?: string;
+    /** Authoritative transcript turn identity when available. */
+    currentTurnId?: string;
+    turnStatus?: ReadChatTurnStatus;
     /** Extension only: additional metadata */
     agentType?: string;
     agentName?: string;

package/dist/providers/index.d.ts

@@ -2,4 +2,4 @@
  * Provider System — Public API
  */
 export { ProviderLoader } from './provider-loader.js';
-export type { ProviderModule, ProviderCategory, ProviderScripts, ResolvedProvider, ReadChatResult, ChatMessage, AgentStatus, ModalInfo, SendMessageResult, ListSessionsResult, SessionInfo, SwitchSessionResult, } from './contracts.js';
+export type { ProviderModule, ProviderCategory, ProviderScripts, ResolvedProvider, ReadChatResult, ReadChatTurnStatus, ChatMessage, AgentStatus, ModalInfo, SendMessageResult, ListSessionsResult, SessionInfo, SwitchSessionResult, } from './contracts.js';

package/dist/types.d.ts

@@ -20,12 +20,19 @@ export interface StatusResponse extends StatusReportPayload {
     /** System info (legacy compat) */
     system?: SystemInfo;
 }
+export type ChatBubbleState = 'draft' | 'streaming' | 'final' | 'removed';
 export interface ChatMessage {
     role: string;
     /** Plain text (legacy) or canonical message parts */
     content: string | MessagePart[];
     kind?: ChatMessageKind;
     id?: string;
+    /** Stable daemon-owned bubble identity when available. */
+    bubbleId?: string;
+    /** Stable provider-local unit identity used to reconcile legacy providers during migration. */
+    providerUnitKey?: string;
+    /** Bubble lifecycle state for transcript-authority migration. */
+    bubbleState?: ChatBubbleState;
     index?: number;
     timestamp?: number;
     receivedAt?: number;

package/node_modules/@adhdev/session-host-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/session-host-core",
-  "version": "0.9.8",
+  "version": "0.9.10",
   "description": "ADHDev local session host core \u2014 session registry, protocol, buffers",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.8",
+  "version": "0.9.10",
   "description": "ADHDev daemon core \u2014 CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

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

@@ -350,7 +350,7 @@ export class ProviderCliAdapter implements CliAdapter {
     private readonly sendDelayMs: number;
     private readonly sendKey: string;
     private readonly submitStrategy: 'wait_for_echo' | 'immediate';
-    private static readonly SCRIPT_STATUS_DEBOUNCE_MS = 1000;
+    private static readonly SCRIPT_STATUS_DEBOUNCE_MS = 3000;
 
     constructor(
         provider: CliProviderModule,

package/src/commands/chat-commands.ts

@@ -18,6 +18,7 @@ import type { ReadChatCursor, ReadChatSyncMode, SessionTransport } from '../shar
 import { normalizeChatMessages } from '../providers/chat-message-normalization.js';
 
 const RECENT_SEND_WINDOW_MS = 1200;
+export const READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS = 25_000;
 const recentSendByTarget = new Map<string, number>();
 
 interface ApprovalSelectableInstance extends ProviderInstance {
@@ -400,7 +401,7 @@ function didProviderConfirmSend(result: any): boolean {
 
 async function readExtensionChatState(h: CommandHelpers): Promise<any | null> {
     try {
-        const evalResult = await h.evaluateProviderScript('readChat', undefined, 50000);
+        const evalResult = await h.evaluateProviderScript('readChat', undefined, READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS);
         if (!evalResult?.result) return null;
         const parsed = parseMaybeJson(evalResult.result);
         return parsed && typeof parsed === 'object' ? parsed : null;
@@ -513,7 +514,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                 ? parsedRecord.providerSessionId
                 : undefined;
             if (status) {
-                LOG.info('Command', `[read_chat] cli-like resolved provider=${adapter.cliType} target=${String(args?.targetSessionId || '')} adapterStatus=${String(adapterStatus.status || '')} parsedStatus=${String(parsedRecord?.status || '')} shouldPreferAdapterMessages=${String(shouldPreferAdapterMessages)} adapterMsgCount=${Array.isArray(adapterStatus.messages) ? adapterStatus.messages.length : 0} parsedMsgCount=${Array.isArray(parsedRecord?.messages) ? parsedRecord.messages.length : 0} returnedMsgCount=${Array.isArray((status as any).messages) ? (status as any).messages.length : 0}`);
+                LOG.debug('Command', `[read_chat] cli-like resolved provider=${adapter.cliType} target=${String(args?.targetSessionId || '')} adapterStatus=${String(adapterStatus.status || '')} parsedStatus=${String(parsedRecord?.status || '')} shouldPreferAdapterMessages=${String(shouldPreferAdapterMessages)} adapterMsgCount=${Array.isArray(adapterStatus.messages) ? adapterStatus.messages.length : 0} parsedMsgCount=${Array.isArray(parsedRecord?.messages) ? parsedRecord.messages.length : 0} returnedMsgCount=${Array.isArray((status as any).messages) ? (status as any).messages.length : 0}`);
                 return buildReadChatCommandResult({
                     messages: (status as any).messages || [],
                     status: status.status,
@@ -540,7 +541,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
     // Extension transport: evaluateInSession
     if (isExtensionTransport(transport)) {
         try {
-            const evalResult = await h.evaluateProviderScript('readChat', undefined, 50000);
+            const evalResult = await h.evaluateProviderScript('readChat', undefined, READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS);
             if (evalResult?.result) {
                 let parsed = evalResult.result;
                 if (typeof parsed === 'string') { try { parsed = JSON.parse(parsed); } catch { } }
@@ -643,7 +644,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
     const script = h.getProviderScript('readChat') || h.getProviderScript('read_chat');
     if (script) {
         try {
-            const evalResult = await h.evaluateProviderScript('readChat', undefined, 50000);
+            const evalResult = await h.evaluateProviderScript('readChat', undefined, READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS);
             if (evalResult?.result) {
                 let parsed: any = evalResult.result;
                 if (typeof parsed === 'string') { try { parsed = JSON.parse(parsed); } catch { } }

package/src/index.d.ts

@@ -3,7 +3,7 @@
  *
  * Core logic for daemon: CDP, Provider, IDE detection, CLI/ACP adapters and more.
  */
-export type { ChatMessage, ExtensionInfo, CommandResult as CoreCommandResult, ProviderConfig, DaemonEvent, StatusResponse, SystemInfo, DetectedIde, ProviderInfo, AgentEntry, } from './types.js';
+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';
 import type { RuntimeWriteOwner as _RuntimeWriteOwner } from './shared-types-extra.js';
 import type { RuntimeAttachedClient as _RuntimeAttachedClient } from './shared-types-extra.js';
@@ -65,7 +65,7 @@ export { ProviderInstanceManager } from './providers/provider-instance-manager.j
 export { IdeProviderInstance } from './providers/ide-provider-instance.js';
 export { CliProviderInstance } from './providers/cli-provider-instance.js';
 export { AcpProviderInstance } from './providers/acp-provider-instance.js';
-export type { ProviderModule, CdpTargetFilter, ProviderResumeCapability } from './providers/contracts.js';
+export type { ProviderModule, CdpTargetFilter, ProviderResumeCapability, ReadChatTurnStatus } from './providers/contracts.js';
 export { VersionArchive, detectAllVersions } from './providers/version-archive.js';
 export type { ProviderVersionInfo, VersionHistory } from './providers/version-archive.js';
 export { DevServer } from './daemon/dev-server.js';

package/src/index.ts

@@ -6,6 +6,7 @@
 
 // ── Types ──
 export type {
+  ChatBubbleState,
   ChatMessage,
   ExtensionInfo,
   CommandResult as CoreCommandResult,
@@ -251,7 +252,7 @@ export { ProviderInstanceManager } from './providers/provider-instance-manager.j
 export { IdeProviderInstance } from './providers/ide-provider-instance.js';
 export { CliProviderInstance } from './providers/cli-provider-instance.js';
 export { AcpProviderInstance } from './providers/acp-provider-instance.js';
-export type { ProviderModule, CdpTargetFilter, ProviderResumeCapability, InputEnvelope, InputPart, MessagePart, ControlListResult, ControlSetResult, ControlInvokeResult } from './providers/contracts.js';
+export type { ProviderModule, CdpTargetFilter, ProviderResumeCapability, InputEnvelope, InputPart, MessagePart, ReadChatTurnStatus, ControlListResult, ControlSetResult, ControlInvokeResult } from './providers/contracts.js';
 export type { ProviderSourceConfigSnapshot, ProviderSourceConfigUpdate } from './config/provider-source-config.js';
 export { parseProviderSourceConfigUpdate } from './config/provider-source-config.js';
 export { normalizeInputEnvelope, normalizeMessageParts, flattenMessageParts } from './providers/io-contracts.js';

package/src/providers/cli-provider-instance.ts

@@ -576,7 +576,7 @@ export class CliProviderInstance implements ProviderInstance {
                 }
 
                 if (!this.generatingStartedAt) this.generatingStartedAt = now;
-                // Defer the generating_started event — if idle comes back within 1s,
+                // Defer the generating_started event — if idle comes back within 3s,
                 // the whole started→completed pair was a false positive from PTY noise
                 if (this.generatingDebounceTimer) clearTimeout(this.generatingDebounceTimer);
                 this.generatingDebouncePending = { chatTitle, timestamp: now };
@@ -586,7 +586,7 @@ export class CliProviderInstance implements ProviderInstance {
                         this.generatingDebouncePending = null;
                     }
                     this.generatingDebounceTimer = null;
-                }, 1000);
+                }, 3000);
             } else if (newStatus === 'waiting_approval') {
                 this.suppressIdleHistoryReplay = false;
                 // Flush pending generating_started if debounce still pending
@@ -626,7 +626,7 @@ export class CliProviderInstance implements ProviderInstance {
                     this.generatingDebouncePending = null;
                     this.generatingStartedAt = 0;
                 } else {
-                    // Debounce completed — wait 2s, if still idle then emit
+                    // Debounce completed — wait 3s, if still idle then emit
                     if (this.completedDebounceTimer) clearTimeout(this.completedDebounceTimer);
                     this.completedDebouncePending = { chatTitle, duration, timestamp: now };
                     this.completedDebounceTimer = setTimeout(() => {
@@ -637,7 +637,7 @@ export class CliProviderInstance implements ProviderInstance {
                             this.generatingStartedAt = 0;
                         }
                         this.completedDebounceTimer = null;
-                    }, 2000);
+                    }, 3000);
                 }
             } else if (newStatus === 'stopped') {
                 // Cancel any pending debounce

package/src/providers/contracts.d.ts

@@ -7,6 +7,7 @@
  * - User custom providers use the same contracts
  */
 import type { ProviderSummaryMetadata } from '../shared-types.js';
+export type ReadChatTurnStatus = 'open' | 'waiting_approval' | 'complete' | 'error';
 export interface ReadChatResult {
     messages: ChatMessage[];
     status: AgentStatus;
@@ -14,6 +15,9 @@ export interface ReadChatResult {
     /** IDE/Extension only: session info */
     id?: string;
     title?: string;
+    /** Authoritative transcript turn identity when available. */
+    currentTurnId?: string;
+    turnStatus?: ReadChatTurnStatus;
     /** Extension only: additional metadata */
     agentType?: string;
     agentName?: string;

package/src/providers/contracts.ts

@@ -12,6 +12,8 @@
 import type { ProviderSummaryMetadata } from '../shared-types.js';
 import type { ChatMessageKind } from './chat-message-normalization.js';
 
+export type ReadChatTurnStatus = 'open' | 'waiting_approval' | 'complete' | 'error';
+
 export interface ReadChatResult {
   messages: ChatMessage[];
   status: AgentStatus;
@@ -19,6 +21,9 @@ export interface ReadChatResult {
  /** IDE/Extension only: session info */
   id?: string;
   title?: string;
+  /** Authoritative transcript turn identity when available. */
+  currentTurnId?: string;
+  turnStatus?: ReadChatTurnStatus;
  /** Extension only: additional metadata */
   agentType?: string;
   agentName?: string;

package/src/providers/index.ts

@@ -8,6 +8,7 @@ export type {
   ProviderScripts,
   ResolvedProvider,
   ReadChatResult,
+  ReadChatTurnStatus,
   ChatMessage,
   AgentStatus,
   ModalInfo,

package/src/providers/read-chat-contract.ts

@@ -1,12 +1,15 @@
 import type { MessagePart, ModalInfo, ReadChatResult } from './contracts.js'
 import { normalizeMessageParts } from './contracts.js'
-import type { ChatMessage } from '../types.js'
+import type { ChatBubbleState, ChatMessage } from '../types.js'
 
 const VALID_STATUSES = ['idle', 'generating', 'waiting_approval', 'error', 'panel_hidden', 'streaming', 'long_generating'] as const
 const VALID_ROLES = ['user', 'assistant', 'system', 'human'] as const
+const VALID_BUBBLE_STATES = ['draft', 'streaming', 'final', 'removed'] as const
+const VALID_TURN_STATUSES = ['open', 'waiting_approval', 'complete', 'error'] as const
 
 type ValidStatus = typeof VALID_STATUSES[number]
 type ValidRole = typeof VALID_ROLES[number]
+type ValidTurnStatus = typeof VALID_TURN_STATUSES[number]
 
 function isPlainObject(value: unknown): value is Record<string, unknown> {
   return !!value && typeof value === 'object' && !Array.isArray(value)
@@ -30,6 +33,20 @@ function validateRole(role: unknown, source: string, index: number): ValidRole {
   return role as ValidRole
 }
 
+function validateBubbleState(state: unknown, source: string, index: number): ChatBubbleState {
+  if (typeof state !== 'string' || !VALID_BUBBLE_STATES.includes(state as ChatBubbleState)) {
+    throw new Error(`${source}: messages[${index}].bubbleState must be one of ${VALID_BUBBLE_STATES.join(', ')}`)
+  }
+  return state as ChatBubbleState
+}
+
+function validateTurnStatus(turnStatus: unknown, source: string): ValidTurnStatus {
+  if (typeof turnStatus !== 'string' || !VALID_TURN_STATUSES.includes(turnStatus as ValidTurnStatus)) {
+    throw new Error(`${source}: turnStatus must be one of ${VALID_TURN_STATUSES.join(', ')}`)
+  }
+  return turnStatus as ValidTurnStatus
+}
+
 function validateMessageContent(content: unknown, source: string, index: number): string | MessagePart[] {
   if (typeof content === 'string') return content
   if (Array.isArray(content)) return normalizeMessageParts(content as any)
@@ -48,6 +65,9 @@ function validateMessage(message: unknown, source: string, index: number): ChatM
 
   if (typeof message.kind === 'string') normalized.kind = message.kind as any
   if (typeof message.id === 'string') normalized.id = message.id
+  if (typeof message.bubbleId === 'string') normalized.bubbleId = message.bubbleId
+  if (typeof message.providerUnitKey === 'string') normalized.providerUnitKey = message.providerUnitKey
+  if (message.bubbleState !== undefined) normalized.bubbleState = validateBubbleState(message.bubbleState, source, index)
   if (isFiniteNumber(message.index)) normalized.index = message.index
   if (isFiniteNumber(message.timestamp)) normalized.timestamp = message.timestamp
   if (isFiniteNumber(message.receivedAt)) normalized.receivedAt = message.receivedAt
@@ -122,6 +142,8 @@ export function validateReadChatResultPayload(raw: unknown, source = 'read_chat'
   if (activeModal !== undefined) normalized.activeModal = activeModal
   if (typeof raw.id === 'string') normalized.id = raw.id
   if (typeof raw.title === 'string') normalized.title = raw.title
+  if (typeof raw.currentTurnId === 'string') normalized.currentTurnId = raw.currentTurnId
+  if (raw.turnStatus !== undefined) normalized.turnStatus = validateTurnStatus(raw.turnStatus, source)
   if (typeof raw.agentType === 'string') normalized.agentType = raw.agentType
   if (typeof raw.agentName === 'string') normalized.agentName = raw.agentName
   if (typeof raw.extensionId === 'string') normalized.extensionId = raw.extensionId

package/src/types.d.ts

@@ -19,12 +19,19 @@ export interface StatusResponse extends StatusReportPayload {
     /** System info (legacy compat) */
     system?: SystemInfo;
 }
+export type ChatBubbleState = 'draft' | 'streaming' | 'final' | 'removed';
 export interface ChatMessage {
     role: string;
     /** Plain text (legacy) or rich content blocks (ACP standard) */
     content: string | ContentBlock[];
     kind?: string;
     id?: string;
+    /** Stable daemon-owned bubble identity when available. */
+    bubbleId?: string;
+    /** Stable provider-local unit identity used to reconcile legacy providers during migration. */
+    providerUnitKey?: string;
+    /** Bubble lifecycle state for transcript-authority migration. */
+    bubbleState?: ChatBubbleState;
     index?: number;
     timestamp?: number;
     receivedAt?: number;

package/src/types.ts

@@ -26,12 +26,20 @@ export interface StatusResponse extends StatusReportPayload {
 
 // ── Chat Message ──
 
+export type ChatBubbleState = 'draft' | 'streaming' | 'final' | 'removed';
+
 export interface ChatMessage {
   role: string;       // 'user' | 'assistant' | 'system' | 'human'
   /** Plain text (legacy) or canonical message parts */
   content: string | MessagePart[];
   kind?: ChatMessageKind;      // built-ins: standard | thought | tool | terminal | system; custom kinds allowed
   id?: string;
+  /** Stable daemon-owned bubble identity when available. */
+  bubbleId?: string;
+  /** Stable provider-local unit identity used to reconcile legacy providers during migration. */
+  providerUnitKey?: string;
+  /** Bubble lifecycle state for transcript-authority migration. */
+  bubbleState?: ChatBubbleState;
   index?: number;
   timestamp?: number;
   receivedAt?: number;