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

package/dist/src/memory-capture.js

@@ -1,40 +1,188 @@
-export function mergeProfile(current, patch) {
-    if (!patch) return null;
+/**
+ * T1 动态记忆的合并守门层(M4 记忆域;DeerFlow 研究 T1 落地):
+ *
+ * 分工(founder 校正「正则匹配 rules 不对」后重写):
+ *   - 事实提取 = LLM 的活。契约 (18) 已要求模型当轮把对话透露的新事实
+ *     (预算/日期/窗口/出发地/同伴/实际经历)经 gotry_motivation_save 并入
+ *     画像(evidence=用户原话)——语言理解交给模型,不做第二套正则引擎。
+ *   - 合并守门 = 代码的活。本文件只做三件代码才可靠的事:
+ *     ① 追加不删史(evidence 永不移除,P0 反幻觉:历史依据不可篡改)
+ *     ② 幂等(同 evidence 不重复入池)
+ *     ③ 结构守卫(weights 存在性校验、空补丁拒绝、权重归一)
+ *
+ * 额外承载(issue #338):用户显式声明的常驻城市/默认出发地——typed
+ * homeCity 字段 + 纯函数 resolveDefaultOrigin(explicit origin, profile)。
+ *   - 当前轮显式出发地永远赢(explicit origin > home city > missing)
+ *   - homeCity 变更必须伴新 evidence(P0 与 weights/hard 同向);单条 evidence
+ *     可作为省略 binding 的兼容形态,多条 evidence 必须显式绑定
+ *   - 该契约不触碰算术/求解——只读字段,不进 feasibility/evaluate 路径
+ *
+ * 持久化语义(issue #338):home-city 是 typed self-contained preference
+ * 记录 `{ value, evidence, updated_at }`,与全局 evidence 列表解耦——
+ * 一次不相关的动机补丁不会改写它的「证据指针」「更新时间」「当前值」。
+ * `updated_at` 由调用方在事件边界注入(账本事件行的 ts),mergeProfile
+ * 自身不在 fold 路径里再读时钟——保证 rebuildProjections() 与直读投影
+ * 永不分叉。
+ */
+const ISO_LIKE_TIMESTAMP = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.\d{1,3})?(Z|[+-]\d{2}:\d{2})$/;
+function isNonBlankString(value) {
+    return typeof value === 'string' && value.trim().length > 0;
+}
+function isValidIsoLikeTimestamp(value) {
+    if (typeof value !== 'string')
+        return false;
+    const match = ISO_LIKE_TIMESTAMP.exec(value);
+    if (!match)
+        return false;
+    const year = Number(match[1]);
+    const month = Number(match[2]);
+    const day = Number(match[3]);
+    const hour = Number(match[4]);
+    const minute = Number(match[5]);
+    const second = Number(match[6]);
+    const zone = match[7];
+    const daysInMonth = month === 2
+        ? (year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0) ? 29 : 28)
+        : [31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month - 1];
+    if (!daysInMonth || day < 1 || day > daysInMonth)
+        return false;
+    // ISO permits 24:00:00 as the end-of-day spelling; no other 24:xx value.
+    if (hour > 23 && !(hour === 24 && minute === 0 && second === 0))
+        return false;
+    if (minute > 59 || second > 59)
+        return false;
+    if (zone !== 'Z' && (Number(zone.slice(1, 3)) > 23 || Number(zone.slice(4, 6)) > 59))
+        return false;
+    return Number.isFinite(Date.parse(value));
+}
+/**
+ * Typed home-city preference 的唯一有效性判定。
+ * 不读取、不修写 raw profile;raw homeCity 若存在只作镜像一致性校验。
+ */
+export function isValidHomeCityPreference(profile) {
+    const preference = profile?.homeCityPreference;
+    if (!preference || typeof preference !== 'object' || Array.isArray(preference))
+        return false;
+    const candidate = preference;
+    if (!(candidate.value === null || isNonBlankString(candidate.value)))
+        return false;
+    if (!isNonBlankString(candidate.evidence) || !isValidIsoLikeTimestamp(candidate.updated_at))
+        return false;
+    if (!profile || !Array.isArray(profile.evidence) || !profile.evidence.some(entry => entry === candidate.evidence))
+        return false;
+    if (profile && Object.prototype.hasOwnProperty.call(profile, 'homeCity') && profile.homeCity !== candidate.value)
+        return false;
+    return true;
+}
+/**
+ * 合并守门。纯函数;不读时钟——`now` 由调用方从事件边界(appendMotivationPatch
+ * 写时 ISO 或 foldEvent 重放时 row.ts)注入,保证写路径与重建路径时间戳一致。
+ *
+ * 触发 homeCity 操作的同时,会原地维护 typed homeCityPreference:
+ *   - valid new binding → 新 `{value, evidence: <homeCityEvidence exact string>, updated_at: now}`
+ *   - unchanged → 沿用 base 的 homeCityPreference(若有);缺失 typed 字段保持缺失
+ *   - missing/mismatched/stale binding → 返回 null,由账本跳过整次事件
+ */
+export function mergeProfile(current, patch, now) {
+    if (!patch)
+        return null;
     const base = {
-        weights: current?.weights ?? {},
-        evidence: current?.evidence ?? [],
-        hard: current?.hard ?? {}
-    };
-    const newEvidence = (patch.evidence ?? []).filter(Boolean).filter((e)=>!base.evidence.includes(e));
+        weights: (current?.weights ?? {}),
+        evidence: (current?.evidence ?? []),
+        hard: (current?.hard ?? {}),
+        homeCity: (current?.homeCity === undefined ? undefined : current.homeCity),
+        homeCityPreference: current?.homeCityPreference,
+    }; // 首次保存:无档案即空档案
+    const newEvidence = (patch.evidence ?? []).filter(Boolean).filter(e => !base.evidence.includes(e));
     const patchWeights = patch.weights;
