@danceiny/gotry 0.0.1-rc.21 → 0.0.1-rc.24

package/dist/scripts/hbcli-tests.js

@@ -1,3 +1,10 @@
+/**
+ * hbcli 封装单元测试:用临时脚本作为假 hbcli 二进制测三条路径。
+ * - 路径 1: 假 hbcli 回 exit 0 + JSON → via=hbcli-realtime
+ * - 路径 2: 假 hbcli exit 1 → via=hbcli-error + 证据链标注 error@ts
+ * - 路径 3: 不存在的 hbcli → via=hbcli-error + 证据链标注 spawn_error@ts
+ * 运行: cd ts && node --experimental-strip-types scripts/hbcli-tests.ts
+ */
 import assert from 'node:assert/strict';
 import { writeFile, mkdtemp, rm } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
@@ -6,100 +13,55 @@ import { callHbcliJson, searchHotels, hbcliBinCandidates } from '../capabilities
 const tmp = await mkdtemp(join(tmpdir(), 'hbcli-test-'));
 async function fakeBin(name, code, payload) {
     const p = join(tmp, name);
-    await writeFile(p, `#!/bin/sh\necho '${payload}'\nexit ${code}\n`, {
-        mode: 0o755
-    });
+    await writeFile(p, `#!/bin/sh\necho '${payload}'\nexit ${code}\n`, { mode: 0o755 });
     return p;
 }
 const okBin = await fakeBin('hbcli-ok', 0, '{"hotels":[{"id":"h1","name":"x"}]}');
 const failBin = await fakeBin('hbcli-fail', 1, 'certificate has expired');
+// 重写:失败时把 message 写到 stderr
 const failBin2 = join(tmp, 'hbcli-fail2');
-await writeFile(failBin2, `#!/bin/sh\nexit 1\n`, {
-    mode: 0o755
-});
-const r1 = await callHbcliJson([
-    'search',
-    'hotel-list',
-    '--json'
-], {
-    hbcliBin: okBin
-});
+await writeFile(failBin2, `#!/bin/sh\nexit 1\n`, { mode: 0o755 });
+// 1. 实时成功
+const r1 = await callHbcliJson(['search', 'hotel-list', '--json'], { hbcliBin: okBin });
 assert.equal(r1.via, 'hbcli-realtime', 'happy path');
