dflow-sdd-ddd 0.15.0 → 0.16.0

package/templates/greenfield/scaffolding/Git-principles-gitflow.md

@@ -127,7 +127,11 @@ within **24 hours** after it lands. Run `/dflow:modify-existing` in
 **post-hoc mode** (`references/modify-existing-flow.md` Step 1.8): it opens a
 minimal host of its own for the fix, records the implementation checkpoint as
 `reconciled ({merged-hotfix-hash})`, and reconciles rather than re-running work
-that is already on the mainline.
+that is already on the mainline. The hash it records is the hotfix's own
+commit, **not** the tagged merge commit on `main` (step 3): the record is
+never a merge commit, and step 4 merges the hotfix **branch**, so the tagged
+commit does not come into `develop` with it.
+`references/modify-existing-post-hoc-hotfix.md` item 3 has the rule.
 What gets written is whatever the cascade's tier calls for — a **T2** lands a
 lightweight spec (root cause + fix + a `dflow/specs/architecture/tech-debt.md` entry
 if the bug reveals a systemic issue); a **T3** lands one `_index.md` Lightweight
@@ -188,8 +192,12 @@ Before making key Git operations:
 
 ### Before merging a feature branch to `develop`
 
-- [ ] `/dflow:finish-feature` has run (or the equivalent Step 8.4
-      manual archival is complete)
+- [ ] **Closeout complete**: `/dflow:finish-feature` has announced closeout
+      complete for this host — its Local-closeout gate is satisfied (the
+      closeout commit landed and passed post-commit verification) and, if
+      the host carries `follow-up-of`, the Step 6 tracking commit has also
+      landed and been verified. `status: completed` or a directory already
+      under `completed/` does not show this on its own.
 - [ ] `_index.md` status = `completed`, feature directory moved to
       `dflow/specs/features/completed/` via `git mv`
 - [ ] BC layer synced: `dflow/specs/domain/{context}/rules.md`,
@@ -202,8 +210,8 @@ Before making key Git operations:
 - [ ] Domain unit tests pass (invariants + value object equality)
 
 > **Minimal (zero-phase) host.** The items about this host's own record —
-> `/dflow:finish-feature` having run, `_index.md` status `completed`, and the
-> archival move — apply **unchanged**: they are what stops a host merging with
+> **Closeout complete**, `_index.md` status `completed`, and the archival
+> move — apply **unchanged**: they are what stops a host merging with
 > its record still open. Every item naming a **Domain or bounded-context
 > artifact** applies only to what this change **actually touched**: a **no-BC**
 > host has no context to sync or document, and a **T3** does no Domain work at

package/templates/greenfield/scaffolding/Git-principles-trunk.md

@@ -277,8 +277,12 @@ Before making key Git operations:
 
 ### Before merging a feature branch to `main` (opening / merging the PR)
 
-- [ ] `/dflow:finish-feature` has run (or the equivalent Step 8.4
-      manual archival is complete)
+- [ ] **Closeout complete**: `/dflow:finish-feature` has announced closeout
+      complete for this host — its Local-closeout gate is satisfied (the
+      closeout commit landed and passed post-commit verification) and, if
+      the host carries `follow-up-of`, the Step 6 tracking commit has also
+      landed and been verified. `status: completed` or a directory already
+      under `completed/` does not show this on its own.
 - [ ] `_index.md` status = `completed`, feature directory moved to
       `dflow/specs/features/completed/` via `git mv`
 - [ ] BC layer synced: `dflow/specs/domain/{context}/rules.md`,
@@ -292,8 +296,8 @@ Before making key Git operations:
 - [ ] CI is green (all required checks passing)
 
 > **Minimal (zero-phase) host.** The items about this host's own record —
-> `/dflow:finish-feature` having run, `_index.md` status `completed`, and the
-> archival move — apply **unchanged**: they are what stops a host merging with
+> **Closeout complete**, `_index.md` status `completed`, and the archival
+> move — apply **unchanged**: they are what stops a host merging with
 > its record still open. Every item naming a **Domain or bounded-context
 > artifact** applies only to what this change **actually touched**: a **no-BC**
 > host has no context to sync or document, and a **T3** does no Domain work at

package/templates/greenfield/templates/_index.md

@@ -6,7 +6,7 @@ created: {YYYY-MM-DD}
 branch: feature/{SPEC-ID}-{slug}
 # follow-up-of: {原 SPEC-ID}    # 選用：本 feature 為某個已 completed feature 的 follow-up 時填入
 ---
-<!-- dflow-shape: greenfield/_index.md 1 — keep this line: dflow doctor reads it -->
+<!-- dflow-shape: greenfield/_index.md 3 — keep this line: dflow doctor reads it -->
 
 <!--
 Template note (for AI):
@@ -136,8 +136,8 @@ references/new-phase-flow.md。有衝突時以那些檔為準。
 > Description 另外標明這是 hotfix，並寫出識別依據（PR／incident／tracker 編號）
 > ——沒有依據的 hash 會擋下 closeout。此時路徑指的是**已合併的那個 hotfix**
 > 碰到的檔案；本列 `Commit` 欄填的是**補文件那個 commit** 的 hash，不是 hotfix
