@danceiny/gotry 0.0.1-rc.18 → 0.0.1-rc.20

package/dist/capabilities/anything.js

@@ -1,4 +1,24 @@
 import { spawn } from 'node:child_process';
+import { hbcliBinCandidates } from './hbcli.js';
+function i18nText(v) {
+    if (!v) return '';
+    if (typeof v === 'string') return v;
+    return v.zh || v.en || v.ar || '';
+}
+function latlngOf(coord) {
+    for (const src of [
+        coord?.google,
+        coord?.gaode
+    ]){
+        const lat = typeof src?.lat === 'number' ? src.lat : undefined;
+        const lng = typeof src?.lng === 'number' ? src.lng : undefined;
+        if (lat !== undefined && lng !== undefined && (lat !== 0 || lng !== 0)) return {
+            latitude: lat,
+            longitude: lng
+        };
+    }
+    return {};
+}
 function sh(cmd, args, opts) {
     const ctrl = new AbortController();
     const timer = setTimeout(()=>{
@@ -48,8 +68,20 @@ function sh(cmd, args, opts) {
         });
     });
 }
-const upperFirst = (s)=>s ? s[0].toUpperCase() + s.slice(1) : s;
-const lowerFirst = (s)=>s ? s[0].toLowerCase() + s.slice(1) : s;
+function buildArgs(keyword, q) {
+    const args = [
+        '--json',
+        'search',
+        'anything',
+        keyword
+    ];
+    if (q.contentType) args.push('--content-type', q.contentType);
+    if (q.parentDestinationId !== undefined) args.push('--destination-id', String(q.parentDestinationId));
+    return args;
+}
+function upgradeHint(stderr) {
+    return /unknown command/i.test(stderr) ? 'hbcli 版本过旧(无 search anything 子命令)——请升级:hbcli update,或重跑 npx gotry setup' : null;
+}
 export async function anythingSearch(q) {
     const started = Date.now();
     const ts = new Date().toISOString();
@@ -64,30 +96,30 @@ export async function anythingSearch(q) {
             error: 'keyword is required'
         };
     }
