@danceiny/gotry 0.2.0-rc.27 → 0.2.0-rc.29

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (79) hide show
  1. package/README.md +2 -2
  2. package/README.zh-CN.md +2 -2
  3. package/bin/gotry-bootstrap.js +56 -12
  4. package/data/yunnan-pack.json +30 -27
  5. package/dist/capabilities/anything.js +26 -0
  6. package/dist/capabilities/channel-registry.js +4 -4
  7. package/dist/capabilities/doctor.js +14 -7
  8. package/dist/capabilities/effect.js +1 -1
  9. package/dist/capabilities/ground-transfer.js +168 -1
  10. package/dist/capabilities/provider-detail-sanitize.js +64 -0
  11. package/dist/capabilities/route-provider-conformance.js +341 -0
  12. package/dist/capabilities/session/extension-bridge.js +3 -3
  13. package/dist/capabilities/session-search.js +1 -1
  14. package/dist/scripts/anything-path-measure-tests.js +133 -0
  15. package/dist/scripts/anything-path-measure.js +150 -0
  16. package/dist/scripts/anything-tests.js +136 -2
  17. package/dist/scripts/booking-copilot-dsh-warmer-proof.js +5 -2
  18. package/dist/scripts/bootstrap-tests.js +77 -7
  19. package/dist/scripts/city-scenario-tier-tests.js +234 -0
  20. package/dist/scripts/doctor-tests.js +39 -3
  21. package/dist/scripts/drill-multiuser-ledger-tests.js +1076 -0
  22. package/dist/scripts/drill-sdk-descendant-cleanup-tests.js +606 -0
  23. package/dist/scripts/drill-w2a-sensor-tests.js +788 -0
  24. package/dist/scripts/dsh-llm-tests.js +437 -0
  25. package/dist/scripts/g5-guard-tests.js +20 -1
  26. package/dist/scripts/g5-guard.js +5 -1
  27. package/dist/scripts/gotry-backend-kernel-tests.js +1 -1
  28. package/dist/scripts/m3-cohort-tests.js +714 -0
  29. package/dist/scripts/m3-cohort.js +310 -0
  30. package/dist/scripts/nightly-evidence-tests.js +44 -2
  31. package/dist/scripts/nightly-evidence.js +21 -4
  32. package/dist/scripts/outcome-projection-tests.js +427 -0
  33. package/dist/scripts/persona-sim-tests.js +621 -0
  34. package/dist/scripts/persona-sim.js +1081 -0
  35. package/dist/scripts/replay-async.js +2 -0
  36. package/dist/scripts/replay.js +2 -0
  37. package/dist/scripts/route-provider-conformance-tests.js +391 -0
  38. package/dist/scripts/session-dida-live-e2e.js +1 -1
  39. package/dist/scripts/session-zone-crash.js +49 -0
  40. package/dist/scripts/session-zone-ledger-tests.js +432 -0
  41. package/dist/scripts/session-zone-observation-tests.js +492 -0
  42. package/dist/scripts/session-zone-observe.js +135 -0
  43. package/dist/scripts/session-zone-wiring-tests.js +566 -0
  44. package/dist/scripts/session-zones-tests.js +17 -1
  45. package/dist/scripts/spawn-bounded-abort-tests.js +3 -0
  46. package/dist/scripts/state-cli.js +16 -0
  47. package/dist/scripts/time-eval-tests.js +2 -0
  48. package/dist/scripts/unified-tests.js +79 -2
  49. package/dist/scripts/z3-race-tests.js +6 -1
  50. package/dist/src/backend/modules/session-search.js +1 -1
  51. package/dist/src/city-scenario-tier.js +378 -0
  52. package/dist/src/dsh-llm.js +84 -14
  53. package/dist/src/index.js +166 -7
  54. package/dist/src/loop.js +16 -5
  55. package/dist/src/m3-cohort.js +1577 -0
  56. package/dist/src/outcome-projection.js +746 -0
  57. package/dist/src/session-zone-ledger.js +312 -0
  58. package/dist/src/session-zone-observation.js +354 -0
  59. package/dist/src/session-zone-wiring.js +658 -0
  60. package/dist/src/session-zones.js +7 -4
  61. package/dist/src/state-ledger.js +293 -40
  62. package/dist/src/unified.js +69 -5
  63. package/extension/README.md +1 -1
  64. package/extension/README.zh-CN.md +1 -1
  65. package/extension/background.js +1 -1
  66. package/extension/content-bridge.js +1 -1
  67. package/extension/content-main.js +1 -1
  68. package/extension/manifest.json +2 -2
  69. package/package.json +1 -1
  70. package/ts/capabilities/anything.ts +27 -0
  71. package/ts/capabilities/session/extension-bridge.ts +3 -3
  72. package/ts/capabilities/session-search.ts +1 -1
  73. package/ts/scripts/state-cli.ts +18 -0
  74. package/ts/src/contracts.ts +4 -0
  75. package/ts/src/dsh-llm.ts +111 -9
  76. package/ts/src/index.ts +181 -8
  77. package/ts/src/loop.ts +15 -5
  78. package/ts/src/state-ledger.ts +294 -40
  79. package/ts/src/unified.ts +91 -18
