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

package/dist/src/travel-timeline.js

@@ -1,78 +1,59 @@
-import { parseAbsoluteDate, ymd } from './time-anchor.js';
+/**
+ * 旅行时间线(memory-design M4 层,P1):「去过哪、何时、和谁」的 append-only 事实层。
+ *
+ * 立场(memory-design §1):确定性事实归代码——日期解析复用 slot-spec(锚点卡词表+绝对),
+ * 词表外 unresolved 不猜;每条事件必须带 evidence(用户原话或 wish 确认),溯源 P0。
+ * 消费:出发地三级解析(未来行程→时间线→问用户)/「去过不再推」排序通道/
+ * 回流率分子(verified_outcome ⟺ timeline 有对应行程)。
+ * 多用户前向兼容:append-only + 稳定 trip_id,账本化只换存储面(RFC §6.5)。
+ */
+import { ymd } from './time-anchor.js';
 import { resolveSlotDate } from './slot-spec.js';
+/** 相对/模糊表达 → 绝对日期(守门:词表外返回 null,调用方必须拒收而非猜) */
 export function resolveTimelineDate(expr, anchor) {
     return resolveSlotDate(expr, anchor).date;
 }
+/** 语义主键:同目的地+同 start+同 source = 同一行程(重放 no-op) */
 export function makeTripId(ev) {
     return `${ev.destination}|${ev.start}|${ev.source}`.replace(/\s+/g, '_');
 }
+/**
+ * 追加守门(纯函数,不改入参):
+ *  - destination/evidence 必填,start 必须已是绝对日期(YYYY-MM-DD),否则拒收(null);
+ *  - end < start 拒收;
+ *  - 同 trip_id 已存在 → no-op(返回 appended:false,幂等);
+ *  - 同目的地日期区间重叠(不同 trip_id)→ 拒收(冲突即停,由人裁决)。
+ */
 export function appendTrip(events, ev) {
-    if (!ev.destination?.trim()) return {
-        events,
-        appended: false,
-        reason: 'destination 必填'
-    };
-    if (!ev.evidence?.trim()) return {
-        events,
-        appended: false,
-        reason: 'evidence 必填(用户原话或 wish 确认指针)'
-    };
-    if (!/^\d{4}-\d{2}-\d{2}$/.test(ev.start)) return {
-        events,
-        appended: false,
-        reason: 'start 必须为 YYYY-MM-DD(词表外日期由上游解析,不猜)'
-    };
-    if (ev.end && ev.end < ev.start) return {
-        events,
-        appended: false,
-        reason: 'end 早于 start'
-    };
+    if (!ev.destination?.trim())
+        return { events, appended: false, reason: 'destination 必填' };
+    if (!ev.evidence?.trim())
+        return { events, appended: false, reason: 'evidence 必填(用户原话或 wish 确认指针)' };
+    if (!/^\d{4}-\d{2}-\d{2}$/.test(ev.start))
+        return { events, appended: false, reason: 'start 必须为 YYYY-MM-DD(词表外日期由上游解析,不猜)' };
+    if (ev.end && ev.end < ev.start)
+        return { events, appended: false, reason: 'end 早于 start' };
     const tripId = makeTripId(ev);
-    if (events.some((e)=>e.trip_id === tripId)) return {
-        events,
-        appended: false,
-        tripId
-    };
-    const overlap = events.find((e)=>e.destination === ev.destination && !(e.end && e.end < ev.start) && !(ev.end && ev.end < e.start));
-    if (overlap) return {
-        events,
-        appended: false,
-        tripId: overlap.trip_id,
-        reason: `与已有行程 ${overlap.trip_id} 日期重叠,冲突即停`
-    };
-    const full = {
-        schema: 'travel_timeline.v1',
-        trip_id: tripId,
-        ts: new Date().toISOString(),
-        ...ev
-    };
-    return {
-        events: [
-            ...events,
-            full
-        ],
-        appended: true,
-        tripId
-    };
+    if (events.some(e => e.trip_id === tripId))
+        return { events, appended: false, tripId };
+    const overlap = events.find(e => e.destination === ev.destination && !(e.end && e.end < ev.start) && !(ev.end && ev.end < e.start));
+    if (overlap)
+        return { events, appended: false, tripId: overlap.trip_id, reason: `与已有行程 ${overlap.trip_id} 日期重叠,冲突即停` };
+    const full = { schema: 'travel_timeline.v1', trip_id: tripId, ts: new Date().toISOString(), ...ev };
+    return { events: [...events, full], appended: true, tripId };
 }
