cotutor 0.2.0 → 0.3.0

package/dist/runtime/journal/conversation.js

@@ -0,0 +1,89 @@
+/**
+ * 对话索引的纯函数:job 命名、空索引、话题、把一次运行的结果并进索引(不改旧对象)。日期在 shared/time.ts,文件布局与卡 id 在 schema/conversation-files.ts。
+ */
+import { ConversationIndexSchema, threads } from "../../schema/index.js";
+const pad = (n) => String(n).padStart(2, '0');
+/** HHMM-<序号>,同一天内不重复 */
+export function jobId(d, seq) {
+    return `${pad(d.getHours())}${pad(d.getMinutes())}-${seq}`;
+}
+export function emptyIndex(tutor, date) {
+    return ConversationIndexSchema.parse({ tutor, date });
+}
+/** 一个话题里上一轮之后改过状态的卡(按 job、下标排):发消息时逐张 describe 进上下文包。turn 是存卡时那个话题的末条 job */
+export function changedCards(index, states, thread) {
+    const last = lastJobOf(index, thread);
+    if (!last)
+        return [];
+    const t = threads(index.messages);
+    const out = [];
+    index.messages.forEach((m, i) => {
+        const per = states[m.job];
+        if (!per || t[i] !== thread)
+            return;
+        for (const n of Object.keys(per).map(Number).sort((a, b) => a - b))
+            if (per[n].turn === last)
+                out.push({ job: m.job, n, file: per[n] });
+    });
+    return out;
+}
+/** 当前话题 = 末条消息的;空索引 null */
+export function currentThread(index) {
+    const t = threads(index.messages);
+    return t.length ? t[t.length - 1] : null;
+}
+/** 某个话题的会话(没有 = 新开) */
+export function sessionFor(index, thread) {
+    return index.sessions[thread] ?? null;
+}
+/**
+ * 这个话题还接得上这个运行时吗(2026-10-31):话题只属于开它的那种运行时,换过运行时就当话题已经结束——接着说开新话题,不记账,记录照样看;
+ * 历史不迁移、不导入。还没有会话的(这个话题一轮都没成)算接得上
+ */
+export function sameRuntime(index, thread, runtime) {
+    const s = index.sessions[thread];
+    return !s || s.runtime === runtime;
+}
+/** 某个话题里最后一条消息的 job(卡的状态文件 turn 记它;没有这个话题 → null) */
+export function lastJobOf(index, thread) {
+    const t = threads(index.messages);
+    for (let i = t.length - 1; i >= 0; i--)
+        if (t[i] === thread)
+            return index.messages[i].job;
+    return null;
+}
+export function addMessage(index, msg) {
+    return { ...index, messages: [...index.messages, msg] };
+}
+/** 一次运行收尾:写 result / tokens / kidText / artifacts / timing,首次拿到 session 就记下 */
+export function applyRun(index, job, run) {
+    const { transcript, kidView } = run;
+    // 会话按话题记:这个话题首次拿到就记;换了运行时(agent 不同)就以这次的为准——跨 CLI 不能 resume。顶层 session = 当前话题的
+    const i = index.messages.findIndex((m) => m.job === job);
+    const thread = i >= 0 ? threads(index.messages)[i] : job;
+    // 话题第一条(thread === job)一律新会话
+    const prev = thread === job ? null : sessionFor(index, thread);
+    const keep = prev && prev.runtime === run.runtime ? prev : null;
+    const messages = index.messages.map((m) => m.job === job
+        ? {
+            ...m,
+            result: transcript.final ? (transcript.final.ok ? 'ok' : 'error') : 'running',
+            ...(transcript.final?.inTokens !== undefined ? { tokens: { in: transcript.final.inTokens, out: transcript.final.outTokens ?? 0, ...(transcript.final.cachedTokens !== undefined ? { cached: transcript.final.cachedTokens } : {}), ...(transcript.final.contextTokens !== undefined ? { context: transcript.final.contextTokens } : {}) } } : {}),
+            kidText: kidView.kidText,
+            artifacts: run.artifacts ?? m.artifacts,
+            runtime: run.runtime,
+            ...(m.bookkeep || kidView.bookkeeping ? { bookkeeping: kidView.bookkeeping } : {}),
+            section: kidView.section,
+            ...(kidView.parentText ? { parentText: kidView.parentText } : {}),
+            ...(kidView.warnings.length ? { warnings: [...(m.warnings ?? []), ...kidView.warnings] } : {}),
+            error: transcript.final?.ok === false ? transcript.final.reason : null,
+            ...(run.timing ? { timing: run.timing } : {}),
+            ...(run.tools?.length ? { tools: run.tools } : {}),
+        }
+        : m);
+    const mine = keep ?? (transcript.sessionId ? { id: transcript.sessionId, runtime: run.runtime } : prev);
+    const sessions = mine ? { ...index.sessions, [thread]: mine } : index.sessions;
+    const cur = currentThread(index);
+    const session = cur ? (sessions[cur] ?? null) : null;
+    return { ...index, session, sessions, messages };
+}

