@danceiny/gotry 0.2.0-rc.31 → 0.2.0-rc.33

package/dist/scripts/bridge-ledger-tests.js

@@ -31,6 +31,8 @@ import Database from 'better-sqlite3';
 import { EXTENSION_ORIGIN, createBridgeJobQueue, } from '../capabilities/session/extension-bridge.js';
 import { BRIDGE_SITE_COOLDOWN_MS, BridgeLedgerStore, bridgeLedgerDbPath, openBridgeLedgerStore, } from '../capabilities/session/bridge-ledger.js';
 import { startSessionSearchModule } from '../src/backend/modules/session-search.js';
+// 账本方法的组织参数必填(漏传是编译错误):本套件验证的是缺省的单车道,统一传 local
+const LOCAL = 'local';
 let passed = 0;
 async function check(label, assertion) {
     await assertion();
@@ -180,7 +182,7 @@ async function main() {
             assert.equal(row?.claimed_by_client, CLAIM_CLIENT);
             assert.equal(row?.attempts, 1);
             assert.ok(row?.claimed_at !== null, 'claimed_at 落账');
-            const pacing = storeC.pacingOf('dida-portal');
+            const pacing = storeC.pacingOf(LOCAL, 'dida-portal');
             assert.ok(pacing && pacing.cooldownUntil > Date.now(), '导航类作业领取即记节律冷却');
             // 正常善果回包 → resolved + result 保留
             const r = await postResult(server.port, polled.job.jobId, { ok: true, kind: 'search', body: '{"rates":[]}', title: 'ok' }, { clientId: CLAIM_CLIENT });
@@ -213,7 +215,7 @@ async function main() {
             const row = storeC.getJob(polled.job.jobId);
             assert.equal(row?.status, 'unresolved', '曾被领取的超时终态 = unresolved');
             assert.ok(row?.result_json?.includes('timeout'), '超时结算留 timeout 备注');
-            const pacing = storeC.pacingOf('train-12306');
+            const pacing = storeC.pacingOf(LOCAL, 'train-12306');
             assert.ok(pacing && pacing.cooldownUntil >= Date.now() + BRIDGE_SITE_COOLDOWN_MS - 2_000, '超时结算把站点冷却推满');
         }
         finally {
@@ -224,7 +226,7 @@ async function main() {
         const server = await serveQueue(queueC);
         try {
             const pending = queueC.submit({ kind: 'search', site: 'ctrip-hotel', url: 'https://hotels.ctrip.com/hotels/list' }, { timeoutMs: 300, extensionWaitMs: 30_000 });
-            const pacingAtSubmit = storeC.pacingOf('ctrip-hotel');
+            const pacingAtSubmit = storeC.pacingOf(LOCAL, 'ctrip-hotel');
             assert.ok(pacingAtSubmit && pacingAtSubmit.cooldownUntil > Date.now(), '导航类作业提交即记节律(与 sessionDidaSearch 内存闸同语义:提交即承诺一次导航)');
             const outcome = await pending;
             assert.equal(outcome.ok, false);
@@ -238,7 +240,7 @@ async function main() {
                 raw.close();
             }
             assert.equal(voided.length, 1, '未被领取的超时作业 = void');
-            const pacingAfter = storeC.pacingOf('ctrip-hotel');
+            const pacingAfter = storeC.pacingOf(LOCAL, 'ctrip-hotel');
             assert.equal(pacingAfter?.cooldownUntil, pacingAtSubmit?.cooldownUntil, '从未被领取的超时结算不追加冷却(站点未被打)');
         }
         finally {
@@ -273,12 +275,12 @@ async function main() {
         let server;
         try {
             // 直接落账模拟上一进程崩溃后的持久状态(不经过队列 close——close 会把未领取作业落 void)
-            storeE.insertQueuedJob({ jobId: 'rec-queued-fresh', kind: 'search', site: 'dida-portal', url: 'https://portal.dida.com/find' }, t0 + 60_000);
-            storeE.insertQueuedJob({ jobId: 'rec-queued-stale', kind: 'search', site: 'dida-portal', url: 'https://portal.dida.com/find' }, t0 - 1_000);
-            storeE.insertQueuedJob({ jobId: 'rec-claimed-live', kind: 'search', site: 'ctrip-flight', url: 'https://flights.ctrip.com/online/list' }, t0 + 60_000);
-            storeE.markClaimed('rec-claimed-live', { origin: EXTENSION_ORIGIN, clientId: LIVE_CLIENT });
-            storeE.insertQueuedJob({ jobId: 'rec-claimed-dead', kind: 'search', site: 'ctrip-hotel', url: 'https://hotels.ctrip.com/hotels/list' }, t0 - 1_000);
-            storeE.markClaimed('rec-claimed-dead', { origin: EXTENSION_ORIGIN });
+            storeE.insertQueuedJob(LOCAL, { jobId: 'rec-queued-fresh', kind: 'search', site: 'dida-portal', url: 'https://portal.dida.com/find' }, t0 + 60_000);
+            storeE.insertQueuedJob(LOCAL, { jobId: 'rec-queued-stale', kind: 'search', site: 'dida-portal', url: 'https://portal.dida.com/find' }, t0 - 1_000);
+            storeE.insertQueuedJob(LOCAL, { jobId: 'rec-claimed-live', kind: 'search', site: 'ctrip-flight', url: 'https://flights.ctrip.com/online/list' }, t0 + 60_000);
+            storeE.markClaimed(LOCAL, 'rec-claimed-live', { origin: EXTENSION_ORIGIN, clientId: LIVE_CLIENT });
+            storeE.insertQueuedJob(LOCAL, { jobId: 'rec-claimed-dead', kind: 'search', site: 'ctrip-hotel', url: 'https://hotels.ctrip.com/hotels/list' }, t0 - 1_000);
+            storeE.markClaimed(LOCAL, 'rec-claimed-dead', { origin: EXTENSION_ORIGIN });
             q = createBridgeJobQueue({ store: storeE });
             server = await serveQueue(q);
             // 恢复先于任何轮询执行(等价挂载路径:模块启动即 recoverOnBoot)
@@ -289,7 +291,7 @@ async function main() {
             assert.equal(summary.settledUnresolved, 1);
             assert.equal(storeE.getJob('rec-queued-stale')?.status, 'void', '未被领取即过期 → void,不再派发(零花费)');
             assert.equal(storeE.getJob('rec-claimed-dead')?.status, 'unresolved', '领取后超时 → unresolved');
-            assert.ok(storeE.pacingOf('ctrip-hotel') && storeE.pacingOf('ctrip-hotel').cooldownUntil > Date.now(), '超时结算记节律冷却');
+            assert.ok(storeE.pacingOf(LOCAL, 'ctrip-hotel') && storeE.pacingOf(LOCAL, 'ctrip-hotel').cooldownUntil > Date.now(), '超时结算记节律冷却');
             // 重排作业可被新进程的扩展领取并善果落账
             const polled = await pollJobs(server.port, { clientId: LIVE_CLIENT, capabilities: ['dida-portal'] });
             assert.equal(polled.job?.jobId, 'rec-queued-fresh', '恢复的 queued 作业重排进队列');
@@ -314,13 +316,13 @@ async function main() {
         const server = await serveQueue(queueC);
         try {
             const CLIENT = randomUUID();
-            const pacingBefore = storeC.pacingOf('dida-portal');
+            const pacingBefore = storeC.pacingOf(LOCAL, 'dida-portal');
             const first = queueC.submit({ kind: 'cookie-names', site: 'dida-portal', timeoutMs: 3_000 }, { timeoutMs: 3_000 });
             const polled = await pollJobs(server.port, { clientId: CLIENT, capabilities: ['dida-portal'] });
             assert.ok(polled.job, 'cookie-names 作业应被领取');
             await postResult(server.port, polled.job.jobId, { ok: true, kind: 'cookie-names', names: ['dida_session_sig'] }, { clientId: CLIENT });
             assert.equal((await first).ok, true);
-            const row1 = storeC.getClient(CLIENT);
+            const row1 = storeC.getClient(LOCAL, CLIENT);
             assert.ok(row1, '轮询即注册客户端');
             assert.equal(row1?.origin, EXTENSION_ORIGIN);
             assert.deepEqual(JSON.parse(row1?.capabilities_json ?? '[]'), ['dida-portal']);
@@ -332,11 +334,11 @@ async function main() {
             assert.ok(polled2.job, '第二次轮询仍可领取');
             await postResult(server.port, polled2.job.jobId, { ok: true, kind: 'cookie-names', names: [] }, { clientId: CLIENT });
             assert.equal((await second).ok, true);
-            const row2 = storeC.getClient(CLIENT);
+            const row2 = storeC.getClient(LOCAL, CLIENT);
             assert.deepEqual(JSON.parse(row2?.capabilities_json ?? '[]'), ['dida-portal', 'train-12306'], 'upsert 覆盖能力清单');
             assert.ok((row2?.last_seen_at ?? 0) >= seen1, 'last_seen_at 单调刷新');
             assert.deepEqual(JSON.parse(row2?.login_sites_json ?? '[]'), ['dida-portal'], 'upsert 不回退 login_sites');
-            const pacingAfter = storeC.pacingOf('dida-portal');
+            const pacingAfter = storeC.pacingOf(LOCAL, 'dida-portal');
             assert.deepEqual(pacingAfter, pacingBefore, 'cookie-names 非导航作业,不推动节律');
         }
         finally {
@@ -352,8 +354,8 @@ async function main() {
         try {
             // 预置一条上一进程遗留的已超时 claimed 作业:模块启动即应结算 unresolved
             const seed = openBridgeLedgerStore(rootG);
-            seed.insertQueuedJob({ jobId: 'mount-recover-dead', kind: 'search', site: 'dida-portal', url: 'https://portal.dida.com/find' }, Date.now() - 1_000);
-            seed.markClaimed('mount-recover-dead', { origin: EXTENSION_ORIGIN });
+            seed.insertQueuedJob(LOCAL, { jobId: 'mount-recover-dead', kind: 'search', site: 'dida-portal', url: 'https://portal.dida.com/find' }, Date.now() - 1_000);
+            seed.markClaimed(LOCAL, 'mount-recover-dead', { origin: EXTENSION_ORIGIN });
             seed.close();
             const mod = startSessionSearchModule({
                 apiKey: () => 'ledger-test-key',
@@ -369,7 +371,7 @@ async function main() {
                     // recoverOnBoot 已在模块启动路径跑过:遗留 claimed 超时作业被结算
                     assert.equal(probe.getJob('mount-recover-dead')?.status, 'unresolved', '启动即恢复结算遗留超时作业');
                     // 账本节律读判定:冷却内 429(带 retry-after)
-                    probe.applyCooldown('dida-portal');
+                    probe.applyCooldown(LOCAL, 'dida-portal');
                     const hot = await driveModuleSearch(mod, 'Bearer ledger-test-key');
                     assert.equal(hot.statusCode, 429, '账本冷却内检索被节律闸拒绝');
                     assert.ok(String(hot.headers['retry-after'] ?? '').length > 0, '429 携带 retry-after');

package/dist/scripts/ctrip-city-tests.js

@@ -0,0 +1,80 @@
+/** Supplier metadata fixtures; no vendor requests, credentials or browser session. */
+import assert from 'node:assert/strict';
+import { parseCtripHotelCities, resolveCtripHotelCity, parseCtripCityCatalog, parseCtripCitySuggestions, matchCtripCity, resolveCtripFlightCity } from '../capabilities/session/ctrip-city.js';
+import { resolveFlightEntryUrl } from '../capabilities/session/adapters/ctrip-flight.js';
+const catalog = { ResponseStatus: { Ack: 'Success' }, responseHead: { errorCode: '0' }, recommendGroupList: [{ indexedCity: { cityList: [
+                    { id: 2, code: 'SHA', name: '上海', eName: 'Shanghai', airportlst: [{ code: 'PVG', name: '上海浦东国际机场' }] },
+                    { id: 58, code: 'HKG', name: '中国香港', nameEn: 'Hong Kong' },
+                ] }, geographicalRegionList: [{ hotCityList: [{ cityList: [{ id: 220, code: 'DXB', name: '迪拜', eName: 'Dubai', specName: '迪拜(阿联酋)', sameSpecCity: 1 }] }] }] }] };
+const cities = parseCtripCityCatalog(catalog);
+for (const [name, code] of [['迪拜（阿联酋）', 'DXB'], ['DXB', 'DXB'], ['香港', 'HKG'], ['Hong Kong', 'HKG'], ['Shanghai', 'SHA'], ['上海浦东国际机场', 'PVG']]) {
+    const r = matchCtripCity(name, cities);
+    assert.ok(r.ok, name);
+    assert.equal(r.city.code, code);
+}
+assert.equal(matchCtripCity('Dubai', cities).ok, false, 'supplier-marked same-name cities require qualification');
+assert.equal(matchCtripCity('迪', cities).ok, false, 'no prefix or nearby-city substitution');
+assert.equal(matchCtripCity('同名城', [{ name: '同名城', code: 'AAA', aliases: ['同名城'], context: '甲国' }, { name: '同名城', code: 'BBB', aliases: ['同名城'], context: '乙国' }]).ok, false);
+assert.throws(() => parseCtripCityCatalog({ ...catalog, responseHead: { errorCode: '1' } }));
+const suggestions = { Data: [{ Type: 4, Name: '未缓存城市', Code: 'NEW', EName: 'New City', Country: '示例国', Nearby: [{ Type: 4, Name: '邻近城市', Code: 'NEA' }] }] };
+assert.equal(parseCtripCitySuggestions(suggestions).length, 1);
+let requests = [];
+const fakeFetch = async (url) => {
+    requests.push(String(url));
+    return Response.json(requests.length === 1 ? catalog : suggestions);
+};
+const resolved = await resolveCtripFlightCity('未缓存城市', fakeFetch);
+assert.ok(resolved.ok);
+assert.equal(resolved.city.code, 'NEW');
+assert.equal(requests.length, 2, 'catalog miss queries supplier autocomplete');
+const blocked = await resolveCtripFlightCity('未知城市', async () => new Response('whaleguard block'));
+assert.ok(!blocked.ok && blocked.reason === 'unavailable', 'challenge is unavailable, not unsupported/no inventory');
+const oversized = await resolveCtripFlightCity('未知城市', async () => new Response('x'.repeat(512001)));
+assert.ok(!oversized.ok && oversized.reason === 'unavailable');
+const entry = await resolveFlightEntryUrl('迪拜（阿联酋）', '香港', '2026-12-01', {}, async (q) => matchCtripCity(q, cities));
+assert.ok(entry.ok && entry.url?.includes('oneway-dxb-hkg'));
+let lookups = 0;
+assert.ok(!(await resolveFlightEntryUrl('Dubai', '香港', 'bad-date', {}, async () => { lookups++; throw Error('should not run'); })).ok);
+assert.ok(!(await resolveFlightEntryUrl('Dubai', '香港', '2026-12-01', { fromCode: '../dxb' }, async () => { lookups++; throw Error('should not run'); })).ok);
+assert.equal(lookups, 0);
+console.log('Ctrip city metadata: international names/airports, ambiguity, autocomplete fallback, challenge/bounds and exact URL PASS');
+const hotelRecord = (id, name, english, country) => ({ keyword: { keywordContentInfo: { tripType: 'CT', keywordCode: String(id), displayTexts: [{ key: 'MAIN_TITLE', value: english }] } }, controlInfo: { regionInfo: { basicCityModel: { cityId: id }, displayCityModel: { cityName: name, countryName: country, destinationNameEN: english } } } });
+const hotels = { ResponseStatus: { Ack: 'Success' }, data: { mainKeywordList: { keywords: [hotelRecord(220, '迪拜', 'Dubai', '阿联酋'), hotelRecord(596578, '迪拜', 'Dubai', '印度')] } } };
+const hotelFetch = async () => Response.json(hotels);
+const ambiguous = await resolveCtripHotelCity('迪拜', undefined, hotelFetch);
+assert.ok(!ambiguous.ok && ambiguous.reason === 'ambiguous');
+assert.equal(ambiguous.candidates.length, 2);
+const qualified = await resolveCtripHotelCity('迪拜', '阿联酋', hotelFetch);
+assert.ok(qualified.ok && qualified.city.id === '220');
+const rejected = await resolveCtripHotelCity('迪拜', undefined, async () => Response.json({ ...hotels, data: { ...hotels.data, htlSpiderActionErrorCode: 'captcha' } }));
+assert.ok(!rejected.ok && rejected.reason === 'unavailable');
+assert.throws(() => parseCtripHotelCities({ ...hotels, data: { mainKeywordList: { keywords: [{ ...hotelRecord(220, '迪拜', 'Dubai', '阿联酋'), keyword: { keywordContentInfo: { tripType: 'CT', keywordCode: '58' } } }] } } }));
+console.log('Hotel destination namespace: same-name city ambiguity, country confirmation, challenge and ID conflict PASS');
+// Exercise the real registered schema and tool dispatch, using an isolated state root.
+const { apply } = await import('../src/index.js');
+const { mkdtempSync, rmSync } = await import('node:fs');
+const { tmpdir } = await import('node:os');
+const { join } = await import('node:path');
+const root = mkdtempSync(join(tmpdir(), 'gotry-city-tool-'));
+const tools = [];
+const effects = [];
+try {
+    apply({ tools: { register: (t) => tools.push(t) }, systemPrompt: { variable: () => { } }, get: () => undefined, on: () => () => { } }, { stateRoot: root, timeoutMs: 1000, hbcliBin: 'unused', sessionAccess: 'allow' }, { effect: (async (fx) => { effects.push(fx); return { result: { ok: false, verdict: 'error', error: 'fixture only', evidence: '[fixture:city-tool]' }, trace: { effect: fx.effect, channel: 'browser', attempts: 1, backoffMs: 0, breaker: 'off', evidence: [] } }; }) });
+    const session = tools.find(t => t.name === 'gotry_session_search');
+    const hotel = tools.find(t => t.name === 'gotry_hotel_search');
+    const parameters = session.parameters?.properties ?? session.parameters;
+    assert.ok(parameters.country && parameters.fromCityCode && parameters.toCityCode, 'model must see disambiguation parameters on session search');
+    const hotelParameters = hotel.parameters?.properties ?? hotel.parameters;
+    assert.ok(!hotelParameters.country, 'HBCLI hotel tool must not advertise an ignored session parameter');
+    await session.execute({ kind: 'hotel', to: '迪拜', country: '阿联酋' }, {});
+    assert.equal(effects.at(-1).effect, 'SESSION_HOTEL_SEARCH');
+    assert.equal(effects.at(-1).params.country, '阿联酋');
+    await session.execute({ kind: 'flight', from: '迪拜', to: '香港', date: '2099-12-01', fromCityCode: 'DXB', toCityCode: 'HKG' }, {});
+    assert.equal(effects.at(-1).effect, 'SESSION_FLIGHT_SEARCH');
+    assert.equal(effects.at(-1).params.fromCityCode, 'DXB');
+    assert.equal(effects.at(-1).params.toCityCode, 'HKG');
+    console.log('Registered session tool: country/code schema and effect dispatch PASS');
+}
+finally {
+    rmSync(root, { recursive: true, force: true });
+}