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

package/ts/src/loop.ts

@@ -8,6 +8,7 @@
 
 import type { InterviewQuestion, TripState, TravelerProfile, Turn, CalendarState, SolveResult } from './contracts.ts'
 import type { JourneySpecTS } from './unified.ts'
+import type { TravelSlotExtraction } from './travel-slots.ts'
 import { anythingSearch } from '../capabilities/anything.ts'
 
 /** LLM 端口:S2 mock(确定性剧本) / S4 真(dsh 运行时)。循环不感知差异。 */
@@ -20,6 +21,12 @@ export interface LlmPort {
   }>
   /** 翻译:对话历史 → 统一模型 spec;约束未齐时返回 null(循环继续访谈) */
   extractSpec(history: Turn[], state: TripState): Promise<JourneySpecTS | null>
+  /**
+   * 槽位抽取(travel_slot_extraction.v1):差旅 intake 面。时间表达逐字保留,
+   * 过期判定在确定性层(flagExpiredSlots),实现方负责注入时间锚点卡。
+   * now 可注入(评测用固定锚点保证确定性;生产省略取系统时钟)。
+   */
+  extractSlots(history: Turn[], now?: Date): Promise<TravelSlotExtraction | null>
   /** 问句润色(ADR-9:确定性驱动,LLM 只管语气) */
   polishQuestion(q: InterviewQuestion): Promise<string>
   /** 结果解释(S3 接 solve 后启用) */
