dsh-session-bridge 0.3.0 → 0.3.1

package/dsh.plugin.json

@@ -1,10 +1,10 @@
 {
   "id": "dsh-external/dsh-session-bridge",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "main": "./lib/index.js",
   "description": "会话桥：创建主会话 / 向任意会话发消息 / 等待回复 / 读取消息 / 按名或 id 查找会话（支持跨工作区）；另含监控/调度主任务与归档会话。",
   "engines": {
-    "dsh": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0"
+    "dsh": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0"
   },
   "contributes": {
     "tools": [

package/lib/index.js

@@ -4,7 +4,7 @@ import { homedir } from "node:os";
 import { dirname, join, resolve } from "node:path";
 import { appendFileSync, mkdirSync } from "node:fs";
 import { randomUUID } from "node:crypto";
-//#region node_modules/.pnpm/@deepseek-ai+dsh-home-paths@0.1.2-alpha.2_@deepseek-ai+cordis@4.0.2_@deepseek-ai+dsh-in_7832b76c982cc1477c0eac59a4954baf/node_modules/@deepseek-ai/dsh-home-paths/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-home-paths@0.1.5-alpha.2_@deepseek-ai+cordis@4.0.2/node_modules/@deepseek-ai/dsh-home-paths/lib/index.js
 /**
 * Shared filesystem path helpers for DeepSeek Harness user data.
 *
@@ -2200,7 +2200,7 @@ var Service = class Service {
 	}
 };
 //#endregion
-//#region node_modules/.pnpm/@deepseek-ai+dsh-typert-protocol@0.1.2-rc.1_@deepseek-ai+cordis@4.0.2/node_modules/@deepseek-ai/dsh-typert-protocol/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-typert-protocol@0.1.5-alpha.2_@deepseek-ai+cordis@4.0.2/node_modules/@deepseek-ai/dsh-typert-protocol/lib/index.js
 /** The one Remote failure class shared by owners, the Gateway, and consumers. */
 /**
 * One Remote call failure: a real Error carrying its stable code and typed
@@ -2345,7 +2345,7 @@ function validateName(subject, value) {
 	if (!isTypertRemoteSegment(value)) throw new TypeError(`typert-protocol: ${subject} must contain only RPC endpoint segment characters`);
 }
 //#endregion
-//#region node_modules/.pnpm/@deepseek-ai+dsh-util-values@0.1.2-alpha.2_@deepseek-ai+cordis@4.0.2_@deepseek-ai+dsh-i_486cdbb63f2ab3a8eaad87d2b6e5a4b7/node_modules/@deepseek-ai/dsh-util-values/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-util-values@0.1.5-alpha.2_@deepseek-ai+cordis@4.0.2/node_modules/@deepseek-ai/dsh-util-values/lib/index.js
 /** Duplicate-install-safe JSON and immutable-value helpers. @module @deepseek-ai/dsh-util-values */
 /**
 * Mark an unreachable closed-union branch.
@@ -2557,7 +2557,7 @@ function deepFreeze(value) {
 	return value;
 }
 //#endregion
-//#region node_modules/.pnpm/@deepseek-ai+dsh-util-crypto@0.1.2-alpha.2_@deepseek-ai+cordis@4.0.2_@deepseek-ai+dsh-i_45952c52282327ee28c4189b1e05c80c/node_modules/@deepseek-ai/dsh-util-crypto/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-util-crypto@0.1.5-alpha.2_@deepseek-ai+cordis@4.0.2/node_modules/@deepseek-ai/dsh-util-crypto/lib/index.js
 /**
 * Random v4 UUID, minted from `crypto.getRandomValues`.
 * @returns the UUID string.
@@ -2570,16 +2570,16 @@ function randomUUID$1() {
 	return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
 }
 //#endregion
-//#region node_modules/.pnpm/@deepseek-ai+dsh-brand@0.1.2-alpha.2_@deepseek-ai+cordis@4.0.2_@deepseek-ai+dsh-invaria_0a6acdb1edc9f1b3caaaafba5a0cd464/node_modules/@deepseek-ai/dsh-brand/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-brand@0.1.5-alpha.2_@deepseek-ai+cordis@4.0.2/node_modules/@deepseek-ai/dsh-brand/lib/index.js
 /**
-* Duplicate-install-safe nominal string helpers.
+* Duplicate-install-safe nominal primitive helpers.
 *
-* A brand makes structurally-identical strings non-interchangeable at the type
-* level: a `SessionId` cannot be passed where a `ToolCallId` is expected, even
-* though both are plain strings at runtime. Comparison, logging, and
-* serialization all behave as ordinary strings.
+* A brand makes structurally identical strings or numbers non-interchangeable
+* at the type level: a `SessionId` cannot be passed where a `ToolCallId` is
+* expected, and an event sequence cannot be passed as a log offset. Comparison,
+* logging, and serialization retain the underlying primitive behavior.
 *
-* This package owns no concrete id and keeps no runtime identity or mutable
+* This package owns no concrete domain value and keeps no runtime identity or mutable
 * state, so independently installed copies produce interchangeable values.
 *
 * @module @deepseek-ai/dsh-brand
@@ -3187,11 +3187,19 @@ defineMethod("transform", [
 	"preserve"
 ], ({ inner }, isInner) => inner.toString(isInner));
 //#endregion
-//#region node_modules/.pnpm/@deepseek-ai+dsh-timeout@0.1.2-rc.1_@deepseek-ai+cordis@4.0.2/node_modules/@deepseek-ai/dsh-timeout/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-timeout@0.1.5-alpha.2_@deepseek-ai+cordis@4.0.2/node_modules/@deepseek-ai/dsh-timeout/lib/index.js
 /** Largest delay Node schedules without clamping it to one millisecond. */
 const MAX_TIMER_DELAY_MS = 2147483647;
 //#endregion
-//#region node_modules/.pnpm/@deepseek-ai+dsh-llm@0.1.2-alpha.2_@deepseek-ai+cordis@4.0.2_@deepseek-ai+dsh-invariant_cc3ae850d309c6dee6d11afd096d0893/node_modules/@deepseek-ai/dsh-llm/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-llm@0.1.5-alpha.2_@deepseek-ai+cordis@4.0.2/node_modules/@deepseek-ai/dsh-llm/lib/index.js
+/**
+* Bound one `notice` summary to {@link CONTEXT_SUMMARY_MAX_CHARS}.
+* @param summary - the producer's one-line account, of any length.
+* @returns the account, ellipsized when it exceeds the bound.
+*/
+function boundContextSummary(summary) {
+	return summary.length <= 120 ? summary : `${summary.slice(0, 119)}…`;
+}
 /**
 * Detach and deep-freeze a message whose identity already exists.
 * @param message - complete message, including its stable identity.
@@ -3457,6 +3465,9 @@ function errorMessage$1(error) {
 function harnessErrorCode(error) {
 	return error instanceof HarnessError ? error.code : "UNKNOWN";
 }
+function quoted(value) {
+	return JSON.stringify(value);
+}
 /**
 * Stable text shown to a model that cannot accept one durable image reference.
 * @param ref - durable normalized attachment omitted from the request.
@@ -3476,6 +3487,76 @@ function textOnlyImageText(ref) {
 function contentHasImage(content) {
 	return content.some((block) => block.type === "image" || block.type === "tool-result" && contentHasImage(block.content));
 }
+/**
+* True when typed model content contains a file block, walking nested
+* tool-result content on the same recursion every file policy shares.
+* Reads current content on every call without retaining scan results.
+* @param content - typed model content blocks.
+* @returns whether any nested block is a file.
+*/
+function contentHasFile(content) {
+	for (const block of content) if (block.type === "file" || block.type === "tool-result" && contentHasFile(block.content)) return true;
+	return false;
+}
+/**
+* Stable model-facing handle for one durable file reference: the address of
+* the verbatim stored copy and the instruction to read it on demand. This is
+* the only representation a provider ever receives for a file.
+* @param ref - durable verbatim file reference.
+* @param readonlyPath - execution-world path of the stored copy, when resolvable.
+* @returns deterministic handle text naming the file, its size, and its address.
+*/
+function fileHandleText(ref, readonlyPath) {
+	const digest = String(ref.attachmentId).slice(7, 15);
+	const identity = `File ${quoted(ref.name)} (${ref.bytes} bytes, sha256:${digest})`;
+	if (readonlyPath === void 0) return `[${identity} was uploaded, but the current execution environment cannot access a readable path. Report that limitation if its contents are needed; do not claim to have read it.]`;
+	return `[${identity}: verbatim read-only copy saved at ${quoted(readonlyPath)}. Read that path with your file tools when its contents are needed; copy it to a writable location before modifying it. When delegating file work, include this saved path in the delegation prompt; only subagents sharing this execution environment can read it.]`;
+}
+/** Replace every file occurrence, including nested tool results, with handle text. */
+function replaceFilesWithHandles(blocks, resolvePath) {
+	let next;
+	for (const [index, block] of blocks.entries()) {
+		if (block.type === "file") {
+			next ??= blocks.slice(0, index);
+			next.push({
+				type: "text",
+				text: fileHandleText(block.attachment, resolvePath(block.attachment))
+			});
+			continue;
+		}
+		if (block.type === "tool-result") {
+			const content = replaceFilesWithHandles(block.content, resolvePath);
+			if (content !== block.content) {
+				next ??= blocks.slice(0, index);
+				next.push({
+					...block,
+					content
+				});
+				continue;
+			}
+		}
+		next?.push(block);
+	}
+	return next ?? blocks;
+}
+/**
+* Project durable file history into deterministic handle text for every model
+* route. Unlike images, no provider receives file blocks natively, so this
+* projection is unconditional in request assembly.
+* @param messages - complete request history.
+* @param resolvePath - resolve one reference's current execution-world read path.
+* @returns the original list without files, otherwise shallow message copies with handle text.
+*/
+function projectFilesToText(messages, resolvePath) {
+	if (!messages.some((message) => contentHasFile(message.content))) return messages;
+	return messages.map((message) => {
+		const content = replaceFilesWithHandles(message.content, resolvePath);
+		return content === message.content ? message : {
+			...message,
+			content
+		};
+	});
+}
 /** Replace every image occurrence, including nested tool results, for a text-only model. */
 function replaceImagesForTextModel(blocks) {
 	let next;
@@ -3916,6 +3997,15 @@ var LlmError = class extends HarnessError {
 		imageRequestPricing(provider, model) {
 			return this.adapters.get(provider)?.adapter.imageRequestPricing(provider, model);
 		}
+		/**
+		* Resolve the exact text one durable file occurrence contributes to every
+		* provider request in the current execution environment.
+		* @param ref - durable verbatim file reference from model history.
+		* @returns the same deterministic handle text used at adapter dispatch.
+		*/
+		fileRequestText(ref) {
+			return fileHandleText(ref, this.fileReadPath(ref));
+		}
 		/** Detach typed adapter-owned modality metadata. */
 		detachedModalities(modalities) {
 			return modalities === void 0 ? void 0 : [...modalities];
@@ -3965,6 +4055,8 @@ var LlmError = class extends HarnessError {
 			const context = resolved.context;
 			if (context !== void 0 && (!Number.isInteger(context.contextWindow) || context.contextWindow <= 0)) throw new LlmError(`adapter returned invalid context metadata for provider "${provider}" model "${model}"`, "INVALID_MODEL_CONTEXT");
 			const inputModalities = this.detachedModalities(resolved.inputModalities);
+			const systemPromptUpdate = resolved.systemPromptUpdate;
+			if (systemPromptUpdate !== void 0 && systemPromptUpdate !== "in-history") throw new LlmError(`adapter returned invalid system prompt update mode for provider "${provider}" model "${model}"`, "INVALID_MODEL_INFO");
 			const defaultMaxTokens = resolved.defaultMaxTokens;
 			if (defaultMaxTokens !== void 0 && (!Number.isSafeInteger(defaultMaxTokens) || defaultMaxTokens <= 0)) throw new LlmError(`adapter returned invalid default maxTokens for provider "${provider}" model "${model}"`, "INVALID_MODEL_MAX_TOKENS");
 			const info = {
@@ -3974,7 +4066,8 @@ var LlmError = class extends HarnessError {
 				...resolved.description === void 0 ? {} : { description: resolved.description },
 				...inputModalities === void 0 ? {} : { inputModalities },
 				...context === void 0 ? {} : { context: { contextWindow: context.contextWindow } },
-				...defaultMaxTokens === void 0 ? {} : { defaultMaxTokens }
+				...defaultMaxTokens === void 0 ? {} : { defaultMaxTokens },
+				...resolved.systemPromptUpdate === void 0 ? {} : { systemPromptUpdate: resolved.systemPromptUpdate }
 			};
 			const reasoning = resolved.reasoning;
 			if (reasoning === void 0) return info;
@@ -4068,6 +4161,7 @@ var LlmError = class extends HarnessError {
 				adapterDefaults,
 				...context === void 0 ? {} : { context },
 				...modelInfo.inputModalities === void 0 ? {} : { inputModalities: Object.freeze([...modelInfo.inputModalities]) },
+				...modelInfo.systemPromptUpdate === void 0 ? {} : { systemPromptUpdate: modelInfo.systemPromptUpdate },
 				stream: (options) => {
 					if (dispatched) throw new LlmError("a prepared LLM call can only be dispatched once", "INVALID_PREPARED_CALL");
 					if (!callConfigEquals(options, resolvedConfig)) throw new LlmError("prepared LLM call config changed before adapter dispatch", "INVALID_PREPARED_CALL");
@@ -4109,6 +4203,20 @@ var LlmError = class extends HarnessError {
 			return Object.isFrozen(options) ? deepFreeze(filtered) : filtered;
 		}
 		/**
+		* Resolve the current execution-world read path of one durable file
+		* reference through the mounted attachment and filesystem providers.
+		*/
+		fileReadPath(ref) {
+			let hostPath;
+			try {
+				hostPath = this.ctx.get("attachments")?.fileHostPath(ref);
+			} catch {
+				return;
+			}
+			if (hostPath === void 0) return void 0;
+			return this.ctx.get("fs")?.processPathFromHostPath(hostPath);
+		}
+		/**
 		* Final adapter boundary. Adapter selection, dispatch, iterator construction,
 		* and iteration failures become one terminal failure chunk. Middleware and
 		* downstream consumer failures remain thrown plugin or consumer errors.
@@ -4139,13 +4247,16 @@ var LlmError = class extends HarnessError {
 					...options,
 					...resolvedConfig
 				};
-				const projectedOptions = modelInfo.inputModalities !== void 0 && !modelInfo.inputModalities.includes("image") && resolvedOptions.messages.some((message) => contentHasImage(message.content)) ? Object.isFrozen(resolvedOptions) ? deepFreeze({
+				let projectedMessages = resolvedOptions.messages;
+				if (projectedMessages.some((message) => contentHasFile(message.content))) projectedMessages = projectFilesToText(projectedMessages, (ref) => this.fileReadPath(ref));
+				if (modelInfo.inputModalities !== void 0 && !modelInfo.inputModalities.includes("image") && projectedMessages.some((message) => contentHasImage(message.content))) projectedMessages = projectImagesForTextModel(projectedMessages);
+				const projectedOptions = projectedMessages === resolvedOptions.messages ? resolvedOptions : Object.isFrozen(resolvedOptions) ? deepFreeze({
 					...resolvedOptions,
-					messages: projectImagesForTextModel(resolvedOptions.messages)
+					messages: projectedMessages
 				}) : {
 					...resolvedOptions,
-					messages: projectImagesForTextModel(resolvedOptions.messages)
-				} : resolvedOptions;
+					messages: projectedMessages
+				};
 				iterator = dispatch(this.forAdapter(projectedOptions, adapter))[Symbol.asyncIterator]();
 			} catch (error) {
 				yield adapterFailureChunk(error, options.signal);
@@ -8966,7 +9077,7 @@ function superRefine(fn, params) {
 	return /* @__PURE__ */ _superRefine(fn, params);
 }
 //#endregion
-//#region node_modules/.pnpm/@deepseek-ai+dsh-storage@0.1.2-rc.1_@deepseek-ai+cordis@4.0.2/node_modules/@deepseek-ai/dsh-storage/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-storage@0.1.5-alpha.2_@deepseek-ai+cordis@4.0.2/node_modules/@deepseek-ai/dsh-storage/lib/index.js
 /**
 * Backend-facing vocabulary of the storage hub: a backend owns one medium
 * (a file-tree root, a database file) and exposes operation groups over it.
@@ -8977,7 +9088,7 @@ function superRefine(fn, params) {
 /** Allowed format for unit and table names: safe as a file name and as a SQL identifier segment without escaping. */
 const UNIT_NAME_RE = /^[a-z][a-z0-9_]*$/;
 //#endregion
-//#region node_modules/.pnpm/@deepseek-ai+dsh-storage-domain@0.1.2-rc.1_@deepseek-ai+cordis@4.0.2_@deepseek-ai+dsh-i_9f44d404e0b20c2f6e8599234336f27b/node_modules/@deepseek-ai/dsh-storage-domain/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-storage-domain@0.1.5-alpha.2_@deepseek-ai+cordis@4.0.2_@deepseek-ai+ds_8f094eabec231701d08ef59df76cca5d/node_modules/@deepseek-ai/dsh-storage-domain/lib/index.js
 /**
 * Domain declaration vocabulary. A spec object is the single source of a
 * domain's identity, layout, and record schemas: the owning package defines
@@ -9121,6 +9232,27 @@ function sessionEvents(session) {
 function asEventList(events) {
 	return Array.isArray(events) ? events : [];
 }
+/**
+* 读取一个持久化（离线）会话的事件日志与头部元数据。兼容两代 persistence API：
+* - 旧版：`sessionPersistence.inspect(id)` 直接返回 { events, meta }；
+* - dsh 0.1.5 之后：`inspect` 已删除，改用 `open(id, 'read')` → `handle.read()`
+*   （+ `handle.header`），读句柄不抢写所有权，读后必须 close()。
+* 会话不存在时两个 API 都抛错，调用方按原语义处理。
+*/
+async function inspectPersistedSession(ctx, id) {
+	const persistence = ctx.sessionPersistence;
+	if (typeof persistence.inspect === "function") return await persistence.inspect(id);
+	const handle = await persistence.open(id, "read");
+	try {
+		const { events } = await handle.read();
+		return {
+			events,
+			meta: handle.header
+		};
+	} finally {
+		await handle.close();
+	}
+}
 /** agent.followup / steer 接受的用户消息值。 */
 function userMessage(text) {
 	return {
@@ -9252,12 +9384,14 @@ function latestSegmentSince(events, sinceSeq = 0) {
 	return segs.length === 0 ? null : segs[segs.length - 1] ?? null;
 }
 /**
-* 对一个 live 会话的事件日志折叠出其"实时思维链"：
-* - 优先聚合流式 assistant/chunk 事件里的 reasoning-delta（turn 中途即可见、增量，
-*   这正是监控思维链并按规则提前终止所需的粒度）；
-* - 同时聚合同窗口的 text-delta 增量；
-* - 若没有进行中的 chunk（会话空闲、或该 provider 不流式推理/无推理），返回 null，
-*   调用方应回落为 foldMessages 里的已定型 message.reasoning。
+* 对一个 live 会话的事件日志折叠出其"最近推理/文本增量流"。兼容两代日志形状：
+* - dsh 0.1.5 之后：turn 内不再发布独立 chunk 事件，流式增量内嵌在已定型
+*   assistant/message（或未定型 assistant/attempt）事件的 `stream` 记录里
+*   （reasoning-chunks / text-chunks 批量段 + 原始 chunk：reasoning-delta / text-delta）；
+* - 0.1.2-rc 之前：独立的 assistant/chunk 事件（turn 中途即可见、增量，
+*   这正是旧版监控思维链并按规则提前终止所需的粒度）。
+* 两者兼读、取最新一份；无任何增量（会话空闲、或该 provider 不流式推理/无推理）
+* 返回 null，调用方应回落为 foldMessages 里已定型的 message.reasoning。
 * 纯读、无副作用；事件形状不做任何假设，缺失/异常一律安全处理。
 */
 function liveReasoningSnapshot(events) {
@@ -9271,11 +9405,41 @@ function liveReasoningSnapshot(events) {
 	let step = 0;
 	let foundDelta = false;
 	for (const event of list) {
-		if (event.type === "assistant/message") {
-			lastFinalizedSeq = event.seq;
+		const type = event.type;
+		if (type === "assistant/message" || type === "assistant/attempt") {
+			const data = event.data;
+			if (data !== null && data !== void 0 && typeof data === "object" && Array.isArray(data.stream)) {
+				let r = "";
+				let t = "";
+				for (const raw of data.stream) {
+					const record = raw;
+					if (record === null || typeof record !== "object") continue;
+					if (record.type === "reasoning-chunks" && Array.isArray(record.texts)) {
+						for (const s of record.texts) if (typeof s === "string") r += s;
+					} else if (record.type === "text-chunks" && Array.isArray(record.texts)) {
+						for (const s of record.texts) if (typeof s === "string") t += s;
+					} else if (record.type === "chunk") {
+						const c = record.chunk;
+						if (c !== null && typeof c === "object" && typeof c.type === "string" && typeof c.text === "string") {
+							if (c.type === "reasoning-delta") r += c.text;
+							else if (c.type === "text-delta") t += c.text;
+						}
+					}
+				}
+				if (r !== "" || t !== "") {
+					if (typeof data.turn === "number") turn = data.turn;
+					if (typeof data.step === "number") step = data.step;
+					reasoning = r;
+					text = t;
+					seq = event.seq;
+					time = event.time;
+					foundDelta = true;
+				}
+			}
+			if (type === "assistant/message") lastFinalizedSeq = event.seq;
 			continue;
 		}
-		if (event.type !== "assistant/chunk") continue;
+		if (type !== "assistant/chunk") continue;
 		if (event.seq <= lastFinalizedSeq) continue;
 		const data = event.data;
 		if (data === null || data === void 0 || typeof data !== "object") continue;
@@ -9511,7 +9675,7 @@ function statusSnapshot(ctx, agent) {
 		lastTurn,
 		lastActivityAt,
 		stalledMs: lastActivityAt === null ? null : Date.now() - lastActivityAt,
-		pendingWork: inbox?.hasPending ?? false,
+		pendingWork: inbox?.hasPending === true || (inbox?.nextTurn?.length ?? 0) + (inbox?.nextStep?.length ?? 0) > 0,
 		nextTurnCount: inbox?.nextTurn?.length ?? 0,
 		nextStepCount: inbox?.nextStep?.length ?? 0,
 		...lastAssistantText === void 0 ? {} : { lastAssistantText },
@@ -9874,7 +10038,7 @@ var SessionMonitor = class {
 	}
 };
 //#endregion
-//#region node_modules/.pnpm/@deepseek-ai+dsh-scope@0.1.2-alpha.2_@deepseek-ai+cordis@4.0.2_@deepseek-ai+dsh-invaria_51e6fefef6ddce4f991b3d02344a1a72/node_modules/@deepseek-ai/dsh-scope/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-scope@0.1.5-alpha.2_@deepseek-ai+cordis@4.0.2_@deepseek-ai+dsh-invaria_a35c65afc1061b4908fad5a531841731/node_modules/@deepseek-ai/dsh-scope/lib/index.js
 /**
 * Shared insertion-ordered storage and effect ownership for scope-aware registries.
 *
@@ -10153,7 +10317,7 @@ function scopeTarget(base, key) {
 	return carrier;
 }
 //#endregion
-//#region node_modules/.pnpm/@deepseek-ai+dsh-tools@0.1.2-alpha.2_96d3de6f0f5da790676b5bfb20e4a981/node_modules/@deepseek-ai/dsh-tools/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-tools@0.1.5-alpha.2_2b754afda902b21956a20e8a701ed6ef/node_modules/@deepseek-ai/dsh-tools/lib/index.js
 /**
 * Enforced JSON Schema subset shared by tool outputs, generated PTC mode
 * types, subagents, and workflows. The subset accepts any JSON root, an
@@ -11330,7 +11494,7 @@ function createRunCodeTool(registry, options) {
 				if (runOver()) throw new Error(`run_code run is over (${String(runController.signal.reason)}); ${name} not dispatched`);
 				const normalized = jsonNormalizeArgs(rawArgs);
 				const n = ++dispatches;
-				const subCallId = brandString(`${String(exec.callId)}:code:${n}`);
+				const subCallId = brandString(`${String(exec.callId)}:ptc:${n}`);
 				const input = {
 					callId: subCallId,
 					rootCallId: exec.rootCallId,
@@ -11362,7 +11526,7 @@ function createRunCodeTool(registry, options) {
 								isError: result.isError,
 								content: result.content
 							});
-							agent.session.append("tool/code-dispatch", {
+							agent.session.append("tool/ptc-dispatch", {
 								rootCallId: exec.rootCallId,
 								parentCallId: exec.callId,
 								subCallId,
@@ -11384,7 +11548,7 @@ function createRunCodeTool(registry, options) {
 							reject(/* @__PURE__ */ new Error(`run_code run is over (${String(runController.signal.reason)}); ${name} tool call abandoned`));
 						},
 						async start() {
-							exec.agent?.session.append("tool/code-dispatch-start", {
+							exec.agent?.session.append("tool/ptc-dispatch-start", {
 								rootCallId: exec.rootCallId,
 								parentCallId: exec.callId,
 								subCallId,
@@ -11418,7 +11582,7 @@ function createRunCodeTool(registry, options) {
 								content: result.content,
 								source: {
 									kind: "plugin",
-									plugin: "tools-code-mode"
+									plugin: "tools-ptc"
 								}
 							}));
 							for (const context of result.additionalContexts ?? []) exec.deferContext(context);
@@ -12822,8 +12986,7 @@ var ToolRuntime = class extends Service {
 	* reads return the same flavor — but a reload that swapped in a second
 	* language between them would hand a program written against one SDK to the
 	* other. Binding it is deferred until a second backend ships (the first
-	* point it is testable); rationale in the
-	* [language-dispatch note](../../../../.agents/notes/implemented/feature/2026-07-31-ptc-language-dispatch.md).
+	* point it is testable).
 	*/
 	requireCodeRuntime(mode) {
 		const runtime = this.ctx.get("codeRuntime");
@@ -12909,9 +13072,9 @@ var ToolRuntime = class extends Service {
 	* A restriction filters what a scope inherits — the global layer and every
 	* ancestor layer on its chain — and never what its OWN layer registers.
 	* That exemption is what a per-child capability filter has to keep intact:
-	* the delegation runtime registers a child's reporting and structured-output
-	* tools into the child's own layer, and a filter naming the capabilities the
-	* child may use must not strip the machinery it answers through.
+	* the delegation runtime registers a child's structured-output tool into the
+	* child's own layer, and a filter naming the capabilities the child may use
+	* must not strip the machinery it answers through.
 	*
 	* Reading the exempt set as "the global layer" instead of "not mine" held
 	* only while every model-facing tool sat in the host composition. Once
@@ -13029,7 +13192,7 @@ var ToolRuntime = class extends Service {
 	}
 	/**
 	* Run the `tools/ptc-dispatch-log` waterfall over one settled sub-dispatch
-	* and return the content the bridge should log on `tool/code-dispatch`.
+	* and return the content the bridge should log on `tool/ptc-dispatch`.
 	* Contained: when a listener throws, the method logs the original settled
 	* content; that failure must not fail the dispatch or omit the settle event. Private:
 	* the ONE consumer is the `run_code` bridge this registry constructs, which
@@ -13655,11 +13818,33 @@ function toolAbortedBeforeDispatchResult(prior) {
 	};
 }
 //#endregion
-//#region node_modules/.pnpm/@deepseek-ai+dsh-agent@0.1.2-alpha.2_82401c175458b799db42b9e8f7dd7700/node_modules/@deepseek-ai/dsh-agent/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-agent@0.1.5-alpha.2_cfc1690176e5c008b05d52ad11161b75/node_modules/@deepseek-ai/dsh-agent/lib/index.js
 /**
 * Agent-scoped model selection shared by runtime entry points.
 * @module @deepseek-ai/dsh-agent/model-selection
 */
+function sameRoute(left, right) {
+	return left.provider === right.provider && left.model === right.model;
+}
+function routeLabel(route, other) {
+	return route.provider === other.provider ? route.model : `${route.provider}/${route.model}`;
+}
+function modelSwitchNotice(previous, selected) {
+	const from = routeLabel(previous, selected);
+	const to = routeLabel(selected, previous);
+	return createUserMessage({
+		content: [{
+			type: "text",
+			text: `[model changed: assistant turns above this point were generated by ${from}; the session continues with ${to}]`
+		}],
+		source: {
+			kind: "plugin",
+			plugin: "model-selection",
+			form: "notice",
+			summary: boundContextSummary(`${from} → ${to}`)
+		}
+	});
+}
 /**
 * Couple one mutable selection to Agent-scoped prompt assembly and request routing.
 * Prompt assembly snapshots the selected model before delegating, then applies
@@ -13668,9 +13853,15 @@ function toolAbortedBeforeDispatchResult(prior) {
 * surfaces. An absent selected effort clears any inherited effort, restoring
 * the selected model's provider/default behavior.
 *
+* A provider/model change appends a durable user-role notice to the next
+* admitted request. It compares the assembled selection with the latest
+* request header; effort-only changes and empty no-request decisions add no
+* notice. Failure before header persistence repeats the notice on the next
+* request.
+*
 * @param agentCtx - The selected Agent's scoped context.
 * @param selection - Mutable selection owned by the calling entry point.
-* @returns Disposer for both scoped waterfall listeners.
+* @returns Disposer for all scoped waterfall listeners.
 */
 function installModelSelection(agentCtx, selection) {
 	const disposeAssembly = agentCtx.on("system-prompt/assemble", async (_assembly, _context, next) => {
@@ -13699,9 +13890,22 @@ function installModelSelection(agentCtx, selection) {
 			...selected.reasoningEffort === void 0 ? {} : { reasoningEffort: selected.reasoningEffort }
 		};
 	});
+	const disposeNotice = agentCtx.on("agent/pre-step", async ({ agent, messages, signal, step }, next) => {
+		const decision = await next();
+		if (decision.kind === "reject" || signal.aborted) return decision;
+		if (decision.messages.length === 0 && (step === 1 || messages.length > 0)) return decision;
+		const selected = selection.assembled;
+		const previous = agent.session.requestHeader()?.config;
+		if (selected === void 0 || previous === void 0 || sameRoute(selected, previous)) return decision;
+		return {
+			...decision,
+			messages: [...decision.messages, modelSwitchNotice(previous, selected)]
+		};
+	}, { prepend: true });
 	return () => {
 		disposeAssembly();
 		disposeRequest();
+		disposeNotice();
 	};
 }
 //#endregion
@@ -14022,7 +14226,11 @@ function registerResume(env) {
 			}
 			let headers = [];
 			try {
-				headers = await env.ctx.sessionPersistence.list();
+				headers = (await env.ctx.sessionPersistence.list()).map((rec) => ({
+					id: rec.header.id,
+					...rec.header.cwd === void 0 ? {} : { cwd: rec.header.cwd },
+					createdAt: rec.header.createdAt
+				}));
 			} catch (error) {
 				throw new Error("session persistence unavailable: " + (error instanceof Error ? error.message : String(error)));
 			}
@@ -14185,7 +14393,7 @@ function registerSegments(env) {
 				events = sessionEvents(agent.session);
 				live = true;
 			} else try {
-				events = (await env.ctx.sessionPersistence.inspect(args.sessionId)).events;
+				events = (await inspectPersistedSession(env.ctx, args.sessionId)).events;
 				live = false;
 			} catch (error) {
 				throw new Error(String(error));
@@ -14279,7 +14487,7 @@ function registerRead(env) {
 			} else {
 				let inspection;
 				try {
-					inspection = await env.ctx.sessionPersistence.inspect(args.sessionId);
+					inspection = await inspectPersistedSession(env.ctx, args.sessionId);
 				} catch (error) {
 					throw new Error("cannot read session " + JSON.stringify(args.sessionId) + ": " + (error instanceof Error ? error.message : String(error)));
 				}
@@ -14403,7 +14611,8 @@ function registerFind(env) {
 			}
 			if (args.liveOnly !== true) try {
 				const persistence = env.ctx.sessionPersistence;
-				for (const header of await persistence.list()) {
+				for (const rec of await persistence.list()) {
+					const header = rec.header;
 					if (items.some((item) => item.sessionId === header.id)) continue;
 					items.push({
 						sessionId: header.id,
@@ -14439,13 +14648,12 @@ function registerFind(env) {
 			const wsFilter = typeof args.workspaceId === "string" ? args.workspaceId.trim() : "";
 			const cwdFilter = typeof args.cwd === "string" ? args.cwd.trim().toLowerCase() : "";
 			if (titleFilter !== "" || query !== "" && items.some((item) => !item.live)) {
-				const persistence = env.ctx.sessionPersistence;
 				let inspected = 0;
 				for (const item of items) {
 					if (inspected >= 30) break;
 					if (item.live || item.title !== void 0) continue;
 					try {
-						item.title = titleOf((await persistence.inspect(item.sessionId)).events);
+						item.title = titleOf((await inspectPersistedSession(env.ctx, item.sessionId)).events);
 						inspected += 1;
 					} catch {
 						inspected += 1;
@@ -14950,7 +15158,6 @@ function registerArchive(env) {
 		async execute(args) {
 			const items = env.ctx.workspaceRegistry.archivedSessionIds.map(String).map((id) => ({ sessionId: id }));
 			if (args.resolveTitles === true && items.length > 0) {
-				const persistence = env.ctx.sessionPersistence;
 				const registryTitles = /* @__PURE__ */ new Map();
 				try {
 					const records = await env.registry.all();
@@ -14962,7 +15169,7 @@ function registerArchive(env) {
 						continue;
 					}
 					try {
-						item.title = titleOf((await persistence.inspect(item.sessionId)).events);
+						item.title = titleOf((await inspectPersistedSession(env.ctx, item.sessionId)).events);
 					} catch {}
 				}
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-session-bridge",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "会话桥（dsh-session-bridge）：通过提示词创建新的主会话（顶层 UI 会话）、向任意会话发送消息、等待会话的下一条回复、读取会话消息，并按会话名或 id 跨工作区查找会话；此外支持监控/调度主任务与归档会话。",
   "private": false,
   "type": "module",
@@ -52,28 +52,28 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@deepseek-ai/dsh-agent": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-agent-presets": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-session": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-session-persistence": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-workspace": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
+    "@deepseek-ai/dsh-agent": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0",
+    "@deepseek-ai/dsh-agent-presets": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0",
+    "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0",
+    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0",
+    "@deepseek-ai/dsh-session": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0",
+    "@deepseek-ai/dsh-session-persistence": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0",
+    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0",
+    "@deepseek-ai/dsh-workspace": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0",
     "cordis": "^4.0.0-rc.7"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-agent": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-agent-presets": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-brand": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-scope": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-session": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-session-persistence": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-util-values": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-workspace": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
+    "@deepseek-ai/dsh-agent": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0",
+    "@deepseek-ai/dsh-agent-presets": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0",
+    "@deepseek-ai/dsh-brand": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0",
+    "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0",
+    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0",
+    "@deepseek-ai/dsh-scope": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0",
+    "@deepseek-ai/dsh-session": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0",
+    "@deepseek-ai/dsh-session-persistence": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0",
+    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0",
+    "@deepseek-ai/dsh-util-values": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0",
+    "@deepseek-ai/dsh-workspace": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0",
     "@types/node": "^24.0.0",
     "cordis": "^4.0.0-rc.7",
     "tsdown": "^0.22.14",

package/src/core.ts

@@ -21,7 +21,9 @@ export interface LiveAgentLike {
   whenIdle?(): Promise<void>
   readonly ctx: Context
   readonly inbox?: {
-    hasPending: boolean
+    // dsh 0.1.2 及之前：`hasPending` getter；dsh 0.1.5 起已删除，仅有
+    // nextTurn / nextStep 只读数组（Inbox 成为 driver 持有的接口）。
+    hasPending?: boolean
     nextTurn?: readonly unknown[]
     nextStep?: readonly unknown[]
   }
@@ -86,6 +88,34 @@ export function asEventList(events: unknown): readonly SessionEvent[] {
   return Array.isArray(events) ? events : []
 }
 
+/**
+ * 读取一个持久化（离线）会话的事件日志与头部元数据。兼容两代 persistence API：
+ * - 旧版：`sessionPersistence.inspect(id)` 直接返回 { events, meta }；
+ * - dsh 0.1.5 之后：`inspect` 已删除，改用 `open(id, 'read')` → `handle.read()`
+ *   （+ `handle.header`），读句柄不抢写所有权，读后必须 close()。
+ * 会话不存在时两个 API 都抛错，调用方按原语义处理。
+ */
+export async function inspectPersistedSession(ctx: Context, id: string): Promise<{ events: readonly SessionEvent[]; meta: { cwd?: string } }> {
+  const persistence = ctx.sessionPersistence as unknown as {
+    inspect?: (sid: string) => Promise<{ events: readonly SessionEvent[]; meta: { cwd?: string } }>
+    open?: (sid: string, access: 'read') => Promise<{
+      header: { cwd?: string }
+      read(): Promise<{ events: readonly SessionEvent[] }>
+      close(): Promise<void>
+    }>
+  }
+  if (typeof persistence.inspect === 'function') {
+    return await persistence.inspect(id)
+  }
+  const handle = await persistence.open!(id, 'read')
+  try {
+    const { events } = await handle.read()
+    return { events, meta: handle.header }
+  } finally {
+    await handle.close()
+  }
+}
+
 /** agent.followup / steer 接受的用户消息值。 */
 export function userMessage(text: string): unknown {
   return {
@@ -237,18 +267,20 @@ export interface CoTLiveSlice {
 }
 
 /**
- * 对一个 live 会话的事件日志折叠出其"实时思维链"：
- * - 优先聚合流式 assistant/chunk 事件里的 reasoning-delta（turn 中途即可见、增量，
- *   这正是监控思维链并按规则提前终止所需的粒度）；
- * - 同时聚合同窗口的 text-delta 增量；
- * - 若没有进行中的 chunk（会话空闲、或该 provider 不流式推理/无推理），返回 null，
- *   调用方应回落为 foldMessages 里的已定型 message.reasoning。
+ * 对一个 live 会话的事件日志折叠出其"最近推理/文本增量流"。兼容两代日志形状：
+ * - dsh 0.1.5 之后：turn 内不再发布独立 chunk 事件，流式增量内嵌在已定型
+ *   assistant/message（或未定型 assistant/attempt）事件的 `stream` 记录里
+ *   （reasoning-chunks / text-chunks 批量段 + 原始 chunk：reasoning-delta / text-delta）；
+ * - 0.1.2-rc 之前：独立的 assistant/chunk 事件（turn 中途即可见、增量，
+ *   这正是旧版监控思维链并按规则提前终止所需的粒度）。
+ * 两者兼读、取最新一份；无任何增量（会话空闲、或该 provider 不流式推理/无推理）
+ * 返回 null，调用方应回落为 foldMessages 里已定型的 message.reasoning。
  * 纯读、无副作用；事件形状不做任何假设，缺失/异常一律安全处理。
  */
 export function liveReasoningSnapshot(events: readonly SessionEvent[]): CoTLiveSlice | null {
   const list = asEventList(events)
-  // 只累积"最近一条已定型 assistant/message 之后"的流式增量（当前 in-flight 窗口），
-  // 避免把历史每一轮的思维链都拼接进来。turn/step 记录窗口内最近的 chunk 归属。
+  // 旧格式只累积"最近一条已定型 assistant/message 之后"的流式增量（in-flight 窗口）；
+  // 新格式的 stream 随定型事件落地，直接以最新携带 stream 的事件为准。
   let lastFinalizedSeq = -1
   let reasoning = ''
   let text = ''
@@ -258,11 +290,42 @@ export function liveReasoningSnapshot(events: readonly SessionEvent[]): CoTLiveS
   let step = 0
   let foundDelta = false
   for (const event of list) {
-    if (event.type === 'assistant/message') {
-      lastFinalizedSeq = event.seq
+    const type = event.type as string
+    if (type === 'assistant/message' || type === 'assistant/attempt') {
+      const data = event.data as { turn?: unknown; step?: unknown; stream?: unknown } | null | undefined
+      if (data !== null && data !== undefined && typeof data === 'object' && Array.isArray(data.stream)) {
+        let r = ''
+        let t = ''
+        for (const raw of data.stream as unknown[]) {
+          const record = raw as { type?: unknown; texts?: unknown; text?: unknown; chunk?: unknown } | null
+          if (record === null || typeof record !== 'object') continue
+          if (record.type === 'reasoning-chunks' && Array.isArray(record.texts)) {
+            for (const s of record.texts as unknown[]) if (typeof s === 'string') r += s
+          } else if (record.type === 'text-chunks' && Array.isArray(record.texts)) {
+            for (const s of record.texts as unknown[]) if (typeof s === 'string') t += s
+          } else if (record.type === 'chunk') {
+            const c = record.chunk as { type?: unknown; text?: unknown } | null
+            if (c !== null && typeof c === 'object' && typeof c.type === 'string' && typeof c.text === 'string') {
+              if (c.type === 'reasoning-delta') r += c.text
+              else if (c.type === 'text-delta') t += c.text
+            }
+          }
+        }
+        if (r !== '' || t !== '') {
+          if (typeof data.turn === 'number') turn = data.turn
+          if (typeof data.step === 'number') step = data.step
+          reasoning = r
+          text = t
+          seq = event.seq
+          time = event.time
+          foundDelta = true
+        }
+      }
+      if (type === 'assistant/message') lastFinalizedSeq = event.seq
       continue
     }
-    if (event.type !== 'assistant/chunk') continue
+    // 旧格式：独立 assistant/chunk 事件。
+    if (type !== 'assistant/chunk') continue
     if (event.seq <= lastFinalizedSeq) continue
     const data = event.data as { turn?: unknown; step?: unknown; chunk?: unknown } | null | undefined
     if (data === null || data === undefined || typeof data !== 'object') continue
@@ -559,7 +622,8 @@ export function statusSnapshot(ctx: Context, agent: LiveAgentLike): BridgeStatus
     lastTurn,
     lastActivityAt,
     stalledMs: lastActivityAt === null ? null : Date.now() - lastActivityAt,
-    pendingWork: inbox?.hasPending ?? false,
+    // 双兼容：0.1.2 用 hasPending getter；0.1.5 起只有 nextTurn/nextStep 数组。
+    pendingWork: inbox?.hasPending === true || (inbox?.nextTurn?.length ?? 0) + (inbox?.nextStep?.length ?? 0) > 0,
     nextTurnCount: inbox?.nextTurn?.length ?? 0,
     nextStepCount: inbox?.nextStep?.length ?? 0,
     ...(lastAssistantText === undefined ? {} : { lastAssistantText }),

package/src/tools.ts

@@ -7,7 +7,7 @@ import type { Context } from '@deepseek-ai/cordis'
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import type { JsonValue } from '@deepseek-ai/dsh-util-values'
 import type {} from '@deepseek-ai/dsh-agent-presets'
-import type { SessionEvent, SessionId } from '@deepseek-ai/dsh-session'
+import type { Session, SessionEvent, SessionId } from '@deepseek-ai/dsh-session'
 import * as agentApi from '@deepseek-ai/dsh-agent'
 import type {
   BridgeFindItem,
@@ -15,11 +15,11 @@ import type {
   BridgeStatusSnapshot,
   BridgeWaitResult,
   LiveAgentLike,
-  WaitForReplyOptions,
 } from './core.ts'
 import {
   attachSessionToWorkspace,
   foldMessages,
+  inspectPersistedSession,
   maxSeq,
   resolveTargetCwd,
   segmentsSince,
@@ -102,10 +102,10 @@ interface WaitArgs {
   timeoutMs?: number
 }
 
-async function maybeWait(env: BridgeEnv, session: { events: readonly SessionEvent[] }, baselineSeq: number, args: WaitArgs, signal: AbortSignal): Promise<ReturnType<typeof renderWait> | undefined> {
+async function maybeWait(env: BridgeEnv, session: Session, baselineSeq: number, args: WaitArgs, signal: AbortSignal): Promise<ReturnType<typeof renderWait> | undefined> {
   if (args.waitForReply !== true) return undefined
   const result = await waitForReply({
-    session: session as WaitForReplyOptions['session'],
+    session,
     baselineSeq,
     timeoutMs: clampTimeout(args.timeoutMs),
     signal,
@@ -354,8 +354,13 @@ function registerResume(env: BridgeEnv): void {
       }
       let headers: readonly { id: string; cwd?: string; createdAt: number }[] = []
       try {
-        const persistence = env.ctx.sessionPersistence as unknown as { list(): Promise<readonly { id: string; cwd?: string; createdAt: number }[]> }
-        headers = await persistence.list()
+        // dsh >= 0.1.5-alpha.1：list() 返回 { header, ... } 快照；映射回平铺字段。
+        const persistence = env.ctx.sessionPersistence as unknown as { list(): Promise<readonly { header: { id: string; cwd?: string; createdAt: number } }[]> }
+        headers = (await persistence.list()).map((rec) => ({
+          id: rec.header.id,
+          ...(rec.header.cwd === undefined ? {} : { cwd: rec.header.cwd }),
+          createdAt: rec.header.createdAt,
+        }))
       } catch (error) {
         throw new Error('session persistence unavailable: ' + (error instanceof Error ? error.message : String(error)))
       }
@@ -502,8 +507,7 @@ function registerSegments(env: BridgeEnv): void {
         live = true
       } else {
         try {
-          const persistence = env.ctx.sessionPersistence as unknown as { inspect(id: string): Promise<{ events: readonly SessionEvent[] }> }
-          const inspection = await persistence.inspect(args.sessionId)
+          const inspection = await inspectPersistedSession(env.ctx, args.sessionId)
           events = inspection.events
           live = false
         } catch (error) {
@@ -580,8 +584,7 @@ function registerRead(env: BridgeEnv): void {
       } else {
         let inspection: { events: readonly SessionEvent[]; meta: { cwd?: string } }
         try {
-          const persistence = env.ctx.sessionPersistence as unknown as { inspect(id: string): Promise<{ events: readonly SessionEvent[]; meta: { cwd?: string } }> }
-          inspection = await persistence.inspect(args.sessionId)
+          inspection = await inspectPersistedSession(env.ctx, args.sessionId)
         } catch (error) {
           throw new Error('cannot read session ' + JSON.stringify(args.sessionId) + ': ' + (error instanceof Error ? error.message : String(error)))
         }
@@ -685,8 +688,11 @@ function registerFind(env: BridgeEnv): void {
       }
       if (args.liveOnly !== true) {
         try {
-          const persistence = env.ctx.sessionPersistence as unknown as { list(): Promise<readonly { id: string; cwd?: string; parentSession?: string; origin?: 'subagent'; createdAt: number; agentPreset?: string }[]> }
-          for (const header of await persistence.list()) {
+          // dsh >= 0.1.5-alpha.1：list() 返回 { header: SessionHeader, revision, ... } 快照，
+          // 不再平铺 id/cwd；旧版直接返回 header 平铺字段。两者都按新形状读，向下兼容。
+          const persistence = env.ctx.sessionPersistence as unknown as { list(): Promise<readonly { header: { id: string; cwd?: string; parentSession?: string; origin?: 'subagent'; createdAt: number; agentPreset?: string } }[]> }
+          for (const rec of await persistence.list()) {
+            const header = rec.header
             if (items.some((item) => item.sessionId === header.id)) continue
             items.push({
               sessionId: header.id,
@@ -720,13 +726,12 @@ function registerFind(env: BridgeEnv): void {
       const cwdFilter = typeof args.cwd === 'string' ? args.cwd.trim().toLowerCase() : ''
       const needsOfflineTitle = titleFilter !== '' || (query !== '' && items.some((item) => !item.live))
       if (needsOfflineTitle) {
-        const persistence = env.ctx.sessionPersistence as unknown as { inspect(id: string): Promise<{ events: readonly SessionEvent[] }> }
         let inspected = 0
         for (const item of items) {
           if (inspected >= 30) break
           if (item.live || item.title !== undefined) continue
           try {
-            const inspection = await persistence.inspect(item.sessionId)
+            const inspection = await inspectPersistedSession(env.ctx, item.sessionId)
             item.title = titleOf(inspection.events)
             inspected += 1
           } catch {
@@ -1118,7 +1123,6 @@ function registerArchive(env: BridgeEnv): void {
       const archived = env.ctx.workspaceRegistry.archivedSessionIds.map(String)
       const items: Array<{ sessionId: string; title?: string }> = archived.map((id) => ({ sessionId: id }))
       if (args.resolveTitles === true && items.length > 0) {
-        const persistence = env.ctx.sessionPersistence as unknown as { inspect(id: string): Promise<{ events: readonly SessionEvent[] }> }
         const registryTitles = new Map<string, string>()
         try {
           const records = await env.registry.all()
@@ -1130,7 +1134,7 @@ function registerArchive(env: BridgeEnv): void {
             continue
           }
           try {
-            const inspection = await persistence.inspect(item.sessionId)
+            const inspection = await inspectPersistedSession(env.ctx, item.sessionId)
             item.title = titleOf(inspection.events)
           } catch { /* offline title unavailable */ }
         }