@accelerator-mzq/forge 2.0.0 → 3.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (55) hide show
  1. package/README.md +12 -12
  2. package/dist/cli/commands/ack.d.ts.map +1 -1
  3. package/dist/cli/commands/ack.js +87 -12
  4. package/dist/cli/commands/ack.js.map +1 -1
  5. package/dist/cli/commands/archive.d.ts.map +1 -1
  6. package/dist/cli/commands/archive.js +29 -4
  7. package/dist/cli/commands/archive.js.map +1 -1
  8. package/dist/cli/commands/pause-capture.d.ts +24 -0
  9. package/dist/cli/commands/pause-capture.d.ts.map +1 -0
  10. package/dist/cli/commands/pause-capture.js +87 -0
  11. package/dist/cli/commands/pause-capture.js.map +1 -0
  12. package/dist/cli/index.js +3 -0
  13. package/dist/cli/index.js.map +1 -1
  14. package/dist/core/ack/marker-ack.d.ts +28 -0
  15. package/dist/core/ack/marker-ack.d.ts.map +1 -0
  16. package/dist/core/ack/marker-ack.js +155 -0
  17. package/dist/core/ack/marker-ack.js.map +1 -0
  18. package/dist/core/ack-log.d.ts +17 -1
  19. package/dist/core/ack-log.d.ts.map +1 -1
  20. package/dist/core/ack-log.js +10 -7
  21. package/dist/core/ack-log.js.map +1 -1
  22. package/dist/core/archive/ack-log-consistency.d.ts.map +1 -1
  23. package/dist/core/archive/ack-log-consistency.js +2 -1
  24. package/dist/core/archive/ack-log-consistency.js.map +1 -1
  25. package/dist/core/archive/pause-decisions-fence.d.ts +24 -1
  26. package/dist/core/archive/pause-decisions-fence.d.ts.map +1 -1
  27. package/dist/core/archive/pause-decisions-fence.js +263 -49
  28. package/dist/core/archive/pause-decisions-fence.js.map +1 -1
  29. package/dist/core/markers/types.d.ts +7 -2
  30. package/dist/core/markers/types.d.ts.map +1 -1
  31. package/dist/core/parse/unified-diff.d.ts +26 -0
  32. package/dist/core/parse/unified-diff.d.ts.map +1 -0
  33. package/dist/core/parse/unified-diff.js +61 -0
  34. package/dist/core/parse/unified-diff.js.map +1 -0
  35. package/dist/core/templates/commands/ack-confirm.md +1 -1
  36. package/dist/core/templates/commands/apply.md +15 -6
  37. package/dist/core/templates/commands/verify.md +2 -0
  38. package/dist/core/templates/skills/_shared/tier23-command-bridge.md +34 -0
  39. package/dist/core/templates/skills/exploring.md +3 -3
  40. package/dist/core/templates/skills/finishing-a-development-branch.md +6 -21
  41. package/dist/core/templates/skills/requesting-code-review.md +11 -0
  42. package/dist/core/templates/skills/subagent-driven-development.md +9 -0
  43. package/dist/core/templates/skills/using-forge.md +6 -6
  44. package/dist/core/templates/skills/verification-before-completion.md +7 -18
  45. package/dist/core/templates/skills/writing-plans.md +6 -17
  46. package/dist/core/validate/marker-schema.d.ts.map +1 -1
  47. package/dist/core/validate/marker-schema.js +15 -0
  48. package/dist/core/validate/marker-schema.js.map +1 -1
  49. package/dist/index.d.ts +1 -1
  50. package/dist/index.d.ts.map +1 -1
  51. package/dist/index.js +8 -1
  52. package/dist/index.js.map +1 -1
  53. package/package.json +22 -19
  54. package/scripts/codex-review-helper.mjs +337 -0
  55. package/src/core/codex-review/prompts/adversarial-default.md +105 -0
package/dist/core/templates/commands/apply.md CHANGED
@@ -75,11 +75,14 @@ subagent 在 apply 中段报告以下三档之一时,主代理**不直接处理*
75
75
  subagent 报告 → 主代理判定 severity(CRITICAL / WARNING / SUGGESTION,沿 design §2.3)
76
76
  ↓
77
77
  CRITICAL? → yes → 走 forge 强 fence 拒签(原 v0.4 行为)
78
- → no → AskUserQuestion 四选项
78
+ → no → 主代理调 `forge pause-capture <change-id> --task <triggering-task-ref> --issue "<summary>"`
79
+ (捕获 pause 时刻 tasks.md 状态进 ack-log hash-chain;记下 stdout 返回的 capture_id)
80
+ ↓
81
+ AskUserQuestion 四选项
79
82
  ↓
80
83
  用户选择
81
84
  ↓