+/** 只读投影:按 start 倒序的行程摘要(「去过」行/brief 注入用) */
 export function projectTimeline(events) {
-    return [
-        ...events
-    ].sort((a, b)=>a.start < b.start ? 1 : -1).map((e)=>({
-            tripId: e.trip_id,
-            destination: e.destination,
-            start: e.start,
-            end: e.end,
-            companions: e.companions
-        }));
+    return [...events]
+        .sort((a, b) => (a.start < b.start ? 1 : -1))
+        .map(e => ({ tripId: e.trip_id, destination: e.destination, start: e.start, end: e.end, companions: e.companions }));
 }
+/**
+ * 交叉一致(回流率分子的质变):verified_outcome 的 wish 应有对应时间线行程。
+ * 返回缺口清单(verified 但无 timeline)——巡检口径,不自动补写(补写需要用户确认日期)。
+ */
 export function timelineGapsForVerified(timeline, verifiedWishes) {
-    const dests = new Set(timeline.map((t)=>t.destination));
-    return verifiedWishes.filter((w)=>w.destination && !dests.has(w.destination)).map((w)=>({
-            wishId: w.wishId
-        }));
+    const dests = new Set(timeline.map(t => t.destination));
+    return verifiedWishes.filter(w => w.destination && !dests.has(w.destination)).map(w => ({ wishId: w.wishId }));
 }
 export { ymd };
-
-
-//# sourceURL=ts/src/travel-timeline.ts

package/dist/src/turn-deadline.js

