cflmy
aea86746e7
feat: migrate corpus to file-scoped occlusion
2026-10-23 12:45:01 +00:00
cflmy
c773503938
Merge branch 'main' of https://github.com/cflmy/marqdo
...
# Conflicts:
# tests/migrate.rs
# tests/occlusion/classic-index.mq.md
2026-10-23 12:11:58 +00:00
cflmy
939e23ee88
refactor: scope markup compatibility per invocation
2026-10-23 12:11:26 +00:00
cflmy and Cursor
687c168014
feat(parse): use nested YAML import: maps instead of one-liner binds
...
Frontmatter imports are now valid YAML (`import:` / `导入:` with bind→target
entries), removing spaced keys. Add `marqdo migrate imports`, hard-error the
old one-liner form, and migrate lib/ext/examples/tests/docs accordingly.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-10-23 19:33:58 +08:00
cflmy
eac9b45263
feat: compile executable knowledge semantic artifacts
2026-10-23 09:16:52 +00:00
cflmy
fc7097bae4
test: validate executable knowledge syntax across libraries
2026-10-23 08:47:49 +00:00
cflmy
b624084745
feat: classify associated and instance symbols
2026-10-23 08:26:33 +00:00
cflmy
0bbe735c3c
feat: add stable executable knowledge symbols
2026-10-23 08:24:10 +00:00
cflmy
86e921e959
feat(migrate): 支持多路径;docs: 体量审计修正两条不成立的判断
...
- migrate labels 接受多个 PATH(与 labels 一致);全仓干跑幂等:
lib/ext/cli/examples/public 均为 0,tests 仅剩刻意保留的 classic 样例 1 处
- 审计修正:
* html.rs 皮肤"重复声明基础 CSS" —— 实测 312 vs 128 条规则、选择器零重叠,不成立
* debug_page "复刻 shell" —— 仅 head/favicon 约 10 行相似,它没有 nav/topbar,不成立
* HostFn 五表合一标记为已完成(−404 行)
- 结论:可机械消除的重复已清完;剩余体量全是特性实现
全仓校验:63 个文件 check 零诊断(label.* 全 0);
cargo test --release 609 passed / 0 failed。" && timeout 300 git push origin main 2>&1 | tail -1
2026-10-22 15:52:22 +08:00
cflmy
6ae0d39e5a
feat(labels): 兼容文档里的 labels pending / labels search 写法
...
设计文档写的是 `labels pending` / `labels search --grep`,CLI 是扁平参数。
把 pending/search 作为无意义位置词过滤掉,使两种写法都可用(不动参数语义)。
实测:labels pending --count → 2;labels search --grep 联调 --count → 1。
全量 605 passed / 0 failed。
2026-10-22 15:34:55 +08:00
cflmy
307c8efa81
feat(labels): 支持多路径扫描;docs: 里程碑全量完成状态与变更文档索引
...
- labels 接受多个 PATH(默认 .),合并去重后扫描
- occlusion-syntax.md §13.1 记录 M0–M10 全部完成,附 11 份变更文档索引
- 全仓校验:98 个文件 check 零诊断(label.* 全为 0,确认无噪音)
- cargo test --release 605 passed / 0 failed;0 编译警告
2026-10-22 15:34:29 +08:00
cflmy
34b0911218
feat(labels): M8 债务棘轮 — --baseline + --fail-on-increase
...
规则:未完成项只许减少,不许增加。
- 台账不存在 → 建立(写入当前计数)并提示,exit 0
- 当前 > 台账 → 失败并提示"未完成项增加了 K",exit 1
- 当前 ≤ 台账 → 通过;若减少则**收紧**台账(N → M)
为什么减少即收紧:否则债务可先降后升,棘轮形同虚设;
收紧后回退到旧数量同样失败(测试第 4 步验证)。
台账格式 {"count":N,"words":[…]},记录词集使"口径变更"可审计。
为什么用棘轮而非硬门禁:硬门禁(必须为 0)会让存量债立刻红一片、逼人关检查;
棘轮做到"老账不追、新账必拦",与防疲劳机制的结论一致。
呈现面复核:expr_display / view 把遮蔽渲染为 [描述](实现)、桩为 [描述](),
实测 view output 页面含 access(;未做桩徽章——桩已是显眼形状,再加装饰是噪音。
测试:四步集成用例(建账 → 增加失败 → 减少收紧 → 回退再次失败);
全量 605 passed / 0 failed(M7 后 604 + 1)。
文档:doc/design/change-m8-ratchet.md
2026-10-22 15:34:07 +08:00
cflmy
4488a3cb70
feat(migrate): M7 迁移与版本门 — per-file markup + migrate labels + 全仓迁移
...
原计划的"翻转默认 + 旧形硬报错"不可行:`[键](集合)` 与 `[描述](实现)` 外形相同,
翻转会让 506 处取元静默变义,硬报错又拿不到证据。改为**按文件声明**。
一、per-file markup
- frontmatter `markup: occlusion`(或 `标记: 遮蔽`)决定该文件模式
- load.rs 先取模式,用 parse::expr::with_markup(线程局部压栈)包住解析
- 同一进程可同时加载两种模式的文件(imports);MARQDO_MARKUP 仍作进程默认
- 好处:迁移逐文件、可增量、可回滚,不存在半迁移的静默错义
二、`marqdo migrate labels [--write|--json]`
改写规则:
[键](集合) → [键](access(集合, "键"))
[`名`](集合) → [名](access(集合, `名`))
- [项](集合) → - [项](遍历 集合 为 项)
安全模型:改写 → 重解析 → 证明等价 → 才写
- 原文件按 classic 解析得 AST-A;改写后按 occlusion 解析得 AST-B
- 反归一化 B(标签与键同名且 payload 为 access 的遮蔽还原成 Index)
- Debug(A) == Debug(反归一化(B))(抹掉行号)才写入,否则原文件一字不动
只改代码行(LineKind::Code);表格行只改 **…** 单元格,散文 markdown 链接不碰;
链式索引由内向外改写,已迁移的有守卫不二次改。
三、access 提升为宿主函数 HostFn::Access(u16 id 212)
与旧取元逐字一致(Map 按键 / List 1-based / 缺键 missing map key);
进 HostFn 是为了两个后端共用同一实现,interp 里的特例已删除。
四、顺带修的两处真实语义缺陷
1. payload 继承外层"文本模式":`f text=[k](access(c,k))` 中 access 不被当调用
→ `()` 内永远允许 callee(args)
2. 遮蔽形状判定过宽:`[问候] ([格式化] "Bo")` 误判为遮蔽
→ 要求 `]` 后紧跟 `(`,否则落回方括号调用
五、全仓迁移结果
migrate labels: 256 index, 23 loop, 80 file written;0 文件被等价性拒绝;
迁移后 cargo test --release → 604 passed / 0 failed;再跑迁移幂等。
等价性检查先后抓出 4 类改写 bug(表格散文链接、payload 文本模式、链式索引、
遮蔽与方括号调用混淆),每类都是先拦下再修工具,未污染文件。
测试:6 个单测 + 3 个集成(干跑不写盘 / 写入后运行输出不变且幂等 /
等价失败文件不动);全量 604 passed / 0 failed(M3 后 595 + 9);双后端一致。
文档:doc/design/change-m7-migration.md
2026-10-22 15:33:31 +08:00
cflmy
409b8df2cb
feat(check): M5 隐式遮蔽 — > 调用上方的叙述作为描述(默认关闭)
...
规则:`>` 调用上方的叙述段即其"描述";段内反引号实体必须被该调用用到,
或能解析到模块/内置,否则报 label.implicit_stale(warning)。
段落边界:紧邻上一行起,允许一个分隔空行(blockquote 前常空一行),
遇第二个空行/标题/代码行即止。
关键决策:**默认关闭(--implicit-labels 开启)**,依据是实测噪音:
- 初版(任何反引号都算断言):lib+ext/ai 上 6 条警告,**全为误报**
(`## open`、`{ path, kind }`、`source=`、`exec`/`net`)
- 加"实体名形状"过滤后:2 条
- 再加默认关闭:**0 条**
理由:描述一个调用可以用任意措辞,机械校验必然模糊;
默认开启就制造疲劳(违背 warning-fatigue-control)。这与 L1 不同:
L1 是"能证明才报",隐式检查是"可疑就报",必须 opt-in。
实体名过滤:首字符字母/_/非ASCII,其余字母数字/_/./非ASCII非空白
→ 排除 `## open` / `{ path, kind }` / `source=` / `path=`。
用法:marqdo check 文件 --implicit-labels
测试:3 个集成(默认静默 / opt-in 报不一致 / opt-in 对一致描述仍静默,
后两条是反向验证"不乱响");全量 593 passed / 0 failed(M6 后 590 + 3)。
文档:doc/design/change-m5-implicit-occlusion.md
2026-10-22 15:21:23 +08:00
cflmy
fd0cfcb566
feat(labels): M9 两级词表检索 — labels CLI + MLSP labels.search
...
第一级(内置,数据常量):六组关键词 —— 未完成/假数据/示例/实验/废弃/待校验,
pending = 未完成 ∪ 假数据。作用是默认查询、LLM 范例、跨项目可比。
第二级(参数):--grep 替换,--also-builtin 并集,--group 选组。
**词表是数据不是语法**:扩充它不改任何解析规则。
CLI:
marqdo labels . # pending 口径
marqdo labels . --grep "联调" # 自定义替换
marqdo labels . --grep "联调" --also-builtin # 并集
marqdo labels . --group 示例,实验
marqdo labels . --count / --json
MLSP:{"method":"labels.search","params":{path|source, grep?, also_builtin?, group?}}
→ {"ok":true,"words":[…],"count":N,"hits":[{line,unit,label,words,has_payload}]}
与 CLI 共用同一份 label::search。
检索语义 v1:子串匹配(CJK 无词边界)、多词 OR、英文大小写不敏感;
误判只影响计数,输出带描述原文可人工判断;不做否定语法(留 v1.1)。
测试:4 个集成(pending=2 / grep 替换=1 / also-builtin 并集=3 / MLSP 返回 hits);
全量 cargo test --release:587 passed / 0 failed(M4 后 583 + 4)。
实测:
pending → 2 命中("待开发"、"模拟"两处)
--grep 联调 → 1 命中
--grep 联调 --also-builtin → 3 命中
文档:doc/design/change-m9-label-search.md
2026-10-22 15:16:39 +08:00
cflmy
11417c42e0
feat(lang): M2 遮蔽语法 [描述](实现) — 描述不执行,payload 是唯一执行体
...
新增 Expr::Occluded { label, payload: Option<Box<Expr>> }:
- [] 描述:自由文本,永不执行(仅用于检索/统计/过期校验)
- () 实现:唯一执行体;为空时值为 None(空载荷桩)
- 支持嵌套遮蔽、描述含空格与中文标点、\] 转义
关键决策:**模式开关,暂不切换语义**
[键](集合) 与 [描述](实现) 外形完全相同;M2 若直接改语义,全仓 506 处取元会
静默变成"遮蔽整个集合"(同形换义,文档点名的最坏一类)。
故 M2 只实现能力:
- 默认 Classic:MARQDO_MARKUP 未设 → [a](b) 仍是取元
- 纯度 Occlusion:MARQDO_MARKUP=occlusion/purity/1/on → 遮蔽
M7 才迁移语料、翻转默认、对旧形报 syntax.legacy_index 硬错误。
实现:
- ast.rs 新节点
- parse/expr.rs:Markup 枚举 + set_markup_default + parse_expr_markup(显式模式,
避免测试依赖全局) + parse_occluded(描述扫描到 ]、\] 转义、必须紧跟 (、
空载荷 → None)+ Parser.markup 字段
- interp.rs:有 payload 求值 payload,否则 None;collect_decl_reads 递归 payload
- bytecode/compile.rs:编译 payload(空则 Op::None_),双后端一致
- view/render.rs:expr_prec 渲染 [描述](payload) / [描述]()
- parse/mod.rs:pub mod expr
- main.rs:MARQDO_MARKUP 环境变量(init_markup_from_env)
测试:
- 8 个单元(值直通/空载荷/描述空格标点/转义/嵌套/classic 仍取元/缺括号报错)
- 3 个集成 tests/occlusion.rs + tests/occlusion/*.mq.md
- 全量 cargo test --release:575 passed / 0 failed(M1 后 565 + 10)
- tree 与 bytecode 双后端一致
文档:doc/design/change-m2-occlusion.md
2026-10-22 15:11:59 +08:00
cflmy
74908ebf04
feat(view): capture live snapshots for static export
...
Add view capture to record per-cell outputs and session summary with source hashes. view output --snapshot consumes the capture without re-executing and rejects source drift. Includes snapshot parsing tests.
2026-10-18 14:45:26 +08:00
cflmy and Cursor
5554b1642c
feat(run): add --fs-root / MARQDO_FS_ROOT for subdirectory entries
...
marqdo run cli/… sandboxes to the entry directory by default; repo-root
sandbox+cwd lets qdagent keep thin CLI wrappers under cli/ without
escaping .marqdo or polluting cli/.marqdo.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-09-28 22:17:24 +08:00
cflmy and Cursor
56ab52356f
feat(knowledge): land Engineering Knowledge Compiler (EKC) from 008
...
Give agents Engineering First Information before codegen: L0–L4 catalog,
reuse/preflight (REUSE→ADAPT→CREATE), graph, and CLI surfaces so large
repos stop reinventing existing capabilities.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-09-28 16:44:39 +08:00
cflmy and Cursor
88dc6d5a54
feat(core): Artifact Metadata Binding (${env|arg|sys|secret})
...
Load-time resolve of frontmatter bindings into Module.metadata; Secret
masking; sys.meta / --bind; llm ctor prefers meta over env_get.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-09-24 19:51:24 +08:00
cflmy and Cursor
db5f0e830b
feat(mlsp): Phase 3 MLSP for AI —— locate/syntax/validate/repair_targets/schema(T3.1/T3.2 + T2.6)
...
- src/mlsp.rs: 行分隔 JSON 协议 + 五 handler;语法唯一事实来源 = CORE_CONSTRUCTS(只加检索别名)
- repair_targets 带有界护栏策略(anchored-local / 越界必拒 abstain / max_attempts=2)
- schema 契约导出(T2.6):形参/返回/字段契约 + 升参清单 + 锚点
- marqdo mlsp 子命令:stdio 行分隔 JSON 服务
- tests/mlsp.rs 7 例全绿;全量回归零失败(含 262 gold)
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-09-22 19:44:35 +08:00
cflmy and Cursor
7a449c40b1
feat(contract): Phase 2 渐进式契约层 —— 契约表提取 + 四边界校验 + marqdo check 防漂移(T2.1–T2.5)
...
- src/contract.rs: 类型词汇(渐进标注)、参数/返回/字段三形状契约表解析、合并、四边界校验诊断
- src/parse/mod.rs: extract_function_contract —— 位置+形状双重判定,在升参推断之前提取;
绑定表/普通文档表绝不吃(P1 零回归),契约表从 body 移除(元数据永不执行)
- src/interp.rs: 四边界校验 —— 调用实参(3 条调用路径)/返回/表绑定/字段访问
- src/check.rs + marqdo check [--json]: 漂移双向互查、未知类型名(附建议)、错位契约
- src/load.rs: label_error 保留结构化诊断(错误出口唯一,不拍平成字符串)
- T2.4: 全部契约诊断带 doc_anchor/doc_quote/contract_ref
- tests/contracts.rs 12 例全绿;全量回归零失败(含 262 gold)
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-09-22 19:40:08 +08:00
cflmy and Cursor
97fda7aa10
feat(core): Phase 1 —— 核心收口 + 诊断地基(core-surface 守卫 · 三层准入 · Diagnostic JSON)
...
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-09-22 19:03:03 +08:00
cflmy and Cursor
aac896b044
feat(wasm): C2/C3 session boot, wire events, and interact demo
...
Add BrowserSession with shared entry env, mq_boot/mq_call exports,
marqdo wasm build, and a counter page driven only by counter.mq.md.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-09-01 10:48:46 +08:00
cflmy and Cursor
d1b33c78c6
Make file subtasks return #main value and expose it as plan.result.
...
Quiet spawn still hides child stdout; workbooks solidify to **returns**, agent-kb lives in the plugin, and multi-step follows OKF file relay rather than print-based answers.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-08-07 17:53:14 +08:00
cflmy and Cursor
2e65c055b8
Release v0.1.2: embedded stdlib, docs, and extension branch policy.
...
Embed lib/*.mq.md in binary; marqdo version --check; public writeback/subtask pages; restore /vscode-extension/ ignore. VSIX built from branch vscode-extension only (see doc/design/vscode-extension-commit.md).
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-08-07 09:41:53 +08:00
cflmy and Cursor
3a7e11c995
Add ext/agent layout framework, ext CLI, and docs catch-up.
...
Ship ABI agent plugin helpers, marqdo ext list/add/remove, and document the agent development roadmap (compose LLM, match/assign).
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-08-06 13:31:25 +08:00
cflmy and Cursor
54a507d906
Ship v0.1.0: dedicated debug host, view outline, code-as-docs README.
...
Add marqdo debug (breakpoints/step/locals), restore view as docs with function search, and emphasize OKF-aligned knowledge-base direction.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-08-05 15:40:29 +08:00
cflmy and Cursor
a53ebb65ee
Add host stdlib modules and unify view/run capabilities.
...
Ship fs/time/sys/json/net L1 libs (plus existing text/table), default-on host caps with soft exit under view, bilingual public/stdlib docs, and design notes for deferred math/foreign.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-08-05 10:03:54 +08:00
cflmy and Cursor
30cd39fd8f
Add diagnostics spans, CLI/view input feeding, and len/str/int builtins.
...
Unify bytecode errors with path:line:col, support --stdin-file and live view preset stdin, and ship the S0 standard library with gold coverage.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-08-04 17:26:09 +08:00
cflmy and Cursor
96a7c6ce76
Consolidate layout: tests fixtures, public user docs, and view site.
...
Move gold samples under tests/, put executable user docs in public/, restyle view, and add catalog plus gh-pages publish workflow.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-08-04 14:49:44 +08:00
cflmy and Cursor
ac0a3fbced
Add view, positional args, errors gold, and bytecode backend.
...
Reorganize examples into structure/keywords/errors, launch marqdo view for AST-backed browsing, and ship an M5 stack VM selectable via --backend.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-08-04 12:30:40 +08:00
cflmy and Cursor
69b626e919
Add English builtins, pipeline dump flags, and M1 line classification.
...
Document a minimal Python-inspired keyword set (print/input, True/False/None), require visible --dump-* stages, and ship working --dump-lines for .mq.md sources.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-08-04 11:28:15 +08:00
cflmy and Cursor
63d7866d06
Scaffold Rust M0 interpreter crate and document local setup.
...
Add clap-based CLI that loads .mq.md and fails loudly until eval exists; pin deps for Cargo 1.81 and verify with an integration test.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-08-04 11:19:32 +08:00