baldart 4.31.0 → 4.31.1

package/CHANGELOG.md

@@ -5,6 +5,20 @@ All notable changes to BALDART will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.31.1] - 2026-06-11
+
+**`new2`: fix v4.31.0's dedup coverage + drop empty residuals + honest A/B cost — verified against the real FEAT-0022 telemetry/report (not the narrative).** Reading the actual run's `skill-runs.jsonl` + workflow report (instead of the prior turn's recollection) exposed three things v4.31.0 missed:
+- **The owner-gated dedup was too narrow** — it filtered by `deferralClass ∈ {owner-gated, not-a-code-defect}`, but the run's FIVE identical `db:push` residuals on card -01 carried kinds `ac-unmet`/`blocker`/`policy-deferred-ac`; the two `policy-deferred-ac` (an F-016 class that is ALWAYS an external/infra action) slipped through. Fix: dedup on `EXTERNAL_DEFERRAL = {owner-gated, not-a-code-defect, policy-deferred-ac}`. A second defect caught by a self-test before publishing: the action key split those 5 across `db-migration-deploy` and `migration:<file>` (the filename branch ran first), collapsing to 2 not 1 — **one `db:push` pushes all pending migrations, so the deploy intent must win over a bare filename**; reordered the key so every db-migration-deploy residual maps to one key. Verified on the real residuals: 7 db:push residuals (5 on -01, 1 on -02, 1 batch-level `F001`) → 2 (one per real card; `F001` dropped), matching the hand reconciliation.
+- **Empty out-of-scope residuals** — the run emitted two `out-of-scope` residuals with no file/line/evidence (`":"`), which would mint contentless follow-up cards. `resolve()` now skips an out-of-scope finding whose composed evidence is empty after stripping `:`/space separators.
+- **A/B cost telemetry was ~8× under** — the workflow reported `total_tokens=476k` (`budget.spent()`, output-only) / `agent_count=30` while the harness saw ~4.15M subagent tokens / 64 agents, because the workflow counters exclude the subagents spawned inside the nested workflows (`new2-resolve`, `new-final-review`). Since `total_tokens` was non-null, the skill's "backfill only if null" rule accepted the wrong figure — defeating new2's whole purpose (A/B on context economy). SKILL.md Step 5.5 now mandates **always** reading the real transcript `usage` via the `-stats` script as the headline cost, labelling the workflow figures as partial.
+
+**PATCH** (corrects v4.31.0's dedup coverage + noise filter + telemetry honesty on the EXPERIMENTAL `new2` surface; no new capability, no config key). Meta: same lesson as the feature itself — the v4.31.0 dedup was written from the prior turn's recollection; reading the raw telemetry/report found the gap. Validate fixes against the data, not the memory of the data.
+
+### Changed
+
+- **`framework/.claude/workflows/new2.js`** — `dedupOwnerGatedResiduals` now keys on `EXTERNAL_DEFERRAL` (adds `policy-deferred-ac`); `ownerGatedActionKey` reorders the db-migration-deploy branch ahead of the filename branch (one key per deploy action); `resolve()` skips empty `out-of-scope` residuals.
+- **`framework/.claude/skills/new2/SKILL.md`** — Step 5.5 cost recording: always backfill real transcript `usage` (the workflow's `total_tokens`/`agent_count` are partial — output-only + exclude nested workflows); keep them labelled `*_workflow`.
+
 ## [4.31.0] - 2026-06-11
 
 **`new2`: the residual ledger self-corrects before returning — no more duplicate-of-done follow-ups, no more N defers for one external action.** A real `new2` run (FEAT-0022 epic, 3 cards) surfaced two over-report classes in the offline-safe residual ledger that the skill was absorbing **by hand** every run: (1) **4 of 8 follow-ups were false-open** — scope-expansion residuals deferred early in the batch but satisfied LATER by another card's commit / a final-review fix, which only `integrateCrossCard()` retracts; a residual closed by any *other* in-batch path stayed falsely-open (and left a best-effort, uncommitted follow-up YAML in the worktree). (2) **3 follow-ups for ONE physical action** — one migration's remote `db:push` re-raised per-card AND batch-wide by the final review → three near-identical owner-gated cards. Both were caught only by the skill's manual per-residual disk grep + consolidation (load-bearing, repeated every run). This release moves that work into the workflow, once, deterministically:

package/VERSION

@@ -1 +1 @@
-4.31.0
+4.31.1

package/framework/.claude/skills/new2/SKILL.md

@@ -228,9 +228,16 @@ returns when the batch is done. It returns:
    (`git -C $MAIN log --oneline ${trunk} | grep <card>`); annotate any divergence and never present
    progress the disk does not show. Then fill `wall_clock_s` (now − kickoff `ts`) and
    `followups_on_disk` (count the actual follow-up files on disk in the main repo, NOT
-   `residualFollowups.length` — which double-counts). `total_tokens`/`agent_count` come from the
-   workflow; if `total_tokens` is null, run the `/new` Phase-8 `-stats` script to backfill real
-   `usage`. Keep `degraded`/`degradation_reasons` + `cards_deferred_done_pending` in the record so
+   `residualFollowups.length` — which double-counts). **Cost (the A/B's whole point) — do NOT trust
+   the workflow's `total_tokens`/`agent_count` as the headline figure.** They are **partial**:
+   `total_tokens` is `budget.spent()` output-only AND the agent counters do not include the subagents
+   spawned inside the nested workflows (`new2-resolve`, `new-final-review`) — on the real FEAT-0022 run
+   the workflow reported `total_tokens=476k` / `agent_count=30` while the harness saw ~4.15M subagent
+   tokens / 64 agents (≈8× under). So **always** run the `/new` Phase-8 `-stats` script to read the
+   real transcript `usage` (not only when `total_tokens` is null), record it as the headline cost, and
+   keep the workflow's figures clearly labelled as `total_tokens_workflow`/`agent_count_workflow`
+   (partial, output-only, excludes nested workflows). Keep `degraded`/`degradation_reasons` +
+   `cards_deferred_done_pending` in the record so
    the A/B comparison stays honest. Also record `migration_gate: <migration.status>`
    (`none`|`applied`|`skipped`|`degraded`) — the Step-3.5 gate is a pre-launch interaction, NOT a
    mid-batch question, so it does not break the zero-ask-during-batch invariant; logging it keeps the

package/framework/.claude/workflows/new2.js

@@ -389,9 +389,14 @@ async function resolve(kind, card, evidence, extra) {
     // domain and decide whether an out-of-ownership remedy lands inside the batch union.
     residuals.push({ card, kind, evidence, materialized: !!fc, deferralClass, domain: dom, remedyFiles: (res && res.remedyFiles) || [] })
   }
-  // F-022 — route out-of-scope findings the resolve surfaced.
+  // F-022 — route out-of-scope findings the resolve surfaced. v4.31.1 — a finding with no file,
+  // no line AND no evidence is noise (the resolve emitted an empty placeholder); pushing it would
+  // mint a contentless follow-up card. Skip when the composed evidence is empty after stripping the
+  // `:`/space separators — a real finding always carries at least a file, a line, or a description.
   for (const osf of (res && res.outOfScopeFindings) || []) {
-    residuals.push({ card, kind: 'out-of-scope', evidence: `${osf.file || ''}:${osf.line || ''} ${osf.evidence || ''}`, materialized: false })
+    const ev = `${osf.file || ''}:${osf.line || ''} ${osf.evidence || ''}`
+    if (!ev.replace(/[:\s]/g, '')) continue
+    residuals.push({ card, kind: 'out-of-scope', evidence: ev.trim(), materialized: false })
   }
   ledger(card, 'resolve:' + kind, status, (res && (res.followupCard || res.reason)) || '')
   return { status, deferralClass }
@@ -1128,19 +1133,31 @@ async function reconcileLedgerAgainstHead() {
 // ───────────────────────────────────────────────────────────────────────────
 function ownerGatedActionKey(r) {
   const hay = `${r.evidence || ''} ${(r.remedyFiles || []).join(' ')}`
+  // ORDER MATTERS — the migration-deploy intent wins over a bare filename match. One `db:push`
+  // pushes ALL pending migrations in a single action, so every "migration not deployed" / db:check-
+  // -sync / db:push residual must collapse onto ONE key regardless of whether it also names the .sql
+  // file (the real FEAT-0022 run split 5 identical db:push residuals across `db-migration-deploy`
+  // and `migration:<file>` because the filename branch ran first → only the deploy intent is canon).
+  if (/\bdb:push\b|\bdb:check-sync\b|remote db push|migration[^.]*(deploy|remote|push|not[_ ]?deployed)/i.test(hay)) return 'db-migration-deploy'
   const mig = hay.match(/(\d{14}_[a-z0-9_]+\.sql)/i)
   if (mig) return 'migration:' + mig[1].toLowerCase()
-  if (/\bdb:push\b|\bdb:check-sync\b|remote db push|migration.*(deploy|remote|push)/i.test(hay)) return 'db-migration-deploy'
   if (/\bdeploy(ment)?\b/i.test(hay)) return 'deploy'
   if (/\bsecret\b/i.test(hay)) return 'secret'
   if (/\bDNS\b|\bdomain\b/i.test(hay)) return 'dns'
   return null // unknown action → never dedup (avoid collapsing two genuinely-distinct externals)
 }
+// classes that are ALWAYS an external/infra action (never code a commit can close) — the only ones
+// safe to collapse by shared action key. `policy-deferred-ac` belongs here (F-016: an AC whose
+// remedy is out-of-ownership or an owner-gated infra step) — the real FEAT-0022 run proved a single
+// `db:push` surfaced as owner-gated AND policy-deferred-ac on the same card, so excluding the latter
+// left duplicates uncollapsed. ac-unmet/blocker/merge-blocker are NOT here: they may be code defects,
+// and their EXTERNAL instances are already reclassified to `owner-gated` by the F-040 classifier.
+const EXTERNAL_DEFERRAL = new Set(['owner-gated', 'not-a-code-defect', 'policy-deferred-ac'])
 function dedupOwnerGatedResiduals() {
   const realCard = new Set(cardIds)
   const groups = {}
   for (const r of residuals) {
-    if (r.deferralClass !== 'owner-gated' && r.deferralClass !== 'not-a-code-defect') continue
+    if (!EXTERNAL_DEFERRAL.has(r.deferralClass)) continue
     const k = ownerGatedActionKey(r)
     if (!k) continue
     ;(groups[k] = groups[k] || []).push(r)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baldart",
-  "version": "4.31.0",
+  "version": "4.31.1",
   "description": "Claude Agent Framework - Reusable framework for coordinating AI agents and humans in software projects",
   "bin": {
     "baldart": "./bin/baldart.js"