@botlearn-course/daemon 0.0.6 → 0.0.8

package/dist/run-dispatcher.js

@@ -18,10 +18,28 @@ const MAX_TIMEOUT_SECONDS = 7200;
 const DEFAULT_MAX_OUTPUT_CHARS = 100_000;
 // wire 上单块文本上限；完整文本在本地 transcript。
 const BLOCK_TEXT_MAX_CHARS = 4000;
+const CONTENT_FLUSH_MAX_CHARS = 512;
+const CONTENT_FLUSH_INTERVAL_MS = 100;
+const AGENT_STREAM_SCHEMA_VERSION = "agent-stream/0.1";
+const SAFE_TOOL_NAME = /^[A-Za-z0-9][A-Za-z0-9._:/-]{0,79}$/;
 function clampTimeoutSeconds(value) {
     const n = typeof value === "number" && Number.isFinite(value) ? value : DEFAULT_TIMEOUT_SECONDS;
     return Math.min(MAX_TIMEOUT_SECONDS, Math.max(MIN_TIMEOUT_SECONDS, n));
 }
+function normalizeToolName(value) {
+    if (typeof value !== "string")
+        return undefined;
+    const name = value.trim();
+    return SAFE_TOOL_NAME.test(name) ? name : undefined;
+}
+function chunkUnicodeText(value, maxCodePoints) {
+    const codePoints = Array.from(value);
+    const chunks = [];
+    for (let offset = 0; offset < codePoints.length; offset += maxCodePoints) {
+        chunks.push(codePoints.slice(offset, offset + maxCodePoints).join(""));
+    }
+    return chunks;
+}
 /**
  * Run dispatcher：把 Course Service 下发的 run.start 交给 runtime，
  * 并把 runtime 输出归一化成 run.block / run.message / run.completed 回报 Course Service。
@@ -54,7 +72,10 @@ export class RunDispatcher {
     }
     /** 排队执行一个 run。返回的 Promise 不 reject（失败已归一化回报为 run.failed）。 */
     dispatch(payload) {
-        const key = payload.agent_instance_id ?? payload.agent_run_id;
+        // 持久 sandbox 内跨 session 全局串行：整个 sandbox 同时只有一个 active turn（ADR-015 §7/§9）。
+        const key = this.persistentSession
+            ? "persistent-sandbox"
+            : payload.agent_instance_id ?? payload.agent_run_id;
         this.scheduledRunIds.add(payload.agent_run_id);
         return this.queue
             .enqueue(key, () => this.execute(payload))
@@ -85,6 +106,17 @@ export class RunDispatcher {
     get activeCount() {
         return this.inflight.size;
     }
+    /** Wait until the selected runs have left both the active and queued sets. */
+    async waitForRuns(agentRunIds, timeoutMs) {
+        const selected = new Set(agentRunIds);
+        const deadline = this.now() + timeoutMs;
+        while ([...selected].some((runId) => this.inflight.has(runId) || this.scheduledRunIds.has(runId))) {
+            if (this.now() >= deadline)
+                return false;
+            await new Promise((resolve) => setTimeout(resolve, 25));
+        }
+        return true;
+    }
     /** 等待所有 run（含排队中的）结束；超时返回 false。 */
     async drain(timeoutMs) {
         const deadline = this.now() + timeoutMs;
@@ -110,6 +142,7 @@ export class RunDispatcher {
         let terminalSent = false;
         let timedOut = false;
         let timer;
+        let contentFlushTimer;
         let profileApplied = false;
         let toolCalls = 0;
         let toolLimitExceeded = false;
@@ -265,8 +298,80 @@ export class RunDispatcher {
                 controller.abort();
             }, timeoutSeconds * 1000);
             let finalText = "";
-            // 上一次真正上了 wire 的块 kind：thinking/status 只在 kind 切换时上报一次，避免刷屏。
+            // 上一次真正上了 wire 的块 kind：status 只在 kind 切换时上报一次，避免刷屏。
             let lastReportedKind = null;
+            let lastReasoningPhase = null;
+            let pendingContent = "";
+            let streamEventFailure;
+            let streamEventChain = Promise.resolve();
+            const queueStreamEvent = (event) => {
+                const operation = streamEventChain.then(async () => {
+                    if (streamEventFailure)
+                        throw streamEventFailure;
+                    await send(event);
+                });
+                streamEventChain = operation.catch((error) => {
+                    streamEventFailure ??= error;
+                });
+                return operation;
+            };
+            const awaitStreamEvents = async () => {
+                await streamEventChain;
+                if (streamEventFailure)
+                    throw streamEventFailure;
+            };
+            const flushContent = async () => {
+                if (contentFlushTimer !== undefined) {
+                    clearTimeout(contentFlushTimer);
+                    contentFlushTimer = undefined;
+                }
+                if (!pendingContent) {
+                    await awaitStreamEvents();
+                    return;
+                }
+                const content = pendingContent;
+                pendingContent = "";
+                for (const text of chunkUnicodeText(redactSecretString(content), BLOCK_TEXT_MAX_CHARS)) {
+                    if (!text)
+                        continue;
+                    await queueStreamEvent({
+                        type: "run.block",
+                        text,
+                        payload: {
+                            schema_version: AGENT_STREAM_SCHEMA_VERSION,
+                            kind: "text_delta",
+                            runtime: runtime.id,
+                        },
+                    });
+                }
+                await awaitStreamEvents();
+            };
+            const scheduleContentFlush = () => {
+                if (contentFlushTimer !== undefined)
+                    return;
+                contentFlushTimer = setTimeout(() => {
+                    contentFlushTimer = undefined;
+                    void flushContent().catch((error) => {
+                        streamEventFailure ??= error;
+                    });
+                }, CONTENT_FLUSH_INTERVAL_MS);
+            };
+            const sendReasoningPhase = async (phase) => {
+                if (phase === "completed" && lastReasoningPhase !== "in_progress")
+                    return;
+                if (phase === lastReasoningPhase)
+                    return;
+                lastReasoningPhase = phase;
+                await queueStreamEvent({
+                    type: "run.block",
+                    payload: {
+                        schema_version: AGENT_STREAM_SCHEMA_VERSION,
+                        kind: "reasoning",
+                        runtime: runtime.id,
+                        phase,
+                    },
+                });
+            };
             const sink = {
                 progressDispositions: async (dispositions) => {
                     progressDisposition.invalid += dispositions.invalid;
@@ -287,6 +392,7 @@ export class RunDispatcher {
                 },
                 block: async (block) => {
                     if (block.kind === "progress") {
+                        await flushContent();
                         const normalized = tryNormalizeProgressReport({
                             summary: block.summary,
                             status: block.status,
@@ -363,19 +469,87 @@ export class RunDispatcher {
                     }
                     if (serverTerminal)
                         return;
-                    const perBlock = block.kind === "tool_call" || block.kind === "tool_result" || block.kind === "error";
-                    const onTransition = (block.kind === "thinking" || block.kind === "status") &&
-                        block.kind !== lastReportedKind;
-                    if (!perBlock && !onTransition)
+                    if (block.kind === "text_delta") {
+                        if (!block.text)
+                            return;
+                        pendingContent += block.text;
+                        if (pendingContent.length >= CONTENT_FLUSH_MAX_CHARS) {
+                            await flushContent();
+                        }
+                        else {
+                            scheduleContentFlush();
+                        }
                         return;
-                    lastReportedKind = block.kind;
-                    await send({
-                        type: "run.block",
-                        text: redactSecretString(truncateText(block.text ?? "", BLOCK_TEXT_MAX_CHARS)),
-                        payload: { kind: block.kind, runtime: runtime.id },
-                    });
+                    }
+                    await flushContent();
+                    if (block.kind === "thinking") {
+                        await sendReasoningPhase(block.phase ?? "in_progress");
+                        return;
+                    }
+                    if (block.kind === "status") {
+                        if (lastReportedKind === "status")
+                            return;
+                        lastReportedKind = "status";
+                        await queueStreamEvent({
+                            type: "run.block",
+                            payload: {
+                                schema_version: AGENT_STREAM_SCHEMA_VERSION,
+                                kind: "status",
+                                runtime: runtime.id,
+                                phase: "executing",
+                            },
+                        });
+                        return;
+                    }
+                    if (block.kind === "tool_call") {
+                        lastReportedKind = block.kind;
+                        lastReasoningPhase = null;
+                        await queueStreamEvent({
+                            type: "run.block",
+                            payload: {
+                                schema_version: AGENT_STREAM_SCHEMA_VERSION,
+                                kind: "tool_call",
+                                runtime: runtime.id,
+                                status: "started",
+                                ...(normalizeToolName(block.name)
+                                    ? { name: normalizeToolName(block.name) }
+                                    : {}),
+                            },
+                        });
+                        return;
+                    }
+                    if (block.kind === "tool_result") {
+                        lastReportedKind = block.kind;
+                        lastReasoningPhase = null;
+                        await queueStreamEvent({
+                            type: "run.block",
+                            payload: {
+                                schema_version: AGENT_STREAM_SCHEMA_VERSION,
+                                kind: "tool_result",
+                                runtime: runtime.id,
+                                status: block.status === "error" ? "error" : "completed",
+                                ...(normalizeToolName(block.name)
+                                    ? { name: normalizeToolName(block.name) }
+                                    : {}),
+                            },
+                        });
+                        return;
+                    }
+                    if (block.kind === "error") {
+                        lastReportedKind = block.kind;
+                        await queueStreamEvent({
+                            type: "run.block",
+                            payload: {
+                                schema_version: AGENT_STREAM_SCHEMA_VERSION,
+                                kind: "error",
+                                runtime: runtime.id,
+                                status: "error",
+                            },
+                        });
+                    }
                 },
                 message: async (text) => {
+                    await flushContent();
                     finalText = text;
                 },
                 file: async (file) => {
@@ -483,6 +657,8 @@ export class RunDispatcher {
         finally {
             if (timer !== undefined)
                 clearTimeout(timer);
+            if (contentFlushTimer !== undefined)
+                clearTimeout(contentFlushTimer);
             if (profileApplied)
                 cleanupRunRuntimeProfile(runId);
             if (Object.values(progressDisposition).some((count) => count > 0)) {
@@ -492,7 +668,12 @@ export class RunDispatcher {
                     ...progressDisposition,
                 });
             }
-            this.inflight.delete(runId);
+            try {
+                this.persistentSession?.finishTurn(payload);
+            }
+            finally {
+                this.inflight.delete(runId);
+            }
         }
     }
 }

package/dist/runtime-env.d.ts

@@ -2,6 +2,12 @@
 export declare function clearAgentServiceControlEnv(env?: NodeJS.ProcessEnv): void;
 /** Copy an environment for a runtime child without leaking Agent Service control values. */
 export declare function runtimeChildEnv(env?: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
+/**
+ * Validate the short-lived model environment delivered by session.activate.
+ * Only model adapter coordinates are accepted; Course/Agent Service control credentials
+ * and supervisor settings can never be reintroduced through the wire payload.
+ */
+export declare function activationRuntimeEnv(value: unknown): Record<string, string>;
 /** Run model processes as the Template's untrusted runtime UID when configured. */
 export declare function runtimeChildIdentity(env?: NodeJS.ProcessEnv): {
     uid?: number;

package/dist/runtime-env.js

@@ -4,8 +4,9 @@ const AGENT_SERVICE_CONTROL_ENV_KEYS = [
     "BOTLEARN_AGENT_SERVICE_RUN_TOKEN",
     "BOTLEARN_AGENT_SERVICE_WORKER_ID",
     "BOTLEARN_AGENT_SERVICE_WS_URL",
-    "BOTLEARN_AGENT_SERVICE_RUNTIME_SESSION_ID",
-    "BOTLEARN_AGENT_SERVICE_SESSION_TOKEN",
+    "BOTLEARN_AGENT_SERVICE_SANDBOX_ID",
+    "BOTLEARN_AGENT_SERVICE_SANDBOX_TOKEN",
+    "BOTLEARN_AGENT_SERVICE_ACTIVATION_ID",
 ];
 const AGENT_SERVICE_SUPERVISOR_ENV_KEYS = [
     "BOTLEARN_DAEMON_HOME",
@@ -18,6 +19,10 @@ const AGENT_SERVICE_SUPERVISOR_ENV_KEYS = [
     "BOTLEARN_AGENT_SERVICE_WORKSPACE_ROOT",
     "BOTLEARN_AGENT_SERVICE_PROFILE_ROOT",
 ];
+const ACTIVATION_RUNTIME_ENV_KEYS = new Set([
+    "DEEPSEEK_API_KEY",
+    "DEEPSEEK_BASE_URL",
+]);
 const RUNTIME_USER_PATTERN = /^[a-z_][a-z0-9_-]{0,31}$/;
 const RUNTIME_SUDO_BINARY = "/usr/bin/sudo";
 const MANAGED_RUNTIME_LAUNCHER = "/opt/botlearn/bin/botlearn-runtime-launcher";
@@ -38,6 +43,34 @@ export function runtimeChildEnv(env = process.env) {
         childEnv.HOME = runtimeHome;
     return childEnv;
 }
+/**
+ * Validate the short-lived model environment delivered by session.activate.
+ * Only model adapter coordinates are accepted; Course/Agent Service control credentials
+ * and supervisor settings can never be reintroduced through the wire payload.
+ */
+export function activationRuntimeEnv(value) {
+    if (value === undefined || value === null)
+        return {};
+    if (typeof value !== "object" || Array.isArray(value)) {
+        throw new Error("activation runtime_env must be an object");
+    }
+    const result = {};
+    for (const [key, item] of Object.entries(value)) {
+        if (!ACTIVATION_RUNTIME_ENV_KEYS.has(key) ||
+            typeof item !== "string" ||
+            item.length < 1 ||
+            item.length > 8192 ||
+            item.includes("\0")) {
+            throw new Error(`activation runtime env is forbidden: ${key}`);
+        }
+        result[key] = item;
+    }
+    if (Object.keys(result).length > 0 &&
+        (!result.DEEPSEEK_API_KEY || !result.DEEPSEEK_BASE_URL)) {
+        throw new Error("activation runtime env requires the DeepSeek key and base URL pair");
+    }
+    return result;
+}
 /** Run model processes as the Template's untrusted runtime UID when configured. */
 export function runtimeChildIdentity(env = process.env) {
     const uid = Number(env.BOTLEARN_RUNTIME_UID);

package/dist/runtime-profile.js

@@ -149,7 +149,18 @@ function archiveEntries(skill) {
     if (total > MAX_PACKAGE_BYTES) {
         throw new RuntimeProfileApplyError(`Skill ${skill.id} archive is too large`);
     }
-    return entries.sort((a, b) => a.path.localeCompare(b.path));
+    return entries.sort((a, b) => compareUnicodeCodePoints(a.path, b.path));
+}
+function compareUnicodeCodePoints(left, right) {
+    const leftCodePoints = Array.from(left, (value) => value.codePointAt(0));
+    const rightCodePoints = Array.from(right, (value) => value.codePointAt(0));
+    const length = Math.min(leftCodePoints.length, rightCodePoints.length);
+    for (let index = 0; index < length; index += 1) {
+        const difference = leftCodePoints[index] - rightCodePoints[index];
+        if (difference !== 0)
+            return difference;
+    }
+    return leftCodePoints.length - rightCodePoints.length;
 }
 function validateArchiveFile(file, skillId) {
     if (!file || typeof file.path !== "string" || typeof file.content !== "string") {

package/dist/runtimes/claude-code.js

@@ -324,22 +324,33 @@ function claudeStatusEvent(obj) {
 }
 function normalizeBlock(obj, seq) {
     let kind = "other";
+    const contents = Array.isArray(obj?.message?.content) ? obj.message.content : [];
     if (obj?.type === "assistant") {
-        const contents = Array.isArray(obj.message?.content) ? obj.message.content : [];
         if (contents.some((c) => c?.type === "tool_use"))
             kind = "tool_use";
         else if (contents.some((c) => c?.type === "text"))
             kind = "assistant_text";
     }
     else if (obj?.type === "user") {
-        const contents = Array.isArray(obj.message?.content) ? obj.message.content : [];
         if (contents.some((c) => c?.type === "tool_result"))
             kind = "tool_result";
     }
     else if (obj?.type === "system") {
         kind = "system";
     }
-    return { raw: obj, kind, seq };
+    const tool = contents.find((c) => c?.type === "tool_use");
+    const text = contents
+        .filter((c) => c?.type === "text" && typeof c.text === "string")
+        .map((c) => c.text)
+        .join("");
+    return {
+        raw: obj,
+        kind,
+        seq,
+        ...(kind === "assistant_text" && text ? { text } : {}),
+        ...(kind === "tool_use" && typeof tool?.name === "string" ? { name: tool.name } : {}),
+        ...(kind === "tool_result" ? { status: "completed" } : {}),
+    };
 }
 export const claudeCodeModule = {
     id: "claude-code",

package/dist/runtimes/codex.js

@@ -318,7 +318,23 @@ function normalizeBlock(obj, seq) {
             kind = type === "item.completed" ? "tool_result" : "tool_use";
         }
     }
-    return { raw: obj, kind, seq };
+    const toolName = itemType === "mcp_tool_call"
+        ? obj?.item?.tool ?? obj?.item?.name ?? itemType
+        : itemType;
+    return {
+        raw: obj,
+        kind,
+        seq,
+        ...(kind === "assistant_text" && typeof obj?.item?.text === "string"
+            ? { text: obj.item.text }
+            : {}),
+        ...((kind === "tool_use" || kind === "tool_result") && typeof toolName === "string"
+            ? { name: toolName }
+            : {}),
+        ...(kind === "tool_result"
+            ? { status: obj?.item?.status === "failed" ? "error" : "completed" }
+            : {}),
+    };
 }
 export const codexModule = {
     id: "codex",

package/dist/runtimes/deepseek-tui.d.ts

@@ -38,10 +38,11 @@ export declare class DeepseekTuiAdapter implements EngineAdapter {
     private resolveBinary;
     private acquireHandle;
     /**
-     * 不设置 DEEPSEEK_RUNTIME_DIR：server 跨 run 池化共享，per-run 目录不成立；
-     * BYOA 直接用用户本机 deepseek 自身的默认状态目录（含已登录凭据）。
+     * 不设置 DEEPSEEK_RUNTIME_DIR：BYOA server 可跨 run 池化，直接使用用户本机
+     * deepseek 默认状态目录（含已登录凭据）；Agent Service server 按 activation 回收。
      */
     private spawnEnv;
+    private managedActivationId;
     private createThread;
     private patchThreadSystemContext;
     private startTurnAndReadEvents;

package/dist/runtimes/deepseek-tui.js

@@ -7,6 +7,18 @@ import { runtimeChildEnv, runtimeChildLaunch } from "../runtime-env.js";
 import { readCommandVersion, resolveCommandOnPath } from "./probe.js";
 import { adaptDeepseekProgressStarted, cleanupProgressMcpConfig, createDeepseekProgressState, createProgressMcpConfig, deepseekProgressDispositions, isDeepseekProgressCompletion, progressMcpAutoInjectionSupported, progressSystemContext, } from "./progress.js";
 import { consoleLogger, wrapEngineAdapter, } from "./engine.js";
+class DeepseekHttpError extends Error {
+    status;
+    constructor(status, detail = "", operation = "") {
+        super(`${operation ? `${operation} ` : ""}HTTP ${status}${detail ? `: ${detail.slice(0, 300)}` : ""}`);
+        this.status = status;
+        this.name = "DeepseekHttpError";
+    }
+}
+function isMissingThreadHttpError(error) {
+    return (error instanceof DeepseekHttpError
+        && (error.status === 404 || error.status === 410));
+}
 const log = consoleLogger;
 const DEEPSEEK_IDLE_TIMEOUT_MS = 5 * 60 * 1000;
 const STARTUP_TIMEOUT_MS = 30_000;
@@ -99,6 +111,7 @@ export class DeepseekTuiAdapter {
         let handle;
         let countedInFlight = false;
         let releaseTurn;
+        const managedActivationId = this.managedActivationId(opts);
         try {
             // The local server has a process-level kill fallback when turn-scoped interrupt
             // fails. Serialize turns so cancelling one run can never terminate another run.
@@ -114,7 +127,10 @@ export class DeepseekTuiAdapter {
             if (handle.idleTimer)
                 clearTimeout(handle.idleTimer);
             const headers = authHeaders(handle.token);
-            let threadId = opts.sessionId?.trim() || "";
+            // Agent Service model credentials are activation-scoped. The local DeepSeek
+            // server reads them only at process startup, so its native thread cache cannot
+            // safely cross activations; durable Course context rebuilds the new thread.
+            let threadId = managedActivationId ? "" : (opts.sessionId?.trim() || "");
             if (threadId && !isValidThreadId(threadId)) {
                 return {
                     text: "",
@@ -140,7 +156,7 @@ export class DeepseekTuiAdapter {
             const error = runResult.error ?? (text === "" ? emptyCompletionError(handle.stderrTail) : undefined);
             return {
                 text,
-                newSessionId: threadId,
+                newSessionId: managedActivationId ? "" : threadId,
                 ...(runResult.progressDispositions
                     ? { progressDispositions: runResult.progressDispositions }
                     : {}),
@@ -150,11 +166,11 @@ export class DeepseekTuiAdapter {
         }
         catch (err) {
             const message = err instanceof Error ? err.message : String(err);
-            // 服务端已丢失该线程（重启、GC）→ 清空 sessionId 让下次重建。
-            const staleSession = opts.sessionId && /404|not found|missing/i.test(message);
+            // 服务端明确确认线程不存在/已过期时才清空 sessionId，让下一轮从 durable context 重建。
+            const staleSession = Boolean(opts.sessionId) && isMissingThreadHttpError(err);
             return {
                 text: "",
-                newSessionId: staleSession ? "" : (opts.sessionId ?? ""),
+                newSessionId: managedActivationId || staleSession ? "" : (opts.sessionId ?? ""),
                 error: `deepseek-tui: ${message}`,
             };
         }
@@ -162,8 +178,14 @@ export class DeepseekTuiAdapter {
             opts.signal.removeEventListener("abort", onAbort);
             if (handle && countedInFlight) {
                 handle.inFlight = Math.max(0, handle.inFlight - 1);
-                if (!this.explicitServerUrl)
+                if (managedActivationId && !this.explicitServerUrl && handle.inFlight === 0) {
+                    if (PROCESS_POOL.get(POOL_KEY) === handle)
+                        PROCESS_POOL.delete(POOL_KEY);
+                    shutdownHandle(handle, "managed-activation-finished");
+                }
+                else if (!this.explicitServerUrl) {
                     resetIdle(handle, POOL_KEY);
+                }
             }
             releaseTurn?.();
         }
@@ -182,14 +204,23 @@ export class DeepseekTuiAdapter {
                 child: nullChild(),
                 baseUrl: trimTrailingSlash(this.explicitServerUrl),
                 token: this.explicitAuthToken ?? "",
+                managedActivationId: null,
                 closed: false,
                 inFlight: 0,
                 stderrTail: "",
             };
         }
+        const managedActivationId = this.managedActivationId(opts);
         const existing = PROCESS_POOL.get(POOL_KEY);
-        if (existing && !existing.closed)
+        if (existing
+            && !existing.closed
+            && existing.managedActivationId === managedActivationId) {
             return existing;
+        }
+        if (existing) {
+            PROCESS_POOL.delete(POOL_KEY);
+            shutdownHandle(existing, "activation-scope-changed");
+        }
         const port = await findFreePort();
         if (signal.aborted)
             throw abortReason(signal);
@@ -231,6 +262,7 @@ export class DeepseekTuiAdapter {
             child,
             baseUrl,
             token,
+            managedActivationId,
             closed: false,
             inFlight: 0,
             stderrTail: "",
@@ -266,8 +298,8 @@ export class DeepseekTuiAdapter {
         return handle;
     }
     /**
-     * 不设置 DEEPSEEK_RUNTIME_DIR：server 跨 run 池化共享，per-run 目录不成立；
-     * BYOA 直接用用户本机 deepseek 自身的默认状态目录（含已登录凭据）。
+     * 不设置 DEEPSEEK_RUNTIME_DIR：BYOA server 可跨 run 池化，直接使用用户本机
+     * deepseek 默认状态目录（含已登录凭据）；Agent Service server 按 activation 回收。
      */
     spawnEnv(opts, progressMcpConfigPath) {
         const env = {
@@ -279,6 +311,12 @@ export class DeepseekTuiAdapter {
             env.DEEPSEEK_MCP_CONFIG = progressMcpConfigPath;
         return env;
     }
+    managedActivationId(opts) {
+        if (this.explicitServerUrl)
+            return null;
+        const value = opts.env?.BOTLEARN_AGENT_SERVICE_ACTIVATION_ID?.trim();
+        return value || null;
+    }
     async createThread(baseUrl, headers, opts, signal) {
         const body = {
             workspace: opts.cwd,
@@ -404,7 +442,7 @@ export class DeepseekTuiAdapter {
     async readEvents(url, headers, opts, signal) {
         const res = await this.fetchFn(url, { method: "GET", headers, signal });
         if (!res.ok)
-            throw new Error(`events stream failed HTTP ${res.status}`);
+            throw new DeepseekHttpError(res.status, "", "events stream failed");
         if (!res.body)
             throw new Error("events stream response missing body");
         const reader = res.body.getReader();
@@ -538,7 +576,7 @@ export class DeepseekTuiAdapter {
             catch {
                 // ignore
             }
-            throw new Error(`HTTP ${res.status}${detail ? `: ${detail.slice(0, 300)}` : ""}`);
+            throw new DeepseekHttpError(res.status, detail);
         }
         return (await res.json());
     }
@@ -553,16 +591,37 @@ export function __resetDeepseekTuiPoolForTests() {
 }
 function normalizeDeepseekEvent(eventName, payload, seq) {
     if (eventName === "message.delta") {
-        return { raw: { event: eventName, payload }, kind: "assistant_text", seq };
+        return {
+            raw: { event: eventName, payload },
+            kind: "assistant_text",
+            seq,
+            text: stringField(payload, "content") ?? "",
+        };
     }
     if (eventName === "tool.started" || isToolStarted(eventName, payload)) {
-        return { raw: { event: eventName, payload }, kind: "tool_use", seq };
+        return {
+            raw: { event: eventName, payload },
+            kind: "tool_use",
+            seq,
+            ...(deepseekToolName(payload) ? { name: deepseekToolName(payload) } : {}),
+        };
     }
     if (eventName === "tool.completed" || isToolCompleted(eventName, payload)) {
-        return { raw: { event: eventName, payload }, kind: "tool_result", seq };
+        return {
+            raw: { event: eventName, payload },
+            kind: "tool_result",
+            seq,
+            ...(deepseekToolName(payload) ? { name: deepseekToolName(payload) } : {}),
+            status: deepseekToolFailed(payload) ? "error" : "completed",
+        };
     }
     if (eventName === "item.delta" && isAgentMessageDelta(payload)) {
-        return { raw: { event: eventName, payload }, kind: "assistant_text", seq };
+        return {
+            raw: { event: eventName, payload },
+            kind: "assistant_text",
+            seq,
+            text: extractDeepseekDelta(payload),
+        };
     }
     if (eventName === "item.completed" && isAgentReasoningItem(payload)) {
         return { raw: { event: eventName, payload }, kind: "thinking", seq };
@@ -674,6 +733,19 @@ function inferDeepseekToolName(item) {
     }
     return undefined;
 }
+function deepseekToolName(payload) {
+    return (stringField(payload, "name")
+        ?? stringField(payload?.tool, "name")
+        ?? stringField(payload?.payload?.tool, "name")
+        ?? inferDeepseekToolName(payload?.item ?? payload?.payload?.item));
+}
+function deepseekToolFailed(payload) {
+    const status = (stringField(payload, "status")
+        ?? stringField(payload?.tool, "status")
+        ?? stringField(payload?.payload?.tool, "status")
+        ?? "").toLowerCase();
+    return status.includes("fail") || status.includes("error");
+}
 function emptyCompletionError(stderrTail) {
     const tail = stderrTail.trim();
     if (!tail) {

package/dist/runtimes/engine.d.ts

@@ -9,6 +9,11 @@ export interface ContentStreamBlock {
     raw: unknown;
     kind: "assistant_text" | "tool_use" | "tool_result" | "system" | "thinking" | "other";
     seq: number;
+    /** Assistant-visible text only. Provider raw payloads must never be used as browser text. */
+    text?: string;
+    /** Safe provider-normalized tool identifier; arguments and results remain private. */
+    name?: string;
+    status?: "completed" | "error";
 }
 /** provider 已严格校验的进度块；禁止携带原始 tool envelope。 */
 export interface ProgressStreamBlock {