@danceiny/gotry 0.2.0-rc.27 → 0.2.0-rc.28

package/dist/src/index.js

@@ -24,7 +24,8 @@ import { interpretArgs } from './tool-packet.js';
 import { projectUtility } from './memory-utility.js';
 import { pickNudgeWish } from './wish-pool.js';
 import { resolveTimelineDate } from './travel-timeline.js';
-import { ensureLedger, readCompanionsWithFallback, readMotivationWithFallback, readTripsWithFallback } from './state-ledger.js';
+import { ensureLedger, openLedgerIfExists, readCompanionsWithFallback, readMotivationWithFallback, readTripsWithFallback } from './state-ledger.js';
+import { applyZoneNote, bindZoneSession, boundZoneSession, isZoneObservableTool, observeToolResult, promoteWithRouting, renderSessionZoneBrief, resolveZoneSwitch, zoneScopeOfExec, zoneSessionRefFromExec, } from './session-zone-wiring.js';
 import { isValidHomeCityPreference, resolveDefaultOrigin } from './memory-capture.js';
 import { applyPlanningWindow } from './loop.js';
 import { buildTimeAnchor } from './time-anchor.js';
@@ -84,6 +85,7 @@ export const Config = z.object({
     timeoutMs: z.number().default(30_000),
     hbcliBin: z.string().default('hbcli'),
     sessionAccess: z.string().default('ask'),
+    sessionZones: z.string().default('off'),
     benchmarkEnvironmentConfigPath: z.string().default(''),
     lavishAxiPackageRoot: z.string().default(''),
 });
@@ -450,6 +452,9 @@ export function apply(ctx, config, seams = {}) {
     }
     // 时间感知:注册动态变量,persona 里用 {{current_date}} 引用。
     // 每次 assemble 时取系统时钟——LLM 始终知道「今天是几号」。
+    // provider 收到本次组装的 AssembleContext(dsh-system-prompt 契约:
+    // `variable(name, provider: (context: AssembleContext) => string | undefined)`);
+    // `scope` 是不透明、按身份比较的 ScopeKey —— 分区读回据此分辨会话。
     const sp = ctx['systemPrompt'];
     sp?.variable?.('current_date', () => {
         const d = new Date();
@@ -464,6 +469,32 @@ export function apply(ctx, config, seams = {}) {
     // 模型都是盲的、重新访谈——「回访规划时长降 ≥50%」不可能成立。这里把画像
     // 渲染成紧凑 brief 注入 persona;为空 = 首访。与当轮说法冲突时以用户为准。
     sp?.variable?.('motivation_brief', () => renderMotivationBrief(config.stateRoot ?? '.'));
+    // 会话双区记忆读回(issue #255 P4-3,design/session-dual-zone-memory-design.md §5):
+    // 变量恒注册(persona 侧可随时引用),但总闸 off(默认)时恒返回空串 —— 接线惰性,
+    // 不建库、不读库、零事件;persona 模板本身不在本 PR 改动,因此开关 off 时注入面
+    // 输出逐字节不变。空串 = 首访/无活笔记(与 motivation_brief 同纪律)。
+    // 会话双区读回(issue #255 P4-3):**只在总闸 on 时注册**。
+    //  - 为什么是条件注册:默认关必须与 main **不可区分**——注入面多出一个变量名
+    //    就已经是可观测差异(§48 benchmark-environment-bridge-tests 的
+    //    「normal product mode keeps its prompt variables」逐项断言会红)。
+    //    出厂 persona(cordis.gotry-patch.yml)今天不引用本变量,所以条件注册安全。
+    //  - **后续约束**:创始人一旦把 `{{session_zone_brief}}` 写进出厂 persona,
+    //    本变量必须改为**无条件注册**(关闸时返回空串)——strict 插值下未注册的
+    //    引用会让整段 persona 渲染失败。那一步同时要改 §48 的变量清单断言、
+    //    persona-surface-guard-tests 的注入面清单与 benchmark-environment-bridge-e2e
+    //    的 CANONICAL_RAW_VARIABLES。
+    //  - 读回按**组装 scope** 取会话身份(dsh agent-loop 以 agent 对象为 ScopeKey,
+    //    与工具侧 exec.agent 同一身份):同一宿主进程里的两个会话因此读不到对方的
+    //    resource 层笔记(设计 §1.1);取不到 scope → 不出 resource 段(fail-closed)。
+    const zoneSwitch = resolveZoneSwitch(config.sessionZones);
+    if (zoneSwitch === 'on') {
+        sp?.variable?.('session_zone_brief', assembleContext => renderSessionZoneBrief({
+            ledger: openLedgerIfExists(config.stateRoot ?? '.'),
+            now: new Date().toISOString(),
+            sessionRef: boundZoneSession(assembleContext?.scope),
+            zoneSwitch,
+        }));
+    }
     // 通道路由卡(通道注册表生成,docs/design/tool-orchestration-design.md §2.1/D-8):
     // persona 检索条款只留行为契约,机/火/酒通道顺位与额度口径查卡——prose 教义
     // 变查表教义,注册表加通道卡片自动一致。
@@ -537,6 +568,30 @@ export function apply(ctx, config, seams = {}) {
         if (typeof t.execute === 'function') {
             t.execute = guardToolExecute(String(t.name), config.stateRoot ?? '.', t.execute);
         }
+        // 工具观察捕获缝(issue #255 P4-3):总闸 on 且工具在闭集白名单内才包裹——
+        // off(默认)时 execute 一层不多包,行为逐字节不变。捕获只投影形状字段
+        // (verdict/条数/价格带),证据只走指针;捕获失败永不影响工具返回值。
+        if (zoneSwitch === 'on' && typeof t.execute === 'function' && isZoneObservableTool(t.name)) {
+            const inner = t.execute;
+            const toolName = String(t.name);
+            t.execute = async (args, exec) => {
+                const result = await inner(args, exec);
+                try {
+                    const sessionRef = zoneSessionRefFromExec(exec);
+                    if (sessionRef) {
+                        bindZoneSession(zoneScopeOfExec(exec), sessionRef);
+                        observeToolResult(openLedgerIfExists(config.stateRoot ?? '.') ?? ensureLedger(config.stateRoot ?? '.'), {
+                            tool: toolName,
+                            result,
+                            session_ref: sessionRef,
+                            ts: new Date().toISOString(),
+                        });
+                    }
+                }
+                catch { /* 记忆面永不把产品主路径带红 */ }
+                return result;
+            };
+        }
         ctx.tools.register(t);
     };
     // Issue #443: register the five local editor tools only from trusted host
@@ -1055,6 +1110,110 @@ export function apply(ctx, config, seams = {}) {
         },
         presentCall: args => ({ card: 'generic', title: '记录旅行', kind: 'edit', rawInput: args }),
     }));