-    const bin = q.hbcliBin ?? 'hbcli';
-    const args = [
-        bin,
-        'search',
-        'anything',
-        kw
-    ];
-    if (q.contentType) args.push('--content-type', q.contentType);
-    if (q.parentDestinationId !== undefined) {
-        args.push('--parent-destination-id', String(q.parentDestinationId));
+    const args = buildArgs(kw, q);
+    const candidates = hbcliBinCandidates(q.hbcliBin ?? 'hbcli');
+    let r = {
+        code: -1,
+        stdout: '',
+        stderr: ''
+    };
+    for(let i = 0; i < candidates.length; i++){
+        r = await sh(candidates[i], args, {
+            timeoutMs: q.timeoutMs ?? 12_000,
+            env: process.env
+        });
+        if (!(r.error && i < candidates.length - 1)) break;
     }
-    const r = await sh(bin, args.slice(1), {
-        timeoutMs: q.timeoutMs ?? 12_000,
-        env: process.env
-    });
     const latencyMs = Date.now() - started;
     if (r.error || r.code !== 0) {
+        const raw = r.error ?? `${r.stderr.slice(0, 200)} (exit ${r.code})`;
         return {
             ok: false,
             via: 'hbcli-anything-error',
-            evidence: `[实时API:hbcli-anything@error@${ts}] ${r.error ?? `exit ${r.code}`}`,
+            evidence: `[实时API:hbcli-anything@error@${ts}] ${raw}`,
             latencyMs,
             verdict: 'error',
-            error: r.error ?? `${r.stderr.slice(0, 200)} (exit ${r.code})`
+            error: upgradeHint(r.stderr) ?? raw
         };
     }
     let data;
@@ -109,15 +141,19 @@ export async function anythingSearch(q) {
     const hits = rawItems.map((it)=>{
         const region = it.region ?? {};
         const hotel = it.hotel ?? {};
-        const isHotel = it.type === 'hotel' || it.type === 'SupplierHotelList' || Boolean(hotel.id);
+        const isHotel = it.type === 'hotel' || Boolean(hotel.id);
+        const hotelCoords = latlngOf(hotel.latlngCoordinator);
+        const placeCoords = latlngOf(it.place?.latlngCoordinator);
+        const center = region.coordinates ?? {};
         return {
-            type: isHotel ? 'hotel' : it.type === 'place' || it.type === 'City' ? lowerFirst(it.type) : 'city',
-            name: it.name ?? region.name_en ?? region.name ?? hotel.name ?? '?',
-            score: it.score ?? region.typeScore,
-            latitude: hotel.latitude ?? region.latitude,
-            longitude: hotel.longitude ?? region.longitude,
-            destinationId: region.id,
-            hotelId: hotel.id
+            type: isHotel ? 'hotel' : it.type === 'place' ? 'place' : 'city',
+            name: i18nText(hotel.name) || i18nText(region.name) || '?',
+            score: it.matchScore,
+            latitude: hotelCoords.latitude ?? placeCoords.latitude ?? (typeof center.centerLat === 'number' ? center.centerLat : undefined),
+            longitude: hotelCoords.longitude ?? placeCoords.longitude ?? (typeof center.centerLng === 'number' ? center.centerLng : undefined),
+            destinationId: hotel.destinationId !== undefined ? String(hotel.destinationId) : region.id !== undefined ? String(region.id) : undefined,
+            hotelId: hotel.id !== undefined ? String(hotel.id) : undefined,
+            star: typeof hotel.star === 'number' && hotel.star > 0 ? hotel.star : undefined
         };
     });
     const verdict = hits.length > 0 ? 'hit' : 'miss';
@@ -131,9 +167,6 @@ export async function anythingSearch(q) {
         totalCandidates: rawItems.length
     };
 }
-export const _ = {
-    upperFirst
-};
 
 
 //# sourceURL=ts/capabilities/anything.ts

package/dist/capabilities/channel-health.js

@@ -0,0 +1,103 @@
+const session = new Map();
+export const DEFAULT_COOLDOWN_MS = 30_000;
+export function markChannelDown(channel, reason, now = Date.now()) {
+    session.set(channel, {
+        state: 'down',
+        reason,
+        since: now
+    });
+    return {
+        channel,
+        state: 'down',
+        reason,
+        at: new Date(now).toISOString()
+    };
+}
+export function markChannelCooldown(channel, cooldownMs = DEFAULT_COOLDOWN_MS, now = Date.now()) {
+    session.set(channel, {
+        state: 'cooldown',
+        until: now + cooldownMs,
+        since: now
+    });
+    return {
+        channel,
+        state: 'cooldown',
+        at: new Date(now).toISOString()
+    };
+}
+export function clearChannel(channel) {
+    session.delete(channel);
+}
+export function channelState(channel, now = Date.now()) {
+    const e = session.get(channel);
+    if (!e) return undefined;
+    if (e.state === 'cooldown' && (e.until ?? 0) <= now) {
+        session.delete(channel);
+        return undefined;
+    }
+    return {
+        state: e.state,
+        reason: e.reason
+    };
+}
+export function resetChannelHealth() {
+    session.clear();
+}
+export function noteChannelVerdict(channel, verdict, opts = {}) {
+    const now = opts.now ?? Date.now();
+    switch(verdict){
+        case 'hit':
+        case 'found':
+            clearChannel(channel);
+            return undefined;
+        case 'needs-setup':
+        case 'needs-login':
+        case 'needs-extension':
+        case 'needs-attach':
+        case 'challenged':
+            return markChannelDown(channel, verdict, now);
+        case 'cooldown':
+            return markChannelCooldown(channel, opts.cooldownMs ?? DEFAULT_COOLDOWN_MS, now);
+        default:
+            return undefined;
+    }
+}
+export async function recordChannelEvent(stateRoot, event) {
+    try {
+        const { mkdir, appendFile } = await import('node:fs/promises');
+        const dir = `${stateRoot.replace(/\/+$/, '')}/gotry-state`;
+        await mkdir(dir, {
+            recursive: true
+        });
+        await appendFile(`${dir}/channel-health.jsonl`, `${JSON.stringify(event)}\n`, 'utf-8');
+    } catch  {}
+}
+export async function readLatestChannelEvents(stateRoot, opts = {}) {
+    const latest = new Map();
+    try {
+        const { readFile } = await import('node:fs/promises');
+        const raw = await readFile(`${stateRoot.replace(/\/+$/, '')}/gotry-state/channel-health.jsonl`, 'utf-8');
+        const nowMs = opts.now ?? Date.now();
+        const cutoff = nowMs - (opts.limitDays ?? 30) * 86_400_000;
+        for (const line of raw.split('\n')){
+            const t = line.trim();
+            if (!t) continue;
+            try {
+                const ev = JSON.parse(t);
+                if (!ev || typeof ev.channel !== 'string' || typeof ev.state !== 'string') continue;
+                if (![
+                    'down',
+                    'cooldown',
+                    'ok'
+                ].includes(ev.state)) continue;
+                const atMs = Date.parse(ev.at ?? '');
+                if (Number.isFinite(atMs) && atMs < cutoff) continue;
+                latest.set(ev.channel, ev);
+            } catch  {}
+        }
+    } catch  {}
+    return latest;
+}
+
+
+//# sourceURL=ts/capabilities/channel-health.ts

package/dist/capabilities/channel-registry.js

@@ -0,0 +1,213 @@
+import { channelState } from './channel-health.js';
+export const CHANNELS = [
+    {
+        id: 'flyai',
+        label: '飞猪官方 API',
+        tool: 'gotry_flyai_search',
+        intents: [
+            'search-flight',
+            'search-train',
+            'search-hotel'
+        ],
+        quotaClass: 'anonymous-trial',
+        evidenceTag: '[实时API:flyai@ts]',
+        tier: 'realtime-api',
+        efficiencyRank: 0,
+        setup: '零 setup(匿名试用共享池,易达限;正式 key 配 FLYAI_API_KEY 解除)'
+    },
+    {
+        id: 'hbcli-hotel',
+        label: 'hbcli 酒店实时源',
+        tool: 'gotry_hotel_search',
+        intents: [
+            'search-hotel'
+        ],
+        quotaClass: 'user-key',
+        evidenceTag: '[实时API:hbcli@ts]',
+        tier: 'realtime-api',
+        efficiencyRank: 1,
+        setup: 'hbcli 凭证(demo 沙箱一键);未装自动降静态包'
+    },
+    {
+        id: 'session:ctrip-flight',
+        label: '携程·用户登录态',
+        tool: 'gotry_session_search',
+        intents: [
+            'search-flight'
+        ],
+        quotaClass: 'user-session',
+        evidenceTag: '[会话:ctrip-flight@ts]',
+        tier: 'session',
+        efficiencyRank: 2,
+        setup: '一次性装 Session Bridge 扩展 + 授权卡 + (如需)官网登录',
+        hint: 'kind=flight'
+    },
+    {
+        id: 'session:ctrip-hotel',
+        label: '携程·用户登录态',
+        tool: 'gotry_session_search',
+        intents: [
+            'search-hotel'
+        ],
+        quotaClass: 'user-session',
+        evidenceTag: '[会话:ctrip-hotel@ts]',
+        tier: 'session',
+        efficiencyRank: 2,
+        setup: '一次性装 Session Bridge 扩展 + 授权卡 + (如需)官网登录',
+        hint: 'kind=hotel'
+    },
+    {
+        id: 'session:12306-train',
+        label: '12306 公开查询面',
+        tool: 'gotry_session_search',
+        intents: [
+            'search-train'
+        ],
+        quotaClass: 'user-session',
+        evidenceTag: '[会话:train-12306@ts]',
+        tier: 'session',
+        efficiencyRank: 2,
+        setup: '一次性装 Session Bridge 扩展(公开查询面,无需登录)',
+        hint: 'kind=train'
+    },
+    {
+        id: 'anything-geo',
+        label: '目的地/酒店候选(hotel-be)',
+        tool: 'gotry_anything_search',
+        intents: [
+            'search-geo'
+        ],
+        quotaClass: 'user-key',
+        evidenceTag: '[实时API:hbcli-anything@ts]',
+        tier: 'realtime-api',
+        efficiencyRank: 1,
+        setup: 'hbcli 可达即可(随 hbcli 安装)'
+    },
+    {
+        id: 'open-meteo',
+        label: '天气(open-meteo)',
+        tool: 'gotry_weather_check',
+        intents: [
+            'weather'
+        ],
+        quotaClass: 'free-public',
+        evidenceTag: '[实时API:open-meteo@ts]',
+        tier: 'realtime-api',
+        efficiencyRank: 0
+    },
+    {
+        id: 'opensky',
+        label: '航班实时印证(OpenSky)',
+        tool: 'gotry_flight_verify',
+        intents: [
+            'verify-flight'
+        ],
+        quotaClass: 'free-public',
+        evidenceTag: '[实时API:opensky@ts]',
+        tier: 'realtime-api',
+        efficiencyRank: 0
+    },
+    {
+        id: 'web-read',
+        label: '网页读取兜底(agent-reach)',
+        tool: 'gotry_web_search',
+        intents: [
+            'read-web',
+            'search-flight',
+            'search-train',
+            'search-hotel'
+        ],
+        quotaClass: 'user-key',
+        evidenceTag: '[agent-reach:web.read@ts]',
+        tier: 'best-effort',
+        efficiencyRank: 3,
+        setup: 'gotry .venv 装 agent-reach(npx gotry doctor --fix)'
+    },
+    {
+        id: 'static-hotel',
+        label: '内置静态数据包',
+        tool: 'gotry_hotel_search',
+        intents: [
+            'search-hotel'
+        ],
+        quotaClass: 'static',
+        evidenceTag: '[静态包:估算]',
+        tier: 'static',
+        efficiencyRank: 9,
+        routable: false
+    }
+];
+const TIER_RANK = {
+    'realtime-api': 0,
+    session: 1,
+    'best-effort': 2,
+    static: 3
+};
+const TIER_WHY = {
+    'realtime-api': '官方结构化数据,证据链最强',
+    'session': '用户本人登录态的真实价/库存',
+    'best-effort': '非结构化兜底(读页汇总),证据弱于 API',
+    'static': '内置估算,仅覆盖内置场景'
+};
+export const INTENT_LABELS = {
+    'search-flight': '机票',
+    'search-train': '火车',
+    'search-hotel': '酒店',
+    'search-geo': '目的地候选',
+    'read-web': '网页/社媒',
+    'weather': '天气',
+    'verify-flight': '航班印证'
+};
+export function channelsForIntent(intent) {
+    return CHANNELS.filter((c)=>c.routable !== false && c.intents.includes(intent)).slice().sort((a, b)=>TIER_RANK[a.tier] - TIER_RANK[b.tier] || a.efficiencyRank - b.efficiencyRank);
+}
+export function routingAdvice(intent, opts = {}) {
+    const alternatives = channelsForIntent(intent).filter((c)=>c.id !== opts.excludeChannel).filter((c)=>channelState(c.id, opts.now)?.state !== 'down').slice(0, opts.limit ?? 3).map((c)=>({
+            tool: c.tool,
+            channel: c.id,
+            label: c.label,
+            why: TIER_WHY[c.tier],
+            ...c.setup ? {
+                setup: c.setup
+            } : {},
+            ...c.hint ? {
+                hint: c.hint
+            } : {}
+        }));
+    return {
+        intent,
+        alternatives
+    };
+}
+export function toolRoutingHeadline(tool) {
+    const intents = new Set();
+    for (const c of CHANNELS){
+        if (c.routable === false || c.tool !== tool) continue;
+        for (const i of c.intents)intents.add(i);
+    }
+    if (intents.size === 0) return '';
+    const lines = [
+        ...intents
+    ].map((intent)=>`- ${INTENT_LABELS[intent]}: ${channelsForIntent(intent).map((c)=>`${c.label}(${c.tool}${c.hint ? ` ${c.hint}` : ''})`).join(' → ')}`);
+    return [
+        '本工具服务的检索意图与通道顺位(证据级降序):',
+        ...lines,
+        'verdict≠hit 时按结果内 routing 字段改道下一通道,勿盲试同通道。'
+    ].join('\n');
+}
+export function renderRoutingCard(now = new Date()) {
+    const multiChannel = Object.keys(INTENT_LABELS).map((intent)=>({
+            intent,
+            channels: channelsForIntent(intent)
+        })).filter((x)=>x.channels.length >= 2);
+    const lines = multiChannel.map(({ intent, channels })=>`- ${INTENT_LABELS[intent]}: ${channels.map((c)=>`${c.label}(${c.tool}${c.hint ? ` ${c.hint}` : ''})`).join(' → ')}`);
+    return [
+        '检索通道顺位(官方API > 用户会话 > 网页兜底;某次检索 verdict≠hit 时,按该结果内 routing 字段改道下一通道,同通道本会话不盲试第二次):',
+        ...lines,
+        '额度口径:匿名试用=首次体验导流(达限即改道并提示配 key);正式 key(FLYAI_API_KEY/hbcli 凭证)与账号会话=正式用量;静态包=估算必标注。',
+        `卡生成于 ${now.toISOString()}(通道状态变化不改变顺位表本身,只影响 routing 建议的可用性过滤)。`
+    ].join('\n');
+}
+
+
+//# sourceURL=ts/capabilities/channel-registry.ts