@danceiny/gotry 0.0.1-rc.11 → 0.0.1-rc.13

package/dist/capabilities/session/benchmark.js

@@ -0,0 +1,252 @@
+export const SESSION_BENCHMARK_SCHEMA_VERSION = 'session-double-source.v1';
+export const SESSION_FIELD_ACCURACY_THRESHOLD = 0.9;
+export const REQUIRED_COMPARABLE_FIELDS = [
+    'query_id',
+    'route_segments',
+    'journey_type',
+    'route_segments[].departure_at',
+    'route_segments[].arrival_at',
+    'route_segments[].transport_number',
+    'currency',
+    'price',
+    'source',
+    'fetched_at',
+    'verdict'
+];
+function isMissing(value) {
+    return value === undefined || value === null || typeof value === 'string' && value.trim() === '';
+}
+function sameValue(left, right) {
+    if (typeof left !== typeof right) return false;
+    return typeof left === 'number' && typeof right === 'number' ? Object.is(left, right) : left === right;
+}
+function sameComparison(row) {
+    if (/\.(?:departure_at|arrival_at)$/.test(row.path) && typeof row.expected === 'string' && typeof row.actual === 'string') {
+        const expectedAt = Date.parse(row.expected);
+        const actualAt = Date.parse(row.actual);
+        if (Number.isFinite(expectedAt) && Number.isFinite(actualAt)) return expectedAt === actualAt;
+    }
+    return sameValue(row.expected, row.actual);
+}
+function fixtureComparisons(expected, actual) {
+    const rows = [
+        {
+            path: 'query_id',
+            expected: expected.query_id,
+            actual: actual.query_id
+        },
+        {
+            path: 'route_segments.length',
+            expected: expected.route_segments.length,
+            actual: actual.route_segments?.length
+        },
+        {
+            path: 'journey_type',
+            expected: expected.journey_type,
+            actual: actual.journey_type
+        },
+        {
+            path: 'currency',
+            expected: expected.currency,
+            actual: actual.currency
+        },
+        {
+            path: 'price',
+            expected: expected.price,
+            actual: actual.price
+        },
+        {
+            path: 'source',
+            expected: expected.source,
+            actual: actual.source
+        },
+        {
+            path: 'fetched_at',
+            expected: expected.fetched_at,
+            actual: actual.fetched_at
+        },
+        {
+            path: 'verdict',
+            expected: expected.verdict,
+            actual: actual.verdict
+        }
+    ];
+    for(let index = 0; index < expected.route_segments.length; index += 1){
+        const exp = expected.route_segments[index];
+        const act = actual.route_segments?.[index];
+        rows.push({
+            path: `route_segments[${index}].from`,
+            expected: exp.from,
+            actual: act?.from
+        }, {
+            path: `route_segments[${index}].to`,
+            expected: exp.to,
+            actual: act?.to
+        }, {
+            path: `route_segments[${index}].departure_at`,
+            expected: exp.departure_at,
+            actual: act?.departure_at
+        }, {
+            path: `route_segments[${index}].arrival_at`,
+            expected: exp.arrival_at,
+            actual: act?.arrival_at
+        }, {
+            path: `route_segments[${index}].transport_number`,
+            expected: exp.transport_number,
+            actual: act?.transport_number
+        });
+    }
+    return rows;
+}
+export function scoreSessionFixture(expected, actual, threshold = SESSION_FIELD_ACCURACY_THRESHOLD) {
+    const rows = fixtureComparisons(expected, actual);
+    const fixtureErrors = [
+        ...rows.filter((row)=>isMissing(row.expected)).map((row)=>row.path),
+        ...requiredMissing(expected)
+    ];
+    const missing = [];
+    const incorrect = [];
+    let correct = 0;
+    for (const row of rows){
+        if (isMissing(row.actual)) {
+            missing.push(row.path);
+        } else if (!sameValue(row.expected, row.actual)) {
+            incorrect.push(row.path);
+        } else {
+            correct += 1;
+        }
+    }
+    const total = rows.length;
+    const accuracy = total > 0 ? correct / total : 0;
+    return {
+        pass: fixtureErrors.length === 0 && accuracy >= threshold,
+        threshold,
+        correct,
+        total,
+        accuracy,
+        missing,
+        incorrect,
+        fixture_errors: [
+            ...new Set(fixtureErrors)
+        ]
+    };
+}
+function isIsoTimestamp(value) {
+    return value.trim() !== '' && Number.isFinite(Date.parse(value));
+}
+function requiredMissing(record) {
+    const missing = [];
+    if (!record.query_id.trim()) missing.push('query_id');
+    if (record.route_segments.length === 0) missing.push('route_segments');
+    if (!record.currency.trim()) missing.push('currency');
+    if (!(record.price > 0)) missing.push('price');
+    if (!record.source.trim()) missing.push('source');
+    if (!isIsoTimestamp(record.fetched_at)) missing.push('fetched_at');
+    if (record.journey_type === 'direct' && record.route_segments.length !== 1) missing.push('journey_type/route_segments');
+    if (record.journey_type === 'transfer' && record.route_segments.length < 2) missing.push('journey_type/route_segments');
+    for(let index = 0; index < record.route_segments.length; index += 1){
+        const segment = record.route_segments[index];
+        if (!segment.from.trim()) missing.push(`route_segments[${index}].from`);
+        if (!segment.to.trim()) missing.push(`route_segments[${index}].to`);
+        if (!isIsoTimestamp(segment.departure_at)) missing.push(`route_segments[${index}].departure_at`);
+        if (!isIsoTimestamp(segment.arrival_at)) missing.push(`route_segments[${index}].arrival_at`);
+        if (!segment.transport_number.trim()) missing.push(`route_segments[${index}].transport_number`);
+    }
+    return missing;
+}
+function baseEvaluation(state, quotaDisposition, extra = {}) {
+    return {
+        state,
+        retry_allowed: false,
+        quota_disposition: quotaDisposition,
+        mismatches: extra.mismatches ?? [],
+        missing: extra.missing ?? [],
+        ...extra.price_delta === undefined ? {} : {
+            price_delta: extra.price_delta
+        }
+    };
+}
+function alignmentComparisons(official, session) {
+    const rows = [
+        {
+            path: 'query_id',
+            expected: official.query_id,
+            actual: session.query_id
+        },
+        {
+            path: 'route_segments.length',
+            expected: official.route_segments.length,
+            actual: session.route_segments.length
+        },
+        {
+            path: 'journey_type',
+            expected: official.journey_type,
+            actual: session.journey_type
+        },
+        {
+            path: 'currency',
+            expected: official.currency,
+            actual: session.currency
+        }
+    ];
+    const comparableSegments = Math.min(official.route_segments.length, session.route_segments.length);
+    for(let index = 0; index < comparableSegments; index += 1){
+        const exp = official.route_segments[index];
+        const act = session.route_segments[index];
+        rows.push({
+            path: `route_segments[${index}].from`,
+            expected: exp.from,
+            actual: act.from
+        }, {
+            path: `route_segments[${index}].to`,
+            expected: exp.to,
+            actual: act.to
+        }, {
+            path: `route_segments[${index}].departure_at`,
+            expected: exp.departure_at,
+            actual: act.departure_at
+        }, {
+            path: `route_segments[${index}].arrival_at`,
+            expected: exp.arrival_at,
+            actual: act.arrival_at
+        }, {
+            path: `route_segments[${index}].transport_number`,
+            expected: exp.transport_number,
+            actual: act.transport_number
+        });
+    }
+    return rows;
+}
+export function evaluateDoubleSource(input) {
+    const official = input.official;
+    const session = input.session;
+    if (session?.verdict === 'challenged' || official?.verdict === 'challenged') {
+        return baseEvaluation('challenge_stop', 'no_spend_stop');
+    }
+    if ((session?.read_guard_blocked ?? 0) !== 0 || (official?.read_guard_blocked ?? 0) !== 0) {
+        return baseEvaluation('guard_violation', 'no_spend_stop');
+    }
+    if (!session) return baseEvaluation('source_unavailable', 'no_spend_stop');
+    if (session.verdict === 'needs-attach') return baseEvaluation('waiting_attach', 'no_spend_waiting_user');
+    if (session.verdict === 'needs-login') return baseEvaluation('waiting_login', 'no_spend_waiting_user');
+    if (!official || official.verdict !== 'hit' || session.verdict !== 'hit') {
+        return baseEvaluation('source_unavailable', 'no_spend_stop');
+    }
+    const missing = [
+        ...requiredMissing(official).map((path)=>`official.${path}`),
+        ...requiredMissing(session).map((path)=>`session.${path}`)
+    ];
+    if (missing.length > 0) {
+        return baseEvaluation('invalid_contract', 'no_spend_stop', {
+            missing
+        });
+    }
+    const mismatches = alignmentComparisons(official, session).filter((row)=>!sameComparison(row)).map((row)=>row.path);
+    return baseEvaluation(mismatches.length === 0 ? 'comparable' : 'divergent', 'evidence_ready', {
+        mismatches,
+        price_delta: session.price - official.price
+    });
+}
+
+
+//# sourceURL=/Users/bytedance/work/gotry/ts/capabilities/session/benchmark.ts

