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

package/dist/src/memory-utility.js

@@ -1,55 +1,42 @@
+/**
+ * 记忆效用 sidecar(RFC S2,post-outcome-memory-utility-attribution 映射):
+ * 「被召回 ≠ 有用,自称用了 ≠ 让结果变好」——召回/使用/结果/归因四件语义独立记录,
+ * 确定性 reducer 只做投影;verified_outcome 只能来自 owner 确认(owner_correction tier),
+ * 模型永远不能自称「有用」。默认 fail-open:sidecar 缺失/损坏不阻塞主路径。
+ *
+ * 多用户 AaaS 前向兼容(RFC §6.5):append-only 事件流 + 稳定 wish_id,
+ * 未来账本化(CAS/receipt)是存储面替换,语义层零改造。
+ */
+/** 事件幂等键:同 wish 同类同 ctx 同归因 = 同一事件(重放 no-op) */
 export function makeEventId(ev) {
-    return [
-        ev.wish_id,
-        ev.kind,
-        ev.ctx ?? '',
-        ev.attribution ?? ''
-    ].join('|');
+    return [ev.wish_id, ev.kind, ev.ctx ?? '', ev.attribution ?? ''].join('|');
 }
+/** 追加不重复(纯函数,不改入参):同 event_id 已存在 → no-op */
 export function appendEvent(events, ev) {
-    const full = {
-        schema: 'memory_utility_observation.v0',
-        event_id: makeEventId(ev),
-        ...ev
-    };
-    if (events.some((e)=>e.event_id === full.event_id)) return {
-        events,
-        appended: false
-    };
+    const full = { schema: 'memory_utility_observation.v0', event_id: makeEventId(ev), ...ev };
+    if (events.some(e => e.event_id === full.event_id))
+        return { events, appended: false };
     if (ev.kind === 'verified_outcome' && !ev.attribution) {
-        return appendEvent(events, {
-            ...ev,
-            kind: 'applied'
-        });
+        // 无归因的结果不算归因证据:降级为 applied(六件语义不越界)
+        return appendEvent(events, { ...ev, kind: 'applied' });
     }
-    return {
-        events: [
-            ...events,
-            full
-        ],
-        appended: true
-    };
+    return { events: [...events, full], appended: true };
 }
