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

package/dist/src/itinerary-html.js

@@ -0,0 +1,131 @@
+/**
+ * 行程 HTML 渲染器(issue #442,父 #438;共享契约层抽取见 issue #564)。
+ *
+ * 纯有界渲染器:拒绝畸形输入,产出单文件自包含 HTML。本模块不执行 IO、
+ * 不启动服务、不解析 Markdown、不做夜数/预算/时间运算——只把显式行程结构
+ * 与已注册事实投影成可导航、可展开的安全文档。
+ *
+ * 输入校验、事实归一化与证据卡渲染的单一事实源在 `itinerary-doc-shared.ts`
+ * (两个文档投影共用,防第二实现漂移);本模块只保留单页文档的排版与组装。
+ *
+ * 两条永不合流的证据面:
+ *   1. 计划面(planner:trip_start/trip_end/stays/od_segments)——用户排期意图;
+ *   2. 证据面(facts:调用方从注册表选出的 BookableFact)——exact-date 查询结论,
+ *      逐条保留 tier/bookability/source/query_id/fetched_at/as_of。
+ * 目的地级酒店库存绝不宣称「某家酒店有房/可订」;无任何整体 verified 徽章。
+ *
+ * 渲染闸锚点纪律:本模块不嵌入 `<!-- fact:<id> -->` 锚点(那属 Markdown 产物闸),
+ * 事实 id 只作为可见文本展示,避免整篇 HTML 被当作锚点行解析。
+ */
+import { DOC_BASE_CSS, DOC_NARROW_CSS, EVIDENCE_BOUNDARY_NOTICE, TWO_PLANE_STATEMENT, buildDateIndex, docBytesError, escapeHtml, factIdSlug, hotelFactsForStay, leftoverFacts, normalizeDocInput, renderDateList, renderFact, renderFactCountsLine, renderHotelEvidenceSection, renderHotelNote, renderLeftoverBlock, renderPlannedStay, renderPolicyNote, renderSegment, routeFactsFor, timeEl, } from './itinerary-doc-shared.js';
+// API 面稳定性:既有消费方(itinerary-artifact.ts / 测试)继续从本模块导入
+export { ITINERARY_DOC_LIMITS as ITINERARY_HTML_LIMITS } from './itinerary-doc-shared.js';
+// ---------------------------------------------------------------------------
+// 单页文档排版(组装共享层的内容原语;CSS 为本形态私有)
+// ---------------------------------------------------------------------------
+const CSS = DOC_BASE_CSS + `
+.wrap{max-width:64rem;margin:0 auto;padding:1rem}
+header.doc{border-bottom:1px solid var(--line);padding-bottom:.75rem}
+nav.toc{border:1px solid var(--line);border-radius:6px;padding:.6rem .8rem;margin:1rem 0;background:var(--card)}
+nav.toc h2{font-size:1rem}
+nav.toc ul{list-style:none;margin:0;padding:0;display:flex;flex-wrap:wrap;gap:.35rem .9rem}
+nav.toc ul ul{margin-left:.9rem;font-size:.92rem;display:block}
+section{margin:1.75rem 0}
+` + DOC_NARROW_CSS + `
+@media (max-width:480px){
+.wrap{padding:.6rem}
+}`;
+function render(input) {
+    const { title, itinerary, facts } = input;
+    const stays = itinerary.stays;
+    const segs = itinerary.od_segments;
+    const hotelFacts = facts.filter((f) => f.kind === 'hotel');
+    const policyFacts = facts.filter((f) => f.kind === 'policy');
+    const flightFacts = facts.filter((f) => f.kind === 'flight' || f.kind === 'train');
+    const stayBlocks = stays.map((stay, i) => renderPlannedStay(stay, `stay-${i + 1}`, hotelFactsForStay(hotelFacts, stay)));
+    const segBlocks = segs.map((seg, i) => renderSegment(seg, `seg-${i + 1}`, routeFactsFor(facts, seg), itinerary.trip_start));
+    const stayDateItems = stays.filter((s, i) => stays.findIndex(x => x.check_in === s.check_in) === i)
+        .map(s => `<li>${timeEl(s.check_in)} — <a href="#stay-${stays.indexOf(s) + 1}">计划住宿 ${escapeHtml(s.place)}</a></li>`)
+        .join('');
+    const segDateItems = [...new Set(segs.map(s => s.date))].sort()
+        .map(d => `<li>${timeEl(d)} — <a href="#segments">交通段</a></li>`)
+        .join('');
+    const dateList = renderDateList(buildDateIndex(itinerary));
+    const leftovers = leftoverFacts(facts, itinerary);
+    const leftoverBlock = renderLeftoverBlock(leftovers, itinerary.trip_start);
+    const hotelNote = renderHotelNote(hotelFacts);
+    const policyNote = renderPolicyNote(policyFacts);
+    return `<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="referrer" content="no-referrer">
+<title>${escapeHtml(title)}</title>
+<style>${CSS}</style>
+</head>
+<body>
+<a class="skip" href="#main">跳到主要内容</a>
+<div class="wrap">
+<header class="doc">
+<h1>${escapeHtml(title)}</h1>
+<p>行程 ${timeEl(itinerary.trip_start)} → ${timeEl(itinerary.trip_end)}</p>
+${TWO_PLANE_STATEMENT}
+</header>
+<main id="main">
+${EVIDENCE_BOUNDARY_NOTICE}
+<nav class="toc" aria-label="行程导航">
+<h2>导航</h2>
+<ul>
+<li><a href="#dates">按日期</a><ul>${dateList.startsWith('<p') ? '<li class="muted">无</li>' : ''}</ul></li>
+<li><a href="#segments">航班/交通段</a><ul>${segDateItems || '<li class="muted">无</li>'}</ul></li>
+<li><a href="#stays">住宿</a><ul>${stayDateItems || '<li class="muted">无</li>'}</ul></li>
+<li><a href="#facts">事实与证据</a></li>
+</ul>
+</nav>
+<section id="dates"><h2>按日期行程</h2>
+${dateList}
+</section>
+<section id="segments"><h2>航班/交通段</h2>
+<p class="muted">下列条目是计划段(用户排期意图);每段内另列可回溯到该 route + date 的已注册事实。计划段不因存在事实而变成可下单。</p>
+${segBlocks.join('') || '<p class="muted missing">没有显式交通段。</p>'}
+</section>
+<section id="stays"><h2>住宿</h2>
+${hotelNote}
+${stayBlocks.join('') || '<p class="muted missing">没有显式住宿段。</p>'}
+${renderHotelEvidenceSection(hotelFacts, itinerary.trip_start)}
+</section>
+<section id="facts"><h2>事实与证据</h2>
+${renderFactCountsLine(facts)}
+${policyFacts.map(f => renderFact(f, `policy-${factIdSlug(f.fact.fact_id)}`, itinerary.trip_start)).join('')}
+${policyNote}
+${leftoverBlock}
+<h3>全部航班/车次事实(含负事实与冲突)</h3>
+${flightFacts.map(f => renderFact(f, `flight-${factIdSlug(f.fact.fact_id)}`, itinerary.trip_start)).join('') || '<p class="muted missing">本次输入没有航班/车次事实。</p>'}
+</section>
+</main>
+</div>
+</body>
+</html>
+`;
+}
+// ---------------------------------------------------------------------------
+// 入口
+// ---------------------------------------------------------------------------
+/**
+ * 纯渲染入口。`input` 是任意运行时数据:结构、枚举、真实日历日期、有限数值、
+ * 容量与文档大小全部现场校验;任何一项不合法即返回 `ok:false` + 结构化 errors,
+ * 绝不静默丢弃核心行程后仍返回「成功」。校验与归一化的单一事实源在
+ * `itinerary-doc-shared.ts`,与 deck 投影共用同一拒绝语义。
+ */
+export function renderItineraryHtml(input) {
+    const normalized = normalizeDocInput(input);
+    if (!normalized.ok)
+        return normalized;
+    const html = render(normalized);
+    // 输出大小硬上限:超限即整体失败(检查实现于共享层)
+    const bytesError = docBytesError(html);
+    if (bytesError !== undefined)
+        return { ok: false, errors: bytesError };
+    return { ok: true, html };
+}