82
- 1=扩本 change scope → 更新 proposal `## What Changes` + subagent 重派
85
+ 1=扩本 change scope → 更新 proposal `## What` + subagent 重派
83
86
  2=加 task 进本轮 → 主代理 append 新 task 到 tasks.md + subagent 重派
84
87
  3=转 out-of-scope → 写到 proposal `## Out of Scope` / design `## Future Work` YAML 块(沿 §2.6)+ subagent 跳过 issue 继续
85
88
  4=Other → 用户自由文本描述(必须配 other_rationale + other_acked_by)
@@ -104,7 +107,7 @@ subagent 报告 → 主代理判定 severity(CRITICAL / WARNING / SUGGESTION,沿
104
107
  **Severity:** WARNING | SUGGESTION(主代理初判,沿 design §2.3 分级;CRITICAL 不进本流程)
105
108
 
106
109
  **Options:**
107
- 1. **扩本 change scope** — 把这个 issue 纳入本 change。更新 proposal `## What Changes` 段,重新派 subagent 实施。代价:本 change scope 增大,需要重 review
110
+ 1. **扩本 change scope** — 把这个 issue 纳入本 change。更新 proposal `## What` 段,重新派 subagent 实施。代价:本 change scope 增大,需要重 review
108
111
  2. **加 task 进本轮 tasks.md** — 当成新发现的本 change 必做项。主代理 append 新 task 到 tasks.md,subagent 重派实施。等同 v0.4 行为
109
112
  3. **转 out-of-scope**(仅限 issue 不阻断本 task 时可用) — 不在本 change 做,写到 proposal `## Out of Scope` 或 design `## Future Work` 段(YAML 结构化字段,沿 §2.6)。subagent 跳过该 issue 继续当前 task。**v1.1 backlog registry 会从这里读**
110
113
  4. **Other** — 自由文本描述。必须配 `other_rationale` + `other_acked_by`(用户在 marker 之外的某处确认)
@@ -128,8 +131,10 @@ pause_decisions:
128
131
  severity_acked_by: msc # WARNING 必须;SUGGESTION 允许 null
129
132
  severity_acked_at: 2026-05-12T14:32:00Z
130
133
  chosen_option: 3 # 1=扩 scope / 2=加 task / 3=转 out-of-scope / 4=Other
134
+ added_task_ref: tasks.md#task-7 # option=2 必填:Fluid Pause 新增的 task(与 task_ref=触发 task 区分)
135
+ capture_id: <forge pause-capture 返回的 capture_id> # option=2 必填:关联 pause-capture entry
131
136
  target_artifact: proposal.md # option=1=proposal.md;option=2=tasks.md;option=3=proposal.md|design.md
132
- target_anchor: '## Out of Scope' # marker 记录写到哪个段
137
+ target_anchor: '## Out of Scope' # 记录写到哪个段(option=2 降为仅人类可读,fence 不据此校验)
133
138
  non_blocking_rationale: 'subagent 可跳过该 issue 完成本 task 主体功能' # option=3 必填
134
139
  other_rationale: null # option=4 必填
135
140
  other_acked_by: null # option=4 必填
@@ -141,11 +146,15 @@ pause_decisions:
141
146
 
142
147
  - CRITICAL severity → 拒签(CRITICAL 应走 forge 强 fence,不应进 pause)
143
148
  - WARNING + (severity_acked_by 空 ∨ severity_acked_at 空)→ 拒签
144
- - option=1:`target_artifact='proposal.md'` + `target_anchor` 含 `What Changes`
145
- - option=2:tasks.md 中 `task_ref` 末段对应的行已勾选 `[x]`
149
+ - option=1:`target_artifact='proposal.md'` + `target_anchor` 含 `What`
150
+ - option=2:`added_task_ref` 指向的 task ∉ capture 快照、∈ 当前 tasks.md 且勾选 `[x]`;`capture_id` 匹配 ack-log pause-capture entry;链完整
146
151
  - option=3:proposal/design YAML 块含对应 entry.id + `non_blocking_rationale` 非空
147
152
  - option=4:`other_rationale` + `other_acked_by` 非空
148
153
 
154
+ ### option=2 capture 的已知边界(capture-input gap,design §9.2/§9.3)
155
+
156
+ `forge pause-capture` 是轻量锚点,**不能**密码学证明 "task 是 pause 真新增的"。它能挡:无 capture 流程的 option=2、capture entry 事后被篡改、同 marker 内 capture 复用。它**挡不住**:capture 当下喂假输入(删旧 task → capture → 恢复)、AI 预先攒多条 capture 后选择性认领、AI 完全不记录 pause_decision。轻量 capture 对 "诚实但偷懒" 的 AI 有效,对蓄意构造假输入的攻击者无效 —— 此 gap 是当前 forge 架构下的已知限制。
157
+
149
158
  ## 与其他 sub-plan 合并点
150
159
 
151
160
  本 §"Fluid Pause Decision Point" 段(plan-9c)与后续 sub-plan 在 apply.md 有合并点(参考 master plan §3.3 line 272):
package/dist/core/templates/commands/verify.md CHANGED
@@ -137,6 +137,8 @@ You are about to handle `/forge:verify $ARGUMENTS`.
137
137
 
138
138
  详细 process_evidence 协议见 `skills/process-evidence/SKILL.md`。
139
139
 
140
+ > **Fluid Pause 边界(design §8.3)**:apply 阶段 Fluid Pause 的 `forge pause-capture` 必须在本步 `forge evidence freeze --kind verify` **之前**完成。verify freeze 之后再产生的 pause-capture entry 不被 verify marker 的 `ack_log_tail_hash`/`ack_log_entry_count` 固化,archive 阶段 option=2 强校验会因 ack-log 行数 mismatch 拒签。
141
+
140
142
  4.5 **若产任何 WARNING + resolved=false**:提示用户 — archive 阶段必须先 `forge ack propose <finding-id>`(沿 9a 两步流程),否则 archive fence 拒签。
141
143
 
142
144
  4.6 **若产任何 automated=true CRITICAL + resolved=false**:**不能 archive**(沿 design §2.2.4 fence)— 必须先实际修复让 finding resolved=true(改 code + 重跑 verify),不允许 ack 降级。
package/dist/core/templates/skills/_shared/tier23-command-bridge.md ADDED
@@ -0,0 +1,34 @@
1
+ # Tier 2/3 Command Bridge — 共享替换规则
2
+
3
+ > 被 5 个 stage skill 的「Tier 2/3 Orchestration」段引用。
4
+ > 适用:OpenCode / Codex 等无 `/forge:*` slash 命令的 harness;Claude Code(Tier 1)不走本桥接。
5
+
6
+ ## plugin root 解析(绝对路径字面值)
7
+
8
+ 命令文件与 helper 同在 plugin 仓库根下。先解析出**绝对路径字面值** `<ROOT>`:
9
+
10
+ - OpenCode:从 session bootstrap 文本里的 `forge plugin root: <abs path>` 行取得。
11
+ - Codex:标准安装为 `~/.codex/forge`,把 `~`/`$HOME` 展开成绝对路径。
12
+ - 解析后校验 `<ROOT>/scripts/run-forge.mjs` 与 `<ROOT>/commands/<stage>.md` **同时存在**;
13
+ 任一缺失 → 报错停止(fail closed),提示用户检查安装,**不得静默跳过**。
14
+ - **不得**在 shell 写 `$FORGE_PLUGIN_ROOT`(非运行时环境变量);用绝对路径字面值,
15
+ 或在单条命令内 `FORGE_ROOT="<abs literal>"; node "$FORGE_ROOT/..."`(变量不跨命令)。
16
+
17
+ ## 替换规则
18
+
19
+ 执行 `commands/<stage>.md` 时,按下表把 Tier-1 专属构造换成 Tier 2/3 等价物:
20
+
21
+ | 命令文件里的 | 替换为 |
22
+ | ---------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
23
+ | `${CLAUDE_PLUGIN_ROOT}/scripts/run-forge.mjs` | `<ROOT>/scripts/run-forge.mjs` |
24
+ | shell/命令执行上下文中的 forge executable token(裸 `forge <subcmd>`、管道右侧 `… \| forge <subcmd>`) | `node "<ROOT>/scripts/run-forge.mjs" <subcmd> …`;helper 不可达时 fallback `npx -y --package @accelerator-mzq/forge@^3.1 -- forge <subcmd>`。**散文/说明文字里的 `forge archive` 等引用不替换** |
25
+ | `$ARGUMENTS` | 从用户自然语言提取 |
26
+ | `AskUserQuestion` | 降级终端 `[1]/[2]/…` 文本 prompt;确认结果必须落到对应 CLI(`forge ack confirm/reject` 等),留 ack-log 证据 |
27
+ | `Task` 工具派子代理 | 按 `skills/subagent-driven-discipline/references/codex-tools.md`(Codex)/ `opencode-tools.md`(OpenCode)映射 |
28
+ | `## (可选)Stage extensions hook — Tier 1 Claude Code only` 段 | 整段跳过 |
29
+
30
+ 示例:
31
+
32
+ - bash:`node "<ROOT>/scripts/run-forge.mjs" validate add-login`
33
+ - PowerShell:`node "<ROOT>\scripts\run-forge.mjs" validate add-login`
34
+ - 管道(bash):`cat payload.json | node "<ROOT>/scripts/run-forge.mjs" finding hash`
package/dist/core/templates/skills/exploring.md CHANGED
@@ -329,7 +329,7 @@ You: [读 forge/changes/add-oauth-integration/{proposal,design,tasks,specs/oauth
329
329
 
330
330
  **Capture offer**:
331
331
  - 若选 option 2:capture 到 `forge/changes/add-oauth-integration/design.md ## Token Refresh Strategy`(新增段);**注意**:design.md 改后 marker `content_hash` 失效,需要重 verify
332
- - 若决定扩 scope(加 IdP 时钟同步):capture 到 `proposal.md ## What Changes`(扩本 change)
332
+ - 若决定扩 scope(加 IdP 时钟同步):capture 到 `proposal.md ## What`(扩本 change)
333
333
  - 若决定不做(留 v1.1):capture 到 `proposal.md ## Out of Scope` YAML 块(沿 §2.6 schema)
334
334
  ```
335
335
 
@@ -381,7 +381,7 @@ You: forge:exploring 下的对比请求 — 沿 OpenSpec `explore.ts:132` "用
381
381
  User: /forge:explore --change add-oauth-integration
382
382
  我们应不应该顺便加 SAML 支持?
383
383
 
384
- You: [读 add-oauth-integration 现状] proposal.md `## What Changes` 只列了 OAuth
384
+ You: [读 add-oauth-integration 现状] proposal.md `## What` 只列了 OAuth
385
385
  (Google + GitHub),没提 SAML。
386
386
 
387
387
  SAML vs OAuth 是企业级 vs 消费者级路线分支:
@@ -437,7 +437,7 @@ AI 倾向把所有"不做"的项都塞 SUGGESTION 持挂,而不写到 out-of-sco
437
437
  | ------------------------------------- | ---------------------------------------------------------------------------------------------------------------- | ------------------------------------------------ |
438
438
  | New requirement / Requirement changed | `forge/changes/<id>/specs/<capability>/spec.md` | marker 失效(`content_hash` 变),提示用户重 verify |
439
439
  | Design decision made | `forge/changes/<id>/design.md` | marker 失效,提示重 verify |
440
- | Scope changed(扩本 change) | `forge/changes/<id>/proposal.md ## What Changes` | marker 失效,提示重 propose review |
440
+ | Scope changed(扩本 change) | `forge/changes/<id>/proposal.md ## What` | marker 失效,提示重 propose review |
441
441
  | **Out-of-scope 识别(转 follow-up)** | `forge/changes/<id>/proposal.md ## Out of Scope` / `## Non-Goals` 或 `design.md ## Future Work` YAML 块(沿 §2.6) | 不影响 marker(out-of-scope 不是 change 内容) |
442
442
  | New work identified(本 change 必做) | `forge/changes/<id>/tasks.md` | marker 失效,需重 apply |
443
443
  | Assumption invalidated | 相关 artifact | 看具体 |
package/dist/core/templates/skills/finishing-a-development-branch.md CHANGED
@@ -225,27 +225,12 @@ forge 路径下,这一步发生在 `/forge:archive` 之后(archive 已做产物
225
225
 
226
226
  ---
227
227
 
228
- ## forge archive step (Tier 2/3 OpenCode/Codex 路径用,Plan 0a 实测 Variant B PASS)
228
+ ## Tier 2/3 Orchestration(OpenCode / Codex 路径)
229
229
 
230
- **仅 OpenCode + Codex 路径**(Tier 1 Claude Code 路径走 commands.md `/forge:archive` 调 helper)。
230
+ 当前 harness 无 `/forge:*` slash 命令时(OpenCode / Codex),你 **MUST** Read 对应 `commands/archive.md` 并**完整执行**其协议 —— 按 `skills/_shared/tier23-command-bridge.md` 的 plugin root 解析与替换规则执行。Claude Code(Tier 1)有 slash 命令,不走本段。
231
231
 
232
- When user says "archive" / "/forge:archive" / "完成归档" or similar, **after** finishing branch tasks(merge / clean / etc),you **MUST** execute:
232
+ 执行完成前核对 archive 硬门槛自检清单:
233
233
 
234
- ```bash
235
- node "${FORGE_HELPER}" archive <change-id>
236
- ```
237
-
238
- (`FORGE_HELPER` 解析见 forge:writing-plans skill 末尾 "CLI validation step" 段)
239
-
240
- forge CLI 内部严格门禁(spec §3.4):
241
-
242
- - `.verify-passed` 存在 + tasks_hash 匹配
243
- - `.review-passed` 存在 + content_hash 匹配 + git.diff_hash 匹配
244
- - specs sync(internal-only,不可绕过)
245
-
246
- **Result handling**:
247
-
248
- - exit 0 → mv 到 `forge/changes/archive/<date>-<id>/`,Tell user "Archive PASS"
249
- - exit 非零 → 报 stderr,**不**重试,提示用户跑缺失 step(`/forge:verify` 或 `/forge:review`)
250
-
251
- **严格门禁不可绕过 — 不要主动加 `--force`**(那是给 maintainer 紧急 escape hatch 用的,不是 AI 自主决策范畴)。
234
+ - `.verify-passed` 与 `.review-passed` 均存在,且 hash(tasks_hash / content_hash / git.diff_hash)新鲜匹配。
235
+ - `forge archive <change-id>` exit 0。
236
+ - 若 archive 步骤 emit sync-check manifest → 按 `commands/archive.md` 的编排步逐项 fulfill。
package/dist/core/templates/skills/requesting-code-review.md CHANGED
@@ -106,3 +106,14 @@ You: [Fix progress indicators]
106
106
  - Push back with technical reasoning
107
107
  - Show code/tests that prove it works
108
108
  - Request clarification
109
+
110
+ ## Tier 2/3 Orchestration(OpenCode / Codex 路径)
111
+
112
+ 当前 harness 无 `/forge:*` slash 命令时(OpenCode / Codex),你 **MUST** Read 对应 `commands/review.md` 并**完整执行**其协议 —— 按 `skills/_shared/tier23-command-bridge.md` 的 plugin root 解析与替换规则执行。Claude Code(Tier 1)有 slash 命令,不走本段。
113
+
114
+ 执行完成前核对 review 硬门槛自检清单:
115
+
116
+ - AI 写基础 `.review-passed` marker。
117
+ - `forge evidence record-review` 跑过(写 staging)。
118
+ - `forge evidence freeze --kind review` exit 0。
119
+ - 过程中遇 `forge ack propose` 退出(产生 pending)→ Read 并执行 `commands/ack-confirm.md` 等价流程,降级 prompt 让用户确认,经 `forge ack confirm`/`reject` 落 ack-log(AI 不得自 ack)。
package/dist/core/templates/skills/subagent-driven-development.md CHANGED
@@ -403,3 +403,12 @@ subagent 在 task 实施完成报 DONE 时,**必须**提供以下字段给主代
403
403
  - **本 STOP triggers**:**多次累积** BLOCKED / verify 重试 时强制 STOP 问用户(避免主代理无限循环)
404
404
 
405
405
  两者不冲突 — 现有 BLOCKED 第 4 项 "plan itself is wrong → Fluid Pause" 仍走 Fluid Pause(单次 critical gap 即触发);本 STOP triggers 表第 3-4 行(BLOCKED ≥ 2 次 / verify ≥ 3 次)是**累积失败**的反向加固,触发 STOP 后用户决策可能是"拆 task"/"重写 spec"/"走 explore"(沿 §2.8.4 与 §2.1/§2.5 桥接)。
406
+
407
+ ## Tier 2/3 Orchestration(OpenCode / Codex 路径)
408
+
409
+ 当前 harness 无 `/forge:*` slash 命令时(OpenCode / Codex),你 **MUST** Read 对应 `commands/apply.md` 并**完整执行**其协议 —— 按 `skills/_shared/tier23-command-bridge.md` 的 plugin root 解析与替换规则执行。Claude Code(Tier 1)有 slash 命令,不走本段。
410
+
411
+ 执行完成前核对 apply 硬门槛自检清单:
412
+
413
+ - 每个完成的 task 经 `forge evidence record-tdd` 写入 TDD 证据链(缺则 archive 的 process_evidence fence 因 `tdd_event_chain` 缺失拒签)。
414
+ - `forge preflight branch-check` 已跑(在 main/master 等保护分支上会 fail-closed)。
package/dist/core/templates/skills/using-forge.md CHANGED
@@ -110,11 +110,11 @@ Instructions say WHAT, not HOW. "Add X" or "Fix Y" doesn't mean skip workflows.
110
110
 
111
111
  forge 在三 harness 下的协议支持:
112
112
 
113
- | Tier | Harness | skill auto-trigger | `/forge:*` slash commands | CLI 调用形态 |
114
- | ---- | ----------- | ------------------ | ------------------------- | ------------------------------------------------------------ |
115
- | 1 | Claude Code | ✅ 全 PASS | ✅ 全 PASS | commands.md 调 `${CLAUDE_PLUGIN_ROOT}/scripts/run-forge.mjs` |
116
- | 2 | OpenCode | ✅ PASS | ❌ FAIL(plugin 不支持) | skill 文本内嵌 fenced bash + must-execute 调 helper |
117
- | 3 | Codex | ✅ PASS | ❌ FAIL(plugin 不支持) | 同上 |
113
+ | Tier | Harness | skill auto-trigger | slash command 注册 | workflow bridge | CLI 调用形态 |
114
+ | ---- | ----------- | ------------------ | ---------------------- | --------------------------------------------------- | ----------------------------------------------------------------------------------------- |
115
+ | 1 | Claude Code | ✅ 全 PASS | ✅ 全 PASS | —(slash 直驱,无需桥接) | commands.md 调 `${CLAUDE_PLUGIN_ROOT}/scripts/run-forge.mjs` |
116
+ | 2 | OpenCode | ✅ PASS | ❌ FAIL(plugin 不注册) | ✅ 经 stage skill 桥接段 Read `commands/<stage>.md` | 桥接段按 `tier23-command-bridge.md` 替换为 `node "<ROOT>/scripts/run-forge.mjs" <subcmd>` |
117
+ | 3 | Codex | ✅ PASS | ❌ FAIL(plugin 不注册) | ✅ 同上 | 同上 |
118
118
 
119
119
  **OpenCode + Codex 用户提示**:即使 `/forge:*` 不可用,brainstorming / writing-plans / verify 等 skill **会按 description 自动触发**,你只需:
120
120
 
@@ -122,7 +122,7 @@ forge 在三 harness 下的协议支持:
122
122
  - 输入 "完成验证 / verify" → AI 自动 invoke `forge:verification-before-completion`
123
123
  - 等等
124
124
 
125
- 跟 Claude Code 体验一致,只是没有 `/forge:propose` 这种"显式入口"按钮。
125
+ Tier 2/3 经 stage skill 的桥接段 Read `commands/<stage>.md` 执行,功能闭环但属 best-effort skill orchestration。
126
126
 
127
127
  ## forge slash commands(本 bootstrap 携带的 7 个工作流入口)
128
128
 
package/dist/core/templates/skills/verification-before-completion.md CHANGED
@@ -144,27 +144,16 @@ From 24 failure memories:
144
144
  - Implications of success
145
145
  - ANY communication suggesting completion/correctness
146
146
 
147
- ## forge strict gate step (Tier 2/3 OpenCode/Codex 路径用,Plan 0a 实测 Variant B PASS)
147
+ ## Tier 2/3 Orchestration(OpenCode / Codex 路径)
148
148
 
149
- **仅 OpenCode + Codex 路径**(Tier 1 Claude Code 路径走 commands.md `/forge:verify` 调 helper)。
149
+ 当前 harness 无 `/forge:*` slash 命令时(OpenCode / Codex),你 **MUST** Read 对应 `commands/verify.md` 并**完整执行**其协议 —— 按 `skills/_shared/tier23-command-bridge.md` 的 plugin root 解析与替换规则执行。Claude Code(Tier 1)有 slash 命令,不走本段。
150
150
 
151
- When user says "verify" / "/forge:verify" / "完成验证" or similar, you **MUST** execute:
151
+ 执行完成前核对 verify 硬门槛自检清单:
152
152
 
153
- ```bash
154
- node "${FORGE_HELPER}" validate <change-id>
155
- ```
156
-
157
- (`FORGE_HELPER` 解析见 forge:writing-plans skill 末尾 "CLI validation step" 段)
158
-
159
- **Result handling**:
160
-
161
- - exit 0 → forge CLI 自动写 `forge/changes/<id>/.verify-passed`(YAML schema + tasks_hash + content_hash + pass=true);report "verify PASS"
162
- - exit 非零 → forge CLI 自动:
163
- 1. 写 `forge/changes/<id>/.verify-failed`(YAML schema + fake_completions 列表)
164
- 2. **append 修复 task** 到 `forge/changes/<id>/tasks.md`(每 fake_completion 一条 `- [ ] verify-fix-N: ...`)
165
- 3. **不修改原已勾 task**(spec §3.3 不变量 2)
166
-
167
- Tell user "Verify FAIL,请处理 verify-fix-\* 新 tasks 后重跑 verify"
153
+ - AI 写基础 `.verify-passed` marker。
154
+ - `forge evidence record-verify` 跑过(写 staging)。
155
+ - `forge evidence freeze --kind verify` exit 0(缺 freeze → archive 的 process-evidence fence 拒签)。
156
+ - 过程中遇 `forge ack propose` 退出(产生 pending)→ Read 并执行 `commands/ack-confirm.md` 等价流程,降级 prompt 让用户确认,经 `forge ack confirm`/`reject` 落 ack-log(AI 不得自 ack)。
168
157
 
169
158
  ## The Bottom Line
170
159
 
package/dist/core/templates/skills/writing-plans.md CHANGED
@@ -237,23 +237,12 @@ Note: forge v0.1 仅提供 subagent-driven 模式,无 inline executing 模式。
237
237
 
238
238
  ---
239
239
 
240
- ## CLI validation step (Tier 2/3 OpenCode/Codex 路径用,Plan 0a 实测 Variant B PASS)
240
+ ## Tier 2/3 Orchestration(OpenCode / Codex 路径)
241
241
 
242
- **仅 OpenCode + Codex 路径**(Tier 1 Claude Code 路径走 commands.md `/forge:propose` 调 helper,不需要本段)。
242
+ 当前 harness 无 `/forge:*` slash 命令时(OpenCode / Codex),你 **MUST** Read 对应 `commands/propose.md` 并**完整执行**其协议 —— 按 `skills/_shared/tier23-command-bridge.md` 的 plugin root 解析与替换规则执行。Claude Code(Tier 1)有 slash 命令,不走本段。
243
243
 
244
- After generating `forge/changes/<id>/{proposal,specs,design,tasks}.md`, you **MUST** execute the following and include output verbatim in your reply:
244
+ 执行完成前核对 propose 硬门槛自检清单:
245
245
 
246
- ```bash
247
- node "${FORGE_HELPER}" validate <change-id>
248
- ```
249
-
250
- **`FORGE_HELPER` 解析(per harness)**:
251
-
252
- - OpenCode:`FORGE_HELPER = <plugin_dir>/scripts/run-forge.mjs`(`__dirname` reachable from plugin entry)
253
- - Codex:`FORGE_HELPER = $HOME/.codex/forge/scripts/run-forge.mjs`(`os.homedir()` 解析,Windows USERPROFILE OK)
254
- - 找不到 helper(用户路径不标准)→ fallback `npx -y --package @accelerator-mzq/forge@^1.4.0 -- forge validate <change-id>`(直接调 npx)
255
-
256
- **失败处理**:
257
-
258
- - exit 0 + "validation OK" → 继续 propose 收尾(回到主 commands 流程的 `forge/drafts/.consumed/` move + commit)
259
- - exit 非零 → stop,把 stderr 报给用户;**不要**继续到 archive 流程
246
+ - `forge/changes/<change-id>/` 下 `proposal.md`、`design.md`、`tasks.md` 与 `specs/` 目录齐全。
247
+ - proposal / design / tasks 三段必备 anchor 均在。
248
+ - `forge validate <change-id>` exit 0。
package/dist/core/validate/marker-schema.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"marker-schema.d.ts","sourceRoot":"","sources":["../../../src/core/validate/marker-schema.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,YAAY,CAAC;AAiD7E;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,gBAAgB,CA8FhF;AA+mBD,YAAY,EAAE,SAAS,EAAE,CAAC"}
1
+ {"version":3,"file":"marker-schema.d.ts","sourceRoot":"","sources":["../../../src/core/validate/marker-schema.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,YAAY,CAAC;AAiD7E;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,gBAAgB,CA8FhF;AA+nBD,YAAY,EAAE,SAAS,EAAE,CAAC"}
package/dist/core/validate/marker-schema.js CHANGED
@@ -655,6 +655,21 @@ function checkPauseDecisionsArray(v, file) {
655
655
  }));
656
656
  }
657
657
  }
658
+ // added_task_ref / capture_id:undefined(老 marker)跳过,
659
+ // 存在则须 null 或 non-empty string(schema 层 optional,superset additive)
660
+ for (const field of ['added_task_ref', 'capture_id']) {
661
+ const val = p[field];
662
+ if (val === undefined)
663
+ continue; // superset additive:老 marker 缺字段 → 跳过(legacy 分支)
664
+ if (val !== null && (typeof val !== 'string' || !val)) {
665
+ results.push(failed({
666
+ artifact: 'marker',
667
+ field: `${fieldBase}.${field}`,
668
+ message: 'must be null or non-empty string',
669
+ file,
670
+ }));
671
+ }
672
+ }
658
673
  }
