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

package/dist/scripts/session-tests.js

@@ -20,7 +20,9 @@ import { buildEntryUrl, parseBatchSearch, parseBatchSearchResult } from '../capa
 import { buildHotelEntryUrl, parseCtripHotelList, looksLikeHotelListBody } from '../capabilities/session/adapters/ctrip-hotel.js';
 import { buildTrainEntryUrl, hasRecognizedAvailableSeat, parseLeftTicketQuery, parseLeftTicketQueryResult, resolveTrainQueryTelecodes, STATION_TELECODES, validateTrainQueryResponseUrl } from '../capabilities/session/adapters/rail-12306.js';
 import { buildDidaEntryUrl, parseDidaRates, parseDidaSearchCache, looksLikeDidaRatesBody } from '../capabilities/session/adapters/dida-portal.js';
-import { sessionFlightSearch, sessionHotelSearch, sessionTrainSearch, sessionDidaSearch, trainStationUnresolvedHint, hotelCityUnresolvedHint, didaLoginHint, __resetRateLimiterForTest, __setTrainSessionTransportForTest, classifyTransportFailure } from '../capabilities/session-search.js';
+import { sessionFlightSearch, sessionFlightGuiSearch, sessionHotelSearch, sessionTrainSearch, sessionDidaSearch, trainStationUnresolvedHint, hotelCityUnresolvedHint, flightCityUnresolvedHint, didaLoginHint, __resetRateLimiterForTest, __setTrainSessionTransportForTest, classifyTransportFailure } from '../capabilities/session-search.js';
+import { planFlightGuiActions, assertGuiPlanSafe, runFlightGuiSearch, parseLowestPriceCalendar, __setGuiDriverForTest } from '../capabilities/session/gui-flight.js';
+import { planHotelGuiActions, assertHotelPlanSafe, runHotelGuiSearch, __setHotelDriverForTest } from '../capabilities/session/gui-hotel.js';
 import { flyaiSearch } from '../capabilities/flyai.js';
 import { createConsentGate } from '../capabilities/session-consent.js';
 import { sessionLogin, pollTicketNames, LOGIN_TARGETS } from '../capabilities/session-login.js';
