@morlay/dsh-context-assembler 0.0.10 → 0.0.11-alpha.2

package/dist/index.d.mts

@@ -1,12 +1,9 @@
 import { Context, Service } from "@deepseek-ai/cordis";
 import z from "@deepseek-ai/schemastery";
 import { Agent } from "@deepseek-ai/dsh-agent";
-//#region src/defaults.d.ts
 export declare const DEFAULT_KEEP: readonly string[];
 export declare const DEFAULT_SUPPRESS: readonly string[];
 export declare const DEFAULT_REPLACE: Readonly<Record<string, string>>;
-//#endregion
-//#region src/channel.d.ts
 export declare class ContextAssembler extends Service {
   private readonly replacements;
   private readonly suppressed;
@@ -30,8 +27,6 @@ declare module "@deepseek-ai/cordis" {
     contextAssembler: ContextAssembler;
   }
 }
-//#endregion
-//#region src/index.d.ts
 export declare const name = "context-assembler";
 export declare const inject: string[];
 export interface Config {
@@ -40,5 +35,4 @@ export interface Config {
   replace?: Record<string, string>;
 }
 export declare const Config: z<Config>;
-export declare function apply(ctx: Context, config: Config): void;
-//#endregion
+export declare function apply(ctx: Context, config: Config): void;

package/dist/index.mjs

@@ -2,7 +2,7 @@ import z from "@deepseek-ai/schemastery";
 import { Service } from "@deepseek-ai/cordis";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
 import { PERSONA_PREFIX_SECTION, PERSONA_SUFFIX_SECTION } from "@deepseek-ai/dsh-system-prompt";
-//#region src/reminder.ts
+// src/reminder.ts
 const REMINDER_OPEN = "<system-reminder";
 const REMINDER_CLOSE = "</system-reminder>";
 const RULES_SECTION = "assembler:rules";
@@ -20,12 +20,11 @@ function renderReminder(id, body) {
 	return `${REMINDER_OPEN} id="${escapeAttr(id)}">\n${escapeFrameBody(body)}\n${REMINDER_CLOSE}`;
 }
 function latestReminderText(agent, id) {
-	for (const seq of agent.session.surface.nodes.toReversed()) {
-		const event = agent.session.eventAt(seq);
-		if (event?.type !== "user/message") continue;
-		if (promptEntryIdOf(event.data.source) !== id) continue;
-		const [block] = event.data.content;
-		return event.data.content.length === 1 && block?.type === "text" ? block.text : "";
+	for (const message of agent.session.deriveMessages().toReversed()) {
+		if (message.role !== "user") continue;
+		if (promptEntryIdOf(message.source) !== id) continue;
+		const [block] = message.content;
+		return message.content.length === 1 && block?.type === "text" ? block.text : "";
 	}
 }
 function reminderMessage(key, text) {
@@ -41,8 +40,7 @@ function reminderMessage(key, text) {
 		}
 	});
 }
-//#endregion
-//#region src/channel.ts
+// src/channel.ts
 var ContextAssembler = class extends Service {
 	replacements = /* @__PURE__ */ new Map();
 	suppressed = /* @__PURE__ */ new Set();
@@ -93,8 +91,7 @@ var ContextAssembler = class extends Service {
 		return state;
 	}
 };