package/dist/runtime/journal/events.d.ts

@@ -0,0 +1,27 @@
+import { type Lane, type RunEvent } from '../../schema/index.ts';
+/** 一条事件的一句话(不带时间与道) */
+export declare function describeEvent(e: RunEvent): string;
+/** 控制台的一行:相对秒 · 道 · 一句话 */
+export declare function formatEvent(e: RunEvent): string;
+/** --lane main,tts → 只留这几道;空 / 缺 → 全部 */
+export declare function laneFilter(spec: string | undefined): (e: RunEvent) => boolean;
+/** events.jsonl → 事件(坏行跳过,不抛);按 t 排(嘴这一道是事后补的,t 比文件里前面的还早) */
+export declare function parseEvents(text: string): RunEvent[];
+/** 一拍的埋点(从事件推,不另记账):关 = 下一张卡出现(末拍 = 老师退出)、就绪 */
+export interface BeatTiming {
+    card: number | null;
+    closedMs?: number;
+    readyMs?: number;
+}
+export declare function beatTimings(events: readonly RunEvent[], beats: readonly {
+    card: number | null;
+}[]): BeatTiming[];
+/** 时间线上的一段(甘特):起止、道、一句话、状态;瞬时的事件 to = from */
+export interface TimelineSpan {
+    lane: Lane;
+    from: number;
+    to: number;
+    label: string;
+    state: 'ok' | 'warn' | 'fail';
+}
+export declare function timelineSpans(events: readonly RunEvent[]): TimelineSpan[];

package/dist/runtime/journal/events.js

