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

package/dist/scripts/booking-copilot-crossrepo-fixture-server.js

@@ -2,13 +2,33 @@ import { mkdtempSync, rmSync } from 'node:fs';
 import { join } from 'node:path';
 import { tmpdir } from 'node:os';
 import { ensureLedger } from '../src/state-ledger.js';
-import { BOOKING_SURFACE_SCHEMA_SHA256, BOOKING_SURFACE_SCHEMA_VERSION } from '../src/booking-surface/contracts.js';
+import { BOOKING_SURFACE_ALLOWED_ACTIONS, BOOKING_SURFACE_SCHEMA_SHA256, BOOKING_SURFACE_SCHEMA_VERSION } from '../src/booking-surface/contracts.js';
 import { BookingCopilotTaskRuntime } from '../src/booking-surface/runtime.js';
 import { startBookingCopilotServer } from '../src/booking-surface/server.js';
+import '../src/booking-surface/runtime.js';
 const API_KEY = 'test-only-cross-repo-key';
 const stateRoot = mkdtempSync(join(tmpdir(), 'gotry-booking-copilot-crossrepo-'));
 const ledger = ensureLedger(stateRoot);
 let sequence = 0;
+const principal = {
+    subject: 'fixture-crossrepo-bff',
+    scope: 'booking:read'
+};
+const ingressMode = 'bff-ingress-binding';
+const ingressBinding = {
+    bind (input) {
+        const surface = input.surfaceHint;
+        return {
+            taskId: `fixture-task-${input.requestKey}`,
+            turnId: `fixture-turn-${input.requestKey}`,
+            contextRef: `ctx-fixture-${input.requestKey}`,
+            surface,
+            allowedActions: [
+                ...BOOKING_SURFACE_ALLOWED_ACTIONS[surface]
+            ]
+        };
+    }
+};
 const plannerFactory = (initialTask)=>{
     let receiptObserved = initialTask.lastReceipt !== undefined;
     return {
@@ -26,6 +46,23 @@ const plannerFactory = (initialTask)=>{
                     }
                 ];
             }