@@ -145,6 +147,16 @@ assert(e1.ok === true && e1.url === 'https://flights.ctrip.com/online/list/onewa
 const e2 = buildEntryUrl('乌兰巴托', '丽江', '2026-10-01');
 assert(e2.ok === false && e2.unresolved?.[0] === '乌兰巴托', '词表外城市 unresolved 逐字保留(不猜)');
 assert(buildEntryUrl('上海', '丽江', '十月一号').ok === false, '非法日期拒绝');
+const internationalEntry = buildEntryUrl('迪拜', '香港', '2026-12-01', { fromCode: 'DXB', toCode: 'HKG' });
+assert(internationalEntry.ok && internationalEntry.url?.includes('oneway-dxb-hkg') === true, '显式供应商城市码不受内置表限制');
+assert(!buildEntryUrl('迪拜', '香港', '2026-12-01', { fromCode: '../dxb', toCode: 'HKG' }).ok, '显式城市码拒绝 URL 注入');
+// 实测校准抽查(2026-10-14 list 页实证:合法组合 200+title 航线名,非法组合 302)
+const e3 = buildEntryUrl('香港', '迪拜', '2026-12-06');
+assert(e3.ok === true && e3.url === 'https://flights.ctrip.com/online/list/oneway-hkg-dxb?depdate=2026-12-06', '香港/迪拜=实测校准入缓存表(hkg/dxb)', e3);
+const e4 = buildEntryUrl('乌兰巴托', '丽江', '2026-10-01', { fromCode: 'ubn' });
+assert(e4.ok === true && e4.url === 'https://flights.ctrip.com/online/list/oneway-ubn-ljg?depdate=2026-10-01', '显式三字码逃生口(形状合格即成行)', e4);
+assert(buildEntryUrl('乌兰巴托', '丽江', '2026-10-01', { fromCode: 'UBN!' }).ok === false, '显式码形状不合格不得进 URL');
+assert(flightCityUnresolvedHint(['乌兰巴托']).includes('fromCityCode'), '机票 unresolved 指引带显式码逃生口');
 // D. DOM 提交件过滤
 console.log('D. isSubmitText(DOM 提交件黑名单)');
 assert(isSubmitText('立即下单') && isSubmitText('去支付') && isSubmitText('提交订单'), '下单/支付/提交 命中');
@@ -153,9 +165,9 @@ assert(!isSubmitText('搜索') && !isSubmitText('筛选'), '搜索/筛选 不误
 console.log('E. 节律闸(≥30s 间隔)');
 __resetRateLimiterForTest();
 const r1 = await sessionFlightSearch({ from: '乌兰巴托', to: '丽江', date: '2026-10-01' });
-const r2 = await sessionFlightSearch({ from: '上海', to: '丽江', date: '2026-10-01' });
+const r2 = await sessionFlightSearch({ from: '另一个未知城市', to: '丽江', date: '2026-10-01' });
 assert(r1.verdict === 'error' && /unresolved/.test(r1.error ?? ''), '首次调用:词表外 → error(unresolved)');
-assert(r2.verdict === 'cooldown', '30s 内二次调用 → cooldown,不发起导航');
+assert(r2.verdict === 'error', '城市解析失败不占用库存检索节律额度，不误报 cooldown');
 __resetRateLimiterForTest();
 // F. transport 失败分类 + live FlyAI 官方通道
 console.log('F. transport verdict + flyaiSearch(live,飞猪官方,无 key;GOTRY_SESSION_LIVE=0 跳过)');
@@ -167,7 +179,10 @@ if (process.env.GOTRY_SESSION_LIVE === '0') {
     console.log('  SKIP - GOTRY_SESSION_LIVE=0(离线门禁不调用 FlyAI 外部实时端点)');
 }
 else {
-    fr = await flyaiSearch({ kind: 'flight', origin: '上海', destination: '丽江', depDate: '2026-10-01' });
+    // 滚动未来日期(硬编码日期跨日假红的教训:过去日期会被上游「出发日期非法」业务失败拒绝)
+    const roll = new Date(Date.now() + 30 * 24 * 3600 * 1000);
+    const rollingDepDate = `${roll.getFullYear()}-${String(roll.getMonth() + 1).padStart(2, '0')}-${String(roll.getDate()).padStart(2, '0')}`;
+    fr = await flyaiSearch({ kind: 'flight', origin: '上海', destination: '丽江', depDate: rollingDepDate });
     const sentinelBlocked = fr.verdict === 'error' && /sentinel|block|trial limit/i.test(fr.error ?? '');
     if (sentinelBlocked) {
         console.log('  WARN - 飞猪上游限流(Sentinel 2026-08-28 / trial-limit 429 2026-08-31 实测,配额未文档化)——降级合同验证通过,跳过 hit 断言');
@@ -540,8 +555,8 @@ console.log('K. 酒店适配器(buildHotelEntryUrl/走形解析/形状嗅探/城
     __resetRateLimiterForTest();
     const e1 = await sessionHotelSearch({ to: '不在码表的城市' });
     assert(e1.ok === false && e1.verdict === 'error' && /city=/.test(e1.error ?? ''), '未收录城市 → error + cityId 指引', e1);
-    const e2 = await sessionHotelSearch({ to: '上海' });
-    assert(e2.ok === false && e2.verdict === 'cooldown', '节律闸:同站点 30s 内第二调 → cooldown(不发起导航)', e2);
+    const e2 = await sessionHotelSearch({ to: '另一个未知酒店城市' });
+    assert(e2.ok === false && e2.verdict === 'error', '酒店城市解析失败不占用库存节律额度', e2);
 }
 // L. 火车会话面(2026-09-03 实装,12306 公开查询面)纯函数:entry URL/管道行解析/电报码指引/闸面
 console.log('L. 火车适配器(buildTrainEntryUrl/parseLeftTicketQuery/电报码指引/节律闸)');
@@ -854,6 +869,162 @@ console.log('M. Dida 门户(entry 守域 + 信封走形 + 闸面)');
     assert(q2.ok === false && q2.verdict === 'cooldown', '节律闸:30s 内二调 → cooldown', q2);
     assert(typeof didaLoginHint() === 'string' && /自动登录/.test(didaLoginHint()), '登录指引指向 hotel-be portal 跳板(账密永不经 gotry)');
 }
+// L. 携程机票 GUI 车道(2026-10-14):规划器/安全白名单/假 driver 全流程/readback 硬闸
+{
+    console.log('L. GUI 车道(规划器 + 安全闸 + 假 driver)');
+    const planOw = planFlightGuiActions({ from: '上海', to: '丽江', date: '2027-05-02' });
+    assert(planOw.some(a => a.t === 'clickTripTab' && a.trip === 'oneway') && !planOw.some(a => a.t === 'setDate' && a.which === 'back'), '单程规划:显式点单程 tab(页面默认往返态)/无回程日期');
+    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(!assertGuiPlanSafe([{ t: 'goto', url: 'https://evil.example.com/' }]).ok, '安全闸:非固定入口 URL 拒绝');
+    assert(!assertGuiPlanSafe([{ t: 'typeCity', which: 'from', text: '立即下单' }]).ok, '安全闸:城市位提交件文本拒绝(写面红线)');
+    assert(!assertGuiPlanSafe([{ t: 'setDate', which: 'dep', ymd: '十二月六号' }]).ok, '安全闸:非 YMD 日期拒绝');
+    assert(!assertGuiPlanSafe([{ t: 'press', key: 'Meta' }]).ok, '安全闸:按键白名单外拒绝');
+    assert(assertGuiPlanSafe(planRt).ok, '合法规划全过');
+    // 假 driver:表单内存模型 + 可编程回包
+    const FIXTURE = JSON.stringify({ data: { flightItineraryList: [{
+                    flightSegments: [{ airlineName: 'Spring Airlines', duration: 215, flightList: [{ flightNo: '9C6617', departureAirportName: '浦东', arrivalAirportName: '三义', departureDateTime: '2027-05-02 17:05:00', arrivalDateTime: '2027-05-02 20:40:00' }] }],
+                    priceList: [{ adultPrice: 1790 }],
+                }] } });
+    // live 实测形状(2026-10-14 GUI 捕获,382 条之一):顶层 priceList,/Date(ms+0800)/ 日期,price>0 才可售
+    const CAL_FIXTURE = JSON.stringify({ responseStatus: { Ack: 'Success' }, priceList: [
+            { departDate: '/Date(1791993600000+0800)/', price: 0 }, // 无价日(过滤)
+            { departDate: '/Date(1792080000000+0800)/', price: 880 }, // 2027-05-02? 由断言锚定实际换算
+            { departDate: '/Date(1792166400000+0800)/', price: 1020 },
+            { departDate: '/Date(1792252800000+0800)/', price: 760 },
+        ] });
+    const makeFakeDriver = (opts = {}) => {
+        const state = { clickedSearch: false, form: { from: '', to: '', dep: '', back: '' } };
+        const page = {
+            async goto() { },
+            async clickTripTab() { },
+            async typeCity(which, text) { state.form[which] = text; },
+            async pickSuggest(which, text) { state.form[which] = `${text}(SHA)`; /* 站点补全归一化形态 */ },
+            async setDate(which, ymd) { state.form[which === 'dep' ? 'dep' : 'back'] = ymd; },
+            async press() { },
+            async clickSearch() { state.clickedSearch = true; },
+            async visibleFormText() { return Object.values({ ...state.form, ...opts.formOverride }).concat(['上海', '丽江']).join(' | '); },
+            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 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;
+            },
+        };
+        return { driver: { open: async () => page, close: async () => { } }, state };
+    };
+    __setGuiDriverForTest(() => makeFakeDriver().driver);
+    const g1 = await runFlightGuiSearch({ from: '上海', to: '丽江', date: '2027-05-02' });
+    assert(g1.ok === true && g1.verdict === 'hit' && g1.anonymous === true && (g1.options?.length ?? 0) === 1, '假 driver 全流程 → hit(anonymous 标注)', g1);
+    assert(/\[会话:ctrip-flight-gui@/.test(g1.evidence) && /transport=gui/.test(g1.evidence), 'GUI 证据链 [会话:ctrip-flight-gui@ts]');
+    assert(g1.options?.[0]?.flightNo === '9C6617' && g1.options?.[0]?.price === 1790, '既有 batchSearch 解析器复用(结构化选项)');
+    // #661/#662:匿名绑定面——无行程回包、仅有低价日历 → hit + 日历数据 + listUrl 透传
+    const calDriver = makeFakeDriver({ apiBody: null, calendarBody: CAL_FIXTURE, listUrl: 'https://flights.ctrip.com/online/list/roundtrip-sha-ljg?depdate=2027-05-02&retdate=2027-05-09' });
+    __setGuiDriverForTest(() => calDriver.driver);
+    const g5 = await runFlightGuiSearch({ from: '上海', to: '丽江', date: '2027-05-02', backDate: '2027-05-09' });
+    assert(g5.ok === true && g5.verdict === 'hit' && (g5.options?.length ?? 0) === 0, '日历绑定:无行程回包时日历即 hit(#661)', g5);
+    assert((g5.calendar?.length ?? 0) === 3 && g5.calendar?.[0]?.date === '2026-10-16' && g5.calendar?.[0]?.price === 880 && g5.calendar?.[2]?.price === 760, '日历数据 /Date(ms)/→date 与 price>0 解析(#662,无价日过滤)', g5.calendar);
+    const calDup = parseLowestPriceCalendar(JSON.stringify({ priceList: [
+            { departDate: '/Date(1792080000000+0800)/', price: 900 }, { departDate: '/Date(1792080000000+0800)/', price: 700 },
+        ] }));
+    assert(calDup.length === 1 && calDup[0]?.price === 700, '往返双程同日双价 → 按日聚合取最低', calDup);
+    assert(g5.listUrl === 'https://flights.ctrip.com/online/list/roundtrip-sha-ljg?depdate=2027-05-02&retdate=2027-05-09', 'listUrl 回传(#663 URL 教师)', g5.listUrl);
+    assert(/低价日历/.test(g5.evidence), '日历证据链标注');
+    assert(parseLowestPriceCalendar('not json').length === 0 && parseLowestPriceCalendar('{"data":{"unknownShape":1}}').length === 0, '日历 parser 形状闸:未知形状空数组(不发明价格)');
+    const mixed = makeFakeDriver({ calendarBody: CAL_FIXTURE });
+    __setGuiDriverForTest(() => mixed.driver);
+    const g6 = await runFlightGuiSearch({ from: '上海', to: '丽江', date: '2027-05-02' });
+    assert((g6.options?.length ?? 0) === 1 && (g6.calendar?.length ?? 0) === 3 && /calendar=3天/.test(g6.evidence), '行程+日历双槽并存(行程优先结算,日历随行)', g6);
+    const rbDriver = makeFakeDriver({ formOverride: { dep: '2027-05-03' } }); // 日期被「改回」→ readback 必须拦
+    __setGuiDriverForTest(() => rbDriver.driver);
+    const g2 = await runFlightGuiSearch({ from: '上海', to: '丽江', date: '2027-05-02' });
+    assert(g2.ok === false && g2.verdict === 'error' && /readback 硬闸/.test(g2.error ?? ''), 'readback 硬闸:日期不符 → 终止,不发起搜索', g2);
+    assert(rbDriver.state.clickedSearch === false, 'readback 拦截后搜索按钮零点击(绝不搜错日期)');
+    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);
+    __setGuiDriverForTest(() => makeFakeDriver({ challenge: true }).driver);
+    const g3 = await runFlightGuiSearch({ from: '上海', to: '丽江', date: '2027-05-02' });
+    assert(g3.ok === false && g3.verdict === 'challenged', '风控页 → challenged(不重试不绕过)', g3);
+    __setGuiDriverForTest(() => makeFakeDriver({ apiBody: null }).driver);
+    const g4 = await runFlightGuiSearch({ from: '上海', to: '丽江', date: '2027-05-02' });
+    assert(g4.ok === false && g4.verdict === 'error' && /嗅探超时/.test(g4.error ?? ''), '回包超时 → 结构化 error', g4);
+    // 编排面:节律闸同站同桶 + 回程日期校验
+    __resetRateLimiterForTest();
+    __setGuiDriverForTest(() => makeFakeDriver().driver);
+    const s1 = await sessionFlightGuiSearch({ from: '上海', to: '丽江', date: '2027-05-02' });
+    assert(s1.ok === true && s1.verdict === 'hit', 'sessionFlightGuiSearch 编排 → hit');
+    const s2 = await sessionFlightGuiSearch({ from: '上海', to: '丽江', date: '2027-05-02' });
+    assert(s2.ok === false && s2.verdict === 'cooldown', 'GUI 与 bridge 同站同桶:30s 内二调 → cooldown');
+    __resetRateLimiterForTest();
+    const s3 = await sessionFlightGuiSearch({ from: '上海', to: '丽江', date: '2027-05-02', backDate: '2027-05-01' });
+    assert(s3.ok === false && s3.verdict === 'error' && /回程日期/.test(s3.error ?? ''), '回程早于去程 → 参数闸拒绝');
+    // bridge 往返(#663 解锁):URL 形状由 GUI 教师实测定稿;回程≤去程仍参数闸拒绝
+    __resetRateLimiterForTest();
+    const s4 = await sessionFlightSearch({ from: '上海', to: '丽江', date: '2027-05-02', backDate: '2027-05-01' });
+    assert(s4.ok === false && s4.verdict === 'error' && /回程日期/.test(s4.error ?? ''), 'bridge 回程早于去程 → 参数闸拒绝', s4);
+    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);
+}
+// M. 携程酒店 GUI 车道(2026-10-14,#664 首片):规划/安全闸/readback/needs-login 边界
+{
+    console.log('M. 酒店 GUI 车道(规划器 + 安全闸 + 假 driver + 登录墙判语)');
+    const hp = planHotelGuiActions({ to: '迪拜', checkIn: '2026-12-06', checkOut: '2026-12-08' });
+    assert(hp.some(a => a.t === 'setDate' && a.which === 'in') && hp.some(a => a.t === 'setDate' && a.which === 'out'), '酒店规划:入住/退房成对');
+    assert(!assertHotelPlanSafe([{ t: 'typeCity', text: '立即下单' }]).ok, '安全闸:目的地位提交件文本拒绝');
+    assert(!assertHotelPlanSafe([{ t: 'goto', url: 'https://evil.example.com/' }]).ok, '安全闸:非固定入口拒绝');
+    const HOTEL_FIXTURE = JSON.stringify({ ResponseStatus: { Ack: 'Success' }, hotelList: [
+            { hotelName: '测试酒店', minPrice: 500, star: 4 },
+        ] });
+    const mkHotelDriver = (opts = {}) => {
+        const state = { clickedSearch: false, form: { to: '', in: '', out: '' }, url: 'https://hotels.ctrip.com/' };
+        const page = {
+            async goto() { },
+            async typeCity(text) { state.form.to = text; },
+            async pickSuggest(text) { state.form.to = `${text}(测试)`; },
+            async setDate(which, ymd) { state.form[which] = ymd; },
+            async press() { },
+            async clickSearch() { state.clickedSearch = true; if (opts.passportAfterSearch)
+                state.url = 'https://passport.ctrip.com/user/login?backurl=x'; },
+            async visibleFormText() {
+                const f = { ...state.form, ...opts.formOverride };
+                const cn = (ymd) => ymd ? `${Number(ymd.slice(5, 7))}月${Number(ymd.slice(8, 10))}日` : '';
+                return Object.values(f).concat(['上海', cn(f.in ?? ''), cn(f.out ?? '')]).join(' | ');
+            },
+            async destFieldValue() { return (opts.formOverride?.to ?? state.form.to) + '(测试)'; },
+            async pageText() { return '酒店预订'; },
+            async currentUrl() { return state.url; },
+            async waitForApiBody() {
+                if (opts.passportAfterSearch)
+                    return null;
+                return opts.body === undefined ? { url: 'https://hotels.ctrip.com/hotels/api/list', body: HOTEL_FIXTURE } : opts.body ? { url: 'x', body: opts.body } : null;
+            },
+        };
+        return { driver: { open: async () => page, close: async () => { } }, state };
+    };
+    __setHotelDriverForTest(() => mkHotelDriver().driver);
+    const h1 = await runHotelGuiSearch({ to: '上海', checkIn: '2026-11-13', checkOut: '2026-11-15' });
+    assert(h1.ok === true && h1.verdict === 'hit' && h1.anonymous === true && (h1.hotels?.length ?? 0) >= 1, '酒店假 driver 全流程 → hit(匿名标注;本地化日期格式核对)', h1);
+    const hLogin = mkHotelDriver({ passportAfterSearch: true });
+    __setHotelDriverForTest(() => hLogin.driver);
+    const h2 = await runHotelGuiSearch({ to: '上海', checkIn: '2026-11-13', checkOut: '2026-11-15' });
+    assert(h2.ok === false && h2.verdict === 'needs-login' && /gotry_session_login/.test(h2.error ?? ''), '登录墙(passport 跳转)→ needs-login 判语(live 实证边界)', h2);
+    const hBadDate = mkHotelDriver({ formOverride: { in: '2026-11-20' } });
+    __setHotelDriverForTest(() => hBadDate.driver);
+    const h3 = await runHotelGuiSearch({ to: '上海', checkIn: '2026-11-13', checkOut: '2026-11-15' });
+    assert(h3.ok === false && /readback 硬闸/.test(h3.error ?? '') && hBadDate.state.clickedSearch === false, 'readback 硬闸:入住日期错位 → 零搜索点击', h3);
+    assert((await runHotelGuiSearch({ to: '上海', checkIn: '2026-11-15', checkOut: '2026-11-13' })).verdict === 'error', '退房早于入住 → 参数闸拒绝');
+    __setHotelDriverForTest(null);
+}
 if (process.env.GOTRY_SESSION_TEST_FORCE_FAILURE === '1') {
     assert(false, 'forced session failure propagation proof');
 }

package/dist/src/gotry-web-api.js

@@ -4,6 +4,7 @@ import { isAbsolute } from 'node:path';
 import { verifyFlyaiCandidate } from '../../bin/gotry-flyai-verification.js';
 import { listArtifacts } from '../capabilities/artifacts.js';
 import { atomicWriteJson, clearFlyaiKey, displayEndpoint, endpointFingerprint, flyaiConfigPath, isPlaceholderFlyaiKey, maskFlyaiKey, readFlyaiConfig, readFlyaiVerification, removeFlyaiVerification, resolveFlyaiEndpoint, resolveFlyaiKey, saveFlyaiKey, sha256Hex, writeFlyaiVerification, } from '../capabilities/flyai-config.js';
+import { hbcliCredentialPath, hbcliSetupStatus, readHbcliCredentials, removeHbcliVerification, verifyHbcliCandidate, withHbcliCredentials, withoutHbcliCredentials, writeHbcliCredentials, writeHbcliVerification, } from '../capabilities/hbcli-config.js';
 const json = (value, status = 200) => Response.json(value, { status, headers: { 'cache-control': 'no-store' } });
 const rejection = (error, status = 400) => json({ ok: false, error }, status);
 const BODY_LIMIT = 8192;
@@ -40,6 +41,7 @@ async function readInput(request) {
 export function createGotryWebHandlers(options) {
     const homeDir = options.homeDir ?? homedir(), env = options.env ?? process.env;
     const paths = { homeDir, env }, configPath = flyaiConfigPath(homeDir);
+    const hbPaths = { homeDir, env, hbcliBin: options.hbcliBin };
     let mutations = Promise.resolve();
     const status = () => {
         const current = resolveFlyaiKey(paths), endpoint = resolveFlyaiEndpoint(paths), receipt = readFlyaiVerification(homeDir);
@@ -99,7 +101,65 @@ export function createGotryWebHandlers(options) {
         }
         return json(status());
     }
+    async function mutateHbcli(input, signal) {
+        if (signal.aborted)
+            return rejection('操作已取消。', 409);
+        if (!hbcliSetupStatus(hbPaths).writable)
+            return rejection('当前凭证来自环境变量，或本机配置不可安全写入。', 409);
+        const before = readHbcliCredentials(hbPaths);
+        if (!before.ok)
+            return rejection('原配置损坏，已保留原文件，请先修复。', 409);
+        if (input.action === 'clear') {
+            if (!writeHbcliCredentials(withoutHbcliCredentials(before.data), hbPaths))
+                return rejection('无法清除配置，请检查本机文件及权限。', 409);
+            removeHbcliVerification(homeDir);
+            return json(hbcliSetupStatus(hbPaths));
+        }
+        const appKey = typeof input.appKey === 'string' ? input.appKey.trim() : '';
+        const appSecret = typeof input.appSecret === 'string' ? input.appSecret.trim() : '';
+        if ([appKey, appSecret].some(value => !value || value.length > 2048 || /[\r\n\0]/.test(value)))
+            return rejection('请填写 HotelByte 提供的 App Key 和 App Secret。');
+        const verified = await verifyHbcliCandidate(appKey, appSecret, hbPaths, signal);
+        if (signal.aborted || verified.verdict === 'error' || verified.verdict === 'cancelled') {
+            return json({ ok: false, error: verified.error ?? '验证已取消，旧配置保留。' }, 422);
+        }
+        const current = readHbcliCredentials(hbPaths);
+        if (!hbcliSetupStatus(hbPaths).writable || !current.ok || current.bytes !== before.bytes)
+            return rejection('配置在验证期间发生变化，请重新读取后再试。', 409);
+        const next = withHbcliCredentials(before.data, appKey, appSecret);
+        if (!writeHbcliCredentials(next, hbPaths))
+            return rejection('安全保存失败，旧配置保留，请检查本机权限。', 409);
+        if (!writeHbcliVerification(next, verified.verdict, hbPaths)) {
+            const restored = before.bytes === undefined
+                ? (() => { try {
+                    rmSync(hbcliCredentialPath(hbPaths));
+                    return true;
+                }
+                catch {
+                    return false;
+                } })()
+                : writeHbcliCredentials(before.data, hbPaths);
+            return rejection(restored ? '验证回执保存失败，旧配置已恢复。' : '验证回执保存失败，请检查本机文件。', 409);
+        }
+        return json(hbcliSetupStatus(hbPaths));
+    }
     return {
+        async hbcli(request) {
+            if (request.method === 'GET')
+                return json(hbcliSetupStatus(hbPaths));
+            if (request.method !== 'POST')
+                return rejection('不支持此操作。', 405);
+            const input = await readInput(request);
+            if (input instanceof Response)
+                return input;
+            if (!['save', 'clear'].includes(String(input.action))
+                || Object.keys(input).some(key => !['action', 'appKey', 'appSecret'].includes(key))
+                || (input.action === 'clear' && ('appKey' in input || 'appSecret' in input)))
+                return rejection('请求无效。');
+            const operation = mutations.then(() => mutateHbcli(input, request.signal)).catch(() => rejection('操作失败，未能确认保存，请重新读取状态。', 500));
+            mutations = operation.then(() => undefined);
+            return operation;
+        },
         async flyai(request) {
             if (request.method === 'GET')
                 return json(status());
@@ -137,12 +197,12 @@ export function createGotryWebHandlers(options) {
         },
     };
 }
-export function registerGotryWebApi(ctx, stateRoot) {
+export function registerGotryWebApi(ctx, stateRoot, hbcliBin) {
     if (typeof ctx.inject !== 'function')
         return;
     ctx.inject(['connection', 'sessions'], scope => {
         const connection = scope.get('connection');
-        const handlers = createGotryWebHandlers({ stateRoot, workspaceForSession: async (sessionId) => {
+        const handlers = createGotryWebHandlers({ stateRoot, hbcliBin, workspaceForSession: async (sessionId) => {
                 const id = sessionId;
                 const live = scope.sessions.get(id)?.header;
                 const stored = live ? undefined : await scope.get('sessionPersistence')?.stat(sessionId);
@@ -152,6 +212,8 @@ export function registerGotryWebApi(ctx, stateRoot) {
         // it. Exact routes have one body mode, so reads and bounded writes differ.
         scope.effect(() => connection.fetch.register({ path: '/api/gotry/flyai', methods: ['GET'], requestBody: 'buffered', fetch: handlers.flyai }));
         scope.effect(() => connection.fetch.register({ path: '/api/gotry/flyai/write', methods: ['POST'], requestBody: 'streaming', fetch: handlers.flyai }));
+        scope.effect(() => connection.fetch.register({ path: '/api/gotry/hbcli', methods: ['GET'], requestBody: 'buffered', fetch: handlers.hbcli }));
+        scope.effect(() => connection.fetch.register({ path: '/api/gotry/hbcli/write', methods: ['POST'], requestBody: 'streaming', fetch: handlers.hbcli }));
         scope.effect(() => connection.fetch.register({ path: '/api/gotry/artifacts', methods: ['GET'], requestBody: 'buffered', fetch: handlers.artifacts }));
     });
 }

package/dist/src/index.js

@@ -432,7 +432,7 @@ export function apply(ctx, config, seams = {}) {
     // 派生的后台规划会话:唯一出口 converge + 长 leash——前台转后台,后台
     // 必须产出最终交付物,不得再次 handoff(否则无限递归)。
     if (!rawBenchmarkEnvironmentConfigPath) {
-        registerGotryWebApi(ctx, config.stateRoot ?? '.');
+        registerGotryWebApi(ctx, config.stateRoot ?? '.', config.hbcliBin);
         registerArtifactDeliveries(ctx);
     }
     const handoffChild = process.env.GOTRY_HANDOFF_CHILD === '1';
@@ -1305,10 +1305,15 @@ export function apply(ctx, config, seams = {}) {
             const resp = itp.result;
             const dir = await ensureStateDir(config.stateRoot);
             const isLive = resp.via === 'hbcli-realtime';
-            const evidence = isLive ? resp.evidence : '[静态包:估算]';
+            const staticStays = resp.hotels?.stays;
+            const hasEstimate = Array.isArray(staticStays) && staticStays.length > 0;
+            const liveList = resp.hotels?.list;
+            const verdict = isLive ? (liveList?.length ? 'hit' : 'miss') : hasEstimate ? 'estimated' : 'error';
+            const evidence = hasEstimate ? '[静态包:估算]' : resp.evidence;
             await recordLatency(join(dir, 'bridge-latency.jsonl'), Date.now() - started, `hotel_search:${resp.via}`).catch(() => { });
             const payload = {
-                ok: true,
+                ok: isLive || hasEstimate,
+                verdict,
                 hotels: resp.hotels ?? null,
                 evidence,
                 destination: q.destination,
@@ -1316,6 +1321,7 @@ export function apply(ctx, config, seams = {}) {
                 latency_ms: Date.now() - started,
                 summary: resp.summary,
                 error: resp.error,
+                ...(verdict !== 'hit' ? await routingField('search-hotel', 'hbcli-hotel') : {}),
                 ...(dateNotes.length ? { date_notes: dateNotes } : {}),
             };
             return JSON.parse(JSON.stringify(payload));
@@ -1342,13 +1348,14 @@ export function apply(ctx, config, seams = {}) {
                 };
             }
             const h = r.hotels;
-            const liveCount = Array.isArray(h) ? h.length : 0;
+            const liveList = h?.list;
+            const liveCount = Array.isArray(liveList) ? liveList.length : 0;
             // 静态包是 {meta, stays} 对象而非数组(issue #24:此前计数恒 0 → UI 显示「无结果」)
             const stays = !Array.isArray(h) && h && typeof h === 'object' ? h.stays : undefined;
             const staticCount = Array.isArray(stays) ? stays.length : 0;
             const tag = r.via === 'hbcli-realtime'
-                ? (liveCount ? `实时 ${liveCount} 家` : '实时')
-                : staticCount ? `静态包 ${staticCount} 块` : (liveCount ? `${liveCount} 家` : '无结果');
+                ? `实时 ${liveCount} 家`
+                : staticCount ? `静态包 ${staticCount} 块` : '查询未完成';
             return {
                 card: 'generic',
                 title: `酒店:${r.destination ?? ''} ${tag}`,
@@ -1731,8 +1738,9 @@ export function apply(ctx, config, seams = {}) {
         description: routed('gotry_session_search', 'Search on the USER\'S OWN browser session (Ctrip kind="flight"(default)/"hotel"; 12306 kind="train" — public query face, no login needed). '
             + 'Consent gate: the FIRST call in a session asks the user via the runtime approval card; once granted it holds for the session, a refusal revokes it for the session (no repeat prompting). '
             + 'Transport: Stai Travel Bridge browser extension (one-time install) — the agent side never talks to Chrome debugging, ZERO system dialogs; read-only by construction (the extension never issues requests; it only passively forwards the site\'s own search responses; agent NEVER touches credentials/captcha; on captcha it stops and returns challenged). '
-            + 'kind="flight": from/to 中文城市名 + date YYYY-MM-DD — sniffs the site search API for structured options. Evidence [会话:ctrip-flight@ts]. '
-            + 'kind="hotel": to=目的地中文, cityId? = the numeric city= in a hotels.ctrip.com list URL (web-search it when the destination is outside the built-in city table), checkIn?/checkOut? (YYYY-MM-DD), adults?; hotel prices are the user\'s real logged-in prices. Evidence [会话:ctrip-hotel@ts]. '
+            + 'kind="flight": from/to city or airport names (Chinese/English) + date YYYY-MM-DD; unknown names resolve from supplier metadata, ambiguous names require confirmation; optional fromCityCode/toCityCode are explicit Ctrip three-letter codes — sniffs the site search API for structured options. '
+            + 'ui?="bridge" (default; the user\'s own logged-in session, real member prices) | "gui" (gotry opens its OWN isolated anonymous Chrome window and drives the Ctrip PC search form — roundtrip via backDate? and ANY city by construction: the site\'s own autocomplete resolves cities; anonymous public prices, NOT logged-in prices; verdicts carry anonymous=true; result-binding iteration tracked in #661). Evidence [会话:ctrip-flight@ts] / [会话:ctrip-flight-gui@ts]. '
+            + 'kind="hotel": to=destination name, country? for same-name disambiguation; cityId? = explicit numeric city= from a Ctrip hotel list URL; otherwise resolves from the hotel destination service, checkIn?/checkOut? (YYYY-MM-DD), adults?; hotel prices are the user\'s real logged-in prices. Evidence [会话:ctrip-hotel@ts]. '
             + 'kind="dida": Dida supplier-portal realtime hotel rates on the employee\'s own logged-in session (hotel-be portal integration line) — no from/to needed; the portal find page\'s own requests are sniffed passively. Rates carry ratePlanId/referenceNo for the server-side booking chain. Evidence [会话:dida-portal@ts]. '
             + 'kind="train": from/to/date(YYYY-MM-DD) + fromStationTelecode?/toStationTelecode? (three-letter codes in the kyfw query URL, for cities outside the built-in table) — 12306 left-ticket query (public face): train codes, times, durations, seat availability; the list API carries NO prices (prices live on the 12306 page). Evidence [会话:train-12306@ts]. '
             + 'verdict needs-login = call gotry_session_login (opens the Ctrip login entry in the user\'s own foreground tab — no terminal, no credentials through GoTry); '
@@ -1745,15 +1753,20 @@ export function apply(ctx, config, seams = {}) {
         // execute 内归一后走原条件闸,结构化报错不崩。flyai 因 kind required 仍在宿主权即拒。
         parameters: {
             kind: { type: 'string', enum: ['flight', 'hotel', 'train', 'dida'], description: '默认 flight 机票;hotel 携程酒店(用户登录态真实价);train 12306 余票(公开面);dida 供应商门户实时价(员工登录态)' },
-            from: { type: 'string', description: '出发城市中文(词表内),如 上海——kind=flight|train 必填' },
+            from: { type: 'string', description: '出发城市名（机票支持中英文及机场名，自动解析），如 上海——kind=flight|train 必填' },
             to: { type: 'string', description: '到达城市中文——kind=flight|train 必填;kind=hotel 时为目的地(必填)' },
             date: { type: 'string', description: '出发日期 YYYY-MM-DD——kind=flight|train 必填,须为今天或未来' },
-            cityId: { type: 'integer', description: '携程酒店 city= 数字,仅 kind=hotel;目的地码表外时 web 搜 hotels.ctrip.com list URL 取 city=' },
+            fromCityCode: { type: 'string', description: '显式携程出发城市／机场三字码，仅 kind=flight；同名城市确认后使用' },
+            toCityCode: { type: 'string', description: '显式携程到达城市／机场三字码，仅 kind=flight；同名城市确认后使用' },
+            cityId: { type: 'integer', description: '显式携程酒店 city= 数字，仅 kind=hotel；未提供时自动解析酒店目的地，不能使用机票城市码' },
+            country: { type: 'string', description: '目的地国家中英文，仅 kind=hotel；用于同名城市消歧，例如 阿联酋' },
             checkIn: { type: 'string', description: '入住日 YYYY-MM-DD,仅 kind=hotel 可选' },
             checkOut: { type: 'string', description: '退房日 YYYY-MM-DD,仅 kind=hotel 可选' },
             adults: { type: 'integer', description: '成人数,仅 kind=hotel 可选' },
             fromStationTelecode: { type: 'string', description: '出发站三位电报码,仅 kind=train;城市码表外时填(kyfw 查询页 URL 里)' },
             toStationTelecode: { type: 'string', description: '到达站三位电报码,仅 kind=train,同上' },
+            backDate: { type: 'string', description: '回程日期 YYYY-MM-DD,仅 kind=flight;存在即往返检索——须 ui=gui(GUI 车道站点表单原生往返;bridge 车道不知往返 URL 形状,不猜)' },
+            ui: { type: 'string', enum: ['bridge', 'gui'], description: 'kind=flight|hotel:bridge(默认,用户登录态被动嗅探)|gui(gotry 隔离匿名窗口驱动 PC 表单——flight 往返/任意城市原生+低价日历;hotel 任意目的地原生(cityId 码表不在主链路);匿名公开价)' },
         },
         output: { schema: { type: 'json' }, render: (_a, v) => [{ type: 'text', text: String(v.summary ?? JSON.stringify(v).slice(0, 600)) }] },
         async execute(args, _exec) {
@@ -1830,17 +1843,17 @@ export function apply(ctx, config, seams = {}) {
             }
             if (q.kind === 'hotel') {
                 if (!q.to) {
-                    return { ok: false, summary: 'kind=hotel 需要 to(目的地中文;城市码表外带 cityId=携程酒店 list 页 URL 里的 city= 数字)' };
+                    return { ok: false, summary: 'kind=hotel 需要 to（目的地名称）；自动解析城市，同名城市可带 country 或确认后的 cityId' };
                 }
                 const itp = await runSessionEffect({
-                    effect: 'SESSION_HOTEL_SEARCH',
+                    effect: q.ui === 'gui' ? 'SESSION_HOTEL_GUI_SEARCH' : 'SESSION_HOTEL_SEARCH',
                     params: {
-                        to: q.to, cityId: q.cityId, checkIn: q.checkIn, checkOut: q.checkOut, adults: q.adults,
+                        to: q.to, country: q.country, cityId: q.cityId, checkIn: q.checkIn, checkOut: q.checkOut, adults: q.adults,
                         auditPath: join(config.stateRoot ?? '.', 'gotry-state', 'session-incidents.jsonl'),
                     },
                 });
                 if (!itp.result)
-                    return declinedObservation('SESSION_HOTEL_SEARCH', itp.trace);
+                    return declinedObservation(q.ui === 'gui' ? 'SESSION_HOTEL_GUI_SEARCH' : 'SESSION_HOTEL_SEARCH', itp.trace);
                 const r = itp.result;
                 await noteChannel('session:ctrip-hotel', r.verdict);
                 // D-26(issue #118):exact-date 会话酒店 hit/miss 落账(摸底无档期不落;cooldown 是节律闸非结论,不落)
@@ -1862,14 +1875,19 @@ export function apply(ctx, config, seams = {}) {
                 }));
             }
             if (!q.from || !q.to || !q.date) {
-                return { ok: false, summary: '需要 from/to(中文城市名,词表内)与 date(YYYY-MM-DD);酒店/火车检索分别用 kind=hotel / kind=train' };
+                return { ok: false, summary: '需要 from/to（城市或机场名）与 date（YYYY-MM-DD）;酒店/火车检索分别用 kind=hotel / kind=train' };
             }
             // 效应解译层(ADR-18):SESSION 通道策略=永不重试/不熔断,节律闸在渠道内;
             // 解译器只做分发与证据拼装,verdict 语义(risk 型 needs-login/challenged)原样透传
+            // GUI 车道(2026-10-14):ui=gui → gotry 隔离匿名窗口驱动 PC 表单(往返 backDate/任意城市原生)。
+            if (q.ui !== undefined && q.ui !== 'bridge' && q.ui !== 'gui') {
+                return { ok: false, summary: 'kind=flight 的 ui 只接受 bridge(默认,登录态被动嗅探)|gui(隔离匿名窗口驱动表单)' };
+            }
             const itp = await runSessionEffect({
-                effect: 'SESSION_FLIGHT_SEARCH',
+                effect: q.ui === 'gui' ? 'SESSION_FLIGHT_GUI_SEARCH' : 'SESSION_FLIGHT_SEARCH',
                 params: {
-                    from: q.from, to: q.to, date: q.date,
+                    from: q.from, to: q.to, date: q.date, fromCityCode: q.fromCityCode, toCityCode: q.toCityCode,
+                    ...(q.backDate ? { backDate: q.backDate } : {}),
                     // ADR-15 收尾:ReadGuard 审计在生产工具路径同样落盘(此前仅测试传隔离 stateRoot 才有 JSONL)
                     auditPath: join(config.stateRoot ?? '.', 'gotry-state', 'session-incidents.jsonl'),
                 },
@@ -1882,8 +1900,12 @@ export function apply(ctx, config, seams = {}) {
             const avMapS = await loadAirlineAirportMap();
             await appendFacts(config.stateRoot ?? '.', factsFromSession({ origin: q.from, destination: q.to, date: q.date }, r, new Date().toISOString(), avMapS?.city_alias));
             const top = (r.options ?? []).slice(0, 8).map(o => `${o.flightNo} ${o.airline} ${o.depDateTime.slice(11, 16)}→${o.arrDateTime.slice(11, 16)} ¥${o.price}`);
+            const lane = q.ui === 'gui' ? `GUI 车道(携程,匿名公开价${q.backDate ? ',往返' : ''})` : '会话检索(携程,用户本人登录态)';
+            const cal = (r.calendar ?? []).slice(0, 14).map(d => `${d.date} ${d.price !== undefined ? `¥${d.price}` : (d.priceRaw ?? '?')}`);
+            const calBlock = cal.length > 0 ? `\n低价日历(匿名公开价,该航线哪些日期有票):\n${cal.join(' | ')}` : '';
+            const urlBlock = q.ui === 'gui' && r.listUrl ? `\nlistUrl(站点真实形状,#663 URL 教师):${r.listUrl.slice(0, 160)}` : '';
             const summary = r.verdict === 'hit'
-                ? `${q.from}→${q.to} ${q.date} 会话检索(携程,用户本人登录态)前 ${top.length} 条:\n${top.join('\n')}\n${r.evidence}`
+                ? `${q.from}→${q.to} ${q.date} ${lane}${(r.options ?? []).length > 0 ? ` 行情前 ${top.length} 条:\n${top.join('\n')}` : ''}${calBlock}${urlBlock}\n${r.evidence}`
                 : `会话检索未取回(${r.verdict}):${r.error ?? ''} ${r.evidence}`;
             return JSON.parse(JSON.stringify({
                 ...r, summary,

package/extension/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Stai Travel Bridge",
-  "version": "0.2.0.31",
+  "version": "0.2.0.32",
   "description": "Stai 连接获准的旅行检索与供应商门户：检索结果经本机或授权后端桥接；门户可触发一次性登录代填，扩展不持久保存凭据。",
   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnuzBX8rT8+RZKEUip5VRA0cY056pExy9PNdN9YCiuY3dgglRbcIBhjuFJoR6EX3/MaUv82vJVyItRVrowXLTwDk4WZof0vwFgKL0zBK304PC46pUaAKTSu1PgXeL1+j5KTAGz/9a9+RnPdbj7jND5rM/MOmBHNPVPpp1NlwxRGIgF9OxHSOfXORcH4Iyte1aJSFUJbFtNS/DaE5D+KjyupPLyIqVN/dCiKnNsTCEHQB9ngeli665PFp76hkccHQQZ4sVuMLS4zBPcazUsp1kcnW+xsQoUATkODTCY+Pzk3zUVF1QOESTjRCVnbNi8tkO43RMRs2q63gX/3inFivcEwIDAQAB",
   "permissions": [
@@ -56,5 +56,5 @@
       "run_at": "document_start"
     }
   ],
-  "version_name": "0.2.0-rc.31"
+  "version_name": "0.2.0-rc.32"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danceiny/gotry",
-  "version": "0.2.0-rc.31",
+  "version": "0.2.0-rc.32",
   "description": "GoTry — 从出发到下一次出发的 AI 旅行 Agent(dsh 插件)。npm/源码入口共用锁定的 dsh runtime + README 安装路径。",
   "type": "module",
   "main": "ts/src/index.ts",
@@ -115,6 +115,7 @@
     "ts/capabilities/opensky.ts",
     "ts/capabilities/flyai.ts",
     "ts/capabilities/flyai-config.ts",
+    "ts/capabilities/hbcli-config.ts",
     "ts/capabilities/session-search.ts",
     "ts/capabilities/session/",
     "extension/",

package/ts/capabilities/flyai-config.ts

@@ -185,22 +185,22 @@ export function verifySecureMode(dir: string, file: string): { ok: boolean; erro
 /**
  * 官方 CLI 1.0.16 首次运行可能先创建 ~/.flyai 为 0755，并在其中写入
  * 0600 device-id。仅对当前用户拥有且本身不是 symlink 的配置目录收紧到
- * 0700；验证回执所在 ~/.gotry 仍严格拒绝既有 0755 目录。
+ * 0700。回执所在 ~/.gotry 采用相同迁移规则，兼容 doctor 创建的目录。
  */
-function prepareFlyaiConfigDir(dir: string, file: string): { ok: boolean; error?: string; unsupported?: boolean } {
+function preparePrivateDir(dir: string, file: string): { ok: boolean; error?: string; unsupported?: boolean } {
   if (process.platform === 'win32') return { ok: false, unsupported: true, error: 'Windows 无 0700/0600 权限位,安全写不支持' }
   try {
     if (!existsSync(dir)) mkdirSync(dir, { recursive: true, mode: 0o700 })
     const entry = lstatSync(dir)
-    if (entry.isSymbolicLink()) return { ok: false, error: '.flyai 目录是符号链接,拒绝写入' }
-    if (!entry.isDirectory()) return { ok: false, error: '.flyai 路径不是目录,拒绝写入' }
+    if (entry.isSymbolicLink()) return { ok: false, error: '配置目录是符号链接,拒绝写入' }
+    if (!entry.isDirectory()) return { ok: false, error: '配置路径不是目录,拒绝写入' }
     if (typeof process.getuid === 'function' && entry.uid !== process.getuid()) {
-      return { ok: false, error: '.flyai 目录不属于当前用户,拒绝写入' }
+      return { ok: false, error: '配置目录不属于当前用户,拒绝写入' }
     }
     if ((entry.mode & 0o777) !== 0o700) chmodSync(dir, 0o700)
     const after = lstatSync(dir)
-    if (after.isSymbolicLink() || !after.isDirectory()) return { ok: false, error: '.flyai 目录状态发生变化,拒绝写入' }
-    if (typeof process.getuid === 'function' && after.uid !== process.getuid()) return { ok: false, error: '.flyai 目录所有者发生变化,拒绝写入' }
+    if (after.isSymbolicLink() || !after.isDirectory()) return { ok: false, error: '配置目录状态发生变化,拒绝写入' }
+    if (typeof process.getuid === 'function' && after.uid !== process.getuid()) return { ok: false, error: '配置目录所有者发生变化,拒绝写入' }
     return verifySecureMode(dir, file)
   } catch (e) {
     return { ok: false, error: (e as Error).message }
@@ -259,7 +259,7 @@ export function saveFlyaiKey(key: string, opts: FlyaiConfigPaths = {}): SaveFlya
   const read = readFlyaiConfig(configPath)
   if (!read.ok) return { ok: false, error: `原配置损坏,已拒绝覆盖(${read.error});请先人工修复 ${configPath}` }
 
-  const configDir = prepareFlyaiConfigDir(dirname(configPath), configPath)
+  const configDir = preparePrivateDir(dirname(configPath), configPath)
   if (!configDir.ok) return { ok: false, error: configDir.error }
   const write = atomicWriteJson(configPath, { ...read.data, FLYAI_API_KEY: text })
   if (!write.ok) return { ok: false, error: write.error }
@@ -297,7 +297,7 @@ export function clearFlyaiKey(opts: FlyaiConfigPaths = {}): ClearFlyaiKeyResult
         return { ok: false, source: 'none', error: `移除文件失败:${(e as Error).message}` }
       }
     } else {
-      const configDir = prepareFlyaiConfigDir(dirname(configPath), configPath)
+      const configDir = preparePrivateDir(dirname(configPath), configPath)
       if (!configDir.ok) return { ok: false, source: 'none', error: configDir.error }
       const write = atomicWriteJson(configPath, next)
       if (!write.ok) return { ok: false, source: 'none', error: write.error }
@@ -355,7 +355,9 @@ export function readFlyaiVerification(homeDir: string): FlyaiVerification | unde
 
 /** 原子写验证记录(权限硬校验);成功=true;失败不抛错 */
 export function writeFlyaiVerification(entry: FlyaiVerification, homeDir: string): boolean {
-  return atomicWriteJson(flyaiVerificationPath(homeDir), entry).ok
+  const path = flyaiVerificationPath(homeDir)
+  const prepared = preparePrivateDir(dirname(path), path)
+  return prepared.ok && atomicWriteJson(path, entry).ok
 }
 
 export function removeFlyaiVerification(homeDir: string): void {