@my-life-buddies/buddy-runtime 0.0.3 → 0.1.0

package/README.md

@@ -2,7 +2,7 @@
 
 MLB 搭子运行时。基于 [`@earendil-works/pi-agent-core`](https://www.npmjs.com/package/@earendil-works/pi-agent-core) 构建，负责搭子与 MLB 平台之间的全部交互：订阅事件流、拉取消息、驱动模型、写回回复、推送在线状态。开发者只需提供搭子的配置。
 
-## 安装
+## 1. 安装
 
 ```bash
 npm install @my-life-buddies/buddy-runtime
@@ -10,7 +10,7 @@ npm install @my-life-buddies/buddy-runtime
 
 要求 Node.js ≥ 22.19。
 
-## 快速开始
+## 2. 快速开始
 
 ```
 my-buddy/
@@ -58,9 +58,9 @@ await BuddyServer.start({
 
 完整示例见 [examples/aunt-tu/](examples/aunt-tu/)。
 
-## API
+## 3. API
 
-### `BuddyServer.start(options)`
+### 3.1 `BuddyServer.start(options)`
 
 启动搭子进程，连接平台事件流。返回 `{ stop(): Promise<void> }`。
 
@@ -69,7 +69,7 @@ await BuddyServer.start({
 | `options.model` | `string`，必填 | 模型 id，取值见平台 `GET /cli/models`。进程内所有会话共用。没填，或 id 在运行时内置的模型目录中不存在时，启动失败 |
 | `options.buddy` | `(conversation: Conversation) => BuddyOptions \| Promise<BuddyOptions>` | 搭子配置工厂。每场会话在第一条消息到达时调用一次 |
 
-### `BuddyOptions`
+### 3.2 `BuddyOptions`
 
 配置的形状与字段名与 pi-agent-core 的 `AgentOptions` / `AgentState` 一致，签名请参考 pi 的文档。
 
@@ -87,12 +87,12 @@ type BuddyOptions =
 | `initialState.systemPrompt` | 系统提示。静态内容；每回合变化的信息不应写在这里。工程目录下有 `resources/` 时，运行时在末尾追加资料清单 |
 | `initialState.tools` | 工具列表，类型为 pi 的 `AgentTool`。`label` 为必填，用作用户可见的状态行文案（空字符串表示不显示）；`execute` 返回值的 `details` 为必填（可为 `undefined`）；执行失败应直接抛出异常。工具名不得与内置工具或其他工具重复。先单独声明为 `AgentTool<typeof 参数 schema>` 再放入数组，`execute` 的参数才有类型；直接写在数组里时参数类型为 `unknown` |
 | `initialState.thinkingLevel` | 思考级别，默认 `off`。模型不支持的级别在发请求前就近换成支持的一档。显式设了模型不支持的级别时，每场会话建立时打一条 warn |
-| `transformContext` | 历史裁剪。平台下发的会话上下文是消息流里的记录，拿到的历史里已经有它 |
+| `transformContext` | 历史裁剪。入参是这场会话完整的 Agent 历史，平台交代的场合也在其中，消息从哪来、长什么样见下方「4. 会话历史」一节；返回值只用于这一次模型请求，不改动历史；抛出异常时使用原历史 |
 | `beforeToolCall` / `afterToolCall` / `shouldStopAfterTurn` / `prepareNextTurnWithContext` / `thinkingBudgets` / `toolExecution` | 原样传递给 pi |
 
 密钥、会话历史、会话标识与插话策略由运行时统一管理，不对开发者开放。模型通过 `BuddyServer.start` 的 `model` 选择。
 
-### `Conversation`：给开发者调用的方法
+### 3.3 `Conversation`：给开发者调用的方法
 
 工厂拿到的对象。上面的属性和方法由开发者在代码里调用，不会注册给模型；要让模型用到，开发者自己包成工具放进 `initialState.tools`，见下方 `remember` 的例子。
 
@@ -105,6 +105,9 @@ interface Conversation {
 		write(key: string, text: string): Promise<void>;  // 覆盖写一条
 		delete(key: string): Promise<void>;               // 删一条，删不存在的也算成功
 	};
+	readonly dataAccess: {
+		query(request: { datasets: string[]; memberId?: string }): Promise<DatasetAccessResult[]>;  // 读用户授权的数据，见 3.4.2
+	};
 }
 
 interface MemoryEntry {
@@ -141,21 +144,19 @@ await BuddyServer.start({
 
 完整示例见 [examples/aunt-tu/](examples/aunt-tu/)：`taste_read` / `taste_write` 两个工具用 `memory` 记每个人爱吃什么、不爱吃什么。
 
-`dataAccess.query` 按当前会话读取用户授权的数据。私聊只传 `datasets`；群聊还要传消息前缀里的稳定 `memberId`。平台逐 Dataset 返回 `available`、`notDeclared`、`notGranted`、`disabledInGroup` 或 `unavailable`，只有 `available` 带数据。会话键和真实用户身份由平台绑定，开发者不能传真实用户 ID。
+`dataAccess.query` 读取用户授权给搭子的数据，用法见 3.4.2。
 
-### 内置工具：运行时注册给模型
+### 3.4 内置工具：运行时注册给模型
 
 以下工具由运行时注册到 Agent，排在开发者工具之前，由模型调用。开发者不需要注册，也不能再注册同名工具；系统提示中可按名称引用。
 
 | 工具 | 何时注册 | 做什么 |
 |---|---|---|
-| `data_access_query` | 搭子声明过至少一个 Dataset | 按需读取当前会话用户授权的数据；单次最多 8 个 Dataset，响应上限 512 KiB |
-| `widget_create` / `widget_write` / `widget_read` / `widget_delete` / `widget_send` | 搭子在平台上登记了小挂件类型 | 建小挂件、写 / 读 / 删记录、把小挂件发进聊天流 |
 | `read_resource` | 工程目录下有 `resources/`，且其中有 `.md` | 按资料清单里的相对路径读一篇资料 |
+| `data_access_query` | 搭子声明过至少一个 Dataset | 按需读取当前会话用户授权的数据；单次最多 8 个 Dataset，响应上限 512 KiB |
+| `widget_create` / `widget_write` / `widget_read` / `widget_delete` / `widget_send` | 搭子在平台上登记了小挂件类型 | 建小挂件、写 / 读 / 删记录、把小挂件发进聊天 |
 
-DataAccess 真实数据仅在当前 Agent run 中可见；发生查询后，该 run 的平台 Tool 记录与长期 transcript 不保存 Tool 参数、Tool 原始结果和 thinking，只保留 Dataset ID、查询状态及最终给用户看的正文。
-
-#### 资料
+#### 3.4.1 资料
 
 资料放在工程目录下的 `resources/` 里，是一篇篇 `.md` 文件。运行时自动让模型按需读取，开发者不需要写代码。
 
@@ -174,7 +175,77 @@ my-buddy/                  工程目录
 
 完整示例见 [examples/stacy-sims/](examples/stacy-sims/)。
 
-#### 小挂件
+#### 3.4.2 授权数据
+
+经用户同意，搭子可以读取用户授权数据。数据按 Dataset 分项，每项内容与字段固定，用户逐项授权。开发者要做的是声明需要哪些 Dataset；查询工具由运行时注册给模型，开发者的工具里也能直接查。
+
+**声明需要哪些数据**
+
+通过平台 CLI 接口 `PUT /cli/buddies/:id/data-requirements` 提交完整清单，每次提交覆盖上一次：
+
+```json
+{
+	"datasets": [
+		{ "id": "health.sleep", "purpose": "根据你最近的睡眠调整作息建议" }
+	]
+}
+```
+
+- `id`：从下表选。
+- `purpose`：写给用户看的用途，1~200 字。用户在 App 里看到这句话，再决定是否同意。
+- 改了某项的 `purpose`，用户之前的同意失效，要重新同意；从清单里删掉的数据，搭子立即读不到。
+- 声明或改动之后，重启搭子进程，模型才能看到新的清单。
+
+目前支持的 Dataset：
+
+| Dataset | 内容 | `data.items` 每条的字段 |
+|---|---|---|
+| `health.sleep` | 睡眠，每天一条 | `date`、`totalSleepMinutes`、`sleepStartLocal`、`sleepEndLocal`、`awakeMinutes`、`coreSleepMinutes`、`deepSleepMinutes`、`remSleepMinutes`、`unspecifiedSleepMinutes` |
+| `health.workouts` | 运动记录，每次一条 | `id`、`date`、`startAt`、`type`、`durationMinutes`、`calories`、`sourceApp` |
+| `health.distance` | 距离与配速，对应一次运动 | `workoutId`、`date`、`startAt`、`distanceKm`、`paceSecondsPerKm` |
+| `health.heartRate` | 心率，对应一段睡眠或一次运动 | `context`（`sleep` / `workout`）、`referenceId`、`date`、`startAt`、`beatsPerMinute` |
+| `health.hrv` | 心率变异性 | `date`、`milliseconds` |
+| `health.respiratoryRate` | 呼吸频率 | `date`、`breathsPerMinute` |
+| `health.oxygenSaturation` | 血氧 | `date`、`percent` |
+| `health.environmentalAudioExposure` | 环境音量 | `date`、`decibels` |
+
+部分字段可能缺失，取值前先判断。
+
+**让模型去查**
+
+声明过至少一项数据，模型就有了 `data_access_query` 工具，工具说明里列着开发者声明的数据与用途。开发者可以在系统提示里写明什么时候查，例如「聊到作息时，先用 data_access_query 查 health.sleep」。
+
+**在自己的工具里查**
+
+调用 `conversation.dataAccess.query`：
+
+```ts
+const [sleep] = await conversation.dataAccess.query({ datasets: ["health.sleep"] });
+if (sleep.status === "available") {
+	// sleep.data.items 是每天一条的睡眠记录
+}
+```
+
+- `datasets`：一次最多 8 个。
+- `memberId`：私聊不传；群聊必须传，即群消息前缀 `[名字 #m_…]` 里的 `m_…`，查的是这位成员的数据。传错时直接抛出异常。
+
+**查询结果**
+
+每个 Dataset 各有一个状态，一个读不到不影响其他。只有 `available` 带 `data`：
+
+| 状态 | 意思 |
+|---|---|
+| `available` | 读到了 |
+| `notDeclared` | 搭子没有声明这项数据 |
+| `notGranted` | 用户没有同意，或改过用途后用户还没重新同意 |
+| `disabledInGroup` | 这位成员在这个群里关掉了这项数据 |
+| `unavailable` | 平台上还没有这位用户的这项数据，或数据已过期 |
+
+**数据只在这一轮回复里可见**
+
+一轮回复里只要查过授权数据，这一轮结束后，聊天记录和会话历史里这一轮的工具参数、工具结果与 thinking，都会换成「查了哪些数据、各是什么状态」，给用户看的回复照常保留。开发者自己写进 `memory` 或小挂件的内容不会被替换，不要把查到的数据写进去。
+
+#### 3.4.3 小挂件
 
 开发者通过平台 CLI 接口给搭子登记小挂件类型：`PUT /cli/buddies/:id/widget-types/:typeId/schema` 交 schema，每个模块写一句 `description` 给模型读，每条记录的形状是一份 JSON Schema；`PUT /cli/buddies/:id/widget-types/:typeId/page` 交展示页面，单个 HTML 文件。
 
@@ -182,7 +253,25 @@ my-buddy/                  工程目录
 
 用法见 [examples/aunt-tu/](examples/aunt-tu/)。
 
-## 环境变量
+## 4. 会话历史：MLBMessage → AgentMessage → LLMMessage
+
+开发者不需要保存会话历史，也不需要把聊天里的消息换成模型消息，这些由运行时完成。每场会话的消息都保存在平台上，搭子进程重启后历史照样在。从平台上的 `MLBMessage` 到模型收到的 `LLMMessage`：
+
+```
+MLBMessage[] → AgentMessage[] → transformContext() → AgentMessage[] → convertToLlm() → LLMMessage[] → LLM
+     ▲      (1)     │ ▲                (2)                                 (3)                         │
+     └─────(5)──────┘ └──────────────────────────────────────(4)───────────────────────────────────────┘
+```
+
+1. 平台上的 `MLBMessage` 换成 pi 的 `AgentMessage`，追加进会话历史。一条消息只换一次：会话起来时换一遍平台上已有的全部消息，之后来一条换一条。什么消息换成什么，见 4.1。
+2. `transformContext()`：开发者可选。入参是完整的会话历史，返回值只用于这一次请求，不改动历史。
+3. `convertToLlm()`：运行时实现，开发者不能替换，做什么见 4.3。换出来的 `LLMMessage`（即 pi-ai 的 `Message`）连同 `systemPrompt` 与 `tools` 发给模型。
+4. 模型的回复，以及它调用工具得到的结果，直接追加进会话历史，不经过 (1)。
+5. 经 (4) 追加进历史的消息，运行时再换成 `MLBMessage` 写回平台；经 (1) 从平台来的不会写回。用户在聊天里看到的回复就是这一步写上去的。用过授权数据的那一轮，写回前先脱敏，见 3.4.2。搭子重启后，这些消息经 (1) 取回。
+
+(1) 在消息到来时发生；(2)、(3) 在每次请求模型前都完整跑一遍，一轮回复里模型可能请求好几次，比如调完工具接着说，每次都从当时完整的会话历史重新算；(4)、(5) 在模型每说完一段、每跑完一步工具时发生。
+
+## 5. 环境变量
 
 | 变量 | 说明 |
 |---|---|
@@ -193,7 +282,7 @@ my-buddy/                  工程目录
 
 搭子的档案（名称、头像、简介）由平台保存：注册时通过 `POST /cli/buddies` 提交，修改通过 `PUT /cli/buddies/:id/meta`。搭子进程不监听端口、不接收入站请求。从非回环地址连接网关时，平台将其识别为 `<id>-dev` 分身，会话与正式身份隔离。
 
-## 开发
+## 6. 开发
 
 - `npm run dev`：以 `node --watch` 启动，文件变更后自动重启。停止时需终止整个进程树（`pkill -f "node --watch .* src/main.ts"`），仅终止子进程会被父进程重新拉起。
 - 会话消息拉取遇到临时网络错误时会主动指数退避重试（1 秒起步、最高 30 秒）；新的 SSE 通知会取消等待并立即重拉。

package/dist/conversation/agent.js

@@ -7,7 +7,7 @@
 // 不管：Agent 建好之后的事（回合、事件分发在 index.ts）。
 import { Agent } from "@earendil-works/pi-agent-core";
 import { clampThinkingLevel, getSupportedThinkingLevels } from "@earendil-works/pi-ai";
-import { convertToLlm } from "./convert.js";
+import { agentMessagesToLLMMessages } from "./agentMessageLLMMessageConverter.js";
 import { errorText } from "../log.js";
 import { dataAccessTool, DataAccessUsageTracker } from "../tools/dataAccess.js";
 import { readResourceTool, resourceCatalog } from "../tools/resource.js";
@@ -90,7 +90,7 @@ export async function createAgent(deps) {
             return base;
         },
         convertToLlm: (messages) => {
-            const llmMessages = convertToLlm(messages);
+            const llmMessages = agentMessagesToLLMMessages(messages);
             log.info("convertToLlm 出参", { convoKey: key, messageCount: llmMessages.length });
             return llmMessages;
         },

package/dist/conversation/agent.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../src/conversation/agent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../src/conversation/agent.ts"],"names":[],"mappings":"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"}

package/dist/conversation/agentMessageLLMMessageConverter.d.ts

@@ -0,0 +1,8 @@
+import type { AgentMessage } from "@earendil-works/pi-agent-core";
+import type { Message } from "@earendil-works/pi-ai";
+/**
+ * note 变 user；相邻两条 user 合并成一条（正文中间隔一个换行）；user / assistant / toolResult 原样。
+ * 返回的是新数组，合并出来的也是新对象，不改传进来的消息。
+ */
+export declare const agentMessagesToLLMMessages: (messages: AgentMessage[]) => Message[];
+//# sourceMappingURL=agentMessageLLMMessageConverter.d.ts.map

package/dist/conversation/agentMessageLLMMessageConverter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"agentMessageLLMMessageConverter.d.ts","sourceRoot":"","sources":["../../src/conversation/agentMessageLLMMessageConverter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAgB,OAAO,EAA4B,MAAM,uBAAuB,CAAC;AAE7F;;;GAGG;AACH,eAAO,MAAM,0BAA0B,GAAI,UAAU,YAAY,EAAE,KAAG,OAAO,EAa5E,CAAC"}

package/dist/conversation/agentMessageLLMMessageConverter.js

@@ -0,0 +1,48 @@
+// AgentMessage → LLMMessage 的换算：交给 pi 的 convertToLlm，每次请求模型前把 Agent 历史（经开发者 transformContext 之后的）换成模型收的消息（pi-ai 的 Message）。
+// MLBMessage 与 AgentMessage 之间的换算不在这里，在 mlbMessageAgentMessageConverter.ts。
+/**
+ * note 变 user；相邻两条 user 合并成一条（正文中间隔一个换行）；user / assistant / toolResult 原样。
+ * 返回的是新数组，合并出来的也是新对象，不改传进来的消息。
+ */
+export const agentMessagesToLLMMessages = (messages) => {
+    const out = [];
+    for (const m of messages) {
+        const next = agentMessageToLLMMessage(m);
+        if (next === undefined)
+            continue;
+        const prev = out[out.length - 1];
+        if (next.role === "user" && prev !== undefined && prev.role === "user") {
+            out[out.length - 1] = mergeUsers(prev, next);
+        }
+        else {
+            out.push(next);
+        }
+    }
+    return out;
+};
+/** 一条 AgentMessage 到模型那边是什么：note 变 user；pi harness 自己并进来的那几种 role（bashExecution / custom / …）这个运行时不产生，照 pi 默认 convertToLlm 的做法不给模型 */
+function agentMessageToLLMMessage(m) {
+    switch (m.role) {
+        case "note":
+            return { role: "user", content: [{ type: "text", text: m.text }], timestamp: m.timestamp };
+        case "user":
+        case "assistant":
+        case "toolResult":
+            return m;
+        default:
+            return undefined;
+    }
+}
+function mergeUsers(a, b) {
+    const blocks = [...userBlocks(a), ...userBlocks(b)];
+    const text = blocks
+        .filter((block) => block.type === "text")
+        .map((block) => block.text)
+        .join("\n");
+    const images = blocks.filter((block) => block.type === "image");
+    return { role: "user", content: [{ type: "text", text }, ...images], timestamp: a.timestamp };
+}
+function userBlocks(m) {
+    return typeof m.content === "string" ? [{ type: "text", text: m.content }] : m.content;
+}
+//# sourceMappingURL=agentMessageLLMMessageConverter.js.map

package/dist/conversation/agentMessageLLMMessageConverter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agentMessageLLMMessageConverter.js","sourceRoot":"","sources":["../../src/conversation/agentMessageLLMMessageConverter.ts"],"names":[],"mappings":"AAAA,4HAA4H;AAC5H,4EAA4E;AAK5E;;;GAGG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,QAAwB,EAAa,EAAE;IACjF,MAAM,GAAG,GAAc,EAAE,CAAC;IAC1B,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QAC1B,MAAM,IAAI,GAAG,wBAAwB,CAAC,CAAC,CAAC,CAAC;QACzC,IAAI,IAAI,KAAK,SAAS;YAAE,SAAS;QACjC,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACjC,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACxE,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACP,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC;IACF,CAAC;IACD,OAAO,GAAG,CAAC;AACZ,CAAC,CAAC;AAEF,sIAAsI;AACtI,SAAS,wBAAwB,CAAC,CAAe;IAChD,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;QAChB,KAAK,MAAM;YACV,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;QAC5F,KAAK,MAAM,CAAC;QACZ,KAAK,WAAW,CAAC;QACjB,KAAK,YAAY;YAChB,OAAO,CAAC,CAAC;QACV;YACC,OAAO,SAAS,CAAC;IACnB,CAAC;AACF,CAAC;AAED,SAAS,UAAU,CAAC,CAAc,EAAE,CAAc;IACjD,MAAM,MAAM,GAAG,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,MAAM,IAAI,GAAG,MAAM;SACjB,MAAM,CAAC,CAAC,KAAK,EAAwB,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC;SAC9D,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;SAC1B,IAAI,CAAC,IAAI,CAAC,CAAC;IACb,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAyB,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;IACvF,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;AAC/F,CAAC;AAED,SAAS,UAAU,CAAC,CAAc;IACjC,OAAO,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;AACxF,CAAC"}

package/dist/conversation/history.d.ts

@@ -8,8 +8,6 @@ export declare function splitForRebuild(records: MLBMessage[]): {
     history: MLBMessage[];
     pending: MLBMessage[];
 };
-/** 一批记录里最大的 seq；空批回原游标 */
-export declare function maxSeq(records: MLBMessage[], from: number): number;
 /** 对方的记录里要处理的：不是搭子写的，有正文或是转发卡 */
 export declare function theirsOf(records: MLBMessage[]): MLBMessage[];
 /**
@@ -17,9 +15,4 @@ export declare function theirsOf(records: MLBMessage[]): MLBMessage[];
  * 该不该答只看平台下发的 shouldReply（旧平台叫 reply，没有 shouldReply 时照认），运行时不判、不让模型猜
  */
 export declare function wantsReply(records: MLBMessage[]): boolean;
-/** 一批增量：游标之后的是新的（fresh），其中对方的（theirs）交给回合 */
-export declare function incoming(batch: MLBMessage[], pulledSeq: number): {
-    fresh: MLBMessage[];
-    theirs: MLBMessage[];
-};
 //# sourceMappingURL=history.d.ts.map

package/dist/conversation/history.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../src/conversation/history.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG;IAAE,OAAO,EAAE,UAAU,EAAE,CAAC;IAAC,OAAO,EAAE,UAAU,EAAE,CAAA;CAAE,CAIvG;AAED,0BAA0B;AAC1B,wBAAgB,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAIlE;AAED,iCAAiC;AACjC,wBAAgB,QAAQ,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAE5D;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAEzD;AAED,6CAA6C;AAC7C,wBAAgB,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IAAC,MAAM,EAAE,UAAU,EAAE,CAAA;CAAE,CAG9G"}
+{"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../src/conversation/history.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG;IAAE,OAAO,EAAE,UAAU,EAAE,CAAC;IAAC,OAAO,EAAE,UAAU,EAAE,CAAA;CAAE,CAIvG;AAED,iCAAiC;AACjC,wBAAgB,QAAQ,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAE5D;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAEzD"}

package/dist/conversation/history.js

@@ -1,6 +1,6 @@
 // 拉回来的平台记录怎么分拣：哪些灌进历史、哪些是搭子还没回应过的、哪些是对方的、要不要开口。纯函数，不碰 Agent。
-// 管：首次拉取（重建）的切分；每批增量的过滤；「要不要开口」的判定（重建与平时同一条）。
-// 不管：记录换成 pi 消息的形状（convert.ts）、分拣之后怎么处理（index.ts）。
+// 管：首次拉取（重建）的切分；挑出对方的记录；「要不要开口」的判定（重建与平时同一条）。
+// 不管：拉取、游标与只交新消息（readMLBMessages.ts）、记录换成 pi 消息的形状（mlbMessageAgentMessageConverter.ts）、分拣之后怎么处理（index.ts）。
 /**
  * 首次拉取（重建）：以搭子最后一次写的记录为界。之前的整段是历史，照原样灌；之后的是搭子还没回应过的，
  * 交给回合按平时同一条规矩处理（wantsReply）。不看「最后一条」：拉取时平台追加的 context、
@@ -12,14 +12,6 @@ export function splitForRebuild(records) {
         last--;
     return { history: records.slice(0, last + 1), pending: records.slice(last + 1) };
 }
-/** 一批记录里最大的 seq；空批回原游标 */
-export function maxSeq(records, from) {
-    let seq = from;
-    for (const m of records)
-        if (m.seq > seq)
-            seq = m.seq;
-    return seq;
-}
 /** 对方的记录里要处理的：不是搭子写的，有正文或是转发卡 */
 export function theirsOf(records) {
     return records.filter((m) => m.author !== "buddy" && ((m.text ?? "") !== "" || m.messagesCard !== undefined));
@@ -31,9 +23,4 @@ export function theirsOf(records) {
 export function wantsReply(records) {
     return records.some((m) => m.author === "user" && (m.shouldReply === true || (m.shouldReply === undefined && m.reply === true)));
 }
-/** 一批增量：游标之后的是新的（fresh），其中对方的（theirs）交给回合 */
-export function incoming(batch, pulledSeq) {
-    const fresh = batch.filter((m) => m.seq > pulledSeq);
-    return { fresh, theirs: theirsOf(fresh) };
-}
 //# sourceMappingURL=history.js.map

package/dist/conversation/history.js.map

@@ -1 +1 @@
-{"version":3,"file":"history.js","sourceRoot":"","sources":["../../src/conversation/history.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,8CAA8C;AAC9C,mDAAmD;AAInD;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,OAAqB;IACpD,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IAC9B,OAAO,IAAI,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,OAAO;QAAE,IAAI,EAAE,CAAC;IAC7D,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC;AAClF,CAAC;AAED,0BAA0B;AAC1B,MAAM,UAAU,MAAM,CAAC,OAAqB,EAAE,IAAY;IACzD,IAAI,GAAG,GAAG,IAAI,CAAC;IACf,KAAK,MAAM,CAAC,IAAI,OAAO;QAAE,IAAI,CAAC,CAAC,GAAG,GAAG,GAAG;YAAE,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC;IACtD,OAAO,GAAG,CAAC;AACZ,CAAC;AAED,iCAAiC;AACjC,MAAM,UAAU,QAAQ,CAAC,OAAqB;IAC7C,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC;AAC/G,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAC,OAAqB;IAC/C,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,CAAC,CAAC,WAAW,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,WAAW,KAAK,SAAS,IAAI,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC;AAClI,CAAC;AAED,6CAA6C;AAC7C,MAAM,UAAU,QAAQ,CAAC,KAAmB,EAAE,SAAiB;IAC9D,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC;IACrD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"history.js","sourceRoot":"","sources":["../../src/conversation/history.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,8CAA8C;AAC9C,2GAA2G;AAI3G;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,OAAqB;IACpD,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IAC9B,OAAO,IAAI,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,OAAO;QAAE,IAAI,EAAE,CAAC;IAC7D,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC;AAClF,CAAC;AAED,iCAAiC;AACjC,MAAM,UAAU,QAAQ,CAAC,OAAqB;IAC7C,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC;AAC/G,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAC,OAAqB;IAC/C,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,CAAC,CAAC,WAAW,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,WAAW,KAAK,SAAS,IAAI,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC;AAClI,CAAC"}

package/dist/conversation/index.d.ts

@@ -26,18 +26,12 @@ export interface ConversationHandleDeps {
 export declare class ConversationHandle {
     private readonly deps;
     private readonly identity;
-    private readonly presence;
-    private readonly writeBack;
+    private readonly reader;
+    private readonly writer;
     /** 懒建：第一次拉到消息时跑 factory 再 new */
     private agent;
     private dataAccessUsage;
-    /** 同会话的拉取串行链：notify 只往链尾排，绝不并发拉 */
-    private pullChain;
-    private pullRetry;
-    private pullRetryDelay;
-    /** 读方向游标：已经拉到并处理过的最大 seq（含自己写的） */
-    private pulledSeq;
-    /** 首次拉取（after=0 全量灌历史）做过没有 */
+    /** 首次拉到的整批灌进历史（重建）做过没有 */
     private rebuilt;
     /** 忙时听见的、不用开口的旁听消息，回合收尾再进历史 */
     private heard;
@@ -51,7 +45,7 @@ export declare class ConversationHandle {
     private _closed;
     private _lastActivity;
     constructor(deps: ConversationHandleDeps);
-    /** 正在跑回合（含收尾：等出站队列清空） */
+    /** 正在跑回合（含收尾：等发平台的队列清空） */
     get busy(): boolean;
     /** 最近一次有消息进来或回合收尾的时刻，server 按它做空闲淘汰 */
     get lastActivity(): number;
@@ -59,27 +53,25 @@ export declare class ConversationHandle {
     get closed(): boolean;
     /** 测试探针：Agent 当前的历史；还没建 Agent 时是空数组 */
     get transcript(): readonly AgentMessage[];
-    /** SSE message 到了：把一次拉取排进串行链。已退役的直接忽略 */
+    /** SSE message 到了：让 reader 拉一次。已退役的直接忽略 */
     notify(): void;
     /**
      * SSE delete 到了（或 server 空闲淘汰、stop、会话起不来）：先标退役，再打断正在跑的回合，等回合收尾。可以重复调。
      */
     close(): Promise<void>;
-    /** 标退役：写回队列清空并打断重发等待（回合收尾才不会被它拖住）、攒着的 delta 扔掉 */
+    /** 标退役：不再拉、取消拉取重试；发平台的队列丢掉没发的字与写回、打断重发等待（回合收尾才不会被它拖住） */
     private retire;
     /**
-     * 一次拉取：从 pulledSeq 往后翻到不满页。第一次走重建，之后走 ingest。网络错误按 1s–30s 指数退避主动重试，新 SSE 会提前唤醒。
-     * 平台的场合交代（context）是流里的一条记录，跟别的记录一起拉到；会话没了只靠 SSE delete 事件收，拉取这里不判。
+     * reader 交来一批：第一次走重建，之后走 ingest。
+     * 平台的场合交代（context）是流里的一条记录，跟别的记录一起拉到；会话没了只靠 SSE delete 事件收，这里不判。
      */
-    private pull;
-    private schedulePullRetry;
-    private cancelPullRetry;
+    private onMessages;
     /**
-     * 首次拉取：建 Agent，以搭子最后一次写的记录为界，之前的整段灌进 state.messages（不经事件，天然不会被写回平台）；
+     * 首次拉取：建 Agent，以搭子最后一次写的记录为界，之前的整段按消息时间的先后灌进 state.messages（不经事件，天然不会被写回平台）；
      * 之后的是搭子还没回应过的，交给 admit 按平时同一条规矩处理：有该答的就起回合，没有就只进历史。
      */
     private rebuild;
-    /** 一批新记录：游标推到最大 seq（自己写的也算，下次不再拉到），对方的交给 admit */
+    /** 一批新记录（reader 只交比上一批晚的，自己写回的也在里面）：对方的交给 admit */
     private ingest;
     /**
      * 搭子还没回应过的对方记录（重建时是搭子最后一次说话之后的那段，平时是这批新来的），换成 user 消息分发。
@@ -90,12 +82,13 @@ export declare class ConversationHandle {
     /**
      * 跑一个回合。messages 有值就 prompt 它们；没值（收尾时发现队列里还有消息）就直接 continue。
      * prompt 完把回合中 steer 进来的消化完；一句话没说就 followUp 一条 note 提醒再跑一次。
-     * 收尾：heard 进历史、delta 发完、replying 关掉、等出站队列清空，才算不忙。
+     * 收尾：replying 关掉、等发平台的队列清空（每条写回的消息都拿到了平台定的时间）、heard 进历史、
+     * 这一轮进历史的消息按时间排好，才算不忙——排完的顺序跟手机上、跟重建出来的一样。
      * 收尾期间又有人 steer（busy 还是 true，走不了 prompt），就接着再跑一个回合把它消化掉。
      */
     private runTurn;
     /**
-     * Agent 事件 → 写回队列 / 在线态。pi 会等这个函数返回再往下走，所以只做同步入队，网络在队列自己的链上；
+     * Agent 事件 → 发平台的队列。pi 会等这个函数返回再往下走，所以只做同步入队，网络在队列自己的链上；
      * 抛错会让 pi 把整个回合判失败，所以整体 try/catch。退役后的事件直接丢。
      */
     private onEvent;

package/dist/conversation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/conversation/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAqB,YAAY,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC/F,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAIxD,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,eAAe,EAA2B,MAAM,aAAa,CAAC;AAMvG,MAAM,WAAW,sBAAsB;IACtC,uBAAuB;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,SAAS,CAAC;IAClB,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAClB,QAAQ,EAAE,QAAQ,CAAC;IACnB,oEAAoE;IACpE,KAAK,EAAE,MAAM,CAAC;IACd,yCAAyC;IACzC,WAAW,EAAE,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IACzC,+DAA+D;IAC/D,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,6BAA6B;IAC7B,gBAAgB,EAAE,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;IACnD,OAAO,EAAE,YAAY,CAAC;IACtB,GAAG,EAAE,WAAW,CAAC;IACjB,uDAAuD;IACvD,aAAa,EAAE,MAAM,IAAI,CAAC;CAC1B;AAUD,qBAAa,kBAAkB;IAC9B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAyB;IAC9C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IACzC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IAEtC,iCAAiC;IACjC,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,eAAe,CAAqC;IAC5D,mCAAmC;IACnC,OAAO,CAAC,SAAS,CAAoC;IACrD,OAAO,CAAC,SAAS,CAA4C;IAC7D,OAAO,CAAC,cAAc,CAAqB;IAC3C,mCAAmC;IACnC,OAAO,CAAC,SAAS,CAAK;IACtB,8BAA8B;IAC9B,OAAO,CAAC,OAAO,CAAS;IACxB,+BAA+B;IAC/B,OAAO,CAAC,KAAK,CAAsB;IACnC,8BAA8B;IAC9B,OAAO,CAAC,IAAI,CAA4B;IACxC,sCAAsC;IACtC,OAAO,CAAC,KAAK,CAAS;IACtB,iFAAiF;IACjF,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,aAAa,CAAc;gBAEvB,IAAI,EAAE,sBAAsB;IAcxC,yBAAyB;IACzB,IAAI,IAAI,IAAI,OAAO,CAElB;IAED,uCAAuC;IACvC,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,uBAAuB;IACvB,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,uCAAuC;IACvC,IAAI,UAAU,IAAI,SAAS,YAAY,EAAE,CAExC;IAED,yCAAyC;IACzC,MAAM,IAAI,IAAI;IASd;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAM5B,kDAAkD;IAClD,OAAO,CAAC,MAAM;IASd;;;OAGG;YACW,IAAI;IAkClB,OAAO,CAAC,iBAAiB;IAWzB,OAAO,CAAC,eAAe;IAMvB;;;OAGG;YACW,OAAO;IAiBrB,kDAAkD;IAClD,OAAO,CAAC,MAAM;IASd;;;;OAIG;IACH,OAAO,CAAC,KAAK;IAiBb;;;;;OAKG;YACW,OAAO;IA6CrB;;;OAGG;IACH,OAAO,CAAC,OAAO;CAiEf"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/conversation/index.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAqB,YAAY,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC/F,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAIxD,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,eAAe,EAA2B,MAAM,aAAa,CAAC;AAMvG,MAAM,WAAW,sBAAsB;IACtC,uBAAuB;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,SAAS,CAAC;IAClB,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAClB,QAAQ,EAAE,QAAQ,CAAC;IACnB,oEAAoE;IACpE,KAAK,EAAE,MAAM,CAAC;IACd,yCAAyC;IACzC,WAAW,EAAE,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IACzC,+DAA+D;IAC/D,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,6BAA6B;IAC7B,gBAAgB,EAAE,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;IACnD,OAAO,EAAE,YAAY,CAAC;IACtB,GAAG,EAAE,WAAW,CAAC;IACjB,uDAAuD;IACvD,aAAa,EAAE,MAAM,IAAI,CAAC;CAC1B;AAKD,qBAAa,kBAAkB;IAC9B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAyB;IAC9C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IAEzC,iCAAiC;IACjC,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,eAAe,CAAqC;IAC5D,0BAA0B;IAC1B,OAAO,CAAC,OAAO,CAAS;IACxB,+BAA+B;IAC/B,OAAO,CAAC,KAAK,CAAsB;IACnC,8BAA8B;IAC9B,OAAO,CAAC,IAAI,CAA4B;IACxC,sCAAsC;IACtC,OAAO,CAAC,KAAK,CAAS;IACtB,iFAAiF;IACjF,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,aAAa,CAAc;gBAEvB,IAAI,EAAE,sBAAsB;IAkBxC,2BAA2B;IAC3B,IAAI,IAAI,IAAI,OAAO,CAElB;IAED,uCAAuC;IACvC,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,uBAAuB;IACvB,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,uCAAuC;IACvC,IAAI,UAAU,IAAI,SAAS,YAAY,EAAE,CAExC;IAED,2CAA2C;IAC3C,MAAM,IAAI,IAAI;IAMd;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAM5B,yDAAyD;IACzD,OAAO,CAAC,MAAM;IAQd;;;OAGG;YACW,UAAU;IAgBxB;;;OAGG;YACW,OAAO;IAgBrB,mDAAmD;IACnD,OAAO,CAAC,MAAM;IAMd;;;;OAIG;IACH,OAAO,CAAC,KAAK;IAiBb;;;;;;OAMG;YACW,OAAO;IA+CrB;;;OAGG;IACH,OAAO,CAAC,OAAO;CAqEf"}