@@ -235,7 +242,7 @@ export async function runTurn(
 
   for (const q of blocking) parts.push(await llm.polishQuestion(q))
 
-  // 约束齐备(无阻塞问题)→ 翻译 spec → **校验闸** → 求解 → 渲染
+  // 约束齐备(无阻塞问题)→ 翻译 spec → **校验闸 + 日期一致性闸** → 求解 → 渲染
   if (blocking.length === 0 && solve) {
     const spec = await llm.extractSpec([...history, { role: 'user', text: userMsg }], state)
     // 场景路由:erhai 候选标记 → 候选求解(洱海金标准的引擎判定)——纯 TS unify 路径
@@ -258,6 +265,20 @@ export async function runTurn(
     } else {
       const invalid = spec ? validateSpec(spec) : '翻译器未产出 spec'
       if (spec && !invalid) {
+        // D-10 切片 C:spec↔槽位日期一致性闸(ADR-10 翻译≠造数的执行点)。
+        // LLM 翻译的 spec 日期与代码层换算的槽位日期分歧时不求解、不猜,追问确认——
+        // 日期是求解关键输入,错日期 = 错判决。槽位缺失/unresolved 不参与(不造假阳性)。
+        const ext = await llm.extractSlots([...history, { role: 'user', text: userMsg }])
+        if (ext) {
+          const { resolveSlots, specDateMismatches } = await import('./slot-spec.ts')
+          const { buildTimeAnchor } = await import('./time-anchor.ts')
+          const mismatches = specDateMismatches(spec, resolveSlots(ext, buildTimeAnchor()))
+          if (mismatches.length > 0) {
+            const lines = mismatches.map(m => `- ${m.specAt}:翻译说 ${m.specDate},你的原话换算是 ${m.slotDate}(${m.field})`)
+            parts.push(`⚠️ 日期分歧,确认后我再算(以你为准):\n${lines.join('\n')}`)
+            return { reply: parts.join('\n\n'), state }
+          }
+        }
         state.spec = spec
         state.solve = await solve(spec)
         parts.push(llm.render ? await llm.render(state) : renderSolve(state))
@@ -271,66 +292,120 @@ 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/酒店" 信号,返回关键词。
- * 触发的不是关键词,是**结构**:句首含"查/搜/找" + 后接地理/酒店类名词。
+ * 触发的不是关键词,是**结构**;关键词抓取有方向性——
+ *  1) 显式搜索动词(查/搜/找/看看/推荐/告诉我/检索)+ 宾语在动词后;
+ *  2) 住宿名词(酒店/民宿/客栈/饭店):优先取名词**之后**的名称段(须含拉丁/数字,
+ *     「我订了酒店:The Title…」→ The Title…);退路是名词前 2-6 字紧邻地名
+ *     (「大理酒店」→ 大理;「机票和」类垃圾后缀拒);
+ *  3) 开放问(有什么/玩什么/有哪些):取名词前的地名;
+ *  4) 短裸地名:≤12 字、无标点、无陈述动词(「大理」✓;「明天有空」「我的工作时间是…」✗——
+ *     2026-08-28 巡检收紧:旧版 ≤24 直通把访谈答案整句当关键词,垃圾 hbcli 调用+证据噪音)。
  * 不是意图(改求解器),只是 datasources 编排层的"提早调 anything"提示。
  */
 export function probePoi(msg: string): string | null {
   const trimmed = msg.trim()
   if (!trimmed) return null
-  // 短查询(<=24 字符 且非问句): 优先剥 trigger 词,再 fall-through 让内容触发也跑
-  const isShort = trimmed.length <= 24 && !/[?？!！。.,，]/.test(trimmed)
-  if (isShort) {
-    const stripped = trimmed.replace(/^(查一下|查|搜|找|看看|推荐|告诉我|检索)\s*/, '').trim()
-    // 即使没 trigger 词,只要 stripped 仍是 ≥2 字符的非空串就当关键词
-    if (stripped.length >= 2) return stripped.slice(0, 24)
-  }
-  // 触发模式:查/搜/找/看看/推荐/告诉我/检索 + 地理/酒店类名词(贪吃但只切前 24 字符)
+  const cutAtPunct = (s: string): string => s.split(/[,，。.;；!！?？]/)[0]?.trim() ?? ''
+
+  // 1) 显式搜索动词 + 宾语
   const m = trimmed.match(/(查一下|查|搜|找|看看|推荐|告诉我|检索)\s*(.{2,24})/)
-  if (m) return m[2].trim().slice(0, 24)
-  // 另一模式:含"酒店"/"民宿"/"客栈" 触发酒店查
-  if (/(酒店|民宿|客栈|饭店|有什么|玩什么|有哪些)/.test(trimmed)) {
-    // 尝试提取前面的地名关键词
-    const place = trimmed.match(/([一-龥a-zA-Z]{2,12})\s*(?:酒店|民宿|客栈|饭店|有什么|玩什么|有哪些)/)
-    if (place) return place[1]
-    return trimmed.replace(/(酒店|民宿|客栈|饭店|有什么|玩什么|有哪些)/, '').trim().slice(0, 24) || trimmed.slice(0, 24)
+  if (m?.[2]) {
+    const obj = cutAtPunct(m[2])
+    if (obj.length >= 2) return obj.slice(0, 24)
+  }
+  // 2) 住宿名词:名称段在名词后
+  if (/(酒店|民宿|客栈|饭店)/.test(trimmed)) {
+    const parts = trimmed.split(/(酒店|民宿|客栈|饭店)/)
+    const after = cutAtPunct((parts[2] ?? '').replace(/^[的:：\s]+/, ''))
+    if (after.length >= 2 && /[A-Za-z0-9]/.test(after)) return after.slice(0, 24)
+    const nounAt = trimmed.search(/(酒店|民宿|客栈|饭店)/)
+    const pre = trimmed.slice(Math.max(0, nounAt - 6), nounAt).match(/[一-龥]{2,6}$/)
+    if (pre && !/(机票|车票|和|做|订|的)$/.test(pre[0])) return pre[0]
+  }
+  // 3) 开放问:地名在疑问词前
+  const q = trimmed.match(/([一-龥a-zA-Z]{2,12})\s*(?:有什么|玩什么|有哪些)/)
+  if (q?.[1]) return q[1]
+  // 4) 短裸地名(≤12 字,无标点,无陈述动词)
+  if (trimmed.length <= 12 && !/[,，。.;；!！?？:：]/.test(trimmed) && !/[是有在要想得到说订吧呢]/.test(trimmed)) {
+    return trimmed.slice(0, 24)
   }
   return null
 }

package/ts/src/mock-llm.ts

@@ -7,6 +7,7 @@
 import type { LlmPort } from './loop.ts'
 import type { InterviewQuestion, TravelerProfile, TripState, Turn, CalendarState } from './contracts.ts'
 import type { JourneySpecTS } from './unified.ts'
+import type { TravelSlotExtraction } from './travel-slots.ts'
 import { parseFlightPackToSpec } from './unified.ts'
 
 interface ScriptStep {
@@ -16,6 +17,12 @@ interface ScriptStep {
   profile?: Partial<TravelerProfile>
 }
 
+/** 槽位抽取剧本:评测 harness 把 golden 逐条挂进来,mock 原样回吐(管道自测用) */
+export interface SlotScriptStep {
+  when: string
+  extraction: TravelSlotExtraction
+}
+
 /** 剧本:来自真实 Kimi 对话里用户给出关键事实的时刻 */
 const SCRIPT: ScriptStep[] = [
   {
@@ -48,7 +55,7 @@ const SCRIPT: ScriptStep[] = [
   },
 ]
 
-export function createMockLlm(flightPackPath?: string): LlmPort {
+export function createMockLlm(flightPackPath?: string, slotScript: SlotScriptStep[] = []): LlmPort {
   let stepIdx = 0
   return {
     async extractFacts(history: Turn[], _state: TripState) {
@@ -81,6 +88,11 @@ export function createMockLlm(flightPackPath?: string): LlmPort {
       spec.budgetCny = 9000
       return spec
     },
+    async extractSlots(history: Turn[]): Promise<TravelSlotExtraction | null> {
+      const last = history[history.length - 1]?.text ?? ''
+      const hit = slotScript.find(s => last.includes(s.when))
+      return hit ? structuredClone(hit.extraction) : null
+    },
     async polishQuestion(q: InterviewQuestion) {
       return `【${q.key}】${q.text}\n(为什么问:${q.why})`
     },

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

package/ts/cordis.gotry-patch.yml

@@ -1,36 +0,0 @@
-# GoTry × dsh 成品组合(DeepSeek 原生——创始人官方 key)
-# 用法(在 ts/dsh-runtime 下):
-#   DEEPSEEK_API_KEY=<key> node node_modules/@deepseek-ai/dsh/lib/bin.js \
-#     --profile headless --patch ../cordis.gotry-patch.yml "<任务>"
-#   (web 界面: 把 --profile headless 换成 web)
-- insert:
-    - id: gotry-tools
-      name: '/Users/bytedance/work/gotry/ts/src/index.ts'
-      config:
-        pythonBin: '../../.venv/bin/python'
-        pythonPath: '../../py'
-        stateRoot: '.'
-        timeoutMs: 30000
-        preferInProcess: true
-        hbcliBin: 'hbcli'
-
-# GoTry 成品人格:行为契约=产品语义
-- id: system-prompt
-  config:
-    persona: >-
-      你是 GoTry——从出发到下一次出发的 AI 旅行伙伴(中国出境首发,workation 场景)。
-      今天是 {{current_date}}。行为契约:
-      (1)动机先行:首轮必问工作窗口(几点到几点/什么时区)与已订资源(航班/酒店);
-      (2)日历一次断言:日期换算 2026 年星期并记住,冲突让用户裁决,永不重算;
-      (3)翻译不造数:班次/价格只来自工具(gotry_feasibility_check/gotry_skeleton_check/gotry_hotel_search);
-      (4)判定归引擎:可行性/全成本由工具计算,你只解释;
-      (5)待决=选择题:2-3 个带 trade-off 选项;
-      (6)憧憬不被拒绝:不可行进 gotry_wish_pool_add(带条件);
-      (7)证据链:引用工具返回的标注([骨架:openflights]/[实时API:hbcli]/[静态包:估算])。
-      (8)时间感知:推荐季节/月份选项时,以今天为锚点——已过的月份不说「将」,
-      当下所在的季节直接点明(如「现在正是雨季」而非把当前月份当成远期选项)。
-      (9)兜底链:自身工具(可行性/酒店/天气/航班/Anything)答不上来时,用
-      gotry_agent_reach(100% follow Panniantong/Agent-Reach 路由表):web 读任意网页(r.jina.ai)/
-      rss/v2ex/youtube 字幕(yt-dlp)/github 搜索(gh)/bilibili/exa 语义搜索;需登录态的渠道
-      (twitter/reddit/xhs 等)会返回配置指引——如实转告用户,不编造。action=status 可跑
-      上游 `agent-reach doctor` 体检。答案标 [agent-reach:<渠道>@<ts>]。