@@ -0,0 +1,136 @@
+/**
+ * 一轮运行的事件:runner 在每道工序的关键点发一条,追加到 <日期>.<job>.events.jsonl,
+ * 也给内存里的订阅者(cotutor send 现场打印、serve --trace、以后的时间线站)。三个消费者共用一份事件,不各自再算。
+ * 道(lane):main 老师 / tts 配音 / ready 就绪 / index 索引 / ledger 账本 / mouth 实时老师的嘴(老事件里的 scene 道读的时候滤掉)。t = 从老师进程起算的毫秒;
+ * mouth 道是通话(src/runtime/live/call.ts)补进来的,孩子按下、松手、嘴接住都在老师进程起来之前,t 是负的。
+ * 这里只有格式化与读,纯函数;事件的形状在 schema/events.ts,发事件的在 runtime/runner.ts。
+ */
+import { tokenText } from "../../shared/tokens.js";
+import { LANES } from "../../schema/index.js";
+const secs = (ms) => (ms / 1000).toFixed(2);
+const used = (t) => (t ? ` · ${tokenText(t)}` : '');
+/** 一条事件的一句话(不带时间与道) */
+export function describeEvent(e) {
+    switch (e.lane) {
+        case 'main':
+            if (e.kind === 'start')
+                return `起 ${e.cli}(${e.runtime},${e.resume ? 'resume' : '新会话'}${e.warmMs !== undefined ? `,预热 ${(e.warmMs / 1000).toFixed(1)}s 前起好` : ''})`;
+            if (e.kind === 'card')
+                return `卡 ${e.card} ${e.label}`;
+            if (e.kind === 'line')
+                return `句 ${e.line}「${e.text}」`;
+            if (e.kind === 'tool')
+                return `${e.sub ? '子代理 ' : ''}工具 ${e.name}`;
+            if (e.kind === 'stall')
+                return `断流:${secs(e.idleMs)}s 没动静,杀掉${e.retry ? `,resume 接着写(第 ${e.retry} 次${e.kept ? `,已写 ${e.kept} 字` : ''})` : ',接着跑的次数用完了'}`;
+            return e.ok ? `退出 ok${e.turns !== undefined ? ` · ${e.turns} turns` : ''}${used(e.tokens)}` : `退出 出错(${e.reason ?? '?'})${used(e.tokens)}`;
+        case 'tts':
+            if (e.kind === 'queued')
+                return `${e.label}排队`;
+            if (e.kind === 'done')
+                return `${e.label}✓ ${secs(e.ms)}s`;
+            return `${e.label}✗ ${secs(e.ms)}s ${e.error}`;
+        case 'ready':
+            if (e.kind === 'speak')
+                return '第一句配好了 ← 首句就绪(能开口)';
+            if (e.kind === 'beat')
+                return `拍 ${e.beat} ✓${e.card === null ? '(没有卡)' : `(卡 ${e.card})`}${e.first ? ' ← 第一拍' : ''}`;
+            return `全部就绪(${e.cards} 张卡 ${e.lines} 句)`;
+        case 'index':
+            return `写入${e.warnings ? ` · 提醒 ${e.warnings}` : ''}`;
+        case 'ledger':
+            return `日记 ${e.file} 记了话题 ${e.thread}`;
+        case 'mouth':
+            if (e.kind === 'hold')
+                return '孩子按下';
+            if (e.kind === 'release')
+                return e.how === 'voice' ? '松手' : e.how === 'vad' ? '说完(一直听)' : `发了(${{ text: '打字', photo: '照片', card: '交卡', ask: '卡上的「?」' }[e.how]})`;
+            if (e.kind === 'catch')
+                return `嘴接住「${e.text}」(开始放)`;
+            if (e.kind === 'read')
+                return `嘴念第 ${e.line + 1} 句(开始放)`;
+            if (e.kind === 'fill')
+                return `脑还在想,嘴垫了一句「${e.text}」(开始放)`;
+            return `孩子按下,打断${e.line === null ? '(讲稿还没念到)' : `(念到第 ${e.line + 1} 句)`}`;
+    }
+}
+/** 控制台的一行:相对秒 · 道 · 一句话 */
+export function formatEvent(e) {
+    return `${secs(e.t).padStart(6)} ${e.lane.padEnd(7)} ${describeEvent(e)}`;
+}
+/** --lane main,tts → 只留这几道;空 / 缺 → 全部 */
+export function laneFilter(spec) {
+    const set = new Set((spec ?? '').split(',').map((s) => s.trim()).filter((s) => LANES.includes(s)));
+    return set.size ? (e) => set.has(e.lane) : () => true;
+}
+/** events.jsonl → 事件(坏行跳过,不抛);按 t 排(嘴这一道是事后补的,t 比文件里前面的还早) */
+export function parseEvents(text) {
+    const out = [];
+    for (const line of text.split('\n')) {
+        if (!line.trim())
+            continue;
+        try {
+            const v = JSON.parse(line);
+            if (typeof v?.t === 'number' && LANES.includes(v.lane) && typeof v.kind === 'string')
+                out.push(v);
+        }
+        catch {
+            /* 坏行跳过 */
+        }
+    }
+    return out.sort((a, b) => a.t - b.t);
+}
+export function beatTimings(events, beats) {
+    const cardAt = new Map();
+    const readyAt = new Map();
+    let exit;
+    let all;
+    for (const e of events) {
+        if (e.lane === 'main' && e.kind === 'card')
+            cardAt.set(e.card, e.t);
+        else if (e.lane === 'main' && e.kind === 'exit')
+            exit = e.t;
+        else if (e.lane === 'ready' && e.kind === 'beat')
+            readyAt.set(e.beat, e.t);
+        else if (e.lane === 'ready' && e.kind === 'all')
+            all = e.t;
+    }
+    return beats.map((b, k) => {
+        const next = beats[k + 1];
+        const closedMs = next && next.card !== null ? cardAt.get(next.card) : exit;
+        const out = { card: b.card };
+        if (closedMs !== undefined)
+            out.closedMs = closedMs;
+        const ready = readyAt.get(k) ?? all;
+        if (ready !== undefined)
+            out.readyMs = ready;
+        return out;
+    });
+}
+export function timelineSpans(events) {
+    const out = [];
+    const open = new Map();
+    for (const e of events) {
+        if (e.lane === 'main' && e.kind === 'start')
+            open.set('main', { from: e.t, label: describeEvent(e) });
+        else if (e.lane === 'main' && e.kind === 'exit') {
+            const o = open.get('main');
+            out.push({ lane: 'main', from: o?.from ?? 0, to: e.t, label: `老师 ${o?.label ?? ''} → ${describeEvent(e)}`, state: e.ok ? 'ok' : 'fail' });
+            open.delete('main');
+        }
+        else if (e.lane === 'tts' && e.kind === 'queued')
+            open.set(`tts:${e.label}`, { from: e.t, label: e.label });
+        else if (e.lane === 'tts' && (e.kind === 'done' || e.kind === 'failed')) {
+            const o = open.get(`tts:${e.label}`);
+            out.push({ lane: 'tts', from: o?.from ?? e.t, to: e.t, label: describeEvent(e), state: e.kind === 'done' ? 'ok' : 'fail' });
+            open.delete(`tts:${e.label}`);
+        }
+        else
+            out.push({ lane: e.lane, from: e.t, to: e.t, label: describeEvent(e), state: e.lane === 'index' && e.warnings ? 'warn' : 'ok' });
+    }
+    // 没收尾的(进程还在、或被杀):画到最后一条事件
+    const last = events.length ? events[events.length - 1].t : 0;
+    for (const [k, o] of open)
+        out.push({ lane: k.split(':')[0], from: o.from, to: last, label: `${o.label}(没收尾)`, state: 'warn' });
+    return out.sort((a, b) => a.from - b.from);
+}

