@danceiny/gotry 0.0.1-rc.7 → 0.0.1-rc.9

package/dist/src/index.js

@@ -1,17 +1,26 @@
 import { join } from 'node:path';
 import z from '@deepseek-ai/schemastery';
 import { defineTool } from '@deepseek-ai/dsh-tools';
-import { ensureStateDir, readJson, recordLatency, writeJson } from './bridge.js';
+import { ensureStateDir, recordLatency } from './bridge.js';
 import { segmentsFromCandidate, solveChoiceSegment } from './unified.js';
 import { checkConnectivity } from '../scripts/skeleton-check.js';
 import { parseCandidate, parseRequest } from './model.js';
 import { searchHotels as hbcliSearchHotels } from '../capabilities/hbcli.js';
 import { installProcessGuards, guardToolExecute } from '../capabilities/incident-log.js';
+import { interpretArgs } from './tool-packet.js';
+import { projectUtility } from './memory-utility.js';
+import { pickNudgeWish } from './wish-pool.js';
+import { resolveTimelineDate } from './travel-timeline.js';
+import { ensureLedger, readCompanionsWithFallback, readMotivationWithFallback, readTripsWithFallback, readWishPoolWithFallback } from './state-ledger.js';
+import { buildTimeAnchor } from './time-anchor.js';
+import { resolveSlotDate } from './slot-spec.js';
 import { geocodePlace, getForecast, getClimate, wmoLabel } from '../capabilities/weather.js';
 import { verifyFlight } from '../capabilities/opensky.js';
 import { anythingSearch } from '../capabilities/anything.js';
 import { readUrl, reach, reachStatus } from '../capabilities/agent-reach.js';
 import { videoSubtitle, githubSearch } from '../capabilities/agent-reach-deep.js';