@@ -1,3 +1,21 @@
+/**
+ * Per-agent, per-turn wall-clock boundary driven by routing (ADR-24 v2).
+ *
+ * 职责只有一件:保证每一轮终结在三态之一——当面答完(converge)、转后台
+ * 并给出回访承诺(handoff)、或明确暂停。绝不允许第四态:流死掉、什么
+ * 都没交付(2026-09-02 轨迹的失败形态)。
+ *
+ * - 阈值不再固定:每次 user/message 由 `turn-policy.ts` 的确定性分类器
+ *   解析 TurnPolicy(softMs/hardMs/exit);benchmark opt-in 用 fixedPolicy
+ *   钉死以保证可复现。
+ * - 硬阈拒绝时**同步**抑制工具 schema(防同 step 回环),并按 exit 语义
+ *   返回两种结构化结果:converge=用已有证据作答;handoff=落
+ *   `gotry_turn_handoff.v1` 工单并指令模型告知用户 ETA 与回访方式。
+ * - handoff 工单是**新的独立格式**,落在 `<stateRoot>/gotry-state/
+ *   turn-handoffs/`,不与 `async/` 的 loop 求解工单混用——async-collect
+ *   对无 spec 的 state 会立即结算 failed(假失败),收集器是未来的
+ *   agent tick(loopx),不是 async-collect。
+ */
 import { randomUUID } from 'node:crypto';
 import { mkdir, readdir, readFile, rename, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
@@ -14,7 +32,7 @@ export async function writeTurnHandoffTicket(stateRoot, userMessage) {
         userMessage,
         requestedAt: new Date().toISOString(),
         etaLabel: TURN_HANDOFF_ETA_LABEL,
-        status: 'open'
+        status: 'open',
     };
     await writeTicketJson(stateRoot, ticket);
     return ticket;
@@ -25,20 +43,20 @@ function handoffDir(stateRoot) {
 }
 async function writeTicketJson(stateRoot, ticket) {
     const dir = handoffDir(stateRoot);
-    await mkdir(dir, {
-        recursive: true
-    });
+    await mkdir(dir, { recursive: true });
     const path = join(dir, `${ticket.id}.json`);
     const tmp = `${path}.tmp`;
     await writeFile(tmp, JSON.stringify(ticket, null, 2), 'utf-8');
     await rename(tmp, path);
     return path;
 }
+/**
+ * 结算工单:交付物落 `<id>.deliverable.md`(settled=规划产物;failed=诚实
+ * 失败说明),工单 json 原子更新 status/settledAt/deliverableFile/error。
+ */
 export async function settleTurnHandoffTicket(stateRoot, ticket, status, deliverable, error) {
     const dir = handoffDir(stateRoot);
-    await mkdir(dir, {
-        recursive: true
-    });
+    await mkdir(dir, { recursive: true });
     const deliverablePath = join(dir, `${ticket.id}.deliverable.md`);
     const deliverableTmp = `${deliverablePath}.tmp`;
     await writeFile(deliverableTmp, deliverable, 'utf-8');
@@ -48,58 +66,56 @@ export async function settleTurnHandoffTicket(stateRoot, ticket, status, deliver
         status,
         settledAt: new Date().toISOString(),
         deliverableFile: `${ticket.id}.deliverable.md`,
-        ...error ? {
-            error
-        } : {}
+        ...(error ? { error } : {}),
     };
     const ticketPath = await writeTicketJson(stateRoot, settled);
-    return {
-        ticketPath,
-        deliverablePath
-    };
+    return { ticketPath, deliverablePath };
 }
+/** 复访查询:按请求时间倒序列出工单;settled 附交付物摘录(≤600 字)。 */
 export async function listTurnHandoffTickets(stateRoot) {
     const dir = handoffDir(stateRoot);
     let names;
     try {
         names = await readdir(dir);
-    } catch  {
+    }
+    catch {
         return [];
     }
     const views = [];
-    for (const name of names){
-        if (!name.endsWith('.json')) continue;
+    for (const name of names) {
+        if (!name.endsWith('.json'))
+            continue;
         try {
             const raw = JSON.parse(await readFile(join(dir, name), 'utf-8'));
-            if (raw?.schema !== TURN_HANDOFF_SCHEMA) continue;
+            if (raw?.schema !== TURN_HANDOFF_SCHEMA)
+                continue;
             const view = {
                 id: raw.id,
                 status: raw.status,
                 objective: raw.objective,
                 requestedAt: raw.requestedAt,
                 etaLabel: raw.etaLabel,
-                ...raw.settledAt ? {
-                    settledAt: raw.settledAt
-                } : {},
-                ...raw.error ? {
-                    error: raw.error
-                } : {}
+                ...(raw.settledAt ? { settledAt: raw.settledAt } : {}),
+                ...(raw.error ? { error: raw.error } : {}),
             };
             if (raw.status !== 'open' && raw.deliverableFile) {
                 try {
                     const text = await readFile(join(dir, raw.deliverableFile), 'utf-8');
                     view.deliverableExcerpt = text.length > 600 ? `${text.slice(0, 600)}…` : text;
-                } catch  {}
+                }
+                catch { /* 交付物缺失时视图降级,不阻塞列表 */ }
             }
             views.push(view);
-        } catch  {}
+        }
+        catch { /* 单个坏工单不阻塞列表 */ }
     }
-    views.sort((a, b)=>a.requestedAt < b.requestedAt ? 1 : -1);
+    views.sort((a, b) => (a.requestedAt < b.requestedAt ? 1 : -1));
     return views;
 }
 function resolveEnvPin(name) {
     const raw = process.env[name];
-    if (!raw) return null;
+    if (!raw)
+        return null;
     const parsed = Number.parseInt(raw, 10);
     return Number.isFinite(parsed) && parsed > 0 ? parsed : null;
 }
