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

package/ts/src/index.ts

@@ -7,7 +7,7 @@
  *   - gotry_wish_pool_add       「下一次出发」清单(憧憬不被拒绝)
  *
  * 插件形态遵循 dsh 约定(name/inject/Config/apply + ctx.tools.register(defineTool(...))),
- * 对齐 @deepseek-ai/dsh-tools@0.1.2-alpha.3 的契约:
+ * 对齐 @deepseek-ai/dsh-tools@0.1.5-rc.1 的契约:
  * render 位于 output 对象内,参数属性是 ValueSchemaSpec(支持 type:'json')。
  *
  * @module @gotry/plugin
@@ -17,7 +17,7 @@ import { join } from 'node:path'
 
 import type { Context } from '@deepseek-ai/cordis'
 import z from '@deepseek-ai/schemastery'
-import { defineTool } from '@deepseek-ai/dsh-tools'
+import { defineTool, type ToolResult, type ToolRunContext } from '@deepseek-ai/dsh-tools'
 import { ensureStateDir, recordLatency } from './bridge.ts'
 import { segmentsFromCandidate, solveChoiceSegment } from './unified.ts'
 import { checkConnectivity } from '../scripts/skeleton-check.ts'
@@ -28,20 +28,23 @@ import { projectUtility } from './memory-utility.ts'
 import { pickNudgeWish, type WishPoolEntry } from './wish-pool.ts'
 import { resolveTimelineDate } from './travel-timeline.ts'
 import { ensureLedger, readCompanionsWithFallback, readMotivationWithFallback, readTripsWithFallback, readWishPoolWithFallback } from './state-ledger.ts'
-import { buildTimeAnchor } from './time-anchor.ts'
-import { resolveSlotDate } from './slot-spec.ts'
+import { isValidHomeCityPreference, resolveDefaultOrigin, type MergedProfile, type ProfilePatch } from './memory-capture.ts'
+import { applyPlanningWindow } from './loop.ts'
+import { buildTimeAnchor, type PlanningWindow } from './time-anchor.ts'
+import { evaluateHotelStayDates } from './hotel-date-gate.ts'
 import { wmoLabel } from '../capabilities/weather.ts'
 // D-23 收编(issue #115):anything/web/github/video/agent_reach/session_login 六渠道改经
 // 效应注册表(退避/熔断/declined 面统一);能力层直接 import 仅留类型位(reach/reachStatus)
 import { reach, reachStatus } from '../capabilities/agent-reach.ts'
-import { runDoctorChecks, renderDoctorReportMd } from '../capabilities/doctor.ts'
+import { runDoctorChecks, renderDoctorReportMd, runDoctorRepair, createRepairApprovalGate, type DoctorRepairOptions } from '../capabilities/doctor.ts'
 import { EXTENSION_STORE_URL } from '../capabilities/session/extension-bridge.ts'
-import { createConsentGate, approvalFromContext } from '../capabilities/session-consent.ts'
+import { createConsentGate, approvalFromContext, resolveSessionSearchKind } from '../capabilities/session-consent.ts'
 import { installModelOverride } from '../capabilities/model-override.ts'
 import { listArtifacts, readArtifact } from '../capabilities/artifacts.ts'
 import { interpretEffect, declinedObservation } from '../capabilities/effect.ts'
 import { appendFacts, loadFactRegistry } from '../capabilities/fact-log.ts'
-import { factsFromFlyai, factsFromHotel, factsFromSession } from './bookable-facts.ts'
+import { factsFromFlyai, factsFromHotel, factsFromSession, factsFromSessionTrain } from './bookable-facts.ts'
+import { hasRecognizedAvailableSeat } from '../capabilities/session/adapters/rail-12306.ts'
 import { gateArtifact, type AirlineAirportMap } from './artifact-gate.ts'
 import { installTurnDeadline, listTurnHandoffTickets } from './turn-deadline.ts'
 import { noteChannelVerdict, recordChannelEvent, readLatestChannelEvents } from '../capabilities/channel-health.ts'