@@ -2,7 +2,7 @@
2
2
 
3
3
  # Stai 浏览器扩展
4
4
 
5
- Stai(原名 GoTry Session Bridge)将已支持的旅行检索页面连接至 GoTry。商店版与本地加载版的扩展 ID 不同,但使用相同的桥接合同。
5
+ Stai(原名 Stai Travel Bridge)将已支持的旅行检索页面连接至 GoTry。商店版与本地加载版的扩展 ID 不同,但使用相同的桥接合同。
6
6
 
7
7
  ## 功能
8
8
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * GoTry Session Bridge — MV3 Service Worker(RFC docs/rfc/user-session-data-rfc.md §2.2 通道 C,2026-08-29 定案为 PRIMARY 传输)。
2
+ * Stai Travel Bridge — MV3 Service Worker(RFC docs/rfc/user-session-data-rfc.md §2.2 通道 C,2026-08-29 定案为 PRIMARY 传输)。
3
3
  *
4
4
  * 职责(与 Node 侧 session/extension-bridge.ts 配对,零构建纯 JS):
5
5
  * - 长轮询取活:POST /jobs(桥最多 hold 20s;每次响应/失败都重置 SW 30s 生命周期,任务秒级触达);
@@ -1,5 +1,5 @@
1
1
  /**
2
- * GoTry Session Bridge — ISOLATED-world 桥(manifest 默认 world,document_start)。
2
+ * Stai Travel Bridge — ISOLATED-world 桥(manifest 默认 world,document_start)。
3
3
  *
4
4
  * MAIN world(content-main.js)拿不到 chrome API;本脚本监听页面里的
5
5
  * gotry-ctrip-sniff 自定义事件,把响应文本经 chrome.runtime.sendMessage 转发给
@@ -1,5 +1,5 @@
1
1
  /**
2
- * GoTry Session Bridge — MAIN-world 网络嗅探(manifest world:"MAIN",document_start)。
2
+ * Stai Travel Bridge — MAIN-world 网络嗅探(manifest world:"MAIN",document_start)。
3
3
  *
4
4
  * MAIN world 没有 chrome.runtime,只负责:hook 站点自己的 fetch/XHR,把命中
5
5
  * 嗅探面的响应文本以 CustomEvent 派发到页面里;ISOLATED 侧的 content-bridge.js
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "manifest_version": 3,
3
3
  "name": "Stai Travel Bridge",
4
- "version": "0.2.0.27",
4
+ "version": "0.2.0.29",
5
5
  "description": "Stai 连接获准的旅行检索与供应商门户:检索结果经本机或授权后端桥接;门户可触发一次性登录代填,扩展不持久保存凭据。",
6
6
  "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnuzBX8rT8+RZKEUip5VRA0cY056pExy9PNdN9YCiuY3dgglRbcIBhjuFJoR6EX3/MaUv82vJVyItRVrowXLTwDk4WZof0vwFgKL0zBK304PC46pUaAKTSu1PgXeL1+j5KTAGz/9a9+RnPdbj7jND5rM/MOmBHNPVPpp1NlwxRGIgF9OxHSOfXORcH4Iyte1aJSFUJbFtNS/DaE5D+KjyupPLyIqVN/dCiKnNsTCEHQB9ngeli665PFp76hkccHQQZ4sVuMLS4zBPcazUsp1kcnW+xsQoUATkODTCY+Pzk3zUVF1QOESTjRCVnbNi8tkO43RMRs2q63gX/3inFivcEwIDAQAB",
7
7
  "permissions": [
@@ -56,5 +56,5 @@
56
56
  "run_at": "document_start"
57
57
  }
58
58
  ],
59
- "version_name": "0.2.0-rc.27"
59
+ "version_name": "0.2.0-rc.29"
60
60
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@danceiny/gotry",
3
- "version": "0.2.0-rc.27",
3
+ "version": "0.2.0-rc.29",
4
4
  "description": "GoTry — 从出发到下一次出发的 AI 旅行 Agent(dsh 插件)。npm/源码入口共用锁定的 dsh runtime + README 安装路径。",
5
5
  "type": "module",
6
6
  "main": "ts/src/index.ts",
@@ -19,6 +19,12 @@
19
19
  * - miss: hbcli exit 0,但 candidates 为空(查无结果)
20
20
  * - err: hbcli exit ≠ 0 或超时(降级,降级产物 标 [实时API:hbcli-anything@error@ts])
21
21
  *
22
+ * 离线开关(issue #617;与会话通道 GOTRY_SESSION_LIVE 同形,方向相反以保持产品默认不变):
23
+ * GOTRY_HBCLI_LIVE=0|false|off(不分大小写)→ 零 spawn、不碰凭据与后端,走同一条降级面
24
+ * (verdict=error,证据标 [实时API:hbcli-anything@offline@ts]);未设或任何其他取值 = 与此前
25
+ * 完全一致(hbcli 可用即 live)。判定见 hbcliLiveEnabled;mock/dry-run harness(nightly-evidence --dry-run、
26
+ * persona-sim、replay*)缺省把它置 0,operator 显式设置的值不覆盖。
27
+ *
22
28
  * 契约(与 hbcli/weather/opensky 同构,L4 不变量):
23
29
  * - 永不抛错:网络/超时/解析失败一律降级返回;
24
30
  * - 证据链标注:成功 [实时API:hbcli-anything@ts];失败 [实时API:hbcli-anything@error@ts];
@@ -157,6 +163,16 @@ function failureReason(
157
163
  : `hbcli 退出码 ${r.code},未返回可判定结果(本轮按降级处理)`) + suffix
158
164
  }
159
165
 
166
+ /**
167
+ * 实时 hbcli 通道是否开启(issue #617)。只有显式写 0 / false / off(不分大小写,忽略首尾空白)
168
+ * 才关闭;未设或任何其他取值都视为开启——终端用户依赖的实时源缺省不丢。调用时读取,
169
+ * 测试与 harness 可在进程内切换。
170
+ */
171
+ export function hbcliLiveEnabled(env: Partial<Pick<NodeJS.ProcessEnv, 'GOTRY_HBCLI_LIVE'>> = process.env): boolean {
172
+ const v = (env.GOTRY_HBCLI_LIVE ?? '').trim().toLowerCase()
173
+ return v !== '0' && v !== 'false' && v !== 'off'
174
+ }
175
+
160
176
  /** Anything 通用搜索 — 任何搜索失败走降级;不抛错 */