package/dist/src/journey.js

@@ -1,10 +1,16 @@
-import { init } from 'z3-solver';
+/**
+ * Multi-leg 行程引擎 TS 版(与 py/gotry_feasibility/journey.py 对齐;Python 为 oracle)。
+ * DEPRECATED(D-1 清偿):统一模型(unified.ts)是唯一求解入口;保留为兼容层与差分 oracle。
+ *
+ * 每 leg 选一个班次,锚点(arrive_by/depart_after/wake_floor)为命名约束;
+ * 无解读 unsat core,逐锚点放宽重解给方案。红眼段用睡眠模型
+ * (精力 = 30 + 8×睡眠小时,clamp 30-75)。
+ */
 import { hhmmToMin, minToHhmm } from './model.js';
-let z3Promise = null;
-async function getZ3() {
-    if (!z3Promise) z3Promise = (async ()=>(await init()).Context('main'))();
-    return z3Promise;
-}
+import { withZ3 } from './z3-shared.js';
+/* eslint-disable @typescript-eslint/no-explicit-any */
+// Z3 运行时收敛到 z3-shared(单一 WASM 实例 + 单一 Context + 会话级互斥);
+// 本模块自有 z3Promise 已删(见 unified.ts / engine.ts 同批迁移)。
 export function evaluateLeg(leg, svc) {
     const wake = svc.depMin - leg.bufferMin - leg.originTransferMin;
     const wakeDisplay = wake < 0 ? `${minToHhmm(wake + 1440)}(前一日)` : minToHhmm(wake);
@@ -14,12 +20,17 @@ export function evaluateLeg(leg, svc) {
     if (leg.redEye && (leg.redEyeDurationMin ?? 0) > 0) {
         const sleepH = ((leg.redEyeDurationMin ?? 0) - 60) / 60;
         energy = Math.max(30, Math.min(75, 30 + 8 * sleepH));
-    } else {
+    }
+    else {
         energy = 100 - 2 * 8;
-        if (wake < 5 * 60) energy -= 30;
-        else if (wake < 6 * 60) energy -= 25;
-        if (arriveStay > 21 * 60) energy -= 10;
-        if (d2d > 6 * 60) energy -= 10;
+        if (wake < 5 * 60)
+            energy -= 30;
+        else if (wake < 6 * 60)
+            energy -= 25;
+        if (arriveStay > 21 * 60)
+            energy -= 10;
+        if (d2d > 6 * 60)
+            energy -= 10;
         energy = Math.max(0, energy);
     }
     return {
@@ -30,118 +41,154 @@ export function evaluateLeg(leg, svc) {
         arrive_stay: minToHhmm(arriveStay),
         door_to_door: `${Math.floor(d2d / 60)}h${String(d2d % 60).padStart(2, '0')}m`,
         energy_pct: Math.round(energy),
-        price_cny: svc.priceCny
+        price_cny: svc.priceCny,
     };
 }
 function exactlyOne(z3, sels) {
     const { If, Sum, Int } = z3;
-    return Sum(...sels.map((s)=>If(s, Int.val(1), Int.val(0)))).eq(Int.val(1));
+    return Sum(...sels.map(s => If(s, Int.val(1), Int.val(0)))).eq(Int.val(1));
+}
+function releaseZ3(resource) {
+    if (typeof resource?.release === 'function')
+        resource.release();
 }
 export async function solveJourney(req) {
-    const z3 = await getZ3();
-    const { Bool, If, Sum, Int, Solver } = z3;
-    const wakeFloor = req.wakeFloorMin ?? hhmmToMin('06:00');
-    const allSels = {};
-    const assertions = {};
-    const legSpecs = req.legs;
-    for (const leg of legSpecs){
-        const sels = leg.services.map((_, i)=>Bool.const(`${leg.id}_s${i}`));
-        allSels[leg.id] = sels;
-        const pick = (attr)=>Sum(...sels.map((s, i)=>If(s, Int.val(leg.services[i][attr]), Int.val(0))));
-        const dep = pick('depMin'), arr = pick('arrMin'), price = pick('priceCny');
-        const wake = dep.sub(Int.val(leg.bufferMin + leg.originTransferMin));
-        const arriveStay = arr.add(Int.val(leg.destTransferMin));
-        if (leg.arriveByMin !== undefined) assertions[`${leg.id}:arrive_by`] = arriveStay.le(Int.val(leg.arriveByMin));
-        if (leg.departAfterMin !== undefined) assertions[`${leg.id}:depart_after`] = dep.ge(Int.val(leg.departAfterMin));
-        if (!leg.redEye) assertions[`${leg.id}:wake_floor`] = wake.ge(Int.val(wakeFloor));
-    }
-    const total = Sum(...legSpecs.flatMap((leg)=>allSels[leg.id].map((s, i)=>If(s, Int.val(leg.services[i].priceCny), Int.val(0)))));
-    if (req.budgetCny !== undefined) assertions['total:budget'] = total.le(Int.val(req.budgetCny));
-    const coreOf = (s)=>{
-        const v = s.unsatCore();
-        const out = [];
-        for(let i = 0; i < v.length(); i++){
-            out.push(String(v.get(i)).replace(/^\|/, '').replace(/\|$/, ''));
+    // 会话级互斥门:判定段从 here 到 return 独占共享实例,防同 Context 并发 unwind。
+    return withZ3('journey.solveJourney', async (z3) => {
+        const { Bool, If, Sum, Int, Solver } = z3;
+        const wakeFloor = req.wakeFloorMin ?? hhmmToMin('06:00');
+        const allSels = {};
+        const assertions = {};
+        const legSpecs = req.legs;
+        for (const leg of legSpecs) {
+            const sels = leg.services.map((_, i) => Bool.const(`${leg.id}_s${i}`));
+            allSels[leg.id] = sels;
+            const pick = (attr) => Sum(...sels.map((s, i) => If(s, Int.val(leg.services[i][attr]), Int.val(0))));
+            const dep = pick('depMin'), arr = pick('arrMin'), price = pick('priceCny');
+            const wake = dep.sub(Int.val(leg.bufferMin + leg.originTransferMin));
+            const arriveStay = arr.add(Int.val(leg.destTransferMin));
+            if (leg.arriveByMin !== undefined)
+                assertions[`${leg.id}:arrive_by`] = arriveStay.le(Int.val(leg.arriveByMin));
+            if (leg.departAfterMin !== undefined)
+                assertions[`${leg.id}:depart_after`] = dep.ge(Int.val(leg.departAfterMin));
+            if (!leg.redEye)
+                assertions[`${leg.id}:wake_floor`] = wake.ge(Int.val(wakeFloor));
         }
-        return out;
-    };
-    const extract = async (model)=>{
-        const chosen = new Map();
-        for (const leg of legSpecs){
-            for(let i = 0; i < allSels[leg.id].length; i++){
-                const v = await maybeAwait(model.eval(allSels[leg.id][i], true));
-                if (String(v) === 'true') chosen.set(leg.id, leg.services[i]);
+        const total = Sum(...legSpecs.flatMap(leg => allSels[leg.id].map((s, i) => If(s, Int.val(leg.services[i].priceCny), Int.val(0)))));
+        if (req.budgetCny !== undefined)
+            assertions['total:budget'] = total.le(Int.val(req.budgetCny));
+        const coreOf = (s) => {
+            const v = s.unsatCore();
+            const out = [];
+            for (let i = 0; i < v.length(); i++) {
+                // D-2 修复:JS 绑定的 unsat core 字符串带竖线定界("|f1:arrive_by|"),剥掉
+                out.push(String(v.get(i)).replace(/^\|/, '').replace(/\|$/, ''));
             }
-        }
-        return chosen;
-    };
-    const s = new Solver();
-    for (const sel of Object.values(allSels))s.add(exactlyOne(z3, sel));
-    for (const [name, expr] of Object.entries(assertions))s.addAndTrack(expr, name);
-    if (String(await s.check()) !== 'unsat') {
-        const chosen = await extract(s.model());
-        const legReports = legSpecs.map((leg)=>evaluateLeg(leg, chosen.get(leg.id)));
-        const money = legReports.reduce((a, r)=>a + r.price_cny, 0);
-        const redFlags = [
-            ...legSpecs.map((leg, i)=>leg.redEye && legReports[i].energy_pct < 50 ? `${leg.id} 落地精力仅 ${legReports[i].energy_pct}%(红眼后直奔事务,当日不宜安排重要会议)` : '').filter(Boolean),
-            ...legSpecs.map((leg, i)=>!leg.redEye && legReports[i].wakeMin >= 0 && legReports[i].wakeMin < 6 * 60 ? `${leg.id} 起床 ${legReports[i].wake}(早于 6:00,生物钟代价)` : '').filter(Boolean)
-        ];
-        return {
-            feasible: true,
-            money_cny: money,
-            legs: legReports,
-            red_flags: redFlags
+            return out;
         };
-    }
-    const core = coreOf(s).sort();
-    const suggestions = [];
-    for (const name of core){
-        const s2 = new Solver();
-        for (const sel of Object.values(allSels))s2.add(exactlyOne(z3, sel));
-        for (const [n2, expr] of Object.entries(assertions)){
-            if (n2 !== name) s2.addAndTrack(expr, n2);
+        const extract = async (model) => {
+            const chosen = new Map();
+            for (const leg of legSpecs) {
+                for (let i = 0; i < allSels[leg.id].length; i++) {
+                    const v = await maybeAwait(model.eval(allSels[leg.id][i], true));
+                    if (String(v) === 'true')
+                        chosen.set(leg.id, leg.services[i]);
+                }
+            }
+            return chosen;
+        };
+        const s = new Solver();
+        let sOpen = true;
+        const closeS = () => {
+            if (sOpen) {
+                releaseZ3(s);
+                sOpen = false;
+            }
+        };
+        try {
+            for (const sel of Object.values(allSels))
+                s.add(exactlyOne(z3, sel));
+            for (const [name, expr] of Object.entries(assertions))
+                s.addAndTrack(expr, name);
+            if (String(await s.check()) !== 'unsat') {
+                const model = s.model();
+                try {
+                    const chosen = await extract(model);
+                    const legReports = legSpecs.map(leg => evaluateLeg(leg, chosen.get(leg.id)));
+                    const money = legReports.reduce((a, r) => a + r.price_cny, 0);
+                    const redFlags = [
+                        ...legSpecs.map((leg, i) => leg.redEye && legReports[i].energy_pct < 50
+                            ? `${leg.id} 落地精力仅 ${legReports[i].energy_pct}%(红眼后直奔事务,当日不宜安排重要会议)` : '')
+                            .filter(Boolean),
+                        ...legSpecs.map((leg, i) => !leg.redEye && legReports[i].wakeMin >= 0 && legReports[i].wakeMin < 6 * 60
+                            ? `${leg.id} 起床 ${legReports[i].wake}(早于 6:00,生物钟代价)` : '')
+                            .filter(Boolean),
+                    ];
+                    return { feasible: true, money_cny: money, legs: legReports, red_flags: redFlags };
+                }
+                finally {
+                    releaseZ3(model);
+                }
+            }
+            const core = coreOf(s).sort();
+            const suggestions = [];
+            closeS();
+            for (const name of core) {
+                const s2 = new Solver();
+                try {
+                    for (const sel of Object.values(allSels))
+                        s2.add(exactlyOne(z3, sel));
+                    for (const [n2, expr] of Object.entries(assertions)) {
+                        if (n2 !== name)
+                            s2.addAndTrack(expr, n2);
+                    }
+                    if (String(await s2.check()) !== 'unsat') {
+                        const model = s2.model();
+                        try {
+                            const chosen = await extract(model);
+                            const rep = legSpecs.map(leg => evaluateLeg(leg, chosen.get(leg.id)));
+                            suggestions.push({
+                                relax: name,
+                                money_cny: rep.reduce((a, r) => a + r.price_cny, 0),
+                                legs: rep.map((r, i) => ({ ...r, leg: legSpecs[i].id })),
+                            });
+                        }
+                        finally {
+                            releaseZ3(model);
+                        }
+                    }
+                }
+                finally {
+                    releaseZ3(s2);
+                }
+            }
+            return { feasible: false, unsat_core: core, suggestions };
         }
-        if (String(await s2.check()) !== 'unsat') {
-            const chosen = await extract(s2.model());
-            const rep = legSpecs.map((leg)=>evaluateLeg(leg, chosen.get(leg.id)));
-            suggestions.push({
-                relax: name,
-                money_cny: rep.reduce((a, r)=>a + r.price_cny, 0),
-                legs: rep.map((r, i)=>({
-                        ...r,
-                        leg: legSpecs[i].id
-                    }))
-            });
+        finally {
+            closeS();
         }
-    }
-    return {
-        feasible: false,
-        unsat_core: core,
-        suggestions
-    };
+    });
 }
 async function maybeAwait(v) {
     return v instanceof Promise ? await v : v;
 }
+// JSON 数据包 → spec 的解析(data/flights_2026.json 形态)
 export function parseFlightPackLegs(pack) {
-    const legs = pack['legs'].map((l)=>({
-            id: String(l['id']),
-            note: l['note'] ? String(l['note']) : undefined,
-            services: l['services'].map((sv)=>({
-                    id: String(sv['id']),
-                    depMin: hhmmToMin(String(sv['dep'])),
-                    arrMin: hhmmToMin(String(sv['arr'])),
-                    priceCny: Number(sv['price_cny'])
-                })),
-            bufferMin: Number(l['buffer_min']),
-            originTransferMin: Number(l['origin_transfer_min']),
-            destTransferMin: Number(l['dest_transfer_min']),
-            arriveByMin: l['arrive_by'] ? hhmmToMin(String(l['arrive_by'])) : undefined,
-            redEye: Boolean(l['red_eye']),
-            redEyeDurationMin: Number(l['red_eye_duration_min'] ?? 0)
-        }));
+    const legs = pack['legs'].map(l => ({
+        id: String(l['id']),
+        note: l['note'] ? String(l['note']) : undefined,
+        services: l['services'].map(sv => ({
+            id: String(sv['id']),
+            depMin: hhmmToMin(String(sv['dep'])),
+            arrMin: hhmmToMin(String(sv['arr'])),
+            priceCny: Number(sv['price_cny']),
+        })),
+        bufferMin: Number(l['buffer_min']),
+        originTransferMin: Number(l['origin_transfer_min']),
+        destTransferMin: Number(l['dest_transfer_min']),
+        arriveByMin: l['arrive_by'] ? hhmmToMin(String(l['arrive_by'])) : undefined,
+        redEye: Boolean(l['red_eye']),
+        redEyeDurationMin: Number(l['red_eye_duration_min'] ?? 0),
+    }));
     return legs;
 }
-
-
-//# sourceURL=/Users/bytedance/work/gotry/ts/src/journey.ts