@danceiny/gotry 0.0.1-rc.9 → 0.2.0-rc.28

package/ts/src/unified.ts

@@ -7,8 +7,12 @@
 
 import { checkConnectivity } from '../scripts/skeleton-check.ts'
 import type { Candidate, Choice, MotivationProfile, Service, TransferMode, TravelRequest, TrueCost } from './model.ts'
-import { evaluateChoice, minToHhmm, hhmmToMin, requiredUsableHours, trueCostToDict, LATEST_ARRIVE_STAY_MIN } from './model.ts'
+import { evaluateChoice, minToHhmm, hhmmToMin, requiredUsableHours, trueCostToDict, LATEST_ARRIVE_STAY_MIN, doorToDoorFromMove, NonpositiveDurationError } from './model.ts'
 import type { LegReport } from './journey.ts'
+import { withZ3 } from './z3-shared.ts'
+import { t as i18nT } from './i18n.ts'
+import { resolveOffsetForLocalDate, describeResolveFailure, isKnownZoneLoose, readWallParts, wallPartsToIso } from './tz-resolver.ts'
+import { FLIGHT_PACK_VERSION } from './flight-pack-contract.ts'
 
 export interface AnchorsSpec {
   arriveByMin?: number
@@ -34,6 +38,9 @@ export interface MoveSpecTS {
   tzOffsetMin?: number
   /** M-1:出发地 UTC 偏移(工作窗口换算用) */
   originTzOffsetMin?: number
+  /** Issue #343 v2:dep/arr 的 IANA zone(从 option.date + 服务 HH:MM 解析;只读镜像,不算术)。 */
+  ianaDepZone?: string
+  ianaArrZone?: string
 }
 
 /** M-1:旅行者工作窗口(家时区) */
@@ -42,6 +49,14 @@ export interface WorkWindowSpec {
   startMin: number
   endMin: number
   workdays?: number[]
+  /** Issue #343 v2:home IANA zone;overrides numeric `homeTzOffsetMin` when set.
+   *  Used by `workWindowBlocks` to derive a date-sensitive home offset instead of a
+   *  single numeric per-trip shift(原 M-1 数值写法).Mutually exclusive with
+   *  `homeTzOffsetMin` at v2 parse time;不在同一 pack 里同时给两值。 */
+  homeZone?: string
+  /** Issue #343 v2:可选,home 工作窗口的本地表达(hh:mm);缺省回退 start/end 的 min-of-day。 */
+  startHHmm?: string
+  endHHmm?: string
 }
 
 export interface StaySpecTS {
@@ -55,6 +70,8 @@ export interface StaySpecTS {
 export interface SegmentOptionTS {
   id: string
   label: string
+  /** 候选级日期;缺省时使用所属 segment.date */
+  date?: string
   move?: MoveSpecTS
   stay?: StaySpecTS
   score?: number
@@ -83,20 +100,13 @@ export interface JourneySpecTS {
   workWindow?: WorkWindowSpec
   /** 骨架层开关(§7-1):true 时对带 route 提示的段做通航性三值标注 */
   skeletonHub?: boolean
+  /** Internal only; symbol-keyed so JSON/public tool schemas never expose pack version. */
+  readonly [FLIGHT_PACK_VERSION]?: 1 | 2
 }
 
+// Z3 运行时收敛到 z3-shared(单一 WASM 实例 + 单一 Context + 会话级互斥)——
+// 此前模块级 z3Promise 三份并存是 WASM race/OOM 的根因(见 z3-shared.ts 头注)。
 /* eslint-disable @typescript-eslint/no-explicit-any */
-let z3Promise: Promise<any> | null = null
-
-async function getZ3(): Promise<any> {
-  // 延迟到首次实际调用 solveUnified 才加载:避免 dsh 加载 GoTry 模块时启动
-  // WASM worker,引起 worker 线程内存冲突(z3-built.wasm 多线程 unsafe)。
-  if (!z3Promise) {
-    const { init } = await import('z3-solver')
-    z3Promise = (async () => (await init()).Context('main'))()
-  }
-  return z3Promise
-}
 
 /** 航班数据包(data/flights_2026.json 形态)→ 段链 */
 const SEGMENT_ROUTES: Record<string, string> = {
@@ -107,6 +117,13 @@ function routeHint(id: string): string | undefined {
   return SEGMENT_ROUTES[id]
 }
 
+// Issue #620 注:数据包缺 buffer_min/origin_transfer_min/dest_transfer_min 时,
+// 这里的 `Number(undefined)` = NaN 会一路流到求解层。NaN **不在 parse 边界补 0**
+// (补零等于替用户编接驳时间,ADR-10 翻译不造数),也不在这里整包拒收
+// (data/yunnan-pack.json 的 yn0 真值按 meta.reconcil 仍待 founder 校准)。
+// 防线在 solveUnifiedInner 的 assertZ3IntegerInputs:进 Z3 之前逐字段点名,
+// 以显式 solver_error 返回,绝不冒充「不可行」。
+
 // ---- 适配器:旧候选用例(洱海形态:request + candidates)→ 单 choice 段 -------------
 // 与 py unified.py segments_from_candidate 逐行对齐
 
@@ -116,6 +133,7 @@ export function segmentsFromCandidate(req: TravelRequest, candidates: Candidate[
   const options: SegmentOptionTS[] = candidates.map(c => ({
     id: c.id,
     label: c.name,
+    date: c.date,
     score: c.imageryMatch,
     bestMonths: c.bestMonths,
     minDays: c.minDaysForPurpose,
@@ -151,6 +169,17 @@ export function segmentsFromCandidate(req: TravelRequest, candidates: Candidate[
 }
 
 export function parseFlightPackToSpec(pack: Record<string, unknown>): JourneySpecTS {
+  // Issue #343 v2:IANA path;v1(无 version 字段或 version===1)走原数值口径。
+  const version = pack['version'] === undefined ? 1 : Number(pack['version'])
+  if (version === 2) return parseFlightPackToSpecV2(pack)
+  if (version !== 1) {
+    throw Object.assign(new Error(`parseFlightPackToSpec: unsupported pack version ${version}`), { code: 'unsupported_pack_version' })
+  }
+  return parseFlightPackToSpecV1(pack)
+}
+
+/** v1 数值口径(path 保留为 export,便于 §7-1/§6 直接复用与差分) */
+export function parseFlightPackToSpecV1(pack: Record<string, unknown>): JourneySpecTS {
   const legs = (pack['legs'] as Array<Record<string, unknown>>).map(l => ({
     id: String(l['id']),
     role: ((l['services'] as unknown[]).length === 1 ? 'fixed' : 'choice') as 'fixed' | 'choice',
@@ -184,6 +213,7 @@ export function parseFlightPackToSpec(pack: Record<string, unknown>): JourneySpe
       endMin: Number(ww['end_min']),
       workdays: (ww['workdays'] as number[] | undefined) ?? [0, 1, 2, 3, 4],
     } : undefined,
+    [FLIGHT_PACK_VERSION]: 1,
   }
   // M-1:班次的星期标注挂到 Option(缺省=不受工作窗口约束)
   for (const l of pack['legs'] as Array<Record<string, unknown>>) {
@@ -198,31 +228,235 @@ export function parseFlightPackToSpec(pack: Record<string, unknown>): JourneySpe
   return spec
 }
 
+/** Issue #343 v2:IANA zone + 当地日期解析;数值 tz_* 字段不可用(混合形态解析时拒收)。 */
+export function parseFlightPackToSpecV2(pack: Record<string, unknown>): JourneySpecTS {
+  const legsRaw = pack['legs'] as Array<Record<string, unknown>>
+  if (!Array.isArray(legsRaw) || legsRaw.length === 0) {
+    throw Object.assign(new Error('parseFlightPackToSpecV2: legs missing/empty'), { code: 'v2_legs_missing' })
+  }
+  const meta = (pack['meta'] ?? {}) as Record<string, unknown>
+  const ww = meta['work_window'] as Record<string, unknown> | undefined
+
+  const legs: SegmentTS[] = []
+  for (const l of legsRaw) {
+    // v2 不允许混合数值 tz_offset_min/origin_tz_offset_min(早 fail)
+    if ('tz_offset_min' in l || 'origin_tz_offset_min' in l) {
+      throw Object.assign(new Error(`parseFlightPackToSpecV2: leg ${l['id']} has legacy tz_offset_min/origin_tz_offset_min;v2 pack must use iana_*_zone + *_local_date`), { code: 'v2_legacy_offset_mixed' })
+    }
+    const legDate = l['date'] ? String(l['date']) : ''
+    if (!/^\d{4}-\d{2}-\d{2}$/.test(legDate)) {
+      throw Object.assign(new Error(`parseFlightPackToSpecV2: leg ${l['id']} requires ISO date`), { code: 'v2_leg_date_missing' })
+    }
+    const ianaDepZone = String(l['iana_dep_zone'] ?? '')
+    const ianaArrZone = String(l['iana_arr_zone'] ?? '')
+    if (!ianaDepZone || !ianaArrZone) {
+      throw Object.assign(new Error(`parseFlightPackToSpecV2: leg ${l['id']} needs iana_dep_zone and iana_arr_zone`), { code: 'v2_zone_missing' })
+    }
+    const options: SegmentOptionTS[] = (l['services'] as Array<Record<string, unknown>>).map(sv => {
+      const svcDepDate = sv['dep_local_date'] ? String(sv['dep_local_date']) : legDate
+      const svcArrDate = sv['arr_local_date'] ? String(sv['arr_local_date']) : legDate
+      const depZone = sv['iana_dep_zone'] ? String(sv['iana_dep_zone']) : ianaDepZone
+      const arrZone = sv['iana_arr_zone'] ? String(sv['iana_arr_zone']) : ianaArrZone
+      const depR = resolveOffsetForLocalDate(depZone, svcDepDate, String(sv['dep']))
+      if (!depR.ok) {
+        throw Object.assign(new Error(`parseFlightPackToSpecV2: dep zone/date failure: ${describeResolveFailure(depR)}`), { code: 'v2_dep_resolve_failed' })
+      }
+      const arrR = resolveOffsetForLocalDate(arrZone, svcArrDate, String(sv['arr']))
+      if (!arrR.ok) {
+        throw Object.assign(new Error(`parseFlightPackToSpecV2: arr zone/date failure: ${describeResolveFailure(arrR)}`), { code: 'v2_arr_resolve_failed' })
+      }
+      // Issue #343 root 复核:d2d canonical 输入必须在 parse 边界校验严格 chronologically after,
+      // 否则把病态数据喂给 model.doorToDoorFromMove → throw NonpositiveDurationError → 被
+      // solveUnified WASM guard 误报为 wasm_runtime_error。
+      if (arrR.utcMs <= depR.utcMs) {
+        throw Object.assign(new Error(
+          `parseFlightPackToSpecV2: service ${String(sv['id'])} arrival instant (${new Date(arrR.utcMs).toISOString()}) must be strictly after departure instant (${new Date(depR.utcMs).toISOString()})`,
+        ), { code: 'v2_arr_not_after_dep' })
+      }
+      // tzOffsetMin = arr - dep(positive = 抵达地更靠东)
+      const tzOffsetMin = arrR.offsetMin - depR.offsetMin
+      return {
+        id: String(sv['id']),
+        label: `${String(sv['id'])} ${String(l['note'] ?? '').slice(0, 18)}`,
+        date: svcDepDate,
+        move: {
+          hub: String(l['hub'] ?? ''),
+          services: [{
+            id: String(sv['id']),
+            depMin: hhmmToMin(String(sv['dep'])),
+            arrMin: hhmmToMin(String(sv['arr'])),
+            priceCny: Number(sv['price_cny']),
+            // Issue #343 v2:把"墙上时刻"投影成真实 UTC instant 留给 evaluate / workWindow 用;
+            // d2d 公式走 (arrUtcMs - depUtcMs)/60000,跨日 / DST / 反向日界线都正确。
+            depUtcMs: depR.utcMs,
+            arrUtcMs: arrR.utcMs,
+          }],
+          bufferMin: Number(l['buffer_min']),
+          originTransferMin: Number(l['origin_transfer_min']),
+          destTransferMin: Number(l['dest_transfer_min']),
+          redEye: Boolean(l['red_eye']),
+          redEyeDurationMin: Number(sv['red_eye_duration_min'] ?? l['red_eye_duration_min'] ?? 0),
+          groundRecoveryMin: l['ground_recovery_min'] ? Number(l['ground_recovery_min']) : undefined,
+          tzOffsetMin,
+          originTzOffsetMin: depR.offsetMin,
+          ianaDepZone: depZone,
+          ianaArrZone: arrZone,
+        },
+        depWeekday: weekdayFromYmd(svcDepDate),
+      }
+    })
+
+    const role = ((l['services'] as unknown[]).length === 1 ? 'fixed' : 'choice') as 'fixed' | 'choice'
+    legs.push({
+      id: String(l['id']),
+      role,
+      note: l['note'] ? String(l['note']) : undefined,
+      date: legDate,
+      anchors: { arriveByMin: l['arrive_by'] ? hhmmToMin(String(l['arrive_by'])) : undefined },
+      route: routeHint(l['id'] as string),
+      options,
+    })
+  }
+
+  // work_window:home_zone 必需(v2 的 home 偏移走 IANA,数值字段不再权威);同时给两值报 reject。
+  let workWindow: WorkWindowSpec | undefined
+  if (ww) {
+    const hasHomeZone = Boolean(ww['home_zone'])
+    const hasHomeNum = ww['home_tz_offset_min'] !== undefined
+    if (hasHomeZone && hasHomeNum) {
+      throw Object.assign(new Error('parseFlightPackToSpecV2: work_window cannot combine home_zone and home_tz_offset_min'), { code: 'v2_ww_conflict' })
+    }
+    if (!hasHomeZone) {
+      throw Object.assign(new Error('parseFlightPackToSpecV2: work_window.home_zone is required for v2'), { code: 'v2_ww_home_zone_required' })
+    }
+    // 在 v2 parse 边界即时验证 home_zone 是已知 IANA zone(root counterexample #3:不许 fail-open)。
+    // 用 tz-resolver 的 isKnownZoneLoose:接受 Intl.DateTimeFormat 能识别的合法 alias(US/Pacific / ROK / Etc/GMT+8)。
+    const homeZone = String(ww['home_zone'])
+    if (!isKnownZoneLoose(homeZone)) {
+      throw Object.assign(new Error(`parseFlightPackToSpecV2: work_window.home_zone '${homeZone}' is not a known IANA zone`), { code: 'v2_home_zone_unknown' })
+    }
+    const startHHmm = ww['start'] ? String(ww['start']) : undefined
+    const endHHmm = ww['end'] ? String(ww['end']) : undefined
+    const startMin = ww['start_min'] !== undefined ? Number(ww['start_min']) : (startHHmm ? hhmmToMin(startHHmm) : hhmmToMin('10:00'))
+    const endMin = ww['end_min'] !== undefined ? Number(ww['end_min']) : (endHHmm ? hhmmToMin(endHHmm) : hhmmToMin('19:00'))
+    // numeric homeTzOffsetMin 仅占位:在 v2 工作窗口过滤时按 home_zone + dep_date 重算;预填 leg-date 占位 0
+    workWindow = {
+      homeTzOffsetMin: 0,
+      startMin,
+      endMin,
+      workdays: (ww['workdays'] as number[] | undefined) ?? [0, 1, 2, 3, 4],
+      homeZone,
+      startHHmm,
+      endHHmm,
+    }
+  }
+
+  return { segments: legs, workWindow, [FLIGHT_PACK_VERSION]: 2 }
+}
+
 const WEEKDAY_IDX: Record<string, number> = { mon: 0, tue: 1, wed: 2, thu: 3, fri: 4, sat: 5, sun: 6 }
 const WEEKDAY_CN: Record<string, string> = { mon: '一', tue: '二', wed: '三', thu: '四', fri: '五', sat: '六', sun: '日' }
 
-/** M-1:工作日的工作窗口内起飞 → 排除理由;否则 null(与 py _work_window_blocks 对齐)。 */
+/** YYYY-MM-DD → mon/tue/wed/thu/fri/sat/sun;v2 路径给 option 标 depWeekday 用。 */
+export function weekdayFromYmd(ymd: string): string {
+  const m = ymd.match(/^(\d{4})-(\d{2})-(\d{2})$/)
+  if (!m) throw new Error(`weekdayFromYmd: bad ymd ${ymd}`)
+  const dow = new Date(Date.UTC(Number(m[1]), Number(m[2]) - 1, Number(m[3]))).getUTCDay()
+  return ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'][dow]!
+}
+
+/** M-1:工作日的工作窗口内起飞 → 排除理由;否则 null(与 py _work_window_blocks 对齐)。
+ *
+ * Issue #343 v2:home zone 存在时,必须把"出发真实 UTC instant"投影到 home zone
+ * 取该 zone 的 date/weekday/HH:MM(root counterexample #2:Tokyo 06:30 ≈ LA 14:30 prev day);
+ * 不再用 dep-local date 直接当 home date。
+ *
+ * root 评审复核:`depUtcMs` 是已知确定的 instant,直接 `readWallParts(homeZone, depUtcMs)`
+ * 取墙时分量 — 不要把 projected wall time 再喂给 `resolveOffsetForLocalDate` 重做 ±14h 扫描,
+ * 否则秋回退日 01:30 会被错误判为 overlap_ambiguous 而 fail-open(已知 instant 永远唯一)。
+ *
+ * dep/arr 的"墙上本地输入"(leg-level `dep`/`arr` 字段)由 parseFlightPackToSpecV2 在
+ * 解析时已用 `resolveOffsetForLocalDate` 拒过 gap/overlap,所以 leg 进 solver 时
+ * 两个 instant 一定 strict-after 且偏移已知。
+ *
+ * home zone 未知时由 v2 parse 边界直接抛 v2_home_zone_unknown 拒绝;
+ * 这里兜底只在 v1 legacy 路径出现。
+ */
 function workWindowBlocks(spec: JourneySpecTS, option: SegmentOptionTS): string | null {
   const ww = spec.workWindow
   if (!ww || !option.move || !option.depWeekday) return null
-  if (!((ww.workdays ?? [0, 1, 2, 3, 4]).includes(WEEKDAY_IDX[option.depWeekday]))) return null
-  const dep = option.move.services[0].depMin
-  const shift = (option.move.originTzOffsetMin ?? 480) - ww.homeTzOffsetMin
-  const start = ww.startMin + shift, end = ww.endMin + shift
-  if (start <= dep && dep <= end) {
+
+  const svc = option.move.services[0]
+  const dep = svc.depMin
+  const homeZone = ww.homeZone
+
+  let homeOffsetMin = ww.homeTzOffsetMin
+  let homeDepMin: number | undefined
+  let homeDepWeekday: string | undefined
+
+  if (homeZone) {
+    if (typeof svc.depUtcMs !== 'number') {
+      // v2 路径必然填了 depUtcMs;没填 = 数据病,按 red flag 排除该 option。
+      return i18nT('un.workwindow_unresolvable_reason', {
+        reason: `home zone ${homeZone} requires UTC dep instant (v2 path bug)`,
+      })
+    }
+    // 已知 instant 直接投影到 home zone 的墙时 — 无歧义,不必也不应重走 ±14h 扫描。
+    const homeParts = readWallParts(homeZone, svc.depUtcMs)
+    const homeIso = wallPartsToIso(homeParts)
+    homeDepMin = hhmmToMin(homeIso.hhmm)
+    homeDepWeekday = weekdayFromYmd(homeIso.ymd)
+  }
+
+  const effectiveDep = homeDepMin ?? dep
+  const effectiveWeekday = homeDepWeekday ?? option.depWeekday
+  if (!((ww.workdays ?? [0, 1, 2, 3, 4]).includes(WEEKDAY_IDX[effectiveWeekday]))) return null
+
+  // v2:startMin/endMin 与 homeDepMin 都是 home-zone 墙时分量(已 IANA 归一),
+  // 直接比较;不再做 originTzOffsetMin 偏移(root 复核该 shift 是 v1 数值残留,会让窗口错位)。
+  // v1 路径(无 homeZone, 走数值 homeTzOffsetMin)保留 shift 兼容旧 spec。
+  let start: number, end: number
+  if (homeZone) {
+    start = ww.startMin
+    end = ww.endMin
+  } else {
+    const shift = (option.move.originTzOffsetMin ?? 480) - homeOffsetMin
+    start = ww.startMin + shift
+    end = ww.endMin + shift
+  }
+  if (start <= effectiveDep && effectiveDep <= end) {
     const hhmm = (m: number) => `${String(Math.floor(m / 60)).padStart(2, '0')}:${String(m % 60).padStart(2, '0')}`
-    return `周${WEEKDAY_CN[option.depWeekday]} ${hhmm(dep)} 起飞落在工作窗口(当地 ${hhmm(start)}-${hhmm(end)})内`
+    return i18nT('un.workwindow_reason', {
+      wd: WEEKDAY_CN[effectiveWeekday] ?? '', dep: hhmm(effectiveDep), start: hhmm(start), end: hhmm(end),
+    })
   }
   return null
 }
 
-/** D-5:时区感知的段核算(与 py unified._evaluate_option_move 对齐)。 */
+/** D-5:时区感知的段核算(与 py unified._evaluate_option_move 对齐)。
+ *
+ * Issue #343 d2d 算术唯一权威入口 = model.ts 的 `doorToDoorFromMove`。
+ * v2 路径会传 Service.depUtcMs/arrUtcMs(由 parseFlightPackToSpecV2 用 tz-resolver 投出),
+ * 此时 d2d 用真实 UTC instant 差 — 跨日 / 反向日界线 / DST 切换都正确;v2 arr<=dep 抛
+ * NonpositiveDurationError → 该 option 当作不可行(由 solveUnifiedInner 转 unsat_core)。
+ * v1 数值口径无 UTC 字段,走老 (arrMin - depMin) - tzOffsetMin;字节不变。
+ */
 function evaluateOptionMove(segId: string, mv: MoveSpecTS): LegReport & { d2d_min?: number } {
   const svc = mv.services[0]
+  let d2dMin: number
+  try {
+    d2dMin = doorToDoorFromMove(svc, mv).doorToDoorMin
+  } catch (e) {
+    if (e instanceof NonpositiveDurationError) {
+      // d2d 病态输入 → 把这条 option 抛红 flag;这里走结构化 reject 而非吞错。
+      throw Object.assign(new Error(`evaluateOptionMove ${segId}/${svc.id}: ${e.message}`), {
+        code: e.code,
+        kind: e.kind,
+      })
+    }
+    throw e
+  }
   const wake = svc.depMin - mv.bufferMin - mv.originTransferMin
-  // 真实时长 = (到达−出发) − 时差;EK329: 215−(−240)=455min=7h35m
-  const trueFlight = (svc.arrMin - svc.depMin) - (mv.tzOffsetMin ?? 0)
-  const d2d = mv.bufferMin + mv.originTransferMin + trueFlight + mv.destTransferMin
   const wakeDisplay = wake < 0 ? `${minToHhmm(wake + 1440)}(前一日)` : minToHhmm(wake)
   const arriveStay = svc.arrMin + mv.destTransferMin
 
@@ -238,7 +472,7 @@ function evaluateOptionMove(segId: string, mv: MoveSpecTS): LegReport & { d2d_mi
     if (wake < 5 * 60) energy -= 30
     else if (wake < 6 * 60) energy -= 25
     if (arriveStay > 21 * 60) energy -= 10
-    if (d2d > 6 * 60) energy -= 10
+    if (d2dMin > 6 * 60) energy -= 10
     energy = Math.max(0, energy)
   }
   return {
@@ -247,44 +481,109 @@ function evaluateOptionMove(segId: string, mv: MoveSpecTS): LegReport & { d2d_mi
     wake: wakeDisplay,
     wakeMin: wake,
     arrive_stay: minToHhmm(arriveStay),
-    door_to_door: `${Math.floor(d2d / 60)}h${String(d2d % 60).padStart(2, '0')}m`,
-    d2d_min: d2d,
+    door_to_door: `${Math.floor(d2dMin / 60)}h${String(d2dMin % 60).padStart(2, '0')}m`,
+    d2d_min: d2dMin,
     energy_pct: Math.round(energy),
     price_cny: svc.priceCny,
   }
 }
 
-/** 航班链形态求解:按 Option 选择,锚点命名约束,core 剥竖线(D-2 修复) */
-export async function solveUnified(spec: JourneySpecTS): Promise<{
+function releaseZ3(resource: { release?: () => void } | null | undefined): void {
+  if (typeof resource?.release === 'function') resource.release()
+}
+
+/**
+ * Issue #620:求解器自身失败的显式类别。**不是 unsat_core**——判定缺席,不是「不可行」。
+ * 机器 token 只住在 `code` 里,不得渲染进任何用户面「冲突」文案。
+ */
+export type SolverErrorInfo = {
+  /** `solver_input_not_integer` = spec 里有非整数进不了 Z3 整数编码(确定性,可定位到字段);
+   *  `solver_runtime_error` = z3-solver / WASM 运行时异常(含真正的内存/竞态形态)。 */
+  code: 'solver_input_not_integer' | 'solver_runtime_error'
+  message: string
+}
+
+export interface UnifiedSolveResult {
+  /** `solver_error` 存在时,`feasible: false` 只表示「没有产出可行解」,
+   *  **不表示「不可行」**——那一轮根本没有判定。读者必须先看 `solver_error`。 */
   feasible: boolean
   money_cny?: number
-  legs?: Array<LegReport & { leg: string }>
+  legs?: Array<LegReport & { leg: string; d2d_min?: number }>
   red_flags?: string[]
   unsat_core?: string[]
   suggestions?: Array<{ relax: string; money_cny: number }>
   work_window_exclusions?: Array<{ segment: string; option: string; reason: string }>
   skeleton_notes?: string[]
-}> {
-  // WASM 防护:如果 z3-solver 加载或求解触发 memory access 错误,不让异常穿透到进程层把 dsh 杀掉。
-  // 候选形态走 solveChoiceSegment 不经过这里——这里是显式航班链路径,用户量较少。
+  solver_error?: SolverErrorInfo
+}
+
+/** Issue #620:进 Z3 前的输入类型闸。`Int.val(NaN|Infinity|小数)` 在 WASM 里是
+ *  `Assertion failed`,不是一个可解释的判定——所以在构造 AST 之前抛可定位的类型化错误。 */
+export class SolverInputError extends Error {
+  readonly code = 'solver_input_not_integer' as const
+  constructor(message: string) {
+    super(message)
+    this.name = 'SolverInputError'
+  }
+}
+
+/** 把所有将要变成 `Int.val(...)` 的数验成有限整数;违例逐项点名(段/候选/字段)。 */
+function assertZ3IntegerInputs(spec: JourneySpecTS, wakeFloorMin: number): void {
+  const bad: string[] = []
+  const check = (where: string, value: unknown): void => {
+    // NaN/Infinity 经 JSON.stringify 会变成 "null",诊断信息就丢了——数值一律按原文印。
+    if (!Number.isInteger(value)) bad.push(`${where}=${typeof value === 'number' ? String(value) : JSON.stringify(value)}`)
+  }
+  check('wakeFloorMin', wakeFloorMin)
+  if (spec.budgetCny !== undefined) check('budgetCny', spec.budgetCny)
+  for (const seg of spec.segments) {
+    if (seg.anchors?.arriveByMin !== undefined) check(`${seg.id}.anchors.arriveByMin`, seg.anchors.arriveByMin)
+    if (seg.anchors?.departAfterMin !== undefined) check(`${seg.id}.anchors.departAfterMin`, seg.anchors.departAfterMin)
+    // 段级 wake/arriveStay 编码只取 options[0].move 的接驳口径(见下方 o0)。
+    const o0 = seg.options[0]?.move
+    if (o0) {
+      check(`${seg.id}.bufferMin`, o0.bufferMin)
+      check(`${seg.id}.originTransferMin`, o0.originTransferMin)
+      check(`${seg.id}.destTransferMin`, o0.destTransferMin)
+    }
+    for (const opt of seg.options) {
+      const svc = opt.move?.services[0]
+      if (!svc) {
+        bad.push(`${seg.id}/${opt.id}.services[0]=missing`)
+        continue
+      }
+      check(`${seg.id}/${opt.id}.depMin`, svc.depMin)
+      check(`${seg.id}/${opt.id}.arrMin`, svc.arrMin)
+      check(`${seg.id}/${opt.id}.priceCny`, svc.priceCny)
+    }
+  }
+  if (bad.length > 0) {
+    throw new SolverInputError(
+      `solveUnified: Z3 整数编码只接受有限整数,下列输入不是(issue #620):${bad.slice(0, 8).join('、')}`
+      + (bad.length > 8 ? `(共 ${bad.length} 处)` : ''),
+    )
+  }
+}
+
+/** 航班链形态求解:按 Option 选择,锚点命名约束,core 剥竖线(D-2 修复) */
+export async function solveUnified(spec: JourneySpecTS): Promise<UnifiedSolveResult> {
+  // 求解器失败防护:z3-solver 加载/求解异常不让它穿透到进程层把 dsh 杀掉。
+  // 但也**不冒充判定**(issue #620):崩溃以 solver_error 显式返回,unsat_core 保持缺席,
+  // 否则「引擎故障」会被下游当成「你的行程不可行」,理由位置上还放着机器 token。
+  // 候选形态走 solveChoiceSegment 不经过这里——这里是显式航班链路径。
   try {
     return await solveUnifiedInner(spec)
   } catch (e) {
-    console.error('[gotry] solveUnified failed (likely wasm thread race):', (e as Error).message?.slice(0, 200))
-    return { feasible: false, unsat_core: ['wasm_runtime_error'], red_flags: ['WASM 求解器异常,建议下次用候选形态(枚举)重试'] }
+    const err = e instanceof Error ? e : new Error(String(e))
+    const code: SolverErrorInfo['code'] = err instanceof SolverInputError ? err.code : 'solver_runtime_error'
+    const message = (err.message ?? '').slice(0, 200)
+    // 措辞纪律:不再写「likely wasm thread race」——#620 证明它也可能是确定性的输入错误。
+    console.error(`[gotry] solveUnified aborted — ${code}(求解器失败,不是「不可行」判定):`, message)
+    return { feasible: false, solver_error: { code, message } }
   }
 }
 
-async function solveUnifiedInner(spec: JourneySpecTS): Promise<{
-  feasible: boolean
-  money_cny?: number
-  legs?: Array<LegReport & { leg: string }>
-  red_flags?: string[]
-  unsat_core?: string[]
-  suggestions?: Array<{ relax: string; money_cny: number }>
-  work_window_exclusions?: Array<{ segment: string; option: string; reason: string }>
-  skeleton_notes?: string[]
-}> {
+async function solveUnifiedInner(spec: JourneySpecTS): Promise<UnifiedSolveResult> {
   // M-1:求解前的工作窗口确定性预过滤(与 py 对齐),排除理由入记录
   // 骨架层(§7-1):三值语义标注——枢纽间否定只降权不排除(骨架滞后会错杀 EK329)
   const skeletonNotes: string[] = []
@@ -310,9 +609,16 @@ async function solveUnifiedInner(spec: JourneySpecTS): Promise<{
     }
   }
 
-  const z3 = await getZ3()
+  // Issue #620:类型闸在 Z3 会话之外先跑——非整数输入不许进 WASM(进去就是
+  // `Assertion failed`,还会污染共享实例)。抛 SolverInputError,由 solveUnified 归类。
+  const wakeFloorPre = spec.defaultWakeFloorMin ?? hhmmToMin('06:00')
+  assertZ3IntegerInputs(spec, wakeFloorPre)
+
+  // Z3 会话进互斥门(骨架/预过滤等网络段留在门外):solveUnifiedInner 的判定段
+  // 从 here 到 return 全部独占共享实例。
+  return withZ3('unified.solveUnifiedInner', async z3 => {
   const { Bool, If, Int, Solver, Sum } = z3
-  const wakeFloor = spec.defaultWakeFloorMin ?? hhmmToMin('06:00')
+  const wakeFloor = wakeFloorPre
 
   const allSels: Record<string, any[]> = {}
   const assertions: Record<string, any> = {}
@@ -348,50 +654,77 @@ async function solveUnifiedInner(spec: JourneySpecTS): Promise<{
   }
 
   const s = new Solver()
-  for (const sel of Object.values(allSels)) s.add(exactlyOne(sel))
-  for (const [name, expr] of Object.entries(assertions)) s.addAndTrack(expr, name)
-
-  const report = async (model: any): Promise<Array<LegReport & { leg: string }>> => {
-    const out: Array<LegReport & { leg: string }> = []
-    for (const seg of spec.segments) {
-      for (let i = 0; i < allSels[seg.id].length; i++) {
-        const v = await maybeAwait(model.eval(allSels[seg.id][i], true))
-        if (String(v) !== 'true') continue
-        const o = seg.options[i]
-        out.push({ leg: seg.id, ...evaluateOptionMove(seg.id, o.move!) })
-        break
-      }
+  let sOpen = true
+  const closeS = () => {
+    if (sOpen) {
+      releaseZ3(s)
+      sOpen = false
     }
-    return out
-  }
-
-  async function maybeAwait<T>(v: T | Promise<T>): Promise<T> {
-    return v instanceof Promise ? await v : v
   }
+  try {
+    for (const sel of Object.values(allSels)) s.add(exactlyOne(sel))
+    for (const [name, expr] of Object.entries(assertions)) s.addAndTrack(expr, name)
+
+    const report = async (model: any): Promise<Array<LegReport & { leg: string }>> => {
+      const out: Array<LegReport & { leg: string }> = []
+      for (const seg of spec.segments) {
+        for (let i = 0; i < allSels[seg.id].length; i++) {
+          const v = await maybeAwait(model.eval(allSels[seg.id][i], true))
+          if (String(v) !== 'true') continue
+          const o = seg.options[i]
+          out.push({ leg: seg.id, ...evaluateOptionMove(seg.id, o.move!) })
+          break
+        }
+      }
+      return out
+    }
 
-  if (String(await s.check()) !== 'unsat') {
-    const legs = await report(s.model())
-    const money = legs.reduce((a, l) => a + l.price_cny, 0)
-    const redFlags = legs
-      .filter(l => spec.segments.find(sg => sg.id === l.leg)?.options.some(o => o.move?.redEye) && l.energy_pct < 50)
-      .map(l => `${l.leg} 落地精力仅 ${l.energy_pct}%(红眼后直奔事务,当日不宜安排重要会议)`)
-    return { feasible: true, money_cny: money, legs, red_flags: redFlags, work_window_exclusions: exclusions, skeleton_notes: skeletonNotes.length ? skeletonNotes : undefined }
-  }
+    async function maybeAwait<T>(v: T | Promise<T>): Promise<T> {
+      return v instanceof Promise ? await v : v
+    }
 
-  const core = coreOf(s).sort()
-  const suggestions: Array<{ relax: string; money_cny: number }> = []
-  for (const name of core) {
-    const s2 = new Solver()
-    for (const sel of Object.values(allSels)) s2.add(exactlyOne(sel))
-    for (const [n2, expr] of Object.entries(assertions)) {
-      if (n2 !== name) s2.addAndTrack(expr, n2)
+    if (String(await s.check()) !== 'unsat') {
+      const model = s.model()
+      try {
+        const legs = await report(model)
+        const money = legs.reduce((a, l) => a + l.price_cny, 0)
+        const redFlags = legs
+          .filter(l => spec.segments.find(sg => sg.id === l.leg)?.options.some(o => o.move?.redEye) && l.energy_pct < 50)
+          .map(l => i18nT('un.redflag_redeye', { leg: l.leg, pct: l.energy_pct }))
+        return { feasible: true, money_cny: money, legs, red_flags: redFlags, work_window_exclusions: exclusions, skeleton_notes: skeletonNotes.length ? skeletonNotes : undefined }
+      } finally {
+        releaseZ3(model)
+      }
     }
-    if (String(await s2.check()) !== 'unsat') {
-      const legs = await report(s2.model())
-      suggestions.push({ relax: name, money_cny: legs.reduce((a, l) => a + l.price_cny, 0) })
+
+    const core = coreOf(s).sort()
+    const suggestions: Array<{ relax: string; money_cny: number }> = []
+    closeS()
+    for (const name of core) {
+      const s2 = new Solver()
+      try {
+        for (const sel of Object.values(allSels)) s2.add(exactlyOne(sel))
+        for (const [n2, expr] of Object.entries(assertions)) {
+          if (n2 !== name) s2.addAndTrack(expr, n2)
+        }
+        if (String(await s2.check()) !== 'unsat') {
+          const model = s2.model()
+          try {
+            const legs = await report(model)
+            suggestions.push({ relax: name, money_cny: legs.reduce((a, l) => a + l.price_cny, 0) })
+          } finally {
+            releaseZ3(model)
+          }
+        }
+      } finally {
+        releaseZ3(s2)
+      }
     }
+    return { feasible: false, unsat_core: core, suggestions }
+  } finally {
+    closeS()
   }
-  return { feasible: false, unsat_core: core, suggestions }
+  })
 }
 
 // ---- 候选形态求解(枚举过滤,与 py solve_choice_segment 对齐) --------------------
@@ -504,7 +837,7 @@ export function solveChoiceSegment(spec: JourneySpecTS, req: TravelRequest): Rec
         conds['budget_cny'] = Math.min(...budgetDropped.map(c => c.cost.moneyCny))
       }
       if (opt.bestMonths?.length) conds['best_months'] = opt.bestMonths
-      wish = { name: opt.label, conditions: conds, reason: `${windowDays} 天窗口装不下(目的需 ${minDays} 天)` }
+      wish = { name: opt.label, conditions: conds, reason: i18nT('sg.wish_reason_window', { days: windowDays, minDays }) }
     }
     verdicts.push({
       candidate_id: opt.id, name: opt.label, feasible: false, imagery_match: opt.score ?? 0,
@@ -524,57 +857,63 @@ function renderCandidateMarkdown(req: TravelRequest, verdicts: Array<Record<stri
   const feasible = verdicts.filter(v => v['feasible']).sort((a, b) => (b['imagery_match'] as number) - (a['imagery_match'] as number))
   const parked = verdicts.filter(v => !v['feasible'])
   const lines: string[] = []
-  lines.push(`> 憧憬:${req.note}`)
-  lines.push(`> 已识别约束:窗口 ${req.windowDays} 天 | 预算 ¥${req.budgetCny} | `
-    + `动机(休整改写需求 ${requiredUsableHours(req.motivation).toFixed(1)}h 有效休整)`)
+  lines.push(i18nT('md.header', { note: req.note }))
+  lines.push(i18nT('md.constraints', {
+    days: req.windowDays, budget: req.budgetCny,
+    hours: requiredUsableHours(req.motivation).toFixed(1),
+  }))
   lines.push('')
   for (const v of parked) {
     const core = (v['unsat_core'] as string[]) ?? []
-    lines.push(`**${v['name']}:现在不行**——冲突约束:${core.join('、')}。`)
+    lines.push(i18nT('md.infeasible', { name: String(v['name']), core: core.join('、') }))
     const sug = ((v['suggestions'] as Array<Record<string, unknown>>) ?? [])[0]
-    if (sug) lines.push(`- 放宽 ${sug['relax']}:约 ¥${sug['resulting_money_cny']}`)
+    if (sug) lines.push(i18nT('md.relax_one', { relax: String(sug['relax']), money: String(sug['resulting_money_cny'] ?? '') }))
     const wish = v['wish_pool'] as Record<string, unknown> | null
     if (wish) {
       const conds = wish['conditions'] as Record<string, unknown>
-      const budgetNote = conds['budget_cny'] ? `、约 ¥${conds['budget_cny']}` : ''
+      const budgetNote = conds['budget_cny'] ? i18nT('md.wish_budget', { cny: String(conds['budget_cny']) }) : ''
       const months = conds['best_months'] as number[] | undefined
-      const season = months ? `,${months} 月最佳` : ''
-      lines.push(`- 已放入「下一次出发」清单:需要 ${conds['days']} 天${budgetNote}${season}`)
+      const season = months ? i18nT('md.wish_season', { months: String(months) }) : ''
+      lines.push(i18nT('md.wish_pool', { days: String(conds['days']), budgetNote, season }))
     }
   }
   lines.push('')
   for (const v of feasible) {
     const ch = v['chosen'] as Record<string, unknown>
-    const t = v['true_cost'] as Record<string, unknown>
-    lines.push(`**${v['name']}:可行**`
-      + `(${ch['out_service']} 出发,${ch['out_transfer']} 接驳,`
-      + `起床 ${t['wake']},到达精力 ${t['energy_arrival_pct']}%,`
-      + `门到门 ${t['door_to_door_out']},有效休整 ${t['usable_hours']}h,共 ¥${t['money_cny']})`)
+    const tc = v['true_cost'] as Record<string, unknown>
+    lines.push(i18nT('md.feasible_unified', {
+      name: String(v['name']), svc: String(ch['out_service']), mode: String(ch['out_transfer']),
+      wake: String(tc['wake']), energy: String(tc['energy_arrival_pct']), d2d: String(tc['door_to_door_out']),
+      hours: String(tc['usable_hours']), money: String(tc['money_cny']),
+    }))
   }
   if (feasible.length) {
     lines.push('')
     const best = feasible[0]
     const alt = feasible[1]
-    lines.push(`**建议:${best['name']}**(意象匹配 ${((best['imagery_match'] as number) * 100).toFixed(0)}%)。`
-      + (alt ? `备选:${alt['name']}(¥${(alt['true_cost'] as Record<string, unknown>)['money_cny']},匹配 ${((alt['imagery_match'] as number) * 100).toFixed(0)}%)。` : ''))
+    lines.push(i18nT('md.recommend', { best: String(best['name']), match: ((best['imagery_match'] as number) * 100).toFixed(0) })
+      + (alt ? i18nT('md.alt', {
+        name: String(alt['name']), money: String((alt['true_cost'] as Record<string, unknown>)['money_cny']),
+        match: ((alt['imagery_match'] as number) * 100).toFixed(0),
+      }) : ''))
   }
   lines.push('')
-  lines.push('**待你决定的两个问题**:')
+  lines.push(i18nT('md.decide_two'))
   if (feasible.length >= 2) {
-    lines.push(`1. ${feasible[0]['name']} 还是 ${feasible[1]['name']}?(前者更贴意象,后者更省)`)
+    lines.push(i18nT('md.q_choice', { a: String(feasible[0]['name']), b: String(feasible[1]['name']) }))
   } else if (feasible.length === 1) {
-    lines.push(`1. 就去 ${feasible[0]['name']} 吗?`)
+    lines.push(i18nT('md.q_single', { name: String(feasible[0]['name']) }))
   } else {
-    lines.push('1. 所有候选都不可行——考虑放宽哪条约束?')
+    lines.push(i18nT('md.q_none'))
   }
   const p0 = parked[0]
   const p0wish = p0?.['wish_pool'] as Record<string, unknown> | null
   if (p0wish) {
     const conds = p0wish['conditions'] as Record<string, unknown>
-    lines.push(`2. 把 ${p0!['name']} 留给「下一次出发」(${conds['days']} 天起),这次先去可行的?`)
+    lines.push(i18nT('md.q_wish', { name: String(p0!['name']), days: String(conds['days']) }))
   } else if (feasible.length) {
     const ch = feasible[0]['chosen'] as Record<string, unknown>
-    lines.push(`2. 出发班次选 ${ch['out_service']} 还是更晚的?`)
+    lines.push(i18nT('md.q_depart', { id: String(ch['out_service']), dep: '' }))
   }
   return lines.join('\n')
 }