package/dist/capabilities/session/transport.js

@@ -76,22 +76,37 @@ export async function openSession(opts = {}) {
         }
     }
     let guard;
-    try {
-        guard = await attachReadGuardPuppeteer(browser, opts.auditPath);
-    } catch (e) {
-        await (isCdp ? browser.disconnect() : browser.close()).catch(()=>{});
-        return {
-            ok: false,
-            summary: `read-guard attach failed: ${e instanceof Error ? e.message.split('\n')[0] : String(e)}`
-        };
+    if (opts.guard !== false) {
+        try {
+            guard = await attachReadGuardPuppeteer(browser, opts.auditPath);
+        } catch (e) {
+            await (isCdp ? browser.disconnect() : browser.close()).catch(()=>{});
+            return {
+                ok: false,
+                summary: `read-guard attach failed: ${e instanceof Error ? e.message.split('\n')[0] : String(e)}`
+            };
+        }
+    }
+    let ownPage = false;
+    let page;
+    if (opts.newPage) {
+        page = await browser.newPage();
+        ownPage = true;
+    } else {
+        page = (await browser.pages())[0] ?? await browser.newPage();
     }
-    const page = (await browser.pages())[0] ?? await browser.newPage();
     return {
         ok: true,
         browser,
         page,
-        guard,
+        guard: guard ?? {
+            blockedCount: ()=>0,
+            requestCount: ()=>0
+        },
         close: async ()=>{
+            if (ownPage && (opts.closeOwnPage ?? true)) {
+                await page.close().catch(()=>{});
+            }
             await (isCdp ? browser.disconnect() : browser.close()).catch(()=>{});
         }
     };

package/dist/capabilities/session-consent.js

@@ -0,0 +1,82 @@
+export const ACCOUNT_TOOLS = {
+    gotry_session_search: 'ctrip-flight'
+};
+const SITE_LABEL = {
+    'ctrip-flight': '携程机票'
+};
+function reasonFor(toolName, site) {
+    return `${toolName} 将使用你本人已登录的浏览器会话做「${SITE_LABEL[site] ?? site}」只读检索` + '(ReadGuard 物理只读:写请求网络层中止,agent 永不碰凭证与验证码);本次批准在你本会话内有效';
+}
+export function createConsentGate(opts) {
+    const store = opts.store ?? new WeakMap();
+    const approvalOf = opts.approval ?? (()=>undefined);
+    return async (exec, next)=>{
+        const site = exec.name && ACCOUNT_TOOLS[exec.name];
+        if (!site) return next();
+        if ((opts.access() ?? 'ask') === 'off') {
+            return {
+                kind: 'deny',
+                reason: `${exec.name} 已被配置关闭(sessionAccess=off);需要账号会话检索时由用户开启`
+            };
+        }
+        const state = exec.agent && store.get(exec.agent) || undefined;
+        if (state?.denied.has(site)) {
+            return {
+                kind: 'deny',
+                reason: `你在本会话已拒绝过「${SITE_LABEL[site] ?? site}」的账号会话检索——本会话不再请求授权,请改走其他工具推进`
+            };
+        }
+        if (state?.granted.has(site) || opts.access() === 'allow' && exec.agent) return next();
+        const approval = opts.approval?.();
+        if (!approval || !exec.agent) return {
+            kind: 'ask',
+            reason: reasonFor(exec.name ?? '', site)
+        };
+        let outcome;
+        try {
+            outcome = await approval.request({
+                agent: exec.agent,
+                toolName: exec.name ?? '',
+                callId: exec.callId,
+                reason: reasonFor(exec.name ?? '', site)
+            });
+        } catch  {
+            outcome = 'unavailable';
+        }
+        if (outcome === 'allowed-once') {
+            remember(store, exec.agent, site, 'grant');
+            return next();
+        }
+        if (outcome === 'rejected' || outcome === 'cancelled') {
+            remember(store, exec.agent, site, 'deny');
+            return {
+                kind: 'deny',
+                reason: `你拒绝了 ${exec.name} 的账号会话授权(本会话内生效);不再重复请求,请改走其他工具推进`
+            };
+        }
+        return {
+            kind: 'deny',
+            reason: `${exec.name} 需要你授权,但当前没有可用的审批通道(headless 一问一答无审批界面;请在 web 会话中使用账号会话检索)`
+        };
+    };
+}
+function remember(store, agent, site, mode) {
+    const prev = store.get(agent) ?? {
+        granted: new Set(),
+        denied: new Set()
+    };
+    if (mode === 'grant') prev.granted.add(site);
+    else prev.denied.add(site);
+    store.set(agent, prev);
+}
+export function approvalFromContext(ctx) {
+    return ()=>{
+        const get = ctx.get;
+        if (typeof get !== 'function') return undefined;
+        const approval = get.call(ctx, 'approval');
+        return approval && typeof approval.request === 'function' ? approval : undefined;
+    };
+}
+
+
+//# sourceURL=/Users/bytedance/work/gotry/ts/capabilities/session-consent.ts

package/dist/capabilities/session-login.js

@@ -0,0 +1,119 @@
+import { openSession } from './session/transport.js';
+export const LOGIN_TARGETS = {
+    'ctrip-flight': {
+        domain: 'ctrip.com',
+        names: [
+            'cticket',
+            'uid',
+            'uname',
+            'passport'
+        ],
+        label: '携程机票',
+        entryUrl: 'https://flights.ctrip.com/'
+    },
+    'meituan-hotel': {
+        domain: 'meituan.com',
+        names: [
+            'lt',
+            'u',
+            'token',
+            'n'
+        ],
+        label: '美团酒店',
+        entryUrl: 'https://hotel.meituan.com/'
+    }
+};
+function err(site, verdict, error, started, ts) {
+    return {
+        ok: false,
+        via: 'session-login-error',
+        evidence: `[会话:login-error@${ts}] ${error.slice(0, 200)}`,
+        latencyMs: Date.now() - started,
+        verdict,
+        site,
+        error: error.slice(0, 200)
+    };
+}
+export async function pollTicketNames(browser, target) {
+    const cookies = await browser.cookies().catch(()=>[]);
+    if (!Array.isArray(cookies)) return [];
+    return cookies.filter((c)=>(c.domain ?? '').includes(target.domain) && c.name != null && target.names.includes(c.name)).map((c)=>c.name);
+}
+export async function sessionLogin(q = {}) {
+    const started = Date.now();
+    const ts = new Date().toISOString();
+    const site = q.site ?? 'ctrip-flight';
+    const target = LOGIN_TARGETS[site];
+    if (!target) {
+        return err(site, 'error', `未知站点 ${site}(可选 ${Object.keys(LOGIN_TARGETS).join('/')})`, started, ts);
+    }
+    const t = await openSession({
+        mode: 'cdp',
+        guard: false
+    });
+    if (!t.ok) {
+        const needsAttach = /chrome:\/\/inspect|DevToolsActivePort|cdp attach 失败/.test(t.summary);
+        return err(site, needsAttach ? 'needs-attach' : 'error', needsAttach ? `${t.summary};开启方法:你的 Chrome 打开 chrome://inspect/#remote-debugging → 打开开关(Chrome 144+,一次性),开启后直接再说一声即可` : t.summary, started, ts);
+    }
+    const evidenceTag = `[会话:${site}-login@${ts}]`;
+    try {
+        const pre = await pollTicketNames(t.browser, target);
+        if (pre.length > 0) {
+            await t.close();
+            return {
+                ok: true,
+                via: 'session-login',
+                latencyMs: Date.now() - started,
+                verdict: 'logged-in',
+                site,
+                tickets: pre,
+                evidence: `${evidenceTag} 自动检测:票据 cookie 已在(先前登录已生效)——[${pre.join(', ')}](只读名字,0 网页交互)`
+            };
+        }
+        const page = await t.browser.newPage();
+        await page.bringToFront().catch(()=>{});
+        try {
+            await page.goto(target.entryUrl, {
+                waitUntil: 'domcontentloaded',
+                timeout: 30_000
+            });
+        } catch  {}
+        console.log(`[session-login] ${target.label} 登录入口已在新标签页置前打开`);
+        const waitMs = Math.min(Math.max(q.waitMs ?? 90_000, 0), 300_000);
+        const pollMs = Math.min(Math.max(q.pollMs ?? 3_000, 500), 10_000);
+        const deadline = Date.now() + waitMs;
+        let tickets = [];
+        while(Date.now() < deadline){
+            await new Promise((resolve)=>setTimeout(resolve, pollMs));
+            tickets = await pollTicketNames(t.browser, target);
+            if (tickets.length > 0) break;
+        }
+        await t.close();
+        if (tickets.length > 0) {
+            return {
+                ok: true,
+                via: 'session-login',
+                latencyMs: Date.now() - started,
+                verdict: 'logged-in',
+                site,
+                tickets,
+                evidence: `${evidenceTag} 票据 cookie 已检出 [${tickets.join(', ')}](只读名字;登录在你自己的浏览器里完成,gotry 全程未接触任何密码/验证码/cookie 值)`
+            };
+        }
+        return {
+            ok: true,
+            via: 'session-login',
+            latencyMs: Date.now() - started,
+            verdict: 'pending',
+            site,
+            tickets: [],
+            evidence: `${evidenceTag} 登录入口已在你的 Chrome 打开(${target.label});在标签页里正常登录完成后再说一声「继续查」即可——gotry 只检查"是否已登录",永不收集你的账号信息`
+        };
+    } catch (e) {
+        await t.close().catch(()=>{});
+        return err(site, 'error', e instanceof Error ? e.message : String(e), started, ts);
+    }
+}
+
+
+//# sourceURL=/Users/bytedance/work/gotry/ts/capabilities/session-login.ts

package/dist/capabilities/session-search.js

@@ -6,6 +6,9 @@ export function __resetRateLimiterForTest() {
     lastCallAt.clear();
 }
 const CHALLENGE_RE = /验证|滑块|captcha|verify/i;
+export function classifyTransportFailure(summary, cdpMode) {
+    return cdpMode && /日常 Chrome 未开调试端口|cdp attach 失败/.test(summary) ? 'needs-attach' : 'error';
+}
 export async function sessionFlightSearch(q) {
     const started = Date.now();
     const ts = new Date().toISOString();
@@ -31,11 +34,11 @@ export async function sessionFlightSearch(q) {
         profileDir: q.profileDir,
         headless: q.headless,
         auditPath: q.auditPath,
-        mode: q.profileDir ? 'persistent' : 'cdp'
+        mode: q.profileDir ? 'persistent' : 'cdp',
+        newPage: true
     });
     if (!t.ok) {
-        if (q.profileDir === undefined && /cdp attach 失败/.test(t.summary)) return err('needs-attach', t.summary);
-        return err('error', t.summary);
+        return err(classifyTransportFailure(t.summary, q.profileDir === undefined), t.summary);
     }
     try {
         const loggedIn = async ()=>{
@@ -43,7 +46,7 @@ export async function sessionFlightSearch(q) {
             return cookies.some((c)=>c.domain.includes(SITE_DOMAIN.replace(/^\./, '')) && LOGIN_COOKIE_NAMES.includes(c.name));
         };
         if (!await loggedIn() && !q.allowAnonymous) {
-            return err('needs-login', '匿名实例——先跑 scripts/session-login.ts 用用户自己的账号建立登录态(allowAnonymous 仅限链路自检)');
+            return err('needs-login', '未检出你本人登录态——调用 gotry_session_login 为用户打开携程登录入口(登录在携程官网完成;gotry 永不经手密码/验证码/cookie 值)');
         }
         let settled = false;
         let body = '';

package/dist/capabilities/weather.js

@@ -32,14 +32,15 @@ const WMO_ZH = {
 export function wmoLabel(code) {
     return WMO_ZH[code] ?? `天气码${code}`;
 }
-async function fetchJson(url, timeoutMs) {
+async function fetchJson(url, timeoutMs, headers = {}) {
     const ctrl = new AbortController();
     const timer = setTimeout(()=>ctrl.abort(), timeoutMs);
     try {
         const res = await fetch(url, {
             signal: ctrl.signal,
             headers: {
-                Accept: 'application/json'
+                Accept: 'application/json',
+                ...headers
             }
         });
         if (!res.ok) return {
@@ -59,33 +60,87 @@ async function fetchJson(url, timeoutMs) {
         clearTimeout(timer);
     }
 }
+const NOMINATIM_BASE = 'https://nominatim.openstreetmap.org/search';
+const MAJOR_FEATURE = /^(PPLC|PPLA|PPLB|PPLX)/;
+function stripHits(hits) {
+    return hits.map(({ name, latitude, longitude, country, admin1 })=>({
+            ...country ? {
+                country
+            } : {},
+            ...admin1 ? {
+                admin1
+            } : {},
+            name,
+            latitude,
+            longitude
+        }));
+}
 export async function geocodePlace(name, opts = {}) {
     const ts = new Date().toISOString();
     const count = opts.count ?? 5;
-    const url = `${GEOCODE_BASE}?name=${encodeURIComponent(name)}&count=${count}&language=zh&format=json`;
-    const r = await fetchJson(url, opts.timeoutMs ?? 15_000);
-    if (!r.ok) {
-        return {
-            ok: false,
-            evidence: `[实时API:open-meteo-geo@error@${ts}]`,
-            results: [],
-            error: r.error
-        };
-    }
-    const results = (r.data?.results ?? []).map((item)=>{
+    const query = name.trim();
+    const omUrl = `${GEOCODE_BASE}?name=${encodeURIComponent(query)}&count=${count}&language=zh&format=json`;
+    const r = await fetchJson(omUrl, opts.timeoutMs ?? 15_000);
+    const omResults = r.ok ? (r.data?.results ?? []).map((item)=>{
         const it = item;
         return {
             name: String(it['name'] ?? ''),
             latitude: Number(it['latitude']),
             longitude: Number(it['longitude']),
             country: it['country'] ? String(it['country']) : undefined,
-            admin1: it['admin1'] ? String(it['admin1']) : undefined
+            admin1: it['admin1'] ? String(it['admin1']) : undefined,
+            population: Number(it['population'] ?? 0) || 0,
+            featureCode: String(it['feature_code'] ?? '')
+        };
+    }).filter((h)=>h.name && Number.isFinite(h.latitude) && Number.isFinite(h.longitude)) : [];
+    omResults.sort((a, b)=>b.population - a.population || Number(MAJOR_FEATURE.test(b.featureCode)) - Number(MAJOR_FEATURE.test(a.featureCode)));
+    const top = omResults[0];
+    if (top && (top.population > 0 || MAJOR_FEATURE.test(top.featureCode))) {
+        return {
+            ok: true,
+            evidence: `[实时API:open-meteo-geo@${ts}]`,
+            via: 'open-meteo',
+            results: stripHits(omResults)
         };
+    }
+    const nomTs = new Date().toISOString();
+    const nomUrl = `${NOMINATIM_BASE}?q=${encodeURIComponent(query)}&format=jsonv2&limit=${count}&accept-language=zh&addressdetails=1`;
+    const nom = await fetchJson(nomUrl, opts.timeoutMs ?? 15_000, {
+        'User-Agent': 'gotry-travel-agent/0.1 (+https://github.com/Danceiny/gotry)'
     });
+    const nomResults = nom.ok ? (nom.data ?? []).map((item)=>{
+        const it = item;
+        const addr = it['address'] ?? {};
+        return {
+            name: String(it['name'] ?? ''),
+            latitude: Number(it['lat']),
+            longitude: Number(it['lon']),
+            country: addr['country'],
+            admin1: addr['province'] ?? addr['state'] ?? addr['county']
+        };
+    }).filter((h)=>h.name && Number.isFinite(h.latitude) && Number.isFinite(h.longitude)) : [];
+    if (nomResults.length) {
+        const omNote = r.ok ? `open-meteo ${omResults.length} 条弱命中(无人口/行政级,不足采信)` : `open-meteo 失败:${r.error ?? 'HTTP error'}`;
+        return {
+            ok: true,
+            evidence: `[实时API:nominatim@${nomTs}](兜底层: ${omNote})`,
+            via: 'nominatim',
+            results: nomResults
+        };
+    }
+    if (omResults.length) {
+        return {
+            ok: true,
+            evidence: `[实时API:open-meteo-geo@${ts}]`,
+            via: 'open-meteo',
+            results: stripHits(omResults)
+        };
+    }
     return {
-        ok: true,
-        evidence: `[实时API:open-meteo-geo@${ts}]`,
-        results
+        ok: false,
+        evidence: `[实时API:open-meteo-geo@error@${ts}];[实时API:nominatim@error@${nomTs}]`,
+        results: [],
+        error: r.ok ? `双源无结果:${nom.error ?? 'nominatim empty'}` : r.error
     };
 }
 export async function getForecast(point, opts = {}) {

package/dist/scripts/agent-reach-wrapper-tests.js

@@ -2,6 +2,10 @@ import assert from 'node:assert/strict';
 import { reach, reachStatus } from '../capabilities/agent-reach.js';
 {
     const st = await reachStatus(90_000);
+    if (!st.ok) {
+        console.log(`SKIP: agent-reach doctor 未就绪(未安装/needs-setup),7 断言整体跳过 — via=${st.via} output=${String(st.output).slice(0, 120)}`);
+        process.exit(0);
+    }
     assert.equal(st.ok, true);
     assert.equal(st.via, 'agent-reach-cli');
     assert.ok(st.output.length > 50, 'doctor 输出非空(上游原样)');