@brainpilot/runtime 0.0.5 → 0.0.6

package/dist/session-manager.js

@@ -9,20 +9,32 @@
  * Persistence (§5): config/history/state live under `<dataRoot>/.bp/{sid}/`,
  * work files under `<dataRoot>/workspaces/{sid}/`.
  */
-import { mkdir, readFile, writeFile, readdir, rm, stat } from "node:fs/promises";
-import { join, resolve, sep } from "node:path";
+import { mkdir, readFile, writeFile, readdir, rm, stat, rename } from "node:fs/promises";
+import { join, resolve, sep, dirname } from "node:path";
 import { randomUUID } from "node:crypto";
+import { CUSTOM_EVENT, } from "@brainpilot/protocol";
 import { EventBus } from "./event-bus.js";
 import { Mailbox } from "./mailbox.js";
 import { GraphOfTrace } from "./trace.js";
-import { MasAgent } from "./mas-agent.js";
+import { MasAgent, addUsage, emptyTokenUsage } from "./mas-agent.js";
 import { systemToolsForRole, builtinToolNamesForRole } from "./tools/system-tools.js";
 import { ev } from "./events.js";
 import { selectFactory, isMockMode } from "./agent-factory.js";
-import { personaFor } from "./personas.js";
+import { personaFor, withLanguageDirective } from "./personas.js";
+import { renderAgentStatusBlock, collectAgentStatusLines } from "./extensions/agent-status.js";
 import { McpBridge, loadMcpServersConfig } from "./mcp-bridge.js";
+import { materializeSkills } from "./materialize-skills.js";
 import { resolveSessionProvider } from "./provider-config.js";
 import { MemWatchdog, parseMemLimitMb } from "./mem-watchdog.js";