+            if (turn.kind === 'user.turn' && turn.request.approval) {
+                return [
+                    {
+                        kind: 'operation',
+                        action: {
+                            schemaVersion: BOOKING_SURFACE_SCHEMA_VERSION,
+                            kind: 'search.run',
+                            actionId: 'cross-repo-action-2',
+                            contextRef: task.contextRef,
+                            expectedRevision: task.revision,
+                            reason: 'Run the approved relaxed search.',
+                            factRefs: [],
+                            input: {}
+                        }
+                    }
+                ];
+            }
             if (receiptObserved) {
                 return [
                     {
@@ -77,6 +114,9 @@ async function main() {
         apiKey: API_KEY,
         runtime,
         plannerFactory,
+        ingressBinding,
+        principal,
+        ingressMode,
         host: '127.0.0.1',
         port: 0
     });

package/dist/scripts/booking-copilot-dsh-core-proof-tests.js

@@ -3,9 +3,9 @@ import { createServer } from 'node:http';
 import { mkdtempSync, rmSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
-import { createDshEmbeddedBookingPlanner, createDshEmbeddedBookingPlannerV2, DSH_EMBEDDED_BOOKING_TOOL_NAMES } from '../src/booking-surface/dsh-planner.js';
+import { createDshEmbeddedBookingPlanner, DSH_EMBEDDED_BOOKING_TOOL_NAMES } from '../src/booking-surface/dsh-planner.js';
 const action = {
-    schemaVersion: 'booking.surface.v1',
+    schemaVersion: 'booking.surface',
     kind: 'search.run',
     actionId: 'action-real-dsh-1',
     contextRef: 'ctx-real-dsh-1',
@@ -32,6 +32,7 @@ function objectKeys(value) {
 }
 const requests = [];
 let modelCall = 0;
+let continuationServed = false;
 const modelServer = createServer((req, res)=>{
     const parts = [];
     req.on('data', (part)=>parts.push(part));
@@ -42,10 +43,11 @@ const modelServer = createServer((req, res)=>{
             body
         });
         modelCall += 1;
-        if (modelCall === 1) {
+        if (!continuationServed && JSON.stringify(body).includes('action.receipt.continuation')) {
+            continuationServed = true;
             sse(res, [
                 {
-                    id: 'chatcmpl-booking-1',
+                    id: 'chatcmpl-booking-continuation',
                     object: 'chat.completion.chunk',
                     created: 0,
                     model: 'deepseek-v4-flash',
@@ -57,14 +59,18 @@ const modelServer = createServer((req, res)=>{
                                 tool_calls: [
                                     {
                                         index: 0,
-                                        id: 'call-booking-1',
+                                        id: 'call-booking-continuation',
                                         type: 'function',
                                         function: {
                                             name: 'booking_search_hotels',
                                             arguments: JSON.stringify({
                                                 decision: {
-                                                    kind: 'operation',
-                                                    action
+                                                    kind: 'terminal',
+                                                    terminal: {
+                                                        status: 'stopped',
+                                                        summary: 'receipt continuation handled',
+                                                        factRefs: []
+                                                    }
                                                 }
                                             })
                                         }
@@ -73,20 +79,15 @@ const modelServer = createServer((req, res)=>{
                             },
                             finish_reason: 'tool_calls'
                         }
-                    ],
-                    usage: {
-                        prompt_tokens: 10,
-                        completion_tokens: 5,
-                        total_tokens: 15
-                    }
+                    ]
                 }
             ]);
             return;
         }
-        if (modelCall === 3) {
+        if (modelCall === 1) {
             sse(res, [
                 {
-                    id: 'chatcmpl-booking-v2-continuation',
+                    id: 'chatcmpl-booking-1',
                     object: 'chat.completion.chunk',
                     created: 0,
                     model: 'deepseek-v4-flash',
@@ -98,18 +99,14 @@ const modelServer = createServer((req, res)=>{
                                 tool_calls: [
                                     {
                                         index: 0,
-                                        id: 'call-booking-v2-continuation',
+                                        id: 'call-booking-1',
                                         type: 'function',
                                         function: {
                                             name: 'booking_search_hotels',
                                             arguments: JSON.stringify({
                                                 decision: {
-                                                    kind: 'terminal',
-                                                    terminal: {
-                                                        status: 'stopped',
-                                                        summary: 'v2 continuation handled',
-                                                        factRefs: []
-                                                    }
+                                                    kind: 'operation',
+                                                    action
                                                 }
                                             })
                                         }
@@ -118,7 +115,12 @@ const modelServer = createServer((req, res)=>{
                             },
                             finish_reason: 'tool_calls'
                         }
-                    ]
+                    ],
+                    usage: {
+                        prompt_tokens: 10,
+                        completion_tokens: 5,
+                        total_tokens: 15
+                    }
                 }
             ]);
             return;
@@ -156,7 +158,7 @@ const address = modelServer.address();
 assert.ok(typeof address === 'object' && address);
 const stateRoot = mkdtempSync(join(tmpdir(), 'gotry-booking-dsh-core-'));
 const workspace = {
-    schemaVersion: 'booking.surface.v1',
+    schemaVersion: 'booking.surface',
     contextRef: action.contextRef,
     surface: 'tenant',
     revision: 0,
@@ -177,24 +179,27 @@ const workspace = {
     }
 };
 const turn = {
-    schemaVersion: 'booking.surface.v1',
+    schemaVersion: 'booking.surface',
     kind: 'user.turn',
     taskId: 'task-real-dsh-1',
-    workspace: {
-        ...workspace,
-        capabilities: {
-            ...workspace.capabilities,
-            allowedActions: [
-                ...workspace.capabilities.allowedActions
-            ]
-        }
-    },
+    turnId: 'real-dsh-turn-1',
+    workspace,
     request: {
         text: '执行当前酒店搜索'
     }
 };
+const availability = {
+    initialized: true,
+    recoveryStarted: false,
+    availabilityPhase: 'need_offers',
+    activeHotelOrdinal: 0,
+    hotelRefs: [],
+    hotels: {},
+    attempts: [],
+    queryReservations: []
+};
 const task = {
-    schemaVersion: 'booking.surface.v1',
+    schemaVersion: 'booking.surface',
     taskId: 'task-real-dsh-1',
     contextRef: action.contextRef,
     surface: 'tenant',
@@ -203,9 +208,12 @@ const task = {
         'search.run'
     ],
     userTurnCount: 1,
-    lastUserTurnDigest: 'digest-only',
+    lastTurnId: 'real-dsh-turn-1',
+    operationCount: 0,
     phase: 'planning',
-    lastSequence: 0
+    lastSequence: 0,
+    availability,
+    workspaceSnapshot: workspace
 };
 let planner;
 try {
@@ -220,7 +228,8 @@ try {
         },
         maxTokens: 512
     });
-    const decisions = await planner.plannerFactory(task).next({
+    const session = planner.plannerFactory(task);
+    const decisions = await session.next({
         turn,
         task
     });
@@ -234,68 +243,27 @@ try {
     const toolNames = requests[0].body.tools.map((tool)=>tool.function.name).sort();
     assert.deepEqual(toolNames, [
         ...DSH_EMBEDDED_BOOKING_TOOL_NAMES
-    ].sort(), 'real model request exposes exactly the seven embedded tools');
+    ].sort(), 'real model request exposes exactly the six embedded tools');
     assert.ok(!toolNames.some((name)=>/gotry_book|payment|holder|guest/i.test(name)), 'real model request exposes no booking write or PII tool');
     const executableKeys = requests[0].body.tools.flatMap((tool)=>objectKeys(tool.function.parameters));
     assert.ok(!executableKeys.some((key)=>/^(book|payment|holder|guest|portalToken|supplierCost)$/i.test(key)), 'tool inputs expose no write or PII field');
     assert.equal(requests[0].headers.authorization, 'Bearer fixture-model-key');
     assert.ok(!JSON.stringify(requests).includes('must-not-enter-dsh'), 'BFF and portal credentials never enter the dsh model transport');
-    const v2Workspace = {
-        schemaVersion: 'booking.surface.v2',
-        contextRef: 'ctx-real-dsh-v2',
-        surface: 'tenant',
-        revision: 1,
-        locale: 'en-US',
-        currency: 'AED',
-        searchDraft: {},
-        results: {
-            status: 'idle'
-        },
-        visibleHotels: [],
-        loadedOffers: [],
-        shortlistedOfferRefs: [],
-        capabilities: {
-            surface: 'tenant',
-            allowedActions: [
-                'search.run'
-            ]
-        }
-    };
-    const v2Task = {
-        schemaVersion: 'booking.surface.v2',
-        taskId: 'task-real-dsh-v2',
-        contextRef: v2Workspace.contextRef,
-        surface: 'tenant',
-        revision: 1,
-        allowedActions: [
-            'search.run'
-        ],
-        userTurnCount: 1,
-        operationCount: 1,
-        phase: 'planning',
-        lastSequence: 1,
-        availability: {
-            initialized: true,
-            recoveryStarted: false,
-            availabilityPhase: 'need_offers',
-            activeHotelOrdinal: 0,
-            hotelRefs: [],
-            hotels: {},
-            attempts: [],
-            queryReservations: []
-        },
-        workspaceSnapshot: v2Workspace
-    };
-    const v2Continuation = {
-        schemaVersion: 'booking.surface.v2',
+    const proseDecisions = await session.next({
+        turn,
+        task
+    });
+    assert.equal(proseDecisions[0]?.kind, 'error', 'assistant prose without a tool call never becomes a decision');
+    const continuation = {
+        schemaVersion: 'booking.surface',
         kind: 'action.receipt.continuation',
-        taskId: v2Task.taskId,
-        workspace: v2Workspace,
+        taskId: task.taskId,
+        workspace,
         receipt: {
-            schemaVersion: 'booking.surface.v2',
+            schemaVersion: 'booking.surface',
             kind: 'action.receipt',
-            actionId: 'action-real-dsh-v2',
-            contextRef: v2Workspace.contextRef,
+            actionId: action.actionId,
+            contextRef: workspace.contextRef,
             status: 'applied',
             revision: 1,
             observation: {
@@ -312,36 +280,23 @@ try {
             }
         }
     };
-    const v2Planner = await createDshEmbeddedBookingPlannerV2({
-        stateRoot,
-        env: {
-            PATH: process.env.PATH,
-            DEEPSEEK_API_KEY: 'fixture-model-key',
-            DEEPSEEK_BASE_URL: `http://127.0.0.1:${address.port}/v1`
-        },
-        maxTokens: 512
+    const continuationDecisions = await session.next({
+        turn: continuation,
+        task: {
+            ...task,
+            lastReceipt: continuation.kind === 'action.receipt.continuation' ? continuation.receipt : undefined
+        }
     });
-    try {
-        const continuationDecisions = await v2Planner.plannerFactory(v2Task).next({
-            turn: v2Continuation,
-            task: {
-                ...v2Task,
-                lastReceipt: v2Continuation.receipt
-            }
-        });
-        assert.deepEqual(continuationDecisions, [
-            {
-                kind: 'terminal',
-                terminal: {
-                    status: 'stopped',
-                    summary: 'v2 continuation handled',
-                    factRefs: []
-                }
+    assert.deepEqual(continuationDecisions, [
+        {
+            kind: 'terminal',
+            terminal: {
+                status: 'stopped',
+                summary: 'receipt continuation handled',
+                factRefs: []
             }
-        ], 'real dsh v2 accepts action.receipt.continuation through the typed planner seam');
-    } finally{
-        await v2Planner.close();
-    }
+        }
+    ], 'real dsh accepts action.receipt.continuation through the typed planner seam');
 } finally{
     await planner?.close();
     await new Promise((resolve, reject)=>modelServer.close((error)=>error ? reject(error) : resolve()));