@beanx/cathygo-protocol 0.1.4 → 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>;
 }
@@ -390,6 +395,31 @@ type CathyGOTransport = {
     isOpen(): boolean;
 };
 
+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>;
+};
+declare class SessionSubscriptionManager {
+    private readonly client;
+    readonly cursorStore: SessionEventCursorStore;
+    private activeSessionId;
+    constructor(client: SessionSubscriptionClient, cursorStore: SessionEventCursorStore);
+    get activeSession(): string | null;
+    activateSession(sessionId: string, afterSeq?: number): Promise<ConversationDetail>;
+    deactivate(): void;
+    markActive(sessionId: string): void;
+}
+
 declare class CathyGOClientError extends Error {
     readonly code?: string | undefined;
     constructor(message: string, code?: string | undefined);
@@ -405,7 +435,8 @@ declare class CathyGOProtocolClient {
     private turnHandlers;
     private attachmentRelayProgressHandlers;
     private lastConnect?;
-    private lastEventSeq;
+    private readonly cursorStore;
+    private readonly subscriptionManager;
     private connectOptions;
     private callbacks;
     constructor(transport: CathyGOTransport, options: CathyGOProtocolClientOptions);
@@ -427,6 +458,13 @@ 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;
     createSession(metadata?: Record<string, unknown>): Promise<string>;
     listSessions(limit?: number): Promise<ConversationSummary[]>;
     getSession(sessionId: string): Promise<ConversationDetail>;
@@ -469,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, type SessionInputOptions, type SessionInputResult, type SessionRuntimeSnapshot, type SessionStopResult, 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,3 +1,82 @@
+// 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;
+    const current = this.cursors.get(sessionId) ?? 0;
+    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) {
+      this.cursors.set(sessionId, seq);
+    }
+  }
+  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;
+    this.cursorStore = cursorStore;
+  }
+  client;
+  cursorStore;
+  activeSessionId = null;
+  get activeSession() {
+    return this.activeSessionId;
+  }
+  async activateSession(sessionId, afterSeq) {
+    this.activeSessionId = sessionId;
+    const detail = await this.client.getSession(sessionId);
+    const runtime = detail.runtime ?? detail.session.runtime;
+    const subscribeFrom = afterSeq ?? resolveSubscribeAfterSeq(this.cursorStore, sessionId, runtime);
+    await this.client.subscribeSession(sessionId, subscribeFrom);
+    return detail;
+  }
+  deactivate() {
+    this.activeSessionId = null;
+  }
+  markActive(sessionId) {
+    this.activeSessionId = sessionId;
+  }
+};
+function sessionIdFromEvent(event) {
+  const sessionId = event.payload.session_id;
+  if (typeof sessionId !== "string" || !sessionId.trim()) return void 0;
+  return sessionId.trim();
+}
+
 // src/client.ts
 var CathyGOClientError = class extends Error {
   constructor(message, code) {
@@ -12,6 +91,7 @@ var CathyGOProtocolClient = class {
     this.transport = transport;
     this.connectOptions = options.connect;
     this.callbacks = options.callbacks ?? {};
+    this.subscriptionManager = new SessionSubscriptionManager(this, this.cursorStore);
     this.transport.onFrame((frame) => this.handleFrame(frame));
     this.transport.onClose?.(() => {
       this.rejectPending("CathyGO socket closed");
@@ -28,7 +108,8 @@ var CathyGOProtocolClient = class {
   turnHandlers = /* @__PURE__ */ new Set();
   attachmentRelayProgressHandlers = /* @__PURE__ */ new Set();
   lastConnect;
-  lastEventSeq = 0;
+  cursorStore = new SessionEventCursorStore();
+  subscriptionManager;
   connectOptions;
   callbacks;
   updateConnectOptions(patch) {
@@ -69,7 +150,8 @@ var CathyGOProtocolClient = class {
   disconnect() {
     this.transport.close();
     this.lastConnect = void 0;
-    this.lastEventSeq = 0;
+    this.cursorStore.clear();
+    this.subscriptionManager.deactivate();
     this.rejectPending("CathyGO socket closed");
   }
   isConnected() {
@@ -78,6 +160,28 @@ 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;
+  }
+  async activateSession(sessionId, afterSeq) {
+    return this.subscriptionManager.activateSession(sessionId, afterSeq);
+  }
+  deactivateSessionSubscription() {
+    this.subscriptionManager.deactivate();
+  }
   async createSession(metadata = {}) {
     const payload = await this.request("session.create", { metadata });
     return String(payload.session_id ?? "");
@@ -109,9 +213,11 @@ var CathyGOProtocolClient = class {
     return turnStartResultFromPayload(payload, sessionId);
   }
   async subscribeSession(sessionId, afterSeq) {
+    this.subscriptionManager.markActive(sessionId);
+    const resolvedAfterSeq = afterSeq ?? this.cursorStore.getAfterSeq(sessionId);
     await this.request("session.subscribe", {
       session_id: sessionId,
-      after_seq: afterSeq ?? this.lastEventSeq
+      after_seq: resolvedAfterSeq
     });
   }
   async stopSession(sessionId) {
@@ -124,12 +230,7 @@ var CathyGOProtocolClient = class {
     };
   }
   async resumeSession(sessionId, afterSeq) {
-    const detail = await this.getSession(sessionId);
-    await this.subscribeSession(
-      sessionId,
-      afterSeq ?? detail.runtime?.last_event_seq ?? detail.session.runtime?.last_event_seq
-    );
-    return detail;
+    return this.subscriptionManager.activateSession(sessionId, afterSeq);
   }
   async regenerateSession(sessionId) {
     const payload = await this.request("session.regenerate", { session_id: sessionId });
@@ -202,9 +303,7 @@ var CathyGOProtocolClient = class {
       }
     }
     if (isLearningTurnEvent(frame)) {
-      if (typeof frame.seq === "number" && frame.seq > this.lastEventSeq) {
-        this.lastEventSeq = frame.seq;
-      }
+      this.cursorStore.observeEvent(frame);
       this.callbacks.onTurnEvent?.(frame);
       for (const handler of this.turnHandlers) {
         handler(frame);
@@ -461,6 +560,8 @@ function learningTurnInput(text, attachments) {
 export {
   CathyGOClientError,
   CathyGOProtocolClient,
+  SessionEventCursorStore,
+  SessionSubscriptionManager,
   capabilityForTurn,
   connectPayload,
   isAttachmentRelayProgressEvent,
@@ -468,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.4",
+  "version": "0.1.6",
   "type": "module",
   "files": [
     "dist"