diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f75626..022e704 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ - **`ext/linalg`**:L0–L6 + 公式文档面 **F1–F3**(中缀、`declare`、展示/`explicit` 默认化简、`T_ascii`、public「如何写公式文档」);示例 `linalg-transpose` · `linalg-svd` · `linalg-least-squares`。设计:[ext-linalg-formula-doc.md](doc/design/ext-linalg-formula-doc.md)。 ### Fixed +- **`ext/agent`**:写回改走 `wb.record`(避免 `writeback` 形参遮蔽模块名),不再直调 `host_*`。 +- **`ext/llm`**:`stream_result` 忽略未知 SSE 类型(如 `reasoning`),不再因此退出。 ### Changed diff --git a/ext/ai/agent.mq.md b/ext/ai/agent.mq.md index c11466d..04ad84e 100644 --- a/ext/ai/agent.mq.md +++ b/ext/ai/agent.mq.md @@ -6,7 +6,7 @@ import json:lib/json.mq.md import sys:lib/sys.mq.md import fs:lib/fs.mq.md import time:lib/time.mq.md -import writeback:lib/writeback.mq.md +import wb:lib/writeback.mq.md import subtask:lib/subtask.mq.md import plugin:lib/plugin.mq.md --- @@ -130,7 +130,7 @@ Allowlist check, then invoke the runbook `##` via `lib/subtask` (`spawn fn=` → Build a runnable workbook. `skeleton=single` (default): one worker `step`. `skeleton=dual`: research then write agents. On success the parent chooses DONE; runtime `agent_workbook_solidify` freezes the answer. *q = > json.quote text=`goal`* -*esc = > json.parse text={"h":"---\ntitle: agent workbook\nimport llm:ext/ai/llm.mq.md\nimport agent:ext/ai/agent.mq.md\nimport json:lib/json.mq.md\nimport sys:lib/sys.mq.md\nimport writeback:lib/writeback.mq.md\nimport subtask:lib/subtask.mq.md\n---\n\n# Goal\n\nParent goal is embedded as JSON in # main.\n\n## Solidify\n\nWhen the child returns a good value, parent DECISION: DONE — runtime agent_workbook_solidify freezes the answer as **return** (do not invent long FIND/REPLACE).\n\n# main\n\n> llm.load_env\n\n","s1":"\u002a\u0060model\u0060 = > llm.llm \u002a\n","s2":"\u002a\u0060tools\u0060 = > json.parse text=[] \u002a\n","s3":"\u002a\u0060worker\u0060 = > agent.agent model=\u0060model\u0060 tools=\u0060tools\u0060 standing=You are a workbook worker. tools=[] means never CALL. Finish the task with a direct final answer; do not invent tools. \u002a\n","s4":"\u002a\u0060wrap\u0060 = > json.parse text={\"task\":","s5":"} \u002a\n","s6":"\u002a\u0060task\u0060 = > json.get value=\u0060wrap\u0060 key=task \u002a\n","s7":"\u002a\u0060out\u0060 = > \u0060worker\u0060.step task=\u0060task\u0060 stream=True \u002a\n","s7b":"\u002a\u0060text\u0060 = > json.get value=\u0060out\u0060 key=result \u002a\n","s8":"\u002a\u002a\u0060text\u0060\u002a\u002a\n","d3":"\u002a\u0060research\u0060 = > agent.agent model=\u0060model\u0060 tools=\u0060tools\u0060 standing=You gather facts for the goal. Be concise. Do not invent tools. \u002a\n","d3b":"\u002a\u0060writer\u0060 = > agent.agent model=\u0060model\u0060 tools=\u0060tools\u0060 standing=You write the final answer from research notes. Do not invent tools. \u002a\n","d4":"\u002a\u0060wrap\u0060 = > json.parse text={\"task\":","d5":"} \u002a\n","d6":"\u002a\u0060task\u0060 = > json.get value=\u0060wrap\u0060 key=task \u002a\n","d7":"\u002a\u0060notes\u0060 = > \u0060research\u0060.step task=\u0060task\u0060 stream=True \u002a\n","d8":"\u002a\u0060ns\u0060 = > json.stringify value=\u0060notes\u0060 \u002a\n","d9":"\u002a\u0060wt\u0060 = Write the final answer. Research notes: \u002a\n","d10":"\u002a\u0060wt\u0060 = \u0060wt\u0060 + \u0060ns\u0060 \u002a\n","d11":"\u002a\u0060out\u0060 = > \u0060writer\u0060.step task=\u0060wt\u0060 stream=True \u002a\n","d11b":"\u002a\u0060text\u0060 = > json.get value=\u0060out\u0060 key=result \u002a\n","d12":"\u002a\u002a\u0060text\u0060\u002a\u002a\n"}* +*esc = > json.parse text={"h":"---\ntitle: agent workbook\nimport llm:ext/ai/llm.mq.md\nimport agent:ext/ai/agent.mq.md\nimport json:lib/json.mq.md\nimport sys:lib/sys.mq.md\nimport wb:lib/writeback.mq.md\nimport subtask:lib/subtask.mq.md\n---\n\n# Goal\n\nParent goal is embedded as JSON in # main.\n\n## Solidify\n\nWhen the child returns a good value, parent DECISION: DONE — runtime agent_workbook_solidify freezes the answer as **return** (do not invent long FIND/REPLACE).\n\n# main\n\n> llm.load_env\n\n","s1":"\u002a\u0060model\u0060 = > llm.llm \u002a\n","s2":"\u002a\u0060tools\u0060 = > json.parse text=[] \u002a\n","s3":"\u002a\u0060worker\u0060 = > agent.agent model=\u0060model\u0060 tools=\u0060tools\u0060 standing=You are a workbook worker. tools=[] means never CALL. Finish the task with a direct final answer; do not invent tools. \u002a\n","s4":"\u002a\u0060wrap\u0060 = > json.parse text={\"task\":","s5":"} \u002a\n","s6":"\u002a\u0060task\u0060 = > json.get value=\u0060wrap\u0060 key=task \u002a\n","s7":"\u002a\u0060out\u0060 = > \u0060worker\u0060.step task=\u0060task\u0060 stream=True \u002a\n","s7b":"\u002a\u0060text\u0060 = > json.get value=\u0060out\u0060 key=result \u002a\n","s8":"\u002a\u002a\u0060text\u0060\u002a\u002a\n","d3":"\u002a\u0060research\u0060 = > agent.agent model=\u0060model\u0060 tools=\u0060tools\u0060 standing=You gather facts for the goal. Be concise. Do not invent tools. \u002a\n","d3b":"\u002a\u0060writer\u0060 = > agent.agent model=\u0060model\u0060 tools=\u0060tools\u0060 standing=You write the final answer from research notes. Do not invent tools. \u002a\n","d4":"\u002a\u0060wrap\u0060 = > json.parse text={\"task\":","d5":"} \u002a\n","d6":"\u002a\u0060task\u0060 = > json.get value=\u0060wrap\u0060 key=task \u002a\n","d7":"\u002a\u0060notes\u0060 = > \u0060research\u0060.step task=\u0060task\u0060 stream=True \u002a\n","d8":"\u002a\u0060ns\u0060 = > json.stringify value=\u0060notes\u0060 \u002a\n","d9":"\u002a\u0060wt\u0060 = Write the final answer. Research notes: \u002a\n","d10":"\u002a\u0060wt\u0060 = \u0060wt\u0060 + \u0060ns\u0060 \u002a\n","d11":"\u002a\u0060out\u0060 = > \u0060writer\u0060.step task=\u0060wt\u0060 stream=True \u002a\n","d11b":"\u002a\u0060text\u0060 = > json.get value=\u0060out\u0060 key=result \u002a\n","d12":"\u002a\u002a\u0060text\u0060\u002a\u002a\n"}* *h = > json.get value=`esc` key="h"* *s1 = > json.get value=`esc` key="s1"* *s2 = > json.get value=`esc` key="s2"* @@ -171,7 +171,7 @@ Build a runnable workbook. `skeleton=single` (default): one worker `step`. `skel Structured observation for the parent developer-agent: source, named writeback slots, exit code, optional child return value, and quiet-captured I/O. *source = > fs.read_text path=`path`* -*slots = > writeback.scan_path path=`path`* +*slots = > wb.scan_path path=`path`* *obs = > json.parse text={"path":""}* *obs = > json.set map=`obs` key="path" value=`path`* *obs = > json.set map=`obs` key="source" value=`source`* @@ -1463,7 +1463,7 @@ Always append `done` and attach `events` on the result map (process audit even w 1. `trace` *body = > json.stringify value=`events`* - > writeback.record value=`body` key="trace" + > wb.record value=`body` key="trace" 2. * *_ = 1* @@ -1606,9 +1606,9 @@ With `stream=True`, the model call uses SSE; `echo=True` prints delta text to st *body = > json.stringify value=`out`* *st = > json.get value=`out` key="status"* 1. `st` == "ok" - > writeback.record value=`body` key="ok" + > wb.record value=`body` key="ok" 2. * - > writeback.record value=`body` key="error" + > wb.record value=`body` key="error" 2. * *_ = 1* @@ -1711,7 +1711,7 @@ Reuse lookup: exact → alias → canonicalize → optional local n-gram `near` *events = > plan_append_round events=`events` round=1 workbook=`path` exit_code=`code` result=`child_val` stream=`stream` echo=`echo`* 1. `writeback` *body = > json.stringify value=`out`* - > writeback.record value=`body` key="ok" + > wb.record value=`body` key="ok" 2. * *_ = 1* *out = > plan_finish_stream out=`out` events=`events` stream=`stream` trace=`trace` result=`child_val`* @@ -1768,7 +1768,7 @@ Reuse lookup: exact → alias → canonicalize → optional local n-gram `near` *events = > plan_append_round events=`events` round=1 workbook=`path` exit_code=`code` result=`child_val` stream=`stream` echo=`echo`* 1. `writeback` *body = > json.stringify value=`out`* - > writeback.record value=`body` key="ok" + > wb.record value=`body` key="ok" 2. * *_ = 1* *out = > plan_finish_stream out=`out` events=`events` stream=`stream` trace=`trace` result=`child_val`* @@ -1832,7 +1832,7 @@ Reuse lookup: exact → alias → canonicalize → optional local n-gram `near` *events = > plan_append_round events=`events` round=1 workbook=`path` exit_code=`code` result=`child_val` stream=`stream` echo=`echo`* 1. `writeback` *body = > json.stringify value=`out`* - > writeback.record value=`body` key="ok" + > wb.record value=`body` key="ok" 2. * *_ = 1* *out = > plan_finish_stream out=`out` events=`events` stream=`stream` trace=`trace` result=`child_val`* @@ -1910,7 +1910,7 @@ Reuse lookup: exact → alias → canonicalize → optional local n-gram `near` *out = > json.set map=`out` key="cache" value="bypass"* 1. `writeback` *body = > json.stringify value=`out`* - > writeback.record value=`body` key="ok" + > wb.record value=`body` key="ok" 2. * *_ = 1* *out = > plan_finish_stream out=`out` events=`events` stream=`stream` trace=`trace`* @@ -2091,9 +2091,9 @@ Deterministic success stop (loop engineering): when the child already returned a 1. `writeback` *body = > json.stringify value=`out`* 1. `status` == "ok" - > writeback.record value=`body` key="ok" + > wb.record value=`body` key="ok" 2. * - > writeback.record value=`body` key="error" + > wb.record value=`body` key="error" 2. * *_ = 1* diff --git a/ext/ai/llm.mq.md b/ext/ai/llm.mq.md index 3f54c60..214a8b1 100644 --- a/ext/ai/llm.mq.md +++ b/ext/ai/llm.mq.md @@ -17,7 +17,7 @@ Load `.env` from cwd (optional named arg `path=`). Does not override existing va ## stream_result + `events` -Reduce a `complete stream=True` event list to the final `done.result` text (or `error.message`). Unknown event types abort. +Reduce a `complete stream=True` event list to the final `done.result` text (or `error.message`). Unknown types (e.g. `reasoning`) are ignored. *answer = ""* @@ -29,9 +29,7 @@ Reduce a `complete stream=True` event list to the final `done.result` text (or ` *answer = ev[^message]* 3. `t` == "delta" 4. * - > print text=ext/ai/llm: unexpected SSE event type - > print text=`t` - > sys.exit code=1 + *_ = 1* **answer** diff --git a/ext/ai/大模型.mq.md b/ext/ai/大模型.mq.md index 7480783..87185e8 100644 --- a/ext/ai/大模型.mq.md +++ b/ext/ai/大模型.mq.md @@ -17,7 +17,7 @@ import json:lib/json.mq.md ## 流式结果 + `事件` -把 `运行 流式=真` 的事件列表收成最终 `done.result`(或 `error.message`)。未知事件类型直接失败。 +把 `运行 流式=真` 的事件列表收成最终 `done.result`(或 `error.message`)。未知类型(如 `reasoning`)忽略。 *answer = ""* @@ -29,9 +29,7 @@ import json:lib/json.mq.md *answer = ev[^message]* 3. `t` == "delta" 4. * - > 打印 内容=ext/ai/大模型: 未预期的 SSE 事件类型 - > 打印 内容=`t` - > 系统.退出 码=1 + *_ = 1* **answer** diff --git a/tests/ext/agent-writeback-shadow.mq.md b/tests/ext/agent-writeback-shadow.mq.md index 41700a7..bbf91cd 100644 --- a/tests/ext/agent-writeback-shadow.mq.md +++ b/tests/ext/agent-writeback-shadow.mq.md @@ -1,6 +1,7 @@ --- -title: writeback param must not shadow host_writeback_record -description: Regression — step/plan param writeback=True used to break > writeback.record (bool is not a map). +title: writeback param must not shadow writeback module +description: Regression — step/plan param writeback=True used to break > writeback.record (bool is not a map). Use a non-colliding import alias. +import wb:lib/writeback.mq.md import writeback:lib/writeback.mq.md import json:lib/json.mq.md import sys:lib/sys.mq.md @@ -12,16 +13,16 @@ import sys:lib/sys.mq.md ## go + `writeback`=False -Mimic agent.step: branch on param named writeback, then persist via host (not import bind). +Mimic agent.step: branch on param named writeback, then persist via aliased lib import. *out = > json.parse text={"status":"ok","note":"shadow-probe"}* 1. `writeback` *body = > json.stringify value=`out`* *st = > json.get value=`out` key="status"* 1. `st` == "ok" - > host_writeback_record value=`body` key="ok" + > wb.record value=`body` key="ok" 2. * - > host_writeback_record value=`body` key="error" + > wb.record value=`body` key="error" 2. * *_ = 1* **** diff --git a/tests/gold.rs b/tests/gold.rs index 97e5e8b..7557cfc 100644 --- a/tests/gold.rs +++ b/tests/gold.rs @@ -3206,22 +3206,23 @@ fn ext_agent_run_live() { let stderr = String::from_utf8_lossy(&output.stderr); assert_eq!(code, 0, "agent-run-live stderr={stderr}"); let lines: Vec<&str> = stdout.trim_end().lines().collect(); - assert!(lines.len() >= 3, "agent-run-live stdout={stdout}"); + assert!(lines.len() >= 4, "agent-run-live stdout={stdout}"); assert!( lines[0].chars().any(|c| c.is_ascii_digit()), "expected date in reply, got {:?}", lines[0] ); - assert_eq!(lines[1], "2", "history after step"); - assert_eq!(lines[2], "0", "history after clear"); - // Caller may persist the step map via lib/writeback; agent itself does not write. + assert_eq!(lines[1], "writeback-ok", "named ok slot after step"); + assert_eq!(lines[2], "2", "history after step"); + assert_eq!(lines[3], "0", "history after clear"); + // Default step writeback persists the result map under the ok/error slots. let src = std::fs::read_to_string( std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/ext/agent-run-live.mq.md"), ) .expect("read agent-run-live after run"); assert!( src.contains("\"status\"") || src.contains("marqdo-out"), - "expected caller writeback of step result map" + "expected writeback of step result map" ); assert!( !stdout.contains("marqdo-out"),