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

package/dist/src/travel-timeline.js

@@ -0,0 +1,78 @@
+import { parseAbsoluteDate, ymd } from './time-anchor.js';
+import { resolveSlotDate } from './slot-spec.js';
+export function resolveTimelineDate(expr, anchor) {
+    return resolveSlotDate(expr, anchor).date;
+}
+export function makeTripId(ev) {
+    return `${ev.destination}|${ev.start}|${ev.source}`.replace(/\s+/g, '_');
+}
+export function appendTrip(events, ev) {
+    if (!ev.destination?.trim()) return {
+        events,
+        appended: false,
+        reason: 'destination 必填'
+    };
+    if (!ev.evidence?.trim()) return {
+        events,
+        appended: false,
+        reason: 'evidence 必填(用户原话或 wish 确认指针)'
+    };
+    if (!/^\d{4}-\d{2}-\d{2}$/.test(ev.start)) return {
+        events,
+        appended: false,
+        reason: 'start 必须为 YYYY-MM-DD(词表外日期由上游解析,不猜)'
+    };
+    if (ev.end && ev.end < ev.start) return {
+        events,
+        appended: false,
+        reason: 'end 早于 start'
+    };
+    const tripId = makeTripId(ev);
+    if (events.some((e)=>e.trip_id === tripId)) return {
+        events,
+        appended: false,
+        tripId
+    };
+    const overlap = events.find((e)=>e.destination === ev.destination && !(e.end && e.end < ev.start) && !(ev.end && ev.end < e.start));
+    if (overlap) return {
+        events,
+        appended: false,
+        tripId: overlap.trip_id,
+        reason: `与已有行程 ${overlap.trip_id} 日期重叠,冲突即停`
+    };
+    const full = {
+        schema: 'travel_timeline.v1',
+        trip_id: tripId,
+        ts: new Date().toISOString(),
+        ...ev
+    };
+    return {
+        events: [
+            ...events,
+            full
+        ],
+        appended: true,
+        tripId
+    };
+}
+export function projectTimeline(events) {
+    return [
+        ...events
+    ].sort((a, b)=>a.start < b.start ? 1 : -1).map((e)=>({
+            tripId: e.trip_id,
+            destination: e.destination,
+            start: e.start,
+            end: e.end,
+            companions: e.companions
+        }));
+}
+export function timelineGapsForVerified(timeline, verifiedWishes) {
+    const dests = new Set(timeline.map((t)=>t.destination));
+    return verifiedWishes.filter((w)=>w.destination && !dests.has(w.destination)).map((w)=>({
+            wishId: w.wishId
+        }));
+}
+export { ymd };
+
+
+//# sourceURL=/Users/bytedance/work/gotry/ts/src/travel-timeline.ts

package/dist/src/unified.js

