@beanx/cathygo-web-core 0.1.2 → 0.1.4

package/README.md

@@ -21,10 +21,16 @@ Host applications still own account routing, agent selection, transport setup,
 selected session id, lightweight session lists, and product-specific shell UI.
 They should not own a second session execution runtime.
 
+## Session Host Helpers (`@0.1.4`)
+
+- `buildSessionLoadedAction` / `conversationMessagesToChatMessages`
+- `createSessionEventRouter`
+- `selectCanSend`, `selectCanStop`, `selectActiveTurnId`, `selectSessionStatus`, `selectIsMutating`
+
 ## First vNext Deliverables
 
 - Keep the current single-session `ChatState` reducer exported.
-- Add `SessionViewState`, session event reducer, and current-session selectors.
+- Session host helpers and selectors (above).
 - Add reducer tests for interrupt, replay, stop, and optimistic reconciliation.
 - Prove the implementation in `cathygo-agent/web` before publishing
-  `@beanx/cathygo-web-core@0.2.0`.
+  npm bumps on the `0.1.x` line (`0.2.0` reserved for breaking renames).

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as react from 'react';
 import { Dispatch, RefObject } from 'react';
-import { AgentActivity, SessionRuntimeSnapshot, LearningTurnEvent, ConversationSummary, GatewayModelStatus } from '@beanx/cathygo-protocol';
+import { AgentActivity, SessionRuntimeSnapshot, LearningTurnEvent, ConversationSummary, GatewayModelStatus, ConversationDetail, ConversationMessage } from '@beanx/cathygo-protocol';
 
 type AgentIdentityStatus = {
     agent_id?: string | null;
@@ -73,6 +73,12 @@ type ChatAttachment = {
     width?: number | null;
     height?: number | null;
     created_at?: string | null;
+    thumbnail?: {
+        mime_type: string;
+        data_base64: string;
+        width?: number | null;
+        height?: number | null;
+    } | null;
 };
 type ChatMessagePart = {
     type: 'text';
@@ -88,6 +94,8 @@ type ChatMessage$1 = {
     content: string;
     parts?: ChatMessagePart[];
     turnId?: string;
+    clientInputId?: string;
+    clientTurnId?: string;
     status?: 'streaming' | 'done' | 'error';
 };
 type ChatState = {
@@ -143,6 +151,8 @@ type ChatAction = {
     id: string;
     content: string;
     parts?: ChatMessagePart[];
+    clientInputId?: string;
+    clientTurnId?: string;
 } | {
     type: 'session.input.accepted';
     sessionId: string;
@@ -384,4 +394,34 @@ declare function ChatView({ chat, draft, attachments, attachmentPolicy, composer
 
 declare function modelStatusText(model: GatewayModelStatus): string;
 
-export { AgentActivityTimeline, type AgentIdentityStatus, type AgentRunProgress, type AgentRunProgressPhase, type AgentRunThinking, CHAT_HOME_MODES, CathyGOChatApp, type CathyGOChatAppProps, type CathyGOChatScreen, type ChatAction, ChatAgentIdentity, type ChatAttachment, type ChatHomeMode, type ChatHomeModeId, ChatHomeView, ChatListView, type ChatMessage$1 as ChatMessage, type ChatMessagePart, ChatMessage as ChatMessageView, type ChatRole, type ChatRuntimeId, ChatRuntimeSelector, type ChatRuntimeSelectorProps, type ChatState, ChatTopBar, ChatTranscript, ChatView, type ComposerAttachmentPolicy, type ComposerFileLike, type ComposerFileRejection, type ComposerFileRejectionReason, type ComposerFileValidationResult, DEFAULT_CHAT_HOME_MODE_ID, DEFAULT_COMPOSER_ATTACHMENT_POLICY, IconBack, IconBrain, IconCalendar, IconChevronDown, IconChevronRight, IconClose, IconCloud, IconCode, IconDevice, IconDevices, IconDocument, IconExternalLink, IconGatewayConnecting, IconGatewayOffline, IconGatewayOnline, IconGithub, IconHome, IconImageUpload, IconInfo, IconLocalComputer, IconMessage, IconMore, IconNewChat, IconPencil, IconPlug, IconSearch, IconSend, IconSettings, IconShield, IconSmartphone, MathMarkdown, MessageComposer, type MessageComposerHandle, type PendingComposerAttachment, RunStatus, type RuntimeOption, ScrollToBottomButton, type UseCathyGOChatResult, agentDisplayName, agentShortId, buildRuntimeOptions, composerAcceptAttribute, findChatHomeMode, fixCommonLatexMistakes, formatBytes, initialChatState, modelStatusText, normalizeComposerAttachmentPolicy, normalizeMathDelimiters, prepareMathMarkdown, reduceChat, stripMathForPreview, useCathyGOChat, validateComposerFiles };
+type RunningTurnsBySession = Record<string, string>;
+declare function eventSessionId(event: LearningTurnEvent): string | undefined;
+declare function eventTurnId(event: LearningTurnEvent): string | undefined;
+declare function shouldApplyEventToRuntime(chat: ChatState | undefined, event: LearningTurnEvent): boolean;
+declare function shouldApplyEventToActiveSession(event: LearningTurnEvent, activeSessionId: string | undefined): boolean;
+declare function isChatStateMutating(chat: ChatState | undefined): boolean;
+declare function selectCanSend(chat: ChatState): boolean;
+declare function selectCanStop(chat: ChatState): boolean;
+declare function selectActiveTurnId(chat: ChatState): string | undefined;
+declare function selectSessionStatus(chat: ChatState): string;
+declare function selectIsMutating(chat: ChatState): boolean;
+declare function updateRunningTurnFromEvent(running: RunningTurnsBySession, event: LearningTurnEvent): RunningTurnsBySession;
+declare function createSessionEventRouter(options: {
+    getActiveSessionId: () => string | undefined;
+    getChat: () => ChatState;
+    dispatchChat: (action: {
+        type: 'event.received';
+        event: LearningTurnEvent;
+    }) => void;
+    onTerminalTurn?: (sessionId: string) => void;
+}): (event: LearningTurnEvent) => void;
+
+type SessionHydrationOptions = {
+    resolveAttachmentUrl?: (uri: string) => string;
+};
+declare function buildSessionLoadedAction(sessionId: string, detail: ConversationDetail, options?: SessionHydrationOptions): Extract<ChatAction, {
+    type: 'session.loaded';
+}>;
+declare function conversationMessagesToChatMessages(messages: ConversationMessage[], options?: SessionHydrationOptions): ChatMessage$1[];
+
+export { AgentActivityTimeline, type AgentIdentityStatus, type AgentRunProgress, type AgentRunProgressPhase, type AgentRunThinking, CHAT_HOME_MODES, CathyGOChatApp, type CathyGOChatAppProps, type CathyGOChatScreen, type ChatAction, ChatAgentIdentity, type ChatAttachment, type ChatHomeMode, type ChatHomeModeId, ChatHomeView, ChatListView, type ChatMessage$1 as ChatMessage, type ChatMessagePart, ChatMessage as ChatMessageView, type ChatRole, type ChatRuntimeId, ChatRuntimeSelector, type ChatRuntimeSelectorProps, type ChatState, ChatTopBar, ChatTranscript, ChatView, type ComposerAttachmentPolicy, type ComposerFileLike, type ComposerFileRejection, type ComposerFileRejectionReason, type ComposerFileValidationResult, DEFAULT_CHAT_HOME_MODE_ID, DEFAULT_COMPOSER_ATTACHMENT_POLICY, IconBack, IconBrain, IconCalendar, IconChevronDown, IconChevronRight, IconClose, IconCloud, IconCode, IconDevice, IconDevices, IconDocument, IconExternalLink, IconGatewayConnecting, IconGatewayOffline, IconGatewayOnline, IconGithub, IconHome, IconImageUpload, IconInfo, IconLocalComputer, IconMessage, IconMore, IconNewChat, IconPencil, IconPlug, IconSearch, IconSend, IconSettings, IconShield, IconSmartphone, MathMarkdown, MessageComposer, type MessageComposerHandle, type PendingComposerAttachment, RunStatus, type RunningTurnsBySession, type RuntimeOption, ScrollToBottomButton, type SessionHydrationOptions, type UseCathyGOChatResult, agentDisplayName, agentShortId, buildRuntimeOptions, buildSessionLoadedAction, composerAcceptAttribute, conversationMessagesToChatMessages, createSessionEventRouter, eventSessionId, eventTurnId, findChatHomeMode, fixCommonLatexMistakes, formatBytes, initialChatState, isChatStateMutating, modelStatusText, normalizeComposerAttachmentPolicy, normalizeMathDelimiters, prepareMathMarkdown, reduceChat, selectActiveTurnId, selectCanSend, selectCanStop, selectIsMutating, selectSessionStatus, shouldApplyEventToActiveSession, shouldApplyEventToRuntime, stripMathForPreview, updateRunningTurnFromEvent, useCathyGOChat, validateComposerFiles };

package/dist/index.js

@@ -1459,7 +1459,7 @@ function ChatMessage({ message }) {
               "img",
               {
                 alt: part.attachment.original_name ?? "Attached image",
-                src: part.attachment.uri
+                src: attachmentImageSrc(part.attachment)
               },
               part.attachment_id
             ) : null
@@ -1481,6 +1481,18 @@ function ChatMessage({ message }) {
     }
   );
 }
+function attachmentImageSrc(attachment) {
+  if (isRenderableUri(attachment.uri)) return attachment.uri;
+  const thumbnail = attachment.thumbnail;
+  if (thumbnail?.mime_type && thumbnail.data_base64) {
+    return `data:${thumbnail.mime_type};base64,${thumbnail.data_base64}`;
+  }
+  return attachment.uri;
+}
+function isRenderableUri(uri) {
+  if (!uri) return false;
+  return uri.startsWith("blob:") || uri.startsWith("data:") || uri.startsWith("http://") || uri.startsWith("https://");
+}
 
 // src/chat-ui/components/ScrollToBottomButton.tsx
 import { useEffect as useEffect3, useState as useState5 } from "react";
@@ -1877,11 +1889,12 @@ function reduceChat(state, action) {
   if (action.type === "session.loaded") {
     const runtime = action.runtime;
     const activeTurnId = optionalString(runtime?.active_turn_id);
+    const messages = reconcileLoadedMessages(state, action.sessionId, action.messages);
     return {
       ...state,
       sessionId: action.sessionId,
       activeTurnId,
-      messages: action.messages,
+      messages,
       activitiesByTurnId: groupActivitiesByTurn(action.activities ?? []),
       progressByTurnId: activeTurnId ? setProgress({}, runtimeProgressFromSnapshot(runtime, activeTurnId)) : {},
       runtime,
@@ -1911,6 +1924,8 @@ function reduceChat(state, action) {
           role: "user",
           content: action.content,
           parts: action.parts,
+          clientInputId: action.clientInputId,
+          clientTurnId: action.clientTurnId,
           status: "done"
         }
       ],
@@ -1933,10 +1948,15 @@ function reduceChat(state, action) {
     };
   }
   if (action.type === "session.input.accepted") {
+    const messages = attachClientIdsToPendingUser(state.messages, {
+      clientInputId: action.clientInputId,
+      clientTurnId: action.clientTurnId
+    });
     return {
       ...state,
       sessionId: action.sessionId,
       activeTurnId: action.turnId,
+      messages,
       runtime: {
         ...state.runtime ?? emptyRuntimeSnapshot(),
         status: "running",
@@ -1960,6 +1980,9 @@ function reduceChat(state, action) {
   }
   const event = action.event;
   const payload = event.payload;
+  if (isDuplicateEvent(state.runtime, event)) {
+    return state;
+  }
   const next = {
     ...state,
     eventCount: state.eventCount + 1,
@@ -2008,6 +2031,14 @@ function reduceChat(state, action) {
       status: "Stopping"
     };
   }
+  if (event.event === "user.message.created") {
+    const message = userMessageFromEvent(event);
+    if (!message) return next;
+    return {
+      ...next,
+      messages: dedupeMessages([...next.messages, message])
+    };
+  }
   if (event.event === "agent.progress.delta") {
     return {
       ...next,
@@ -2073,7 +2104,8 @@ function reduceChat(state, action) {
         next.messages,
         payload.message_id,
         finalMessage,
-        payload.turn_id
+        payload.turn_id,
+        optionalString(payload.persisted_message_id)
       )
     };
   }
@@ -2137,20 +2169,34 @@ function appendAssistantDelta(messages, messageId, delta, turnId) {
     } : message
   );
 }
-function finalizeAssistantMessage(messages, messageId, finalMessage, turnId) {
+function finalizeAssistantMessage(messages, messageId, finalMessage, turnId, persistedMessageId) {
   const id = String(messageId || "");
   const resolvedTurnId = optionalString(turnId);
+  const existingTurnAssistantIndex = resolvedTurnId ? messages.findIndex(
+    (message) => message.role === "assistant" && message.turnId === resolvedTurnId && message.status === "done" && Boolean(message.content)
+  ) : -1;
   if (!id && !finalMessage) {
     return messages.map(
       (message) => message.role === "assistant" && message.status === "streaming" ? { ...message, turnId: message.turnId ?? resolvedTurnId, status: "done" } : message
     );
   }
   const index = messages.findIndex((message) => message.id === id);
+  if (index === -1 && existingTurnAssistantIndex !== -1) {
+    return messages.map(
+      (message, itemIndex) => itemIndex === existingTurnAssistantIndex ? {
+        ...message,
+        id: persistedMessageId ?? (id || message.id),
+        content: finalMessage || message.content,
+        turnId: message.turnId ?? resolvedTurnId,
+        status: "done"
+      } : message
+    );
+  }
   if (index === -1 && finalMessage) {
     return [
       ...messages,
       {
-        id: id || `msg_done_${messages.length}`,
+        id: persistedMessageId ?? (id || `msg_done_${messages.length}`),
         role: "assistant",
         content: finalMessage,
         turnId: resolvedTurnId,
@@ -2161,12 +2207,212 @@ function finalizeAssistantMessage(messages, messageId, finalMessage, turnId) {
   return messages.map(
     (message, itemIndex) => itemIndex === index || message.role === "assistant" && message.status === "streaming" ? {
       ...message,
+      id: itemIndex === index && persistedMessageId && message.id === id ? persistedMessageId : message.id,
       content: message.content || finalMessage,
       turnId: message.turnId ?? resolvedTurnId,
       status: "done"
     } : message
   );
 }
+function reconcileLoadedMessages(state, sessionId, loadedMessages) {
+  if (state.sessionId !== sessionId || state.messages.length === 0) {
+    return dedupeMessages(loadedMessages);
+  }
+  const localMessagesByClientId = /* @__PURE__ */ new Map();
+  for (const message of state.messages) {
+    if (message.role !== "user") continue;
+    for (const key of messageClientKeys(message)) {
+      localMessagesByClientId.set(key, message);
+    }
+  }
+  const reconciled = loadedMessages.map((message) => {
+    if (message.role !== "user") return message;
+    const local = messageClientKeys(message).map((key) => localMessagesByClientId.get(key)).find((item) => Boolean(item));
+    if (!local) return message;
+    return mergeLoadedUserMessage(local, message);
+  });
+  const loadedClientKeys = new Set(reconciled.flatMap(messageClientKeys));
+  const pendingLocalMessages = state.messages.filter((message) => {
+    if (message.role !== "user" || message.status === "error") return false;
+    const keys = messageClientKeys(message);
+    return keys.length > 0 && keys.every((key) => !loadedClientKeys.has(key));
+  });
+  return dedupeMessages([...reconciled, ...pendingLocalMessages]);
+}
+function mergeLoadedUserMessage(local, loaded) {
+  return {
+    ...loaded,
+    content: loaded.content || local.content,
+    parts: mergeMessageParts(local.parts, loaded.parts),
+    clientInputId: loaded.clientInputId ?? local.clientInputId,
+    clientTurnId: loaded.clientTurnId ?? local.clientTurnId,
+    status: loaded.status ?? "done"
+  };
+}
+function mergeMessageParts(localParts, loadedParts) {
+  if (!loadedParts?.length) return localParts;
+  if (!localParts?.length) return loadedParts;
+  return loadedParts.map((part) => {
+    if (part.type !== "image") return part;
+    const local = localParts.find(
+      (item) => item.type === "image" && item.attachment_id === part.attachment_id
+    );
+    if (!local) return part;
+    if (isLocalAttachmentPreview(local.attachment.uri) && !isReachableAttachmentUri(part.attachment.uri)) {
+      return {
+        ...part,
+        attachment: {
+          ...part.attachment,
+          uri: local.attachment.uri
+        }
+      };
+    }
+    return part;
+  });
+}
+function userMessageFromEvent(event) {
+  const payload = event.payload;
+  const messageId = optionalString(payload.message_id);
+  if (!messageId) return void 0;
+  const metadata = plainRecord(payload.metadata);
+  return {
+    id: messageId,
+    role: "user",
+    content: optionalString(payload.message) ?? "",
+    parts: chatPartsFromPayload(payload.parts),
+    turnId: optionalString(payload.turn_id),
+    clientInputId: optionalString(payload.client_input_id) ?? metadataString(metadata, "client_input_id"),
+    clientTurnId: optionalString(payload.client_turn_id) ?? metadataString(metadata, "client_turn_id"),
+    status: "done"
+  };
+}
+function chatPartsFromPayload(parts) {
+  if (!Array.isArray(parts)) return void 0;
+  const normalized = parts.map((part) => {
+    const raw = plainRecord(part);
+    if (!raw) return void 0;
+    const type = optionalString(raw.type);
+    if (type === "text") {
+      const text = optionalString(raw.text);
+      return text ? { type: "text", text } : void 0;
+    }
+    if (type === "image") {
+      const attachmentId = optionalString(raw.attachment_id);
+      const attachment = chatAttachmentFromPayload(raw.attachment, attachmentId);
+      if (!attachmentId || !attachment) return void 0;
+      return {
+        type: "image",
+        attachment_id: attachmentId,
+        attachment
+      };
+    }
+    return void 0;
+  }).filter((part) => Boolean(part));
+  return normalized.length ? normalized : void 0;
+}
+function chatAttachmentFromPayload(value, attachmentId) {
+  const raw = plainRecord(value);
+  if (!raw && !attachmentId) return void 0;
+  return {
+    id: optionalString(raw?.id) ?? attachmentId ?? "",
+    kind: "image",
+    uri: optionalString(raw?.uri) ?? "",
+    original_name: optionalString(raw?.original_name) ?? null,
+    mime_type: optionalString(raw?.mime_type) ?? null,
+    size_bytes: optionalNumber(raw?.size_bytes),
+    sha256: optionalString(raw?.sha256) ?? null,
+    width: optionalNumber(raw?.width),
+    height: optionalNumber(raw?.height),
+    created_at: optionalString(raw?.created_at) ?? null,
+    thumbnail: thumbnailFromPayload(raw?.thumbnail)
+  };
+}
+function thumbnailFromPayload(value) {
+  const raw = plainRecord(value);
+  if (!raw) return null;
+  const mimeType = optionalString(raw.mime_type);
+  const dataBase64 = optionalString(raw.data_base64);
+  if (!mimeType || !dataBase64) return null;
+  return {
+    mime_type: mimeType,
+    data_base64: dataBase64,
+    width: optionalNumber(raw.width),
+    height: optionalNumber(raw.height)
+  };
+}
+function dedupeMessages(messages) {
+  const next = [];
+  for (const message of messages) {
+    const duplicateIndex = next.findIndex((item) => messagesMatch(item, message));
+    if (duplicateIndex === -1) {
+      next.push(message);
+      continue;
+    }
+    next[duplicateIndex] = mergeDuplicateMessage(next[duplicateIndex], message);
+  }
+  return next;
+}
+function messagesMatch(left, right) {
+  if (left.id === right.id) return true;
+  if (left.role !== right.role) return false;
+  if (left.role === "assistant" && left.turnId && left.turnId === right.turnId) return true;
+  const leftKeys = new Set(messageClientKeys(left));
+  return messageClientKeys(right).some((key) => leftKeys.has(key));
+}
+function mergeDuplicateMessage(base, update) {
+  const preferUpdate = base.id.startsWith("user_") && !update.id.startsWith("user_") || base.id.startsWith("msg_") && !update.id.startsWith("msg_") || update.status === "done";
+  const primary = preferUpdate ? update : base;
+  const secondary = preferUpdate ? base : update;
+  return {
+    ...primary,
+    content: primary.content || secondary.content,
+    parts: mergeMessageParts(secondary.parts, primary.parts),
+    turnId: primary.turnId ?? secondary.turnId,
+    clientInputId: primary.clientInputId ?? secondary.clientInputId,
+    clientTurnId: primary.clientTurnId ?? secondary.clientTurnId,
+    status: primary.status ?? secondary.status
+  };
+}
+function attachClientIdsToPendingUser(messages, ids) {
+  if (!ids.clientInputId && !ids.clientTurnId) return messages;
+  for (let index = messages.length - 1; index >= 0; index -= 1) {
+    const message = messages[index];
+    if (message.role !== "user") continue;
+    if (message.clientInputId || message.clientTurnId) return messages;
+    return messages.map(
+      (item, itemIndex) => itemIndex === index ? {
+        ...item,
+        clientInputId: ids.clientInputId,
+        clientTurnId: ids.clientTurnId
+      } : item
+    );
+  }
+  return messages;
+}
+function messageClientKeys(message) {
+  return [message.clientInputId, message.clientTurnId].map((value) => optionalString(value)).filter((value) => Boolean(value));
+}
+function metadataString(metadata, key) {
+  return optionalString(metadata?.[key]);
+}
+function isDuplicateEvent(runtime, event) {
+  if (!event.seq || event.seq <= 0) return false;
+  return event.seq <= (runtime?.last_event_seq ?? 0);
+}
+function plainRecord(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
+  return value;
+}
+function optionalNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : null;
+}
+function isLocalAttachmentPreview(uri) {
+  return Boolean(uri?.startsWith("blob:") || uri?.startsWith("data:"));
+}
+function isReachableAttachmentUri(uri) {
+  if (!uri) return false;
+  return uri.startsWith("blob:") || uri.startsWith("data:") || uri.startsWith("http://") || uri.startsWith("https://");
+}
 function isAgentActivityEvent(event) {
   return event.event.startsWith("agent.activity.");
 }
@@ -2554,6 +2800,131 @@ function RuntimeIcon({ kind }) {
   const className = "chat-runtime-icon";
   return kind === "cloud" ? /* @__PURE__ */ jsx15(IconCloud, { className }) : /* @__PURE__ */ jsx15(IconLocalComputer, { className });
 }
+
+// src/session-host/session-runtime.ts
+var TERMINAL_TURN_EVENTS = /* @__PURE__ */ new Set(["turn.completed", "turn.failed", "turn.cancelled"]);
+function eventSessionId(event) {
+  return optionalString2(event.payload.session_id);
+}
+function eventTurnId(event) {
+  return optionalString2(event.payload.turn_id);
+}
+function shouldApplyEventToRuntime(chat, event) {
+  const turnId = eventTurnId(event);
+  if (!turnId || event.event === "session.input.accepted") return true;
+  if (!isTurnScopedRuntimeEvent(event.event)) return true;
+  const activeTurnId = chat?.activeTurnId;
+  return !activeTurnId || activeTurnId === turnId;
+}
+function shouldApplyEventToActiveSession(event, activeSessionId) {
+  const sessionId = eventSessionId(event);
+  if (!sessionId) return false;
+  if (!activeSessionId) return false;
+  return sessionId === activeSessionId;
+}
+function isChatStateMutating(chat) {
+  if (!chat) return false;
+  return Boolean(chat.activeTurnId) || chat.status === "Sending" || chat.status === "Thinking" || chat.status === "Streaming" || chat.status === "Stopping";
+}
+function selectCanSend(chat) {
+  return chat.status !== "Loading" && chat.status !== "Disconnected" && chat.status !== "Error";
+}
+function selectCanStop(chat) {
+  return Boolean(chat.activeTurnId) || chat.status === "Thinking" || chat.status === "Streaming" || chat.status === "Stopping";
+}
+function selectActiveTurnId(chat) {
+  return chat.activeTurnId;
+}
+function selectSessionStatus(chat) {
+  return chat.status;
+}
+function selectIsMutating(chat) {
+  return isChatStateMutating(chat);
+}
+function updateRunningTurnFromEvent(running, event) {
+  const sessionId = eventSessionId(event);
+  const turnId = eventTurnId(event);
+  if (!sessionId || !turnId) return running;
+  if (TERMINAL_TURN_EVENTS.has(event.event)) {
+    if (!running[sessionId] || running[sessionId] === turnId) {
+      const next = { ...running };
+      delete next[sessionId];
+      return next;
+    }
+    return running;
+  }
+  if (event.event === "turn.started" || event.event === "assistant.delta") {
+    if (running[sessionId] === turnId) return running;
+    return { ...running, [sessionId]: turnId };
+  }
+  return running;
+}
+function createSessionEventRouter(options) {
+  return (event) => {
+    const sessionId = eventSessionId(event);
+    if (shouldApplyEventToActiveSession(event, options.getActiveSessionId()) && shouldApplyEventToRuntime(options.getChat(), event)) {
+      options.dispatchChat({ type: "event.received", event });
+    }
+    if (sessionId && TERMINAL_TURN_EVENTS.has(event.event)) {
+      options.onTerminalTurn?.(sessionId);
+    }
+  };
+}
+function isTurnScopedRuntimeEvent(event) {
+  return event === "turn.started" || event === "assistant.delta" || event === "assistant.completed" || event === "turn.completed" || event === "turn.cancelled" || event === "turn.failed" || event === "agent.activity.started" || event === "agent.activity.updated" || event === "agent.activity.completed" || event === "agent.progress.delta";
+}
+function optionalString2(value) {
+  if (value === void 0 || value === null) return void 0;
+  const text = String(value).trim();
+  return text || void 0;
+}
+
+// src/session-host/hydration.ts
+function buildSessionLoadedAction(sessionId, detail, options = {}) {
+  return {
+    type: "session.loaded",
+    sessionId,
+    messages: conversationMessagesToChatMessages(detail.messages, options),
+    activities: detail.activities ?? [],
+    runtime: detail.runtime ?? detail.session.runtime
+  };
+}
+function conversationMessagesToChatMessages(messages, options = {}) {
+  return messages.map((message) => ({
+    id: message.id,
+    role: message.role,
+    content: message.content,
+    parts: normalizeMessageParts(message.parts, options.resolveAttachmentUrl),
+    turnId: message.turn_id ?? void 0,
+    clientInputId: messageMetadataString(message.metadata, "client_input_id"),
+    clientTurnId: messageMetadataString(message.metadata, "client_turn_id"),
+    status: "done"
+  }));
+}
+function normalizeMessageParts(parts, resolveAttachmentUrl) {
+  const normalized = parts?.map((part) => {
+    if (part.type === "text" && part.text) {
+      return { type: "text", text: part.text };
+    }
+    if (part.type === "image" && part.attachment_id && part.attachment) {
+      const uri = part.attachment.uri;
+      return {
+        type: "image",
+        attachment_id: part.attachment_id,
+        attachment: {
+          ...part.attachment,
+          uri: uri && resolveAttachmentUrl ? resolveAttachmentUrl(uri) : uri
+        }
+      };
+    }
+    return void 0;
+  }).filter((part) => Boolean(part));
+  return normalized?.length ? normalized : void 0;
+}
+function messageMetadataString(metadata, key) {
+  const value = metadata?.[key];
+  return typeof value === "string" && value.trim() ? value.trim() : void 0;
+}
 export {
   AgentActivityTimeline,
   CHAT_HOME_MODES,
@@ -2605,17 +2976,31 @@ export {
   agentDisplayName,
   agentShortId,
   buildRuntimeOptions,
+  buildSessionLoadedAction,
   composerAcceptAttribute,
+  conversationMessagesToChatMessages,
+  createSessionEventRouter,
+  eventSessionId,
+  eventTurnId,
   findChatHomeMode,
   fixCommonLatexMistakes,
   formatBytes,
   initialChatState,
+  isChatStateMutating,
   modelStatusText,
   normalizeComposerAttachmentPolicy,
   normalizeMathDelimiters,
   prepareMathMarkdown,
   reduceChat,
+  selectActiveTurnId,
+  selectCanSend,
+  selectCanStop,
+  selectIsMutating,
+  selectSessionStatus,
+  shouldApplyEventToActiveSession,
+  shouldApplyEventToRuntime,
   stripMathForPreview,
+  updateRunningTurnFromEvent,
   useCathyGOChat,
   validateComposerFiles
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beanx/cathygo-web-core",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "type": "module",
   "files": [
     "dist"
@@ -16,7 +16,7 @@
     "./styles.css": "./dist/styles.css"
   },
   "dependencies": {
-    "@beanx/cathygo-protocol": "0.1.1",
+    "@beanx/cathygo-protocol": "0.1.5",
     "@streamdown/math": "^1.0.2",
     "katex": "^0.16.47",
     "streamdown": "^2.5.0"