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

package/dist/capabilities/doctor.js

@@ -1,5 +1,6 @@
 import { spawn } from 'node:child_process';
 import { existsSync, readFileSync } from 'node:fs';
+import { createRequire } from 'node:module';
 import { homedir } from 'node:os';
 import { join, resolve } from 'node:path';
 import { readLatestChannelEvents } from './channel-health.js';
@@ -42,10 +43,68 @@ function probe(bin, args, timeoutMs = 8_000) {
         });
     });
 }
+function probeStdout(bin, args, timeoutMs = 8_000) {
+    return new Promise((resolveProbe)=>{
+        const child = spawn(bin, args, {
+            stdio: [
+                'ignore',
+                'pipe',
+                'ignore'
+            ],
+            env: process.env
+        });
+        let out = '';
+        let done = false;
+        const timer = setTimeout(()=>{
+            if (!done) {
+                done = true;
+                try {
+                    child.kill('SIGKILL');
+                } catch  {}
+                resolveProbe(null);
+            }
+        }, timeoutMs);
+        child.on('error', ()=>{
+            if (!done) {
+                done = true;
+                clearTimeout(timer);
+                resolveProbe(null);
+            }
+        });
+        child.stdout?.on('data', (d)=>{
+            out += d.toString();
+        });
+        child.on('exit', (code)=>{
+            if (!done) {
+                done = true;
+                clearTimeout(timer);
+                resolveProbe(code === 0 ? out.trim() : null);
+            }
+        });
+    });
+}
+function parseVersion(v) {
+    const m = String(v || '').match(/(\d+)\.(\d+)\.(\d+)/);
+    return m ? [
+        Number(m[1]),
+        Number(m[2]),
+        Number(m[3])
+    ] : null;
+}
+function versionAtLeast(v, min) {
+    const a = v;
+    const b = parseVersion(min);
+    if (!a || !b) return false;
+    for(let i = 0; i < 3; i++){
+        if (a[i] !== b[i]) return a[i] > b[i];
+    }
+    return true;
+}
 export function nodeOk(version) {
     const [maj = '0', min = '0'] = version.split('.');
     return Number(maj) > 22 || Number(maj) === 22 && Number(min) >= 15;
 }