+/** 只读投影:status = 最后一次 verified_outcome 的归因;无 verified_outcome 永远 unknown */
 export function projectUtility(events) {
     const out = {};
-    for (const ev of events){
-        const w = out[ev.wish_id] ??= {
-            wish_id: ev.wish_id,
-            status: 'unknown',
-            recalled: 0,
-            applied: 0,
-            verified: 0
-        };
-        if (ev.kind === 'recalled') w.recalled++;
-        if (ev.kind === 'applied') w.applied++;
+    for (const ev of events) {
+        const w = out[ev.wish_id] ??= { wish_id: ev.wish_id, status: 'unknown', recalled: 0, applied: 0, verified: 0 };
+        if (ev.kind === 'recalled')
+            w.recalled++;
+        if (ev.kind === 'applied')
+            w.applied++;
         if (ev.kind === 'verified_outcome') {
             w.verified++;
-            if (ev.attribution) w.status = ev.attribution;
+            if (ev.attribution)
+                w.status = ev.attribution;
         }
         w.last_event_ts = ev.ts;
     }
     return out;
 }
-
-
-//# sourceURL=/Users/bytedance/work/gotry/ts/src/memory-utility.ts

package/dist/src/mock-llm.js

@@ -1,103 +1,78 @@
+/**
+ * Mock LLM(S2,ADR-8):确定性剧本,重放真实对话的智能侧。
+ * 它不做任何「聪明事」——只按剧本返回抽取结果;循环架构的正确性由此验证,
+ * 与智能质量解耦。S4 接真 LLM 后,本文件留作回归夹具。
+ */
 import { parseFlightPackToSpec } from './unified.js';
+import { mergeProfileWorkWindow } from './flight-pack-adapter.js';
+/** 剧本:来自真实 Kimi 对话里用户给出关键事实的时刻 */
 const SCRIPT = [
     {
         when: '请给我做机票和酒店的行程规划和推荐',
         calendar: {
             year: 2026,
             assertedWeekdays: {
-                '2026-07-17': 'fri',
-                '2026-07-18': 'sat',
-                '2026-07-31': 'fri',
-                '2026-08-01': 'sat',
-                '2026-08-09': 'sun',
-                '2026-08-10': 'mon'
-            }
+                '2026-07-17': 'fri', '2026-07-18': 'sat', '2026-07-31': 'fri',
+                '2026-08-01': 'sat', '2026-08-09': 'sun', '2026-08-10': 'mon',
+            },
         },
-        profile: {
-            companions: [
-                'girlfriend(先在普吉)'
-            ]
-        }
+        profile: { companions: ['girlfriend(先在普吉)'] },
     },
     {
         when: '工作时间',
         profile: {
             workWindow: {
-                homeTzOffsetMin: 240,
-                startMin: 600,
-                endMin: 1140,
-                workdays: [
-                    0,
-                    1,
-                    2,
-                    3,
-                    4
-                ],
-                evidence: '用户原话:我的工作时间是UTC+4的早上10点到下午7点'
-            }
-        }
+                homeTzOffsetMin: 240, startMin: 600, endMin: 1140, workdays: [0, 1, 2, 3, 4],
+                evidence: '用户原话:我的工作时间是UTC+4的早上10点到下午7点',
+            },
+        },
     },
     {
         when: '订了酒店',
         profile: {
             bookedResources: [
-                {
-                    kind: 'hotel',
-                    ref: 'The Title East Wing Rawai(7.18-23, 5 晚)',
-                    window: '2026-07-18~07-23'
-                }
-            ]
-        }
-    }
+                { kind: 'hotel', ref: 'The Title East Wing Rawai(7.18-23, 5 晚)', window: '2026-07-18~07-23' },
+            ],
+        },
+    },
 ];
 export function createMockLlm(flightPackPath, slotScript = []) {
     let stepIdx = 0;
     return {
-        async extractFacts (history, _state) {
+        async extractFacts(history, _state) {
             const last = history[history.length - 1]?.text ?? '';
+            // 剧本顺序消费:真实对话里事实按此顺序浮出;未命中则无新事实
             const step = SCRIPT[stepIdx];
             if (step && last.includes(step.when)) {
                 stepIdx++;
                 return {
                     calendar: step.calendar,
                     profile: step.profile,
-                    assumptions: Object.keys({
-                        ...step.profile
-                    }).map((f)=>({
-                            field: f,
-                            source: 'user-verbatim'
-                        }))
+                    assumptions: Object.keys({ ...step.profile }).map(f => ({ field: f, source: 'user-verbatim' })),
                 };
             }
-            return {
-                assumptions: []
-            };
+            return { assumptions: [] };
         },
-        async extractSpec (history, state) {
-            if (!state.profile.workWindow || !state.profile.bookedResources) return null;
-            if (!flightPackPath) return null;
+        async extractSpec(history, state) {
+            // mock 翻译:工作窗口与已订资源齐备后,「翻译」= 装载航班包并挂上真实工作窗口
+            if (!state.profile.workWindow || !state.profile.bookedResources)
+                return null;
+            if (!flightPackPath)
+                return null;
             const { readFile } = await import('node:fs/promises');
             const pack = JSON.parse(await readFile(flightPackPath, 'utf-8'));
             const spec = parseFlightPackToSpec(pack);
-            spec.workWindow = {
-                homeTzOffsetMin: state.profile.workWindow.homeTzOffsetMin,
-                startMin: state.profile.workWindow.startMin,
-                endMin: state.profile.workWindow.endMin,
-                workdays: state.profile.workWindow.workdays
-            };
-            spec.budgetCny = 9000;
-            return spec;
+            const merged = mergeProfileWorkWindow(spec, state.profile.workWindow);
+            merged.budgetCny = 9000;
+            return merged;
         },
-        async extractSlots (history) {
+        async extractSlots(history) {
             const last = history[history.length - 1]?.text ?? '';
-            const hit = slotScript.find((s)=>last.includes(s.when));
+            const hit = slotScript.find(s => last.includes(s.when));
             return hit ? structuredClone(hit.extraction) : null;
         },
-        async polishQuestion (q) {
+        async polishQuestion(q) {
             return `【${q.key}】${q.text}\n(为什么问:${q.why})`;
-        }
+        },
     };
 }
-
-
-//# sourceURL=/Users/bytedance/work/gotry/ts/src/mock-llm.ts

package/dist/src/model.js

@@ -1,3 +1,10 @@
+/**
+ * Gotry 可行性引擎领域模型(TS 版,与 py/gotry_feasibility/model.py 逐行对齐)。
+ *
+ * 双实现纪律:Python 版是**对照实现(oracle)**,TS 版是产品运行时实现;
+ * 同一输入两版必须给出相同判定(ts/scripts/diff-test.ts 做差分验证)。
+ * 算术(门到门全成本)在此层与求解完全分离,两边各自可测。
+ */
 export function hhmmToMin(s) {
     const [h, m] = s.split(':');
     return Number(h) * 60 + Number(m);
@@ -8,6 +15,7 @@ export function minToHhmm(m) {
 export function requiredUsableHours(mot) {
     return mot.baseUsableHours + mot.escapeHoursPerWeight * (mot.weights['escape_rest'] ?? 0);
 }
+// ---- 精力模型(可校准参数,与 Python 版一致) --------------------------------
 export const WAKE_PENALTY_BEFORE_5 = 30;
 export const WAKE_PENALTY_BEFORE_6 = 25;
 export const WAKE_PENALTY_BEFORE_630 = 15;
@@ -19,56 +27,46 @@ export const DAY2_START_MIN = 9 * 60;
 export const DAY2_QUALITY = 0.9;
 export const LATEST_ARRIVE_STAY_MIN = 18 * 60;
 export function parseMotivation(d) {
-    const hard = d['hard'] ?? {};
-    const rawWeights = d['weights'] ?? d;
+    const hard = (d['hard'] ?? {});
+    const rawWeights = (d['weights'] ?? d);
     const weights = {};
-    for (const [k, v] of Object.entries(rawWeights)){
-        if (typeof v === 'number') weights[k] = v;
+    for (const [k, v] of Object.entries(rawWeights)) {
+        if (typeof v === 'number')
+            weights[k] = v;
     }
     return {
         weights,
         wakeFloorMin: hhmmToMin(String(hard['wake_not_before'] ?? '06:30')),
         minArrivalEnergyPct: Number(hard['min_arrival_energy_pct'] ?? 40),
         baseUsableHours: 4.0,
-        escapeHoursPerWeight: 2.0
+        escapeHoursPerWeight: 2.0,
     };
 }
 export function parseRequest(d) {
     const home = (d['home'] ?? {})['hubs'] ?? {};
     const homeHubAccess = {};
-    for (const [hub, acc] of Object.entries(home)){
-        homeHubAccess[hub] = {
-            hub,
-            toHubMin: Number(acc['to_hub_min'])
-        };
+    for (const [hub, acc] of Object.entries(home)) {
+        homeHubAccess[hub] = { hub, toHubMin: Number(acc['to_hub_min']) };
     }
     return {
         note: String(d['note'] ?? ''),
         motivation: parseMotivation(d['motivation']),
         windowDays: Number(d['window_days']),
         budgetCny: Number(d['budget_cny']),
-        homeHubAccess
+        homeHubAccess,
     };
 }
 function parseService(d) {
-    return {
-        id: String(d['id']),
-        depMin: hhmmToMin(String(d['dep'])),
-        arrMin: hhmmToMin(String(d['arr'])),
-        priceCny: Number(d['price_cny'])
-    };
+    return { id: String(d['id']), depMin: hhmmToMin(String(d['dep'])), arrMin: hhmmToMin(String(d['arr'])), priceCny: Number(d['price_cny']) };
 }
 function parseTransfer(d) {
-    return {
-        mode: String(d['mode']),
-        minutes: Number(d['min']),
-        priceCny: Number(d['price_cny'])
-    };
+    return { mode: String(d['mode']), minutes: Number(d['min']), priceCny: Number(d['price_cny']) };
 }
 export function parseCandidate(d) {
     return {
         id: String(d['id']),
         name: String(d['name']),
+        date: typeof d['date'] === 'string' ? d['date'] : undefined,
         hub: String(d['hub']),
         bufferOutMin: Number(d['buffer_out_min'] ?? 60),
         bufferRetMin: Number(d['buffer_ret_min'] ?? 60),
@@ -79,29 +77,79 @@ export function parseCandidate(d) {
         localDailyCny: Number(d['local_daily_cny']),
         minDaysForPurpose: Number(d['min_days_for_purpose']),
         imageryMatch: Number(d['imagery_match']),
-        bestMonths: (d['best_months'] ?? []).map(Number)
+        bestMonths: (d['best_months'] ?? []).map(Number),
     };
 }
+/** Issue #343 d2d canonical arithmetic。 */
+export class NonpositiveDurationError extends Error {
+    /** 'arr_not_after_dep' | 'legacy_negative_offset' */
+    kind;
+    code = 'nonpositive_duration';
+    constructor(kind, message) {
+        super(message);
+        this.kind = kind;
+        this.name = 'NonpositiveDurationError';
+    }
+}
+/**
+ * 单段门到门时长(分)。v2 路径用真实 UTC instant(跨日 / 反向日界线 / DST 切换正确),
+ * 且强制 `arrUtcMs > depUtcMs` — parse 边界也会再做一次防御性 throw。
+ * v1 路径用墙上分钟差 - tzOffsetMin(原数值口径,字节不变,即使结果为负也照旧返回)。
+ *
+ * v2:arrUtcMs 必须严格大于 depUtcMs;否则抛 NonpositiveDurationError(arr_not_after_dep)。
+ * v1:沿用 legacy 公式,字节不变;不抛错。
+ *
+ * 调用方(unified.ts evaluateOptionMove)只负责拿到 doorToDoorMin 并包装 LegReport。
+ */
+export function doorToDoorFromMove(svc, mv) {
+    if (typeof svc.depUtcMs === 'number' && typeof svc.arrUtcMs === 'number') {
+        if (svc.arrUtcMs <= svc.depUtcMs) {
+            throw new NonpositiveDurationError('arr_not_after_dep', `service ${svc.id}: arrUtcMs (${svc.arrUtcMs}) must be strictly greater than depUtcMs (${svc.depUtcMs})`);
+        }
+        const trueFlightMin = (svc.arrUtcMs - svc.depUtcMs) / 60_000;
+        const doorToDoorMin = mv.bufferMin + mv.originTransferMin + trueFlightMin + mv.destTransferMin;
+        return { trueFlightMin, doorToDoorMin };
+    }
+    // v1 legacy 字节不变:不校验正负,沿用原公式。
+    const trueFlightMin = (svc.arrMin - svc.depMin) - (mv.tzOffsetMin ?? 0);
+    const doorToDoorMin = mv.bufferMin + mv.originTransferMin + trueFlightMin + mv.destTransferMin;
+    return { trueFlightMin, doorToDoorMin };
+}
 export function evaluateChoice(cand, req, ch) {
+    /** 门到门全成本核算(与 Python evaluate_choice 完全一致)。 */
     const access = req.homeHubAccess[cand.hub];
+    const outTransferMin = typeof ch.outTransfer.minutesOut === 'number'
+        ? ch.outTransfer.minutesOut
+        : ch.outTransfer.minutes;
+    const retTransferMin = typeof ch.retTransfer.minutesRet === 'number'
+        ? ch.retTransfer.minutesRet
+        : ch.retTransfer.minutes;
     const wake = ch.outService.depMin - cand.bufferOutMin - access.toHubMin;
-    const arriveStay = ch.outService.arrMin + ch.outTransfer.minutes;
+    const arriveStay = ch.outService.arrMin + outTransferMin;
     const d2dOut = arriveStay - wake;
     let energy = 100;
-    if (wake < 5 * 60) energy -= WAKE_PENALTY_BEFORE_5;
-    else if (wake < 6 * 60) energy -= WAKE_PENALTY_BEFORE_6;
-    else if (wake < hhmmToMin('06:30')) energy -= WAKE_PENALTY_BEFORE_630;
+    if (wake < 5 * 60)
+        energy -= WAKE_PENALTY_BEFORE_5;
+    else if (wake < 6 * 60)
+        energy -= WAKE_PENALTY_BEFORE_6;
+    else if (wake < hhmmToMin('06:30'))
+        energy -= WAKE_PENALTY_BEFORE_630;
     energy -= 2 * TRANSFER_PENALTY;
-    if (arriveStay > 21 * 60) energy -= LATE_ARRIVAL_PENALTY;
-    if (d2dOut > 6 * 60) energy -= LONG_D2D_PENALTY;
+    if (arriveStay > 21 * 60)
+        energy -= LATE_ARRIVAL_PENALTY;
+    if (d2dOut > 6 * 60)
+        energy -= LONG_D2D_PENALTY;
     energy = Math.max(0, energy);
     const day1Raw = Math.max(0, DAY_END_MIN - arriveStay) / 60;
     const day1 = day1Raw * (0.5 + energy / 200);
-    const leaveStayRet = ch.retService.depMin - cand.bufferRetMin - ch.retTransfer.minutes;
+    const leaveStayRet = ch.retService.depMin - cand.bufferRetMin - retTransferMin;
     const day2 = Math.max(0, leaveStayRet - DAY2_START_MIN) / 60 * DAY2_QUALITY;
     const midDays = Math.max(0, ch.days - 2);
     const usable = day1 + day2 + midDays * 8.0 * DAY2_QUALITY;
-    const money = ch.outService.priceCny + ch.retService.priceCny + ch.outTransfer.priceCny + ch.retTransfer.priceCny + cand.stayCnyPerNight * (ch.days - 1) + cand.localDailyCny * ch.days;
+    const money = ch.outService.priceCny + ch.retService.priceCny
+        + ch.outTransfer.priceCny + ch.retTransfer.priceCny
+        + cand.stayCnyPerNight * (ch.days - 1)
+        + cand.localDailyCny * ch.days;
     return {
         moneyCny: money,
         wakeMin: wake,
@@ -112,7 +160,7 @@ export function evaluateChoice(cand, req, ch) {
         usableDay1Hours: day1,
         usableDay2Hours: day2,
         departHomeRetMin: leaveStayRet,
-        arriveHomeRetMin: ch.retService.arrMin + access.toHubMin
+        arriveHomeRetMin: ch.retService.arrMin + access.toHubMin,
     };
 }
 export function trueCostToDict(t) {
@@ -126,9 +174,6 @@ export function trueCostToDict(t) {
         usable_day1_hours: Math.round(t.usableDay1Hours * 10) / 10,
         usable_day2_hours: Math.round(t.usableDay2Hours * 10) / 10,
         leave_stay_return: minToHhmm(t.departHomeRetMin),
-        arrive_home_return: minToHhmm(Math.min(1440, t.arriveHomeRetMin))
+        arrive_home_return: minToHhmm(Math.min(1440, t.arriveHomeRetMin)),
     };
 }
-
-
-//# sourceURL=/Users/bytedance/work/gotry/ts/src/model.ts