161
177
  export async function anythingSearch(q: AnythingQuery): Promise<AnythingResult> {
162
178
  const started = Date.now()
@@ -180,6 +196,17 @@ export async function anythingSearch(q: AnythingQuery): Promise<AnythingResult>
180
196
  latencyMs: 0, verdict: 'error', error: 'aborted by host signal',
181
197
  }
182
198
  }
199
+ // 离线开关:位置在入参校验与 pre-abort 之后,既有入参的既有结果/原因串逐字节不变;
200
+ // 关闭时与「未装配 hbcli」同形降级(ok:false / hbcli-anything-error / verdict:error + 人话原因,
201
+ // 无进程噪音,也不含 timeout 字样——效应层只重试 timeout 类),且不 spawn、不重试。
202
+ if (!hbcliLiveEnabled()) {
203
+ return {
204
+ ok: false, via: 'hbcli-anything-error',
205
+ evidence: `[实时API:hbcli-anything@offline@${ts}] GOTRY_HBCLI_LIVE switched off; live channel closed, zero spawn`,
206
+ latencyMs: Date.now() - started, verdict: 'error',
207
+ error: 'hbcli 实时通道已关闭(GOTRY_HBCLI_LIVE 离线开关;本轮按降级处理,未发起查询)',
208
+ }
209
+ }
183
210
  let r: Awaited<ReturnType<typeof spawnBounded>> = { code: null, stdout: '', stderr: '', aborted: false, timedOut: false }
