@beanx/cathygo-web-core 0.1.1 → 0.1.2

package/README.md

@@ -0,0 +1,30 @@
+# @beanx/cathygo-web-core
+
+Shared CathyGO Web UI and state package.
+
+Current active upgrade plan:
+
+- [`../../docs/session-runtime-vnext-upgrade-plan.md`](../../docs/session-runtime-vnext-upgrade-plan.md)
+
+## vNext Role
+
+This package owns the selected-session view model for:
+
+- single-session transcript rendering
+- session event reduction
+- optimistic user input reconciliation by `client_input_id`
+- session-scoped stop state
+- replay-safe hydration after refresh or reconnect
+- selectors used by local Web and `beanx-home`
+
+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.
+
+## First vNext Deliverables
+
+- Keep the current single-session `ChatState` reducer exported.
+- Add `SessionViewState`, session event reducer, and current-session selectors.
+- 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`.

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as react from 'react';
 import { Dispatch, RefObject } from 'react';
-import { AgentActivity, LearningTurnEvent, ConversationSummary, GatewayModelStatus } from '@beanx/cathygo-protocol';
+import { AgentActivity, SessionRuntimeSnapshot, LearningTurnEvent, ConversationSummary, GatewayModelStatus } from '@beanx/cathygo-protocol';
 
 type AgentIdentityStatus = {
     agent_id?: string | null;
@@ -96,6 +96,7 @@ type ChatState = {
     messages: ChatMessage$1[];
     activitiesByTurnId: Record<string, AgentActivity[]>;
     progressByTurnId: Record<string, AgentRunProgress>;
+    runtime?: SessionRuntimeSnapshot;
     status: string;
     contextMessageCount?: number;
     error?: string;
@@ -131,6 +132,7 @@ type ChatAction = {
     sessionId: string;
     messages: ChatMessage$1[];
     activities?: AgentActivity[];
+    runtime?: SessionRuntimeSnapshot;
 } | {
     type: 'session.load.failed';
     sessionId: string;
@@ -142,9 +144,12 @@ type ChatAction = {
     content: string;
     parts?: ChatMessagePart[];
 } | {
-    type: 'turn.accepted';
+    type: 'session.input.accepted';
     sessionId: string;
     turnId: string;
+    clientInputId?: string;
+    clientTurnId?: string;
+    idempotentReplay?: boolean;
 } | {
     type: 'send.failed';
     id: string;
@@ -204,7 +209,7 @@ type UseCathyGOChatResult = {
     dispatchChat: Dispatch<ChatAction>;
     resetChat: () => void;
     createSession: (sessionId: string) => void;
-    loadSession: (sessionId: string, messages: ChatMessage$1[], activities?: ChatState['activitiesByTurnId'][string]) => void;
+    loadSession: (sessionId: string, messages: ChatMessage$1[], activities?: ChatState['activitiesByTurnId'][string], runtime?: SessionRuntimeSnapshot) => void;
     applyTurnEvent: (event: LearningTurnEvent) => void;
 };
 declare function useCathyGOChat(initialState?: ChatState): UseCathyGOChatResult;

package/dist/index.js

@@ -1668,7 +1668,7 @@ function ChatView({
   onSettingsOpen
 }) {
   const loadingSession = chat.status === "Loading";
-  const busy = Boolean(chat.activeTurnId) || Boolean(externalBusy) || loadingSession;
+  const busy = Boolean(externalBusy) || loadingSession;
   const ready = Boolean(chat.sessionId) && !loadingSession;
   const usingMock = model?.provider === "mock";
   const modelLabel = model ? model.model || model.display_name || model.provider : "loading model status";
@@ -1715,7 +1715,7 @@ function ChatView({
           activitiesByTurnId: chat.activitiesByTurnId,
           progressByTurnId: chat.progressByTurnId,
           messages: chat.messages,
-          onSuggest: ready && !busy ? onSuggest : void 0
+          onSuggest: ready && !busy && !chat.activeTurnId ? onSuggest : void 0
         }
       ),
       !loadingSession && chat.status === "Error" && chat.error ? /* @__PURE__ */ jsx13("p", { className: "chat-session-error", children: chat.error }) : null,
@@ -1875,14 +1875,17 @@ function reduceChat(state, action) {
     };
   }
   if (action.type === "session.loaded") {
+    const runtime = action.runtime;
+    const activeTurnId = optionalString(runtime?.active_turn_id);
     return {
       ...state,
       sessionId: action.sessionId,
-      activeTurnId: void 0,
+      activeTurnId,
       messages: action.messages,
       activitiesByTurnId: groupActivitiesByTurn(action.activities ?? []),
-      progressByTurnId: {},
-      status: "Ready",
+      progressByTurnId: activeTurnId ? setProgress({}, runtimeProgressFromSnapshot(runtime, activeTurnId)) : {},
+      runtime,
+      status: statusFromRuntime(runtime),
       error: void 0,
       errorCode: void 0
     };
@@ -1929,11 +1932,19 @@ function reduceChat(state, action) {
       errorCode: action.code
     };
   }
-  if (action.type === "turn.accepted") {
+  if (action.type === "session.input.accepted") {
     return {
       ...state,
       sessionId: action.sessionId,
       activeTurnId: action.turnId,
+      runtime: {
+        ...state.runtime ?? emptyRuntimeSnapshot(),
+        status: "running",
+        active_turn_id: action.turnId,
+        active_turn_ids: [action.turnId],
+        active_client_input_id: action.clientInputId ?? null,
+        active_client_turn_id: action.clientTurnId ?? null
+      },
       progressByTurnId: setProgress(state.progressByTurnId, {
         turnId: action.turnId,
         phase: "queued",
@@ -1953,8 +1964,50 @@ function reduceChat(state, action) {
     ...state,
     eventCount: state.eventCount + 1,
     sessionId: payload.session_id ?? state.sessionId,
-    activeTurnId: payload.turn_id ?? state.activeTurnId
+    activeTurnId: payload.turn_id ?? state.activeTurnId,
+    runtime: runtimeFromEvent(state.runtime, event)
   };
+  if (event.event === "session.created") {
+    return {
+      ...next,
+      status: "Ready",
+      error: void 0,
+      errorCode: void 0
+    };
+  }
+  if (event.event === "session.deleted") {
+    return {
+      ...next,
+      activeTurnId: void 0,
+      progressByTurnId: {},
+      status: "Archived"
+    };
+  }
+  if (event.event === "session.input.accepted") {
+    const turnId = optionalString(payload.turn_id);
+    if (!turnId) return next;
+    return {
+      ...next,
+      activeTurnId: turnId,
+      progressByTurnId: setProgress(next.progressByTurnId, {
+        turnId,
+        phase: "queued",
+        status: "running",
+        summary: "\u6B63\u5728\u63D0\u4EA4\u95EE\u9898",
+        detail: "\u7B49\u5F85 CathyGO \u5F00\u59CB\u5904\u7406",
+        startedAt: nowIso()
+      }),
+      status: "Thinking",
+      error: void 0,
+      errorCode: void 0
+    };
+  }
+  if (event.event === "session.stop.requested") {
+    return {
+      ...next,
+      status: "Stopping"
+    };
+  }
   if (event.event === "agent.progress.delta") {
     return {
       ...next,
@@ -2029,6 +2082,7 @@ function reduceChat(state, action) {
       ...next,
       activeTurnId: void 0,
       progressByTurnId: removeProgress(next.progressByTurnId, payload.turn_id),
+      runtime: markRuntimeIdle(next.runtime),
       status: "Ready"
     };
   }
@@ -2037,6 +2091,7 @@ function reduceChat(state, action) {
       ...next,
       activeTurnId: void 0,
       progressByTurnId: removeProgress(next.progressByTurnId, payload.turn_id),
+      runtime: markRuntimeIdle(next.runtime),
       status: "Ready"
     };
   }
@@ -2046,6 +2101,7 @@ function reduceChat(state, action) {
       ...next,
       activeTurnId: void 0,
       progressByTurnId: removeProgress(next.progressByTurnId, payload.turn_id),
+      runtime: markRuntimeIdle(next.runtime),
       status: "Error",
       error: error?.message ?? "CathyGO turn failed",
       errorCode: error?.code
@@ -2068,6 +2124,10 @@ function appendAssistantDelta(messages, messageId, delta, turnId) {
       }
     ];
   }
+  const existing = messages[index];
+  if (existing?.role === "assistant" && existing.status === "done" && existing.content) {
+    return messages;
+  }
   return messages.map(
     (message, itemIndex) => itemIndex === index ? {
       ...message,
@@ -2217,6 +2277,78 @@ function progressFromActivity(progressByTurnId, activity, turnActivities, messag
   }
   return progressByTurnId;
 }
+function runtimeProgressFromSnapshot(runtime, turnId) {
+  return {
+    turnId,
+    phase: runtime?.status === "stopping" ? "model" : "queued",
+    status: "running",
+    summary: runtime?.status === "stopping" ? "\u6B63\u5728\u505C\u6B62" : "\u6B63\u5728\u6062\u590D\u4F1A\u8BDD\u72B6\u6001",
+    detail: runtime?.active_client_input_id ? `client_input_id=${runtime.active_client_input_id}` : void 0,
+    startedAt: nowIso()
+  };
+}
+function runtimeFromEvent(current, event) {
+  const payload = event.payload;
+  const turnId = optionalString(payload.turn_id);
+  const turnIds = eventTurnIds(payload, turnId);
+  const base = {
+    ...current ?? emptyRuntimeSnapshot(),
+    last_event_seq: Math.max(current?.last_event_seq ?? 0, event.seq)
+  };
+  if (event.event === "session.input.accepted" || event.event === "turn.started") {
+    return {
+      ...base,
+      status: "running",
+      active_turn_id: turnId ?? base.active_turn_id ?? null,
+      active_turn_ids: turnIds.length > 0 ? turnIds : base.active_turn_ids ?? [],
+      active_client_input_id: optionalString(payload.client_input_id) ?? base.active_client_input_id ?? null,
+      active_client_turn_id: optionalString(payload.client_turn_id) ?? base.active_client_turn_id ?? null
+    };
+  }
+  if (event.event === "session.stop.requested") {
+    return {
+      ...base,
+      status: "stopping",
+      active_turn_id: turnId ?? base.active_turn_id ?? null,
+      active_turn_ids: turnIds.length > 0 ? turnIds : base.active_turn_ids ?? []
+    };
+  }
+  if (event.event === "turn.completed" || event.event === "turn.cancelled" || event.event === "turn.failed" || event.event === "session.deleted") {
+    return markRuntimeIdle(base);
+  }
+  return base;
+}
+function eventTurnIds(payload, turnId) {
+  if (Array.isArray(payload.turn_ids)) {
+    return payload.turn_ids.map((value) => optionalString(value)).filter((value) => Boolean(value));
+  }
+  return turnId ? [turnId] : [];
+}
+function emptyRuntimeSnapshot() {
+  return {
+    status: "idle",
+    active_turn_id: null,
+    active_turn_ids: [],
+    active_client_input_id: null,
+    active_client_turn_id: null,
+    last_event_seq: 0
+  };
+}
+function markRuntimeIdle(runtime) {
+  return {
+    ...runtime ?? emptyRuntimeSnapshot(),
+    status: "idle",
+    active_turn_id: null,
+    active_turn_ids: [],
+    active_client_input_id: null,
+    active_client_turn_id: null
+  };
+}
+function statusFromRuntime(runtime) {
+  if (runtime?.status === "running") return "Thinking";
+  if (runtime?.status === "stopping") return "Stopping";
+  return "Ready";
+}
 function setProgress(progressByTurnId, progress) {
   return {
     ...progressByTurnId,
@@ -2314,8 +2446,8 @@ function useCathyGOChat(initialState = initialChatState) {
     dispatchChat({ type: "session.created", sessionId });
   }, []);
   const loadSession = useCallback(
-    (sessionId, messages, activities) => {
-      dispatchChat({ type: "session.loaded", sessionId, messages, activities });
+    (sessionId, messages, activities, runtime) => {
+      dispatchChat({ type: "session.loaded", sessionId, messages, activities, runtime });
     },
     []
   );

package/package.json

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