-//#endregion
-//#region src/defaults.ts
+// src/defaults.ts
 const DEFAULT_KEEP = [
 	PERSONA_PREFIX_SECTION,
 	PERSONA_SUFFIX_SECTION,
@@ -114,11 +111,9 @@ const DEFAULT_REPLACE = {
 	"context:file-reference": "以 @ 开头的词是用户显式引用的工作区路径，相对于工作区根。结尾带斜杠表示目录：需要时列目录内容。其余是文件：需要内容时用 read 工具读取，不要在读取前声称自己已经看过。用 @\"...\" 括住含空格的路径。",
 	"ui:deliverable-file-references": "成功创建或修改文件后，在最终回复里点明主要产物。除命令、配置表达式与代码块之外，每处提到已存在的文件都要链到它的完整路径（相对工作目录或绝对路径）；已知行号时在目标后加 `#L24` 或 `#L24-L30`。链接文本用文件名或清晰别名，只加够区分的父目录，不要把完整路径放进标签；默认只用文件名，需要精确位置时在标签后接 `:24` 或 `:24–30`（不带 `#` 或 `L`）。"
 };
-//#endregion
-//#region src/rules.ts
+// src/rules.ts
 const RULES_TEXT = ["system-reminder 与 skill_content 块是本系统提示词的一部分，持续有效：同一条内容的最新一条取代更早的（带 id 的块以 id 为准，其余按来源），不同来源互不影响。", "skill_content 是要遵循的技能说明（随请求送来的与你后来加载的一样），file_content 是本步引用的文件内容。"].join("");
-//#endregion
-//#region src/index.ts
+// src/index.ts
 const name = "context-assembler";
 const RULES_ORDER = 1;
 const inject = ["systemPrompt"];
@@ -190,5 +185,4 @@ function sectionId(name) {
 function pendingEntries(agent, channel) {
 	return [...channel.collect(agent)].filter(([key, text]) => latestReminderText(agent, key) !== text).toSorted(([left], [right]) => left < right ? -1 : left > right ? 1 : 0);
 }
-//#endregion
 export { Config, ContextAssembler, DEFAULT_KEEP, DEFAULT_REPLACE, DEFAULT_SUPPRESS, apply, inject, name };

package/dist/rows.d.mts

@@ -1,9 +1,7 @@
-//#region src/rows.d.ts
 export declare const CONTEXT_PACKAGE = "@morlay/dsh-context-assembler";
 export interface ContextRow {
   readonly id: string;
   readonly name: string;
   readonly config?: Readonly<Record<string, unknown>>;
 }
-export declare function contextChannel(): ContextRow;
-//#endregion
+export declare function contextChannel(): ContextRow;

package/dist/rows.mjs

@@ -1,4 +1,4 @@
-//#region src/rows.ts
+// src/rows.ts
 const CONTEXT_PACKAGE = "@morlay/dsh-context-assembler";
 function contextChannel() {
 	return {
@@ -6,5 +6,4 @@ function contextChannel() {
 		name: CONTEXT_PACKAGE
 	};
 }
-//#endregion
 export { CONTEXT_PACKAGE, contextChannel };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/dsh-context-assembler",
-  "version": "0.0.10",
+  "version": "0.0.11-alpha.2",
   "description": "Prompt channel for dsh: assembly-result text conversion (replace / suppress) plus per-step delivery of demoted sections. Workspace instructions and the skill catalog use the official rows (@deepseek-ai/dsh-agent-instructions / @deepseek-ai/dsh-tool-skill); the per-session scope gate lives in @morlay/dsh-session-mode. Reference expansion is its own package (@morlay/dsh-reference).",
   "keywords": [
     "context",
@@ -35,31 +35,31 @@
     "./locale/*.json": "./locale/*.json"
   },
   "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.5"
+    "@deepseek-ai/schemastery": "^3.18.6-alpha.1"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "^4.0.5",
-    "@deepseek-ai/dsh-agent": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-agent-loop": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-agent-loop-testkit": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-compaction-basic": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-llm": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-scope": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-session": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-session-persistence-jsonl": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-system-prompt": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-token-meter": "^0.2.1-rc.1",
-    "@morlay/session-rdb": "0.1.9"
+    "@deepseek-ai/cordis": "^4.0.6-alpha.1",
+    "@deepseek-ai/dsh-agent": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-agent-loop": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-agent-loop-testkit": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-compaction-basic": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-llm": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-scope": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-session": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-session-persistence-jsonl": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-system-prompt": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-token-meter": "^0.2.2-alpha.2",
+    "@morlay/session-rdb": "0.1.10-alpha.2"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.5",
-    "@deepseek-ai/dsh-agent": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-llm": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-session": "^0.2.1-rc.1",
-    "@deepseek-ai/dsh-system-prompt": "^0.2.1-rc.1"
+    "@deepseek-ai/cordis": "^4.0.6-alpha.1",
+    "@deepseek-ai/dsh-agent": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-llm": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-session": "^0.2.2-alpha.2",
+    "@deepseek-ai/dsh-system-prompt": "^0.2.2-alpha.2"
   },
   "engines": {
-    "dsh": ">= 0.2.1-rc.1 < 0.2.2"
+    "dsh": ">= 0.2.2-alpha.2 < 0.2.3"
   },
   "scripts": {
     "build": "pnpm exec tsdown"

package/src/reminder.ts

@@ -42,13 +42,14 @@ export function renderReminder(id: string, body: string): string {
 }
 
 // surface 上最近一条该 id 的 reminder 原文（含信封）；没有则 undefined。
+// 走 `deriveMessages()`（surface 的派生消息视图，受支持的同步读）而不是逐 seq 读事件：
+// `Session.eventAt` / `snapshotEvents` / `ownEvents` 已被上游声明为「新调用禁止」。
 export function latestReminderText(agent: Agent, id: string): string | undefined {
-  for (const seq of agent.session.surface.nodes.toReversed()) {
-    const event = agent.session.eventAt(seq);
-    if (event?.type !== "user/message") continue;
-    if (promptEntryIdOf(event.data.source) !== id) continue;
-    const [block] = event.data.content;
-    return event.data.content.length === 1 && block?.type === "text" ? block.text : "";
+  for (const message of agent.session.deriveMessages().toReversed()) {
+    if (message.role !== "user") continue;
+    if (promptEntryIdOf(message.source) !== id) continue;
+    const [block] = message.content;
+    return message.content.length === 1 && block?.type === "text" ? block.text : "";
   }
   return undefined;
 }