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

package/dist/scripts/bootstrap-tests.js

@@ -103,12 +103,22 @@ assert.ok(!c7b.out.includes('下载通道'), '非法值不应进入 github 通
 console.log('7. 扩展分发 github 通道(不可达基址即时降级 + 非法值回落 bundled)OK');
 // 8. doctor 子命令(2026-09-02 迪拜 session 复盘:可选依赖不撒手——doctor 统一
 //    显示状态 + 精确补装指引;LLM key 显式让渡;报告落 gotry-state/doctor-report.md)
-const c8 = runBootstrap(['doctor'], {});
+const doctorHome = mkdtempSync(join(tmpdir(), 'gotry-doctor-home-'));
+let c8;
+try {
+    c8 = runBootstrap(['doctor'], { HOME: doctorHome, FLYAI_API_KEY: '', DEBUG_FLYAI_API_KEY: '', STAICLI_HOME: join(doctorHome, '.staicli'), HOTELBYTE_TOKEN: '' });
+}
+finally {
+    rmSync(doctorHome, { recursive: true, force: true });
+}
 assert.ok(c8.out.includes('[gotry-doctor]'), '应输出 [gotry-doctor] 标签');
 assert.ok(c8.out.includes('Agent Reach'), '体检应含 agent-reach 项');
 assert.ok(c8.out.includes('hbcli'), '体检应含 hbcli 项');
 assert.ok(c8.out.includes('FlyAI(飞猪官方检索'), '体检应含 flyai 项');
-assert.ok(c8.out.includes('匿名试用') || c8.out.includes('已配置,未验证'), '体检应明确 FlyAI 当前未验证/匿名降级面');
+// FlyAI 面三合法态(doctor.ts #521:configured≠verified):匿名试用 / 已配置,未验证 / 已验证。
+// 机器态依赖断言:本机配置并验证过 key 的环境(如 founder 机)doctor 输出「已验证 …」,
+// 两态断言会把健康态误判为红(2026-10-14 发版门禁实测)。
+assert.ok(c8.out.includes('匿名试用') || c8.out.includes('已配置,未验证') || c8.out.includes('已验证'), '体检应明确 FlyAI 当前状态(匿名试用/已配置,未验证/已验证)');
 assert.ok(c8.out.includes('LLM key'), '体检应含 LLM key 让渡说明(doctor 不管 key)');
 assert.ok(c8.out.includes('dsh-map-tools'), '体检应含 dsh-map-tools 项(#139;与 ts/capabilities/doctor.ts 两面成对)');
 assert.ok(c8.out.includes('dsh-tool-ask-user'), '体检应含 dsh-tool-ask-user 项(与 ts/capabilities/doctor.ts 两面成对)');
@@ -396,6 +406,7 @@ console.log('18. onboarding CLI 跳过(非 TTY / CI / GOTRY_SETUP_SKIP / GOTRY_O
     copyFileSync(join(repoRoot, 'bin', 'gotry-flyai-verification.js'), join(fixture, 'bin', 'gotry-flyai-verification.js'));
     copyFileSync(join(repoRoot, 'bin', 'gotry-process-liveness.js'), join(fixture, 'bin', 'gotry-process-liveness.js'));
     copyFileSync(join(repoRoot, 'bin', 'gotry-extension-status.js'), join(fixture, 'bin', 'gotry-extension-status.js'));
+    copyFileSync(join(repoRoot, 'bin', 'gotry-hbcli-release.js'), join(fixture, 'bin', 'gotry-hbcli-release.js'));
     copyFileSync(join(repoRoot, 'package.json'), join(fixture, 'package.json'));
     const vendorDir = join(fixture, 'ts', 'dsh-runtime', 'vendor');
     mkdirSync(vendorDir, { recursive: true });
@@ -647,6 +658,7 @@ function buildPkgFixture(tmpRoot) {
     copyFileSync(join(repoRoot, 'bin', 'gotry-bootstrap.js'), join(pkgBin, 'gotry-bootstrap.js'));
     copyFileSync(join(repoRoot, 'bin', 'gotry-flyai-verification.js'), join(pkgBin, 'gotry-flyai-verification.js'));
     copyFileSync(join(repoRoot, 'bin', 'gotry-extension-status.js'), join(pkgBin, 'gotry-extension-status.js'));
+    copyFileSync(join(repoRoot, 'bin', 'gotry-hbcli-release.js'), join(pkgBin, 'gotry-hbcli-release.js'));
     copyFileSync(join(repoRoot, 'bin', 'gotry-runtime-resolution.js'), join(pkgBin, 'gotry-runtime-resolution.js'));
     copyFileSync(join(repoRoot, 'bin', 'gotry-process-liveness.js'), join(pkgBin, 'gotry-process-liveness.js'));
     copyFileSync(join(repoRoot, 'cordis.gotry-patch.yml'), join(pkgRoot, 'cordis.gotry-patch.yml'));
@@ -1508,8 +1520,9 @@ console.log('23. result 通道排他写入(预存文件不被覆盖 + symlink
     assert.deepEqual(unit('not json'), { ok: true, customer: false }, '非 JSON(超旧版/异常)保守视为有效,与工具层同语义');
     assert.deepEqual(unit(''), { ok: true, customer: false }, '空输出同属不可解析,保守视为有效');
     assert.deepEqual(unit(null), { ok: false, customer: false }, '取不到输出(非零退出/超时/spawn 失败)→ 未确认');
-    const fakeHbcli = (whoamiArm) => `#!/bin/sh\ncase "$*" in\n  *--version*) echo '0.0.4';;\n  *version*) echo '0.0.4';;\n  *whoami*) ${whoamiArm};;\nesac\n`;
+    const fakeHbcli = (whoamiArm, version = '0.0.4') => `#!/bin/sh\ncase "$*" in\n  *--version*) echo '${version}';;\n  *version*) echo '${version}';;\n  *whoami*) ${whoamiArm};;\nesac\n`;
     const cases = [
+        { name: 'old-version', version: '0.0.3', arm: `echo '${allFalse.replace('"api_key":{"configured":false}', '"api_key":{"configured":true}')}'`, expect: 'missing' },
         { name: 'allfalse', arm: `echo '${allFalse}'`, expect: 'degraded' },
         { name: 'customer', arm: `echo '${allFalse.replace('"customer":{"configured":false}', '"customer":{"configured":true}')}'`, expect: 'ok', customer: true },
         { name: 'apikey', arm: `echo '${allFalse.replace('"api_key":{"configured":false}', '"api_key":{"configured":true}')}'`, expect: 'ok' },
@@ -1527,12 +1540,12 @@ console.log('23. result 通道排他写入(预存文件不被覆盖 + symlink
                 mkdirSync(binDir);
                 mkdirSync(home);
                 symlinkSync(process.execPath, join(binDir, 'node'));
-                writeFileSync(join(binDir, 'hbcli'), fakeHbcli(c.arm), { mode: 0o755 });
+                writeFileSync(join(binDir, 'hbcli'), fakeHbcli(c.arm, c.version), { mode: 0o755 });
                 // CLI 面
                 const cli = runBootstrap(['doctor'], { HOME: home, PATH: binDir, FLYAI_API_KEY: '' });
                 const line = cli.out.split('\n').find((l) => l.includes('hbcli(酒店实时源)'));
                 assert.ok(line, `${c.name}: CLI doctor 应输出 hbcli 行\n${cli.out}`);
-                const cliLevel = line.includes('已安装且凭证有效') ? 'ok' : line.includes('二进制在,但凭证未配置/失效') ? 'degraded' : 'other';
+                const cliLevel = line.includes('已安装且凭证有效') ? 'ok' : line.includes('二进制在,但凭证未配置/失效') ? 'degraded' : line.includes('版本过旧') ? 'missing' : 'other';
                 assert.equal(cliLevel, c.expect, `${c.name}: CLI doctor 的 hbcli 结论应为 ${c.expect}\n${line}`);
                 if (c.customer)
                     assert.ok(line.includes('customer 档在用'), `${c.name}: CLI 应标注 customer 档在用\n${line}`);
@@ -1542,6 +1555,10 @@ console.log('23. result 通道排他写入(预存文件不被覆盖 + symlink
                 process.env.PATH = prevPath;
                 assert.equal(tool.status, c.expect, `${c.name}: 工具层 doctor 的 hbcli 结论应为 ${c.expect},实际 ${tool.status}`);
                 assert.equal(cliLevel, tool.status, `${c.name}: CLI 与工具层必须同结论(两份实现不得漂移)`);
+                if (c.expect === 'missing') {
+                    assert.match(cli.out, /staicli-v0\.0\.4\/install\.sh/, 'CLI 应提供当前官方版本的安装入口');
+                    assert.match(tool.fix ?? '', /staicli-v0\.0\.4\/install\.sh/, '工具层应提供相同升级入口');
+                }
             }
             finally {
                 process.env.PATH = prevPath;
@@ -1560,5 +1577,5 @@ console.log('23. result 通道排他写入(预存文件不被覆盖 + symlink
         catch { /* ignore */ }
     }
 }
-console.log('24. hbcli 凭证判定(CLI doctor 按 whoami 三档 JSON 判,不看退出码;与工具层 doctor 对拍 5 夹具同结论:全 false=degraded / customer·api_key=ok / 非 JSON=保守 ok / 非零退出=degraded)OK');
+console.log('24. hbcli 版本与凭证判定(CLI↔工具层 6 夹具同结论:旧版=missing / 全 false=degraded / customer·api_key=ok / 非 JSON=保守 ok / 非零退出=degraded)OK');
 console.log('BOOTSTRAP TESTS: 26/26 OK(扩展就位 + 跳过开关 / wizard --dry-run / wizard 真实 / 扩展分发通道 / doctor 体检面 / calendar setup 状态面 / 显式跳过 + auto 跳过 + 单项跳过 / 启动摘要 / sidebar 落盘状态复核 / onboarding 分类+计划+env opt-out+跳过原因+yes+partial-failure+幂等+prompt+CLI 跳过+--scan / 编排缝 orchestrateWebLaunch × 6 / prompt waiter failure deterministic process-group reap / waiter 原始错误 + cleanup timeout/failure handled / 临时安装包 spawned inner 21a TTY-eligible 真实 prompt→n→web + 摘要抑制 + 无残留 / 21b non-TTY 零 prompt / 21c POSIX 信号清理 SIGTERM→清 result+patch 目录 + 无残留子进程 / 21f yes-path installer 子树信号清理 / 21g yes-path timeout installer 子树清理 / 21d timeout 诊断 + 无残留 / 21e dsh-lifecycle 信号转发 / win32 平台边界 / result 通道排他写入 / hbcli 凭证判定 CLI↔工具层对拍)');

package/dist/scripts/ctrip-city-tests.js

@@ -0,0 +1,80 @@
+/** Supplier metadata fixtures; no vendor requests, credentials or browser session. */
+import assert from 'node:assert/strict';
+import { parseCtripHotelCities, resolveCtripHotelCity, parseCtripCityCatalog, parseCtripCitySuggestions, matchCtripCity, resolveCtripFlightCity } from '../capabilities/session/ctrip-city.js';
+import { resolveFlightEntryUrl } from '../capabilities/session/adapters/ctrip-flight.js';
+const catalog = { ResponseStatus: { Ack: 'Success' }, responseHead: { errorCode: '0' }, recommendGroupList: [{ indexedCity: { cityList: [
+                    { id: 2, code: 'SHA', name: '上海', eName: 'Shanghai', airportlst: [{ code: 'PVG', name: '上海浦东国际机场' }] },
+                    { id: 58, code: 'HKG', name: '中国香港', nameEn: 'Hong Kong' },
+                ] }, geographicalRegionList: [{ hotCityList: [{ cityList: [{ id: 220, code: 'DXB', name: '迪拜', eName: 'Dubai', specName: '迪拜(阿联酋)', sameSpecCity: 1 }] }] }] }] };
+const cities = parseCtripCityCatalog(catalog);
+for (const [name, code] of [['迪拜（阿联酋）', 'DXB'], ['DXB', 'DXB'], ['香港', 'HKG'], ['Hong Kong', 'HKG'], ['Shanghai', 'SHA'], ['上海浦东国际机场', 'PVG']]) {
+    const r = matchCtripCity(name, cities);
+    assert.ok(r.ok, name);
+    assert.equal(r.city.code, code);
+}
+assert.equal(matchCtripCity('Dubai', cities).ok, false, 'supplier-marked same-name cities require qualification');
+assert.equal(matchCtripCity('迪', cities).ok, false, 'no prefix or nearby-city substitution');
+assert.equal(matchCtripCity('同名城', [{ name: '同名城', code: 'AAA', aliases: ['同名城'], context: '甲国' }, { name: '同名城', code: 'BBB', aliases: ['同名城'], context: '乙国' }]).ok, false);
+assert.throws(() => parseCtripCityCatalog({ ...catalog, responseHead: { errorCode: '1' } }));
+const suggestions = { Data: [{ Type: 4, Name: '未缓存城市', Code: 'NEW', EName: 'New City', Country: '示例国', Nearby: [{ Type: 4, Name: '邻近城市', Code: 'NEA' }] }] };
+assert.equal(parseCtripCitySuggestions(suggestions).length, 1);
+let requests = [];
+const fakeFetch = async (url) => {
+    requests.push(String(url));
+    return Response.json(requests.length === 1 ? catalog : suggestions);
+};
+const resolved = await resolveCtripFlightCity('未缓存城市', fakeFetch);
+assert.ok(resolved.ok);
+assert.equal(resolved.city.code, 'NEW');
+assert.equal(requests.length, 2, 'catalog miss queries supplier autocomplete');
+const blocked = await resolveCtripFlightCity('未知城市', async () => new Response('whaleguard block'));
+assert.ok(!blocked.ok && blocked.reason === 'unavailable', 'challenge is unavailable, not unsupported/no inventory');
+const oversized = await resolveCtripFlightCity('未知城市', async () => new Response('x'.repeat(512001)));
+assert.ok(!oversized.ok && oversized.reason === 'unavailable');
+const entry = await resolveFlightEntryUrl('迪拜（阿联酋）', '香港', '2026-12-01', {}, async (q) => matchCtripCity(q, cities));
+assert.ok(entry.ok && entry.url?.includes('oneway-dxb-hkg'));
+let lookups = 0;
+assert.ok(!(await resolveFlightEntryUrl('Dubai', '香港', 'bad-date', {}, async () => { lookups++; throw Error('should not run'); })).ok);
+assert.ok(!(await resolveFlightEntryUrl('Dubai', '香港', '2026-12-01', { fromCode: '../dxb' }, async () => { lookups++; throw Error('should not run'); })).ok);
+assert.equal(lookups, 0);
+console.log('Ctrip city metadata: international names/airports, ambiguity, autocomplete fallback, challenge/bounds and exact URL PASS');
+const hotelRecord = (id, name, english, country) => ({ keyword: { keywordContentInfo: { tripType: 'CT', keywordCode: String(id), displayTexts: [{ key: 'MAIN_TITLE', value: english }] } }, controlInfo: { regionInfo: { basicCityModel: { cityId: id }, displayCityModel: { cityName: name, countryName: country, destinationNameEN: english } } } });
+const hotels = { ResponseStatus: { Ack: 'Success' }, data: { mainKeywordList: { keywords: [hotelRecord(220, '迪拜', 'Dubai', '阿联酋'), hotelRecord(596578, '迪拜', 'Dubai', '印度')] } } };
+const hotelFetch = async () => Response.json(hotels);
+const ambiguous = await resolveCtripHotelCity('迪拜', undefined, hotelFetch);
+assert.ok(!ambiguous.ok && ambiguous.reason === 'ambiguous');
+assert.equal(ambiguous.candidates.length, 2);
+const qualified = await resolveCtripHotelCity('迪拜', '阿联酋', hotelFetch);
+assert.ok(qualified.ok && qualified.city.id === '220');
+const rejected = await resolveCtripHotelCity('迪拜', undefined, async () => Response.json({ ...hotels, data: { ...hotels.data, htlSpiderActionErrorCode: 'captcha' } }));
+assert.ok(!rejected.ok && rejected.reason === 'unavailable');
+assert.throws(() => parseCtripHotelCities({ ...hotels, data: { mainKeywordList: { keywords: [{ ...hotelRecord(220, '迪拜', 'Dubai', '阿联酋'), keyword: { keywordContentInfo: { tripType: 'CT', keywordCode: '58' } } }] } } }));
+console.log('Hotel destination namespace: same-name city ambiguity, country confirmation, challenge and ID conflict PASS');
+// Exercise the real registered schema and tool dispatch, using an isolated state root.
+const { apply } = await import('../src/index.js');
+const { mkdtempSync, rmSync } = await import('node:fs');
+const { tmpdir } = await import('node:os');
+const { join } = await import('node:path');
+const root = mkdtempSync(join(tmpdir(), 'gotry-city-tool-'));
+const tools = [];
+const effects = [];
+try {
+    apply({ tools: { register: (t) => tools.push(t) }, systemPrompt: { variable: () => { } }, get: () => undefined, on: () => () => { } }, { stateRoot: root, timeoutMs: 1000, hbcliBin: 'unused', sessionAccess: 'allow' }, { effect: (async (fx) => { effects.push(fx); return { result: { ok: false, verdict: 'error', error: 'fixture only', evidence: '[fixture:city-tool]' }, trace: { effect: fx.effect, channel: 'browser', attempts: 1, backoffMs: 0, breaker: 'off', evidence: [] } }; }) });
+    const session = tools.find(t => t.name === 'gotry_session_search');
+    const hotel = tools.find(t => t.name === 'gotry_hotel_search');
+    const parameters = session.parameters?.properties ?? session.parameters;
+    assert.ok(parameters.country && parameters.fromCityCode && parameters.toCityCode, 'model must see disambiguation parameters on session search');
+    const hotelParameters = hotel.parameters?.properties ?? hotel.parameters;
+    assert.ok(!hotelParameters.country, 'HBCLI hotel tool must not advertise an ignored session parameter');
+    await session.execute({ kind: 'hotel', to: '迪拜', country: '阿联酋' }, {});
+    assert.equal(effects.at(-1).effect, 'SESSION_HOTEL_SEARCH');
+    assert.equal(effects.at(-1).params.country, '阿联酋');
+    await session.execute({ kind: 'flight', from: '迪拜', to: '香港', date: '2099-12-01', fromCityCode: 'DXB', toCityCode: 'HKG' }, {});
+    assert.equal(effects.at(-1).effect, 'SESSION_FLIGHT_SEARCH');
+    assert.equal(effects.at(-1).params.fromCityCode, 'DXB');
+    assert.equal(effects.at(-1).params.toCityCode, 'HKG');
+    console.log('Registered session tool: country/code schema and effect dispatch PASS');
+}
+finally {
+    rmSync(root, { recursive: true, force: true });
+}