@danceiny/gotry 0.0.1-rc.21 → 0.0.1-rc.24

package/dist/src/companions.js

@@ -1,56 +1,55 @@
+/**
+ * 同行人档案(memory-design M5 层,P2):同行人及其约束(行动/健康/偏好)的持久化。
+ *
+ * 立场(memory-design §1):
+ *  - 溯源 P0:每条约束伴 evidence(用户原话),追加不删史;
+ *  - 约束只进排序与行程结构建议,永不进硬过滤;
+ *  - **负面清单守卫**:证件号/电话/地址等敏感字段拒收入库(需要时后端从登录态
+ *    填充,fail-closed)——health 存的是「高血压/晕车」这类行为约束,不是病历;
+ *  - upsert 合并语义同 mergeProfile:追加不删史/同内容幂等。
+ */
+/** 负面清单:命中即拒收(红线 6 + 隐私立场) */
 const SENSITIVE_PATTERNS = [
-    {
-        re: /\d{15,17}[Xx]?/,
-        label: '疑似证件号/卡号'
-    },
-    {
-        re: /1[3-9]\d{9}/,
-        label: '疑似手机号'
-    },
-    {
-        re: /(护照|身份证|证件号|通行证)\s*号?\s*[:：]?\s*\w+/i,
-        label: '证件信息'
-    }
+    { re: /\d{15,17}[Xx]?/, label: '疑似证件号/卡号' },
+    { re: /1[3-9]\d{9}/, label: '疑似手机号' },
+    { re: /(护照|身份证|证件号|通行证)\s*号?\s*[:：]?\s*\w+/i, label: '证件信息' },
 ];
