@danceiny/gotry 0.0.1-rc.18 → 0.0.1-rc.19

package/ts/src/booking-surface/startup.ts

@@ -7,53 +7,46 @@ import { ensureLedger, type StateLedger } from '../state-ledger.ts'
 import {
   buildDshPlannerEnvironment,
   createDshEmbeddedBookingPlanner,
-  createDshEmbeddedBookingPlannerV2,
-  type DshEmbeddedBookingPlannerHandleV1,
-  type DshEmbeddedBookingPlannerHandleV2,
-  type DshEmbeddedBookingPlannerOptionsV1,
+  type DshEmbeddedBookingPlannerHandle,
+  type DshEmbeddedBookingPlannerOptions,
 } from './dsh-planner.ts'
 import { BookingCopilotTaskRuntime } from './runtime.ts'
-import { BookingCopilotTaskRuntimeV2 } from './runtime-v2.ts'
-import { BOOKING_COPILOT_V2_INGRESS_MODES, type BookingCopilotV2IngressMode, type BookingIngressBindingV2, type BookingIngressPrincipalV2 } from './contracts-v2.ts'
+import { BOOKING_COPILOT_INGRESS_MODES, type BookingCopilotIngressMode, type BookingIngressBinding, type BookingIngressPrincipal } from './contracts.ts'
 import {
   startBookingCopilotServer,
-  type BookingCopilotServerHandleV1,
-  type BookingCopilotServerOptionsV1,
+  type BookingCopilotServerHandle,
+  type BookingCopilotServerOptions,
 } from './server.ts'
 
