its-magic 0.1.2-38 → 0.1.2-39

package/installer.sh

@@ -1,6 +1,9 @@
 #!/usr/bin/env sh
 set -e
 
+# BUG-0004: keep startup shell options POSIX-safe for /bin/sh execution.
+# Do not use bash-only "set" flags in this unconditional startup path.
+
 SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
 SOURCE_ROOT="$SCRIPT_DIR/template"
 MANIFEST_NAME="docs/engineering/context/installer-owned-paths.manifest"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "its-magic",
-  "version": "0.1.2-38",
+  "version": "0.1.2-39",
   "description": "its-magic - AI dev team workflow for Cursor.",
   "license": "MIT",
   "bin": {

package/scripts/check_intake_template_parity.py

@@ -12,6 +12,7 @@ INTAKE_TEMPLATE_PAIRS: tuple[tuple[str, str], ...] = (
     ("scripts/intake_evidence_validate.py", "template/scripts/intake_evidence_validate.py"),
     ("scripts/intake_evidence_lib.py", "template/scripts/intake_evidence_lib.py"),
     ("scripts/intake_bug_routing_guard.py", "template/scripts/intake_bug_routing_guard.py"),
+    ("scripts/intake_bug_resume_brief_refresh.py", "template/scripts/intake_bug_resume_brief_refresh.py"),
     ("scripts/check_intake_template_parity.py", "template/scripts/check_intake_template_parity.py"),
 )
 

package/scripts/intake_evidence_lib.py

@@ -1,6 +1,6 @@
 """
 Deterministic intake evidence validation
-(US-0078 / US-0083 / DEC-0060 / DEC-0067 / R-0055).
+(US-0078 / US-0083 / DEC-0060 / DEC-0067 / R-0055 / BUG-0007 / R-0066).
 
 Consumes a logical intake_evidence bundle (dict). PO workflows MUST run this
 gate before mutating backlog/acceptance; failures are fail-closed.
@@ -202,6 +202,77 @@ def _row_uses_equivalent_evidence(row: dict[str, Any]) -> bool:
     return bool(str(row.get("equivalent_evidence_ref") or "").strip())
 
 
+def _norm_answer_ref_quoted_user_text(value: Any) -> str:
+    """Normalize quoted_user_text for BUG-0007 duplicate detection (DEC-0060 strip parity)."""
+    if value is None:
+        return ""
+    return str(value).strip()
+
+
+def _row_exempt_from_answer_ref_topic_distinctness(row: dict[str, Any]) -> bool:
+    """BUG-0007: alternate satisfaction paths do not participate in answer_ref blob reuse checks."""
+    return _row_uses_equivalent_evidence(row)
+
+
+def _validate_answer_ref_topic_distinctness(
+    bundle: dict[str, Any],
+    required: list[str],
+    by_key: dict[str, dict[str, Any]],
+    res: ValidationResult,
+) -> None:
+    """
+    BUG-0007 / R-0066: distinct required topic_key rows must not reuse the same
+    quoted_user_text under satisfied_by=answer_ref (normalized), except exempt rows.
+    """
+    norm_to_topics: dict[str, list[str]] = {}
+    for k in required:
+        row = by_key.get(k)
+        if not row:
+            continue
+        sat = (row.get("satisfied_by") or "").strip()
+        if sat != "answer_ref":
+            continue
+        if _row_exempt_from_answer_ref_topic_distinctness(row):
+            continue
+        irid = _row_run_id(bundle, row)
+        tit = _row_turn(row)
+        if irid is None or tit is None:
+            continue
+        qraw = row.get("quoted_user_text")
+        qtxt = "" if qraw is None else str(qraw)
+        ref = (row.get("ref") or "").strip()
+        if not ref or not verify_ie_ref(
+            ref,
+            intake_run_id=irid,
+            turn_index=int(tit),
+            topic_key=k,
+            satisfied_by=sat,
+            quoted_user_text=qtxt,
+        ):
+            continue
+        norm = _norm_answer_ref_quoted_user_text(qraw)
+        norm_to_topics.setdefault(norm, []).append(k)
+
+    dup_groups: list[str] = []
+    for norm, topics in norm_to_topics.items():
+        uniq = sorted(set(topics))
+        if len(uniq) < 2:
+            continue
+        dup_groups.append("text=" + repr(norm[:120]) + " topics=" + ",".join(uniq))
+
+    if dup_groups:
+        res.ok = False
+        res.add_code("INTAKE_ANSWER_REF_NOT_TOPIC_DISTINCT")
+        res.diagnostics.append(
+            "Remediation: distinct required topics must not reuse the same quoted_user_text "
+            "under satisfied_by=answer_ref (BUG-0007 / R-0066). Duplicates: "
+            + "; ".join(dup_groups)
+            + ". Use per-topic answers, or an allowed alternate path "
+            "(evidence_source=equivalent_evidence_ref + equivalent_evidence_ref, "
+            "delegation_ref per DEC-0067 / US-0083, or assumption_confirmation_ref on the row)."
+        )
+
+
 def _candidate_story_ids(bundle: dict[str, Any]) -> set[str]:
     out: set[str] = set()
 
@@ -527,6 +598,8 @@ def validate_intake_evidence(
                 res.missing_topics.append(k)
     res.missing_topics = sorted(set(res.missing_topics))
 
+    _validate_answer_ref_topic_distinctness(bundle, required, by_key, res)
+
     # US-0081 / DEC-0064: first/new/broad intake requires complete-plan coverage contract.
     if pack == "first-intake-pack":
         _validate_plan_coverage_contract(bundle, res)
@@ -668,6 +741,32 @@ def self_test() -> None:
     assert d0.ok and d1.ok
     assert d0.primary_codes == d1.primary_codes
 
+    # BUG-0007: same quoted_user_text across multiple answer_ref required topics fails
+    dup_txt = "synthetic blob echoed for every topic"
+    dup_rows = []
+    for i, key in enumerate(small):
+        dup_rows.append(
+            {
+                "topic_key": key,
+                "satisfied_by": "answer_ref",
+                "quoted_user_text": dup_txt,
+                "intake_run_id": rid,
+                "turn_index": 300 + i,
+                "ref": build_ie_ref(rid, 300 + i, key, "answer_ref", dup_txt),
+            }
+        )
+    dup_bundle = {
+        "selected_pack": "small-intake-pack",
+        "intake_run_id": rid,
+        "asked_topics": list(small),
+        "missing_topics": [],
+        "assumptions_confirmed": "(none)",
+        "topic_coverage": dup_rows,
+    }
+    dup_res = validate_intake_evidence(dup_bundle)
+    assert not dup_res.ok
+    assert "INTAKE_ANSWER_REF_NOT_TOPIC_DISTINCT" in dup_res.primary_codes
+
     # First-intake full-plan coverage contract (US-0081 / DEC-0064)
     first = PACK_REQUIRED_KEYS["first-intake-pack"]
     first_rows = []

package/template/.cursor/commands/auto.md

@@ -9,12 +9,30 @@ description: "its-magic auto: deterministic continuation orchestrator."
 - tech-lead
 
 ## Execution model
-- `/auto` is an orchestrator only. It must not execute phase work directly.
-- For each phase, spawn a fresh subagent context for that phase role.
+- `/auto` is a **spawn-only orchestrator**: it schedules materialization, spawns
+  fresh **phase-role** subagents, and verifies phase boundaries—it **must not**
+  execute lifecycle phase work, perform phase-role duties, or author **phase
+  deliverables** in the orchestrator context.
+- For each phase, **spawn a fresh subagent** for that phase’s canonical role;
+  phase output must arrive only via artifacts and handoff files (no in-turn
+  orchestrator execution of that phase).
 - Phase context transfer happens only through artifacts and handoff files.
 - Scope is process/workflow orchestration only. Do not claim runtime product
   orchestration changes.
 
+## Spawn-boundary integrity (BUG-0006)
+
+- **Forbidden**: treating the orchestrator turn as the executor of a lifecycle
+  phase (for example running **`architecture`**, **`execute`**, **`qa`**, or any
+  other **`phase_id`** in the orchestrator instead of spawning the required
+  subagent).
+- **Fail fast** with **`AUTO_ORCHESTRATOR_PHASE_EXECUTION`**. **Remediation**:
+  stop; spawn a **fresh** subagent for the canonical **`phase_id`** and **`role`**
+  per the phase→role matrix (**DEC-0051**); do not merge phase output into
+  orchestrator turns. **Distinct from** **`PHASE_CONTEXT_ISOLATION_VIOLATION`**
+  (wrong writer / isolation break) and **`RUNTIME_PROOF_*`** / **`PHASE_ROLE_*`**
+  families—do not overload those codes for a missing-spawn violation.
+
 ## Full specification (US-0080 / DEC-0062)
 
 Long prose, expanded mode semantics, and **Steps 1–13** detail live in

package/template/.cursor/commands/intake.md

@@ -21,6 +21,7 @@ description: "its-magic intake: clarify idea and capture story + acceptance."
 - `docs/product/backlog.md`
 - `docs/product/acceptance.md`
 - `handoffs/po_to_tl.md`
+- `handoffs/resume_brief.md` (required on successful **`/intake bug`** persistence — **DEC-0069** / **BUG-0005**)
 - Optional (when enabled): `docs/engineering/compatibility-report.md`
 - Optional (when enabled): `docs/engineering/component-scope.md`
 
@@ -41,7 +42,7 @@ description: "its-magic intake: clarify idea and capture story + acceptance."
 - For artifact mutations, enforce deterministic single-writer scope:
   - establish writer identity (`writer_id`) and run identity (`intake_run_id`),
   - bind writes to target artifacts (`backlog`, `acceptance`, `vision`,
-    `po_to_tl`) for this run.
+    `po_to_tl`, and when persisting bugs: `resume_brief` per **DEC-0069**) for this run.
 - Drift guard semantics:
   - self-write changes from the same `(writer_id, intake_run_id)` are valid and
     must not trigger concurrent-writer blockers,
@@ -73,6 +74,7 @@ description: "its-magic intake: clarify idea and capture story + acceptance."
   - `INTAKE_REQUIRED_TOPIC_MISSING`
   - `INTAKE_REQUIRED_PACK_INCOMPLETE`
   - `INTAKE_ASSUMPTION_CONFIRMATION_REQUIRED`
+  - `INTAKE_ANSWER_REF_NOT_TOPIC_DISTINCT` (**BUG-0007** / **R-0066** — see **Truthfulness** below)
   - `INTAKE_PERSISTENCE_BLOCKED`
 - Remediation guidance surface (mandatory on block):
   - list `missing_topics`,
@@ -127,6 +129,24 @@ and assumption binding. **Do not** mutate `docs/product/backlog.md` or
   (**AC-5**, **AC-6**).
 - **Grandfathering**: legacy intake rows remain valid for read/display; the **next** intake-driven
   mutation must supply full **US-0078** evidence or the write is blocked (**DEC-0060** §5).
+- Truthfulness / anti-echo (**BUG-0007** / **R-0066**): `INTAKE_ANSWER_REF_NOT_TOPIC_DISTINCT` when
+  the same normalized `quoted_user_text` is reused across distinct required `topic_key` rows under
+  `satisfied_by=answer_ref` without an exempt path (`evidence_source=equivalent_evidence_ref` +
+  `equivalent_evidence_ref`, `delegation_ref` per **DEC-0067** / **US-0083**, or
+  `assumption_confirmation_ref` on the row). Canonical **`ie:`** integrity (**DEC-0060**) does not
+  prove a topic was actually elicited.
+
+## Truthfulness: `asked_topics` and `topic_coverage` (BUG-0007 / US-0083 / DEC-0060 / DEC-0067)
+
+- **`asked_topics`** may list a required `topic_key` only when a **user-visible question** was posed
+  **or** a **DEC-0060**-allowed alternate applies: **`delegation_ref`** (**DEC-0067**, **US-0083**),
+  **`evidence_source=equivalent_evidence_ref`** with **`equivalent_evidence_ref`**, or
+  **`assumption_confirmation_ref`** (row-level and/or bundle-level assumption binding per the gate
+  contract above).
+- **Forbidden**: fabricating **`topic_coverage`** by echoing **one** user or bug-report blob into
+  **`quoted_user_text`** on **every** required key as **`answer_ref`** solely to satisfy structure.
+  The validator rejects that pattern under **`INTAKE_ANSWER_REF_NOT_TOPIC_DISTINCT`** (see
+  **`docs/engineering/architecture.md`** **`# BUG-0007`**).
 
 ## Bug issue routing (US-0079 / DEC-0061)
 
@@ -138,6 +158,12 @@ and assumption binding. **Do not** mutate `docs/product/backlog.md` or
   - Append **`### BUG-#### — Title`** under **`## Bug issues (canonical)`** with **Status**, **`environment`**, **`steps_to_reproduce`**, **`expected`**, **`actual`**, **`evidence_refs`**.
   - Add matching **`- [ ]` / `- [x]`** row under **`## Bug acceptance (canonical)`**, sorted by id.
   - Run **`python scripts/bug_issue_validate.py --backlog docs/product/backlog.md --check-acceptance`** before completing the handoff.
+  - **Resume brief refresh (DEC-0069 / BUG-0005)**: immediately after successful bug persistence and backlog/acceptance validation **PASS**, run the atomic writer (temp file + replace — idempotent latest-pointer upsert):
+    - `python scripts/intake_bug_resume_brief_refresh.py --bug-id BUG-#### --backlog docs/product/backlog.md --resume-brief handoffs/resume_brief.md --intake-boundary-utc <RFC3339Z>`  
+    - Optional: `--orchestrator-run-id`, `--intake-evidence handoffs/intake_evidence/....json`, `--sprint-id` when known.  
+    - Exit non-zero → **`INTAKE_RESUME_BRIEF_*`** family — do not claim intake complete; fix backlog/brief contradiction or supply valid boundary UTC.  
+    - Post-condition: **`intended_resume_phase` / `resolved_start_phase` = `discovery`**, **`resolution_source=resume_brief`**, **`bug_id`** matches persisted row, so **`/auto`** without **`start-from`** does not false-trigger **`RESUME_BRIEF_STALE`** for a stale pre-intake **`intake`** target.  
+    - Optional audit: `python scripts/intake_bug_resume_brief_refresh.py --bug-id BUG-#### --backlog docs/product/backlog.md --resume-brief handoffs/resume_brief.md --validate-file` (no write).
 
 ## Steps
 1. Determine intake mode from `.cursor/scratchpad.md`:
@@ -283,7 +309,8 @@ and assumption binding. **Do not** mutate `docs/product/backlog.md` or
 - Intake mutations must also comply with
   `docs/engineering/artifact-ownership-policy.md`.
 - Intake may mutate only intake-owned scopes (`vision`, `backlog`, `acceptance`,
-  `po_to_tl`) for target story context.
+  `po_to_tl`, and **`handoffs/resume_brief.md`** only via the **DEC-0069** bug-intake
+  completion path / `intake_bug_resume_brief_refresh.py`) for target story context.
 - Any attempted delete/rewrite of non-intake-owned sections fails closed with
   `PHASE_OWNERSHIP_VIOLATION`.
 - If an override-authorized path is configured for an artifact but required

package/template/docs/engineering/artifact-ownership-policy.md

@@ -23,7 +23,7 @@ artifacts. Ordering policy and ownership policy are complementary:
 | `handoffs/release_queue.md` | target sprint row only | `release` | none |
 | `handoffs/release_notes.md` | latest pointer section | `release`, `refresh-context` | none |
 | `docs/engineering/state.md` | append-bottom checkpoints only | all delivery phases | none |
-| `handoffs/resume_brief.md` | current status/next-actions sections | `pause`, `resume`, `refresh-context`, `release` | none |
+| `handoffs/resume_brief.md` | current status/next-actions sections; latest-pointer upsert on **`/intake bug`** completion (**DEC-0069**) | `intake` (bug persistence path only), `pause`, `resume`, `refresh-context`, `release` | none |
 
 ## Non-destructive mutation rules
 

package/template/scripts/check_intake_template_parity.py

@@ -12,6 +12,7 @@ INTAKE_TEMPLATE_PAIRS: tuple[tuple[str, str], ...] = (
     ("scripts/intake_evidence_validate.py", "template/scripts/intake_evidence_validate.py"),
     ("scripts/intake_evidence_lib.py", "template/scripts/intake_evidence_lib.py"),
     ("scripts/intake_bug_routing_guard.py", "template/scripts/intake_bug_routing_guard.py"),
+    ("scripts/intake_bug_resume_brief_refresh.py", "template/scripts/intake_bug_resume_brief_refresh.py"),
     ("scripts/check_intake_template_parity.py", "template/scripts/check_intake_template_parity.py"),
 )
 

package/template/scripts/intake_bug_resume_brief_refresh.py

@@ -0,0 +1,303 @@
+#!/usr/bin/env python3
+"""
+Atomic refresh of handoffs/resume_brief.md after successful /intake bug persistence (DEC-0069 / BUG-0005).
+
+Idempotent: same inputs yield the same latest-pointer section. Uses temp file + os.replace for atomicity.
+"""
+
+from __future__ import annotations
+
+import argparse
+import os
+import re
+import sys
+import tempfile
+from pathlib import Path
+
+import bug_issue_lib as bi
+import bug_issue_validate as biv
+
+
+def bug_status(backlog_text: str, bug_id: str) -> str | None:
+    section = bi.extract_bug_section(backlog_text)
+    if not section:
+        return None
+    for issue in bi.parse_bug_issues(section):
+        if issue.bug_id == bug_id:
+            return issue.status
+    return None
+
+
+def upsert_latest_orchestration_pointer(full_text: str, latest_block: str) -> str:
+    """Replace ## Latest orchestration pointer section or insert after # Resume Brief."""
+    latest_block = latest_block.rstrip("\n") + "\n"
+    lines = full_text.splitlines(keepends=True)
+    if not lines:
+        return "# Resume Brief\n\n" + latest_block
+
+    out: list[str] = []
+    i = 0
+    replaced = False
+    while i < len(lines):
+        line = lines[i]
+        if line.startswith("## Latest orchestration pointer"):
+            out.append(latest_block)
+            i += 1
+            while i < len(lines) and not lines[i].startswith("## "):
+                i += 1
+            replaced = True
+            continue
+        out.append(line)
+        i += 1
+
+    if replaced:
+        return "".join(out)
+
+    text = "".join(lines)
+    stripped = text.lstrip("\n")
+    if stripped.startswith("# Resume Brief"):
+        return text.rstrip("\n") + "\n\n" + latest_block
+    return "# Resume Brief\n\n" + latest_block + text.lstrip("\n")
+
+
+def build_latest_pointer_markdown(
+    *,
+    bug_id: str,
+    intake_boundary_utc: str,
+    orchestrator_run_id: str | None,
+    intake_evidence_ref: str | None,
+    sprint_id: str | None,
+) -> str:
+    orch = orchestrator_run_id if orchestrator_run_id else "(unknown)"
+    ev = intake_evidence_ref if intake_evidence_ref else "(none)"
+    spr = sprint_id if sprint_id else "(none)"
+    return f"""## Latest orchestration pointer — post-bug-intake (DEC-0069)
+
+- **Boundary**: successful **`/intake bug`** persistence (**`US-0045`**) — **`intake_boundary_utc={intake_boundary_utc}`**
+- **`bug_id`**: **`{bug_id}`** — must remain **`OPEN`** in **`docs/product/backlog.md`** (authority); this refresh is rejected if backlog shows **DONE**
+- **Intake evidence ref**: `{ev}`
+- **`orchestrator_run_id`**: `{orch}` (boundary metadata when known; optional at intake)
+- **Contract**: default **`/auto`** continuation targets **`discovery`** for this OPEN bug (not a stale pre-intake **`intake`** resume target)
+
+## Current status
+
+- **Active bug**: **`{bug_id}`** — **OPEN** per **`docs/product/backlog.md`** at refresh time
+
+## Intended resume phase
+
+`discovery`
+
+## Resume target
+
+- bug_id={bug_id}
+- story_id=(none)
+- sprint_id={spr}
+- boundary=post-bug-intake (**DEC-0069**)
+
+## Latest auto breadcrumb seed
+
+- requested_start_from=(none)
+- resolved_start_phase=discovery
+- resolution_source=resume_brief
+- resolution_status=resolved
+- stop_reason=intake_complete
+- stop_phase=intake
+- next_scheduled_phase=discovery
+- bug_id={bug_id}
+- story_id=(none)
+- sprint_id={spr}
+- orchestrator_run_id={orch}
+- intake_boundary_utc={intake_boundary_utc}
+"""
+
+
+def extract_brief_bug_id(brief_text: str) -> str | None:
+    for line in brief_text.splitlines():
+        s = line.strip()
+        m = re.match(r"^-\s*bug_id=(BUG-\d{4})\s*$", s)
+        if m:
+            return m.group(1)
+    return None
+
+
+def validate_brief_open_bug_alignment(brief_text: str, backlog_text: str) -> list[str]:
+    """Writer-side guard: brief bug_id must match an OPEN row in backlog (US-0045)."""
+    errors: list[str] = []
+    bid = extract_brief_bug_id(brief_text)
+    if not bid:
+        errors.append("INTAKE_RESUME_BRIEF_PARSE_BUG_ID_MISSING")
+        return errors
+
+    st = bug_status(backlog_text, bid)
+    if st is None:
+        errors.append(f"INTAKE_RESUME_BRIEF_BACKLOG_BUG_UNKNOWN:{bid}")
+        return errors
+    if st != "OPEN":
+        errors.append(f"INTAKE_RESUME_BRIEF_BACKLOG_CONTRADICTION:{bid}:status={st}")
+    if "`discovery`" not in brief_text and "resolved_start_phase=discovery" not in brief_text:
+        errors.append("INTAKE_RESUME_BRIEF_DISCOVERY_PHASE_MISSING")
+    return errors
+
+
+def atomic_write(path: Path, content: str) -> None:
+    path.parent.mkdir(parents=True, exist_ok=True)
+    fd, tmp = tempfile.mkstemp(
+        dir=path.parent,
+        prefix=".resume_brief_tmp_",
+        suffix=".md",
+    )
+    try:
+        with os.fdopen(fd, "w", encoding="utf-8", newline="\n") as f:
+            f.write(content)
+        os.replace(tmp, path)
+    except Exception:
+        try:
+            os.unlink(tmp)
+        except OSError:
+            pass
+        raise
+
+
+def _fail(code: str, detail: str = "") -> int:
+    msg = code
+    if detail:
+        msg += f": {detail}"
+    print(msg, file=sys.stderr)
+    return 1
+
+
+def self_test() -> int:
+    block = build_latest_pointer_markdown(
+        bug_id="BUG-0999",
+        intake_boundary_utc="2026-04-03T12:00:00Z",
+        orchestrator_run_id="auto-test",
+        intake_evidence_ref="handoffs/intake_evidence/x.json",
+        sprint_id="S0001",
+    )
+    old = "# Resume Brief\n\n## Latest orchestration pointer — old\n\n- x\n\n## Checkpoint\n\nkeep\n"
+    new = upsert_latest_orchestration_pointer(old, block)
+    if "keep" not in new:
+        return _fail("SELFTEST_FAILED", "lost tail section")
+    if "BUG-0999" not in new or "resolved_start_phase=discovery" not in new:
+        return _fail("SELFTEST_FAILED", "missing expected content")
+    if "## Latest orchestration pointer — old" in new:
+        return _fail("SELFTEST_FAILED", "old latest not replaced")
+    good_backlog = """## Bug issues (canonical)
+
+### BUG-0999 — T
+- Status: OPEN
+- environment: e
+- steps_to_reproduce: s
+- expected: x
+- actual: y
+- evidence_refs: z
+"""
+    errs = validate_brief_open_bug_alignment(new, good_backlog)
+    if errs:
+        return _fail("SELFTEST_FAILED", str(errs))
+    bad_backlog = good_backlog.replace("OPEN", "DONE")
+    errs2 = validate_brief_open_bug_alignment(new, bad_backlog)
+    if not any("CONTRADICTION" in e for e in errs2):
+        return _fail("SELFTEST_FAILED", "expected contradiction on DONE")
+    print("[INTAKE_BUG_RESUME_BRIEF_REFRESH_OK]")
+    return 0
+
+
+def main() -> int:
+    ap = argparse.ArgumentParser(description=__doc__)
+    ap.add_argument("--bug-id", default="", help="Persisted BUG-#### id (required unless --self-test)")
+    ap.add_argument("--backlog", default="docs/product/backlog.md")
+    ap.add_argument("--resume-brief", default="handoffs/resume_brief.md")
+    ap.add_argument(
+        "--intake-boundary-utc",
+        default="",
+        help="RFC3339 UTC timestamp for intake completion boundary (required unless --validate-file)",
+    )
+    ap.add_argument("--orchestrator-run-id", default="", help="Optional orchestrator run id")
+    ap.add_argument("--intake-evidence", default="", help="Optional intake evidence path or ref")
+    ap.add_argument("--sprint-id", default="", help="Optional sprint id")
+    ap.add_argument("--dry-run", action="store_true", help="Print body only; do not write")
+    ap.add_argument("--validate-file", action="store_true", help="Validate existing brief vs backlog; no write")
+    ap.add_argument("--self-test", action="store_true")
+    args = ap.parse_args()
+    if args.self_test:
+        return self_test()
+
+    if not args.bug_id:
+        return _fail("INTAKE_RESUME_BRIEF_INVALID_BUG_ID", "missing --bug-id")
+    if not re.fullmatch(r"BUG-\d{4}", args.bug_id):
+        return _fail("INTAKE_RESUME_BRIEF_INVALID_BUG_ID", args.bug_id)
+
+    try:
+        backlog_text = Path(args.backlog).read_text(encoding="utf-8")
+    except OSError as e:
+        return _fail("INTAKE_RESUME_BRIEF_IO_ERROR", str(e))
+
+    berr, _ = biv.validate_backlog(backlog_text)
+    if berr:
+        for e in berr:
+            print(e, file=sys.stderr)
+        return _fail("INTAKE_RESUME_BRIEF_BACKLOG_INVALID", berr[0])
+
+    resume_path = Path(args.resume_brief)
+    if args.validate_file:
+        if not resume_path.is_file():
+            return _fail("INTAKE_RESUME_BRIEF_MISSING", str(resume_path))
+        brief_text = resume_path.read_text(encoding="utf-8")
+        bid_file = extract_brief_bug_id(brief_text)
+        if bid_file != args.bug_id:
+            return _fail(
+                "INTAKE_RESUME_BRIEF_BUG_ID_MISMATCH",
+                f"cli={args.bug_id} brief={bid_file}",
+            )
+        verr = validate_brief_open_bug_alignment(brief_text, backlog_text)
+        if verr:
+            for e in verr:
+                print(e, file=sys.stderr)
+            return 1
+        print("[INTAKE_RESUME_BRIEF_VALIDATE_OK]")
+        return 0
+
+    if not args.intake_boundary_utc.strip():
+        return _fail("INTAKE_RESUME_BRIEF_BOUNDARY_UTC_REQUIRED", "supply --intake-boundary-utc")
+
+    st = bug_status(backlog_text, args.bug_id)
+    if st is None:
+        return _fail("INTAKE_RESUME_BRIEF_BUG_NOT_FOUND", args.bug_id)
+    if st != "OPEN":
+        return _fail(
+            "INTAKE_RESUME_BRIEF_BACKLOG_CONTRADICTION",
+            f"{args.bug_id} must be OPEN for discovery default; got {st}",
+        )
+
+    block = build_latest_pointer_markdown(
+        bug_id=args.bug_id,
+        intake_boundary_utc=args.intake_boundary_utc,
+        orchestrator_run_id=args.orchestrator_run_id or None,
+        intake_evidence_ref=args.intake_evidence or None,
+        sprint_id=args.sprint_id or None,
+    )
+
+    prior = resume_path.read_text(encoding="utf-8") if resume_path.is_file() else ""
+    merged = upsert_latest_orchestration_pointer(prior, block)
+    verr = validate_brief_open_bug_alignment(merged, backlog_text)
+    if verr:
+        for e in verr:
+            print(e, file=sys.stderr)
+        return 1
+
+    if args.dry_run:
+        print(merged)
+        return 0
+
+    try:
+        atomic_write(resume_path, merged)
+    except OSError as e:
+        return _fail("INTAKE_RESUME_BRIEF_WRITE_FAILED", str(e))
+
+    print("[INTAKE_BUG_RESUME_BRIEF_REFRESH_OK]")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

package/template/scripts/intake_evidence_lib.py

@@ -1,6 +1,6 @@
 """
 Deterministic intake evidence validation
-(US-0078 / US-0083 / DEC-0060 / DEC-0067 / R-0055).
+(US-0078 / US-0083 / DEC-0060 / DEC-0067 / R-0055 / BUG-0007 / R-0066).
 
 Consumes a logical intake_evidence bundle (dict). PO workflows MUST run this
 gate before mutating backlog/acceptance; failures are fail-closed.
@@ -202,6 +202,77 @@ def _row_uses_equivalent_evidence(row: dict[str, Any]) -> bool:
     return bool(str(row.get("equivalent_evidence_ref") or "").strip())
 
 
+def _norm_answer_ref_quoted_user_text(value: Any) -> str:
+    """Normalize quoted_user_text for BUG-0007 duplicate detection (DEC-0060 strip parity)."""
+    if value is None:
+        return ""
+    return str(value).strip()
+
+
+def _row_exempt_from_answer_ref_topic_distinctness(row: dict[str, Any]) -> bool:
+    """BUG-0007: alternate satisfaction paths do not participate in answer_ref blob reuse checks."""
+    return _row_uses_equivalent_evidence(row)
+
+
+def _validate_answer_ref_topic_distinctness(
+    bundle: dict[str, Any],
+    required: list[str],
+    by_key: dict[str, dict[str, Any]],
+    res: ValidationResult,
+) -> None:
+    """
+    BUG-0007 / R-0066: distinct required topic_key rows must not reuse the same
+    quoted_user_text under satisfied_by=answer_ref (normalized), except exempt rows.
+    """
+    norm_to_topics: dict[str, list[str]] = {}
+    for k in required:
+        row = by_key.get(k)
+        if not row:
+            continue
+        sat = (row.get("satisfied_by") or "").strip()
+        if sat != "answer_ref":
+            continue
+        if _row_exempt_from_answer_ref_topic_distinctness(row):
+            continue
+        irid = _row_run_id(bundle, row)
+        tit = _row_turn(row)
+        if irid is None or tit is None:
+            continue
+        qraw = row.get("quoted_user_text")
+        qtxt = "" if qraw is None else str(qraw)
+        ref = (row.get("ref") or "").strip()
+        if not ref or not verify_ie_ref(
+            ref,
+            intake_run_id=irid,
+            turn_index=int(tit),
+            topic_key=k,
+            satisfied_by=sat,
+            quoted_user_text=qtxt,
+        ):
+            continue
+        norm = _norm_answer_ref_quoted_user_text(qraw)
+        norm_to_topics.setdefault(norm, []).append(k)
+
+    dup_groups: list[str] = []
+    for norm, topics in norm_to_topics.items():
+        uniq = sorted(set(topics))
+        if len(uniq) < 2:
+            continue
+        dup_groups.append("text=" + repr(norm[:120]) + " topics=" + ",".join(uniq))
+
+    if dup_groups:
+        res.ok = False
+        res.add_code("INTAKE_ANSWER_REF_NOT_TOPIC_DISTINCT")
+        res.diagnostics.append(
+            "Remediation: distinct required topics must not reuse the same quoted_user_text "
+            "under satisfied_by=answer_ref (BUG-0007 / R-0066). Duplicates: "
+            + "; ".join(dup_groups)
+            + ". Use per-topic answers, or an allowed alternate path "
+            "(evidence_source=equivalent_evidence_ref + equivalent_evidence_ref, "
+            "delegation_ref per DEC-0067 / US-0083, or assumption_confirmation_ref on the row)."
+        )
+
+
 def _candidate_story_ids(bundle: dict[str, Any]) -> set[str]:
     out: set[str] = set()
 
@@ -527,6 +598,8 @@ def validate_intake_evidence(
                 res.missing_topics.append(k)
     res.missing_topics = sorted(set(res.missing_topics))
 
+    _validate_answer_ref_topic_distinctness(bundle, required, by_key, res)
+
     # US-0081 / DEC-0064: first/new/broad intake requires complete-plan coverage contract.
     if pack == "first-intake-pack":
         _validate_plan_coverage_contract(bundle, res)
@@ -668,6 +741,32 @@ def self_test() -> None:
     assert d0.ok and d1.ok
     assert d0.primary_codes == d1.primary_codes
 
+    # BUG-0007: same quoted_user_text across multiple answer_ref required topics fails
+    dup_txt = "synthetic blob echoed for every topic"
+    dup_rows = []
+    for i, key in enumerate(small):
+        dup_rows.append(
+            {
+                "topic_key": key,
+                "satisfied_by": "answer_ref",
+                "quoted_user_text": dup_txt,
+                "intake_run_id": rid,
+                "turn_index": 300 + i,
+                "ref": build_ie_ref(rid, 300 + i, key, "answer_ref", dup_txt),
+            }
+        )
+    dup_bundle = {
+        "selected_pack": "small-intake-pack",
+        "intake_run_id": rid,
+        "asked_topics": list(small),
+        "missing_topics": [],
+        "assumptions_confirmed": "(none)",
+        "topic_coverage": dup_rows,
+    }
+    dup_res = validate_intake_evidence(dup_bundle)
+    assert not dup_res.ok
+    assert "INTAKE_ANSWER_REF_NOT_TOPIC_DISTINCT" in dup_res.primary_codes
+
     # First-intake full-plan coverage contract (US-0081 / DEC-0064)
     first = PACK_REQUIRED_KEYS["first-intake-pack"]
     first_rows = []