@danceiny/gotry 0.0.1-rc.21 → 0.0.1-rc.24

package/ts/capabilities/artifacts.ts

@@ -13,7 +13,8 @@
  * 文本类(md/txt/json/jsonl/csv/log/yaml/yml)——本工具是「产物查看」,不是通用文件浏览器。
  */
 
-import { readdir, readFile, stat } from 'node:fs/promises'
+import { createHash } from 'node:crypto'
+import { readdir, readFile, realpath, stat } from 'node:fs/promises'
 import { existsSync } from 'node:fs'
 import { isAbsolute, join, resolve, sep } from 'node:path'
 
@@ -31,11 +32,14 @@ export interface ArtifactEntry {
 
 export interface ArtifactReadView {
   ok: true
+  source: 'state-root' | 'cwd'
   path: string
   offset: number
   lines: Array<{ number: number; text: string }>
   totalLines: number
   lang?: string
+  /** Short content fingerprint shown by the Web Client to distinguish refreshes. */
+  version: string
   content: string
   windowed: boolean
 }
@@ -100,6 +104,8 @@ async function listDeliverableFiles(root: string, limit: number): Promise<Artifa
     const p = join(dir, n)
     const st = await stat(p).catch(() => null)
     if (!st?.isFile()) continue
+    const canonical = await realpath(p).catch(() => null)
+    if (!canonical || !underRoot(canonical, root) || hasDeniedSegment(canonical)) continue
     entries.push({
       source: 'async-run',
       id: n.replace(/\.deliverable\.md$/, ''),
@@ -127,6 +133,8 @@ async function listCwdMarkdown(cwd: string, limit: number): Promise<ArtifactEntr
     const p = join(cwd, d.name)
     const st = await stat(p).catch(() => null)
     if (!st) continue
+    const canonical = await realpath(p).catch(() => null)
+    if (!canonical || !underRoot(canonical, cwd) || hasDeniedSegment(canonical)) continue
     entries.push({
       source: 'cwd-file',
       id: d.name,
@@ -147,10 +155,12 @@ export async function listArtifacts(opts: {
   const limit = Math.max(1, Math.min(opts.limit ?? 20, MAX_LIST))
   const root = rootOf(opts.stateRoot)
   const cwd = opts.cwd ? resolve(opts.cwd) : process.cwd()
+  const canonicalRoot = await realpath(root).catch(() => root)
+  const canonicalCwd = await realpath(cwd).catch(() => cwd)
 
   const seenPath = new Set<string>()
   const merged: ArtifactEntry[] = []
-  for (const e of [...listRunsFromLedger(root, 'local', limit), ...(await listDeliverableFiles(root, limit)), ...(await listCwdMarkdown(cwd, limit))]) {
+  for (const e of [...listRunsFromLedger(canonicalRoot, 'local', limit), ...(await listDeliverableFiles(canonicalRoot, limit)), ...(await listCwdMarkdown(canonicalCwd, limit))]) {
     if (seenPath.has(e.path)) continue
     seenPath.add(e.path)
     merged.push(e)
@@ -158,7 +168,7 @@ export async function listArtifacts(opts: {
   merged.sort((a, b) => String(b.updated ?? '').localeCompare(String(a.updated ?? '')))
 
   const total = merged.length
-  return { artifacts: merged.slice(0, limit), total, truncated: total > limit, roots: [root, cwd] }
+  return { artifacts: merged.slice(0, limit), total, truncated: total > limit, roots: [canonicalRoot, canonicalCwd] }
 }
 
 /**
@@ -177,6 +187,8 @@ export async function readArtifact(opts: {
 }): Promise<ArtifactReadView | { ok: false; error: string; hint?: string }> {
   const root = rootOf(opts.stateRoot)
   const cwd = opts.cwd ? resolve(opts.cwd) : process.cwd()
+  const canonicalRoot = await realpath(root).catch(() => root)
+  const canonicalCwd = await realpath(cwd).catch(() => cwd)
   const raw = String(opts.path ?? '').trim()
   if (!raw) return { ok: false, error: 'path 必填(来自 gotry_artifacts_list 的 path,或异步工单 id)' }
 
@@ -194,7 +206,21 @@ export async function readArtifact(opts: {
       filePath = asyncDeliverablePath(root, raw)
     } else {
       const p = asyncDeliverablePath(root, raw)
-      if (existsSync(p)) { filePath = p; text = await readFile(p, 'utf-8') }
+      const canonical = await realpath(p).catch(() => null)
+      if (canonical) {
+        if (!underRoot(canonical, canonicalRoot) || hasDeniedSegment(canonical)) {
+          return { ok: false, error: `路径越界:${raw}`, hint: `只读 ${root} 与 dsh 工作目录内的文本产物` }
+        }
+        const ext = canonical.slice(canonical.lastIndexOf('.') + 1).toLowerCase()
+        if (!TEXT_EXT_LANG[ext]) {
+          return { ok: false, error: `不支持的文件类型 .${ext}`, hint: `白名单:${Object.keys(TEXT_EXT_LANG).join('/')}` }
+        }
+        const st = await stat(canonical).catch(() => null)
+        if (!st?.isFile()) return { ok: false, error: `文件不存在:${raw}`, hint: '先 gotry_artifacts_list 看在册产物' }
+        if (st.size > MAX_BYTES) return { ok: false, error: `文件过大(${st.size} bytes > ${MAX_BYTES})` }
+        filePath = canonical
+        text = await readFile(canonical, 'utf-8')
+      }
     }
     if (text === null) return { ok: false, error: `工单 ${raw} 无 deliverable(未交付或不存在)`, hint: '先 gotry_artifacts_list 看在册产物' }
   }
@@ -202,19 +228,28 @@ export async function readArtifact(opts: {
   // 2) 路径形态:目录白名单 + 扩展名白名单
   if (text === null) {
     const candidates = isAbsolute(raw) ? [resolve(raw)] : [resolve(cwd, raw), resolve(root, raw), resolve(root, 'gotry-state', 'async', raw)]
-    const allowed = candidates.find(p => (underRoot(p, cwd) || underRoot(p, root)) && !hasDeniedSegment(p))
+    const inScope = (p: string) => (underRoot(p, cwd) || underRoot(p, root)) && !hasDeniedSegment(p)
+    // Prefer an existing candidate so a cwd miss does not mask a valid state-root file.
+    const allowed = candidates.find(p => inScope(p) && existsSync(p)) ?? candidates.find(inScope)
     if (!allowed) {
       return { ok: false, error: `路径越界:${raw}`, hint: `只读 ${root} 与 dsh 工作目录内的文本产物` }
     }
-    const ext = allowed.slice(allowed.lastIndexOf('.') + 1).toLowerCase()
+    const canonical = await realpath(allowed).catch(() => null)
+    if (!canonical) {
+      return { ok: false, error: `文件不存在:${raw}`, hint: '先 gotry_artifacts_list 看在册产物' }
+    }
+    if (!(underRoot(canonical, canonicalCwd) || underRoot(canonical, canonicalRoot)) || hasDeniedSegment(canonical)) {
+      return { ok: false, error: `路径越界:${raw}`, hint: `只读 ${root} 与 dsh 工作目录内的文本产物` }
+    }
+    const ext = canonical.slice(canonical.lastIndexOf('.') + 1).toLowerCase()
     if (!TEXT_EXT_LANG[ext]) {
       return { ok: false, error: `不支持的文件类型 .${ext}`, hint: `白名单:${Object.keys(TEXT_EXT_LANG).join('/')}` }
     }
-    const st = await stat(allowed).catch(() => null)
+    const st = await stat(canonical).catch(() => null)
     if (!st?.isFile()) return { ok: false, error: `文件不存在:${raw}`, hint: '先 gotry_artifacts_list 看在册产物' }
     if (st.size > MAX_BYTES) return { ok: false, error: `文件过大(${st.size} bytes > ${MAX_BYTES})` }
-    filePath = allowed
-    text = await readFile(allowed, 'utf-8')
+    filePath = canonical
+    text = await readFile(canonical, 'utf-8')
   }
 
   const allLines = text.split('\n')
@@ -224,11 +259,13 @@ export async function readArtifact(opts: {
   const ext = filePath.slice(filePath.lastIndexOf('.') + 1).toLowerCase()
   return {
     ok: true,
+    source: underRoot(filePath, canonicalRoot) ? 'state-root' : 'cwd',
     path: filePath,
     offset,
     lines: slice.map((t, i) => ({ number: offset + i, text: t })),
     totalLines: allLines.length,
     lang: TEXT_EXT_LANG[ext] ?? 'text',
+    version: createHash('sha256').update(text).digest('hex').slice(0, 12),
     content: slice.join('\n'),
     windowed: allLines.length > offset - 1 + slice.length,
   }

package/ts/capabilities/flyai.ts

@@ -113,6 +113,7 @@ interface RawItem {
       seatClassName?: string
     }>
   }>
+  adultPrice?: string
   ticketPrice?: string
   /** 机/火与酒店条目的顶层 price(未鉴权态为打码串,机/火如 "1xxx",酒店如 "¥7xx") */
   price?: string
@@ -127,6 +128,51 @@ interface RawItem {
   detailUrl?: string
 }
 
+interface ParsedItems<T> {
+  options: T[]
+  malformedCount: number
+}
+
+function nonEmptyText(value: unknown): string | undefined {
+  if (typeof value !== 'string') return undefined
+  const text = value.trim()
+  return text || undefined
+}
+
+function optionalText(value: unknown, allowNull = false): string | undefined | null {
+  if (value === undefined) return undefined
+  if (allowNull && value === null) return null
+  return nonEmptyText(value)
+}
+
+function positiveFiniteNumber(value: unknown): number | undefined {
+  const number = typeof value === 'number'
+    ? value
+    : typeof value === 'string' && value.trim() ? Number(value.trim()) : Number.NaN
+  return Number.isFinite(number) && number > 0 ? number : undefined
+}
+
+function positiveFiniteDuration(value: unknown): number | undefined {
+  if (typeof value === 'number') return positiveFiniteNumber(value)
+  const text = nonEmptyText(value)
+  if (!text) return undefined
+  const minutes = /^(\d+(?:\.\d+)?)\s*分钟$/.exec(text)?.[1]
+  return positiveFiniteNumber(minutes ?? text)
+}
+
+function parseTransportPrice(value: unknown): { price: number; priceRaw?: string } | undefined {
+  const raw = nonEmptyText(value)
+  if (!raw) return undefined
+  const bare = raw.replace(/^¥\s*/, '')
+  if (/^\d+(?:\.\d+)?$/.test(bare)) {
+    const price = Number(bare)
+    return Number.isFinite(price) && price > 0 ? { price } : undefined
+  }
+  // 未鉴权态可能返回 1xxx/¥7xx；保留原值，但绝不把模糊串猜成数字。
+  if (/^\d+x+$/.test(bare)) return { price: 0, priceRaw: raw }
+  return undefined
+}
+
 /**
  * 从 CLI stdout 中提取首个完整且含 itemList 的 JSON 对象。
  *
@@ -265,7 +311,7 @@ export async function flyaiSearch(q: FlyaiQuery): Promise<FlyaiResult> {
     }
     return { ...base, latencyMs, ok: false, via: 'flyai-error', verdict: 'error', evidence: `[实时API:flyai@error@${ts}] ${r.error ?? `exit ${r.code}`}`, error: r.error ?? r.stderr.replace(/\s+/g, ' ').slice(0, 200) }
   }
-  let items: RawItem[]
+  let items: unknown[]
   try {
     // main-lane 加固的扫描器:容忍 npx 前缀日志/不完整对象——data:null 语义失败
     // (issue #24)的「出发日期非法」原话经 raw stdout 片段进 error 终态,语义不丢
@@ -278,60 +324,133 @@ export async function flyaiSearch(q: FlyaiQuery): Promise<FlyaiResult> {
   }
 
   if (q.kind === 'hotel') {
-    const hotels = parseHotelItems(items)
+    const parsed = parseHotelItems(items)
+    if (parsed.malformedCount > 0) return malformedItemListResult(q.kind, latencyMs, ts, parsed.malformedCount, items.length)
+    const hotels = parsed.options
     const verdict: FlyaiResult['verdict'] = hotels.length > 0 ? 'hit' : 'miss'
     return { kind: q.kind, latencyMs, ok: true, via: 'flyai', verdict, evidence: `[实时API:flyai@${ts}] ${hotels.length}/${items.length} hotel options`, hotels }
   }
-  const options = parseTransportItems(items)
+  const parsed = parseTransportItems(items)
+  if (parsed.malformedCount > 0) return malformedItemListResult(q.kind, latencyMs, ts, parsed.malformedCount, items.length)
+  const options = parsed.options
   const verdict: FlyaiResult['verdict'] = options.length > 0 ? 'hit' : 'miss'
   return { kind: q.kind, latencyMs, ok: true, via: 'flyai', verdict, evidence: `[实时API:flyai@${ts}] ${options.length}/${items.length} ${q.kind} options`, options }
 }
 
-/** 机/火条目 → FlyaiOption(journeys[0].segments[0];缺航班号/时刻的条目跳过) */
-function parseTransportItems(items: RawItem[]): FlyaiOption[] {
+function malformedItemListResult(kind: FlyaiKind, latencyMs: number, ts: string, malformedCount: number, total: number): FlyaiResult {
+  const label = kind === 'hotel' ? 'hotel' : 'transport'
+  const error = `FlyAI ${label} itemList malformed: ${malformedCount}/${total} item(s) failed typed validation`
+  return {
+    kind,
+    latencyMs,
+    ok: false,
+    via: 'flyai-error',
+    verdict: 'error',
+    evidence: `[实时API:flyai@error@${ts}] ${label} itemList malformed (${malformedCount}/${total} items failed typed validation; valid siblings discarded)`,
+    error,
+  }
+}
+
+/** 机/火条目 → FlyaiOption;非空列表含任一不完整条目即整体 malformed */
+function parseTransportItems(items: unknown[]): ParsedItems<FlyaiOption> {
   const options: FlyaiOption[] = []
-  for (const it of items) {
-    const seg = it.journeys?.[0]?.segments?.[0]
-    if (!seg?.marketingTransportNo || !seg.depDateTime) continue
-    const rawPrice = it.ticketPrice ?? it.price ?? ''
-    const numericPrice = Number(rawPrice)
+  let malformedCount = 0
+  for (const raw of items) {
+    if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+      malformedCount += 1
+      continue
+    }
+    const it = raw as RawItem
+    const journey = Array.isArray(it.journeys) ? it.journeys[0] : undefined
+    const seg = journey && typeof journey === 'object' && !Array.isArray(journey) && Array.isArray(journey.segments)
+      ? journey.segments[0]
+      : undefined
+    if (!seg || typeof seg !== 'object' || Array.isArray(seg)) {
+      malformedCount += 1
+      continue
+    }
+    const no = nonEmptyText(seg.marketingTransportNo)
+    const name = optionalText(seg.marketingTransportName)
+    const depDateTime = nonEmptyText(seg.depDateTime)
+    const arrDateTime = nonEmptyText(seg.arrDateTime)
+    const depStation = nonEmptyText(seg.depStationName)
+    const arrStation = nonEmptyText(seg.arrStationName)
+    const durationMin = positiveFiniteDuration(seg.duration)
+    const rawPriceValue = it.adultPrice !== undefined
+      ? it.adultPrice
+      : it.ticketPrice !== undefined
+        ? it.ticketPrice
+        : it.price
+    const parsedPrice = parseTransportPrice(rawPriceValue)
+    const seatClass = optionalText(seg.seatClassName)
+    const jumpUrl = optionalText(it.jumpUrl)
+    if (!no || !depDateTime || !arrDateTime || !depStation || !arrStation || durationMin === undefined || !parsedPrice
+      || (seg.marketingTransportName !== undefined && name === undefined)
+      || (seg.seatClassName !== undefined && seatClass === undefined)
+      || (it.jumpUrl !== undefined && jumpUrl === undefined)) {
+      malformedCount += 1
+      continue
+    }
     options.push({
-      no: seg.marketingTransportNo,
-      name: seg.marketingTransportName ?? '',
-      depDateTime: seg.depDateTime ?? '',
-      arrDateTime: seg.arrDateTime ?? '',
-      depStation: seg.depStationName ?? '',
-      arrStation: seg.arrStationName ?? '',
-      durationMin: Number(seg.duration ?? 0) || 0,
-      price: Number.isFinite(numericPrice) && numericPrice > 0 ? numericPrice : 0,
-      priceRaw: /^\d+$/.test(rawPrice) ? undefined : rawPrice || undefined,
-      seatClass: seg.seatClassName,
-      jumpUrl: it.jumpUrl,
+      no,
+      name: name ?? '',
+      depDateTime,
+      arrDateTime,
+      depStation,
+      arrStation,
+      durationMin,
+      price: parsedPrice.price,
+      priceRaw: parsedPrice.priceRaw,
+      seatClass: seatClass ?? undefined,
+      jumpUrl: jumpUrl ?? undefined,
     })
   }
-  return options
+  return { options, malformedCount }
 }
 
-/** 酒店条目 → FlyaiHotelOption(实测 2026-08-29:price 未鉴权为打码串"¥7xx",rate 常 null) */
-function parseHotelItems(items: RawItem[]): FlyaiHotelOption[] {
+/** 酒店条目 → FlyaiHotelOption;非空列表含任一不完整条目即整体 malformed */
+function parseHotelItems(items: unknown[]): ParsedItems<FlyaiHotelOption> {
   const hotels: FlyaiHotelOption[] = []
-  for (const it of items) {
-    if (!it.name) continue
-    const rawPrice = String(it.price ?? '')
+  let malformedCount = 0
+  for (const raw of items) {
+    if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+      malformedCount += 1
+      continue
+    }
+    const it = raw as RawItem
+    const name = nonEmptyText(it.name)
+    const star = optionalText(it.star)
+    const rawPrice = optionalText(it.price)
+    const rate = optionalText(it.rate, true)
+    const address = optionalText(it.address)
+    const poi = optionalText(it.interestsPoi)
+    const hotelId = optionalText(it.shId)
+    const jumpUrl = optionalText(it.detailUrl)
+    if (!name
+      || (it.star !== undefined && star === undefined)
+      || (it.price !== undefined && rawPrice === undefined)
+      || (it.rate !== undefined && rate === undefined)
+      || (it.address !== undefined && address === undefined)
+      || (it.interestsPoi !== undefined && poi === undefined)
+      || (it.shId !== undefined && hotelId === undefined)
+      || (it.detailUrl !== undefined && jumpUrl === undefined)) {
+      malformedCount += 1
+      continue
+    }
     // 打码价如 "¥7xx" 绝不能截成数字 7(会伪装成真价)——仅全数字串才落 price
-    const bare = rawPrice.replace(/^[¥]/, '')
+    const bare = (rawPrice ?? '').replace(/^[¥]/, '')
     const numericPrice = Number(bare)
     hotels.push({
-      name: it.name,
-      star: it.star,
+      name,
+      star: star ?? undefined,
       price: /^\d+(\.\d+)?$/.test(bare) && numericPrice > 0 ? numericPrice : 0,
       priceRaw: rawPrice || undefined,
-      rate: it.rate != null ? String(it.rate) : undefined,
-      address: it.address,
-      poi: it.interestsPoi,
-      hotelId: it.shId,
-      jumpUrl: it.detailUrl,
+      rate: rate ?? undefined,
+      address: address ?? undefined,
+      poi: poi ?? undefined,
+      hotelId: hotelId ?? undefined,
+      jumpUrl: jumpUrl ?? undefined,
     })
   }
-  return hotels
-}
+  return { options: hotels, malformedCount }
+}

package/ts/capabilities/hbcli.ts

@@ -207,7 +207,7 @@ export async function searchHotels(
   // 自动跑过官方脚本;PATH 未含 ~/.local/bin 时上方候选路径也已兜住),
   // 裸 "spawn hbcli ENOENT" 读起来像工具坏了——实际静态包降级是设计行为
   const rawReason = live.error ?? live.via
-  const reason = /ENOENT/i.test(rawReason) ? '未安装 hbcli(可选实时源;npx gotry setup 可按官方脚本安装)' : rawReason
+  const reason = /ENOENT/i.test(rawReason) ? '未安装 hbcli(可选实时源;npx @danceiny/gotry setup 可按官方脚本安装)' : rawReason
   // 降级:读静态包,按目的地过滤命中的住宿块(issue #24)——整包倾倒会把无关场景
   // (深圳/普吉/曼谷/云南/大理混装)灌给模型且不指明哪块相关;包内无该目的地时明示
   // 「无数据」而不是伪装成可用结果。

package/ts/capabilities/incident-log.ts

@@ -1,20 +1,17 @@
 /**
- * 进程级事故日志(D-NEW 护栏):fsync append-only JSONL。
+ * 进程级事故日志(D-NEW):同步、durable 的 JSONL 诊断记录。
  *
- * 目的: dsh 0.1.1-rc.1 只接 SIGINT/SIGTERM,缺 uncaughtException/unhandledRejection——
- * 任一插件 wasm/runtime 异常穿透到 node 层都会让整个 web UI 进程死亡,
- * 现场不存。这次(Z3 WASM mk_bool_var 崩溃)教训:连个取证都没有。
- *
- * 设计: 进程级 handler 同步写盘(fsync),尽量在进程被杀前留下事故证据。
- * handler 自身不再抛——再次抛出会绕过 handler,变成无声死亡。
+ * `uncaughtExceptionMonitor` 只观察 fatal 事故并留下证据；宿主仍决定
+ * 是否退出。GoTry 不吞掉 fatal 事件、不调用 process.exit、也不隐式重启。
+ * 工具 execute 的业务失败仍由 guardToolExecute 转成结构化失败返回。
  *
  * §11 状态面同步:事故日志是 gotry-state/incidents.jsonl,
- * 用户可见(README 第 x 节),可清理。
+ * 用户可见、可清理。
  */
 
-import { appendFileSync, existsSync, mkdirSync, writeFileSync } from 'node:fs'
+import { closeSync, existsSync, fsyncSync, mkdirSync, openSync, writeFileSync } from 'node:fs'
 import { dirname, isAbsolute, join } from 'node:path'
-import { fileURLToPath } from 'node:url'
+import { pathToFileURL } from 'node:url'
 import type { ToolFailure } from '../src/tool-packet.ts'
 
 export type IncidentKind = 'uncaughtException' | 'unhandledRejection' | 'plugin_error' | 'tool_execute_error'
@@ -43,68 +40,104 @@ function ensureDir(path: string): void {
 
 let installed = false
 let logPath: string | null = null
+let activeMonitor: ((err: Error, origin: NodeJS.UncaughtExceptionOrigin) => void) | null = null
+
+function safeErrorMessage(value: unknown): string {
+  try {
+    if (value instanceof Error) return typeof value.message === 'string' ? value.message : '[error-without-message]'
+    if (typeof value === 'string') return value
+    if (typeof value === 'number' || typeof value === 'boolean' || typeof value === 'bigint' || typeof value === 'symbol') return String(value)
+    const json = JSON.stringify(value)
+    return typeof json === 'string' ? json : '[unprintable-error]'
+  } catch {
+    return '[unprintable-error]'
+  }
+}
+
+function safeErrorStack(value: unknown): string {
+  try {
+    const stack = (value as { stack?: unknown } | null | undefined)?.stack
+    return typeof stack === 'string' ? stack : ''
+  } catch {
+    return ''
+  }
+}
 
 /**
- * 写入一条事故并 fsync。同步执行——handler 内异步无效。
- * 自身 try/catch 自保,不让写入失败再抛一次把进程杀掉。
+ * 写入一条事故并 fsync。整个 append 使用同一个 fd，并保证所有失败路径
+ * 都尝试 close；返回 true 只表示写入、fsync、close 全部成功。
  */
 export function recordIncident(inc: Incident, stateRoot?: string): boolean {
   const target = stateRoot ? resolveIncidentsPath(stateRoot) : (logPath ?? resolveIncidentsPath('.'))
+  let fd: number | undefined
+  let closeAttempted = false
   try {
     ensureDir(target)
-    appendFileSync(target, JSON.stringify(inc) + '\n', { flag: 'a' })
-    // fsync: 让盘数据落定,免得被杀时缓冲丢
-    const fd = require('node:fs').openSync(target, 'a')
-    require('node:fs').fsyncSync(fd)
-    require('node:fs').closeSync(fd)
+    fd = openSync(target, 'a')
+    writeFileSync(fd, JSON.stringify(inc) + '\n', { encoding: 'utf8' })
+    fsyncSync(fd)
+    closeAttempted = true
+    closeSync(fd)
+    fd = undefined
     return true
   } catch {
-    // 绝对不能在这里抛——我们正在处理已经抛过一次的进程级错误
+    // 事故处理中的诊断失败绝不能再次抛出。
     return false
+  } finally {
+    if (fd !== undefined && !closeAttempted) {
+      closeAttempted = true
+      try { closeSync(fd) } catch { /* best effort close on a failed write */ }
+    }
   }
 }
 
 /**
- * 安装进程级护栏:进程整个生命周期仅生效一次(重复调用安全)。
- * 必须同步执行——异步发生在事件循环下一次,而 wasm 崩溃后已无下一轮。
- *
- * @returns 一个 disposer,卸载所有监听(测试场景使用)
+ * 安装进程级事故观察器。只挂 monitor，不改变 Node/dsh 的 fatal 行为。
+ * 进程整个生命周期仅生效一次；disposer 供宿主卸载和测试使用。
  */
 export function installProcessGuards(stateRoot: string, labels?: { uncaughtException?: string; unhandledRejection?: string }): () => void {
   if (installed) return () => { /* 已装,no-op */ }
   installed = true
   logPath = resolveIncidentsPath(stateRoot)
 
-  const uncaughtHandler = (err: Error, origin: NodeJS.UncaughtExceptionOrigin | 'uncaughtException') => {
-    recordIncident({
-      ts: new Date().toISOString(),
-      kind: 'uncaughtException',
-      message: (err?.message ?? String(err)).slice(0, 2000),
-      stack: (err?.stack ?? '').slice(0, 4000),
-      source: labels?.uncaughtException ?? String(origin),
-    }, stateRoot)
-    // 不调用 process.exit——让 dsh/上级容器的重启策略负责;
-    // 如果 dsh 不接住,我们至少留下事故记录。
-  }
-
-  const rejectionHandler = (reason: unknown, promise: Promise<unknown>) => {
-    const msg = reason instanceof Error ? reason.message : String(reason)
-    const stack = reason instanceof Error ? (reason.stack ?? '') : ''
-    recordIncident({
-      ts: new Date().toISOString(),
-      kind: 'unhandledRejection',
-      message: msg.slice(0, 2000),
-      stack: stack.slice(0, 4000),
-      source: labels?.unhandledRejection ?? 'promise',
-    }, stateRoot)
+  const monitor = (err: Error, origin: NodeJS.UncaughtExceptionOrigin) => {
+    try {
+      const kind: IncidentKind = origin === 'unhandledRejection' ? 'unhandledRejection' : 'uncaughtException'
+      const source = kind === 'unhandledRejection'
+        ? (labels?.unhandledRejection ?? 'promise')
+        : (labels?.uncaughtException ?? origin)
+      recordIncident({
+        ts: new Date().toISOString(),
+        kind,
+        message: safeErrorMessage(err).slice(0, 2000),
+        stack: safeErrorStack(err).slice(0, 4000),
+        source,
+      }, stateRoot)
+    } catch {
+      // Formatting must never replace the original fatal event. Keep a final
+      // plain fallback attempt for diagnostics, while the host retains control.
+      try {
+        recordIncident({
+          ts: new Date().toISOString(),
+          kind: origin === 'unhandledRejection' ? 'unhandledRejection' : 'uncaughtException',
+          message: '[incident-observer-fallback]',
+          source: 'incident-observer',
+        }, stateRoot)
+      } catch { /* observer is strictly best effort */ }
+    }
   }
 
-  process.on('uncaughtException', uncaughtHandler)
-  process.on('unhandledRejection', rejectionHandler)
+  process.on('uncaughtExceptionMonitor', monitor)
+  activeMonitor = monitor
+  let active = true
   return () => {
-    process.off('uncaughtException', uncaughtHandler)
-    process.off('unhandledRejection', rejectionHandler)
+    if (!active) return
+    active = false
+    if (activeMonitor !== monitor) return
+    process.off('uncaughtExceptionMonitor', monitor)
     installed = false
+    logPath = null
+    activeMonitor = null
   }
 }
 
@@ -112,24 +145,23 @@ 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> => {
     try {
       return await execute(args, exec)
     } catch (e) {
-      const err = e instanceof Error ? e : new Error(String(e))
+      const message = safeErrorMessage(e)
       recordIncident({
         ts: new Date().toISOString(),
         kind: 'tool_execute_error',
-        message: `${name}: ${err.message}`.slice(0, 2000),
-        stack: (err.stack ?? '').slice(0, 4000),
+        message: `${name}: ${message}`.slice(0, 2000),
+        stack: safeErrorStack(e).slice(0, 4000),
         source: name,
       }, stateRoot)
       const failure: ToolFailure = {
         ok: false,
-        summary: `gotry_${name} 内部错误(已隔离,会话继续): ${err.message.slice(0, 300)}`,
+        summary: `gotry_${name} 内部错误(已隔离,会话继续): ${message.slice(0, 300)}`,
         evidence: `[incident:tool_execute_error@${new Date().toISOString()}]`,
       }
       return failure as R
@@ -137,12 +169,9 @@ export function guardToolExecute<A, R>(name: string, stateRoot: string, execute:
   }
 }
 
-/** CLI 调试:从命令行单独跑查看当前进程是否已挂护栏 */
-if (import.meta.url === `file://${fileURLToPath(import.meta.url)}` && process.argv[2] === '--smoke') {
+/** CLI 调试:最小 fatal 子进程会留下事故证据并按 Node 原生语义非零退出。 */
+if (process.argv[1] !== undefined && pathToFileURL(process.argv[1]).href === import.meta.url && process.argv[2] === '--smoke') {
   const stateRoot = process.argv[3] ?? '.'
   installProcessGuards(stateRoot, { uncaughtException: 'smoke', unhandledRejection: 'smoke' })
-  writeFileSync(resolveIncidentsPath(stateRoot) + '.smoke', 'ok')
-  // 触发一次未捕获,应被写盘(不真正杀进程——进程继续跑完)
-  setTimeout(() => Promise.reject(new Error('intentional smoke-rejection')), 50)
-  setTimeout(() => { console.log('SMOKE OK'); process.exit(0) }, 500)
+  setTimeout(() => { throw new Error('intentional smoke-uncaught') }, 50)
 }