-export interface BookingCopilotStartupConfigV1 {
+export interface BookingCopilotStartupConfig {
   apiKey: string
   stateRoot: string
   host: string
   port: number
   artifactId?: string
   /** Defaults to bound-turn-only; a complete injected seam enables ingress. */
-  ingressMode: BookingCopilotV2IngressMode
+  ingressMode: BookingCopilotIngressMode
 }
 
-export interface BookingCopilotStartupHandleV1 {
+export interface BookingCopilotStartupHandle {
   port: number
   close(): Promise<void>
 }
 
-export interface BookingCopilotStartupDependenciesV1 {
+export interface BookingCopilotStartupDependencies {
   ensureLedger(stateRoot: string): StateLedger
   runtimeFactory(ledger: StateLedger): BookingCopilotTaskRuntime
-  createPlanner(options: DshEmbeddedBookingPlannerOptionsV1): Promise<DshEmbeddedBookingPlannerHandleV1>
-  runtimeFactoryV2?: (ledger: StateLedger) => BookingCopilotTaskRuntimeV2
-  createPlannerV2?: (options: DshEmbeddedBookingPlannerOptionsV1) => Promise<DshEmbeddedBookingPlannerHandleV2>
-  /** Optional in-process BFF identity seam; standalone v2 uses bound-turn-only mode. */
-  ingressBinding?: BookingIngressBindingV2
-  principal?: BookingIngressPrincipalV2
-  startServer(options: BookingCopilotServerOptionsV1): Promise<BookingCopilotServerHandleV1>
+  createPlanner(options: DshEmbeddedBookingPlannerOptions): Promise<DshEmbeddedBookingPlannerHandle>
+  /** Optional in-process BFF identity seam; standalone use is bound-turn-only. */
+  ingressBinding?: BookingIngressBinding
+  principal?: BookingIngressPrincipal
+  startServer(options: BookingCopilotServerOptions): Promise<BookingCopilotServerHandle>
 }
 
-const DEFAULT_DEPENDENCIES: BookingCopilotStartupDependenciesV1 = {
+const DEFAULT_DEPENDENCIES: BookingCopilotStartupDependencies = {
   ensureLedger,
   runtimeFactory: (ledger) => new BookingCopilotTaskRuntime(ledger),
   createPlanner: createDshEmbeddedBookingPlanner,
-  runtimeFactoryV2: (ledger) => new BookingCopilotTaskRuntimeV2(ledger),
-  createPlannerV2: createDshEmbeddedBookingPlannerV2,
   startServer: startBookingCopilotServer,
 }
 
@@ -66,7 +59,7 @@ function parsePort(raw: string | undefined): number {
 
 export function resolveBookingCopilotStartupConfig(
   env: Record<string, string | undefined> = process.env,
-): BookingCopilotStartupConfigV1 {
+): BookingCopilotStartupConfig {
   const apiKey = env.GOTRY_BOOKING_COPILOT_API_KEY ?? ''
   if (!apiKey) throw new Error('booking_copilot_api_key_required')
   const stateRoot = env.GOTRY_BOOKING_COPILOT_STATE_ROOT ?? ''
@@ -76,10 +69,10 @@ export function resolveBookingCopilotStartupConfig(
   if (artifactId !== undefined && !/^[0-9a-f]{40}$/.test(artifactId)) {
     throw new Error('booking_copilot_artifact_id_invalid')
   }
-  const rawIngressMode = env.GOTRY_BOOKING_COPILOT_V2_INGRESS_MODE
+  const rawIngressMode = env.GOTRY_BOOKING_COPILOT_INGRESS_MODE
   const ingressMode = rawIngressMode === undefined || rawIngressMode === '' ? 'bff-bound-turn-only' : rawIngressMode
-  if (!(BOOKING_COPILOT_V2_INGRESS_MODES as readonly string[]).includes(ingressMode)) {
-    throw new Error('booking_copilot_v2_ingress_mode_invalid')
+  if (!(BOOKING_COPILOT_INGRESS_MODES as readonly string[]).includes(ingressMode)) {
+    throw new Error('booking_copilot_ingress_mode_invalid')
   }
   return {
     apiKey,
@@ -87,21 +80,19 @@ export function resolveBookingCopilotStartupConfig(
     host: env.GOTRY_BOOKING_COPILOT_HOST || '127.0.0.1',
     port: parsePort(env.GOTRY_BOOKING_COPILOT_PORT),
     artifactId,
-    ingressMode: ingressMode as BookingCopilotV2IngressMode,
+    ingressMode: ingressMode as BookingCopilotIngressMode,
   }
 }
 
 async function closeAll(
-  server: BookingCopilotServerHandleV1 | undefined,
-  planner: DshEmbeddedBookingPlannerHandleV1 | DshEmbeddedBookingPlannerHandleV2 | undefined,
-  plannerV2: DshEmbeddedBookingPlannerHandleV2 | undefined,
+  server: BookingCopilotServerHandle | undefined,
+  planner: DshEmbeddedBookingPlannerHandle | undefined,
   ledger: StateLedger | undefined,
 ): Promise<void> {
   const failures: unknown[] = []
   for (const close of [
     server ? () => server.close() : undefined,
     planner ? () => planner.close() : undefined,
-    plannerV2 ? () => plannerV2.close() : undefined,
     ledger ? () => Promise.resolve(ledger.close()) : undefined,
   ]) {
     if (!close) continue
@@ -117,44 +108,41 @@ async function closeAll(
  */
 export async function startBookingCopilotFromEnvironment(
   env: Record<string, string | undefined> = process.env,
-  dependencies: BookingCopilotStartupDependenciesV1 = DEFAULT_DEPENDENCIES,
-): Promise<BookingCopilotStartupHandleV1> {
+  dependencies: BookingCopilotStartupDependencies = DEFAULT_DEPENDENCIES,
+): Promise<BookingCopilotStartupHandle> {
   const config = resolveBookingCopilotStartupConfig(env)
   const activeDependencies = dependencies
   const hasIngressBinding = Boolean(activeDependencies.ingressBinding)
   const hasPrincipal = Boolean(activeDependencies.principal)
-  if (hasIngressBinding !== hasPrincipal) throw new Error('booking_copilot_v2_ingress_binding_pair_required')
+  if (hasIngressBinding !== hasPrincipal) throw new Error('booking_copilot_ingress_binding_pair_required')
   const ingressPair = hasIngressBinding && hasPrincipal
-  if (ingressPair && env.GOTRY_BOOKING_COPILOT_V2_INGRESS_MODE !== undefined && config.ingressMode === 'bff-bound-turn-only') {
-    throw new Error('booking_copilot_v2_ingress_mode_conflict')
+  if (ingressPair && env.GOTRY_BOOKING_COPILOT_INGRESS_MODE !== undefined && config.ingressMode === 'bff-bound-turn-only') {
+    throw new Error('booking_copilot_ingress_mode_conflict')
   }
-  if (!ingressPair && config.ingressMode === 'bff-ingress-binding') throw new Error('booking_copilot_v2_ingress_binding_required')
+  if (!ingressPair && config.ingressMode === 'bff-ingress-binding') throw new Error('booking_copilot_ingress_binding_required')
   if (ingressPair && (typeof activeDependencies.ingressBinding?.bind !== 'function'
     || typeof activeDependencies.principal?.subject !== 'string' || activeDependencies.principal.subject.length === 0 || activeDependencies.principal.subject.length > 256
     || typeof activeDependencies.principal?.scope !== 'string' || activeDependencies.principal.scope.length === 0 || activeDependencies.principal.scope.length > 256)) {
-    throw new Error('booking_copilot_v2_ingress_binding_invalid')
+    throw new Error('booking_copilot_ingress_binding_invalid')
   }
-  const activeIngressMode: BookingCopilotV2IngressMode = ingressPair ? 'bff-ingress-binding' : 'bff-bound-turn-only'
+  const activeIngressMode: BookingCopilotIngressMode = ingressPair ? 'bff-ingress-binding' : 'bff-bound-turn-only'
   mkdirSync(config.stateRoot, { recursive: true })
   let ledger: StateLedger | undefined
-  let planner: DshEmbeddedBookingPlannerHandleV1 | undefined
-  let plannerV2: DshEmbeddedBookingPlannerHandleV2 | undefined
-  let server: BookingCopilotServerHandleV1 | undefined
+  let planner: DshEmbeddedBookingPlannerHandle | undefined
+  let server: BookingCopilotServerHandle | undefined
   try {
     ledger = dependencies.ensureLedger(config.stateRoot)
     const plannerOptions = { stateRoot: config.stateRoot, env: buildDshPlannerEnvironment(env) }
-    if (!activeDependencies.runtimeFactoryV2 || !activeDependencies.createPlannerV2) throw new Error('booking_copilot_v2_startup_dependency_missing')
     const runtime = activeDependencies.runtimeFactory(ledger)
     planner = await activeDependencies.createPlanner(plannerOptions)
-    const runtimeV2 = activeDependencies.runtimeFactoryV2(ledger)
-    plannerV2 = await activeDependencies.createPlannerV2(plannerOptions)
     server = await activeDependencies.startServer({
       apiKey: config.apiKey, runtime, plannerFactory: planner.plannerFactory,
-      v2: { runtime: runtimeV2, plannerFactory: plannerV2.plannerFactory, ingressBinding: activeDependencies.ingressBinding, principal: activeDependencies.principal, ingressMode: activeIngressMode },
+      ...(ingressPair ? { ingressBinding: activeDependencies.ingressBinding, principal: activeDependencies.principal } : {}),
+      ingressMode: activeIngressMode,
       host: config.host, port: config.port, artifactId: config.artifactId,
     })
   } catch (error) {
-    try { await closeAll(server, planner, plannerV2, ledger) } catch (cleanupError) {
+    try { await closeAll(server, planner, ledger) } catch (cleanupError) {
       throw new AggregateError([error, cleanupError], 'booking_copilot_startup_and_cleanup_failed')
     }
     throw error
@@ -166,7 +154,7 @@ export async function startBookingCopilotFromEnvironment(
     async close() {
       if (closed) return
       closed = true
-      await closeAll(server, planner, plannerV2, ledger)
+      await closeAll(server, planner, ledger)
     },
   }
 }