@danceiny/gotry 0.0.1-rc.9 → 0.2.0-rc.28

package/ts/scripts/map-tools-vendor-package-proof.ts

@@ -0,0 +1,404 @@
+/**
+ * Package proof for issue #202.
+ *
+ * The full suite passes the executable from its clean tarball install; focused
+ * runs pack/unpack locally and attach the already-installed root closure. Both
+ * paths load the plugin from the artifact, never from the checkout vendor path.
+ * No map provider or paid endpoint is contacted; inline-coordinate geocoding is
+ * asserted with fetch disabled.
+ */
+
+import { execFileSync } from 'node:child_process'
+import { createHash } from 'node:crypto'
+import { chmodSync, copyFileSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, realpathSync, rmSync, symlinkSync, writeFileSync } from 'node:fs'
+import { createRequire } from 'node:module'
+import { basename, dirname, isAbsolute, join, resolve } from 'node:path'
+import { tmpdir } from 'node:os'
+import { fileURLToPath, pathToFileURL } from 'node:url'
+import assert from 'node:assert/strict'
+
+const repoRoot = resolve(dirname(fileURLToPath(import.meta.url)), '../..')
+const upstreamLicenseSha256 = 'b6bbb0c73a02cf8d2c304e9f208b41c32f0a810fabe366986e2b14ac3338f618'
+const upstreamVendorFileCount = 37
+const adaptedVendorAggregateSha256 = 'f01515d8c1ec2973c7b4fb2bec0f6e2175bceef7a5331847cb210a11855a49e2'
+const expectedTools = [
+  'map_bicycling_route',
+  'map_driving_route',
+  'map_geocode',
+  'map_poi_search',
+  'map_reverse_geocode',
+  'map_transit_route',
+  'map_walking_route',
+]
+
+function sha256(path: string): string {
+  return createHash('sha256').update(readFileSync(path)).digest('hex')
+}
+
+function vendorAggregate(root: string): { count: number; sha256: string } {
+  const files: string[] = []
+  const walk = (directory: string) => {
+    for (const entry of readdirSync(directory, { withFileTypes: true })) {
+      const path = join(directory, entry.name)
+      if (entry.isDirectory()) walk(path)
+      else files.push(path.slice(root.length + 1).replaceAll('\\', '/'))
+    }
+  }
+  walk(root)
+  files.sort()
+  const digest = createHash('sha256')
+  for (const relative of files) {
+    digest.update(relative)
+    digest.update('\0')
+    digest.update(readFileSync(join(root, relative)))
+    digest.update('\0')
+  }
+  return { count: files.length, sha256: digest.digest('hex') }
+}
+
+function assertPackagingExcludesNodeModules(): void {
+  const tempRoot = mkdtempSync(join(tmpdir(), 'gotry-pack-excl-'))
+  try {
+    const archiveTar = join(tempRoot, 'head.tar')
+    execFileSync('git', ['archive', '--format=tar', '--output', archiveTar, 'HEAD'], { cwd: repoRoot })
+    const checkoutDir = join(tempRoot, 'checkout')
+    mkdirSync(checkoutDir)
+    execFileSync('tar', ['-xf', archiveTar, '-C', checkoutDir])
+    copyFileSync(join(repoRoot, 'package.json'), join(checkoutDir, 'package.json'))
+
+    const vendorBinDir = join(checkoutDir, 'ts/dsh-runtime/vendor/dsh-map-tools/node_modules/.bin')
+    mkdirSync(vendorBinDir, { recursive: true })
+    for (const name of ['cordis', 'tsc', 'tsserver', 'vitest']) {
+      const binPath = join(vendorBinDir, name)
+      writeFileSync(binPath, '#!/usr/bin/env node\n')
+      chmodSync(binPath, 0o755)
+    }
+
+    const packDir = join(tempRoot, 'pack')
+    mkdirSync(packDir)
+    const packOutput = execFileSync('npm', [
+      'pack', '--ignore-scripts', '--json', '--pack-destination', packDir,
+    ], { cwd: checkoutDir, encoding: 'utf8' })
+    const packInfo = JSON.parse(packOutput) as Array<{ filename: string }>
+    assert.equal(packInfo.length, 1, 'temp npm pack must produce one artifact')
+    const tarball = join(packDir, packInfo[0].filename)
+    assert.ok(existsSync(tarball), `temp packed artifact missing: ${tarball}`)
+
+    const entries = execFileSync('tar', ['-tzf', tarball], { encoding: 'utf8' }).trimEnd().split('\n')
+    const nodeModulesEntries = entries.filter(path =>
+      path.startsWith('package/ts/dsh-runtime/vendor/dsh-map-tools/node_modules'),
+    )
+    assert.equal(
+      nodeModulesEntries.length, 0,
+      `npm pack must exclude vendor node_modules: found ${nodeModulesEntries.join(', ')}`,
+    )
+
+    const extractDir = join(tempRoot, 'extracted')
+    mkdirSync(extractDir)
+    execFileSync('tar', ['-xzf', tarball, '-C', extractDir])
+    const packedVendorRoot = join(extractDir, 'package/ts/dsh-runtime/vendor/dsh-map-tools')
+    const packedAggregate = vendorAggregate(packedVendorRoot)
+    assert.equal(packedAggregate.count, upstreamVendorFileCount, 'packed vendor file count drifted')
+    assert.equal(packedAggregate.sha256, adaptedVendorAggregateSha256, 'packed vendor aggregate drifted')
+  } finally {
+    rmSync(tempRoot, { recursive: true, force: true })
+  }
+}
+
+function assertTargetLockClosure(): { packages: number; version: string } {
+  const manifest = JSON.parse(readFileSync(join(repoRoot, 'ts/package.json'), 'utf8')) as {
+    dependencies?: Record<string, string>
+  }
+  assert.equal(manifest.dependencies?.['dsh-map-tools'], undefined, 'external map-tools dependency must stay removed')
+
+  const lock = JSON.parse(readFileSync(join(repoRoot, 'ts/package-lock.json'), 'utf8')) as {
+    packages?: Record<string, { version?: string; dependencies?: Record<string, string> }>
+  }
+  assert.equal(lock.packages?.['']?.dependencies?.['dsh-map-tools'], undefined, 'lock root must not resolve external map-tools')
+  assert.equal(lock.packages?.['node_modules/dsh-map-tools'], undefined, 'lock must not carry external map-tools')
+  const dshEntries = Object.entries(lock.packages ?? {}).filter(([path]) =>
+    /(?:^|\/)node_modules\/@deepseek-ai\/(?:dsh|dsh-[^/]+)$/.test(path),
+  )
+  assert.ok(dshEntries.length >= 10, 'expected dsh-tools peer closure in the ts lock')
+  for (const [path, entry] of dshEntries) {
+    assert.equal(entry.version, '0.2.0-rc.2', `${path} drifted outside the 0.2.0-rc.2 closure`)
+  }
+  return { packages: dshEntries.length, version: '0.2.0-rc.2' }
+}
+
+function findPackageRoot(entry: string): string {
+  let cursor = dirname(entry)
+  for (;;) {
+    const manifestPath = join(cursor, 'package.json')
+    if (existsSync(manifestPath)) {
+      const manifest = JSON.parse(readFileSync(manifestPath, 'utf8')) as { name?: string }
+      if (manifest.name === '@danceiny/gotry') return cursor
+    }
+    const parent = dirname(cursor)
+    if (parent === cursor) throw new Error(`cannot locate @danceiny/gotry package root from ${entry}`)
+    cursor = parent
+  }
+}
+
+function assertBinTargetsPackage(binPath: string, expectedTarget: string): void {
+  const resolvedExpectedTarget = realpathSync(expectedTarget)
+  if (realpathSync(binPath) === resolvedExpectedTarget) return
+
+  // pnpm writes an executable shell shim instead of a symlink. Its final
+  // machine-readable marker is safer to verify than accepting any occurrence
+  // of the package path in an otherwise unrelated executable.
+  const shim = readFileSync(binPath, 'utf8')
+  assert.ok(Buffer.byteLength(shim, 'utf8') <= 32_768, 'clean-install gotry shim is unexpectedly large')
+  const lines = shim.trimEnd().split(/\r?\n/)
+  const markers = lines.filter(line => line.startsWith('# cmd-shim-target='))
+  assert.equal(markers.length, 1, 'pnpm gotry shim must contain exactly one target marker')
+  assert.equal(lines.at(-1), markers[0], 'pnpm gotry shim target marker must be the final line')
+  const markerTarget = markers[0].slice('# cmd-shim-target='.length)
+  assert.ok(isAbsolute(markerTarget), 'pnpm gotry shim target must be absolute')
+  assert.equal(
+    realpathSync(markerTarget),
+    resolvedExpectedTarget,
+    'GOTRY_MAP_TOOLS_E2E_BIN shim must target this installed GoTry package',
+  )
+}
+
+function prepareProofPackage(cleanInstalledBin?: string): { packageRoot: string; proofRoot?: string } {
+  if (cleanInstalledBin) {
+    const binPath = resolve(cleanInstalledBin)
+    assert.equal(basename(binPath), 'gotry', 'clean-install executable must use the gotry bin name')
+    assert.equal(basename(dirname(binPath)), '.bin', 'clean-install executable must come from node_modules/.bin')
+    assert.equal(basename(dirname(dirname(binPath))), 'node_modules', 'clean-install executable must come from a consumer install')
+    const consumerRoot = dirname(dirname(dirname(binPath)))
+    const packageMain = createRequire(join(consumerRoot, 'package.json')).resolve('@danceiny/gotry')
+    const packageRoot = findPackageRoot(packageMain)
+    const installedManifest = JSON.parse(readFileSync(join(packageRoot, 'package.json'), 'utf8')) as {
+      name?: string
+      bin?: string | Record<string, string>
+    }
+    assert.equal(installedManifest.name, '@danceiny/gotry', 'clean-install executable must belong to GoTry')
+    const declaredBin = typeof installedManifest.bin === 'string'
+      ? installedManifest.bin
+      : installedManifest.bin?.gotry
+    assert.equal(declaredBin, 'bin/gotry-inner.js', 'installed package must declare the production gotry bin')
+    assertBinTargetsPackage(binPath, join(packageRoot, declaredBin))
+    return { packageRoot }
+  }
+
+  const proofRoot = mkdtempSync(join(repoRoot, '.tmp-map-tools-proof-'))
+  try {
+    const packOutput = execFileSync('npm', [
+      'pack', '--ignore-scripts', '--json', '--pack-destination', proofRoot,
+    ], { cwd: repoRoot, encoding: 'utf8' })
+    const packInfo = JSON.parse(packOutput) as Array<{ filename: string }>
+    assert.equal(packInfo.length, 1, 'npm pack must produce one artifact')
+    const tarball = join(proofRoot, packInfo[0].filename)
+    assert.ok(existsSync(tarball), `packed artifact missing: ${tarball}`)
+    const unpackRoot = join(proofRoot, 'unpacked')
+    mkdirSync(unpackRoot)
+    execFileSync('tar', ['-xzf', tarball, '-C', unpackRoot])
+    const packageRoot = join(unpackRoot, 'package')
+    symlinkSync(join(repoRoot, 'node_modules'), join(packageRoot, 'node_modules'), process.platform === 'win32' ? 'junction' : 'dir')
+    return { packageRoot, proofRoot }
+  } catch (error) {
+    rmSync(proofRoot, { recursive: true, force: true })
+    throw error
+  }
+}
+
+const cleanInstalledBin = process.env.GOTRY_MAP_TOOLS_E2E_BIN
+const { packageRoot, proofRoot } = prepareProofPackage(cleanInstalledBin)
+
+try {
+  assertPackagingExcludesNodeModules()
+  const lockedDsh = assertTargetLockClosure()
+  const vendorRoot = join(packageRoot, 'ts/dsh-runtime/vendor/dsh-map-tools')
+  const requiredFiles = [
+    'LICENSE',
+    'package.json',
+    'cordis.patch.yml',
+    'lib/index.js',
+    'lib/settings-ns.js',
+    'lib/config.js',
+    'lib/tools/geocode.js',
+    'lib/tools/routes.js',
+    'lib/tools/poi.js',
+  ]
+  for (const relative of requiredFiles) {
+    assert.ok(existsSync(join(vendorRoot, relative)), `required vendor file missing: ${relative}`)
+  }
+  const vendorTree = vendorAggregate(vendorRoot)
+  assert.equal(vendorTree.count, upstreamVendorFileCount, 'vendored payload file count drifted')
+  assert.equal(vendorTree.sha256, adaptedVendorAggregateSha256, 'vendored payload aggregate drifted')
+  const vendorPackage = JSON.parse(readFileSync(join(vendorRoot, 'package.json'), 'utf8')) as {
+    name?: string
+    version?: string
+    license?: string
+  }
+  assert.equal(vendorPackage.name, 'dsh-map-tools')
+  assert.equal(vendorPackage.version, '0.7.3')
+  assert.equal(vendorPackage.license, 'MIT')
+  assert.equal(sha256(join(vendorRoot, 'LICENSE')), upstreamLicenseSha256, 'upstream MIT license changed')
+
+  const packageRequire = createRequire(join(packageRoot, 'package.json'))
+  const dshToolsPackageJson = packageRequire.resolve('@deepseek-ai/dsh-tools/package.json')
+  const dshSettingsPackageJson = packageRequire.resolve('@deepseek-ai/dsh-settings/package.json')
+  const dshTools = JSON.parse(readFileSync(dshToolsPackageJson, 'utf8')) as { version: string }
+  const dshSettings = JSON.parse(readFileSync(dshSettingsPackageJson, 'utf8')) as { version: string }
+  assert.equal(dshTools.version, '0.2.0-rc.2')
+  assert.equal(dshSettings.version, '0.2.0-rc.2')
+  const settingsApi = await import(pathToFileURL(join(dirname(dshSettingsPackageJson), 'lib/index.js')).href) as {
+    SettingsForms?: { prototype?: { configure?: (...args: unknown[]) => () => void } }
+  }
+  // 0.2.0-rc.2:SettingsForms 取代了手工 section API——表单由插件导出的
+  // Config schema 自动生成,唯一的手工注册是页策略 settings.configure({auto}, fiber)。
+  const settingsConfigure = settingsApi.SettingsForms?.prototype?.configure
+  assert.equal(
+    typeof settingsConfigure,
+    'function',
+    'real 0.2.0-rc.2 SettingsForms.prototype.configure must be present',
+  )
+
+  const plugin = await import(pathToFileURL(join(vendorRoot, 'lib/index.js')).href)
+  type RegisteredTool = Record<string, unknown> & { name: string; execute?: unknown }
+  const registered = new Map<string, RegisteredTool>()
+  const registerEvents: string[] = []
+  const toolDisposeEvents: string[] = []
+  const settingsRegistrations: unknown[][] = []
+  const settingsWatchers: Array<() => void> = []
+  const settingsProviderDisposers: Array<() => void> = []
+  const contextDisposers: Array<() => void> = []
+  const settingsConfigureCalls: Array<{ presentation: unknown; owner: unknown }> = []
+  const activeToolNames = () => [...registered.keys()].sort()
+  const settingsConfigureDisposed: string[] = []
+  const settingsProvider = {
+    ctx: {
+      effect(effect: () => (() => void) | void) {
+        const disposer = effect()
+        if (typeof disposer === 'function') settingsProviderDisposers.push(disposer)
+        return disposer
+      },
+    },
+    register: (...args: unknown[]) => {
+      settingsRegistrations.push(args)
+      return {
+        get: () => args[2] && typeof args[2] === 'object' ? (args[2] as { base?: unknown }).base : undefined,
+        watch: (callback: () => void) => {
+          settingsWatchers.push(callback)
+          return () => {
+            const index = settingsWatchers.indexOf(callback)
+            if (index >= 0) settingsWatchers.splice(index, 1)
+          }
+        },
+        update: async () => undefined,
+        replace: async () => undefined,
+      }
+    },
+    installSection: (..._args: unknown[]) => {
+      throw new Error('legacy installSection must not be called on the 0.2.0-rc.2 settings service')
+    },
+    configure: (presentation: unknown, owner: unknown) => {
+      settingsConfigureCalls.push({ presentation, owner })
+      return () => {
+        settingsConfigureDisposed.push('policy')
+      }
+    },
+  }
+  const context = {
+    fiber: { state: 'active' },
+    effect(effect: () => (() => void) | void) {
+      const disposer = effect()
+      if (typeof disposer === 'function') contextDisposers.push(disposer)
+      return disposer
+    },
+    tools: {
+      register(tool: RegisteredTool) {
+        assert.ok(tool.name.startsWith('map_'), `unexpected map tool name: ${tool.name}`)
+        registered.set(tool.name, tool)
+        registerEvents.push(tool.name)
+        return () => {
+          registered.delete(tool.name)
+          toolDisposeEvents.push(tool.name)
+        }
+      },
+    },
+    inject(dependencies: string[], callback: (scope: Record<string, unknown>) => void) {
+      if (dependencies.includes('settings')) {
+        callback({ settings: settingsProvider })
+      } else if (dependencies.includes('webServer')) {
+        // 0.7.3 的 config-route 用 scope.effect 托管回环路由的撤销注册。
+        callback({
+          webServer: { register: () => undefined },
+          effect(effect: () => (() => void) | void) {
+            const disposer = effect()
+            if (typeof disposer === 'function') contextDisposers.push(disposer)
+            return disposer
+          },
+        })
+      } else {
+        throw new Error(`unexpected dependency injection: ${dependencies.join(',')}`)
+      }
+    },
+  }
+  plugin.apply(context, {
+    provider: 'osm', amapKey: '', timeoutMs: 1000, maxQps: 2,
+    defaultMode: 'driving', language: 'zh',
+  })
+  assert.deepEqual(activeToolNames(), expectedTools, 'exactly seven active map tools must register')
+  assert.equal(registerEvents.length, expectedTools.length, 'schema-driven settings add no initial tool rebuild')
+  assert.equal(toolDisposeEvents.length, 0, 'schema-driven settings dispose no tool generation')
+  assert.equal(settingsConfigureCalls.length, 1, '0.2.0-rc.2 settings page policy must configure exactly once')
+  assert.deepEqual(settingsConfigureCalls[0]?.presentation, { auto: true }, 'page policy presentation must opt into the automatic card')
+  assert.equal(settingsConfigureCalls[0]?.owner, context.fiber, 'page policy owner must be the plugin fiber')
+  assert.equal(settingsRegistrations.length, 0, 'legacy per-section registration must stay retired')
+  assert.equal(settingsWatchers.length, 0, 'legacy settings watcher must stay retired')
+  assert.equal(settingsProviderDisposers.length, 0, 'legacy provider-detach fallback must stay retired')
+  // 两个受管撤销:config-route 的回环路由注册 + settings 页策略(按注册序)。
+  assert.equal(contextDisposers.length, 2, 'config-route disposer + settings page-policy disposer must register with the plugin effects')
+
+  contextDisposers[1]!()
+  assert.equal(settingsConfigureDisposed.length, 1, 'plugin effect disposal must release the settings page policy')
+  assert.deepEqual(activeToolNames(), expectedTools, 'policy disposal must keep exactly seven active map tools')
+
+  const finalActiveTools = [...registered.values()]
+  const originalFetch = globalThis.fetch
+  globalThis.fetch = (async () => { throw new Error('network forbidden by package proof') }) as typeof fetch
+  try {
+    const geocode = registered.get('map_geocode')
+    assert.ok(geocode, 'map_geocode must be registered')
+    const result = await (geocode.execute as (args: unknown, execution: unknown) => Promise<unknown>)(
+      { address: '116.397428,39.90923' },
+      { signal: new AbortController().signal },
+    ) as { provider?: string; location?: number[] }
+    assert.equal(result.provider, 'inline')
+    assert.deepEqual(result.location, [116.397428, 39.90923])
+  } finally {
+    globalThis.fetch = originalFetch
+  }
+
+  for (const dispose of contextDisposers.splice(0).reverse()) dispose()
+  assert.equal(registered.size, 0, 'plugin unload must dispose the active map tool generation')
+
+  console.log(JSON.stringify({
+    proof: 'map-tools-vendor-package',
+    status: 'PASS',
+    artifactMode: cleanInstalledBin ? 'clean-installed-tarball' : 'packed-unpacked-focused',
+    vendored: {
+      sourcePackage: 'dsh-map-tools@0.7.3',
+      licenseSha256: upstreamLicenseSha256, vendorFileCount: vendorTree.count,
+      adaptedVendorAggregateSha256: vendorTree.sha256,
+    },
+    artifactVendor: vendorRoot,
+    dshClosure: { tools: dshTools.version, settings: dshSettings.version, ...lockedDsh },
+    settingsLifecycle: {
+      registerEvents: registerEvents.length,
+      toolDisposeEvents: toolDisposeEvents.length,
+      pagePolicyConfigured: settingsConfigureCalls.length,
+      legacySectionRegistrations: settingsRegistrations.length,
+      pluginUnloadDisposed: true,
+    },
+    tools: finalActiveTools.map(tool => tool.name).sort(),
+    inlineCoordinate: { provider: 'inline', network: 'forbidden' },
+  }, null, 2))
+} finally {
+  if (proofRoot) rmSync(proofRoot, { recursive: true, force: true })
+}

