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

package/dist/capabilities/session/gui-hotel.js

@@ -0,0 +1,413 @@
+/**
+ * 携程酒店 GUI 车道(2026-10-14,#664 首片):gotry 隔离匿名窗口驱动 hotels.ctrip.com
+ * PC 检索表单(目的地/入住/退房),被动收站点自己的酒店列表回包——城市解析交给站点
+ * 自动补全(cityId 码表退出主链路),匿名公开价(非登录态价)。
+ *
+ * 与机票 GUI 车道(gui-flight.ts)同构:动作闭集 + 提交件黑名单 + readback 硬闸 +
+ * 可注入 driver;复用 ctrip-hotel 适配器的三态分类器(classifyCtripHotelList:
+ * parsed/recognized-empty/unrecognized——只有显式空列表才算 miss,绝不猜)。
+ * 证据链 [会话:ctrip-hotel-gui@ts],恒标 anonymous。
+ */
+import { mkdtempSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { isSubmitText } from './read-guard.js';
+import { HOTEL_NETWORK_HINTS, looksLikeHotelListBody, classifyCtripHotelList } from './adapters/ctrip-hotel.js';
+export const HOTEL_GUI_HOME = 'https://hotels.ctrip.com/';
+const YMD = /^\d{4}-\d{2}-\d{2}$/;
+const GUI_CHALLENGE_RE = /验证|校验|拖动滑块|请输入验证码/;
+/** 纯函数:查询 → 动作序列(离线测试锚点) */
+export function planHotelGuiActions(q) {
+    return [
+        { t: 'goto', url: HOTEL_GUI_HOME },
+        { t: 'typeCity', text: q.to },
+        { t: 'pickSuggest', text: q.to },
+        { t: 'setDate', which: 'in', ymd: q.checkIn },
+        { t: 'setDate', which: 'out', ymd: q.checkOut },
+        { t: 'press', key: 'Escape' },
+        { t: 'readback', expect: { to: q.to, checkIn: q.checkIn, checkOut: q.checkOut } },
+        { t: 'clickSearch' },
+        { t: 'awaitApi' },
+    ];
+}
+/** 安全白名单(与机票车道同款纪律) */
+export function assertHotelPlanSafe(plan) {
+    for (const a of plan) {
+        switch (a.t) {
+            case 'goto':
+                if (a.url !== HOTEL_GUI_HOME)
+                    return { ok: false, error: `GUI 车道只允许固定入口 ${HOTEL_GUI_HOME}` };
+                break;
+            case 'typeCity':
+            case 'pickSuggest': {
+                const text = a.text.trim();
+                if (!text || text.length > 24)
+                    return { ok: false, error: `目的地文本非法:${text.slice(0, 30)}` };
+                if (isSubmitText(text))
+                    return { ok: false, error: `目的地位提交件文本,拒绝:${text}` };
+                break;
+            }
+            case 'setDate':
+                if (!YMD.test(a.ymd))
+                    return { ok: false, error: `日期需 YYYY-MM-DD,实际 ${a.ymd}` };
+                break;
+            case 'press':
+                if (a.key !== 'Escape' && a.key !== 'Enter')
+                    return { ok: false, error: `按键白名单外:${a.key}` };
+                break;
+            case 'clickSearch':
+            case 'awaitApi':
+                break;
+            case 'readback':
+                for (const v of [a.expect.to, a.expect.checkIn, a.expect.checkOut]) {
+                    if (!v.trim() || v.length > 24)
+                        return { ok: false, error: `readback 期望值非法:${v}` };
+                }
+                break;
+            default:
+                return { ok: false, error: `动作闭集外:${JSON.stringify(a).slice(0, 60)}` };
+        }
+    }
+    return { ok: true };
+}
+let hotelDriverFactory = null;
+export function __setHotelDriverForTest(factory) {
+    hotelDriverFactory = factory;
+}
+export async function runHotelGuiSearch(q) {
+    const started = Date.now();
+    const ts = new Date().toISOString();
+    const fail = (error, verdict = 'error') => ({
+        ok: false, via: 'session-ctrip-hotel-gui-error', latencyMs: Date.now() - started, verdict, error,
+        evidence: `[会话:ctrip-hotel-gui@error@${ts}] ${error.slice(0, 120)}`, anonymous: true,
+    });
+    if (!(q.checkIn < q.checkOut))
+        return fail(`退房日期(${q.checkOut})须晚于入住(${q.checkIn})`);
+    const plan = planHotelGuiActions(q);
+    const safe = assertHotelPlanSafe(plan);
+    if (!safe.ok)
+        return fail(`GUI 计划被安全闸拒绝:${safe.error}`);
+    const budget = q.timeoutMs ?? 90_000;
+    const driver = hotelDriverFactory ? hotelDriverFactory() : await createHotelPlaywrightDriver();
+    let page;
+    try {
+        page = await withDeadline(driver.open(), Math.min(budget, 30_000), 'GUI 浏览器窗口启动失败/超时(本机需已装 Chrome)');
+    }
+    catch (e) {
+        await driver.close().catch(() => { });
+        return fail(e.message.slice(0, 400));
+    }
+    let api = null;
+    let listUrl = '';
+    try {
+        for (const a of plan) {
+            const remain = budget - (Date.now() - started);
+            if (remain <= 0)
+                return fail(`GUI 预算耗尽(${budget}ms)`);
+            const step = (p, what) => withDeadline(p, Math.min(remain, 20_000), `GUI 步骤失败(${what})`);
+            switch (a.t) {
+                case 'goto':
+                    await step(page.goto(a.url), '打开携程酒店首页');
+                    break;
+                case 'typeCity':
+                    await step(page.typeCity(a.text), '填写目的地');
+                    break;
+                case 'pickSuggest':
+                    await step(page.pickSuggest(a.text), '选择目的地补全');
+                    break;
+                case 'setDate':
+                    await step(page.setDate(a.which, a.ymd), `设置${a.which === 'in' ? '入住' : '退房'}日期`);
+                    break;
+                case 'press':
+                    await step(page.press(a.key), `按键 ${a.key}`);
+                    break;
+                case 'clickSearch':
+                    await step(page.clickSearch(), '点击搜索');
+                    // live 校准(2026-10-14):hotels list 对匿名窗口强制跳 passport 登录——
+                    // 诚实判 needs-login(不绕过、不重试),登录态走 bridge 车道。
+                    {
+                        const after = await page.currentUrl().catch(() => '');
+                        if (/passport\.ctrip\.com\/.*login/i.test(after)) {
+                            return fail('酒店列表需登录态:匿名窗口被重定向到携程登录页(红线:不自动登录)——gotry_session_login 为用户打开官方登录入口后走 bridge 车道(ui 默认),或登录后重试', 'needs-login');
+                        }
+                    }
+                    break;
+                case 'readback': {
+                    const dest = await step(page.destFieldValue(), '读回目的地框');
+                    const form = await step(page.visibleFormText(), '读回表单');
+                    if (!dest.includes(a.expect.to)) {
+                        return fail(`readback 硬闸:目的地框未确认「${a.expect.to}」(实际「${dest.slice(0, 30)}」)——已终止,未发起搜索`);
+                    }
+                    // live 校准:酒店表单日期显示为本地化格式(如 11月13日(周五))而非 YMD——双格式核对
+                    const dateShown = (ymd) => {
+                        const cn = `${Number(ymd.slice(5, 7))}月${Number(ymd.slice(8, 10))}日`;
+                        return form.includes(ymd) || form.includes(cn);
+                    };
+                    for (const [label, value] of [['入住日期', a.expect.checkIn], ['退房日期', a.expect.checkOut]]) {
+                        if (!dateShown(value)) {
+                            return fail(`readback 硬闸:${label}「${value}」未在表单确认(表单摘要:${form.slice(0, 200)})——已终止,未发起搜索`);
+                        }
+                    }
+                    break;
+                }
+                case 'awaitApi': {
+                    const text = await step(page.pageText(), '检查页面');
+                    if (GUI_CHALLENGE_RE.test(text)) {
+                        return fail('风控/验证码命中;按红线不重试不绕过,交还用户', 'challenged');
+                    }
+                    api = await step(page.waitForApiBody(Math.min(remain - 500, 18_000)), '等待酒店列表回包');
+                    if (!api) {
+                        const recent = page.recentApiUrls ? (await page.recentApiUrls().catch(() => [])) : [];
+                        const nowUrl = await page.currentUrl().catch(() => '?');
+                        if (/passport\.ctrip\.com\/.*login/i.test(nowUrl)) {
+                            return fail('酒店列表需登录态:匿名窗口被重定向到携程登录页(红线:不自动登录)——gotry_session_login 为用户打开官方登录入口后走 bridge 车道,或登录后重试', 'needs-login');
+                        }
+                        return fail(`酒店列表回包嗅探超时(href=${nowUrl.slice(0, 120)})${recent.length ? ` ‖recent-apis: ${recent.slice(-8).join(' ; ').slice(0, 500)}` : ''}`);
+                    }
+                    break;
+                }
+            }
+        }
+        listUrl = await page.currentUrl().catch(() => '');
+    }
+    catch (e) {
+        return fail(e.message.slice(0, 400));
+    }
+    finally {
+        await driver.close().catch(() => { });
+    }
+    if (!api)
+        return fail('内部不变量失败:api 未结算(awaitApi 已过)');
+    const classified = classifyCtripHotelList(api.body);
+    if (classified.shape === 'unrecognized') {
+        return fail(`酒店列表回包形状未识别(body头:${api.body.replace(/\s+/g, ' ').slice(0, 240)})`);
+    }
+    if (classified.shape === 'malformed') {
+        return fail('酒店列表回包非 JSON(接口改版?)');
+    }
+    const hotels = classified.hotels;
+    const verdict = hotels.length > 0 ? 'hit' : 'miss';
+    return {
+        ok: verdict === 'hit', via: 'session-ctrip-hotel-gui', latencyMs: Date.now() - started, verdict,
+        ...(hotels.length > 0 ? { hotels: hotels.slice(0, 20) } : {}),
+        ...(listUrl ? { listUrl } : {}),
+        evidence: `[会话:ctrip-hotel-gui@${ts}] 匿名 GUI 面检索:${hotels.length} 家(shape=${classified.shape};匿名公开价,非登录态价)`,
+        anonymous: true,
+    };
+}
+async function withDeadline(p, ms, what) {
+    let timer;
+    try {
+        return await Promise.race([
+            p,
+            new Promise((_, reject) => {
+                timer = setTimeout(() => reject(new Error(`${what}:${ms}ms`)), ms);
+            }),
+        ]);
+    }
+    finally {
+        if (timer)
+            clearTimeout(timer);
+    }
+}
+// ── 生产 driver:与机票车道同策略(隔离临时 profile headful Chrome) ──
+const HOTEL_FORM_TEXT = `(() => Array.from(document.querySelectorAll('input'))
+  .map(e => [e.value, e.placeholder].filter(Boolean).join('¤')).join(' | '))()`;
+const HOTEL_DEST_VALUE = `(() => { const els = Array.from(document.querySelectorAll('input')).filter(e => e.offsetParent)
+  const hit = els.find(e => /目的地|城市|地点/.test(e.placeholder || '') && !/搜索/.test(e.placeholder || ''))
+    || els.find(e => /目的地/.test(((e.parentElement && e.parentElement.innerText) || '').slice(0, 60)))
+  return hit ? (hit.value || '') : '' })()`;
+const HOTEL_DATE_IDX = (which) => `(() => { const els = Array.from(document.querySelectorAll('input')).filter(e => e.offsetParent)
+  const hits = els.map((e, i) => ({ i, ph: e.placeholder || '', v: e.value || '' }))
+    .filter(x => /入住|退房|离店|日期|date/i.test(x.ph) || /^\\d{4}-\\d{2}-\\d{2}/.test(x.v))
+  const out = ${which === 'out'}
+  if (hits.length >= (out ? 2 : 1)) return hits[out ? 1 : 0].i
+  return els.length > 1 ? (out ? Math.min(2, els.length - 1) : 1) : 0 })()`;
+const HOTEL_CLICK_CELL = (ymd) => {
+    const day = String(Number(ymd.slice(8, 10)));
+    const ymCn = `${ymd.slice(0, 4)}年${Number(ymd.slice(5, 7))}月`;
+    return `(() => {
+    const all = Array.from(document.querySelectorAll('*'))
+    const dayLeaves = all.filter(e => e.children.length === 0 && (e.textContent || '').trim() === '${day}')
+    const clickEl = (e) => {
+      const target = e.parentElement && /day|cell|date/.test(String(e.parentElement.className)) ? e.parentElement : e
+      target.dispatchEvent(new MouseEvent('mousedown', { bubbles: true }))
+      target.dispatchEvent(new MouseEvent('mouseup', { bubbles: true }))
+      target.click()
+      return true }
+    const ariaHit = dayLeaves.find(e =>
+      ((e.getAttribute('aria-label') || '') + (e.getAttribute('title') || '')).includes('${ymd}'))
+    if (ariaHit) return clickEl(ariaHit)
+    const enabled = dayLeaves.filter(e => !/disabled|prev|next/.test(String(e.parentElement && e.parentElement.className)))
+    if (enabled.length === 1) return clickEl(enabled[0])
+    const norm = (s) => s.replace(/\\s+/g, '')
+    let inTargetMonth = false
+    for (const e of all) {
+      const ownText = norm(Array.from(e.childNodes).filter(n => n.nodeType === 3).map(n => n.textContent).join(''))
+      if (/^\\d{4}年\\d{1,2}月$/.test(ownText)) { inTargetMonth = ownText === norm('${ymCn}'); continue }
+      if (inTargetMonth && e.children.length === 0 && (e.textContent || '').trim() === '${day}') return clickEl(e)
+    }
+    return false })()`;
+};
+const HOTEL_CLICK_SEARCH = `(() => {
+  const els = Array.from(document.querySelectorAll('input')).filter(e => e.offsetParent)
+  const anchor = els.find(e => /入住|退房|离店|日期|date/i.test(e.placeholder || '') || /^\\d{4}-\\d{2}-\\d{2}/.test(e.value || ''))
+  if (!anchor) throw new Error('搜索按钮定位失败:日期框不存在')
+  const click = (el) => {
+    let target = el
+    for (let k = 0; k < 3 && target.parentElement; k += 1) {
+      const p = target.parentElement
+      if (getComputedStyle(p).cursor === 'pointer' || p.tagName === 'BUTTON' || p.hasAttribute('role')) { target = p; break }
+    }
+    target.dispatchEvent(new MouseEvent('mousedown', { bubbles: true }))
+    target.dispatchEvent(new MouseEvent('mouseup', { bubbles: true }))
+    target.click()
+    return true }
+  let node = anchor
+  for (let k = 0; k < 8 && node; k += 1) {
+    node = node.parentElement
+    if (!node) break
+    const hit = Array.from(node.querySelectorAll('*'))
+      .find(e => e.children.length === 0 && (e.textContent || '').trim() === '搜索' && e.offsetParent)
+    if (hit) return click(hit)
+  }
+  const rect = anchor.getBoundingClientRect()
+  let best = null, bestDist = 1e9
+  for (const e of Array.from(document.querySelectorAll('*'))) {
+    if (e === anchor || !e.offsetParent || e.contains(anchor)) continue
+    const r = e.getBoundingClientRect()
+    if (r.width < 50 || r.width > 320 || r.height < 36) continue
+    if (getComputedStyle(e).cursor !== 'pointer') continue
+    const cx = r.left + r.width / 2, cy = r.top + r.height / 2
+    if (cx < anchor.getBoundingClientRect().right - 40 || cx > anchor.getBoundingClientRect().right + 500) continue
+    if (cy < rect.top - 80 || cy > rect.bottom + 160) continue
+    const d = Math.abs(cy - (rect.top + rect.height / 2))
+    if (d < bestDist) { best = e; bestDist = d }
+  }
+  if (best) return click(best)
+  throw new Error('搜索按钮未找到') })()`;
+async function createHotelPlaywrightDriver() {
+    const { chromium } = await import('playwright-core');
+    const profile = mkdtempSync(join(tmpdir(), 'gotry-gui-hotel-'));
+    const ctx = await chromium.launchPersistentContext(profile, {
+        channel: 'chrome',
+        headless: false,
+        viewport: { width: 1480, height: 950 },
+    });
+    const page = ctx.pages()[0] ?? (await ctx.newPage());
+    let waiter = null;
+    const recentUrls = [];
+    page.on('request', r => {
+        const u = r.url();
+        if (/api|search|restapi|soa2|hotel|list/i.test(u) && !/\.(js|css|png|jpg|svg|woff)/.test(u)) {
+            recentUrls.push(u.slice(0, 140));
+            if (recentUrls.length > 30)
+                recentUrls.shift();
+        }
+    });
+    page.on('response', async (r) => {
+        if (!waiter)
+            return;
+        const url = r.url();
+        if (!HOTEL_NETWORK_HINTS.some((re) => re.test(url)))
+            return;
+        try {
+            const body = await r.text();
+            if (!looksLikeHotelListBody(body))
+                return;
+            const resolve = waiter;
+            waiter = null;
+            resolve?.({ url, body });
+        }
+        catch { /* body gone */ }
+    });
+    return {
+        async open() {
+            const sleep = (ms) => page.waitForTimeout(ms);
+            return {
+                async goto(url) {
+                    await page.goto(url, { waitUntil: 'domcontentloaded', timeout: 40_000 });
+                    await page.locator('input:visible').first().waitFor({ state: 'visible', timeout: 30_000 });
+                    await sleep(2500);
+                },
+                async typeCity(text) {
+                    const direct = page.locator('input[placeholder*="目的地"]:visible, input[placeholder*="城市"]:visible').first();
+                    const fallback = page.locator('input:visible').first();
+                    const use = (await direct.count()) > 0 ? direct : fallback;
+                    await use.click({ timeout: 6000 });
+                    await use.fill('', { timeout: 3000 }).catch(() => { });
+                    await use.pressSequentially(text, { delay: 160 });
+                },
+                async pickSuggest(text) {
+                    await sleep(1600);
+                    await page.keyboard.press('ArrowDown');
+                    await sleep(150);
+                    await page.keyboard.press('Enter');
+                    await sleep(700);
+                    const v = await page.evaluate(HOTEL_DEST_VALUE).catch(() => '');
+                    if (!v.includes(text)) {
+                        await page.keyboard.press('ArrowDown');
+                        await sleep(150);
+                        await page.keyboard.press('Enter');
+                        await sleep(700);
+                    }
+                },
+                async setDate(which, ymd) {
+                    const idx = await page.evaluate(HOTEL_DATE_IDX(which));
+                    const input = page.locator('input:visible').nth(idx);
+                    await input.click({ timeout: 5000 });
+                    await sleep(600);
+                    const typed = await input.evaluate((el, v) => {
+                        if (el.readOnly)
+                            return false;
+                        const setter = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value')?.set;
+                        setter?.call(el, v);
+                        el.dispatchEvent(new Event('input', { bubbles: true }));
+                        el.dispatchEvent(new Event('change', { bubbles: true }));
+                        return el.value === v;
+                    }, ymd).catch(() => false);
+                    if (typed) {
+                        await sleep(400);
+                        return;
+                    }
+                    const clicked = await page.evaluate(HOTEL_CLICK_CELL(ymd)).catch(() => false);
+                    if (!clicked)
+                        throw new Error(`日期 ${ymd} 未能设置——readback 将兜底`);
+                    await sleep(400);
+                },
+                async press(key) { await page.keyboard.press(key); },
+                async clickSearch() {
+                    await page.keyboard.press('Escape').catch(() => { });
+                    await sleep(500);
+                    await page.evaluate(HOTEL_CLICK_SEARCH);
+                },
+                async visibleFormText() {
+                    return String(await page.evaluate(HOTEL_FORM_TEXT).catch(() => ''));
+                },
+                async destFieldValue() {
+                    return String(await page.evaluate(HOTEL_DEST_VALUE).catch(() => ''));
+                },
+                async pageText() {
+                    const title = await page.title().catch(() => '');
+                    const text = String(await page.evaluate('document.body.innerText.slice(0, 3000)').catch(() => ''));
+                    return title + text;
+                },
+                async currentUrl() { return page.url(); },
+                async recentApiUrls() { return [...recentUrls]; },
+                async waitForApiBody(timeoutMs) {
+                    return new Promise(resolve => {
+                        const timer = setTimeout(() => {
+                            waiter = null;
+                            resolve(null);
+                        }, timeoutMs);
+                        waiter = v => { clearTimeout(timer); resolve(v); };
+                    });
+                },
+            };
+        },
+        async close() {
+            await ctx.close().catch(() => { });
+            rmSync(profile, { recursive: true, force: true });
+        },
+    };
+}

package/dist/capabilities/session-search.js

@@ -16,11 +16,13 @@ import { extensionCookieNames, extensionSearchJob, classifyBridgeFailure, needsE
 import { appendFileSync, mkdirSync } from 'node:fs';
 import { dirname } from 'node:path';
 import { randomUUID } from 'node:crypto';
-import { buildEntryUrl, NETWORK_HINTS, parseBatchSearchResult, LOGIN_COOKIE_NAMES, SITE_DOMAIN } from './session/adapters/ctrip-flight.js';
-import { buildHotelEntryUrl, parseCtripHotelList, HOTEL_SITE_HOST } from './session/adapters/ctrip-hotel.js';
+import { resolveFlightEntryUrl, NETWORK_HINTS, parseBatchSearchResult, LOGIN_COOKIE_NAMES, SITE_DOMAIN } from './session/adapters/ctrip-flight.js';
+import { resolveHotelEntryUrl, classifyCtripHotelList, HOTEL_SITE_HOST } from './session/adapters/ctrip-hotel.js';
 import { buildTrainEntryUrl, parseLeftTicketQueryResult, resolveTrainQueryTelecodes, validateTrainQueryResponseUrl } from './session/adapters/rail-12306.js';
 import { buildDidaEntryUrl, parseDidaRates, parseDidaSearchCache, parseDidaRecommendHotels, parseDidaPrices, DIDA_NETWORK_HINTS, DIDA_SITE_DOMAIN, DIDA_LOGIN_COOKIE_NAMES } from './session/adapters/dida-portal.js';
 import { EXTENSION_STORE_URL } from './session/extension-bridge.js';
+import { runFlightGuiSearch } from './session/gui-flight.js';
+import { runHotelGuiSearch } from './session/gui-hotel.js';
 /** Flight evidence can be persisted by the benchmark; extension-supplied error text is untrusted. */
 function flightBridgeFailureSummary(kind) {
     switch (kind) {
@@ -90,6 +92,37 @@ export function appendExtensionAudit(auditPath, entry) {
 export function hotelCityUnresolvedHint(cities) {
     return `城市 ${cities.join('/')} 不在携程酒店城市码表——先 web 搜「hotels.ctrip.com ${cities[0] ?? ''} 酒店」拿到 list 页 URL 里的 city= 数字,带 cityId 重试`;
 }
+/** 机票城市三字码未收录时的人话指引(纯函数,测试锚点;码表只是缓存,主链路=显式码逃生口) */
+export function flightCityUnresolvedHint(cities) {
+    return `城市 ${cities.join('/')} 不在携程机票三字码表(缓存)——web 搜「flights.ctrip.com ${cities[0] ?? ''} 机票」从 list 页 URL 取三字码(形如 oneway-hkg-dxb),带 fromCityCode/toCityCode 重试;或改走 gotry_web_search`;
+}
+/**
+ * 携程酒店 GUI 车道(2026-10-14,#664 首片):gotry 隔离匿名窗口驱动 hotels.ctrip.com
+ * 表单(目的地=站点自动补全,cityId 码表退出主链路),结果复用 ctrip-hotel 三态分类器。
+ * 节律闸与 bridge 酒店道同站同桶('ctrip-hotel');匿名公开价,恒标 anonymous。
+ */
+export async function sessionHotelGuiSearch(q) {
+    const started = Date.now();
+    const ts = new Date().toISOString();
+    const err = (verdict, error) => ({
+        ok: false, via: 'session-ctrip-hotel-error', evidence: `[会话:ctrip-hotel-gui@error@${ts}] ${error}`, latencyMs: Date.now() - started, verdict, error,
+    });
+    const last = lastCallAt.get('ctrip-hotel') ?? 0;
+    if (Date.now() - last < MIN_INTERVAL_MS) {
+        return err('cooldown', `rate limit: last call ${Date.now() - last}ms ago, min ${MIN_INTERVAL_MS}ms`);
+    }
+    lastCallAt.set('ctrip-hotel', Date.now());
+    if (!q.checkIn || !q.checkOut) {
+        return err('error', 'GUI 车道需要 checkIn/checkOut(YYYY-MM-DD,成对)');
+    }
+    const r = await runHotelGuiSearch({ to: q.to, checkIn: q.checkIn, checkOut: q.checkOut, ...(q.timeoutMs ? { timeoutMs: q.timeoutMs } : {}) });
+    return {
+        ok: r.ok, via: r.via, evidence: r.evidence, latencyMs: r.latencyMs, verdict: r.verdict,
+        ...(r.hotels ? { hotels: r.hotels } : {}),
+        ...(r.listUrl ? { listUrl: r.listUrl } : {}),
+        ...(r.error ? { error: r.error } : {}),
+    };
+}
 export async function sessionHotelSearch(q) {
     const started = Date.now();
     const ts = new Date().toISOString();
@@ -113,11 +146,14 @@ export async function sessionHotelSearch(q) {
     if (Date.now() - last < MIN_INTERVAL_MS) {
         return err('cooldown', `rate limit: last call ${Date.now() - last}ms ago, min ${MIN_INTERVAL_MS}ms`);
     }
-    lastCallAt.set(site, Date.now());
-    const entry = buildHotelEntryUrl({ to: q.to, cityId: q.cityId, checkIn: q.checkIn, checkOut: q.checkOut, adults: q.adults });
+    const entry = await resolveHotelEntryUrl({ to: q.to, country: q.country, cityId: q.cityId, checkIn: q.checkIn, checkOut: q.checkOut, adults: q.adults });
     if (!entry.ok || !entry.url) {
-        return err('error', hotelCityUnresolvedHint(entry.unresolved ?? [q.to]));
+        return err('error', entry.error ?? hotelCityUnresolvedHint(entry.unresolved ?? [q.to]));
     }
+    const resolvedLast = lastCallAt.get(site) ?? 0;
+    if (Date.now() - resolvedLast < MIN_INTERVAL_MS)
+        return err('cooldown', `rate limit: min ${MIN_INTERVAL_MS}ms`);
+    lastCallAt.set(site, Date.now());
     const mode = resolveTransportMode(q.profileDir);
     if (mode === 'extension') {
         // ① 登录态快查(与机票同账号体系,票据 cookie 名一致)
@@ -147,10 +183,16 @@ export async function sessionHotelSearch(q) {
         }
         const title = r.title;
         const head = r.body.slice(0, 5000);
-        if (CHALLENGE_RE.test(title + head)) {
+        if (r.challenge === true || CHALLENGE_RE.test(title + head)) {
             return err('challenged', `风控/验证码命中(title=${title.slice(0, 60)});按红线不重试不绕过,交还用户`);
         }
-        const hotels = parseCtripHotelList(r.body);
+        if (r.timedOut || !r.body)
+            return err('error', '酒店页嗅探超时，未取得报价；本次不能判断无房，请换用其他酒店通道');
+        const parsed = classifyCtripHotelList(r.body);
+        if (parsed.shape === 'malformed' || parsed.shape === 'unrecognized') {
+            return err('error', `酒店回包无法识别（${parsed.shape}），库存查询未完成；本次不能判断无房`);
+        }
+        const hotels = parsed.hotels;
         const verdict = hotels.length > 0 ? 'hit' : 'miss';
         return {
             ok: true,
@@ -203,7 +245,13 @@ export async function sessionHotelSearch(q) {
         if (CHALLENGE_RE.test(title + headHtml)) {
             return err('challenged', `风控/验证码命中(title=${title.slice(0, 60)});按红线不重试不绕过,交还用户`);
         }
-        const hotels = parseCtripHotelList(body);
+        if (!body)
+            return err('error', '酒店页嗅探超时，未取得报价；本次不能判断无房，请换用其他酒店通道');
+        const parsed = classifyCtripHotelList(body);
+        if (parsed.shape === 'malformed' || parsed.shape === 'unrecognized') {
+            return err('error', `酒店回包无法识别（${parsed.shape}），库存查询未完成；本次不能判断无房`);
+        }
+        const hotels = parsed.hotels;
         const verdict = hotels.length > 0 ? 'hit' : 'miss';
         return {
             ok: true,
@@ -551,11 +599,20 @@ export async function sessionFlightSearch(q) {
     if (Date.now() - last < MIN_INTERVAL_MS) {
         return err('cooldown', `rate limit: last call ${Date.now() - last}ms ago, min ${MIN_INTERVAL_MS}ms`);
     }
-    lastCallAt.set(site, Date.now());
-    const entry = buildEntryUrl(q.from, q.to, q.date);
+    // 往返(2026-10-14 解锁,#663):URL 形状由 GUI 车道教师实测定稿——
+    // round-{code}0-{code}0?depdate=去_回&cabin=y_s(curl 200+往返 title 实证)。
+    if (q.backDate && !(q.date < q.backDate)) {
+        return err('error', `回程日期(${q.backDate})须晚于去程(${q.date})`);
+    }
+    const entry = await resolveFlightEntryUrl(q.from, q.to, q.date, { fromCode: q.fromCityCode, toCode: q.toCityCode }, undefined, q.backDate);
     if (!entry.ok || !entry.url) {
-        return err('error', `unresolved entry: ${(entry.unresolved ?? []).join('/')} 不在城市码表`);
+        return err('error', entry.error ?? '城市解析失败，请确认城市或机场码；不能据此判断航线覆盖');
     }
+    // Resolution never consumes inventory pacing; recheck after asynchronous lookup.
+    const resolvedLast = lastCallAt.get(site) ?? 0;
+    if (Date.now() - resolvedLast < MIN_INTERVAL_MS)
+        return err('cooldown', `rate limit: min ${MIN_INTERVAL_MS}ms`);
+    lastCallAt.set(site, Date.now());
     const mode = resolveTransportMode(q.profileDir);
     if (mode === 'extension') {
         // ① 登录态快查:票据 cookie 名存在性(免标签页,秒回;needs-login 不再先付一次导航成本)
@@ -684,3 +741,33 @@ export async function sessionFlightSearch(q) {
         await t.close();
     }
 }
+/**
+ * 携程机票 GUI 车道(2026-10-14,创始人指示):gotry 自己的隔离匿名 headful 窗口,
+ * 驱动 PC 检索表单(往返/任意城市原生支持——城市解析=站点自动补全,码表退居缓存),
+ * 结果从站点自己的 batchSearch 回包解析。节律闸与 bridge 同站同桶('ctrip-flight')。
+ * 写面红线:动作白名单+提交件黑名单+readback 硬闸(gui-flight.ts 契约)。
+ */
+export async function sessionFlightGuiSearch(q) {
+    const started = Date.now();
+    const ts = new Date().toISOString();
+    const err = (verdict, error) => ({
+        ok: false, via: 'session-ctrip-flight-error', evidence: `[会话:ctrip-flight-gui@error@${ts}] ${error}`, latencyMs: Date.now() - started, verdict, error,
+    });
+    const last = lastCallAt.get('ctrip-flight') ?? 0;
+    if (Date.now() - last < MIN_INTERVAL_MS) {
+        return err('cooldown', `rate limit: last call ${Date.now() - last}ms ago, min ${MIN_INTERVAL_MS}ms`);
+    }
+    lastCallAt.set('ctrip-flight', Date.now());
+    if (q.backDate && !(q.date < q.backDate)) {
+        return err('error', `回程日期(${q.backDate})须晚于去程(${q.date})`);
+    }
+    const r = await runFlightGuiSearch({ from: q.from, to: q.to, date: q.date, ...(q.backDate ? { backDate: q.backDate } : {}), ...(q.timeoutMs ? { timeoutMs: q.timeoutMs } : {}) });
+    return {
+        ok: r.ok, via: r.via, evidence: r.evidence, latencyMs: r.latencyMs,
+        verdict: r.verdict,
+        ...(r.options ? { options: r.options } : {}),
+        ...(r.calendar && r.calendar.length > 0 ? { calendar: r.calendar } : {}),
+        ...(r.listUrl ? { listUrl: r.listUrl } : {}),
+        ...(r.error ? { error: r.error } : {}),
+    };
+}