@@ -49,6 +52,15 @@ import { routingAdvice, renderRoutingCard, toolRoutingHeadline, type ChannelInte
 import { registerBenchmarkEnvironmentBridge, type BenchmarkSubprocessService } from './benchmark-environment-bridge.ts'
 import { installBenchmarkToolIsolation } from './benchmark-tool-isolation.ts'
 import { installBenchmarkAgentConformance } from './benchmark-agent-conformance.ts'
+import { installSubagentJobIdGuard } from './subagent-job-id-guard.ts'
+import {
+  createGroundTransferResolver,
+  createPublicMapDrivingRouteProvider,
+  exposeGroundTransferEvidence,
+  resolveGroundTransferPayload,
+  type GroundTransferProvider,
+  type GroundTransferResolution,
+} from '../capabilities/ground-transfer.ts'
 
 /** 航司→机场映射表(issue #46 冲突检测面;data/airline-airports.json,as_of 快照) */
 let airlineAirportMapCache: AirlineAirportMap | null = null
@@ -71,6 +83,13 @@ export const name = 'gotry-tools'
 // depend on a service that is only needed for explicit benchmark opt-in.
 export const inject = ['tools', 'systemPrompt']
 
+function sessionCwd(exec: unknown): string | undefined {
+  const candidate = exec as { agent?: { session?: { header?: { cwd?: unknown } } } } | null
+  return typeof candidate?.agent?.session?.header?.cwd === 'string'
+    ? candidate.agent.session.header.cwd
+    : undefined
+}
+
 export interface Config {
   /** 状态根目录(动机画像、wish pool、延迟日志) */
   stateRoot: string
@@ -96,12 +115,31 @@ interface FeasibilityResult {
   answer_md?: string
   recommended?: string | null
   verdicts?: Array<Record<string, unknown>>
+  ground_transfer?: GroundTransferResolution
+}
+
+interface FeasibilityValidationFailure extends Record<string, Json> {
+  ok: false
+  code: 'invalid_planning_context' | 'planning_window_rejected'
+  summary: string
+  rejected: Array<{ segmentId: string; optionId: string; date: string }>
 }
 
 interface MotivationProfileInput {
   weights?: Record<string, number>
   evidence?: string[]
   hard?: Record<string, unknown>
+  /**
+   * 持久化用户常驻城市/默认出发地(issue #338)。
+   *   - string = 设置默认城市(用户原话指明常驻)
+   *   - null   = 显式清除(审计一行留痕,用于遗忘/迁居)
+   *   - undefined = 字段未传,保持当前值不动
+   * 改值须伴新 evidence(同 weights/hard 的 P0 守卫);evidence 恰好一条且非空时
+   * 可省略 homeCityEvidence,多条 evidence 必须显式绑定。
+   */
+  homeCity?: string | null
+  /** homeCity 对应的本次用户原话;仅与 homeCity 一起传入。 */
+  homeCityEvidence?: string
 }
 
 interface WishPoolEntryInput {
@@ -130,6 +168,22 @@ function renderMotivationBrief(stateRoot: string): string {
   if (weights.length) lines.push(`- 动机权重: ${weights.map(([k, v]) => `${k}=${v}`).join(', ')}(证据 ${p.evidence?.length ?? 0} 条)`)
   const hard = Object.entries(p.hard ?? {})
   if (hard.length) lines.push(`- 硬约束: ${hard.map(([k, v]) => `${k}=${String(v)}`).join(', ')}`)
+  // 持久默认城市(issue #338):生产 brief 复用纯 resolver 的 precedence
+  // 契约;这里仍只负责读回渲染,不把 resolver 接入 feasibility/evaluate。
+  const profile = p as MergedProfile
+  const homeResolution = resolveDefaultOrigin(undefined, profile)
+  const homePref = profile.homeCityPreference
+  const typedPreferenceIsValid = isValidHomeCityPreference(profile)
+  const hasHomeCityData = Object.prototype.hasOwnProperty.call(profile, 'homeCity')
+    || Object.prototype.hasOwnProperty.call(profile, 'homeCityPreference')
+  if (homeResolution.source === 'home_default' && homeResolution.origin && typedPreferenceIsValid && homePref) {
+    const evidence = homeResolution.homeCityEvidence?.[0] ?? ''
+    lines.push(`- 常驻城市: ${homeResolution.origin}(原话证据:${evidence};记录于 ${homePref.updated_at})——本轮未指明出发地时作为软默认;本轮显式出发地优先;不进可行性硬约束,不删候选`)
+  } else if (typedPreferenceIsValid && homePref?.value === null) {
+    lines.push(`- 常驻城市: 已显式清除(原话证据:${homePref.evidence};记录于 ${homePref.updated_at})——已无持久软默认;每次行程必须由用户明确出发地,不猜测`)
+  } else if (hasHomeCityData) {
+    lines.push('- 常驻城市: 无可验证的持久默认——本轮请明确出发地;不从旧画像或全局 evidence 猜测')
+  }
   // 旅行时间线(memory-design P1):去过的地方不再主动推荐,除非用户点名
   const trips = readTimelineTrips(stateRoot)
   if (trips.length) {
@@ -142,10 +196,11 @@ function renderMotivationBrief(stateRoot: string): string {
   }
   lines.push(`- 愿望池: 用 gotry_wish_pool_list 按条件召回(0..1),勿直接堆砌`)
   if (p.updated_at) lines.push(`- 更新于: ${p.updated_at}`)
-  return weights.length || hard.length ? lines.join('\n') : ''
+  return weights.length || hard.length || hasHomeCityData ? lines.join('\n') : ''
 }
 
-/** 时间线摘要(brief 用):最近 3 次行程(目的地+年月);账本优先,未迁移回退文件 */
+/**
+ * 时间线摘要(brief 用):最近 3 次行程(目的地+年月);账本优先,未迁移回退文件 */
 /** 同行人摘要(brief 用):label + 约束串 */
 function readCompanions(stateRoot: string): Array<{ label: string; brief: string }> {
   return readCompanionsWithFallback(stateRoot)
@@ -184,7 +239,62 @@ function benchmarkPinnedPolicy(): { softMs: number; hardMs: number; exit: 'conve
   return { softMs, hardMs, exit: 'converge' }
 }
 
-export function apply(ctx: Context, config: Config): void {
+/** 把 hotel-date-gate.message 里的模型转手措辞(请告诉用户 / 请告诉 gotry /
+ *  请向用户确认)归一为直接对用户措辞(请补充 / 请提供)。仅做这一类短语的字面
+ *  替换,日期示例等可行动细节保留不动;只服务 hotel_search input_required 卡
+ *  单点,不动 date-gate 契约、不动其它 presentResult 路径。 */
+function normalizeHotelGateHandoff(message: unknown): string {
+  const raw = String(message ?? '')
+  if (!raw) return ''
+  return raw
+    .replace(/请告诉\s*(?:用户|gotry)\s*/g, '请补充 ')
+    .replace(/请向用户确认/g, '请提供')
+}
+
+export interface ApplyTestSeams {
+  doctor?: {
+    check?: typeof runDoctorChecks
+    repair?: DoctorRepairOptions
+  }
+  /** Isolated test-only effect interpreter; production keeps interpretEffect. */
+  effect?: typeof interpretEffect
+  /** Test-only clock injection; production derives the reference date from Date. */
+  clock?: () => Date
+  /** Isolated public map-tool result seam; production uses nested dsh dispatch. */
+  groundTransfer?: { provider?: GroundTransferProvider }
+}
+
+function parseFeasibilityPlanning(raw: unknown, anchor: ReturnType<typeof buildTimeAnchor>): PlanningWindow | null {
+  if (raw === undefined) return null
+  if (!raw || typeof raw !== 'object' || Array.isArray(raw)) throw new Error('planning must be an object')
+  const planning = raw as Record<string, unknown>
+  const intent = planning['intent']
+  const requestedYear = planning['requested_year']
+  if (intent !== 'future' && intent !== 'historical') {
+    throw new Error('planning.intent must be future or historical')
+  }
+  if (!Number.isInteger(requestedYear) || Number(requestedYear) < 1_000 || Number(requestedYear) > 9_999) {
+    throw new Error('planning.requested_year must be a four-digit integer')
+  }
+  // referenceDate is always the host clock; the payload cannot supply a stale now.
+  return { intent, requestedYear: Number(requestedYear), referenceDate: anchor.today }
+}
+
+function feasibilityValidationFailure(
+  code: FeasibilityValidationFailure['code'],
+  summary: string,
+  rejected?: FeasibilityValidationFailure['rejected'],
+): FeasibilityValidationFailure {
+  return { ok: false, code, summary, rejected: rejected ?? [] }
+}
+
+export function apply(ctx: Context, config: Config, seams: ApplyTestSeams = {}): void {
+  const clock = seams.clock ?? (() => new Date())
+  const runFlyaiEffect = seams.effect ?? interpretEffect
+  const groundTransferResolver = createGroundTransferResolver({
+    provider: seams.groundTransfer?.provider ?? createPublicMapDrivingRouteProvider(ctx),
+    clock,
+  })
   const rawBenchmarkEnvironmentConfigPath = config.benchmarkEnvironmentConfigPath ?? ''
   // ADR-24 v2:产品路径装「路由 + wall-clock 双出口」——用户主观时间是唯一
   // 预算,复杂度决定出口结构(converge/handoff)。benchmark opt-in 钉死
@@ -239,7 +349,7 @@ export function apply(ctx: Context, config: Config): void {
   sp?.variable?.('motivation_brief', () => renderMotivationBrief(config.stateRoot ?? '.'))
 
   // 通道路由卡(通道注册表生成,docs/design/tool-orchestration-design.md §2.1/D-8):
-  // persona (19) 只留行为契约,机/火/酒通道顺位与额度口径查卡——prose 教义
+  // persona 检索条款只留行为契约,机/火/酒通道顺位与额度口径查卡——prose 教义
   // 变查表教义,注册表加通道卡片自动一致。
   sp?.variable?.('channel_routing_card', () => renderRoutingCard())
 
@@ -266,14 +376,29 @@ export function apply(ctx: Context, config: Config): void {
   // (headless 无用户在场)一律 fail-closed 拒绝。sessionAccess: ask(默认)|allow|off。
   // v1 教训(2026-08-29 founder 实测「每次都要弹,经常无法点击」):逐调用弹卡 = 骚扰,
   // 会话态收归 capabilities/session-consent.ts。防御:极简宿主/mock ctx 无事件总线时跳过。
+  // issue #194 A-轨道 guard 先注册；生产 Cordis 的 prepend 保证它在授权闸
+  // 前运行，smoke 的轻量事件采集器也继续把授权闸作为最后一个观察项。
+  installSubagentJobIdGuard(ctx)
   const ctxOn = (ctx as unknown as { on?: unknown }).on
   if (typeof ctxOn === 'function') {
-    ctx.on('tools/pre-execute', createConsentGate({
+    const gate = createConsentGate({
       access: () => config.sessionAccess ?? 'ask',
       approval: approvalFromContext(ctx),
-    }))
+    })
+    // site 绑定(#308):dsh pre-execute 实际派发的 arguments 原样进入 gate;
+    // gate 与 execute 共用 resolveSessionSearchKind/interpretArgs,因此 wrapped
+    // query.*、缺省 flight、unknown/malformed 的选择与授权和效应路径保持一致。
+    ctx.on('tools/pre-execute', gate)
   }
 
+  // issue #284 修复闸:gotry_doctor.action='repair' 走同一审批缝(scope-keyed,
+  // WeakMap<agent>)——同 agent + 同 scope 复用批准,不同 scope 重问,rejected/cancelled
+  // = 本会话吊销,unavailable 通道不记。同口径 session-consent,不增新持久面。
+  // 注册早于 gotry_doctor(下方),保证工具面闭包捕获当前会话的闸实例。
+  const repairApprovalGate = createRepairApprovalGate({
+    approval: approvalFromContext(ctx),
+  })
+
   // LLM_MODEL → dsh 会话面模型覆盖(issue #77;机制与分层见
   // capabilities/model-override.ts 头注)。GOTRY_LLM_MODEL 未设时零行为变化。
   installModelOverride(ctx as unknown as Parameters<typeof installModelOverride>[0])
@@ -315,7 +440,90 @@ export function apply(ctx: Context, config: Config): void {
         required: true,
         properties: {
           request: { type: 'object', additionalProperties: true, required: true, description: '引擎请求:{ motivation weights, hard constraints, window, budget, home hubs }' },
-          candidates: { type: 'array', items: { type: 'object', additionalProperties: true }, required: true, description: '候选列表:[{ id, label, services, transfers, stay, minDays }]' },
+          candidates: { type: 'array', items: { type: 'object', additionalProperties: true }, required: true, description: '候选列表:[{ id, label, date?, services, transfers, stay, minDays }]' },
+          planning: {
+            type: 'object', additionalProperties: false,
+            description: '可选显式规划上下文;dated 候选省略时默认按宿主时钟作 future 下界过滤,指定 future 年份再加年末上界,historical 仅用于明确历史/回测查询;完全 dateless 输入保持旧可行性计算',
+            properties: {
+              intent: { type: 'string', enum: ['future', 'historical'], required: true },
+              requested_year: { type: 'integer', required: true, description: '用户明确请求的四位年份,不传宿主当前年份' },
+            },
+          },
+          ground_transfer: {
+            type: 'object',
+            additionalProperties: false,
+            description: '可选显式地面接驳覆盖:仅 destination 位置、显式经纬度和 mode=driving;路线同时绑定抵达方向(A→B)与返程方向(B→A),两方向分别请求/缓存/降级,价格仍来自静态包;缓存 TTL 由能力层固定',
+            properties: {
+              candidate_id: { type: 'string', description: '要绑定的候选 id;不会按相似度推断' },
+              transfer_index: { type: 'integer', description: 'dest_transfers 的零基位置;不会按 mode 推断' },
+              position: { type: 'string', description: '当前切片固定为 destination' },
+              mode: { type: 'string', description: '当前只接受 driving;其它/缺省模式显式回退静态分钟' },
+              origin: {
+                type: 'object',
+                additionalProperties: false,
+                description: '旧版单对坐标:等同于 outbound.origin(能力层自动把返程方向设为其互换)',
+                properties: {
+                  longitude: { type: 'number' },
+                  latitude: { type: 'number' },
+                },
+              },
+              destination: {
+                type: 'object',
+                additionalProperties: false,
+                description: '旧版单对坐标:等同于 outbound.destination',
+                properties: {
+                  longitude: { type: 'number' },
+                  latitude: { type: 'number' },
+                },
+              },
+              outbound: {
+                type: 'object',
+                additionalProperties: false,
+                description: '显式抵达方向坐标对(A→B):不指定时回退 origin/destination',
+                properties: {
+                  origin: {
+                    type: 'object',
+                    additionalProperties: false,
+                    properties: {
+                      longitude: { type: 'number' },
+                      latitude: { type: 'number' },
+                    },
+                  },
+                  destination: {
+                    type: 'object',
+                    additionalProperties: false,
+                    properties: {
+                      longitude: { type: 'number' },
+                      latitude: { type: 'number' },
+                    },
+                  },
+                },
+              },
+              return: {
+                type: 'object',
+                additionalProperties: false,
+                description: '显式返程方向坐标对(B→A):不指定时回退 outbound 互换',
+                properties: {
+                  origin: {
+                    type: 'object',
+                    additionalProperties: false,
+                    properties: {
+                      longitude: { type: 'number' },
+                      latitude: { type: 'number' },
+                    },
+                  },
+                  destination: {
+                    type: 'object',
+                    additionalProperties: false,
+                    properties: {
+                      longitude: { type: 'number' },
+                      latitude: { type: 'number' },
+                    },
+                  },
+                },
+              },
+            },
+          },
         },
       },
     },
@@ -331,10 +539,38 @@ export function apply(ctx: Context, config: Config): void {
       // 路径——候选形态枚举求解,~6ms/次)。unified 内部有 try-catch 护栏覆盖 wasm 异常。
       const started = Date.now()
       const payload = args.payload as Record<string, unknown>
+      const anchor = buildTimeAnchor(clock())
+      let planning: PlanningWindow | null
+      try {
+        planning = parseFeasibilityPlanning(payload['planning'], anchor)
+      } catch (error) {
+        const summary = error instanceof Error ? error.message : 'planning context is invalid'
+        return feasibilityValidationFailure('invalid_planning_context', summary)
+      }
       const req = parseRequest(payload['request'] as Record<string, unknown>)
       const cands = (payload['candidates'] as Record<string, unknown>[]).map(parseCandidate)
-      const spec = segmentsFromCandidate(req, cands)
-      const result = solveChoiceSegment(spec, req) as Record<string, unknown>
+      const execution = _exec && typeof _exec === 'object' ? _exec as ToolRunContext : undefined
+      let solverCandidates = cands
+      let groundTransferEvidence: GroundTransferResolution | undefined
+      if (payload['ground_transfer'] !== undefined) {
+        const prepared = await resolveGroundTransferPayload(
+          payload['ground_transfer'],
+          cands,
+          groundTransferResolver,
+          { signal: execution?.signal, execution },
+        )
+        solverCandidates = prepared.candidates
+        groundTransferEvidence = prepared.resolution
+      }
+      const spec = segmentsFromCandidate(req, solverCandidates)
+      const planningCheck = applyPlanningWindow(spec, planning, anchor, { defaultDatedFuture: true })
+      if (planningCheck.error) {
+        return feasibilityValidationFailure('planning_window_rejected', planningCheck.error, planningCheck.rejected)
+      }
+      const solved = solveChoiceSegment(planningCheck.spec, req) as Record<string, unknown>
+      const result = groundTransferEvidence
+        ? exposeGroundTransferEvidence(solved, groundTransferEvidence)
+        : solved
       const dir = await ensureStateDir(config.stateRoot)
       await recordLatency(join(dir, 'bridge-latency.jsonl'), Date.now() - started, 'feasibility_check:in-process-unified').catch(() => {})
       return { ok: true, ...result, latency_ms: Date.now() - started, via: 'in-process-unified' }
@@ -371,6 +607,9 @@ export function apply(ctx: Context, config: Config): void {
       + 'existing history is never deleted. Requires evidence on every call (P0 anti-fabrication rule).',
     // D-30 第五刀(issue #112):profile blob → 结构化闭合对象;evidence(P0 反伪造红线)进嵌套
     // schema 由宿主权闸——无证据的保存请求入口即被结构化拒绝(ToolFailure 形状)
+    // issue #338:homeCity 字段(string=设置,null=显式清除,undefined=不动);单条非空
+    // evidence 可省略 binding,多条 evidence 必须显式 homeCityEvidence。
+    // dsh 参数 schema 仅支持单值 type,string|null 用 oneOf 表达。
     parameters: {
       profile: {
         type: 'object',
@@ -380,6 +619,17 @@ export function apply(ctx: Context, config: Config): void {
           weights: { type: 'object', additionalProperties: true, description: '动机权重增量,如 { escape_rest: 0.7 }(可选,权重变更须伴新证据)' },
           evidence: { type: 'array', items: { type: 'string' }, required: true, description: '本轮新事实的用户原话数组(P0:必带)' },
           hard: { type: 'object', additionalProperties: true, description: '硬约束:{ wake_not_before, min_arrival_energy_pct }(可选)' },
+          homeCity: {
+            oneOf: [
+              { type: 'string', description: '设置持久常驻城市/默认出发地(用户原话指明常驻),如 "上海"' },
+              { type: 'null', description: '显式清除常驻城市(用于遗忘/迁居)' },
+            ],
+            description: '持久常驻城市/默认出发地(string=设置,null=显式清除);改值须伴新 evidence(P0);恰一条非空可省略 binding,多条须显式;不删候选/不压当轮 origin',
+          },
+          homeCityEvidence: {
+            type: 'string',
+            description: 'homeCity 对应的 exact 用户原话;显式传入时必须逐字出现在本次 profile.evidence 中且为新证据(同值同绑定重复调用例外为幂等);evidence 恰好一条非空时可省略并绑定该条,多条时必须显式传入',
+          },
         },
       },
     },
@@ -388,17 +638,48 @@ export function apply(ctx: Context, config: Config): void {
       schema: { type: 'json' },
       render: (_args, value) => [{ type: 'text', text: `动机画像已保存:${String((value as { path?: string }).path ?? '')}` }],
     },
-    async execute(args: { profile: unknown }, _exec: unknown) {
+    async execute(args, _exec: unknown) {
       // T1 接线:本工具是增量补丁语义(契约 18——模型每轮把对话新事实带进来),
       // 经 mergeProfile 守门合并进既有画像(追加不删史/幂等/权重变更须伴新证据),
       // 不再整档覆盖。首次调用(无档案)= 全量建立。
       // ADR-15:守门+事件+投影在账本单事务内完成,evidence 红线拒绝即回滚,账本无痕。
-      const incoming = (args.profile ?? {}) as { weights?: Record<string, number>; evidence?: string[]; hard?: Record<string, unknown> }
+      // issue #338:homeCity 同走 mergeProfile 守门(null=显式清除)。单条非空
+      // evidence 可提供省略的 unambiguous binding;多条 evidence 不按数组位置推断。
+      const incoming = (args.profile ?? {}) as { weights?: Record<string, number>; evidence?: string[]; hard?: Record<string, unknown>; homeCity?: string | null; homeCityEvidence?: string }
       if (!incoming.evidence?.length) {
         throw new Error('refusing to save a motivation profile without evidence (P0 anti-fabrication rule)')
       }
+      // issue #338:trim 后空白拒绝(零事件落账)。空白字符串「无值」≠
+      // 「显式清除」——后者是 null,前者是没有声明。不擅自解释,显式拒收。
+      if (typeof incoming.homeCity === 'string' && incoming.homeCity.trim().length === 0) {
+        throw new Error('gotry_motivation_save.homeCity 是空白字符串,既不是声明也不是清除;请明确传城市名或 null')
+      }
+      let boundHomeCityEvidence: string | undefined
+      if (incoming.homeCity !== undefined) {
+        if (incoming.homeCityEvidence !== undefined) {
+          if (typeof incoming.homeCityEvidence !== 'string' || incoming.homeCityEvidence.trim().length === 0) {
+            throw new Error('gotry_motivation_save.homeCityEvidence 为空白;homeCity 必须绑定本次 evidence 中的一条 exact 用户原话')
+          }
+          if (!incoming.evidence.some(e => e === incoming.homeCityEvidence)) {
+            throw new Error('gotry_motivation_save.homeCityEvidence 必须逐字匹配本次 profile.evidence 中的一条用户原话')
+          }
+          boundHomeCityEvidence = incoming.homeCityEvidence
+        } else if (incoming.evidence.length === 1 && typeof incoming.evidence[0] === 'string' && incoming.evidence[0].trim().length > 0) {
+          boundHomeCityEvidence = incoming.evidence[0]
+        } else {
+          throw new Error('gotry_motivation_save.homeCityEvidence 缺失或有歧义;evidence 恰好一条非空时可省略,多条 evidence 必须显式绑定 exact 用户原话')
+        }
+      } else if (incoming.homeCityEvidence !== undefined) {
+        throw new Error('gotry_motivation_save.homeCityEvidence 只能与 homeCity 一起传入')
+      }
       const ledger = ensureLedger(config.stateRoot)
-      const res = ledger.appendMotivationPatch({ weights: incoming.weights, evidence: incoming.evidence, hard: incoming.hard })
+      const res = ledger.appendMotivationPatch({
+        weights: incoming.weights,
+        evidence: incoming.evidence,
+        hard: incoming.hard,
+        homeCity: incoming.homeCity,
+        homeCityEvidence: boundHomeCityEvidence,
+      } as ProfilePatch)
       const profileJson = JSON.parse(JSON.stringify(res.profile)) as JsonObject
       return res.saved
         ? { ok: true, saved: true, path: ledger.dbPath, profile: profileJson, summary: '画像已合并入账本(单事务)' }
@@ -651,14 +932,18 @@ export function apply(ctx: Context, config: Config): void {
     description: routed('gotry_hotel_search',
       'Search hotels via hotelbyte-cli (real-time when hbcli credentials exist, falls back to the static pack with explicit evidence tagging). '
       + 'Input: destination city name + optional dates/adults. Dates accept verbatim natural expressions (下周五 / 8.20 / 下周五+3) — '
-      + 'the code layer resolves them against the time anchor; unresolved expressions degrade to an undated search with an explicit '
-      + 'date_notes entry instead of guessing. Output: hotel list with evidence chain ([realtime-API:hbcli] + fetch timestamp, '
+      + 'the code layer resolves them against the time anchor. **Dates are required for a supplier search** (issue #283): missing, blank, '
+      + 'single-side, unresolvable, or checkOut ≤ checkIn returns an actionable input_required result WITHOUT spawning the vendor CLI; '
+      + 'only after a complete valid stay window is fixed do we forward to hbcli. '
+      + 'Output: hotel list with evidence chain ([realtime-API:hbcli] + fetch timestamp, '
       + 'or [static-pack:estimate]) per the L4 invariant.'),
     // D-30 第二刀(issue #112):query blob → 平铺 typed 契约(同 flyai 刀法)。
     parameters: {
       destination: { type: 'string', required: true, description: '目的地城市,如 大理' },
-      checkIn: { type: 'string', description: '入住日:YYYY-MM-DD 或自然表达(下周五/8.20/下周五+3);解析不了降级无日期检索并记 date_notes' },
-      checkOut: { type: 'string', description: 'checkOut 退房日:YYYY-MM-DD 或自然表达,形态同 checkIn' },
+      // issue #283 闸:日期字段对模型面仍是契约必填(required 标在 description,schema 不强制,
+      // 让 gate 产出更可行动的错误——dsh schema 拒绝信息太泛)
+      checkIn: { type: 'string', description: '入住日:YYYY-MM-DD 或自然表达(下周五/8.20/下周五+3);REQUIRED——缺失/空白/无法解析由 date-gate 返回 input_required,不查' },
+      checkOut: { type: 'string', description: 'checkOut 退房日:YYYY-MM-DD 或自然表达,形态同 checkIn;REQUIRED——必须晚于入住日,否则不查' },
       adults: { type: 'integer', description: '成人数(顶层字段,默认 2)' },
     },
     output: {
@@ -670,25 +955,37 @@ export function apply(ctx: Context, config: Config): void {
       if (!q.destination) throw new Error('gotry_hotel_search requires destination')
       const started = Date.now()
       const fallbackPath = join(import.meta.dirname, '..', '..', 'data', 'hotels_2026.json')
-      // D-10 切片 B:日期槽位接受逐字自然表达(下周五/8.20/+N),代码层换算(slot-spec);
-      // unresolved 不猜——降级为无日期搜索并显式记 note,由模型向用户追问
-      const anchor = buildTimeAnchor(new Date())
-      const dateNotes: string[] = []
-      const resolveDate = (expr?: string): string | undefined => {
-        if (!expr) return undefined
-        const r = resolveSlotDate(expr, anchor)
-        if (!r.date) {
-          dateNotes.push(`日期未解析:${r.raw}——请向用户确认具体日期`)
-          return undefined
-        }
-        if (r.raw !== r.date) dateNotes.push(`slot-resolved: ${r.raw} → ${r.date}`)
-        return r.date
+      // issue #283 闸:完整、有效且退房晚于入住才能派发 hbcli;失败直接返回
+      // input_required,不发供应商命令,不把当前窗口查询当所需日期结果。
+      // 复用既有 time-anchor/slot-spec:词表内自然表达 → 绝对日期;
+      // 词表外 → unresolved,闸失败,不再走「无日期降级」伪装默认窗口价。
+      const gate = evaluateHotelStayDates(q.checkIn, q.checkOut)
+      if (!gate.ok) {
+        // 闸失败:不调用 interpretEffect,不调 hbcli;延迟日志不写(no spawn)。
+        // summary 用「需要 X 信息才能查询酒店」开头的可行动句式,presentResult 直接
+        // 渲成「酒店:<dest> 缺日期」行动卡(替代旧版「无结果」空卡)。
+        const summary = `需要补充${(gate.missing ?? []).map(m => m === 'checkIn' ? '入住日' : '退房日').join('和')}才能查询酒店「${q.destination ?? ''}」:${gate.message}`
+        return {
+          ok: false,
+          verdict: gate.verdict,
+          reason: gate.reason,
+          missing: gate.missing,
+          raw: gate.raw,
+          destination: q.destination,
+          message: gate.message,
+          summary,
+          evidence: gate.evidence,
+          latency_ms: Date.now() - started,
+        } as never
       }
+      // 闸通过:绝对日期已就位;slot 解析过程产生的原话 → 绝对日期 注记回显
+      // (工具层 date_notes 与既有 D-10 切片 B 形态兼容)
+      const dateNotes = [...gate.notes]
       // 效应解译层(ADR-18):渠道选择/韧性(重试/熔断)在解译器,result 原样透传——
       // 断路拒绝时返回平铺失败面(不发起查询,不伪装成 miss)
       const itp = await interpretEffect({
         effect: 'HBCLI_HOTEL_SEARCH',
-        params: { destination: q.destination, checkIn: resolveDate(q.checkIn), checkOut: resolveDate(q.checkOut), adults: q.adults, hbcliBin: config.hbcliBin, timeoutMs: config.timeoutMs, fallbackPath },
+        params: { destination: q.destination, checkIn: gate.checkIn, checkOut: gate.checkOut, adults: q.adults, hbcliBin: config.hbcliBin, timeoutMs: config.timeoutMs, fallbackPath },
       })
       if (!itp.result) return declinedObservation('HBCLI_HOTEL_SEARCH', itp.trace)
       const resp = itp.result
@@ -711,7 +1008,25 @@ export function apply(ctx: Context, config: Config): void {
     },
     presentCall: args => ({ card: 'generic', title: `酒店搜索:${args.destination ?? ''}`, kind: 'search', rawInput: args }),
     presentResult: (_args, value) => {
-      const r = value as { hotels?: unknown; via?: string; destination?: string; summary?: string }
+      // 闸失败:渲染为「input_required」行动卡,引导模型向用户追问日期;
+      // 不再退化为「无结果」空卡——闸拒绝的可行动语义必须显式进 UI。
+      // UI 面禁用内部工程词(check_in_blank / 闸拒绝 / ISO 字符串),只露「入住日/退房日」
+      // 与具体日期示例供模型追问。
+      const r = value as { hotels?: unknown; via?: string; destination?: string; summary?: string; verdict?: string; reason?: string; missing?: string[]; message?: string }
+      if (r.verdict === 'input_required') {
+        const missingLabels = (r.missing ?? []).map(m => m === 'checkIn' ? '入住日' : '退房日')
+        const fieldText = missingLabels.length ? missingLabels.join('和') : '入住日和退房日'
+        const dateHint = !missingLabels.length || missingLabels.length === 2
+          ? '例如 2026-09-18 / 2026-09-20'
+          : missingLabels[0] === '入住日' ? '例如 2026-09-18' : '例如 2026-09-20'
+        return {
+          card: 'generic',
+          title: `酒店:${r.destination ?? ''} 需要${fieldText}`,
+          // P2 措辞修正:直接对用户说话的句式,不再绕一道「请告诉.../请向用户确认」转给模型;
+          // gate.message 里残留的字段指引也归一为直接对用户措辞,保留日期示例等可行动细节。
+          content: [{ type: 'text', text: `请补充 ${fieldText}(${dateHint})后再次查询。\n${normalizeHotelGateHandoff(r.message)}` }],
+        }
+      }
       const h = r.hotels
       const liveCount = Array.isArray(h) ? h.length : 0
       // 静态包是 {meta, stays} 对象而非数组(issue #24:此前计数恒 0 → UI 显示「无结果」)
@@ -915,7 +1230,7 @@ export function apply(ctx: Context, config: Config): void {
             return { ok: false, summary: 'checkOut 需 YYYY-MM-DD(与 checkIn 成对)' } as const
           }
         }
-        const itp = await interpretEffect({ effect: 'FLYAI_SEARCH', params: { kind: 'hotel', destName: dest, checkInDate: q.checkIn, checkOutDate: q.checkOut, keyWords: q.keyWords } })
+        const itp = await runFlyaiEffect({ effect: 'FLYAI_SEARCH', params: { kind: 'hotel', destName: dest, checkInDate: q.checkIn, checkOutDate: q.checkOut, keyWords: q.keyWords } })
         if (!itp.result) return declinedObservation('FLYAI_SEARCH', itp.trace)
         const r = itp.result
         await noteChannel('flyai', r.verdict)
@@ -948,7 +1263,7 @@ export function apply(ctx: Context, config: Config): void {
             + `多为用户时间表达未带年份所致——向用户确认年份(或按未来最近的同月日修正)后再查。`,
         })) as Record<string, never>
       }
-      const itp = await interpretEffect({ effect: 'FLYAI_SEARCH', params: { kind, origin: q.from, destination: q.to, depDate: q.date } })
+      const itp = await runFlyaiEffect({ effect: 'FLYAI_SEARCH', params: { kind, origin: q.from, destination: q.to, depDate: q.date } })
       if (!itp.result) return declinedObservation('FLYAI_SEARCH', itp.trace)
       const r = itp.result
       await noteChannel('flyai', r.verdict)
@@ -1039,6 +1354,7 @@ export function apply(ctx: Context, config: Config): void {
       + 'Transport: GoTry Session Bridge browser extension (one-time install) — the agent side never talks to Chrome debugging, ZERO system dialogs; read-only by construction (the extension never issues requests; it only passively forwards the site\'s own search responses; agent NEVER touches credentials/captcha; on captcha it stops and returns challenged). '
       + 'kind="flight": from/to 中文城市名 + date YYYY-MM-DD — sniffs the site search API for structured options. Evidence [会话:ctrip-flight@ts]. '
       + 'kind="hotel": to=目的地中文, cityId? = the numeric city= in a hotels.ctrip.com list URL (web-search it when the destination is outside the built-in city table), checkIn?/checkOut? (YYYY-MM-DD), adults?; hotel prices are the user\'s real logged-in prices. Evidence [会话:ctrip-hotel@ts]. '
+      + 'kind="dida": Dida supplier-portal realtime hotel rates on the employee\'s own logged-in session (hotel-be portal integration line) — no from/to needed; the portal find page\'s own requests are sniffed passively. Rates carry ratePlanId/referenceNo for the server-side booking chain. Evidence [会话:dida-portal@ts]. '
       + 'kind="train": from/to/date(YYYY-MM-DD) + fromStationTelecode?/toStationTelecode? (three-letter codes in the kyfw query URL, for cities outside the built-in table) — 12306 left-ticket query (public face): train codes, times, durations, seat availability; the list API carries NO prices (prices live on the 12306 page). Evidence [会话:train-12306@ts]. '
       + 'verdict needs-login = call gotry_session_login (opens the Ctrip login entry in the user\'s own foreground tab — no terminal, no credentials through GoTry); '
       + `needs-extension = one-time browser-extension install (Chrome Web Store one-click, installUrl is also surfaced as a clickable link in the verdict field for dsh UI to render) — the DEFAULT transport; cdp (chrome://inspect remote debugging) is a diagnostic fallback only via GOTRY_SESSION_TRANSPORT=cdp. `
@@ -1049,7 +1365,7 @@ export function apply(ctx: Context, config: Config): void {
     // (docs/design/tool-orchestration-design.md §4③「interpretArgs 留作旧形态容忍层」),blob 调用在
     // execute 内归一后走原条件闸,结构化报错不崩。flyai 因 kind required 仍在宿主权即拒。
     parameters: {
-      kind: { type: 'string', enum: ['flight', 'hotel', 'train'], description: '默认 flight 机票;hotel 携程酒店(用户登录态真实价);train 12306 余票(公开面)' },
+      kind: { type: 'string', enum: ['flight', 'hotel', 'train', 'dida'], description: '默认 flight 机票;hotel 携程酒店(用户登录态真实价);train 12306 余票(公开面);dida 供应商门户实时价(员工登录态)' },
       from: { type: 'string', description: '出发城市中文(词表内),如 上海——kind=flight|train 必填' },
       to: { type: 'string', description: '到达城市中文——kind=flight|train 必填;kind=hotel 时为目的地(必填)' },
       date: { type: 'string', description: '出发日期 YYYY-MM-DD——kind=flight|train 必填,须为今天或未来' },
@@ -1062,7 +1378,34 @@ export function apply(ctx: Context, config: Config): void {
     },
     output: { schema: { type: 'json' }, render: (_a, v) => [{ type: 'text', text: String((v as { summary?: string }).summary ?? JSON.stringify(v).slice(0, 600)) }] },
     async execute(args, _exec) {
-      const q = unwrapQuery<{ kind?: string; from?: string; to?: string; date?: string; cityId?: number | string; checkIn?: string; checkOut?: string; adults?: number; fromStationTelecode?: string; toStationTelecode?: string }>(args)
+      const selectedKind = resolveSessionSearchKind(args)
+      if (!selectedKind.ok) return { ok: false, summary: selectedKind.reason } as const
+      const q = { ...unwrapQuery<{ kind?: string; from?: string; to?: string; date?: string; cityId?: number | string; checkIn?: string; checkOut?: string; adults?: number; fromStationTelecode?: string; toStationTelecode?: string }>(args), kind: selectedKind.kind }
+      const runSessionEffect = seams.effect ?? interpretEffect
+      // ---- Dida 供应商门户(2026-09-09 实装;hotel-be portal integration 迁移线)----
+      if (q.kind === 'dida') {
+        const itpD = await runSessionEffect({
+          effect: 'SESSION_DIDA_SEARCH',
+          params: {
+            auditPath: join(config.stateRoot ?? '.', 'gotry-state', 'session-incidents.jsonl'),
+          },
+        })
+        if (!itpD.result) return declinedObservation('SESSION_DIDA_SEARCH', itpD.trace)
+        const rD = itpD.result
+        await noteChannel('session:dida-portal', rD.verdict)
+        const topD = (rD.rates ?? []).slice(0, 8).map(x => `${x.hotelName ?? x.hotelId ?? '?'} ${x.roomName ?? ''} ${x.ratePlanId ?? ''} ${x.currency ?? ''}${x.price} 库存${x.inventory ?? '?'}${x.referenceNo ? ` ref=${x.referenceNo.slice(0, 12)}…` : ''}`)
+        const summaryD = rD.verdict === 'hit'
+          ? `Dida 门户实时价(员工本人登录态,被动嗅探)前 ${topD.length} 条(预订由服务端适配器凭 referenceNo 续链,gotry 不碰下单):\n${topD.join('\n')}\n${rD.evidence}`
+          : rD.verdict === 'cooldown'
+            ? `会话检索节律闸冷却中(两次会话检索需 ≥30s 间隔)——稍候重试或先用其他工具推进。${rD.evidence}`
+            : rD.verdict === 'needs-login'
+              ? `${rD.error ?? ''} ${rD.evidence}`
+              : `Dida 门户会话检索未取回(${rD.verdict}):${rD.error ?? ''} ${rD.evidence}`
+        return JSON.parse(JSON.stringify({
+          ...rD, summary: summaryD,
+          ...(rD.verdict !== 'hit' ? routingField('search-hotel', 'session:dida-portal') : {}),
+        })) as Record<string, never>
+      }
       // ---- 会话酒店(2026-09-03 实装;2026-09-02 迪拜 session:用户要携程找酒店,会话面却只有机票)----
       // ---- 会话火车(2026-09-03 实装;12306 公开查询面,无登录闸)----
       if (q.kind === 'train') {
@@ -1077,7 +1420,7 @@ export function apply(ctx: Context, config: Config): void {
             summary: `未发起查询:日期 ${q.date} 已是过去(今天 ${todayT}),过去不存在在售火车票。向用户确认日期后再查。`,
           })) as Record<string, never>
         }
-        const itpT = await interpretEffect({
+        const itpT = await runSessionEffect({
           effect: 'SESSION_TRAIN_SEARCH',
           params: {
             from: q.from, to: q.to, date: q.date,
@@ -1088,7 +1431,11 @@ export function apply(ctx: Context, config: Config): void {
         if (!itpT.result) return declinedObservation('SESSION_TRAIN_SEARCH', itpT.trace)
         const rT = itpT.result
         await noteChannel('session:12306-train', rT.verdict)
-        const topT = (rT.trains ?? []).slice(0, 10).map(t => `${t.trainCode} ${t.depTime}→${t.arrTime} 历时${Math.round(t.durationMin / 60 * 10) / 10}h ${t.canWebBuy === 'Y' ? '可订' : t.canWebBuy}${Object.entries(t.seats).filter(([, v]) => v && v !== '--' && v !== '无').slice(0, 3).map(([k, v]) => `${k}:${v}`).join(' ')}`)
+        // #355:only the invocation-produced binding may enter the fact log;
+        // malformed/transport/challenge states remain no-fact, and Y alone is
+        // not rendered as bookable without a recognized available seat token.
+        await appendFacts(config.stateRoot ?? '.', factsFromSessionTrain({ from: q.from, to: q.to, date: q.date }, rT, clock()))
+        const topT = (rT.trains ?? []).slice(0, 10).map(t => `${t.trainCode} ${t.depTime}→${t.arrTime} 历时${Math.round(t.durationMin / 60 * 10) / 10}h ${t.canWebBuy === 'Y' && hasRecognizedAvailableSeat(t) ? '可订' : '余票待确认'}${Object.entries(t.seats).filter(([, v]) => v && v !== '--' && v !== '无').slice(0, 3).map(([k, v]) => `${k}:${v}`).join(' ')}`)
         const summaryT = rT.verdict === 'hit'
           ? `${q.from}→${q.to} ${q.date} 余票(12306 公开查询面,${(rT.trains ?? []).length} 趟)前 ${topT.length} 条(列表接口不含票价,票价以 12306 落地页为准):\n${topT.join('\n')}\n${rT.evidence}`
           : rT.verdict === 'cooldown'
@@ -1103,7 +1450,7 @@ export function apply(ctx: Context, config: Config): void {
         if (!q.to) {
           return { ok: false, summary: 'kind=hotel 需要 to(目的地中文;城市码表外带 cityId=携程酒店 list 页 URL 里的 city= 数字)' } as const
         }
-        const itp = await interpretEffect({
+        const itp = await runSessionEffect({
           effect: 'SESSION_HOTEL_SEARCH',
           params: {
             to: q.to, cityId: q.cityId, checkIn: q.checkIn, checkOut: q.checkOut, adults: q.adults,
@@ -1136,7 +1483,7 @@ export function apply(ctx: Context, config: Config): void {
       }
       // 效应解译层(ADR-18):SESSION 通道策略=永不重试/不熔断,节律闸在渠道内;
       // 解译器只做分发与证据拼装,verdict 语义(risk 型 needs-login/challenged)原样透传
-      const itp = await interpretEffect({
+      const itp = await runSessionEffect({
         effect: 'SESSION_FLIGHT_SEARCH',
         params: {
           from: q.from, to: q.to, date: q.date,
@@ -1160,12 +1507,17 @@ export function apply(ctx: Context, config: Config): void {
       })) as Record<string, never>
     },
     presentCall: args => {
-      const callTitle = args.kind === 'hotel' ? `会话酒店:${args.to ?? ''}` : args.kind === 'train' ? `会话火车:${args.from ?? ''}` : `会话检索:${args.from ?? ''}`
+      const selected = resolveSessionSearchKind(args)
+      const kind = selected.ok ? selected.kind : undefined
+      const raw = args as { to?: unknown; from?: unknown }
+      const callTitle = kind === 'hotel' ? `会话酒店:${raw.to ?? ''}` : kind === 'train' ? `会话火车:${raw.from ?? ''}` : kind === 'dida' ? '会话酒店:Dida 门户实时价' : `会话检索:${raw.from ?? ''}`
       return { card: 'generic', title: callTitle, kind: 'fetch', rawInput: args }
     },
     presentResult: (args, value) => {
+      const selected = resolveSessionSearchKind(args)
+      const kind = selected.ok ? selected.kind : undefined
       const r = value as { verdict?: string; options?: unknown[]; hotels?: unknown[]; installUrl?: string }
-      const isHotel = args.kind === 'hotel'
+      const isHotel = kind === 'hotel'
       const n = Math.max((r.options ?? []).length, (r.hotels ?? []).length)
       const needsExt = r.verdict === 'needs-extension'
       const label = r.verdict === 'hit'
@@ -1177,7 +1529,7 @@ export function apply(ctx: Context, config: Config): void {
             : r.verdict ?? '降级'
       const content: Array<{ type: 'text'; text: string }> = [{ type: 'text', text: String((value as { summary?: string }).summary ?? '') }]
       if (needsExt && r.installUrl) content.push({ type: 'text', text: `安装链接:${r.installUrl}` })
-      const face = args.kind === 'hotel' ? '会话酒店' : args.kind === 'train' ? '会话火车' : '会话检索'
+      const face = kind === 'hotel' ? '会话酒店' : kind === 'train' ? '会话火车' : kind === 'dida' ? '会话酒店:Dida' : '会话检索'
       return { card: 'generic', title: `${face}:${label}`, content }
     },
   }))
@@ -1397,7 +1749,7 @@ export function apply(ctx: Context, config: Config): void {
         await recordLatency(join(dir, 'bridge-latency.jsonl'), Date.now() - started, 'agent-reach:doctor').catch(() => {})
         const summary = st.via === 'agent-reach-cli'
           ? `Agent Reach doctor(上游 CLI,原样透传):\n${st.output}\n${st.evidence}`
-          : `Agent Reach 未装配(.venv 缺失)——可选依赖,机/酒/网页社媒读取之外的工具不受影响。\n补装:终端跑 npx gotry doctor --fix;整体依赖状态可调 gotry_doctor 工具查看。\n${st.evidence}`
+          : `Agent Reach 未装配(.venv 缺失)——可选依赖,机/酒/网页社媒读取之外的工具不受影响。\n补装:终端跑 npx @danceiny/gotry doctor --fix;整体依赖状态可调 gotry_doctor 工具查看。\n${st.evidence}`
         return JSON.parse(JSON.stringify({
           ok: st.ok, via: st.via, output: st.output, evidence: st.evidence, summary,
           latency_ms: Date.now() - started,
@@ -1432,7 +1784,7 @@ export function apply(ctx: Context, config: Config): void {
         : r.verdict === 'needs-setup'
           ? `${q.channel}.${q.method} → 需配置(上游 check() 原话): ${r.setup ?? ''}\n${r.evidence}`
           : r.verdict === 'not-installed'
-            ? `${q.channel}.${q.method} → 上游未装配(可选依赖): ${r.setup ?? ''}\n整体依赖状态可调 gotry_doctor 查看;补装: npx gotry doctor --fix\n${r.evidence}`
+            ? `${q.channel}.${q.method} → 上游未装配(可选依赖): ${r.setup ?? ''}\n整体依赖状态可调 gotry_doctor 查看;补装: npx @danceiny/gotry doctor --fix\n${r.evidence}`
             : `${q.channel}.${q.method} → ${r.error ?? 'error'}${r.inventory ? `\n上游清单: ${JSON.stringify(r.inventory).slice(0, 1200)}` : ''}\n${r.evidence}`
       return JSON.parse(JSON.stringify({
         ok: r.ok, channel: r.channel, method: q.method, verdict: r.verdict,
@@ -1460,13 +1812,19 @@ export function apply(ctx: Context, config: Config): void {
   registerGuarded(defineTool({
     name: 'gotry_doctor',
     description:
-      'Check optional-dependency health for ALL gotry tools (read-only, never installs): GoTry Session Bridge extension / Agent Reach (.venv) / hbcli (hotel realtime) / FlyAI key + recent trial-quota exhaustion time / dsh-calendar mount state / dsh-better-sidebar. '
+      'Check optional-dependency health for ALL gotry tools (read-only by default). Coverage: GoTry Session Bridge extension / Agent Reach (.venv) / hbcli (hotel realtime) / FlyAI key + recent trial-quota exhaustion time / dsh-calendar mount state / dsh-better-sidebar / dsh-map-tools / dsh-tool-ask-user. '
       + 'Call this when ANY gotry tool returns not-installed / needs-setup, when the user asks 「体检/依赖状态/工具为什么不可用」, or BEFORE leaning on a channel for a plan. '
       + 'Returns per-item status (ok/degraded/missing) with exact fix commands. '
-      + 'Repair = `npx gotry doctor --fix` run BY THE USER in a terminal (this tool never installs anything); LLM keys are the dsh host\'s business and are deliberately out of scope. '
+      + 'Action=diagnose (default): pure read-only — never installs anything, only renders the report. '
+      + 'Action=repair: optional autonomous repair — only attempts items the user named via `items` (stable doctor item ids, e.g. ["agent-reach","sidebar"]); empty/missing items means repair every auto-repairable gap. Items requiring browser-store install / credentials / API key / profile config / package reinstall / Node upgrade are NEVER auto-installed — they are reported as needs-user-action / unavailable and require the user to handle them. '
+      + 'Repair flow is observable: diagnosis → scope-keyed plan (selected auto-repairable items + skipped) → runtime approval card (per agent, per scope; same agent+scope reuses approval, different scope re-asks) → execute installer → recheck → per-item installed/failed with retry command. '
+      + 'Rejected/cancelled = no execution; unavailable approval channel = no execution (clear structured outcome). LLM keys are the dsh host\'s business and are deliberately out of scope. '
       + 'A markdown report is rendered for the workspace (gotry-state/doctor-report.md) so the sidebar workbench can preview it.',
     // D-30 第三刀(issue #112):query blob → 平铺 typed;全字段可选 → interpretArgs 容忍层
+    // issue #284 增量:action + items 两参数;默认 diagnose 保持读-only 不变(向后兼容)
     parameters: {
+      action: { type: 'string', enum: ['diagnose', 'repair'], description: '默认 diagnose;repair 时按 items 范围补装可选依赖,user-action / unavailable 项永不冒充 auto' },
+      items: { type: 'array', items: { type: 'string', enum: ['node', 'extension', 'agent-reach', 'hbcli', 'flyai', 'sidebar', 'llm-key', 'calendar', 'map-tools', 'ask-user'] }, description: 'repair 时的 doctor item id 范围;空 = 全部 auto-repairable' },
       writeReport: { type: 'boolean', description: '默认 true,把 markdown 报告写进 gotry-state/doctor-report.md(侧栏工作台可预览)' },
     },
     output: {
@@ -1474,29 +1832,126 @@ export function apply(ctx: Context, config: Config): void {
       render: (_args, value) => [{ type: 'text', text: String((value as { summary?: string }).summary ?? JSON.stringify(value).slice(0, 900)) }],
     },
     async execute(args, _exec: unknown) {
-      const q = unwrapQuery<{ writeReport?: boolean }>(args, 'writeReport')
-      const report = await runDoctorChecks({ stateRoot: config.stateRoot ?? '.' })
-      // 报告落 gotry-state(侧栏工作台预览面);写失败不阻塞体检结论本身
+      const q = unwrapQuery<{ action?: 'diagnose' | 'repair'; items?: string[]; writeReport?: boolean }>(args, 'action')
+      const action = q?.action === 'repair' ? 'repair' : 'diagnose'
+      const check = seams.doctor?.check ?? runDoctorChecks
+      const report = await check({ stateRoot: config.stateRoot ?? '.' })
+
+      // repair 时必须把复检后的报告写盘，避免侧栏仍显示修复前状态。
       let reportPath: string | undefined
-      if (q?.writeReport !== false) {
+      const writeReport = async (current: typeof report): Promise<void> => {
+        if (q?.writeReport === false) return
         try {
           const { writeFile } = await import('node:fs/promises')
           const dir = await ensureStateDir(config.stateRoot)
           reportPath = join(dir, 'doctor-report.md')
-          await writeFile(reportPath, renderDoctorReportMd(report), 'utf-8')
+          await writeFile(reportPath, renderDoctorReportMd(current), 'utf-8')
         } catch { reportPath = undefined }
       }
       const icon = (s: string) => (s === 'ok' ? '✅' : s === 'degraded' ? '⚠️' : '❌')
-      const lines = report.items.map(i => `${icon(i.status)} ${i.label}:${i.detail}${i.fix ? `\n   ↳ 修复: ${i.fix}` : ''}`)
-      const summary = `${report.summary}\n${lines.join('\n')}${reportPath ? `\n报告已写: ${reportPath}(侧栏工作台可直接预览)` : '\n(报告写盘失败,仅本对话展示)'}`
-      return JSON.parse(JSON.stringify({ ok: true, verdict: report.ok ? 'all-clear' : 'needs-attention', items: report.items, report_path: reportPath, evidence: `[doctor@${new Date().toISOString()}]`, summary })) as Record<string, never>
+      const reportLines = (current: typeof report) => current.items.map(i => `${icon(i.status)} ${i.label}:${i.detail}${i.fix ? `\n   ↳ 修复: ${i.fix}` : ''}`)
+
+      if (action === 'diagnose') {
+        await writeReport(report)
+        const diagSummary = `${report.summary}\n${reportLines(report).join('\n')}${reportPath ? `\n报告已写: ${reportPath}(侧栏工作台可直接预览)` : '\n(报告写盘失败,仅本对话展示)'}`
+        // 读-only 路径:保持向后兼容,模型拿到的 verdict/items 与 issue #284 之前一致
+        return JSON.parse(JSON.stringify({
+          ok: true,
+          action: 'diagnose',
+          verdict: report.ok ? 'all-clear' : 'needs-attention',
+          items: report.items,
+          report_path: reportPath,
+          evidence: `[doctor@${new Date().toISOString()}]`,
+          summary: diagSummary,
+        })) as Record<string, never>
+      }
+
+      // action='repair':从诊断 → 选定 auto-repairable → scope-keyed 审批 → 真执行(走 bootstrap.runOnboardingFix)→ 复检。
+      // 范围过滤:items 非空时只考虑这些 id(未知 id 静默剔除,落 skipped 不冒充 auto)。
+      // runDoctorRepair 内部懒加载 bin/gotry-bootstrap.js,自适应 status→level 适配 + 真实安装器。
+      const requestedItems = Array.isArray(q?.items) && q!.items!.length > 0 ? new Set(q!.items!) : null
+      const scopedReport = requestedItems
+        ? { ...report, items: report.items.filter((i) => requestedItems.has(i.id)) }
+        : report
+      const exec = _exec as { agent?: object; callId?: string; signal?: AbortSignal } | undefined
+      // 生产 repair 让 bootstrap 安装编排复用本工具的同一诊断注册表做终态复检；
+      // fixture 若显式提供 recheck，则保留其隔离实现，再单独取一次工具报告。
+      let recheck: typeof report | undefined
+      const injectedRepair = seams.doctor?.repair
+      const repairOptions: DoctorRepairOptions = {
+        ...injectedRepair,
+        recheck: injectedRepair?.recheck ?? (async () => {
+          recheck = await check({ stateRoot: config.stateRoot ?? '.' })
+          return recheck.items.map((item) => ({
+            label: item.label,
+            level: item.status,
+            detail: item.detail,
+            fix: item.fix,
+          }))
+        }),
+      }
+      const repair = await runDoctorRepair(
+        scopedReport,
+        (scopeKey, reason) => repairApprovalGate.request(exec?.agent, scopeKey, reason, { callId: exec?.callId, signal: exec?.signal }),
+        repairOptions,
+      )
+      if (repair.approval === 'granted' && !recheck) {
+        recheck = await check({ stateRoot: config.stateRoot ?? '.' })
+      }
+      const finalReport = recheck ?? report
+      await writeReport(finalReport)
+      const diagSummary = `${report.summary}\n${reportLines(report).join('\n')}`
+      // 整合诊断 + 修复双视角 summary(模型可分清哪段是体检、哪段是修复)
+      const repairLines: string[] = []
+      for (const r of repair.repairs) {
+        repairLines.push(`${r.status === 'installed' ? '✅' : '❌'} ${r.label}: ${r.reason}${r.nextAction ? ` → ${r.nextAction}` : ''}`)
+      }
+      for (const s of repair.skipped) {
+        repairLines.push(`⏭  ${s.label}: ${s.reason}(bucket=${s.bucket})`)
+      }
+      const recheckSummary = recheck
+        ? `\n\n[recheck] ${recheck.summary}\n${reportLines(recheck).join('\n')}`
+        : ''
+      const reportSummary = reportPath ? `\n报告已写: ${reportPath}(侧栏工作台可直接预览)` : '\n(报告写盘失败,仅本对话展示)'
+      const combinedSummary = `${diagSummary}\n\n[repair] verdict=${repair.verdict}, approval=${repair.approval}, plan=${repair.selected.length} 项 auto / ${repair.skipped.length} 项 skipped\n${repairLines.join('\n')}\n${repair.summary}${recheckSummary}${reportSummary}`
+      return JSON.parse(JSON.stringify({
+        ok: repair.ok,
+        action: 'repair',
+        verdict: repair.verdict,
+        diagnosis: report,
+        recheck,
+        plan: {
+          selected: repair.selected,
+          needs_user_action: repair.skipped.filter((s) => s.bucket === 'user-action').map((s) => ({ id: s.id, label: s.label, reason: s.reason })),
+          unavailable: repair.skipped.filter((s) => s.bucket === 'unavailable').map((s) => ({ id: s.id, label: s.label, reason: s.reason })),
+          scope_key: repair.scopeKey,
+        },
+        approval: repair.approval,
+        repairs: repair.repairs,
+        skipped: repair.skipped,
+        evidence: `[doctor@${new Date().toISOString()}]`,
+        summary: combinedSummary,
+        report_path: reportPath,
+      })) as Record<string, never>
+    },
+    presentCall: args => {
+      const q = unwrapQuery<{ action?: string }>(args, 'action')
+      const a = q?.action === 'repair'
+      return { card: 'generic', title: a ? '🩺 依赖体检+修复(待批准)' : '🩺 依赖体检', kind: 'execute', rawInput: args }
     },
-    presentCall: _args => ({ card: 'generic', title: '🩺 依赖体检', kind: 'execute', rawInput: {} }),
     presentResult: (_args, value) => {
-      const r = value as { verdict?: string; summary?: string }
+      const r = value as { verdict?: string; summary?: string; action?: string; approval?: string }
+      const deniedLabel = r.approval === 'cancelled'
+        ? '↩️ 已取消'
+        : r.approval === 'unavailable'
+          ? '⚠️ 无审批通道'
+          : '🚫 已拒绝'
+      const title = r.action === 'repair'
+        ? `🩺 修复:${r.verdict === 'repaired' ? '✅ 已就位' : r.verdict === 'partial-repair' ? '⚠️ 部分成功' : r.verdict === 'repair-blocked' ? '❌ 复检未通过' : r.verdict === 'approval-denied' ? deniedLabel : '🔧 无可补装项'}`
+        : `🩺 依赖体检:${r.verdict === 'all-clear' ? '✅ 全部就绪' : '🔧 有项待处理'}`
       return {
         card: 'generic',
-        title: `🩺 依赖体检:${r.verdict === 'all-clear' ? '✅ 全部就绪' : '🔧 有项待处理'}`,
+        title,
         content: [{ type: 'text', text: String(r.summary ?? '') }],
       }
     },
@@ -1518,10 +1973,22 @@ export function apply(ctx: Context, config: Config): void {
     output: {
       schema: { type: 'json' },
       render: (_args, value) => [{ type: 'text', text: String((value as { summary?: string }).summary ?? JSON.stringify(value).slice(0, 600)) }],
+      presentationMeta: (_args, value) => {
+        const r = value as { artifacts?: Array<{ path?: string }>; total?: number; truncated?: boolean }
+        const paths = Array.isArray(r.artifacts)
+          ? r.artifacts.map(a => String(a.path ?? '')).filter(Boolean)
+          : []
+        return {
+          shape: 'paths',
+          paths,
+          truncated: Boolean(r.truncated),
+          total: r.total ?? paths.length,
+        }
+      },
     },
-    async execute(args, _exec: unknown) {
+    async execute(args, exec: unknown) {
       const q = unwrapQuery<{ limit?: number }>(args, 'limit')
-      const r = await listArtifacts({ stateRoot: config.stateRoot ?? '.', limit: q.limit })
+      const r = await listArtifacts({ stateRoot: config.stateRoot ?? '.', cwd: sessionCwd(exec), limit: q.limit })
       const lines = r.artifacts.map(a =>
         `- [${a.source}] ${a.title}${a.status ? `(${a.status})` : ''} — ${a.path}${a.updated ? ` @ ${a.updated.slice(0, 16).replace('T', ' ')}` : ''}`)
       const summary = r.artifacts.length
@@ -1529,13 +1996,23 @@ export function apply(ctx: Context, config: Config): void {
         : '无在册产物(异步深度规划交付与工作目录 md 文件都会出现在这里)'
       return JSON.parse(JSON.stringify({ ok: true, artifacts: r.artifacts, total: r.total, truncated: r.truncated, summary })) as Record<string, never>
     },
-    presentCall: () => ({ card: 'generic', title: '列出产物', kind: 'search' }),
-    presentResult: (_args, value) => {
-      const r = value as { summary?: string; total?: number }
+    // Host presentationMeta remains persisted with the ToolResult for Host-side
+    // consumers; the packaged public Client separately renders the runtime block
+    // for these custom wire names in DSH Web.
+    presentResult: (_args, result: ToolResult) => {
+      if (result.isError || typeof result.meta !== 'object' || result.meta === null || Array.isArray(result.meta)) return undefined
+      const meta = result.meta as { shape?: unknown; paths?: unknown; truncated?: unknown; total?: unknown }
+      if (meta.shape !== 'paths' || !Array.isArray(meta.paths) || !meta.paths.every(p => typeof p === 'string') ||
+          typeof meta.truncated !== 'boolean' || typeof meta.total !== 'number' || !Number.isInteger(meta.total) || meta.total < 0) {
+        return undefined
+      }
       return {
-        card: 'generic',
-        title: `产物:${r.total ?? 0} 项在册`,
-        content: [{ type: 'text', text: String(r.summary ?? '') }],
+        card: 'search' as const,
+        shape: 'paths' as const,
+        title: `产物:${meta.total} 项在册${meta.truncated ? '(已截断)' : ''}`,
+        paths: meta.paths,
+        truncated: meta.truncated,
+        total: meta.total,
       }
     },
   }))
@@ -1556,34 +2033,71 @@ export function apply(ctx: Context, config: Config): void {
     output: {
       schema: { type: 'json' },
       render: (_args, value) => [{ type: 'text', text: String((value as { content?: string }).content ?? JSON.stringify(value).slice(0, 600)) }],
+      presentationMeta: (_args, value) => {
+        const r = value as { path?: string; offset?: number; lines?: Array<{ number: number; text: string }>; totalLines?: number; lang?: string; source?: string; version?: string }
+        return {
+          path: String(r.path ?? ''),
+          offset: r.offset ?? 1,
+          lines: Array.isArray(r.lines) ? r.lines.map(line => ({ number: line.number, text: line.text })) : [],
+          totalLines: r.totalLines ?? 0,
+          ...(r.lang ? { lang: r.lang } : {}),
+          ...(r.source ? { source: r.source } : {}),
+          ...(r.version ? { version: r.version } : {}),
+        }
+      },
     },
-    async execute(args, _exec) {
+    async execute(args, exec) {
       const q = args
       if (!q.path) throw new Error('gotry_artifacts_read requires path')
       if (!q.path) return JSON.parse(JSON.stringify({ ok: false, error: 'path 必填(来自 gotry_artifacts_list)' })) as Record<string, never>
-      const r = await readArtifact({ stateRoot: config.stateRoot ?? '.', path: q.path, offset: q.offset, limit: q.limit })
+      const r = await readArtifact({ stateRoot: config.stateRoot ?? '.', cwd: sessionCwd(exec), path: q.path, offset: q.offset, limit: q.limit })
       if (!r.ok) return JSON.parse(JSON.stringify(r)) as Record<string, never>
+      // 身份/来源展示(issue #285 第 1 条「显示身份/来源」):行号视图保留 read 卡的
+      // path/offset/lines/totalLines/lang;fallback content 用 source label 前缀,
+      // 让无法渲染 read 卡的 UI 也能区分「本会话选了哪个产物」,避免把旧摘要当新内容。
       return JSON.parse(JSON.stringify({
         ...r,
+        source: r.source,
         summary: `${r.path}(${r.totalLines} 行)第 ${r.offset}-${r.offset + r.lines.length - 1} 行${r.windowed ? `(共 ${r.totalLines} 行,可翻页)` : ''}`,
       })) as Record<string, never>
     },
-    presentCall: args => ({ card: 'generic', title: `读产物:${args.path ?? ''}`, kind: 'read', rawInput: args }),
-    presentResult: (_args, value) => {
-      const r = value as unknown as { ok?: boolean; path?: string; offset?: number; lines?: Array<{ number: number; text: string }>; totalLines?: number; lang?: string; content?: string; error?: string }
-      if (!r.ok) {
-        return { card: 'generic', title: '读产物失败', content: [{ type: 'text', text: String(r.error ?? '') }] }
+    // Keep the standard location payload for Host consumers. The Web client only
+    // renders its built-in keyed tools, so this is not claimed as native custom-card E2E.
+    presentCall: args => ({
+      card: 'generic',
+      title: `读产物:${args.path ?? ''}`,
+      kind: 'read',
+      rawInput: args,
+      ...(args.path ? { locations: [{ path: String(args.path), line: 1 }] } : {}),
+    }),
+    presentResult: (_args, result: ToolResult) => {
+      if (result.isError || typeof result.meta !== 'object' || result.meta === null || Array.isArray(result.meta)) return undefined
+      const meta = result.meta as { path?: unknown; source?: unknown; offset?: unknown; lines?: unknown; totalLines?: unknown; lang?: unknown }
+      if (typeof meta.path !== 'string' || meta.path === '' || typeof meta.offset !== 'number' || !Number.isInteger(meta.offset) || meta.offset < 1 ||
+          !Array.isArray(meta.lines) || !meta.lines.every(line => typeof line === 'object' && line !== null && !Array.isArray(line) &&
+            typeof (line as { number?: unknown }).number === 'number' && Number.isInteger((line as { number: number }).number) &&
+            typeof (line as { text?: unknown }).text === 'string') ||
+          typeof meta.totalLines !== 'number' || !Number.isInteger(meta.totalLines) || meta.totalLines < 0) {
+        return undefined
       }
-      // dsh read 卡:UI 渲染为行号文件视图(issue #25 的「插件能力查看 artifacts」落点)
+      const source = typeof meta.source === 'string' ? meta.source : 'unknown'
+      const identityLine = `source: ${source} · path: ${meta.path} · ${meta.totalLines} lines`
+      const rawContent = result.content
+        .filter(block => block.type === 'text')
+        .map(block => block.text)
+        .join('\n')
       return {
         card: 'read' as const,
-        title: r.path?.split('/').pop() ?? r.path ?? '',
-        path: r.path ?? '',
-        offset: r.offset ?? 1,
-        lines: r.lines ?? [],
-        totalLines: r.totalLines ?? 0,
-        lang: r.lang,
-        content: [{ type: 'text', text: r.content ?? '' }],
+        title: meta.path.split('/').pop() ?? meta.path,
+        path: meta.path,
+        offset: meta.offset,
+        lines: meta.lines as Array<{ number: number; text: string }>,
+        totalLines: meta.totalLines,
+        ...(typeof meta.lang === 'string' ? { lang: meta.lang } : {}),
+        content: [
+          { type: 'text', text: identityLine },
+          { type: 'text', text: rawContent },
+        ],
       }
     },
   }))
@@ -1616,7 +2130,7 @@ export function apply(ctx: Context, config: Config): void {
       schema: { type: 'json' },
       render: (_args, value) => [{ type: 'text', text: String((value as { summary?: string }).summary ?? JSON.stringify(value).slice(0, 800)) }],
     },
-    async execute(args, _exec: unknown) {
+    async execute(args, exec: unknown) {
       const q = unwrapQuery<{ markdown?: string; path?: string; tripYear?: number; itinerary?: Record<string, unknown> }>(args, 'markdown')
       const avMap = await loadAirlineAirportMap()
       if (!avMap) {
@@ -1624,14 +2138,19 @@ export function apply(ctx: Context, config: Config): void {
       }
       let markdown = q.markdown
       if (!markdown && q.path) {
-        const r = await readArtifact({ stateRoot: config.stateRoot ?? '.', path: q.path })
+        const r = await readArtifact({ stateRoot: config.stateRoot ?? '.', cwd: sessionCwd(exec), path: q.path })
         if (!r.ok) return JSON.parse(JSON.stringify({ ok: false, summary: `产物读取失败:${String((r as { error?: string }).error ?? '')}` })) as Record<string, never>
         markdown = r.content
       }
       if (!markdown) return JSON.parse(JSON.stringify({ ok: false, summary: '需要 markdown(产物全文)或 path(产物路径)' })) as Record<string, never>
       const itinerary = q.itinerary as import('./bookable-facts.ts').ItineraryFacts | undefined
       const registry = await loadFactRegistry(config.stateRoot ?? '.')
-      const report = gateArtifact(markdown, registry, avMap, { trip_year: q.tripYear, itinerary })
+      // 政策复核提醒桥接(issue #359):闸侧 opts.tripStart 与 renderer 同一传入
+      // 才能让合法 `renderPolicyFact(f, tripStart)` 行通过公开闸。已加载的
+      // itinerary.trip_start 是权威源(同次闸同时驱动 itineraryInvariants),不再
+      // 额外要求调用方传 opts.tripStart;空 itinerary/无 trip_start 即无提醒。
+      const tripStart = typeof itinerary?.trip_start === 'string' ? itinerary.trip_start : undefined
+      const report = gateArtifact(markdown, registry, avMap, { trip_year: q.tripYear, itinerary, tripStart })
       const lines = report.violations.slice(0, 20).map(v => `  L${v.line} [${v.kind}] ${v.detail}`)
       const summary = report.verdict === 'pass'
         ? `事实闸 PASS:${report.traceable}/${report.claims_checked} 可下单 claim 全部回溯到 exact-date 工具结果(query_id 可重放)——可宣称「已验证方案」。`