659
674
  return mergeResults(...results);
660
675
  }
package/dist/core/validate/marker-schema.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"marker-schema.js","sourceRoot":"","sources":["../../../src/core/validate/marker-schema.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"marker-schema.js","sourceRoot":"","sources":["../../../src/core/validate/marker-schema.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- export declare const FORGE_VERSION: "1.3.0";
1
+ export declare const FORGE_VERSION: string;
2
2
  export * from './core/schema/index.js';
3
3
  export * from './core/parse/index.js';
4
4
  export * from './core/validate/index.js';
package/dist/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,aAAa,EAAG,OAAgB,CAAC;AAG9C,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,yBAAyB,CAAC;AACxC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,aAAa,EAAE,MAAmB,CAAC;AAGhD,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,yBAAyB,CAAC;AACxC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC"}
package/dist/index.js CHANGED
@@ -1,5 +1,12 @@
1
1
  // forge core library — 公共 API
2
- export const FORGE_VERSION = '1.3.0';
2
+ import { readFileSync } from 'node:fs';
3
+ // 包根 package.json 是唯一版本号来源:dev 时 src/index.ts 上溯 1 层 = 仓库根,
4
+ // runtime 时 dist/index.js 上溯 1 层 = npm 包根;两种形态都含 package.json。
5
+ // 此前硬编码字面量,与 package.json 漂移污染 archive marker / handoff manifest
6
+ // 的 forgeVersion 字段(v3.1.1 修)。
7
+ const pkgUrl = new URL('../package.json', import.meta.url);
8
+ const { version: pkgVersion } = JSON.parse(readFileSync(pkgUrl, 'utf8'));
9
+ export const FORGE_VERSION = pkgVersion;
3
10
  // 重新导出所有 core 模块的公共类型 + 函数
4
11
  export * from './core/schema/index.js';
5
12
  export * from './core/parse/index.js';
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAE9B,MAAM,CAAC,MAAM,aAAa,GAAG,OAAgB,CAAC;AAE9C,2BAA2B;AAC3B,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,yBAAyB,CAAC;AACxC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,4DAA4D;AAC5D,+DAA+D;AAC/D,iEAAiE;AACjE,+BAA+B;AAC/B,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,iBAAiB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC3D,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAwB,CAAC;AAChG,MAAM,CAAC,MAAM,aAAa,GAAW,UAAU,CAAC;AAEhD,2BAA2B;AAC3B,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,yBAAyB,CAAC;AACxC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@accelerator-mzq/forge",
3
- "version": "2.0.0",
3
+ "version": "3.1.1",
4
4
  "description": "OpenSpec × superpowers fusion: spec-driven workflow + behavior-shaping skills, packaged as multi-harness CLI",
5
5
  "type": "module",
6
6
  "engines": {
@@ -12,10 +12,30 @@
12
12
  },
13
13
  "files": [
14
14
  "dist",
15
+ "scripts/codex-review-helper.mjs",
16
+ "src/core/codex-review",
15
17
  "README.md",
16
18
  "LICENSE",
17
19
  "LICENSE-THIRD-PARTY.md"
18
20
  ],
21
+ "scripts": {
22
+ "build": "node scripts/copy-templates.mjs && tsc -p tsconfig.json",
23
+ "prepublishOnly": "pnpm build",
24
+ "test": "vitest run && pnpm test:gate",
25
+ "test:gate": "node scripts/check-release-gate.mjs",
26
+ "test:gate:release": "node scripts/check-release-gate.mjs --release",
27
+ "test:watch": "vitest",
28
+ "lint": "eslint .",
29
+ "lint:fix": "eslint . --fix",
30
+ "format": "prettier --write .",
31
+ "format:check": "prettier --check .",
32
+ "typecheck": "tsc -p tsconfig.json --noEmit && tsc -p tsconfig.test.json --noEmit",
33
+ "eval": "tsx forge-eval/index.ts",
34
+ "eval:changed": "tsx forge-eval/index.ts --changed-only",
35
+ "eval:skill": "tsx forge-eval/index.ts --skill",
36
+ "eval-regen": "tsx forge-eval/regeneration-index.ts",
37
+ "eval-regen:scenario": "tsx forge-eval/regeneration-index.ts --scenario"
38
+ },
19
39
  "dependencies": {
20
40
  "@anthropic-ai/sdk": "^0.93.0",
21
41
  "canonicalize": "^3.0.0",
@@ -62,22 +82,5 @@
62
82
  "homepage": "https://github.com/Accelerator-mzq/forge",
63
83
  "bugs": {
64
84
  "url": "https://github.com/Accelerator-mzq/forge/issues"
65
- },
66
- "scripts": {
67
- "build": "node scripts/copy-templates.mjs && tsc -p tsconfig.json",
68
- "test": "vitest run && pnpm test:gate",
69
- "test:gate": "node scripts/check-release-gate.mjs",
70
- "test:gate:release": "node scripts/check-release-gate.mjs --release",
71
- "test:watch": "vitest",
72
- "lint": "eslint .",
73
- "lint:fix": "eslint . --fix",
74
- "format": "prettier --write .",
75
- "format:check": "prettier --check .",
76
- "typecheck": "tsc -p tsconfig.json --noEmit && tsc -p tsconfig.test.json --noEmit",
77
- "eval": "tsx forge-eval/index.ts",
78
- "eval:changed": "tsx forge-eval/index.ts --changed-only",
79
- "eval:skill": "tsx forge-eval/index.ts --skill",
80
- "eval-regen": "tsx forge-eval/regeneration-index.ts",
81
- "eval-regen:scenario": "tsx forge-eval/regeneration-index.ts --scenario"
82
85
  }
83
- }
86
+ }