cotutor 0.3.0 → 0.4.1

package/dist/runtime/runner.js

@@ -11,26 +11,24 @@
  * 进程 cwd 是老师目录 agents/<name>/。
  */
 import { lecturePack, readLecture, storedMarks } from "./lecture.js";
-import { existsSync } from 'node:fs';
-import { appendFile, mkdir, readFile, writeFile } from 'node:fs/promises';
-import { dirname, isAbsolute, join, relative, sep } from 'node:path';
+import { appendFile, mkdir, readFile } from 'node:fs/promises';
+import { isAbsolute, join, relative, sep } from 'node:path';
 import { buildContextPack } from "./context/context-pack.js";
-import { addMessage, applyRun, lastJobOf, changedCards, jobId, sameRuntime, sessionFor } from "./journal/conversation.js";
+import { addMessage, applyRun, changedCards, jobId, sameRuntime, sessionFor } from "./journal/conversation.js";
 import { localDate, localMinute } from "../shared/time.js";
-import { cardId, conversationFiles, threads } from "../schema/index.js";
+import { cardVoice, cardId, conversationFiles, threads } from "../schema/index.js";
 import { bookkeepingPrompt, kidQuestions, textbookHeadings } from "../memory/diary.js";
 import { cardAssets, cardLabel, describeCard, tutorCardKinds } from "../board/cards/index.js";
 import { boardGuideFor, cardGuidesFor } from "../board/cards/docs.js";
 import { activityCards, parseActivity, renderTutorSection } from "./activity.js";
-import { activityFile } from "./activities.js";
+import { findActivityFile } from "./activities.js";
 import { activityState, paintGate, paintTool, readActivity, threadActivity } from "./activity-state.js";
-import { controlsTools, createBrain } from "../brain/index.js";
-import { endsWithToolCall, lineFlags, parseBoard } from "../board/parse.js";
+import { createBrain, getRuntime } from "../brain/index.js";
+import { lineFlags, parseBoard } from "../board/parse.js";
 import { readyBeats, beatsOf } from "../board/presentation.js";
 import { deriveKidView, truncateReply } from "./kid-view.js";
 import { parseSections } from "../board/sections.js";
 import { threadDigest } from "./context/thread-digest.js";
-import { getRuntime, runtimeUses, boardPreloaded } from "../brain/cli/run-plan.js";
 import { beatTimings } from "./journal/events.js";
 import {} from "../schema/index.js";
 import { BOARD_CARD_KINDS, MEMORY_MAX_PER_TURN, MEMORY_TIDY_CAP, VAULT_PACK_ROLES, isApiRuntime, resolvePolicy } from "../schema/index.js";
