@danceiny/gotry 0.0.1-rc.10 → 0.0.1-rc.12

package/dist/capabilities/session/transport.js

@@ -76,21 +76,26 @@ 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)}`
+            };
+        }
     }
     const page = (await browser.pages())[0] ?? await browser.newPage();
     return {
         ok: true,
         browser,
         page,
-        guard,
+        guard: guard ?? {
+            blockedCount: ()=>0,
+            requestCount: ()=>0
+        },
         close: async ()=>{
             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,103 @@
+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 {
+        try {
+            await t.page.goto(target.entryUrl, {
+                waitUntil: 'domcontentloaded',
+                timeout: 30_000
+            });
+        } catch  {}
+        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();
@@ -34,8 +37,7 @@ export async function sessionFlightSearch(q) {
         mode: q.profileDir ? 'persistent' : 'cdp'
     });
     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 +45,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 输出非空(上游原样)');

package/dist/scripts/async-collect.js

@@ -1,7 +1,30 @@
 import { appendFileSync } from 'node:fs';
-import { collectDeepPlanning, loadAsyncTicket, makeJournaledSolvePort, settleAsyncTicket } from '../src/loop.js';
+import { ASYNC_TERMINAL_SCHEMA, collectDeepPlanning, loadAsyncTicket, makeJournaledSolvePort, settleAsyncTicket } from '../src/loop.js';
 import { solveUnified } from '../src/unified.js';
 import { openLedgerIfExists } from '../src/state-ledger.js';
+function isTerminalOutcome(value) {
+    return value?.['schema'] === ASYNC_TERMINAL_SCHEMA && (value['status'] === 'succeeded' || value['status'] === 'failed') && typeof value['passed'] === 'number' && value['total'] === 4 && Array.isArray(value['failed_checks']);
+}
+function legacyTerminalOutcome(ticket, status, deliverable) {
+    const succeeded = status === 'settled' && deliverable.includes('不失望四条:4/4 ✅');
+    return {
+        schema: ASYNC_TERMINAL_SCHEMA,
+        ticket_id: ticket,
+        status: succeeded ? 'succeeded' : 'failed',
+        passed: succeeded ? 4 : 0,
+        total: 4,
+        checks: {
+            legacy_human_marker_only: succeeded
+        },
+        failed_checks: succeeded ? [] : [
+            'legacy_unstructured_terminal'
+        ]
+    };
+}
+function emitTerminal(outcome) {
+    console.log(JSON.stringify(outcome));
+    process.exit(outcome.status === 'succeeded' ? 0 : 2);
+}
 const ticketId = process.argv[2];
 const stateRoot = process.argv[3] ?? '.';
 if (!ticketId) {
@@ -15,9 +38,12 @@ if (!loaded) {
 }
 const ledger = openLedgerIfExists(stateRoot);
 const run = ledger?.getWorkflowRun(ticketId);
-if (run?.status === 'settled' && run.deliverable) {
+if ((run?.status === 'settled' || run?.status === 'failed') && run.deliverable) {
+    const storedOutcome = ledger?.getWorkflowTerminalOutcome(ticketId) ?? null;
+    const outcome = isTerminalOutcome(storedOutcome) ? storedOutcome : legacyTerminalOutcome(ticketId, run.status, run.deliverable);
+    await settleAsyncTicket(ticketId, run.deliverable, stateRoot, outcome);
     console.log(`工单 ${ticketId} 已交付(账本终态,复诵不重算):\n\n${run.deliverable}`);
-    process.exit(0);
+    emitTerminal(outcome);
 }
 if (!ledger) {
     console.error(`工单 ${ticketId}:stateRoot(${stateRoot})无账本——持久化先于回收,不应发生`);
@@ -29,9 +55,11 @@ const solve = makeJournaledSolvePort(ledger, ticketId, solveUnified, {
         if (f) appendFileSync(f, 'solve\n');
     }
 });
-const { reply } = await collectDeepPlanning(loaded.state, loaded.ticket, solve);
-const out = await settleAsyncTicket(ticketId, reply, stateRoot);
+const { reply, outcome } = await collectDeepPlanning(loaded.state, loaded.ticket, solve);
+const out = await settleAsyncTicket(ticketId, reply, stateRoot, outcome);
 console.log(`交付物已落盘:${out}\n\n${reply}`);
+console.log(JSON.stringify(outcome));
+process.exitCode = outcome.status === 'succeeded' ? 0 : 2;
 
 
 //# sourceURL=/Users/bytedance/work/gotry/ts/scripts/async-collect.ts

package/dist/scripts/hbcli-tests.js

@@ -62,7 +62,12 @@ await writeFile(fallback, JSON.stringify({
     meta: 'fake',
     stays: [
         {
-            id: 's1'
+            id: 's1',
+            note: '普吉岛 workation 两周(13 晚)'
+        },
+        {
+            id: 's2',
+            note: '曼谷周末(2 晚)'
         }
     ]
 }));
@@ -83,19 +88,35 @@ await writeFile(fallback, JSON.stringify({
     }
     console.log('5. v0.3.0 旗标(--destination-name/--room-occupancies)对齐 OK');
 }const r4 = await searchHotels({
-    destination: '普吉'
+    destination: '普吉岛'
 }, {
     hbcliBin: failBin2,
     fallbackPath: fallback
 });
 assert.equal(r4.via, 'hbcli-error', 'searchHotels: fails to hbcli → fallback');
 assert.equal(r4.summary.includes('降级到静态包'), true, 'summary 指明降级');
-assert.ok(r4.hotels, '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
+});
+assert.equal(r5.hotels ?? null, null, '无目的地命中时 hotels 为 null(不整包倾倒)');
+assert.match(r5.summary, /无「巴黎」住宿数据/, 'summary 明示静态包无该目的地');
 await rm(tmp, {
     recursive: true,
     force: true
 });
-console.log('HBCLI TESTS: 5/5 OK (happy / error / no-binary / fallback / v0.3.0 旗标回归)');
+console.log('HBCLI TESTS: 6/6 OK (happy / error / no-binary / fallback-filter / fallback-no-match / v0.3.0 旗标回归)');
 
 
 //# sourceURL=/Users/bytedance/work/gotry/ts/scripts/hbcli-tests.ts

package/dist/scripts/i18n-tests.js

@@ -0,0 +1,34 @@
+import assert from 'node:assert/strict';
+import { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { enCoverage, getLocale, setLocale, t } from '../src/i18n.js';
+import { solve } from '../src/engine.js';
+import { parseCandidate, parseRequest } from '../src/model.js';
+assert.deepEqual(enCoverage(), [], 'en 目录缺键:' + enCoverage().join(','));
+const erhai = JSON.parse(await readFile(join('..', 'data', 'golden_erhai.json'), 'utf-8'));
+const req = parseRequest(erhai['request']);
+const candidates = erhai['candidates'].map(parseCandidate);
+assert.equal(getLocale(), 'zh-CN', '默认 locale 应为 zh-CN');
+const zhRes = await solve(req, candidates);
+const zhZh = String(zhRes['answer_md']);
+assert.ok(zhZh.includes('千岛湖') && zhZh.includes('下一次出发') && zhZh.includes('待你决定的两个问题'));
+void zhZh;
+setLocale('en');
+const enRes = await solve(req, candidates);
+const enMd = String(enRes['answer_md']);
+assert.ok(enMd.includes('feasible'), '英文判定应含 feasible');
+assert.ok(!enMd.includes('现在不行'), '英文面不得残留中文判定词');
+assert.ok(enMd.includes('千岛湖'), '候选名(数据)跨语言不动');
+assert.ok(/¥\d+/.test(enMd), '金额不翻译');
+assert.equal(t('md.wish_budget', {
+    cny: '4950'
+}).includes('4950'), true, '插值生效(以当前 locale 渲染)');
+setLocale('zh-CN');
+assert.equal(getLocale(), 'zh-CN');
+assert.equal(t('md.wish_budget', {
+    cny: 4950
+}), '、约 ¥4950', 'zh 模板逐字节');
+console.log('\nI18N TESTS: 4/4 OK(en 零缺键/默认 zh 金标准一致/en 切换数据不动/插值+回退)');
+
+
+//# sourceURL=/Users/bytedance/work/gotry/ts/scripts/i18n-tests.ts