package/dist/runtime/journal/kid-log.d.ts

@@ -0,0 +1,105 @@
+import type { Workspace } from '../../schema/index.ts';
+/** 打开时的权限与能力(7.2):麦克风权限、有没有 getUserMedia(2026-10-22 删了浏览器识别,不再探语音识别;老设备表里的 sr 留着不读) */
+export interface KidCaps {
+    mic: 'granted' | 'denied' | 'prompt' | 'unknown';
+    gum: boolean;
+}
+/** 流水的一行(服务端补 at、device、ip) */
+export type KidLogRow = {
+    k: 'open';
+    page: string;
+    v: string;
+    ua: string;
+    touch: number;
+    standalone: boolean;
+    w: number;
+    h: number;
+    vw: number;
+    vh: number;
+    dpr: number;
+    lang: string;
+    caps?: KidCaps;
+}
+/** 在前台多久(7.4):这一笔的毫秒,时刻是这一笔记下的那一刻 */
+ | {
+    k: 'fg';
+    page: string;
+    ms: number;
+}
+/** 权限变了(7.2):mic = 麦克风权限变成 state;autoplay = 老师的声音被拦了(state blocked) */
+ | {
+    k: 'perm';
+    page: string;
+    what: 'mic' | 'autoplay';
+    state: string;
+}
+/** 连接(7.3):offline = 心跳断了多久(通了才报);live = 实时老师的连接自己关了,opened false = 没连上,true = 连上 ms 毫秒后断了 */
+ | {
+    k: 'net';
+    page: string;
+    what: 'offline';
+    ms: number;
+} | {
+    k: 'net';
+    page: string;
+    what: 'live';
+    opened: boolean;
+    ms: number;
+} | {
+    k: 'error';
+    page: string;
+    mode: string;
+    v: string;
+    msg: string;
+    where: string;
+    stack: string;
+    ua: string;
+    ctx: Record<string, unknown> | null;
+};
+/** 服务端那时跑的是哪份代码(打开那行补) */
+export interface KidLogSrv {
+    v: string | null;
+    commit: string | null;
+    started: string;
+}
+export type KidLogLine = KidLogRow & {
+    at: string;
+    device: string;
+    ip?: string;
+    srv?: KidLogSrv;
+};
+/** 设备表的一项 */
+export interface KidDevice {
+    first: string;
+    last: string;
+    opens: number;
+    ua: string;
+    touch: number;
+    standalone: boolean;
+    label: string;
+    /** 家长在工作台起的名 */
+    name?: string;
+    /** 最近一次打开时服务端的提交 */
+    commit?: string;
+    /** 最近的权限与能力(打开时记,麦克风权限变了跟着改) */
+    caps?: KidCaps;
+    /** 老师的声音最近一次被浏览器拦的时刻 */
+    blockedAt?: string;
+}
+export type KidDevices = Record<string, KidDevice>;
+/** 页面交来的一行:形状不对、太长、k 不认得 → null(回 400) */
+export declare function parseKidLog(body: unknown): KidLogRow | null;
+export declare const newDeviceId: () => string;
+export declare const validDevice: (id: string | null | undefined) => string | null;
+export declare const deviceCookie: (id: string, secure: boolean) => string;
+export declare function readDevices(ws: Workspace): Promise<KidDevices>;
+/** 记一行流水;是孩子端的打开就顺手登记设备 */
+export declare function recordKidLog(ws: Workspace, row: KidLogRow, who: {
+    device: string;
+    ip?: string;
+    srv?: KidLogSrv;
+}, now: Date): Promise<void>;
+/** 家长起名;空着 = 去掉名字。没有这台 → false */
+export declare function renameDevice(ws: Workspace, id: string, name: string): Promise<boolean>;
+/** 这几天的流水,坏行丢掉 */
+export declare function readKidLog(ws: Workspace, dates: readonly string[]): Promise<KidLogLine[]>;