@@ -45,8 +43,7 @@ import { TUTOR_RULES_PATH, takesTutorRules, tutorRulesBody, BOARD_GUIDE_IN_SYSTE
 import { DubQueue } from "../media/tts.js";
 import { continueContext } from "./home/store.js";
 import { kidInput } from "./kid-input.js";
-import { dashscopeAuth } from "../realtime/bailian.js";
-import { qianwenKeys } from "../shared/qianwen.js";
+import { compatibleLine } from "../shared/qianwen.js";
 import { DRAW_ONLY_TEXT, drawingPackLine } from "../board/paper.js";
 import { makeDraw } from "../media/draw.js";
 import { paintLines, startPaints } from "../scenes/paint/painter.js";
@@ -123,7 +120,7 @@ export async function gatherContext(ws, tutor, input, report) {
  */
 export async function attachActivity(ws, tutor, pack, run, where, inSystem = false) {
     pack.activity = { name: run.name, params: run.params, state: {} };
-    const path = relative(ws.root, activityFile(ws.root, tutor, run.name)).split(sep).join('/');
+    const path = relative(ws.root, findActivityFile(ws.root, tutor, run.name)).split(sep).join('/');
     const text = await readFile(join(ws.root, path), 'utf8').catch(() => null);
     if (text === null) {
         pack.activityGuide = `缺:${path} 不在,照你老师文件里的做`;
@@ -150,8 +147,6 @@ export async function attachActivity(ws, tutor, pack, run, where, inSystem = fal
     pack.activityGuide = path;
     return [];
 }
-/** 按老师裁的板书写法落在哪(相对 workspace 根;机器文件,内容变了文件名跟着变) */
-export const TUTOR_BOARD_DIR = '.cotutor/board';
 /** activity 在系统提示里时,上下文包 activityGuide 那一行 */
 export const ACTIVITY_IN_SYSTEM = '已在你的系统提示里(这个话题的 activity,照它带)';
 export async function activityParts(ws, tutor, run) {
@@ -160,85 +155,42 @@ export async function activityParts(ws, tutor, run) {
         return null;
     const kinds = [...new Set(['text', ...a.cards.filter((k) => BOARD_CARD_KINDS.includes(k))])];
     const body = renderTutorSection(a, { params: run.params, cards: kinds }) ?? '';
-    const guideBody = boardGuideFor(kinds);
-    const guide = { body: guideBody, path: `${TUTOR_BOARD_DIR}/${tutor}-${textHash(guideBody).slice(0, 8)}.md` };
     const display = ws.config.tutors[tutor]?.display ?? tutor;
-    await writeIfChanged(join(ws.root, guide.path), guideBody);
-    return { body, kinds, guide, memory: { agent: `${tutor}/${run.name}`, display: `${display}·${run.name}` } };
+    return { body, kinds, guide: boardGuideFor(kinds), memory: { agent: `${tutor}/${run.name}`, display: `${display}·${run.name}` } };
 }
-async function writeIfChanged(file, text) {
-    if ((await readFile(file, 'utf8').catch(() => null)) === text)
-        return;
-    await mkdir(dirname(file), { recursive: true });
-    await writeFile(file, text);
-}
-/**
- * 这位老师的板书写法:正文 + 相对 workspace 根的路径(给 {boardFile} 与上下文包)。
- * 没写 cards → 出厂的 cotutor-board SKILL.md;写了 → 按清单从包里现拼(boardGuideFor),写到 .cotutor/board/<老师>-<hash>.md,
- * 文件名带内容的 hash:清单一改路径就变,预热进程的 argv 对不上,不会拿着旧写法去答。读不到 SKILL.md → null。
- */
+/** 这位老师的板书写法:没写 cards → 出厂的 cotutor-board SKILL.md;写了 → 按清单从包里现拼(boardGuideFor)。读不到 SKILL.md → null */
 export async function boardGuideOf(ws, tutor) {
     const kinds = tutorCardKinds(ws.config.tutors[tutor]?.cards);
-    if (!kinds) {
-        try {
-            return { body: boardGuideBody(await readFile(join(ws.root, BOARD_GUIDE_PATH), 'utf8')), path: BOARD_GUIDE_PATH };
-        }
-        catch {
-            return null;
-        }
-    }
-    const body = boardGuideFor(kinds);
-    const path = `${TUTOR_BOARD_DIR}/${tutor}-${textHash(body).slice(0, 8)}.md`;
-    const file = join(ws.root, path);
-    if (!existsSync(file)) {
-        await mkdir(join(ws.root, TUTOR_BOARD_DIR), { recursive: true });
-        await writeFile(file, body);
+    if (kinds)
+        return boardGuideFor(kinds);
+    try {
+        return boardGuideBody(await readFile(join(ws.root, BOARD_GUIDE_PATH), 'utf8'));
     }
-    return { body, path };
-}
-/**
- * 板书写法怎么递给老师(2026-09-19):有脸的老师、板书没关才带。运行时预载了 → 上下文包只写一行事实;
- * 没预载 → 原文作为一条笔记放进话题第一条(<cotutor-board>),排在守则后面,续话题没改过写「未变」。返回板书写法(给 {systemBody} 与 {boardFile})。
- */
-export async function attachBoardGuide(ws, tutor, pack, o) {
-    if (!takesTutorRules(tutor) || o.boardOff)
-        return null;
-    const guide = await boardGuideOf(ws, tutor);
-    if (!guide) {
-        pack.boardGuide = `缺:${BOARD_GUIDE_PATH} 不在(cotutor upgrade 补),照你会的写`;
+    catch {
         return null;
     }
-    if (o.preloaded) {
-        pack.boardGuide = BOARD_GUIDE_IN_SYSTEM;
-        return guide;
-    }
-    pack.boardGuide = guide.path;
-    const notes = pack.notes ?? [];
-    const at = notes.findIndex((n) => n.role === 'rules');
-    notes.splice(at + 1, 0, { role: 'boardGuide', path: guide.path, text: guide.body });
-    pack.notes = notes;
-    return guide;
 }
-/** 回复停在写成正文的工具调用上(后面只剩空行;「## 」尾巴不算):交给脑,CLI 据此 resume 一次 */
-const stuckOnTool = (text) => endsWithToolCall(parseSections(text).body);
 /**
- * 老师正文({agentBody})与系统提示({systemBody} = 正文 + 板书写法)、板书写法的文件({boardFile}):模板用到才读。send 与预热同一份,预热起的进程 argv 才对得上。
- * 顺手把板书写法挂到上下文包上(attachBoardGuide)。没递板书写法(工具人、板书关了)的 {boardFile} 照旧是出厂的 SKILL.md。
+ * 系统提示(2026-09-19 起板书写法跟着进系统提示):有脸的老师、板书没关才带板书写法,上下文包只写一行「已在系统提示里」。
+ * activity 话题:系统提示换成 activity 的人设与做法 + 它的卡的写法;工具人(没有守则)的 activity 退回老师文件 + 第一条带原文(attachActivity)。
  */
-async function systemParts(ws, tutor, runtime, policy, pack, act = null) {
-    const wantsSystemBody = runtimeUses(runtime, '{systemBody}');
-    // activity 话题:系统提示换成 activity 的(Qwen 走 {systemBody});模板没有它就退回老师文件 + 第一条带原文
-    if (act && takesTutorRules(tutor) && wantsSystemBody) {
-        const boardOff = policy.board === 'off';
+async function systemParts(ws, tutor, policy, pack, act = null) {
+    const boardOff = policy.board === 'off';
+    if (act && takesTutorRules(tutor)) {
         if (!boardOff)
             pack.boardGuide = BOARD_GUIDE_IN_SYSTEM;
-        const systemBody = boardOff ? act.body : `${act.body}\n\n${act.guide.body}`;
-        return { agentBody: act.body, systemBody, boardFile: join(ws.root, boardOff ? BOARD_GUIDE_PATH : act.guide.path), agent: tutor, activityInSystem: true };
+        return { systemBody: boardOff ? act.body : `${act.body}\n\n${act.guide}`, activityInSystem: true };
     }
-    const agentBody = runtimeUses(runtime, '{agentBody}') || wantsSystemBody ? await readAgentBody(ws, tutor) : undefined;
-    const guide = await attachBoardGuide(ws, tutor, pack, { preloaded: boardPreloaded(runtime), boardOff: policy.board === 'off' });
-    const systemBody = wantsSystemBody && agentBody !== undefined ? (guide ? `${agentBody}\n\n${guide.body}` : agentBody) : undefined;
-    return { agentBody, systemBody, boardFile: join(ws.root, guide?.path ?? BOARD_GUIDE_PATH), agent: tutor, activityInSystem: false };
+    const agentBody = await readAgentBody(ws, tutor);
+    if (!takesTutorRules(tutor) || boardOff)
+        return { systemBody: agentBody, activityInSystem: false };
+    const guide = await boardGuideOf(ws, tutor);
+    if (!guide) {
+        pack.boardGuide = `缺:${BOARD_GUIDE_PATH} 不在(cotutor upgrade 补),照你会的写`;
+        return { systemBody: agentBody, activityInSystem: false };
+    }
+    pack.boardGuide = BOARD_GUIDE_IN_SYSTEM;
+    return { systemBody: `${agentBody}\n\n${guide}`, activityInSystem: false };
 }
 /** 这轮带的笔记版本:role → `路径@hash`(记进消息;同一话题下一轮对得上就不再带原文) */
 export function noteVersions(pack) {
@@ -262,7 +214,7 @@ export function seenNotes(messages, thread) {
             return messages[i].notes;
     return {};
 }
-/** 老师该读得到的目录:workspace 根(作业照片、技能)与 vault(教材、日记);会话 cwd 是老师目录,这些在它外面(qwen 读外面要先划进来) */
+/** 只读工具读得到的目录:workspace 根(作业照片、技能)与 vault(教材、日记) */
 export function readDirsOf(ws) {
     return [...new Set([ws.root, ws.paths.vault])];
 }
@@ -277,13 +229,12 @@ export async function packDryRun(ws, tutor, input) {
     const policy = resolvePolicy(ws.config, tutor);
     if (policy.board === 'off')
         pack.board = 'off';
-    const { runtime } = getRuntime(ws.config, t.runtime);
     // 和 send 同一条规矩:孩子的话不带工具时,只有工具才用得上的路径不进包
-    if (policy.tools !== 'on' && input.from === 'kid' && controlsTools(runtime)) {
+    if (policy.tools !== 'on' && input.from === 'kid') {
         delete pack.refs;
         delete pack.vault;
     }
-    const parts = await systemParts(ws, tutor, runtime, policy, pack, act);
+    const parts = await systemParts(ws, tutor, policy, pack, act);
     if (input.activity)
         await attachActivity(ws, tutor, pack, input.activity, { date: localDate(input.at), messages: [], thread: '', now: input.at.getTime() }, parts.activityInSystem);
     return { prompt: buildContextPack(pack, input.text, policy.contextPack), pack, report };
@@ -297,7 +248,7 @@ export function vaultPack(paths) {
         if (!p)
             continue;
         const rel = relative(root, p);
-        out[r] = !rel || rel.startsWith('..') || isAbsolute(rel) ? p : rel;
+        out[r] = !rel || rel.startsWith('..') || isAbsolute(rel) ? p : rel.split(sep).join('/');
     }
     return out;
 }
@@ -310,15 +261,9 @@ export class Runner {
     listeners = new Set();
     /** noteEvent 每个事件文件一条追加链 */
     notes = new Map();
-    /** 脑执行:起老师、读输出、断流接着跑、预热下一轮(src/brain/) */
+    /** 脑执行:请模型、读输出(src/brain/) */
     brain;
-    /** 预热池的旧入口(测试看有没有、杀掉);迁完删 */
-    get spares() {
-        return { has: (tutor, slot) => this.brain.warmed(tutor, slot), drop: (tutor, slot) => this.brain.dropWarm(tutor, slot) };
-    }
-    /** 页面拉今天时的预热:每位老师(与带的话题)上次看的时刻 */
-    prewarmedAt = new Map();
-    /** 起子进程用的环境(测试注入) */
+    /** key、假端点从哪读的环境(测试注入) */
     get env() {
         return this.opts.env;
     }
@@ -332,10 +277,10 @@ export class Runner {
         this.getWs = getWs;
         this.opts = opts;
         this.draw = opts.draw ?? makeDraw({ env: opts.env });
-        // API 运行时的凭证与实时那边同一条查找链(家长端配的在最前);只有按量 key、没有业务空间 id 也能用(走公网域名,同 qwen)。
+        // API 运行时的 key 与配音、画图同一套选法(~/.config/cotutor/):Token Plan 有这个模型就走它,否则百炼按量;只有按量 key、没有业务空间 id 也能用(走公网域名)。
         // COTUTOR_BRAIN_ENDPOINT:测试与探针指到假百炼
         const env = opts.env ?? process.env;
-        this.brain = createBrain({ workspace: () => { const ws = this.getWs(); return { config: ws.config, root: ws.root }; }, env: opts.env, warmIdleMs: opts.warmIdleMs, auth: () => dashscopeAuth(env) ?? (qianwenKeys(env).payg ? { key: qianwenKeys(env).payg, workspaceId: null } : null), endpoint: env.COTUTOR_BRAIN_ENDPOINT || undefined });
+        this.brain = createBrain({ workspace: () => { const ws = this.getWs(); return { config: ws.config, root: ws.root }; }, line: (model) => compatibleLine(model, env), endpoint: env.COTUTOR_BRAIN_ENDPOINT || undefined });
     }
     /** 孩子端发一条的验与拼(HTTP 与实时老师共用,./kid-input.ts):拼成 send 的入参,或回 reject;不起老师 */
     accept(tutor, body, date, deviceId) {
@@ -373,61 +318,6 @@ export class Runner {
             }
         }
     }
-    /** 杀掉所有预热的进程(测试收尾;服务退出时它们的 stdin 断了会自己退) */
-    close() {
-        this.brain.close();
-    }
-    /**
-     * 预热:给这位老师起好下一轮的进程,两个位置都补齐——
-     * fresh:新开会话(新话题、接着上次都用它);
-     * resume:接 thread(页面选着的话题;不给或今天没有 = 当天末条所在的话题,和 send 缺省一样)的会话,它没有会话就不留。
-     * 只给有脸的、开着的、运行时 stdin: "stream-json"、这会儿没在跑的老师起;throttleMs 内同一话题看过就不再看(页面轮询今天)。
-     * 起了返回 true;起不了不报错,下一轮冷起。warm: false(cotutor send:跑完就退,留着备用进程会把它挂一小时)不起。
-     */
-    async prewarm(tutor, opts = {}) {
-        if (this.opts.warm === false)
-            return false;
-        const t0 = Date.now();
-        const seen = `${tutor}\n${opts.thread ?? ''}`;
-        if (opts.throttleMs && t0 - (this.prewarmedAt.get(seen) ?? -Infinity) < opts.throttleMs)
-            return false;
-        this.prewarmedAt.set(seen, t0);
-        const ws = this.getWs();
-        const t = ws.config.tutors[tutor];
-        if (!t?.enabled || !takesTutorRules(tutor) || this.active.has(tutor))
-            return false;
-        const { runtime } = getRuntime(ws.config, t.runtime);
-        if (!this.brain.canWarm(runtime))
-            return false;
-        const date = localDate((this.opts.now ?? (() => new Date()))());
-        const index = await readIndex(ws, tutor, date);
-        const known = threads(index.messages);
-        const thread = opts.thread && known.includes(opts.thread) ? opts.thread : known.at(-1);
-        const session = thread ? sessionFor(index, thread) : null;
-        const policy = resolvePolicy(ws.config, tutor);
-        const parts = await systemParts(ws, tutor, runtime, policy, { at: '', plan: [], recent: [] });
-        const base = { prompt: '', runtime: t.runtime, effort: policy.effort, tools: policy.tools === 'on' ? 'on' : 'off', readDirs: readDirsOf(ws) };
-        // 预热的是孩子的下一句:工具照孩子那轮填(带照片的对不上,那轮冷起)。新话题照老师文件;接着的话题是 activity 的,照它的系统提示
-        const fresh = this.brain.plan({ ...base, ...parts, session: null });
-        const run = thread ? threadActivity(index.messages, thread) : null;
-        const act = run ? await activityParts(ws, tutor, run) : null;
-        const resumeParts = act ? await systemParts(ws, tutor, runtime, policy, { at: '', plan: [], recent: [] }, act) : parts;
-        const resume = session ? this.brain.plan({ ...base, ...resumeParts, session }) : null;
-        const cwd = join(ws.dirs.agents, tutor);
-        await mkdir(cwd, { recursive: true });
-        // 读索引这会儿孩子可能已经开口了:这轮在跑就不起(它收尾时会再起)
-        if (this.active.has(tutor))
-            return false;
-        await this.brain.prepare(fresh);
-        if (this.active.has(tutor))
-            return false;
-        this.brain.warm(tutor, 'fresh', fresh, { cwd, date, lastJob: null });
-        if (resume?.resume && thread)
-            this.brain.warm(tutor, 'resume', resume, { cwd, date, lastJob: lastJobOf(index, thread) });
-        else
-            this.brain.dropWarm(tutor, 'resume');
-        return true;
-    }
     /** 正在回的那条已经出来的板书(流式);没在跑或还没出卡 → null */
     partial(tutor) {
         return this.active.get(tutor)?.partial ?? null;
@@ -499,7 +389,7 @@ export class Runner {
         const query = input.from === 'kid' ? [text, input.home?.brief].filter(Boolean).join('\n') : '';
         const gathered = await gatherContext(ws, tutor, { from: input.from, at: now, focus: input.focus, ...(query ? { query } : {}), ...(act ? { agent: act.memory.agent, kinds: act.kinds } : {}) });
         const policy = resolvePolicy(ws.config, tutor);
-        const { agentBody, systemBody, boardFile, agent, activityInSystem } = await systemParts(ws, tutor, runtime, policy, gathered, act);
+        const { systemBody, activityInSystem } = await systemParts(ws, tutor, policy, gathered, act);
         const activityRun = input.bookkeep ? null : threadRun;
         const activityWarn = activityRun ? await attachActivity(ws, tutor, gathered, activityRun, { date, messages: index.messages, thread, now: now.getTime() }, activityInSystem) : [];
         // 家长笔记原文:新会话整篇带;续会话时这个话题带过、没改的只写「未变」
@@ -529,10 +419,9 @@ export class Runner {
         }));
         // 这轮带不带工具(policy.tools,2026-10-04):孩子说的话缺省不带,只凭上下文包答;带照片的、交了画的(要 Read 看图)、
         // 系统任务带只读的(以前是整份白名单,照片里一句话就能让老师拿 Bash 读写 workspace 外);policy.tools: on 的老师总是整份。
-        // 不带的那轮,只有工具才用得上的路径(refs / vault)不进包;模板管不了工具的运行时(没有 {tools} / {toolArgs}),照旧
+        // 不带的那轮,只有工具才用得上的路径(refs / vault)不进包
         const tools = policy.tools === 'on' ? 'on' : input.from !== 'kid' || seen.length > 0 || drawings > 0 ? 'read' : 'off';
-        const bare = tools === 'off' && controlsTools(runtime);
-        if (bare) {
+        if (tools === 'off') {
             delete pack.refs;
             delete pack.vault;
         }
@@ -568,29 +457,22 @@ export class Runner {
             pack.live = { ...(l.caught ? { caught: l.caught } : {}), ...(l.cut !== undefined ? { cut: l.cut } : {}), ...(l.warmup?.length ? { warmup: l.warmup } : {}), ...(l.phone !== undefined ? { phone: l.phone } : {}), ...(l.app ? { app: l.app } : {}), ...(l.draw?.length ? { draw: l.draw } : {}) };
         }
         const prompt = buildContextPack(pack, text, policy.contextPack);
-        const req = { agent, prompt, agentBody, systemBody, boardFile, runtime: input.runtime ?? t.runtime, effort: policy.effort, tools, readDirs: readDirsOf(ws), session, ...(compact ? { compact: { digest: threadDigest(index.messages.filter((_, i) => known[i] === thread)) } } : {}), ...(pack.photoFiles?.length ? { images: pack.photoFiles } : {}), stuckOnTool };
+        const req = { agent: tutor, prompt, systemBody, runtime: input.runtime ?? t.runtime, effort: policy.effort, tools, readDirs: readDirsOf(ws), session, ...(compact ? { compact: { digest: threadDigest(index.messages.filter((_, i) => known[i] === thread)) } } : {}), ...(pack.photoFiles?.length ? { images: pack.photoFiles } : {}) };
         const plan = this.brain.plan(req);
         // 原声:落在这轮旁边(删话题一起删);写不下就当没有,消息照发
         const started = addMessage(index, { job, thread, at: pack.at, from: input.from, text, focus: input.focus, ...(input.action ? { action: input.action } : {}), ...(cards.length ? { cards: cards.map(({ card, text }) => ({ card, text })) } : {}), ...(photos.length ? { photos } : {}), ...(input.drawing ? { drawing: input.drawing } : {}), ...(input.device ? { device: input.device } : {}), ...(input.deviceId ? { deviceId: input.deviceId } : {}), ...(input.bookkeep ? { bookkeep: input.bookkeep } : {}), ...(input.tidy ? { tidy: true } : {}), ...(input.replayOf ? { replayOf: input.replayOf } : {}), ...(input.eval ? { eval: true } : {}), ...(input.live ? { live: true } : {}), ...(input.via ? { via: input.via } : {}), ...(continued && input.continues ? { continues: { date: input.continues.date, thread: input.continues.thread } } : {}), ...(input.lecture ? { lecture: { bundle: input.lecture.bundle, title: lecture?.title ?? input.lecture.bundle, watchedMs: input.lecture.watchedMs, finished: input.lecture.finished, pauses: input.lecture.pauses, ...(input.lecture.again ? { again: true } : {}), ...(lecture?.video ? { video: true } : {}), ...(marks.length ? { marks } : {}), ...(input.lecture.log?.length ? { log: input.lecture.log } : {}) } } : {}), ...(Object.keys(notes).length ? { notes } : {}), ...(fresh && activityRun ? { activity: activityRun } : {}), ...(fresh && input.talk ? { talk: input.talk } : {}), ...(compact ? { compacted: true } : {}), ...(lectureWarn.length || activityWarn.length ? { warnings: [...lectureWarn, ...activityWarn] } : {}), result: 'running', artifacts: [], runtime: plan.runtime });
         await writeIndex(ws, started);
         // 运行记录(《vault重构方案》§7):除了老师文件与技能,还记这轮带进上下文的每篇笔记、替老师查的每个文件,事后重建得出老师看到的是哪一版
         const notesSent = (pack.notes ?? []).map((n) => ({ role: n.role, path: n.path, hash: textHash(n.text), chars: n.text.length, ...(n.cut ? { cut: true } : {}) }));
-        await writeRunFile(ws, tutor, date, job, { at: pack.at, prompt, plan, agentBody: agentBody !== undefined, sources: { ...(await snapshotSources(ws, tutor)), notes: notesSent, retrieved: gathered.retrieved } });
-        // 这个 CLI 在 workspace 里要的机器文件(qwen 的隔离家目录):备不好这轮照起,起不来的原因会在 err.log
-        await this.brain.prepare(plan);
+        await writeRunFile(ws, tutor, date, job, { at: pack.at, prompt, plan, agentBody: true, sources: { ...(await snapshotSources(ws, tutor)), notes: notesSent, retrieved: gathered.retrieved } });
         active.job = job;
         if (input.live)
             active.live = true;
         // 实时的一轮讲稿是嘴念的,不按 replyMaxChars 截(截了孩子听到半句:10-20「题目已经…」后面「你补上 ēng 就行」没了)
         const runPolicy = input.live ? { ...policy, replyMaxChars: Number.MAX_SAFE_INTEGER } : policy;
-        // 预热的进程按这个话题末条 job 对(新开记 null);spawn 在同一拍里接过来
-        const lastJob = plan.resume ? lastJobOf(index, thread) : null;
-        active.done = this.spawn(ws, tutor, date, job, thread, req, plan, runPolicy, active, lastJob).finally(() => {
+        active.done = this.spawn(ws, tutor, date, job, thread, req, plan, runPolicy, active).finally(() => {
             if (this.active.get(tutor) === active)
                 this.active.delete(tutor);
-            // 孩子 / 家长这轮完了,马上起好下一轮的进程;系统轮(记账、整理记忆)之后孩子多半不在,不起
-            if (input.from !== 'system' && !input.replayOf && !input.eval)
-                void this.prewarm(tutor).catch(() => { });
         });
         return { tutor, date, job, thread, plan, done: active.done };
     }
@@ -694,7 +576,7 @@ export class Runner {
         const shared = Boolean(ws.config.tutors[tutor]) && tutor.endsWith('-tutor');
         return planMemory(ws, { agent: owner?.agent ?? tutor, display: owner?.display ?? ws.config.tutors[tutor]?.display ?? tutor, items, max: asked?.tidy ? null : MEMORY_MAX_PER_TURN, date, said, shared, ...(seen ? { seen } : {}), ...(childSeen ? { childSeen } : {}) });
     }
-    async spawn(ws, tutor, date, job, thread, req, plan, policy, active, lastJob) {
+    async spawn(ws, tutor, date, job, thread, req, plan, policy, active) {
         const replyMaxChars = policy.replyMaxChars;
         const files = conversationFiles(ws.dirs.conversations, tutor, date);
         // 埋点:从这一轮起算,首卡 = partial 板书第一次有卡(孩子端第一次看到东西),done = 进程退出,dubbed = 配音收尾
@@ -718,8 +600,8 @@ export class Runner {
             }
         };
         // 讲稿不配音(嘴照念):拍关就就绪;卡自己的声音(点读段、单词)照配
-        const cardVoice = ws.config.tutors[tutor]?.voice;
-        const queue = cardVoice ? new DubQueue(cardVoice, files.err(job), { cacheDir: ws.dirs.tts, env: this.opts.env }) : null;
+        const voice = cardVoice(ws.config.tutors, tutor);
+        const queue = voice ? new DubQueue(voice, files.err(job), { cacheDir: ws.dirs.tts, env: this.opts.env }) : null;
         if (queue)
             queue.report = (e) => emit(e.kind === 'queued' ? { lane: 'tts', kind: 'queued', label: e.label } : e.kind === 'done' ? { lane: 'tts', kind: 'done', label: e.label, ms: e.ms, file: e.file ?? '' } : { lane: 'tts', kind: 'failed', label: e.label, ms: e.ms, error: e.error ?? '?' });
         let cardsSeen = 0;
@@ -765,24 +647,21 @@ export class Runner {
                 emit({ lane: 'main', kind: 'line', line: linesSeen, text: lines[linesSeen].text, ...lineFlags(lines[linesSeen], section.cards) });
             settleReady();
         };
-        // 起老师(src/brain/):预热的进程在这一拍里接过来(send 查完 busy 到这里之间没有 await);正文、工具、断流随流回报
-        const brainRun = this.brain.start(req, plan, { tutor, key: { cwd: join(ws.dirs.agents, tutor), date, lastJob }, files: { log: files.log(job), err: files.err(job), history: files.brain(thread) }, stall: policy.stall }, {
-            onStart: (s) => emit({ lane: 'main', kind: 'start', cli: s.cli, runtime: s.runtime, resume: s.resume, ...(s.warmBornAt !== undefined ? { warmMs: t0 - s.warmBornAt } : {}) }),
+        // 请老师(src/brain/):正文、工具随流回报
+        const brainRun = this.brain.start(req, plan, { tutor, files: { log: files.log(job), err: files.err(job), history: files.brain(thread) }, stall: policy.stall }, {
+            onStart: (s) => emit({ lane: 'main', kind: 'start', cli: s.cli, runtime: s.runtime, resume: s.resume }),
             onText: () => {
                 dirty = true;
                 if (!timer)
                     timer = setTimeout(reparse, 150);
             },
             onTool: (tl) => emit({ lane: 'main', kind: 'tool', name: tl.name, sub: tl.sub }),
-            onStall: (s) => emit({ lane: 'main', kind: 'stall', idleMs: s.idleMs, retry: s.retry, kept: s.kept }),
             onExit: (at) => {
                 timing.doneMs = at - t0;
                 if (timer)
                     clearTimeout(timer);
             },
         });
-        if (brainRun.warm)
-            timing.warm = true;
         const { transcript, tools, warnings } = await brainRun.done;
         emit({ lane: 'main', kind: 'exit', ok: transcript.final.ok, ...(transcript.final.reason ? { reason: transcript.final.reason } : {}), ...(transcript.final.inTokens !== undefined ? { tokens: { in: transcript.final.inTokens, out: transcript.final.outTokens ?? 0 } } : {}), ...(transcript.final.numTurns !== undefined ? { turns: transcript.final.numTurns } : {}) });
         const kidView = deriveKidView(transcript, { replyMaxChars }, { live: active.live });

package/dist/scenes/paint/painter.js

@@ -5,7 +5,7 @@
  * 一张一张排着画。孩子端没有错误:没画成就停在分幅那几句,原因只给家长看。
  */
 import { mkdir, readdir, readFile, rename, writeFile } from 'node:fs/promises';
-import { join, relative } from 'node:path';
+import { join, relative, sep } from 'node:path';
 import { cardId, conversationFiles } from "../../schema/index.js";
 import { PaintPropsSchema } from "../../board/cards/index.js";
 import { PAINT_DEFAULT, PAINT_NEGATIVE } from "../../schema/index.js";
@@ -124,7 +124,7 @@ export function paintNote(r) {
     const why = e.startsWith('daily:') ? `今天画了 ${e.slice(6).split('/')[0]} 张,到了当时一天的上限(现在不限了)`
         : e.startsWith('gate:') ? `应用拦下了,没交给画家(activity「应用拦的」:${e.slice(5)})`
             : e === 'replay' ? '回放不画'
-                : e === 'no_key' ? '拿不到百炼 key(DASHSCOPE_API_KEY,或本机 ~/.qwen/settings.json)'
+                : e === 'no_key' ? '拿不到百炼 key(家长端「首页」里填)'
                     : e === 'stale' ? '画到一半服务重起了'
                         : e.includes('DataInspectionFailed') ? '百炼的内容审核没过'
                             : e === 'timeout' ? '等了太久(超时)'
@@ -148,7 +148,8 @@ export async function enrichPaints(ws, tutor, date, job, at, section, opts = {})
         if (r?.state === 'drawing' && since(r.at) > PAINT_STALE_MS)
             r = { state: 'none', at: r.at, error: 'stale' };
         const drawn = r ? (r.state === 'done' ? 'done' : r.state) : since(at) > PAINT_STALE_MS ? 'none' : 'drawing';
-        const pic = drawn === 'done' ? relative(ws.root, files.cardAsset(job, n, PAINT_PNG)) : undefined;
+        // 孩子端按它拼取图的地址:Windows 上 relative 给的是反斜杠,换成 /
+        const pic = drawn === 'done' ? relative(ws.root, files.cardAsset(job, n, PAINT_PNG)).split(sep).join('/') : undefined;
         return { ...c, props: { ...c.props, drawn, ...(pic ? { pic } : {}), ...(opts.parent ? { note: paintNote(r) } : {}) } };
     }));
     return { ...section, cards };

package/dist/schema/config.d.ts

@@ -5,6 +5,8 @@
  * 人设(display / avatar / voice)、政策、开关全在这里。
  */
 import { z } from 'zod';
+import { DEFAULT_PORT } from '../shared/default-port.ts';
+export { DEFAULT_PORT };
 export declare const PolicySchema: z.ZodObject<{
     replyMaxChars: z.ZodNumber;
     contextPack: z.ZodObject<{
@@ -68,6 +70,23 @@ export declare const AGENT_NAME_RE: RegExp;
 /** 老师卡上的常驻入口:不经首页发布、一直在那位老师的卡上 */
 export declare const TUTOR_EXTRAS: readonly ["dictation", "talk"];
 export type TutorExtra = (typeof TUTOR_EXTRAS)[number];
+/**
+ * 老师卡上常驻的三块方砖(设计稿 https://claude.ai/artifact/NpPFoyvuF17dbRSEUuRJfW):先后就是牌上的先后。
+ * id 记在消息的 via.button;activity 是老师家里同名的文件(agents/<老师>/activities/<名>.md),孩子看到的字也是它。
+ * 家里有那个文件才出那一块(三门主科出厂都有);cotutor.json 的 tiles 只记关掉的,升级来的老 workspace 自动就有
+ */
+export declare const HOME_TILES: readonly [{
+    readonly id: "preview";
+    readonly activity: "预习";
+}, {
+    readonly id: "check";
+    readonly activity: "检查作业";
+}, {
+    readonly id: "review";
+    readonly activity: "复习";
+}];
+export type HomeTileId = (typeof HOME_TILES)[number]['id'];
+export declare const HOME_TILE_IDS: [HomeTileId, ...HomeTileId[]];
 export declare const TutorSchema: z.ZodObject<{
     display: z.ZodString;
     subject: z.ZodOptional<z.ZodString>;
@@ -119,6 +138,11 @@ export declare const TutorSchema: z.ZodObject<{
         dictation: "dictation";
         talk: "talk";
     }>>>;
+    tiles: z.ZodOptional<z.ZodObject<{
+        check: z.ZodOptional<z.ZodBoolean>;
+        preview: z.ZodOptional<z.ZodBoolean>;
+        review: z.ZodOptional<z.ZodBoolean>;
+    }, z.core.$strict>>;
 }, z.core.$strip>;
 export type Tutor = z.infer<typeof TutorSchema>;
 /** 学科的标准名:三门主科的别名归一(语文 / 数学 / 英语),别的原样(去两头空白);没写 null */
@@ -129,16 +153,11 @@ export declare function subjectLang(subject: string | null | undefined): 'zh' |
  * 这位老师卡上的常驻入口:配了照配的;没配按学科——语文 = 听写;英语 = 口语课,要口语课开着(talkOn = talk.enabled)
  */
 export declare function tutorExtras(t: Pick<Tutor, 'extras' | 'subject'>, talkOn?: boolean): TutorExtra[];
+/** 这位老师开着的方砖(牌上的先后);家里有没有那个 activity 文件不在这里管 */
+export declare function tutorTiles(t: Pick<Tutor, 'tiles'>): HomeTileId[];
 /**
- * 运行时:一个 CLI 一组 {run, resume} 命令模板。占位符:
- * {agent} 老师名 / {agentBody} 老师文件正文(给没有 --agent 的 CLI 塞系统提示)/ {prompt} 消息 / {session} 会话 id。
- * 板书写法的两种预载({boardFile} 板书技能 SKILL.md 的绝对路径,给能从文件追加系统提示的 CLI;{systemBody} 老师正文 + 板书写法,给只收一段系统提示文字的 CLI):
- * 模板里用了其中一个,应用就当板书写法已在系统提示里;都没用,应用在话题第一条消息里注入 <cotutor-board>(任何 CLI 都成立的退路)。
- * {effort} 这位老师的政策 effort(low / medium / high),qwen 由适配器写入思考量配置。
- * 带不带工具由适配器展开(src/brain/cli/):{tools} 填一串工具名,独占一个参数的 {toolArgs} 展开成几个参数。
- * 政策旋钮(预算、轮数、模型)写进模板,换 agent 只换运行时。
- * stdin: "stream-json":消息不进命令行,写进 stdin(`--input-format stream-json`),
- * 模板里就不写 {prompt};argv 与消息无关,应用把下一轮的进程提前起好等着。
+ * 旧的命令行运行时:一组 {run, resume} 命令模板(起 Qwen Code;更早是 Claude CLI)。2026-11-02 起不再支持,
+ * 留着这个形状只为旧 cotutor.json 读得进来:doctor 报出来,用到它的老师发不出去(src/brain/runtime.ts)。
  */
 export declare const CliRuntimeSchema: z.ZodObject<{
     cli: z.ZodOptional<z.ZodString>;
@@ -148,8 +167,8 @@ export declare const CliRuntimeSchema: z.ZodObject<{
 }, z.core.$strip>;
 export type CliRuntime = z.infer<typeof CliRuntimeSchema>;
 /**
- * 内置 API 运行时(2026-10-29):应用自己直连模型(src/brain/api.ts),不起 CLI、不用装 Qwen Code。
- * 现在只有百炼(OpenAI 兼容的 Chat Completions,端点是业务空间 id 的域名);凭证是机器级的百炼配置(家长端「首页」里填的按量 key 与业务空间 id)。
+ * API 运行时(2026-10-29;2026-11-02 起只有它):应用自己直连模型(src/brain/api.ts)。
+ * 现在只有百炼(OpenAI 兼容的 Chat Completions);凭证是机器级的 ~/.config/cotutor/(家长端「首页」填的按量 key 与业务空间 id,开发机还有 Token Plan)。
  * 系统提示 = 老师正文 + 板书写法;同一话题的模型历史由应用存;effort 映射成思考开关与思考量;工具只有只读的三样。
  */
 export declare const ApiRuntimeSchema: z.ZodObject<{
@@ -244,6 +263,12 @@ export declare const LiveSchema: z.ZodObject<{
 export type LiveConfig = z.infer<typeof LiveSchema>;
 /** 这位老师的嘴用哪个音色 */
 export declare const mouthVoice: (live: Pick<LiveConfig, "voices">, tutor: string) => string;
+/** 卡的配音(点读、单词卡、听写念词)的缺省:出厂三位各一个(2026-11-03 照 Ray 那里用着的),不写进 cotutor.json;别的老师没配就不配音 */
+export declare const SHIPPED_CARD_VOICES: Readonly<Record<string, string>>;
+/** 这位老师卡的配音用哪个音色:家长挑的,没挑用出厂的;都没有 undefined(不配音) */
+export declare const cardVoice: (tutors: Readonly<Record<string, {
+    voice?: string;
+}>>, tutor: string) => string | undefined;
 /**
  * 听写:拍照认词表用哪个模型。挑词的要求在听写 activity 文件「认字收到什么」;
  * 下面两份是出厂那节的原文,workspace 里没有听写 activity 文件时照它。回什么格式(一行一段 JSON)由应用填(src/scenes/dictation/recognize.ts 的 FORMAT)。
@@ -378,6 +403,11 @@ export declare const CotutorConfigSchema: z.ZodObject<{
             dictation: "dictation";
             talk: "talk";
         }>>>;
+        tiles: z.ZodOptional<z.ZodObject<{
+            check: z.ZodOptional<z.ZodBoolean>;
+            preview: z.ZodOptional<z.ZodBoolean>;
+            review: z.ZodOptional<z.ZodBoolean>;
+        }, z.core.$strict>>;
     }, z.core.$strip>>>;
     runtimes: z.ZodObject<{
         default: z.ZodString;
@@ -437,19 +467,10 @@ export interface TutorView {
     policy: Policy;
     /** 老师卡上的常驻入口(已按学科补缺省) */
     extras: TutorExtra[];
+    /** 开着的方砖(没管家里有没有那个文件) */
+    tiles: HomeTileId[];
 }
 /** 老师列表(带有效政策);kidOnly = 只要孩子端能看到的(enabled 且不 hidden) */
 export declare function listTutors(config: CotutorConfig, opts?: {
     kidOnly?: boolean;
 }): TutorView[];
-/** 运行时模板填占位符;{tools} 填适配器给的工具名单(src/brain/cli/ 的 fillArgs 先算好,没给就填空);{agentBody} / {systemBody} / {boardFile} 只在给了值时替换,否则原样留着(doctor 会报);{effort} 没给用出厂缺省(课文件排版这类不认老师政策的调用) */
-export declare function fillRuntime(argv: readonly string[], vars: {
-    agent: string;
-    prompt: string;
-    session?: string;
-    agentBody?: string;
-    systemBody?: string;
-    boardFile?: string;
-    effort?: Policy['effort'];
-    tools?: string;
-}): string[];