dsh-session-bridge 0.3.2-alpha.1 → 0.3.2-alpha.3

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.6-alpha.1_@deepseek-ai+cordis@4.0.2/node_modules/@deepseek-ai/dsh-home-paths/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-home-paths@0.1.6-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.6-alpha.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.6-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.6-alpha.1_@deepseek-ai+cordis@4.0.2/node_modules/@deepseek-ai/dsh-util-values/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-util-values@0.1.6-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.6-alpha.1_@deepseek-ai+cordis@4.0.2/node_modules/@deepseek-ai/dsh-util-crypto/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-util-crypto@0.1.6-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,7 +2570,7 @@ 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.6-alpha.1_@deepseek-ai+cordis@4.0.2/node_modules/@deepseek-ai/dsh-brand/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-brand@0.1.6-alpha.2_@deepseek-ai+cordis@4.0.2/node_modules/@deepseek-ai/dsh-brand/lib/index.js
 /**
 * Duplicate-install-safe nominal primitive helpers.
 *
@@ -3187,11 +3187,11 @@ defineMethod("transform", [
 	"preserve"
 ], ({ inner }, isInner) => inner.toString(isInner));
 //#endregion
-//#region node_modules/.pnpm/@deepseek-ai+dsh-timeout@0.1.6-alpha.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.6-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.6-alpha.1_@deepseek-ai+cordis@4.0.2/node_modules/@deepseek-ai/dsh-llm/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-llm@0.1.6-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.
@@ -3957,7 +3957,8 @@ var LlmError = class extends HarnessError {
 					id: model.id,
 					...model.name === void 0 ? {} : { name: model.name },
 					...model.contextWindow === void 0 ? {} : { contextWindow: model.contextWindow },
-					...model.maxTokens === void 0 ? {} : { maxTokens: model.maxTokens }
+					...model.maxTokens === void 0 ? {} : { maxTokens: model.maxTokens },
+					...model.inputModalities === void 0 ? {} : { inputModalities: [...model.inputModalities] }
 				});
 			}
 			return models;
@@ -9080,7 +9081,7 @@ function superRefine(fn, params) {
 	return /* @__PURE__ */ _superRefine(fn, params);
 }
 //#endregion
