@danceiny/gotry 0.0.1-rc.12 → 0.0.1-rc.14

package/dist/scripts/flyai-tests.js

@@ -0,0 +1,95 @@
+import assert from 'node:assert/strict';
+import { writeFile, mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { flyaiSearch } from '../capabilities/flyai.js';
+const tmp = await mkdtemp(join(tmpdir(), 'flyai-test-'));
+async function fakeCli(name, code, payload) {
+    const p = join(tmp, name);
+    await writeFile(p, `#!/bin/sh\necho '${payload}'\nexit ${code}\n`, {
+        mode: 0o755
+    });
+    return p;
+}
+const base = {
+    kind: 'flight',
+    origin: '上海',
+    destination: '丽江',
+    depDate: '2026-10-01'
+};
+const sentinelBin = await fakeCli('flyai-sentinel', 0, '{"message":"SentinelBlockException: flow control"}');
+const s = await flyaiSearch({
+    ...base,
+    cliBin: sentinelBin,
+    timeoutMs: 5000
+});
+assert.equal(s.ok, false, 'Sentinel 形状应 ok=false');
+assert.equal(s.verdict, 'error', `Sentinel 形状应判 error,实际 ${s.verdict}`);
+assert.match(s.error ?? '', /sentinel/i, `error 应保留 sentinel 字样(供上层限流识别),实际 ${s.error}`);
+assert.match(s.evidence, /\[实时API:flyai@error@/, 'error 证据链标注');
+console.log('1. Sentinel 非业务形状 → error(非静默 miss)OK');
+const missBin = await fakeCli('flyai-miss', 0, '{"data":{"itemList":[]}}');
+const m = await flyaiSearch({
+    ...base,
+    cliBin: missBin,
+    timeoutMs: 5000
+});
+assert.equal(m.ok, true, '业务空形状 ok=true');
+assert.equal(m.verdict, 'miss', `空 itemList 应判 miss,实际 ${m.verdict}`);
+assert.match(m.evidence, /0\/0 flight options/, 'miss 证据链 0/0');
+console.log('2. 业务空形状 → miss(0/0)OK');
+const hitPayload = JSON.stringify({
+    data: {
+        itemList: [
+            {
+                journeys: [
+                    {
+                        segments: [
+                            {
+                                marketingTransportNo: '9C6617',
+                                marketingTransportName: '吉祥航空',
+                                depDateTime: '2026-10-01 07:55',
+                                arrDateTime: '2026-10-01 11:20',
+                                depStationName: '浦东T2',
+                                arrStationName: '丽江三义',
+                                duration: 205
+                            }
+                        ]
+                    }
+                ],
+                ticketPrice: '580',
+                jumpUrl: 'https://www.fliggy.com/demo'
+            }
+        ]
+    }
+});
+const hitBin = await fakeCli('flyai-hit', 0, hitPayload);
+const h = await flyaiSearch({
+    ...base,
+    cliBin: hitBin,
+    timeoutMs: 5000
+});
+assert.equal(h.verdict, 'hit', `业务条目应判 hit,实际 ${h.verdict}`);
+assert.equal(h.options?.length, 1, '1 个选项');
+assert.equal(h.options[0].no, '9C6617');
+assert.equal(h.options[0].price, 580, '价格数值解析');
+assert.equal(h.options[0].depStation, '浦东T2');
+assert.match(h.evidence, /1\/1 flight options/, 'hit 证据链 1/1');
+console.log('3. 业务命中 → hit(9C6617 ¥580)OK');
+const failBin = await fakeCli('flyai-fail', 1, '');
+const f = await flyaiSearch({
+    ...base,
+    cliBin: failBin,
+    timeoutMs: 5000
+});
+assert.equal(f.ok, false);
+assert.equal(f.verdict, 'error', '非零退出应判 error');
+console.log('4. 非零退出 → error OK');
+await rm(tmp, {
+    recursive: true,
+    force: true
+});
+console.log('FLYAI TESTS: 4/4 OK(离线假 CLI:Sentinel→error / 空 itemList→miss / 命中→hit / exit≠0→error)');
+
+
+//# sourceURL=/Users/bytedance/work/gotry/ts/scripts/flyai-tests.ts

package/dist/scripts/hbcli-tests.js

@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
 import { writeFile, mkdtemp, rm } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
-import { callHbcliJson, searchHotels } from '../capabilities/hbcli.js';
+import { callHbcliJson, searchHotels, hbcliBinCandidates } from '../capabilities/hbcli.js';
 const tmp = await mkdtemp(join(tmpdir(), 'hbcli-test-'));
 async function fakeBin(name, code, payload) {
     const p = join(tmp, name);
@@ -112,11 +112,36 @@ const r5 = await searchHotels({
 });
 assert.equal(r5.hotels ?? null, null, '无目的地命中时 hotels 为 null(不整包倾倒)');
 assert.match(r5.summary, /无「巴黎」住宿数据/, 'summary 明示静态包无该目的地');
-await rm(tmp, {
+const r6 = await searchHotels({
+    destination: '普吉'
+}, {
+    hbcliBin: '/nope/hbcli',
+    fallbackPath: fallback
+});
+assert.equal(r6.via, 'hbcli-error', 'no-binary path');
+assert.ok(r6.summary.includes('未安装 hbcli'), `summary 应人话化 ENOENT,实际 ${r6.summary}`);
+assert.ok(r6.summary.includes('gotry setup'), '应带 gotry setup 安装指引');
+assert.ok(r6.summary.includes('降级到静态包'), '人话化后仍指明降级到静态包');
+console.log(`6. ENOENT 人话化 OK:${r6.summary}`);
+{
+    const home = '/home/t';
+    assert.deepEqual(hbcliBinCandidates('hbcli', home), [
+        'hbcli',
+        '/home/t/.local/bin/hbcli',
+        '/home/t/.staicli/current/hbcli'
+    ], '默认名应带安装位候选');
+    assert.deepEqual(hbcliBinCandidates('hbcli-not-on-path', home), [
+        'hbcli-not-on-path'
+    ], '自定义名单候选(测试确定性)');
+    assert.deepEqual(hbcliBinCandidates('/nope/hbcli', home), [
+        '/nope/hbcli'
+    ], '绝对路径单候选');
+    console.log('7. hbcliBinCandidates(~/.local/bin + ~/.staicli/current 回退)OK');
+}await rm(tmp, {
     recursive: true,
     force: true
 });
-console.log('HBCLI TESTS: 6/6 OK (happy / error / no-binary / fallback-filter / fallback-no-match / v0.3.0 旗标回归)');
+console.log('HBCLI TESTS: 8/8 OK (happy / error / no-binary / fallback-filter / fallback-no-match / v0.3.0 旗标回归 / ENOENT 人话化 / 候选路径)');
 
 
 //# sourceURL=/Users/bytedance/work/gotry/ts/scripts/hbcli-tests.ts

package/dist/scripts/session-tests.js

@@ -387,6 +387,8 @@ console.log('H. flyaiSearch hotel(飞猪官方 search-hotel)');
         });
         if (lr.verdict === 'needs-attach') {
             assert(lr.ok === false && /chrome:\/\/inspect/.test(lr.error ?? ''), 'live:Chrome 未开调试 → needs-attach + 一次性指引', lr);
+        } else if (lr.verdict === 'logged-in') {
+            assert(lr.ok === true && (lr.tickets?.length ?? 0) > 0, 'live:已登录自动检测 → logged-in(零弹窗,票据名级)', lr);
         } else {
             assert(lr.ok === true && lr.verdict === 'pending', 'live:attach 成功不交互 → pending(入口已开,等人登录)', lr);
             const evidenceTagRe = /\[会话:ctrip-flight-login@/;

package/dist/src/index.js

@@ -585,10 +585,14 @@ export function apply(ctx, config) {
             }),
         presentResult: (_args, value)=>{
             const r = value;
-            const n = Array.isArray(r.hotels) ? r.hotels.length : 0;
+            const h = r.hotels;
+            const liveCount = Array.isArray(h) ? h.length : 0;
+            const stays = !Array.isArray(h) && h && typeof h === 'object' ? h.stays : undefined;
+            const staticCount = Array.isArray(stays) ? stays.length : 0;
+            const tag = r.via === 'hbcli-realtime' ? liveCount ? `实时 ${liveCount} 家` : '实时' : staticCount ? `静态包 ${staticCount} 块` : liveCount ? `${liveCount} 家` : '无结果';
             return {
                 card: 'generic',
-                title: `酒店:${r.destination ?? ''} ${n ? `${n} 家(${r.via === 'hbcli-realtime' ? '实时' : '静态包'})` : '无结果'}`,
+                title: `酒店:${r.destination ?? ''} ${tag}`,
                 content: [
                     {
                         type: 'text',
@@ -875,7 +879,8 @@ export function apply(ctx, config) {
                 depDate: q.date
             });
             const top = (r.options ?? []).slice(0, 8).map((o)=>`${o.no} ${o.name} ${o.depDateTime.slice(11, 16)}→${o.arrDateTime.slice(11, 16)} ¥${o.price}`);
-            const summary = r.verdict === 'hit' ? `${q.from}→${q.to} ${q.date} ${kind === 'flight' ? '机票' : '火车票'}(飞猪官方只读)前 ${top.length} 条:\n${top.join('\n')}\n${r.evidence}` : `${q.from}→${q.to} ${q.date} 无结果或失败:${r.error ?? 'miss'} ${r.evidence}`;
+            const label = kind === 'flight' ? '机票' : '火车票';
+            const summary = r.verdict === 'hit' ? `${q.from}→${q.to} ${q.date} ${label}(飞猪官方只读)前 ${top.length} 条:\n${top.join('\n')}\n${r.evidence}` : r.verdict === 'miss' ? `${q.from}→${q.to} ${q.date} ${label}官方通道正常返回 0 条(常见原因:航线未开放/当日售罄)。${r.evidence}` : `${q.from}→${q.to} ${q.date} ${label}检索失败(可能限流/网络):${r.error ?? ''} ${r.evidence}`;
             return JSON.parse(JSON.stringify({
                 ...r,
                 kind,
@@ -906,7 +911,7 @@ export function apply(ctx, config) {
     }));
     registerGuarded(defineTool({
         name: 'gotry_session_login',
-        description: 'Productized login bootstrap for the account session channel (call this when gotry_session_search returns needs-login — the user never needs a terminal). ' + 'OPENS the site login entry in the USER\'S OWN Chrome and waits for the user to finish logging in on the external site. ' + 'GoTry NEVER collects, stores, or transmits credentials: no passwords, no SMS codes, no cookie values — it only checks the boolean fact "already logged in" (reads cookie NAMES only, zero values). ' + 'verdict logged-in (tickets detected) | pending (login tab opened, user not done yet — offer to re-check later) | needs-attach (one-time Chrome remote-debugging switch instructions). ' + 'Evidence [会话:<site>-login@ts].',
+        description: 'Productized login bootstrap for the account session channel (call this when gotry_session_search returns needs-login — the user never needs a terminal). ' + 'AUTO-DETECTION FIRST: it reads ticket-cookie NAMES before anything else — if the user already logged in (on the external site) it confirms instantly WITHOUT opening any page. ' + 'OPENS the site login entry in the USER\'S OWN Chrome and waits for the user to finish logging in on the external site. ' + 'GoTry NEVER collects, stores, or transmits credentials: no passwords, no SMS codes, no cookie values — it only checks the boolean fact "already logged in" (reads cookie NAMES only, zero values). ' + 'verdict logged-in (tickets detected) | pending (login tab opened, user not done yet — offer to re-check later) | needs-attach (one-time Chrome remote-debugging switch instructions). ' + 'Evidence [会话:<site>-login@ts].',
         parameters: {
             query: {
                 type: 'json',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danceiny/gotry",
-  "version": "0.0.1-rc.12",
+  "version": "0.0.1-rc.14",
   "description": "GoTry — 从出发到下一次出发的 AI 旅行 Agent(dsh 插件)。npm 包入口 + vendored dsh runtime + 5 行 README 安装路径。",
   "type": "module",
   "main": "ts/src/index.ts",
@@ -47,6 +47,7 @@
     "ts/package.json",
     "cordis.gotry-patch.yml",
     "README.md",
+    "README.zh-CN.md",
     "LICENSE",
     "ts/capabilities/session-consent.ts",
     "ts/capabilities/session-login.ts"

package/ts/capabilities/hbcli.ts

@@ -13,9 +13,11 @@
  */
 
 import { spawn } from 'node:child_process'
+import { homedir } from 'node:os'
+import { join } from 'node:path'
 
 export interface HbcliCallOptions {
-  /** hbcli 二进制路径(默认 'hbcli',依赖 PATH) */
+  /** hbcli 二进制路径(默认 'hbcli',依赖 PATH;~/.local/bin 等已知安装位自动回退) */
   hbcliBin?: string
   /** 超时(ms) */
   timeoutMs?: number
@@ -43,23 +45,29 @@ export interface HbcliCallResult {
   error?: string
 }
 
-/** 通用 hbcli JSON 调用封装:失败不抛,而是返回降级结果 */
-export async function callHbcliJson(
+/**
+ * hbcli 二进制候选路径(gotry setup 按官方脚本装到 ~/.local/bin/hbcli,
+ * symlink 指向 ~/.staicli/current/hbcli——当 PATH 不含 ~/.local/bin 时裸名
+ * spawn 仍 ENOENT,按已知安装位回退)。仅对默认名 'hbcli' 扩展;显式自定义
+ * 名(如测试注入的不存在路径)不扩展,保持配置即所用的可测性。
+ */
+export function hbcliBinCandidates(bin: string, homeDir: string = homedir()): string[] {
+  if (bin !== 'hbcli') return [bin]
+  return [bin, join(homeDir, '.local/bin/hbcli'), join(homeDir, '.staicli/current/hbcli')]
+}
+
+/** 单个候选的一次 spawn 封装:失败不抛,返回降级结果(spawnError 标记 ENOENT 类失败供上层换候选) */
+function attemptHbcli(
+  bin: string,
   args: string[],
-  opts: HbcliCallOptions = {},
-): Promise<HbcliCallResult> {
+  opts: Required<Pick<HbcliCallOptions, 'timeoutMs' | 'env'>> & { envVars: Record<string, string> },
+): Promise<HbcliCallResult & { spawnError?: boolean }> {
   const started = Date.now()
-  const bin = opts.hbcliBin ?? 'hbcli'
-  const timeoutMs = opts.timeoutMs ?? 15_000
-  const env = opts.env ?? 'uat'
-  const envVars: Record<string, string> = { HOTELBYTE_ENV: env }
-  if (opts.token) envVars['HOTELBYTE_TOKEN'] = opts.token
-
   return new Promise((resolve) => {
     let stdout = ''
     let stderr = ''
     let settled = false
-    const child = spawn(bin, args, { env: { ...process.env, ...envVars } })
+    const child = spawn(bin, args, { env: { ...process.env, ...opts.envVars } })
     const timer = setTimeout(() => {
       if (!settled) {
         settled = true
@@ -67,10 +75,10 @@ export async function callHbcliJson(
         resolve({
           via: 'hbcli-error', exitCode: -1, result: null,
           evidence: `[实时API:hbcli@timeout@${new Date().toISOString()}]`,
-          latencyMs: Date.now() - started, error: `timeout after ${timeoutMs}ms`,
+          latencyMs: Date.now() - started, error: `timeout after ${opts.timeoutMs}ms`,
         })
       }
-    }, timeoutMs)
+    }, opts.timeoutMs)
     child.stdout.on('data', (d: Buffer) => { stdout += d.toString() })
     child.stderr.on('data', (d: Buffer) => { stderr += d.toString() })
     child.on('close', (code) => {
@@ -105,16 +113,35 @@ export async function callHbcliJson(
       if (settled) return
       settled = true
       clearTimeout(timer)
-      // ENOENT (二进制不存在) 等也走降级路径
+      // ENOENT (二进制不存在) 等也走降级路径;spawnError 供上层按候选路径重试
       resolve({
         via: 'hbcli-error', exitCode: -1, result: null,
         evidence: `[实时API:hbcli@spawn_error@${new Date().toISOString()}]`,
-        latencyMs: Date.now() - started, error: (e as Error).message,
+        latencyMs: Date.now() - started, error: (e as Error).message, spawnError: true,
       })
     })
   })
 }
 
+/** 通用 hbcli JSON 调用封装:失败不抛,而是返回降级结果 */
+export async function callHbcliJson(
+  args: string[],
+  opts: HbcliCallOptions = {},
+): Promise<HbcliCallResult> {
+  const env = opts.env ?? 'uat'
+  const envVars: Record<string, string> = { HOTELBYTE_ENV: env }
+  if (opts.token) envVars['HOTELBYTE_TOKEN'] = opts.token
+  const callOpts = { timeoutMs: opts.timeoutMs ?? 15_000, env, envVars }
+  const candidates = hbcliBinCandidates(opts.hbcliBin ?? 'hbcli')
+  let last: HbcliCallResult & { spawnError?: boolean } | undefined
+  for (const bin of candidates) {
+    last = await attemptHbcli(bin, args, callOpts)
+    // spawn 级失败(ENOENT 等)且还有候选 → 换下一个已知安装位;其余失败(退码/超时)无重试意义
+    if (!(last.spawnError && candidates.indexOf(bin) < candidates.length - 1)) return last
+  }
+  return last!
+}
+
 /** 高层语义化封装:酒店列表查询(down-tier to 静态包 + 证据链标注) */
 export async function searchHotels(
   query: { destination: string; checkIn?: string; checkOut?: string; adults?: number },
@@ -129,6 +156,11 @@ export async function searchHotels(
   if (live.via === 'hbcli-realtime') {
     return { ...live, hotels: live.result, summary: `${query.destination}:hbcli 实时返回${query.checkIn || query.checkOut ? '(日期不传上游 list,以当前窗口房价返回)' : ''}` }
   }
+  // 降级原因人话化(issue #24):hbcli 未安装时按 gotry setup 指引(npm 安装期已
+  // 自动跑过官方脚本;PATH 未含 ~/.local/bin 时上方候选路径也已兜住),
+  // 裸 "spawn hbcli ENOENT" 读起来像工具坏了——实际静态包降级是设计行为
+  const rawReason = live.error ?? live.via
+  const reason = /ENOENT/i.test(rawReason) ? '未安装 hbcli(可选实时源;npx gotry setup 可按官方脚本安装)' : rawReason
   // 降级:读静态包,按目的地过滤命中的住宿块(issue #24)——整包倾倒会把无关场景
   // (深圳/普吉/曼谷/云南/大理混装)灌给模型且不指明哪块相关;包内无该目的地时明示
   // 「无数据」而不是伪装成可用结果。
@@ -144,17 +176,17 @@ export async function searchHotels(
         return {
           ...live,
           hotels: { stays: matched },
-          summary: `${query.destination}:hbcli 不可用(${live.error ?? live.via}),降级到静态包,命中 ${matched.length} 个住宿块`,
+          summary: `${query.destination}:hbcli 实时源不可用(${reason}),已降级到静态包(公开渠道估算,非实时),命中 ${matched.length} 个住宿块`,
         }
       }
       return {
         ...live,
         hotels: null,
-        summary: `${query.destination}:hbcli 不可用(${live.error ?? live.via}),且静态包无「${query.destination}」住宿数据(静态包仅覆盖内置场景)`,
+        summary: `${query.destination}:hbcli 实时源不可用(${reason}),且静态包无「${query.destination}」住宿数据(静态包仅覆盖内置场景)`,
       }
     } catch { /* 静态包读不到也优雅降级 */ }
   }
-  return { ...live, summary: `${query.destination}:hbcli 不可用且无静态包(仅返回错误)` }
+  return { ...live, summary: `${query.destination}:hbcli 实时源不可用(${reason})且无静态包(仅返回错误)` }
 }
 
 /** 高层语义化封装:目的地列表(无数据依赖,通常 hbcli dest 命令可独立调通) */

package/ts/capabilities/session/transport.ts

@@ -57,6 +57,14 @@ export interface TransportOptions {
    * 凭证流的中间(隐私+可靠性双输)。该形态下不发起任何检索导航、不落审计。
    */
   guard?: boolean
+  /**
+   * 开**自己的新标签页**(默认 false=沿用既有首页——那是用户的页面!)。
+   * 人机共治纪律(2026-08-29 founder:「我根本就看不到登录页面」):登录与检索一律
+   * newPage 开自己的页,绝不劫持用户已有标签页;closeOwnPage 控制收尾是否关掉自己开的页。
+   */
+  newPage?: boolean
+  /** newPage:true 时,close() 是否连自己开的标签页一起关(默认 true;登录引导保持 false——把登录页留给用户) */
+  closeOwnPage?: boolean
 }
 
 function devtoolsWsEndpoint(): { ws: string } | { err: string } {
@@ -111,14 +119,27 @@ export async function openSession(opts: TransportOptions = {}): Promise<SessionT
       return { ok: false, summary: `read-guard attach failed: ${e instanceof Error ? e.message.split('\n')[0] : String(e)}` }
     }
   }
-  const page = (await browser.pages())[0] ?? (await browser.newPage())
+  // 标签页纪律:ownPage=自己开的新页(newPage:true)——用它,收尾按 closeOwnPage 关;
+  // 否则沿用既有首页(仅 persistent 兼容形态;cdp 检索/登录一律 newPage)
+  let ownPage: boolean = false
+  let page
+  if (opts.newPage) {
+    page = await browser.newPage()
+    ownPage = true
+  } else {
+    page = (await browser.pages())[0] ?? await browser.newPage()
+  }
   return {
     ok: true,
     browser,
     page,
     guard: guard ?? { blockedCount: () => 0, requestCount: () => 0 },
     close: async () => {
+      // 自己开的标签页按 closeOwnPage 收尾(登录引导保持 false——登录页留给用户);
       // cdp:只断开连接,绝不关用户浏览器;persistent:关自己拉起的实例
+      if (ownPage && (opts.closeOwnPage ?? true)) {
+        await (page as { close(): Promise<void> }).close().catch(() => { /* ignore */ })
+      }
       await (isCdp ? browser.disconnect() : browser.close()).catch(() => { /* ignore */ })
     },
   }

package/ts/capabilities/session-login.ts

@@ -84,6 +84,8 @@ export async function sessionLogin(q: SessionLoginQuery = {}): Promise<SessionLo
   if (!target) {
     return err(site, 'error', `未知站点 ${site}(可选 ${Object.keys(LOGIN_TARGETS).join('/')})`, started, ts)
   }
+  // 人机共治纪律:开自己的新标签页并置前台——用户必须看见登录页(2026-08-29 founder:
+  // 「我根本就看不到登录页面」,此前误劫持用户既有标签页);closeOwnPage=false 把登录页留给用户
   const t = await openSession({ mode: 'cdp', guard: false })
   if (!t.ok) {
     const needsAttach = /chrome:\/\/inspect|DevToolsActivePort|cdp attach 失败/.test(t.summary)
@@ -98,11 +100,25 @@ export async function sessionLogin(q: SessionLoginQuery = {}): Promise<SessionLo
   }
   const evidenceTag = `[会话:${site}-login@${ts}]`
   try {
+    // 自动检测优先(2026-08-29 founder「UI 里有自动检测吗」):先只读票据名——
+    // 已登录则**零弹窗**直接确认,不打开任何页面;登录状态由用户在携程官网自然留存
+    const pre = await pollTicketNames(t.browser as unknown as { cookies(): Promise<CookieLike[]> }, target)
+    if (pre.length > 0) {
+      await t.close()
+      return {
+        ok: true, via: 'session-login', latencyMs: Date.now() - started, verdict: 'logged-in', site, tickets: pre,
+        evidence: `${evidenceTag} 自动检测:票据 cookie 已在(先前登录已生效)——[${pre.join(', ')}](只读名字,0 网页交互)`,
+      }
+    }
+    // 未检出 → 开自己的新标签页并置前台(绝不劫持用户既有页面),等待用户在官网完成登录
+    const page = await t.browser.newPage()
+    await (page as unknown as { bringToFront(): Promise<void> }).bringToFront().catch(() => { /* 某些环境不可置前 */ })
     try {
-      await t.page.goto(target.entryUrl, { waitUntil: 'domcontentloaded', timeout: 30_000 })
+      await page.goto(target.entryUrl, { waitUntil: 'domcontentloaded', timeout: 30_000 })
     } catch {
       // 站点慢不致命:入口标签已打开,用户手动登录即可
     }
+    console.log(`[session-login] ${target.label} 登录入口已在新标签页置前打开`)
     const waitMs = Math.min(Math.max(q.waitMs ?? 90_000, 0), 300_000)
     const pollMs = Math.min(Math.max(q.pollMs ?? 3_000, 500), 10_000)
     const deadline = Date.now() + waitMs

package/ts/capabilities/session-search.ts

@@ -74,7 +74,8 @@ export async function sessionFlightSearch(q: SessionFlightQuery): Promise<Sessio
     return err('error', `unresolved entry: ${(entry.unresolved ?? []).join('/')} 不在城市码表`)
   }
 
-  const t = await openSession({ profileDir: q.profileDir, headless: q.headless, auditPath: q.auditPath, mode: q.profileDir ? 'persistent' : 'cdp' })
+  // 人机共治纪律:检索一律开自己的新标签页(绝不劫持用户已有页面),用完关自己的页
+  const t = await openSession({ profileDir: q.profileDir, headless: q.headless, auditPath: q.auditPath, mode: q.profileDir ? 'persistent' : 'cdp', newPage: true })
   if (!t.ok) {
     // cdp 未开端口或握手失败 → needs-attach(一次性用户动作);persistent 启动失败仍走 error。
     // transport 的“端口未开”在连接前返回,文案不含 `cdp attach 失败`,两种形态都要归入同一用户门禁。

package/ts/src/index.ts

@@ -516,11 +516,18 @@ export function apply(ctx: Context, config: Config): void {
     },
     presentCall: args => ({ card: 'generic', title: `酒店搜索:${String((args.query as { destination?: string })?.destination ?? '')}`, kind: 'search', rawInput: args.query }),
     presentResult: (_args, value) => {
-      const r = value as { hotels?: unknown[]; via?: string; destination?: string; summary?: string }
-      const n = Array.isArray(r.hotels) ? r.hotels.length : 0
+      const r = value as { hotels?: unknown; via?: string; destination?: string; summary?: string }
+      const h = r.hotels
+      const liveCount = Array.isArray(h) ? h.length : 0
+      // 静态包是 {meta, stays} 对象而非数组(issue #24:此前计数恒 0 → UI 显示「无结果」)
+      const stays = !Array.isArray(h) && h && typeof h === 'object' ? (h as { stays?: unknown[] }).stays : undefined
+      const staticCount = Array.isArray(stays) ? stays.length : 0
+      const tag = r.via === 'hbcli-realtime'
+        ? (liveCount ? `实时 ${liveCount} 家` : '实时')
+        : staticCount ? `静态包 ${staticCount} 块` : (liveCount ? `${liveCount} 家` : '无结果')
       return {
         card: 'generic',
-        title: `酒店:${r.destination ?? ''} ${n ? `${n} 家(${r.via === 'hbcli-realtime' ? '实时' : '静态包'})` : '无结果'}`,
+        title: `酒店:${r.destination ?? ''} ${tag}`,
         content: [{ type: 'text', text: String(r.summary ?? '') }],
       }
     },
@@ -719,9 +726,14 @@ export function apply(ctx: Context, config: Config): void {
       }
       const r = await flyaiSearch({ kind, origin: q.from, destination: q.to, depDate: q.date })
       const top = (r.options ?? []).slice(0, 8).map(o => `${o.no} ${o.name} ${o.depDateTime.slice(11, 16)}→${o.arrDateTime.slice(11, 16)} ¥${o.price}`)
+      // issue #24:miss(上游正常返回 0 条)与 error(限流/网络)分开陈述,不再混写「无结果或失败」
+      // (过去日期已被上方预校验拦下,此处不会出现过期查询)
+      const label = kind === 'flight' ? '机票' : '火车票'
       const summary = r.verdict === 'hit'
-        ? `${q.from}→${q.to} ${q.date} ${kind === 'flight' ? '机票' : '火车票'}(飞猪官方只读)前 ${top.length} 条:\n${top.join('\n')}\n${r.evidence}`
-        : `${q.from}→${q.to} ${q.date} 无结果或失败:${r.error ?? 'miss'} ${r.evidence}`
+        ? `${q.from}→${q.to} ${q.date} ${label}(飞猪官方只读)前 ${top.length} 条:\n${top.join('\n')}\n${r.evidence}`
+        : r.verdict === 'miss'
+          ? `${q.from}→${q.to} ${q.date} ${label}官方通道正常返回 0 条(常见原因:航线未开放/当日售罄)。${r.evidence}`
+          : `${q.from}→${q.to} ${q.date} ${label}检索失败(可能限流/网络):${r.error ?? ''} ${r.evidence}`
       return JSON.parse(JSON.stringify({ ...r, kind, summary })) as Record<string, never>
     },
     presentCall: args => ({ card: 'generic', title: `官方检索:${String((args.query as { kind?: string })?.kind ?? 'flight')}`, kind: 'fetch', rawInput: args.query }),
@@ -736,7 +748,7 @@ export function apply(ctx: Context, config: Config): void {
   registerGuarded(defineTool({
     name: 'gotry_session_login',
     description:
-      'Productized login bootstrap for the account session channel (call this when gotry_session_search returns needs-login — the user never needs a terminal). '
+      'Productized login bootstrap for the account session channel (call this when gotry_session_search returns needs-login — the user never needs a terminal). ' + 'AUTO-DETECTION FIRST: it reads ticket-cookie NAMES before anything else — if the user already logged in (on the external site) it confirms instantly WITHOUT opening any page. '
       + 'OPENS the site login entry in the USER\'S OWN Chrome and waits for the user to finish logging in on the external site. '
       + 'GoTry NEVER collects, stores, or transmits credentials: no passwords, no SMS codes, no cookie values — it only checks the boolean fact "already logged in" (reads cookie NAMES only, zero values). '
       + 'verdict logged-in (tickets detected) | pending (login tab opened, user not done yet — offer to re-check later) | needs-attach (one-time Chrome remote-debugging switch instructions). '