-    const weightsChanged = !!patchWeights && Object.keys(patchWeights).length > 0 && JSON.stringify(patchWeights) !== JSON.stringify(base.weights);
-    const hardChanged = !!patch.hard && Object.keys(patch.hard).length > 0 && JSON.stringify(patch.hard) !== JSON.stringify(base.hard);
-    if (newEvidence.length === 0 && !weightsChanged && !hardChanged) return null;
-    let weights = {
-        ...base.weights
-    };
+    const weightsChanged = !!patchWeights && Object.keys(patchWeights).length > 0 &&
+        JSON.stringify(patchWeights) !== JSON.stringify(base.weights);
+    const hardChanged = !!patch.hard && Object.keys(patch.hard).length > 0 &&
+        JSON.stringify(patch.hard) !== JSON.stringify(base.hard);
+    // homeCity 变更判定:
+    //   patch.homeCity === undefined → 字段未传,不视为变更
+    //   string 先 trim;trim 后空白 → 视作「未传」(避免把空白值当清除语义或无意义值写入)
+    //   trim 后与 base.homeCity 仍不等 → 视为变更(包括 string↔null、null↔undefined 等差异)
+    let patchedHomeCityInput = patch.homeCity;
+    if (typeof patchedHomeCityInput === 'string') {
+        const trimmed = patchedHomeCityInput.trim();
+        patchedHomeCityInput = trimmed.length === 0 ? undefined : trimmed;
+    }
+    const homeCityTouched = patchedHomeCityInput !== undefined;
+    const homeCityChanged = homeCityTouched && patchedHomeCityInput !== base.homeCity;
+    if (!homeCityTouched && patch.homeCityEvidence !== undefined)
+        return null;
+    // homeCity 的语义绑定必须在 profile patch 边界明确给出,不从自然语言或
+    // evidence 数组位置推断。唯一兼容例外:本次只有一条非空 evidence 时,
+    // 该条本身就是 unambiguous binding;多条 evidence 仍必须显式命名。
+    let homeCityEvidence;
+    let homeCityEvidenceIsNew = false;
+    if (homeCityTouched) {
+        const evidenceEntries = patch.evidence ?? [];
+        const candidate = patch.homeCityEvidence !== undefined
+            ? patch.homeCityEvidence
+            : evidenceEntries.length === 1 && isNonBlankString(evidenceEntries[0])
+                ? evidenceEntries[0]
+                : undefined;
+        const appearsInCall = isNonBlankString(candidate) && evidenceEntries.some(e => e === candidate);
+        homeCityEvidenceIsNew = appearsInCall && !base.evidence.includes(candidate);
+        const exactDuplicate = appearsInCall && !homeCityEvidenceIsNew && !homeCityChanged
+            && base.homeCityPreference?.value === patchedHomeCityInput
+            && base.homeCityPreference?.evidence === candidate;
+        if (!appearsInCall || (!homeCityEvidenceIsNew && !exactDuplicate))
+            return null;
+        homeCityEvidence = candidate;
+    }
+    // A same-city/clear operation with a new bound quote is a real preference
+    // update even though the value itself did not change. The exact duplicate
+    // above remains a no-op.
+    const homeCityPreferenceChanged = homeCityTouched && homeCityEvidenceIsNew;
+    if (newEvidence.length === 0 && !weightsChanged && !hardChanged && !homeCityChanged && !homeCityPreferenceChanged)
+        return null;
+    // 权重变更必须伴至少一条新 evidence(P0:改画像要有依据),否则拒该部分
+    let weights = { ...base.weights };
     if (weightsChanged && newEvidence.length > 0 && patchWeights) {
-        weights = {
-            ...weights,
-            ...patchWeights
-        };
-        const sum = Object.values(weights).reduce((a, b)=>a + b, 0);
-        if (sum > 0) for (const k of Object.keys(weights))weights[k] = Math.round(weights[k] / sum * 100) / 100;
+        weights = { ...weights, ...patchWeights };
+        const sum = Object.values(weights).reduce((a, b) => a + b, 0);
+        if (sum > 0)
+            for (const k of Object.keys(weights))
+                weights[k] = Math.round((weights[k] / sum) * 100) / 100;
+    }
+    // homeCity 操作只接受上面验证过的 exact homeCityEvidence 绑定;无关 evidence
+    // 可以继续追加到全局池,但绝不会成为 homeCityPreference 的语义指针。
+    let homeCity = base.homeCity;
+    let homeCityPreference = base.homeCityPreference;
+    if (homeCityPreferenceChanged) {
+        homeCity = patchedHomeCityInput ?? null;
+        if (homeCityEvidence !== undefined) {
+            homeCityPreference = { value: homeCity, evidence: homeCityEvidence, updated_at: now };
+        }
     }
     return {
         weights,
-        evidence: [
-            ...base.evidence,
-            ...newEvidence
-        ],
-        hard: hardChanged ? {
-            ...base.hard,
-            ...patch.hard ?? {}
-        } : {
-            ...base.hard
-        }
+        evidence: [...base.evidence, ...newEvidence],
+        hard: hardChanged ? { ...base.hard, ...(patch.hard ?? {}) } : { ...base.hard },
+        homeCity,
+        homeCityPreference,
     };
 }
