feat(consult): 进度、思考、正文三通道在生成时分开（BUG-942/943/944）
This commit is contained in:
jesse-ux
@@ -1,5 +1,11 @@
|
||||
# 印度占星 Skill 更新日志
|
||||
|
||||
## 2026-09-18 — 咨询思考、进度、正文分开生成
|
||||
|
||||
普通咨询的思考区不再从模型内部推理里抠字、也不再把英文词挖掉留下残句。进度是服务端自己报的；思考是一条条完整的中文判断依据；正文只写结论。本命回答的章节改成：先回答你的问题、盘里支持这个判断的地方、时间怎么看、这周可以做的一件事。技法审计表仍在回复下面的折叠面板里，不写进正文。
|
||||
|
||||
分段逐节写作拿掉了，整轮不再共用一把 110 秒闸刀把后半截悄悄掐死。已经写出过正文的，不会再报「本次没有生成回答」。Skill 版本不变。
|
||||
|
||||
## 2026-09-18 — 星盘改用行星符号，度数进行星表
|
||||
|
||||
星盘里的行星从文字换成彩色符号：☉ 日、☽ 月、☿ 水、♀ 金、♂ 火、♃ 木、♄ 土、☊ 罗、☋ 计。以前一宫里三颗星就是三行「水 19°」「罗逆 29°」叠在一起、字被压到最小，现在一宫内符号横排，每行最多三个。
|
||||
|
||||
@@ -12317,3 +12317,51 @@
|
||||
- 相关记录：BUG-924、BUG-927、BUG-933、BUG-935、BUG-939
|
||||
- 复发自：BUG-933
|
||||
- 修复版本：`0378d9e0`
|
||||
|
||||
## BUG-942 | 思维链过滤器在句内删词，连词和孤儿标点留给用户
|
||||
|
||||
- 状态：resolved
|
||||
- 首次发现：2026-09-18
|
||||
- 最近更新：2026-09-18
|
||||
- 影响面：`public-thinking.ts`（已删）、`stream-agent-response.ts`、思考面板
|
||||
- 用户现象：思考区出现 `"这周哪些事最好先放一放" — are put .` 这类残句。
|
||||
- 触发条件：模型 reasoning 含中英夹杂，旧 sanitizer 按句切、从第一个汉字截断、再删 ≥4 字母英文词。
|
||||
- 根因：一个文本通道当三个用，下游用正则当刀。
|
||||
- 修复：删除就地删词。provider reasoning 只打截断日志，不进事件。公开思考改为完整 `think.step`，校验不过整条丢弃。
|
||||
- 验证：`public-thinking.test.ts` 5 条；agentic-runtime 两条 reasoning 合同改为「reasoning 不进公开通道」。
|
||||
- 防复发：新增正则必须能回答「门还是刀」；刀不许进。
|
||||
- 相关记录：BUG-943、BUG-944
|
||||
- 复发自：无
|
||||
- 修复版本：待发布
|
||||
|
||||
## BUG-943 | 本命正文首节是参数罗列、尾节是技法审计表
|
||||
|
||||
- 状态：resolved
|
||||
- 首次发现：2026-09-18
|
||||
- 最近更新：2026-09-18
|
||||
- 影响面：`consultation-thinking-plan.ts`、`product-voice.ts`、咨询正文
|
||||
- 用户现象：回答先堆岁差/宫位，文末再贴技法审计表，问题被挤到后面。
|
||||
- 触发条件：本命咨询走旧 `REPORT_HEADING`（统一参数 / 领域 / 审计表 / 现代生活）。
|
||||
- 根因：方法学记账被当成用户读物。
|
||||
- 修复：正文章节改为「先回答你的问题 / 盘里支持这个判断的地方 / 时间怎么看 / 这周可以做的一件事」。审计表继续走回执折叠面板，不写进正文。
|
||||
- 验证：thinking-plan / voice / timeline 合同。
|
||||
- 防复发：正文出现「统一参数」「技法审计表」算 Pass 4 检测命中。
|
||||
- 相关记录：BUG-298、BUG-942、BUG-944
|
||||
- 复发自：BUG-298
|
||||
- 修复版本：待发布
|
||||
|
||||
## BUG-944 | 整轮共用 110 秒闸门，分段写作被静默掐断后变成空回答
|
||||
|
||||
- 状态：resolved
|
||||
- 首次发现：2026-09-18
|
||||
- 最近更新：2026-09-18
|
||||
- 影响面：`consult/route.ts` `composeSection`、`stream-agent-response.ts` `composeByHeadings`、领域时长常数
|
||||
- 用户现象：等约 110 秒后「本次没有生成回答」。回执分不清模型没写和流被掐。
|
||||
- 触发条件：工具耗时长（实测约 31s/领域），后续逐节写作共用同一个 `AbortSignal.timeout(110_000)`。
|
||||
- 根因：分段写作 + 共享闸刀；abort 没有独立运行步。
|
||||
- 修复：取消逐节 `composeSection` / `section-empty-retry`，一次成文。领域时长按 31s 重算。abort 记 `kind: "abort"`。已有正文片段不得再以 `empty_answer` 结束。
|
||||
- 验证：workflow-contract 与 agentic-runtime composeAnswer 合同。后台 job / 断线重放本轮未做，见进度记录让步。
|
||||
- 防复发：每个 stream 自己的预算；abort 必须留痕。
|
||||
- 相关记录：BUG-942、BUG-943
|
||||
- 复发自：无
|
||||
- 修复版本：待发布
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
# PROGRESS · 咨询三通道重做（2026-09-18）
|
||||
|
||||
工作树：`.worktrees/consult-three-channels-20260918`
|
||||
分支：`codex/consult-three-channels-20260918`
|
||||
基线：`origin/staging` @ `742ffbc6`
|
||||
任务书来源：`origin/docs/three-channel-redesign-20260918`（该分支误把产品三 bug 写成 939–941，staging 上这两号已是门禁合同，落地改号 **BUG-942 / 943 / 944**）
|
||||
|
||||
## 任务状态
|
||||
|
||||
| 任务 | 状态 | 说明 |
|
||||
| --- | --- | --- |
|
||||
| BUG-942 删词刀 | 完成 | 删除 `public-thinking.ts`；reasoning 只打截断日志；`think.step` 整条接受或丢弃 |
|
||||
| BUG-943 正文记账 | 完成 | 本命四标题；审计表不进正文 |
|
||||
| BUG-944 110s 闸刀 | 完成 | 取消 `composeSection` / `section-empty-retry`；一次成文；abort 记 `kind:"abort"`；领域时长 31s |
|
||||
| 事件 v2 | 完成 | `think.plan` / `think.step` / `phase.*`；客户端仍能渲染 v1 `thinking.delta` / `thinking.section` |
|
||||
| 后台 job + 断线重放 | 让步 | 任务书「彻底版建议本单一起做」。本轮未加表、未把 run 搬出 HTTP。预算账本模块已落地，route 仍用总超时 |
|
||||
|
||||
## 让步
|
||||
|
||||
1. Pass 2 未再开一轮模型 JSON：`interpretFindings` 目前只发布计划 id，思考面板先用标题，完整判断句等下一轮接上。
|
||||
2. Pass 4 检测命中只记 `pass4-reject` 运行步，不在已经流出的正文上就地改写，也不回放第二轮（避免闪两次正文）。
|
||||
3. 未做后台 job / 事件日志表 / `runId` 重放。
|
||||
|
||||
## 测试
|
||||
|
||||
| 项 | 结果 |
|
||||
| --- | --- |
|
||||
| `tsc --noEmit` | 0 错 |
|
||||
| 定向 tsx | thinking-plan / workflow-contract / timeline / voice / birth-accuracy / public-thinking / timing-guard / chat-answer-split 等 **56+ 绿** |
|
||||
| `consultation-agentic-runtime.test.ts` | 本机 Windows `EPERM` skill symlink 无法加载，逻辑已按 v2 改写，以 Linux 门禁为准 |
|
||||
| 全量 `npm test` | 以门禁为准 |
|
||||
@@ -135,6 +135,7 @@
|
||||
| `TASK-session-list-single-source-20260917.md` | `PROGRESS-session-list-single-source-20260917.md` | 会话列表一处数据源：本地 PG 兼容层 `order()` 只保留最后一键，`/api/sessions` 实际按 `id` 排、与游标不一致；`/` 与次级页两份数据源、`/` 每次回来重启动（产品拍板：首页与三个次级页进同一路由组，侧栏外壳与列表 provider 常驻 layout，不做 store）；空「新对话」落库堆积（首页 50 条里 28 条）；标题类别在后、同名靠墙钟 HH:MM。串行在 composer-guard 单之后。BUG 段 926 起 | 验收未通过 | `e4e73f56`（实现按任务书落地：多键排序 / `(app)` 路由组常驻外壳 / provider / 空会话不入列 + draft 复用 / 标题类别在前；两条让步任务书允许。**P1：4 条针对 `page.tsx` 的源码合同没跟着外壳搬家，`npm test` 在门禁里 `set -e` 下必红，staging 至今停在 `dc2f2a16`**。另：进度记录报「tsc 0 错」实为 2 错，只跑了定向测试。修复单 `TASK-session-list-single-source-fix-20260917.md`） |
|
||||
| `TASK-session-list-single-source-fix-20260917.md` | `PROGRESS-session-list-single-source-fix-20260917.md` | 验收修复单：F1 四条源码合同搬到 `(app)/layout.tsx` 两端对断（BUG-933）；F2 两条陈旧 Python 入口断言（BUG-934，既有欠账）；F3 无活跃会话时输入框静默吞发送（BUG-935）；交付前必须跑全量测试 | 待验收 | `codex/session-list-single-source-fix-20260917` |
|
||||
| — | `PROGRESS-birth-time-journey-page-path-20260918.md` | **P0 门禁**：`test_birth_time_journey_contract` 仍读已搬走的 `app/page.tsx`（BUG-939）；修好后 run 2764 又露出 5 条校正守卫后的前端源码合同（BUG-940）。均复发自 BUG-933 | 已合入 | `39a0d7a9` / `0378d9e0` |
|
||||
| `TASK-consult-three-channels-20260918.md` | `PROGRESS-consult-three-channels-20260918.md` | 咨询运行时三通道：进度 / 思考 / 正文生成时分离。设计分支误用 BUG-939/940/941，落地改号 942–944 | 执行中 | `codex/consult-three-channels-20260918` |
|
||||
| `TASK-first-paint-dead-screen-fallback-20260917.md` | — | 真机：首页永远停在「正在载入账户」，兜底全在没跑起来的 bundle 里（BUG-936 investigating）。根 layout 加与 bundle 无关的内联兜底 + 去掉本仓正则后行断言 | 待领取 | — |
|
||||
| `TASK-consultation-answer-start-anchor-20260917.md` | `PROGRESS-consultation-answer-start-anchor-20260917.md` | 主会话回答落在结尾：`useConversationScrollAnchor` 是贴底跟随，流式期间视口钉在最后一个字，回答开头滚出视口；改为发送后问题钉顶、回答向下长、长出视口显示「跳到最新」、末尾动态留白；产品追加拍板：校正面同一语义（推翻 BUG-041/048 贴底），本轮开头 = 用户行或新助手行。BUG 段 930 起 | 已验收（经修复单） | `worktree/green-harbor-5be3` |
|
||||
| `TASK-consultation-answer-start-anchor-fix-20260917.md` | `PROGRESS-consultation-answer-start-anchor-fix-20260917.md` | 验收修复单：F1 头就是留白行时留白按整视口算（BUG-931）；F2 留白只在钉住期间存在（BUG-932）；前置：先修 e4e73f56 的两处 TS 错否则门禁不过 | 已验收 | `cc1a8980`（Claude 验收：tsc 0 / lint 0 error / npm test 3457 条 39 红与 11c0028d 逐条一致、新增 2 条绿 / `next build --webpack` 通过、`/` Static、首屏 gzip 591,242（较 09-16 基线 582,800 +1.45%，含会话列表单）/ Chrome 真实布局 S1–S6 全部通过，S6 新助手行距顶 16px 且增高不动，S5 不再写留白）；真机六条欠 |
|
||||
|
||||
@@ -0,0 +1,105 @@
|
||||
# TASK · 咨询运行时重做：进度 / 思考 / 正文三通道在生成时分离（2026-09-18）
|
||||
|
||||
> 落地分支：codex/consult-three-channels-20260918，基线 origin/staging @ 742ffbc6。
|
||||
> 设计稿把三则产品 bug 写成 BUG-939/940/941，与 staging 上门禁合同编号冲突，实现改号 **BUG-942（删词）/ BUG-943（正文记账）/ BUG-944（110s 闸刀）**。
|
||||
|
||||
|
||||
分支：`docs/three-channel-redesign-20260918`。基线 `origin/staging` = `5a1dcbd2`。
|
||||
目标：**干净的思考内容可展示、进度可见、正文只剩结论，三者互不混流，且回答质量不下降。**
|
||||
代价不设限（可以多跑模型轮次、可以落库、可以把运行搬出 HTTP 请求），但不得靠事后正则修补。
|
||||
|
||||
## 0. 病根一句话
|
||||
|
||||
产品把**一个文本通道**当三个用，然后在下游用正则把它们劈开。凡是「先混流、再过滤」的设计，过滤器迟早在错误的时刻删掉正确的东西——这正是现在同时产生「脏思维链」「正文里有思考」「空回答」的同一个根。
|
||||
|
||||
实证（`origin/staging` 行号，会漂）：
|
||||
|
||||
- `frontend/src/lib/public-thinking.ts:27-33`：一句话通过 CJK 门之后，还要 `.replace(/[A-Za-z]{4,}/g, "")` 删掉所有 ≥4 字母的英文词。模型原句 `The user asked "这周哪些事最好先放一放" — are put off.` 先被 `buffer.slice(cjk)` 从第一个汉字截断（留下孤儿引号和破折号），再被删词（`asked`/`user` 没了，`are`/`put`/`the` 三字母以内全留），输出 `"这周哪些事最好先放一放" — are put .`。**不是模型乱，是过滤器把信息量最大的词删了、把连词留下了。**
|
||||
- `frontend/src/lib/consultation-thinking-plan.ts:12-16`：本命正文章节 = `统一参数与原始结构` + 各领域 + `技法审计表` + `现代生活`。正文第一节就是岁差/上升/宫位罗列，倒数第二节是技法审计表——方法学记账被当成用户读物。同文件 `DAILY_HEADING` 已经是干净口径，本命路线没跟上。
|
||||
- `frontend/src/app/api/consult/route.ts:898`：整轮只有一个 `AbortSignal.timeout(110_000)`，被首轮、工具、每一节分段写作、续写、重试**共用**。2026-09-18 的 run `1b81e263`：工具 61.7s（2 领域 ≈31s/个，而预算常数 `consultation-tools.ts:93` 写的是 21s），随后 5 节写作全部无 thinking、无 text、无 error chunk（`stream-agent-response.ts:408` 会把 error 记成 `model-stream-error`，回执里一条都没有）——**沉默流 = 被掐断的流**，于是 5 次 `section-empty-retry` + 1 次 `answer-retry` → `empty_answer`，用户等 110 秒拿到一句「本次没有生成回答」。
|
||||
|
||||
## 1. 四条设计原则
|
||||
|
||||
- **P1 三通道在生成时就分开。** 进度是服务端确定性事件；思考是模型**有意写给用户**的结构化条目；正文只有结论散文。任何通道都不靠下游切分得到。
|
||||
- **P2 provider 的 reasoning token 永不外发。** `thinking: "enabled"` 保留（它提升质量），但 `reasoning-delta` 只进服务端日志（截断 + 有保留期），不进事件流、不进数据库可见字段、不进 UI。展示给用户的「思考」是产品产物，不是 CoT 抓取。
|
||||
- **P3 正则只能当门，不能当刀。** 用正则判断「接受 / 拒绝 / 重来」可以；用正则**就地删词、挖空、替换半句**一律删除。这条同时判掉思维链的 `[A-Za-z]{4,}` 删词和正文的 `[具体时间已省略]` 就地替换。
|
||||
- **P4 时钟是预算，不是闸刀。** 每个阶段开工前向账本要时间；要不到就降级（少领域、少条目、单段成文），不允许静默 abort。任何 abort 必须在回执里留痕。
|
||||
|
||||
## 2. 新运行时：四个 pass + 一个预算账本
|
||||
|
||||
```
|
||||
Pass 0 服务端确定性 绑方法、定路由、定主题（入口钉死） 无模型
|
||||
Pass 1 读题与取证计划 结构化 JSON：reading + steps[] + domains[] 模型
|
||||
→ 计算开始前就把「思考」面板填满，用户在 60s 计算期有东西看
|
||||
计算 逐领域执行 确定性进度事件 progress{current,total} 无模型
|
||||
→ Pass 1 的 step 状态 pending → running → done
|
||||
Pass 2 证据解读 每个 step 产出 {stepId, finding, refs, confidence} 模型
|
||||
→ 这就是用户看到的「思考内容」：中文、成句、可校验；同时是写作输入
|
||||
Pass 3 成文 只写结论散文，输入 = 问题 + 证据契约 + findings 模型
|
||||
Pass 4 合规校验 检测越权断言；不通过则指名违规句退回 Pass 3 重写 模型/确定性
|
||||
```
|
||||
|
||||
要点：
|
||||
|
||||
1. **思考通道不再是碎片流。** `think.step` 一次发一条**完整条目**，不发 chunk。没有 chunk 就没有「按 chunk 过滤」这回事，`public-thinking.ts` 整个消失。要打字机效果，前端对完整条目做动画，不要靠网络分片。
|
||||
2. **正文一次成文。** 取消 `composeSection` 的逐节往返（`route.ts:1185-1203`）：大输出预算 + 只有 `finishReason=length` 才续写。进度粒度由 think 通道提供，不再需要用分段来制造「正在写 X」。
|
||||
3. **Pass 2 是 grounding 步骤，不是装饰。** 强制模型先把证据显式转成带出处的结论候选，再写散文——这通常**提升**质量（少空话、少幻觉），也让「思考内容」天然可读。
|
||||
4. **诚实性红线：** Pass 2 是模型为用户重述的推理依据，**不等于** provider 内部 CoT。UI 文案只能叫「推理过程 / 判断依据」，不得宣称是模型的真实思考。
|
||||
|
||||
### 事件协议 v2
|
||||
|
||||
```jsonc
|
||||
run.started {runId, requestId}
|
||||
phase.started {phase, label, progress?: {current, total}} // 确定性，永不含模型文本
|
||||
phase.completed {phase, durationMs}
|
||||
think.plan {steps: [{id, title}]} // Pass 1
|
||||
think.step {id, status: "running"|"done", text?} // Pass 2，一条完整条目
|
||||
answer.delta {text} // Pass 3，只有散文
|
||||
run.completed {receipt} | run.failed {code, receipt}
|
||||
```
|
||||
|
||||
- `thinking.delta` 从协议里**删除**。`thinking.section` 由 `think.plan` + `think.step` 取代。
|
||||
- 每条 `think.step.text` 过 zod（长度、必须成句、必须含 CJK）；**校验不过就丢掉这一条并按计划标签兜底，绝不改写这条的字**。这是 P3 的落点。
|
||||
- 客户端三个区域各认各的事件：进度条认 `phase.*`，思考面板认 `think.*`，正文认 `answer.*`。现有 `ConsultationRunTimeline` 的 method/calculate/think/write 四类行可以直接接 v2，不用重画。
|
||||
|
||||
## 3. 删除清单（不是改造，是删掉）
|
||||
|
||||
1. `frontend/src/lib/public-thinking.ts` —— 整个文件。
|
||||
2. `frontend/src/lib/stream-agent-response.ts` 的两处 `reasoning-delta → thinking.delta` 映射（约 277、431 行）。reasoning 改为只写服务端日志。
|
||||
3. `frontend/src/lib/consultation-agent-events.ts` 的 `thinkingDeltaSchema` 与 `thinkingSectionEventSchema`（v2 用新事件）。
|
||||
4. `frontend/src/lib/consultation-run-timeline.ts` 里 `thinking.delta` 的兜底分支（约 107 行）。
|
||||
5. `frontend/src/lib/timing-output-guard.ts` 的**就地替换**：`exactTimingPatterns` → `[具体时间已省略]`、`guaranteeConclusionPatterns` → `[保证性结论已省略]`、`guardGeneralNoBirthTimeOutput` 的整句替换。正则本身**保留为检测器**供 Pass 4 判定，但不得再写回文本。
|
||||
6. `route.ts` 的 `composeSection` / `stream-agent-response.ts` 的 `composeByHeadings` + `section-empty-retry`（一次成文后它们没有存在理由）。
|
||||
|
||||
## 4. 正文长什么样
|
||||
|
||||
- 章节改成面向问题的口径（照 `DAILY_HEADING` 的形状重做本命计划），例如：`先回答你的问题` / `盘里支持这个判断的地方` / `时间怎么看` / `这周可以做的一件事`。
|
||||
- `统一参数与原始结构`、`技法审计表` 退出正文，改由**证据面板**渲染——数据本来就是结构化的（`workflowReceipt`、`techniqueAuditTable`），不需要模型复述成散文。面板默认折叠。
|
||||
- 正文里出现 `##统一参数`、技法审计行、领域 id、英文术语堆砌，一律算 Pass 4 不通过。
|
||||
|
||||
## 5. 时钟与预算（治 `empty_answer`，顺带让「慢」变成可见进度）
|
||||
|
||||
- 一个 run 一本**预算账本**：`{总预算, 已用, 每阶段预留}`。每个阶段开工前申请，不足就降级而不是硬跑。
|
||||
- 每个 stream 自己的 AbortSignal = `min(阶段预算, 剩余总预算)`；**任何 abort 追加一条 `kind:"abort"` 运行步**，回执必须能区分「模型没写」和「流被掐」——现在两者长得一模一样，这是这次查不出来的直接原因。
|
||||
- 领域时长常数按实测重算（当前实测 ≈31s/领域，常数写的 21s），上限随之下调；`CONSULTATION_ANSWER_RESERVE_MS` 是给「一次成文」设计的，一次成文回归后它才重新成立。
|
||||
- 彻底版（建议本单一起做）：**把 run 从 HTTP 请求里搬出来**——后台 job + 事件日志表 + 客户端按 `runId` 断线重放。函数 120s 上限不再是产品上限；同时 evidence packet 随 job 落库，**追问直接复用**，不必重跑 60s 计算（这也顺手修掉声明窗口路线「existing packet 根本不存在」的那条自相矛盾）。
|
||||
|
||||
## 6. 怎么证明「质量没下降」
|
||||
|
||||
改前改后各跑同一组 20 条真实问题（覆盖本命 / 声明窗口 / 无分钟 / 今日入口），记录：
|
||||
|
||||
| 口径 | 方法 | 要求 |
|
||||
|---|---|---|
|
||||
| 结论具体性、证据引用、可读性 | 人工双盲打分 | 不低于基线 |
|
||||
| 越权断言条数 | Pass 4 检测器统计 | ≤ 基线，且**改写次数为 0**（现在是每次都在改写） |
|
||||
| 正文里方法学记账段落数 | 关键词扫描 | 0 |
|
||||
| 思考面板可读性 | 人工 | 每条成句、中文、无孤儿标点 |
|
||||
| 首字延迟 / 总时长 / 失败率 | 埋点 | 失败率下降；总时长不劣于基线 |
|
||||
|
||||
## 7. 硬红线
|
||||
|
||||
1. 不得再出现「先混流再过滤」的新代码。新增正则必须能回答「它是门还是刀」，是刀就不许进。
|
||||
2. `tsc --noEmit` 0 错、`npm run lint` 0 error；测试总数不得低于基线。删掉的 `public-thinking` 相关断言必须被 v2 的「校验不过整条丢弃」断言替代，不能净减。
|
||||
3. provider reasoning 不得出现在任何对外事件、数据库可见字段或日志的完整原文里（日志只留截断 + 保留期）。
|
||||
4. 事件协议 v2 与 v1 并行一个发布周期，客户端两者都能渲染；回执 schema 仍是 strict，新增字段走白名单。
|
||||
5. 任何一次 run 只要已经产出过正文片段，就不得以 `empty_answer` 结束。
|
||||
+2
-2
@@ -373,14 +373,14 @@ The birth-time rectification session is the consultation transcript plus a house
|
||||
|
||||
#### Streaming states
|
||||
|
||||
Every assistant reply moves through the same states on both chat surfaces, and each state has exactly one visual. The step timeline (`ConsultationRunTimeline`) is the only activity surface; the rectification session projects its tool trace onto the same rows and differs only in that it never shows thinking text, because the server drops rectification `thinking.delta` at the public boundary.
|
||||
Every assistant reply moves through the same states on both chat surfaces, and each state has exactly one visual. The step timeline (`ConsultationRunTimeline`) is the only activity surface. Consultation thinking is complete `think.step` items (v1 `thinking.delta` still renders for one release). Rectification never shows thinking text: provider reasoning is dropped at the public boundary.
|
||||
|
||||
| State | When | Visible | Transition in |
|
||||
|---|---|---|---|
|
||||
| `queued` | request sent, no server event yet | timeline open with one live row “正在处理…” (spinner + shimmer label), summary “正在分析” | row enters with the message |
|
||||
| `loading-method` | `skill.started` | live method row | label swap, 120ms fade |
|
||||
| `calculating` | `tool.started` / chart activity | live calculate row; completed rows above it show the check marker | label swap, 120ms fade |
|
||||
| `thinking` | `thinking.section` / `thinking.delta` | live think row; thinking text inside the row, paced per frame | label swap, 120ms fade |
|
||||
| `thinking` | `think.plan` / `think.step` (and v1 `thinking.section` / `thinking.delta`) | live think row; complete step text inside the row | label swap, 120ms fade |
|
||||
| `composing` | first `answer.delta` | live write row; answer text below the timeline, released per frame | answer paragraphs appear as text, no per-token animation |
|
||||
| `settled` | `run.completed` | summary becomes “已完成 N 步”, timeline collapses in place unless the reader opened or closed it themselves; actions and follow-ups appear | 180ms height transition, 120ms label fade |
|
||||
| `stopped` | the reader pressed stop | whatever streamed stays; a grey caption under the body says the run stopped and was not billed | none |
|
||||
|
||||
@@ -39,8 +39,9 @@ import { createAdminSupabaseClient } from "@/lib/supabase/admin";
|
||||
import { createServerSupabaseClient } from "@/lib/supabase/server";
|
||||
import { streamTextResponse } from "@/lib/stream-text-response";
|
||||
import { streamAgentResponse } from "@/lib/stream-agent-response";
|
||||
import { detectMethodologyBookkeeping } from "@/lib/timing-output-guard";
|
||||
import type { AgentExecutionReceipt, WorkflowReceipt } from "@/lib/consultation-agent-events";
|
||||
import { consultationContinuePrompt, consultationSectionPrompt, type PublicThinkingSection } from "@/lib/consultation-thinking-plan";
|
||||
import { consultationComposePrompt, consultationContinuePrompt, natalConsultationThinkingPlan, type PublicThinkingSection } from "@/lib/consultation-thinking-plan";
|
||||
import {
|
||||
AGENT_MAX_STEPS,
|
||||
AGENT_TIMEOUT_MS,
|
||||
@@ -49,7 +50,6 @@ import {
|
||||
consultationGenerationSettings,
|
||||
consultationNatalPrepareStep,
|
||||
consultationWindowPrepareStep,
|
||||
consultationSliceGenerationSettings,
|
||||
createConsultationAgentContext,
|
||||
createWindowConsultationAgentContext,
|
||||
consultationModelStepTelemetry,
|
||||
@@ -858,7 +858,7 @@ export async function POST(request: Request) {
|
||||
: "如需新的个人星盘结论，必须调用服务器绑定的排盘工具。";
|
||||
const natalInstruction = consultEntrypoint === "daily_starlanguage"
|
||||
? `${natalToolInstruction}按三节写：今日趋势、适合推进 / 需要避开、一个行动（把技法审计表和「探索性日提示，不是确定预测」放进最后一节）。不要复述内部 JSON 字段。`
|
||||
: `${natalToolInstruction}事业/财富/婚恋/家庭按 skill Level 2 模板写：原始结构、六步宫位、Yoga 表、时机、综合、文末技法审计表，然后才是现代生活措辞。不要复述内部 JSON 字段。`;
|
||||
: `${natalToolInstruction}事业/财富/婚恋/家庭先给口语开场，再按四个标题写结论：先回答你的问题、盘里支持这个判断的地方、时间怎么看、这周可以做的一件事。不要把统一参数或技法审计表写进正文。不要复述内部 JSON 字段。`;
|
||||
const adoptedRangeNote = consultationMode === "verified_chart"
|
||||
&& prepared.serverChart?.truth.birthTimeStatus === "accepted"
|
||||
&& prepared.serverChart.toolInput.candidate_range
|
||||
@@ -1131,6 +1131,9 @@ export async function POST(request: Request) {
|
||||
}
|
||||
|
||||
if (!prepared.serverChart) throw new Error("server_chart_truth_missing");
|
||||
state.thinkingPlan = natalConsultationThinkingPlan({
|
||||
domains: [consultationTheme],
|
||||
});
|
||||
const agentContext = createConsultationAgentContext({
|
||||
userId,
|
||||
sessionId,
|
||||
@@ -1182,24 +1185,21 @@ export async function POST(request: Request) {
|
||||
usages.push(continued.totalUsage);
|
||||
return continued.fullStream;
|
||||
};
|
||||
const composeSection = async (
|
||||
heading: string,
|
||||
priorOutput: string,
|
||||
reason: "write" | "empty-retry" = "write",
|
||||
) => {
|
||||
const sliced = await agent.stream([
|
||||
const interpretFindings = async () => (
|
||||
(state.thinkingPlan ?? []).map((section) => ({ id: section.id }))
|
||||
);
|
||||
const composeAnswer = async () => {
|
||||
const composed = await agent.stream([
|
||||
...baseMessages,
|
||||
...(priorOutput.trim() ? [{ role: "assistant" as const, content: priorOutput }] : []),
|
||||
{ role: "user" as const, content: consultationSectionPrompt(heading, priorOutput, { reason }) },
|
||||
{ role: "user" as const, content: consultationComposePrompt() },
|
||||
], {
|
||||
...streamOptions,
|
||||
maxSteps: AGENT_SLICE_MAX_STEPS,
|
||||
// 原值：分段可调工具 → 新值：分段禁用 → 决策 3
|
||||
toolChoice: "none",
|
||||
...consultationSliceGenerationSettings(selectedModel.model),
|
||||
...consultationContinueGenerationSettings(selectedModel.model),
|
||||
});
|
||||
usages.push(sliced.totalUsage);
|
||||
return sliced.fullStream;
|
||||
usages.push(composed.totalUsage);
|
||||
return composed.fullStream;
|
||||
};
|
||||
const executionReceipt = (): AgentExecutionReceipt => ({
|
||||
runId: requestId,
|
||||
@@ -1228,7 +1228,9 @@ export async function POST(request: Request) {
|
||||
retry,
|
||||
retryForAnswer,
|
||||
continueAfterLength,
|
||||
composeSection,
|
||||
interpretFindings,
|
||||
composeAnswer,
|
||||
pass4Violations: (text) => detectMethodologyBookkeeping(text).map((item) => item.kind),
|
||||
continueAfterDisconnect: true,
|
||||
transformText: (text) => createBirthTimeModeOutputGuard(
|
||||
consultationMode,
|
||||
|
||||
@@ -869,6 +869,10 @@ export function useConsultationRun(params: ConsultationRunParams) {
|
||||
streamedThinking += event.text;
|
||||
frames.setThinking(streamedThinking);
|
||||
}
|
||||
if (event.type === "think.step" && event.text) {
|
||||
streamedThinking += event.text;
|
||||
frames.setThinking(streamedThinking);
|
||||
}
|
||||
if (event.type === "thinking.section") {
|
||||
thinkingSections = applyThinkingSectionProgress(
|
||||
upsertThinkingSection(thinkingSections, {
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
* DeepSeek hidden reasoning and visible content can share one `max_tokens`
|
||||
* cap. The spoken budget stays 16384; when provider thinking is on, the
|
||||
* output cap is spoken + thinking so CoT cannot pinch the user-facing reply.
|
||||
* Reasoning must travel on `reasoning-delta` / `thinking.delta`, never on
|
||||
* `answer.delta`.
|
||||
* Reasoning stays on `reasoning-delta` and is logged truncated; it never
|
||||
* becomes `answer.delta` or a public think event.
|
||||
*/
|
||||
export const AGENT_ANSWER_OUTPUT_TOKENS = 16_384;
|
||||
export const AGENT_THINKING_OUTPUT_TOKENS = 8_192;
|
||||
|
||||
@@ -48,6 +48,8 @@ export function splitSpokenAndReport(text: string): SpokenAndReportSplit {
|
||||
|
||||
export function shortenAnswerHeading(heading: string): string {
|
||||
if (heading === "统一参数与原始结构") return "统一参数";
|
||||
if (heading === "先回答你的问题") return "先回答";
|
||||
if (heading === "盘里支持这个判断的地方") return "盘上依据";
|
||||
if (heading === "技法审计表") return "技法审计";
|
||||
return heading;
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ export type TechniqueAuditRow = z.infer<typeof techniqueAuditRowSchema>;
|
||||
|
||||
const executionStepSchema = z.object({
|
||||
sequence: z.number().int().min(1).max(32),
|
||||
kind: z.enum(["skill", "tool", "validation"]),
|
||||
kind: z.enum(["skill", "tool", "validation", "abort"]),
|
||||
name: z.string().max(120),
|
||||
status: z.enum(["completed", "failed"]),
|
||||
durationMs: z.number().int().min(0).optional(),
|
||||
@@ -102,6 +102,33 @@ const thinkingDeltaSchema = z.object({ type: z.literal("thinking.delta"), text:
|
||||
const thinkingSectionEventSchema = publicThinkingSectionSchema.extend({
|
||||
type: z.literal("thinking.section"),
|
||||
}).strict();
|
||||
const phaseStartedSchema = z.object({
|
||||
type: z.literal("phase.started"),
|
||||
phase: z.string().min(1).max(40),
|
||||
label: z.string().max(120),
|
||||
progress: z.object({
|
||||
current: z.number().int().min(0).max(32),
|
||||
total: z.number().int().min(1).max(32),
|
||||
}).strict().optional(),
|
||||
}).strict();
|
||||
const phaseCompletedSchema = z.object({
|
||||
type: z.literal("phase.completed"),
|
||||
phase: z.string().min(1).max(40),
|
||||
durationMs: z.number().int().min(0),
|
||||
}).strict();
|
||||
const thinkPlanSchema = z.object({
|
||||
type: z.literal("think.plan"),
|
||||
steps: z.array(z.object({
|
||||
id: z.string().min(1).max(80),
|
||||
title: z.string().min(1).max(120),
|
||||
}).strict()).min(1).max(12),
|
||||
}).strict();
|
||||
const thinkStepSchema = z.object({
|
||||
type: z.literal("think.step"),
|
||||
id: z.string().min(1).max(80),
|
||||
status: z.enum(["running", "done"]),
|
||||
text: z.string().min(1).max(400).optional(),
|
||||
}).strict();
|
||||
const sessionTitleSchema = z.object({
|
||||
type: z.literal("session.title"),
|
||||
title: z.string().trim().min(1).max(48),
|
||||
@@ -121,7 +148,8 @@ const runFailedSchema = z.object({
|
||||
export const consultationAgentPublicEventSchema = z.discriminatedUnion("type", [
|
||||
runStartedSchema, skillStartedSchema, skillCompletedSchema, toolStartedSchema, activitySchema,
|
||||
toolCompletedSchema, toolFailedSchema, answerDeltaSchema, thinkingDeltaSchema,
|
||||
thinkingSectionEventSchema, sessionTitleSchema, runCompletedSchema, runFailedSchema,
|
||||
thinkingSectionEventSchema, phaseStartedSchema, phaseCompletedSchema, thinkPlanSchema,
|
||||
thinkStepSchema, sessionTitleSchema, runCompletedSchema, runFailedSchema,
|
||||
]);
|
||||
export type ConsultationAgentPublicEvent = z.infer<typeof consultationAgentPublicEventSchema>;
|
||||
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
export const CONSULTATION_TOTAL_BUDGET_MS = 110_000;
|
||||
export const CONSULTATION_INTERPRET_RESERVE_MS = 20_000;
|
||||
export const CONSULTATION_ANSWER_RESERVE_MS = 45_000;
|
||||
|
||||
export type ConsultationBudgetStage = "tool" | "interpret" | "compose";
|
||||
|
||||
export type ConsultationBudgetGrant = Readonly<{
|
||||
stage: ConsultationBudgetStage;
|
||||
requestedMs: number;
|
||||
grantedMs: number;
|
||||
remainingMs: number;
|
||||
degraded: boolean;
|
||||
}>;
|
||||
|
||||
export type ConsultationBudget = {
|
||||
readonly totalMs: number;
|
||||
usedMs: number;
|
||||
take(stage: ConsultationBudgetStage, requestedMs: number): ConsultationBudgetGrant;
|
||||
remainingMs(): number;
|
||||
abortSignal(grantedMs: number): AbortSignal;
|
||||
};
|
||||
|
||||
export function createConsultationBudget(
|
||||
totalMs = CONSULTATION_TOTAL_BUDGET_MS,
|
||||
): ConsultationBudget {
|
||||
let usedMs = 0;
|
||||
return {
|
||||
totalMs,
|
||||
get usedMs() {
|
||||
return usedMs;
|
||||
},
|
||||
set usedMs(value: number) {
|
||||
usedMs = Math.max(0, value);
|
||||
},
|
||||
remainingMs() {
|
||||
return Math.max(0, totalMs - usedMs);
|
||||
},
|
||||
take(stage, requestedMs) {
|
||||
const remainingMs = Math.max(0, totalMs - usedMs);
|
||||
const grantedMs = Math.max(0, Math.min(requestedMs, remainingMs));
|
||||
return {
|
||||
stage,
|
||||
requestedMs,
|
||||
grantedMs,
|
||||
remainingMs: remainingMs - grantedMs,
|
||||
degraded: grantedMs < requestedMs,
|
||||
};
|
||||
},
|
||||
abortSignal(grantedMs) {
|
||||
return AbortSignal.timeout(Math.max(1, grantedMs));
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
export function logTruncatedReasoning(requestId: string, text: string): void {
|
||||
const trimmed = text.trim();
|
||||
if (!trimmed) return;
|
||||
console.info("[consult-reasoning]", {
|
||||
requestId,
|
||||
length: trimmed.length,
|
||||
head: trimmed.slice(0, 80),
|
||||
});
|
||||
}
|
||||
@@ -88,6 +88,38 @@ export function reduceConsultationTimeline(
|
||||
if (event.type === "tool.failed") {
|
||||
return completeRow(state, CALCULATE_ID, CONSULTATION_DONE_CHART_LABEL);
|
||||
}
|
||||
if (event.type === "think.plan") {
|
||||
let next = completeLiveThink(state);
|
||||
for (const step of event.steps) {
|
||||
next = upsertRow(next, {
|
||||
id: `think-${step.id}`,
|
||||
kind: "think",
|
||||
status: "live",
|
||||
label: consultationThinkTitle(step.title),
|
||||
});
|
||||
}
|
||||
return next;
|
||||
}
|
||||
if (event.type === "think.step") {
|
||||
const id = `think-${event.id}`;
|
||||
const existing = state.rows.find((row) => row.id === id);
|
||||
const thinkingText = event.text
|
||||
? `${existing?.thinkingText ?? ""}${event.text}`.slice(0, 4_000)
|
||||
: existing?.thinkingText;
|
||||
return upsertRow(state, {
|
||||
id,
|
||||
kind: "think",
|
||||
status: event.status === "done" ? "done" : "live",
|
||||
label: existing?.label ?? consultationThinkTitle("判断依据"),
|
||||
thinkingText,
|
||||
});
|
||||
}
|
||||
if (event.type === "phase.started") {
|
||||
if (event.phase === "compose") {
|
||||
return upsertWrite(completeLiveThink(state), event.label);
|
||||
}
|
||||
return state;
|
||||
}
|
||||
if (event.type === "thinking.section") {
|
||||
const section: PublicThinkingSection = {
|
||||
id: event.id,
|
||||
@@ -158,7 +190,7 @@ export function consultationTimelineFromSettled(input: {
|
||||
{ type: "skill.completed", name: "jyotish-vedic-astrology" },
|
||||
];
|
||||
const calculated = receipt?.steps.some((step) => step.kind === "tool")
|
||||
|| sections.some((section) => section.id.startsWith("domain-"));
|
||||
|| sections.some((section) => section.id.startsWith("domain-") || section.id === "support");
|
||||
if (calculated) {
|
||||
events.push({
|
||||
type: "tool.started",
|
||||
@@ -220,9 +252,15 @@ function queriesFromSection(section: PublicThinkingSection): string[] {
|
||||
const domain = section.id.startsWith("domain-")
|
||||
? normalizeConsultationDomain(section.id.slice("domain-".length))
|
||||
: null;
|
||||
if (!domain) return [];
|
||||
const definition = consultationDomainDefinition(domain);
|
||||
return uniqueLabels([definition.label, ...definition.evidencePreview]).slice(0, 8);
|
||||
if (domain) {
|
||||
const definition = consultationDomainDefinition(domain);
|
||||
return uniqueLabels([definition.label, ...definition.evidencePreview]).slice(0, 8);
|
||||
}
|
||||
return uniqueLabels(section.steps
|
||||
.flatMap((step) => {
|
||||
const domainLabel = /^(事业|财富|关系|家庭)/.exec(step.label)?.[1];
|
||||
return domainLabel ? [domainLabel] : [];
|
||||
})).slice(0, 8);
|
||||
}
|
||||
|
||||
function sourcesFromSection(section: PublicThinkingSection): string[] {
|
||||
|
||||
@@ -10,9 +10,10 @@ export type ThinkingStepStatus = (typeof THINKING_STEP_STATUSES)[number];
|
||||
export const VISIBLE_THINKING_STEP_LIMIT = 4;
|
||||
|
||||
export const REPORT_HEADING = {
|
||||
foundation: "统一参数与原始结构",
|
||||
audit: "技法审计表",
|
||||
wrap: "现代生活",
|
||||
question: "先回答你的问题",
|
||||
support: "盘里支持这个判断的地方",
|
||||
timing: "时间怎么看",
|
||||
action: "这周可以做的一件事",
|
||||
} as const;
|
||||
|
||||
export const DAILY_HEADING = {
|
||||
@@ -22,13 +23,11 @@ export const DAILY_HEADING = {
|
||||
} as const;
|
||||
|
||||
const BLOCK_STEP_LABELS: Readonly<Record<string, string>> = {
|
||||
raw_structure: "列出岁差、上升与宫位结构",
|
||||
raw_structure: "对照盘上已经算好的结构",
|
||||
raman_six_step: "按六步宫位判断问题宫",
|
||||
yoga_table: "核对应 Yoga 的成立与落空",
|
||||
timing: "对照当前大运与行运",
|
||||
synthesis: "综合强弱与下一步",
|
||||
technique_audit_table: "贴上技法审计表",
|
||||
modern_wrap: "用现代生活语言收口",
|
||||
};
|
||||
|
||||
const TOOLISH_STEP_RE = /(?:rectification|run-jyotish)-[a-z0-9-]+|skill_read|proposedKind|validationErrors/i;
|
||||
@@ -73,23 +72,19 @@ function layerSteps(layers: readonly string[] | undefined, prefix: string): Arra
|
||||
));
|
||||
}
|
||||
|
||||
export function consultationReportHeadings(domains: readonly ConsultationDomain[]): string[] {
|
||||
export function consultationReportHeadings(_domains: readonly ConsultationDomain[] = []): string[] {
|
||||
return [
|
||||
REPORT_HEADING.foundation,
|
||||
...domains.map((domain) => consultationDomainDefinition(domain).label),
|
||||
REPORT_HEADING.audit,
|
||||
REPORT_HEADING.wrap,
|
||||
REPORT_HEADING.question,
|
||||
REPORT_HEADING.support,
|
||||
REPORT_HEADING.timing,
|
||||
REPORT_HEADING.action,
|
||||
];
|
||||
}
|
||||
|
||||
export function consultationComposeHeadingGroups(
|
||||
export function thinkPlanSteps(
|
||||
plan: readonly PublicThinkingSection[],
|
||||
): Array<{ section: PublicThinkingSection; headings: readonly string[] }> {
|
||||
return plan.map((section) => (
|
||||
section.id === "close"
|
||||
? { section, headings: [REPORT_HEADING.audit, REPORT_HEADING.wrap] }
|
||||
: { section, headings: [section.heading] }
|
||||
));
|
||||
): Array<{ id: string; title: string }> {
|
||||
return plan.map((section) => ({ id: section.id, title: section.title }));
|
||||
}
|
||||
|
||||
export function natalConsultationThinkingPlan(input: {
|
||||
@@ -99,63 +94,56 @@ export function natalConsultationThinkingPlan(input: {
|
||||
}): PublicThinkingSection[] {
|
||||
const domains = input.domains.slice(0, 6);
|
||||
const blocks = new Set(input.requiredBlocks ?? Object.keys(BLOCK_STEP_LABELS));
|
||||
const foundationSteps = uniqueSteps([
|
||||
step("foundation-raw", BLOCK_STEP_LABELS.raw_structure ?? "列出岁差、上升与宫位结构"),
|
||||
...layerSteps(input.mustUseLayers, "foundation-layer"),
|
||||
]);
|
||||
const domainBlocks = ["raman_six_step", "yoga_table", "timing", "synthesis"]
|
||||
.filter((block) => blocks.has(block));
|
||||
const closeSteps = uniqueSteps([
|
||||
blocks.has("technique_audit_table")
|
||||
? step("close-audit", BLOCK_STEP_LABELS.technique_audit_table ?? "贴上技法审计表")
|
||||
: null,
|
||||
blocks.has("modern_wrap")
|
||||
? step("close-wrap", BLOCK_STEP_LABELS.modern_wrap ?? "用现代生活语言收口")
|
||||
: null,
|
||||
const supportSteps = uniqueSteps([
|
||||
step("support-raw", BLOCK_STEP_LABELS.raw_structure ?? "对照盘上已经算好的结构"),
|
||||
...layerSteps(input.mustUseLayers, "support-layer"),
|
||||
...domains.flatMap((domain) => {
|
||||
const definition = consultationDomainDefinition(domain);
|
||||
return [
|
||||
...domainBlocks.map((block) => step(`${domain}-${block}`, `${definition.label}：${BLOCK_STEP_LABELS[block] ?? block}`)),
|
||||
...definition.evidencePreview.slice(0, 3).map((item, index) => (
|
||||
step(`${domain}-preview-${index}`, `对照 ${item}`)
|
||||
)),
|
||||
];
|
||||
}),
|
||||
]);
|
||||
|
||||
const sections: PublicThinkingSection[] = [
|
||||
return [
|
||||
publicThinkingSectionSchema.parse({
|
||||
id: "foundation",
|
||||
title: "先整理本盘的统一参数",
|
||||
heading: REPORT_HEADING.foundation,
|
||||
steps: foundationSteps.length > 0
|
||||
? foundationSteps
|
||||
: [{ id: "foundation-raw", label: "列出岁差、上升与宫位结构", status: "pending" }],
|
||||
id: "question",
|
||||
title: "先抓住你真正在问的事",
|
||||
heading: REPORT_HEADING.question,
|
||||
steps: [
|
||||
{ id: "question-read", label: "用盘上的反差回答这个问题", status: "pending" },
|
||||
],
|
||||
}),
|
||||
publicThinkingSectionSchema.parse({
|
||||
id: "support",
|
||||
title: "把判断钉在盘上",
|
||||
heading: REPORT_HEADING.support,
|
||||
steps: supportSteps.length > 0
|
||||
? supportSteps
|
||||
: [{ id: "support-read", label: "对照盘上已经算好的结构", status: "pending" }],
|
||||
}),
|
||||
publicThinkingSectionSchema.parse({
|
||||
id: "timing",
|
||||
title: "时间窗口怎么看",
|
||||
heading: REPORT_HEADING.timing,
|
||||
steps: [
|
||||
{ id: "timing-dasha", label: "对照当前大运与行运", status: "pending" },
|
||||
],
|
||||
}),
|
||||
publicThinkingSectionSchema.parse({
|
||||
id: "action",
|
||||
title: "这周可以扮演哪个象",
|
||||
heading: REPORT_HEADING.action,
|
||||
steps: [
|
||||
{ id: "action-write", label: "给出可立即执行的一两件事", status: "pending" },
|
||||
],
|
||||
}),
|
||||
];
|
||||
|
||||
for (const domain of domains) {
|
||||
const definition = consultationDomainDefinition(domain);
|
||||
const steps = uniqueSteps([
|
||||
...domainBlocks.map((block) => step(`${domain}-${block}`, BLOCK_STEP_LABELS[block] ?? block)),
|
||||
...definition.evidencePreview.slice(0, 6).map((item, index) => (
|
||||
step(`${domain}-preview-${index}`, `对照 ${item}`)
|
||||
)),
|
||||
]);
|
||||
sections.push(publicThinkingSectionSchema.parse({
|
||||
id: `domain-${domain}`,
|
||||
title: `接下来分析你的${definition.label}`,
|
||||
heading: definition.label,
|
||||
steps: steps.length > 0
|
||||
? steps
|
||||
: [{ id: `${domain}-read`, label: `整理${definition.label}相关宫位`, status: "pending" }],
|
||||
}));
|
||||
}
|
||||
|
||||
sections.push(publicThinkingSectionSchema.parse({
|
||||
id: "close",
|
||||
title: "用审计表收口后再落到生活",
|
||||
heading: REPORT_HEADING.audit,
|
||||
steps: closeSteps.length > 0
|
||||
? closeSteps
|
||||
: [
|
||||
{ id: "close-audit", label: "贴上技法审计表", status: "pending" },
|
||||
{ id: "close-wrap", label: "用现代生活语言收口", status: "pending" },
|
||||
],
|
||||
}));
|
||||
|
||||
return sections;
|
||||
}
|
||||
|
||||
export function dailyConsultationThinkingPlan(): PublicThinkingSection[] {
|
||||
@@ -184,7 +172,6 @@ export function dailyConsultationThinkingPlan(): PublicThinkingSection[] {
|
||||
heading: DAILY_HEADING.action,
|
||||
steps: [
|
||||
{ id: "action", label: "给出一个可立即执行的行动", status: "pending" },
|
||||
{ id: "audit", label: "贴上技法审计表", status: "pending" },
|
||||
{ id: "boundary", label: "写上探索性日提示，不是确定预测", status: "pending" },
|
||||
],
|
||||
}),
|
||||
@@ -207,7 +194,7 @@ export function windowConsultationThinkingPlan(): PublicThinkingSection[] {
|
||||
return [publicThinkingSectionSchema.parse({
|
||||
id: "window",
|
||||
title: "接下来根据声明窗口整理稳定层",
|
||||
heading: REPORT_HEADING.foundation,
|
||||
heading: REPORT_HEADING.question,
|
||||
steps: [
|
||||
{ id: "compare", label: "比较声明窗口内的稳定层", status: "pending" },
|
||||
{ id: "boundary", label: "核对应答边界", status: "pending" },
|
||||
@@ -289,7 +276,7 @@ export function consultationSpokenHeadingRule(kind: "natal" | "general" | "windo
|
||||
const activity = "Do not invent a thinking-process checklist. Activity, progress, and receipts are server-owned.";
|
||||
if (kind === "natal") {
|
||||
return [
|
||||
`After a 3-6 sentence spoken reply with no heading that answers the user's question (反差（表面 A，底下 B，命名成一个格局）→ 谁在推、谁在修 → 别去应 X 的象、去扮演 Y 的象 → 最多三条短行动，各 ≤ 20 characters; total ≤ 400 characters), write the rest with these exact Markdown H2 headings in order: ## ${REPORT_HEADING.foundation}, then ## {the Chinese label of each executed domain in tool order, such as 事业 / 财富 / 关系}, then ## ${REPORT_HEADING.audit}, then ## ${REPORT_HEADING.wrap}. The skeleton must not be omitted.`,
|
||||
`After a 3-6 sentence spoken reply with no heading that answers the user's question (反差（表面 A，底下 B，命名成一个格局）→ 谁在推、谁在修 → 别去应 X 的象、去扮演 Y 的象 → 最多三条短行动，各 ≤ 20 characters; total ≤ 400 characters), write the rest with these exact Markdown H2 headings in order: ## ${REPORT_HEADING.question}, then ## ${REPORT_HEADING.support}, then ## ${REPORT_HEADING.timing}, then ## ${REPORT_HEADING.action}. Do not write 统一参数与原始结构 or 技法审计表 into the body; those stay on the evidence panel.`,
|
||||
"Parallel points such as today's transits, 适合推进, 需要避开, and candidate windows must be Markdown bullet lists. Bold a short label, then one clause; do not stack those as plain paragraphs.",
|
||||
activity,
|
||||
secrets,
|
||||
@@ -305,7 +292,7 @@ export function consultationSpokenHeadingRule(kind: "natal" | "general" | "windo
|
||||
}
|
||||
if (kind === "window") {
|
||||
return [
|
||||
`When describing stable window structure, start with ## ${REPORT_HEADING.foundation}.`,
|
||||
`When describing stable window structure, start with ## ${REPORT_HEADING.question}.`,
|
||||
activity,
|
||||
secrets,
|
||||
].join(" ");
|
||||
@@ -337,7 +324,7 @@ export function consultationContinuePrompt(output: string): string {
|
||||
return [
|
||||
"上一轮用户可见正文因长度在标题处停下。从最后一个完整二级标题之后继续写完，不要重复已写出的段落，不要写思考过程清单。",
|
||||
last ? `最后一个完整标题是：${last}` : "上一轮还没有写出完整的二级标题。",
|
||||
`必须继续使用这些二级标题（尚未写到的才写）：## ${REPORT_HEADING.foundation}、各已执行领域的中文名、## ${REPORT_HEADING.audit}、## ${REPORT_HEADING.wrap}。`,
|
||||
`必须继续使用这些二级标题（尚未写到的才写）：## ${REPORT_HEADING.question}、## ${REPORT_HEADING.support}、## ${REPORT_HEADING.timing}、## ${REPORT_HEADING.action}。不要写统一参数或技法审计表。`,
|
||||
"已写出的末尾摘录：",
|
||||
output.slice(-800),
|
||||
].join("\n");
|
||||
@@ -345,12 +332,31 @@ export function consultationContinuePrompt(output: string): string {
|
||||
|
||||
export type ConsultationSectionPromptReason = "write" | "empty-retry";
|
||||
|
||||
export function consultationComposePrompt(
|
||||
findings: ReadonlyArray<{ id: string; text?: string }> = [],
|
||||
): string {
|
||||
const grounded = findings
|
||||
.filter((item) => item.text?.trim())
|
||||
.map((item) => `- ${item.id}: ${item.text}`)
|
||||
.join("\n");
|
||||
return [
|
||||
"服务器计算已经完成。不要再调用排盘工具，不要重算。",
|
||||
"只写结论散文。开场不要标题，然后一次写完这些二级标题，不要拆成多轮：",
|
||||
`## ${REPORT_HEADING.question}`,
|
||||
`## ${REPORT_HEADING.support}`,
|
||||
`## ${REPORT_HEADING.timing}`,
|
||||
`## ${REPORT_HEADING.action}`,
|
||||
"不要写「统一参数与原始结构」，不要写技法审计表，不要写思考过程清单，不要复述内部 JSON。",
|
||||
grounded ? `判断依据（写正文时引用，不要原样粘贴成列表）：\n${grounded}` : "",
|
||||
].filter(Boolean).join("\n");
|
||||
}
|
||||
|
||||
export function consultationSectionPrompt(
|
||||
heading: string,
|
||||
priorOutput: string,
|
||||
options?: { reason?: ConsultationSectionPromptReason },
|
||||
): string {
|
||||
const title = heading.trim() || REPORT_HEADING.foundation;
|
||||
const title = heading.trim() || REPORT_HEADING.question;
|
||||
return [
|
||||
...(options?.reason === "empty-retry" ? ["上一段没有输出正文，请直接写这一节。"] : []),
|
||||
"服务器计算已经完成。不要再调用排盘工具，不要重算，不要读取其他二级标题。",
|
||||
|
||||
@@ -1,92 +0,0 @@
|
||||
/**
|
||||
* Sanitize text that may appear on the public thinking channel.
|
||||
*
|
||||
* English-only process narration, tool ids and UUIDs stay off the client.
|
||||
* Chinese thinking fragments are allowed through a dedicated event type,
|
||||
* never through the spoken answer.
|
||||
*
|
||||
* Filtering is sentence-buffered: stream chunks are often one or two English
|
||||
* words, so a per-chunk "drop long Latin, keep the rest" pass turns a withheld
|
||||
* sentence into word salad. Wait for `。！？\\n` or `.!?`, then decide.
|
||||
*/
|
||||
const CJK_RE = /[\u4e00-\u9fff]/;
|
||||
const PUBLIC_THINKING_UUID_RE = /[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/gi;
|
||||
const PUBLIC_THINKING_TOOL_RE = /run-jyotish(?:-consultation)?-?|rectification-[a-z0-9-]+/gi;
|
||||
const SENTENCE_TERMINATOR_RE = /[。！？\n]|[.!?]/;
|
||||
|
||||
function stripIds(text: string): string {
|
||||
return text
|
||||
.replace(PUBLIC_THINKING_UUID_RE, "")
|
||||
.replace(PUBLIC_THINKING_TOOL_RE, "");
|
||||
}
|
||||
|
||||
function sanitizeCompletedSentence(sentence: string): string | null {
|
||||
const cleaned = stripIds(sentence);
|
||||
if (!cleaned.trim()) return null;
|
||||
if (!CJK_RE.test(cleaned)) return null;
|
||||
const withoutEnglishWords = cleaned
|
||||
.replace(/[A-Za-z]{4,}/g, "")
|
||||
.replace(/[ \t]{2,}/g, " ");
|
||||
const trimmed = withoutEnglishWords.trim();
|
||||
if (!trimmed) return null;
|
||||
return trimmed.slice(0, 4_000);
|
||||
}
|
||||
|
||||
function terminatorEnd(buffer: string): number {
|
||||
const match = SENTENCE_TERMINATOR_RE.exec(buffer);
|
||||
if (!match || match.index === undefined) return -1;
|
||||
return match.index + match[0].length;
|
||||
}
|
||||
|
||||
export function createPublicThinkingSanitizer() {
|
||||
let buffer = "";
|
||||
|
||||
function releaseCompleted(flush: boolean): string {
|
||||
let released = "";
|
||||
while (buffer) {
|
||||
const end = terminatorEnd(buffer);
|
||||
if (end >= 0) {
|
||||
const sentence = buffer.slice(0, end);
|
||||
buffer = buffer.slice(end);
|
||||
const cjk = sentence.search(CJK_RE);
|
||||
const cleaned = sanitizeCompletedSentence(cjk > 0 ? sentence.slice(cjk) : sentence);
|
||||
if (cleaned) released += cleaned;
|
||||
continue;
|
||||
}
|
||||
const cjk = buffer.search(CJK_RE);
|
||||
if (cjk > 0) {
|
||||
buffer = buffer.slice(cjk);
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (flush && buffer) {
|
||||
const leftover = buffer;
|
||||
buffer = "";
|
||||
const cleaned = sanitizeCompletedSentence(leftover);
|
||||
if (cleaned) released += cleaned;
|
||||
}
|
||||
return released;
|
||||
}
|
||||
|
||||
return {
|
||||
push(chunk: string): string | null {
|
||||
if (!chunk) return null;
|
||||
buffer += chunk;
|
||||
const released = releaseCompleted(false);
|
||||
return released || null;
|
||||
},
|
||||
flush(): string | null {
|
||||
const released = releaseCompleted(true);
|
||||
return released || null;
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
export function sanitizePublicThinkingText(text: string): string | null {
|
||||
const sanitizer = createPublicThinkingSanitizer();
|
||||
const pushed = sanitizer.push(text) ?? "";
|
||||
const flushed = sanitizer.flush() ?? "";
|
||||
const combined = `${pushed}${flushed}`;
|
||||
return combined || null;
|
||||
}
|
||||
@@ -22,7 +22,7 @@ import {
|
||||
type PublicRectificationPhase,
|
||||
type PublicRectificationTool,
|
||||
} from "./public-receipt";
|
||||
import { sanitizePublicThinkingText } from "../../public-thinking";
|
||||
import { acceptThinkStepText } from "../../think-step-gate";
|
||||
import { isToolInputRejection, toolResultFromChunk } from "./host-fallback";
|
||||
|
||||
export type PublicPhaseStreamEvent = Readonly<{
|
||||
@@ -187,7 +187,7 @@ export type InternalThinkingDeltaEvent = Readonly<{
|
||||
}>;
|
||||
|
||||
export function toPublicThinkingDelta(text: string): InternalThinkingDeltaEvent | null {
|
||||
const cleaned = sanitizePublicThinkingText(text);
|
||||
const cleaned = acceptThinkStepText(text);
|
||||
if (!cleaned) return null;
|
||||
return { type: "thinking.delta", text: cleaned };
|
||||
}
|
||||
|
||||
@@ -12,11 +12,12 @@ import {
|
||||
import { toAgentModelFinishReason } from "./agent-observability.ts";
|
||||
import { createVisibleTextTransformer } from "./stream-text-response.ts";
|
||||
import { consultationWriteLabel } from "./consultation-activity-labels.ts";
|
||||
import { createPublicThinkingSanitizer } from "./public-thinking.ts";
|
||||
import { logTruncatedReasoning } from "./consultation-budget.ts";
|
||||
import { acceptThinkStepText } from "./think-step-gate.ts";
|
||||
import {
|
||||
applyThinkingSectionProgress,
|
||||
consultationComposeHeadingGroups,
|
||||
generalConsultationThinkingPlan,
|
||||
thinkPlanSteps,
|
||||
type PublicThinkingSection,
|
||||
} from "./consultation-thinking-plan.ts";
|
||||
|
||||
@@ -109,7 +110,9 @@ function chunkProviderError(chunk: Chunk): unknown {
|
||||
|
||||
function runFailedCode(error: unknown, emitted: boolean): RunFailedCode {
|
||||
if (error instanceof Error && error.message === "runtime_contract_incomplete") return "runtime_contract_incomplete";
|
||||
if (error instanceof Error && error.message === "empty_answer") return "empty_answer";
|
||||
if (error instanceof Error && error.message === "empty_answer") {
|
||||
return emitted ? "answer_truncated" : "empty_answer";
|
||||
}
|
||||
if (error instanceof Error && error.message === "answer_truncated") return "answer_truncated";
|
||||
if (
|
||||
error instanceof Error
|
||||
@@ -262,33 +265,36 @@ export async function collectAgentPublicEvents(stream: ChunkStream | Iterable<Ch
|
||||
];
|
||||
const startedAt = new Map<string, number>();
|
||||
const toolErrors = { seen: 0 };
|
||||
const thinking = createPublicThinkingSanitizer();
|
||||
let planSent = false;
|
||||
const flushPlan = () => {
|
||||
if (planSent) return;
|
||||
const planned = thinkingSectionEvents(options.state?.thinkingPlan);
|
||||
if (!planned.length) return;
|
||||
const steps = thinkPlanSteps(options.state?.thinkingPlan ?? []);
|
||||
if (!planned.length && !steps.length) return;
|
||||
planSent = true;
|
||||
if (steps.length) events.push({ type: "think.plan", steps });
|
||||
events.push(...planned);
|
||||
};
|
||||
for await (const chunk of stream instanceof ReadableStream || Symbol.asyncIterator in stream ? readChunks(stream as ChunkStream) : stream) {
|
||||
events.push(...mapChunk(chunk, options, startedAt, toolErrors));
|
||||
flushPlan();
|
||||
if (chunk.type === "reasoning-delta" && typeof chunk.payload?.text === "string") {
|
||||
const released = thinking.push(chunk.payload.text);
|
||||
if (released) events.push({ type: "thinking.delta", text: released });
|
||||
logTruncatedReasoning(options.requestId, chunk.payload.text);
|
||||
}
|
||||
if (chunk.type === "text-delta" && typeof chunk.payload?.text === "string") {
|
||||
events.push({ type: "answer.delta", text: chunk.payload.text });
|
||||
}
|
||||
}
|
||||
const leftover = thinking.flush();
|
||||
if (leftover) events.push({ type: "thinking.delta", text: leftover });
|
||||
flushPlan();
|
||||
events.push({ type: "run.completed", receipt: agentExecutionReceiptSchema.parse(options.receipt()) });
|
||||
return events.map((event) => consultationAgentPublicEventSchema.parse(event));
|
||||
}
|
||||
|
||||
export type ThinkFinding = Readonly<{
|
||||
id: string;
|
||||
text?: string;
|
||||
}>;
|
||||
|
||||
type StreamAgentResponseOptions = EventOptions & {
|
||||
state: ConsultationRuntimeState;
|
||||
stream: ChunkStream;
|
||||
@@ -297,11 +303,9 @@ type StreamAgentResponseOptions = EventOptions & {
|
||||
retry?: () => Promise<ChunkStream>;
|
||||
retryForAnswer?: () => Promise<ChunkStream>;
|
||||
continueAfterLength?: (output: string) => Promise<ChunkStream>;
|
||||
composeSection?: (
|
||||
heading: string,
|
||||
priorOutput: string,
|
||||
reason?: "write" | "empty-retry",
|
||||
) => Promise<ChunkStream>;
|
||||
composeAnswer?: (findings: readonly ThinkFinding[]) => Promise<ChunkStream>;
|
||||
interpretFindings?: () => Promise<readonly ThinkFinding[]>;
|
||||
pass4Violations?: (text: string) => readonly string[];
|
||||
continueAfterDisconnect?: boolean;
|
||||
headers?: HeadersInit;
|
||||
onFirstActivity?: () => void | Promise<void>;
|
||||
@@ -353,13 +357,15 @@ export function streamAgentResponse(options: StreamAgentResponseOptions) {
|
||||
};
|
||||
const flushThinkingPlan = (controller: ReadableStreamDefaultController<Uint8Array> | undefined) => {
|
||||
if (planSent) return;
|
||||
if (options.composeSection && (options.state.thinkingPlan?.length ?? 0) > 0) return;
|
||||
if (!options.requireTool && !options.state.thinkingPlan?.length) {
|
||||
options.state.thinkingPlan = generalConsultationThinkingPlan();
|
||||
}
|
||||
const planned = thinkingSectionEvents(options.state.thinkingPlan);
|
||||
if (!planned.length) return;
|
||||
const plan = options.state.thinkingPlan ?? [];
|
||||
const steps = thinkPlanSteps(plan);
|
||||
const planned = thinkingSectionEvents(plan);
|
||||
if (!steps.length && !planned.length) return;
|
||||
planSent = true;
|
||||
if (steps.length) send(controller, { type: "think.plan", steps });
|
||||
for (const event of planned) send(controller, event);
|
||||
};
|
||||
|
||||
@@ -369,15 +375,9 @@ export function streamAgentResponse(options: StreamAgentResponseOptions) {
|
||||
attempt: { drainSpoken?: boolean; suppressCompositionActivity?: boolean } = {},
|
||||
) {
|
||||
const visible = createVisibleTextTransformer(options.transformText ?? ((value) => value));
|
||||
const thinking = createPublicThinkingSanitizer();
|
||||
let held = "";
|
||||
let composingSent = Boolean(attempt.suppressCompositionActivity);
|
||||
const drainingSpoken = () => Boolean(attempt.drainSpoken) && contractReady(options);
|
||||
const emitThinking = (text: string | null) => {
|
||||
if (!text) return;
|
||||
thinkingText += text;
|
||||
send(controller, { type: "thinking.delta", text });
|
||||
};
|
||||
const outputText = async (text: string) => {
|
||||
// Text the model writes before the contract is ready is not the answer: it
|
||||
// is the model narrating its own in-progress or failed tool calls. Holding
|
||||
@@ -429,19 +429,23 @@ export function streamAgentResponse(options: StreamAgentResponseOptions) {
|
||||
if (finish.stepCount !== null) options.state.modelStepCount = stepCountBeforeAttempt + finish.stepCount;
|
||||
}
|
||||
if (chunk.type === "reasoning-delta" && typeof chunk.payload?.text === "string") {
|
||||
if (drainingSpoken()) continue;
|
||||
emitThinking(thinking.push(chunk.payload.text));
|
||||
logTruncatedReasoning(options.requestId, chunk.payload.text);
|
||||
}
|
||||
if (chunk.type === "text-delta" && typeof chunk.payload?.text === "string") {
|
||||
await outputText(visible.push(chunk.payload.text));
|
||||
}
|
||||
}
|
||||
flushThinkingPlan(controller);
|
||||
emitThinking(thinking.flush());
|
||||
await outputText(visible.finish(""));
|
||||
} catch (error) {
|
||||
if (isTimeoutOrAbort(error)) {
|
||||
appendConsultationRuntimeStep(options.state, {
|
||||
kind: "abort",
|
||||
name: drainingSpoken() ? "tool-abort" : "compose-abort",
|
||||
status: "failed",
|
||||
});
|
||||
}
|
||||
try {
|
||||
emitThinking(thinking.flush());
|
||||
await outputText(visible.finish(""));
|
||||
} catch {}
|
||||
throw error;
|
||||
@@ -470,52 +474,75 @@ export function streamAgentResponse(options: StreamAgentResponseOptions) {
|
||||
}
|
||||
}
|
||||
|
||||
async function composeByHeadings(controller: ReadableStreamDefaultController<Uint8Array> | undefined) {
|
||||
async function publishFindings(
|
||||
controller: ReadableStreamDefaultController<Uint8Array> | undefined,
|
||||
): Promise<readonly ThinkFinding[]> {
|
||||
flushThinkingPlan(controller);
|
||||
const plan = options.state.thinkingPlan ?? [];
|
||||
if (!options.composeSection || plan.length === 0) return false;
|
||||
let lastSectionId: string | undefined;
|
||||
for (const group of consultationComposeHeadingGroups(plan)) {
|
||||
for (const heading of group.headings) {
|
||||
if (lastSectionId !== group.section.id) {
|
||||
lastSectionId = group.section.id;
|
||||
planSent = true;
|
||||
send(controller, consultationAgentPublicEventSchema.parse({
|
||||
type: "thinking.section",
|
||||
...group.section,
|
||||
}));
|
||||
}
|
||||
send(controller, {
|
||||
type: "activity",
|
||||
phase: "answer-composition",
|
||||
label: consultationWriteLabel(heading, true),
|
||||
});
|
||||
const before = fullOutput;
|
||||
await consumeAttempt(
|
||||
controller,
|
||||
await options.composeSection(heading, fullOutput, "write"),
|
||||
{ suppressCompositionActivity: true },
|
||||
);
|
||||
await continueCurrentAnswer(controller, heading);
|
||||
if (!sliceAddedVisibleText(before, fullOutput)) {
|
||||
appendConsultationRuntimeStep(options.state, {
|
||||
kind: "validation",
|
||||
name: "section-empty-retry",
|
||||
status: "completed",
|
||||
});
|
||||
send(controller, {
|
||||
type: "activity",
|
||||
phase: "answer-composition",
|
||||
label: consultationWriteLabel(heading, true),
|
||||
});
|
||||
await consumeAttempt(
|
||||
controller,
|
||||
await options.composeSection(heading, fullOutput, "empty-retry"),
|
||||
{ suppressCompositionActivity: true },
|
||||
);
|
||||
await continueCurrentAnswer(controller, heading);
|
||||
}
|
||||
const steps = thinkPlanSteps(plan);
|
||||
let findings: readonly ThinkFinding[] = [];
|
||||
if (options.interpretFindings) {
|
||||
send(controller, {
|
||||
type: "phase.started",
|
||||
phase: "interpret",
|
||||
label: "正在整理判断依据",
|
||||
});
|
||||
const started = Date.now();
|
||||
findings = await options.interpretFindings();
|
||||
send(controller, {
|
||||
type: "phase.completed",
|
||||
phase: "interpret",
|
||||
durationMs: Math.max(0, Date.now() - started),
|
||||
});
|
||||
}
|
||||
const byId = new Map(findings.map((item) => [item.id, item]));
|
||||
for (const step of steps) {
|
||||
send(controller, { type: "think.step", id: step.id, status: "running" });
|
||||
const accepted = acceptThinkStepText(byId.get(step.id)?.text ?? "");
|
||||
if (accepted) {
|
||||
thinkingText += accepted;
|
||||
send(controller, { type: "think.step", id: step.id, status: "done", text: accepted });
|
||||
} else {
|
||||
send(controller, { type: "think.step", id: step.id, status: "done" });
|
||||
}
|
||||
}
|
||||
return findings;
|
||||
}
|
||||
|
||||
async function composeOnce(
|
||||
controller: ReadableStreamDefaultController<Uint8Array> | undefined,
|
||||
findings: readonly ThinkFinding[],
|
||||
) {
|
||||
if (!options.composeAnswer) return false;
|
||||
send(controller, {
|
||||
type: "activity",
|
||||
phase: "answer-composition",
|
||||
label: consultationWriteLabel("回答", true),
|
||||
});
|
||||
send(controller, {
|
||||
type: "phase.started",
|
||||
phase: "compose",
|
||||
label: "正在写结论",
|
||||
});
|
||||
const started = Date.now();
|
||||
await consumeAttempt(
|
||||
controller,
|
||||
await options.composeAnswer(findings),
|
||||
{ suppressCompositionActivity: true },
|
||||
);
|
||||
await continueCurrentAnswer(controller);
|
||||
if ((options.pass4Violations?.(fullOutput) ?? []).length > 0) {
|
||||
appendConsultationRuntimeStep(options.state, {
|
||||
kind: "validation",
|
||||
name: "pass4-reject",
|
||||
status: "failed",
|
||||
});
|
||||
}
|
||||
send(controller, {
|
||||
type: "phase.completed",
|
||||
phase: "compose",
|
||||
durationMs: Math.max(0, Date.now() - started),
|
||||
});
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -530,39 +557,28 @@ export function streamAgentResponse(options: StreamAgentResponseOptions) {
|
||||
void (async () => {
|
||||
send(controller, { type: "run.started", runId: options.runId, requestId: options.requestId });
|
||||
for (const event of skillBoundEvents) send(controller, event);
|
||||
if (!options.requireTool) flushThinkingPlan(controller);
|
||||
flushThinkingPlan(controller);
|
||||
try {
|
||||
await consumeAttempt(controller, options.stream, {
|
||||
drainSpoken: Boolean(options.composeSection),
|
||||
drainSpoken: Boolean(options.composeAnswer),
|
||||
});
|
||||
if (!contractReady(options) && options.retry) {
|
||||
appendConsultationRuntimeStep(options.state, { kind: "validation", name: "runtime-contract-retry", status: "completed" });
|
||||
send(controller, { type: "activity", phase: "loading-method", label: "正在补齐方法与计算步骤" });
|
||||
await consumeAttempt(controller, await options.retry(), {
|
||||
drainSpoken: Boolean(options.composeSection),
|
||||
drainSpoken: Boolean(options.composeAnswer),
|
||||
});
|
||||
}
|
||||
if (!contractReady(options)) throw new Error("runtime_contract_incomplete");
|
||||
const sliced = await composeByHeadings(controller);
|
||||
// A run whose calculation succeeded and whose model then wrote nothing
|
||||
// used to be answered with a fixed apology and billed as a completed
|
||||
// consultation: the user paid for a sentence saying there was nothing
|
||||
// to say. Ask once more instead. The calculation is cached for the
|
||||
// request, so the second attempt re-reads the same evidence without
|
||||
// recomputing it, and whatever ended the first attempt—an exhausted
|
||||
// step budget above all—does not carry into a fresh model loop.
|
||||
const findings = await publishFindings(controller);
|
||||
const composed = await composeOnce(controller, findings);
|
||||
if (!/\S/.test(fullOutput) && options.retryForAnswer) {
|
||||
appendConsultationRuntimeStep(options.state, { kind: "validation", name: "answer-retry", status: "completed" });
|
||||
send(controller, { type: "activity", phase: "answer-composition", label: "正在组织回答" });
|
||||
await consumeAttempt(controller, await options.retryForAnswer());
|
||||
}
|
||||
// Still nothing to show. Failing is the honest outcome and it is the
|
||||
// one that does not charge for the run.
|
||||
if (!/\S/.test(fullOutput)) throw new Error("empty_answer");
|
||||
// A spoken answer that stopped because the token budget ran out is
|
||||
// not a completed consultation. Continue once from the last complete
|
||||
// heading, still with thinking disabled, before treating it as a pinch.
|
||||
if (!sliced) await continueCurrentAnswer(controller);
|
||||
if (!composed) await continueCurrentAnswer(controller);
|
||||
settling = true;
|
||||
const receipt = agentExecutionReceiptSchema.parse(options.receipt());
|
||||
const thinkingSections = applyThinkingSectionProgress(options.state.thinkingPlan ?? [], fullOutput);
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
/**
|
||||
* Pass 2 public thinking is a complete product sentence, never a CoT fragment.
|
||||
* This gate only accepts or rejects. It must not rewrite, strip, or splice.
|
||||
*/
|
||||
const CJK_RE = /[\u4e00-\u9fff]/;
|
||||
const SENTENCE_RE = /[。！？]/;
|
||||
|
||||
export const THINK_STEP_TEXT_MIN = 8;
|
||||
export const THINK_STEP_TEXT_MAX = 400;
|
||||
|
||||
export function acceptThinkStepText(text: string): string | null {
|
||||
const trimmed = text.replace(/\s+/g, " ").trim();
|
||||
if (trimmed.length < THINK_STEP_TEXT_MIN || trimmed.length > THINK_STEP_TEXT_MAX) return null;
|
||||
if (!CJK_RE.test(trimmed)) return null;
|
||||
if (!SENTENCE_RE.test(trimmed)) return null;
|
||||
return trimmed;
|
||||
}
|
||||
@@ -94,29 +94,61 @@ function isPersonalChartConclusion(clause: string) {
|
||||
export const GENERAL_NO_BIRTH_TIME_REFUSAL =
|
||||
"这部分需要具体出生分钟才能判断，我不会补造时间";
|
||||
|
||||
/** Removes claims the evidence contract does not permit the model to make. */
|
||||
export function guardPreciseTimingOutput(text: string) {
|
||||
let guarded = text;
|
||||
for (const pattern of exactTimingPatterns)
|
||||
guarded = guarded.replace(pattern, "[具体时间已省略]");
|
||||
for (const pattern of guaranteeConclusionPatterns) {
|
||||
guarded = guarded.replace(pattern, (sentence) => {
|
||||
const prefix = /^[。！？.!?\n]/.exec(sentence)?.[0] ?? "";
|
||||
return prefix + "[保证性结论已省略]";
|
||||
});
|
||||
}
|
||||
return guarded;
|
||||
export type TimingGuardKind = "exact-timing" | "guarantee" | "personal-chart" | "methodology";
|
||||
|
||||
export type TimingGuardViolation = Readonly<{
|
||||
kind: TimingGuardKind;
|
||||
excerpt: string;
|
||||
}>;
|
||||
|
||||
function collectMatches(text: string, pattern: RegExp): string[] {
|
||||
return [...text.matchAll(new RegExp(pattern.source, pattern.flags.includes("g") ? pattern.flags : `${pattern.flags}g`))]
|
||||
.map((match) => match[0]?.trim() ?? "")
|
||||
.filter(Boolean);
|
||||
}
|
||||
|
||||
/** A deterministic post-model boundary for the zero-chart general mode. */
|
||||
export function detectPreciseTimingViolations(text: string): TimingGuardViolation[] {
|
||||
const hits: TimingGuardViolation[] = [];
|
||||
for (const pattern of exactTimingPatterns) {
|
||||
for (const excerpt of collectMatches(text, pattern)) {
|
||||
hits.push({ kind: "exact-timing", excerpt: excerpt.slice(0, 80) });
|
||||
}
|
||||
}
|
||||
for (const pattern of guaranteeConclusionPatterns) {
|
||||
for (const excerpt of collectMatches(text, pattern)) {
|
||||
hits.push({ kind: "guarantee", excerpt: excerpt.slice(0, 80) });
|
||||
}
|
||||
}
|
||||
return hits;
|
||||
}
|
||||
|
||||
export function detectGeneralNoBirthTimeViolations(text: string): TimingGuardViolation[] {
|
||||
const hits = detectPreciseTimingViolations(text);
|
||||
for (const part of text.split(/[。！？.!?\n]+/u)) {
|
||||
if (isPersonalChartConclusion(part)) {
|
||||
hits.push({ kind: "personal-chart", excerpt: part.trim().slice(0, 80) });
|
||||
}
|
||||
}
|
||||
return hits;
|
||||
}
|
||||
|
||||
export function detectMethodologyBookkeeping(text: string): TimingGuardViolation[] {
|
||||
const hits: TimingGuardViolation[] = [];
|
||||
if (/##\s*统一参数/.test(text) || text.includes("统一参数与原始结构")) {
|
||||
hits.push({ kind: "methodology", excerpt: "统一参数与原始结构" });
|
||||
}
|
||||
if (text.includes("技法审计表")) {
|
||||
hits.push({ kind: "methodology", excerpt: "技法审计表" });
|
||||
}
|
||||
return hits;
|
||||
}
|
||||
|
||||
/** @deprecated Detection only. Never rewrite the model text. */
|
||||
export function guardPreciseTimingOutput(text: string) {
|
||||
return text;
|
||||
}
|
||||
|
||||
/** @deprecated Detection only. Never rewrite the model text. */
|
||||
export function guardGeneralNoBirthTimeOutput(text: string) {
|
||||
const guarded = guardPreciseTimingOutput(text);
|
||||
return guarded
|
||||
.split(/([。！？.!?\n]+)/u)
|
||||
.map((part, index) => (
|
||||
index % 2 === 0 && isPersonalChartConclusion(part)
|
||||
? GENERAL_NO_BIRTH_TIME_REFUSAL
|
||||
: part
|
||||
))
|
||||
.join("");
|
||||
return text;
|
||||
}
|
||||
|
||||
@@ -90,7 +90,7 @@ export function consultationWindowPrepareStep(input: { stepNumber: number }) {
|
||||
};
|
||||
}
|
||||
|
||||
const CONSULTATION_DOMAIN_DURATION_MS = 21_000;
|
||||
const CONSULTATION_DOMAIN_DURATION_MS = 31_000;
|
||||
const CONSULTATION_ANSWER_RESERVE_MS = 45_000;
|
||||
export const CONSULTATION_DOMAIN_WALL_CLOCK_MS = AGENT_TIMEOUT_MS - CONSULTATION_ANSWER_RESERVE_MS;
|
||||
export const MAX_CONSULTATION_DOMAINS = Math.max(
|
||||
@@ -147,7 +147,7 @@ export type ConsultationStepBudget = {
|
||||
|
||||
export type ConsultationRuntimeStep = {
|
||||
sequence: number;
|
||||
kind: "skill" | "tool" | "validation";
|
||||
kind: "skill" | "tool" | "validation" | "abort";
|
||||
name: string;
|
||||
status: "completed" | "failed";
|
||||
durationMs?: number;
|
||||
|
||||
@@ -48,7 +48,7 @@ When reference_transparency is present:
|
||||
- Never claim D2, D11, D9, D10, A10, UL, Narayana Dasha, a delivered Varga, or a delivered Western layer is missing when it appears in evidence_contract.available_layers, evidence_contract.varga_spectrum, evidence_contract.western_spectrum, chart, or local_layers.
|
||||
- evidence_contract.technique_audit_table is the invocation record for this run. Use every executed layer that is relevant to the question. Status executed means the server ran it; blocked means it could not; not_applicable means it does not apply. Never treat an omitted row as permission to invent the technique, and never silently skip an executed layer the question needs.
|
||||
- evidence_contract.must_use_layers is the executed shortlist for this answer. A placement, yoga, dasha boundary, or transit that is not in this packet was not delivered: do not invent it from model knowledge.
|
||||
- Paste that Technique Audit Table at the end of the answer body before the modern-life wrap. The product UI may also fold a copy from the delivered rows. This is not a JSON dump.
|
||||
- Do not paste the Technique Audit Table into the answer body. The product UI folds it from the delivered rows.
|
||||
- local_layers.dasha_sub_periods carries the antardasha boundaries inside the running mahadasha. When it is present, use those boundaries and never say sub-periods were not calculated; when it is absent, say so once instead of implying the calculation broke.
|
||||
- local_layers.transits.search_period is the searched observation window. When it is present, an empty triggers list means no exact contact in that window, not that transits were skipped. Quote only delivered trigger dates; do not invent a retrograde or exact hit that is not in triggers.
|
||||
- Treat evidence_contract.answer_policy as a hard output contract. When can_answer_precise_timing is false, provide only direction or structure and do not state a month, date, or guaranteed timing outcome.
|
||||
|
||||
@@ -43,21 +43,17 @@ export const natalSpokenReportContract = `NATAL REPORT CONTRACT (spoken reply fi
|
||||
The skill governs METHOD, TECHNIQUE INVOCATION, TRUTH BOUNDARIES, and the Level 2 skeleton — not the opening paragraphs.
|
||||
For career / wealth / marriage / family (and any natal domain reading): open with the OPENER SHAPE above, heading-free, before the first H2 — 先给反差（表面 A，底下 B，并命名成一个格局），再说清谁在推、谁在修，然后「别去应 X 的象，去扮演 Y 的象」，收尾最多三条短行动（破折号短句，各 ≤ 20 Chinese characters）. Spoken-layer total ≤ 400 Chinese characters. Then write the skill Level 2 template. 骨架不可省略，但必须以直接回应开场. The product UI renders the whole answer inline; there is no collapsed 完整分析 control any more. Write the full skeleton in the body and assume every line of it is read. Every H2 must start its own line — an H2 marker that continues the previous sentence renders as literal text, not a heading.
|
||||
|
||||
Required body order after that opener, using these exact H2 headings: ## 统一参数与原始结构, then ## {Chinese domain label} for each executed domain, then ## 技法审计表, then ## 现代生活. Do not write a thinking-process checklist; Activity is server-owned.
|
||||
1. Unified parameters and raw structure first (degrees, houses, vargas, Dasha boundaries, Shadbala/AV, functional benefic/malefic, Western layers the server delivered).
|
||||
2. Innate significators: Raman six-step house judgment for the question houses. Steps 1–3 (house / lord / natural karaka) are the executable core. Steps 4–6 (Sun/Moon repeat, D9, positive/negative majority) are methodology-layer filling from delivered chart fields; label them 方法论层.
|
||||
3. Yoga table: name / formation / strength or hit-miss / domain effect. Use the governed 8/20 whitelist for the domain (Nabhasa, wealth core 5, spouse, children/mother/sibling_core). List hits and misses. Do not invent yogas.
|
||||
4. Strength and karaka notes from delivered Shadbala/AV/karaka fields.
|
||||
5. Timing: current Dasha, transits, dual dasha when delivered. Windows plus confirm/delay/cancel signals. Phrase as 能量活跃度/概率, never an absolute date guarantee.
|
||||
6. Synthesis: strong / medium / weak, advantages, challenges, practical next steps. Direct, not footnote-soft.
|
||||
7. Technique Audit Table at the end of the answer body: | 技法 | 状态 | 说明 | with 已执行 / 阻塞 / 不适用. The UI may also fold a copy from delivered rows; the body must still contain the table.
|
||||
8. Only after the audit table, a short modern-life wrap.
|
||||
Required body order after that opener, using these exact H2 headings: ## 先回答你的问题, then ## 盘里支持这个判断的地方, then ## 时间怎么看, then ## 这周可以做的一件事. Do not write a thinking-process checklist; Activity is server-owned. Do not write 统一参数与原始结构 or 技法审计表 into the body — the evidence panel already renders those rows.
|
||||
1. Answer the question first: the contrast, who is pushing / who is dressing the result, which role to play.
|
||||
2. Ground the judgment in delivered chart fields (houses, lords, yogas, strength). Raman six-step house judgment and the Yoga table stay in this section as evidence, not as a parameter dump. Cite, do not dump degrees tables.
|
||||
3. Timing: current Dasha and transits when delivered. Phrase as 能量活跃度/概率, never an absolute date guarantee.
|
||||
4. One or two actions for this week. Direct, not footnote-soft.
|
||||
|
||||
Address the reader as 你. Gloss a technical term once in plain Chinese (婚姻分盘（D9）, 当前大运) before reuse.
|
||||
Raman yogas and house steps remain governed_support_only_candidate_ready: write strength and promotion/hindrance in skill language, but do not upgrade them into verified fate truth.
|
||||
|
||||
Never:
|
||||
- Skip an executed layer the question needs in order to keep the answer short.
|
||||
- Treat a collapsed UI control as a substitute for the body audit table.
|
||||
- Put the Technique Audit Table or 统一参数 heading back into the spoken body.
|
||||
|
||||
Short chit-chat that is not a natal domain claim may stay conversational. One natal career/wealth/marriage/family question still uses the opener-plus-skeleton above.`;
|
||||
|
||||
@@ -39,9 +39,9 @@ export const ACCIDENT_CASE_BEFORE_COPY = {
|
||||
financeCollect: "有没有记得住时间的收入变化、大笔支出或欠债？",
|
||||
deliveryAdopt: "当前可信区间是 05:00–05:07，代表分钟 05:00。代表分钟只是代表性候选，不是已确认的唯一出生分钟。 可以从下面的时间里选一个采用。",
|
||||
marriageConsultOpen: [
|
||||
"## 统一参数与原始结构",
|
||||
"## 关系",
|
||||
"## 技法审计表",
|
||||
"## 先回答你的问题",
|
||||
"## 盘里支持这个判断的地方",
|
||||
"## 时间怎么看",
|
||||
],
|
||||
} as const;
|
||||
|
||||
|
||||
@@ -34,7 +34,6 @@ import { consultationDomainIds, consultationDomainPlanValues } from "../src/lib/
|
||||
import {
|
||||
natalConsultationThinkingPlan,
|
||||
dailyConsultationThinkingPlan,
|
||||
consultationComposeHeadingGroups,
|
||||
DAILY_HEADING,
|
||||
REPORT_HEADING,
|
||||
} from "../src/lib/consultation-thinking-plan.ts";
|
||||
@@ -1011,7 +1010,7 @@ test("model answer text cannot forge a public Activity event", async () => {
|
||||
assert.equal(events.find((event) => event.type === "answer.delta")?.text, forged);
|
||||
});
|
||||
|
||||
test("Chinese reasoning is a public thinking channel and stays off the spoken answer", async () => {
|
||||
test("provider reasoning never becomes a public think or answer event", async () => {
|
||||
const events = await collectAgentPublicEvents([
|
||||
{ type: "reasoning-delta", payload: { text: "The proposedKind value was rejected" } },
|
||||
{ type: "reasoning-delta", payload: { text: "先看事业宫的结构。" } },
|
||||
@@ -1023,15 +1022,13 @@ test("Chinese reasoning is a public thinking channel and stays off the spoken an
|
||||
steps: [], workflow: { route: "career", status: "ready", preciseTiming: "blocked", missingLayers: [], domains: ["career"] },
|
||||
}),
|
||||
});
|
||||
assert.deepEqual(
|
||||
events.filter((event) => event.type === "thinking.delta"),
|
||||
[{ type: "thinking.delta", text: "先看事业宫的结构。" }],
|
||||
);
|
||||
assert.deepEqual(events.filter((event) => event.type === "thinking.delta"), []);
|
||||
assert.deepEqual(
|
||||
events.filter((event) => event.type === "answer.delta"),
|
||||
[{ type: "answer.delta", text: "事业方向的判断如下。" }],
|
||||
);
|
||||
assert.equal(events.some((event) => JSON.stringify(event).includes("proposedKind")), false);
|
||||
assert.equal(events.some((event) => JSON.stringify(event).includes("先看事业宫的结构")), false);
|
||||
});
|
||||
|
||||
test("incremental NDJSON parser handles arbitrary chunk boundaries", () => {
|
||||
@@ -1532,93 +1529,29 @@ test("a calculated run publishes thinking.section without tool ids", async () =>
|
||||
title: string;
|
||||
heading: string;
|
||||
}>;
|
||||
assert.ok(sections.some((section) => section.heading === "事业"));
|
||||
assert.ok(sections.some((section) => section.heading === "财富"));
|
||||
assert.ok(sections.some((section) => section.title.includes("财运") || section.title.includes("财富")));
|
||||
assert.ok(sections.some((section) => section.heading === REPORT_HEADING.question));
|
||||
assert.ok(sections.some((section) => section.heading === REPORT_HEADING.support));
|
||||
assert.ok(JSON.stringify(sections).includes("事业") || JSON.stringify(sections).includes("财富"));
|
||||
assert.doesNotMatch(JSON.stringify(sections), /run-jyotish/);
|
||||
});
|
||||
|
||||
test("sliced compose drains leftover first-stream text and writes one heading per slice", async () => {
|
||||
test("composeAnswer drains leftover first-stream text and writes one body", async () => {
|
||||
const state = toolOnlyRunState();
|
||||
state.thinkingPlan = natalConsultationThinkingPlan({ domains: ["career", "wealth"] });
|
||||
const headings = consultationComposeHeadingGroups(state.thinkingPlan).flatMap((group) => [...group.headings]);
|
||||
async function* leftover() {
|
||||
yield { type: "tool-result", payload: { toolCallId: "tool-1", toolName: "run-jyotish-consultation", result: {} } };
|
||||
yield { type: "text-delta", payload: { text: "## 事业\n整篇都写了" } };
|
||||
yield { type: "finish", payload: { stepResult: { reason: "stop" }, output: { usage: {}, steps: [{}] } } };
|
||||
}
|
||||
const composed: Array<{ heading: string; prior: string }> = [];
|
||||
let composed = 0;
|
||||
const response = streamAgentResponse({
|
||||
runId: "run", requestId: "req", state, stream: leftover(), requireTool: true,
|
||||
toolStatus: () => "ready", receipt: () => receipt(state),
|
||||
composeSection: async (heading, priorOutput) => {
|
||||
composed.push({ heading, prior: priorOutput });
|
||||
async function* slice() {
|
||||
yield { type: "reasoning-delta", payload: { text: `对照${heading}` } };
|
||||
yield { type: "text-delta", payload: { text: `## ${heading}\n本节。\n` } };
|
||||
yield { type: "finish", payload: { stepResult: { reason: "stop" }, output: { usage: {}, steps: [{}] } } };
|
||||
}
|
||||
return slice();
|
||||
},
|
||||
});
|
||||
const events: unknown[] = [];
|
||||
const parser = createNdjsonParser((event) => events.push(event));
|
||||
parser.finish(await response.text());
|
||||
assert.deepEqual(composed.map((item) => item.heading), headings);
|
||||
assert.equal(composed[0]?.prior, "");
|
||||
assert.match(composed[1]?.prior ?? "", /统一参数与原始结构/);
|
||||
const answer = events
|
||||
.filter((event): event is { type: string; text: string } => (event as { type?: string }).type === "answer.delta")
|
||||
.map((event) => event.text)
|
||||
.join("");
|
||||
assert.doesNotMatch(answer, /整篇都写了/);
|
||||
assert.match(answer, /## 统一参数与原始结构/);
|
||||
assert.match(answer, /## 事业\n本节/);
|
||||
assert.match(answer, /## 财富/);
|
||||
assert.match(answer, new RegExp(`## ${REPORT_HEADING.audit}`));
|
||||
const sectionHeadings = events
|
||||
.filter((event): event is { type: string; heading: string } => (event as { type?: string }).type === "thinking.section")
|
||||
.map((event) => event.heading);
|
||||
assert.deepEqual(sectionHeadings, [
|
||||
REPORT_HEADING.foundation,
|
||||
"事业",
|
||||
"财富",
|
||||
REPORT_HEADING.audit,
|
||||
]);
|
||||
});
|
||||
|
||||
test("an empty compose slice is retried once and does not fall through to answer-retry", async () => {
|
||||
const state = toolOnlyRunState();
|
||||
state.thinkingPlan = dailyConsultationThinkingPlan();
|
||||
let answerRetries = 0;
|
||||
const composed: Array<{ heading: string; reason: string }> = [];
|
||||
let trendAttempts = 0;
|
||||
async function* first() {
|
||||
yield { type: "tool-result", payload: { toolCallId: "tool-1", toolName: "run-jyotish-consultation", result: {} } };
|
||||
yield { type: "finish", payload: { stepResult: { reason: "stop" }, output: { usage: {}, steps: [{}] } } };
|
||||
}
|
||||
const response = streamAgentResponse({
|
||||
runId: "run", requestId: "req", state, stream: first(), requireTool: true,
|
||||
toolStatus: () => "ready", receipt: () => receipt(state),
|
||||
retryForAnswer: async () => {
|
||||
answerRetries += 1;
|
||||
async function* empty() {}
|
||||
return empty();
|
||||
},
|
||||
composeSection: async (heading, _prior, reason) => {
|
||||
composed.push({ heading, reason: reason ?? "write" });
|
||||
if (heading === DAILY_HEADING.trend) {
|
||||
trendAttempts += 1;
|
||||
if (trendAttempts === 1) {
|
||||
async function* toolOnly() {
|
||||
yield { type: "tool-call", payload: { toolCallId: "t2", toolName: "run-jyotish-consultation", args: {} } };
|
||||
yield { type: "finish", payload: { stepResult: { reason: "stop" }, output: { usage: {}, steps: [{}] } } };
|
||||
}
|
||||
return toolOnly();
|
||||
}
|
||||
}
|
||||
composeAnswer: async () => {
|
||||
composed += 1;
|
||||
async function* body() {
|
||||
yield { type: "text-delta", payload: { text: `## ${heading}\n本节。\n` } };
|
||||
yield { type: "reasoning-delta", payload: { text: "The user asked about career." } };
|
||||
yield { type: "text-delta", payload: { text: `## ${REPORT_HEADING.question}\n外松内紧。\n` } };
|
||||
yield { type: "finish", payload: { stepResult: { reason: "stop" }, output: { usage: {}, steps: [{}] } } };
|
||||
}
|
||||
return body();
|
||||
@@ -1627,25 +1560,22 @@ test("an empty compose slice is retried once and does not fall through to answer
|
||||
const events: unknown[] = [];
|
||||
const parser = createNdjsonParser((event) => events.push(event));
|
||||
parser.finish(await response.text());
|
||||
assert.equal(composed, 1);
|
||||
const answer = events
|
||||
.filter((event): event is { type: string; text: string } => (event as { type?: string }).type === "answer.delta")
|
||||
.map((event) => event.text)
|
||||
.join("");
|
||||
assert.equal(answerRetries, 0);
|
||||
assert.equal(trendAttempts, 2);
|
||||
assert.ok(composed.some((item) => item.heading === DAILY_HEADING.trend && item.reason === "empty-retry"));
|
||||
assert.equal(state.steps.some((step) => step.name === "section-empty-retry"), true);
|
||||
assert.equal(state.steps.some((step) => step.name === "answer-retry"), false);
|
||||
assert.match(answer, new RegExp(`## ${DAILY_HEADING.trend}`));
|
||||
assert.match(answer, /本节/);
|
||||
assert.equal(events.filter((event) => (event as { type?: string }).type === "run.completed").length, 1);
|
||||
assert.doesNotMatch(answer, /整篇都写了/);
|
||||
assert.match(answer, new RegExp(`## ${REPORT_HEADING.question}`));
|
||||
assert.equal(events.some((event) => (event as { type?: string }).type === "think.plan"), true);
|
||||
assert.equal(events.filter((event) => (event as { type?: string }).type === "thinking.delta").length, 0);
|
||||
});
|
||||
|
||||
test("a compose slice that stays empty after retry still asks for a full answer", async () => {
|
||||
test("empty composeAnswer falls through to answer-retry once", async () => {
|
||||
const state = toolOnlyRunState();
|
||||
state.thinkingPlan = dailyConsultationThinkingPlan();
|
||||
let answerRetries = 0;
|
||||
const composed: Array<{ heading: string; reason: string }> = [];
|
||||
let composed = 0;
|
||||
async function* first() {
|
||||
yield { type: "tool-result", payload: { toolCallId: "tool-1", toolName: "run-jyotish-consultation", result: {} } };
|
||||
yield { type: "finish", payload: { stepResult: { reason: "stop" }, output: { usage: {}, steps: [{}] } } };
|
||||
@@ -1661,10 +1591,50 @@ test("a compose slice that stays empty after retry still asks for a full answer"
|
||||
}
|
||||
return body();
|
||||
},
|
||||
composeSection: async (heading, _prior, reason) => {
|
||||
composed.push({ heading, reason: reason ?? "write" });
|
||||
composeAnswer: async () => {
|
||||
composed += 1;
|
||||
async function* empty() {
|
||||
yield { type: "finish", payload: { stepResult: { reason: "stop" }, output: { usage: {}, steps: [{}] } } };
|
||||
}
|
||||
return empty();
|
||||
},
|
||||
});
|
||||
const events: unknown[] = [];
|
||||
const parser = createNdjsonParser((event) => events.push(event));
|
||||
parser.finish(await response.text());
|
||||
const answer = events
|
||||
.filter((event): event is { type: string; text: string } => (event as { type?: string }).type === "answer.delta")
|
||||
.map((event) => event.text)
|
||||
.join("");
|
||||
assert.equal(composed, 1);
|
||||
assert.equal(answerRetries, 1);
|
||||
assert.equal(state.steps.some((step) => step.name === "section-empty-retry"), false);
|
||||
assert.equal(state.steps.some((step) => step.name === "answer-retry"), true);
|
||||
assert.match(answer, /补写/);
|
||||
assert.equal(events.filter((event) => (event as { type?: string }).type === "run.completed").length, 1);
|
||||
});
|
||||
|
||||
test("composeAnswer that stays empty still asks for a full answer", async () => {
|
||||
const state = toolOnlyRunState();
|
||||
state.thinkingPlan = dailyConsultationThinkingPlan();
|
||||
let answerRetries = 0;
|
||||
async function* first() {
|
||||
yield { type: "tool-result", payload: { toolCallId: "tool-1", toolName: "run-jyotish-consultation", result: {} } };
|
||||
yield { type: "finish", payload: { stepResult: { reason: "stop" }, output: { usage: {}, steps: [{}] } } };
|
||||
}
|
||||
const response = streamAgentResponse({
|
||||
runId: "run", requestId: "req", state, stream: first(), requireTool: true,
|
||||
toolStatus: () => "ready", receipt: () => receipt(state),
|
||||
retryForAnswer: async () => {
|
||||
answerRetries += 1;
|
||||
async function* body() {
|
||||
yield { type: "text-delta", payload: { text: `## ${DAILY_HEADING.trend}\n补写。\n` } };
|
||||
yield { type: "finish", payload: { stepResult: { reason: "stop" }, output: { usage: {}, steps: [{}] } } };
|
||||
}
|
||||
return body();
|
||||
},
|
||||
composeAnswer: async () => {
|
||||
async function* empty() {
|
||||
yield { type: "tool-call", payload: { toolCallId: "t2", toolName: "run-jyotish-consultation", args: {} } };
|
||||
yield { type: "finish", payload: { stepResult: { reason: "stop" }, output: { usage: {}, steps: [{}] } } };
|
||||
}
|
||||
return empty();
|
||||
@@ -1678,16 +1648,14 @@ test("a compose slice that stays empty after retry still asks for a full answer"
|
||||
.map((event) => event.text)
|
||||
.join("");
|
||||
assert.equal(answerRetries, 1);
|
||||
assert.equal(composed.filter((item) => item.reason === "empty-retry").length, 3);
|
||||
assert.equal(state.steps.some((step) => step.name === "section-empty-retry"), true);
|
||||
assert.equal(state.steps.some((step) => step.name === "section-empty-retry"), false);
|
||||
assert.equal(state.steps.at(-1)?.name, "answer-retry");
|
||||
assert.match(answer, /补写/);
|
||||
});
|
||||
|
||||
test("sliced compose length continue stays on the current section", async () => {
|
||||
test("composeAnswer length continue finishes the same body", async () => {
|
||||
const state = toolOnlyRunState();
|
||||
state.thinkingPlan = natalConsultationThinkingPlan({ domains: ["career"] });
|
||||
const headings = consultationComposeHeadingGroups(state.thinkingPlan).flatMap((group) => [...group.headings]);
|
||||
async function* first() {
|
||||
yield { type: "tool-result", payload: { toolCallId: "tool-1", toolName: "run-jyotish-consultation", result: {} } };
|
||||
yield { type: "finish", payload: { stepResult: { reason: "stop" }, output: { usage: {}, steps: [{}] } } };
|
||||
@@ -1696,24 +1664,16 @@ test("sliced compose length continue stays on the current section", async () =>
|
||||
const response = streamAgentResponse({
|
||||
runId: "run", requestId: "req", state, stream: first(), requireTool: true,
|
||||
toolStatus: () => "ready", receipt: () => receipt(state),
|
||||
composeSection: async (heading, priorOutput) => {
|
||||
if (heading === REPORT_HEADING.foundation) {
|
||||
async function* pinched() {
|
||||
yield { type: "text-delta", payload: { text: `## ${heading}\n岁差` } };
|
||||
yield { type: "finish", payload: { stepResult: { reason: "length" }, output: { usage: {}, steps: [{}] } } };
|
||||
}
|
||||
return pinched();
|
||||
composeAnswer: async () => {
|
||||
async function* pinched() {
|
||||
yield { type: "text-delta", payload: { text: `## ${REPORT_HEADING.question}\n岁差` } };
|
||||
yield { type: "finish", payload: { stepResult: { reason: "length" }, output: { usage: {}, steps: [{}] } } };
|
||||
}
|
||||
async function* slice() {
|
||||
yield { type: "text-delta", payload: { text: `## ${heading}\n本节。\n` } };
|
||||
yield { type: "finish", payload: { stepResult: { reason: "stop" }, output: { usage: {}, steps: [{}] } } };
|
||||
}
|
||||
return slice();
|
||||
return pinched();
|
||||
},
|
||||
continueAfterLength: async (output) => {
|
||||
continues += 1;
|
||||
assert.match(output, /## 统一参数与原始结构/);
|
||||
assert.doesNotMatch(output, /## 事业/);
|
||||
assert.match(output, new RegExp(`## ${REPORT_HEADING.question}`));
|
||||
async function* rest() {
|
||||
yield { type: "text-delta", payload: { text: " Lahiri。\n" } };
|
||||
yield { type: "finish", payload: { stepResult: { reason: "stop" }, output: { usage: {}, steps: [{}] } } };
|
||||
@@ -1725,21 +1685,20 @@ test("sliced compose length continue stays on the current section", async () =>
|
||||
const parser = createNdjsonParser((event) => events.push(event));
|
||||
parser.finish(await response.text());
|
||||
assert.equal(continues, 1);
|
||||
assert.equal(headings[0], REPORT_HEADING.foundation);
|
||||
const answer = events
|
||||
.filter((event): event is { type: string; text: string } => (event as { type?: string }).type === "answer.delta")
|
||||
.map((event) => event.text)
|
||||
.join("");
|
||||
assert.match(answer, /岁差 Lahiri/);
|
||||
assert.match(answer, /## 事业/);
|
||||
assert.equal(events.filter((event) => (event as { type?: string }).type === "run.completed").length, 1);
|
||||
});
|
||||
|
||||
test("natal tool success stores a Chinese thinking plan", async () => {
|
||||
const { state } = await runDomainPlan(["career", "wealth"], () => workflow());
|
||||
const encoded = JSON.stringify(state.thinkingPlan ?? []);
|
||||
assert.ok((state.thinkingPlan ?? []).some((section) => section.heading === "事业"));
|
||||
assert.ok((state.thinkingPlan ?? []).some((section) => section.heading === "财富"));
|
||||
assert.ok((state.thinkingPlan ?? []).some((section) => section.heading === REPORT_HEADING.support));
|
||||
assert.ok(JSON.stringify(state.thinkingPlan ?? []).includes("事业"));
|
||||
assert.ok(JSON.stringify(state.thinkingPlan ?? []).includes("财富"));
|
||||
assert.equal(encoded.includes("run-jyotish"), false);
|
||||
});
|
||||
|
||||
@@ -1784,7 +1743,7 @@ test("consult generation reserves spoken-answer tokens and enables a separate th
|
||||
assert.equal(AGENT_MAX_STEPS, 8);
|
||||
});
|
||||
|
||||
test("provider reasoning stays off the spoken answer and Chinese reasoning is public thinking", async () => {
|
||||
test("provider reasoning stays off the spoken answer and off the public think channel", async () => {
|
||||
const state = createConsultationRuntimeState();
|
||||
state.jyotishSkillBound = true;
|
||||
state.consultationToolCallCount = 1;
|
||||
@@ -1807,15 +1766,16 @@ test("provider reasoning stays off the spoken answer and Chinese reasoning is pu
|
||||
parser.finish(await response.text());
|
||||
assert.deepEqual(
|
||||
events.filter((event) => (event as { type?: string }).type === "thinking.delta"),
|
||||
[{ type: "thinking.delta", text: "先看事业宫的结构。" }],
|
||||
[],
|
||||
);
|
||||
const answer = events
|
||||
.filter((event): event is { type: string; text: string } => (event as { type?: string }).type === "answer.delta")
|
||||
.map((event) => event.text)
|
||||
.join("");
|
||||
assert.equal(answer, "事业方向的判断如下。");
|
||||
assert.equal(completedThinking, "先看事业宫的结构。");
|
||||
assert.equal(completedThinking, undefined);
|
||||
assert.doesNotMatch(JSON.stringify(events), /proposedKind/);
|
||||
assert.doesNotMatch(JSON.stringify(events), /先看事业宫的结构/);
|
||||
assert.equal(events.filter((event) => (event as { type?: string }).type === "run.completed").length, 1);
|
||||
});
|
||||
|
||||
|
||||
@@ -267,12 +267,12 @@ test("output guards and window/general instruction seams stay byte-stable", () =
|
||||
"D9 在印度占星中通常用于观察婚姻与法则层面的成熟。\n你的上升是巨蟹座。",
|
||||
);
|
||||
assert.match(general, /D9 在印度占星中通常用于观察婚姻与法则层面的成熟/);
|
||||
assert.doesNotMatch(general, /你的上升是巨蟹座/);
|
||||
assert.match(general, /你的上升是巨蟹座/);
|
||||
|
||||
const windowed = createBirthTimeModeOutputGuard("declared_birth_window", false)(
|
||||
"Rahu 大运为 2013年11月21日 至 2031年11月22日。",
|
||||
);
|
||||
assert.match(windowed, /具体时间已省略/);
|
||||
assert.match(windowed, /2013年11月21日/);
|
||||
|
||||
assert.match(routeSource, /function generalNoMinuteInstruction\(hasPublicDaily: boolean\) \{/);
|
||||
assert.match(routeSource, /function declaredWindowInstruction\(\) \{/);
|
||||
|
||||
@@ -10,8 +10,8 @@ import {
|
||||
} from "../src/lib/consultation-run-timeline.ts";
|
||||
|
||||
test("career and wealth events append method, calculate 1/2, think, then the first write", () => {
|
||||
const [foundation] = natalConsultationThinkingPlan({ domains: ["career", "wealth"] });
|
||||
assert.ok(foundation);
|
||||
const [question] = natalConsultationThinkingPlan({ domains: ["career", "wealth"] });
|
||||
assert.ok(question);
|
||||
const afterProgress = reduceConsultationTimelineEvents([
|
||||
{ type: "skill.started", name: "jyotish-vedic-astrology" },
|
||||
{ type: "skill.completed", name: "jyotish-vedic-astrology" },
|
||||
@@ -32,17 +32,17 @@ test("career and wealth events append method, calculate 1/2, think, then the fir
|
||||
assert.equal(afterProgress.rows[1]?.label, "正在计算本命盘（第 1/2 项）…");
|
||||
|
||||
const state = reduceConsultationTimelineEvents([
|
||||
{ type: "thinking.section", ...foundation },
|
||||
{ type: "answer.delta", text: "## 统一参数与原始结构\n岁差 Lahiri。\n" },
|
||||
{ type: "thinking.section", ...question },
|
||||
{ type: "answer.delta", text: "## 先回答你的问题\n外松内紧。\n" },
|
||||
], afterProgress);
|
||||
|
||||
assert.deepEqual(state.rows.map((row) => row.kind), ["method", "calculate", "think", "write"]);
|
||||
assert.equal(state.rows[1]?.status, "done");
|
||||
assert.equal(state.rows[2]?.label, "先整理本盘的统一参数");
|
||||
assert.equal(state.rows[2]?.label, "先抓住你真正在问的事");
|
||||
assert.equal(state.rows[2]?.status, "done");
|
||||
assert.equal(state.rows[3]?.id, "write-统一参数与原始结构");
|
||||
assert.equal(state.rows[3]?.id, "write-先回答你的问题");
|
||||
assert.equal(state.rows[3]?.status, "live");
|
||||
assert.match(state.rows[3]?.label ?? "", /正在写统一参数与原始结构/);
|
||||
assert.match(state.rows[3]?.label ?? "", /正在写先回答你的问题/);
|
||||
});
|
||||
|
||||
test("thinking after a tool starts a new think row instead of reopening the first", () => {
|
||||
@@ -94,14 +94,12 @@ test("idle chat without a natal calculation has no calculate row", () => {
|
||||
test("settled natal messages hydrate a calculate row from domain sections", () => {
|
||||
const sections = natalConsultationThinkingPlan({ domains: ["career", "wealth"] });
|
||||
const rows = consultationTimelineFromSettled({
|
||||
text: "## 统一参数与原始结构\n岁差。\n## 事业\n方向稳定。\n",
|
||||
text: "## 先回答你的问题\n外松内紧。\n## 盘里支持这个判断的地方\n方向稳定。\n",
|
||||
thinkingSections: sections,
|
||||
thinkingText: "先对照 D10。",
|
||||
});
|
||||
assert.ok(rows.some((row) => row.kind === "calculate"));
|
||||
assert.ok(rows.some((row) => row.kind === "think" && row.label.includes("事业")));
|
||||
assert.ok(rows.some((row) => row.kind === "think"));
|
||||
const calculate = rows.find((row) => row.kind === "calculate");
|
||||
assert.ok(calculate?.queries?.includes("事业"));
|
||||
assert.ok(calculate?.queries?.includes("D10"));
|
||||
assert.ok(calculate?.queries?.includes("财富"));
|
||||
assert.ok(calculate?.queries?.some((item) => item.includes("事业") || item.includes("D10") || item.includes("财富")));
|
||||
});
|
||||
|
||||
@@ -3,7 +3,7 @@ import test from "node:test";
|
||||
|
||||
import {
|
||||
applyThinkingSectionProgress,
|
||||
consultationComposeHeadingGroups,
|
||||
consultationComposePrompt,
|
||||
consultationContinuePrompt,
|
||||
consultationReportHeadings,
|
||||
consultationSectionPrompt,
|
||||
@@ -13,6 +13,7 @@ import {
|
||||
natalConsultationThinkingPlan,
|
||||
REPORT_HEADING,
|
||||
splitAnswerByHeadings,
|
||||
thinkPlanSteps,
|
||||
visibleThinkingSteps,
|
||||
windowConsultationThinkingPlan,
|
||||
} from "../src/lib/consultation-thinking-plan.ts";
|
||||
@@ -33,21 +34,21 @@ test("multi-domain thinking plan uses Chinese product labels and hides tool ids"
|
||||
});
|
||||
const encoded = JSON.stringify(sections);
|
||||
assert.deepEqual(sections.map((section) => section.heading), [
|
||||
REPORT_HEADING.foundation,
|
||||
"事业",
|
||||
"财富",
|
||||
REPORT_HEADING.audit,
|
||||
REPORT_HEADING.question,
|
||||
REPORT_HEADING.support,
|
||||
REPORT_HEADING.timing,
|
||||
REPORT_HEADING.action,
|
||||
]);
|
||||
assert.ok(sections.some((section) => section.title === "接下来分析你的事业"));
|
||||
assert.ok(sections.some((section) => section.title === "接下来分析你的财富"));
|
||||
assert.ok(sections.some((section) => section.id === "support"));
|
||||
assert.ok(JSON.stringify(sections).includes("事业"));
|
||||
assert.equal(encoded.includes("run-jyotish"), false);
|
||||
assert.equal(encoded.includes("skill_read"), false);
|
||||
assert.ok(sections[0]?.steps.some((step) => step.label.includes("D1")));
|
||||
assert.ok(sections.some((section) => section.steps.some((step) => step.label.includes("D1"))));
|
||||
});
|
||||
|
||||
test("window thinking plan stays on stable-layer copy", () => {
|
||||
const [section] = windowConsultationThinkingPlan();
|
||||
assert.equal(section?.heading, REPORT_HEADING.foundation);
|
||||
assert.equal(section?.heading, REPORT_HEADING.question);
|
||||
assert.equal(JSON.stringify(section).includes("run-jyotish"), false);
|
||||
});
|
||||
|
||||
@@ -65,22 +66,20 @@ test("visible steps collapse extras into a remaining count", () => {
|
||||
test("answer split follows the required heading order", () => {
|
||||
const headings = consultationReportHeadings(["career", "wealth"]);
|
||||
const text = [
|
||||
"## 统一参数与原始结构",
|
||||
"岁差 Lahiri。",
|
||||
"## 事业",
|
||||
"事业方向稳定。",
|
||||
"## 财富",
|
||||
"财运看 2/11 宫。",
|
||||
"## 技法审计表",
|
||||
"| 技法 | 状态 |",
|
||||
"## 现代生活",
|
||||
"先把合同条款写清楚。",
|
||||
`## ${REPORT_HEADING.question}`,
|
||||
"外松内紧。",
|
||||
`## ${REPORT_HEADING.support}`,
|
||||
"事业宫被土星压着。",
|
||||
`## ${REPORT_HEADING.timing}`,
|
||||
"这轮大运还没过完。",
|
||||
`## ${REPORT_HEADING.action}`,
|
||||
"这周只把合同条款写清楚。",
|
||||
].join("\n");
|
||||
const { slices } = splitAnswerByHeadings(text, headings);
|
||||
assert.match(slices["事业"] ?? "", /事业方向稳定/);
|
||||
assert.match(slices["财富"] ?? "", /财运看/);
|
||||
assert.match(slices[REPORT_HEADING.audit] ?? "", /技法/);
|
||||
assert.match(slices[REPORT_HEADING.wrap] ?? "", /合同条款/);
|
||||
assert.match(slices[REPORT_HEADING.question] ?? "", /外松内紧/);
|
||||
assert.match(slices[REPORT_HEADING.support] ?? "", /土星/);
|
||||
assert.match(slices[REPORT_HEADING.timing] ?? "", /大运/);
|
||||
assert.match(slices[REPORT_HEADING.action] ?? "", /合同条款/);
|
||||
});
|
||||
|
||||
test("settled answers mark leftover thinking sections done", () => {
|
||||
@@ -95,7 +94,7 @@ test("settled answers mark leftover thinking sections done", () => {
|
||||
|
||||
test("progress marks the current heading active and completed ones done", () => {
|
||||
const sections = natalConsultationThinkingPlan({ domains: ["career"] });
|
||||
const progressed = applyThinkingSectionProgress(sections, "## 统一参数与原始结构\n岁差。\n");
|
||||
const progressed = applyThinkingSectionProgress(sections, `## ${REPORT_HEADING.question}\n外松内紧。\n`);
|
||||
assert.equal(progressed[0]?.steps[0]?.status, "done");
|
||||
assert.equal(progressed[1]?.steps[0]?.status, "active");
|
||||
});
|
||||
@@ -111,23 +110,18 @@ test("natal spoken answers must use markdown lists for parallel points", () => {
|
||||
assert.match(consultationSpokenHeadingRule("natal"), /Markdown bullet lists/);
|
||||
});
|
||||
|
||||
test("close heading group splits audit and modern-life into two compose slices", () => {
|
||||
const groups = consultationComposeHeadingGroups(natalConsultationThinkingPlan({
|
||||
test("think plan flattens natal sections into v2 steps", () => {
|
||||
const steps = thinkPlanSteps(natalConsultationThinkingPlan({
|
||||
domains: ["career", "wealth"],
|
||||
}));
|
||||
assert.deepEqual(groups.map((group) => [...group.headings]), [
|
||||
[REPORT_HEADING.foundation],
|
||||
["事业"],
|
||||
["财富"],
|
||||
[REPORT_HEADING.audit, REPORT_HEADING.wrap],
|
||||
]);
|
||||
assert.deepEqual(steps.map((step) => step.id), ["question", "support", "timing", "action"]);
|
||||
});
|
||||
|
||||
test("section prompt asks for one heading and forbids another calculation", () => {
|
||||
const prompt = consultationSectionPrompt("事业", "## 统一参数与原始结构\n岁差。\n");
|
||||
const prompt = consultationSectionPrompt("事业", `## ${REPORT_HEADING.question}\n外松内紧。\n`);
|
||||
assert.match(prompt, /只写这一个二级标题及其正文：## 事业/);
|
||||
assert.match(prompt, /不要再调用排盘工具/);
|
||||
assert.match(prompt, /统一参数与原始结构/);
|
||||
assert.match(consultationComposePrompt(), /不要写「统一参数与原始结构」/);
|
||||
});
|
||||
|
||||
test("daily thinking plan is three sections without a close heading", () => {
|
||||
@@ -140,8 +134,8 @@ test("daily thinking plan is three sections without a close heading", () => {
|
||||
assert.equal(plan.at(-1)?.title, "一个行动 + 边界句");
|
||||
assert.equal(plan.some((section) => section.id === "close"), false);
|
||||
assert.deepEqual(
|
||||
consultationComposeHeadingGroups(plan).map((group) => [...group.headings]),
|
||||
[[DAILY_HEADING.trend], [DAILY_HEADING.actAvoid], [DAILY_HEADING.action]],
|
||||
thinkPlanSteps(plan).map((step) => step.id),
|
||||
["daily-trend", "daily-act-avoid", "daily-action"],
|
||||
);
|
||||
const written = [
|
||||
`## ${DAILY_HEADING.trend}\n今日宜把已谈妥的细节落成文字。`,
|
||||
|
||||
@@ -14,8 +14,7 @@ test("product voice uses a spoken opener then the skill Level 2 report skeleton"
|
||||
assert.match(voice, /governs METHOD, TECHNIQUE INVOCATION, TRUTH BOUNDARIES/);
|
||||
assert.match(voice, /Raman six-step house judgment/);
|
||||
assert.match(voice, /Yoga table/);
|
||||
assert.match(voice, /Technique Audit Table at the end of the answer body/);
|
||||
assert.match(voice, /已执行 \/ 阻塞 \/ 不适用/);
|
||||
assert.match(voice, /Do not write 统一参数与原始结构 or 技法审计表 into the body/);
|
||||
assert.match(voice, /governed_support_only_candidate_ready/);
|
||||
assert.match(voice, /Skip an executed layer the question needs/);
|
||||
// 原值: assert.match(voice, /你更适合把已经积累的专业能力做成长期事业/) —— 它是 Good 例。
|
||||
@@ -35,7 +34,7 @@ test("product voice uses a spoken opener then the skill Level 2 report skeleton"
|
||||
assert.match(mastra, /productConversationVoice/);
|
||||
assert.match(mastra, /natalSpokenReportContract/);
|
||||
assert.match(mastra, /skill Level 2 report skeleton/);
|
||||
assert.match(mastra, /Paste that Technique Audit Table at the end of the answer body/);
|
||||
assert.match(mastra, /Do not paste the Technique Audit Table into the answer body/);
|
||||
assert.match(binding, /Follow this method and its truth boundaries/);
|
||||
assert.match(binding, /present its Level 2 report template in the chat body after a 3-6 sentence spoken reply/);
|
||||
assert.match(mastra, /The bound skill method is this product's answering contract/);
|
||||
@@ -43,13 +42,12 @@ test("product voice uses a spoken opener then the skill Level 2 report skeleton"
|
||||
assert.match(mastra, /must_use_layers is the executed shortlist/);
|
||||
assert.match(mastra, /do not invent it from model knowledge/);
|
||||
assert.match(mastra, /search_period is the searched observation window/);
|
||||
assert.match(voice, /## 统一参数与原始结构/);
|
||||
assert.match(voice, /## 先回答你的问题/);
|
||||
assert.match(mastra, /consultationSpokenHeadingRule\("natal"\)/);
|
||||
assert.match(workflow, /template: "skill_level_2"/);
|
||||
assert.match(workflow, /raman_six_step/);
|
||||
assert.doesNotMatch(mastra, /Name the domains you did cover, say plainly that the remaining ones were not calculated/);
|
||||
assert.doesNotMatch(mastra, /2-5 short paragraphs/);
|
||||
assert.doesNotMatch(voice, /Do not paste the Technique Audit Table/);
|
||||
});
|
||||
|
||||
test("general and window get voice without the natal Level 2 skeleton", () => {
|
||||
|
||||
@@ -118,11 +118,11 @@ test("consult streams reserve an answer budget and keep provider thinking on a s
|
||||
assert.match(tools, /AGENT_MAX_OUTPUT_TOKENS as CONSULTATION_MAX_OUTPUT_TOKENS/);
|
||||
assert.match(route, /\.\.\.consultationGenerationSettings\(selectedModel\.model\)/);
|
||||
assert.match(route, /consultationContinueGenerationSettings\(selectedModel\.model\)/);
|
||||
assert.match(route, /consultationSliceGenerationSettings\(selectedModel\.model\)/);
|
||||
assert.match(route, /composeSection,/);
|
||||
assert.match(route, /consultationContinueGenerationSettings\(selectedModel\.model\)/);
|
||||
assert.match(route, /composeAnswer,/);
|
||||
assert.doesNotMatch(route, /maxOutputTokens:\s*\d/);
|
||||
assert.equal(route.match(/const continueAfterLength = async \(output: string\) => \{/g)?.length, 3);
|
||||
assert.equal(route.match(/const composeSection = async \(\s*heading: string,\s*priorOutput: string,\s*reason: "write" \| "empty-retry" = "write",\s*\) => \{/g)?.length, 1);
|
||||
assert.equal(route.match(/const composeAnswer = async \(\) => \{/g)?.length, 1);
|
||||
assert.match(route, /toolChoice: "none"/);
|
||||
assert.match(route, /entrypoint: consultEntrypoint/);
|
||||
assert.match(route, /entrypoint: parsed\.data\.entrypoint/);
|
||||
@@ -153,18 +153,19 @@ test("consult streams reserve an answer budget and keep provider thinking on a s
|
||||
assert.match(natalRetry, /], natalStreamOptions\)/);
|
||||
assert.doesNotMatch(natalRetry, /], streamOptions\)/);
|
||||
const composeBlock = route.slice(
|
||||
route.indexOf("const composeSection = async ("),
|
||||
route.indexOf("const executionReceipt = (): AgentExecutionReceipt => ({", route.indexOf("const composeSection = async (")),
|
||||
route.indexOf("const composeAnswer = async () => {"),
|
||||
route.indexOf("const executionReceipt = (): AgentExecutionReceipt => ({", route.indexOf("const composeAnswer = async () => {")),
|
||||
);
|
||||
assert.match(composeBlock, /\.\.\.streamOptions,/);
|
||||
assert.doesNotMatch(composeBlock, /natalStreamOptions/);
|
||||
assert.match(stream, /section-empty-retry/);
|
||||
assert.doesNotMatch(stream, /section-empty-retry/);
|
||||
assert.match(tools, /dailyConsultationThinkingPlan/);
|
||||
assert.match(tools, /pinsConsultationDomains/);
|
||||
assert.match(stream, /thinking\.section/);
|
||||
assert.match(stream, /thinking\.delta/);
|
||||
assert.match(stream, /think\.plan/);
|
||||
assert.match(stream, /think\.step/);
|
||||
assert.match(stream, /continueAfterLength/);
|
||||
assert.match(stream, /composeSection/);
|
||||
assert.match(stream, /composeAnswer/);
|
||||
assert.match(stream, /drainSpoken/);
|
||||
assert.match(stream, /answer-continue/);
|
||||
});
|
||||
|
||||
@@ -1,27 +1,6 @@
|
||||
import assert from "node:assert/strict";
|
||||
import test from "node:test";
|
||||
import {
|
||||
createPublicThinkingSanitizer,
|
||||
sanitizePublicThinkingText,
|
||||
} from "../src/lib/public-thinking.ts";
|
||||
|
||||
function chunksOf(text: string, size: number): string[] {
|
||||
const chunks: string[] = [];
|
||||
for (let index = 0; index < text.length; index += size) {
|
||||
chunks.push(text.slice(index, index + size));
|
||||
}
|
||||
return chunks;
|
||||
}
|
||||
|
||||
function feed(text: string, size: number): string {
|
||||
const sanitizer = createPublicThinkingSanitizer();
|
||||
let released = "";
|
||||
for (const chunk of chunksOf(text, size)) {
|
||||
released += sanitizer.push(chunk) ?? "";
|
||||
}
|
||||
released += sanitizer.flush() ?? "";
|
||||
return released;
|
||||
}
|
||||
import { acceptThinkStepText } from "../src/lib/think-step-gate.ts";
|
||||
|
||||
const INCIDENT_ENGLISH = [
|
||||
"The a for 2026-09-09 (, per). The is a - an, not a.",
|
||||
@@ -29,36 +8,30 @@ const INCIDENT_ENGLISH = [
|
||||
'Let me use: [""]. "timing"? Let me run-jyotish-.',
|
||||
].join(" ");
|
||||
|
||||
test("incident English salad fed in 3-6 character chunks never reaches the public channel", () => {
|
||||
const chinese = "今日宜推进合同细节。";
|
||||
for (const size of [3, 4, 5, 6]) {
|
||||
const released = feed(`${INCIDENT_ENGLISH} ${chinese}`, size);
|
||||
assert.match(released, /今日宜推进合同细节/);
|
||||
assert.doesNotMatch(released, /[A-Za-z]{4,}/);
|
||||
assert.doesNotMatch(released, /run-jyotish/);
|
||||
}
|
||||
test("incident English salad never reaches the public think channel", () => {
|
||||
assert.equal(acceptThinkStepText(INCIDENT_ENGLISH), null);
|
||||
});
|
||||
|
||||
test("pure Chinese thinking is unchanged", () => {
|
||||
const chinese = "先对照今日过境。再分开适合推进的事。";
|
||||
assert.equal(feed(chinese, 4), chinese);
|
||||
assert.equal(sanitizePublicThinkingText(chinese), chinese);
|
||||
assert.equal(acceptThinkStepText(chinese), chinese);
|
||||
});
|
||||
|
||||
test("CJK sentences keep Chinese and drop four-letter English words", () => {
|
||||
test("CJK sentences are accepted whole; English words are not stripped", () => {
|
||||
// 原值：删掉 ≥4 字母英文词，留下「今日趋势 可以推进。」
|
||||
// 新值：整句接受，或整句丢弃，绝不就地删词
|
||||
// 原因：BUG-942 / 任务书 P3，正则只能当门不能当刀。
|
||||
assert.equal(
|
||||
sanitizePublicThinkingText("今日趋势 timing 可以推进。"),
|
||||
"今日趋势 可以推进。",
|
||||
acceptThinkStepText("今日趋势 timing 可以推进。"),
|
||||
"今日趋势 timing 可以推进。",
|
||||
);
|
||||
});
|
||||
|
||||
test("English-only process narration is dropped even without a terminator", () => {
|
||||
assert.equal(sanitizePublicThinkingText("The proposedKind value was rejected"), null);
|
||||
assert.equal(acceptThinkStepText("The proposedKind value was rejected"), null);
|
||||
});
|
||||
|
||||
test("an unterminated English chunk does not glue onto the following Chinese sentence", () => {
|
||||
const sanitizer = createPublicThinkingSanitizer();
|
||||
assert.equal(sanitizer.push("The proposedKind value was rejected"), null);
|
||||
assert.equal(sanitizer.push("先看事业宫的结构。"), "先看事业宫的结构。");
|
||||
assert.equal(sanitizer.flush(), null);
|
||||
test("an unterminated fragment is dropped rather than rewritten", () => {
|
||||
assert.equal(acceptThinkStepText("先看事业宫的结构"), null);
|
||||
assert.equal(acceptThinkStepText("先看事业宫的结构。"), "先看事业宫的结构。");
|
||||
});
|
||||
|
||||
@@ -2,6 +2,8 @@ import assert from "node:assert/strict";
|
||||
import test from "node:test";
|
||||
|
||||
import {
|
||||
detectGeneralNoBirthTimeViolations,
|
||||
detectPreciseTimingViolations,
|
||||
GENERAL_NO_BIRTH_TIME_REFUSAL,
|
||||
guardGeneralNoBirthTimeOutput,
|
||||
guardPreciseTimingOutput,
|
||||
@@ -10,27 +12,28 @@ import { streamTextResponse } from "../src/lib/stream-text-response.ts";
|
||||
import { parseAgentReply } from "../src/lib/agent-reply.ts";
|
||||
import { createBirthTimeModeOutputGuard } from "../src/lib/consultation-birth-time-mode.ts";
|
||||
|
||||
test("removes exact dates and months when precise timing is blocked", () => {
|
||||
const guarded = guardPreciseTimingOutput(
|
||||
"你会在2027年3月15日结婚，事业将在11月转折。",
|
||||
);
|
||||
|
||||
assert.doesNotMatch(guarded, /2027年3月15日|11月/);
|
||||
assert.match(guarded, /具体时间已省略/);
|
||||
test("detects exact dates and months when precise timing is blocked", () => {
|
||||
// 原值：就地替换成「[具体时间已省略]」
|
||||
// 新值：只检测，不改写
|
||||
// 原因：任务书 P3，正则当门不当刀。
|
||||
const text = "你会在2027年3月15日结婚，事业将在11月转折。";
|
||||
const hits = detectPreciseTimingViolations(text);
|
||||
assert.equal(hits.some((item) => item.kind === "exact-timing"), true);
|
||||
assert.equal(guardPreciseTimingOutput(text), text);
|
||||
});
|
||||
|
||||
test("removes guarantee conclusions when the evidence contract is incomplete", () => {
|
||||
const guarded = guardPreciseTimingOutput("我保证你一定会升职。");
|
||||
|
||||
assert.doesNotMatch(guarded, /保证你一定会升职/);
|
||||
assert.match(guarded, /保证性结论已省略/);
|
||||
test("detects guarantee conclusions when the evidence contract is incomplete", () => {
|
||||
const text = "我保证你一定会升职。";
|
||||
const hits = detectPreciseTimingViolations(text);
|
||||
assert.equal(hits.some((item) => item.kind === "guarantee"), true);
|
||||
assert.equal(guardPreciseTimingOutput(text), text);
|
||||
assert.equal(
|
||||
guardPreciseTimingOutput("You will definitely get promoted."),
|
||||
"[保证性结论已省略].",
|
||||
detectPreciseTimingViolations("You will definitely get promoted.").some((item) => item.kind === "guarantee"),
|
||||
true,
|
||||
);
|
||||
});
|
||||
|
||||
test("guards a date that crosses streamed chunks", async () => {
|
||||
test("streamed dates stay intact because the guard no longer rewrites", async () => {
|
||||
async function* reply() {
|
||||
yield "应期是2027年";
|
||||
yield "3月15日，但我保证你一定会升职。";
|
||||
@@ -42,9 +45,8 @@ test("guards a date that crosses streamed chunks", async () => {
|
||||
transformText: guardPreciseTimingOutput,
|
||||
});
|
||||
const text = await response.text();
|
||||
|
||||
assert.doesNotMatch(text, /2027年3月15日|保证你一定会升职/);
|
||||
assert.match(text, /保证性结论已省略/);
|
||||
assert.match(text, /2027年3月15日/);
|
||||
assert.equal(detectPreciseTimingViolations(text).length > 0, true);
|
||||
});
|
||||
|
||||
test("guards only visible prose and preserves AYANAM blocks across arbitrary chunk boundaries", async () => {
|
||||
@@ -67,9 +69,9 @@ test("guards only visible prose and preserves AYANAM blocks across arbitrary chu
|
||||
const text = await response.text();
|
||||
const parsed = parseAgentReply(text);
|
||||
|
||||
assert.doesNotMatch(text, /2027年3月15日|正文说你将在.*一定会升职/);
|
||||
assert.match(text, /2027年3月15日/);
|
||||
assert.match(text, /^一般知识不依赖个人星盘/);
|
||||
assert.match(text, /具体时间已省略|保证性结论已省略/);
|
||||
assert.equal(detectPreciseTimingViolations(parsed.text).length > 0, true);
|
||||
assert.equal(text.includes(suggestions), true);
|
||||
assert.equal(text.includes(title), true);
|
||||
assert.doesNotMatch(text, /<!\[/);
|
||||
@@ -92,9 +94,9 @@ test("general mode structurally rejects personalized chart placements in Chinese
|
||||
];
|
||||
|
||||
for (const claim of unsafeClaims) {
|
||||
const guarded = guardGeneralNoBirthTimeOutput(claim);
|
||||
assert.equal(guarded.includes(GENERAL_NO_BIRTH_TIME_REFUSAL), true, claim);
|
||||
assert.equal(guarded.includes(claim.replace(/[。.]$/, "")), false, claim);
|
||||
const hits = detectGeneralNoBirthTimeViolations(claim);
|
||||
assert.equal(hits.some((item) => item.kind === "personal-chart" || item.kind === "exact-timing"), true, claim);
|
||||
assert.equal(guardGeneralNoBirthTimeOutput(claim), claim, claim);
|
||||
}
|
||||
|
||||
assert.equal(
|
||||
@@ -125,9 +127,8 @@ test("general mode rejects personalized chart predicates beyond possessive place
|
||||
];
|
||||
|
||||
for (const claim of unsafeClaims) {
|
||||
const guarded = guardGeneralNoBirthTimeOutput(claim);
|
||||
const punctuation = claim.endsWith("。") ? "。" : ".";
|
||||
assert.equal(guarded, `${GENERAL_NO_BIRTH_TIME_REFUSAL}${punctuation}`, claim);
|
||||
assert.equal(detectGeneralNoBirthTimeViolations(claim).length > 0, true, claim);
|
||||
assert.equal(guardGeneralNoBirthTimeOutput(claim), claim, claim);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -174,8 +175,8 @@ test("hidden AYANAM comments cannot split a personalized claim around the guard"
|
||||
const parsed = parseAgentReply(text);
|
||||
|
||||
assert.match(text, /一般知识可以说明概念/);
|
||||
assert.match(text, new RegExp(GENERAL_NO_BIRTH_TIME_REFUSAL));
|
||||
assert.doesNotMatch(text, /你的\s*金星落第七宫/);
|
||||
assert.match(parsed.text, /金星落/);
|
||||
assert.equal(detectGeneralNoBirthTimeViolations(parsed.text).length > 0, true);
|
||||
assert.equal(text.includes(title), true);
|
||||
assert.equal(text.includes(suggestions), true);
|
||||
assert.equal(parsed.title, "一般占星咨询");
|
||||
|
||||
Reference in New Issue
Block a user