package/dist/runtime/journal/kid-log.js

@@ -0,0 +1,133 @@
+/**
+ * 孩子端的流水,服务端这一半:孩子端各页往服务端记的事,一件一行,按天存 .cotutor/kid-log/<日期>.jsonl。
+ * 页面那段脚本(KID_LOG_JS)在 src/ui/kid/kid-log.ts。
+ * 这期两件:open = 孩子端模式下打开一次(带认设备要的浏览器信息,登记进设备表 .cotutor/devices.json);error = 页面脚本出错(各种模式都记)。
+ * 设备是服务端种的 cookie(cotutor_kid,src/schema/kid-device.ts);消息上的 deviceId 也由服务端从 cookie 取,不靠页面带。
+ * 孩子端照旧什么都不显示;删话题不动流水。
+ */
+import { randomBytes } from 'node:crypto';
+import { appendFile, mkdir, readFile, rename, writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { localDate } from "../../shared/time.js";
+import { DEVICE_COOKIE, DEVICE_COOKIE_DAYS, DEVICE_ID_RE, deviceLabel } from "../../schema/kid-device.js";
+const MIC_STATES = ['granted', 'denied', 'prompt', 'unknown'];
+const micState = (v) => (MIC_STATES.includes(v) ? v : 'unknown');
+const MAX_BODY = 4000;
+const str = (v, max) => (typeof v === 'string' ? v.slice(0, max) : '');
+const num = (v) => (typeof v === 'number' && Number.isFinite(v) ? v : 0);
+/** 页面交来的一行:形状不对、太长、k 不认得 → null(回 400) */
+export function parseKidLog(body) {
+    if (!body || typeof body !== 'object' || Array.isArray(body) || JSON.stringify(body).length > MAX_BODY)
+        return null;
+    const b = body;
+    if (b.k === 'open') {
+        const c = b.caps && typeof b.caps === 'object' ? b.caps : null;
+        return { k: 'open', page: str(b.page, 40), v: str(b.v, 40), ua: str(b.ua, 400), touch: num(b.touch), standalone: b.standalone === true, w: num(b.w), h: num(b.h), vw: num(b.vw), vh: num(b.vh), dpr: num(b.dpr), lang: str(b.lang, 20), ...(c ? { caps: { mic: micState(c.mic), gum: c.gum === true } } : {}) };
+    }
+    if (b.k === 'net') {
+        const ms = typeof b.ms === 'number' && b.ms >= 0 && b.ms <= 86_400_000 ? Math.round(b.ms) : null;
+        if (ms === null)
+            return null;
+        if (b.what === 'offline')
+            return { k: 'net', page: str(b.page, 40), what: 'offline', ms };
+        if (b.what === 'live')
+            return { k: 'net', page: str(b.page, 40), what: 'live', opened: b.opened === true, ms };
+        return null;
+    }
+    if (b.k === 'perm')
+        return b.what === 'mic' || b.what === 'autoplay' ? { k: 'perm', page: str(b.page, 40), what: b.what, state: b.what === 'mic' ? micState(b.state) : 'blocked' } : null;
+    // 一笔最多算 6 小时(页面每 5 分钟记一笔,长了是钟跳了)
+    if (b.k === 'fg')
+        return typeof b.ms === 'number' && b.ms > 0 && b.ms <= 6 * 3600_000 ? { k: 'fg', page: str(b.page, 40), ms: Math.round(b.ms) } : null;
+    if (b.k === 'error') {
+        const ctx = b.ctx && typeof b.ctx === 'object' && !Array.isArray(b.ctx) ? b.ctx : null;
+        return { k: 'error', page: str(b.page, 40), mode: str(b.mode, 20), v: str(b.v, 40), msg: str(b.msg, 300), where: str(b.where, 40), stack: str(b.stack, 1500), ua: str(b.ua, 400), ctx };
+    }
+    return null;
+}
+export const newDeviceId = () => randomBytes(6).toString('hex');
+export const validDevice = (id) => (id && DEVICE_ID_RE.test(id) ? id : null);
+export const deviceCookie = (id, secure) => `${DEVICE_COOKIE}=${id}; Path=/; Max-Age=${DEVICE_COOKIE_DAYS * 86400}; HttpOnly; SameSite=Lax${secure ? '; Secure' : ''}`;
+const logDir = (ws) => join(ws.root, '.cotutor', 'kid-log');
+const devicesFile = (ws) => join(ws.root, '.cotutor', 'devices.json');
+export async function readDevices(ws) {
+    try {
+        const j = JSON.parse(await readFile(devicesFile(ws), 'utf8'));
+        return j && typeof j === 'object' && !Array.isArray(j) ? j : {};
+    }
+    catch {
+        return {};
+    }
+}
+/** 设备表一次只一个人写(同一进程一条队),写到临时文件再换上 */
+let chain = Promise.resolve();
+function updateDevices(ws, f) {
+    const run = async () => {
+        const d = await readDevices(ws);
+        const out = f(d);
+        await mkdir(join(ws.root, '.cotutor'), { recursive: true });
+        const file = devicesFile(ws);
+        await writeFile(`${file}.tmp`, `${JSON.stringify(d, null, 2)}\n`);
+        await rename(`${file}.tmp`, file);
+        return out;
+    };
+    const p = chain.then(run, run);
+    chain = p.catch(() => { });
+    return p;
+}
+/** 记一行流水;是孩子端的打开就顺手登记设备 */
+export async function recordKidLog(ws, row, who, now) {
+    const line = { at: now.toISOString(), ...row, device: who.device, ...(who.ip ? { ip: who.ip } : {}), ...(row.k === 'open' && who.srv ? { srv: who.srv } : {}) };
+    await mkdir(logDir(ws), { recursive: true });
+    await appendFile(join(logDir(ws), `${localDate(now)}.jsonl`), `${JSON.stringify(line)}\n`);
+    if (row.k === 'perm') {
+        // 权限变了:只改登记过的设备(家长端那几页不报 perm)
+        await updateDevices(ws, (d) => {
+            const dev = d[who.device];
+            if (!dev)
+                return;
+            if (row.what === 'autoplay')
+                dev.blockedAt = line.at;
+            else
+                dev.caps = { ...(dev.caps ?? { gum: true }), mic: micState(row.state) };
+        });
+        return;
+    }
+    if (row.k !== 'open')
+        return;
+    await updateDevices(ws, (d) => {
+        const was = d[who.device];
+        const hint = { ua: row.ua, touch: row.touch, standalone: row.standalone };
+        d[who.device] = { first: was?.first ?? line.at, last: line.at, opens: (was?.opens ?? 0) + 1, ...hint, label: deviceLabel(hint), ...(was?.name ? { name: was.name } : {}), ...(who.srv?.commit ? { commit: who.srv.commit } : {}), ...(row.caps ? { caps: row.caps } : was?.caps ? { caps: was.caps } : {}), ...(was?.blockedAt ? { blockedAt: was.blockedAt } : {}) };
+    });
+}
+/** 家长起名;空着 = 去掉名字。没有这台 → false */
+export function renameDevice(ws, id, name) {
+    return updateDevices(ws, (d) => {
+        const dev = d[id];
+        if (!dev)
+            return false;
+        const n = name.trim().slice(0, 30);
+        if (n)
+            dev.name = n;
+        else
+            delete dev.name;
+        return true;
+    });
+}
+/** 这几天的流水,坏行丢掉 */
+export async function readKidLog(ws, dates) {
+    const out = [];
+    for (const date of dates) {
+        const text = await readFile(join(logDir(ws), `${date}.jsonl`), 'utf8').catch(() => '');
+        for (const l of text.split('\n')) {
+            if (!l.trim())
+                continue;
+            try {
+                out.push(JSON.parse(l));
+            }
+            catch { /* 写到一半的行 */ }
+        }
+    }
+    return out;
+}

package/dist/runtime/journal/ledger.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 产物账本的纯函数部分:逐行 JSON + zod,坏行报行号不中断;按 id 折叠,后者为准。
+ * (观察不在账本里了,2026-09-14:真相在 vault 的日记,见 memory/diary.ts)
+ */
+import type { z } from 'zod';
+import { type Artifact, type ArtifactEvent } from '../../schema/index.ts';
+export interface JsonlParse<T> {
+    rows: T[];
+    errors: string[];
+}
+export declare function parseJsonl<T>(text: string, schema: z.ZodType<T>, file?: string): JsonlParse<T>;
+export declare const parseArtifactEvents: (text: string) => JsonlParse<ArtifactEvent>;
+/** 折叠产物事件;首行缺 kind / by 的产物报错(不进结果) */
+export declare function mergeArtifacts(events: ArtifactEvent[]): {
+    artifacts: Artifact[];
+    errors: string[];
+};

package/dist/{lib → runtime/journal}/ledger.js

@@ -1,4 +1,4 @@
-import { ArtifactEventSchema, ObservationLineSchema, explainIssues, } from "../schema/index.js";
+import { ArtifactEventSchema, explainIssues } from "../../schema/index.js";
 export function parseJsonl(text, schema, file = 'jsonl') {
     const rows = [];
     const errors = [];
@@ -21,24 +21,7 @@ export function parseJsonl(text, schema, file = 'jsonl') {
     });
     return { rows, errors };
 }
