@beanx/cathygo-protocol 0.1.5 → 0.1.6

package/dist/index.d.ts

@@ -66,6 +66,9 @@ type LearningTurnEventPayload = {
     message_id?: string;
     role?: "user" | "assistant" | "system";
     delta?: string;
+    content?: string;
+    content_revision?: number;
+    persisted_message_id?: string;
     message?: string;
     parts?: ConversationMessagePart[];
     metadata?: Record<string, unknown>;
@@ -87,7 +90,7 @@ type LearningTurnEventPayload = {
 };
 type LearningTurnEvent = {
     type: "event";
-    event: "session.created" | "session.deleted" | "session.input.accepted" | "session.stop.requested" | "user.message.created" | "turn.started" | "assistant.delta" | "assistant.completed" | "turn.completed" | "turn.failed" | "turn.cancelled" | "agent.activity.started" | "agent.activity.updated" | "agent.activity.completed" | "agent.progress.delta" | `debug.${string}` | `experimental.${string}`;
+    event: "session.created" | "session.deleted" | "session.input.accepted" | "session.stop.requested" | "user.message.created" | "turn.started" | "assistant.delta" | "assistant.message" | "assistant.completed" | "turn.completed" | "turn.failed" | "turn.cancelled" | "agent.activity.started" | "agent.activity.updated" | "agent.activity.completed" | "agent.progress.delta" | `debug.${string}` | `experimental.${string}`;
     seq: number;
     payload: LearningTurnEventPayload;
 };
@@ -197,6 +200,8 @@ interface ConversationMessage {
     content: string;
     parts?: ConversationMessagePart[];
     turn_id?: string | null;
+    status?: "streaming" | "completed" | "failed" | "aborted" | "superseded";
+    content_revision?: number;
     created_at: string;
     metadata?: Record<string, unknown>;
 }
@@ -392,11 +397,14 @@ type CathyGOTransport = {
 
 declare class SessionEventCursorStore {
     private readonly cursors;
+    private readonly turnStartSeq;
     getAfterSeq(sessionId: string): number;
+    getTurnStartSeq(sessionId: string): number | undefined;
     observeEvent(event: LearningTurnEvent): void;
     setAfterSeq(sessionId: string, seq: number): void;
     clear(): void;
 }
+declare function resolveSubscribeAfterSeq(cursorStore: SessionEventCursorStore, sessionId: string, runtime?: SessionRuntimeSnapshot | null): number;
 type SessionSubscriptionClient = {
     getSession(sessionId: string): Promise<ConversationDetail>;
     subscribeSession(sessionId: string, afterSeq: number): Promise<void>;
@@ -450,8 +458,10 @@ declare class CathyGOProtocolClient {
         attachment_relay_max_file_bytes?: number;
         attachment_relay_progress_min_interval_ms?: number;
     } | undefined;
+    getConnectResult(): CathyGOConnectResult | undefined;
     getSessionEventCursorStore(): SessionEventCursorStore;
     getLastEventSeq(sessionId: string): number;
+    resolveSubscribeAfterSeq(sessionId: string, detail: ConversationDetail): number;
     getActiveSubscriptionSessionId(): string | null;
     activateSession(sessionId: string, afterSeq?: number): Promise<ConversationDetail>;
     deactivateSessionSubscription(): void;
@@ -497,4 +507,4 @@ declare function photoQuestionTurnInput(text: string, attachments: GatewayAttach
 declare function capabilityForTurn(attachments: GatewayAttachment[]): LearningCapability;
 declare function learningTurnInput(text: string, attachments: GatewayAttachment[]): TurnInput;
 
-export { type AgentActivity, type AgentPresenceEvent, type AttachmentCommitBlob, type AttachmentCommitParams, type AttachmentInput, type AttachmentRelayProgress, type AttachmentRelayProgressEvent, type AttachmentRelayProgressHandler, type BeanXAccountRuntimeConfig, CathyGOClientError, type CathyGOClientRole, type CathyGOConnectOptions, type CathyGOConnectResult, type CathyGODeviceContext, type CathyGOFrame, type CathyGOIncomingFrame, CathyGOProtocolClient, type CathyGOProtocolClientCallbacks, type CathyGOProtocolClientOptions, type CathyGORequest, type CathyGOResponse, type CathyGOTransport, type CathyGOTransportEventHandler, type CathyGOTransportFrameHandler, type ConversationDetail, type ConversationMessage, type ConversationMessagePart, type ConversationSummary, type GatewayAgentProfile, type GatewayAttachment, type GatewayModelConfig, type GatewayModelConfigUpdate, type GatewayModelOption, type GatewayModelStatus, type GatewayVisibleSettings, type LearningCapability, type LearningTurnEvent, type LearningTurnEventHandler, type LearningTurnEventPayload, type ListResponse, type MessagePartInput, type MultimodalTurnInput, type SameSessionPolicy, SessionEventCursorStore, type SessionInputOptions, type SessionInputResult, type SessionRuntimeSnapshot, type SessionStopResult, type SessionSubscriptionClient, SessionSubscriptionManager, type SettingsItem, type SettingsItemKind, type SettingsSection, type TextTurnInput, type TurnInput, type UploadAttachmentViaRelayOptions, type UploadScope, capabilityForTurn, connectPayload, isAttachmentRelayProgressEvent, isLearningTurnEvent, learningTurnInput, parseConnectPayload, photoQuestionTurnInput, settingsFromPayload, textTurnInput, uploadAttachmentViaRelay };
+export { type AgentActivity, type AgentPresenceEvent, type AttachmentCommitBlob, type AttachmentCommitParams, type AttachmentInput, type AttachmentRelayProgress, type AttachmentRelayProgressEvent, type AttachmentRelayProgressHandler, type BeanXAccountRuntimeConfig, CathyGOClientError, type CathyGOClientRole, type CathyGOConnectOptions, type CathyGOConnectResult, type CathyGODeviceContext, type CathyGOFrame, type CathyGOIncomingFrame, CathyGOProtocolClient, type CathyGOProtocolClientCallbacks, type CathyGOProtocolClientOptions, type CathyGORequest, type CathyGOResponse, type CathyGOTransport, type CathyGOTransportEventHandler, type CathyGOTransportFrameHandler, type ConversationDetail, type ConversationMessage, type ConversationMessagePart, type ConversationSummary, type GatewayAgentProfile, type GatewayAttachment, type GatewayModelConfig, type GatewayModelConfigUpdate, type GatewayModelOption, type GatewayModelStatus, type GatewayVisibleSettings, type LearningCapability, type LearningTurnEvent, type LearningTurnEventHandler, type LearningTurnEventPayload, type ListResponse, type MessagePartInput, type MultimodalTurnInput, type SameSessionPolicy, SessionEventCursorStore, type SessionInputOptions, type SessionInputResult, type SessionRuntimeSnapshot, type SessionStopResult, type SessionSubscriptionClient, SessionSubscriptionManager, type SettingsItem, type SettingsItemKind, type SettingsSection, type TextTurnInput, type TurnInput, type UploadAttachmentViaRelayOptions, type UploadScope, capabilityForTurn, connectPayload, isAttachmentRelayProgressEvent, isLearningTurnEvent, learningTurnInput, parseConnectPayload, photoQuestionTurnInput, resolveSubscribeAfterSeq, settingsFromPayload, textTurnInput, uploadAttachmentViaRelay };

package/dist/index.js

@@ -1,9 +1,14 @@
 // src/session-subscription.ts
+var TERMINAL_TURN_EVENTS = /* @__PURE__ */ new Set(["turn.completed", "turn.failed", "turn.cancelled"]);
 var SessionEventCursorStore = class {
   cursors = /* @__PURE__ */ new Map();
+  turnStartSeq = /* @__PURE__ */ new Map();
   getAfterSeq(sessionId) {
     return this.cursors.get(sessionId) ?? 0;
   }
+  getTurnStartSeq(sessionId) {
+    return this.turnStartSeq.get(sessionId);
+  }
   observeEvent(event) {
     const sessionId = sessionIdFromEvent(event);
     if (!sessionId || !event.seq || event.seq <= 0) return;
@@ -11,6 +16,13 @@ var SessionEventCursorStore = class {
     if (event.seq > current) {
       this.cursors.set(sessionId, event.seq);
     }
+    if (event.event === "turn.started") {
+      this.turnStartSeq.set(sessionId, event.seq);
+      return;
+    }
+    if (TERMINAL_TURN_EVENTS.has(event.event)) {
+      this.turnStartSeq.delete(sessionId);
+    }
   }
   setAfterSeq(sessionId, seq) {
     if (seq > 0) {
@@ -19,8 +31,20 @@ var SessionEventCursorStore = class {
   }
   clear() {
     this.cursors.clear();
+    this.turnStartSeq.clear();
   }
 };
+function resolveSubscribeAfterSeq(cursorStore, sessionId, runtime) {
+  const lastEventSeq = runtime?.last_event_seq ?? 0;
+  if (!runtime?.active_turn_id) {
+    return lastEventSeq;
+  }
+  const turnStartSeq = cursorStore.getTurnStartSeq(sessionId);
+  if (turnStartSeq != null && turnStartSeq > 0) {
+    return Math.max(0, turnStartSeq - 1);
+  }
+  return 0;
+}
 var SessionSubscriptionManager = class {
   constructor(client, cursorStore) {
     this.client = client;
@@ -35,8 +59,8 @@ var SessionSubscriptionManager = class {
   async activateSession(sessionId, afterSeq) {
     this.activeSessionId = sessionId;
     const detail = await this.client.getSession(sessionId);
-    const snapshotSeq = detail.runtime?.last_event_seq ?? detail.session.runtime?.last_event_seq ?? 0;
-    const subscribeFrom = afterSeq ?? snapshotSeq;
+    const runtime = detail.runtime ?? detail.session.runtime;
+    const subscribeFrom = afterSeq ?? resolveSubscribeAfterSeq(this.cursorStore, sessionId, runtime);
     await this.client.subscribeSession(sessionId, subscribeFrom);
     return detail;
   }
@@ -136,12 +160,19 @@ var CathyGOProtocolClient = class {
   getLimits() {
     return this.lastConnect?.limits;
   }
+  getConnectResult() {
+    return this.lastConnect;
+  }
   getSessionEventCursorStore() {
     return this.cursorStore;
   }
   getLastEventSeq(sessionId) {
     return this.cursorStore.getAfterSeq(sessionId);
   }
+  resolveSubscribeAfterSeq(sessionId, detail) {
+    const runtime = detail.runtime ?? detail.session.runtime;
+    return resolveSubscribeAfterSeq(this.cursorStore, sessionId, runtime);
+  }
   getActiveSubscriptionSessionId() {
     return this.subscriptionManager.activeSession;
   }
@@ -538,6 +569,7 @@ export {
   learningTurnInput,
   parseConnectPayload,
   photoQuestionTurnInput,
+  resolveSubscribeAfterSeq,
   settingsFromPayload,
   textTurnInput,
   uploadAttachmentViaRelay

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beanx/cathygo-protocol",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "type": "module",
   "files": [
     "dist"