@@ -107,16 +123,8 @@ function convergenceContext(code, text) {
     return {
         id: randomUUID(),
         role: 'user',
-        content: [
-            {
-                type: 'text',
-                text: `${code}: ${text}`
-            }
-        ],
-        source: {
-            kind: 'plugin',
-            plugin: 'gotry-turn-deadline'
-        }
+        content: [{ type: 'text', text: `${code}: ${text}` }],
+        source: { kind: 'plugin', plugin: 'gotry-turn-deadline' },
     };
 }
 function exhaustionResult(reason) {
@@ -124,20 +132,10 @@ function exhaustionResult(reason) {
         isError: true,
         error: {
             message: reason,
-            info: {
-                name: 'TurnDeadlineError',
-                code: TURN_DEADLINE_EXHAUSTED
-            }
+            info: { name: 'TurnDeadlineError', code: TURN_DEADLINE_EXHAUSTED },
         },
-        content: [
-            {
-                type: 'text',
-                text: reason
-            }
-        ],
-        additionalContexts: [
-            convergenceContext(TURN_DEADLINE_EXHAUSTED, 'No more tool dispatches are permitted in this turn. Produce the final answer from existing results.')
-        ]
+        content: [{ type: 'text', text: reason }],
+        additionalContexts: [convergenceContext(TURN_DEADLINE_EXHAUSTED, 'No more tool dispatches are permitted in this turn. Produce the final answer from existing results.')],
     };
 }
 function handoffResult(ticket) {
@@ -146,70 +144,72 @@ function handoffResult(ticket) {
         isError: true,
         error: {
             message: `${TURN_DEADLINE_HANDOFF}: sync window exhausted for a deep-planning turn; ticket ${ticket.id}`,
-            info: {
-                name: 'TurnDeadlineHandoff',
-                code: TURN_DEADLINE_HANDOFF
-            }
+            info: { name: 'TurnDeadlineHandoff', code: TURN_DEADLINE_HANDOFF },
         },
-        content: [
-            {
-                type: 'text',
-                text: `${TURN_DEADLINE_HANDOFF}: ${instruction}`
-            }
-        ],
-        additionalContexts: [
-            convergenceContext(TURN_DEADLINE_HANDOFF, instruction)
-        ]
+        content: [{ type: 'text', text: `${TURN_DEADLINE_HANDOFF}: ${instruction}` }],
+        additionalContexts: [convergenceContext(TURN_DEADLINE_HANDOFF, instruction)],
     };
 }
