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

package/dist/src/booking-surface/startup.js

@@ -2,17 +2,14 @@ import { mkdirSync } from 'node:fs';
 import { isAbsolute, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { ensureLedger } from '../state-ledger.js';
-import { buildDshPlannerEnvironment, createDshEmbeddedBookingPlanner, createDshEmbeddedBookingPlannerV2 } from './dsh-planner.js';
+import { buildDshPlannerEnvironment, createDshEmbeddedBookingPlanner } from './dsh-planner.js';
 import { BookingCopilotTaskRuntime } from './runtime.js';
-import { BookingCopilotTaskRuntimeV2 } from './runtime-v2.js';
-import { BOOKING_COPILOT_V2_INGRESS_MODES } from './contracts-v2.js';
+import { BOOKING_COPILOT_INGRESS_MODES } from './contracts.js';
 import { startBookingCopilotServer } from './server.js';
 const DEFAULT_DEPENDENCIES = {
     ensureLedger,
     runtimeFactory: (ledger)=>new BookingCopilotTaskRuntime(ledger),
     createPlanner: createDshEmbeddedBookingPlanner,
-    runtimeFactoryV2: (ledger)=>new BookingCopilotTaskRuntimeV2(ledger),
-    createPlannerV2: createDshEmbeddedBookingPlannerV2,
     startServer: startBookingCopilotServer
 };
 function parsePort(raw) {
@@ -31,10 +28,10 @@ export function resolveBookingCopilotStartupConfig(env = process.env) {
     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.includes(ingressMode)) {
-        throw new Error('booking_copilot_v2_ingress_mode_invalid');
+    if (!BOOKING_COPILOT_INGRESS_MODES.includes(ingressMode)) {
+        throw new Error('booking_copilot_ingress_mode_invalid');
     }
     return {
         apiKey,
@@ -45,12 +42,11 @@ export function resolveBookingCopilotStartupConfig(env = process.env) {
         ingressMode: ingressMode
     };
 }
-async function closeAll(server, planner, plannerV2, ledger) {
+async function closeAll(server, planner, ledger) {
     const failures = [];
     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;
@@ -68,14 +64,14 @@ export async function startBookingCopilotFromEnvironment(env = process.env, depe
     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 = ingressPair ? 'bff-ingress-binding' : 'bff-bound-turn-only';
     mkdirSync(config.stateRoot, {
@@ -83,7 +79,6 @@ export async function startBookingCopilotFromEnvironment(env = process.env, depe
     });
     let ledger;
     let planner;
-    let plannerV2;
     let server;
     try {
         ledger = dependencies.ensureLedger(config.stateRoot);
@@ -91,29 +86,24 @@ export async function startBookingCopilotFromEnvironment(env = process.env, depe
             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,
+            ...ingressPair ? {
                 ingressBinding: activeDependencies.ingressBinding,
-                principal: activeDependencies.principal,
-                ingressMode: activeIngressMode
-            },
+                principal: activeDependencies.principal
+            } : {},
+            ingressMode: activeIngressMode,
             host: config.host,
             port: config.port,
             artifactId: config.artifactId
         });
     } catch (error) {
         try {
-            await closeAll(server, planner, plannerV2, ledger);
+            await closeAll(server, planner, ledger);
         } catch (cleanupError) {
             throw new AggregateError([
                 error,
@@ -128,7 +118,7 @@ export async function startBookingCopilotFromEnvironment(env = process.env, depe
         async close () {
             if (closed) return;
             closed = true;
-            await closeAll(server, planner, plannerV2, ledger);
+            await closeAll(server, planner, ledger);
         }
     };
 }