-> 的 hash（後者記在 Checkpoint Log 的 `reconciled (...)` 列）。兩者來源不同，
-> 不可互填。
+> 的 hash（後者記在 Checkpoint Log 的 `reconciled (...)` 列，記哪一顆見
+> references/modify-existing-post-hoc-hotfix.md item 3）。兩者來源不同，不可互填。
 >
 > Tier 判準見 AI-AGENT-GUIDE.md § Ceremony Scaling 的 ordered cascade（步驟 0–4，先命中者勝）。
 
@@ -185,8 +185,9 @@ references/new-phase-flow.md。有衝突時以那些檔為準。
 > 生命週期 checkpoint 的 commit / skip 時間線（讓三週後回溯不必手動重建）。
 > 每個 checkpoint 無論 commit 或 skip 都記一列。Tier 決定 checkpoint 數：
 > T1 三點（spec 完 / impl 完 / closeout）、T2 兩點（spec+impl 合併 / closeout）、
-> T3 單一實作 commit（其 inline row 與本列的 hash 由 host 的下一個 commit 一併帶進；
+> T3 單一實作 commit（記它 hash 的那幾格由 host 的下一個 commit 帶進；
 > host 若沒有後續 commit，允許一個只動 ledger 的 tracking commit 收尾，該 commit 不另成列）。
+> `modify-existing` 的那一顆在更新文件那一步（Step 5）做完之後才 commit，連同那一步寫的文件一起帶。
 > ⚠ **上面那些「點」在本表 `Checkpoint` 欄各有固定的字面值**：spec 里程碑寫
 > **`spec-baseline`**、實作寫 **`implementation`**、關帳寫 **`closeout`**（下表的
 > `spec-baseline` / `implementation` / `closeout` 三列就是這幾個值；表中另有一列
@@ -199,16 +200,18 @@ references/new-phase-flow.md。有衝突時以那些檔為準。
 > **Minimal host（zero-phase）例外**——見 references/modify-existing-flow.md
 > Step 1.7（standalone）、Step 1.6 的 follow-up minimal 變體，或 Step 1.8 的
 > post-hoc hotfix（其 linkage 落在前兩者之一）：這種 host 之後
-> 沒有別的 commit 可以收攏 T3 的 row，所以**不分 tier 一律記兩個 checkpoint**
-> （implementation，然後 closeout），而且 T3 的 inline row 要**寫進 checkpoint 1
-> 本身**、不是等下一個 commit 帶進來。上一段「T3 單一實作 commit ／ 由下一個
-> commit 帶進」講的是**掛在既有 feature 底下的** T3，不適用於 minimal host。
+> 沒有別的 commit 可以收攏 row，所以**不分 tier 一律記兩個 checkpoint**
+> （implementation，然後 closeout），而且每一列（T3 的 inline row 也一樣）都要**寫進
+> checkpoint 1 本身**；之後只補記 checkpoint 1 hash 的那幾格，搭 closeout commit。
+> 上一段「T3 單一實作 commit ／ 由下一個 commit 帶進」講的是**掛在既有 feature
+> 底下的** T3，不適用於 minimal host。
 >
 > Result 的合法值是 `committed ({hash})` / `skipped` / `failed`，外加
 > **`reconciled ({merged-hotfix-hash})`**——只給 post-hoc hotfix（Step 1.8）的
 > implementation 列用，意思是「本 checkpoint 記錄的是一個已經合併的變更」。
-> 括號裡是**那個 hotfix 的 hash**，不是本 host 補文件那個 commit 的 hash
-> （後者填在 Lightweight Changes 該列的 `Commit` 欄）。完整詞彙見
+> 括號裡是**那個修正的 commit**（記哪一顆見
+> references/modify-existing-post-hoc-hotfix.md item 3），不是本 host 補文件那個
+> commit 的 hash（後者填在 Lightweight Changes 該列的 `Commit` 欄）。完整詞彙見
 > references/git-integration.md § Commit Checkpoints, Branch Gate & AI Commits。
 >
 > **`branch-override` 是紀錄列，不是生命週期 checkpoint。** 在 branch gate 選了
@@ -223,9 +226,11 @@ references/new-phase-flow.md。有衝突時以那些檔為準。
 > **minimal host**（Step 1.6 follow-up 變體／Step 1.7 standalone／Step 1.8
 > post-hoc）**不提供**這個選項——那些 host 正是拿 `branch:` 當權威來斷言分支相等的。
 >
-> commit hash 只在 commit 實際成功後填入；pre-commit hook reject 或 commit
-> 失敗記 `failed`、不寫假 hash。**例外：closeout 列不填 hash**——closeout
-> commit 無法自含自身 hash，該列於 commit 前寫入、隨歸檔目錄一起進 commit；
+> **checkpoint 的 commit 不可能帶著自己的 hash**：記它 hash 的那幾格（本表那一列的
+> `committed ({hash})`、Lightweight Changes 填同一個 hash 的 `Commit` 格）一律在 commit
+> 實際成功後才寫，搭 host 的**下一個** commit；pre-commit hook reject 或 commit
+> 失敗記 `failed`、不寫假 hash。**例外：closeout 列不填 hash**——這個 host 之後再也
+> 沒有 commit 會帶上它，所以該列於 commit 前寫入、隨歸檔目錄一起進 commit；
 > 溯源用 `git log -1 -- completed/{SPEC-ID}-{slug}` 或選配的
 > `Dflow-Checkpoint` trailer（見 references/git-integration.md）。
 >