package/ts/scripts/skeleton-check.ts

@@ -34,7 +34,7 @@ export async function checkConnectivity(a: string, b: string): Promise<{ connect
   return {
     connected: false,
     evidence: inHub
-      ? `[骨架:openflights] ❌ ${a}↔${b} 枢纽间无直飞记录——引擎应将此候选降权或要求中转`
+      ? `[骨架:openflights] ❌ ${a}↔${b} 枢纽对未在骨架覆盖(实时源以新航线为准;骨架可能滞后——请用户根据行程复核)`
       : `[骨架:openflights] ○ ${a}或${b}不在枢纽集,骨架不覆盖(不作否定结论)`,
   }
 }

package/ts/scripts/skeleton-integration-test.ts

@@ -1,6 +1,8 @@
 /**
  * 骨架层集成验证(§7-1 消费面):开 skeletonHub + 带 route 的段 → 结果带三值标注;
  * 枢纽间否定只标注不排除——EK329(数据集滞后的新航线)必须存活。
+ * 用户面(issue #559 卡点 4):unscaffolded leg 必须挂 ⚠ 前缀,避免用户读到「正常选择」后才在尾部 skeleton_notes 发现矛盾。
+ * 内核冻结面(#234)不可擅动,⚠ 标记由 loop.ts:renderSolve 从 skeleton_notes 字符串编码里推断。
  * 运行(在 ts/ 下):npx tsx scripts/skeleton-integration-test.ts
  */
 