-assert.deepEqual(r1.result, {
-    hotels: [
-        {
-            id: 'h1',
-            name: 'x'
-        }
-    ]
-});
+assert.deepEqual(r1.result, { hotels: [{ id: 'h1', name: 'x' }] });
 assert.match(r1.evidence, /^\[实时API:hbcli@/);
 assert.ok(r1.latencyMs >= 0);
-const r2 = await callHbcliJson([
-    'search',
-    'hotel-list',
-    '--json'
-], {
-    hbcliBin: failBin2,
-    timeoutMs: 5000
-});
+// 2. 实时失败(exit 1)
+const r2 = await callHbcliJson(['search', 'hotel-list', '--json'], { hbcliBin: failBin2, timeoutMs: 5000 });
 assert.equal(r2.via, 'hbcli-error', 'error path');
 assert.match(r2.evidence, /\[实时API:hbcli@error@/, `evidence got: ${r2.evidence}`);
 assert.equal(r2.exitCode, 1, '失败时 exitCode 透传');
 assert.ok(r2.error, '有 error 字段');
-const r3 = await callHbcliJson([
-    'search',
-    'hotel-list',
-    '--json'
-], {
-    hbcliBin: '/nope/hbcli',
-    timeoutMs: 5000
-});
+// 3. 二进制不存在
+const r3 = await callHbcliJson(['search', 'hotel-list', '--json'], { hbcliBin: '/nope/hbcli', timeoutMs: 5000 });
 assert.equal(r3.via, 'hbcli-error', 'no-binary path');
 assert.match(r3.evidence, /spawn_error/, `evidence got: ${r3.evidence}`);
+// 4. searchHotels 高层降级:静态包按目的地过滤命中块(issue #24 契约,不整包倾倒)
 const fallback = join(tmp, 'hotels-fallback.json');
-await writeFile(fallback, JSON.stringify({
-    meta: 'fake',
-    stays: [
-        {
-            id: 's1',
-            note: '普吉岛 workation 两周(13 晚)'
-        },
-        {
-            id: 's2',
-            note: '曼谷周末(2 晚)'
-        }
-    ]
-}));
+await writeFile(fallback, JSON.stringify({ meta: 'fake', stays: [{ id: 's1', note: '普吉岛 workation 两周(13 晚)' }, { id: 's2', note: '曼谷周末(2 晚)' }] }));
+// v0.3.0 旗标回归:上游扁平化后旗标是 --destination-name/--room-occupancies
 {
     const { writeFileSync, chmodSync } = await import('node:fs');
     const echoBin = join(tmp, 'hbcli-echo');
     writeFileSync(echoBin, '#!/bin/sh\necho "ARGS:$@"; echo \'{}\' ');
     chmodSync(echoBin, 0o755);
-    const re = await searchHotels({
-        destination: '普吉',
-        adults: 2
-    }, {
-        hbcliBin: echoBin
-    });
+    const re = await searchHotels({ destination: '普吉', adults: 2 }, { hbcliBin: echoBin });
     const argLine = JSON.stringify(re);
     if (!argLine.includes('destination-name') || !argLine.includes('room-occupancies')) {
         throw new Error(`FAIL: v0.3.0 旗标未对齐,实际 ${argLine.slice(0, 200)}`);
     }
-    const rd = await searchHotels({
-        destination: '普吉',
-        checkIn: '2026-09-18',
-        checkOut: '2026-09-20'
-    }, {
-        hbcliBin: echoBin
-    });
+    // 日期旗标回归(issue #195):hotel-list 支持日期,不传会把实时价退化成当前窗口价
+    const rd = await searchHotels({ destination: '普吉', checkIn: '2026-09-18', checkOut: '2026-09-20' }, { hbcliBin: echoBin });
     const dateLine = JSON.stringify(rd);
     if (!dateLine.includes('check-in') || !dateLine.includes('2026-09-18') || !dateLine.includes('check-out')) {
         throw new Error(`FAIL: 日期旗标未传上游,实际 ${dateLine.slice(0, 240)}`);
     }
     assert.ok(rd.summary.includes('入住 2026-09-18 → 退房 2026-09-20'), 'summary 应回显日期槽位');
     console.log('5. 旗标对齐(--destination-name/--room-occupancies/--check-in/--check-out)OK');
-}{
+}
+// 5b. 实时 summary 自带数据行(issue #195:render 只透 summary,summary 必须含 id/名称/星级/价)
+{
     const { writeFileSync, chmodSync } = await import('node:fs');
     const listBin = join(tmp, 'hbcli-list');
     writeFileSync(listBin, `#!/bin/sh
@@ -108,13 +70,7 @@ cat <<'JSON'
 JSON
 `);
     chmodSync(listBin, 0o755);
-    const rl = await searchHotels({
-        destination: '迪拜',
-        checkIn: '2026-09-18',
-        checkOut: '2026-09-20'
-    }, {
-        hbcliBin: listBin
-    });
+    const rl = await searchHotels({ destination: '迪拜', checkIn: '2026-09-18', checkOut: '2026-09-20' }, { hbcliBin: listBin });
     assert.equal(rl.via, 'hbcli-realtime');
     assert.ok(rl.summary.includes('实时 1 家'), 'summary 应带家数');
     assert.ok(rl.summary.includes('id=461850557'), '数据行应带 hotelId(hotel-rates 入参来源)');
@@ -124,61 +80,31 @@ JSON
     assert.match(rl.summary, /\[实时API:hbcli@/, 'summary 应带证据链时间戳');
     assert.ok(rl.hotels !== null, 'hotels 结构化产物保留(UI/程序消费)');
     console.log(`5b. 实时 summary 数据行 OK:${rl.summary.split('\n')[1]}`);
-}const r4 = await searchHotels({
-    destination: '普吉岛'
-}, {
-    hbcliBin: failBin2,
-    fallbackPath: fallback
-});
+}
+const r4 = await searchHotels({ destination: '普吉岛' }, { hbcliBin: failBin2, fallbackPath: fallback });
 assert.equal(r4.via, 'hbcli-error', 'searchHotels: fails to hbcli → fallback');
 assert.equal(r4.summary.includes('降级到静态包'), true, 'summary 指明降级');
-assert.deepEqual(r4.hotels, {
-    stays: [
-        {
-            id: 's1',
-            note: '普吉岛 workation 两周(13 晚)'
-        }
-    ]
-}, 'hotels 只含目的地命中的住宿块');
+assert.deepEqual(r4.hotels, { stays: [{ id: 's1', note: '普吉岛 workation 两周(13 晚)' }] }, 'hotels 只含目的地命中的住宿块');
 assert.equal(r4.summary.includes('命中 1 个住宿块'), true, 'summary 指明命中块数');
-const r5 = await searchHotels({
-    destination: '巴黎'
-}, {
-    hbcliBin: failBin2,
-    fallbackPath: fallback
-});
+// 5. 静态包无该目的地 → hotels=null 明示无数据,不伪装成可用结果
+const r5 = await searchHotels({ destination: '巴黎' }, { hbcliBin: failBin2, fallbackPath: fallback });
 assert.equal(r5.hotels ?? null, null, '无目的地命中时 hotels 为 null(不整包倾倒)');
 assert.match(r5.summary, /无「巴黎」住宿数据/, 'summary 明示静态包无该目的地');
-const r6 = await searchHotels({
-    destination: '普吉'
-}, {
-    hbcliBin: '/nope/hbcli',
-    fallbackPath: fallback
-});
+// 6. ENOENT 降级原因人话化(issue #24):hbcli 未安装时降级原因应带 gotry setup 指引
+const r6 = await searchHotels({ destination: '普吉' }, { hbcliBin: '/nope/hbcli', fallbackPath: fallback });
 assert.equal(r6.via, 'hbcli-error', 'no-binary path');
 assert.ok(r6.summary.includes('未安装 hbcli'), `summary 应人话化 ENOENT,实际 ${r6.summary}`);
 assert.ok(r6.summary.includes('gotry setup'), '应带 gotry setup 安装指引');
 assert.ok(r6.summary.includes('降级到静态包'), '人话化后仍指明降级到静态包');
 console.log(`6. ENOENT 人话化 OK:${r6.summary}`);
+// 7. 候选路径回退(gotry setup 官方脚本装到 ~/.local/bin,PATH 可能不含):
+//    默认名 'hbcli' 扩展已知安装位;显式自定义名不扩展(保配置即所用的可测性)
 {
     const home = '/home/t';
-    assert.deepEqual(hbcliBinCandidates('hbcli', home), [
-        'hbcli',
-        '/home/t/.local/bin/hbcli',
-        '/home/t/.staicli/current/hbcli'
-    ], '默认名应带安装位候选');
-    assert.deepEqual(hbcliBinCandidates('hbcli-not-on-path', home), [
-        'hbcli-not-on-path'
-    ], '自定义名单候选(测试确定性)');
-    assert.deepEqual(hbcliBinCandidates('/nope/hbcli', home), [
-        '/nope/hbcli'
-    ], '绝对路径单候选');
+    assert.deepEqual(hbcliBinCandidates('hbcli', home), ['hbcli', '/home/t/.local/bin/hbcli', '/home/t/.staicli/current/hbcli'], '默认名应带安装位候选');
+    assert.deepEqual(hbcliBinCandidates('hbcli-not-on-path', home), ['hbcli-not-on-path'], '自定义名单候选(测试确定性)');
+    assert.deepEqual(hbcliBinCandidates('/nope/hbcli', home), ['/nope/hbcli'], '绝对路径单候选');
     console.log('7. hbcliBinCandidates(~/.local/bin + ~/.staicli/current 回退)OK');
-}await rm(tmp, {
-    recursive: true,
-    force: true
-});
+}
+await rm(tmp, { recursive: true, force: true });
 console.log('HBCLI TESTS: 8/8 OK (happy / error / no-binary / fallback-filter / fallback-no-match / v0.3.0 旗标回归 / ENOENT 人话化 / 候选路径)');
-
-
-//# sourceURL=ts/scripts/hbcli-tests.ts

package/dist/scripts/health-watch-cli.js

@@ -1,24 +1,42 @@
+/**
+ * health-watch CLI 入口(gotry setup wizard 闭环 §3.3):
+ *
+ * bin/gotry-bootstrap.js wizard 子命令 spawn `npx tsx scripts/health-watch-cli.ts`,
+ * 本脚本启 startExtensionHealthWatch 后,把 waitReady 结果以单行 JSON 形式 stdout 打印。
+ *
+ * 参数(全部 env/argv 可读,缺省走 §3.3 设计默认值):
+ *   --timeout <ms>   最长等多久(默认 120_000)
+ *   --interval <ms>  探活间隔(默认 5_000)
+ *   --json           单行 JSON 输出(默认开,方便父进程解析)
+ *   GOTRY_ONBOARDING_BRIDGE_PORTS=<csv> 诊断/测试端口覆盖;`0` 表示隔离临时端口
+ *
+ * 退出码:0 = ready 或 timeout(语义由 JSON 字段区分,父进程据此 exit 0/1);非 0 = 异常。
+ *
+ * 不打 .(心跳点)给父进程——父进程单独打,避免双源混 stdout(JSON 行被 . 切断)。
+ */
 import process from 'node:process';
 import { startExtensionHealthWatch } from '../capabilities/session/health-watch.js';
 function parseArgs(argv) {
-    const args = {
-        timeoutMs: 120_000,
-        intervalMs: 5_000,
-        json: true
-    };
-    for(let i = 0; i < argv.length; i += 1){
+    const args = { timeoutMs: 120_000, intervalMs: 5_000, json: true };
+    for (let i = 0; i < argv.length; i += 1) {
         const cur = argv[i];
-        if (cur === '--timeout') args.timeoutMs = parseInt(argv[++i] ?? '120000', 10);
-        else if (cur === '--interval') args.intervalMs = parseInt(argv[++i] ?? '5000', 10);
-        else if (cur === '--json') args.json = true;
-        else if (cur === '--no-json') args.json = false;
+        if (cur === '--timeout')
+            args.timeoutMs = parseInt(argv[++i] ?? '120000', 10);
+        else if (cur === '--interval')
+            args.intervalMs = parseInt(argv[++i] ?? '5000', 10);
+        else if (cur === '--json')
+            args.json = true;
+        else if (cur === '--no-json')
+            args.json = false;
     }
-    if (Number.isNaN(args.timeoutMs) || args.timeoutMs < 0) args.timeoutMs = 120_000;
-    if (Number.isNaN(args.intervalMs) || args.intervalMs < 1_000) args.intervalMs = 5_000;
+    if (Number.isNaN(args.timeoutMs) || args.timeoutMs < 0)
+        args.timeoutMs = 120_000;
+    if (Number.isNaN(args.intervalMs) || args.intervalMs < 1_000)
+        args.intervalMs = 5_000;
     const rawPorts = process.env.GOTRY_ONBOARDING_BRIDGE_PORTS;
     if (rawPorts) {
-        const parsed = rawPorts.split(',').map((part)=>Number.parseInt(part.trim(), 10));
-        if (parsed.every((port)=>Number.isInteger(port) && port >= 0 && port <= 65535)) {
+        const parsed = rawPorts.split(',').map((part) => Number.parseInt(part.trim(), 10));
+        if (parsed.every((port) => Number.isInteger(port) && port >= 0 && port <= 65535)) {
             args.ports = parsed;
         }
     }
@@ -26,34 +44,30 @@ function parseArgs(argv) {
 }
 async function main() {
     const args = parseArgs(process.argv.slice(2));
+    // 双因子业务探针默认关:心跳 + cookie-names 双通过才算 ready,wizard 30s 内难凑齐。
+    // 单心跳就够(扩展真在线 = SW 在跑,permission 缺时 cookie job 失败会显式 verdict 报错);
+    // 想要严格双因子,CLI 显式 --business-probe。
     const businessProbe = process.argv.includes('--business-probe');
     const watch = startExtensionHealthWatch({
         timeoutMs: args.timeoutMs,
         intervalMs: args.intervalMs,
         keepBridge: true,
         businessProbe,
-        ports: args.ports
-    });
-    process.on('SIGINT', ()=>{
-        watch.cancel('SIGINT');
-        process.exit(0);
-    });
-    process.on('SIGTERM', ()=>{
-        watch.cancel('SIGTERM');
-        process.exit(0);
+        ports: args.ports,
     });
+    // Ctrl+C 转 cancelled
+    process.on('SIGINT', () => { watch.cancel('SIGINT'); process.exit(0); });
+    process.on('SIGTERM', () => { watch.cancel('SIGTERM'); process.exit(0); });
     const outcome = await watch.waitReady();
     if (args.json) {
         process.stdout.write(JSON.stringify(outcome) + '\n');
-    } else {
+    }
+    else {
         process.stdout.write(`ready=${outcome.ready} attempts=${outcome.attempts} waitedMs=${outcome.waitedMs} reason=${'reason' in outcome ? outcome.reason : 'ok'}\n`);
     }
     process.exit(0);
 }
-main().catch((e)=>{
+main().catch((e) => {
     process.stderr.write(`[health-watch-cli] error: ${e instanceof Error ? e.message : String(e)}\n`);
     process.exit(2);
 });
-
-
-//# sourceURL=ts/scripts/health-watch-cli.ts