+function makeDeferred() {
+    let resolve;
+    let reject;
+    const promise = new Promise((res, rej) => {
+        resolve = res;
+        reject = rej;
+    });
+    return { promise, resolve, reject };
+}
 /** Roles inferred from agent name. */
 function roleFor(name) {
     if (name === "principal")
@@ -31,24 +43,91 @@ function roleFor(name) {
         return "trace";
     return "expert";
 }
+/**
+ * Conservative token estimation from character count (issue #80).
+ * English text averages ~4 chars/token; CJK text ~1-2 chars/token.
+ * 3.5 gives a safety margin — we'd rather truncate slightly early than
+ * overflow the provider's context window. Exported for tests.
+ */
+export function estimateTokens(text) {
+    return Math.ceil(text.length / 3.5);
+}
+/** Sum a per-agent token usage breakdown into a single session total. */
+function sumAgentUsage(byAgent) {
+    const total = emptyTokenUsage();
+    for (const u of Object.values(byAgent)) {
+        total.input += u.input;
+        total.output += u.output;
+        total.cacheRead += u.cacheRead;
+        total.cacheWrite += u.cacheWrite;
+        total.total += u.total;
+    }
+    return total;
+}
+/** Filesystem-safe form of a tool name (for saving truncated results). */
+function sanitiseFilename(name) {
+    return name.replace(/[^A-Za-z0-9_-]/g, "_").slice(0, 64);
+}
+/** Human-readable byte size (e.g. "1.2MB"). */
+function formatBytes(n) {
+    if (n < 1024)
+        return `${n}B`;
+    if (n < 1024 * 1024)
+        return `${(n / 1024).toFixed(1)}KB`;
+    return `${(n / (1024 * 1024)).toFixed(1)}MB`;
+}
 export class SessionManager {
     sessions = new Map();
     dataRoot;
     agentFactory;
     persist;
     lastActivityAt = 0;
+    // #76: active mailbox delivery. A delivery loop drains a target agent's inbox
+    // and runs it; the key (`${sid}:${name}`) guards re-entrancy so concurrent
+    // wakes for one agent collapse into a single serial loop (its `prompt` is
+    // never invoked concurrently).
+    deliveryLoops = new Set();
     // External MCP tools (§9 decision 2): loaded once, lazily, shared by all
     // non-trace agents. Null until first agent is created.
     mcpBridge;
     mcpTools = [];
     mcpLoaded = false;
+    // Built-in skills directory, loaded through Pi's native skill pipeline
+    // (`additionalSkillPaths`). The bundled @brainpilot/skills content is
+    // materialized here once (lazily) on first agent creation.
+    skillsDir;
+    // Router skills directory backing the `skill_search` Pi-native tool — the
+    // long-tail catalog NOT in `<available_skills>`. Materialized alongside
+    // `skillsDir` (each top-level category lands on the side determined by
+    // `materializeSkills`).
+    routerSkillsDir;
+    skillsMaterialized = false;
     // Opt-in memory watchdog (§R-4 / issue #20). Null when no budget is set.
     memWatchdog;
+    // Tool result truncation (issue #80). 0 = disabled.
+    maxToolResultTokens;
     constructor(opts = {}) {
         this.dataRoot = opts.dataRoot ?? process.env.BP_DATA_DIR ?? join(process.cwd(), ".bp-data");
         this.agentFactory = opts.agentFactory ?? selectFactory();
         this.persist = opts.persist ?? true;
         this.mcpBridge = opts.mcpBridge ?? null;
+        this.maxToolResultTokens =
+            opts.maxToolResultTokens ??
+                (() => {
+                    const env = process.env.BP_MAX_TOOL_RESULT_TOKENS?.trim();
+                    if (env !== undefined && env !== "") {
+                        const n = Number(env);
+                        if (Number.isInteger(n) && n >= 0)
+                            return n;
+                    }
+                    return 64000;
+                })();
+        // Skills are loaded by Pi from this dir (default <dataRoot>/bp_template/skills).
+        this.skillsDir = opts.skillsDir ?? join(this.dataRoot, "bp_template", "skills");
+        // The router skill library is a parallel directory with the same on-disk
+        // format; `skill_search` reads from here, Pi never sees it.
+        this.routerSkillsDir =
+            opts.routerSkillsDir ?? join(this.dataRoot, "bp_template", "skills-router");
         const limitBytes = opts.memLimitBytes ?? parseMemLimitMb(process.env);
         this.memWatchdog =
             limitBytes != null
@@ -60,6 +139,31 @@ export class SessionManager {
                 : null;
         this.memWatchdog?.start();
     }
+    /**
+     * Materialize the bundled @brainpilot/skills content into `this.skillsDir`
+     * (skip-if-exists) so Pi's native skill pipeline can load it. Idempotent —
+     * runs at most once per manager. Called at server startup (so skills exist and
+     * are user-visible before any agent runs, incl. Docker pure-compose where no
+     * CLI scaffold ran) AND lazily before the first non-trace agent. Best-effort:
+     * skills are a convenience, not a hard dependency, so failures are swallowed.
+     */
+    async ensureSkillsMaterialized() {
+        if (this.skillsMaterialized)
+            return;
+        this.skillsMaterialized = true;
+        try {
+            const res = await materializeSkills(this.dataRoot);
+            // eslint-disable-next-line no-console
+            console.info(`[skills] always-on: ${res.copied} copied → ${res.dest}` +
+                (res.skipped ? ` (${res.skipped} preserved)` : "") +
+                `; router: ${res.routerCopied} copied → ${res.routerDest}` +
+                (res.routerSkipped ? ` (${res.routerSkipped} preserved)` : ""));
+        }
+        catch (err) {
+            // eslint-disable-next-line no-console
+            console.error(`[skills] failed to materialize built-in skills: ${err.message}`);
+        }
+    }
     /**
      * Load external MCP tools once. No-op in mock mode (BP_MOCK=1) and when no
      * `mcp_servers.json` is present, so the default path stays zero-overhead.
@@ -90,17 +194,26 @@ export class SessionManager {
     workspaceDir(sid) {
         return join(this.dataRoot, "workspaces", sid);
     }
+    /**
+     * #60: composer uploads in single-user mode are POSTed against the literal
+     * sandbox id `"local"` (the web `LOCAL_SANDBOX.id`), because a file can be
+     * attached in the draft composer *before* the real session exists. They land
+     * in `workspaces/local/` — but the agent's cwd is `workspaces/<sessionId>/`,
+     * so without this it can't read the file the user just attached. We treat
+     * `workspaces/local/` as a staging area and drain it into the real session
+     * workspace right before the agent runs (see drainLocalUploads).
+     */
+    static UPLOAD_STAGING_SID = "local";
+    /**
+     * #97: max CONSECUTIVE failed delivery runs for one expert before the failure
+     * is escalated to the principal instead of self-retried. Matches the legacy
+     * circuit-breaker threshold (3). Only `retryable` errors consume retries;
+     * a `fatal` error escalates on the first failure regardless of this cap.
+     */
+    static MAX_DELIVERY_RETRIES = 3;
     historyPath(sid, agent) {
         return join(this.bpDir(sid), "history", `${agent}.jsonl`);
     }
-    /** Skills shared by every session (user-editable `bp_template/skills/`). */
-    templateSkillsDir() {
-        return join(this.dataRoot, "bp_template", "skills");
-    }
-    /** This session's own skill dir (`.bp/<sid>/skills/`), overrides/augments the template. */
-    sessionSkillsDir(sid) {
-        return join(this.bpDir(sid), "skills");
-    }
     /** User-editable persona override for an agent (`bp_template/agents/<name>/prompt.md`). */
     agentPromptPath(name) {
         return join(this.dataRoot, "bp_template", "agents", name, "prompt.md");
@@ -183,6 +296,107 @@ export class SessionManager {
             return false;
         }
     }
+    /**
+     * #47: write an uploaded file into the session workspace. Content arrives
+     * base64-encoded (binary-safe over the JSON byte chain). The same
+     * `resolveWorkspacePath` guard prevents path traversal; parent dirs are
+     * created so an upload like `docs/foo.pdf` works. The file lands in the
+     * agent's cwd, so it can `read` it by its workspace-relative path.
+     * `maxBytes` (default 20 MiB) bounds the decoded size.
+     */
+    async writeSessionFile(sid, rel, contentBase64, maxBytes = 20 * 1024 * 1024) {
+        const buf = Buffer.from(contentBase64, "base64");
+        if (buf.byteLength > maxBytes) {
+            throw new Error(`file too large: ${buf.byteLength} bytes exceeds limit of ${maxBytes}`);
+        }
+        const abs = this.resolveWorkspacePath(sid, rel);
+        await mkdir(dirname(abs), { recursive: true });
+        await writeFile(abs, buf);
+        // Return the workspace-relative path (strip the absolute root prefix).
+        const root = this.workspaceDir(sid);
+        const relOut = abs === root ? "" : abs.slice(root.length + 1);
+        return { path: relOut, size: buf.byteLength };
+    }
+    /**
+     * #60: drain the composer upload staging area (`workspaces/local/`) into a
+     * real session's workspace so the agent — whose cwd is `workspaces/<sid>/` —
+     * can read files the user attached in the draft composer (when no real
+     * session id existed yet, the web uploads against the literal `"local"`
+     * sandbox id). Called right before the agent runs.
+     *
+     * Move semantics: each staged entry is renamed into the session workspace
+     * (an existing same-named entry in the session is left untouched and the
+     * staged copy is discarded), then the staging area is emptied so files never
+     * leak into the next session. No-op when the target IS the staging sid, or
+     * when the staging dir is missing/empty. Best-effort: never throws — a copy
+     * failure must not block the user's prompt.
+     */
+    async drainLocalUploads(sessionId) {
+        if (sessionId === SessionManager.UPLOAD_STAGING_SID)
+            return;
+        const stagingDir = this.workspaceDir(SessionManager.UPLOAD_STAGING_SID);
+        let names;
+        try {
+            names = await readdir(stagingDir);
+        }
+        catch {
+            return; // no staging dir → nothing was uploaded in the draft
+        }
+        if (names.length === 0)
+            return;
+        const destDir = this.workspaceDir(sessionId);
+        try {
+            await mkdir(destDir, { recursive: true });
+        }
+        catch {
+            /* best-effort */
+        }
+        for (const name of names) {
+            const from = join(stagingDir, name);
+            const to = join(destDir, name);
+            try {
+                // Don't clobber an existing session file; just drop the staged copy.
+                let exists = false;
+                try {
+                    await stat(to);
+                    exists = true;
+                }
+                catch {
+                    /* target absent → safe to move */
+                }
+                if (exists) {
+                    await rm(from, { recursive: true, force: true });
+                    continue;
+                }
+                await rename(from, to);
+            }
+            catch {
+                // rename failed (e.g. cross-device, or `from` is a directory on some
+                // platforms): fall back to a content copy so the file still reaches the
+                // session, then remove the staged copy. Best-effort, never throws.
+                try {
+                    await this.copyEntry(from, to);
+                    await rm(from, { recursive: true, force: true });
+                }
+                catch {
+                    /* give up on this entry */
+                }
+            }
+        }
+    }
+    /** Recursively copy a file or directory tree (drainLocalUploads fallback). */
+    async copyEntry(from, to) {
+        const st = await stat(from);
+        if (st.isDirectory()) {
+            await mkdir(to, { recursive: true });
+            for (const child of await readdir(from)) {
+                await this.copyEntry(join(from, child), join(to, child));
+            }
+            return;
+        }
+        await mkdir(dirname(to), { recursive: true });
+        await writeFile(to, await readFile(from));
+    }
     /**
      * Resolve an agent's system persona. Prefers the user-editable on-disk
      * `bp_template/agents/<name>/prompt.md` (so personas can be tuned without a
@@ -190,25 +404,38 @@ export class SessionManager {
      * file is present or it's empty.
      */
     async loadPersona(name, role) {
+        let base;
         try {
             const raw = (await readFile(this.agentPromptPath(name), "utf8")).trim();
             if (raw)
-                return raw;
+                base = raw;
         }
         catch {
             // No on-disk override — fall through to the built-in persona.
         }
-        return personaFor(name, role);
+        // #97: append the language-following directive here (not in the persona text
+        // / on-disk prompt.md) so it also reaches users who scaffolded earlier, and
+        // applies whether the persona came from disk or the built-in constant.
+        return withLanguageDirective(base ?? personaFor(name, role));
     }
     /* ---------------------------- session CRUD ---------------------------- */
-    async createSession(input = {}) {
+    async createSession(input = {}, 
+    /**
+     * Internal restore path (see `restoreFromDisk`): when provided, the entry
+     * inherits the on-disk meta.json timestamps verbatim instead of stamping
+     * fresh ones, and `writeMeta` is skipped so the canonical file is not
+     * clobbered with boot-time values. Public callers should not pass this.
+     */
+    _restore) {
         if (this.memWatchdog?.isOverSoftLimit()) {
             throw new Error("memory budget exceeded: refusing new session");
         }
         const id = input.id ?? randomUUID();
         if (this.sessions.has(id))
             return this.toSession(this.sessions.get(id));
-        const nowIso = new Date().toISOString();
+        const nowIso = _restore ? _restore.updatedAt : new Date().toISOString();
+        const createdAt = _restore ? _restore.createdAt : nowIso;
+        const lastActivityAt = _restore ? _restore.lastActivityAt : Date.now();
         const persistBase = this.persist ? this.bpDir(id) : undefined;
         // Provider ref: explicit input wins; otherwise reuse an existing on-disk ref
         // (restore path) so reviving a session never clobbers its chosen model.
@@ -220,35 +447,50 @@ export class SessionManager {
                 : {};
         const bus = new EventBus({ persistPath: persistBase ? join(persistBase, "events.jsonl") : undefined });
         const mailbox = new Mailbox(id, persistBase ? join(persistBase, "mailbox") : undefined);
-        const trace = new GraphOfTrace(id, persistBase ? join(persistBase, "trace.json") : undefined);
+        // #79: push every trace mutation to the SSE stream as CUSTOM:trace_node so
+        // the web Graph of Trace updates live instead of polling. The store stays
+        // bus-agnostic; the manager owns the wire shape.
+        const trace = new GraphOfTrace(id, persistBase ? join(persistBase, "trace.json") : undefined, (op, node) => {
+            bus.emit(ev.custom({ sessionId: id }, CUSTOM_EVENT.TRACE_NODE, { op, node }));
+        });
         const entry = {
             id,
             title: input.title ?? "Untitled session",
-            createdAt: nowIso,
+            createdAt,
             updatedAt: nowIso,
-            lastActivityAt: Date.now(),
+            lastActivityAt,
             bus,
             mailbox,
             trace,
             agents: new Map(),
             tasks: new Map(),
+            deliveryErrors: new Map(),
+            delegators: new Map(),
             runActive: false,
             activeRunId: null,
+            pendingInputs: new Map(),
             providerRef,
+            tokenUsage: { total: emptyTokenUsage(), byAgent: {} },
         };
         this.sessions.set(id, entry);
-        this.touch(entry);
+        if (!_restore)
+            this.touch(entry);
+        else
+            this.lastActivityAt = entry.lastActivityAt;
         if (this.persist) {
             await mkdir(join(this.bpDir(id), "history"), { recursive: true });
-            await mkdir(this.sessionSkillsDir(id), { recursive: true });
             await mkdir(this.workspaceDir(id), { recursive: true });
-            await this.writeMeta(entry);
+            // On restore, meta.json on disk is the authority — do not write it back.
+            if (!_restore)
+                await this.writeMeta(entry);
             // Only (re)write the ref when the caller chose one — restore must not
             // clobber an existing ref with an empty object.
             if (explicitRef)
                 await this.writeProviderRef(entry);
             await mailbox.recover();
             await this.loadTrace(entry);
+            // Rehydrate cumulative token usage so the running total survives restarts.
+            await this.loadUsage(entry);
         }
         return this.toSession(entry);
     }
@@ -303,12 +545,16 @@ export class SessionManager {
         await e.mailbox.flush();
         await e.trace.flush();
         e.bus.clear();
+        for (const [id2, d] of e.pendingInputs) {
+            d.reject(new Error("evicted"));
+            e.pendingInputs.delete(id2);
+        }
         this.sessions.delete(id);
         return { evicted: true, agentsKilled: killed };
     }
     /* ----------------------------- messaging ----------------------------- */
     /** Send a user message to an agent (default principal). §7 L3 isolated. */
-    async sendMessage(sessionId, content, agentName = "principal") {
+    async sendMessage(sessionId, content, agentName = "principal", opts = {}) {
         const entry = this.sessions.get(sessionId);
         if (!entry)
             throw new Error(`session not found: ${sessionId}`);
@@ -323,9 +569,25 @@ export class SessionManager {
             return { accepted: false };
         }
         const agent = await this.ensureAgent(sessionId, agentName);
+        // #60: pull any composer uploads staged under workspaces/local/ into this
+        // session's workspace (the agent's cwd) before it runs, so it can read the
+        // file the user just attached. No-op when nothing was staged.
+        await this.drainLocalUploads(sessionId);
         entry.runActive = true;
         entry.activeRunId = `run_${randomUUID()}`;
         const runId = entry.activeRunId;
+        // #70: emit an initial session_state frame here — onStatusChange only fires
+        // on a status *change*, and ensureAgent creates the agent as idle without
+        // emitting, so without this the panel stays empty until the first
+        // setStatus("running"). This first frame carries runState.active=true + the
+        // freshly-ensured agent.
+        this.emitSessionState(entry);
+        // issue #42: persist + broadcast the user's own prompt as a role:"user"
+        // CHUNK *before* the agent runs, so SSE replay reconstructs the full
+        // transcript (user + assistant). The web composer's optimistic bubble uses
+        // the same `uuid`, so the reducer dedupes the replayed event by id rather
+        // than duplicating it. Fall back to a fresh id if the client omitted one.
+        entry.bus.emit(ev.textMessageChunk({ sessionId, agentName, runId }, opts.uuid ?? randomUUID(), content, "user"));
         // Fire-and-track: don't block the HTTP response on the full run.
         void agent
             .prompt(content)
@@ -336,22 +598,192 @@ export class SessionManager {
             entry.runActive = false;
             entry.activeRunId = null;
             this.touch(entry);
+            // #76: re-evaluate the derived run-active flag now that the user-prompt
+            // correlation is cleared. For a direct reply this yields the terminal
+            // active=false frame; for a delegation a pending delivery loop keeps it
+            // true (the loop emits its own terminal frame when it drains).
+            this.emitSessionState(entry);
         });
         return { accepted: true, runId };
     }
-    /** Interrupt a session (or a specific agent). */
+    /**
+     * Ask the terminal user a question on behalf of `agent`. Emits a
+     * `user_input_request` event and returns a promise that resolves when
+     * `resolveInput` is called with the matching request_id, or rejects if the
+     * session is interrupted/evicted. Blocks the calling tool's turn.
+     */
+    requestUserInput(entry, agent, req) {
+        const requestId = `req_${randomUUID()}`;
+        const deferred = makeDeferred();
+        entry.pendingInputs.set(requestId, deferred);
+        entry.bus.emit(ev.userInputRequest({ sessionId: entry.id, runId: entry.activeRunId ?? undefined }, { request_id: requestId, agent, question: req.question, options: req.options, allow_free_text: req.allow_free_text }));
+        return deferred.promise;
+    }
+    /**
+     * Resolve an outstanding ask_user request. Returns false when the session or
+     * request_id is unknown/already consumed (stale answer). Pure lookup; never
+     * throws — the server handles 404 for unknown sessions before calling.
+     */
+    resolveInput(sessionId, requestId, answer) {
+        const entry = this.sessions.get(sessionId);
+        const deferred = entry?.pendingInputs.get(requestId);
+        if (!entry || !deferred)
+            return false;
+        entry.pendingInputs.delete(requestId);
+        deferred.resolve(answer);
+        this.touch(entry);
+        return true;
+    }
+    /**
+     * Interrupt a session (or a specific agent).
+     *
+     * Targeted (`agentName` given): abort just that agent. Mailboxes and the
+     * principal are left untouched — a narrow "stop this one expert" contract.
+     *
+     * Whole-session (`agentName` omitted, the Stop button — #90): abort EVERY
+     * agent (incl. their running script subprocesses, via Pi `session.abort()`),
+     * then clear ALL mailboxes so a queued message can't re-wake a stopped agent,
+     * surface a user-facing system_message, and immediately prompt the principal
+     * one run with an interrupt notice so PI knows the user interrupted and should
+     * await further instructions.
+     */
     async interrupt(sessionId, agentName) {
         const entry = this.sessions.get(sessionId);
         if (!entry)
             return false;
+        const wholeSession = agentName === undefined;
         const targets = agentName ? [entry.agents.get(agentName)].filter(Boolean) : [...entry.agents.values()];
-        for (const a of targets)
-            await a.abort();
+        // Reject any pending ask_user FIRST: a prompt blocked awaiting user input
+        // would never settle, so abort()'s waitForIdle (#101) must not run before
+        // these are unblocked or it would deadlock.
+        for (const [id, d] of entry.pendingInputs) {
+            d.reject(new Error("interrupted"));
+            entry.pendingInputs.delete(id);
+        }
+        // Abort every target and WAIT for each in-flight run to fully settle (#101)
+        // — RUN_FINISHED emitted, status settled, provider stream fenced — so the
+        // interrupt-notice run below can't race the old run ("already processing").
+        await Promise.all(targets.map((a) => a.abort()));
         entry.runActive = false;
         entry.activeRunId = null;
+        if (wholeSession) {
+            // Clear every inbox BEFORE notifying PI: otherwise a queued task_delegate
+            // would re-wake the expert the user just stopped.
+            await entry.mailbox.clearAll();
+            entry.bus.emit(ev.systemMessage(sessionId, "info", "⏹️ 用户已中断当前任务,信箱已清空,正在等候进一步指示。", {
+                agent: "principal",
+                recoverable: true,
+            }));
+            this.notifyPrincipalInterrupted(entry);
+        }
         return targets.length > 0;
     }
+    /**
+     * #90: after a whole-session Stop, prompt the principal one run with an
+     * interrupt notice. Mirrors `sendMessage`'s fire-and-track run accounting but
+     * emits NO role:"user" text chunk — the notice is system context, not a user
+     * bubble. The principal should acknowledge briefly and await the user.
+     */
+    notifyPrincipalInterrupted(entry) {
+        const notice = "<system_notice>\n" +
+            "  The user interrupted the current task. All running agents were stopped " +
+            "and every mailbox was cleared, so any in-flight delegation is cancelled. " +
+            "Do not resume or re-delegate the prior work. Briefly acknowledge the " +
+            "interruption and wait for the user's next instruction.\n" +
+            "</system_notice>";
+        void this.ensureAgent(entry.id, "principal")
+            .then((agent) => {
+            entry.runActive = true;
+            entry.activeRunId = `run_${randomUUID()}`;
+            this.emitSessionState(entry);
+            return agent.prompt(notice).finally(() => {
+                entry.runActive = false;
+                entry.activeRunId = null;
+                this.touch(entry);
+                this.emitSessionState(entry);
+            });
+        })
+            .catch(() => {
+            /* error-isolated: prompt() never throws, ensureAgent failure is best-effort */
+        });
+    }
+    /** Test/diagnostic accessor: number of queued messages in `agent`'s inbox. */
+    mailboxCount(sessionId, agent) {
+        return this.sessions.get(sessionId)?.mailbox.count(agent) ?? 0;
+    }
     /* ------------------------------ agents ------------------------------- */
+    /**
+     * Wrap a SystemTool so its execute() results are guarded against overflowing
+     * the model's context window (issue #80). When truncation triggers, the full
+     * result is saved to `<workspace>/.truncated/` and a system_message warning
+     * is emitted. No-op when maxToolResultTokens is 0.
+     */
+    wrapToolWithTruncation(tool, sessionId, bus) {
+        if (this.maxToolResultTokens <= 0)
+            return tool;
+        const maxTokens = this.maxToolResultTokens;
+        const saveFullResult = (origResult) => this.truncateToolResult(tool.name, sessionId, bus, origResult, maxTokens);
+        const originalExecute = tool.execute.bind(tool);
+        return {
+            name: tool.name,
+            description: tool.description,
+            parameters: tool.parameters,
+            execute: async (params) => {
+                const result = await originalExecute(params);
+                if (result.isError)
+                    return result; // never truncate error messages
+                return saveFullResult(result);
+            },
+        };
+    }
+    /**
+     * Estimate tokens in a tool result, truncate if over budget, save the full
+     * content to the session workspace, and emit a warning event.
+     */
+    async truncateToolResult(toolName, sessionId, bus, result, maxTokens) {
+        // Concatenate all text blocks to estimate total tokens.
+        const fullText = result.content.map((c) => c.text).join("");
+        const estimated = estimateTokens(fullText);
+        if (estimated <= maxTokens)
+            return result;
+        // Truncate at ~maxTokens chars (conservative).
+        const maxChars = maxTokens * 3.5;
+        const truncatedText = fullText.slice(0, Math.floor(maxChars));
+        const now = new Date().toISOString();
+        const ts = now.replace(/[:.]/g, "-");
+        const fname = `${sanitiseFilename(toolName)}_${ts}.json`;
+        const relPath = `.truncated/${fname}`;
+        // Save full content to workspace.
+        try {
+            const absDir = join(this.workspaceDir(sessionId), ".truncated");
+            await mkdir(absDir, { recursive: true });
+            const saved = {
+                tool: toolName,
+                truncatedAt: now,
+                originalBytes: Buffer.byteLength(fullText),
+                truncatedBytes: Buffer.byteLength(truncatedText),
+                estimatedTokens: estimated,
+                maxTokens,
+                content: fullText,
+            };
+            await writeFile(join(absDir, fname), JSON.stringify(saved, null, 2), "utf8");
+        }
+        catch {
+            // Best-effort — never block the agent on file I/O.
+        }
+        // Emit warning.
+        bus.emit(ev.systemMessage(sessionId, "warning", `⚠️ 工具 ${toolName} 返回结果过大 ` +
+            `(原始约 ${estimated} tokens / ${formatBytes(Buffer.byteLength(fullText))})，` +
+            `已截断至约 ${estimateTokens(truncatedText)} tokens。` +
+            `完整结果已保存至 workspace/${relPath}`, { recoverable: true }));
+        const notice = `\n\n---\n` +
+            `[⚠️ 结果已截断: 原始 ${estimated} tokens / ${formatBytes(Buffer.byteLength(fullText))} → ` +
+            `截断后 ${estimateTokens(truncatedText)} tokens。` +
+            `完整内容已保存至 workspace/${relPath} ，可用 read 工具读取]`;
+        return {
+            content: [{ type: "text", text: truncatedText + notice }],
+        };
+    }
     /** Ensure an agent exists (create or resurrect). */
     async ensureAgent(sessionId, name) {
         const entry = this.sessions.get(sessionId);
@@ -372,11 +804,24 @@ export class SessionManager {
             destroyAgent: async (target) => {
                 await this.destroyAgent(sessionId, target);
             },
+            wakeAgent: (target) => this.wakeAgent(sessionId, target),
+            requestUserInput: (req) => this.requestUserInput(entry, name, req),
+            routerSkillsDir: this.routerSkillsDir,
         };
         const systemTools = systemToolsForRole(role, name, deps);
         // External MCP tools go to non-trace agents (trace agent is graph-only, §9).
         const mcpTools = role === "trace" ? [] : await this.ensureMcpTools();
-        const agentTools = [...systemTools, ...mcpTools];
+        const rawTools = [...systemTools, ...mcpTools];
+        // Built-in skills are loaded by Pi natively (not as tools). Materialize the
+        // bundled content into bp_template/skills once, then hand the dir to the
+        // factory as additionalSkillPaths. Trace agent is skill-less (graph-only).
+        let skillPaths;
+        if (role !== "trace") {
+            await this.ensureSkillsMaterialized();
+            skillPaths = [this.skillsDir];
+        }
+        // #80: guard every tool result against context-window overflow.
+        const agentTools = rawTools.map((t) => this.wrapToolWithTruncation(t, sessionId, entry.bus));
         const builtins = builtinToolNamesForRole(role, name);
         const allowedToolNames = [...builtins, ...agentTools.map((t) => t.name)];
         // Resolve this session's provider against the SSOT (providers.json). When
@@ -391,8 +836,15 @@ export class SessionManager {
             systemTools: agentTools,
             allowedToolNames,
             systemPrompt: await this.loadPersona(name, role),
-            skillPaths: [this.templateSkillsDir(), this.sessionSkillsDir(sessionId)],
+            skillPaths,
             providerConfig,
+            // 意图二 fallback: the trace-reminder extension calls this when an expert
+            // was reminded once and still didn't report back, so the principal never
+            // dead-waits on a silent expert.
+            onUnreplied: (agentName) => this.writeFallbackToDelegator(entry, agentName),
+            // #97: only the principal gets the live team-status block injected each
+            // turn (it is the coordinator). Other roles run without it.
+            renderAgentStatus: name === "principal" ? () => this.renderAgentStatus(entry) : undefined,
         });
         const agent = new MasAgent({
             sessionId,
@@ -400,13 +852,72 @@ export class SessionManager {
             role,
             session,
             bus: entry.bus,
-            onStatusChange: () => this.touch(entry),
+            // #70: keep the touch (idle-reclaim) AND push an authoritative live
+            // snapshot so the web Agents panel updates without a reload/reselect.
+            // setStatus early-returns on no-op transitions, so this never storms.
+            onStatusChange: () => {
+                this.touch(entry);
+                this.emitSessionState(entry);
+            },
+            // Roll the agent's running total into the per-session breakdown, push a
+            // live session_state frame, and persist usage.json. Total is recomputed
+            // as the sum across agents so it can never drift from the breakdown.
+            onUsage: (agentName, _delta, cumulative) => {
+                entry.tokenUsage.byAgent[agentName] = cumulative;
+                entry.tokenUsage.total = sumAgentUsage(entry.tokenUsage.byAgent);
+                this.touch(entry);
+                this.emitSessionState(entry);
+                void this.writeUsage(entry);
+            },
         });
+        // Continue this agent's cumulative count across restarts / lazy revival.
+        agent.seedUsage(entry.tokenUsage.byAgent[name]);
         entry.agents.set(name, agent);
         if (!entry.tasks.has(name))
             entry.tasks.set(name, "");
         return agent;
     }
+    /**
+     * 意图二 fallback — the trace-reminder extension calls this (via the factory's
+     * `onUnreplied`) when an expert was reminded once and STILL did not
+     * `send_message` its delegator (the "silence" path; a hard *error* run is
+     * handled separately). We write a NEUTRAL system note into the REAL delegator's
+     * mailbox and wake it so it never dead-waits. The delegator is whoever last
+     * delegated to this expert (#97 directed escalation), falling back to the
+     * principal. This fires during the expert's run (before the clean-run cleanup
+     * in `runDeliveryLoop`), so the delegator record is still present. The note
+     * only states the fact — the expert ended without delivering a result — and
+     * deliberately gives NO directive ("re-delegate", "proceed without it"): the
+     * delegator decides what to do. Best-effort: a failed write must never break
+     * the agent loop.
+     */
+    writeFallbackToDelegator(entry, expert) {
+        const to = this.delegatorFor(entry, expert);
+        void entry.mailbox
+            .write({
+            fromAgent: "system",
+            toAgent: to,
+            msgType: "system",
+            content: `[系统通知] 专家 "${expert}" 结束了本次任务但未回交结果。`,
+        })
+            .then(() => this.wakeAgent(entry.id, to))
+            .catch(() => {
+            /* best-effort */
+        });
+    }
+    /**
+     * #97: snapshot the live team status for injection into the principal's turn
+     * (via the agent-status extension's Pi `context` hook). Lists every agent —
+     * INCLUDING the principal itself, so it sees its own inbox backlog — with its
+     * authoritative status and the number of messages still queued unread in its
+     * inbox (`mailbox.count`). Excludes the trace agent (an internal recorder) and
+     * any stopped agent (destroyed; irrelevant to current coordination). Returns
+     * "" when nothing is worth reporting so the extension injects nothing.
+     */
+    renderAgentStatus(entry) {
+        const lines = collectAgentStatusLines(entry.agents.values(), (name) => entry.mailbox.count(name));
+        return renderAgentStatusBlock(lines);
+    }
     async destroyAgent(sessionId, name) {
         const entry = this.sessions.get(sessionId);
         if (!entry)
@@ -417,6 +928,198 @@ export class SessionManager {
         agent.stop();
         entry.agents.delete(name); // history on disk is kept (§5).
     }
+    /* ------------------------- mailbox delivery (#76) ------------------------- */
+    /**
+     * #76: wake `name` to consume its mailbox. Fire-and-forget — `send_message`
+     * calls this after writing; the actual run happens in a serial delivery loop.
+     * The re-entrancy guard (`deliveryLoops`) means concurrent wakes for the same
+     * agent collapse into the one already-running loop (which re-drains after each
+     * turn), so an agent's `prompt` is never invoked concurrently.
+     */
+    wakeAgent(sessionId, name) {
+        const key = `${sessionId}:${name}`;
+        if (this.deliveryLoops.has(key))
+            return;
+        this.deliveryLoops.add(key);
+        void this.runDeliveryLoop(sessionId, name).finally(() => {
+            this.deliveryLoops.delete(key);
+            // Emit a final frame AFTER the key is gone: the agent's own running→idle
+            // transition fired emitSessionState while this key was still present (so
+            // that frame still read active via the pending-delivery check). Without
+            // this trailing frame the derived run-active flag would stay stuck true.
+            const entry = this.sessions.get(sessionId);
+            if (entry)
+                this.emitSessionState(entry);
+            // Re-check after releasing the guard: a message could have been written
+            // between the loop's final empty read and this delete, and that writer's
+            // wakeAgent would have bailed (key still present) — leaving the message
+            // unread. Re-wake if the inbox is non-empty so it never strands.
+            if (entry && entry.mailbox.count(name) > 0)
+                this.wakeAgent(sessionId, name);
+        });
+    }
+    /**
+     * Drain `name`'s inbox and run it, looping so messages that arrive *during* a
+     * turn are picked up without a second external wake. Each iteration atomically
+     * drains the inbox, ensures the agent, wraps the messages as
+     * `<message_envelope>`s (the format the A2A persona documents), and prompts.
+     * `MasAgent.prompt` is error-isolated (never throws), so a failed expert turn
+     * ends the loop cleanly rather than rejecting. A `session_state` frame is
+     * emitted on entry and exit so the derived run-active flag reflects the
+     * delegated work even across the await gap between the sender finishing and
+     * the target starting.
+     */
+    async runDeliveryLoop(sessionId, name) {
+        for (;;) {
+            const entry = this.sessions.get(sessionId);
+            if (!entry)
+                return;
+            const msgs = await entry.mailbox.readBatch(name); // bounded FIFO batch (#76)
+            if (msgs.length === 0)
+                return;
+            const agent = await this.ensureAgent(sessionId, name);
+            if (agent.status === "stopped")
+                return;
+            // #97 directed escalation: remember who delegated this work (the last
+            // task_delegate in the batch). Self-retry nudges are msgType "system", so
+            // they never overwrite a real delegator recorded on the original task.
+            const delegated = [...msgs].reverse().find((m) => m.msgType === "task_delegate");
+            if (delegated)
+                entry.delegators.set(name, delegated.fromAgent);
+            this.touch(entry);
+            // Surface the delegated run immediately (derived active flag, agent list).
+            this.emitSessionState(entry);
+            await agent.prompt(this.renderEnvelopes(msgs, name));
+            // #97 error path. A delegated run that ended in `error` is handled here
+            // (the trace-reminder extension bails on an errored run, leaving the host
+            // the sole owner of error recovery). Transient errors self-retry up to a
+            // cap; fatal errors (auth/config) and the exhausted cap escalate to the
+            // principal. A clean run resets the agent's consecutive-error count.
+            if (agent.status === "error" && agent.role === "expert") {
+                if (this.handleDeliveryError(entry, agent))
+                    continue; // self-retry queued
+                return; // escalated — nothing more to drain for this agent
+            }
+            entry.deliveryErrors.delete(name); // clean run → reset the streak
+            entry.delegators.delete(name); // and forget the delegator (task done)
+        }
+    }
+    /**
+     * #97: react to a failed delegated expert run. Returns true when a self-retry
+     * was queued (the loop should continue and re-drain the agent's own inbox),
+     * false when the failure was escalated to the principal (the loop should stop).
+     *
+     * Policy:
+     *  - `retryable` (rate limit / 5xx / network) AND under the retry cap →
+     *    re-wake the SAME expert with a neutral system nudge in its own inbox, and
+     *    surface a `warning` to the user ("retrying n/N"). Re-running may succeed.
+     *  - `fatal` (auth / missing key / forbidden), OR the cap is reached →
+     *    escalate: write a NEUTRAL error note to the principal's mailbox + wake it,
+     *    surface an `error` to the user, and reset the streak so a future task to
+     *    this expert starts fresh.
+     */
+    handleDeliveryError(entry, agent) {
+        const name = agent.name;
+        const count = (entry.deliveryErrors.get(name) ?? 0) + 1;
+        entry.deliveryErrors.set(name, count);
+        const kind = agent.lastErrorKind ?? "retryable";
+        const headline = agent.state().lastError?.message ?? "未知错误";
+        if (kind === "retryable" && count < SessionManager.MAX_DELIVERY_RETRIES) {
+            entry.bus.emit(ev.systemMessage(entry.id, "warning", `专家 "${name}" 执行任务时出错，正在自动重试 (${count}/${SessionManager.MAX_DELIVERY_RETRIES})…`, { agent: name, recoverable: true }));
+            // Re-wake the SAME expert via its own inbox: a neutral, directive-free
+            // nudge. The expert retains its prior conversation context, so it knows
+            // what it was attempting; we only signal "the last attempt failed, try
+            // again". Returning true lets the loop re-drain this note immediately.
+            void entry.mailbox
+                .write({
+                fromAgent: "system",
+                toAgent: name,
+                msgType: "system",
+                content: `[系统通知] 上一次任务执行出错（${headline}）。请重试。`,
+            })
+                .catch(() => {
+                /* best-effort */
+            });
+            return true;
+        }
+        // Fatal, or retries exhausted → escalate to the real delegator and stop.
+        const delegator = this.delegatorFor(entry, name);
+        const target = delegator === "principal" ? "主管" : `委派方 "${delegator}"`;
+        entry.bus.emit(ev.systemMessage(entry.id, "error", kind === "fatal"
+            ? `专家 "${name}" 发生无法自动恢复的错误，已上报${target}。`
+            : `专家 "${name}" 连续 ${count} 次执行失败，已上报${target}。`, { agent: name, recoverable: true }));
+        this.writeErrorToDelegator(entry, name, headline);
+        entry.deliveryErrors.delete(name); // reset streak for a future task
+        entry.delegators.delete(name); // delegator notified; forget it
+        return false;
+    }
+    /**
+     * #97 directed escalation: resolve who an expert's failure/silence should be
+     * reported to. Returns the recorded delegator ONLY when it is a still-live,
+     * non-trace agent other than the expert itself (a destroyed/stopped delegator
+     * would be wrongly resurrected by the wake, and a self/system target is
+     * nonsensical). Otherwise falls back to `principal`, the root coordinator,
+     * which always exists and owns un-rooted work.
+     */
+    delegatorFor(entry, expert) {
+        const d = entry.delegators.get(expert);
+        if (!d || d === expert || d === "system" || d === "principal")
+            return "principal";
+        const agent = entry.agents.get(d);
+        if (!agent || agent.status === "stopped" || agent.role === "trace")
+            return "principal";
+        return d;
+    }
+    /**
+     * #97 error escalation: write a NEUTRAL, error-flavored system note into the
+     * REAL delegator's mailbox and wake it, so whoever delegated the work (the
+     * principal, or another agent in a chain like auditor→engineer) learns the
+     * expert failed rather than dead-waiting. Distinct from
+     * `writeFallbackToDelegator` (the "silence" path): this one states an ERROR
+     * occurred and carries the error headline as context, but — like the silence
+     * note — gives NO directive ("re-delegate" / "proceed"): the delegator decides.
+     * Best-effort; never breaks the loop.
+     */
+    writeErrorToDelegator(entry, expert, headline) {
+        const to = this.delegatorFor(entry, expert);
+        void entry.mailbox
+            .write({
+            fromAgent: "system",
+            toAgent: to,
+            msgType: "system",
+            content: `[系统通知] 专家 "${expert}" 在执行任务时发生错误，未能产出结果。错误：${headline}`,
+        })
+            .then(() => this.wakeAgent(entry.id, to))
+            .catch(() => {
+            /* best-effort */
+        });
+    }
+    /**
+     * Wrap drained mailbox messages in the `<message_envelope>` header the A2A
+     * persona (`personas.ts`) tells agents to expect, so the model knows who sent
+     * each message and why. User-origin messages declare `<source type="user"/>`;
+     * agent-origin ones name the sender.
+     *
+     * 意图一·触发点2 (Pi-native hooks): when the PRINCIPAL receives a message from
+     * another agent (not the user — i.e. an expert reporting back), append a single
+     * static line nudging it to record_trace any real decision it makes while
+     * processing the reply. Stateless, loop-free (at most one line per delivery).
+     */
+    renderEnvelopes(msgs, toAgent) {
+        const body = msgs
+            .map((m) => {
+            const source = m.msgType === "user_message"
+                ? `<source type="user" />`
+                : `<source type="agent" name="${m.fromAgent}" />`;
+            return `<message_envelope>\n  ${source}\n  <type>${m.msgType}</type>\n</message_envelope>\n${m.content}`;
+        })
+            .join("\n\n");
+        const fromAgent = msgs.some((m) => m.msgType !== "user_message");
+        if (toAgent === "principal" && fromAgent) {
+            return `${body}\n\n[提醒：处理完这些消息后，如有实质决策请调用 record_trace 记录。]`;
+        }
+        return body;
+    }
     /* -------------------------- state authority -------------------------- */
     /** §10 polling fallback: list agents with authoritative status. */
     listAgents(sessionId) {
@@ -435,14 +1138,61 @@ export class SessionManager {
             return out;
         });
     }
+    /**
+     * #76: a session is "running" whenever ANY non-trace agent is running, or a
+     * mailbox delivery loop is pending for a non-trace target (the loop is
+     * registered synchronously inside `send_message`, so this closes the await gap
+     * between the sender finishing its turn and the delegated target starting —
+     * without it the flag would flicker false in that window). The trace agent is
+     * a real spawned agent (record_trace dispatches `trace_event` envelopes into
+     * its mailbox and it owns the Graph of Trace as editor, see
+     * `system-tools.ts:createRecordTraceTool`), but it is excluded from the
+     * AGGREGATE: a trace recording isn't "the user's task is still running". It
+     * is still LISTED in `agents[]` with its own status so the Agents panel shows
+     * its idle/running transitions live.
+     */
+    deriveRunActive(entry) {
+        if (entry.runActive)
+            return true;
+        for (const a of entry.agents.values()) {
+            if (a.role !== "trace" && a.status === "running")
+                return true;
+        }
+        for (const key of this.deliveryLoops) {
+            const sep = entry.id.length;
+            // key === `${sid}:${name}` — match this session, exclude the trace target.
+            if (key.startsWith(`${entry.id}:`) && key.slice(sep + 1) !== "trace")
+                return true;
+        }
+        return false;
+    }
+    /**
+     * #70/#76: emit the authoritative live snapshot as a `CUSTOM:session_state`
+     * event. This is the wholesale source the web Agents panel replaces its
+     * agents list from; it is pushed on every agent status transition
+     * (`onStatusChange`), an initial frame in `sendMessage`, and on delivery-loop
+     * entry/exit. `runState.active` is DERIVED (any non-trace agent running / a
+     * pending delivery), so a delegated expert keeps the run visibly active. The
+     * ring buffer replays the last frame on reconnect, so a re-subscribing client
+     * recovers the current snapshot. Shape matches `SessionStateSnapshotSchema`.
+     */
+    emitSessionState(entry) {
+        entry.bus.emit(ev.custom({ sessionId: entry.id }, "session_state", {
+            runState: { active: this.deriveRunActive(entry), runId: entry.activeRunId },
+            agents: this.listAgents(entry.id),
+            lastActivityTs: new Date(entry.lastActivityAt).toISOString(),
+            tokenUsage: entry.tokenUsage,
+        }));
+    }
     getSessionState(sessionId) {
         const entry = this.sessions.get(sessionId);
         if (!entry)
             return undefined;
         return {
-            runState: { active: entry.runActive, runId: entry.activeRunId },
+            runState: { active: this.deriveRunActive(entry), runId: entry.activeRunId },
             agents: this.listAgents(sessionId),
             lastActivityTs: new Date(entry.lastActivityAt).toISOString(),
+            tokenUsage: entry.tokenUsage,
         };
     }
     /** The session's Graph of Trace (reasoning DAG), or undefined if no session. */
@@ -450,6 +1200,61 @@ export class SessionManager {
         const entry = this.sessions.get(sessionId);
         return entry?.trace.getGraph();
     }
+    /**
+     * Read persisted AG-UI events for a session from `.bp/<sid>/events.jsonl`.
+     * Used by the web to rehydrate chat history after a runtime restart (the
+     * in-memory bus ring buffer only carries `recent()` for live SSE replay).
+     *
+     * The file is read line-by-line and unparseable lines are skipped so a
+     * single corrupt record doesn't poison the whole history.
+     *
+     * `limit` caps the returned array; when total > limit we return the **tail**
+     * (most recent events) for lightweight callers. Default 1000, positive
+     * limits are capped at 5000. `limit <= 0` returns the full log and is used by
+     * the web rehydrate path so long sessions are not sliced through the middle
+     * of a streamed message.
+     *
+     * Returns `undefined` if the session id isn't in memory — this method is
+     * only useful for known sessions (call `restoreFromDisk` first if needed).
+     */
+    async readEventHistory(sessionId, opts = {}) {
+        if (!this.sessions.has(sessionId))
+            return undefined;
+        const requestedLimit = opts.limit;
+        const limit = requestedLimit === undefined || !Number.isFinite(requestedLimit)
+            ? 1000
+            : requestedLimit <= 0
+                ? null
+                : Math.max(1, Math.min(requestedLimit, 5000));
+        const path = join(this.bpDir(sessionId), "events.jsonl");
+        let raw;
+        try {
+            raw = await readFile(path, "utf8");
+        }
+        catch {
+            // No events file yet — empty history is valid (newly created session).
+            return { events: [], total: 0, truncated: false };
+        }
+        const lines = raw.split("\n");
+        const events = [];
+        let total = 0;
+        for (const line of lines) {
+            if (!line)
+                continue;
+            let parsed;
+            try {
+                parsed = JSON.parse(line);
+            }
+            catch {
+                continue; // skip malformed line
+            }
+            total++;
+            events.push(parsed);
+        }
+        const truncated = limit !== null && events.length > limit;
+        const out = truncated ? events.slice(events.length - limit) : events;
+        return { events: out, total, truncated };
+    }
     metrics() {
         let runningAgents = 0;
         for (const e of this.sessions.values()) {
@@ -553,7 +1358,43 @@ export class SessionManager {
             /* no trace yet */
         }
     }
-    /** Restore session list from disk (§10 策略A: agents start idle, lazily revived). */
+    usagePath(sid) {
+        return join(this.bpDir(sid), "usage.json");
+    }
+    /** Persist cumulative token usage (best-effort; never throws). */
+    async writeUsage(entry) {
+        if (!this.persist)
+            return;
+        await mkdir(this.bpDir(entry.id), { recursive: true }).catch(() => { });
+        await writeFile(this.usagePath(entry.id), JSON.stringify(entry.tokenUsage, null, 2), "utf8").catch(() => { });
+    }
+    /** Rehydrate cumulative token usage from disk (restore path). */
+    async loadUsage(entry) {
+        try {
+            const raw = await readFile(this.usagePath(entry.id), "utf8");
+            const parsed = JSON.parse(raw);
+            const byAgent = {};
+            for (const [name, u] of Object.entries(parsed.byAgent ?? {})) {
+                byAgent[name] = addUsage(emptyTokenUsage(), u);
+            }
+            entry.tokenUsage = { byAgent, total: sumAgentUsage(byAgent) };
+        }
+        catch {
+            /* no usage yet — keep the zeroed default */
+        }
+    }
+    /**
+     * Restore session list from disk. Reads `<dataRoot>/.bp/<id>/meta.json` for
+     * every directory and recreates the session entry with its original
+     * timestamps preserved (provider ref, mailbox, trace also rehydrate via the
+     * normal `createSession` restore path). §10 策略A: agents start idle and
+     * are lazily revived when the user actually sends a message.
+     *
+     * Idempotent — sessions already in memory are skipped, not reset.
+     *
+     * Returns the ids that were restored this call (i.e. excluding ones that
+     * were already loaded or whose meta.json was missing / malformed).
+     */
     async restoreFromDisk() {
         const restored = [];
         const root = join(this.dataRoot, ".bp");
@@ -562,19 +1403,35 @@ export class SessionManager {
             ids = await readdir(root);
         }
         catch {
-            return restored;
+            return restored; // .bp/ doesn't exist yet — fresh install
         }
         for (const id of ids) {
+            if (this.sessions.has(id))
+                continue;
+            const metaPath = join(root, id, "meta.json");
+            let raw;
             try {
-                const raw = await readFile(join(root, id, "meta.json"), "utf8");
-                const meta = JSON.parse(raw);
-                if (!this.sessions.has(meta.id)) {
-                    await this.createSession({ id: meta.id, title: meta.title });
-                    restored.push(meta.id);
-                }
+                raw = await readFile(metaPath, "utf8");
             }
             catch {
-                /* skip non-session dirs */
+                continue; // not a session dir (no meta.json) — silent skip
+            }
+            try {
+                const meta = JSON.parse(raw);
+                const sid = meta.id ?? id;
+                if (this.sessions.has(sid))
+                    continue;
+                const now = new Date().toISOString();
+                await this.createSession({ id: sid, title: meta.title }, {
+                    createdAt: meta.createdAt ?? now,
+                    updatedAt: meta.updatedAt ?? now,
+                    lastActivityAt: typeof meta.lastActivityAt === "number" ? meta.lastActivityAt : Date.now(),
+                });
+                restored.push(sid);
+            }
+            catch (err) {
+                // eslint-disable-next-line no-console
+                console.warn(`[runtime] skipping ${id}: ${err.message}`);
             }
         }
         return restored;