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

package/dist/src/index.js

@@ -14,19 +14,19 @@ import { ensureLedger, readCompanionsWithFallback, readMotivationWithFallback, r
 import { buildTimeAnchor } from './time-anchor.js';
 import { resolveSlotDate } from './slot-spec.js';
 import { wmoLabel } from '../capabilities/weather.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 { sessionLogin } from '../capabilities/session-login.js';
+import { reach, reachStatus } from '../capabilities/agent-reach.js';
+import { runDoctorChecks, renderDoctorReportMd } from '../capabilities/doctor.js';
 import { EXTENSION_STORE_URL } from '../capabilities/session/extension-bridge.js';
 import { createConsentGate, approvalFromContext } from '../capabilities/session-consent.js';
 import { installModelOverride } from '../capabilities/model-override.js';
 import { listArtifacts, readArtifact } from '../capabilities/artifacts.js';
 import { interpretEffect, declinedObservation } from '../capabilities/effect.js';
 import { appendFacts, loadFactRegistry } from '../capabilities/fact-log.js';
-import { factsFromFlyai, factsFromSession } from './bookable-facts.js';
+import { factsFromFlyai, factsFromHotel, factsFromSession } from './bookable-facts.js';
 import { gateArtifact } from './artifact-gate.js';
-import { installToolBudget } from './tool-budget.js';
+import { installTurnDeadline, listTurnHandoffTickets } from './turn-deadline.js';
+import { noteChannelVerdict, recordChannelEvent, readLatestChannelEvents } from '../capabilities/channel-health.js';
+import { routingAdvice, renderRoutingCard, toolRoutingHeadline } from '../capabilities/channel-registry.js';
 import { registerBenchmarkEnvironmentBridge } from './benchmark-environment-bridge.js';
 import { installBenchmarkToolIsolation } from './benchmark-tool-isolation.js';
 import { installBenchmarkAgentConformance } from './benchmark-agent-conformance.js';
@@ -95,9 +95,39 @@ function readTimelineTrips(stateRoot) {
             start: t.start
         })).sort((a, b)=>a.start < b.start ? 1 : -1).slice(0, 3);
 }
+function benchmarkPinnedPolicy() {
+    const parse = (name, fallback)=>{
+        const raw = process.env[name];
+        if (raw === undefined || raw === '') return fallback;
+        const value = Number.parseInt(raw, 10);
+        if (!Number.isSafeInteger(value) || value <= 0) {
+            throw new Error(`invalid ${name}: ${JSON.stringify(raw)} (expected a positive safe integer)`);
+        }
+        return value;
+    };
+    const softMs = parse('GOTRY_BENCHMARK_SOFT_MS', 60_000);
+    const hardMs = parse('GOTRY_BENCHMARK_HARD_MS', 120_000);
+    if (hardMs <= softMs) throw new Error(`GOTRY_BENCHMARK_HARD_MS (${hardMs}) must exceed GOTRY_BENCHMARK_SOFT_MS (${softMs})`);
+    return {
+        softMs,
+        hardMs,
+        exit: 'converge'
+    };
+}
 export function apply(ctx, config) {
-    installToolBudget(ctx);
     const rawBenchmarkEnvironmentConfigPath = config.benchmarkEnvironmentConfigPath ?? '';
+    const handoffChild = process.env.GOTRY_HANDOFF_CHILD === '1';
+    installTurnDeadline(ctx, handoffChild ? {
+        fixedPolicy: {
+            softMs: 300_000,
+            hardMs: 900_000,
+            exit: 'converge'
+        }
+    } : rawBenchmarkEnvironmentConfigPath.trim() ? {
+        fixedPolicy: benchmarkPinnedPolicy()
+    } : {
+        stateRoot: process.env.GOTRY_TURN_HANDOFF_ROOT ?? config.stateRoot ?? '.'
+    });
     if (rawBenchmarkEnvironmentConfigPath.trim()) {
         installModelOverride(ctx);
         const getService = ctx.get;
@@ -124,6 +154,16 @@ export function apply(ctx, config) {
     });
     sp?.variable?.('time_anchor_card', ()=>buildTimeAnchor(new Date()).card);
     sp?.variable?.('motivation_brief', ()=>renderMotivationBrief(config.stateRoot ?? '.'));
+    sp?.variable?.('channel_routing_card', ()=>renderRoutingCard());
+    const noteChannel = async (channel, verdict)=>{
+        const ev = noteChannelVerdict(channel, verdict);
+        if (ev) await recordChannelEvent(config.stateRoot ?? '.', ev);
+    };
+    const routingField = (intent, excludeChannel)=>({
+            routing: routingAdvice(intent, {
+                excludeChannel
+            })
+        });
     installProcessGuards(config.stateRoot ?? '.', {
         uncaughtException: 'gotry-tools',
         unhandledRejection: 'gotry-tools'
@@ -145,14 +185,35 @@ export function apply(ctx, config) {
         }
         ctx.tools.register(t);
     };
+    const routed = (tool, desc)=>{
+        const head = toolRoutingHeadline(tool);
+        return head ? `${head}\n${desc}` : desc;
+    };
     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): ' + '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',
+                type: 'object',
+                additionalProperties: false,
                 required: true,
-                description: 'The full engine payload: { request, candidates }.'
+                properties: {
+                    request: {
+                        type: 'object',
+                        additionalProperties: true,
+                        required: true,
+                        description: '引擎请求:{ motivation weights, hard constraints, window, budget, home hubs }'
+                    },
+                    candidates: {
+                        type: 'array',
+                        items: {
+                            type: 'object',
+                            additionalProperties: true
+                        },
+                        required: true,
+                        description: '候选列表:[{ id, label, services, transfers, stay, minDays }]'
+                    }
+                }
             }
         },
         output: {
@@ -213,9 +274,29 @@ export function apply(ctx, config) {
         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',
+                type: 'object',
+                additionalProperties: false,
                 required: true,
-                description: '{ weights: {escape_rest: 0.7, ...}, evidence: [user quotes...], hard: {wake_not_before, min_arrival_energy_pct} }'
+                properties: {
+                    weights: {
+                        type: 'object',
+                        additionalProperties: true,
+                        description: '动机权重增量,如 { escape_rest: 0.7 }(可选,权重变更须伴新证据)'
+                    },
+                    evidence: {
+                        type: 'array',
+                        items: {
+                            type: 'string'
+                        },
+                        required: true,
+                        description: '本轮新事实的用户原话数组(P0:必带)'
+                    },
+                    hard: {
+                        type: 'object',
+                        additionalProperties: true,
+                        description: '硬约束:{ wake_not_before, min_arrival_energy_pct }(可选)'
+                    }
+                }
             }
         },
         output: {
@@ -269,7 +350,7 @@ export function apply(ctx, config) {
             entry: {
                 type: 'json',
                 required: true,
-                description: '{ name, reason?, conditions: { days, budget_cny, best_months }, muted?: boolean }'
+                description: '{ name, reason?, conditions: { days, budget_cny, best_months, channels? }, muted?: boolean }'
             }
         },
         output: {
@@ -312,12 +393,44 @@ export function apply(ctx, config) {
     }));
     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.',