@@ -179,7 +179,9 @@ function evaluateOptionMove(segId, mv) {
     let energy;
     if (mv.redEye && (mv.redEyeDurationMin ?? 0) > 0) {
         const sleepH = ((mv.redEyeDurationMin ?? 0) - 60) / 60;
-        energy = Math.max(30, Math.min(75, 30 + 8 * sleepH));
+        const groundH = (mv.groundRecoveryMin ?? mv.destTransferMin ?? 0) / 60;
+        const recovery = Math.min(5, 5 * groundH);
+        energy = Math.max(30, Math.min(75 + recovery, 80, 30 + 8 * sleepH + recovery));
     } else {
         energy = 100 - 2 * 8;
         if (wake < 5 * 60) energy -= 30;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danceiny/gotry",
-  "version": "0.0.1-rc.8",
+  "version": "0.0.1-rc.9",
   "description": "GoTry — 从出发到下一次出发的 AI 旅行 Agent(dsh 插件)。npm 包入口 + vendored dsh runtime + 5 行 README 安装路径。",
   "type": "module",
   "main": "ts/src/index.ts",

package/ts/package.json

@@ -13,10 +13,13 @@
     "@deepseek-ai/cordis": "*",
     "@deepseek-ai/dsh-tools": "*",
     "@deepseek-ai/schemastery": "*",
+    "@types/better-sqlite3": "^9.6.0",
+    "better-sqlite3": "^13.0.3",
     "z3-solver": "^5.2.0"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",
+    "playwright-core": "^1.62.1",
     "tsx": "^4.19.0",
     "typescript": "^5.6.0"
   }

package/ts/src/index.ts

@@ -14,21 +14,21 @@
  */
 
 import { join } from 'node:path'
-import { readFile, writeFile } from 'node:fs/promises'
-import { readFileSync } from 'node:fs'
+
 import type { Context } from '@deepseek-ai/cordis'
 import z from '@deepseek-ai/schemastery'
 import { defineTool } from '@deepseek-ai/dsh-tools'
-import { ensureStateDir, readJson, recordLatency, writeJson } from './bridge.ts'
+import { ensureStateDir, recordLatency } from './bridge.ts'
 import { segmentsFromCandidate, solveChoiceSegment } from './unified.ts'
 import { checkConnectivity } from '../scripts/skeleton-check.ts'
 import { parseCandidate, parseRequest } from './model.ts'
 import { searchHotels as hbcliSearchHotels } from '../capabilities/hbcli.ts'
 import { installProcessGuards, guardToolExecute } from '../capabilities/incident-log.ts'
 import { interpretArgs, type GotryObservation } from './tool-packet.ts'
-import { appendEvent, projectUtility, type MemoryUtilityEvent } from './memory-utility.ts'
+import { projectUtility } from './memory-utility.ts'
 import { pickNudgeWish, type WishPoolEntry } from './wish-pool.ts'
-import { mergeProfile } from './memory-capture.ts'
+import { resolveTimelineDate } from './travel-timeline.ts'
+import { ensureLedger, readCompanionsWithFallback, readMotivationWithFallback, readTripsWithFallback, readWishPoolWithFallback } from './state-ledger.ts'
 import { buildTimeAnchor } from './time-anchor.ts'
 import { resolveSlotDate } from './slot-spec.ts'
 import { geocodePlace, getForecast, getClimate, wmoLabel } from '../capabilities/weather.ts'
@@ -36,6 +36,8 @@ import { verifyFlight } from '../capabilities/opensky.ts'
 import { anythingSearch } from '../capabilities/anything.ts'
 import { readUrl, reach, reachStatus } from '../capabilities/agent-reach.ts'
 import { videoSubtitle, githubSearch } from '../capabilities/agent-reach-deep.ts'
+import { flyaiSearch } from '../capabilities/flyai.ts'
+import { sessionFlightSearch } from '../capabilities/session-search.ts'
 
 export const name = 'gotry-tools'
 export const inject = ['tools', 'systemPrompt']
@@ -81,24 +83,48 @@ interface WishPoolEntryInput {
 const unwrapQuery = interpretArgs
 
 /**
- * 动机画像 → persona 紧凑 brief(M4 T1 读回路径):空文件返回 ''(首访),
+ * 动机画像 → persona 紧凑 brief(M4 T1 读回路径):空画像返回 ''(首访),
  * persona 据此决定是否访谈。只读,不猜——画像里没有的字段不编。
+ * ADR-15:读经账本(未迁移 root 回退旧文件,只读)。
  */
 function renderMotivationBrief(stateRoot: string): string {
-  try {
-    const raw = readFileSync(join(stateRoot, 'gotry-state', 'motivation-profile.json'), 'utf-8')
-    const p = JSON.parse(raw) as { weights?: Record<string, number>; evidence?: string[]; hard?: Record<string, unknown>; updated_at?: string }
-    const lines: string[] = ['## 用户记忆(跨会话画像;与用户当轮说法冲突时以用户为准,更新经 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(', ')}`)
-    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') : ''
-  } catch {
-    return '' // 首访:无画像
+  const p = readMotivationWithFallback(stateRoot)
+  if (!p) return '' // 首访:无画像
+  const lines: string[] = ['## 用户记忆(跨会话画像;与用户当轮说法冲突时以用户为准,更新经 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(', ')}`)
+  // 旅行时间线(memory-design P1):去过的地方不再主动推荐,除非用户点名
+  const trips = readTimelineTrips(stateRoot)
+  if (trips.length) {
+    lines.push(`- 去过: ${trips.map(t => `${t.destination}(${t.start.slice(0, 7)})`).join('、')}——去过的地方不再主动推荐,除非用户点名`)
+  }
+  // 同行人档案(memory-design P2):约束只进排序与行程结构建议,永不硬过滤
+  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') : ''
+}
+
+/** 时间线摘要(brief 用):最近 3 次行程(目的地+年月);账本优先,未迁移回退文件 */
+/** 同行人摘要(brief 用):label + 约束串 */
+function readCompanions(stateRoot: string): Array<{ label: string; brief: string }> {
+  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: string): Array<{ destination: string; start: string }> {
+  return readTripsWithFallback(stateRoot)
+    .map(t => ({ destination: t.destination, start: t.start }))
+    .sort((a, b) => (a.start < b.start ? 1 : -1))
+    .slice(0, 3)
 }
 
 type Json = string | number | boolean | null | Json[] | { [k: string]: Json }
@@ -224,25 +250,17 @@ export function apply(ctx: Context, config: Config): void {
       // T1 接线:本工具是增量补丁语义(契约 18——模型每轮把对话新事实带进来),
       // 经 mergeProfile 守门合并进既有画像(追加不删史/幂等/权重变更须伴新证据),
       // 不再整档覆盖。首次调用(无档案)= 全量建立。
+      // ADR-15:守门+事件+投影在账本单事务内完成,evidence 红线拒绝即回滚,账本无痕。
       const incoming = (args.profile ?? {}) as { weights?: Record<string, number>; evidence?: string[]; hard?: Record<string, unknown> }
       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')
-      let existing: { weights?: Record<string, number>; evidence?: string[]; hard?: Record<string, unknown> } | null = null
-      try {
-        existing = await readJson<typeof existing>(path, null)
-      } catch { /* 首次保存:无档案 */ }
-      const merged = mergeProfile(existing, { weights: incoming.weights, evidence: incoming.evidence, hard: incoming.hard })
-      if (!merged) {
-        // 幂等:补丁与现有画像完全一致,不落盘
-        const currentJson = JSON.parse(JSON.stringify({ ...(existing ?? {}), updated_at: new Date().toISOString() })) as JsonObject
-        return { ok: true, saved: false, path, profile: currentJson, summary: '无新内容(幂等跳过)' }
-      }
-      const saved = JSON.parse(JSON.stringify({ ...merged, updated_at: new Date().toISOString() })) as JsonObject
-      await writeJson(path, saved)
-      return { ok: true, saved: true, path, profile: saved, summary: '画像已合并落盘' }
+      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)) as JsonObject
+      return res.saved
+        ? { ok: true, saved: true, path: ledger.dbPath, profile: profileJson, summary: '画像已合并入账本(单事务)' }
+        : { ok: true, saved: false, path: ledger.dbPath, profile: profileJson, summary: '无新内容(幂等跳过)' }
     },
     presentCall: args => ({ card: 'generic', title: '保存动机画像', kind: 'edit', rawInput: args.profile }),
   }))