-export const parseObservations = (text) => parseJsonl(text, ObservationLineSchema, 'observations.jsonl');
 export const parseArtifactEvents = (text) => parseJsonl(text, ArtifactEventSchema, 'artifacts.jsonl');
-/** 完整行建条目,纠错行改 retracted;顺序按首次出现 */
-export function mergeObservations(lines) {
-    const byId = new Map();
-    for (const l of lines) {
-        if ('claim' in l) {
-            const prev = byId.get(l.id);
-            byId.set(l.id, prev ? { ...prev, ...l, retracted: prev.retracted || l.retracted } : { ...l });
-        }
-        else {
-            const prev = byId.get(l.id);
-            if (prev)
-                prev.retracted = true;
-        }
-    }
-    return [...byId.values()];
-}
 /** 折叠产物事件;首行缺 kind / by 的产物报错(不进结果) */
 export function mergeArtifacts(events) {
     const byId = new Map();
@@ -58,7 +41,8 @@ export function mergeArtifacts(events) {
                 status: e.status ?? 'draft',
                 path: e.path,
                 source: e.source,
-                hash: e.hash,
+                costUsd: e.costUsd,
+                durationMs: e.durationMs,
                 updatedAt: e.at,
             });
             continue;
@@ -73,28 +57,11 @@ export function mergeArtifacts(events) {
             prev.path = e.path;
         if (e.source)
             prev.source = e.source;
-        if (e.hash)
-            prev.hash = e.hash;
+        if (e.costUsd !== undefined)
+            prev.costUsd = e.costUsd;
+        if (e.durationMs !== undefined)
+            prev.durationMs = e.durationMs;
         prev.updatedAt = e.at;
     }
     return { artifacts: [...byId.values()], errors };
 }