+        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. ' + 'A wish whose conditions.channels names a channel that is currently down (out-of-band health facts) is vetoed for this recall — 不推当下走不通的憧憬. ' + '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?: "行程起始(确认成行时挂时间线)" }'
+            action: {
+                type: 'string',
+                description: 'recall(默认,召回下一次出发建议)或 confirm-outcome(确认某条建议成/不成)'
+            },
+            days: {
+                type: 'integer',
+                description: '回看天数窗(recall)'
+            },
+            budgetCny: {
+                type: 'number',
+                description: '预算上限(recall 过滤)'
+            },
+            month: {
+                type: 'integer',
+                description: '出行月份 1-12(recall)'
+            },
+            wishId: {
+                type: 'string',
+                description: 'confirm-outcome 目标愿望 id'
+            },
+            attribution: {
+                type: 'string',
+                enum: [
+                    'helpful',
+                    'harmful',
+                    'neutral'
+                ],
+                description: 'confirm-outcome 归因'
+            },
+            detail: {
+                type: 'string',
+                description: '一句话细节(用户原话)'
+            },
+            tripStart: {
+                type: 'string',
+                description: '确认成行时挂时间线的行程起始日'
             }
         },
         output: {
@@ -376,10 +489,18 @@ export function apply(ctx, config) {
             const pool = ledger.readWishPool();
             const candidates = pool.filter((e)=>!e.muted && typeof e.wish_id === 'string');
             const month = q.month ?? new Date().getMonth() + 1;
+            let channelDown;
+            try {
+                const latest = await readLatestChannelEvents(config.stateRoot);
+                const down = new Set();
+                for (const [ch, ev] of latest)if (ev.state === 'down') down.add(ch);
+                channelDown = down;
+            } catch  {}
             const match = pickNudgeWish(candidates, {
                 days: q.days,
                 budgetCny: q.budgetCny,
-                month
+                month,
+                channelDown
             });
             if (!match) {
                 return {
@@ -416,7 +537,59 @@ export function apply(ctx, config) {
                 card: 'generic',
                 title: '「下一次出发」召回',
                 kind: 'search',
-                rawInput: args.query
+                rawInput: args
+            })
+    }));
+    registerGuarded(defineTool({
+        name: 'gotry_turn_handoff_list',
+        description: 'List background deep-planning handoff tickets (read-only). Call this whenever the user asks about ' + 'a previously handed-off plan («规划好了吗» / «上次那个行程»): open = still being worked in the ' + 'background (ETA ' + '约 1 小时' + '), settled = deliverable ready (excerpt included, full text in the ' + 'ticket\'s .deliverable.md), failed = honest failure note. Never fabricate a deliverable that is not here.',
+        parameters: {
+            ticketId: {
+                type: 'string',
+                description: '只看这一单,如 th-...(缺省列全部)'
+            }
+        },
+        output: {
+            schema: {
+                type: 'json'
+            },
+            render: (_args, value)=>[
+                    {
+                        type: 'text',
+                        text: String(value.summary ?? '')
+                    }
+                ]
+        },
+        async execute (args, _exec) {
+            const q = interpretArgs(args);
+            const root = process.env.GOTRY_TURN_HANDOFF_ROOT ?? config.stateRoot ?? '.';
+            const all = await listTurnHandoffTickets(root);
+            const tickets = (q.ticketId ? all.filter((t)=>t.id === q.ticketId) : all).slice(0, 10);
+            if (tickets.length === 0) {
+                return {
+                    ok: true,
+                    count: 0,
+                    summary: q.ticketId ? `没有 id 为 ${q.ticketId} 的后台规划工单(可能已被清理或记错 id)` : '当前没有后台深度规划工单(无挂起、无历史)'
+                };
+            }
+            const lines = tickets.map((t)=>{
+                const head = `[${t.status}] ${t.id} ${t.objective.slice(0, 40)}`;
+                if (t.status === 'open') return `${head}——后台规划中,ETA ${t.etaLabel}`;
+                if (t.status === 'failed') return `${head}——失败:${t.error ?? '未知原因'}(请重新发起规划)`;
+                return `${head}——已交付,摘要:${(t.deliverableExcerpt ?? '').slice(0, 120).replace(/\n/g, ' ')}`;
+            });
+            return {
+                ok: true,
+                count: tickets.length,
+                tickets,
+                summary: `后台规划工单 ${tickets.length} 张:\n${lines.join('\n')}`
+            };
+        },
+        presentCall: (args)=>({
+                card: 'generic',
+                title: '后台规划工单查询',
+                kind: 'search',
+                rawInput: args
             })
     }));
     registerGuarded(defineTool({
@@ -424,9 +597,26 @@ export function apply(ctx, config) {
         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',
+                type: 'object',
+                additionalProperties: false,
                 required: true,
-                description: '{ label: "爸爸", constraints: { mobility?: "步行≤4h", health?: ["轻度高血压"], prefs?: ["怕吵"] }, evidence: "<用户原话>" }'
+                properties: {
+                    label: {
+                        type: 'string',
+                        required: true,
+                        description: '称呼,如 爸爸'
+                    },
+                    constraints: {
+                        type: 'object',
+                        additionalProperties: true,
+                        description: '{ mobility?: "步行≤4h", health?: ["轻度高血压"], prefs?: ["怕吵"] }'
+                    },
+                    evidence: {
+                        type: 'string',
+                        required: true,
+                        description: '用户原话(append-only 可溯源,P0)'
+                    }
+                }
             }
         },
         output: {
@@ -479,10 +669,31 @@ export function apply(ctx, config) {
         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',
+            destination: {
+                type: 'string',
+                required: true,
+                description: '目的地,如 大理'
+            },
+            start: {
+                type: 'string',
+                required: true,
+                description: '行程起始:YYYY-MM-DD 或绝对日期表达(解析不了 execute 结构化报错不猜)'
+            },
+            end: {
+                type: 'string',
+                description: '行程结束,形态同 start(可选)'
+            },
+            companions: {
+                type: 'array',
+                items: {
+                    type: 'string'
+                },
+                description: '同行人,如 ["爸爸"]'
+            },
+            evidence: {
+                type: 'string',
                 required: true,
-                description: '{ destination: "大理", start: "2025-10-01 或绝对日期表达", end?: 同上, companions?: ["爸爸"], evidence: "<用户原话>" }'
+                description: '用户原话(溯源 P0 红线)'
             }
         },
         output: {
@@ -497,7 +708,7 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = unwrapQuery(args, 'destination');
+            const q = args;
             if (!q.destination) return {
                 ok: false,
                 summary: 'destination 必填'
@@ -538,17 +749,29 @@ export function apply(ctx, config) {
                 card: 'generic',
                 title: '记录旅行',
                 kind: 'edit',
-                rawInput: args.query
+                rawInput: args
             })
     }));
     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. 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.',
+        description: routed('gotry_hotel_search', '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/adults. 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',
+            destination: {
+                type: 'string',
                 required: true,
-                description: '{ destination: "<目的地城市>", checkIn?: "YYYY-MM-DD 或自然表达(下周五/8.20)", checkOut?: 同上, occupancy?: { adults: 2 } }'
+                description: '目的地城市,如 大理'
+            },
+            checkIn: {
+                type: 'string',
+                description: '入住日:YYYY-MM-DD 或自然表达(下周五/8.20/下周五+3);解析不了降级无日期检索并记 date_notes'
+            },
+            checkOut: {
+                type: 'string',
+                description: 'checkOut 退房日:YYYY-MM-DD 或自然表达,形态同 checkIn'
+            },
+            adults: {
+                type: 'integer',
+                description: '成人数(顶层字段,默认 2)'
             }
         },
         output: {
@@ -563,7 +786,7 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = unwrapQuery(args, 'destination');
+            const q = args;
             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');
@@ -614,9 +837,9 @@ export function apply(ctx, config) {
         },
         presentCall: (args)=>({
                 card: 'generic',
-                title: `酒店搜索:${String(args.query?.destination ?? '')}`,
+                title: `酒店搜索:${args.destination ?? ''}`,
                 kind: 'search',
-                rawInput: args.query
+                rawInput: args
             }),
         presentResult: (_args, value)=>{
             const r = value;
@@ -680,12 +903,35 @@ export function apply(ctx, config) {
     }));
     registerGuarded(defineTool({
         name: 'gotry_weather_check',
-        description: 'Check weather for a destination: forecast (≤16 days) or historical climate (seasonality baseline). ' + 'Free Open-Meteo API, no key required. Input: place name (Chinese ok) or lat/lng. ' + 'Returns daily temp range, precipitation probability, weather code — with evidence chain tagging ' + '[实时API:open-meteo@ts]. Use to ground seasonal advice in real data instead of LLM guessing.',
+        description: routed('gotry_weather_check', 'Check weather for a destination: forecast (≤16 days) or historical climate (seasonality baseline). ' + 'Free Open-Meteo API, no key required. Input: place name (Chinese ok) or lat/lng. ' + 'Returns daily temp range, precipitation probability, weather code — with evidence chain tagging ' + '[实时API:open-meteo@ts]. Use to ground seasonal advice in real data instead of LLM guessing.'),
         parameters: {
-            query: {
-                type: 'json',
-                required: true,
-                description: '{ place: "<城市名>", month?: 8, mode?: "forecast"|"climate", days?: 7 }'
+            place: {
+                type: 'string',
+                description: '城市名(中文可),如 大理;与 lat/lng 二选一,都没给 execute 结构化报错'
+            },
+            lat: {
+                type: 'number',
+                description: '纬度(与 lng 成对;给了则跳过地理编码)'
+            },
+            lng: {
+                type: 'number',
+                description: '经度(与 lat 成对)'
+            },
+            month: {
+                type: 'integer',
+                description: '气候基线月份 1-12(mode=climate 或给了 month 未指 mode 时用)'
+            },
+            mode: {
+                type: 'string',
+                enum: [
+                    'forecast',
+                    'climate'
+                ],
+                description: '默认 forecast'
+            },
+            days: {
+                type: 'integer',
+                description: '预报天数(≤16,默认 7)'
             }
         },
         output: {
@@ -700,7 +946,7 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = unwrapQuery(args, 'place');
+            const q = args;
             const started = Date.now();
             let lat = q.lat, lng = q.lng;
             let placeLabel = q.place ?? `${q.lat},${q.lng}`;
@@ -760,13 +1006,13 @@ export function apply(ctx, config) {
         },
         presentCall: (args)=>({
                 card: 'generic',
-                title: `天气:${String(args.query?.place ?? '')}`,
+                title: `天气:${args.place ?? `${args.lat ?? ''},${args.lng ?? ''}`}`,
                 kind: 'fetch',
-                rawInput: args.query
+                rawInput: args
             }),
         presentResult: (args, value)=>{
             const r = value;
-            const place = String(args.query?.place ?? '');
+            const place = String(args.place ?? '');
             const failed = String(r.summary ?? '').includes('降级') || String(r.summary ?? '').includes('unavailable');
             return {
                 card: 'generic',
@@ -782,12 +1028,20 @@ export function apply(ctx, config) {
     }));
     registerGuarded(defineTool({
         name: 'gotry_flight_verify',
-        description: 'Verify whether a flight callsign is currently observable on the OpenSky ADS-B network. ' + 'Free anonymous API (~400 credits/day, 4 req/s burst). Three-valued semantics: ' + 'observed = strong positive (the aircraft is currently being broadcast); ' + 'not_observed = no conclusion (ADS-B coverage is limited by geography/altitude — ' + 'a missing signal does NOT disprove the flight); ' + 'unavailable = API failure, gracefully degraded. ' + 'Use to ground "is this flight actually flying right now?" in real data, complementing ' + 'the OpenFlights skeleton (historical connectivity) and the static flight pack (planned schedule).',
+        description: routed('gotry_flight_verify', 'Verify whether a flight callsign is currently observable on the OpenSky ADS-B network. ' + 'Free anonymous API (~400 credits/day, 4 req/s burst). Three-valued semantics: ' + 'observed = strong positive (the aircraft is currently being broadcast); ' + 'not_observed = no conclusion (ADS-B coverage is limited by geography/altitude — ' + 'a missing signal does NOT disprove the flight); ' + 'unavailable = API failure, gracefully degraded. ' + 'Use to ground "is this flight actually flying right now?" in real data, complementing ' + 'the OpenFlights skeleton (historical connectivity) and the static flight pack (planned schedule).'),
         parameters: {
-            query: {
-                type: 'json',
+            callsign: {
+                type: 'string',
                 required: true,
-                description: '{ callsign: "EK329", airport?: "OMDB", timeoutMs?: 10000 }'
+                description: '航班呼号,如 EK329'
+            },
+            airport: {
+                type: 'string',
+                description: '预期机场 IATA,如 OMDB(观测命中时展示)'
+            },
+            timeoutMs: {
+                type: 'integer',
+                description: '超时毫秒,默认 10000'
             }
         },
         output: {
@@ -802,7 +1056,7 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = unwrapQuery(args, 'callsign');
+            const q = args;
             const started = Date.now();
             if (!q.callsign) {
                 return JSON.parse(JSON.stringify({
@@ -838,19 +1092,48 @@ export function apply(ctx, config) {
         },
         presentCall: (args)=>({
                 card: 'generic',
-                title: `飞行校验:${String(args.query?.callsign ?? '')}`,
+                title: `飞行校验:${args.callsign ?? ''}`,
                 kind: 'fetch',
-                rawInput: args.query
+                rawInput: args
             })
     }));
     registerGuarded(defineTool({
         name: 'gotry_flyai_search',
-        description: 'Live travel search through the Fliggy official FlyAI channel (read-only, no key; booking/comparison happens by the HUMAN on the jumpUrl page). ' + 'kind="flight"|"train": { kind, from, to, date } (中文城市名, date YYYY-MM-DD) — real schedules & prices, split 直达/中转 in results. ' + 'kind="hotel": { kind:"hotel", to:"大理"(目的地中文), checkIn?, checkOut? (YYYY-MM-DD,成对可选——未定档期可不填先摸底), keyWords? }. ' + 'Hotel prices may be masked upstream (priceRaw like "¥7xx"): always present the mask as a range, and let the human open jumpUrl for the real price. ' + 'Evidence [实时API:flyai@ts]. Errors (rate-limit Sentinel / invalid dates) degrade as structured errors with the upstream message — surface them, never guess.',
+        description: routed('gotry_flyai_search', 'Live travel search through the Fliggy official FlyAI channel (read-only, no key; booking/comparison happens by the HUMAN on the jumpUrl page). ' + 'kind="flight"|"train": from/to 中文城市名 + date YYYY-MM-DD — real schedules & prices, split 直达/中转 in results. ' + 'kind="hotel": to=目的地中文(如 大理), checkIn/checkOut (YYYY-MM-DD,成对可选——未定档期可不填先摸底), keyWords?. ' + 'Hotel prices may be masked upstream (priceRaw like "¥7xx"): always present the mask as a range, and let the human open jumpUrl for the real price. ' + 'Evidence [实时API:flyai@ts]. verdict=needs-setup (anonymous trial quota exhausted, upstream 429) is a CONFIG issue, not a search failure: surface the setup hint once, do NOT retry this tool this session — switch to gotry_session_search or web search. ' + 'Errors (rate-limit Sentinel / invalid dates) degrade as structured errors with the upstream message — surface them, never guess.'),
         parameters: {
-            query: {
-                type: 'json',
+            kind: {
+                type: 'string',
+                enum: [
+                    'flight',
+                    'train',
+                    'hotel'
+                ],
                 required: true,
-                description: 'kind=flight|train: { kind, from: "上海", to: "丽江", date: "2026-10-01" }; kind="hotel": { kind:"hotel", to:"大理", checkIn?: "YYYY-MM-DD", checkOut?: "YYYY-MM-DD", keyWords?: "洱海" }'
+                description: '检索类型:flight 机票 / train 火车 / hotel 酒店'
+            },
+            from: {
+                type: 'string',
+                description: '出发城市中文,如 上海——kind=flight|train 必填'
+            },
+            to: {
+                type: 'string',
+                description: '到达城市中文,如 丽江;kind=hotel 时为目的地,如 大理(必填)'
+            },
+            date: {
+                type: 'string',
+                description: '出发日期 YYYY-MM-DD——kind=flight|train 必填,须为今天或未来'
+            },
+            checkIn: {
+                type: 'string',
+                description: '入住日期 YYYY-MM-DD,仅 kind=hotel;与 checkOut 成对可选(未定档期可不填先摸底)'
+            },
+            checkOut: {
+                type: 'string',
+                description: '退房日期 YYYY-MM-DD,仅 kind=hotel;与 checkIn 成对'
+            },
+            keyWords: {
+                type: 'string',
+                description: '酒店关键词,如 洱海——仅 kind=hotel 可选'
             }
         },
         output: {
@@ -865,7 +1148,7 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = unwrapQuery(args, 'from');
+            const q = args;
             if (q.kind === 'hotel') {
                 const dest = (q.to ?? '').trim();
                 if (!dest) return {
@@ -908,11 +1191,23 @@ export function apply(ctx, config) {
                 });
                 if (!itp.result) return declinedObservation('FLYAI_SEARCH', itp.trace);
                 const r = itp.result;
+                await noteChannel('flyai', r.verdict);
+                await appendFacts(config.stateRoot ?? '.', factsFromHotel({
+                    source: 'flyai-hotel',
+                    destination: dest,
+                    checkIn: q.checkIn,
+                    checkOut: q.checkOut,
+                    verdict: r.verdict,
+                    options: r.hotels?.length ?? 0,
+                    evidence: r.evidence,
+                    fetchedAt: new Date().toISOString()
+                }));
                 const top = (r.hotels ?? []).slice(0, 8).map((o)=>`${o.name}${o.star ? `(${o.star})` : ''} ${o.priceRaw ?? '价待询'}${o.poi ? ` · ${o.poi}` : ''}`);
-                const summary = r.verdict === 'hit' ? `${dest} 酒店(飞猪官方只读)前 ${top.length} 家(价格多为打码,真实价以 jumpUrl 为准):\n${top.join('\n')}\n${r.evidence}` : `${dest} 酒店无结果或失败:${r.error ?? 'miss'} ${r.evidence}`;
+                const summary = r.verdict === 'hit' ? `${dest} 酒店(飞猪官方只读)前 ${top.length} 家(价格多为打码,真实价以 jumpUrl 为准):\n${top.join('\n')}\n${r.evidence}` : r.verdict === 'needs-setup' ? `${dest} 酒店检索未发起(配置问题,非检索失败):${r.error ?? ''}\n${r.setup ?? ''}\n状态体检可调 gotry_doctor。${r.evidence}` : `${dest} 酒店无结果或失败:${r.error ?? 'miss'} ${r.evidence}`;
                 return JSON.parse(JSON.stringify({
                     ...r,
-                    summary
+                    summary,
+                    ...r.verdict !== 'hit' ? routingField('search-hotel', 'flyai') : {}
                 }));
             }
             const kind = q.kind === 'train' ? 'train' : 'flight';
@@ -943,6 +1238,7 @@ export function apply(ctx, config) {
             });
             if (!itp.result) return declinedObservation('FLYAI_SEARCH', itp.trace);
             const r = itp.result;
+            await noteChannel('flyai', r.verdict);
             const avMap = await loadAirlineAirportMap();
             await appendFacts(config.stateRoot ?? '.', factsFromFlyai({
                 kind,
@@ -952,21 +1248,22 @@ export function apply(ctx, config) {
             }, r, new Date().toISOString(), avMap?.city_alias));
             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 label = kind === 'flight' ? '机票' : '火车票';
-            const summary = r.verdict === 'hit' ? `${q.from}→${q.to} ${q.date} ${label}(飞猪官方只读)前 ${top.length} 条:\n${top.join('\n')}\n${r.evidence}` : r.verdict === 'miss' ? `${q.from}→${q.to} ${q.date} ${label}官方通道正常返回 0 条(常见原因:航线未开放/当日售罄)。${r.evidence}` : `${q.from}→${q.to} ${q.date} ${label}检索失败(可能限流/网络):${r.error ?? ''} ${r.evidence}`;
+            const summary = r.verdict === 'hit' ? `${q.from}→${q.to} ${q.date} ${label}(飞猪官方只读)前 ${top.length} 条:\n${top.join('\n')}\n${r.evidence}` : r.verdict === 'miss' ? `${q.from}→${q.to} ${q.date} ${label}官方通道正常返回 0 条(常见原因:航线未开放/当日售罄)。${r.evidence}` : r.verdict === 'needs-setup' ? `${q.from}→${q.to} ${q.date} ${label}检索未发起(配置问题,非检索失败):${r.error ?? ''}\n${r.setup ?? ''}\n状态体检可调 gotry_doctor。${r.evidence}` : `${q.from}→${q.to} ${q.date} ${label}检索失败(可能限流/网络):${r.error ?? ''} ${r.evidence}`;
             return JSON.parse(JSON.stringify({
                 ...r,
                 kind,
-                summary
+                summary,
+                ...r.verdict !== 'hit' ? routingField(kind === 'train' ? 'search-train' : 'search-flight', 'flyai') : {}
             }));
         },
         presentCall: (args)=>({
                 card: 'generic',
-                title: `官方检索:${String(args.query?.kind ?? 'flight')}`,
+                title: `官方检索:${args.kind}`,
                 kind: 'fetch',
-                rawInput: args.query
+                rawInput: args
             }),
         presentResult: (args, value)=>{
-            const isHotel = String(args.query?.kind) === 'hotel';
+            const isHotel = args.kind === 'hotel';
             const r = value;
             const n = Math.max((r.options ?? []).length, (r.hotels ?? []).length);
             return {
@@ -985,10 +1282,9 @@ export function apply(ctx, config) {
         name: 'gotry_session_login',
         description: 'Productized login bootstrap for the account session channel (call this when gotry_session_search returns needs-login — the user never needs a terminal). ' + 'AUTO-DETECTION FIRST: it reads ticket-cookie NAMES before anything else — if the user already logged in (on the external site) it confirms instantly WITHOUT opening any page. ' + 'OPENS the site login entry in the USER\'S OWN Chrome (foreground tab, left open for the user) and waits for the user to finish logging in on the external site. ' + 'GoTry NEVER collects, stores, or transmits credentials: no passwords, no SMS codes, no cookie values — it only checks the boolean fact "already logged in" (reads cookie NAMES only, zero values). ' + 'Transport: the GoTry Session Bridge browser extension (one-time install, ZERO Chrome system dialogs). ' + `verdict logged-in (tickets detected) | pending (login tab opened, user not done yet — offer to re-check later) | needs-extension (one-time extension install: the verdict surfaces the Chrome Web Store installUrl as a clickable link for dsh UI to render — installation is a browser concern, not gotry's). ` + 'Evidence [会话:<site>-login@ts].',
         parameters: {
-            query: {
-                type: 'json',
-                required: true,
-                description: '可空对象 {}: { waitSeconds?: number }(等待用户完成登录的上限秒数,默认 90,至多 300)'
+            waitSeconds: {
+                type: 'integer',
+                description: '等待用户完成登录的上限秒数,默认 90,至多 300;不传用默认'
             }
         },
         output: {
@@ -1004,9 +1300,14 @@ export function apply(ctx, config) {
         },
         async execute (args, _exec) {
             const q = unwrapQuery(args, 'waitSeconds');
-            const r = await sessionLogin({
-                waitMs: typeof q?.waitSeconds === 'number' ? q.waitSeconds * 1000 : undefined
+            const itpL = await interpretEffect({
+                effect: 'SESSION_LOGIN',
+                params: {
+                    waitSeconds: q?.waitSeconds
+                }
             });
+            if (!itpL.result) return declinedObservation('SESSION_LOGIN', itpL.trace);
+            const r = itpL.result;
             const summary = r.verdict === 'logged-in' ? `${r.site} 登录完成确认(票据 cookie 名已检出,只读名字)。说明:登录是在携程官网、用你自己的浏览器完成的——gotry 全程未接触任何密码/验证码/cookie 值。现在可以继续会话检索了。${r.evidence}` : r.verdict === 'pending' ? `登录入口已在你的 Chrome 打开;请在弹出的标签页里正常登录携程(登录由你在官网完成,不属于 gotry)。完成后说一声"继续",我再确认。gotry 只检查"是否已登录",永不收集你的账号信息。${r.evidence}` : r.verdict === 'needs-extension' ? `需要一次性安装 GoTry Session Bridge 浏览器扩展:这是浏览器的事,gotry 不弹面板不开剪贴板——请直接在 Chrome 应用商店一键装(add-to-chrome 自动更新)。storeUrl=${EXTENSION_STORE_URL}. 装好即生效,装完后告诉我「重试」即可。${r.evidence}` : r.verdict === 'needs-attach' ? `cdp 车道需要一次性开启你 Chrome 的远程调试开关:在你的 Chrome 地址栏打开 chrome://inspect/#remote-debugging 并打开开关,然后说一声"重试"(默认走扩展车道,无需此步)。${r.evidence}` : `登录引导未完成:${r.error ?? '未知原因'} ${r.evidence}`;
             return JSON.parse(JSON.stringify({
                 ...r,
@@ -1042,12 +1343,52 @@ export function apply(ctx, config) {
     }));
     registerGuarded(defineTool({
         name: 'gotry_session_search',
-        description: 'Search on the USER\'S OWN logged-in browser session (Ctrip flights today; the account channel, not an anonymous instance). ' + 'Consent gate: the FIRST call in a session asks the user via the runtime approval card; once granted it holds for the session, a refusal revokes it for the session (no repeat prompting). ' + 'Transport: GoTry Session Bridge browser extension (one-time install) — the agent side never talks to Chrome debugging, ZERO system dialogs; read-only by construction (the extension never issues requests; it only passively forwards the site\'s own search responses; 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 = call gotry_session_login (opens the Ctrip login entry in the user\'s own foreground tab — no terminal, no credentials through GoTry); ' + `needs-extension = one-time browser-extension install (Chrome Web Store one-click, installUrl is also surfaced as a clickable link in the verdict field for dsh UI to render) — the DEFAULT transport; cdp (chrome://inspect remote debugging) is a diagnostic fallback only via GOTRY_SESSION_TRANSPORT=cdp. ` + 'Rate-limited (≥30s between same-site calls; a challenged/timeout verdict means STOP — never retry, fall back to other tools).',
+        description: routed('gotry_session_search', 'Search on the USER\'S OWN browser session (Ctrip kind="flight"(default)/"hotel"; 12306 kind="train" — public query face, no login needed). ' + 'Consent gate: the FIRST call in a session asks the user via the runtime approval card; once granted it holds for the session, a refusal revokes it for the session (no repeat prompting). ' + 'Transport: GoTry Session Bridge browser extension (one-time install) — the agent side never talks to Chrome debugging, ZERO system dialogs; read-only by construction (the extension never issues requests; it only passively forwards the site\'s own search responses; agent NEVER touches credentials/captcha; on captcha it stops and returns challenged). ' + 'kind="flight": from/to 中文城市名 + date YYYY-MM-DD — sniffs the site search API for structured options. Evidence [会话:ctrip-flight@ts]. ' + 'kind="hotel": to=目的地中文, cityId? = the numeric city= in a hotels.ctrip.com list URL (web-search it when the destination is outside the built-in city table), checkIn?/checkOut? (YYYY-MM-DD), adults?; hotel prices are the user\'s real logged-in prices. Evidence [会话:ctrip-hotel@ts]. ' + 'kind="train": from/to/date(YYYY-MM-DD) + fromStationTelecode?/toStationTelecode? (three-letter codes in the kyfw query URL, for cities outside the built-in table) — 12306 left-ticket query (public face): train codes, times, durations, seat availability; the list API carries NO prices (prices live on the 12306 page). Evidence [会话:train-12306@ts]. ' + 'verdict needs-login = call gotry_session_login (opens the Ctrip login entry in the user\'s own foreground tab — no terminal, no credentials through GoTry); ' + `needs-extension = one-time browser-extension install (Chrome Web Store one-click, installUrl is also surfaced as a clickable link in the verdict field for dsh UI to render) — the DEFAULT transport; cdp (chrome://inspect remote debugging) is a diagnostic fallback only via GOTRY_SESSION_TRANSPORT=cdp. ` + 'Rate-limited (≥30s between same-site calls; a challenged/timeout verdict means STOP — never retry, fall back to other tools).'),
         parameters: {
-            query: {
-                type: 'json',
-                required: true,
-                description: '{ from: "上海", to: "丽江", date: "2026-10-01" }'
+            kind: {
+                type: 'string',
+                enum: [
+                    'flight',
+                    'hotel',
+                    'train'
+                ],
+                description: '默认 flight 机票;hotel 携程酒店(用户登录态真实价);train 12306 余票(公开面)'
+            },
+            from: {
+                type: 'string',
+                description: '出发城市中文(词表内),如 上海——kind=flight|train 必填'
+            },
+            to: {
+                type: 'string',
+                description: '到达城市中文——kind=flight|train 必填;kind=hotel 时为目的地(必填)'
+            },
+            date: {
+                type: 'string',
+                description: '出发日期 YYYY-MM-DD——kind=flight|train 必填,须为今天或未来'
+            },
+            cityId: {
+                type: 'integer',
+                description: '携程酒店 city= 数字,仅 kind=hotel;目的地码表外时 web 搜 hotels.ctrip.com list URL 取 city='
+            },
+            checkIn: {
+                type: 'string',
+                description: '入住日 YYYY-MM-DD,仅 kind=hotel 可选'
+            },
+            checkOut: {
+                type: 'string',
+                description: '退房日 YYYY-MM-DD,仅 kind=hotel 可选'
+            },
+            adults: {
+                type: 'integer',
+                description: '成人数,仅 kind=hotel 可选'
+            },
+            fromStationTelecode: {
+                type: 'string',
+                description: '出发站三位电报码,仅 kind=train;城市码表外时填(kyfw 查询页 URL 里)'
+            },
+            toStationTelecode: {
+                type: 'string',
+                description: '到达站三位电报码,仅 kind=train,同上'
             }
         },
         output: {
@@ -1062,11 +1403,90 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = unwrapQuery(args, 'from');
+            const q = unwrapQuery(args);
+            if (q.kind === 'train') {
+                if (!q.from || !q.to || !q.date) {
+                    return {
+                        ok: false,
+                        summary: 'kind=train 需要 from/to(中文城市/车站名)与 date(YYYY-MM-DD);城市电报码表外带 fromStationTelecode/toStationTelecode(kyfw 查询页 URL 里的三位码)'
+                    };
+                }
+                const nowT = new Date();
+                const todayT = `${nowT.getFullYear()}-${String(nowT.getMonth() + 1).padStart(2, '0')}-${String(nowT.getDate()).padStart(2, '0')}`;
+                if (q.date < todayT) {
+                    return JSON.parse(JSON.stringify({
+                        ok: false,
+                        verdict: 'error',
+                        summary: `未发起查询:日期 ${q.date} 已是过去(今天 ${todayT}),过去不存在在售火车票。向用户确认日期后再查。`
+                    }));
+                }
+                const itpT = await interpretEffect({
+                    effect: 'SESSION_TRAIN_SEARCH',
+                    params: {
+                        from: q.from,
+                        to: q.to,
+                        date: q.date,
+                        fromStationTelecode: q.fromStationTelecode,
+                        toStationTelecode: q.toStationTelecode,
+                        auditPath: join(config.stateRoot ?? '.', 'gotry-state', 'session-incidents.jsonl')
+                    }
+                });
+                if (!itpT.result) return declinedObservation('SESSION_TRAIN_SEARCH', itpT.trace);
+                const rT = itpT.result;
+                await noteChannel('session:12306-train', rT.verdict);
+                const topT = (rT.trains ?? []).slice(0, 10).map((t)=>`${t.trainCode} ${t.depTime}→${t.arrTime} 历时${Math.round(t.durationMin / 60 * 10) / 10}h ${t.canWebBuy === 'Y' ? '可订' : t.canWebBuy}${Object.entries(t.seats).filter(([, v])=>v && v !== '--' && v !== '无').slice(0, 3).map(([k, v])=>`${k}:${v}`).join(' ')}`);
+                const summaryT = rT.verdict === 'hit' ? `${q.from}→${q.to} ${q.date} 余票(12306 公开查询面,${(rT.trains ?? []).length} 趟)前 ${topT.length} 条(列表接口不含票价,票价以 12306 落地页为准):\n${topT.join('\n')}\n${rT.evidence}` : rT.verdict === 'cooldown' ? `会话火车检索节律闸冷却中(两次会话检索需 ≥30s 间隔)——稍候重试或先用其他工具推进。${rT.evidence}` : `会话火车检索未取回(${rT.verdict}):${rT.error ?? ''} ${rT.evidence}`;
+                return JSON.parse(JSON.stringify({
+                    ...rT,
+                    summary: summaryT,
+                    ...rT.verdict !== 'hit' ? routingField('search-train', 'session:12306-train') : {}
+                }));
+            }
+            if (q.kind === 'hotel') {
+                if (!q.to) {
+                    return {
+                        ok: false,
+                        summary: 'kind=hotel 需要 to(目的地中文;城市码表外带 cityId=携程酒店 list 页 URL 里的 city= 数字)'
+                    };
+                }
+                const itp = await interpretEffect({
+                    effect: 'SESSION_HOTEL_SEARCH',
+                    params: {
+                        to: q.to,
+                        cityId: q.cityId,
+                        checkIn: q.checkIn,
+                        checkOut: q.checkOut,
+                        adults: q.adults,
+                        auditPath: join(config.stateRoot ?? '.', 'gotry-state', 'session-incidents.jsonl')
+                    }
+                });
+                if (!itp.result) return declinedObservation('SESSION_HOTEL_SEARCH', itp.trace);
+                const r = itp.result;
+                await noteChannel('session:ctrip-hotel', r.verdict);
+                if (r.verdict === 'hit' || r.verdict === 'miss') {
+                    await appendFacts(config.stateRoot ?? '.', factsFromHotel({
+                        source: 'session:ctrip-hotel',
+                        destination: q.to ?? '',
+                        checkIn: q.checkIn,
+                        checkOut: q.checkOut,
+                        verdict: r.verdict,
+                        options: r.hotels?.length ?? 0,
+                        evidence: r.evidence,
+                        fetchedAt: new Date().toISOString()
+                    }));
+                }
+                const top = (r.hotels ?? []).slice(0, 8).map((h)=>`${h.name}${h.star ? `(${h.star}星)` : ''} ${h.priceRaw ?? (h.price > 0 ? `¥${h.price}` : '价待询')}${h.score ? ` 评分${h.score}` : ''}`);
+                const summary = r.verdict === 'hit' ? `${q.to} 酒店(携程,用户本人登录态,真实价)前 ${top.length} 家(预订以 jumpUrl 落地页为准):\n${top.join('\n')}\n${r.evidence}` : r.verdict === 'cooldown' ? `会话酒店检索节律闸冷却中(两次会话检索需 ≥30s 间隔)——稍候重试或先用其他工具推进。${r.evidence}` : `会话酒店检索未取回(${r.verdict}):${r.error ?? ''} ${r.evidence}`;
+                return JSON.parse(JSON.stringify({
+                    ...r,
+                    summary,
+                    ...r.verdict !== 'hit' ? routingField('search-hotel', 'session:ctrip-hotel') : {}
+                }));
+            }
             if (!q.from || !q.to || !q.date) {
                 return {
                     ok: false,
-                    summary: '需要 from/to(中文城市名,词表内)与 date(YYYY-MM-DD)'
+                    summary: '需要 from/to(中文城市名,词表内)与 date(YYYY-MM-DD);酒店/火车检索分别用 kind=hotel / kind=train'
                 };
             }
             const itp = await interpretEffect({
@@ -1080,6 +1500,7 @@ export function apply(ctx, config) {
             });
             if (!itp.result) return declinedObservation('SESSION_FLIGHT_SEARCH', itp.trace);
             const r = itp.result;
+            await noteChannel('session:ctrip-flight', r.verdict);
             const avMapS = await loadAirlineAirportMap();
             await appendFacts(config.stateRoot ?? '.', factsFromSession({
                 origin: q.from,
@@ -1090,19 +1511,25 @@ export function apply(ctx, config) {
             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
+                summary,
+                ...r.verdict !== 'hit' ? routingField('search-flight', 'session:ctrip-flight') : {}
             }));
         },
-        presentCall: (args)=>({
+        presentCall: (args)=>{
+            const callTitle = args.kind === 'hotel' ? `会话酒店:${args.to ?? ''}` : args.kind === 'train' ? `会话火车:${args.from ?? ''}` : `会话检索:${args.from ?? ''}`;
+            return {
                 card: 'generic',
-                title: `会话检索:${String(args.query?.from ?? '')}`,
+                title: callTitle,
                 kind: 'fetch',
-                rawInput: args.query
-            }),
-        presentResult: (_args, value)=>{
+                rawInput: args
+            };
+        },
+        presentResult: (args, value)=>{
             const r = value;
+            const isHotel = args.kind === 'hotel';
+            const n = Math.max((r.options ?? []).length, (r.hotels ?? []).length);
             const needsExt = r.verdict === 'needs-extension';
-            const label = r.verdict === 'hit' ? `会话 ${r.options.length} 条` : r.verdict === 'needs-login' ? '需登录' : needsExt ? '🧩 需装 GoTry Session Bridge 扩展(浏览器商店一键装,自动更新)' : r.verdict ?? '降级';
+            const label = r.verdict === 'hit' ? `会话 ${n} 条` : r.verdict === 'needs-login' ? '需登录' : needsExt ? '🧩 需装 GoTry Session Bridge 扩展(浏览器商店一键装,自动更新)' : r.verdict ?? '降级';
             const content = [
                 {
                     type: 'text',
@@ -1113,21 +1540,38 @@ export function apply(ctx, config) {
                 type: 'text',
                 text: `安装链接:${r.installUrl}`
             });
+            const face = args.kind === 'hotel' ? '会话酒店' : args.kind === 'train' ? '会话火车' : '会话检索';
             return {
                 card: 'generic',
-                title: `会话检索:${label}`,
+                title: `${face}:${label}`,
                 content
             };
         }
     }));
     registerGuarded(defineTool({
         name: 'gotry_anything_search',
-        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).',
+        description: routed('gotry_anything_search', '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',
+            keyword: {
+                type: 'string',
                 required: true,
-                description: '{ keyword: "<搜索关键词>", contentType?: "city"|"hotel", parentDestinationId?: "?", timeoutMs?: 12000 }'
+                description: '搜索关键词'
+            },
+            contentType: {
+                type: 'string',
+                enum: [
+                    'city',
+                    'hotel'
+                ],
+                description: '内容类型(缺省由上游推断)'
+            },
+            parentDestinationId: {
+                type: 'string',
+                description: '父目的地 id(上游形态)'
+            },
+            timeoutMs: {
+                type: 'integer',
+                description: '超时毫秒,默认 12000'
             }
         },
         output: {
@@ -1142,7 +1586,8 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = unwrapQuery(args, 'keyword');
+            const q = args;
+            const rawQuery = String(q.keyword ?? '');
             const started = Date.now();
             if (!q.keyword) {
                 return JSON.parse(JSON.stringify({
@@ -1152,7 +1597,12 @@ export function apply(ctx, config) {
                     evidence: '[hbcli-anything@error] empty'
                 }));
             }
-            const r = await anythingSearch(q);
+            const itpA = await interpretEffect({
+                effect: 'ANYTHING_SEARCH',
+                params: q
+            });
+            if (!itpA.result) return declinedObservation('ANYTHING_SEARCH', itpA.trace);
+            const r = itpA.result;
             const dir = await ensureStateDir(config.stateRoot);
             await recordLatency(join(dir, 'bridge-latency.jsonl'), Date.now() - started, `anything:${r.via}`).catch(()=>{});
             const top5 = (r.hits ?? []).slice(0, 5);
@@ -1171,9 +1621,9 @@ export function apply(ctx, config) {
         },
         presentCall: (args)=>({
                 card: 'generic',
-                title: `Anything search:${String(args.query?.keyword ?? '')}`,
+                title: `Anything search:${args.keyword ?? ''}`,
                 kind: 'search',
-                rawInput: args.query
+                rawInput: args
             }),
         presentResult: (_args, value)=>{
             const r = value;
@@ -1192,12 +1642,16 @@ export function apply(ctx, config) {
     }));
     registerGuarded(defineTool({
         name: 'gotry_web_search',
-        description: 'Read any public URL as markdown (Jina Reader, free, no key). ' + 'Use as the "last mile" web reader when hotel-be Anything or gotry tools lack the answer. ' + 'NOT a general-purpose search engine — only fetches a URL you already know. ' + 'Three-valued: ok / error(非法 URL/超时)/not-reachable(r.jina.ai 不可用).' + 'Contract with gotry capabilities/anything.ts: 同构(L4 证据链 + 降级不阻塞 + 三值)。',
+        description: routed('gotry_web_search', 'Read any public URL as markdown (Jina Reader, free, no key). ' + 'Use as the "last mile" web reader when hotel-be Anything or gotry tools lack the answer. ' + 'NOT a general-purpose search engine — only fetches a URL you already know. ' + 'Three-valued: ok / error(非法 URL/超时)/not-reachable(r.jina.ai 不可用).' + 'Contract with gotry capabilities/anything.ts: 同构(L4 证据链 + 降级不阻塞 + 三值)。'),
         parameters: {
-            query: {
-                type: 'json',
+            url: {
+                type: 'string',
                 required: true,
-                description: '{ url: "https://example.com", timeoutMs?: 20000 }'
+                description: '完整 URL,https://…'
+            },
+            timeoutMs: {
+                type: 'integer',
+                description: '超时毫秒,默认 20000'
             }
         },
         output: {
@@ -1212,7 +1666,7 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = unwrapQuery(args, 'url');
+            const q = args;
             const started = Date.now();
             if (!q.url) {
                 return JSON.parse(JSON.stringify({
@@ -1221,10 +1675,15 @@ export function apply(ctx, config) {
                     evidence: '[agent-reach:error] empty url'
                 }));
             }
-            const r = await readUrl({
-                url: q.url,
-                timeoutMs: q.timeoutMs
+            const itpW = await interpretEffect({
+                effect: 'WEB_READ',
+                params: {
+                    url: q.url,
+                    timeoutMs: q.timeoutMs
+                }
             });
+            if (!itpW.result) return declinedObservation('WEB_READ', itpW.trace);
+            const r = itpW.result;
             const dir = await ensureStateDir(config.stateRoot);
             await recordLatency(join(dir, 'bridge-latency.jsonl'), Date.now() - started, `agent-reach:${r.via}`).catch(()=>{});
             const summary = r.ok ? `${q.url} → ${r.title ?? '(no title)'} (${r.latencyMs}ms)\n${r.evidence}\n---\n${r.content?.slice(0, 600) ?? ''}` : `${q.url} → unavailable (${r.error})\n${r.evidence}`;
@@ -1241,19 +1700,23 @@ export function apply(ctx, config) {
         },
         presentCall: (args)=>({
                 card: 'generic',
-                title: `读网页:${String(args.query?.url ?? '')}`,
+                title: `读网页:${args.url ?? ''}`,
                 kind: 'fetch',
-                rawInput: args.query
+                rawInput: args
             })
     }));
     registerGuarded(defineTool({
         name: 'gotry_video_subtitle',
         description: 'Extract subtitles from a YouTube/Bilibili video (yt-dlp, optional tool). ' + 'If yt-dlp is installed on this machine, returns the subtitle text (vtt, zh-Hans/zh/en preference). ' + 'If NOT installed, degrades gracefully with install instructions — never blocks. ' + 'Evidence chain: [agent-reach:yt-dlp@ts] / [@not-installed@ts].',
         parameters: {
-            query: {
-                type: 'json',
+            url: {
+                type: 'string',
                 required: true,
-                description: '{ url: "https://www.youtube.com/watch?v=...", lang?: "zh-Hans,zh,en" }'
+                description: '视频页 URL(youtube 等)'
+            },
+            lang: {
+                type: 'string',
+                description: '字幕语言优先级,如 zh-Hans,zh,en'
             }
         },
         output: {
@@ -1268,17 +1731,22 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = unwrapQuery(args, 'url');
+            const q = args;
             if (!q.url) {
                 return JSON.parse(JSON.stringify({
                     ok: false,
                     summary: 'url 必填'
                 }));
             }
-            const r = await videoSubtitle({
-                url: q.url,
-                lang: q.lang
+            const itpV = await interpretEffect({
+                effect: 'VIDEO_SUBTITLE',
+                params: {
+                    url: q.url,
+                    lang: q.lang
+                }
             });
+            if (!itpV.result) return declinedObservation('VIDEO_SUBTITLE', itpV.trace);
+            const r = itpV.result;
             const summary = r.verdict === 'found' ? `${q.url} 字幕提取成功 (${r.latencyMs}ms)\n${r.evidence}\n---\n${(r.subtitles ?? '').slice(0, 800)}` : r.verdict === 'not-installed' ? `yt-dlp 未安装。${r.stderr}\n${r.evidence}` : `${q.url} 字幕提取失败(${r.verdict})\n${r.evidence}`;
             return JSON.parse(JSON.stringify({
                 ok: r.ok,
@@ -1292,9 +1760,9 @@ export function apply(ctx, config) {
         },
         presentCall: (args)=>({
                 card: 'generic',
-                title: `视频字幕:${String(args.query?.url ?? '')}`,
+                title: `视频字幕:${args.url ?? ''}`,
                 kind: 'fetch',
-                rawInput: args.query
+                rawInput: args
             })
     }));
     registerGuarded(defineTool({
@@ -1302,9 +1770,13 @@ export function apply(ctx, config) {
         description: 'Search GitHub repositories (gh CLI, optional tool). ' + 'If gh is installed and authenticated, returns repos with name/description/stars/url. ' + 'If NOT installed, degrades with install instructions — never blocks. ' + 'Evidence chain: [agent-reach:gh@ts] / [@not-installed@ts].',
         parameters: {
             query: {
-                type: 'json',
+                type: 'string',
                 required: true,
-                description: '{ query: "agent-reach", limit?: 5 }'
+                description: 'GitHub 搜索关键词,如 agent-reach'
+            },
+            limit: {
+                type: 'integer',
+                description: '结果数上限,默认 5'
             }
         },
         output: {
@@ -1319,17 +1791,22 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = unwrapQuery(args, 'query');
+            const q = args;
             if (!q.query) {
                 return JSON.parse(JSON.stringify({
                     ok: false,
                     summary: 'query 必填'
                 }));
             }
-            const r = await githubSearch({
-                query: q.query,
-                limit: q.limit
+            const itpG = await interpretEffect({
+                effect: 'GITHUB_SEARCH',
+                params: {
+                    query: q.query,
+                    limit: q.limit
+                }
             });
+            if (!itpG.result) return declinedObservation('GITHUB_SEARCH', itpG.trace);
+            const r = itpG.result;
             const summary = r.verdict === 'found' ? `${q.query} → ${r.repos?.length ?? 0} repos\n${(r.repos ?? []).map((x, i)=>`  ${i + 1}. ${x.name} ★${x.stars ?? '?'} — ${(x.description ?? '').slice(0, 60)}`).join('\n')}\n${r.evidence}` : r.verdict === 'not-installed' ? `gh 未安装。${r.stderr}\n${r.evidence}` : `${q.query} 搜索失败(${r.verdict})\n${r.evidence}`;
             return JSON.parse(JSON.stringify({
                 ok: r.ok,
@@ -1343,19 +1820,34 @@ export function apply(ctx, config) {
         },
         presentCall: (args)=>({
                 card: 'generic',
-                title: `GitHub 搜索:${String(args.query?.query ?? '')}`,
+                title: `GitHub 搜索:${args.query ?? ''}`,
                 kind: 'search',
-                rawInput: args.query
+                rawInput: args
             })
     }));
     registerGuarded(defineTool({
         name: 'gotry_agent_reach',
         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',
-                required: true,
-                description: '{ action: "status" } 或 { action: "reach", channel: "<上游渠道名,如 web/v2ex/xueqiu>", method: "<上游方法名,如 read/get_hot_topics/get_stock_quote>", args?: "<空格分隔参数>" }'
+            action: {
+                type: 'string',
+                description: 'status(默认,无 channel 时)或 reach'
+            },
+            channel: {
+                type: 'string',
+                description: '上游渠道名,如 web/v2ex/xueqiu(action=reach 时)'
+            },
+            method: {
+                type: 'string',
+                description: '上游方法名,如 read/get_hot_topics/get_stock_quote'
+            },
+            args: {
+                type: 'string',
+                description: '空格分隔参数'
+            },
+            timeoutMs: {
+                type: 'integer',
+                description: '超时毫秒'
             }
         },
         output: {
@@ -1370,13 +1862,24 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = unwrapQuery(args, 'channel');
+            const q = unwrapQuery(args);
             const started = Date.now();
             const dir = await ensureStateDir(config.stateRoot);
+            const itpAR = await interpretEffect({
+                effect: 'AGENT_REACH',
+                params: {
+                    action: q.action,
+                    channel: q.channel,
+                    method: q.method,
+                    args: q.args,
+                    timeoutMs: q.timeoutMs
+                }
+            });
+            if (!itpAR.result) return declinedObservation('AGENT_REACH', itpAR.trace);
             if (q.action === 'status' || !q.action && !q.channel) {
-                const st = await reachStatus(q.timeoutMs);
+                const st = itpAR.result;
                 await recordLatency(join(dir, 'bridge-latency.jsonl'), Date.now() - started, 'agent-reach:doctor').catch(()=>{});
-                const summary = st.via === 'agent-reach-cli' ? `Agent Reach doctor(上游 CLI,原样透传):\n${st.output}\n${st.evidence}` : `Agent Reach 未装:\n${st.output}\n${st.evidence}`;
+                const summary = st.via === 'agent-reach-cli' ? `Agent Reach doctor(上游 CLI,原样透传):\n${st.output}\n${st.evidence}` : `Agent Reach 未装配(.venv 缺失)——可选依赖,机/酒/网页社媒读取之外的工具不受影响。\n补装:终端跑 npx gotry doctor --fix;整体依赖状态可调 gotry_doctor 工具查看。\n${st.evidence}`;
                 return JSON.parse(JSON.stringify({
                     ok: st.ok,
                     via: st.via,
@@ -1392,12 +1895,7 @@ export function apply(ctx, config) {
                     summary: 'channel 与 method 必填(或 action=status);清单可先随便调一次,inventory 会带回上游渠道/方法表'
                 }));
             }
-            const r = await reach({
-                channel: q.channel,
-                method: q.method,
-                args: q.args,
-                timeoutMs: q.timeoutMs
-            });
+            const r = itpAR.result;
             const dataStr = (v)=>{
                 if (Array.isArray(v)) {
                     const kept = [];
@@ -1416,7 +1914,7 @@ export function apply(ctx, config) {
             };
             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}`;
+            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整体依赖状态可调 gotry_doctor 查看;补装: npx gotry doctor --fix\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({
                 ok: r.ok,
                 channel: r.channel,
@@ -1432,13 +1930,13 @@ export function apply(ctx, config) {
         },
         presentCall: (args)=>({
                 card: 'generic',
-                title: `Agent Reach:${String(args.query?.channel ?? '')}.${String(args.query?.method ?? 'status')}`,
+                title: `Agent Reach:${String(args.channel ?? '')}.${String(args.method ?? 'status')}`,
                 kind: 'fetch',
-                rawInput: args.query
+                rawInput: args
             }),
         presentResult: (args, value)=>{
             const r = value;
-            const q = args.query ?? {};
+            const q = args ?? {};
             const icon = r.verdict === 'found' ? '✅' : r.verdict === 'needs-setup' ? '🔧' : r.verdict === 'not-installed' ? '📦' : '❌';
             return {
                 card: 'generic',
@@ -1452,14 +1950,81 @@ export function apply(ctx, config) {
             };
         }
     }));
+    registerGuarded(defineTool({
+        name: 'gotry_doctor',
+        description: 'Check optional-dependency health for ALL gotry tools (read-only, never installs): GoTry Session Bridge extension / Agent Reach (.venv) / hbcli (hotel realtime) / FlyAI key + recent trial-quota exhaustion time / dsh-calendar mount state / dsh-better-sidebar. ' + 'Call this when ANY gotry tool returns not-installed / needs-setup, when the user asks 「体检/依赖状态/工具为什么不可用」, or BEFORE leaning on a channel for a plan. ' + 'Returns per-item status (ok/degraded/missing) with exact fix commands. ' + 'Repair = `npx gotry doctor --fix` run BY THE USER in a terminal (this tool never installs anything); LLM keys are the dsh host\'s business and are deliberately out of scope. ' + 'A markdown report is rendered for the workspace (gotry-state/doctor-report.md) so the sidebar workbench can preview it.',
+        parameters: {
+            writeReport: {
+                type: 'boolean',
+                description: '默认 true,把 markdown 报告写进 gotry-state/doctor-report.md(侧栏工作台可预览)'
+            }
+        },
+        output: {
+            schema: {
+                type: 'json'
+            },
+            render: (_args, value)=>[
+                    {
+                        type: 'text',
+                        text: String(value.summary ?? JSON.stringify(value).slice(0, 900))
+                    }
+                ]
+        },
+        async execute (args, _exec) {
+            const q = unwrapQuery(args, 'writeReport');
+            const report = await runDoctorChecks({
+                stateRoot: config.stateRoot ?? '.'
+            });
+            let reportPath;
+            if (q?.writeReport !== false) {
+                try {
+                    const { writeFile } = await import('node:fs/promises');
+                    const dir = await ensureStateDir(config.stateRoot);
+                    reportPath = join(dir, 'doctor-report.md');
+                    await writeFile(reportPath, renderDoctorReportMd(report), 'utf-8');
+                } catch  {
+                    reportPath = undefined;
+                }
+            }
+            const icon = (s)=>s === 'ok' ? '✅' : s === 'degraded' ? '⚠️' : '❌';
+            const lines = report.items.map((i)=>`${icon(i.status)} ${i.label}:${i.detail}${i.fix ? `\n   ↳ 修复: ${i.fix}` : ''}`);
+            const summary = `${report.summary}\n${lines.join('\n')}${reportPath ? `\n报告已写: ${reportPath}(侧栏工作台可直接预览)` : '\n(报告写盘失败,仅本对话展示)'}`;
+            return JSON.parse(JSON.stringify({
+                ok: true,
+                verdict: report.ok ? 'all-clear' : 'needs-attention',
+                items: report.items,
+                report_path: reportPath,
+                evidence: `[doctor@${new Date().toISOString()}]`,
+                summary
+            }));
+        },
+        presentCall: (_args)=>({
+                card: 'generic',
+                title: '🩺 依赖体检',
+                kind: 'execute',
+                rawInput: {}
+            }),
+        presentResult: (_args, value)=>{
+            const r = value;
+            return {
+                card: 'generic',
+                title: `🩺 依赖体检:${r.verdict === 'all-clear' ? '✅ 全部就绪' : '🔧 有项待处理'}`,
+                content: [
+                    {
+                        type: 'text',
+                        text: String(r.summary ?? '')
+                    }
+                ]
+            };
+        }
+    }));
     registerGuarded(defineTool({
         name: 'gotry_artifacts_list',
         description: 'List GoTry artifacts — deep-planning deliverables (async runs from the state ledger) plus agent-written markdown files ' + 'in the working directory (trip plans etc.). READ-ONLY discovery. ' + 'Use when the user asks to see/open/revisit a previously generated artifact ' + '(「看看刚才生成的行程」「上次的规划在哪」「打开那个 md」) — list first, then read with gotry_artifacts_read.',
         parameters: {
-            query: {
-                type: 'json',
-                required: true,
-                description: '{ limit?: 20 }'
+            limit: {
+                type: 'integer',
+                description: '最多返回条数,默认 20'
             }
         },
         output: {
@@ -1512,10 +2077,18 @@ export function apply(ctx, config) {
         name: 'gotry_artifacts_read',
         description: 'Read one GoTry artifact as a line-numbered file view rendered directly in the chat UI. ' + 'Input: the path from gotry_artifacts_list, or a bare async ticket id (e.g. dp-xxxx). ' + 'Optional offset (1-based) / limit window for paging large files. ' + 'READ-ONLY; text artifacts only (md/txt/json/jsonl/csv/log/yaml).',
         parameters: {
-            query: {
-                type: 'json',
+            path: {
+                type: 'string',
                 required: true,
-                description: '{ path: "<list 返回的路径或工单 id>", offset?: 1, limit?: 400 }'
+                description: 'list 返回的路径或工单 id'
+            },
+            offset: {
+                type: 'integer',
+                description: '起始行号(1 起)'
+            },
+            limit: {
+                type: 'integer',
+                description: '窗口行数,默认 400'
             }
         },
         output: {
@@ -1530,7 +2103,8 @@ export function apply(ctx, config) {
                 ]
         },
         async execute (args, _exec) {
-            const q = unwrapQuery(args, 'path');
+            const q = args;
+            if (!q.path) throw new Error('gotry_artifacts_read requires path');
             if (!q.path) return JSON.parse(JSON.stringify({
                 ok: false,
                 error: 'path 必填(来自 gotry_artifacts_list)'
@@ -1549,9 +2123,9 @@ export function apply(ctx, config) {
         },
         presentCall: (args)=>({
                 card: 'generic',
-                title: `读产物:${String(args.query?.path ?? '')}`,
+                title: `读产物:${args.path ?? ''}`,
                 kind: 'read',
-                rawInput: args.query
+                rawInput: args
             }),
         presentResult: (_args, value)=>{
             const r = value;
@@ -1588,10 +2162,22 @@ export function apply(ctx, config) {
         name: 'gotry_fact_gate',
         description: 'Factuality gate for itinerary artifacts (issue #46): call BEFORE delivering any artifact that contains bookable facts ' + '(flight numbers, times, airports, prices, visa/entry policies). Every bookable claim in the markdown is checked against ' + 'the session fact registry (exact-date tool results recorded by gotry_flyai_search / gotry_session_search — hit AND miss). ' + 'Blocked when: a claimed flight is absent from the exact-date source (never backfill from route pages/history/adjacent dates); ' + 'route+date never queried; times contradict the snapshot; carrier→airport mapping conflicts (FD=DMK vs VZ=BKK are NOT interchangeable); ' + '「联程」without protected_connection=true; policy claims without 「截至 YYYY-MM-DD」; unconditional ✓ on unverified claims. ' + 'Optional itinerary object enables machine invariants (hotel_nights + onboard_nights = total nights, O&D segments vs flight legs, ' + 'budget floor ≥ sum of item minimums). verdict=blocked ⇒ fix or downgrade wording — never present as a verified plan.',
         parameters: {
-            query: {
-                type: 'json',
-                required: true,
-                description: '{ markdown?: "<产物全文>", path?: "<产物路径(artifacts_list 返回的)>— 二选一", tripYear?: 2027, itinerary?: { trip_start, trip_end, stays: [{place,check_in,check_out}], onboard_nights, od_segments: [{from,to,date,mode,legs}], budget_items: [{label,min_cny,max_cny}], claimed_floor_cny? } }'
+            markdown: {
+                type: 'string',
+                description: '产物全文;与 path 二选一'
+            },
+            path: {
+                type: 'string',
+                description: '产物路径(artifacts_list 返回的);与 markdown 二选一'
+            },
+            tripYear: {
+                type: 'integer',
+                description: '行程年份,如 2027(日期归一用)'
+            },
+            itinerary: {
+                type: 'object',
+                additionalProperties: true,
+                description: '结构化行程 { trip_start, trip_end, stays:[{place,check_in,check_out}], onboard_nights, od_segments:[{from,to,date,mode,legs}], budget_items:[{label,min_cny,max_cny}], claimed_floor_cny? }'
             }
         },
         output: {
@@ -1648,7 +2234,7 @@ export function apply(ctx, config) {
                 card: 'generic',
                 title: '产物事实闸',
                 kind: 'execute',
-                rawInput: args.query
+                rawInput: args
             }),
         presentResult: (_args, value)=>{
             const r = value;