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

package/dist/src/realtime-pricing.js

@@ -0,0 +1,105 @@
+import { flyaiSearch } from '../capabilities/flyai.js';
+const IATA_TO_CITY = {
+    HKG: '香港',
+    HKT: '普吉',
+    BKK: '曼谷',
+    KMG: '昆明',
+    SZX: '深圳',
+    DXB: '迪拜',
+    LJG: '丽江',
+    DLU: '大理',
+    SHA: '上海',
+    PVG: '上海',
+    PEK: '北京',
+    CTU: '成都'
+};
+export async function overlayRealtimeFlightPrices(spec, opts = {}) {
+    const out = {
+        spec,
+        matched: [],
+        notes: []
+    };
+    const flights = [];
+    for (const seg of spec.segments){
+        if (!seg.date || !/^\d{4}-\d{2}-\d{2}$/.test(seg.date)) continue;
+        const route = seg.route;
+        if (!route || !route.includes('->')) continue;
+        const [a, b] = route.split('->').map((s)=>IATA_TO_CITY[s.trim()]);
+        if (!a || !b) continue;
+        if (seg.options.some((o)=>!o.move)) continue;
+        flights.push({
+            seg,
+            date: seg.date,
+            origin: a,
+            destination: b
+        });
+    }
+    if (flights.length === 0) return out;
+    const query = opts.query ?? defaultQuery;
+    for (const f of flights){
+        let result;
+        try {
+            result = await query({
+                kind: 'flight',
+                origin: f.origin,
+                destination: f.destination,
+                depDate: f.date
+            });
+        } catch (e) {
+            out.notes.push(`${f.seg.id}: 实时票价不可用(降级静态包):${e.message?.slice(0, 80)} [实时API:flyai@error]`);
+            continue;
+        }
+        if (!result.ok || result.verdict !== 'hit' || !result.options?.length) {
+            out.notes.push(`${f.seg.id}: 实时票价未取回(${result.verdict},降级静态包) ${result.evidence}`);
+            continue;
+        }
+        const ts = /@(\d{4}-\d{2}-\d{2}T[\d:.]+Z)\]/.exec(result.evidence)?.[1] ?? new Date().toISOString();
+        const byNo = new Map();
+        for (const o of result.options){
+            if (Number.isFinite(o.price) && o.price > 0) byNo.set(o.no.toUpperCase(), o);
+        }
+        for (const opt of f.seg.options){
+            const svc = opt.move.services[0];
+            const rt = byNo.get(svc.id.toUpperCase());
+            if (!rt) continue;
+            const evidence = `[实时API:flyai@${ts}] ${rt.no} ¥${rt.price}(静态包原价 ¥${svc.priceCny})`;
+            out.matched.push({
+                segment: f.seg.id,
+                option: opt.id,
+                staticCny: svc.priceCny,
+                realtimeCny: rt.price,
+                evidence
+            });
+            out.notes.push(evidence);
+            svc.priceCny = rt.price;
+        }
+    }
+    return out;
+}
+const defaultQuery = (q)=>flyaiSearch({
+        kind: q.kind,
+        origin: q.origin,
+        destination: q.destination,
+        depDate: q.depDate
+    });
+export function realtimeSolvePort(base, opts = {}) {
+    return async (spec)=>{
+        const enabled = opts.enabled ?? process.env['GOTRY_REALTIME_PRICING'] === '1';
+        if (!enabled) return base(spec);
+        try {
+            const ov = await overlayRealtimeFlightPrices(spec, opts);
+            if (ov.matched.length === 0 && ov.notes.length === 0) return base(ov.spec);
+            const res = await base(ov.spec);
+            res.skeleton_notes = [
+                ...res.skeleton_notes ?? [],
+                ...ov.notes
+            ];
+            return res;
+        } catch  {
+            return base(spec);
+        }
+    };
+}
+
+
+//# sourceURL=/Users/bytedance/work/gotry/ts/src/realtime-pricing.ts

