@danceiny/gotry 0.0.1-rc.10 → 0.0.1-rc.11

package/dist/src/engine.js

@@ -1,12 +1,7 @@
-import { init } from 'z3-solver';
+import { parseCandidate, parseRequest } from './model.js';
 import { evaluateChoice, minToHhmm, requiredUsableHours, trueCostToDict, LATEST_ARRIVE_STAY_MIN } 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';
+import { t } from './i18n.js';
 const CONSTRAINT_LABEL_KEYS = [
     'wake_floor',
     'energy_floor',
@@ -111,8 +106,7 @@ async function unsatCoreOf(s) {
     for(let i = 0; i < v.length(); i++)out.push(String(v.get(i)));
     return out;
 }
-async function cheapestPlan(enc, skip) {
-    const z3 = await getZ3();
+async function cheapestPlan(enc, skip, z3) {
     const opt = new z3.Optimize();
     opt.add(enc.structure);
     for (const name of CONSTRAINT_LABEL_KEYS){
@@ -133,109 +127,138 @@ async function cheapestPlan(enc, skip) {
 function suggestText(relax, cand, req, choice, cost) {
     const mot = req.motivation;
     const parts = [];
-    if (relax.includes('duration')) parts.push(`把行程延长到 ${choice.days} 天(${cand.name} 值得这个窗口)`);
-    if (relax.includes('budget')) parts.push(`预算提高到 ¥${cost.moneyCny}(原 ¥${req.budgetCny})`);
-    if (relax.includes('wake_floor')) parts.push(`接受 ${minToHhmm(cost.wakeMin)} 起床——破坏生物钟,与你的休整动机冲突,不推荐`);
-    if (relax.includes('energy_floor')) parts.push(`接受到达精力 ${cost.energyArrivalPct}%(低于你要求的 ${mot.minArrivalEnergyPct}%)`);
-    if (relax.includes('usable_hours')) parts.push(`接受有效休整 ${cost.usableHours.toFixed(1)}h(低于动机所需的 ${requiredUsableHours(mot).toFixed(1)}h)`);
-    if (relax.includes('arrival_before_evening')) parts.push(`接受 ${minToHhmm(cost.arriveStayMin)} 才到住处`);
-    const plan = `可行方案:${choice.outService.id} ${minToHhmm(choice.outService.depMin)} 出发、` + `${choice.outTransfer.mode} 接驳,¥${cost.moneyCny},${minToHhmm(cost.wakeMin)} 起床,` + `${minToHhmm(cost.arriveStayMin)} 到住处,到达精力 ${cost.energyArrivalPct}%`;
+    if (relax.includes('duration')) parts.push(t('sg.duration', {
+        days: choice.days,
+        name: cand.name
+    }));
+    if (relax.includes('budget')) parts.push(t('sg.budget', {
+        cost: cost.moneyCny,
+        budget: req.budgetCny
+    }));
+    if (relax.includes('wake_floor')) parts.push(t('sg.wake_floor', {
+        wake: minToHhmm(cost.wakeMin)
+    }));
+    if (relax.includes('energy_floor')) parts.push(t('sg.energy_floor', {
+        pct: cost.energyArrivalPct,
+        min: mot.minArrivalEnergyPct
+    }));
+    if (relax.includes('usable_hours')) parts.push(t('sg.usable_hours', {
+        hours: cost.usableHours.toFixed(1),
+        need: requiredUsableHours(mot).toFixed(1)
+    }));
+    if (relax.includes('arrival_before_evening')) parts.push(t('sg.arrival', {
+        time: minToHhmm(cost.arriveStayMin)
+    }));
+    const plan = t('sg.plan', {
+        id: choice.outService.id,
+        dep: minToHhmm(choice.outService.depMin),
+        mode: choice.outTransfer.mode,
+        money: cost.moneyCny,
+        wake: minToHhmm(cost.wakeMin),
+        arrive: minToHhmm(cost.arriveStayMin),
+        percent: cost.energyArrivalPct
+    });
     return parts.join(' + ') + `;${plan}`;
 }
 export async function solveCandidate(cand, req) {
-    const z3 = await getZ3();
-    const enc = new Encoding(z3, cand, req);
-    const verdict = {
-        candidateId: cand.id,
-        name: cand.name,
-        feasible: false,
-        imageryMatch: cand.imageryMatch,
-        unsatCore: [],
-        suggestions: []
-    };
-    const s = await enc.solverWith();
-    if (!await isUnsat(s)) {
-        verdict.feasible = true;
-        verdict.choice = await enc.extract(s.model());
-        verdict.trueCost = evaluateChoice(cand, req, verdict.choice);
-        return verdict;
-    }
-    const core = (await unsatCoreOf(s)).sort();
-    verdict.unsatCore = core;
-    for (const name of core){
-        const skip = new Set([
-            name
-        ]);
-        const enc2 = name === 'duration' ? new Encoding(z3, cand, req, cand.minDaysForPurpose) : enc;
-        const s2 = await enc2.solverWith(skip);
-        if (!await isUnsat(s2)) {
-            const choice = await enc2.extract(s2.model());
-            const cost = evaluateChoice(cand, req, choice);
-            verdict.suggestions.push({
-                relax: [
-                    name
-                ],
-                text: suggestText([
-                    name
-                ], cand, req, choice, cost),
-                resulting: {
-                    days: choice.days,
-                    ...trueCostToDict(cost)
-                }
-            });
+    return withZ3('engine.solveCandidate', async (z3)=>{
+        const enc = new Encoding(z3, cand, req);
+        const verdict = {
+            candidateId: cand.id,
+            name: cand.name,
+            feasible: false,
+            imageryMatch: cand.imageryMatch,
+            unsatCore: [],
+            suggestions: []
+        };
+        const s = await enc.solverWith();
+        if (!await isUnsat(s)) {
+            verdict.feasible = true;
+            verdict.choice = await enc.extract(s.model());
+            verdict.trueCost = evaluateChoice(cand, req, verdict.choice);
+            return verdict;
         }
-    }
-    if (core.includes('duration')) {
-        const longEnc = new Encoding(z3, cand, req, cand.minDaysForPurpose);
-        const s2 = await longEnc.solverWith(new Set([
-            'duration'
-        ]));
-        if (await isUnsat(s2)) {
-            const core2 = await unsatCoreOf(s2);
-            let joint = [
-                'duration',
-                ...core2.filter((n)=>n !== 'duration')
-            ];
-            for (const name of joint.filter((n)=>n !== 'duration')){
-                const trial = new Set(joint.filter((n)=>n !== name));
-                if (!await isUnsat(await longEnc.solverWith(trial))) joint = [
-                    ...trial
-                ];
-            }
-            const plan = await cheapestPlan(longEnc, new Set(joint));
-            if (plan) {
+        const core = (await unsatCoreOf(s)).sort();
+        verdict.unsatCore = core;
+        for (const name of core){
+            const skip = new Set([
+                name
+            ]);
+            const enc2 = name === 'duration' ? new Encoding(z3, cand, req, cand.minDaysForPurpose) : enc;
+            const s2 = await enc2.solverWith(skip);
+            if (!await isUnsat(s2)) {
+                const choice = await enc2.extract(s2.model());
+                const cost = evaluateChoice(cand, req, choice);
                 verdict.suggestions.push({
-                    relax: joint,
-                    text: suggestText(joint, cand, req, plan.choice, plan.cost),
+                    relax: [
+                        name
+                    ],
+                    text: suggestText([
+                        name
+                    ], cand, req, choice, cost),
                     resulting: {
-                        days: plan.choice.days,
-                        ...trueCostToDict(plan.cost)
+                        days: choice.days,
+                        ...trueCostToDict(cost)
                     }
                 });
             }
         }
-    }
-    if (verdict.suggestions.some((sg)=>sg.relax.includes('duration'))) {
-        const longEnc = new Encoding(z3, cand, req, cand.minDaysForPurpose);
-        const plan = await cheapestPlan(longEnc, new Set([
-            'duration',
-            'budget'
-        ]));
-        const conditions = {
-            days: cand.minDaysForPurpose
-        };
-        if (plan) conditions['budget_cny'] = plan.cost.moneyCny;
-        if (cand.bestMonths.length) conditions['best_months'] = cand.bestMonths;
-        verdict.wishPool = {
-            name: cand.name,
-            conditions,
-            reason: `动机谱系 ${JSON.stringify(req.motivation.weights)} 下,${req.windowDays} 天窗口装不下这个目的地`
-        };
-    }
-    return verdict;
+        if (core.includes('duration')) {
+            const longEnc = new Encoding(z3, cand, req, cand.minDaysForPurpose);
+            const s2 = await longEnc.solverWith(new Set([
+                'duration'
+            ]));
+            if (await isUnsat(s2)) {
+                const core2 = await unsatCoreOf(s2);
+                let joint = [
+                    'duration',
+                    ...core2.filter((n)=>n !== 'duration')
+                ];
+                for (const name of joint.filter((n)=>n !== 'duration')){
+                    const trial = new Set(joint.filter((n)=>n !== name));
+                    if (!await isUnsat(await longEnc.solverWith(trial))) joint = [
+                        ...trial
+                    ];
+                }
+                const plan = await cheapestPlan(longEnc, new Set(joint), z3);
+                if (plan) {
+                    verdict.suggestions.push({
+                        relax: joint,
+                        text: suggestText(joint, cand, req, plan.choice, plan.cost),
+                        resulting: {
+                            days: plan.choice.days,
+                            ...trueCostToDict(plan.cost)
+                        }
+                    });
+                }
+            }
+        }
+        if (verdict.suggestions.some((sg)=>sg.relax.includes('duration'))) {
+            const longEnc = new Encoding(z3, cand, req, cand.minDaysForPurpose);
+            const plan = await cheapestPlan(longEnc, new Set([
+                'duration',
+                'budget'
+            ]), z3);
+            const conditions = {
+                days: cand.minDaysForPurpose
+            };
+            if (plan) conditions['budget_cny'] = plan.cost.moneyCny;
+            if (cand.bestMonths.length) conditions['best_months'] = cand.bestMonths;
+            verdict.wishPool = {
+                name: cand.name,
+                conditions,
+                reason: t('sg.wish_reason_engine', {
+                    weights: JSON.stringify(req.motivation.weights),
+                    days: req.windowDays
+                })
+            };
+        }
+        return verdict;
+    });
 }
 export async function solve(req, candidates) {
-    const verdicts = await Promise.all(candidates.map((c)=>solveCandidate(c, req)));
+    const verdicts = [];
+    for (const c of candidates)verdicts.push(await solveCandidate(c, req));
     const feasible = verdicts.filter((v)=>v.feasible).sort((a, b)=>b.imageryMatch - a.imageryMatch);
     const recommended = feasible[0]?.candidateId ?? null;
     return {
@@ -284,45 +307,91 @@ function renderMarkdown(req, verdicts, recommended) {
     const feasible = verdicts.filter((v)=>v.feasible).sort((a, b)=>b.imageryMatch - a.imageryMatch);
     const parked = verdicts.filter((v)=>!v.feasible);
     const lines = [];
-    lines.push(`> 憧憬:${req.note}`);
-    lines.push(`> 已识别约束:窗口 ${req.windowDays} 天 | 预算 ¥${req.budgetCny} | ` + `动机(休整改写需求 ${requiredUsableHours(req.motivation).toFixed(1)}h 有效休整)`);
+    lines.push(t('md.header', {
+        note: req.note
+    }));
+    lines.push(t('md.constraints', {
+        days: req.windowDays,
+        budget: req.budgetCny,
+        hours: requiredUsableHours(req.motivation).toFixed(1)
+    }));
     lines.push('');
     for (const v of parked){
-        lines.push(`**${v.name}:现在不行**——冲突约束:${v.unsatCore.join('、')}。`);
+        lines.push(t('md.infeasible', {
+            name: v.name,
+            core: v.unsatCore.join('、')
+        }));
         for (const sg of v.suggestions.slice(0, 1))lines.push(`- ${sg.text}`);
         if (v.wishPool) {
             const conds = v.wishPool.conditions;
-            const budgetNote = conds['budget_cny'] ? `、约 ¥${conds['budget_cny']}` : '';
+            const budgetNote = conds['budget_cny'] ? t('md.wish_budget', {
+                cny: String(conds['budget_cny'])
+            }) : '';
             const months = conds['best_months'];
-            const season = months ? `,${months} 月最佳` : '';
-            lines.push(`- 已放入「下一次出发」清单:需要 ${conds['days']} 天${budgetNote}${season}`);
+            const season = months ? t('md.wish_season', {
+                months: months.join(',')
+            }) : '';
+            lines.push(t('md.wish_pool', {
+                days: String(conds['days']),
+                budgetNote,
+                season
+            }));
         }
     }
     lines.push('');
     for (const v of feasible){
-        const c = v.choice, t = v.trueCost;
-        lines.push(`**${v.name}:可行**` + `(${c.outService.id} ${minToHhmm(c.outService.depMin)} 出发,` + `${c.outTransfer.mode} 接驳,${minToHhmm(t.arriveStayMin)} 到住处,` + `起床 ${minToHhmm(t.wakeMin)},到达精力 ${t.energyArrivalPct}%,` + `门到门 ${Math.floor(t.doorToDoorOutMin / 60)}h${String(t.doorToDoorOutMin % 60).padStart(2, '0')}m,` + `有效休整 ${t.usableHours.toFixed(1)}h,共 ¥${t.moneyCny})`);
+        const c = v.choice, cost = v.trueCost;
+        lines.push(t('md.feasible_engine', {
+            name: v.name,
+            id: c.outService.id,
+            dep: minToHhmm(c.outService.depMin),
+            mode: c.outTransfer.mode,
+            arrive: minToHhmm(cost.arriveStayMin),
+            wake: minToHhmm(cost.wakeMin),
+            energy: cost.energyArrivalPct,
+            d2d: `${Math.floor(cost.doorToDoorOutMin / 60)}h${String(cost.doorToDoorOutMin % 60).padStart(2, '0')}m`,
+            hours: cost.usableHours.toFixed(1),
+            money: cost.moneyCny
+        }));
     }
     if (feasible.length) {
         lines.push('');
         const best = feasible[0];
         const alt = feasible[1];
-        lines.push(`**建议:${best.name}**(意象匹配 ${(best.imageryMatch * 100).toFixed(0)}%)。` + (alt ? `备选:${alt.name}(¥${alt.trueCost.moneyCny},匹配 ${(alt.imageryMatch * 100).toFixed(0)}%)。` : ''));
+        lines.push(t('md.recommend', {
+            best: best.name,
+            match: (best.imageryMatch * 100).toFixed(0)
+        }) + (alt ? t('md.alt', {
+            name: alt.name,
+            money: alt.trueCost.moneyCny,
+            match: (alt.imageryMatch * 100).toFixed(0)
+        }) : ''));
     }
     lines.push('');
-    lines.push('**待你决定的两个问题**:');
+    lines.push(t('md.decide_two'));
     if (feasible.length >= 2) {
-        lines.push(`1. ${feasible[0].name} 还是 ${feasible[1].name}?(前者更贴意象,后者更省)`);
+        lines.push(t('md.q_choice', {
+            a: feasible[0].name,
+            b: feasible[1].name
+        }));
     } else if (feasible.length === 1) {
-        lines.push(`1. 就去 ${feasible[0].name} 吗?`);
+        lines.push(t('md.q_single', {
+            name: feasible[0].name
+        }));
     } else {
-        lines.push('1. 所有候选都不可行——考虑放宽哪条约束?');
+        lines.push(t('md.q_none'));
     }
     const p0 = parked[0];
     if (p0?.wishPool) {
-        lines.push(`2. 把 ${p0.name} 留给「下一次出发」(${p0.wishPool.conditions['days']} 天起),这次先去可行的?`);
+        lines.push(t('md.q_wish', {
+            name: p0.name,
+            days: String(p0.wishPool.conditions['days'])
+        }));
     } else if (feasible.length) {
-        lines.push(`2. 出发班次选 ${feasible[0].choice.outService.id}(${minToHhmm(feasible[0].choice.outService.depMin)})还是更晚的?`);
+        lines.push(t('md.q_depart', {
+            id: feasible[0].choice.outService.id,
+            dep: minToHhmm(feasible[0].choice.outService.depMin)
+        }));
     }
     return lines.join('\n');
 }

package/dist/src/i18n.js

@@ -0,0 +1,77 @@
+const ZH = {
+    'md.header': '> 憧憬:{note}',
+    'md.constraints': '> 已识别约束:窗口 {days} 天 | 预算 ¥{budget} | 动机(休整改写需求 {hours}h 有效休整)',
+    'md.infeasible': '**{name}:现在不行**——冲突约束:{core}。',
+    'md.relax_one': '- 放宽 {relax}:约 ¥{money}',
+    'md.wish_pool': '- 已放入「下一次出发」清单:需要 {days} 天{budgetNote}{season}',
+    'md.wish_budget': '、约 ¥{cny}',
+    'md.wish_season': ',{months} 月最佳',
+    'md.feasible_engine': '**{name}:可行**({id} {dep} 出发,{mode} 接驳,{arrive} 到住处,起床 {wake},到达精力 {energy}%,门到门 {d2d},有效休整 {hours}h,共 ¥{money})',
+    'md.feasible_unified': '**{name}:可行**({svc} 出发,{mode} 接驳,起床 {wake},到达精力 {energy}%,门到门 {d2d},有效休整 {hours}h,共 ¥{money})',
+    'md.recommend': '**建议:{best}**(意象匹配 {match}%)。',
+    'md.alt': '备选:{name}(¥{money},匹配 {match}%)。',
+    'md.decide_two': '**待你决定的两个问题**:',
+    'md.q_choice': '1. {a} 还是 {b}?(前者更贴意象,后者更省)',
+    'md.q_single': '1. 就去 {name} 吗?',
+    'md.q_none': '1. 所有候选都不可行——考虑放宽哪条约束?',
+    'md.q_wish': '2. 把 {name} 留给「下一次出发」({days} 天起),这次先去可行的?',
+    'md.q_depart': '2. 出发班次选 {id}({dep})还是更晚的?',
+    'sg.duration': '把行程延长到 {days} 天({name} 值得这个窗口)',
+    'sg.budget': '预算提高到 ¥{cost}(原 ¥{budget})',
+    'sg.wake_floor': '接受 {wake} 起床——破坏生物钟,与你的休整动机冲突,不推荐',
+    'sg.energy_floor': '接受到达精力 {pct}%(低于你要求的 {min}%)',
+    'sg.usable_hours': '接受有效休整 {hours}h(低于动机所需的 {need}h)',
+    'sg.arrival': '接受 {time} 才到住处',
+    'sg.plan': '可行方案:{id} {dep} 出发、{mode} 接驳,¥{money},{wake} 起床,{arrive} 到住处,到达精力 {percent}%',
+    'sg.wish_reason_engine': '动机谱系 {weights} 下,{days} 天窗口装不下这个目的地',
+    'sg.wish_reason_window': '{days} 天窗口装不下(目的需 {minDays} 天)',
+    'un.workwindow_reason': '周{wd} {dep} 起飞落在工作窗口(当地 {start}-{end})内',
+    'un.redflag_redeye': '{leg} 落地精力仅 {pct}%(红眼后直奔事务,当日不宜安排重要会议)'
+};
+const EN = {
+    'md.header': '> Aspiration: {note}',
+    'md.constraints': '> Constraints captured: {days}-day window | budget ¥{budget} | motivation (needs {hours}h of usable rest)',
+    'md.infeasible': '**{name}: not yet** — conflicting constraints: {core}.',
+    'md.relax_one': '- Relax {relax}: about ¥{money}',
+    'md.wish_pool': '- Added to the "next departure" list: needs {days} days{budgetNote}{season}',
+    'md.wish_budget': ', about ¥{cny}',
+    'md.wish_season': ', best in months {months}',
+    'md.feasible_engine': '**{name}: feasible** ({id} departs {dep}, {mode} transfer, at your stay by {arrive}, wake {wake}, arrival energy {energy}%, door-to-door {d2d}, {hours}h of real rest, total ¥{money})',
+    'md.feasible_unified': '**{name}: feasible** ({svc} departs, {mode} transfer, wake {wake}, arrival energy {energy}%, door-to-door {d2d}, {hours}h of real rest, total ¥{money})',
+    'md.recommend': '**Suggestion: {best}** (imagery match {match}%).',
+    'md.alt': 'Alternative: {name} (¥{money}, match {match}%).',
+    'md.decide_two': '**Two decisions for you**:',
+    'md.q_choice': '1. {a} or {b}? (former fits the vision, latter saves more)',
+    'md.q_single': '1. Go with {name}?',
+    'md.q_none': '1. All candidates are infeasible — which constraint to relax?',
+    'md.q_wish': '2. Keep {name} for the "next departure" ({days}+ days) and go feasible this time?',
+    'md.q_depart': '2. Departure: {id} ({dep}) or later?',
+    'sg.duration': 'Extend the trip to {days} days ({name} deserves this window)',
+    'sg.budget': 'Raise budget to ¥{cost} (was ¥{budget})',
+    'sg.wake_floor': 'Accept a {wake} wake-up — wrecks your body clock, conflicts with your rest motivation, not recommended',
+    'sg.energy_floor': 'Accept arrival energy {pct}% (below your required {min}%)',
+    'sg.usable_hours': 'Accept {hours}h of usable rest (below the {need}h your motivation needs)',
+    'sg.arrival': 'Accept reaching your stay only at {time}',
+    'sg.plan': 'Feasible plan: {id} departs {dep}, {mode} transfer, ¥{money}, wake {wake}, at your stay {arrive}, arrival energy {percent}%',
+    'sg.wish_reason_engine': 'under motivation weights {weights}, a {days}-day window cannot fit this destination',
+    'sg.wish_reason_window': '{days}-day window cannot fit (the purpose needs {minDays} days)',
+    'un.workwindow_reason': 'Departs {dep} on weekday {wd}, inside your work window (local {start}-{end})',
+    'un.redflag_redeye': '{leg} lands with only {pct}% energy (red-eye then straight to business — no big meetings that day)'
+};
+let locale = process.env['GOTRY_LOCALE'] === 'en' ? 'en' : 'zh-CN';
+export function getLocale() {
+    return locale;
+}
+export function setLocale(l) {
+    locale = l;
+}
+export function t(key, vars = {}) {
+    const tpl = (locale === 'en' ? EN[key] : undefined) ?? ZH[key] ?? String(key);
+    return tpl.replace(/\{(\w+)\}/g, (_, k)=>k in vars ? String(vars[k]) : `{${k}}`);
+}
+export function enCoverage() {
+    return Object.keys(ZH).filter((k)=>EN[k] === undefined);
+}
+
+
+//# sourceURL=/Users/bytedance/work/gotry/ts/src/i18n.ts

package/dist/src/journey.js

@@ -1,10 +1,5 @@
-import { init } from 'z3-solver';
 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';
 export function evaluateLeg(leg, svc) {
     const wake = svc.depMin - leg.bufferMin - leg.originTransferMin;
     const wakeDisplay = wake < 0 ? `${minToHhmm(wake + 1440)}(前一日)` : minToHhmm(wake);
@@ -38,87 +33,88 @@ function exactlyOne(z3, sels) {
     return Sum(...sels.map((s)=>If(s, Int.val(1), Int.val(0)))).eq(Int.val(1));
 }
 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(/\|$/, ''));
-        }
-        return out;
-    };
-    const extract = async (model)=>{
-        const chosen = new Map();
+    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){
-            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 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 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
+        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(/\|$/, ''));
+            }
+            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();
+        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
+            };
         }
-        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
-                    }))
-            });
+        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);
+            }
+            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
+                        }))
+                });
+            }
         }
-    }
-    return {
-        feasible: false,
-        unsat_core: core,
-        suggestions
-    };
+        return {
+            feasible: false,
+            unsat_core: core,
+            suggestions
+        };
+    });
 }
 async function maybeAwait(v) {
     return v instanceof Promise ? await v : v;