@danceiny/gotry 0.0.1-rc.21 → 0.0.1-rc.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +102 -194
- package/README.zh-CN.md +115 -210
- package/bin/gotry-backend.js +53 -0
- package/bin/gotry-bootstrap.js +466 -35
- package/bin/gotry-inner.js +255 -36
- package/bin/gotry-process-liveness.d.ts +27 -0
- package/bin/gotry-process-liveness.js +97 -0
- package/bin/gotry-runtime-resolution.d.ts +1 -1
- package/bin/gotry-runtime-resolution.js +2 -2
- package/client/client.js +174 -0
- package/cordis.gotry-patch.yml +70 -93
- package/dist/capabilities/agent-reach-deep.js +45 -122
- package/dist/capabilities/agent-reach.js +63 -148
- package/dist/capabilities/anything.js +89 -75
- package/dist/capabilities/artifacts.js +123 -104
- package/dist/capabilities/channel-health.js +65 -45
- package/dist/capabilities/channel-registry.js +108 -87
- package/dist/capabilities/doctor.js +357 -235
- package/dist/capabilities/effect.js +223 -309
- package/dist/capabilities/fact-log.js +28 -14
- package/dist/capabilities/flyai.js +245 -156
- package/dist/capabilities/ground-transfer.js +509 -0
- package/dist/capabilities/hbcli.js +144 -148
- package/dist/capabilities/hotelbyte-transaction.js +194 -0
- package/dist/capabilities/incident-log.js +131 -61
- package/dist/capabilities/model-override.js +30 -10
- package/dist/capabilities/opensky.js +54 -43
- package/dist/capabilities/resilience.js +50 -32
- package/dist/capabilities/session/action-cache.js +50 -44
- package/dist/capabilities/session/adapters/ctrip-flight.js +119 -62
- package/dist/capabilities/session/adapters/ctrip-hotel.js +125 -110
- package/dist/capabilities/session/adapters/dida-portal.js +206 -0
- package/dist/capabilities/session/adapters/meituan-local.js +35 -54
- package/dist/capabilities/session/adapters/rail-12306.js +169 -112
- package/dist/capabilities/session/benchmark.js +85 -149
- package/dist/capabilities/session/extension-bridge.js +320 -259
- package/dist/capabilities/session/extension-channel.js +57 -76
- package/dist/capabilities/session/extension-distribution.js +115 -119
- package/dist/capabilities/session/extract.js +31 -21
- package/dist/capabilities/session/golden-score.js +55 -33
- package/dist/capabilities/session/health-watch.js +146 -154
- package/dist/capabilities/session/read-guard.js +55 -47
- package/dist/capabilities/session/static-flight-golden.js +49 -36
- package/dist/capabilities/session/transport.js +54 -61
- package/dist/capabilities/session/wizard.js +63 -93
- package/dist/capabilities/session-consent.js +143 -47
- package/dist/capabilities/session-login.js +95 -126
- package/dist/capabilities/session-search.js +391 -253
- package/dist/capabilities/sponsor-plugin.js +341 -0
- package/dist/capabilities/visa-policy.js +87 -73
- package/dist/capabilities/weather.js +163 -235
- package/dist/scripts/action-cache-tests.js +24 -59
- package/dist/scripts/agent-planning-turn-deadline-e2e.js +91 -142
- package/dist/scripts/agent-planning-turn-deadline-tests.js +80 -176
- package/dist/scripts/agent-reach-deep-tests.js +30 -40
- package/dist/scripts/agent-reach-tests.js +26 -18
- package/dist/scripts/agent-reach-wrapper-tests.js +46 -50
- package/dist/scripts/anything-tests.js +58 -62
- package/dist/scripts/artifact-client-contract-tests.js +69 -0
- package/dist/scripts/artifacts-capability-tests.js +235 -0
- package/dist/scripts/async-collect.js +26 -15
- package/dist/scripts/benchmark-environment-bridge-e2e.js +287 -684
- package/dist/scripts/benchmark-environment-bridge-tests.js +818 -3123
- package/dist/scripts/booking-copilot-availability-ledger-binding-tests.js +66 -279
- package/dist/scripts/booking-copilot-availability-policy-tests.js +153 -1257
- package/dist/scripts/booking-copilot-bin-proof-tests.js +22 -45
- package/dist/scripts/booking-copilot-crossrepo-fixture-server.js +64 -76
- package/dist/scripts/booking-copilot-dsh-core-proof-tests.js +69 -199
- package/dist/scripts/booking-copilot-dsh-planner-proof-tests.js +393 -759
- package/dist/scripts/booking-copilot-dsh-plugin-proof-tests.js +33 -75
- package/dist/scripts/booking-copilot-event-sequence-concurrency-proof-tests.js +60 -110
- package/dist/scripts/booking-copilot-gap-code-contract-proof-tests.js +28 -66
- package/dist/scripts/booking-copilot-operation-ledger-concurrency-proof-tests.js +72 -271
- package/dist/scripts/booking-copilot-receipt-ledger-concurrency-proof-tests.js +73 -275
- package/dist/scripts/booking-copilot-runtime-proof-tests.js +784 -3398
- package/dist/scripts/booking-copilot-server-proof-tests.js +63 -168
- package/dist/scripts/booking-copilot-startup-proof-tests.js +38 -124
- package/dist/scripts/booking-executor-tests.js +80 -0
- package/dist/scripts/booking-recovery-chain-tests.js +182 -0
- package/dist/scripts/booking-saga-tests.js +61 -123
- package/dist/scripts/booking-surface-contract-proof-tests.js +152 -1167
- package/dist/scripts/bootstrap-tests.js +1383 -128
- package/dist/scripts/build-changelog.js +89 -130
- package/dist/scripts/build-metrics-report.js +135 -143
- package/dist/scripts/changelog-tests.js +35 -82
- package/dist/scripts/channel-probe-tests.js +44 -116
- package/dist/scripts/channel-probe.js +84 -167
- package/dist/scripts/channel-registry-tests.js +97 -185
- package/dist/scripts/companion-tests.js +25 -70
- package/dist/scripts/dida-cookie-probe.js +87 -0
- package/dist/scripts/dida-sw-probe.js +114 -0
- package/dist/scripts/diff-test.js +17 -12
- package/dist/scripts/doctor-tests.js +428 -120
- package/dist/scripts/dsh-artifact-e2e.js +150 -0
- package/dist/scripts/dsh-artifact-web-e2e.js +443 -0
- package/dist/scripts/dsh-http-proxy-sse-proof.js +90 -0
- package/dist/scripts/dsh-runtime-closure-tests.js +110 -153
- package/dist/scripts/dsh-runtime-closure.js +75 -63
- package/dist/scripts/dsh-session-v3-migration-proof.js +106 -0
- package/dist/scripts/dsh-subprocess-local-proof.js +149 -0
- package/dist/scripts/dsh-target-closure-proof.js +178 -0
- package/dist/scripts/effect-tests.js +165 -552
- package/dist/scripts/engine-run.js +1 -3
- package/dist/scripts/engine-tests.js +16 -10
- package/dist/scripts/evaluation-cadence-tests.js +69 -242
- package/dist/scripts/evaluation-contract-tests.js +193 -499
- package/dist/scripts/extension-distribution-cli.js +19 -15
- package/dist/scripts/extension-distribution-tests.js +98 -211
- package/dist/scripts/extension-tests.js +366 -389
- package/dist/scripts/fact-gate-tests.js +725 -263
- package/dist/scripts/fixtures/extension-bridge-unref-child.mjs +21 -0
- package/dist/scripts/flight-hotel-anchor-363-registered-e2e.js +169 -0
- package/dist/scripts/flight-malformed-tests.js +159 -0
- package/dist/scripts/flyai-tests.js +325 -68
- package/dist/scripts/g5-guard-tests.js +131 -0
- package/dist/scripts/g5-guard.js +189 -0
- package/dist/scripts/gen-lunar-anchors.js +106 -0
- package/dist/scripts/gotry-backend-kernel-tests.js +79 -0
- package/dist/scripts/ground-transfer-tests.js +956 -0
- package/dist/scripts/hbcli-e2e-tests.js +71 -90
- package/dist/scripts/hbcli-live-optin-tests.js +96 -0
- package/dist/scripts/hbcli-release-contract-tests.js +122 -0
- package/dist/scripts/hbcli-tests.js +41 -115
- package/dist/scripts/health-watch-cli.js +42 -28
- package/dist/scripts/hotel-date-gate-tests.js +496 -0
- package/dist/scripts/hotelbyte-reconcile-tests.js +141 -0
- package/dist/scripts/hotelbyte-spawn-e2e-tests.js +373 -0
- package/dist/scripts/i18n-tests.js +16 -9
- package/dist/scripts/incident-tests.js +281 -87
- package/dist/scripts/issue-194-job-id-guard-tests.js +106 -0
- package/dist/scripts/issue-233-cancel-refund-commission-tests.js +392 -0
- package/dist/scripts/issue-271-liveness-tests.js +547 -0
- package/dist/scripts/issue-289-model-retry-real-tests.js +296 -0
- package/dist/scripts/issue-289-model-retry-tests.js +441 -0
- package/dist/scripts/issue-289-web-retry-e2e.js +630 -0
- package/dist/scripts/issue-338-home-city-e2e.js +577 -0
- package/dist/scripts/issue343-real-entry-e2e.js +160 -0
- package/dist/scripts/journey-tests.js +22 -27
- package/dist/scripts/kernel-manifest-evidence.js +109 -0
- package/dist/scripts/kernel-manifest-gate.js +126 -0
- package/dist/scripts/kernel-manifest-tests.js +212 -0
- package/dist/scripts/kernel-manifest-trace-entry.js +7 -0
- package/dist/scripts/kernel-manifest-trace-hook.mjs +28 -0
- package/dist/scripts/kernel-manifest.js +369 -0
- package/dist/scripts/ledger-repair-apply-tests.js +316 -0
- package/dist/scripts/ledger-repair-plan-tests.js +375 -0
- package/dist/scripts/ledger-tests.js +325 -340
- package/dist/scripts/ledger-workflow-crash.js +10 -20
- package/dist/scripts/map-tools-vendor-package-proof.js +206 -134
- package/dist/scripts/memory-capture-tests.js +242 -61
- package/dist/scripts/memory-decay-tests.js +18 -52
- package/dist/scripts/memory-lifecycle-tests.js +657 -0
- package/dist/scripts/memory-lifecycle.js +196 -0
- package/dist/scripts/memory-metrics.js +24 -12
- package/dist/scripts/memory-value-report.js +474 -222
- package/dist/scripts/memory-value-tests.js +328 -0
- package/dist/scripts/metrics-report-tests.js +62 -199
- package/dist/scripts/model-override-e2e.js +66 -105
- package/dist/scripts/nightly-evidence-tests.js +64 -89
- package/dist/scripts/nightly-evidence.js +108 -111
- package/dist/scripts/nudge-digest.js +39 -28
- package/dist/scripts/onboarding-tests.js +63 -88
- package/dist/scripts/opensky-check.js +18 -13
- package/dist/scripts/opensky-tests.js +28 -28
- package/dist/scripts/persona-surface-guard-tests.js +37 -12
- package/dist/scripts/pnpm-dsh-closure-proof.js +2 -5
- package/dist/scripts/policy-anchor-359-registered-e2e.js +214 -0
- package/dist/scripts/price-drift-tests.js +126 -227
- package/dist/scripts/price-drift-watch.js +209 -253
- package/dist/scripts/probe-poi-tests.js +52 -45
- package/dist/scripts/product-metrics.js +187 -273
- package/dist/scripts/publish-preverify.js +47 -41
- package/dist/scripts/realtime-pricing-tests.js +37 -76
- package/dist/scripts/replay-async.js +20 -18
- package/dist/scripts/replay-real.js +16 -18
- package/dist/scripts/replay.js +52 -82
- package/dist/scripts/session-attach-diagnose.js +16 -12
- package/dist/scripts/session-attach-poc.js +34 -37
- package/dist/scripts/session-benchmark.js +66 -147
- package/dist/scripts/session-dida-live-e2e.js +151 -0
- package/dist/scripts/session-extract-tests.js +14 -35
- package/dist/scripts/session-login.js +14 -13
- package/dist/scripts/session-tests.js +545 -583
- package/dist/scripts/sf-live-benchmark.js +92 -110
- package/dist/scripts/sf-live-cli-tests.js +2 -9
- package/dist/scripts/sf-soft-score-tests.js +19 -60
- package/dist/scripts/sf-summary-tests.js +149 -0
- package/dist/scripts/sf-summary.js +466 -84
- package/dist/scripts/skeleton-check.js +16 -14
- package/dist/scripts/skeleton-integration-test.js +11 -10
- package/dist/scripts/skills-contract-tests.js +51 -46
- package/dist/scripts/smoke-session-gate-tests.js +12 -20
- package/dist/scripts/smoke.js +541 -422
- package/dist/scripts/sponsor-reuse-tests.js +262 -0
- package/dist/scripts/state-cli-tests.js +226 -101
- package/dist/scripts/state-cli.js +549 -212
- package/dist/scripts/static-golden-tests.js +46 -180
- package/dist/scripts/time-eval-tests.js +210 -192
- package/dist/scripts/travel-timeline-tests.js +29 -93
- package/dist/scripts/turn-handoff-collect-tests.js +46 -93
- package/dist/scripts/turn-handoff-collect.js +71 -99
- package/dist/scripts/turn-policy-tests.js +28 -29
- package/dist/scripts/typed-contract-canary.js +77 -162
- package/dist/scripts/tz-resolver-sanity.js +50 -0
- package/dist/scripts/tz-resolver-tests.js +584 -0
- package/dist/scripts/unified-tests.js +23 -19
- package/dist/scripts/visa-policy-tests.js +31 -44
- package/dist/scripts/weather-tests.js +121 -543
- package/dist/scripts/wish-channel-gate-tests.js +29 -86
- package/dist/scripts/write-gate-tests.js +522 -0
- package/dist/scripts/z3-lifecycle-fault-tests.js +188 -0
- package/dist/scripts/z3-lifecycle-tests.js +170 -0
- package/dist/scripts/z3-race-repeat-tests.js +39 -0
- package/dist/scripts/z3-race-tests.js +18 -12
- package/dist/src/artifact-gate.js +652 -221
- package/dist/src/backend/kernel.js +91 -0
- package/dist/src/backend/modules/booking-copilot.js +55 -0
- package/dist/src/backend/modules/booking-executor.js +124 -0
- package/dist/src/backend/modules/session-search.js +194 -0
- package/dist/src/benchmark-agent-conformance.js +296 -262
- package/dist/src/benchmark-environment-bridge.js +298 -413
- package/dist/src/benchmark-headless-child-diagnostics.js +93 -100
- package/dist/src/benchmark-tool-isolation.js +94 -67
- package/dist/src/bookable-facts.js +299 -174
- package/dist/src/booking-saga.js +64 -120
- package/dist/src/booking-surface/availability-policy.js +443 -576
- package/dist/src/booking-surface/cancel-refund-commission.js +379 -0
- package/dist/src/booking-surface/contracts.js +24 -80
- package/dist/src/booking-surface/dsh-planner.js +510 -281
- package/dist/src/booking-surface/dsh-plugin.js +17 -1
- package/dist/src/booking-surface/error-codes.js +82 -10
- package/dist/src/booking-surface/index.js +0 -3
- package/dist/src/booking-surface/profile.js +10 -54
- package/dist/src/booking-surface/recovery-chain.js +367 -0
- package/dist/src/booking-surface/runtime.js +765 -891
- package/dist/src/booking-surface/server.js +200 -251
- package/dist/src/booking-surface/startup.js +58 -54
- package/dist/src/booking-surface/validation.js +150 -218
- package/dist/src/bridge.js +20 -13
- package/dist/src/companions.js +48 -74
- package/dist/src/contracts.js +21 -43
- package/dist/src/dsh-llm.js +82 -120
- package/dist/src/engine.js +253 -239
- package/dist/src/evaluation-cadence.js +72 -209
- package/dist/src/evaluation-contracts.js +220 -843
- package/dist/src/flight-pack-adapter.js +54 -0
- package/dist/src/flight-pack-contract.js +2 -0
- package/dist/src/gotry-backend.js +70 -0
- package/dist/src/hotel-date-gate.js +118 -0
- package/dist/src/i18n.js +18 -7
- package/dist/src/index.js +1425 -1629
- package/dist/src/journey.js +132 -81
- package/dist/src/ledger-repair-apply.js +538 -0
- package/dist/src/ledger-repair-plan.js +463 -0
- package/dist/src/loop.js +257 -166
- package/dist/src/memory-capture.js +180 -32
- package/dist/src/memory-decay.js +30 -14
- package/dist/src/memory-lifecycle.js +1310 -0
- package/dist/src/memory-utility.js +27 -40
- package/dist/src/mock-llm.js +36 -61
- package/dist/src/model.js +81 -36
- package/dist/src/realtime-pricing.js +63 -72
- package/dist/src/slot-spec.js +84 -106
- package/dist/src/state-ledger.js +310 -471
- package/dist/src/subagent-job-id-guard.js +58 -0
- package/dist/src/time-anchor.js +231 -33
- package/dist/src/tool-packet.js +20 -8
- package/dist/src/travel-slots.js +58 -35
- package/dist/src/travel-timeline.js +44 -63
- package/dist/src/turn-deadline.js +121 -127
- package/dist/src/turn-policy.js +61 -89
- package/dist/src/tz-resolver.js +143 -0
- package/dist/src/unified.js +504 -381
- package/dist/src/wish-pool.js +39 -14
- package/dist/src/write-gate.js +495 -0
- package/dist/src/z3-shared.js +273 -7
- package/extension/README.md +4 -3
- package/extension/background.js +125 -14
- package/extension/content-bridge.js +23 -1
- package/extension/content-main.js +15 -4
- package/extension/manifest.json +16 -8
- package/package.json +251 -220
- package/ts/capabilities/agent-reach.ts +4 -4
- package/ts/capabilities/anything.ts +1 -1
- package/ts/capabilities/artifacts.ts +46 -9
- package/ts/capabilities/flyai.ts +156 -37
- package/ts/capabilities/hbcli.ts +1 -1
- package/ts/capabilities/incident-log.ts +88 -59
- package/ts/capabilities/session/adapters/ctrip-flight.ts +99 -36
- package/ts/capabilities/session/adapters/dida-portal.ts +250 -0
- package/ts/capabilities/session/adapters/rail-12306.ts +123 -24
- package/ts/capabilities/session/extension-bridge.ts +226 -101
- package/ts/capabilities/session/extension-channel.ts +22 -9
- package/ts/capabilities/session/wizard.ts +2 -2
- package/ts/capabilities/session-consent.ts +98 -14
- package/ts/capabilities/session-login.ts +1 -0
- package/ts/capabilities/session-search.ts +315 -31
- package/ts/dsh-runtime/vendor/README.md +8 -4
- package/ts/dsh-runtime/vendor/dsh-map-tools/README.en.md +7 -1
- package/ts/dsh-runtime/vendor/dsh-map-tools/README.md +5 -3
- package/ts/dsh-runtime/vendor/dsh-map-tools/lib/settings-ns.js +1 -1
- package/ts/dsh-runtime/vendor/dsh-map-tools/lib/types/settings-ns.d.ts +1 -1
- package/ts/dsh-runtime/vendor/dsh-map-tools/package.json +6 -6
- package/ts/package.json +236 -16
- package/ts/scripts/map-tools-vendor-package-proof.ts +152 -31
- package/ts/scripts/state-cli.ts +418 -51
- package/ts/src/artifact-gate.ts +561 -15
- package/ts/src/benchmark-environment-bridge.ts +37 -20
- package/ts/src/bookable-facts.ts +183 -7
- package/ts/src/booking-surface/cancel-refund-commission.ts +488 -0
- package/ts/src/booking-surface/dsh-planner.ts +240 -32
- package/ts/src/booking-surface/dsh-plugin.js +17 -1
- package/ts/src/booking-surface/error-codes.ts +75 -0
- package/ts/src/booking-surface/recovery-chain.ts +409 -0
- package/ts/src/booking-surface/server.ts +84 -51
- package/ts/src/booking-surface/validation.ts +2 -0
- package/ts/src/contracts.ts +12 -2
- package/ts/src/dsh-llm.ts +4 -8
- package/ts/src/index.ts +609 -90
- package/ts/src/loop.ts +116 -7
- package/ts/src/memory-capture.ts +227 -3
- package/ts/src/mock-llm.ts +4 -8
- package/ts/src/model.ts +88 -2
- package/ts/src/state-ledger.ts +47 -29
- package/ts/src/subagent-job-id-guard.ts +72 -0
- package/ts/src/time-anchor.ts +217 -13
- package/ts/src/unified.ts +316 -54
package/ts/src/unified.ts
CHANGED
|
@@ -7,10 +7,12 @@
|
|
|
7
7
|
|
|
8
8
|
import { checkConnectivity } from '../scripts/skeleton-check.ts'
|
|
9
9
|
import type { Candidate, Choice, MotivationProfile, Service, TransferMode, TravelRequest, TrueCost } from './model.ts'
|
|
10
|
-
import { evaluateChoice, minToHhmm, hhmmToMin, requiredUsableHours, trueCostToDict, LATEST_ARRIVE_STAY_MIN } from './model.ts'
|
|
10
|
+
import { evaluateChoice, minToHhmm, hhmmToMin, requiredUsableHours, trueCostToDict, LATEST_ARRIVE_STAY_MIN, doorToDoorFromMove, NonpositiveDurationError } from './model.ts'
|
|
11
11
|
import type { LegReport } from './journey.ts'
|
|
12
12
|
import { withZ3 } from './z3-shared.ts'
|
|
13
13
|
import { t as i18nT } from './i18n.ts'
|
|
14
|
+
import { resolveOffsetForLocalDate, describeResolveFailure, isKnownZoneLoose, readWallParts, wallPartsToIso } from './tz-resolver.ts'
|
|
15
|
+
import { FLIGHT_PACK_VERSION } from './flight-pack-contract.ts'
|
|
14
16
|
|
|
15
17
|
export interface AnchorsSpec {
|
|
16
18
|
arriveByMin?: number
|
|
@@ -36,6 +38,9 @@ export interface MoveSpecTS {
|
|
|
36
38
|
tzOffsetMin?: number
|
|
37
39
|
/** M-1:出发地 UTC 偏移(工作窗口换算用) */
|
|
38
40
|
originTzOffsetMin?: number
|
|
41
|
+
/** Issue #343 v2:dep/arr 的 IANA zone(从 option.date + 服务 HH:MM 解析;只读镜像,不算术)。 */
|
|
42
|
+
ianaDepZone?: string
|
|
43
|
+
ianaArrZone?: string
|
|
39
44
|
}
|
|
40
45
|
|
|
41
46
|
/** M-1:旅行者工作窗口(家时区) */
|
|
@@ -44,6 +49,14 @@ export interface WorkWindowSpec {
|
|
|
44
49
|
startMin: number
|
|
45
50
|
endMin: number
|
|
46
51
|
workdays?: number[]
|
|
52
|
+
/** Issue #343 v2:home IANA zone;overrides numeric `homeTzOffsetMin` when set.
|
|
53
|
+
* Used by `workWindowBlocks` to derive a date-sensitive home offset instead of a
|
|
54
|
+
* single numeric per-trip shift(原 M-1 数值写法).Mutually exclusive with
|
|
55
|
+
* `homeTzOffsetMin` at v2 parse time;不在同一 pack 里同时给两值。 */
|
|
56
|
+
homeZone?: string
|
|
57
|
+
/** Issue #343 v2:可选,home 工作窗口的本地表达(hh:mm);缺省回退 start/end 的 min-of-day。 */
|
|
58
|
+
startHHmm?: string
|
|
59
|
+
endHHmm?: string
|
|
47
60
|
}
|
|
48
61
|
|
|
49
62
|
export interface StaySpecTS {
|
|
@@ -57,6 +70,8 @@ export interface StaySpecTS {
|
|
|
57
70
|
export interface SegmentOptionTS {
|
|
58
71
|
id: string
|
|
59
72
|
label: string
|
|
73
|
+
/** 候选级日期;缺省时使用所属 segment.date */
|
|
74
|
+
date?: string
|
|
60
75
|
move?: MoveSpecTS
|
|
61
76
|
stay?: StaySpecTS
|
|
62
77
|
score?: number
|
|
@@ -85,6 +100,8 @@ export interface JourneySpecTS {
|
|
|
85
100
|
workWindow?: WorkWindowSpec
|
|
86
101
|
/** 骨架层开关(§7-1):true 时对带 route 提示的段做通航性三值标注 */
|
|
87
102
|
skeletonHub?: boolean
|
|
103
|
+
/** Internal only; symbol-keyed so JSON/public tool schemas never expose pack version. */
|
|
104
|
+
readonly [FLIGHT_PACK_VERSION]?: 1 | 2
|
|
88
105
|
}
|
|
89
106
|
|
|
90
107
|
// Z3 运行时收敛到 z3-shared(单一 WASM 实例 + 单一 Context + 会话级互斥)——
|
|
@@ -109,6 +126,7 @@ export function segmentsFromCandidate(req: TravelRequest, candidates: Candidate[
|
|
|
109
126
|
const options: SegmentOptionTS[] = candidates.map(c => ({
|
|
110
127
|
id: c.id,
|
|
111
128
|
label: c.name,
|
|
129
|
+
date: c.date,
|
|
112
130
|
score: c.imageryMatch,
|
|
113
131
|
bestMonths: c.bestMonths,
|
|
114
132
|
minDays: c.minDaysForPurpose,
|
|
@@ -144,6 +162,17 @@ export function segmentsFromCandidate(req: TravelRequest, candidates: Candidate[
|
|
|
144
162
|
}
|
|
145
163
|
|
|
146
164
|
export function parseFlightPackToSpec(pack: Record<string, unknown>): JourneySpecTS {
|
|
165
|
+
// Issue #343 v2:IANA path;v1(无 version 字段或 version===1)走原数值口径。
|
|
166
|
+
const version = pack['version'] === undefined ? 1 : Number(pack['version'])
|
|
167
|
+
if (version === 2) return parseFlightPackToSpecV2(pack)
|
|
168
|
+
if (version !== 1) {
|
|
169
|
+
throw Object.assign(new Error(`parseFlightPackToSpec: unsupported pack version ${version}`), { code: 'unsupported_pack_version' })
|
|
170
|
+
}
|
|
171
|
+
return parseFlightPackToSpecV1(pack)
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
/** v1 数值口径(path 保留为 export,便于 §7-1/§6 直接复用与差分) */
|
|
175
|
+
export function parseFlightPackToSpecV1(pack: Record<string, unknown>): JourneySpecTS {
|
|
147
176
|
const legs = (pack['legs'] as Array<Record<string, unknown>>).map(l => ({
|
|
148
177
|
id: String(l['id']),
|
|
149
178
|
role: ((l['services'] as unknown[]).length === 1 ? 'fixed' : 'choice') as 'fixed' | 'choice',
|
|
@@ -177,6 +206,7 @@ export function parseFlightPackToSpec(pack: Record<string, unknown>): JourneySpe
|
|
|
177
206
|
endMin: Number(ww['end_min']),
|
|
178
207
|
workdays: (ww['workdays'] as number[] | undefined) ?? [0, 1, 2, 3, 4],
|
|
179
208
|
} : undefined,
|
|
209
|
+
[FLIGHT_PACK_VERSION]: 1,
|
|
180
210
|
}
|
|
181
211
|
// M-1:班次的星期标注挂到 Option(缺省=不受工作窗口约束)
|
|
182
212
|
for (const l of pack['legs'] as Array<Record<string, unknown>>) {
|
|
@@ -191,33 +221,235 @@ export function parseFlightPackToSpec(pack: Record<string, unknown>): JourneySpe
|
|
|
191
221
|
return spec
|
|
192
222
|
}
|
|
193
223
|
|
|
224
|
+
/** Issue #343 v2:IANA zone + 当地日期解析;数值 tz_* 字段不可用(混合形态解析时拒收)。 */
|
|
225
|
+
export function parseFlightPackToSpecV2(pack: Record<string, unknown>): JourneySpecTS {
|
|
226
|
+
const legsRaw = pack['legs'] as Array<Record<string, unknown>>
|
|
227
|
+
if (!Array.isArray(legsRaw) || legsRaw.length === 0) {
|
|
228
|
+
throw Object.assign(new Error('parseFlightPackToSpecV2: legs missing/empty'), { code: 'v2_legs_missing' })
|
|
229
|
+
}
|
|
230
|
+
const meta = (pack['meta'] ?? {}) as Record<string, unknown>
|
|
231
|
+
const ww = meta['work_window'] as Record<string, unknown> | undefined
|
|
232
|
+
|
|
233
|
+
const legs: SegmentTS[] = []
|
|
234
|
+
for (const l of legsRaw) {
|
|
235
|
+
// v2 不允许混合数值 tz_offset_min/origin_tz_offset_min(早 fail)
|
|
236
|
+
if ('tz_offset_min' in l || 'origin_tz_offset_min' in l) {
|
|
237
|
+
throw Object.assign(new Error(`parseFlightPackToSpecV2: leg ${l['id']} has legacy tz_offset_min/origin_tz_offset_min;v2 pack must use iana_*_zone + *_local_date`), { code: 'v2_legacy_offset_mixed' })
|
|
238
|
+
}
|
|
239
|
+
const legDate = l['date'] ? String(l['date']) : ''
|
|
240
|
+
if (!/^\d{4}-\d{2}-\d{2}$/.test(legDate)) {
|
|
241
|
+
throw Object.assign(new Error(`parseFlightPackToSpecV2: leg ${l['id']} requires ISO date`), { code: 'v2_leg_date_missing' })
|
|
242
|
+
}
|
|
243
|
+
const ianaDepZone = String(l['iana_dep_zone'] ?? '')
|
|
244
|
+
const ianaArrZone = String(l['iana_arr_zone'] ?? '')
|
|
245
|
+
if (!ianaDepZone || !ianaArrZone) {
|
|
246
|
+
throw Object.assign(new Error(`parseFlightPackToSpecV2: leg ${l['id']} needs iana_dep_zone and iana_arr_zone`), { code: 'v2_zone_missing' })
|
|
247
|
+
}
|
|
248
|
+
const options: SegmentOptionTS[] = (l['services'] as Array<Record<string, unknown>>).map(sv => {
|
|
249
|
+
const svcDepDate = sv['dep_local_date'] ? String(sv['dep_local_date']) : legDate
|
|
250
|
+
const svcArrDate = sv['arr_local_date'] ? String(sv['arr_local_date']) : legDate
|
|
251
|
+
const depZone = sv['iana_dep_zone'] ? String(sv['iana_dep_zone']) : ianaDepZone
|
|
252
|
+
const arrZone = sv['iana_arr_zone'] ? String(sv['iana_arr_zone']) : ianaArrZone
|
|
253
|
+
const depR = resolveOffsetForLocalDate(depZone, svcDepDate, String(sv['dep']))
|
|
254
|
+
if (!depR.ok) {
|
|
255
|
+
throw Object.assign(new Error(`parseFlightPackToSpecV2: dep zone/date failure: ${describeResolveFailure(depR)}`), { code: 'v2_dep_resolve_failed' })
|
|
256
|
+
}
|
|
257
|
+
const arrR = resolveOffsetForLocalDate(arrZone, svcArrDate, String(sv['arr']))
|
|
258
|
+
if (!arrR.ok) {
|
|
259
|
+
throw Object.assign(new Error(`parseFlightPackToSpecV2: arr zone/date failure: ${describeResolveFailure(arrR)}`), { code: 'v2_arr_resolve_failed' })
|
|
260
|
+
}
|
|
261
|
+
// Issue #343 root 复核:d2d canonical 输入必须在 parse 边界校验严格 chronologically after,
|
|
262
|
+
// 否则把病态数据喂给 model.doorToDoorFromMove → throw NonpositiveDurationError → 被
|
|
263
|
+
// solveUnified WASM guard 误报为 wasm_runtime_error。
|
|
264
|
+
if (arrR.utcMs <= depR.utcMs) {
|
|
265
|
+
throw Object.assign(new Error(
|
|
266
|
+
`parseFlightPackToSpecV2: service ${String(sv['id'])} arrival instant (${new Date(arrR.utcMs).toISOString()}) must be strictly after departure instant (${new Date(depR.utcMs).toISOString()})`,
|
|
267
|
+
), { code: 'v2_arr_not_after_dep' })
|
|
268
|
+
}
|
|
269
|
+
// tzOffsetMin = arr - dep(positive = 抵达地更靠东)
|
|
270
|
+
const tzOffsetMin = arrR.offsetMin - depR.offsetMin
|
|
271
|
+
return {
|
|
272
|
+
id: String(sv['id']),
|
|
273
|
+
label: `${String(sv['id'])} ${String(l['note'] ?? '').slice(0, 18)}`,
|
|
274
|
+
date: svcDepDate,
|
|
275
|
+
move: {
|
|
276
|
+
hub: String(l['hub'] ?? ''),
|
|
277
|
+
services: [{
|
|
278
|
+
id: String(sv['id']),
|
|
279
|
+
depMin: hhmmToMin(String(sv['dep'])),
|
|
280
|
+
arrMin: hhmmToMin(String(sv['arr'])),
|
|
281
|
+
priceCny: Number(sv['price_cny']),
|
|
282
|
+
// Issue #343 v2:把"墙上时刻"投影成真实 UTC instant 留给 evaluate / workWindow 用;
|
|
283
|
+
// d2d 公式走 (arrUtcMs - depUtcMs)/60000,跨日 / DST / 反向日界线都正确。
|
|
284
|
+
depUtcMs: depR.utcMs,
|
|
285
|
+
arrUtcMs: arrR.utcMs,
|
|
286
|
+
}],
|
|
287
|
+
bufferMin: Number(l['buffer_min']),
|
|
288
|
+
originTransferMin: Number(l['origin_transfer_min']),
|
|
289
|
+
destTransferMin: Number(l['dest_transfer_min']),
|
|
290
|
+
redEye: Boolean(l['red_eye']),
|
|
291
|
+
redEyeDurationMin: Number(sv['red_eye_duration_min'] ?? l['red_eye_duration_min'] ?? 0),
|
|
292
|
+
groundRecoveryMin: l['ground_recovery_min'] ? Number(l['ground_recovery_min']) : undefined,
|
|
293
|
+
tzOffsetMin,
|
|
294
|
+
originTzOffsetMin: depR.offsetMin,
|
|
295
|
+
ianaDepZone: depZone,
|
|
296
|
+
ianaArrZone: arrZone,
|
|
297
|
+
},
|
|
298
|
+
depWeekday: weekdayFromYmd(svcDepDate),
|
|
299
|
+
}
|
|
300
|
+
})
|
|
301
|
+
|
|
302
|
+
const role = ((l['services'] as unknown[]).length === 1 ? 'fixed' : 'choice') as 'fixed' | 'choice'
|
|
303
|
+
legs.push({
|
|
304
|
+
id: String(l['id']),
|
|
305
|
+
role,
|
|
306
|
+
note: l['note'] ? String(l['note']) : undefined,
|
|
307
|
+
date: legDate,
|
|
308
|
+
anchors: { arriveByMin: l['arrive_by'] ? hhmmToMin(String(l['arrive_by'])) : undefined },
|
|
309
|
+
route: routeHint(l['id'] as string),
|
|
310
|
+
options,
|
|
311
|
+
})
|
|
312
|
+
}
|
|
313
|
+
|
|
314
|
+
// work_window:home_zone 必需(v2 的 home 偏移走 IANA,数值字段不再权威);同时给两值报 reject。
|
|
315
|
+
let workWindow: WorkWindowSpec | undefined
|
|
316
|
+
if (ww) {
|
|
317
|
+
const hasHomeZone = Boolean(ww['home_zone'])
|
|
318
|
+
const hasHomeNum = ww['home_tz_offset_min'] !== undefined
|
|
319
|
+
if (hasHomeZone && hasHomeNum) {
|
|
320
|
+
throw Object.assign(new Error('parseFlightPackToSpecV2: work_window cannot combine home_zone and home_tz_offset_min'), { code: 'v2_ww_conflict' })
|
|
321
|
+
}
|
|
322
|
+
if (!hasHomeZone) {
|
|
323
|
+
throw Object.assign(new Error('parseFlightPackToSpecV2: work_window.home_zone is required for v2'), { code: 'v2_ww_home_zone_required' })
|
|
324
|
+
}
|
|
325
|
+
// 在 v2 parse 边界即时验证 home_zone 是已知 IANA zone(root counterexample #3:不许 fail-open)。
|
|
326
|
+
// 用 tz-resolver 的 isKnownZoneLoose:接受 Intl.DateTimeFormat 能识别的合法 alias(US/Pacific / ROK / Etc/GMT+8)。
|
|
327
|
+
const homeZone = String(ww['home_zone'])
|
|
328
|
+
if (!isKnownZoneLoose(homeZone)) {
|
|
329
|
+
throw Object.assign(new Error(`parseFlightPackToSpecV2: work_window.home_zone '${homeZone}' is not a known IANA zone`), { code: 'v2_home_zone_unknown' })
|
|
330
|
+
}
|
|
331
|
+
const startHHmm = ww['start'] ? String(ww['start']) : undefined
|
|
332
|
+
const endHHmm = ww['end'] ? String(ww['end']) : undefined
|
|
333
|
+
const startMin = ww['start_min'] !== undefined ? Number(ww['start_min']) : (startHHmm ? hhmmToMin(startHHmm) : hhmmToMin('10:00'))
|
|
334
|
+
const endMin = ww['end_min'] !== undefined ? Number(ww['end_min']) : (endHHmm ? hhmmToMin(endHHmm) : hhmmToMin('19:00'))
|
|
335
|
+
// numeric homeTzOffsetMin 仅占位:在 v2 工作窗口过滤时按 home_zone + dep_date 重算;预填 leg-date 占位 0
|
|
336
|
+
workWindow = {
|
|
337
|
+
homeTzOffsetMin: 0,
|
|
338
|
+
startMin,
|
|
339
|
+
endMin,
|
|
340
|
+
workdays: (ww['workdays'] as number[] | undefined) ?? [0, 1, 2, 3, 4],
|
|
341
|
+
homeZone,
|
|
342
|
+
startHHmm,
|
|
343
|
+
endHHmm,
|
|
344
|
+
}
|
|
345
|
+
}
|
|
346
|
+
|
|
347
|
+
return { segments: legs, workWindow, [FLIGHT_PACK_VERSION]: 2 }
|
|
348
|
+
}
|
|
349
|
+
|
|
194
350
|
const WEEKDAY_IDX: Record<string, number> = { mon: 0, tue: 1, wed: 2, thu: 3, fri: 4, sat: 5, sun: 6 }
|
|
195
351
|
const WEEKDAY_CN: Record<string, string> = { mon: '一', tue: '二', wed: '三', thu: '四', fri: '五', sat: '六', sun: '日' }
|
|
196
352
|
|
|
197
|
-
/**
|
|
353
|
+
/** YYYY-MM-DD → mon/tue/wed/thu/fri/sat/sun;v2 路径给 option 标 depWeekday 用。 */
|
|
354
|
+
export function weekdayFromYmd(ymd: string): string {
|
|
355
|
+
const m = ymd.match(/^(\d{4})-(\d{2})-(\d{2})$/)
|
|
356
|
+
if (!m) throw new Error(`weekdayFromYmd: bad ymd ${ymd}`)
|
|
357
|
+
const dow = new Date(Date.UTC(Number(m[1]), Number(m[2]) - 1, Number(m[3]))).getUTCDay()
|
|
358
|
+
return ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'][dow]!
|
|
359
|
+
}
|
|
360
|
+
|
|
361
|
+
/** M-1:工作日的工作窗口内起飞 → 排除理由;否则 null(与 py _work_window_blocks 对齐)。
|
|
362
|
+
*
|
|
363
|
+
* Issue #343 v2:home zone 存在时,必须把"出发真实 UTC instant"投影到 home zone
|
|
364
|
+
* 取该 zone 的 date/weekday/HH:MM(root counterexample #2:Tokyo 06:30 ≈ LA 14:30 prev day);
|
|
365
|
+
* 不再用 dep-local date 直接当 home date。
|
|
366
|
+
*
|
|
367
|
+
* root 评审复核:`depUtcMs` 是已知确定的 instant,直接 `readWallParts(homeZone, depUtcMs)`
|
|
368
|
+
* 取墙时分量 — 不要把 projected wall time 再喂给 `resolveOffsetForLocalDate` 重做 ±14h 扫描,
|
|
369
|
+
* 否则秋回退日 01:30 会被错误判为 overlap_ambiguous 而 fail-open(已知 instant 永远唯一)。
|
|
370
|
+
*
|
|
371
|
+
* dep/arr 的"墙上本地输入"(leg-level `dep`/`arr` 字段)由 parseFlightPackToSpecV2 在
|
|
372
|
+
* 解析时已用 `resolveOffsetForLocalDate` 拒过 gap/overlap,所以 leg 进 solver 时
|
|
373
|
+
* 两个 instant 一定 strict-after 且偏移已知。
|
|
374
|
+
*
|
|
375
|
+
* home zone 未知时由 v2 parse 边界直接抛 v2_home_zone_unknown 拒绝;
|
|
376
|
+
* 这里兜底只在 v1 legacy 路径出现。
|
|
377
|
+
*/
|
|
198
378
|
function workWindowBlocks(spec: JourneySpecTS, option: SegmentOptionTS): string | null {
|
|
199
379
|
const ww = spec.workWindow
|
|
200
380
|
if (!ww || !option.move || !option.depWeekday) return null
|
|
201
|
-
|
|
202
|
-
const
|
|
203
|
-
const
|
|
204
|
-
const
|
|
205
|
-
|
|
381
|
+
|
|
382
|
+
const svc = option.move.services[0]
|
|
383
|
+
const dep = svc.depMin
|
|
384
|
+
const homeZone = ww.homeZone
|
|
385
|
+
|
|
386
|
+
let homeOffsetMin = ww.homeTzOffsetMin
|
|
387
|
+
let homeDepMin: number | undefined
|
|
388
|
+
let homeDepWeekday: string | undefined
|
|
389
|
+
|
|
390
|
+
if (homeZone) {
|
|
391
|
+
if (typeof svc.depUtcMs !== 'number') {
|
|
392
|
+
// v2 路径必然填了 depUtcMs;没填 = 数据病,按 red flag 排除该 option。
|
|
393
|
+
return i18nT('un.workwindow_unresolvable_reason', {
|
|
394
|
+
reason: `home zone ${homeZone} requires UTC dep instant (v2 path bug)`,
|
|
395
|
+
})
|
|
396
|
+
}
|
|
397
|
+
// 已知 instant 直接投影到 home zone 的墙时 — 无歧义,不必也不应重走 ±14h 扫描。
|
|
398
|
+
const homeParts = readWallParts(homeZone, svc.depUtcMs)
|
|
399
|
+
const homeIso = wallPartsToIso(homeParts)
|
|
400
|
+
homeDepMin = hhmmToMin(homeIso.hhmm)
|
|
401
|
+
homeDepWeekday = weekdayFromYmd(homeIso.ymd)
|
|
402
|
+
}
|
|
403
|
+
|
|
404
|
+
const effectiveDep = homeDepMin ?? dep
|
|
405
|
+
const effectiveWeekday = homeDepWeekday ?? option.depWeekday
|
|
406
|
+
if (!((ww.workdays ?? [0, 1, 2, 3, 4]).includes(WEEKDAY_IDX[effectiveWeekday]))) return null
|
|
407
|
+
|
|
408
|
+
// v2:startMin/endMin 与 homeDepMin 都是 home-zone 墙时分量(已 IANA 归一),
|
|
409
|
+
// 直接比较;不再做 originTzOffsetMin 偏移(root 复核该 shift 是 v1 数值残留,会让窗口错位)。
|
|
410
|
+
// v1 路径(无 homeZone, 走数值 homeTzOffsetMin)保留 shift 兼容旧 spec。
|
|
411
|
+
let start: number, end: number
|
|
412
|
+
if (homeZone) {
|
|
413
|
+
start = ww.startMin
|
|
414
|
+
end = ww.endMin
|
|
415
|
+
} else {
|
|
416
|
+
const shift = (option.move.originTzOffsetMin ?? 480) - homeOffsetMin
|
|
417
|
+
start = ww.startMin + shift
|
|
418
|
+
end = ww.endMin + shift
|
|
419
|
+
}
|
|
420
|
+
if (start <= effectiveDep && effectiveDep <= end) {
|
|
206
421
|
const hhmm = (m: number) => `${String(Math.floor(m / 60)).padStart(2, '0')}:${String(m % 60).padStart(2, '0')}`
|
|
207
422
|
return i18nT('un.workwindow_reason', {
|
|
208
|
-
wd: WEEKDAY_CN[
|
|
423
|
+
wd: WEEKDAY_CN[effectiveWeekday] ?? '', dep: hhmm(effectiveDep), start: hhmm(start), end: hhmm(end),
|
|
209
424
|
})
|
|
210
425
|
}
|
|
211
426
|
return null
|
|
212
427
|
}
|
|
213
428
|
|
|
214
|
-
/** D-5:时区感知的段核算(与 py unified._evaluate_option_move 对齐)。
|
|
429
|
+
/** D-5:时区感知的段核算(与 py unified._evaluate_option_move 对齐)。
|
|
430
|
+
*
|
|
431
|
+
* Issue #343 d2d 算术唯一权威入口 = model.ts 的 `doorToDoorFromMove`。
|
|
432
|
+
* v2 路径会传 Service.depUtcMs/arrUtcMs(由 parseFlightPackToSpecV2 用 tz-resolver 投出),
|
|
433
|
+
* 此时 d2d 用真实 UTC instant 差 — 跨日 / 反向日界线 / DST 切换都正确;v2 arr<=dep 抛
|
|
434
|
+
* NonpositiveDurationError → 该 option 当作不可行(由 solveUnifiedInner 转 unsat_core)。
|
|
435
|
+
* v1 数值口径无 UTC 字段,走老 (arrMin - depMin) - tzOffsetMin;字节不变。
|
|
436
|
+
*/
|
|
215
437
|
function evaluateOptionMove(segId: string, mv: MoveSpecTS): LegReport & { d2d_min?: number } {
|
|
216
438
|
const svc = mv.services[0]
|
|
439
|
+
let d2dMin: number
|
|
440
|
+
try {
|
|
441
|
+
d2dMin = doorToDoorFromMove(svc, mv).doorToDoorMin
|
|
442
|
+
} catch (e) {
|
|
443
|
+
if (e instanceof NonpositiveDurationError) {
|
|
444
|
+
// d2d 病态输入 → 把这条 option 抛红 flag;这里走结构化 reject 而非吞错。
|
|
445
|
+
throw Object.assign(new Error(`evaluateOptionMove ${segId}/${svc.id}: ${e.message}`), {
|
|
446
|
+
code: e.code,
|
|
447
|
+
kind: e.kind,
|
|
448
|
+
})
|
|
449
|
+
}
|
|
450
|
+
throw e
|
|
451
|
+
}
|
|
217
452
|
const wake = svc.depMin - mv.bufferMin - mv.originTransferMin
|
|
218
|
-
// 真实时长 = (到达−出发) − 时差;EK329: 215−(−240)=455min=7h35m
|
|
219
|
-
const trueFlight = (svc.arrMin - svc.depMin) - (mv.tzOffsetMin ?? 0)
|
|
220
|
-
const d2d = mv.bufferMin + mv.originTransferMin + trueFlight + mv.destTransferMin
|
|
221
453
|
const wakeDisplay = wake < 0 ? `${minToHhmm(wake + 1440)}(前一日)` : minToHhmm(wake)
|
|
222
454
|
const arriveStay = svc.arrMin + mv.destTransferMin
|
|
223
455
|
|
|
@@ -233,7 +465,7 @@ function evaluateOptionMove(segId: string, mv: MoveSpecTS): LegReport & { d2d_mi
|
|
|
233
465
|
if (wake < 5 * 60) energy -= 30
|
|
234
466
|
else if (wake < 6 * 60) energy -= 25
|
|
235
467
|
if (arriveStay > 21 * 60) energy -= 10
|
|
236
|
-
if (
|
|
468
|
+
if (d2dMin > 6 * 60) energy -= 10
|
|
237
469
|
energy = Math.max(0, energy)
|
|
238
470
|
}
|
|
239
471
|
return {
|
|
@@ -242,18 +474,22 @@ function evaluateOptionMove(segId: string, mv: MoveSpecTS): LegReport & { d2d_mi
|
|
|
242
474
|
wake: wakeDisplay,
|
|
243
475
|
wakeMin: wake,
|
|
244
476
|
arrive_stay: minToHhmm(arriveStay),
|
|
245
|
-
door_to_door: `${Math.floor(
|
|
246
|
-
d2d_min:
|
|
477
|
+
door_to_door: `${Math.floor(d2dMin / 60)}h${String(d2dMin % 60).padStart(2, '0')}m`,
|
|
478
|
+
d2d_min: d2dMin,
|
|
247
479
|
energy_pct: Math.round(energy),
|
|
248
480
|
price_cny: svc.priceCny,
|
|
249
481
|
}
|
|
250
482
|
}
|
|
251
483
|
|
|
484
|
+
function releaseZ3(resource: { release?: () => void } | null | undefined): void {
|
|
485
|
+
if (typeof resource?.release === 'function') resource.release()
|
|
486
|
+
}
|
|
487
|
+
|
|
252
488
|
/** 航班链形态求解:按 Option 选择,锚点命名约束,core 剥竖线(D-2 修复) */
|
|
253
489
|
export async function solveUnified(spec: JourneySpecTS): Promise<{
|
|
254
490
|
feasible: boolean
|
|
255
491
|
money_cny?: number
|
|
256
|
-
legs?: Array<LegReport & { leg: string }>
|
|
492
|
+
legs?: Array<LegReport & { leg: string; d2d_min?: number }>
|
|
257
493
|
red_flags?: string[]
|
|
258
494
|
unsat_core?: string[]
|
|
259
495
|
suggestions?: Array<{ relax: string; money_cny: number }>
|
|
@@ -273,7 +509,7 @@ export async function solveUnified(spec: JourneySpecTS): Promise<{
|
|
|
273
509
|
async function solveUnifiedInner(spec: JourneySpecTS): Promise<{
|
|
274
510
|
feasible: boolean
|
|
275
511
|
money_cny?: number
|
|
276
|
-
legs?: Array<LegReport & { leg: string }>
|
|
512
|
+
legs?: Array<LegReport & { leg: string; d2d_min?: number }>
|
|
277
513
|
red_flags?: string[]
|
|
278
514
|
unsat_core?: string[]
|
|
279
515
|
suggestions?: Array<{ relax: string; money_cny: number }>
|
|
@@ -345,50 +581,76 @@ async function solveUnifiedInner(spec: JourneySpecTS): Promise<{
|
|
|
345
581
|
}
|
|
346
582
|
|
|
347
583
|
const s = new Solver()
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
for (const seg of spec.segments) {
|
|
354
|
-
for (let i = 0; i < allSels[seg.id].length; i++) {
|
|
355
|
-
const v = await maybeAwait(model.eval(allSels[seg.id][i], true))
|
|
356
|
-
if (String(v) !== 'true') continue
|
|
357
|
-
const o = seg.options[i]
|
|
358
|
-
out.push({ leg: seg.id, ...evaluateOptionMove(seg.id, o.move!) })
|
|
359
|
-
break
|
|
360
|
-
}
|
|
584
|
+
let sOpen = true
|
|
585
|
+
const closeS = () => {
|
|
586
|
+
if (sOpen) {
|
|
587
|
+
releaseZ3(s)
|
|
588
|
+
sOpen = false
|
|
361
589
|
}
|
|
362
|
-
return out
|
|
363
|
-
}
|
|
364
|
-
|
|
365
|
-
async function maybeAwait<T>(v: T | Promise<T>): Promise<T> {
|
|
366
|
-
return v instanceof Promise ? await v : v
|
|
367
590
|
}
|
|
591
|
+
try {
|
|
592
|
+
for (const sel of Object.values(allSels)) s.add(exactlyOne(sel))
|
|
593
|
+
for (const [name, expr] of Object.entries(assertions)) s.addAndTrack(expr, name)
|
|
594
|
+
|
|
595
|
+
const report = async (model: any): Promise<Array<LegReport & { leg: string }>> => {
|
|
596
|
+
const out: Array<LegReport & { leg: string }> = []
|
|
597
|
+
for (const seg of spec.segments) {
|
|
598
|
+
for (let i = 0; i < allSels[seg.id].length; i++) {
|
|
599
|
+
const v = await maybeAwait(model.eval(allSels[seg.id][i], true))
|
|
600
|
+
if (String(v) !== 'true') continue
|
|
601
|
+
const o = seg.options[i]
|
|
602
|
+
out.push({ leg: seg.id, ...evaluateOptionMove(seg.id, o.move!) })
|
|
603
|
+
break
|
|
604
|
+
}
|
|
605
|
+
}
|
|
606
|
+
return out
|
|
607
|
+
}
|
|
368
608
|
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
const redFlags = legs
|
|
373
|
-
.filter(l => spec.segments.find(sg => sg.id === l.leg)?.options.some(o => o.move?.redEye) && l.energy_pct < 50)
|
|
374
|
-
.map(l => i18nT('un.redflag_redeye', { leg: l.leg, pct: l.energy_pct }))
|
|
375
|
-
return { feasible: true, money_cny: money, legs, red_flags: redFlags, work_window_exclusions: exclusions, skeleton_notes: skeletonNotes.length ? skeletonNotes : undefined }
|
|
376
|
-
}
|
|
609
|
+
async function maybeAwait<T>(v: T | Promise<T>): Promise<T> {
|
|
610
|
+
return v instanceof Promise ? await v : v
|
|
611
|
+
}
|
|
377
612
|
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
613
|
+
if (String(await s.check()) !== 'unsat') {
|
|
614
|
+
const model = s.model()
|
|
615
|
+
try {
|
|
616
|
+
const legs = await report(model)
|
|
617
|
+
const money = legs.reduce((a, l) => a + l.price_cny, 0)
|
|
618
|
+
const redFlags = legs
|
|
619
|
+
.filter(l => spec.segments.find(sg => sg.id === l.leg)?.options.some(o => o.move?.redEye) && l.energy_pct < 50)
|
|
620
|
+
.map(l => i18nT('un.redflag_redeye', { leg: l.leg, pct: l.energy_pct }))
|
|
621
|
+
return { feasible: true, money_cny: money, legs, red_flags: redFlags, work_window_exclusions: exclusions, skeleton_notes: skeletonNotes.length ? skeletonNotes : undefined }
|
|
622
|
+
} finally {
|
|
623
|
+
releaseZ3(model)
|
|
624
|
+
}
|
|
385
625
|
}
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
626
|
+
|
|
627
|
+
const core = coreOf(s).sort()
|
|
628
|
+
const suggestions: Array<{ relax: string; money_cny: number }> = []
|
|
629
|
+
closeS()
|
|
630
|
+
for (const name of core) {
|
|
631
|
+
const s2 = new Solver()
|
|
632
|
+
try {
|
|
633
|
+
for (const sel of Object.values(allSels)) s2.add(exactlyOne(sel))
|
|
634
|
+
for (const [n2, expr] of Object.entries(assertions)) {
|
|
635
|
+
if (n2 !== name) s2.addAndTrack(expr, n2)
|
|
636
|
+
}
|
|
637
|
+
if (String(await s2.check()) !== 'unsat') {
|
|
638
|
+
const model = s2.model()
|
|
639
|
+
try {
|
|
640
|
+
const legs = await report(model)
|
|
641
|
+
suggestions.push({ relax: name, money_cny: legs.reduce((a, l) => a + l.price_cny, 0) })
|
|
642
|
+
} finally {
|
|
643
|
+
releaseZ3(model)
|
|
644
|
+
}
|
|
645
|
+
}
|
|
646
|
+
} finally {
|
|
647
|
+
releaseZ3(s2)
|
|
648
|
+
}
|
|
389
649
|
}
|
|
650
|
+
return { feasible: false, unsat_core: core, suggestions }
|
|
651
|
+
} finally {
|
|
652
|
+
closeS()
|
|
390
653
|
}
|
|
391
|
-
return { feasible: false, unsat_core: core, suggestions }
|
|
392
654
|
})
|
|
393
655
|
}
|
|
394
656
|
|