package/dist/src/state-ledger.js

@@ -543,21 +543,47 @@ export class StateLedger {
     markStepDone(runId, name, result) {
         this.db.prepare(`UPDATE workflow_steps SET status = 'done', result = ?, done_ts = ? WHERE run_id = ? AND name = ? AND tenant_id = ?`).run(JSON.stringify(result), new Date().toISOString(), runId, name, this.tenant);
     }
-    settleWorkflowRun(id, deliverable, actor = 'system:async-collect') {
+    finishWorkflowRun(id, status, eventKind, deliverable, terminalOutcome, actor = 'system:async-collect') {
         const run = this.db.transaction(()=>{
-            this.db.prepare(`UPDATE workflow_runs SET status = 'settled', deliverable = ?, updated = ? WHERE id = ? AND tenant_id = ?`).run(deliverable, new Date().toISOString(), id, this.tenant);
+            const update = this.db.prepare(`UPDATE workflow_runs SET status = ?, deliverable = ?, updated = ?
+         WHERE id = ? AND tenant_id = ? AND status = 'pending'`).run(status, deliverable, new Date().toISOString(), id, this.tenant);
+            if (update.changes === 0) {
+                const existing = this.getWorkflowRun(id);
+                if (existing?.status === status) return;
+                throw new Error(`workflow ${id} cannot transition ${existing?.status ?? 'missing'} -> ${status}`);
+            }
             this.insertEvent({
                 actor,
-                kind: 'async.settled',
+                kind: eventKind,
                 subjectId: id,
                 payload: {
-                    bytes: deliverable.length
+                    bytes: deliverable.length,
+                    terminal_outcome: terminalOutcome
                 },
+                idemKey: `async-terminal:${id}`,
                 runId: id
             });
         });
         run();
     }
+    settleWorkflowRun(id, deliverable, terminalOutcome, actor = 'system:async-collect') {
+        this.finishWorkflowRun(id, 'settled', 'async.settled', deliverable, terminalOutcome, actor);
+    }
+    failWorkflowRun(id, deliverable, terminalOutcome, actor = 'system:async-collect') {
+        this.finishWorkflowRun(id, 'failed', 'async.failed', deliverable, terminalOutcome, actor);
+    }
+    getWorkflowTerminalOutcome(id) {
+        const row = this.db.prepare(`SELECT payload FROM events
+       WHERE tenant_id = ? AND run_id = ? AND kind IN ('async.settled', 'async.failed')
+       ORDER BY seq DESC LIMIT 1`).get(this.tenant, id);
+        if (!row) return null;
+        try {
+            const payload = JSON.parse(row.payload);
+            return payload.terminal_outcome ?? null;
+        } catch  {
+            return null;
+        }
+    }
     requestPendingWrite(input, actor = 'system:writegate') {
         const ts = new Date().toISOString();
         const run = this.db.transaction(()=>{

package/dist/src/unified.js

@@ -1,13 +1,7 @@
 import { checkConnectivity } from '../scripts/skeleton-check.js';
 import { evaluateChoice, minToHhmm, hhmmToMin, requiredUsableHours, trueCostToDict, LATEST_ARRIVE_STAY_MIN } from './model.js';
-let z3Promise = null;
-async function getZ3() {
-    if (!z3Promise) {
-        const { init } = await import('z3-solver');
-        z3Promise = (async ()=>(await init()).Context('main'))();
-    }
-    return z3Promise;
-}
+import { withZ3 } from './z3-shared.js';
+import { t as i18nT } from './i18n.js';
 const SEGMENT_ROUTES = {
     f1: 'HKG->HKT',
     f2: 'HKT->BKK',
@@ -165,7 +159,12 @@ function workWindowBlocks(spec, option) {
     const start = ww.startMin + shift, end = ww.endMin + shift;
     if (start <= dep && dep <= end) {
         const hhmm = (m)=>`${String(Math.floor(m / 60)).padStart(2, '0')}:${String(m % 60).padStart(2, '0')}`;
-        return `周${WEEKDAY_CN[option.depWeekday]} ${hhmm(dep)} 起飞落在工作窗口(当地 ${hhmm(start)}-${hhmm(end)})内`;
+        return i18nT('un.workwindow_reason', {
+            wd: WEEKDAY_CN[option.depWeekday] ?? '',
+            dep: hhmm(dep),
+            start: hhmm(start),
+            end: hhmm(end)
+        });
     }
     return null;
 }
@@ -250,91 +249,95 @@ async function solveUnifiedInner(spec) {
             };
         }
     }
-    const z3 = await getZ3();
-    const { Bool, If, Int, Solver, Sum } = z3;
-    const wakeFloor = spec.defaultWakeFloorMin ?? hhmmToMin('06:00');
-    const allSels = {};
-    const assertions = {};
-    const svcOf = {};
-    for (const seg of spec.segments){
-        const sels = seg.options.map((_, i)=>Bool.const(`${seg.id}_o${i}`));
-        allSels[seg.id] = sels;
-        const svcs = seg.options.map((o)=>o.move.services[0]);
-        svcOf[seg.id] = svcs;
-        const pick = (attr)=>Sum(...sels.map((s, i)=>If(s, Int.val(svcs[i][attr]), Int.val(0))));
-        const dep = pick('depMin'), arr = pick('arrMin');
-        const o0 = seg.options[0].move;
-        const wake = dep.sub(Int.val(o0.bufferMin + o0.originTransferMin));
-        const arriveStay = arr.add(Int.val(o0.destTransferMin));
-        if (seg.anchors?.arriveByMin !== undefined) assertions[`${seg.id}:arrive_by`] = arriveStay.le(Int.val(seg.anchors.arriveByMin));
-        if (seg.anchors?.departAfterMin !== undefined) assertions[`${seg.id}:depart_after`] = dep.ge(Int.val(seg.anchors.departAfterMin));
-        if (!seg.options.some((o)=>o.move?.redEye)) assertions[`${seg.id}:wake_floor`] = wake.ge(Int.val(wakeFloor));
-    }
-    const total = Sum(...spec.segments.flatMap((seg)=>allSels[seg.id].map((s, i)=>If(s, Int.val(svcOf[seg.id][i].priceCny), Int.val(0)))));
-    if (spec.budgetCny !== undefined) assertions['total:budget'] = total.le(Int.val(spec.budgetCny));
-    const exactlyOne = (sels)=>Sum(...sels.map((s)=>If(s, Int.val(1), Int.val(0)))).eq(Int.val(1));
-    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 s = new Solver();
-    for (const sel of Object.values(allSels))s.add(exactlyOne(sel));
-    for (const [name, expr] of Object.entries(assertions))s.addAndTrack(expr, name);
-    const report = async (model)=>{
-        const out = [];
+    return withZ3('unified.solveUnifiedInner', async (z3)=>{
+        const { Bool, If, Int, Solver, Sum } = z3;
+        const wakeFloor = spec.defaultWakeFloorMin ?? hhmmToMin('06:00');
+        const allSels = {};
+        const assertions = {};
+        const svcOf = {};
         for (const seg of spec.segments){
-            for(let i = 0; i < allSels[seg.id].length; i++){
-                const v = await maybeAwait(model.eval(allSels[seg.id][i], true));
-                if (String(v) !== 'true') continue;
-                const o = seg.options[i];
-                out.push({
-                    leg: seg.id,
-                    ...evaluateOptionMove(seg.id, o.move)
+            const sels = seg.options.map((_, i)=>Bool.const(`${seg.id}_o${i}`));
+            allSels[seg.id] = sels;
+            const svcs = seg.options.map((o)=>o.move.services[0]);
+            svcOf[seg.id] = svcs;
+            const pick = (attr)=>Sum(...sels.map((s, i)=>If(s, Int.val(svcs[i][attr]), Int.val(0))));
+            const dep = pick('depMin'), arr = pick('arrMin');
+            const o0 = seg.options[0].move;
+            const wake = dep.sub(Int.val(o0.bufferMin + o0.originTransferMin));
+            const arriveStay = arr.add(Int.val(o0.destTransferMin));
+            if (seg.anchors?.arriveByMin !== undefined) assertions[`${seg.id}:arrive_by`] = arriveStay.le(Int.val(seg.anchors.arriveByMin));
+            if (seg.anchors?.departAfterMin !== undefined) assertions[`${seg.id}:depart_after`] = dep.ge(Int.val(seg.anchors.departAfterMin));
+            if (!seg.options.some((o)=>o.move?.redEye)) assertions[`${seg.id}:wake_floor`] = wake.ge(Int.val(wakeFloor));
+        }
+        const total = Sum(...spec.segments.flatMap((seg)=>allSels[seg.id].map((s, i)=>If(s, Int.val(svcOf[seg.id][i].priceCny), Int.val(0)))));
+        if (spec.budgetCny !== undefined) assertions['total:budget'] = total.le(Int.val(spec.budgetCny));
+        const exactlyOne = (sels)=>Sum(...sels.map((s)=>If(s, Int.val(1), Int.val(0)))).eq(Int.val(1));
+        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 s = new Solver();
+        for (const sel of Object.values(allSels))s.add(exactlyOne(sel));
+        for (const [name, expr] of Object.entries(assertions))s.addAndTrack(expr, name);
+        const report = async (model)=>{
+            const out = [];
+            for (const seg of spec.segments){
+                for(let i = 0; i < allSels[seg.id].length; i++){
+                    const v = await maybeAwait(model.eval(allSels[seg.id][i], true));
+                    if (String(v) !== 'true') continue;
+                    const o = seg.options[i];
+                    out.push({
+                        leg: seg.id,
+                        ...evaluateOptionMove(seg.id, o.move)
+                    });
+                    break;
+                }
+            }
+            return out;
+        };
+        async function maybeAwait(v) {
+            return v instanceof Promise ? await v : v;
+        }
+        if (String(await s.check()) !== 'unsat') {
+            const legs = await report(s.model());
+            const money = legs.reduce((a, l)=>a + l.price_cny, 0);
+            const redFlags = legs.filter((l)=>spec.segments.find((sg)=>sg.id === l.leg)?.options.some((o)=>o.move?.redEye) && l.energy_pct < 50).map((l)=>i18nT('un.redflag_redeye', {
+                    leg: l.leg,
+                    pct: l.energy_pct
+                }));
+            return {
+                feasible: true,
+                money_cny: money,
+                legs,
+                red_flags: redFlags,
+                work_window_exclusions: exclusions,
+                skeleton_notes: skeletonNotes.length ? skeletonNotes : undefined
+            };
+        }
+        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(sel));
+            for (const [n2, expr] of Object.entries(assertions)){
+                if (n2 !== name) s2.addAndTrack(expr, n2);
+            }
+            if (String(await s2.check()) !== 'unsat') {
+                const legs = await report(s2.model());
+                suggestions.push({
+                    relax: name,
+                    money_cny: legs.reduce((a, l)=>a + l.price_cny, 0)
                 });
-                break;
             }
         }
-        return out;
-    };
-    async function maybeAwait(v) {
-        return v instanceof Promise ? await v : v;
-    }
-    if (String(await s.check()) !== 'unsat') {
-        const legs = await report(s.model());
-        const money = legs.reduce((a, l)=>a + l.price_cny, 0);
-        const redFlags = legs.filter((l)=>spec.segments.find((sg)=>sg.id === l.leg)?.options.some((o)=>o.move?.redEye) && l.energy_pct < 50).map((l)=>`${l.leg} 落地精力仅 ${l.energy_pct}%(红眼后直奔事务,当日不宜安排重要会议)`);
         return {
-            feasible: true,
-            money_cny: money,
-            legs,
-            red_flags: redFlags,
-            work_window_exclusions: exclusions,
-            skeleton_notes: skeletonNotes.length ? skeletonNotes : undefined
+            feasible: false,
+            unsat_core: core,
+            suggestions
         };
-    }
-    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(sel));
-        for (const [n2, expr] of Object.entries(assertions)){
-            if (n2 !== name) s2.addAndTrack(expr, n2);
-        }
-        if (String(await s2.check()) !== 'unsat') {
-            const legs = await report(s2.model());
-            suggestions.push({
-                relax: name,
-                money_cny: legs.reduce((a, l)=>a + l.price_cny, 0)
-            });
-        }
-    }
-    return {
-        feasible: false,
-        unsat_core: core,
-        suggestions
-    };
+    });
 }
 function checkTrueCost(t, spec) {
     const fails = [];
@@ -459,7 +462,10 @@ export function solveChoiceSegment(spec, req) {
             wish = {
                 name: opt.label,
                 conditions: conds,
-                reason: `${windowDays} 天窗口装不下(目的需 ${minDays} 天)`
+                reason: i18nT('sg.wish_reason_window', {
+                    days: windowDays,
+                    minDays
+                })
             };
         }
         verdicts.push({
@@ -483,52 +489,99 @@ function renderCandidateMarkdown(req, verdicts, recommended) {
     const feasible = verdicts.filter((v)=>v['feasible']).sort((a, b)=>b['imagery_match'] - a['imagery_match']);
     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(i18nT('md.header', {
+        note: req.note
+    }));
+    lines.push(i18nT('md.constraints', {
+        days: req.windowDays,
+        budget: req.budgetCny,
+        hours: requiredUsableHours(req.motivation).toFixed(1)
+    }));
     lines.push('');
     for (const v of parked){
         const core = v['unsat_core'] ?? [];
-        lines.push(`**${v['name']}:现在不行**——冲突约束:${core.join('、')}。`);
+        lines.push(i18nT('md.infeasible', {
+            name: String(v['name']),
+            core: core.join('、')
+        }));
         const sug = (v['suggestions'] ?? [])[0];
-        if (sug) lines.push(`- 放宽 ${sug['relax']}:约 ¥${sug['resulting_money_cny']}`);
+        if (sug) lines.push(i18nT('md.relax_one', {
+            relax: String(sug['relax']),
+            money: String(sug['resulting_money_cny'] ?? '')
+        }));
         const wish = v['wish_pool'];
         if (wish) {
             const conds = wish['conditions'];
-            const budgetNote = conds['budget_cny'] ? `、约 ¥${conds['budget_cny']}` : '';
+            const budgetNote = conds['budget_cny'] ? i18nT('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 ? i18nT('md.wish_season', {
+                months: String(months)
+            }) : '';
+            lines.push(i18nT('md.wish_pool', {
+                days: String(conds['days']),
+                budgetNote,
+                season
+            }));
         }
     }
     lines.push('');
     for (const v of feasible){
         const ch = v['chosen'];
-        const t = v['true_cost'];
-        lines.push(`**${v['name']}:可行**` + `(${ch['out_service']} 出发,${ch['out_transfer']} 接驳,` + `起床 ${t['wake']},到达精力 ${t['energy_arrival_pct']}%,` + `门到门 ${t['door_to_door_out']},有效休整 ${t['usable_hours']}h,共 ¥${t['money_cny']})`);
+        const tc = v['true_cost'];
+        lines.push(i18nT('md.feasible_unified', {
+            name: String(v['name']),
+            svc: String(ch['out_service']),
+            mode: String(ch['out_transfer']),
+            wake: String(tc['wake']),
+            energy: String(tc['energy_arrival_pct']),
+            d2d: String(tc['door_to_door_out']),
+            hours: String(tc['usable_hours']),
+            money: String(tc['money_cny'])
+        }));
     }
     if (feasible.length) {
         lines.push('');
         const best = feasible[0];
         const alt = feasible[1];
-        lines.push(`**建议:${best['name']}**(意象匹配 ${(best['imagery_match'] * 100).toFixed(0)}%)。` + (alt ? `备选:${alt['name']}(¥${alt['true_cost']['money_cny']},匹配 ${(alt['imagery_match'] * 100).toFixed(0)}%)。` : ''));
+        lines.push(i18nT('md.recommend', {
+            best: String(best['name']),
+            match: (best['imagery_match'] * 100).toFixed(0)
+        }) + (alt ? i18nT('md.alt', {
+            name: String(alt['name']),
+            money: String(alt['true_cost']['money_cny']),
+            match: (alt['imagery_match'] * 100).toFixed(0)
+        }) : ''));
     }
     lines.push('');
-    lines.push('**待你决定的两个问题**:');
+    lines.push(i18nT('md.decide_two'));
     if (feasible.length >= 2) {
-        lines.push(`1. ${feasible[0]['name']} 还是 ${feasible[1]['name']}?(前者更贴意象,后者更省)`);
+        lines.push(i18nT('md.q_choice', {
+            a: String(feasible[0]['name']),
+            b: String(feasible[1]['name'])
+        }));
     } else if (feasible.length === 1) {
-        lines.push(`1. 就去 ${feasible[0]['name']} 吗?`);
+        lines.push(i18nT('md.q_single', {
+            name: String(feasible[0]['name'])
+        }));
     } else {
-        lines.push('1. 所有候选都不可行——考虑放宽哪条约束?');
+        lines.push(i18nT('md.q_none'));
     }
     const p0 = parked[0];
     const p0wish = p0?.['wish_pool'];
     if (p0wish) {
         const conds = p0wish['conditions'];
-        lines.push(`2. 把 ${p0['name']} 留给「下一次出发」(${conds['days']} 天起),这次先去可行的?`);
+        lines.push(i18nT('md.q_wish', {
+            name: String(p0['name']),
+            days: String(conds['days'])
+        }));
     } else if (feasible.length) {
         const ch = feasible[0]['chosen'];
-        lines.push(`2. 出发班次选 ${ch['out_service']} 还是更晚的?`);
+        lines.push(i18nT('md.q_depart', {
+            id: String(ch['out_service']),
+            dep: ''
+        }));
     }
     return lines.join('\n');
 }

package/dist/src/z3-shared.js

@@ -0,0 +1,18 @@
+let z3Promise = null;
+let chain = Promise.resolve();
+export async function getZ3() {
+    if (!z3Promise) {
+        const { init } = await import('z3-solver');
+        z3Promise = (async ()=>(await init()).Context('main'))();
+    }
+    return z3Promise;
+}
+export async function withZ3(label, session) {
+    const z3 = await getZ3();
+    const turn = chain.then(()=>session(z3));
+    chain = turn.then(()=>undefined, ()=>undefined);
+    return turn;
+}
+
+
+//# sourceURL=/Users/bytedance/work/gotry/ts/src/z3-shared.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danceiny/gotry",
-  "version": "0.0.1-rc.10",
+  "version": "0.0.1-rc.12",
   "description": "GoTry — 从出发到下一次出发的 AI 旅行 Agent(dsh 插件)。npm 包入口 + vendored dsh runtime + 5 行 README 安装路径。",
   "type": "module",
   "main": "ts/src/index.ts",
@@ -47,7 +47,9 @@
     "ts/package.json",
     "cordis.gotry-patch.yml",
     "README.md",
-    "LICENSE"
+    "LICENSE",
+    "ts/capabilities/session-consent.ts",
+    "ts/capabilities/session-login.ts"
   ],
   "engines": {
     "node": ">=22.0.0"
@@ -81,4 +83,4 @@
     "deepseek-harness"
   ],
   "license": "MIT"
-}
+}