@@ -8,6 +10,7 @@ import assert from 'node:assert/strict'
 import { readFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { parseFlightPackToSpec, solveUnified } from '../src/unified.ts'
+import { renderSolve, newState } from '../src/loop.ts'
 
 const pack = JSON.parse(await readFile(join('..', 'data', 'flights_2026.json'), 'utf-8'))
 const spec = parseFlightPackToSpec(pack)
@@ -18,6 +21,25 @@ const r = await solveUnified(spec)
 assert.equal(r.feasible, true, '骨架否定不排除——EK329 必须仍在')
 const f5 = r.legs!.find(l => l.leg === 'f5')
 assert.equal(f5?.service, 'EK329', 'EK329 存活(骨架滞后容错)')
+
+// §7-1 issue #559 卡点 4:骨架证据不再承诺「降权或中转」——承认骨架滞后,让用户据行程复核
 assert.ok((r.skeleton_notes ?? []).some(n => n.includes('SZX') && n.includes('❌')), `枢纽否定标注在: ${r.skeleton_notes}`)
 assert.ok((r.skeleton_notes ?? []).some(n => n.includes('HKG') && n.includes('✅')), '正向标注在')
-console.log(`骨架集成 OK:EK329 在枢纽否定下存活,标注=[${r.skeleton_notes?.join(' | ')}]`)
+assert.ok(
+  !(r.skeleton_notes ?? []).some(n => n.includes('应将此候选降权') || n.includes('要求中转')),
+  '骨架证据不再承诺「降权或中转」——承认骨架滞后,让用户据行程复核',
+)
+
+// §7-1 issue #559 卡点 4:renderSolve 从 skeleton_notes 推断 unscaffolded leg,
+// 给 ⚠ 前缀 + 补充说明,用户读到即知(不动 #234 内核冻结面)
+const state = newState()
+state.solve = r as unknown as Parameters<typeof renderSolve>[0]['solve']
+const rendered = renderSolve(state)
+const f5Line = rendered.split('\n').find(line => line.includes('f5') && line.includes('EK329')) ?? ''
+assert.ok(f5Line.startsWith('- ⚠'), `f5 EK329 用户面必须有 ⚠ 前缀(实测行=${f5Line})`)
+assert.ok(f5Line.includes('枢纽对未在骨架覆盖'), 'f5 用户面行内必须说明「枢纽对未在骨架覆盖」')
+const f1Line = rendered.split('\n').find(line => line.includes('f1 ') && line.includes(':') && line.includes('起飞') && !line.startsWith('- ⚠')) ?? ''
+assert.ok(f1Line.length > 0, 'f1 HKG↔HKT 正向覆盖的 leg 行必须在(实测查找结果为空)')
+assert.ok(!f1Line.startsWith('- ⚠'), `f1 正向覆盖不应有 ⚠ 前缀(实测行=${f1Line})`)
+
+console.log(`骨架集成 OK:EK329 仍存活,用户面 ⚠ 前缀落地;EK329 行=[${f5Line.trim()}]`)