-//#region node_modules/.pnpm/@deepseek-ai+dsh-storage@0.1.6-alpha.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.6-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.
@@ -9091,7 +9092,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.6-alpha.1_@deepseek-ai+cordis@4.0.2_@deepseek-ai+ds_404bb44176e435660710548cd6a4e0aa/node_modules/@deepseek-ai/dsh-storage-domain/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-storage-domain@0.1.6-alpha.2_@deepseek-ai+cordis@4.0.2_@deepseek-ai+ds_5fa439225de576bdb2338dd42cd57e82/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
@@ -9214,11 +9215,19 @@ Service.init;
 */
 /**
 * 兼容读取不同 dsh-session 版本上的会话事件：
-* - 旧版 `Session` 暴露 `get events(): readonly SessionEvent[]`；
-* - 新版（如宿主实际运行的 0.1.2-rc.x）将 `get events` 改为
-*   `snapshotEvents(fromSeq?, toSeqExclusive?)` 方法——`.events` 直接读取会
-*   得到 `undefined`，对 for...of 迭代即抛 `events is not iterable`。
+* - 旧版 \`Session\` 暴露 \`get events(): readonly SessionEvent[]\`；
+* - 新版将 \`get events\` 改为 \`snapshotEvents(fromSeq?, toSeqExclusive?)\` 方法——
+*   \`.events\` 直接读取会得到 \`undefined\`，对 for...of 迭代即抛
+*   \`events is not iterable\`。
 * 两者都读不到（或 session 不存在）时回退为空数组，绝不抛迭代错误。
+*
+* 注意：dsh 0.1.6-alpha.1 起 \`snapshotEvents()\`（连同 \`eventAt()\` /
+* \`ownEvents()\`）已标记 @deprecated —— 官方策略是"现有逻辑可暂不迁移，但禁止
+* 新增调用"；其替代不是同步读，而是（a）恢复后读取 Session 投影/派生状态，或
+* （b）按需异步分页读取历史窗口（见 dsh 决策
+* 2026-09-09-deprecate-synchronous-session-event-reads）。本函数的调用方
+* （foldMessages / segmentsSince / wait 基线）仍依赖完整同步快照，故按该决定暂缓
+* 迁移；将来官方补齐分页读后，只需改造这一个入口。
 */
 function sessionEvents(session) {
 	const s = session;
@@ -9526,8 +9535,11 @@ function sleep(ms) {
 * 因此默认不再用 turn/end 作门控；需要完整收尾语义时用 requireTurnEnd:true 显式开启，
 * 此时才会等到其后出现 turn/end。
 *
-* 返回时 message 为"最新的带文本 assistant 行"，否则为最新 assistant 行（可能无文本，
-* 如纯工具调用中间态）；超时/中止返回已收集内容。
+* 返回的 message：默认是 baseline 之后最新的一条**带文本** assistant 行；整个等待
+* 窗口内没有等到新文本回复时，回落为 baseline 及之前最新的一条带文本回复并置
+* stale:true（绝不把更晚的无文本中间行当回复返回 —— 那正是渲染层打印 "(no text)"
+* 的来源）。segment 模式同理：新段落优先，否则回落既有段落。
+* 超时/中止返回已收集内容；timedOut 表示"本次等待要求的输出未在预算内出现"。
 */
 async function waitForReply(opts) {
 	const started = Date.now();
@@ -9564,7 +9576,25 @@ async function waitForReply(opts) {
 		if (Date.now() >= deadline) break;
 		await sleep(100);
 	}
-	let message = waitForSegment && segment !== null ? {
+	const observedNew = waitForSegment ? segment !== null : textReply !== null;
+	const sawNewRow = latest !== null;
+	let stale = false;
+	if (waitForSegment) {
+		if (segment === null) {
+			const prev = lastSegmentUpTo(sessionEvents(opts.session), opts.baselineSeq);
+			if (prev !== null) {
+				segment = prev;
+				stale = true;
+			}
+		}
+	} else if (textReply === null) {
+		const prev = lastTextRowUpTo(foldMessages(sessionEvents(opts.session)), opts.baselineSeq);
+		if (prev !== null) {
+			textReply = prev;
+			stale = true;
+		}
+	}
+	const message = waitForSegment && segment !== null ? {
 		seq: segment.seq,
 		time: segment.time,
 		role: "assistant",
@@ -9572,16 +9602,34 @@ async function waitForReply(opts) {
 		...segment.text !== void 0 ? { text: segment.text } : {},
 		...segment.reasoning !== void 0 ? { reasoning: segment.reasoning } : {},
 		...segment.toolCalls.length > 0 ? { toolCalls: segment.toolCalls } : {}
-	} : textReply ?? latest;
+	} : textReply;
 	return {
 		message,
 		seq: message === null ? opts.baselineSeq : message.seq,
 		turnEnded,
-		timedOut: requireTurnEnd ? latest !== null && !turnEnded : waitForSegment ? segment === null : textReply === null,
+		timedOut: requireTurnEnd ? !(sawNewRow && turnEnded) : !observedNew,
+		stale,
 		aborted: opts.signal !== void 0 && opts.signal.aborted,
 		waitedMs: Date.now() - started
 	};
 }
+/** seq 及之前最新一个已完成输出段落（wait 零新输出时回落既有段落）。 */
+function lastSegmentUpTo(events, seq) {
+	const segs = segmentsSince(events);
+	for (let i = segs.length - 1; i >= 0; i -= 1) {
+		const seg = segs[i];
+		if (seg !== void 0 && seg.seq <= seq) return seg;
+	}
+	return null;
+}
+/** seq 及之前最新一条带文本的 assistant 行（wait 零新文本回复时回落既有回复）。 */
+function lastTextRowUpTo(rows, seq) {
+	for (let i = rows.length - 1; i >= 0; i -= 1) {
+		const row = rows[i];
+		if (row !== void 0 && row.role === "assistant" && row.text !== void 0 && row.seq <= seq) return row;
+	}
+	return null;
+}
 /**
 * 解析目标工作目录：workspaceId（注册表）> cwd（绝对路径/任意拼写）> 调用者会话 cwd。
 * 跨工作区由 workspaceId / cwd 任意指定实现。
@@ -9633,6 +9681,14 @@ async function attachSessionToWorkspace(ctx, sessionId, cwd) {
 	return workspace.id;
 }
 /**
+* 卡住判定（唯一真源，status 渲染与监控 watchdog 共用）：只有 **running** 会话才可能
+* "卡住" —— 空闲/已收尾的会话没有进展是正常状态，不能报 stall。阈值语义为"超过"
+* （严格大于），与工具描述/README 的 "more than stalledMs" 一致。
+*/
+function isStalled(running, stalledMs, thresholdMs) {
+	return running === "running" && stalledMs !== null && stalledMs > thresholdMs;
+}
+/**
 * 计算一个 live 会话的监控快照（agent 状态 + 事件折叠出的进度/卡住事实）。
 * 纯读，无副作用。用于 `session_bridge_status`。
 */
@@ -9852,7 +9908,7 @@ var SessionMonitor = class {
 			this.stopWithLog(sessionId);
 			return;
 		}
-		if (snapshot.running === "running" && snapshot.stalledMs !== null && snapshot.stalledMs > (entry.config.stalledMs ?? 6e4)) {
+		if (isStalled(snapshot.running, snapshot.stalledMs, entry.config.stalledMs ?? 6e4)) {
 			entry.stuckCount += 1;
 			entry.lastActionAt = Date.now();
 			if (this.shouldCancel(entry)) {
@@ -10041,7 +10097,7 @@ var SessionMonitor = class {
 	}
 };
 //#endregion
-//#region node_modules/.pnpm/@deepseek-ai+dsh-scope@0.1.6-alpha.1_@deepseek-ai+cordis@4.0.2_@deepseek-ai+dsh-invaria_eaf7046112a9b60866fe7f69bc8f6f64/node_modules/@deepseek-ai/dsh-scope/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-scope@0.1.6-alpha.2_@deepseek-ai+cordis@4.0.2_@deepseek-ai+dsh-invaria_8802cbeca2a66ef97a5b4e663664f4cd/node_modules/@deepseek-ai/dsh-scope/lib/index.js
 /**
 * Shared insertion-ordered storage and effect ownership for scope-aware registries.
 *
@@ -10320,7 +10376,7 @@ function scopeTarget(base, key) {
 	return carrier;
 }
 //#endregion
-//#region node_modules/.pnpm/@deepseek-ai+dsh-sandbox@0.1.6-alpha.1_@deepseek-ai+cordis@4.0.2_@deepseek-ai+dsh-llm@0_1d3a97f96d2766469566ca2b01247bfa/node_modules/@deepseek-ai/dsh-sandbox/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-sandbox@0.1.6-alpha.2_@deepseek-ai+cordis@4.0.2_@deepseek-ai+dsh-llm@0_5328c6913d63e98a7878ca36cab93ca2/node_modules/@deepseek-ai/dsh-sandbox/lib/index.js
 /**
 * The escalation vocabulary and choreography shared by every sandbox-enforcing
 * tool family (`@deepseek-ai/dsh-tool-bash`, `@deepseek-ai/dsh-tool-fs`): the
@@ -10371,21 +10427,18 @@ function validateEscalationArgs(sandboxPermissions, justification) {
 	if (justification !== void 0 && justification.trim().length === 0) throw new Error("invalid justification: expected a non-empty sentence");
 }
 /**
-* Resolve a sandbox-escalation request BEFORE anything executes: check strict
-* widening against the call's effective mode, then resolve the approval
-* channel, then map every outcome — the ordered fail-closed sequence both
-* enforcing families share. Returns the granted mode to stamp onto exactly
-* this call; throws the distinct verbatim text for every other path (a
-* non-widening request, a missing approval service, an agent-less execution,
-* a rejection, a cancellation, an unanswerable ask) — the tool registry turns
-* the throw into the call's isError result, and nothing has run. A
-* non-widening request never prompts a human.
+* Resolve a sandbox permission request before execution. Repeating the call's
+* effective mode returns it without approval. A strictly wider mode requires
+* approval and applies only to this call. Narrower or unsupported targets,
+* missing approval services or agents for widening, and non-grant outcomes
+* throw before execution.
 * @param request - the escalation to judge (see {@link EscalationRequest}).
 * @param approval - the approval ingredients the tool holds (see {@link EscalationApproval}).
 * @returns the granted mode, consumed by the one call that asked.
 */
 async function approveEscalation(request, approval) {
 	const { requestedMode: mode, effectiveMode, justification, subject } = request;
+	if (mode === effectiveMode) return effectiveMode;
 	if (!(WIDER_MODES[effectiveMode] ?? []).includes(mode)) throw new Error(`sandbox escalation to "${mode}" is not strictly wider than this call's current "${effectiveMode}" mode`);
 	if (approval.approver === void 0) throw new Error(`sandbox escalation to "${mode}" requires approval, but no approval service is composed`);
 	if (approval.agent === void 0) throw new Error(`sandbox escalation to "${mode}" requires approval, but the call has no agent to route it through`);
@@ -10405,7 +10458,7 @@ async function approveEscalation(request, approval) {
 	}
 }
 //#endregion
-//#region node_modules/.pnpm/@deepseek-ai+dsh-tools@0.1.6-alpha.1_e89197212305e1b19bd6df05221bc44b/node_modules/@deepseek-ai/dsh-tools/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-tools@0.1.6-alpha.2_e8d664b8446198a3dac4043bd11091d7/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
@@ -14018,7 +14071,7 @@ function toolAbortedBeforeDispatchResult(prior) {
 	};
 }
 //#endregion
-//#region node_modules/.pnpm/@deepseek-ai+dsh-agent@0.1.6-alpha.1_ce40d13c69e7e1ce48818baba37665e1/node_modules/@deepseek-ai/dsh-agent/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+dsh-agent@0.1.6-alpha.2_44110910133b3cc261ea9dfdcaed39ee/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
@@ -14135,6 +14188,14 @@ function liveAgent(env, sessionId) {
 function liveAgents(env) {
 	return env.ctx.agents.list();
 }
+/** 等待结果里的状态附注行（wait / send / create 三处渲染共用）。 */
+function waitNotes(reply) {
+	const notes = [];
+	if (reply.timedOut === true) notes.push("[wait timed out]");
+	if (reply.stale === true) notes.push("[stale] pre-existing reply — nothing new arrived during the wait");
+	if (reply.aborted === true) notes.push("[wait aborted]");
+	return notes;
+}
 /** 渲染等待结果为 JSON 友好值。 */
 function renderWait(wait) {
 	const row = wait.message;
@@ -14150,6 +14211,7 @@ function renderWait(wait) {
 		seq: wait.seq,
 		turnEnded: wait.turnEnded,
 		timedOut: wait.timedOut,
+		...wait.stale === true ? { stale: true } : {},
 		aborted: wait.aborted,
 		waitedMs: wait.waitedMs
 	};
@@ -14221,9 +14283,10 @@ function registerCreate(env) {
 				if (typeof v.cwd === "string") lines.push(`cwd: ${v.cwd}`);
 				if (typeof v.title === "string") lines.push(`title: ${v.title}`);
 				const reply = v.reply;
+				if (typeof v.sinceSeq === "number") lines.push(`sinceSeq: ${String(v.sinceSeq)} (pass to session_bridge_wait)`);
 				if (reply !== void 0) {
 					lines.push(`reply: ${String(reply.message?.text ?? "(no text)")}`);
-					if (reply.timedOut === true) lines.push("[wait timed out]");
+					lines.push(...waitNotes(reply));
 				}
 				return [{
 					type: "text",
@@ -14290,8 +14353,10 @@ function registerCreate(env) {
 				source: "create"
 			});
 			let reply;
+			let createBaseline;
 			if (typeof args.prompt === "string" && args.prompt.trim() !== "") {
 				const baseline = maxSeq(sessionEvents(agent.session));
+				createBaseline = baseline;
 				agent.followup(userMessage(args.prompt.trim()));
 				env.registry.touch(sessionId);
 				if (args.waitForReply === true) reply = await maybeWait(env, agent.session, baseline, args, exec.signal);
@@ -14301,6 +14366,7 @@ function registerCreate(env) {
 				cwd: targetCwd,
 				...workspaceId === void 0 ? {} : { workspaceId },
 				...typeof args.title === "string" && args.title.trim() !== "" ? { title: args.title.trim() } : {},
+				...reply === void 0 && createBaseline !== void 0 ? { sinceSeq: createBaseline } : {},
 				...reply === void 0 ? {} : { reply }
 			});
 		}
@@ -14344,9 +14410,10 @@ function registerSend(env) {
 				const v = value;
 				const reply = v.reply;
 				const lines = ["sent to " + String(v.sessionId)];
+				if (typeof v.sinceSeq === "number") lines.push("sinceSeq: " + String(v.sinceSeq) + " (pass to session_bridge_wait)");
 				if (reply !== null && reply !== void 0) {
 					lines.push("reply: " + String(reply.message?.text ?? "(no text)"));
-					if (reply.timedOut === true) lines.push("[wait timed out]");
+					lines.push(...waitNotes(reply));
 				}
 				return [{
 					type: "text",
@@ -14372,7 +14439,7 @@ function registerSend(env) {
 			return asJson({
 				accepted: true,
 				sessionId: args.sessionId,
-				...reply === void 0 ? {} : { reply }
+				...reply === void 0 ? { sinceSeq: baseline } : { reply }
 			});
 		}
 	}));
@@ -14467,7 +14534,7 @@ function registerResume(env) {
 function registerWait(env) {
 	env.ctx.tools.register(defineTool({
 		name: "session_bridge_wait",
-		description: "Wait for a session next assistant output: blocks (polling the session log) until a NEW assistant output appears after sinceSeq (default: the latest seq at call time). waitFor=reply returns as soon as a new assistant TEXT reply is readable; waitFor=segment returns as soon as any new COMPLETED output segment appears (an assistant/message step — text, reasoning, or tool-call turn), i.e. it does NOT wait for the whole turn, so you can observe the chain-of-thought/output paragraph by paragraph as it is produced. Returns the output summary, or timedOut/aborted when the deadline or caller cancellation ends the wait. Use it to consume output produced asynchronously by another session (e.g. a session you sent a message to, or one working on its own).",
+		description: "Wait for a session next assistant output: blocks (polling the session log) until a NEW assistant output appears after sinceSeq (default: the latest seq at call time). waitFor=reply returns as soon as a new assistant TEXT reply is readable; waitFor=segment returns as soon as any new COMPLETED output segment appears (an assistant/message step — text, reasoning, or tool-call turn), i.e. it does NOT wait for the whole turn, so you can observe the chain-of-thought/output paragraph by paragraph as it is produced. If no new output arrives within the budget, the latest PRE-EXISTING reply/segment is returned with stale=true (so an already-landed reply is never lost as \"(no text)\"). Returns the output summary, or timedOut/aborted when the deadline or caller cancellation ends the wait. Use it to consume output produced asynchronously by another session (e.g. a session you sent a message to, or one working on its own); to read a reply that may already exist, pass the sinceSeq anchor returned by send/create.",
 		parameters: {
 			sessionId: {
 				type: "string",
@@ -14476,7 +14543,7 @@ function registerWait(env) {
 			},
 			sinceSeq: {
 				type: "number",
-				description: "Only replies after this event seq count (default: latest seq at call time)."
+				description: "Only replies after this event seq count (default: latest seq at call time; -1 = count every event, the anchor returned by create for a brand-new session)."
 			},
 			timeoutMs: {
 				type: "number",
@@ -14504,10 +14571,9 @@ function registerWait(env) {
 					text: "no reply observed"
 				}];
 				const message = reply.message;
-				const lines = ["reply seq " + String(reply.seq) + ": " + String(message === null ? "(no text)" : message.text ?? "(no text)")];
+				const lines = [message === null ? "no new reply within " + String(reply.waitedMs ?? "?") + "ms (no assistant text in this session)" : "reply seq " + String(reply.seq) + ": " + String(message.text ?? "(no text)")];
 				if (typeof reply.turnEnded === "boolean") lines.push("turnEnded: " + String(reply.turnEnded));
-				if (reply.timedOut === true) lines.push("[wait timed out]");
-				if (reply.aborted === true) lines.push("[wait aborted]");
+				lines.push(...waitNotes(reply));
 				return [{
 					type: "text",
 					text: lines.join("\n")
@@ -14518,28 +14584,19 @@ function registerWait(env) {
 			if (typeof args.sessionId !== "string" || args.sessionId.trim() === "") throw new Error("invalid sessionId: expected a non-empty string");
 			const agent = liveAgent(env, args.sessionId);
 			if (agent === void 0) throw new Error("session " + JSON.stringify(args.sessionId) + " is not live — call session_bridge_resume first (waiting requires a live session)");
-			const waitSegment = args.waitFor === "segment";
-			let baseline;
-			if (typeof args.sinceSeq === "number" && Number.isInteger(args.sinceSeq) && args.sinceSeq >= 0) baseline = args.sinceSeq;
-			else if (waitSegment) {
-				const segs = segmentsSince(sessionEvents(agent.session));
-				baseline = segs.length === 0 ? -1 : segs[segs.length - 1]?.seq ?? -1;
-			} else {
-				let lastText = -1;
-				for (const row of foldMessages(sessionEvents(agent.session))) if (row.text !== void 0) lastText = row.seq;
-				baseline = lastText;
-			}
+			const baseline = typeof args.sinceSeq === "number" && Number.isInteger(args.sinceSeq) && args.sinceSeq >= -1 ? args.sinceSeq : maxSeq(sessionEvents(agent.session));
 			const result = await waitForReply({
 				session: agent.session,
 				baselineSeq: baseline,
 				timeoutMs: clampTimeout(args.timeoutMs),
 				signal: exec.signal,
 				requireTurnEnd: args.requireTurnEnd === true,
-				...waitSegment ? { waitForSegment: true } : {}
+				...args.waitFor === "segment" ? { waitForSegment: true } : {}
 			});
 			env.registry.touch(args.sessionId);
 			return asJson({
 				sessionId: args.sessionId,
+				sinceSeq: baseline,
 				reply: renderWait(result),
 				running: agent.status === "running"
 			});
@@ -15145,7 +15202,11 @@ function pruneReasoning(snapshot, mode) {
 	else delete rest.lastReasoning;
 	return rest;
 }
-/** 渲染监控快照为一行摘要：运行态 + openTurn + 卡住/待处理 + 最新回复(+ 思维链预览)。 */
+/**
+* 渲染监控快照为一行摘要：运行态 + openTurn + 卡住/待处理 + 最新回复(+ 思维链预览)。
+* 卡住判定走 core.isStalled（唯一真源）：只有 running 会话才可能被标 [STALLED] ——
+* 空闲/已收尾的会话"很久没事件"是正常状态，不是卡住（与监控 watchdog 一致）。
+*/
 function renderStatus(snapshot, stalledMsThreshold) {
 	const lines = [];
 	const runLabel = snapshot.running === "running" ? "running" : "idle";
@@ -15153,7 +15214,7 @@ function renderStatus(snapshot, stalledMsThreshold) {
 	if (snapshot.openTurn) lines.push(`openTurn: yes (turn #${snapshot.lastTurn})`);
 	else lines.push(`openTurn: no (last turn #${snapshot.lastTurn})`);
 	if (snapshot.stalledMs !== null) {
-		const stalled = snapshot.stalledMs >= stalledMsThreshold;
+		const stalled = isStalled(snapshot.running, snapshot.stalledMs, stalledMsThreshold);
 		lines.push(`lastActivity: now-${snapshot.stalledMs}ms${stalled ? " [STALLED]" : ""}`);
 	}
 	if (snapshot.pendingWork) lines.push(`pendingWork: ${snapshot.nextTurnCount} turn + ${snapshot.nextStepCount} step`);
@@ -15167,7 +15228,7 @@ function renderStatus(snapshot, stalledMsThreshold) {
 function registerStatus(env) {
 	env.ctx.tools.register(defineTool({
 		name: "session_bridge_status",
-		description: "Inspect a session's live progress for monitoring/scheduling. Returns running/idle, whether a turn is open, last turn number, time since the last event (for stall detection), pending queued work, and the latest text reply. It also surfaces the session's chain-of-thought: lastReasoning is the most recent finalized reasoning block, liveReasoning is the in-flight reasoning streamed for the current handled turn (reasoning-delta), and reasoningTail is a compact merged preview. reasoning=none drops all three to keep tokens small. When stalledMsThreshold is given, marks the session as stalled when the time since the last event exceeds it. Pass sessionId of a live session (use session_bridge_find to locate; session_bridge_resume to bring an offline one online). Use this as the \"observe\" step of a monitor→decide→steer/cancel loop.",
+		description: "Inspect a session's live progress for monitoring/scheduling. Returns running/idle, whether a turn is open, last turn number, time since the last event (for stall detection), pending queued work, and the latest text reply. It also surfaces the session's chain-of-thought: lastReasoning is the most recent finalized reasoning block, liveReasoning is the in-flight reasoning streamed for the current handled turn (reasoning-delta), and reasoningTail is a compact merged preview. reasoning=none drops all three to keep tokens small. When stalledMsThreshold is given, marks a RUNNING session as stalled once the time since the last event exceeds it (idle sessions are never flagged — a quiet finished session is not stuck). Pass sessionId of a live session (use session_bridge_find to locate; session_bridge_resume to bring an offline one online). Use this as the \"observe\" step of a monitor→decide→steer/cancel loop.",
 		parameters: {
 			sessionId: {
 				type: "string",
@@ -15176,7 +15237,7 @@ function registerStatus(env) {
 			},
 			stalledMsThreshold: {
 				type: "number",
-				description: "Mark the session STALLED when time since the last event exceeds this many ms (default 60000)."
+				description: "Mark a RUNNING session STALLED when time since the last event exceeds this many ms (default 60000); idle sessions are never marked."
 			},
 			recent: {
 				type: "number",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-session-bridge",
-  "version": "0.3.2-alpha.1",
+  "version": "0.3.2-alpha.3",
   "description": "会话桥（dsh-session-bridge）：通过提示词创建新的主会话（顶层 UI 会话）、向任意会话发送消息、等待会话的下一条回复、读取会话消息，并按会话名或 id 跨工作区查找会话；此外支持监控/调度主任务与归档会话。",
   "private": false,
   "type": "module",
@@ -83,6 +83,7 @@
     "build": "bash scripts/build.sh",
     "build:client": "tsdown",
     "check:compat": "node scripts/check-dsh-compat.mjs",
+    "test": "node --experimental-strip-types scripts/test-bridge-core.mjs",
     "typecheck": "tsc -p tsconfig.json --noEmit"
   }
 }

package/scripts/check-dsh-compat.mjs

@@ -79,6 +79,13 @@ function resolveScopeDir(argv) {
     }
   } catch { /* dsh not on PATH; the other anchors decide */ }
 
+  // Anchor 3 (last resort): this repository's own install. CI pins the
+  // @deepseek-ai packages through pnpm overrides and installs no DSH app, so
+  // the scope only exists here; probing it keeps check:compat runnable in CI.
+  // A developer machine resolves one of the anchors above first, so the
+  // *running* harness keeps priority there.
+  candidates.push(join(ROOT, 'node_modules', '@deepseek-ai'))
+
   for (const candidate of candidates) if (isScopeDir(candidate)) return candidate
   return undefined
 }
@@ -115,9 +122,57 @@ function dshVersionOf(scopeDir) {
     const manifest = readJson(candidate)
     if (manifest?.name === '@deepseek-ai/dsh' && typeof manifest.version === 'string') return manifest.version
   }
+  // Repo-local install (CI overrides): there is no `dsh` app package, but the
+  // release versions every dsh-* package together, so any of them names the
+  // harness version the types and the bundle were resolved from.
+  for (const pkg of ['dsh-tools', 'dsh-session', 'dsh-agent']) {
+    const manifest = readJson(join(scopeDir, pkg, 'package.json'))
+    if (typeof manifest?.version === 'string') return manifest.version
+  }
   return undefined
 }
 
+/**
+ * Inspect the built tsdown bundle's source map for the DSH version it INLINED.
+ *
+ * `check:compat` type-checks src/ against the installed harness, but src/ is not
+ * what loads: lib/index.js is a self-contained bundle that inlines every
+ * @deepseek-ai/* import. A stale checkout therefore type-checks green while the
+ * artifact ships old DSH code (observed: checkout 0.1.5-alpha.2 / host
+ * 0.1.6-alpha.2). This reads the map's sources — a checkout path names the root
+ * whose package.json carries the version; a .pnpm path encodes it.
+ *
+ * @returns { versions: Set<string>, roots: Set<string> } or undefined when no map exists.
+ */
+function artifactProvenance() {
+  const mapPath = join(ROOT, 'lib', 'index.js.map')
+  if (!existsSync(mapPath)) return undefined
+  let map
+  try { map = JSON.parse(readFileSync(mapPath, 'utf8')) } catch { return undefined }
+  const versions = new Set()
+  const roots = new Set()
+  for (const source of Array.isArray(map.sources) ? map.sources : []) {
+    if (typeof source !== 'string') continue
+    // Source checkout: <root>/packages/... or <root>/vendor/... (relative to the map in lib/).
+    const checkout = source.match(/^(.*?)[/\\](?:packages|vendor)[/\\]/)
+    if (checkout !== null) { roots.add(resolve(ROOT, 'lib', checkout[1])); continue }
+    // Registry install: .../.pnpm/@deepseek-ai+dsh-<name>@<version>[_hash]/node_modules/...
+    // Only dsh-* packages name the harness release; sibling @deepseek-ai
+    // packages (cordis, schemastery) are versioned independently, so counting
+    // them would make every CI build look like a provenance mismatch.
+    const registry = source.match(/[\\/]\.pnpm[\\/]@deepseek-ai\+dsh-[a-z0-9-]+@([^\\/]+)[\\/]node_modules/)
+    if (registry !== null) {
+      const version = registry[1].replace(/_.*$/, '')
+      if (/^\d/.test(version)) versions.add(version)
+    }
+  }
+  for (const root of roots) {
+    const manifest = readJson(join(root, 'package.json'))
+    if (typeof manifest?.version === 'string') versions.add(manifest.version)
+  }
+  return { versions, roots }
+}
+
 const dshVersion = dshVersionOf(scope) ?? '(unknown)'
 
 // Every DSH package src/ imports, plus the plain `cordis` specifier that
@@ -170,4 +225,18 @@ if (failure !== undefined) {
   const status = typeof failure.status === 'number' ? ' (tsc exit ' + failure.status + ')' : ''
   fail('src/ does NOT type-check against installed dsh ' + dshVersion + status + ' — this is a real incompatibility with the running harness.')
 }
-console.log('check-dsh-compat: OK — src/ type-checks against installed dsh ' + dshVersion)
+console.log('check-dsh-compat: OK — src/ type-checks against installed dsh ' + dshVersion)
+
+const provenance = artifactProvenance()
+if (provenance === undefined) {
+  console.log('check-dsh-compat: no lib/index.js.map — skipping bundle provenance check (run pnpm build:client to enable it)')
+} else if (provenance.versions.size === 0) {
+  console.log('check-dsh-compat: bundle provenance not resolvable from the source map — skipped')
+} else {
+  const inlined = [...provenance.versions].sort().join(', ')
+  console.log('check-dsh-compat: lib/index.js inlined DSH ' + inlined + ' (from ' + provenance.roots.size + ' checkout(s) / registry entries)')
+  if (dshVersion !== '(unknown)' && !(provenance.versions.size === 1 && provenance.versions.has(dshVersion))) {
+    fail('the built lib/index.js inlines DSH ' + inlined + ' but the installed harness is ' + dshVersion
+      + ' — rebuild the bundle against the running harness (a stale checkout type-checks green while shipping old DSH code).')
+  }
+}