+    // 会话双区记忆工具面(issue #255 P4-3):**只在总闸 on 时注册**——off(默认)时
+    // 工具清单逐项不变,模型看不到任何分区入口(接线惰性的第一道)。
+    if (zoneSwitch === 'on') {
+        registerGuarded(defineTool({
+            name: 'gotry_session_zone_note',
+            description: 'Session working-zone memory (hot context, issue #255): capture a STRUCTURED fragment of what is still in play this session '
+                + '(destination / date window / party size / budget stance = intent tier, 24h; search shapes = resource tier, 30min), '
+                + 'revise it with optimistic CAS when the user corrects a detail, or drop it when it stops being true. '
+                + 'Payload must be typed slot-spec-family fields — NEVER raw conversation text, IDs, phone numbers, URLs or credentials '
+                + '(the write gate rejects those shapes). Evidence is a pointer (session + observation index), never content. '
+                + 'action="propose" only PROPOSES moving a note into the durable notebook: it writes NOTHING; the owner must confirm in their own words, '
+                + 'after which you call gotry_session_zone_promote with that quote. The model may never self-promote. '
+                + 'action="deny" records that the owner declined to remember it long-term (writes nothing; stop re-proposing it this session).',
+            parameters: {
+                action: { type: 'string', required: true, enum: ['capture', 'revise', 'drop', 'propose', 'deny'], description: 'capture=新片段入工作区;revise=CAS 修订(需 noteId+expectedRev);drop=更正即弃;propose=提议晋升(零写入);deny=owner 否决提议(零写入)' },
+                tier: { type: 'string', enum: ['resource', 'intent'], description: 'capture 必填:intent(目的地/日期/人数/预算立场,24h)或 resource(检索形态,30min)' },
+                kind: { type: 'string', enum: ['availability', 'price_band', 'destination', 'date_window', 'party_size', 'budget_stance'], description: 'capture 必填;revise 可选(改 kind)' },
+                payload: { type: 'object', additionalProperties: true, description: '结构化片段,如 { city: "大理" } / { start: "2026-11-01", end: "2026-11-05" };禁放原文/证件/电话/URL/凭证' },
+                noteId: { type: 'string', description: 'revise/drop/propose 的目标笔记 id' },
+                expectedRev: { type: 'integer', description: 'revise 的父 rev(必须等于当前 rev,否则 stale_rev 拒绝)' },
+                promoteKind: { type: 'string', enum: ['trip_fact', 'preference', 'constraint', 'lesson'], description: 'propose 时提议的持久条目类别' },
+            },
+            output: {
+                schema: { type: 'json' },
+                render: (_args, value) => [{ type: 'text', text: String(value.summary ?? '') }],
+            },
+            async execute(args, exec) {
+                const sessionRef = zoneSessionRefFromExec(exec);
+                if (!sessionRef) {
+                    return { ok: false, code: 'bad_session', summary: '无会话身份(exec.agent.session.id 缺失):分区不记忆无主体的片段' };
+                }
+                bindZoneSession(zoneScopeOfExec(exec), sessionRef);
+                const r = applyZoneNote(ensureLedger(config.stateRoot), {
+                    action: args.action,
+                    ...(args.tier !== undefined ? { tier: args.tier } : {}),
+                    ...(args.kind !== undefined ? { kind: args.kind } : {}),
+                    ...(args.payload !== undefined ? { payload: args.payload } : {}),
+                    ...(args.noteId !== undefined ? { noteId: args.noteId } : {}),
+                    ...(args.expectedRev !== undefined ? { expectedRev: args.expectedRev } : {}),
+                    ...(args.promoteKind !== undefined ? { promoteKind: args.promoteKind } : {}),
+                    session_ref: sessionRef,
+                    ts: new Date().toISOString(),
+                });
+                if (!r.ok)
+                    return { ok: false, code: r.code, summary: r.detail };
+                const summary = r.proposed
+                    ? `已提议(未写入):${r.ask ?? ''}`
+                    : `${r.action}${r.appended ? ' 已落账' : ' 幂等跳过'}${r.noteId ? `:${r.noteId.slice(0, 60)}` : ''}`;
+                return { ok: true, action: r.action, appended: r.appended, note_id: r.noteId, requires_owner_confirm: r.requiresOwnerConfirm === true, summary };
+            },
+            presentCall: args => ({ card: 'generic', title: `会话记忆:${String(args.action ?? '')}`, kind: 'edit', rawInput: args }),
+        }));
+        registerGuarded(defineTool({
+            name: 'gotry_session_zone_promote',
+            description: 'Owner-confirmed promotion into the durable trip notebook (issue #255) — the ONLY write path into durable memory. '
+                + 'Requires ownerQuote: the user\'s OWN words confirming they want this remembered long-term; your own summary is not a confirmation. '
+                + 'Routing rule: a preference ALSO goes through the motivation-profile gate (pass motivation.{weights|hard|homeCity}), '
+                + 'a trip fact through the timeline gate (pass trip.{destination,start}), a companion constraint through the companion gate (pass companion.{label,constraints}). '
+                + 'Without the required routed payload the promotion is REJECTED — the notebook never becomes a parallel store for a fact that already has an owner. '
+                + 'Generic constraints and lessons live in the notebook itself. The notebook write and the routed gate write are one transaction: they cannot diverge.',
+            parameters: {
+                noteId: { type: 'string', required: true, description: '源工作区笔记 id(必须未过期)' },
+                kind: { type: 'string', required: true, enum: ['trip_fact', 'preference', 'constraint', 'lesson'], description: '持久条目类别' },
+                ownerQuote: { type: 'string', required: true, description: '用户本人确认要长期记住的原话(≤200 字;模型自述不算确认)' },
+                surface: { type: 'string', required: true, enum: ['user_reply', 'approval_card'], description: '确认表面:用户回复 或 审批卡' },
+                payload: { type: 'object', additionalProperties: true, description: '可选:覆盖源笔记载荷的结构化断言' },
+                motivation: { type: 'object', additionalProperties: true, description: 'preference 必填:{ weights?, hard?, homeCity? } 至少一项(经动机画像闸)' },
+                trip: { type: 'object', additionalProperties: true, description: 'trip_fact 必填:{ destination, start(YYYY-MM-DD), end?, companions? }(经时间线闸)' },
+                companion: { type: 'object', additionalProperties: true, description: '同行人约束必填:{ label, constraints:{ mobility?, health?, prefs? } }(经同行人闸)' },
+            },
+            output: {
+                schema: { type: 'json' },
+                render: (_args, value) => [{ type: 'text', text: String(value.summary ?? '') }],
+            },
+            async execute(args, exec) {
+                const sessionRef = zoneSessionRefFromExec(exec);
+                if (sessionRef)
+                    bindZoneSession(zoneScopeOfExec(exec), sessionRef);
+                const r = promoteWithRouting(ensureLedger(config.stateRoot), {
+                    noteId: String(args.noteId ?? ''),
+                    kind: String(args.kind ?? ''),
+                    ownerQuote: String(args.ownerQuote ?? ''),
+                    surface: String(args.surface ?? ''),
+                    ...(args.payload !== undefined ? { payload: args.payload } : {}),
+                    ...(args.motivation !== undefined ? { motivation: args.motivation } : {}),
+                    ...(args.trip !== undefined ? { trip: args.trip } : {}),
+                    ...(args.companion !== undefined ? { companion: args.companion } : {}),
+                    ts: new Date().toISOString(),
+                });
+                if (!r.ok)
+                    return { ok: false, code: r.code, summary: r.detail };
+                const routed = r.routed ? `;并经 ${r.routed.authority} 闸${r.routed.applied ? '落地' : '幂等跳过'}` : '';
+                return {
+                    ok: true,
+                    appended: r.appended,
+                    entry_id: r.entryId,
+                    authority: r.authority,
+                    routed: r.routed ? JSON.parse(JSON.stringify(r.routed)) : null,
+                    summary: `${r.appended ? '已写入笔记本' : '笔记本幂等跳过'}${routed}`,
+                };
+            },
+            presentCall: args => ({ card: 'generic', title: '笔记本晋升(owner 确认)', kind: 'edit', rawInput: args }),
+        }));
+    }
     registerGuarded(defineTool({
         name: 'gotry_hotel_search',
         description: routed('gotry_hotel_search', 'Search hotels via hotelbyte-cli (real-time when hbcli credentials exist, falls back to the static pack with explicit evidence tagging). '

package/dist/src/loop.js

@@ -161,13 +161,18 @@ function terminalOutcomeFromState(ticketId, state) {
             '4_做不到的诚实说': false,
         });
     }
+    // issue #620:求解器自身失败时既没有产物也没有判定——2 条不成立;但「做不到诚实说」
+    // 恰恰成立(我们明说了是引擎故障而非不可行),不靠 unsat_core 冒充自检通过。
+    const solverFailed = Boolean(state.solve.solver_error);
     return asyncTerminalOutcome(ticketId, {
         '1_承诺时间后必有明确产物': Boolean(state.solve.legs?.length || state.solve.verdicts?.length),
-        '2_产物通过自检清单': state.solve.feasible
-            ? (state.solve.legs?.every(l => l['energy_pct'] !== undefined) ?? false)
-            : Boolean(state.solve.unsat_core?.length),
+        '2_产物通过自检清单': solverFailed
+            ? false
+            : state.solve.feasible
+                ? (state.solve.legs?.every(l => l['energy_pct'] !== undefined) ?? false)
+                : Boolean(state.solve.unsat_core?.length),
         '3_待决问题全部是简单选择题': state.gates.every(g => g.id === 'budget' || g.options.length >= 2),
-        '4_做不到的诚实说': state.solve.feasible || Boolean(state.solve.suggestions?.length),
+        '4_做不到的诚实说': solverFailed || state.solve.feasible || Boolean(state.solve.suggestions?.length),
     });
 }
 export function isComplex(state) {
@@ -207,7 +212,13 @@ export function renderSolve(state) {
     if (!s)
         return '(无求解结果)';
     const lines = [];
-    if (s.feasible) {
+    if (s.solver_error) {
+        // issue #620:求解器自己失败 ≠ 行程不可行。这里**不**说「不可行」、不列「冲突」,
+        // 也不把机器 token(solver_error.code)渲染给用户——它只在日志/证据里。
+        lines.push('**这轮没算出结论——求解器自身出错了,不是你的行程不可行**');
+        lines.push('- 我不把引擎故障说成「不可行」:这条已记录,修好或换候选形态(枚举)后重算');
+    }
+    else if (s.feasible) {
         lines.push(`**方案可行,机票合计 ¥${s.money_cny}**`);
         // §7-1 issue #559 卡点 4:从 s.skeleton_notes 字符串编码里推断 unscaffolded 的 seg.id,
         // 不动 unified.ts/journey.ts(内核冻结面 #234),用户面给 ⚠ 前缀与「枢纽对未在骨架覆盖」补充。