-/** o-YYYYMMDD-NNN,同日顺延 */
-export function nextObservationId(date, existing) {
-    const day = date.replaceAll('-', '').slice(0, 8);
-    let n = 0;
-    for (const id of existing) {
-        const m = new RegExp(`^o-${day}-(\\d{3,})$`).exec(id);
-        if (m)
-            n = Math.max(n, Number(m[1]));
-    }
-    return `o-${day}-${String(n + 1).padStart(3, '0')}`;
-}
-/** 上下文包的 recent:未撤回、本学科(没配 subject 就全量)的最近 n 条,按日期与出现顺序,只带 date + claim */
-export function recentObservations(obs, opts) {
-    return obs
-        .filter((o) => !o.retracted && (!opts.subject || o.subject === opts.subject))
-        .sort((a, b) => (a.date < b.date ? -1 : a.date > b.date ? 1 : 0))
-        .slice(-opts.n)
-        .map((o) => ({ date: o.date, claim: o.claim }));
-}

package/dist/runtime/journal/mix.d.ts

@@ -0,0 +1,33 @@
+/**
+ * 录像的声音(口语课、实时老师共用):两边的声音照到达的时刻摆成一条对齐墙钟的单声道(24k),和孩子当时听到的、说的一样。纯函数。
+ *   孩子的块(16k)到了服务端才记时刻,声音是那之前 100 毫秒录的:往前挪一块的长度,升到 24k。
+ *   老师的块照孩子端 A.play 的排法排:上一块放完或到达 + 60 毫秒,取晚的;flush(孩子插嘴、换段)那一刻还没放完的截掉,队列从头排。
+ * 同时给出老师在出声的时段(录像里画「老师在说 / 轮到你」用)、孩子有声的时段(跳过空白时别把孩子说话剪掉)。
+ */
+export declare const MIX_RATE = 24000;
+export interface Chunk {
+    t: number;
+    pcm: Buffer;
+}
+/** 老师的块排成段:[开始, 结束, pcm],flush 截断;时间都是毫秒 */
+export declare function scheduleTutor(chunks: Chunk[], flushes: number[]): {
+    start: number;
+    end: number;
+    pcm: Buffer;
+}[];
+/** 老师出声的时段:挨着的段(间隔不到 150 毫秒)并成一段 */
+export declare function playingOf(segs: {
+    start: number;
+    end: number;
+}[]): [number, number][];
+/** 两边混成一条(PCM16 单声道 24k,长到 ms 为止;挂断那一刻还没放完的老师的声音不要) */
+export declare function mixCall(o: {
+    kid: Chunk[];
+    tutor: Chunk[];
+    flushes: number[];
+    ms: number;
+}): {
+    pcm: Buffer;
+    playing: [number, number][];
+    kidVoice: [number, number][];
+};