+import { flyaiSearch } from '../capabilities/flyai.js';
+import { sessionFlightSearch } from '../capabilities/session-search.js';
 export const name = 'gotry-tools';
 export const inject = [
     'tools',
@@ -22,6 +31,48 @@ export const Config = z.object({
     timeoutMs: z.number().default(30_000),
     hbcliBin: z.string().default('hbcli')
 });
+const unwrapQuery = interpretArgs;
+function renderMotivationBrief(stateRoot) {
+    const p = readMotivationWithFallback(stateRoot);
+    if (!p) return '';
+    const lines = [
+        '## 用户记忆(跨会话画像;与用户当轮说法冲突时以用户为准,更新经 gotry_motivation_save)'
+    ];
+    const weights = Object.entries(p.weights ?? {});
+    if (weights.length) lines.push(`- 动机权重: ${weights.map(([k, v])=>`${k}=${v}`).join(', ')}(证据 ${p.evidence?.length ?? 0} 条)`);
+    const hard = Object.entries(p.hard ?? {});
+    if (hard.length) lines.push(`- 硬约束: ${hard.map(([k, v])=>`${k}=${String(v)}`).join(', ')}`);
+    const trips = readTimelineTrips(stateRoot);
+    if (trips.length) {
+        lines.push(`- 去过: ${trips.map((t)=>`${t.destination}(${t.start.slice(0, 7)})`).join('、')}——去过的地方不再主动推荐,除非用户点名`);
+    }
+    const companions = readCompanions(stateRoot);
+    if (companions.length) {
+        lines.push(`- 同行人: ${companions.map((c)=>`${c.label}(${c.brief})`).join('、')}——约束进结构与排序建议,不硬过滤;引用时带当初的原话依据`);
+    }
+    lines.push(`- 愿望池: 用 gotry_wish_pool_list 按条件召回(0..1),勿直接堆砌`);
+    if (p.updated_at) lines.push(`- 更新于: ${p.updated_at}`);
+    return weights.length || hard.length ? lines.join('\n') : '';
+}
+function readCompanions(stateRoot) {
+    return readCompanionsWithFallback(stateRoot).map((c)=>{
+        const bits = [
+            c.constraints.mobility,
+            ...c.constraints.health ?? [],
+            ...c.constraints.prefs ?? []
+        ].filter(Boolean);
+        return {
+            label: c.label,
+            brief: bits.join('/')
+        };
+    });
+}
+function readTimelineTrips(stateRoot) {
+    return readTripsWithFallback(stateRoot).map((t)=>({
+            destination: t.destination,
+            start: t.start
+        })).sort((a, b)=>a.start < b.start ? 1 : -1).slice(0, 3);
+}
 export function apply(ctx, config) {
     const sp = ctx['systemPrompt'];
     sp?.variable?.('current_date', ()=>{
@@ -38,6 +89,8 @@ export function apply(ctx, config) {
         ];
         return `${ymd} 周${weekdays[d.getDay()]}`;
     });
+    sp?.variable?.('time_anchor_card', ()=>buildTimeAnchor(new Date()).card);
+    sp?.variable?.('motivation_brief', ()=>renderMotivationBrief(config.stateRoot ?? '.'));
     installProcessGuards(config.stateRoot ?? '.', {
         uncaughtException: 'gotry-tools',
         unhandledRejection: 'gotry-tools'
@@ -53,7 +106,7 @@ export function apply(ctx, config) {
     };
     registerGuarded(defineTool({
         name: 'gotry_feasibility_check',
-        description: 'Check travel candidates against the user\'s motivation and hard constraints using the ' + 'door-to-door true-cost engine (wake time, arrival state, energy, usable hours, money). ' + 'Input is the structured request (motivation weights + hard constraints + window + budget + home hubs) ' + 'and the candidate list (services/transfers/stay costs/min days), same shape as data/golden_erhai.json. ' + 'Returns per-candidate verdicts, unsat cores with minimal-modification suggestions, ' + 'a wish-pool entry for infeasible aspirations, and a ready-to-show markdown answer.',
+        description: 'Check travel candidates against the user\'s motivation and hard constraints using the ' + 'door-to-door true-cost engine (wake time, arrival state, energy, usable hours, money). ' + 'Input is the structured request (motivation weights + hard constraints + window + budget + home hubs) ' + 'and the candidate list (services/transfers/stay costs/min days): ' + 'structure { request: { motivation weights, hard constraints, window, budget, home hubs }, candidates: [ { id, label, services, transfers, stay, minDays } ] }. ' + 'Returns per-candidate verdicts, unsat cores with minimal-modification suggestions, ' + 'a wish-pool entry for infeasible aspirations, and a ready-to-show markdown answer.',
         parameters: {
             payload: {
                 type: 'json',
@@ -82,6 +135,7 @@ export function apply(ctx, config) {
             const dir = await ensureStateDir(config.stateRoot);
             await recordLatency(join(dir, 'bridge-latency.jsonl'), Date.now() - started, 'feasibility_check:in-process-unified').catch(()=>{});
             return {
+                ok: true,
                 ...result,
                 latency_ms: Date.now() - started,
                 via: 'in-process-unified'
@@ -90,13 +144,32 @@ export function apply(ctx, config) {
         presentCall: (args)=>({
                 card: 'generic',
                 title: 'GoTry 可行性检查(门到门全成本)',
-                kind: 'other',
+                kind: 'execute',
                 rawInput: args.payload
-            })
+            }),
+        presentResult: (args, value)=>{
+            const r = value;
+            const budget = args.payload?.request?.budget_cny;
+            const lines = (r.verdicts ?? []).map((v)=>{
+                const tc = v.true_cost ?? {};
+                const money = typeof tc.money_cny === 'number' ? ` ¥${tc.money_cny}/人` + (typeof budget === 'number' ? `(预算 ¥${budget},${tc.money_cny <= budget ? '余' : '超'} ¥${Math.abs(budget - tc.money_cny)})` : '') : '';
+                return v.feasible ? `✅ ${String(v.name ?? v.candidate_id)}${money}${v.candidate_id === r.recommended ? ' ← 推荐' : ''}` : `❌ ${String(v.name ?? v.candidate_id)} — ${Array.isArray(v.unsat_core) ? v.unsat_core.join(',') : '不可行'}`;
+            });
+            return {
+                card: 'generic',
+                title: `可行性:${r.recommended ? `推荐 ${r.recommended}` : '全部不可行'}`,
+                content: [
+                    {
+                        type: 'text',
+                        text: (lines.length ? lines.join('\n') + '\n\n' : '') + String(r.answer_md ?? '').slice(0, 1500)
+                    }
+                ]
+            };
+        }
     }));
     registerGuarded(defineTool({
         name: 'gotry_motivation_save',
-        description: 'Persist the traveler\'s motivation profile (the "why depart" contract object). ' + 'This is the B2B reuse seam: downstream plugins consume only MotivationProfile + constraints, ' + 'never the principal/sponsor distinction. Requires an evidence field: every weight must trace ' + 'back to the user\'s own words (P0 anti-fabrication rule).',
+        description: 'Persist the traveler\'s motivation profile (the "why depart" contract object). ' + 'This is the B2B reuse seam: downstream plugins consume only MotivationProfile + constraints, ' + 'never the principal/sponsor distinction. MERGE semantics (T1): call again with just the NEW ' + 'facts learned this turn (weights delta optional but MUST bring fresh evidence; evidence = user quotes); ' + 'existing history is never deleted. Requires evidence on every call (P0 anti-fabrication rule).',
         parameters: {
             profile: {
                 type: 'json',
@@ -106,19 +179,7 @@ export function apply(ctx, config) {
         },
         output: {
             schema: {
-                type: 'object',
-                additionalProperties: false,
-                properties: {
-                    saved: {
-                        type: 'boolean'
-                    },
-                    path: {
-                        type: 'string'
-                    },
-                    profile: {
-                        type: 'json'
-                    }
-                }
+                type: 'json'
             },
             render: (_args, value)=>[
                     {
@@ -128,55 +189,51 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const profile = args.profile ?? {};
-            if (!profile.evidence?.length) {
+            const incoming = args.profile ?? {};
+            if (!incoming.evidence?.length) {
                 throw new Error('refusing to save a motivation profile without evidence (P0 anti-fabrication rule)');
             }
-            const dir = await ensureStateDir(config.stateRoot);
-            const path = join(dir, 'motivation-profile.json');
-            const saved = JSON.parse(JSON.stringify({
-                ...profile,
-                updated_at: new Date().toISOString()
-            }));
-            await writeJson(path, saved);
-            return {
+            const ledger = ensureLedger(config.stateRoot);
+            const res = ledger.appendMotivationPatch({
+                weights: incoming.weights,
+                evidence: incoming.evidence,
+                hard: incoming.hard
+            });
+            const profileJson = JSON.parse(JSON.stringify(res.profile));
+            return res.saved ? {
+                ok: true,
                 saved: true,
-                path,
-                profile: saved
+                path: ledger.dbPath,
+                profile: profileJson,
+                summary: '画像已合并入账本(单事务)'
+            } : {
+                ok: true,
+                saved: false,
+                path: ledger.dbPath,
+                profile: profileJson,
+                summary: '无新内容(幂等跳过)'
             };
         },
         presentCall: (args)=>({
                 card: 'generic',
                 title: '保存动机画像',
-                kind: 'other',
+                kind: 'edit',
                 rawInput: args.profile
             })
     }));
     registerGuarded(defineTool({
         name: 'gotry_wish_pool_add',
-        description: 'Add an aspiration to the "next departure" wish pool — the graceful home for infeasible dreams. ' + 'An entry carries its fulfilment conditions (days needed, budget, best months) so a future ' + '"next departure" nudge can fire when the window matches. 憧憬不被拒绝。',
+        description: 'Add an aspiration to the "next departure" wish pool — the graceful home for infeasible dreams. ' + 'An entry carries its fulfilment conditions (days needed, budget, best months) so a future ' + '"next departure" nudge can fire when the window matches. Each entry gets a stable wish_id ' + '(the memory-utility sidecar keys on it); muted:true puts a wish dormant (永不删除,只是不再召回). 憧憬不被拒绝。',
         parameters: {
             entry: {
                 type: 'json',
                 required: true,
-                description: '{ name, reason, conditions: { days, budget_cny, best_months } }'
+                description: '{ name, reason?, conditions: { days, budget_cny, best_months }, muted?: boolean }'
             }
         },
         output: {
             schema: {
-                type: 'object',
-                additionalProperties: false,
-                properties: {
-                    added: {
-                        type: 'boolean'
-                    },
-                    total: {
-                        type: 'integer'
-                    },
-                    path: {
-                        type: 'string'
-                    }
-                }
+                type: 'json'
             },
             render: (_args, value)=>{
                 const v = value;
@@ -190,53 +247,267 @@ export function apply(ctx, config) {
         },
         async execute (args, _exec) {
             const entry = args.entry ?? {};
-            if (!entry.name || !entry.conditions) {
-                throw new Error('wish pool entry requires name and conditions (fulfilment conditions are the whole point)');
+            const ledger = ensureLedger(config.stateRoot);
+            const r = ledger.appendWish({
+                name: entry.name,
+                reason: entry.reason,
+                conditions: entry.conditions,
+                muted: entry.muted
+            });
+            return {
+                ok: true,
+                added: r.added,
+                wish_id: r.wish_id,
+                total: r.total,
+                path: ledger.dbPath
+            };
+        },
+        presentCall: (args)=>({
+                card: 'generic',
+                title: '加入「下一次出发」清单',
+                kind: 'edit',
+                rawInput: args.entry
+            })
+    }));
+    registerGuarded(defineTool({
+        name: 'gotry_wish_pool_list',
+        description: 'Surface AT MOST ONE "next departure" wish whose fulfilment conditions match the user\'s current window ' + '(0..1 rule: never more than one nudge per turn, never push when nothing matches — 憧憬不被拒绝,也不被硬推). ' + 'Muted wishes never surface. Surfacing records a recalled event in the memory-utility sidecar. ' + 'action="confirm-outcome" records the user-confirmed real-world outcome (attribution helpful/harmful/neutral) — ' + 'ONLY pass attribution the user explicitly stated; the agent must never self-attribute usefulness.',
+        parameters: {
+            query: {
+                type: 'json',
+                required: true,
+                description: '{ action?: "recall"|"confirm-outcome", days?, budgetCny?, month?, wishId?, attribution?: "helpful"|"harmful"|"neutral", detail?, tripStart?: "行程起始(确认成行时挂时间线)" }'
             }
-            const dir = await ensureStateDir(config.stateRoot);
-            const path = join(dir, 'wish-pool.json');
-            const pool = await readJson(path, []);
-            const existing = pool.findIndex((e)=>e['name'] === entry.name);
-            if (existing >= 0) {
-                pool[existing] = {
-                    ...pool[existing],
-                    reason: entry.reason ?? pool[existing]?.['reason'],
-                    conditions: entry.conditions
+        },
+        output: {
+            schema: {
+                type: 'json'
+            },
+            render: (_args, value)=>[
+                    {
+                        type: 'text',
+                        text: String(value.summary ?? '')
+                    }
+                ]
+        },
+        async execute (args, _exec) {
+            const q = unwrapQuery(args, 'action');
+            const ledger = ensureLedger(config.stateRoot);
+            const now = new Date().toISOString();
+            if (q.action === 'confirm-outcome') {
+                if (!q.wishId || !q.attribution) {
+                    return {
+                        ok: false,
+                        summary: 'confirm-outcome 需要 wishId + attribution(helpful|harmful|neutral)'
+                    };
+                }
+                let tripInput;
+                const wish = ledger.readWishPool().find((e)=>String(e.wish_id) === q.wishId);
+                if (q.tripStart && wish?.name) {
+                    const anchor = buildTimeAnchor(new Date());
+                    const start = resolveTimelineDate(q.tripStart, anchor) ?? (/^\d{4}-\d{2}-\d{2}$/.test(q.tripStart) ? q.tripStart : undefined);
+                    if (start) {
+                        tripInput = {
+                            destination: String(wish.name),
+                            start,
+                            companions: undefined,
+                            source: 'wish-confirmed',
+                            evidence: `wish ${q.wishId} confirm-outcome(${q.attribution})`
+                        };
+                    }
+                }
+                const r = ledger.confirmOutcome({
+                    wishId: q.wishId,
+                    attribution: q.attribution,
+                    detail: q.detail,
+                    trip: tripInput
+                });
+                return {
+                    ok: true,
+                    recorded: r.recorded,
+                    wish_id: q.wishId,
+                    status: q.attribution,
+                    ...r.trip ? {
+                        trip: r.trip
+                    } : {}
                 };
-                await writeJson(path, pool);
+            }
+            const pool = ledger.readWishPool();
+            const candidates = pool.filter((e)=>!e.muted && typeof e.wish_id === 'string');
+            const month = q.month ?? new Date().getMonth() + 1;
+            const match = pickNudgeWish(candidates, {
+                days: q.days,
+                budgetCny: q.budgetCny,
+                month
+            });
+            if (!match) {
                 return {
-                    added: false,
-                    total: pool.length,
-                    path
+                    ok: true,
+                    suggestion: null,
+                    summary: `无可成行的憧憬匹配当前窗口(${candidates.length} 条在册,0..1 纪律:不硬推)`
                 };
             }
-            pool.push({
-                reason: '',
-                ...entry,
-                added_at: new Date().toISOString()
+            const { events: next } = ledger.appendUtilityEvent({
+                wish_id: match.wishId,
+                kind: 'recalled',
+                ts: now,
+                ctx: 'gotry_wish_pool_list.recall'
             });
-            await writeJson(path, pool);
+            const utility = projectUtility(next)[match.wishId];
             return {
-                added: true,
-                total: pool.length,
-                path
+                ok: true,
+                suggestion: {
+                    wish_id: match.entry['wish_id'],
+                    name: match.entry['name'],
+                    reason: match.entry['reason'],
+                    conditions: match.entry['conditions'],
+                    match_score: match.score,
+                    hits: match.hits
+                },
+                utility: {
+                    status: utility?.status ?? 'unknown',
+                    recalled: utility?.recalled ?? 1
+                },
+                summary: `「下一次出发」候选(0..1):${String(match.entry['name'])}——成行条件 ${JSON.stringify(match.entry['conditions'])},本次窗口命中 ${match.score}/3 项(${match.hits.join('+')});效用状态 ${utility?.status ?? 'unknown'}`
             };
         },
         presentCall: (args)=>({
                 card: 'generic',
-                title: '加入「下一次出发」清单',
-                kind: 'other',
-                rawInput: args.entry
+                title: '「下一次出发」召回',
+                kind: 'search',
+                rawInput: args.query
+            })
+    }));
+    registerGuarded(defineTool({
+        name: 'gotry_companion_save',
+        description: 'Save/update a travel companion profile (memory-design M5 layer): constraints that shape itinerary STRUCTURE and ranking — ' + 'never a hard filter (「爸爸65轻度高血压」→ 不排高海拔/控制步行量;「晕车」→ 优先火车/备提示). ' + 'evidence MUST be the user\'s verbatim words (append-only, traceable). ' + 'NEGATIVE LIST: passport/ID/phone numbers are rejected on sight — such fields never enter storage.',
+        parameters: {
+            companion: {
+                type: 'json',
+                required: true,
+                description: '{ label: "爸爸", constraints: { mobility?: "步行≤4h", health?: ["轻度高血压"], prefs?: ["怕吵"] }, evidence: "<用户原话>" }'
+            }
+        },
+        output: {
+            schema: {
+                type: 'json'
+            },
+            render: (_args, value)=>[
+                    {
+                        type: 'text',
+                        text: String(value.summary ?? '')
+                    }
+                ]
+        },
+        async execute (args, _exec) {
+            const c = args.companion ?? {};
+            if (!c.evidence) return {
+                ok: false,
+                summary: 'evidence 必填(用户原话,溯源 P0)'
+            };
+            const ledger = ensureLedger(config.stateRoot);
+            const res = ledger.appendCompanion({
+                label: String(c.label ?? ''),
+                constraints: {
+                    mobility: c.constraints?.mobility,
+                    health: c.constraints?.health,
+                    prefs: c.constraints?.prefs
+                },
+                evidence: c.evidence
+            });
+            if (!res.appended && res.reason) return {
+                ok: false,
+                summary: res.reason
+            };
+            return {
+                ok: true,
+                appended: res.appended,
+                companion_id: res.companionId,
+                total: res.total,
+                summary: res.appended ? `同行人已保存:${res.companionId}` : `无新内容(幂等跳过):${res.companionId}`
+            };
+        },
+        presentCall: (args)=>({
+                card: 'generic',
+                title: '保存同行人',
+                kind: 'edit',
+                rawInput: args.companion
+            })
+    }));
+    registerGuarded(defineTool({
+        name: 'gotry_trip_log',
+        description: 'Record a PAST trip into the travel timeline (memory-design M4 layer). Use when the user mentions a trip they already took ' + '(「去年国庆去了大理」) — dates resolve via the time anchor (词表外日期会拒绝,请用户给绝对日期), evidence MUST be the user\'s verbatim words. ' + 'Append-only and idempotent (same destination+start+source = same trip); overlapping same-destination trips are rejected for human adjudication. ' + 'Past trips power origin resolution and 「去过不再推」 ranking — never a hard filter.',
+        parameters: {
+            query: {
+                type: 'json',
+                required: true,
+                description: '{ destination: "大理", start: "2025-10-01 或绝对日期表达", end?: 同上, companions?: ["爸爸"], evidence: "<用户原话>" }'
+            }
+        },
+        output: {
+            schema: {
+                type: 'json'
+            },
+            render: (_args, value)=>[
+                    {
+                        type: 'text',
+                        text: String(value.summary ?? '')
+                    }
+                ]
+        },
+        async execute (args, _exec) {
+            const q = unwrapQuery(args, 'destination');
+            if (!q.destination) return {
+                ok: false,
+                summary: 'destination 必填'
+            };
+            if (!q.evidence) return {
+                ok: false,
+                summary: 'evidence 必填(用户原话,溯源 P0)'
+            };
+            const anchor = buildTimeAnchor(new Date());
+            const start = resolveTimelineDate(q.start ?? '', anchor) ?? (/^\d{4}-\d{2}-\d{2}$/.test(q.start ?? '') ? q.start : undefined);
+            if (!start) return {
+                ok: false,
+                summary: `start 无法解析为绝对日期(${q.start ?? '缺'})——请向用户要具体日期,不猜`
+            };
+            const end = q.end ? resolveTimelineDate(q.end, anchor) ?? (/^\d{4}-\d{2}-\d{2}$/.test(q.end) ? q.end : undefined) : undefined;
+            const ledger = ensureLedger(config.stateRoot);
+            const res = ledger.appendTripEvent({
+                destination: q.destination.trim(),
+                start,
+                end,
+                companions: q.companions,
+                source: 'user-verbatim',
+                evidence: q.evidence
+            });
+            if (!res.appended && res.reason) return {
+                ok: false,
+                summary: res.reason
+            };
+            return {
+                ok: true,
+                appended: res.appended,
+                trip_id: res.tripId,
+                total: res.total,
+                summary: res.appended ? `已入时间线:${q.destination} @ ${start}` : `已存在(幂等跳过):${res.tripId}`
+            };
+        },
+        presentCall: (args)=>({
+                card: 'generic',
+                title: '记录旅行',
+                kind: 'edit',
+                rawInput: args.query
             })
     }));
     registerGuarded(defineTool({
         name: 'gotry_hotel_search',
-        description: 'Search hotels via hotelbyte-cli (real-time when hbcli credentials exist, falls back to the static pack with explicit evidence tagging). ' + 'Input: destination city name + optional dates/occupancy. Output: hotel list with evidence chain ([realtime-API:hbcli] + fetch timestamp, ' + 'or [static-pack:estimate]) per the L4 invariant.',
+        description: 'Search hotels via hotelbyte-cli (real-time when hbcli credentials exist, falls back to the static pack with explicit evidence tagging). ' + 'Input: destination city name + optional dates/occupancy. Dates accept verbatim natural expressions (下周五 / 8.20 / 下周五+3) — ' + 'the code layer resolves them against the time anchor; unresolved expressions degrade to an undated search with an explicit ' + 'date_notes entry instead of guessing. Output: hotel list with evidence chain ([realtime-API:hbcli] + fetch timestamp, ' + 'or [static-pack:estimate]) per the L4 invariant.',
         parameters: {
             query: {
                 type: 'json',
                 required: true,
-                description: '{ destination: "普吉", checkIn?: "2026-07-18", checkOut?: "2026-07-23", occupancy?: { adults: 2 } }'
+                description: '{ destination: "<目的地城市>", checkIn?: "YYYY-MM-DD 或自然表达(下周五/8.20)", checkOut?: 同上, occupancy?: { adults: 2 } }'
             }
         },
         output: {
@@ -251,14 +522,26 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = args.query ?? {};
+            const q = unwrapQuery(args, 'destination');
             if (!q.destination) throw new Error('gotry_hotel_search requires destination');
             const started = Date.now();
             const fallbackPath = join(import.meta.dirname, '..', '..', 'data', 'hotels_2026.json');
+            const anchor = buildTimeAnchor(new Date());
+            const dateNotes = [];
+            const resolveDate = (expr)=>{
+                if (!expr) return undefined;
+                const r = resolveSlotDate(expr, anchor);
+                if (!r.date) {
+                    dateNotes.push(`日期未解析:${r.raw}——请向用户确认具体日期`);
+                    return undefined;
+                }
+                if (r.raw !== r.date) dateNotes.push(`slot-resolved: ${r.raw} → ${r.date}`);
+                return r.date;
+            };
             const resp = await hbcliSearchHotels({
                 destination: q.destination,
-                checkIn: q.checkIn,
-                checkOut: q.checkOut,
+                checkIn: resolveDate(q.checkIn),
+                checkOut: resolveDate(q.checkOut),
                 adults: q.adults
             }, {
                 hbcliBin: config.hbcliBin,
@@ -270,22 +553,40 @@ export function apply(ctx, config) {
             const evidence = isLive ? resp.evidence : '[静态包:估算]';
             await recordLatency(join(dir, 'bridge-latency.jsonl'), Date.now() - started, `hotel_search:${resp.via}`).catch(()=>{});
             const payload = {
+                ok: true,
                 hotels: resp.hotels ?? null,
                 evidence,
                 destination: q.destination,
                 via: resp.via,
                 latency_ms: Date.now() - started,
                 summary: resp.summary,
-                error: resp.error
+                error: resp.error,
+                ...dateNotes.length ? {
+                    date_notes: dateNotes
+                } : {}
             };
             return JSON.parse(JSON.stringify(payload));
         },
         presentCall: (args)=>({
                 card: 'generic',
                 title: `酒店搜索:${String(args.query?.destination ?? '')}`,
-                kind: 'other',
+                kind: 'search',
                 rawInput: args.query
-            })
+            }),
+        presentResult: (_args, value)=>{
+            const r = value;
+            const n = Array.isArray(r.hotels) ? r.hotels.length : 0;
+            return {
+                card: 'generic',
+                title: `酒店:${r.destination ?? ''} ${n ? `${n} 家(${r.via === 'hbcli-realtime' ? '实时' : '静态包'})` : '无结果'}`,
+                content: [
+                    {
+                        type: 'text',
+                        text: String(r.summary ?? '')
+                    }
+                ]
+            };
+        }
     }));
     registerGuarded(defineTool({
         name: 'gotry_skeleton_check',
@@ -304,38 +605,27 @@ export function apply(ctx, config) {
         },
         output: {
             schema: {
-                type: 'object',
-                additionalProperties: false,
-                properties: {
-                    connected: {
-                        type: 'boolean'
-                    },
-                    airlines: {
-                        type: 'array',
-                        items: {
-                            type: 'string'
-                        }
-                    },
-                    evidence: {
-                        type: 'string'
-                    }
-                }
+                type: 'json'
             },
             render: (_args, value)=>[
                     {
                         type: 'text',
-                        text: String(value.evidence ?? '')
+                        text: String(value.evidence ?? JSON.stringify(value))
                     }
                 ]
         },
         async execute (args, _exec) {
-            const verdict = await checkConnectivity(args.from, args.to);
-            return JSON.parse(JSON.stringify(verdict));
+            const q = unwrapQuery(args);
+            const verdict = await checkConnectivity(String(q.from ?? ''), String(q.to ?? ''));
+            return JSON.parse(JSON.stringify({
+                ok: true,
+                ...verdict
+            }));
         },
         presentCall: (args)=>({
                 card: 'generic',
                 title: `骨架校验:${args.from}-${args.to}`,
-                kind: 'other',
+                kind: 'execute',
                 rawInput: args
             })
     }));
@@ -346,7 +636,7 @@ export function apply(ctx, config) {
             query: {
                 type: 'json',
                 required: true,
-                description: '{ place: "大理市", month?: 8, mode?: "forecast"|"climate", days?: 7 }'
+                description: '{ place: "<城市名>", month?: 8, mode?: "forecast"|"climate", days?: 7 }'
             }
         },
         output: {
@@ -361,7 +651,7 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = args.query ?? {};
+            const q = unwrapQuery(args, 'place');
             const started = Date.now();
             let lat = q.lat, lng = q.lng;
             let placeLabel = q.place ?? `${q.lat},${q.lng}`;
@@ -407,9 +697,24 @@ export function apply(ctx, config) {
         presentCall: (args)=>({
                 card: 'generic',
                 title: `天气:${String(args.query?.place ?? '')}`,
-                kind: 'other',
+                kind: 'fetch',
                 rawInput: args.query
-            })
+            }),
+        presentResult: (args, value)=>{
+            const r = value;
+            const place = String(args.query?.place ?? '');
+            const failed = String(r.summary ?? '').includes('降级') || String(r.summary ?? '').includes('unavailable');
+            return {
+                card: 'generic',
+                title: `天气:${place} ${failed ? '降级' : 'ok'}`,
+                content: [
+                    {
+                        type: 'text',
+                        text: String(r.summary ?? '')
+                    }
+                ]
+            };
+        }
     }));
     registerGuarded(defineTool({
         name: 'gotry_flight_verify',
@@ -433,7 +738,7 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = args.query ?? {};
+            const q = unwrapQuery(args, 'callsign');
             const started = Date.now();
             if (!q.callsign) {
                 return JSON.parse(JSON.stringify({
@@ -451,6 +756,7 @@ export function apply(ctx, config) {
             await recordLatency(join(dir, 'bridge-latency.jsonl'), Date.now() - started, `flight_verify:${r.via}`).catch(()=>{});
             const summary = r.verdict === 'observed' ? `${r.callsign} 当前 ADS-B 观测命中 (${r.hits?.length ?? 0} 架)${r.airport ? ` 在 ${r.airport}` : ''}\n${r.evidence}` : r.verdict === 'not_observed' ? `${r.callsign} 当前观测列表未见(ADS-B 覆盖有限,不否定该航班存在)\n${r.evidence}` : `${r.callsign} OpenSky 不可用:${r.error}\n${r.evidence}`;
             return JSON.parse(JSON.stringify({
+                ok: true,
                 verdict: r.verdict,
                 callsign: r.callsign,
                 airport: r.airport,
@@ -464,18 +770,145 @@ export function apply(ctx, config) {
         presentCall: (args)=>({
                 card: 'generic',
                 title: `飞行校验:${String(args.query?.callsign ?? '')}`,
-                kind: 'other',
+                kind: 'fetch',
                 rawInput: args.query
             })
     }));
+    registerGuarded(defineTool({
+        name: 'gotry_flyai_search',
+        description: 'Live flight/train search via Fliggy official FlyAI channel (read-only, no key, booking only via jumpUrl by the human). ' + 'PRIMARY source for real schedules & prices (RFC user-session-data-rfc). Input: kind=flight|train, from/to city names (Chinese), date YYYY-MM-DD. ' + 'Evidence [实时API:flyai@ts]. Cross-validate expensive claims against gotry_session_search when it matters.',
+        parameters: {
+            query: {
+                type: 'json',
+                required: true,
+                description: '{ kind: "flight"|"train", from: "上海", to: "丽江", date: "2026-10-01" }'
+            }
+        },
+        output: {
+            schema: {
+                type: 'json'
+            },
+            render: (_a, v)=>[
+                    {
+                        type: 'text',
+                        text: String(v.summary ?? JSON.stringify(v).slice(0, 600))
+                    }
+                ]
+        },
+        async execute (args, _exec) {
+            const q = unwrapQuery(args, 'from');
+            const kind = q.kind === 'train' ? 'train' : 'flight';
+            if (!q.from || !q.to || !q.date) {
+                return {
+                    ok: false,
+                    summary: '需要 from/to(中文城市名)与 date(YYYY-MM-DD)'
+                };
+            }
+            const r = await flyaiSearch({
+                kind,
+                origin: q.from,
+                destination: q.to,
+                depDate: q.date
+            });
+            const top = (r.options ?? []).slice(0, 8).map((o)=>`${o.no} ${o.name} ${o.depDateTime.slice(11, 16)}→${o.arrDateTime.slice(11, 16)} ¥${o.price}`);
+            const summary = r.verdict === 'hit' ? `${q.from}→${q.to} ${q.date} ${kind === 'flight' ? '机票' : '火车票'}(飞猪官方只读)前 ${top.length} 条:\n${top.join('\n')}\n${r.evidence}` : `${q.from}→${q.to} ${q.date} 无结果或失败:${r.error ?? 'miss'} ${r.evidence}`;
+            return JSON.parse(JSON.stringify({
+                ...r,
+                kind,
+                summary
+            }));
+        },
+        presentCall: (args)=>({
+                card: 'generic',
+                title: `官方检索:${String(args.query?.kind ?? 'flight')}`,
+                kind: 'fetch',
+                rawInput: args.query
+            }),
+        presentResult: (args, value)=>{
+            const r = value;
+            return {
+                card: 'generic',
+                title: `飞猪检索:${r.ok && (r.options?.length ?? 0) > 0 ? `${r.options.length} 条` : '降级'}`,
+                content: [
+                    {
+                        type: 'text',
+                        text: String(value.summary ?? '')
+                    }
+                ]
+            };
+        }
+    }));
+    registerGuarded(defineTool({
+        name: 'gotry_session_search',
+        description: 'Cross-validation search on the user\'s OWN logged-in browser session (dedicated persistent profile, ReadGuard = physically read-only: ' + 'write requests are aborted at network layer; agent NEVER touches credentials/captcha; on captcha it stops and returns challenged). ' + 'Currently ctrip-flight: sniffs the site search API for structured options. Evidence [会话:ctrip-flight@ts]. ' + 'verdict needs-login = run scripts/session-login.ts once with the human logging in. Rate-limited (≥30s between same-site calls). ' + 'Use to verify/double-check prices from gotry_flyai_search on the same itinerary (split by 直达/中转).',
+        parameters: {
+            query: {
+                type: 'json',
+                required: true,
+                description: '{ from: "上海", to: "丽江", date: "2026-10-01" }'
+            }
+        },
+        output: {
+            schema: {
+                type: 'json'
+            },
+            render: (_a, v)=>[
+                    {
+                        type: 'text',
+                        text: String(v.summary ?? JSON.stringify(v).slice(0, 600))
+                    }
+                ]
+        },
+        async execute (args, _exec) {
+            const q = unwrapQuery(args, 'from');
+            if (!q.from || !q.to || !q.date) {
+                return {
+                    ok: false,
+                    summary: '需要 from/to(中文城市名,词表内)与 date(YYYY-MM-DD)'
+                };
+            }
+            const r = await sessionFlightSearch({
+                from: q.from,
+                to: q.to,
+                date: q.date,
+                auditPath: join(config.stateRoot ?? '.', 'gotry-state', 'session-incidents.jsonl')
+            });
+            const top = (r.options ?? []).slice(0, 8).map((o)=>`${o.flightNo} ${o.airline} ${o.depDateTime.slice(11, 16)}→${o.arrDateTime.slice(11, 16)} ¥${o.price}`);
+            const summary = r.verdict === 'hit' ? `${q.from}→${q.to} ${q.date} 会话检索(携程,用户本人登录态)前 ${top.length} 条:\n${top.join('\n')}\n${r.evidence}` : `会话检索未取回(${r.verdict}):${r.error ?? ''} ${r.evidence}`;
+            return JSON.parse(JSON.stringify({
+                ...r,
+                summary
+            }));
+        },
+        presentCall: (args)=>({
+                card: 'generic',
+                title: `会话检索:${String(args.query?.from ?? '')}`,
+                kind: 'fetch',
+                rawInput: args.query
+            }),
+        presentResult: (_args, value)=>{
+            const r = value;
+            const label = r.verdict === 'hit' ? `会话 ${r.options.length} 条` : r.verdict === 'needs-login' ? '需登录' : r.verdict ?? '降级';
+            return {
+                card: 'generic',
+                title: `会话检索:${label}`,
+                content: [
+                    {
+                        type: 'text',
+                        text: String(value.summary ?? '')
+                    }
+                ]
+            };
+        }
+    }));
     registerGuarded(defineTool({
         name: 'gotry_anything_search',
-        description: 'Universal Anything search via hotel-byte CLI → hotel-be Anything endpoint. ' + 'Mixed destinations (cities / metropolitan areas / high-level regions) + hotels in one call. ' + 'Returns candidates with type, name, optional coordinates and hotel-id. ' + 'Three-valued semantics: hit = ≥1 candidate; miss = 0 candidates (try synonyms or contentType=city/hotel); ' + 'unavailable = hbcli failed (degraded, never blocks). ' + 'Use as the first stop when the user mentions a place/city/hotel name and you need to ground it in real catalog data ' + '(OpenFlights skeleton tells you connectivity; Anything tells you what EXISTS at a city/region).',
+        description: 'Travel-domain search via hotel-byte CLI → hotel-be Anything (cities/hotels/destinations) — NOT general web search; for general internet facts use gotry_agent_reach. ' + 'Mixed destinations (cities / metropolitan areas / high-level regions) + hotels in one call. ' + 'Returns candidates with type, name, optional coordinates and hotel-id. ' + 'Three-valued semantics: hit = ≥1 candidate; miss = 0 candidates (try synonyms or contentType=city/hotel); ' + 'unavailable = hbcli failed (degraded, never blocks). ' + 'Use as the first stop when the user mentions a place/city/hotel name and you need to ground it in real catalog data ' + '(OpenFlights skeleton tells you connectivity; Anything tells you what EXISTS at a city/region).',
         parameters: {
             query: {
                 type: 'json',
                 required: true,
-                description: '{ keyword: "大理", contentType?: "city"|"hotel", parentDestinationId?: "?", timeoutMs?: 12000 }'
+                description: '{ keyword: "<搜索关键词>", contentType?: "city"|"hotel", parentDestinationId?: "?", timeoutMs?: 12000 }'
             }
         },
         output: {
@@ -490,7 +923,7 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = args.query ?? {};
+            const q = unwrapQuery(args, 'keyword');
             const started = Date.now();
             if (!q.keyword) {
                 return JSON.parse(JSON.stringify({
@@ -520,9 +953,23 @@ export function apply(ctx, config) {
         presentCall: (args)=>({
                 card: 'generic',
                 title: `Anything search:${String(args.query?.keyword ?? '')}`,
-                kind: 'other',
+                kind: 'search',
                 rawInput: args.query
-            })
+            }),
+        presentResult: (_args, value)=>{
+            const r = value;
+            const n = Array.isArray(r.hits) ? r.hits.length : r.total_candidates ?? 0;
+            return {
+                card: 'generic',
+                title: `Anything:${r.keyword ?? ''} ${r.verdict === 'hit' ? `${n} hits` : r.verdict ?? 'no-result'}`,
+                content: [
+                    {
+                        type: 'text',
+                        text: String(r.summary ?? '')
+                    }
+                ]
+            };
+        }
     }));
     registerGuarded(defineTool({
         name: 'gotry_web_search',
@@ -546,7 +993,7 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = args.query ?? {};
+            const q = unwrapQuery(args, 'url');
             const started = Date.now();
             if (!q.url) {
                 return JSON.parse(JSON.stringify({
@@ -576,7 +1023,7 @@ export function apply(ctx, config) {
         presentCall: (args)=>({
                 card: 'generic',
                 title: `读网页:${String(args.query?.url ?? '')}`,
-                kind: 'other',
+                kind: 'fetch',
                 rawInput: args.query
             })
     }));
@@ -602,7 +1049,7 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = args.query ?? {};
+            const q = unwrapQuery(args, 'url');
             if (!q.url) {
                 return JSON.parse(JSON.stringify({
                     ok: false,
@@ -627,7 +1074,7 @@ export function apply(ctx, config) {
         presentCall: (args)=>({
                 card: 'generic',
                 title: `视频字幕:${String(args.query?.url ?? '')}`,
-                kind: 'other',
+                kind: 'fetch',
                 rawInput: args.query
             })
     }));
@@ -653,7 +1100,7 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = args.query ?? {};
+            const q = unwrapQuery(args, 'query');
             if (!q.query) {
                 return JSON.parse(JSON.stringify({
                     ok: false,
@@ -678,13 +1125,13 @@ export function apply(ctx, config) {
         presentCall: (args)=>({
                 card: 'generic',
                 title: `GitHub 搜索:${String(args.query?.query ?? '')}`,
-                kind: 'other',
+                kind: 'search',
                 rawInput: args.query
             })
     }));
     registerGuarded(defineTool({
         name: 'gotry_agent_reach',
-        description: 'Agent Reach — thin wrapper over Panniantong/Agent-Reach upstream registry (zero channel knowledge here). ' + 'Call ANY upstream channel method by reflection: web.read(url) / v2ex.get_hot_topics() / v2ex.search(query) / ' + 'xueqiu.get_stock_quote(symbol) / xueqiu.search_stock(query) / youtube.transcribe(url) / <channel>.check() ... ' + 'Unknown channel or method? Just call it — the error returns the upstream inventory (channel list or method signatures) so you can self-correct. ' + 'Action "status" runs the real `agent-reach doctor` (.venv/bin/agent-reach). ' + 'Channels needing cookies/setup return the upstream check() guidance verbatim (never blocks). ' + 'Evidence chain: [agent-reach:<channel>.<method>@ts].',
+        description: 'Agent Reach — the PRIMARY external-data gateway (thin wrapper over Panniantong/Agent-Reach upstream registry, zero channel knowledge here). ' + 'Prefer this for ANY external/internet fact beyond weather/flights/hotels. ' + 'Call ANY upstream channel method by reflection: web.read(url) / v2ex.get_hot_topics() / v2ex.search(query) / ' + 'xueqiu.get_stock_quote(symbol) / xueqiu.search_stock(query) / youtube.transcribe(url) / <channel>.check() ... ' + 'Unknown channel or method? Just call it — the error returns the upstream inventory (channel list or method signatures) so you can self-correct. ' + 'Action "status" runs the real `agent-reach doctor` (.venv/bin/agent-reach). ' + 'Channels needing cookies/setup return the upstream check() guidance verbatim — do NOT give up there: hand the user the exact configure command, then offer to re-check. ' + 'Evidence chain: [agent-reach:<channel>.<method>@ts].',
         parameters: {
             query: {
                 type: 'json',
@@ -704,7 +1151,7 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = args.query ?? {};
+            const q = unwrapQuery(args, 'channel');
             const started = Date.now();
             const dir = await ensureStateDir(config.stateRoot);
             if (q.action === 'status' || !q.action && !q.channel) {
@@ -732,6 +1179,23 @@ export function apply(ctx, config) {
                 args: q.args,
                 timeoutMs: q.timeoutMs
             });
+            const dataStr = (v)=>{
+                if (Array.isArray(v)) {
+                    const kept = [];
+                    let budget = 3500;
+                    for (const item of v){
+                        const s = JSON.stringify(item);
+                        if (budget - s.length < 0) break;
+                        budget -= s.length + 1;
+                        kept.push(item);
+                    }
+                    if (kept.length < v.length) kept.push(`…(截断:保留 ${kept.length}/${v.length} 条;可用上游方法带 limit 参数取更少)`);
+                    return kept;
+                }
+                if (typeof v === 'string') return v.length > 4000 ? v.slice(0, 4000) + '…(截断)' : v;
+                return v;
+            };
+            if (r.ok) r.data = dataStr(r.data);
             await recordLatency(join(dir, 'bridge-latency.jsonl'), Date.now() - started, `agent-reach:${q.channel}.${q.method}:${r.verdict}`).catch(()=>{});
             const summary = r.verdict === 'found' ? `${q.channel}.${q.method} → found (${r.latencyMs}ms)\n${r.evidence}\n${typeof r.data === 'string' ? r.data.slice(0, 600) : JSON.stringify(r.data ?? null).slice(0, 600)}` : r.verdict === 'needs-setup' ? `${q.channel}.${q.method} → 需配置(上游 check() 原话): ${r.setup ?? ''}\n${r.evidence}` : r.verdict === 'not-installed' ? `${q.channel}.${q.method} → 上游未装: ${r.setup ?? ''}\n${r.evidence}` : `${q.channel}.${q.method} → ${r.error ?? 'error'}${r.inventory ? `\n上游清单: ${JSON.stringify(r.inventory).slice(0, 1200)}` : ''}\n${r.evidence}`;
             return JSON.parse(JSON.stringify({
@@ -750,9 +1214,24 @@ export function apply(ctx, config) {
         presentCall: (args)=>({
                 card: 'generic',
                 title: `Agent Reach:${String(args.query?.channel ?? '')}.${String(args.query?.method ?? 'status')}`,
-                kind: 'other',
+                kind: 'fetch',
                 rawInput: args.query
-            })
+            }),
+        presentResult: (args, value)=>{
+            const r = value;
+            const q = args.query ?? {};
+            const icon = r.verdict === 'found' ? '✅' : r.verdict === 'needs-setup' ? '🔧' : r.verdict === 'not-installed' ? '📦' : '❌';
+            return {
+                card: 'generic',
+                title: `AgentReach ${icon} ${q.channel ?? ''}.${q.method ?? 'status'} ${r.verdict ?? ''}`,
+                content: [
+                    {
+                        type: 'text',
+                        text: String(r.summary ?? '')
+                    }
+                ]
+            };
+        }
     }));
 }