-
-
-//# sourceURL=ts/src/memory-capture.ts
+export function resolveDefaultOrigin(currentTripOrigin, profile) {
+    const trimmed = typeof currentTripOrigin === 'string' ? currentTripOrigin.trim() : '';
+    const validTypedPreference = isValidHomeCityPreference(profile);
+    const preference = validTypedPreference ? profile?.homeCityPreference : undefined;
+    const typedValue = preference?.value;
+    const homeCity = validTypedPreference ? typedValue : undefined;
+    if (trimmed) {
+        return { origin: trimmed, source: 'explicit', homeCity, homeCityPreferenceSource: 'none' };
+    }
+    if (validTypedPreference && typeof typedValue === 'string') {
+        return {
+            origin: typedValue.trim(),
+            source: 'home_default',
+            homeCity,
+            homeCityEvidence: [preference.evidence],
+            homeCityPreferenceSource: 'typed',
+        };
+    }
+    return { origin: null, source: 'missing', homeCity, homeCityPreferenceSource: 'none' };
+}

package/dist/src/memory-decay.js

@@ -1,31 +1,47 @@
+/**
+ * 时间窗衰减原语(memory-design P3):行为偏好的新鲜度置信度——
+ * 30/90/180/365d 分级窗口,确定性纯函数;**只降不删**(历史事件永远在,
+ * 衰减只作用于读时置信度);地板 0.1(记忆永不因旧而消失)。
+ *
+ * 边界(memory-design §4 P3):衰减只作用于**行为事件**(效用 sidecar 等);
+ * 动机权重层零衰减——动机跨年稳定是产品设计 §4 的明文(个性化的锚点),
+ * 本模块不提供任何作用于 motivation-profile 的 API(构造性保证)。
+ *
+ * 未来消费方(行为偏好层落地时):同原语直接复用,窗口即配置。
+ */
+/** 分级窗口:age(天)→ 因子;单调不增,地板 0.1(只降不删) */
 export function windowFactor(ageDays) {
-    if (ageDays <= 30) return 1.0;
-    if (ageDays <= 90) return 0.75;
-    if (ageDays <= 180) return 0.5;
-    if (ageDays <= 365) return 0.25;
+    if (ageDays <= 30)
+        return 1.0;
+    if (ageDays <= 90)
+        return 0.75;
+    if (ageDays <= 180)
+        return 0.5;
+    if (ageDays <= 365)
+        return 0.25;
     return 0.1;
 }
-export const KIND_WEIGHT = {
-    recalled: 0.25,
-    applied: 0.5,
-    verified_outcome: 1.0
-};
+/** 事件种类权重:verified_outcome 最强,recalled 最弱(自称被召回 ≠ 有用) */
+export const KIND_WEIGHT = { recalled: 0.25, applied: 0.5, verified_outcome: 1.0 };
 export function ageDaysOf(ts, now) {
     const then = new Date(ts).getTime();
-    if (Number.isNaN(then)) return Number.POSITIVE_INFINITY;
+    if (Number.isNaN(then))
+        return Number.POSITIVE_INFINITY;
     return Math.max(0, (now.getTime() - then) / 86_400_000);
 }
+/** 单事件衰减分:KIND_WEIGHT × windowFactor;未知时间戳按地板(不猜) */
 export function eventDecayScore(ev, now) {
     const w = KIND_WEIGHT[ev.kind] ?? 0;
     return round4(w * windowFactor(ageDaysOf(ev.ts, now)));
 }
+/**
+ * 单条记忆的新鲜置信度 ∈ [0,1]:Σ 事件衰减分,上界 1。
+ * 同 wish 同窗口内事件越多置信越高(有界);旧事件只做地板贡献。
+ */
 export function decayedConfidence(events, now) {
-    const sum = events.reduce((acc, ev)=>acc + eventDecayScore(ev, now), 0);
+    const sum = events.reduce((acc, ev) => acc + eventDecayScore(ev, now), 0);
     return round4(Math.min(1, sum));
 }
 function round4(x) {
     return Math.round(x * 10_000) / 10_000;
 }
-
-
-//# sourceURL=ts/src/memory-decay.ts