184
211
  for (let i = 0; i < candidates.length; i++) {
185
212
  r = await sh(candidates[i]!, args, { timeoutMs: q.timeoutMs ?? 12_000, env: process.env, signal: q.signal })
@@ -62,17 +62,17 @@ export function localExtensionInstalled(home = homedir()): boolean {
62
62
  * 影响面统一行:账号会话通道断 → 列表底部工具不提供;其余工具不受影响。
63
63
  * 纯函数(默认 HOME 可注入)。
64
64
  *
65
- * 双语对照:CN=本函数返回值;EN 权威见 docs/capability-onboarding.md「Session Bridge 安装」段。
65
+ * 双语对照:CN=本函数返回值;EN 权威见 docs/capability-onboarding.md「Stai Travel Bridge 安装」段。
66
66
  */
67
67
  const EXTENSION_IMPACT_LINE = '影响面:gotry_session_search / gotry_session_login(账号会话通道)不可用;携程机票/酒店实时检索、12306 余票、Dida 实时报价都依赖此通道。其它工具(机票 FlyAI、酒店 hbcli、地图、天气等)不受影响。'
68
68
  export function needsExtensionSummary(opts: { localInstalled?: boolean; home?: string } = {}): string {
69
69
  const local = opts.localInstalled ?? localExtensionInstalled(opts.home)
70
70
  if (local) {
71
- return 'GoTry Session Bridge 扩展未连接(未安装或已停用)。推荐 Chrome 应用商店一键装(自动更新) '
71
+ return 'Stai Travel Bridge 扩展未连接(未安装或已停用)。推荐 Chrome 应用商店一键装(自动更新) '
72
72
  + `${EXTENSION_STORE_URL} ;或 npx @danceiny/gotry setup 落位后 chrome://extensions 开发者模式「加载已解压的扩展程序」指向 ~/.gotry/extension。`
73
73
  + EXTENSION_IMPACT_LINE
74
74
  }
75
- return 'GoTry Session Bridge 扩展未连接。若你已从 Chrome 商店安装(自动更新):打开 Chrome 并确认扩展已启用即可自动连接,无需再装。'
75
+ return 'Stai Travel Bridge 扩展未连接。若你已从 Chrome 商店安装(自动更新):打开 Chrome 并确认扩展已启用即可自动连接,无需再装。'
76
76
  + `若尚未安装:应用商店一键装 ${EXTENSION_STORE_URL} (装完零弹窗,浏览器自己当安装器)。`
77
77
  + EXTENSION_IMPACT_LINE
78
78
  }
@@ -2,7 +2,7 @@
2
2
  * 会话检索编排层(RFC §3.2):transport → adapter entry → networkHint 嗅探 → 解析 → ReadGuard → 证据链。
3
3
  *
4
4
  * 传输车道(2026-08-29 定案,RFC §2.2):**扩展桥为默认**——一次性安装的 MV3 扩展
5
- * (GoTry Session Bridge)在自己标签页被动嗅探 batchSearch,零 Chrome 系统弹窗;
5
+ * (Stai Travel Bridge)在自己标签页被动嗅探 batchSearch,零 Chrome 系统弹窗;
6
6
  * cdp(attach 日常 Chrome,Chrome 144+ 每连接弹权限框)降为显式后备
7
7
  * (`GOTRY_SESSION_TRANSPORT=cdp` opt-in,诊断/测试用);persistent 仅测试。
8
8
  *
@@ -4,6 +4,8 @@
4
4
  * migrate [root] one-shot 迁移:旧 JSON/JSONL → 账本 events
5
5
  * (导入前自动快照到 gotry-state/pre-ledger-backup/)
6
6
  * export [root] local-only:账本 → 旧文件名视图(红线 6:可见可导出;单向,不回流)
7
+ * 另含会话双区派生视图(P4-2):hot-context.jsonl /
8
+ * notebook.json,从事件 fold 渲染——视图永不是写路径
7
9
  * log [root] [--limit N] 事件账本尾部(append-only 审计面)
8
10
  * stats [root] 各面计数
9
11
  * rebuild [root] [toSeq] DROP 投影 → fold 重放(可截到 toSeq;账本/投影
@@ -48,6 +50,11 @@
48
50
  import { mkdirSync, renameSync, writeFileSync } from 'node:fs'
49
51
  import { dirname, join } from 'node:path'
50
52
  import { ensureLedger, ledgerDbPath, ledgerExists, openLedgerIfExists } from '../src/state-ledger.ts'
53
+ import {
54
+ ZONE_EXPORT_HOT_FILE,
55
+ ZONE_EXPORT_NOTEBOOK_FILE,
56
+ readZoneExportViews,
57
+ } from '../src/session-zone-ledger.ts'
51
58
  import { formatRepairPlan, loadEvidenceMappingFile, planLedgerRepair } from '../src/ledger-repair-plan.ts'
52
59
  import {
53
60
  applyLedgerRepair,
@@ -405,6 +412,17 @@ switch (cmd) {
405
412
  if (utility.length) atomicWrite(join(dir, 'memory-utility.jsonl'), utility.map(e => JSON.stringify(e)).join('\n') + '\n')
406
413
  const trips = ledger.readTrips()
407
414
  if (trips.length) atomicWrite(join(dir, 'trips.jsonl'), trips.map(e => JSON.stringify(e)).join('\n') + '\n')
415
+ // 会话双区派生视图(P4-2,design/session-dual-zone-memory-design.md §2):
416
+ // 从六个事件 kind 的确定性 fold 渲染;空分区不产生空文件(同既有视图纪律)。
417
+ // 日志触读上界即拒:导出残缺视图比不导出更坏(读者会当它是全量)。
418
+ const zone = readZoneExportViews(ledger)
419
+ if (!zone.ok) {
420
+ console.error(`${zone.code}: ${zone.detail}`)
421
+ process.exit(1)
422
+ }
423
+ const zoneViews = zone.views
424
+ if (zoneViews.hotContextJsonl) atomicWrite(join(dir, ZONE_EXPORT_HOT_FILE), zoneViews.hotContextJsonl)
425
+ if (zoneViews.notebookJson !== '[]') atomicWrite(join(dir, ZONE_EXPORT_NOTEBOOK_FILE), zoneViews.notebookJson)
408
426
  console.log(`视图已导出(单向,DB→文件;红线 6):${dir}/`)
409
427
  break
410
428
  }
@@ -76,11 +76,15 @@ export interface TripState {
76
76
  // ---- 求解结果(unified 求解器输出的契约化引用) ----------------------------------
77
77
 
78
78
  export interface SolveResult {
79
+ /** `solver_error` 存在时,`feasible: false` 只表示「没有产出可行解」,
80
+ * **不表示「不可行」**(issue #620):那一轮求解器自己失败了,判定缺席。 */
79
81
  feasible: boolean
80
82
  money_cny?: number
81
83
  legs?: Array<Record<string, unknown> & { leg: string }>
82
84
  red_flags?: string[]
83
85
  unsat_core?: string[]
86
+ /** 求解器自身失败(非判定)。机器 token 只住 `code`,不进用户面「冲突」文案。 */
87
+ solver_error?: { code: string; message: string }
84
88
  suggestions?: Array<{ relax: string; money_cny?: number }>
85
89
  work_window_exclusions?: Array<{ segment: string; option: string; reason: string }>
86
90
  skeleton_notes?: string[]
package/ts/src/dsh-llm.ts CHANGED
@@ -1,7 +1,8 @@
1
1
  /**
2
2
  * 真 LlmPort:OpenAI 兼容接口的 provider 中立适配器(DeepSeek/MiniMax-M2 实测)。
3
3
  * 零新依赖(node 内建 fetch)。环境变量:LLM_API_KEY/LLM_BASE_URL/LLM_MODEL
4
- * (兼容旧 DEEPSEEK_* 别名)。MiniMax-M2 是推理模型:输出带 <think> 块,
4
+ * (兼容旧 DEEPSEEK_* 别名);GOTRY_LLM_TIMEOUT_MS = 单次请求总预算(默认 300000ms,
5
+ * 非正整数忽略)。MiniMax-M2 是推理模型:输出带 <think> 块,
5
6
  * 必须先剥离再解析——JSON 藏在 think 里是常见失败模式。
6
7
  * 无 key 时抛出明确错误,replay-real 自动回退 mock(ADR-8)。
7
8
  * 责任铁律不变:本适配器只做翻译/润色/解释,判定与算术在确定性组件。
@@ -37,11 +38,100 @@ function emptyUsage(): LlmUsageTracker {
37
38
  return { calls: 0, inputTokens: 0, outputTokens: 0, inputCacheHitTokens: 0, inputCacheMissTokens: 0, responsesMissingUsage: 0 }
38
39
  }
39
40
 
40
- async function chat(messages: Array<{ role: 'system' | 'user' | 'assistant'; content: string }>, json: boolean, usage?: LlmUsageTracker): Promise<string> {
41
+ /** 单次请求(连接→响应头→正文读完)的默认总预算:对推理模型足够宽松,只兜「连上了却永不应答」的卡死。 */
42
+ export const DEFAULT_LLM_TIMEOUT_MS = 300_000
43
+ /**
44
+ * 超时上限 = 2^31-1 ms(≈24.8 天)。Node 对更大的延迟会溢出并**悄悄改成 1ms**
45
+ * (TimeoutOverflowWarning),即「配得越大越立刻超时」——所以必须夹住,绝不原样透传。
46
+ */
47
+ const MAX_LLM_TIMEOUT_MS = 2_147_483_647
48
+
49
+ /**
50
+ * chat() 的请求级选项。timeoutMs 压过环境变量 GOTRY_LLM_TIMEOUT_MS;signal 由调用方持有并与
51
+ * 超时合并(AbortSignal.any)——任一先触发就终止本次请求,落成 LlmRequestError。
52
+ */
53
+ export interface LlmRequestOptions {
54
+ timeoutMs?: number
55
+ signal?: AbortSignal
56
+ }
57
+
58
+ /** 只认十进制正整数(数值或纯数字串);其余(0/负数/小数/NaN/带单位/空串)一律 undefined——绝不退化成「无超时」。 */
59
+ function parseTimeoutMs(raw: unknown): number | undefined {
60
+ const n = typeof raw === 'string' ? (/^\d+$/.test(raw.trim()) ? Number(raw.trim()) : Number.NaN) : raw
61
+ return typeof n === 'number' && Number.isSafeInteger(n) && n > 0 ? Math.min(n, MAX_LLM_TIMEOUT_MS) : undefined
62
+ }
63
+
64
+ /** 解析顺序:本次调用显式值 > 环境变量 GOTRY_LLM_TIMEOUT_MS(调用时取值,同 base()/model())> 默认值。 */
65
+ export function resolveLlmTimeoutMs(callMs?: number): number {
66
+ return parseTimeoutMs(callMs) ?? parseTimeoutMs(process.env['GOTRY_LLM_TIMEOUT_MS']) ?? DEFAULT_LLM_TIMEOUT_MS
67
+ }
68
+
69
+ export type LlmRequestFailureCode = 'timeout' | 'aborted'
70
+
71
+ /**
72
+ * chat() 请求被截断(超时 / 调用方取消)的类型化失败——不是挂起,也不会被吞。
73
+ * 与既有错误形态一致,而非另起一套:
74
+ * - message 沿用本模块 `llm <kind>: <detail>` 约定(同 `llm 429: …`),只读 .message 的调用方
75
+ * (nightly-evidence / persona-sim / time-eval --real)原样可用;
76
+ * - name 取平台既有名 TimeoutError / AbortError(AbortSignal.timeout 与手动 abort 抛的同名),
77
+ * persona-sim、channel-probe 等按 name 分类的代码零改动即可识别;
78
+ * - cause 保留 fetch 抛出的原始错误(调用方自定义的 abort reason 也在其中)。
79
+ * HTTP 非 2xx(`llm <status>`)、DNS/连接重置、坏 JSON 仍是原样的普通 Error——只改写「被我们的 signal 终止」的失败。
80
+ */
81
+ export class LlmRequestError extends Error {
82
+ readonly code: LlmRequestFailureCode
83
+ /** 本次生效的超时预算;仅 code === 'timeout' 有值 */
84
+ readonly timeoutMs: number | undefined
85
+
86
+ constructor(code: LlmRequestFailureCode, detail: string, options: { cause?: unknown; timeoutMs?: number } = {}) {
87
+ super(`llm ${code}: ${detail}`, options.cause === undefined ? undefined : { cause: options.cause })
88
+ this.name = code === 'timeout' ? 'TimeoutError' : 'AbortError'
89
+ this.code = code
90
+ this.timeoutMs = options.timeoutMs
91
+ }
92
+ }
93
+
94
+ interface ChatCompletion {
95
+ choices: Array<{ message: { content: string } }>
96
+ usage?: { prompt_tokens?: number; completion_tokens?: number; prompt_cache_hit_tokens?: number; prompt_cache_miss_tokens?: number }
97
+ }
98
+
99
+ /**
100
+ * 发一次请求并读完正文。**同一个 signal 贯穿 fetch 与 res.json()/res.text()**,所以超时覆盖整个请求
101
+ * (含「响应头已到、正文卡住」与「非 2xx 的错误正文卡住」),调用方取消同理。
102
+ * 只有「被我们的 signal 终止」才改写成 LlmRequestError;其余错误原样上抛。
103
+ */
104
+ async function requestCompletion(
105
+ url: string,
106
+ init: { headers: Record<string, string>; body: string },
107
+ request: LlmRequestOptions,
108
+ ): Promise<{ ok: true; data: ChatCompletion } | { ok: false; status: number; text: string }> {
109
+ const timeoutMs = resolveLlmTimeoutMs(request.timeoutMs)
110
+ const timeout = AbortSignal.timeout(timeoutMs)
111
+ const signal = request.signal ? AbortSignal.any([request.signal, timeout]) : timeout
112
+ try {
113
+ const res = await fetch(url, { method: 'POST', headers: init.headers, body: init.body, signal })
114
+ if (!res.ok) return { ok: false, status: res.status, text: await res.text() }
115
+ return { ok: true, data: await res.json() as ChatCompletion }
116
+ } catch (error) {
117
+ if (!signal.aborted) throw error
118
+ // AbortSignal.any 的 reason 是最先触发的那个源的 reason:等于超时信号的 reason 即超时先到,否则是调用方取消
119
+ if (timeout.aborted && signal.reason === timeout.reason) {
120
+ throw new LlmRequestError('timeout', `no complete response within ${timeoutMs}ms (GOTRY_LLM_TIMEOUT_MS)`, { cause: error, timeoutMs })
121
+ }
122
+ throw new LlmRequestError('aborted', "request cancelled by the caller's AbortSignal", { cause: error })
123
+ }
124
+ }
125
+
126
+ async function chat(
127
+ messages: Array<{ role: 'system' | 'user' | 'assistant'; content: string }>,
128
+ json: boolean,
129
+ usage?: LlmUsageTracker,
130
+ request: LlmRequestOptions = {},
131
+ ): Promise<string> {
41
132
  const key = process.env['LLM_API_KEY'] ?? process.env['DEEPSEEK_API_KEY']
42
133
  if (!key) throw new Error('LLM_API_KEY 未设置(兼容 DEEPSEEK_API_KEY 别名)——真 LLM 路径不可用,请回退 mock(ADR-8)')
43
- const res = await fetch(`${base()}/chat/completions`, {
44
- method: 'POST',
134
+ const reply = await requestCompletion(`${base()}/chat/completions`, {
45
135
  headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${key}` },
46
136
  body: JSON.stringify({
47
137
  model: model(),
@@ -49,9 +139,9 @@ async function chat(messages: Array<{ role: 'system' | 'user' | 'assistant'; con
49
139
  ...(json ? { response_format: { type: 'json_object' } } : {}),
50
140
  temperature: json ? 0 : 0.7,
51
141
  }),
52
- })
53
- if (!res.ok) throw new Error(`llm ${res.status}: ${(await res.text()).slice(0, 300)}`)
54
- const data = await res.json() as { choices: Array<{ message: { content: string } }>; usage?: { prompt_tokens?: number; completion_tokens?: number; prompt_cache_hit_tokens?: number; prompt_cache_miss_tokens?: number } }
142
+ }, request)
143
+ if (!reply.ok) throw new Error(`llm ${reply.status}: ${reply.text.slice(0, 300)}`)
144
+ const data = reply.data
55
145
  if (usage) {
56
146
  usage.calls += 1
57
147
  const u = data.usage
@@ -94,7 +184,11 @@ const SKELETON_SYSTEM = `你是行程骨架抽取器。从对话中抽取行程
94
184
  规则:每个跨城移动一段;锚点只放用户明说或必然的(如"当天到"→arriveByMin 23:59=1439);时刻用当日分钟。
95
185
  scenario 判定:「洱海/大理/千岛湖/太湖+选目的地」→erhai(候选集);「普吉/workation/远程办公+多城链」→workation(五段链);「云南/大理丽江」→yunnan;不确定→generic。只输出 JSON。`
96
186
 
97
- export function createOpenAICompatLlm(flightPackPath?: string, clock: () => Date = () => new Date()): LlmPort & { usage: LlmUsageTracker } {
187
+ /**
188
+ * request:本端口每次 chat() 共用的请求级选项(timeoutMs / signal)。signal 是端口级取消——
189
+ * 调用方可借它在会话/批次截止时真正掐断在途请求,而不是放着它继续挂在 provider 上。
190
+ */
191
+ export function createOpenAICompatLlm(flightPackPath?: string, clock: () => Date = () => new Date(), request: LlmRequestOptions = {}): LlmPort & { usage: LlmUsageTracker } {
98
192
  const pack = flightPackPath
99
193
  const usage = emptyUsage()
100
194
  const historyText = (h: Turn[]) => h.map(t => `${t.role === 'user' ? '用户' : '助手'}: ${t.text}`).join('\n')
@@ -107,6 +201,7 @@ export function createOpenAICompatLlm(flightPackPath?: string, clock: () => Date
107
201
  [{ role: 'system', content: FACTS_SYSTEM }, { role: 'user', content: `${anchorContext()}\n\n${historyText(history)}` }],
108
202
  true,
109
203
  usage,
204
+ request,
110
205
  )
111
206
  const obj = parseJsonBlock(out)
112
207
  if (!obj) return { assumptions: [] }
@@ -122,6 +217,7 @@ export function createOpenAICompatLlm(flightPackPath?: string, clock: () => Date
122
217
  [{ role: 'system', content: SKELETON_SYSTEM }, { role: 'user', content: `${context}\n\n${historyText(history)}` }],
123
218
  true,
124
219
  usage,
220
+ request,
125
221
  )
126
222
  const skeleton = parseJsonBlock(out)
127
223
  if (!skeleton || !Array.isArray(skeleton['segments']) || (skeleton['segments'] as unknown[]).length === 0) return null
@@ -147,7 +243,11 @@ export function createOpenAICompatLlm(flightPackPath?: string, clock: () => Date
147
243
  return { segments: [], note: 'erhai-candidates', budgetCny: 3000 } as unknown as JourneySpecTS
148
244
  }
149
245
  packSpec = parseFlightPackToSpec(JSON.parse(await readFile(packPath, 'utf-8')))
150
- } catch {
246
+ } catch (e) {
247
+ // issue #620:数据包被 parse 边界拒收时,原因必须留痕——否则用户只看到
248
+ // 「骨架还不完整」,运维看不到是哪个包的哪个字段把求解面挡住了。
249
+ const err = e as Error & { code?: string }
250
+ console.error(`[gotry] extractSpec: 数据包不可用 ${packPath}(${err.code ?? 'parse_failed'}):`, (err.message ?? '').slice(0, 200))
151
251
  return null
152
252
  }
153
253
  const anchorsById = new Map<string, Record<string, unknown>>(
@@ -167,6 +267,7 @@ export function createOpenAICompatLlm(flightPackPath?: string, clock: () => Date
167
267
  [{ role: 'system', content: buildSlotSystem(anchor) }, { role: 'user', content: historyText(history) }],
168
268
  true,
169
269
  usage,
270
+ request,
170
271
  )
171
272
  const obj = parseJsonBlock(out)
172
273
  if (!obj) return null
@@ -180,6 +281,7 @@ export function createOpenAICompatLlm(flightPackPath?: string, clock: () => Date
180
281
  { role: 'user', content: `【${q.key}】${q.text}(为什么问:${q.why})` }],
181
282
  false,
182
283
  usage,
284
+ request,
183
285
  )
184
286
  return out.trim() || `【${q.key}】${q.text}`
185
287
  },