+const MIN_HBCLI_VERSION = process.env.GOTRY_MIN_HBCLI_VERSION ?? '0.0.3';
 export async function runDoctorChecks(opts = {}) {
     const repoRoot = opts.repoRoot ? resolve(opts.repoRoot) : resolve(import.meta.dirname, '..', '..');
     const home = opts.homeDir ?? homedir();
@@ -117,22 +176,36 @@ export async function runDoctorChecks(opts = {}) {
         }
     }
     if (hbPresent) {
-        const whoami = await probe(hbPresent === 'hbcli(PATH)' ? 'hbcli' : hbPresent, [
-            'auth',
-            'whoami'
-        ]);
-        items.push(whoami ? {
-            id: 'hbcli',
-            label: 'hbcli(酒店实时源)',
-            status: 'ok',
-            detail: `已安装且凭证有效(${hbPresent})`
-        } : {
-            id: 'hbcli',
-            label: 'hbcli(酒店实时源)',
-            status: 'degraded',
-            detail: '二进制在,但凭证未配置/失效——酒店检索将降级静态包(非实时)',
-            fix: 'hbcli auth set-credentials --app-key hotelbyte_api_demo --app-secret hotelbyte_api_demo(快速试用沙箱;正式 key 向 HotelByte 申请)'
-        });
+        const hbCmd = hbPresent === 'hbcli(PATH)' ? 'hbcli' : hbPresent;
+        const v = parseVersion(await probeStdout(hbCmd, [
+            '--version'
+        ]));
+        if (v && !versionAtLeast(v, MIN_HBCLI_VERSION)) {
+            items.push({
+                id: 'hbcli',
+                label: 'hbcli(酒店实时源)',
+                status: 'missing',
+                detail: `版本过旧(v${v.join('.')} < v${MIN_HBCLI_VERSION})——trade.* / search/checkAvail 会 401(issue #142)`,
+                fix: 'npm install -g staicli --registry=https://registry.npmjs.org/'
+            });
+        } else {
+            const whoami = await probe(hbCmd, [
+                'auth',
+                'whoami'
+            ]);
+            items.push(whoami ? {
+                id: 'hbcli',
+                label: 'hbcli(酒店实时源)',
+                status: 'ok',
+                detail: `已安装且凭证有效(${hbPresent}, v${v ? v.join('.') : '?'})`
+            } : {
+                id: 'hbcli',
+                label: 'hbcli(酒店实时源)',
+                status: 'degraded',
+                detail: '二进制在,但凭证未配置/失效——酒店检索将降级静态包(非实时)',
+                fix: 'hbcli auth set-credentials --app-key hotelbyte_api_demo --app-secret hotelbyte_api_demo(快速试用沙箱;正式 key 向 HotelByte 申请)'
+            });
+        }
     } else {
         items.push({
             id: 'hbcli',
@@ -206,13 +279,22 @@ export async function runDoctorChecks(opts = {}) {
         detail: '已挂载但 calendar 未配置 username——日历工具会话中会报「未配置」',
         fix: `npx gotry setup calendar --off(恢复默认不挂载),或在 ${calProfilePatch} 覆盖 calendar 行 config 填 username(指引: npx gotry setup calendar --status)`
     });
+    const rootRequire = createRequire(join(repoRoot, 'package.json'));
     const mapCandidates = [
+        join(repoRoot, 'ts/dsh-runtime/vendor/dsh-map-tools/lib/index.js'),
         join(repoRoot, 'ts/dsh-runtime/node_modules/dsh-map-tools/lib/index.js'),
         join(repoRoot, 'node_modules/dsh-map-tools/package.json'),
         join(repoRoot, 'ts/node_modules/dsh-map-tools/package.json'),
         join(home, '.dsh/profiles/web/node_modules/dsh-map-tools/package.json')
     ];
-    const mapHit = mapCandidates.find((p)=>existsSync(p));
+    let mapHit = mapCandidates.find((p)=>existsSync(p));
+    if (!mapHit) {
+        try {
+            mapHit = rootRequire.resolve('dsh-map-tools');
+        } catch  {
+            mapHit = undefined;
+        }
+    }
     items.push(mapHit ? {
         id: 'map-tools',
         label: 'dsh-map-tools(地图/路线/POI)',
@@ -223,14 +305,26 @@ export async function runDoctorChecks(opts = {}) {
         label: 'dsh-map-tools(地图/路线/POI)',
         status: 'missing',
         detail: '未随包解析——启动时该 patch 条目被静默剔除,地图/路线/POI 工具不会出现在模型工具箱(缺地图不挡旅行规划,只少能力)',
-        fix: 'npx gotry doctor --fix 不覆盖此项:source 布局把 dsh-map-tools 放进 ts/dsh-runtime/node_modules(或 ts/node_modules);npm 布局重装 @danceiny/gotry(随发行版依赖提供)'
+        fix: '重装 @danceiny/gotry(地图插件随包 vendor 分发,缺失多为安装不完整)'
     });
     const askCandidates = [
         join(repoRoot, 'ts/dsh-runtime/vendor/deepseek-ai-dsh-tool-ask-user/package.json'),
         join(repoRoot, 'node_modules/@deepseek-ai/dsh-tool-ask-user/package.json'),
         join(home, '.dsh/profiles/web/node_modules/@deepseek-ai/dsh-tool-ask-user/package.json')
     ];
-    const askHit = askCandidates.find((p)=>existsSync(p));
+    let askHit = askCandidates.find((p)=>existsSync(p));
+    if (!askHit) {
+        try {
+            const reqFromDsh = createRequire(rootRequire.resolve('@deepseek-ai/dsh/lib/bin.js'));
+            askHit = reqFromDsh.resolve('@deepseek-ai/dsh-tool-ask-user');
+        } catch  {
+            try {
+                askHit = rootRequire.resolve('@deepseek-ai/dsh-tool-ask-user');
+            } catch  {
+                askHit = undefined;
+            }
+        }
+    }
     items.push(askHit ? {
         id: 'ask-user',
         label: 'dsh-tool-ask-user(结构化澄清卡)',

package/dist/capabilities/hbcli.js

@@ -112,6 +112,25 @@ export async function callHbcliJson(args, opts = {}) {
     }
     return last;
 }
+function i18nName(v) {
+    if (!v) return '';
+    if (typeof v === 'string') return v;
+    return v.zh || v.en || v.ar || '';
+}
+function hotelLines(result, max = 8) {
+    const list = result?.list;
+    if (!Array.isArray(list) || list.length === 0) return '';
+    const lines = [];
+    for (const item of list.slice(0, max)){
+        const h = item;
+        const name = i18nName(h.name) || `hotel ${h.id ?? '?'}`;
+        const star = typeof h.star === 'number' && h.star > 0 ? ` ${h.star}★` : '';
+        const price = h.minPrice && typeof h.minPrice.amount === 'number' ? ` 低至 ${h.minPrice.amount}${h.minPrice.currency ? ` ${h.minPrice.currency}` : ''}` : '';
+        lines.push(`- id=${h.id ?? '?'} ${name}${star}${price}`);
+    }
+    if (list.length > max) lines.push(`…(共 ${list.length} 家,仅列前 ${max})`);
+    return lines.join('\n');
+}
 export async function searchHotels(query, opts = {}) {
     const hbArgs = [
         'search',
@@ -121,6 +140,8 @@ export async function searchHotels(query, opts = {}) {
         '10'
     ];
     if (query.destination) hbArgs.push('--destination-name', query.destination);
+    if (query.checkIn) hbArgs.push('--check-in', query.checkIn);
+    if (query.checkOut) hbArgs.push('--check-out', query.checkOut);
     if (query.adults) hbArgs.push('--room-occupancies', JSON.stringify([
         {
             adultCount: query.adults,
@@ -129,10 +150,15 @@ export async function searchHotels(query, opts = {}) {
     ]));
     const live = await callHbcliJson(hbArgs, opts);
     if (live.via === 'hbcli-realtime') {
+        const list = live.result?.list;
+        const n = Array.isArray(list) ? list.length : 0;
+        const dateTag = query.checkIn ? `入住 ${query.checkIn}${query.checkOut ? ` → 退房 ${query.checkOut}` : ''}` : '未传日期(上游按当前窗口价)';
+        const lines = hotelLines(live.result);
+        const summary = `${query.destination}:hbcli 实时 ${n} 家(${dateTag})${lines ? `\n${lines}` : ''}\n${live.evidence}`;
         return {
             ...live,
             hotels: live.result,
-            summary: `${query.destination}:hbcli 实时返回${query.checkIn || query.checkOut ? '(日期不传上游 list,以当前窗口房价返回)' : ''}`
+            summary
         };
     }
     const rawReason = live.error ?? live.via;
@@ -151,7 +177,7 @@ export async function searchHotels(query, opts = {}) {
                     hotels: {
                         stays: matched
                     },
-                    summary: `${query.destination}:hbcli 实时源不可用(${reason}),已降级到静态包(公开渠道估算,非实时),命中 ${matched.length} 个住宿块`
+                    summary: `${query.destination}:hbcli 实时源不可用(${reason}),已降级到静态包(公开渠道估算,非实时),命中 ${matched.length} 个住宿块:\n${JSON.stringify(matched).slice(0, 1600)}`
                 };
             }
             return {

package/dist/capabilities/session/health-watch.js

@@ -73,10 +73,17 @@ export function startExtensionHealthWatch(opts = {}) {
     const businessProbe = opts.businessProbe ?? true;
     const probe = opts.probe ?? (async ()=>{
         const bridge = await import('./extension-bridge.js');
-        await bridge.getOrCreateSessionBridge({
-            keepBridge: opts.keepBridge === true
+        const created = await bridge.getOrCreateSessionBridge({
+            keepBridge: opts.keepBridge === true,
+            ports: opts.ports
         });
-        return combinedProbe(opts, businessProbe);
+        const probeOpts = created.ok && opts.ports ? {
+            ...opts,
+            ports: [
+                created.bridge.port
+            ]
+        } : opts;
+        return combinedProbe(probeOpts, businessProbe);
     });
     const now = opts.now ?? Date.now;
     const state = {

package/dist/scripts/agent-planning-turn-deadline-e2e.js

@@ -117,7 +117,8 @@ async function startRelay() {
             if (toolNames(body).includes(TOOL)) {
                 plannerBodies.push(body);
                 const plannerIndex = plannerBodies.length;
-                const alreadyHandedOff = JSON.stringify(body).includes(HANDOFF);
+                const realToolMessages = (body.messages ?? []).filter((message)=>message.role === 'tool');
+                const alreadyHandedOff = realToolMessages.some((message)=>JSON.stringify(message).includes(HANDOFF));
                 const stall = !alreadyHandedOff && plannerIndex === 1 ? RELAY_STALL_MS : 0;
                 setTimeout(()=>{
                     if (!alreadyHandedOff && plannerIndex === 1) {

package/dist/scripts/anything-tests.js

@@ -11,11 +11,17 @@ try {
             await writeFile(p, `#!/bin/sh
 cat <<'JSON'
 {"candidates":[
-  {"type":"hotel","name":"Park Hyatt","hotel":{"id":"h1","name":"Park Hyatt","latitude":22.31,"longitude":114.16}},
-  {"type":"city","name":"大理市","region":{"id":"d1","name":"Dali","latitude":25.58,"longitude":100.21}},
-  {"type":"place","name":"洱海","region":{"id":"r1","name":"Erhai Lake","latitude":25.74,"longitude":100.25}}
+  {"type":"hotel","matchScore":180,"hotel":{"id":"h1","name":{"en":"Park Hyatt","zh":"柏悦酒店"},"star":5,"destinationId":"d1","latlngCoordinator":{"google":{"lat":22.31,"lng":114.16}}}},
+  {"type":"city","matchScore":250,"region":{"id":"d1","name":{"en":"Dali","zh":"大理市"},"countryCode":"CN","coordinates":{"centerLat":25.58,"centerLng":100.21}}},
+  {"type":"place","matchScore":90,"region":{"id":"r1","name":{"zh":"洱海"}},"place":{"latlngCoordinator":{"google":{"lat":25.74,"lng":100.25}}}}
 ]}
 JSON
+`, {
+                mode: 0o755
+            });
+        } else if (behaviour === 'echo-args') {
+            await writeFile(p, `#!/bin/sh
+printf '{"candidates":[{"type":"city","region":{"id":"%s"}}]}' "$*"
 `, {
                 mode: 0o755
             });
@@ -31,6 +37,13 @@ JSON
             await writeFile(p, `#!/bin/sh
 echo 'hotelbe down' >&2
 exit 1
+`, {
+                mode: 0o755
+            });
+        } else if (behaviour === 'unknown-command') {
+            await writeFile(p, `#!/bin/sh
+echo "error: unknown command 'anything'" >&2
+exit 1
 `, {
                 mode: 0o755
             });
@@ -46,44 +59,80 @@ while :; do sleep 5; done
     }
     const ok = await fakeBin('hbcli-ok', 'ok');
     const r1 = await anythingSearch({
-        keyword: 'Park Hyatt',
+        keyword: '大理',
         hbcliBin: ok
     });
     assert.equal(r1.verdict, 'hit');
     assert.equal(r1.hits.length, 3);
     assert.ok(r1.evidence.includes('hbcli-anything@'));
-    console.log(`1. Park Hyatt → hit (${r1.hits.length} candidates) OK`);
-    const empty = await fakeBin('hbcli-empty', 'empty');
+    const [hotelHit, cityHit, placeHit] = r1.hits;
+    assert.equal(hotelHit.type, 'hotel');
+    assert.equal(hotelHit.name, '柏悦酒店', 'hotel i18n name 应 zh 优先');
+    assert.equal(hotelHit.hotelId, 'h1');
+    assert.equal(hotelHit.destinationId, 'd1', 'hotel 候选 destinationId 取所属目的地');
+    assert.equal(hotelHit.star, 5);
+    assert.equal(hotelHit.latitude, 22.31);
+    assert.equal(hotelHit.longitude, 114.16);
+    assert.equal(hotelHit.score, 180);
+    assert.equal(cityHit.type, 'city');
+    assert.equal(cityHit.name, '大理市', 'region i18n name 应 zh 优先');
+    assert.equal(cityHit.destinationId, 'd1');
+    assert.equal(cityHit.latitude, 25.58, 'city 坐标取 region.coordinates.centerLat');
+    assert.equal(cityHit.longitude, 100.21);
+    assert.equal(placeHit.type, 'place');
+    assert.equal(placeHit.name, '洱海');
+    assert.equal(placeHit.latitude, 25.74, 'place 坐标回退 place.latlngCoordinator');
+    console.log('1. 真实候选 wire 形状(hotel/city/place 逐字段)OK');
+    const echo = await fakeBin('hbcli-echo-args', 'echo-args');
     const r2 = await anythingSearch({
+        keyword: '大理',
+        contentType: 'city',
+        parentDestinationId: 'd1',
+        hbcliBin: echo
+    });
+    assert.equal(r2.verdict, 'hit');
+    assert.equal(r2.hits[0].destinationId, '--json search anything 大理 --content-type city --destination-id d1', 'spawn 旗标形态(--json 前置/--destination-id 映射)应稳定,实际 ' + r2.hits[0].destinationId);
+    console.log('2. 旗标回归(--json 前置 + --destination-id 映射)OK');
+    const empty = await fakeBin('hbcli-empty', 'empty');
+    const r3 = await anythingSearch({
         keyword: 'nothing',
         hbcliBin: empty
     });
-    assert.equal(r2.verdict, 'miss');
-    assert.equal(r2.hits.length, 0);
-    console.log('2. nothing → miss OK');
+    assert.equal(r3.verdict, 'miss');
+    assert.equal(r3.hits.length, 0);
+    console.log('3. nothing → miss OK');
     const fail = await fakeBin('hbcli-fail', 'fail');
-    const r3 = await anythingSearch({
+    const r4 = await anythingSearch({
         keyword: 'x',
         hbcliBin: fail
     });
-    assert.equal(r3.verdict, 'error');
-    assert.equal(r3.ok, false);
-    assert.match(r3.evidence, /error/);
-    console.log('3. fail → error (降级) OK');
+    assert.equal(r4.verdict, 'error');
+    assert.equal(r4.ok, false);
+    assert.match(r4.evidence, /error/);
+    console.log('4. fail → error (降级) OK');
+    const old = await fakeBin('hbcli-old', 'unknown-command');
+    const r5 = await anythingSearch({
+        keyword: 'x',
+        hbcliBin: old
+    });
+    assert.equal(r5.verdict, 'error');
+    assert.match(r5.error ?? '', /hbcli update|gotry setup/, 'error 应带升级指引,实际 ' + r5.error);
+    assert.match(r5.evidence, /unknown command/, 'evidence 保留上游原话(溯源)');
+    console.log(`5. 旧 CLI unknown command → 升级指引 OK(${r5.error})`);
     const hang = await fakeBin('hbcli-hang', 'hang');
-    const r4 = await anythingSearch({
+    const r6 = await anythingSearch({
         keyword: 'x',
         hbcliBin: hang,
         timeoutMs: 800
     });
-    assert.equal(r4.verdict, 'error', 'timeout 应判 error');
-    console.log(`4. hang/timeout → error OK (latency=${r4.latencyMs}ms)`);
-    const r5 = await anythingSearch({
+    assert.equal(r6.verdict, 'error', 'timeout 应判 error');
+    console.log(`6. hang/timeout → error OK (latency=${r6.latencyMs}ms)`);
+    const r7 = await anythingSearch({
         keyword: '   '
     });
-    assert.equal(r5.verdict, 'error');
-    console.log('5. empty keyword → error OK');
-    console.log('\nANYTHING TESTS: 5/5 OK(hbcli fake + graceful degrade)');
+    assert.equal(r7.verdict, 'error');
+    console.log('7. empty keyword → error OK');
+    console.log('\nANYTHING TESTS: 7/7 OK(hbcli fake + wire 对齐 + 降级诚实)');
 } finally{
     await rm(tmp, {
         recursive: true,