+/**
+ * Install the runtime boundary, kept separate from the GoTry tool catalog so
+ * the actual Cordis waterfalls can be exercised without booting every tool.
+ */
 export function installTurnDeadline(ctx, options = {}) {
-    if (options.enabled === false) return;
-    if (typeof ctx.on !== 'function') return;
-    const now = options.now ?? (()=>Date.now());
+    if (options.enabled === false)
+        return;
+    // Some offline contract tests intentionally provide a registration-only
+    // Context slice. They do not drive an agent loop, so there is no boundary
+    // to install and no reason to require an event bus.
+    if (typeof ctx.on !== 'function')
+        return;
+    const now = options.now ?? (() => Date.now());
+    // Test/benchmark seam only: pin the resolved numbers without touching the
+    // routed exit strategy. Product runs never set these.
     const softPin = resolveEnvPin('GOTRY_TURN_DEADLINE_SOFT_MS');
     const hardPin = resolveEnvPin('GOTRY_TURN_DEADLINE_HARD_MS');
     const defaultPolicy = options.fixedPolicy ?? turnPolicyFor('sync-planning');
-    const routePolicy = (message)=>{
-        if (options.fixedPolicy) return {
-            ...options.fixedPolicy
-        };
+    const routePolicy = (message) => {
+        if (options.fixedPolicy)
+            return { ...options.fixedPolicy };
         const policy = turnPolicyFor(classifyTurn(message));
-        return {
-            ...policy,
-            softMs: softPin ?? policy.softMs,
-            hardMs: hardPin ?? policy.hardMs
-        };
+        return { ...policy, softMs: softPin ?? policy.softMs, hardMs: hardPin ?? policy.hardMs };
     };
     const stateByAgent = new Map();
     const softExecutions = new Map();
     const finalOnlyDisposers = new Map();
-    const clearAgent = (agentId)=>{
+    const clearAgent = (agentId) => {
         stateByAgent.delete(agentId);
-        for (const [token, owner] of softExecutions){
-            if (owner.agentId === agentId) softExecutions.delete(token);
+        for (const [token, owner] of softExecutions) {
+            if (owner.agentId === agentId)
+                softExecutions.delete(token);
         }
         finalOnlyDisposers.get(agentId)?.();
         finalOnlyDisposers.delete(agentId);
     };
-    const enterFinalOnly = (agent)=>{
+    const enterFinalOnly = (agent) => {
         const agentId = String(agent.id);
-        if (finalOnlyDisposers.has(agentId)) return;
+        if (finalOnlyDisposers.has(agentId))
+            return;
         const globalTools = ctx.tools;
         const scopedTools = agent.ctx?.tools;
         if (typeof globalTools.schemas !== 'function' || typeof scopedTools?.restrict !== 'function') {
+            // No registry to suppress: subsequent tool calls in the same turn hit the
+            // same per-call denial branch and stay refused until the next turn.
             return;
         }
-        const inheritedNames = globalTools.schemas().map((schema)=>schema.name).filter((name)=>name !== 'run_code');
-        if (inheritedNames.length === 0) return;
-        finalOnlyDisposers.set(agentId, scopedTools.restrict({
-            deny: inheritedNames
-        }));
+        const inheritedNames = globalTools.schemas()
+            .map(schema => schema.name)
+            .filter(name => name !== 'run_code');
+        if (inheritedNames.length === 0)
+            return;
+        finalOnlyDisposers.set(agentId, scopedTools.restrict({ deny: inheritedNames }));
     };
-    const keyOfAgent = (agent)=>{
+    // 事件主体是 session 对象;agent 归属同一 session 时共用同一预算键。
+    const keyOfAgent = (agent) => {
         const session = agent.session;
         return String(session?.id ?? agent.id);
     };
-    ctx.on('session/event', (subject, event)=>{
+    ctx.on('session/event', (subject, event) => {
         const agentId = String(subject.id);
         if (event.type === 'turn/end') {
             clearAgent(agentId);
@@ -221,72 +221,66 @@ export function installTurnDeadline(ctx, options = {}) {
             if (!stateByAgent.has(agentId)) {
                 stateByAgent.set(agentId, {
                     startedAt: now(),
-                    policy: {
-                        ...defaultPolicy,
-                        softMs: softPin ?? defaultPolicy.softMs,
-                        hardMs: hardPin ?? defaultPolicy.hardMs
-                    }
+                    policy: { ...defaultPolicy, softMs: softPin ?? defaultPolicy.softMs, hardMs: hardPin ?? defaultPolicy.hardMs },
                 });
             }
             return;
         }
         if (event.type === 'user/message') {
+            // dsh 事件载荷在 event.data 下(benchmark-agent-conformance 同型读法)。
             const message = event.data;
-            if (message?.source?.kind !== 'user') return;
-            const text = (message.content ?? []).find((block)=>block.type === 'text')?.text ?? '';
-            if (!text.trim()) return;
-            stateByAgent.set(agentId, {
-                startedAt: now(),
-                policy: routePolicy(text),
-                userMessage: text
-            });
+            if (message?.source?.kind !== 'user')
+                return;
+            const text = (message.content ?? []).find(block => block.type === 'text')?.text ?? '';
+            if (!text.trim())
+                return;
+            // 每个 user 消息 = 新的预算:路由分类 + 时钟重置。plugin/skill 注入
+            // 的 user/message(source.kind !== 'user')不参与路由。
+            stateByAgent.set(agentId, { startedAt: now(), policy: routePolicy(text), userMessage: text });
         }
     });
-    ctx.on('session/disposed', (subject)=>clearAgent(String(subject.id)));
-    ctx.on('tools/execute', (exec, next)=>{
-        if (!exec.agent) return next();
+    ctx.on('session/disposed', subject => clearAgent(String(subject.id)));
+    ctx.on('tools/execute', (exec, next) => {
+        // Programmatic/direct calls are not part of a model planner turn.
+        if (!exec.agent)
+            return next();
         const agentId = keyOfAgent(exec.agent);
-        const state = stateByAgent.get(agentId) ?? {
-            startedAt: now(),
-            policy: {
-                ...defaultPolicy,
-                softMs: softPin ?? defaultPolicy.softMs,
-                hardMs: hardPin ?? defaultPolicy.hardMs
-            }
-        };
+        const state = stateByAgent.get(agentId)
+            ?? { startedAt: now(), policy: { ...defaultPolicy, softMs: softPin ?? defaultPolicy.softMs, hardMs: hardPin ?? defaultPolicy.hardMs } };
         stateByAgent.set(agentId, state);
         const elapsed = now() - state.startedAt;
         if (elapsed > state.policy.hardMs) {
+            // Synchronous schema suppression so same-step follow-up calls cannot
+            // loop on refusal results (the 2026-09-02 trajectory failure).
             enterFinalOnly(exec.agent);
             if (state.policy.exit === 'handoff' && state.userMessage && options.stateRoot) {
-                return writeTurnHandoffTicket(options.stateRoot, state.userMessage).then((ticket)=>handoffResult(ticket)).catch(()=>exhaustionResult(`${TURN_DEADLINE_EXHAUSTED}: hard deadline ${state.policy.hardMs}ms reached (ticket persistence failed; degraded to converge)`));
+                return writeTurnHandoffTicket(options.stateRoot, state.userMessage)
+                    .then(ticket => handoffResult(ticket))
+                    .catch(() => exhaustionResult(`${TURN_DEADLINE_EXHAUSTED}: hard deadline ${state.policy.hardMs}ms reached (ticket persistence failed; degraded to converge)`));
             }
             return Promise.resolve(exhaustionResult(`${TURN_DEADLINE_EXHAUSTED}: turn exceeded hard deadline of ${state.policy.hardMs}ms (elapsed ${elapsed}ms); provide a final answer using existing results`));
         }
         if (elapsed > state.policy.softMs) {
-            softExecutions.set(exec.token, {
-                agentId,
-                exit: state.policy.exit
-            });
+            softExecutions.set(exec.token, { agentId, exit: state.policy.exit });
         }
         return next();
     });
-    ctx.on('tools/post-execute', (exec, _result, next)=>{
-        return next().then((decision)=>{
+    ctx.on('tools/post-execute', (exec, _result, next) => {
+        return next().then(decision => {
             const owner = softExecutions.get(exec.token);
-            if (!owner) return decision;
+            if (!owner)
+                return decision;
             softExecutions.delete(exec.token);
-            const text = owner.exit === 'handoff' ? 'Turn has crossed the soft deadline of a deep-planning turn. Wrap up context gathering now; the turn will hand off to background planning at the hard deadline.' : 'Turn has crossed the soft deadline. Stop dispatching new tools and produce the final answer from gathered evidence.';
+            const text = owner.exit === 'handoff'
+                ? 'Turn has crossed the soft deadline of a deep-planning turn. Wrap up context gathering now; the turn will hand off to background planning at the hard deadline.'
+                : 'Turn has crossed the soft deadline. Stop dispatching new tools and produce the final answer from gathered evidence.';
             return {
                 ...decision,
                 additionalContexts: [
-                    ...decision.additionalContexts ?? [],
-                    convergenceContext(TURN_DEADLINE_SOFT, text)
-                ]
+                    ...(decision.additionalContexts ?? []),
+                    convergenceContext(TURN_DEADLINE_SOFT, text),
+                ],
             };
         });
     });
 }
-
-
-//# sourceURL=ts/src/turn-deadline.ts