@elevasis/core 0.48.0 → 0.49.0

package/src/operations/sessions/server/session.ts

@@ -1,11 +1,52 @@
 import type { SupabaseClient, Json } from '../../../supabase'
-import type { ExecutionContext } from '../../../execution/engine/base/types'
-import type { AgentDefinition } from '../../../execution/engine/agent/core/types'
-import type { AgentMemory } from '../../../execution/engine/agent/memory/types'
-import type { SessionRow, SessionTurnResult } from '../types'
-import { createLLMAdapter } from '../../../execution/engine/llm/adapters/server/adapter-factory'
-
-export class Session {
+import type { ExecutionContext } from '../../../execution/engine/base/types'
+import type { AgentDefinition } from '../../../execution/engine/agent/core/types'
+import type { AgentMemory } from '../../../execution/engine/agent/memory/types'
+import type { SessionRow, SessionTurnResult } from '../types'
+import { createLLMAdapter } from '../../../execution/engine/llm/adapters/server/adapter-factory'
+
+export interface SessionTurnExecutorResult<TOutput> {
+  output: TOutput | null
+  memorySnapshot: AgentMemory
+}
+
+export type SessionTurnExecutor<TOutput> = (
+  session: Session,
+  lockedTurnNumber: number
+) => Promise<SessionTurnExecutorResult<TOutput>>
+
+export interface SessionTurnExecutionOptions {
+  beforeExecute?: (session: Session, lockedTurnNumber: number) => Promise<void>
+}
+
+function isMemoryEntry(value: unknown): value is AgentMemory['history'][number] {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return false
+  const entry = value as Record<string, unknown>
+  return (
+    typeof entry.type === 'string' &&
+    typeof entry.content === 'string' &&
+    typeof entry.timestamp === 'number' &&
+    (typeof entry.turnNumber === 'number' || entry.turnNumber === null) &&
+    (typeof entry.iterationNumber === 'number' || entry.iterationNumber === null)
+  )
+}
+
+function isAgentMemory(value: unknown): value is AgentMemory {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return false
+  const memory = value as Record<string, unknown>
+  const sessionMemory = memory.sessionMemory
+  const history = memory.history
+  return (
+    !!sessionMemory &&
+    typeof sessionMemory === 'object' &&
+    !Array.isArray(sessionMemory) &&
+    Object.values(sessionMemory as Record<string, unknown>).every(isMemoryEntry) &&
+    Array.isArray(history) &&
+    history.every(isMemoryEntry)
+  )
+}
+
+export class Session {
   constructor(
     private db: SupabaseClient,
     private data: SessionRow
@@ -73,14 +114,45 @@ export class Session {
    * @param context - Full execution context (including sessionTurnMessages if streaming)
    * @returns Turn result with output and metadata
    */
-  async executeTurn<TInput, TOutput>(
-    agentDefinition: AgentDefinition,
-    input: TInput,
-    context: ExecutionContext
-  ): Promise<SessionTurnResult<TOutput>> {
-    const turnStartTime = Date.now()
-
-    // NOTE: Using RPC to acquire row-level lock and get fresh state
+  async executeTurn<TInput, TOutput>(
+    agentDefinition: AgentDefinition,
+    input: TInput,
+    context: ExecutionContext,
+    options?: SessionTurnExecutionOptions
+  ): Promise<SessionTurnResult<TOutput>> {
+    return this.executeTurnWithExecutor(context, async () => {
+      // Create agent instance (stateless, recreated per turn)
+      const { Agent } = await import('../../../execution/engine/agent/core/agent')
+      const agent = new Agent<TInput, TOutput>(agentDefinition, createLLMAdapter)
+
+      // Execute agent (preloadMemory callback will restore session memory)
+      const output = await agent.execute(input, context)
+
+      // Update state and persist
+      const memorySnapshot = agent.getMemorySnapshot()
+      if (!memorySnapshot) {
+        throw new Error('Agent did not produce memory snapshot')
+      }
+
+      return { output, memorySnapshot }
+    }, options)
+  }
+
+  /**
+   * Execute a session turn with a caller-provided execution body.
+   *
+   * Keeps the session lifecycle centralized for both in-process agents and
+   * worker-backed external agents: acquire lock, validate active session,
+   * execute, persist memory snapshot, and increment turn count exactly once.
+   */
+  async executeTurnWithExecutor<TOutput>(
+    context: ExecutionContext,
+    executor: SessionTurnExecutor<TOutput>,
+    options?: SessionTurnExecutionOptions
+  ): Promise<SessionTurnResult<TOutput>> {
+    const turnStartTime = Date.now()
+
+    // NOTE: Using RPC to acquire row-level lock and get fresh state
     // This ensures atomic lock acquisition for concurrent turn prevention
     const { data, error } = await this.db.rpc('execute_session_turn', {
       p_session_id: this.sessionId
@@ -99,34 +171,31 @@ export class Session {
     this.data = lockResult as SessionRow
 
     // Validate
-    if (this.isEnded) {
-      throw new Error('Cannot execute turn on ended session')
-    }
-
-    // Create agent instance (stateless, recreated per turn)
-    const { Agent } = await import('../../../execution/engine/agent/core/agent')
-    const agent = new Agent<TInput, TOutput>(agentDefinition, createLLMAdapter)
-
-    // Execute agent (preloadMemory callback will restore session memory)
-    const output = await agent.execute(input, context)
-
-    // Update state and persist
-    const snapshot = agent.getMemorySnapshot()
-    if (!snapshot) {
-      throw new Error('Agent did not produce memory snapshot')
-    }
-
-    // Complete turn (messages already persisted immediately via onMessageEvent)
-    await this.completeTurn(snapshot)
-
-    return {
-      sessionId: this.sessionId,
-      executionId: context.executionId,
-      turnNumber: this.data.session_total_turns ?? 0,
-      output,
-      duration: Date.now() - turnStartTime
-    }
-  }
+    if (this.isEnded) {
+      throw new Error('Cannot execute turn on ended session')
+    }
+
+    const lockedTurnNumber = (this.data.session_total_turns ?? 0) + 1
+    context.sessionTurnNumber = lockedTurnNumber
+    await options?.beforeExecute?.(this, lockedTurnNumber)
+
+    const result = await executor(this, lockedTurnNumber)
+    if (!isAgentMemory(result.memorySnapshot)) {
+      throw new Error('Session turn did not produce memory snapshot')
+    }
+
+    // Complete turn (messages already persisted immediately via onMessageEvent)
+    await this.completeTurn(result.memorySnapshot)
+
+    return {
+      sessionId: this.sessionId,
+      executionId: context.executionId,
+      lockedTurnNumber,
+      turnNumber: this.data.session_total_turns ?? 0,
+      output: result.output,
+      duration: Date.now() - turnStartTime
+    }
+  }
 
   /**
    * End this session (marks as ended, prevents future turns)

package/src/operations/sessions/types.ts

@@ -43,13 +43,15 @@ export interface ChatMessage {
   createdAt: Date
 }
 
-export interface SessionTurnResult<TOutput> {
-  sessionId: string
-  executionId: string
-  turnNumber: number
-  output: TOutput | null // Null for side-effect agents with no output schema
-  duration: number
-}
+export interface SessionTurnResult<TOutput> {
+  sessionId: string
+  executionId: string
+  /** Authoritative turn number claimed from locked session state before execution starts. */
+  lockedTurnNumber?: number
+  turnNumber: number
+  output: TOutput | null // Null for side-effect agents with no output schema
+  duration: number
+}
 
 export interface CreateSessionParams {
   resourceId: string

package/src/platform/constants/versions.ts

@@ -1,3 +1,3 @@
 export const VERSION = {
-  CURRENT: '1.13.4'
+  CURRENT: '1.13.7'
 }

package/src/supabase/database.types.ts

@@ -7,11 +7,6 @@ export type Json =
   | Json[]
 
 export type Database = {
-  // Allows to automatically instantiate createClient with right options
-  // instead of createClient<Database, { PostgrestVersion: 'XX' }>(URL, KEY)
-  __InternalSupabase: {
-    PostgrestVersion: "12.2.3 (519615d)"
-  }
   public: {
     Tables: {
       acq_artifacts: {
@@ -1211,6 +1206,74 @@ export type Database = {
           },
         ]
       }
+      agent_access_grants: {
+        Row: {
+          allowed_origins: string[]
+          branding: Json
+          capture_fields: Json
+          code_hash: string | null
+          code_salt: string | null
+          created_at: string
+          disabled_at: string | null
+          expires_at: string | null
+          id: string
+          max_sessions_per_visitor: number
+          max_turns_per_session: number
+          mode: string
+          organization_id: string
+          resource_id: string
+          slug: string
+          tool_policy: Json
+          updated_at: string
+        }
+        Insert: {
+          allowed_origins?: string[]
+          branding?: Json
+          capture_fields?: Json
+          code_hash?: string | null
+          code_salt?: string | null
+          created_at?: string
+          disabled_at?: string | null
+          expires_at?: string | null
+          id?: string
+          max_sessions_per_visitor?: number
+          max_turns_per_session?: number
+          mode?: string
+          organization_id: string
+          resource_id: string
+          slug: string
+          tool_policy?: Json
+          updated_at?: string
+        }
+        Update: {
+          allowed_origins?: string[]
+          branding?: Json
+          capture_fields?: Json
+          code_hash?: string | null
+          code_salt?: string | null
+          created_at?: string
+          disabled_at?: string | null
+          expires_at?: string | null
+          id?: string
+          max_sessions_per_visitor?: number
+          max_turns_per_session?: number
+          mode?: string
+          organization_id?: string
+          resource_id?: string
+          slug?: string
+          tool_policy?: Json
+          updated_at?: string
+        }
+        Relationships: [
+          {
+            foreignKeyName: "agent_access_grants_organization_id_fkey"
+            columns: ["organization_id"]
+            isOneToOne: false
+            referencedRelation: "organizations"
+            referencedColumns: ["id"]
+          },
+        ]
+      }
       api_keys: {
         Row: {
           created_at: string | null
@@ -2118,138 +2181,6 @@ export type Database = {
         }
         Relationships: []
       }
-      agent_access_grants: {
-        Row: {
-          allowed_origins: string[]
-          branding: Json
-          capture_fields: Json
-          code_hash: string | null
-          code_salt: string | null
-          created_at: string
-          disabled_at: string | null
-          expires_at: string | null
-          id: string
-          max_sessions_per_visitor: number
-          max_turns_per_session: number
-          mode: string
-          organization_id: string
-          resource_id: string
-          slug: string
-          tool_policy: Json
-          updated_at: string
-        }
-        Insert: {
-          allowed_origins?: string[]
-          branding?: Json
-          capture_fields?: Json
-          code_hash?: string | null
-          code_salt?: string | null
-          created_at?: string
-          disabled_at?: string | null
-          expires_at?: string | null
-          id?: string
-          max_sessions_per_visitor?: number
-          max_turns_per_session?: number
-          mode?: string
-          organization_id: string
-          resource_id: string
-          slug: string
-          tool_policy?: Json
-          updated_at?: string
-        }
-        Update: {
-          allowed_origins?: string[]
-          branding?: Json
-          capture_fields?: Json
-          code_hash?: string | null
-          code_salt?: string | null
-          created_at?: string
-          disabled_at?: string | null
-          expires_at?: string | null
-          id?: string
-          max_sessions_per_visitor?: number
-          max_turns_per_session?: number
-          mode?: string
-          organization_id?: string
-          resource_id?: string
-          slug?: string
-          tool_policy?: Json
-          updated_at?: string
-        }
-        Relationships: [
-          {
-            foreignKeyName: "agent_access_grants_organization_id_fkey"
-            columns: ["organization_id"]
-            isOneToOne: false
-            referencedRelation: "organizations"
-            referencedColumns: ["id"]
-          },
-        ]
-      }
-      agent_chat_capabilities: {
-        Row: {
-          created_at: string
-          expires_at: string
-          grant_id: string
-          id: string
-          organization_id: string
-          origin: string | null
-          resource_id: string
-          revoked_at: string | null
-          session_id: string | null
-          token_hash: string
-          visitor_id: string | null
-        }
-        Insert: {
-          created_at?: string
-          expires_at: string
-          grant_id: string
-          id?: string
-          organization_id: string
-          origin?: string | null
-          resource_id: string
-          revoked_at?: string | null
-          session_id?: string | null
-          token_hash: string
-          visitor_id?: string | null
-        }
-        Update: {
-          created_at?: string
-          expires_at?: string
-          grant_id?: string
-          id?: string
-          organization_id?: string
-          origin?: string | null
-          resource_id?: string
-          revoked_at?: string | null
-          session_id?: string | null
-          token_hash?: string
-          visitor_id?: string | null
-        }
-        Relationships: [
-          {
-            foreignKeyName: "agent_chat_capabilities_grant_id_fkey"
-            columns: ["grant_id"]
-            isOneToOne: false
-            referencedRelation: "agent_access_grants"
-            referencedColumns: ["id"]
-          },
-          {
-            foreignKeyName: "agent_chat_capabilities_organization_id_fkey"
-            columns: ["organization_id"]
-            isOneToOne: false
-            referencedRelation: "organizations"
-            referencedColumns: ["id"]
-          },
-          {
-            foreignKeyName: "agent_chat_capabilities_session_id_fkey"
-            columns: ["session_id"]
-            isOneToOne: false
-            referencedRelation: "sessions"
-            referencedColumns: ["session_id"]
-          },
-        ]
-      }
       organizations: {
         Row: {
           config: Json
@@ -3133,24 +3064,42 @@ export type Database = {
       [_ in never]: never
     }
     Functions: {
-      acq_default_checklist: { Args: { p_platform: string }; Returns: Json }
+      acq_default_checklist: {
+        Args: { p_platform: string }
+        Returns: Json
+      }
       append_deal_activity: {
         Args: { p_activity: Json; p_deal_id: string; p_organization_id: string }
         Returns: undefined
       }
-      auth_jwt_claims: { Args: never; Returns: Json }
-      auth_uid_safe: { Args: never; Returns: string }
+      auth_jwt_claims: {
+        Args: Record<PropertyKey, never>
+        Returns: Json
+      }
+      auth_uid_safe: {
+        Args: Record<PropertyKey, never>
+        Returns: string
+      }
       can_assign_role_in_org: {
         Args: { p_role_id: string; p_target_membership_id: string }
         Returns: boolean
       }
-      current_user_is_platform_admin: { Args: never; Returns: boolean }
+      current_user_is_platform_admin: {
+        Args: Record<PropertyKey, never>
+        Returns: boolean
+      }
       current_user_shares_org_with: {
         Args: { other_user_id: string }
         Returns: boolean
       }
-      current_user_supabase_id: { Args: never; Returns: string }
-      detect_stalled_executions: { Args: never; Returns: undefined }
+      current_user_supabase_id: {
+        Args: Record<PropertyKey, never>
+        Returns: string
+      }
+      detect_stalled_executions: {
+        Args: Record<PropertyKey, never>
+        Returns: undefined
+      }
       execute_session_turn: {
         Args: { p_session_id: string }
         Returns: {
@@ -3166,20 +3115,32 @@ export type Database = {
           user_id: string
         }[]
       }
-      get_platform_credential_kek: { Args: never; Returns: string }
-      get_storage_org_id: { Args: { file_path: string }; Returns: string }
-      get_workos_user_id: { Args: never; Returns: string }
-      has_org_access:
-        | {
-            Args: { action?: string; org_id: string; system_path: string }
-            Returns: boolean
-          }
-        | { Args: { action?: string; system_path: string }; Returns: boolean }
+      get_platform_credential_kek: {
+        Args: Record<PropertyKey, never>
+        Returns: string
+      }
+      get_storage_org_id: {
+        Args: { file_path: string }
+        Returns: string
+      }
+      get_workos_user_id: {
+        Args: Record<PropertyKey, never>
+        Returns: string
+      }
+      has_org_access: {
+        Args:
+          | { action?: string; org_id: string; system_path: string }
+          | { action?: string; system_path: string }
+        Returns: boolean
+      }
       has_org_permission: {
         Args: { org_id: string; perm_key: string }
         Returns: boolean
       }
-      is_org_member: { Args: { org_id: string }; Returns: boolean }
+      is_org_member: {
+        Args: { org_id: string }
+        Returns: boolean
+      }
       link_workos_membership_on_accept: {
         Args: {
           p_email: string
@@ -3196,10 +3157,16 @@ export type Database = {
         }
         Returns: Json
       }
-      process_due_schedules: { Args: never; Returns: Json }
-      recompute_all_memberships: { Args: never; Returns: undefined }
+      process_due_schedules: {
+        Args: Record<PropertyKey, never>
+        Returns: Json
+      }
+      recompute_all_memberships: {
+        Args: Record<PropertyKey, never>
+        Returns: undefined
+      }
       repair_membership_role_assignments: {
-        Args: never
+        Args: Record<PropertyKey, never>
         Returns: {
           membership_id: string
           organization_id: string
@@ -3222,7 +3189,7 @@ export type Database = {
         Returns: string
       }
       upsert_user_profile: {
-        Args: never
+        Args: Record<PropertyKey, never>
         Returns: {
           profile_display_name: string
           profile_email: string
@@ -3362,3 +3329,4 @@ export const Constants = {
     Enums: {},
   },
 } as const
+