@@ -271,30 +289,11 @@ export function apply(ctx: Context, config: Config): void {
     },
     async execute(args: { entry: unknown }, _exec: unknown) {
       const entry = (args.entry ?? {}) as WishPoolEntryInput & { muted?: boolean }
-      if (!entry.name || !entry.conditions) {
-        throw new Error('wish pool entry requires name and conditions (fulfilment conditions are the whole point)')
-      }
-      const dir = await ensureStateDir(config.stateRoot)
-      const path = join(dir, 'wish-pool.json')
-      const pool = (await readJson(path, [])) as Array<Record<string, unknown>>
-      // 同名憧憬幂等更新(刷新理由与成行条件),不重复落盘;wish_id 稳定(存量补签)
-      const existing = pool.findIndex(e => e['name'] === entry.name)
-      if (existing >= 0) {
-        const prev = pool[existing] ?? {}
-        pool[existing] = {
-          ...prev,
-          wish_id: prev['wish_id'] ?? `w${Date.now().toString(36)}`,
-          reason: entry.reason ?? prev['reason'],
-          conditions: entry.conditions,
-          ...(entry.muted !== undefined ? { muted: entry.muted } : {}),
-        }
-        await writeJson(path, pool)
-        return { ok: true, added: false, wish_id: String(pool[existing]?.['wish_id']), total: pool.length, path }
-      }
-      const created = { wish_id: `w${Date.now().toString(36)}`, reason: '', ...entry, added_at: new Date().toISOString() }
-      pool.push(created)
-      await writeJson(path, pool)
-      return { ok: true, added: true, wish_id: created.wish_id, total: pool.length, path }
+      // 同名憧憬幂等更新(刷新理由与成行条件),不重复入池;wish_id 语义派生自名称,稳定可重放。
+      // ADR-15:conditions 红线在账本事务内校验拒绝。
+      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 }),
   }))