+/** 守门:内容命中负面清单 → 返回拒收理由;否则 null */
 export function sensitiveViolation(text) {
-    for (const { re, label } of SENSITIVE_PATTERNS){
-        if (re.test(text)) return `负面清单拒收:${label}不入库(需要时由后端从登录态填充)`;
+    for (const { re, label } of SENSITIVE_PATTERNS) {
+        if (re.test(text))
+            return `负面清单拒收:${label}不入库(需要时由后端从登录态填充)`;
     }
     return null;
 }
+/** 稳定主键:label 去空白 */
 export function companionId(label) {
     return label.replace(/\s+/g, '');
 }
 function mergeStrArray(oldArr, newArr) {
     const a = oldArr ?? [];
     let added = false;
-    for (const x of newArr ?? []){
+    for (const x of newArr ?? []) {
         if (!a.includes(x)) {
             a.push(x);
             added = true;
         }
     }
-    return {
-        merged: a,
-        added
-    };
+    return { merged: a, added };
 }
+/**
+ * upsert 合并(纯函数,不改入参):同 companion_id 按 label 归并——
+ * constraints 逐字段取新值(新值覆盖旧行为约束,追加数组项),evidence 追加不删史,
+ * 全量无新增 → 幂等 no-op(appended:false)。
+ */
 export function upsertCompanion(profiles, patch) {
-    if (!patch.label?.trim()) return {
-        profiles,
-        appended: false,
-        companionId: '',
-        reason: 'label 必填'
-    };
+    if (!patch.label?.trim())
+        return { profiles, appended: false, companionId: '', reason: 'label 必填' };
     const violation = sensitiveViolation(JSON.stringify(patch));
-    if (violation) return {
-        profiles,
-        appended: false,
-        companionId: '',
-        reason: violation
-    };
+    if (violation)
+        return { profiles, appended: false, companionId: '', reason: violation };
     const id = companionId(patch.label);
-    const existing = profiles.find((p)=>p.companion_id === id);
+    const existing = profiles.find(p => p.companion_id === id);
     if (!existing) {
         const full = {
             schema: 'companion_profile.v1',
@@ -58,55 +57,30 @@ export function upsertCompanion(profiles, patch) {
             label: patch.label.trim(),
             constraints: {
                 mobility: patch.constraints.mobility,
-                health: patch.constraints.health ? [
-                    ...patch.constraints.health
-                ] : undefined,
-                prefs: patch.constraints.prefs ? [
-                    ...patch.constraints.prefs
-                ] : undefined
+                health: patch.constraints.health ? [...patch.constraints.health] : undefined,
+                prefs: patch.constraints.prefs ? [...patch.constraints.prefs] : undefined,
             },
-            evidence: [
-                patch.evidence
-            ],
-            ts: new Date().toISOString()
-        };
-        return {
-            profiles: [
-                ...profiles,
-                full
-            ],
-            appended: true,
-            companionId: id
+            evidence: [patch.evidence],
+            ts: new Date().toISOString(),
         };
+        return { profiles: [...profiles, full], appended: true, companionId: id };
     }
     const mergedConstraints = {
         mobility: patch.constraints.mobility ?? existing.constraints.mobility,
         health: mergeStrArray(existing.constraints.health, patch.constraints.health).merged,
-        prefs: mergeStrArray(existing.constraints.prefs, patch.constraints.prefs).merged
+        prefs: mergeStrArray(existing.constraints.prefs, patch.constraints.prefs).merged,
     };
-    const ev = mergeStrArray(existing.evidence, [
-        patch.evidence
-    ]);
+    const ev = mergeStrArray(existing.evidence, [patch.evidence]);
     const healthLen = mergedConstraints.health?.length ?? 0;
     const prefsLen = mergedConstraints.prefs?.length ?? 0;
-    const changed = mergedConstraints.mobility !== existing.constraints.mobility || healthLen !== (existing.constraints.health?.length ?? 0) || prefsLen !== (existing.constraints.prefs?.length ?? 0) || ev.added;
-    if (!changed) return {
-        profiles,
-        appended: false,
-        companionId: id
-    };
-    const next = profiles.map((p)=>p.companion_id === id ? {
-            ...p,
-            constraints: mergedConstraints,
-            evidence: ev.merged,
-            ts: new Date().toISOString()
-        } : p);
-    return {
-        profiles: next,
-        appended: true,
-        companionId: id
-    };
+    const changed = mergedConstraints.mobility !== existing.constraints.mobility ||
+        healthLen !== (existing.constraints.health?.length ?? 0) ||
+        prefsLen !== (existing.constraints.prefs?.length ?? 0) ||
+        ev.added;
+    if (!changed)
+        return { profiles, appended: false, companionId: id };
+    const next = profiles.map(p => p.companion_id === id
+        ? { ...p, constraints: mergedConstraints, evidence: ev.merged, ts: new Date().toISOString() }
+        : p);
+    return { profiles: next, appended: true, companionId: id };
 }
-
-
-//# sourceURL=ts/src/companions.ts

package/dist/src/contracts.js

@@ -1,64 +1,42 @@
+/**
+ * Stage 1 契约层(S1,docs/design/stage1-top-down-design.md §2)——顶层数据与工具面契约。
+ *
+ * 自顶向下纪律:本文件是唯一权威契约。实现(mock 循环/求解器挂载/真 LLM)都向这里对齐;
+ * 契约变更需走设计文档升版,不随实现漂移。
+ * 责任铁律:LLM 只做问句组织/翻译/解释;判定与算术永远是确定性组件。
+ */
+/** 工具注册表:名字 → IO 类型(dsh 插件按此生成 parameters/output schema) */
 export const TOOL_CONTRACTS = {
     'gotry_interview_next': {},
     'gotry_spec_extract': {},
     'gotry_solve': {},
     'gotry_render': {},
-    'gotry_wish_pool_add': {}
+    'gotry_wish_pool_add': {},
 };
+// ---- wire schema(dsh 注册用的 JSON Schema 面;type:'json' 根 + 关键字段文档) ----
 export const TRIP_STATE_JSON_SCHEMA = {
     type: 'object',
     additionalProperties: false,
     properties: {
         calendar: {
-            type: 'object',
-            additionalProperties: true,
-            description: '年份与已断言的星期映射;一次断言终身使用,冲突必须显式指出'
+            type: 'object', additionalProperties: true,
+            description: '年份与已断言的星期映射;一次断言终身使用,冲突必须显式指出',
         },
         profile: {
-            type: 'object',
-            additionalProperties: true,
-            description: 'workWindow(带 evidence)/companions/budgetTier/bookedResources/motivation'
-        },
-        spec: {
-            type: 'json',
-            description: '统一行程模型 JourneySpec(见 unified.ts)'
-        },
-        solve: {
-            type: 'json',
-            description: '求解结果(锚点/排除/红旗/建议)'
+            type: 'object', additionalProperties: true,
+            description: 'workWindow(带 evidence)/companions/budgetTier/bookedResources/motivation',
         },
+        spec: { type: 'json', description: '统一行程模型 JourneySpec(见 unified.ts)' },
+        solve: { type: 'json', description: '求解结果(锚点/排除/红旗/建议)' },
         gates: {
             type: 'array',
             description: '待决问题,只能是选择题',
             items: {
-                type: 'object',
-                additionalProperties: true,
-                properties: {
-                    id: {
-                        type: 'string'
-                    },
-                    question: {
-                        type: 'string'
-                    }
-                }
-            }
+                type: 'object', additionalProperties: true,
+                properties: { id: { type: 'string' }, question: { type: 'string' } },
+            },
         },
-        wishes: {
-            type: 'array',
-            description: '「下一次出发」清单',
-            items: {
-                type: 'object',
-                additionalProperties: true
-            }
-        }
+        wishes: { type: 'array', description: '「下一次出发」清单', items: { type: 'object', additionalProperties: true } },
     },
-    required: [
-        'calendar',
-        'profile',
-        'gates',
-        'wishes'
-    ]
+    required: ['calendar', 'profile', 'gates', 'wishes'],
 };
-
-
-//# sourceURL=ts/src/contracts.ts

package/dist/src/dsh-llm.js

@@ -1,39 +1,38 @@
+/**
+ * 真 LlmPort:OpenAI 兼容接口的 provider 中立适配器(DeepSeek/MiniMax-M2 实测)。
+ * 零新依赖(node 内建 fetch)。环境变量:LLM_API_KEY/LLM_BASE_URL/LLM_MODEL
+ * (兼容旧 DEEPSEEK_* 别名)。MiniMax-M2 是推理模型:输出带 <think> 块,
+ * 必须先剥离再解析——JSON 藏在 think 里是常见失败模式。
+ * 无 key 时抛出明确错误,replay-real 自动回退 mock(ADR-8)。
+ * 责任铁律不变:本适配器只做翻译/润色/解释,判定与算术在确定性组件。
+ */
 import { parseFlightPackToSpec } from './unified.js';
 import { buildTimeAnchor } from './time-anchor.js';
 import { buildSlotSystem, flagExpiredSlots, normalizeExtraction } from './travel-slots.js';
-const model = ()=>process.env['LLM_MODEL'] ?? process.env['DEEPSEEK_MODEL'] ?? 'MiniMax-M2';
-const base = ()=>(process.env['LLM_BASE_URL'] ?? process.env['DEEPSEEK_BASE_URL'] ?? 'https://api.minimax.io/v1').replace(/\/$/, '');
+import { mergeProfileWorkWindow } from './flight-pack-adapter.js';
+// 惰性读取(env 在调用时取值):模块顶常量会在 .env 加载前冻结(ESM import 提升),
+// 脚本先 loadEnv 再 import 也救不了——401 错配(key 发往默认端点)的存量隐患由此根除。
+const model = () => process.env['LLM_MODEL'] ?? process.env['DEEPSEEK_MODEL'] ?? 'MiniMax-M2';
+const base = () => (process.env['LLM_BASE_URL'] ?? process.env['DEEPSEEK_BASE_URL'] ?? 'https://api.minimax.io/v1').replace(/\/$/, '');
 function emptyUsage() {
-    return {
-        calls: 0,
-        inputTokens: 0,
-        outputTokens: 0,
-        inputCacheHitTokens: 0,
-        inputCacheMissTokens: 0,
-        responsesMissingUsage: 0
-    };
+    return { calls: 0, inputTokens: 0, outputTokens: 0, inputCacheHitTokens: 0, inputCacheMissTokens: 0, responsesMissingUsage: 0 };
 }
 async function chat(messages, json, usage) {
     const key = process.env['LLM_API_KEY'] ?? process.env['DEEPSEEK_API_KEY'];
-    if (!key) throw new Error('LLM_API_KEY 未设置(兼容 DEEPSEEK_API_KEY 别名)——真 LLM 路径不可用,请回退 mock(ADR-8)');
+    if (!key)
+        throw new Error('LLM_API_KEY 未设置(兼容 DEEPSEEK_API_KEY 别名)——真 LLM 路径不可用,请回退 mock(ADR-8)');
     const res = await fetch(`${base()}/chat/completions`, {
         method: 'POST',
-        headers: {
-            'Content-Type': 'application/json',
-            Authorization: `Bearer ${key}`
-        },
+        headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${key}` },
         body: JSON.stringify({
             model: model(),
             messages,
-            ...json ? {
-                response_format: {
-                    type: 'json_object'
-                }
-            } : {},
-            temperature: json ? 0 : 0.7
-        })
+            ...(json ? { response_format: { type: 'json_object' } } : {}),
+            temperature: json ? 0 : 0.7,
+        }),
     });
-    if (!res.ok) throw new Error(`llm ${res.status}: ${(await res.text()).slice(0, 300)}`);
+    if (!res.ok)
+        throw new Error(`llm ${res.status}: ${(await res.text()).slice(0, 300)}`);
     const data = await res.json();
     if (usage) {
         usage.calls += 1;
@@ -42,157 +41,120 @@ async function chat(messages, json, usage) {
             usage.inputTokens += u.prompt_tokens ?? 0;
             usage.outputTokens += u.completion_tokens ?? 0;
             usage.inputCacheHitTokens += u.prompt_cache_hit_tokens ?? 0;
-            usage.inputCacheMissTokens += u.prompt_cache_miss_tokens ?? u.prompt_tokens ?? 0;
-        } else {
+            // 无缓存明细的 provider:全部输入按 miss 记(随后按 peak miss 价换算,只高不低)
+            usage.inputCacheMissTokens += u.prompt_cache_miss_tokens ?? (u.prompt_tokens ?? 0);
+        }
+        else {
             usage.responsesMissingUsage += 1;
         }
     }
     const raw = data.choices[0]?.message?.content ?? '';
+    // 推理模型(MiniMax-M2 等):剥 <think> 块,只留正文;未闭合时留全文由上层容错
     return raw.replace(/<think>[\s\S]*?<\/think>/g, '').trim() || raw;
 }
+/** 从模型输出稳健地抠出 JSON 对象(容忍围栏/前后文) */
 function parseJsonBlock(text) {
     const m = text.match(/\{[\s\S]*\}/);
-    if (!m) return null;
+    if (!m)
+        return null;
     try {
         return JSON.parse(m[0]);
-    } catch  {
+    }
+    catch {
         return null;
     }
 }
 const FACTS_SYSTEM = `你是旅行规划的事实抽取器。从对话中抽取两类事实并以 JSON 返回:
 {"calendar": {"year": 数字, "assertedWeekdays": {"YYYY-MM-DD": "mon|tue|wed|thu|fri|sat|sun"}},
- "profile": {"workWindow": {"homeTzOffsetMin": 数字, "startMin": 数字, "endMin": 数字, "workdays": [0,1,2,3,4], "evidence": "用户原话"},
+ "profile": {"workWindow": {"homeTzOffsetMin": 数字(仅 legacy v1;用户未明确时可省略), "startMin": 数字, "endMin": 数字, "workdays": [0,1,2,3,4], "evidence": "用户原话"},
               "companions": ["..."], "budgetTier": "economy|comfort|convenience",
               "bookedResources": [{"kind": "flight|hotel", "ref": "...", "window": "..."}]}}
-只放用户明确说过的事实;没有的字段省略。分钟数从 HH:MM 换算;UTC+4 → homeTzOffsetMin=240。
+只放用户明确说过的事实;没有的字段省略。分钟数从 HH:MM 换算;用户未明确说 numeric offset 时不要猜、不要输出 homeTzOffsetMin;v2 pack 的 IANA home zone 属于数据层权威。
 **休假语义(关键)**:用户说「请假/年假/不用办公/休假」→ workWindow 输出 {"vacation": true}(不是省略!省略会触发重复追问);只有用户明确给了工作时间才输出完整 workWindow 对象。只输出 JSON。`;
 const SKELETON_SYSTEM = `你是行程骨架抽取器。从对话中抽取行程的**骨架**——段(移动)与锚点,不包含任何班次数据(班次来自数据层,你不要编造时刻/价格/航班号)。
 输出 JSON:{"scenario":"erhai|workation|yunnan|generic","segments":[{"id":"f1","role":"choice|fixed","route":"HKG->HKT","dateHint":"2026-07-18","anchors":{"arriveByMin":885}}]}
 规则:每个跨城移动一段;锚点只放用户明说或必然的(如"当天到"→arriveByMin 23:59=1439);时刻用当日分钟。
 scenario 判定:「洱海/大理/千岛湖/太湖+选目的地」→erhai(候选集);「普吉/workation/远程办公+多城链」→workation(五段链);「云南/大理丽江」→yunnan;不确定→generic。只输出 JSON。`;
-export function createOpenAICompatLlm(flightPackPath, clock = ()=>new Date()) {
+export function createOpenAICompatLlm(flightPackPath, clock = () => new Date()) {
     const pack = flightPackPath;
     const usage = emptyUsage();
-    const historyText = (h)=>h.map((t)=>`${t.role === 'user' ? '用户' : '助手'}: ${t.text}`).join('\n');
-    const anchorContext = ()=>`时间锚点卡:\n${buildTimeAnchor(clock()).card}`;
+    const historyText = (h) => h.map(t => `${t.role === 'user' ? '用户' : '助手'}: ${t.text}`).join('\n');
+    // 时间锚点卡:每条抽取链路都带上「今天」——legacy 路径此前无时间注入,
+    // 过期/相对日期语义全靠它(算术在 time-anchor 层,LLM 只查卡)。
+    const anchorContext = () => `时间锚点卡:\n${buildTimeAnchor(clock()).card}`;
     return {
-        async extractFacts (history) {
-            const out = await chat([
-                {
-                    role: 'system',
-                    content: FACTS_SYSTEM
-                },
-                {
-                    role: 'user',
-                    content: `${anchorContext()}\n\n${historyText(history)}`
-                }
-            ], true, usage);
+        async extractFacts(history) {
+            const out = await chat([{ role: 'system', content: FACTS_SYSTEM }, { role: 'user', content: `${anchorContext()}\n\n${historyText(history)}` }], true, usage);
             const obj = parseJsonBlock(out);
-            if (!obj) return {
-                assumptions: []
-            };
+            if (!obj)
+                return { assumptions: [] };
             const calendar = obj['calendar'];
             const profile = obj['profile'];
-            const assumptions = Object.keys(profile ?? {}).map((f)=>({
-                    field: f,
-                    source: 'user-verbatim'
-                }));
-            return {
-                calendar,
-                profile,
-                assumptions
-            };
+            const assumptions = Object.keys(profile ?? {}).map(f => ({ field: f, source: 'user-verbatim' }));
+            return { calendar, profile, assumptions };
         },
-        async extractSpec (history, state) {
+        async extractSpec(history, state) {
+            // 架构(ADR-10):LLM 只产骨架与锚点;班次数据永远来自能力层(数据包/未来实时API)
             const context = `${anchorContext()}\n已断言日历:${JSON.stringify(state.calendar.assertedWeekdays)}\nprofile:${JSON.stringify(state.profile)}`;
-            const out = await chat([
-                {
-                    role: 'system',
-                    content: SKELETON_SYSTEM
-                },
-                {
-                    role: 'user',
-                    content: `${context}\n\n${historyText(history)}`
-                }
-            ], true, usage);
+            const out = await chat([{ role: 'system', content: SKELETON_SYSTEM }, { role: 'user', content: `${context}\n\n${historyText(history)}` }], true, usage);
             const skeleton = parseJsonBlock(out);
-            if (!skeleton || !Array.isArray(skeleton['segments']) || skeleton['segments'].length === 0) return null;
-            if (!pack) return null;
+            if (!skeleton || !Array.isArray(skeleton['segments']) || skeleton['segments'].length === 0)
+                return null;
+            // 能力层装数据:航班包提供 services;骨架按段 id 合并锚点
+            if (!pack)
+                return null;
             const { readFile } = await import('node:fs/promises');
             const scenario = String(skeleton['scenario'] ?? 'generic');
-            if (scenario === 'generic') return null;
+            // 场景→数据包路由(薄壳段3:意图决定装哪个包,而非永远装通用包)
+            // generic 不装包——意图不明确时不进求解,让循环继续访谈(ADR-10:翻译不造数)
+            if (scenario === 'generic')
+                return null;
             const packByScenario = {
                 erhai: pack.replace('flights_2026.json', 'golden_erhai.json'),
-                workation: pack,
-                yunnan: pack.replace('flights_2026.json', 'yunnan-pack.json')
+                workation: pack, // 五段链
+                yunnan: pack.replace('flights_2026.json', 'yunnan-pack.json'),
             };
             const packPath = packByScenario[scenario];
-            if (!packPath) return null;
+            if (!packPath)
+                return null;
             let packSpec;
             try {
                 if (scenario === 'erhai') {
-                    return {
-                        segments: [],
-                        note: 'erhai-candidates',
-                        budgetCny: 3000
-                    };
+                    // 洱海 = 候选集场景:不装五段链,返回洱海候选 spec 的轻量标记(由引擎的候选求解处理;
+                    // 循环层看到 scenario=erhai 时走 solveChoiceSegment 而非 solveUnified)
+                    return { segments: [], note: 'erhai-candidates', budgetCny: 3000 };
                 }
                 packSpec = parseFlightPackToSpec(JSON.parse(await readFile(packPath, 'utf-8')));
-            } catch  {
+            }
+            catch {
                 return null;
             }
-            const anchorsById = new Map(skeleton['segments'].map((s)=>[
-                    String(s['id'] ?? ''),
-                    s['anchors'] ?? {}
-                ]));
-            for (const seg of packSpec.segments){
+            const anchorsById = new Map(skeleton['segments'].map(s => [String(s['id'] ?? ''), (s['anchors'] ?? {})]));
+            for (const seg of packSpec.segments) {
                 const a = anchorsById.get(seg.id);
-                if (a?.arriveByMin !== undefined) seg.anchors = {
-                    arriveByMin: a.arriveByMin
-                };
+                if (a?.arriveByMin !== undefined)
+                    seg.anchors = { arriveByMin: a.arriveByMin };
             }
-            packSpec.workWindow = state.profile.workWindow ? {
-                homeTzOffsetMin: state.profile.workWindow.homeTzOffsetMin,
-                startMin: state.profile.workWindow.startMin,
-                endMin: state.profile.workWindow.endMin,
-                workdays: state.profile.workWindow.workdays
-            } : undefined;
+            packSpec = mergeProfileWorkWindow(packSpec, state.profile.workWindow);
             packSpec.budgetCny = 9000;
             return packSpec;
         },
-        async extractSlots (history, now) {
+        async extractSlots(history, now) {
+            // now 可注入(评测固定锚点);过期判定在 flagExpiredSlots(代码层),模型只管逐字抽取
             const anchor = buildTimeAnchor(now ?? clock());
-            const out = await chat([
-                {
-                    role: 'system',
-                    content: buildSlotSystem(anchor)
-                },
-                {
-                    role: 'user',
-                    content: historyText(history)
-                }
-            ], true, usage);
+            const out = await chat([{ role: 'system', content: buildSlotSystem(anchor) }, { role: 'user', content: historyText(history) }], true, usage);
             const obj = parseJsonBlock(out);
-            if (!obj) return null;
-            const ext = normalizeExtraction(obj, history.map((t)=>t.text).join('\n'));
+            if (!obj)
+                return null;
+            // language 判定归代码层(detectLanguage),模型输出仅供参考;过期判定同在代码层
+            const ext = normalizeExtraction(obj, history.map(t => t.text).join('\n'));
             return ext ? flagExpiredSlots(ext, anchor) : null;
         },
-        async polishQuestion (q) {
-            const out = await chat([
-                {
-                    role: 'system',
-                    content: '把旅行规划的追问润色得更自然,保留全部信息(含为什么问),一两句话,不要加表情。'
-                },
-                {
-                    role: 'user',
-                    content: `【${q.key}】${q.text}(为什么问:${q.why})`
-                }
-            ], false, usage);
+        async polishQuestion(q) {
+            const out = await chat([{ role: 'system', content: '把旅行规划的追问润色得更自然,保留全部信息(含为什么问),一两句话,不要加表情。' },
+                { role: 'user', content: `【${q.key}】${q.text}(为什么问:${q.why})` }], false, usage);
             return out.trim() || `【${q.key}】${q.text}`;
         },
-        usage
+        usage,
     };
 }
-
-
-//# sourceURL=ts/src/dsh-llm.ts