@adhdev/daemon-core 0.8.71 → 0.8.73

package/dist/providers/provider-session-id.d.ts

@@ -0,0 +1,2 @@
+export declare function normalizeProviderSessionId(providerType: string | undefined, providerSessionId: string | null | undefined): string;
+export declare function isLegacyVolatileSessionReadKey(key: string | null | undefined): boolean;

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

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/session-host-core",
-  "version": "0.8.71",
+  "version": "0.8.73",
   "description": "ADHDev local session host core — 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.8.71",
+  "version": "0.8.73",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,6 +16,12 @@
       "import": "./dist/status/normalize.mjs",
       "require": "./dist/status/normalize.js",
       "default": "./dist/status/normalize.js"
+    },
+    "./chat/chat-signatures": {
+      "types": "./dist/chat/chat-signatures.d.ts",
+      "import": "./dist/chat/chat-signatures.mjs",
+      "require": "./dist/chat/chat-signatures.js",
+      "default": "./dist/chat/chat-signatures.js"
     }
   },
   "scripts": {

package/src/chat/chat-signatures.ts

@@ -0,0 +1,95 @@
+export interface ChatMessageSignatureInput {
+  id?: string | number | null
+  index?: number | null
+  role?: string | null
+  receivedAt?: string | number | null
+  timestamp?: string | number | null
+  content?: unknown
+}
+
+export interface ChatTailDeliverySignatureInput {
+  sessionId: string
+  historySessionId?: string
+  messages: unknown[]
+  status: string
+  title?: string
+  activeModal?: { message: string; buttons: string[] } | null
+  syncMode: string
+  replaceFrom: number
+  totalMessages: number
+  lastMessageSignature: string
+}
+
+export interface SessionModalDeliverySignatureInput {
+  sessionId: string
+  status: string
+  title?: string
+  modalMessage?: string
+  modalButtons?: string[]
+}
+
+export function hashSignatureParts(parts: string[]): string {
+  let hash = 0x811c9dc5
+  for (const part of parts) {
+    const text = String(part || '')
+    for (let i = 0; i < text.length; i += 1) {
+      hash ^= text.charCodeAt(i)
+      hash = Math.imul(hash, 0x01000193) >>> 0
+    }
+    hash ^= 0xff
+    hash = Math.imul(hash, 0x01000193) >>> 0
+  }
+  return hash.toString(16).padStart(8, '0')
+}
+
+function stringifySignatureContent(content: unknown): string {
+  try {
+    return JSON.stringify(content ?? '')
+  } catch {
+    return String(content ?? '')
+  }
+}
+
+function stringifySignatureMessages(messages: unknown[]): string {
+  try {
+    return JSON.stringify(messages)
+  } catch {
+    return String(messages.length)
+  }
+}
+
+export function buildChatMessageSignature(message: ChatMessageSignatureInput | null | undefined): string {
+  if (!message) return ''
+  return hashSignatureParts([
+    String(message.id || ''),
+    String(message.index ?? ''),
+    String(message.role || ''),
+    String(message.receivedAt ?? message.timestamp ?? ''),
+    stringifySignatureContent(message.content),
+  ])
+}
+
+export function buildChatTailDeliverySignature(payload: ChatTailDeliverySignatureInput): string {
+  return hashSignatureParts([
+    payload.sessionId,
+    payload.historySessionId || '',
+    payload.status,
+    payload.title || '',
+    payload.syncMode,
+    String(payload.replaceFrom),
+    String(payload.totalMessages),
+    payload.lastMessageSignature,
+    payload.activeModal ? `${payload.activeModal.message}|${payload.activeModal.buttons.join('\u001f')}` : '',
+    stringifySignatureMessages(payload.messages),
+  ])
+}
+
+export function buildSessionModalDeliverySignature(payload: SessionModalDeliverySignatureInput): string {
+  return hashSignatureParts([
+    payload.sessionId,
+    payload.status,
+    payload.title || '',
+    payload.modalMessage || '',
+    Array.isArray(payload.modalButtons) ? payload.modalButtons.join('\u001f') : '',
+  ])
+}

package/src/chat/subscription-updates.ts

@@ -0,0 +1,222 @@
+import type {
+  ReadChatCursor,
+  ReadChatSyncMode,
+  ReadChatSyncResult,
+  SessionChatTailUpdate,
+  SessionModalUpdate,
+} from '../shared-types.js'
+import {
+  buildChatTailDeliverySignature,
+  buildSessionModalDeliverySignature,
+} from './chat-signatures.js'
+
+export interface ChatTailSubscriptionCursor {
+  knownMessageCount: number
+  lastMessageSignature: string
+  tailLimit: number
+}
+
+export type SessionChatTailCommandResult = Partial<Omit<ReadChatSyncResult, 'activeModal'>> & {
+  success?: boolean
+  activeModal?: unknown
+}
+
+export interface PrepareSessionChatTailUpdateInput {
+  key: string
+  sessionId: string
+  historySessionId?: string
+  seq: number
+  timestamp: number
+  interactionId?: string
+  cursor: ChatTailSubscriptionCursor
+  lastDeliveredSignature: string
+  result: SessionChatTailCommandResult | null | undefined
+}
+
+export interface PreparedSessionChatTailUpdate {
+  cursor: ChatTailSubscriptionCursor
+  seq: number
+  lastDeliveredSignature: string
+  update: SessionChatTailUpdate | null
+}
+
+export interface PrepareSessionModalUpdateInput {
+  key: string
+  sessionId: string
+  status: string
+  title?: string
+  activeModal?: unknown
+  seq: number
+  timestamp: number
+  interactionId?: string
+  lastDeliveredSignature: string
+}
+
+export interface PreparedSessionModalUpdate {
+  seq: number
+  lastDeliveredSignature: string
+  update: SessionModalUpdate | null
+}
+
+function normalizeSyncMode(syncMode: string | undefined): ReadChatSyncMode {
+  return syncMode === 'append'
+    || syncMode === 'replace_tail'
+    || syncMode === 'noop'
+    || syncMode === 'full'
+    ? syncMode
+    : 'full'
+}
+
+function normalizeModalButtons(value: unknown): string[] {
+  return Array.isArray(value)
+    ? value.filter((button): button is string => typeof button === 'string')
+    : []
+}
+
+function normalizeModalMessage(value: unknown): string | undefined {
+  return typeof value === 'string' ? value : undefined
+}
+
+export function normalizeChatTailActiveModal(activeModal: unknown): { message: string; buttons: string[] } | null {
+  if (!activeModal || typeof activeModal !== 'object') return null
+  const message = normalizeModalMessage((activeModal as { message?: unknown }).message)
+  if (!message) return null
+  const rawButtons = (activeModal as { buttons?: unknown }).buttons
+  if (!Array.isArray(rawButtons)) return null
+  return {
+    message,
+    buttons: normalizeModalButtons(rawButtons),
+  }
+}
+
+export function normalizeSessionModalFields(activeModal: unknown): { modalMessage?: string; modalButtons: string[] } {
+  if (!activeModal || typeof activeModal !== 'object') {
+    return { modalButtons: [] }
+  }
+
+  return {
+    modalMessage: normalizeModalMessage((activeModal as { message?: unknown }).message),
+    modalButtons: normalizeModalButtons((activeModal as { buttons?: unknown }).buttons),
+  }
+}
+
+function buildNextChatCursor(
+  cursor: ChatTailSubscriptionCursor,
+  result: SessionChatTailCommandResult,
+): ChatTailSubscriptionCursor {
+  return {
+    knownMessageCount: Math.max(0, Number(result.totalMessages || cursor.knownMessageCount)),
+    lastMessageSignature: typeof result.lastMessageSignature === 'string'
+      ? result.lastMessageSignature
+      : cursor.lastMessageSignature,
+    tailLimit: cursor.tailLimit,
+  }
+}
+
+export function prepareSessionChatTailUpdate(
+  input: PrepareSessionChatTailUpdateInput,
+): PreparedSessionChatTailUpdate {
+  const result = input.result
+  if (!result?.success || result.syncMode === 'noop') {
+    return {
+      cursor: result?.success ? buildNextChatCursor(input.cursor, result) : input.cursor,
+      seq: input.seq,
+      lastDeliveredSignature: input.lastDeliveredSignature,
+      update: null,
+    }
+  }
+
+  const syncMode = normalizeSyncMode(result.syncMode)
+  const cursor = {
+    knownMessageCount: Math.max(0, Number(result.totalMessages || 0)),
+    lastMessageSignature: typeof result.lastMessageSignature === 'string' ? result.lastMessageSignature : '',
+    tailLimit: input.cursor.tailLimit,
+  }
+  const title = typeof result.title === 'string' ? result.title : undefined
+  const activeModal = normalizeChatTailActiveModal(result.activeModal)
+  const status = typeof result.status === 'string' ? result.status : 'idle'
+  const deliverySignature = buildChatTailDeliverySignature({
+    sessionId: input.sessionId,
+    ...(input.historySessionId ? { historySessionId: input.historySessionId } : {}),
+    messages: Array.isArray(result.messages) ? result.messages : [],
+    status,
+    ...(title ? { title } : {}),
+    ...(activeModal ? { activeModal } : {}),
+    syncMode,
+    replaceFrom: Number(result.replaceFrom || 0),
+    totalMessages: Number(result.totalMessages || 0),
+    lastMessageSignature: typeof result.lastMessageSignature === 'string' ? result.lastMessageSignature : '',
+  })
+  const seq = input.seq + 1
+
+  if (deliverySignature === input.lastDeliveredSignature) {
+    return {
+      cursor,
+      seq,
+      lastDeliveredSignature: input.lastDeliveredSignature,
+      update: null,
+    }
+  }
+
+  return {
+    cursor,
+    seq,
+    lastDeliveredSignature: deliverySignature,
+    update: {
+      topic: 'session.chat_tail',
+      key: input.key,
+      sessionId: input.sessionId,
+      ...(input.historySessionId ? { historySessionId: input.historySessionId } : {}),
+      ...(input.interactionId ? { interactionId: input.interactionId } : {}),
+      seq,
+      timestamp: input.timestamp,
+      messages: Array.isArray(result.messages) ? result.messages : [],
+      status,
+      ...(title ? { title } : {}),
+      ...(activeModal ? { activeModal } : {}),
+      syncMode,
+      replaceFrom: Number(result.replaceFrom || 0),
+      totalMessages: Number(result.totalMessages || 0),
+      lastMessageSignature: typeof result.lastMessageSignature === 'string' ? result.lastMessageSignature : '',
+    },
+  }
+}
+
+export function prepareSessionModalUpdate(
+  input: PrepareSessionModalUpdateInput,
+): PreparedSessionModalUpdate {
+  const { modalMessage, modalButtons } = normalizeSessionModalFields(input.activeModal)
+  const deliverySignature = buildSessionModalDeliverySignature({
+    sessionId: input.sessionId,
+    status: input.status,
+    ...(input.title ? { title: input.title } : {}),
+    ...(modalMessage ? { modalMessage } : {}),
+    ...(modalButtons.length > 0 ? { modalButtons } : {}),
+  })
+
+  if (deliverySignature === input.lastDeliveredSignature) {
+    return {
+      seq: input.seq,
+      lastDeliveredSignature: input.lastDeliveredSignature,
+      update: null,
+    }
+  }
+
+  const seq = input.seq + 1
+  return {
+    seq,
+    lastDeliveredSignature: deliverySignature,
+    update: {
+      topic: 'session.modal',
+      key: input.key,
+      sessionId: input.sessionId,
+      status: input.status,
+      ...(input.title ? { title: input.title } : {}),
+      ...(modalMessage ? { modalMessage } : {}),
+      ...(modalButtons.length > 0 ? { modalButtons } : {}),
+      ...(input.interactionId ? { interactionId: input.interactionId } : {}),
+      seq,
+      timestamp: input.timestamp,
+    },
+  }
+}

package/src/commands/chat-commands.ts

@@ -12,6 +12,7 @@ import type { ProviderInstance } from '../providers/provider-instance.js';
 import { readChatHistory } from '../config/chat-history.js';
 import { LOG } from '../logging/logger.js';
 import { recordDebugTrace } from '../logging/debug-trace.js';
+import { buildChatMessageSignature } from '../chat/chat-signatures.js';
 import type { ChatMessage } from '../types.js';
 import type { ReadChatCursor, ReadChatSyncMode, SessionTransport } from '../shared-types.js';
 import { normalizeChatMessages } from '../providers/chat-message-normalization.js';
@@ -19,20 +20,6 @@ import { normalizeChatMessages } from '../providers/chat-message-normalization.j
 const RECENT_SEND_WINDOW_MS = 1200;
 const recentSendByTarget = new Map<string, number>();
 
-function hashSignatureParts(parts: string[]): string {
-    let hash = 0x811c9dc5;
-    for (const part of parts) {
-        const text = String(part || '');
-        for (let i = 0; i < text.length; i += 1) {
-            hash ^= text.charCodeAt(i);
-            hash = Math.imul(hash, 0x01000193) >>> 0;
-        }
-        hash ^= 0xff;
-        hash = Math.imul(hash, 0x01000193) >>> 0;
-    }
-    return hash.toString(16).padStart(8, '0');
-}
-
 interface ApprovalSelectableInstance extends ProviderInstance {
     recordApprovalSelection?(buttonText: string): void;
 }
@@ -171,20 +158,7 @@ function parseMaybeJson(value: any): any {
 }
 
 function getChatMessageSignature(message: ChatMessage | null | undefined): string {
-    if (!message) return '';
-    let content = '';
-    try {
-        content = JSON.stringify(message.content ?? '');
-    } catch {
-        content = String(message.content ?? '');
-    }
-    return hashSignatureParts([
-        String(message.id || ''),
-        String(message.index ?? ''),
-        String(message.role || ''),
-        String(message.receivedAt ?? message.timestamp ?? ''),
-        content,
-    ]);
+    return buildChatMessageSignature(message);
 }
 
 function normalizeReadChatCursor(args: any): Required<ReadChatCursor> {

package/src/commands/handler.ts

@@ -24,6 +24,7 @@ import { ChatHistoryWriter } from '../config/chat-history.js';
 import type { SessionRegistry, SessionRuntimeTarget } from '../sessions/registry.js';
 import { reconcileIdeRuntimeSessions } from '../sessions/reconcile.js';
 import { LOG } from '../logging/logger.js';
+import { resolveLegacyProviderScript, type LegacyStringScript } from './provider-script-resolver.js';
 
 // Sub-module imports
 import * as Chat from './chat-commands.js';
@@ -68,8 +69,6 @@ export interface CommandHelpers {
     readonly historyWriter: ChatHistoryWriter;
 }
 
-type LegacyStringScript = (params?: Record<string, unknown> | string) => string;
-
 const COMMAND_DEBUG_LEVELS = new Set([
     'pty_input',
     'pty_resize',
@@ -220,32 +219,7 @@ export class DaemonCommandHandler implements CommandHelpers {
         if (provider?.scripts) {
             const fn = provider.scripts[scriptName];
             if (typeof fn === 'function') {
-                const callScript = fn as LegacyStringScript;
-                if (params && Object.keys(params).length > 0) {
-                    const firstVal = Object.values(params)[0];
-                    if (scriptName === 'sendMessage' && typeof firstVal === 'string') {
-                        const legacyScript = callScript(firstVal);
-                        if (legacyScript) return legacyScript;
-                    }
-                    const script = callScript(params);
-                    if (script) {
-                        const likelyLegacyObjectLeak =
-                            typeof script === 'string'
-                            && script.includes('[object Object]')
-                            && typeof firstVal === 'string';
-                        if (!likelyLegacyObjectLeak) return script;
-                    }
-
-                    if (firstVal !== undefined) {
-                        const legacyScript = callScript(firstVal);
-                        if (legacyScript) return legacyScript;
-                    }
-
-                    if (script) return script;
-                } else {
-                    const script = callScript();
-                    if (script) return script;
-                }
+                return resolveLegacyProviderScript(fn as LegacyStringScript, scriptName, params);
             }
         }
         return null;

package/src/commands/provider-script-resolver.ts

@@ -0,0 +1,40 @@
+export type LegacyStringScript = (params?: Record<string, unknown> | string) => string | null | undefined
+
+export function resolveLegacyProviderScript(
+  fn: LegacyStringScript | null | undefined,
+  scriptName: string,
+  params?: Record<string, unknown> | string,
+): string | null {
+  if (typeof fn !== 'function') return null
+
+  if (params && typeof params === 'object' && !Array.isArray(params) && Object.keys(params).length > 0) {
+    const firstVal = Object.values(params)[0]
+
+    if (scriptName === 'sendMessage' && typeof firstVal === 'string') {
+      const legacyScript = fn(firstVal)
+      if (legacyScript) return legacyScript
+    }
+
+    const script = fn(params)
+    const likelyLegacyObjectLeak =
+      typeof script === 'string'
+      && script.includes('[object Object]')
+      && typeof firstVal === 'string'
+    if (!likelyLegacyObjectLeak && script) return script
+
+    if (firstVal !== undefined) {
+      const legacyScript = fn(firstVal as string)
+      if (legacyScript) return legacyScript
+    }
+
+    if (script) return script
+    return null
+  }
+
+  if (params !== undefined) {
+    const script = fn(params)
+    if (script) return script
+  }
+
+  return fn() || null
+}

package/src/config/state-store.ts

@@ -12,6 +12,7 @@ import { join } from 'path';
 import { getConfigDir } from './config.js';
 import type { RecentActivityEntry } from './recent-activity.js';
 import type { SavedProviderSessionEntry } from './saved-sessions.js';
+import { isLegacyVolatileSessionReadKey, normalizeProviderSessionId } from '../providers/provider-session-id.js';
 
 export interface DaemonState {
     /** Unified recent activity across IDE / CLI / ACP launch flows */
@@ -42,18 +43,38 @@ function getStatePath(): string {
 function normalizeState(raw: unknown): DaemonState {
     const parsed = isPlainObject(raw) ? raw : {};
 
+    const recentActivity = (Array.isArray(parsed.recentActivity) ? parsed.recentActivity : [])
+        .filter((entry): entry is RecentActivityEntry => {
+            if (!isPlainObject(entry)) return false;
+            const normalizedId = normalizeProviderSessionId(
+                typeof entry.providerType === 'string' ? entry.providerType : '',
+                typeof entry.providerSessionId === 'string' ? entry.providerSessionId : '',
+            );
+            if (typeof entry.providerSessionId === 'string' && !normalizedId) return false;
+            return true;
+        });
+
+    const savedProviderSessions = (Array.isArray(parsed.savedProviderSessions) ? parsed.savedProviderSessions : [])
+        .filter((entry): entry is SavedProviderSessionEntry => {
+            if (!isPlainObject(entry)) return false;
+            return !!normalizeProviderSessionId(
+                typeof entry.providerType === 'string' ? entry.providerType : '',
+                typeof entry.providerSessionId === 'string' ? entry.providerSessionId : '',
+            );
+        });
+
     const sessionReads = Object.fromEntries(
         Object.entries(isPlainObject(parsed.sessionReads) ? parsed.sessionReads : {})
-            .filter(([, value]) => typeof value === 'number' && Number.isFinite(value as number))
+            .filter(([key, value]) => !isLegacyVolatileSessionReadKey(key) && typeof value === 'number' && Number.isFinite(value as number))
     );
     const sessionReadMarkers = Object.fromEntries(
         Object.entries(isPlainObject(parsed.sessionReadMarkers) ? parsed.sessionReadMarkers : {})
-            .filter(([, value]) => typeof value === 'string')
+            .filter(([key, value]) => !isLegacyVolatileSessionReadKey(key) && typeof value === 'string')
     );
 
     return {
-        recentActivity: Array.isArray(parsed.recentActivity) ? parsed.recentActivity as RecentActivityEntry[] : [],
-        savedProviderSessions: Array.isArray(parsed.savedProviderSessions) ? parsed.savedProviderSessions as SavedProviderSessionEntry[] : [],
+        recentActivity,
+        savedProviderSessions,
         sessionReads,
         sessionReadMarkers,
     };

package/src/daemon/dev-server.ts

@@ -33,6 +33,7 @@ import { VersionArchive, detectAllVersions } from '../providers/version-archive.
 import { LOG } from '../logging/logger.js';
 import { findCdpManager } from '../status/builders.js';
 import { handleCdpEvaluate, handleCdpClick, handleCdpDomQuery, handleScreenshot, handleScriptsRun, handleTypeAndSend, handleTypeAndSendAt, handleScriptHints, handleCdpTargets, handleDomInspect, handleDomChildren, handleDomAnalyze, handleFindCommon, handleFindByText, handleDomContext } from './dev-cdp-handlers.js';
+import { resolveLegacyProviderScript, type LegacyStringScript } from '../commands/provider-script-resolver.js';
 import { handleCliStatus, handleCliLaunch, handleCliSend, handleCliStop, handleCliDebug, handleCliTrace, handleCliExercise, handleCliFixtureCapture, handleCliFixtureList, handleCliFixtureReplay, handleCliResolve, handleCliRaw, handleCliSSE } from './dev-cli-debug.js';
 import { handleAutoImplement, handleAutoImplCancel, handleAutoImplSSE } from './dev-auto-implement.js';
 
@@ -386,7 +387,8 @@ export class DevServer implements DevServerContext {
 
   public async handleRunScript(type: string, req: http.IncomingMessage, res: http.ServerResponse, parsedBody?: any): Promise<void> {
     const body = parsedBody || await this.readBody(req);
-    const { script: scriptName, params, ideType: scriptIdeType } = body;
+    const { script: scriptName, params, args, ideType: scriptIdeType } = body;
+    const rawParams = args !== undefined ? args : params;
 
     const provider = this.providerLoader.resolve(type);
     if (!provider) {
@@ -407,18 +409,7 @@ export class DevServer implements DevServerContext {
     }
 
     try {
-      // Emulate production CommandHandler behavior
-      let scriptCode: string | null = null;
-      if (['sendMessage', 'webviewSendMessage', 'switchSession', 'webviewSwitchSession', 'setMode', 'webviewSetMode', 'setModel', 'webviewSetModel'].includes(scriptName)) {
-        // Production daemon's getProviderScript always unpacks the object and sends the first value
-        const firstVal = params && typeof params === 'object' && Object.keys(params).length > 0 
-            ? Object.values(params)[0] 
-            : params;
-        scriptCode = firstVal !== undefined ? fn(firstVal) : fn();
-      } else {
-        // Scripts like resolveAction are passed the raw parameters object in production
-        scriptCode = params !== undefined ? fn(params) : fn();
-      }
+      const scriptCode = resolveLegacyProviderScript(fn as LegacyStringScript, scriptName, rawParams);
       if (!scriptCode) {
         this.json(res, 500, { error: 'Script function returned null' });
         return;
@@ -429,12 +420,23 @@ export class DevServer implements DevServerContext {
       const isWebviewScript = scriptName.toLowerCase().includes('webview');
       let raw: any;
       if (provider.category === 'extension' && !isWebviewScript) {
-        // Extension scripts: prefer session frame (agent webview) — matching agent-stream poller behavior
+        // Extension scripts: prefer the requested agent webview session.
         const sessions = cdp.getAgentSessions();
         let sessionId: string | null = null;
         for (const [sid, target] of sessions) {
           if (target.agentType === type) { sessionId = sid; break; }
         }
+        if (!sessionId) {
+          try {
+            const discovered = await cdp.discoverAgentWebviews();
+            const target = discovered.find((entry) => entry.agentType === type);
+            if (target) {
+              sessionId = await cdp.attachToAgent(target);
+            }
+          } catch (error) {
+            this.log(`Extension attach fallback failed for ${type}: ${(error as Error)?.message || String(error)}`);
+          }
+        }
         if (sessionId) {
           raw = await cdp.evaluateInSessionFrame(sessionId, scriptCode);
         } else if (cdp.evaluateInWebviewFrame) {

package/src/index.ts

@@ -188,6 +188,31 @@ export { DEFAULT_DAEMON_PORT, DAEMON_WS_PATH } from './ipc-protocol.js';
 
 // ── Chat History ──
 export { readChatHistory } from './config/chat-history.js';
+export {
+  hashSignatureParts,
+  buildChatMessageSignature,
+  buildChatTailDeliverySignature,
+  buildSessionModalDeliverySignature,
+} from './chat/chat-signatures.js';
+export type {
+  ChatMessageSignatureInput,
+  ChatTailDeliverySignatureInput,
+  SessionModalDeliverySignatureInput,
+} from './chat/chat-signatures.js';
+export {
+  normalizeChatTailActiveModal,
+  normalizeSessionModalFields,
+  prepareSessionChatTailUpdate,
+  prepareSessionModalUpdate,
+} from './chat/subscription-updates.js';
+export type {
+  ChatTailSubscriptionCursor,
+  PrepareSessionChatTailUpdateInput,
+  PreparedSessionChatTailUpdate,
+  PrepareSessionModalUpdateInput,
+  PreparedSessionModalUpdate,
+  SessionChatTailCommandResult,
+} from './chat/subscription-updates.js';
 
 // ── Agent Stream ──
 export { DaemonAgentStreamManager } from './agent-stream/index.js';

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

@@ -24,6 +24,7 @@ import { buildPersistedProviderEffectMessage, normalizeProviderEffects } from '.
 import { formatAutoApprovalMessage, pickApprovalButton } from './approval-utils.js';
 import { getCliScriptCommand, parseCliScriptResult } from './cli-script-results.js';
 import { mergeProviderPatchState, resolveProviderStateSurface } from './provider-patch-state.js';
+import { normalizeProviderSessionId } from './provider-session-id.js';
 import { buildChatMessage, buildRuntimeSystemChatMessage, normalizeChatMessages } from './chat-message-normalization.js';
 
 let CachedDatabaseSync: (new (path: string, options?: { readOnly?: boolean }) => {
@@ -304,9 +305,10 @@ export class CliProviderInstance implements ProviderInstance {
         const parsedStatus = this.adapter.getScriptParsedStatus?.() || null;
         const autoApproveActive = adapterStatus.status === 'waiting_approval' && this.shouldAutoApprove();
         const visibleStatus = autoApproveActive ? 'generating' : adapterStatus.status;
-        const parsedProviderSessionId = typeof parsedStatus?.providerSessionId === 'string'
-            ? parsedStatus.providerSessionId.trim()
-            : '';
+        const parsedProviderSessionId = normalizeProviderSessionId(
+            this.type,
+            typeof parsedStatus?.providerSessionId === 'string' ? parsedStatus.providerSessionId : '',
+        );
         if (parsedProviderSessionId) {
             this.promoteProviderSessionId(parsedProviderSessionId);
         }
@@ -598,9 +600,10 @@ export class CliProviderInstance implements ProviderInstance {
     private applyProviderResponse(data: any, options: { phase: 'immediate' | 'turn_completed' }): void {
         if (!data || typeof data !== 'object') return;
 
-        const patchedProviderSessionId = typeof data.providerSessionId === 'string'
-            ? data.providerSessionId.trim()
-            : '';
+        const patchedProviderSessionId = normalizeProviderSessionId(
+            this.type,
+            typeof data.providerSessionId === 'string' ? data.providerSessionId : '',
+        );
         if (patchedProviderSessionId) {
             this.promoteProviderSessionId(patchedProviderSessionId);
         }