@danceiny/gotry 0.2.0-rc.32 → 0.2.0-rc.33

package/dist/scripts/nightly-evidence.js

@@ -32,6 +32,7 @@ import { appendFileSync, mkdirSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { createMockLlm } from '../src/mock-llm.js';
 import { createOpenAICompatLlm } from '../src/dsh-llm.js';
+import { loadPriceTable, priceRunCost } from '../src/llm-price-table.js';
 import { newState, runTurn } from '../src/loop.js';
 import { solveUnified } from '../src/unified.js';
 import { realtimeSolvePort } from '../src/realtime-pricing.js';
@@ -50,9 +51,6 @@ function canonical(value) {
 function sha256Of(value) {
     return createHash('sha256').update(canonical(value)).digest('hex');
 }
-function round6(value) {
-    return Number(value.toFixed(6));
-}
 export function loadPromptSet(path) {
     const raw = JSON.parse(readFileSync(path, 'utf8'));
     if (raw['schema_version'] !== 'gotry_m3_nightly_prompt_set_v1') {
@@ -64,114 +62,9 @@ export function loadPromptSet(path) {
     }
     return { schema_version: 'gotry_m3_nightly_prompt_set_v1', description: raw['description'], turns: turns };
 }
-function assertPriceEntry(label, value) {
-    const entry = typeof value === 'object' && value !== null ? value : null;
-    if (!entry)
-        throw new Error(`${label} must be an object`);
-    for (const field of ['input_cache_miss_usd_per_1m_peak', 'input_cache_hit_usd_per_1m_peak', 'output_usd_per_1m_peak']) {
-        const num = entry[field];
-        if (typeof num !== 'number' || !Number.isFinite(num) || num < 0) {
-            throw new Error(`${label}.${field} must be a non-negative finite number`);
-        }
-    }
-    return value;
-}
-export function loadPriceTable(path) {
-    const raw = JSON.parse(readFileSync(path, 'utf8'));
-    const schemaVersion = raw['schema_version'];
-    if (schemaVersion === 'gotry_llm_price_table_v2') {
-        return loadPriceTableV2(raw);
-    }
-    if (schemaVersion === 'gotry_llm_price_table_v1') {
-        return loadPriceTableV1(raw);
-    }
-    throw new Error(`price table schema_version must be gotry_llm_price_table_v1 or _v2, got: ${String(schemaVersion)}`);
-}
-function loadPriceTableV1(raw) {
-    const aliases = typeof raw['aliases'] === 'object' && raw['aliases'] !== null ? raw['aliases'] : {};
-    for (const [from, to] of Object.entries(aliases)) {
-        if (typeof to !== 'string')
-            throw new Error(`price table alias ${from} must map to a model name`);
-    }
-    const prices = {};
-    for (const [name, entry] of Object.entries(typeof raw['prices'] === 'object' && raw['prices'] !== null ? raw['prices'] : {})) {
-        prices[name] = assertPriceEntry(`price table entry ${name}`, entry);
-    }
-    return { schema_version: 'gotry_llm_price_table_v1', aliases, prices };
-}
-/** v2 reader:providers.<id>.models.<model> 平铺为统一的 aliases/prices 双表,外暴露 API 不变。
- *  lookup 规则:给定 model 名 →
- *    1. 若在 aliases 表中,跳到别名目标(qualified `providerId:model`);
- *    2. 否则直接以 qualified `providerId:model` 在 prices 中查找;
- *    3. 否则尝试裸 `model` 键(单 provider 时透明,如 MiniMax-M3 在 minimax:models 下唯一);
- *    4. 仍找不到 → fail-closed。 */
-function loadPriceTableV2(raw) {
-    const providersObj = typeof raw['providers'] === 'object' && raw['providers'] !== null ? raw['providers'] : null;
-    if (!providersObj)
-        throw new Error('price table v2 requires providers object');
-    const aliases = {};
-    const prices = {};
-    for (const [providerId, rawProvider] of Object.entries(providersObj)) {
-        const provider = assertProviderEntry(`price table provider ${providerId}`, rawProvider);
-        for (const [aliasName, target] of Object.entries(provider.aliases)) {
-            if (typeof target !== 'string')
-                throw new Error(`provider ${providerId} alias ${aliasName} must map to a model name`);
-            if (!provider.models[target]) {
-                throw new Error(`provider ${providerId} alias ${aliasName} -> ${target} has no entry; update data/llm-price-table.json via PR`);
-            }
-            aliases[aliasName] = target;
-        }
-        for (const [modelName, entry] of Object.entries(provider.models)) {
-            const qualified = `${providerId}:${modelName}`;
-            const validated = assertPriceEntry(`price table provider ${providerId} model ${modelName}`, entry);
-            if (prices[qualified])
-                throw new Error(`duplicate price table key ${qualified}`);
-            prices[qualified] = validated;
-            if (prices[modelName])
-                throw new Error(`duplicate price table key ${modelName} (across providers, disambiguate via aliases or qualified lookup)`);
-            prices[modelName] = validated;
-        }
-    }
-    return { schema_version: 'gotry_llm_price_table_v2', aliases, prices };
-}
-function assertProviderEntry(label, value) {
-    const entry = typeof value === 'object' && value !== null ? value : null;
-    if (!entry)
-        throw new Error(`${label} must be an object`);
-    const family = entry['family'];
-    if (typeof family !== 'string' || family.length === 0)
-        throw new Error(`${label}.family must be a non-empty string`);
-    const strategy = entry['price_strategy'];
-    if (strategy !== 'tiered_peak_offpeak' && strategy !== 'flat_no_offpeak') {
-        throw new Error(`${label}.price_strategy must be 'tiered_peak_offpeak' or 'flat_no_offpeak', got: ${String(strategy)}`);
-    }
-    const aliases = typeof entry['aliases'] === 'object' && entry['aliases'] !== null ? entry['aliases'] : {};
-    const models = typeof entry['models'] === 'object' && entry['models'] !== null ? entry['models'] : {};
-    return {
-        family,
-        price_strategy: strategy,
-        api_base: typeof entry['api_base'] === 'string' ? entry['api_base'] : undefined,
-        source_url: typeof entry['source_url'] === 'string' ? entry['source_url'] : undefined,
-        aliases,
-        models,
-    };
-}
-/** 换算单次运行成本(peak 保守上界:全部输入按 cache miss 峰价计,只高不低)。 */
-export function priceRunCost(model, usage, table) {
-    if (usage.responsesMissingUsage > 0) {
-        throw new Error(`usage provider omitted usage on ${usage.responsesMissingUsage} response(s) — cost unprovable, refusing to price (fail-closed)`);
-    }
-    const alias = table.aliases[model];
-    if (alias && !table.prices[alias])
-        throw new Error(`price table alias ${model} -> ${alias} has no entry; update data/llm-price-table.json via PR`);
-    const entry = table.prices[alias ?? model];
-    if (!entry)
-        throw new Error(`price table has no entry for model ${model}; update data/llm-price-table.json via PR (fail-closed, no guessed price)`);
-    const cost = (usage.inputCacheMissTokens * entry.input_cache_miss_usd_per_1m_peak
-        + usage.inputCacheHitTokens * entry.input_cache_hit_usd_per_1m_peak
-        + usage.outputTokens * entry.output_usd_per_1m_peak) / 1_000_000;
-    return round6(cost);
-}
+// The frozen price table (ADR-20) and its pricing function live in src/llm-price-table.ts so the AaaS quota meter prices
+// through the same code; they are re-exported here for the nightly producer and its callers.
+export { loadPriceTable, priceRunCost };
 /** 记录构建(确定性:同内容同 executed_at => 同 run_key)。写入前由消费方 parseNightlyRun 校验。 */
 export function buildNightlyRunRecord(input) {
     const { schema_version, executed_at, real_llm, prompt_set_sha256, output_sha256, cost_usd } = input;

package/dist/scripts/session-tests.js

@@ -877,7 +877,7 @@ console.log('M. Dida 门户(entry 守域 + 信封走形 + 闸面)');
     const planRt = planFlightGuiActions({ from: '香港', to: '迪拜', date: '2026-12-06', backDate: '2026-12-13' });
     assert(planRt.some(a => a.t === 'clickTripTab' && a.trip === 'roundtrip') && planRt.some(a => a.t === 'setDate' && a.which === 'back'), '往返规划:往返 tab + 回程日期(不知 URL 形状也能搜)');
     const rb = planRt.find(a => a.t === 'readback');
-    assert(!!rb && rb.t === 'readback' && rb.expect.back === '2026-12-13', 'readback 期望含回程日期');
+    assert(!!rb && rb.t === 'readback' && rb.expect.legs[0]?.back === '2026-12-13', 'readback 期望含回程日期(legs 形状)');
     // 安全白名单:闭集外/提交件文本/非固定入口/坏日期/坏按键全拒
     assert(!assertGuiPlanSafe([{ t: 'goto', url: 'https://evil.example.com/' }]).ok, '安全闸:非固定入口 URL 拒绝');
     assert(!assertGuiPlanSafe([{ t: 'typeCity', which: 'from', text: '立即下单' }]).ok, '安全闸:城市位提交件文本拒绝(写面红线)');
@@ -897,7 +897,7 @@ console.log('M. Dida 门户(entry 守域 + 信封走形 + 闸面)');
             { departDate: '/Date(1792252800000+0800)/', price: 760 },
         ] });
     const makeFakeDriver = (opts = {}) => {
-        const state = { clickedSearch: false, form: { from: '', to: '', dep: '', back: '' } };
+        const state = { clickedSearch: false, drives: 0, form: { from: '', to: '', dep: '', back: '' } };
         const page = {
             async goto() { },
             async clickTripTab() { },
@@ -910,12 +910,16 @@ console.log('M. Dida 门户(entry 守域 + 信封走形 + 闸面)');
             async cityFieldValues() { const f = { ...state.form, ...opts.formOverride }; return { from: f.from ?? '', to: f.to ?? '' }; },
             async pageText() { return opts.challenge ? '请输入验证码 拖动滑块' : '机票预订'; },
             async currentUrl() { return opts.listUrl ?? 'https://flights.ctrip.com/online/channel/domestic'; },
+            async waitForHumanLogin() { return opts.loginResult ?? false; },
             async waitForApiCapture() {
-                const itinerary = opts.apiBody === undefined
-                    ? { url: 'https://flights.ctrip.com/international/search/api/search/batchSearch', body: FIXTURE }
-                    : opts.apiBody ? { url: 'x', body: opts.apiBody } : null;
-                const calendar = opts.calendarBody ? { url: 'https://m.ctrip.com/restapi/soa2/15380/bjjson/FlightIntlAndInlandLowestPriceSearch', body: opts.calendarBody } : null;
-                return (itinerary || calendar) ? { ...(itinerary ? { itinerary } : {}), ...(calendar ? { calendar } : {}) } : null;
+                state.drives += 1;
+                const first = state.drives === 1;
+                const itinerary = first
+                    ? (opts.apiBody === undefined ? { url: 'https://flights.ctrip.com/international/search/api/search/batchSearch', body: FIXTURE } : opts.apiBody ? { url: 'x', body: opts.apiBody } : null)
+                    : (opts.afterLoginBody ? { url: 'x', body: opts.afterLoginBody } : null);
+                const calendar = first && opts.calendarBody ? { url: 'https://m.ctrip.com/restapi/soa2/15380/bjjson/FlightIntlAndInlandLowestPriceSearch', body: opts.calendarBody } : null;
+                const probe = first && opts.loginProbe ? { url: 'x', body: '{"data":null,"needUserLogin":true}' } : undefined;
+                return (itinerary || calendar || probe) ? { ...(itinerary ? { itinerary } : {}), ...(calendar ? { calendar } : {}), ...(probe ? { loginProbe: probe } : {}) } : null;
             },
         };
         return { driver: { open: async () => page, close: async () => { } }, state };
@@ -950,7 +954,7 @@ console.log('M. Dida 门户(entry 守域 + 信封走形 + 闸面)');
     const cityDriver = makeFakeDriver({ formOverride: { from: '北京(BJS)' } }); // 城市打进别的框(live 实测形态)
     __setGuiDriverForTest(() => cityDriver.driver);
     const g2b = await runFlightGuiSearch({ from: '上海', to: '丽江', date: '2027-05-02' });
-    assert(g2b.ok === false && /出发城市框未确认/.test(g2b.error ?? '') && cityDriver.state.clickedSearch === false, 'readback 逐字段:城市框错位(全局框假阳)→ 终止', g2b);
+    assert(g2b.ok === false && /城市框未确认/.test(g2b.error ?? '') && cityDriver.state.clickedSearch === false, 'readback 逐字段:城市框错位(全局框假阳)→ 终止', g2b);
     __setGuiDriverForTest(() => makeFakeDriver({ challenge: true }).driver);
     const g3 = await runFlightGuiSearch({ from: '上海', to: '丽江', date: '2027-05-02' });
     assert(g3.ok === false && g3.verdict === 'challenged', '风控页 → challenged(不重试不绕过)', g3);
@@ -974,6 +978,35 @@ console.log('M. Dida 门户(entry 守域 + 信封走形 + 闸面)');
     const rtUrl = buildEntryUrl('香港', '迪拜', '2026-11-13', {}, '2026-11-17');
     assert(rtUrl.ok === true && rtUrl.url === 'https://flights.ctrip.com/online/list/round-hkg0-dxb0?depdate=2026-11-13_2026-11-17&cabin=y_s&adult=1&child=0&infant=0', '往返 URL=GUI 教师实证形状(round-{code}0)', rtUrl);
     __setGuiDriverForTest(null);
+    // N. GUI 登录态配对 + 多程(2026-10-15,#661/#663/#664 余尾收口)
+    {
+        console.log('N. 登录态配对(interactiveLogin)+ 多程规划');
+        // 多程规划:multi tab + 逐段(城市×2+日期)动作 + legs readback
+        const planMc = planFlightGuiActions({ from: '', to: '', date: '', legs: [
+                { from: '香港', to: '迪拜', date: '2026-12-06' },
+                { from: '迪拜', to: '上海', date: '2026-12-10' },
+            ] });
+        assert(planMc.some(a => a.t === 'clickTripTab' && a.trip === 'multi'), '多程规划:点 multi tab');
+        assert(planMc.filter(a => a.t === 'setDate').length === 2 && planMc.some(a => a.t === 'setDate' && a.seg === 2), '多程规划:逐段日期(seg 维度)');
+        assert(!assertGuiPlanSafe([{ t: 'typeCity', which: 'from', text: '香港', seg: 4 }]).ok, '安全闸:seg 闭集(1–3)外拒绝');
+        // 登录配对(机票):首驾只有日历+needUserLogin 探测 → 等人登录 → 重驾拿行程 → anonymous=false
+        const loginDriver = makeFakeDriver({ apiBody: null, calendarBody: CAL_FIXTURE, loginProbe: true, loginResult: true, afterLoginBody: FIXTURE });
+        __setGuiDriverForTest(() => loginDriver.driver);
+        const n1 = await runFlightGuiSearch({ from: '上海', to: '丽江', date: '2026-11-13', interactiveLoginMs: 60_000 });
+        assert(n1.ok === true && (n1.options?.length ?? 0) === 1 && n1.anonymous === false, '登录配对(机票):探测→等人登录→重驾→行程明细 hit,anonymous=false', n1);
+        assert(/本人已在本窗口官方页登录/.test(n1.evidence), '登录态证据链标注');
+        // 登录等待超时:needs-login 终态(不冒充成功)
+        const timeoutDriver = makeFakeDriver({ apiBody: null, calendarBody: CAL_FIXTURE, loginProbe: true, loginResult: false });
+        __setGuiDriverForTest(() => timeoutDriver.driver);
+        const n2 = await runFlightGuiSearch({ from: '上海', to: '丽江', date: '2026-11-13', interactiveLoginMs: 60_000 });
+        assert(n2.ok === false && n2.verdict === 'needs-login' && /登录等待超时/.test(n2.error ?? ''), '登录等待超时 → needs-login 终态', n2);
+        // 未授权等待(interactiveLoginMs 缺省):保持匿名日历面,不弹登录
+        const anonDriver = makeFakeDriver({ apiBody: null, calendarBody: CAL_FIXTURE, loginProbe: true });
+        __setGuiDriverForTest(() => anonDriver.driver);
+        const n3 = await runFlightGuiSearch({ from: '上海', to: '丽江', date: '2026-11-13' });
+        assert(n3.ok === true && (n3.calendar?.length ?? 0) === 3 && n3.anonymous === true, '未授权等待:保持匿名日历面(默认行为不变)', n3);
+        __setGuiDriverForTest(null);
+    }
 }
 // M. 携程酒店 GUI 车道(2026-10-14,#664 首片):规划/安全闸/readback/needs-login 边界
 {
@@ -1003,6 +1036,7 @@ console.log('M. Dida 门户(entry 守域 + 信封走形 + 闸面)');
             async destFieldValue() { return (opts.formOverride?.to ?? state.form.to) + '(测试)'; },
             async pageText() { return '酒店预订'; },
             async currentUrl() { return state.url; },
+            async waitForHumanLogin() { return false; },
             async waitForApiBody() {
                 if (opts.passportAfterSearch)
                     return null;