@@ -311,7 +310,7 @@ export function apply(ctx: Context, config: Config): void {
       query: {
         type: 'json',
         required: true,
-        description: '{ action?: "recall"|"confirm-outcome", days?: number, budgetCny?: number, month?: number, wishId?: string, attribution?: "helpful"|"harmful"|"neutral", detail?: string }',
+        description: '{ action?: "recall"|"confirm-outcome", days?, budgetCny?, month?, wishId?, attribution?: "helpful"|"harmful"|"neutral", detail?, tripStart?: "行程起始(确认成行时挂时间线)" }',
       },
     },
     output: {
@@ -319,44 +318,40 @@ export function apply(ctx: Context, config: Config): void {
       render: (_args, value) => [{ type: 'text', text: String((value as { summary?: string }).summary ?? '') }],
     },
     async execute(args: { query: unknown }, _exec: unknown) {
-      const q = unwrapQuery<{ action?: string; days?: number; budgetCny?: number; month?: number; wishId?: string; attribution?: 'helpful' | 'harmful' | 'neutral'; detail?: string }>(args, 'action')
-      const dir = await ensureStateDir(config.stateRoot)
-      const pool = (await readJson(join(dir, 'wish-pool.json'), [])) as Array<Record<string, unknown>>
-      const sidecarPath = join(dir, 'memory-utility.jsonl')
-      const loadSidecar = async (): Promise<MemoryUtilityEvent[]> => {
-        try {
-          const raw = await readFile(sidecarPath, 'utf-8')
-          return raw.split('\n').filter(Boolean).map(l => JSON.parse(l) as MemoryUtilityEvent)
-        } catch { return [] } // fail-open:sidecar 缺失/损坏不阻塞召回
-      }
-      const saveSidecar = async (events: MemoryUtilityEvent[]) => {
-        await writeFile(sidecarPath, events.map(e => JSON.stringify(e)).join('\n') + '\n', 'utf-8')
-      }
+      const q = unwrapQuery<{ action?: string; days?: number; budgetCny?: number; month?: number; wishId?: string; attribution?: 'helpful' | 'harmful' | 'neutral'; detail?: string; tripStart?: string }>(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)' } as never
         }
-        const events = await loadSidecar()
-        const { events: next, appended } = appendEvent(events, {
-          wish_id: q.wishId, kind: 'verified_outcome', ts: now,
-          ctx: 'gotry_wish_pool_list.confirm', detail: q.detail, attribution: q.attribution,
-        })
-        if (appended) await saveSidecar(next)
-        return { ok: true, recorded: appended, wish_id: q.wishId, status: q.attribution } as never
+        // 成行确认 = 效用事件 + 可选时间线行程,账本单事务(ADR-15:原两文件写在崩溃时分叉)
+        let tripInput: { destination: string; start: string; end?: string; companions?: string[]; source: 'wish-confirmed'; evidence: string } | undefined
+        const wish = ledger.readWishPool().find(e => String(e.wish_id) === q.wishId) as { name?: unknown } | undefined
+        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 } : {}) } as never
       }
       // recall:0..1 条件匹配(判定归 wish-pool 纯函数),muted 永不召回,无命中不硬推
