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

package/ts/capabilities/hbcli.ts

@@ -120,14 +120,14 @@ export async function searchHotels(
   query: { destination: string; checkIn?: string; checkOut?: string; adults?: number },
   opts: HbcliCallOptions & { fallbackPath?: string } = {},
 ): Promise<HbcliCallResult & { hotels?: unknown; summary: string }> {
-  const hbArgs = ['search', 'hotel-list', '--json']
-  if (query.destination) hbArgs.push('--destination', query.destination)
-  if (query.checkIn) hbArgs.push('--check-in', query.checkIn)
-  if (query.checkOut) hbArgs.push('--check-out', query.checkOut)
-  if (query.adults) hbArgs.push('--adults', String(query.adults))
+  // 旗标对齐上游 CLI v0.3.0(命令树扁平化后):--destination-name + --room-occupancies;
+  // hotel-list 无日期旗标(房价按上游当前窗口),checkIn/checkOut 留给 hotel-rates 跟进
+  const hbArgs = ['search', 'hotel-list', '--json', '--page-size', '10']
+  if (query.destination) hbArgs.push('--destination-name', query.destination)
+  if (query.adults) hbArgs.push('--room-occupancies', JSON.stringify([{ adultCount: query.adults, childrenAges: [] }]))
   const live = await callHbcliJson(hbArgs, opts)
   if (live.via === 'hbcli-realtime') {
-    return { ...live, hotels: live.result, summary: `${query.destination}:hbcli 实时返回` }
+    return { ...live, hotels: live.result, summary: `${query.destination}:hbcli 实时返回${query.checkIn || query.checkOut ? '(日期不传上游 list,以当前窗口房价返回)' : ''}` }
   }
   // 降级:读静态包
   const fallback = opts.fallbackPath

package/ts/capabilities/incident-log.ts

@@ -15,6 +15,7 @@
 import { appendFileSync, existsSync, mkdirSync, writeFileSync } from 'node:fs'
 import { dirname, isAbsolute, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
+import type { ToolFailure } from '../src/tool-packet.ts'
 
 export type IncidentKind = 'uncaughtException' | 'unhandledRejection' | 'plugin_error' | 'tool_execute_error'
 
@@ -74,7 +75,7 @@ export function installProcessGuards(stateRoot: string, labels?: { uncaughtExcep
   installed = true
   logPath = resolveIncidentsPath(stateRoot)
 
-  const uncaughtHandler = (err: Error, origin: NodeJS.UncaughtExceptionOriginTypes | 'uncaughtException') => {
+  const uncaughtHandler = (err: Error, origin: NodeJS.UncaughtExceptionOrigin | 'uncaughtException') => {
     recordIncident({
       ts: new Date().toISOString(),
       kind: 'uncaughtException',
@@ -111,6 +112,7 @@ export function installProcessGuards(stateRoot: string, labels?: { uncaughtExcep
  * 工具执行面异常隔离(D-NEW gotry 侧收尾):dsh 的一个工具 execute 抛错/拒绝
  * 会沿 cordis 传到主循环,拖垮整个会话。包装后:降级为结构化错误返回给 LLM、
  * 事故落盘,永不向上抛。落盘失败也不抛(双保险,仍返回结构化错误)。
+ * 失败形状 = ToolFailure(RFC S1 observation envelope 的失败分支,编译期对齐)。
  */
 export function guardToolExecute<A, R>(name: string, stateRoot: string, execute: (args: A, exec: unknown) => R | Promise<R>): (args: A, exec: unknown) => Promise<R> {
   return async (args: A, exec: unknown): Promise<R> => {
@@ -125,11 +127,12 @@ export function guardToolExecute<A, R>(name: string, stateRoot: string, execute:
         stack: (err.stack ?? '').slice(0, 4000),
         source: name,
       }, stateRoot)
-      return {
+      const failure: ToolFailure = {
         ok: false,
         summary: `gotry_${name} 内部错误(已隔离,会话继续): ${err.message.slice(0, 300)}`,
         evidence: `[incident:tool_execute_error@${new Date().toISOString()}]`,
-      } as R
+      }
+      return failure as R
     }
   }
 }

package/ts/scripts/skeleton-check.ts

@@ -40,6 +40,10 @@ export async function checkConnectivity(a: string, b: string): Promise<{ connect
 }
 
 // CLI 直跑
-if (process.argv[2] && process.argv[3]) {
+// 仅作为直接 CLI 入口时执行(被 import 时不触发:此前 dsh 子进程的
+// argv[2]/[3](--profile headless)恰好真值,每次启动白跑一次探测还污染 stdout)
+import { pathToFileURL } from 'node:url'
+const isMain = process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href
+if (isMain && process.argv[2] && process.argv[3]) {
   console.log((await checkConnectivity(process.argv[2], process.argv[3])).evidence)
 }

package/ts/src/dsh-llm.ts

@@ -10,18 +10,22 @@
 import type { LlmPort } from './loop.ts'
 import type { InterviewQuestion, TravelerProfile, TripState, Turn, CalendarState } from './contracts.ts'
 import { parseFlightPackToSpec, type JourneySpecTS } from './unified.ts'
+import { buildTimeAnchor } from './time-anchor.ts'
+import { buildSlotSystem, flagExpiredSlots, normalizeExtraction, type TravelSlotExtraction } from './travel-slots.ts'
 
-const MODEL = process.env['LLM_MODEL'] ?? process.env['DEEPSEEK_MODEL'] ?? 'MiniMax-M2'
-const BASE = (process.env['LLM_BASE_URL'] ?? process.env['DEEPSEEK_BASE_URL'] ?? 'https://api.minimax.io/v1').replace(/\/$/, '')
+// 惰性读取(env 在调用时取值):模块顶常量会在 .env 加载前冻结(ESM import 提升),
+// 脚本先 loadEnv 再 import 也救不了——401 错配(key 发往默认端点)的存量隐患由此根除。
+const model = () => process.env['LLM_MODEL'] ?? process.env['DEEPSEEK_MODEL'] ?? 'MiniMax-M2'
+const base = () => (process.env['LLM_BASE_URL'] ?? process.env['DEEPSEEK_BASE_URL'] ?? 'https://api.minimax.io/v1').replace(/\/$/, '')
 
 async function chat(messages: Array<{ role: 'system' | 'user' | 'assistant'; content: string }>, json: boolean): Promise<string> {
   const key = process.env['LLM_API_KEY'] ?? process.env['DEEPSEEK_API_KEY']
   if (!key) throw new Error('LLM_API_KEY 未设置(兼容 DEEPSEEK_API_KEY 别名)——真 LLM 路径不可用,请回退 mock(ADR-8)')
-  const res = await fetch(`${BASE}/chat/completions`, {
+  const res = await fetch(`${base()}/chat/completions`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${key}` },
     body: JSON.stringify({
-      model: MODEL,
+      model: model(),
       messages,
       ...(json ? { response_format: { type: 'json_object' } } : {}),
       temperature: json ? 0 : 0.7,
@@ -58,13 +62,16 @@ const SKELETON_SYSTEM = `你是行程骨架抽取器。从对话中抽取行程
 规则:每个跨城移动一段;锚点只放用户明说或必然的(如"当天到"→arriveByMin 23:59=1439);时刻用当日分钟。
 scenario 判定:「洱海/大理/千岛湖/太湖+选目的地」→erhai(候选集);「普吉/workation/远程办公+多城链」→workation(五段链);「云南/大理丽江」→yunnan;不确定→generic。只输出 JSON。`
 
-export function createOpenAICompatLlm(flightPackPath?: string): LlmPort {
+export function createOpenAICompatLlm(flightPackPath?: string, clock: () => Date = () => new Date()): LlmPort {
   const pack = flightPackPath
   const historyText = (h: Turn[]) => h.map(t => `${t.role === 'user' ? '用户' : '助手'}: ${t.text}`).join('\n')
+  // 时间锚点卡:每条抽取链路都带上「今天」——legacy 路径此前无时间注入,
+  // 过期/相对日期语义全靠它(算术在 time-anchor 层,LLM 只查卡)。
+  const anchorContext = () => `时间锚点卡:\n${buildTimeAnchor(clock()).card}`
   return {
     async extractFacts(history) {
       const out = await chat(
-        [{ role: 'system', content: FACTS_SYSTEM }, { role: 'user', content: historyText(history) }],
+        [{ role: 'system', content: FACTS_SYSTEM }, { role: 'user', content: `${anchorContext()}\n\n${historyText(history)}` }],
         true,
       )
       const obj = parseJsonBlock(out)
@@ -76,7 +83,7 @@ export function createOpenAICompatLlm(flightPackPath?: string): LlmPort {
     },
     async extractSpec(history, state) {
       // 架构(ADR-10):LLM 只产骨架与锚点;班次数据永远来自能力层(数据包/未来实时API)
-      const context = `已断言日历:${JSON.stringify(state.calendar.assertedWeekdays)}\nprofile:${JSON.stringify(state.profile)}`
+      const context = `${anchorContext()}\n已断言日历:${JSON.stringify(state.calendar.assertedWeekdays)}\nprofile:${JSON.stringify(state.profile)}`
       const out = await chat(
         [{ role: 'system', content: SKELETON_SYSTEM }, { role: 'user', content: `${context}\n\n${historyText(history)}` }],
         true,
@@ -123,6 +130,19 @@ export function createOpenAICompatLlm(flightPackPath?: string): LlmPort {
       packSpec.budgetCny = 9000
       return packSpec
     },
+    async extractSlots(history, now?: Date): Promise<TravelSlotExtraction | null> {
+      // now 可注入(评测固定锚点);过期判定在 flagExpiredSlots(代码层),模型只管逐字抽取
+      const anchor = buildTimeAnchor(now ?? clock())
+      const out = await chat(
+        [{ role: 'system', content: buildSlotSystem(anchor) }, { role: 'user', content: historyText(history) }],
+        true,
+      )
+      const obj = parseJsonBlock(out)
+      if (!obj) return null
+      // language 判定归代码层(detectLanguage),模型输出仅供参考;过期判定同在代码层
+      const ext = normalizeExtraction(obj, history.map(t => t.text).join('\n'))
+      return ext ? flagExpiredSlots(ext, anchor) : null
+    },
     async polishQuestion(q: InterviewQuestion) {
       const out = await chat(
         [{ role: 'system', content: '把旅行规划的追问润色得更自然,保留全部信息(含为什么问),一两句话,不要加表情。' },