dsh-session-bridge 0.2.0 → 0.2.1

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-session-bridge",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "main": "./lib/index.js",
   "description": "会话桥：创建主会话 / 向任意会话发消息 / 等待回复 / 读取消息 / 按名或 id 查找会话（支持跨工作区）；另含监控/调度主任务与归档会话。",
   "engines": {

package/lib/index.js

@@ -9098,6 +9098,29 @@ Service.init;
 * dsh-session-bridge core: 会话创建 / 发消息 / 等待回复 / 读取 / 查找。
 * 所有逻辑跑在插件宿主上下文（rootCtx），操作的是 DSH 真实的会话与 agent 注册表。
 */
+/**
+* 兼容读取不同 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 不存在）时回退为空数组，绝不抛迭代错误。
+*/
+function sessionEvents(session) {
+	const s = session;
+	if (s === null || s === void 0) return [];
+	if (Array.isArray(s.events)) return s.events;
+	if (typeof s.snapshotEvents === "function") try {
+		return s.snapshotEvents();
+	} catch {
+		return [];
+	}
+	return [];
+}
+/** 规约任意"事件列表"值为数组（非数组 → []），避免 events is not iterable。 */
+function asEventList(events) {
+	return Array.isArray(events) ? events : [];
+}
 /** agent.followup / steer 接受的用户消息值。 */
 function userMessage(text) {
 	return {
@@ -9141,8 +9164,9 @@ function toolNamesOf(toolCalls) {
 }
 /** 折叠会话事件日志为可读消息行（跳过非 user 来源与空消息）。 */
 function foldMessages(events) {
+	const list = asEventList(events);
 	const rows = [];
-	for (const event of events) if (event.type === "user/message") {
+	for (const event of list) if (event.type === "user/message") {
 		const source = event.data.source;
 		if (source !== void 0 && source.kind !== "user") continue;
 		const text = blockText(event.data.content);
@@ -9179,8 +9203,9 @@ function foldMessages(events) {
 * 无标题事件时回落为第一条用户消息（截断 80 字符）。
 */
 function titleOf(events) {
+	const list = asEventList(events);
 	let title;
-	for (const event of events) {
+	for (const event of list) {
 		const raw = event;
 		if (raw.type === "session/title") {
 			const t = raw.data.title;
@@ -9188,7 +9213,7 @@ function titleOf(events) {
 		}
 	}
 	if (title !== void 0) return title;
-	for (const event of events) if (event.type === "user/message") {
+	for (const event of list) if (event.type === "user/message") {
 		const source = event.data.source;
 		if (source !== void 0 && source.kind !== "user") continue;
 		const text = blockText(event.data.content);
@@ -9200,8 +9225,9 @@ function titleOf(events) {
 }
 /** 日志最大事件序号。 */
 function maxSeq(events) {
+	const list = asEventList(events);
 	let m = -1;
-	for (const event of events) if (event.seq > m) m = event.seq;
+	for (const event of list) if (event.seq > m) m = event.seq;
 	return m;
 }
 function sleep(ms) {
@@ -9228,7 +9254,7 @@ async function waitForReply(opts) {
 	let turnEnded = false;
 	for (;;) {
 		if (opts.signal !== void 0 && opts.signal.aborted) break;
-		const events = opts.session.events;
+		const events = sessionEvents(opts.session);
 		for (const row of foldMessages(events)) {
 			if (row.seq <= opts.baselineSeq || row.role !== "assistant") continue;
 			if (latest === null || row.seq > latest.seq) latest = row;
@@ -9309,7 +9335,7 @@ async function attachSessionToWorkspace(ctx, sessionId, cwd) {
 * 纯读，无副作用。用于 `session_bridge_status`。
 */
 function statusSnapshot(ctx, agent) {
-	const events = agent.session.events;
+	const events = sessionEvents(agent.session);
 	const rows = foldMessages(events);
 	let lastActivityAt = null;
 	let lastTurn = 0;
@@ -13633,7 +13659,7 @@ function registerCreate(env) {
 			});
 			let reply;
 			if (typeof args.prompt === "string" && args.prompt.trim() !== "") {
-				const baseline = maxSeq(agent.session.events);
+				const baseline = maxSeq(sessionEvents(agent.session));
 				agent.followup(userMessage(args.prompt.trim()));
 				env.registry.touch(sessionId);
 				if (args.waitForReply === true) reply = await maybeWait(env, agent.session, baseline, args, exec.signal);
@@ -13701,7 +13727,7 @@ function registerSend(env) {
 			if (typeof args.message !== "string" || args.message.trim() === "") throw new Error("invalid message: 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 to bring it online (or session_bridge_find to locate it)");
-			const baseline = maxSeq(agent.session.events);
+			const baseline = maxSeq(sessionEvents(agent.session));
 			if (args.mode === "steer") agent.steer(userMessage(args.message.trim()));
 			else agent.followup(userMessage(args.message.trim()));
 			const headerCwd = agent.session.header.cwd;
@@ -13764,7 +13790,7 @@ function registerResume(env) {
 					sessionId: args.sessionId,
 					alreadyLive: true,
 					...existing.session.header.cwd === void 0 ? {} : { cwd: existing.session.header.cwd },
-					title: titleOf(existing.session.events) ?? null,
+					title: titleOf(sessionEvents(existing.session)) ?? null,
 					running: existing.status === "running"
 				});
 			}
@@ -13797,7 +13823,7 @@ function registerResume(env) {
 				sessionId: args.sessionId,
 				resumed: true,
 				...headerCwd === void 0 ? {} : { cwd: headerCwd },
-				title: titleOf(handle.agent.session.events) ?? null
+				title: titleOf(sessionEvents(handle.agent.session)) ?? null
 			});
 		}
 	}));
@@ -13855,7 +13881,7 @@ function registerWait(env) {
 			if (typeof args.sinceSeq === "number" && Number.isInteger(args.sinceSeq) && args.sinceSeq >= 0) baseline = args.sinceSeq;
 			else {
 				let lastText = -1;
-				for (const row of foldMessages(agent.session.events)) if (row.text !== void 0) lastText = row.seq;
+				for (const row of foldMessages(sessionEvents(agent.session))) if (row.text !== void 0) lastText = row.seq;
 				baseline = lastText;
 			}
 			const result = await waitForReply({
@@ -13934,7 +13960,7 @@ function registerRead(env) {
 			let live;
 			let cwd;
 			if (agent !== void 0) {
-				events = agent.session.events;
+				events = sessionEvents(agent.session);
 				live = true;
 				cwd = agent.session.header.cwd;
 			} else {
@@ -14051,7 +14077,7 @@ function registerFind(env) {
 				const wsId = wsById.get(agent.id) ?? workspaceByPath(env.ctx, headerCwd);
 				items.push({
 					sessionId: agent.id,
-					title: titleOf(agent.session.events),
+					title: titleOf(sessionEvents(agent.session)),
 					...headerCwd === void 0 ? {} : { cwd: headerCwd },
 					...wsId === void 0 ? {} : { workspaceId: wsId },
 					live: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-session-bridge",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "会话桥（dsh-session-bridge）：通过提示词创建新的主会话（顶层 UI 会话）、向任意会话发送消息、等待会话的下一条回复、读取会话消息，并按会话名或 id 跨工作区查找会话；此外支持监控/调度主任务与归档会话。",
   "private": false,
   "type": "module",

package/src/core.ts

@@ -60,6 +60,32 @@ export interface BridgeFindItem {
   agentPreset?: string
 }
 
+/**
+ * 兼容读取不同 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 不存在）时回退为空数组，绝不抛迭代错误。
+ */
+export function sessionEvents(session: unknown): readonly SessionEvent[] {
+  const s = session as {
+    events?: readonly SessionEvent[]
+    snapshotEvents?: (fromSeq?: number, toSeqExclusive?: number) => readonly SessionEvent[]
+  } | null | undefined
+  if (s === null || s === undefined) return []
+  if (Array.isArray(s.events)) return s.events
+  if (typeof s.snapshotEvents === 'function') {
+    try { return s.snapshotEvents() } catch { return [] }
+  }
+  return []
+}
+
+/** 规约任意"事件列表"值为数组（非数组 → []），避免 events is not iterable。 */
+export function asEventList(events: unknown): readonly SessionEvent[] {
+  return Array.isArray(events) ? events : []
+}
+
 /** agent.followup / steer 接受的用户消息值。 */
 export function userMessage(text: string): unknown {
   return {
@@ -104,8 +130,9 @@ function toolNamesOf(toolCalls: unknown): string[] {
 
 /** 折叠会话事件日志为可读消息行（跳过非 user 来源与空消息）。 */
 export function foldMessages(events: readonly SessionEvent[]): BridgeMessageRow[] {
+  const list = asEventList(events)
   const rows: BridgeMessageRow[] = []
-  for (const event of events) {
+  for (const event of list) {
     if (event.type === 'user/message') {
       const source = (event.data as { source?: { kind?: string } }).source
       if (source !== undefined && source.kind !== 'user') continue
@@ -134,8 +161,9 @@ export function foldMessages(events: readonly SessionEvent[]): BridgeMessageRow[
  * 无标题事件时回落为第一条用户消息（截断 80 字符）。
  */
 export function titleOf(events: readonly SessionEvent[]): string | undefined {
+  const list = asEventList(events)
   let title: string | undefined
-  for (const event of events) {
+  for (const event of list) {
     const raw = event as unknown as { type: string; data: { title?: unknown } }
     if (raw.type === 'session/title') {
       const t = raw.data.title
@@ -143,7 +171,7 @@ export function titleOf(events: readonly SessionEvent[]): string | undefined {
     }
   }
   if (title !== undefined) return title
-  for (const event of events) {
+  for (const event of list) {
     if (event.type === 'user/message') {
       const source = (event.data as { source?: { kind?: string } }).source
       if (source !== undefined && source.kind !== 'user') continue
@@ -159,8 +187,9 @@ export function titleOf(events: readonly SessionEvent[]): string | undefined {
 
 /** 日志最大事件序号。 */
 export function maxSeq(events: readonly SessionEvent[]): number {
+  const list = asEventList(events)
   let m = -1
-  for (const event of events) if (event.seq > m) m = event.seq
+  for (const event of list) if (event.seq > m) m = event.seq
   return m
 }
 
@@ -197,7 +226,7 @@ export async function waitForReply(opts: WaitForReplyOptions): Promise<BridgeWai
   let turnEnded = false
   for (;;) {
     if (opts.signal !== undefined && opts.signal.aborted) break
-    const events = opts.session.events
+    const events = sessionEvents(opts.session)
     for (const row of foldMessages(events)) {
       if (row.seq <= opts.baselineSeq || row.role !== 'assistant') continue
       if (latest === null || row.seq > latest.seq) latest = row
@@ -324,7 +353,7 @@ export interface BridgeStatusSnapshot {
  * 纯读，无副作用。用于 `session_bridge_status`。
  */
 export function statusSnapshot(ctx: Context, agent: LiveAgentLike): BridgeStatusSnapshot {
-  const events = agent.session.events
+  const events = sessionEvents(agent.session)
   const rows = foldMessages(events)
   let lastActivityAt: number | null = null
   let lastTurn = 0

package/src/tools.ts

@@ -22,6 +22,7 @@ import {
   foldMessages,
   maxSeq,
   resolveTargetCwd,
+  sessionEvents,
   statusSnapshot,
   titleOf,
   userMessage,
@@ -236,7 +237,7 @@ function registerCreate(env: BridgeEnv): void {
 
       let reply: ReturnType<typeof renderWait> | undefined
       if (typeof args.prompt === 'string' && args.prompt.trim() !== '') {
-        const baseline = maxSeq(agent.session.events)
+        const baseline = maxSeq(sessionEvents(agent.session))
         agent.followup(userMessage(args.prompt.trim()))
         env.registry.touch(sessionId)
         if (args.waitForReply === true) {
@@ -294,7 +295,7 @@ function registerSend(env: BridgeEnv): void {
       if (agent === undefined) {
         throw new Error('session ' + JSON.stringify(args.sessionId) + ' is not live — call session_bridge_resume first to bring it online (or session_bridge_find to locate it)')
       }
-      const baseline = maxSeq(agent.session.events)
+      const baseline = maxSeq(sessionEvents(agent.session))
       if (args.mode === 'steer') agent.steer(userMessage(args.message.trim()))
       else agent.followup(userMessage(args.message.trim()))
       const headerCwd = agent.session.header.cwd
@@ -346,7 +347,7 @@ function registerResume(env: BridgeEnv): void {
           sessionId: args.sessionId,
           alreadyLive: true,
           ...(existing.session.header.cwd === undefined ? {} : { cwd: existing.session.header.cwd }),
-          title: titleOf(existing.session.events) ?? null,
+          title: titleOf(sessionEvents(existing.session)) ?? null,
           running: existing.status === 'running',
         })
       }
@@ -381,7 +382,7 @@ function registerResume(env: BridgeEnv): void {
         sessionId: args.sessionId,
         resumed: true,
         ...(headerCwd === undefined ? {} : { cwd: headerCwd }),
-        title: titleOf(handle.agent.session.events) ?? null,
+        title: titleOf(sessionEvents(handle.agent.session)) ?? null,
       })
     },
   }))
@@ -432,7 +433,7 @@ function registerWait(env: BridgeEnv): void {
         baseline = args.sinceSeq
       } else {
         let lastText = -1
-        for (const row of foldMessages(agent.session.events)) {
+        for (const row of foldMessages(sessionEvents(agent.session))) {
           if (row.text !== undefined) lastText = row.seq
         }
         baseline = lastText
@@ -494,7 +495,7 @@ function registerRead(env: BridgeEnv): void {
       let live: boolean
       let cwd: string | undefined
       if (agent !== undefined) {
-        events = agent.session.events
+        events = sessionEvents(agent.session)
         live = true
         cwd = agent.session.header.cwd
       } else {
@@ -592,7 +593,7 @@ function registerFind(env: BridgeEnv): void {
         const wsId = wsById.get(agent.id) ?? workspaceByPath(env.ctx, headerCwd)
         items.push({
           sessionId: agent.id,
-          title: titleOf(agent.session.events),
+          title: titleOf(sessionEvents(agent.session)),
           ...(headerCwd === undefined ? {} : { cwd: headerCwd }),
           ...(wsId === undefined ? {} : { workspaceId: wsId }),
           live: true,