-      const candidates = pool.filter(e => !e['muted'] && typeof e['wish_id'] === 'string')
+      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 as WishPoolEntry[], { days: q.days, budgetCny: q.budgetCny, month })
       if (!match) {
         return { ok: true, suggestion: null, summary: `无可成行的憧憬匹配当前窗口(${candidates.length} 条在册,0..1 纪律:不硬推)` } as never
       }
-      const events = await loadSidecar()
-      const { events: next, appended } = appendEvent(events, {
+      const { events: next } = ledger.appendUtilityEvent({
         wish_id: match.wishId, kind: 'recalled', ts: now, ctx: 'gotry_wish_pool_list.recall',
       })
-      if (appended) await saveSidecar(next)
       const utility = projectUtility(next)[match.wishId]
       return {
         ok: true,
@@ -368,6 +363,78 @@ export function apply(ctx: Context, config: Config): void {
     presentCall: args => ({ card: 'generic', 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 as { summary?: string }).summary ?? '') }],
+    },
+    async execute(args: { companion: unknown }, _exec: unknown) {
+      const c = (args.companion ?? {}) as { label?: string; constraints?: { mobility?: string; health?: string[]; prefs?: string[] }; evidence?: string }
+      if (!c.evidence) return { ok: false, summary: 'evidence 必填(用户原话,溯源 P0)' } as never
+      // ADR-15:负面清单守卫(upsertCompanion)在账本事务内执行,拒收即回滚
+      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 } as never
+      return { ok: true, appended: res.appended, companion_id: res.companionId, total: res.total, summary: res.appended ? `同行人已保存:${res.companionId}` : `无新内容(幂等跳过):${res.companionId}` } as never
+    },
+    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 as { summary?: string }).summary ?? '') }],
+    },
+    async execute(args: { query: unknown }, _exec: unknown) {
+      const q = unwrapQuery<{ destination?: string; start?: string; end?: string; companions?: string[]; evidence?: string }>(args, 'destination')
+      if (!q.destination) return { ok: false, summary: 'destination 必填' } as never
+      if (!q.evidence) return { ok: false, summary: 'evidence 必填(用户原话,溯源 P0)' } as never
+      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 ?? '缺'})——请向用户要具体日期,不猜` } as never
+      const end = q.end ? (resolveTimelineDate(q.end, anchor) ?? (/^\d{4}-\d{2}-\d{2}$/.test(q.end) ? q.end : undefined)) : undefined
+      // ADR-15:appendTrip 守门(必填/绝对日期/重叠冲突即停)在账本事务内执行
+      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 } as never
+      return { ok: true, appended: res.appended, trip_id: res.tripId, total: res.total, summary: res.appended ? `已入时间线:${q.destination} @ ${start}` : `已存在(幂等跳过):${res.tripId}` } as never
+    },
+    presentCall: args => ({ card: 'generic', title: '记录旅行', kind: 'edit', rawInput: args.query }),
+  }))
+
   registerGuarded(defineTool({
     name: 'gotry_hotel_search',
     description:
@@ -573,6 +640,72 @@ export function apply(ctx: Context, config: Config): void {
     presentCall: args => ({ card: 'generic', title: `飞行校验:${String((args.query as { callsign?: string })?.callsign ?? '')}`, 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 as { summary?: string }).summary ?? JSON.stringify(v).slice(0, 600)) }] },
+    async execute(args: { query: unknown }, _exec: unknown) {
+      const q = unwrapQuery<{ kind?: string; from?: string; to?: string; date?: string }>(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)' } as const
+      }
+      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 })) as Record<string, never>
+    },
+    presentCall: args => ({ card: 'generic', title: `官方检索:${String((args.query as { kind?: string })?.kind ?? 'flight')}`, kind: 'fetch', rawInput: args.query }),
+    presentResult: (args, value) => {
+      const r = value as { ok?: boolean; options?: unknown[] }
+      return { card: 'generic', title: `飞猪检索:${r.ok && (r.options?.length ?? 0) > 0 ? `${r.options!.length} 条` : '降级'}`, content: [{ type: 'text', text: String((value as { summary?: string }).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 as { summary?: string }).summary ?? JSON.stringify(v).slice(0, 600)) }] },
+    async execute(args: { query: unknown }, _exec: unknown) {
+      const q = unwrapQuery<{ from?: string; to?: string; date?: string }>(args, 'from')
+      if (!q.from || !q.to || !q.date) {
+        return { ok: false, summary: '需要 from/to(中文城市名,词表内)与 date(YYYY-MM-DD)' } as const
+      }
+      const r = await sessionFlightSearch({
+        from: q.from, to: q.to, date: q.date,
+        // ADR-15 收尾:ReadGuard 审计在生产工具路径同样落盘(此前仅测试传隔离 stateRoot 才有 JSONL)
+        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 })) as Record<string, never>
+    },
+    presentCall: args => ({ card: 'generic', title: `会话检索:${String((args.query as { from?: string })?.from ?? '')}`, kind: 'fetch', rawInput: args.query }),
+    presentResult: (_args, value) => {
+      const r = value as { verdict?: string; options?: unknown[] }
+      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 as { summary?: string }).summary ?? '') }] }
+    },
+  }))
+
   registerGuarded(defineTool({
     name: 'gotry_anything_search',
     description:

package/ts/src/loop.ts

@@ -292,42 +292,82 @@ export async function runTurn(
   return { reply: parts.join('\n\n'), state }
 }
 
-// ---- 异步工单持久化(S5 编排半段):真正的「一小时后」必须跨进程存续 ----
-// 请求时落盘(ticket+state 快照);任意后续进程(如 loopx 驱动的 tick)执行
-// async-collect 加载、求解、写回交付物。状态目录属用户数据(红线 6)。
+// ---- 异步工单持久化(S5 编排半段 → ADR-15 durable 工单):真正的「一小时后」必须跨进程存续 ----
+// 权威 = 账本 workflow_runs/workflow_steps(单事务;崩溃后 done 步骤不重执行);
+// {id}.json / {id}.deliverable.md 降级为视图(AGENTS.md 清扫合同 + 人工检视),
+// tmp+rename 原子写——此前裸 writeFile 的非原子缺口(RFC §1.1)就此关闭。
 
 import { join } from 'node:path'
-import { mkdir } from 'node:fs/promises'
-import { readFile, writeFile } from 'node:fs/promises'
+import { mkdir, rename, writeFile, readFile } from 'node:fs/promises'
+import { ensureLedger, openLedgerIfExists, type StateLedger } from './state-ledger.ts'
 
-const ASYNC_DIR = 'gotry-state/async'
+async function asyncDir(stateRoot: string): Promise<string> {
+  const root = stateRoot === '.' ? process.cwd() : stateRoot
+  const dir = join(root, 'gotry-state', 'async')
+  await mkdir(dir, { recursive: true })
+  return dir
+}
 
-async function asyncPath(name: string): Promise<string> {
-  await mkdir(ASYNC_DIR, { recursive: true })
-  return join(ASYNC_DIR, name)
+async function atomicWrite(path: string, text: string): Promise<void> {
+  const tmp = `${path}.tmp`
+  await writeFile(tmp, text, 'utf-8')
+  await rename(tmp, path)
 }
 
-export async function persistAsyncTicket(ticket: AsyncTicket, state: TripState): Promise<string> {
-  const p = await asyncPath(`${ticket.id}.json`)
-  await writeFile(p, JSON.stringify({ ticket, state }, null, 2), 'utf-8')
+export async function persistAsyncTicket(ticket: AsyncTicket, state: TripState, stateRoot = '.'): Promise<string> {
+  const ledger = ensureLedger(stateRoot)
+  ledger.createWorkflowRun({ id: ticket.id, goal: ticket.objective, ticket, state })
+  const dir = await asyncDir(stateRoot)
+  const p = join(dir, `${ticket.id}.json`)
+  await atomicWrite(p, JSON.stringify({ ticket, state }, null, 2))
   return p
 }
 
-export async function loadAsyncTicket(ticketId: string): Promise<{ ticket: AsyncTicket; state: TripState } | null> {
+export async function loadAsyncTicket(ticketId: string, stateRoot = '.'): Promise<{ ticket: AsyncTicket; state: TripState } | null> {
+  // 账本优先;无账本的 root 回退旧 json 文件(只读,兼容存量已交付工单)
+  const ledger = openLedgerIfExists(stateRoot)
+  const run = ledger?.getWorkflowRun(ticketId)
+  if (run) {
+    return {
+      ticket: JSON.parse(run.ticket_json) as AsyncTicket,
+      state: JSON.parse(run.state_json) as TripState,
+    }
+  }
   try {
-    const p = await asyncPath(`${ticketId}.json`)
+    const p = join(await asyncDir(stateRoot), `${ticketId}.json`)
     return JSON.parse(await readFile(p, 'utf-8')) as { ticket: AsyncTicket; state: TripState }
   } catch {
     return null
   }
 }
 
-export async function settleAsyncTicket(ticketId: string, reply: string): Promise<string> {
-  const p = await asyncPath(`${ticketId}.deliverable.md`)
-  await writeFile(p, reply, 'utf-8')
+export async function settleAsyncTicket(ticketId: string, reply: string, stateRoot = '.'): Promise<string> {
+  openLedgerIfExists(stateRoot)?.settleWorkflowRun(ticketId, reply)
+  const dir = await asyncDir(stateRoot)
+  const p = join(dir, `${ticketId}.deliverable.md`)
+  await atomicWrite(p, reply)
   return p
 }
 
+/**
+ * 可日志化 solve 端口(ADR-15 步骤日志,intent-before-execute):
+ * 先记 intent 再执行,done 后结果落账本——任意进程恢复时 done 的步骤直接复用
+ * 结果不重执行(exactly-once:LLM/求解调用不重复花钱),intent 悬挂的重试。
+ */
+export function makeJournaledSolvePort(ledger: StateLedger, runId: string, solve: SolvePort, opts?: { onRealSolve?: () => void }): SolvePort {
+  return async spec => {
+    const step = ledger.getWorkflowStep(runId, 'solve')
+    if (step?.status === 'done' && step.result) {
+      return JSON.parse(step.result) as Awaited<ReturnType<SolvePort>>
+    }
+    ledger.markStepIntent(runId, 'solve')
+    opts?.onRealSolve?.()
+    const r = await solve(spec)
+    ledger.markStepDone(runId, 'solve', r)
+    return r
+  }
+}
+
 /**
  * probePoi:从 user msg 探测"查 POI/酒店" 信号,返回关键词。
  * 触发的不是关键词,是**结构**;关键词抓取有方向性——

package/ts/src/unified.ts

@@ -28,6 +28,8 @@ export interface MoveSpecTS {
   destTransferMin: number
   redEye?: boolean
   redEyeDurationMin?: number
+  /** D-6:红眼航段落地后接驳(机场→住处/办公室)的乘车补眠时长(分钟);机上已算,落地接驳未算 */
+  groundRecoveryMin?: number
   /** D-5:目的地相对出发地的时差(KMG-BKK=+60,DXB-SZX=-240) */
   tzOffsetMin?: number
   /** M-1:出发地 UTC 偏移(工作窗口换算用) */
@@ -227,7 +229,10 @@ function evaluateOptionMove(segId: string, mv: MoveSpecTS): LegReport & { d2d_mi
   let energy: number
   if (mv.redEye && (mv.redEyeDurationMin ?? 0) > 0) {
     const sleepH = ((mv.redEyeDurationMin ?? 0) - 60) / 60
-    energy = Math.max(30, Math.min(75, 30 + 8 * sleepH))
+    // D-6 校准:机上睡眠上限 75;落地接驳(destTransferMin)乘车补眠回血(1h≈+5%,上限 80)
+    const groundH = (mv.groundRecoveryMin ?? mv.destTransferMin ?? 0) / 60
+    const recovery = Math.min(5, 5 * groundH)
+    energy = Math.max(30, Math.min(75 + recovery, 80, 30 + 8 * sleepH + recovery))
   } else {
     energy = 100 - 2 * 8
     if (wake < 5 * 60) energy -= 30