@danceiny/gotry 0.0.1-rc.19 → 0.0.1-rc.20

package/README.md

@@ -205,7 +205,7 @@ Current release: **v0.0.1-rc.18** (npm `latest` and `rc` both point here; regist
 - **M3 Exit not closed** — engineering & distribution are ready, but real seed-user evidence (50–200 person cohort) has not been accumulated; automated tests prove contracts and formulas, not business pass
 - **Hotel session adapters** — Ctrip-hotel / Meituan logged-in surfaces await real login-state backfill; flights are done
 - **Interface language** — English covers the deterministic solve-output layer; the dsh host UI and dialogue surface belong to the host / calibration samples
-- **External benchmark generalization** — every frozen external run to date remains diagnostic-only (no score, no uplift claim); the round-by-round engineering ledger lives in [`docs/evaluation/benchmark-environment-bridge.md`](docs/evaluation/benchmark-environment-bridge.md)
+- **External benchmark generalization** — every frozen external run to date remains diagnostic-only (no score, no uplift claim). The bridge now combines the generic `tools/call/errors` recovery surface with per-tool typed descriptors, exact result/domain/failure conformance, and a latest-response terminal fence; the round-by-round engineering ledger lives in [`docs/evaluation/benchmark-environment-bridge.md`](docs/evaluation/benchmark-environment-bridge.md)
 - **Booking** — nothing bookable ships today; M5 opens only through WriteGate and the booking-saga FSM
 
 <details>

package/README.zh-CN.md

@@ -201,7 +201,7 @@ node scripts/build-dist.mjs                       # 构建 JS runtime
 - **M3 Exit 未关闭** —— 工程与分发面就绪,但真实种子用户证据(50–200 人 cohort)尚未积累;自动化测试证明的是合同与公式,不是 business pass
 - **酒店会话适配** —— 携程酒店/美团登录态面等实测回填;机票已通
 - **界面语言** —— 英文仅覆盖求解确定性输出层;dsh 宿主界面与对话面属宿主/校准件
-- **外部 benchmark 泛化** —— 迄今所有冻结外部运行均仅 diagnostic(无分数、无 uplift 声明);逐轮工程台账见 [`docs/evaluation/benchmark-environment-bridge.md`](docs/evaluation/benchmark-environment-bridge.md)
+- **外部 benchmark 泛化** —— 迄今所有冻结外部运行均仅 diagnostic（无分数、无 uplift 声明）。bridge 现已合并通用 `tools/call/errors` 恢复面、逐工具 typed descriptor、严格 result/domain/failure 分流与 latest-response terminal fence；逐轮工程台账见 [`docs/evaluation/benchmark-environment-bridge.md`](docs/evaluation/benchmark-environment-bridge.md)
 - **预订** —— 今天没有任何可下单路径;M5 只经 WriteGate 与 booking-saga 状态机启封
 
 <details>

package/bin/gotry-bootstrap.js

@@ -58,6 +58,7 @@ import { copyFileSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSyn
 import { homedir } from 'node:os'
 import { join, dirname } from 'node:path'
 import { fileURLToPath } from 'node:url'
+import { createRequire } from 'node:module'
 
 const repoRoot = join(dirname(fileURLToPath(import.meta.url)), '..')
 const AUTO = process.argv.includes('--auto')
@@ -73,9 +74,9 @@ const HBCLI_INSTALL_CMD = 'curl -fsSL https://github.com/hotelbyte-com/docs/rele
 const REACH_INSTALL_URL = 'git+https://github.com/Panniantong/Agent-Reach.git'
 
 /** 带超时的子进程(inherit stdio 让用户看见上游安装进度) */
-function run(cmd, args, { timeoutMs, cwd } = {}) {
+function run(cmd, args, { timeoutMs, cwd, env } = {}) {
   return new Promise((resolve) => {
-    const child = spawn(cmd, args, { stdio: 'inherit', cwd, env: process.env })
+    const child = spawn(cmd, args, { stdio: 'inherit', cwd, env: env ?? process.env })
     let done = false
     const timer = setTimeout(() => {
       if (!done) { done = true; try { child.kill('SIGKILL') } catch { /* ignore */ } }
@@ -143,34 +144,56 @@ async function setupReach() {
   return { ok: true }
 }
 
-async function setupSidebar() {  say('[gotry-setup] dsh-better-sidebar(dsh web 侧栏工作台,产物查看面 issue #25)')
-  const installed = existsSync(join(homedir(), '.dsh/profiles/web/node_modules/dsh-better-sidebar/package.json'))
-  if (installed) { say('  ✓ 已安装(~/.dsh/profiles/web)'); return { ok: true } }
+/** sidebar 落盘状态 = 与 doctor 检查同口径的唯一事实面(profile 里的 package.json) */
+function sidebarInstalled() {
+  return existsSync(join(homedir(), '.dsh/profiles/web/node_modules/dsh-better-sidebar/package.json'))
+}
+
+/** dsh plugin 在 profile 目录里跑 pnpm;pnpm ≥10.5 默认不执行依赖构建脚本,严格态
+ *  (pnpm 11 默认 / strict-dep-builds)下 ERR_PNPM_IGNORED_BUILDS 直接 exit 1——
+ *  但包本身已完整落盘(2026-09-08 实测:exit 1 而 167 包全部就位,doctor 复检即绿)。
+ *  对该调用降回警告态(env 只作用于这一次 spawn,不改用户全局 pnpm 配置);
+ *  老版本 pnpm 不认识此配置,零影响。 */
+const SIDEBAR_PNPM_ENV = { ...process.env, npm_config_strict_dep_builds: 'false' }
+
+async function setupSidebar(attemptInstall) {  say('[gotry-setup] dsh-better-sidebar(dsh web 侧栏工作台,产物查看面 issue #25)')
+  if (sidebarInstalled()) { say('  ✓ 已安装(~/.dsh/profiles/web)'); return { ok: true } }
   if (CHECK_ONLY) { say('  ✗ 未安装(--check-only 只报告)'); return { ok: true } }
   const SIDEBAR_PKG = 'dsh-better-sidebar@latest'
-  // dsh CLI:本包依赖里的 @deepseek-ai/dsh 优先;解析不到走 npx 自拉(官方安装途径同款)
-  const { createRequire } = await import('node:module')
+  // dsh CLI:本包依赖里的 @deepseek-ai/dsh 优先;解析不到走 npx 自拉(官方安装途径同款)。
+  // attemptInstall 注入位供测试模拟「安装器失败但状态落盘」(pnpm 忽略构建脚本策略)。
   const require_ = createRequire(join(repoRoot, 'package.json'))
-  let launched = false
-  try {
-    const dshBin = require_.resolve('@deepseek-ai/dsh/lib/bin.js')
-    say(`  安装中(dsh plugin → web profile): ${SIDEBAR_PKG}`)
-    const r = await run(process.execPath, [dshBin, 'plugin', '--profile', 'web', 'add', SIDEBAR_PKG], { timeoutMs: 300_000 })
-    launched = true
-    if (r.ok) {
-      say('  ✓ 安装完成(gotry web 刷新浏览器即见右侧工作台;工作区里的产物 md 可直接预览)')
-      return { ok: true }
-    }
-    say(`  ✗ dsh plugin 安装失败(${r.error})——尝试 npx 途径`)
-  } catch { /* 本包未携带 @deepseek-ai/dsh */ }
-  if (!launched) say('  本包未携带 @deepseek-ai/dsh,走 npx 途径安装')
-  const r2 = await run('npx', ['-y', '--package', '@deepseek-ai/dsh', 'dsh', 'plugin', '--profile', 'web', 'add', SIDEBAR_PKG], { timeoutMs: 300_000 })
-  if (!r2.ok) {
-    say('  ✗ 安装失败——不影响 gotry:产物仍可在对话里说「看看我生成的行程」经 gotry_artifacts_list/read 查看;可稍后重试: npx gotry doctor --fix')
-    return { ok: false }
+  const defaultAttempt = async () => {
+    try {
+      const dshBin = require_.resolve('@deepseek-ai/dsh/lib/bin.js')
+      say(`  安装中(dsh plugin → web profile): ${SIDEBAR_PKG}`)
+      return await run(process.execPath, [dshBin, 'plugin', '--profile', 'web', 'add', SIDEBAR_PKG], { timeoutMs: 300_000, env: SIDEBAR_PNPM_ENV })
+    } catch { return { ok: false, noDsh: true } }
   }
-  say('  ✓ 安装完成(gotry web 刷新浏览器即见右侧工作台)')
-  return { ok: true }
+  const r = await (attemptInstall ?? defaultAttempt)()
+  if (r.ok) {
+    say('  ✓ 安装完成(gotry web 刷新浏览器即见右侧工作台;工作区里的产物 md 可直接预览)')
+    return { ok: true }
+  }
+  // exit 非 0 ≠ 没装上(pnpm 忽略构建脚本策略):先按落盘状态复核,再决定是否回退 npx 途径
+  if (sidebarInstalled()) {
+    say('  ✓ 安装完成(安装器 exit 非 0,但按落盘状态复核已就位;gotry web 刷新浏览器即见右侧工作台)')
+    say('  ⚠ pnpm 跳过了 node-pty(侧栏内嵌终端)的构建脚本——预览功能不受影响;如需内嵌终端:cd ~/.dsh/profiles/web && pnpm approve-builds 勾选 node-pty')
+    return { ok: true }
+  }
+  if (r.noDsh) say('  本包未携带 @deepseek-ai/dsh,走 npx 途径安装')
+  else say('  ✗ dsh plugin 安装失败且未落盘——尝试 npx 途径')
+  const r2 = await run('npx', ['-y', '--package', '@deepseek-ai/dsh', 'dsh', 'plugin', '--profile', 'web', 'add', SIDEBAR_PKG], { timeoutMs: 300_000, env: SIDEBAR_PNPM_ENV })
+  if (r2.ok) {
+    say('  ✓ 安装完成(gotry web 刷新浏览器即见右侧工作台)')
+    return { ok: true }
+  }
+  if (sidebarInstalled()) {
+    say('  ✓ 安装完成(npx 途径 exit 非 0,但按落盘状态复核已就位)')
+    return { ok: true }
+  }
+  say('  ✗ 安装失败——不影响 gotry:产物仍可在对话里说「看看我生成的行程」经 gotry_artifacts_list/read 查看;可稍后重试: npx gotry doctor --fix')
+  return { ok: false }
 }
 
 // ---------------------------------------------------------------------------
@@ -269,9 +292,8 @@ async function doctorChecks() {
   // flyai key(匿名试用额度共享易达限;正式 key 即免)
   const flyaiKey = (process.env.FLYAI_API_KEY ?? '').trim()
   items.push({ label: 'FlyAI(飞猪官方检索)', ok: Boolean(flyaiKey), level: flyaiKey ? 'ok' : 'degraded', detail: flyaiKey ? 'FLYAI_API_KEY 已配(正式 key,无试用额度限制)' : '未配 FLYAI_API_KEY——走匿名试用额度(共享,易达限;达限报 "Trial limit reached")', fix: flyaiKey ? undefined : '到 flyai.open.fliggy.com 控制台申请正式 key,配进环境变量 FLYAI_API_KEY' })
-  // sidebar
-  const sidebarPkg = join(homedir(), '.dsh/profiles/web/node_modules/dsh-better-sidebar/package.json')
-  const sbOk = existsSync(sidebarPkg)
+  // sidebar(状态面与 setupSidebar 的落盘复核同一口径)
+  const sbOk = sidebarInstalled()
   items.push({ label: 'dsh-better-sidebar(侧栏工作台)', ok: sbOk, level: sbOk ? 'ok' : 'missing', detail: sbOk ? '已安装——web UI 右侧工作台可预览产物与 doctor 报告(gotry-state/doctor-report.md)' : '未安装——dsh web 无右侧工作台,产物与 doctor 报告只能在对话里看(gotry_artifacts_list)', fix: sbOk ? undefined : 'npx gotry doctor --fix' })
   // dsh-calendar(setup 状态面;默认不挂载=ok 是合法态,opt-in 未配置才 degraded)
   const calState = readCalendarState()
@@ -279,24 +301,42 @@ async function doctorChecks() {
   const calConfigured = calOn && calendarProfileConfigured()
   items.push({ label: 'dsh-calendar(日历工作窗口)', ok: !calOn || calConfigured, level: !calOn ? 'ok' : calConfigured ? 'ok' : 'degraded', detail: calendarDetail(calState), fix: !calOn ? undefined : calConfigured ? undefined : '在 ~/.dsh/profiles/web/cordis.patch.yml 覆盖 calendar 行 config 填 username(或 npx gotry setup calendar --off 恢复默认不挂载)' })
   // dsh-map-tools(patch 分发面宿主插件,issue #139):解析失败启动时整块静默剔除,
-  // doctor 把两态照亮。候选清单与 bin/gotry-inner.js 解析链、ts/capabilities/doctor.ts 同口径。
+  // doctor 把两态照亮。候选清单与 bin/gotry-inner.js 解析链、ts/capabilities/doctor.ts 同口径:
+  // tarball vendor 副本优先(随 files[] 分发,不进 npm 依赖——其 peerDependencies 要求
+  // dsh-settings/dsh-tools >=0.1.2-rc.1,与锁定的 0.1.2-alpha.3 家族在 npm 严格 peer
+  // 解析下 ERESOLVE,依赖形态会弄坏 npx 安装),其余覆盖 source/提升/profile 布局。
+  const rootRequire = createRequire(join(repoRoot, 'package.json'))
   const mapCandidates = [
+    join(repoRoot, 'ts/dsh-runtime/vendor/dsh-map-tools/lib/index.js'),
     join(repoRoot, 'ts/dsh-runtime/node_modules/dsh-map-tools/lib/index.js'),
     join(repoRoot, 'node_modules/dsh-map-tools/package.json'),
     join(repoRoot, 'ts/node_modules/dsh-map-tools/package.json'),
     join(homedir(), '.dsh/profiles/web/node_modules/dsh-map-tools/package.json'),
   ]
-  const mapHit = mapCandidates.find((p) => existsSync(p))
+  let mapHit = mapCandidates.find((p) => existsSync(p))
+  // npm 提升布局:gotry 的依赖不在包目录 node_modules 里,而在同级提升位——
+  // 与 inner 的 require_.resolve 同机制(createRequire 从包位置向上走查)
+  if (!mapHit) { try { mapHit = rootRequire.resolve('dsh-map-tools') } catch { mapHit = undefined } }
   items.push(mapHit
     ? { label: 'dsh-map-tools(地图/路线/POI)', ok: true, level: 'ok', detail: `已就位(${mapHit})——地图工具可用(零 key,走 OSM/OSRM)`, fix: undefined }
-    : { label: 'dsh-map-tools(地图/路线/POI)', ok: false, level: 'missing', detail: '未随包解析——启动时该 patch 条目被静默剔除,地图/路线/POI 工具不会出现在模型工具箱(缺地图不挡旅行规划,只少能力)', fix: 'npx gotry doctor --fix 不覆盖此项:source 布局把 dsh-map-tools 放进 ts/dsh-runtime/node_modules(或 ts/node_modules);npm 布局重装 @danceiny/gotry(随发行版依赖提供)' })
+    : { label: 'dsh-map-tools(地图/路线/POI)', ok: false, level: 'missing', detail: '未随包解析——启动时该 patch 条目被静默剔除,地图/路线/POI 工具不会出现在模型工具箱(缺地图不挡旅行规划,只少能力)', fix: '重装 @danceiny/gotry(地图插件随包 vendor 分发,缺失多为安装不完整)' })
   // dsh-tool-ask-user(结构化澄清卡,人格契约 (5) 的卡片形态载体)
   const askCandidates = [
     join(repoRoot, 'ts/dsh-runtime/vendor/deepseek-ai-dsh-tool-ask-user/package.json'),
     join(repoRoot, 'node_modules/@deepseek-ai/dsh-tool-ask-user/package.json'),
     join(homedir(), '.dsh/profiles/web/node_modules/@deepseek-ai/dsh-tool-ask-user/package.json'),
   ]
-  const askHit = askCandidates.find((p) => existsSync(p))
+  let askHit = askCandidates.find((p) => existsSync(p))
+  // 与 inner 同口径:优先从 dsh 包上下文解析(pnpm 嵌套布局只有 dsh 看得见),再从包根上下文
+  // (npm/npx 提升布局),最后静态候选(source vendored / profile)
+  if (!askHit) {
+    try {
+      const reqFromDsh = createRequire(rootRequire.resolve('@deepseek-ai/dsh/lib/bin.js'))
+      askHit = reqFromDsh.resolve('@deepseek-ai/dsh-tool-ask-user')
+    } catch {
+      try { askHit = rootRequire.resolve('@deepseek-ai/dsh-tool-ask-user') } catch { askHit = undefined }
+    }
+  }
   items.push(askHit
     ? { label: 'dsh-tool-ask-user(结构化澄清卡)', ok: true, level: 'ok', detail: `已就位(${askHit})——ask_user_question 澄清卡可用(web 原生卡片;headless+TTY 用 stdio 提供方)`, fix: undefined }
     : { label: 'dsh-tool-ask-user(结构化澄清卡)', ok: false, level: 'missing', detail: '未解析——启动时澄清卡注入被静默剔除,模型只能散文追问(人格契约 (5) 退化文本形态)', fix: '重装 @danceiny/gotry——该依赖随 dsh 闭包自带,缺失多为安装不完整' })
@@ -728,7 +768,13 @@ if (WIZARD) {
   process.exit(0)
 }
 
-main().catch((e) => {
-  say(`[gotry-setup] 异常:${e.message}(不影响 gotry 本体;可重试 npx gotry setup)`)
-  process.exit(AUTO ? 0 : 1)
-})
+// 直接执行才跑 main(bootstrap-tests import 本模块做 setupSidebar 单测时不触发安装面;
+// bin/gotry-inner.js 始终以 `node …/gotry-bootstrap.js` 直接 spawn,不受影响)
+if (process.argv[1] && process.argv[1].endsWith('gotry-bootstrap.js')) {
+  main().catch((e) => {
+    say(`[gotry-setup] 异常:${e.message}(不影响 gotry 本体;可重试 npx gotry setup)`)
+    process.exit(AUTO ? 0 : 1)
+  })
+}
+
+export { setupSidebar, sidebarInstalled }

package/bin/gotry-inner.js

@@ -82,10 +82,7 @@ if (help) {
 Usage:
   gotry web                          # dsh Web UI on http://127.0.0.1:3080
   gotry setup                        # 扩展就位检查/指引(商店一键装)
-<<<<<<< HEAD
   gotry setup calendar               # 可选日历(CalDAV 工作窗口)挂载开关:默认关;--off 关闭;--status 查看
-=======
->>>>>>> origin/main
   gotry doctor                       # 可选依赖体检:扩展/agent-reach/hbcli/flyai/sidebar 状态 + 补装指引
   gotry doctor --fix                 # 体检 + 按报告补装(hbcli 官方脚本 / agent-reach pip / sidebar 插件)
   gotry "一段完整任务..."            # headless 一问一答
@@ -368,13 +365,21 @@ if (benchmarkEnvironmentConfig) {
     process.exit(1)
   }
 }
-// dsh-map-tools 宿主插件(地图/路线/POI,零 key 走 OSM/OSRM):repo 用 vendored,
-// npm 用依赖解析;都找不到就整块剔除 patch 条目(缺地图不挡旅行规划)
+// dsh-map-tools 宿主插件(地图/路线/POI,零 key 走 OSM/OSRM):tarball 随包 vendor,
+// repo 工作副本走 runtime workspace 链接/依赖解析;都找不到就整块剔除 patch 条目
+// (缺地图不挡旅行规划)。不能改成 npm 依赖:其 peerDependencies 要求
+// dsh-settings/dsh-tools >=0.1.2-rc.1,与本包锁定的 0.1.2-alpha.3 家族在 npm
+// 严格 peer 解析下 ERESOLVE,会直接弄坏 npx 安装。
 let mapEntry = ''
 if (!benchmarkEnvironmentConfig) {
-  const vendoredMap = join(repoRoot, 'ts/dsh-runtime/node_modules/dsh-map-tools/lib/index.js')
+  const vendoredMap = join(repoRoot, 'ts/dsh-runtime/vendor/dsh-map-tools/lib/index.js')
+    // (随 tarball 分发;source 布局同一份文件)
+  const runtimeMap = join(repoRoot, 'ts/dsh-runtime/node_modules/dsh-map-tools/lib/index.js')
+    // (ts/dsh-runtime pnpm workspace vendor/* 链接形态)
   if (existsSync(vendoredMap)) {
     mapEntry = vendoredMap
+  } else if (existsSync(runtimeMap)) {
+    mapEntry = runtimeMap
   } else {
     // npm 布局:子路径可能被 exports 挡(resolve 抛错不能留下旧值),裸包名返回真实入口
     try { mapEntry = require_.resolve('dsh-map-tools/lib/index.js') } catch { mapEntry = '' }

package/cordis.gotry-patch.yml

@@ -109,9 +109,13 @@
       **交付任何含可下单事实的行程产物(markdown 文件或长方案)前,必须调
       gotry_fact_gate**;闸 blocked 时逐条修正为可回溯事实或降级措辞,
       不得宣称「已验证方案」。
-      (21)工具循环收敛:第 16 次工具调用收到 TOOL_BUDGET_SOFT 提示后立即整理并给出最终答复;
-      每个对话轮次最多允许 18 次真实工具派发,第 19 次起收到结构化 TOOL_BUDGET_EXHAUSTED
-      拒绝结果且不得再调用工具。达到闸值后只能基于已有结果输出最终答复,不得重试或改调其他工具。
+      (21)工具循环收敛(wall-clock,ADR-24 v2):工具按需取用,没有「次数预算」,
+      也**永远不要**向用户宣称「工具预算已耗尽」——每轮唯一的边界是运行时时间闸,
+      只认三种信号:收到 TURN_DEADLINE_SOFT = 时间过半,立即停止发起新工具,开始
+      整理已有结果;收到 TURN_DEADLINE_EXHAUSTED = 本轮时间到,只能基于已有结果
+      输出最终答复,不得重试或改调其他工具,更不得用记忆/常识填充工具没查到的
+      实时事实(如实说明哪部分未能核实);收到 TURN_DEADLINE_HANDOFF = 深规划
+      转入后台,按提示告知用户预计时间与回访方式(附工单号),本轮给简短确认。
       (22)到达账必达:红眼/凌晨起飞、或落地当天有硬安排(上班/办事)的航段,解释方案时必须
       显式给出到达账——当地到达时刻(含日期偏移)、时差、到达精力与落地后可用时长,并主动给
       前一晚落脚建议;时刻表正确不等于行程可行。

package/dist/capabilities/anything.js

@@ -1,4 +1,24 @@
 import { spawn } from 'node:child_process';
+import { hbcliBinCandidates } from './hbcli.js';
+function i18nText(v) {
+    if (!v) return '';
+    if (typeof v === 'string') return v;
+    return v.zh || v.en || v.ar || '';
+}
+function latlngOf(coord) {
+    for (const src of [
+        coord?.google,
+        coord?.gaode
+    ]){
+        const lat = typeof src?.lat === 'number' ? src.lat : undefined;
+        const lng = typeof src?.lng === 'number' ? src.lng : undefined;
+        if (lat !== undefined && lng !== undefined && (lat !== 0 || lng !== 0)) return {
+            latitude: lat,
+            longitude: lng
+        };
+    }
+    return {};
+}
 function sh(cmd, args, opts) {
     const ctrl = new AbortController();
     const timer = setTimeout(()=>{
@@ -48,8 +68,20 @@ function sh(cmd, args, opts) {
         });
     });
 }
-const upperFirst = (s)=>s ? s[0].toUpperCase() + s.slice(1) : s;
-const lowerFirst = (s)=>s ? s[0].toLowerCase() + s.slice(1) : s;
+function buildArgs(keyword, q) {
+    const args = [
+        '--json',
+        'search',
+        'anything',
+        keyword
+    ];
+    if (q.contentType) args.push('--content-type', q.contentType);
+    if (q.parentDestinationId !== undefined) args.push('--destination-id', String(q.parentDestinationId));
+    return args;
+}
+function upgradeHint(stderr) {
+    return /unknown command/i.test(stderr) ? 'hbcli 版本过旧(无 search anything 子命令)——请升级:hbcli update,或重跑 npx gotry setup' : null;
+}
 export async function anythingSearch(q) {
     const started = Date.now();
     const ts = new Date().toISOString();
@@ -64,30 +96,30 @@ export async function anythingSearch(q) {
             error: 'keyword is required'
         };
     }
-    const bin = q.hbcliBin ?? 'hbcli';
-    const args = [
-        bin,
-        'search',
-        'anything',
-        kw
-    ];
-    if (q.contentType) args.push('--content-type', q.contentType);
-    if (q.parentDestinationId !== undefined) {
-        args.push('--parent-destination-id', String(q.parentDestinationId));
+    const args = buildArgs(kw, q);
+    const candidates = hbcliBinCandidates(q.hbcliBin ?? 'hbcli');
+    let r = {
+        code: -1,
+        stdout: '',
+        stderr: ''
+    };
+    for(let i = 0; i < candidates.length; i++){
+        r = await sh(candidates[i], args, {
+            timeoutMs: q.timeoutMs ?? 12_000,
+            env: process.env
+        });
+        if (!(r.error && i < candidates.length - 1)) break;
     }
-    const r = await sh(bin, args.slice(1), {
-        timeoutMs: q.timeoutMs ?? 12_000,
-        env: process.env
-    });
     const latencyMs = Date.now() - started;
     if (r.error || r.code !== 0) {
+        const raw = r.error ?? `${r.stderr.slice(0, 200)} (exit ${r.code})`;
         return {
             ok: false,
             via: 'hbcli-anything-error',
-            evidence: `[实时API:hbcli-anything@error@${ts}] ${r.error ?? `exit ${r.code}`}`,
+            evidence: `[实时API:hbcli-anything@error@${ts}] ${raw}`,
             latencyMs,
             verdict: 'error',
-            error: r.error ?? `${r.stderr.slice(0, 200)} (exit ${r.code})`
+            error: upgradeHint(r.stderr) ?? raw
         };
     }
     let data;
@@ -109,15 +141,19 @@ export async function anythingSearch(q) {
     const hits = rawItems.map((it)=>{
         const region = it.region ?? {};
         const hotel = it.hotel ?? {};
-        const isHotel = it.type === 'hotel' || it.type === 'SupplierHotelList' || Boolean(hotel.id);
+        const isHotel = it.type === 'hotel' || Boolean(hotel.id);
+        const hotelCoords = latlngOf(hotel.latlngCoordinator);
+        const placeCoords = latlngOf(it.place?.latlngCoordinator);
+        const center = region.coordinates ?? {};
         return {
-            type: isHotel ? 'hotel' : it.type === 'place' || it.type === 'City' ? lowerFirst(it.type) : 'city',
-            name: it.name ?? region.name_en ?? region.name ?? hotel.name ?? '?',
-            score: it.score ?? region.typeScore,
-            latitude: hotel.latitude ?? region.latitude,
-            longitude: hotel.longitude ?? region.longitude,
-            destinationId: region.id,
-            hotelId: hotel.id
+            type: isHotel ? 'hotel' : it.type === 'place' ? 'place' : 'city',
+            name: i18nText(hotel.name) || i18nText(region.name) || '?',
+            score: it.matchScore,
+            latitude: hotelCoords.latitude ?? placeCoords.latitude ?? (typeof center.centerLat === 'number' ? center.centerLat : undefined),
+            longitude: hotelCoords.longitude ?? placeCoords.longitude ?? (typeof center.centerLng === 'number' ? center.centerLng : undefined),
+            destinationId: hotel.destinationId !== undefined ? String(hotel.destinationId) : region.id !== undefined ? String(region.id) : undefined,
+            hotelId: hotel.id !== undefined ? String(hotel.id) : undefined,
+            star: typeof hotel.star === 'number' && hotel.star > 0 ? hotel.star : undefined
         };
     });
     const verdict = hits.length > 0 ? 'hit' : 'miss';
@@ -131,9 +167,6 @@ export async function anythingSearch(q) {
         totalCandidates: rawItems.length
     };
 }
-export const _ = {
-    upperFirst
-};
 
 
 //# sourceURL=ts/capabilities/anything.ts

package/dist/capabilities/doctor.js

@@ -1,5 +1,6 @@
 import { spawn } from 'node:child_process';
 import { existsSync, readFileSync } from 'node:fs';
+import { createRequire } from 'node:module';
 import { homedir } from 'node:os';
 import { join, resolve } from 'node:path';
 import { readLatestChannelEvents } from './channel-health.js';
@@ -206,13 +207,22 @@ export async function runDoctorChecks(opts = {}) {
         detail: '已挂载但 calendar 未配置 username——日历工具会话中会报「未配置」',
         fix: `npx gotry setup calendar --off(恢复默认不挂载),或在 ${calProfilePatch} 覆盖 calendar 行 config 填 username(指引: npx gotry setup calendar --status)`
     });
+    const rootRequire = createRequire(join(repoRoot, 'package.json'));
     const mapCandidates = [
+        join(repoRoot, 'ts/dsh-runtime/vendor/dsh-map-tools/lib/index.js'),
         join(repoRoot, 'ts/dsh-runtime/node_modules/dsh-map-tools/lib/index.js'),
         join(repoRoot, 'node_modules/dsh-map-tools/package.json'),
         join(repoRoot, 'ts/node_modules/dsh-map-tools/package.json'),
         join(home, '.dsh/profiles/web/node_modules/dsh-map-tools/package.json')
     ];
-    const mapHit = mapCandidates.find((p)=>existsSync(p));
+    let mapHit = mapCandidates.find((p)=>existsSync(p));
+    if (!mapHit) {
+        try {
+            mapHit = rootRequire.resolve('dsh-map-tools');
+        } catch  {
+            mapHit = undefined;
+        }
+    }
     items.push(mapHit ? {
         id: 'map-tools',
         label: 'dsh-map-tools(地图/路线/POI)',
@@ -223,14 +233,26 @@ export async function runDoctorChecks(opts = {}) {
         label: 'dsh-map-tools(地图/路线/POI)',
         status: 'missing',
         detail: '未随包解析——启动时该 patch 条目被静默剔除,地图/路线/POI 工具不会出现在模型工具箱(缺地图不挡旅行规划,只少能力)',
-        fix: 'npx gotry doctor --fix 不覆盖此项:source 布局把 dsh-map-tools 放进 ts/dsh-runtime/node_modules(或 ts/node_modules);npm 布局重装 @danceiny/gotry(随发行版依赖提供)'
+        fix: '重装 @danceiny/gotry(地图插件随包 vendor 分发,缺失多为安装不完整)'
     });
     const askCandidates = [
         join(repoRoot, 'ts/dsh-runtime/vendor/deepseek-ai-dsh-tool-ask-user/package.json'),
         join(repoRoot, 'node_modules/@deepseek-ai/dsh-tool-ask-user/package.json'),
         join(home, '.dsh/profiles/web/node_modules/@deepseek-ai/dsh-tool-ask-user/package.json')
     ];
-    const askHit = askCandidates.find((p)=>existsSync(p));
+    let askHit = askCandidates.find((p)=>existsSync(p));
+    if (!askHit) {
+        try {
+            const reqFromDsh = createRequire(rootRequire.resolve('@deepseek-ai/dsh/lib/bin.js'));
+            askHit = reqFromDsh.resolve('@deepseek-ai/dsh-tool-ask-user');
+        } catch  {
+            try {
+                askHit = rootRequire.resolve('@deepseek-ai/dsh-tool-ask-user');
+            } catch  {
+                askHit = undefined;
+            }
+        }
+    }
     items.push(askHit ? {
         id: 'ask-user',
         label: 'dsh-tool-ask-user(结构化澄清卡)',

package/dist/capabilities/hbcli.js

@@ -112,6 +112,25 @@ export async function callHbcliJson(args, opts = {}) {
     }
     return last;
 }
+function i18nName(v) {
+    if (!v) return '';
+    if (typeof v === 'string') return v;
+    return v.zh || v.en || v.ar || '';
+}
+function hotelLines(result, max = 8) {
+    const list = result?.list;
+    if (!Array.isArray(list) || list.length === 0) return '';
+    const lines = [];
+    for (const item of list.slice(0, max)){
+        const h = item;
+        const name = i18nName(h.name) || `hotel ${h.id ?? '?'}`;
+        const star = typeof h.star === 'number' && h.star > 0 ? ` ${h.star}★` : '';
+        const price = h.minPrice && typeof h.minPrice.amount === 'number' ? ` 低至 ${h.minPrice.amount}${h.minPrice.currency ? ` ${h.minPrice.currency}` : ''}` : '';
+        lines.push(`- id=${h.id ?? '?'} ${name}${star}${price}`);
+    }
+    if (list.length > max) lines.push(`…(共 ${list.length} 家,仅列前 ${max})`);
+    return lines.join('\n');
+}
 export async function searchHotels(query, opts = {}) {
     const hbArgs = [
         'search',
@@ -121,6 +140,8 @@ export async function searchHotels(query, opts = {}) {
         '10'
     ];
     if (query.destination) hbArgs.push('--destination-name', 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('--room-occupancies', JSON.stringify([
         {
             adultCount: query.adults,
@@ -129,10 +150,15 @@ export async function searchHotels(query, opts = {}) {
     ]));
     const live = await callHbcliJson(hbArgs, opts);
     if (live.via === 'hbcli-realtime') {
+        const list = live.result?.list;
+        const n = Array.isArray(list) ? list.length : 0;
+        const dateTag = query.checkIn ? `入住 ${query.checkIn}${query.checkOut ? ` → 退房 ${query.checkOut}` : ''}` : '未传日期(上游按当前窗口价)';
+        const lines = hotelLines(live.result);
+        const summary = `${query.destination}:hbcli 实时 ${n} 家(${dateTag})${lines ? `\n${lines}` : ''}\n${live.evidence}`;
         return {
             ...live,
             hotels: live.result,
-            summary: `${query.destination}:hbcli 实时返回${query.checkIn || query.checkOut ? '(日期不传上游 list,以当前窗口房价返回)' : ''}`
+            summary
         };
     }
     const rawReason = live.error ?? live.via;
@@ -151,7 +177,7 @@ export async function searchHotels(query, opts = {}) {
                     hotels: {
                         stays: matched
                     },
-                    summary: `${query.destination}:hbcli 实时源不可用(${reason}),已降级到静态包(公开渠道估算,非实时),命中 ${matched.length} 个住宿块`
+                    summary: `${query.destination}:hbcli 实时源不可用(${reason}),已降级到静态包(公开渠道估算,非实时),命中 ${matched.length} 个住宿块:\n${JSON.stringify(matched).slice(0, 1600)}`
                 };
             }
             return {

package/dist/scripts/agent-planning-turn-deadline-e2e.js

@@ -117,7 +117,8 @@ async function startRelay() {
             if (toolNames(body).includes(TOOL)) {
                 plannerBodies.push(body);
                 const plannerIndex = plannerBodies.length;
-                const alreadyHandedOff = JSON.stringify(body).includes(HANDOFF);
+                const realToolMessages = (body.messages ?? []).filter((message)=>message.role === 'tool');
+                const alreadyHandedOff = realToolMessages.some((message)=>JSON.stringify(message).includes(HANDOFF));
                 const stall = !alreadyHandedOff && plannerIndex === 1 ? RELAY_STALL_MS : 0;
                 setTimeout(()=>{
                     if (!alreadyHandedOff && plannerIndex === 1) {