@opengsd/gsd-path 1.0.0 → 1.1.0

package/skills/gsd-path-build/scripts/state_checkpoint.py

@@ -20,6 +20,43 @@ except ModuleNotFoundError as error:  # pragma: no cover - package imports used
     from scripts.isolation import IsolationError, checkpoint as isolation_checkpoint, require_commit, require_full_sha, PROJECT_ENTRIES
 
 
+if __package__:
+    from . import roadmap
+else:
+    import roadmap
+
+if __package__:  # imported as scripts.state_checkpoint
+    from . import pipeline_state
+    from .pipeline_state import (
+        CHECKPOINT_JOURNAL_NAME,
+        CHECKPOINT_KINDS,
+        CHECKPOINT_SCHEMA,
+        PLAN_APPROVAL_SUBJECT,
+        PROMOTION_TRACKS,
+        SLUG_RE,
+        TASK_FILE_RE,
+        TASK_ID_RE,
+        ApprovedTaskContract,
+        PipelineState,
+        PipelineStateError,
+    )
+else:  # standalone script or sibling import
+    import pipeline_state
+    from pipeline_state import (
+        CHECKPOINT_JOURNAL_NAME,
+        CHECKPOINT_KINDS,
+        CHECKPOINT_SCHEMA,
+        PLAN_APPROVAL_SUBJECT,
+        PROMOTION_TRACKS,
+        SLUG_RE,
+        TASK_FILE_RE,
+        TASK_ID_RE,
+        ApprovedTaskContract,
+        PipelineState,
+        PipelineStateError,
+    )
+
+
 def _sha256(content: str) -> str:
     return hashlib.sha256(content.encode("utf-8")).hexdigest()
 
@@ -65,41 +102,29 @@ def _checkpoint_artifact_digest(project: Path, mutable_paths: set[str]) -> str:
     return digest.hexdigest()
 
 
-def _roadmap_status(lines: list[str], start: int, end: int) -> str:
-    values = []
-    for line in lines[start:end]:
-        match = re.fullmatch(r"Status:\s*(\S+)\s*", line.rstrip("\r\n"))
-        if match:
-            values.append(match.group(1))
-    if len(values) != 1:
-        raise PipelineStateError("ROADMAP.md milestone must have one Status field")
-    return values[0]
-
-
 def _activate_roadmap_milestone(text: str, milestone: str) -> str:
-    sections = pipeline_state._roadmap_sections(text)
-    if milestone not in sections:
-        raise PipelineStateError(f"ROADMAP.md is missing selected milestone: {milestone}")
-    lines = text.splitlines(keepends=True)
-    active = [
-        slug
-        for slug, (_, start, end) in sections.items()
-        if _roadmap_status(lines, start, end) == "active"
-    ]
-    if active:
-        raise PipelineStateError(
-            "ROADMAP.md already has an active milestone: " + ", ".join(active)
-        )
-    _, start, end = sections[milestone]
-    pipeline_state._replace_roadmap_field(lines, start, end, "Status", {"pending"}, "active")
-    return "".join(lines)
-
+    try:
+        return roadmap.activate_milestone(text, milestone)
+    except roadmap.RoadmapError as error:
+        raise PipelineStateError(str(error)) from error
 
 def _approval_details(
     kind: str,
     state: PipelineState,
     selected_milestone: Optional[str],
 ) -> tuple[dict[str, Optional[str]], str, str, str]:
+    if kind == "roadmap-reslice":
+        if state.status != "active" or state.archive is not None:
+            raise PipelineStateError("roadmap re-slice requires active, unarchived state")
+        if state.phase in {"inspect", "define"} and selected_milestone == state.milestone and state.milestone:
+            changes = {}
+            event = "program roadmap re-slice approved"
+        elif state.phase == "roadmap" and state.milestone is None and selected_milestone and SLUG_RE.fullmatch(selected_milestone):
+            changes = {"phase": "inspect", "milestone": selected_milestone}
+            event = "roadmap approved after abandoned milestone"
+        else:
+            raise PipelineStateError("roadmap re-slice must preserve the active milestone or select after abandon")
+        return changes, event, "roadmap: program roadmap approved", "Why: approved roadmap checkpoint"
     if kind == "plan":
         if selected_milestone is not None:
             raise PipelineStateError("plan approval does not accept a selected milestone")
@@ -126,6 +151,12 @@ def _approval_details(
     raise PipelineStateError(f"unsupported approval kind: {kind}")
 
 
+def _reslice_roadmap(before: str, candidate: str, state: PipelineState, selected: str) -> str:
+    try:
+        return roadmap.reslice(before, candidate, state.phase, selected)
+    except roadmap.RoadmapError as error:
+        raise PipelineStateError(str(error)) from error
+
 def _checkpoint_request_fields(
     kind: str,
     project_dir: str,
@@ -175,6 +206,10 @@ def _approval_journal(repo: Path, journal: Mapping[str, object]) -> dict[str, ob
         "roadmap_before",
         "roadmap_after",
     }
+    if journal.get("kind") == "roadmap-reslice":
+        expected_keys.add("baseline_before")
+        if not isinstance(journal.get("baseline_before"), str):
+            raise PipelineStateError("checkpoint journal has an invalid re-slice baseline")
     if set(journal) != expected_keys:
         raise PipelineStateError("checkpoint journal has invalid fields")
     if journal.get("schema") != CHECKPOINT_SCHEMA or journal.get("repo") != str(repo):
@@ -253,12 +288,14 @@ def _approval_journal(repo: Path, journal: Mapping[str, object]) -> dict[str, ob
         or journal["state_after"] != rendered
     ):
         raise PipelineStateError("checkpoint journal approval contract is invalid")
-    if str(journal["kind"]) == "roadmap":
+    if journal["kind"] in {"roadmap", "roadmap-reslice"}:
         if project_dir != ".project":
             raise PipelineStateError("roadmap approval is legal only on the active track")
         if journal["roadmap_path"] != ".project/ROADMAP.md":
             raise PipelineStateError("checkpoint journal has an invalid ROADMAP path")
-        expected_roadmap = _activate_roadmap_milestone(
+        expected_roadmap = _reslice_roadmap(
+            str(journal["baseline_before"]), str(journal["roadmap_before"]), before, str(selected),
+        ) if journal["kind"] == "roadmap-reslice" else _activate_roadmap_milestone(
             str(journal["roadmap_before"]),
             str(selected),
         )
@@ -307,6 +344,12 @@ def _resume_checkpoint_locked(
     transaction = _approval_journal(repo, journal)
     state_path = _checkpoint_file(repo, str(transaction["state_path"]), "STATE.md")
     mutable = {state_path.relative_to(project).as_posix()}
+    baseline = project / "ROADMAP.before-reslice.md" if transaction["kind"] == "roadmap-reslice" else None
+    if baseline is not None:
+        mutable.add(baseline.name)
+        if baseline.exists() or baseline.is_symlink():
+            if pipeline_state._read_real_file(baseline, "re-slice baseline") != transaction["baseline_before"]:
+                raise PipelineStateError("re-slice baseline drifted during checkpoint recovery")
     roadmap_path: Optional[Path] = None
     if transaction["roadmap_path"] is not None:
         roadmap_path = _checkpoint_file(
@@ -354,6 +397,8 @@ def _resume_checkpoint_locked(
             raise PipelineStateError("completed checkpoint has the wrong ROADMAP.md")
 
     try:
+        if baseline is not None and baseline.exists():
+            baseline.unlink()
         committed = isolation_checkpoint(
             repo,
             expected_head,
@@ -362,6 +407,8 @@ def _resume_checkpoint_locked(
             [".project"],
         )
     except IsolationError as error:
+        if baseline is not None and pipeline_state._run_git(repo, "rev-parse", "HEAD").stdout.strip() == expected_head:
+            pipeline_state._atomic_write(baseline, str(transaction["baseline_before"]))
         raise PipelineStateError(f"approval checkpoint failed: {error}") from error
     if committed.get("commit") != pipeline_state._run_git(repo, "rev-parse", "HEAD").stdout.strip():
         raise PipelineStateError("approval checkpoint returned the wrong commit")
@@ -381,6 +428,8 @@ def _resume_checkpoint_locked(
 def _validate_plan_briefs(repo: Path, kind: str, project_dir: str) -> None:
     if kind != "plan":
         return
+    if project_dir == ".project":
+        pipeline_state._build_recovery().validate_plan(repo)
     head = pipeline_state._run_git(repo, "rev-parse", "--verify", "HEAD", check=False)
     if head.returncode != 0:
         # Pre-Git approval defers base-dependent checks to build.
@@ -476,6 +525,8 @@ def checkpoint_approval(
         state, state_before, state_path = pipeline_state.load_state(resolved, project_dir)
         changes, event, subject, body = _approval_details(kind, state, selected_milestone)
         _validate_plan_briefs(resolved, kind, project_dir)
+        if kind == "plan" and project_dir == ".project":
+            pipeline_state._build_recovery().restore_unchanged_reviews(resolved)
         expected = {
             "phase": state.phase,
             "status": state.status,
@@ -497,13 +548,18 @@ def checkpoint_approval(
         roadmap_path: Optional[Path] = None
         roadmap_before: Optional[str] = None
         roadmap_after: Optional[str] = None
-        if kind == "roadmap":
+        baseline_before = None
+        if kind in {"roadmap", "roadmap-reslice"}:
             if project_dir != ".project":
                 raise PipelineStateError("roadmap approval is legal only on the active track")
             assert selected_milestone is not None
             roadmap_path = project / "ROADMAP.md"
             roadmap_before = pipeline_state._read_real_file(roadmap_path, "ROADMAP.md")
-            roadmap_after = _activate_roadmap_milestone(
+            if kind == "roadmap-reslice":
+                baseline_before = pipeline_state._read_real_file(project / "ROADMAP.before-reslice.md", "re-slice baseline")
+            roadmap_after = _reslice_roadmap(
+                baseline_before, roadmap_before, state, selected_milestone,
+            ) if kind == "roadmap-reslice" else _activate_roadmap_milestone(
                 roadmap_before,
                 selected_milestone,
             )
@@ -512,6 +568,8 @@ def checkpoint_approval(
         mutable = {state_relative}
         if roadmap_path is not None:
             mutable.add(roadmap_path.relative_to(project).as_posix())
+        if baseline_before is not None:
+            mutable.add("ROADMAP.before-reslice.md")
         journal: dict[str, object] = {
             "schema": CHECKPOINT_SCHEMA,
             "repo": str(resolved),
@@ -528,6 +586,8 @@ def checkpoint_approval(
             "roadmap_before": roadmap_before,
             "roadmap_after": roadmap_after,
         }
+        if baseline_before is not None:
+            journal["baseline_before"] = baseline_before
         pipeline_state._write_json(journal_path, journal)
         return _resume_checkpoint_locked(resolved, project, journal_path, journal)
 
@@ -576,6 +636,10 @@ def defer_approval(
     with pipeline_state._state_lock(project):
         state, state_before, state_path = pipeline_state.load_state(resolved, project_dir)
         changes, event, _, _ = _approval_details(kind, state, selected_milestone)
+        if project_dir == ".project":
+            recovery = pipeline_state._build_recovery().context(resolved, state_before)
+            if recovery and recovery["active"]:
+                raise PipelineStateError("build recovery requires a plan checkpoint")
         _validate_plan_briefs(resolved, kind, project_dir)
         if patch:
             event = "patch plan approved"
@@ -595,17 +659,25 @@ def defer_approval(
             project_dir,
             approval_kind=kind,
         )
-        if kind == "roadmap":
+        baseline = None
+        if kind in {"roadmap", "roadmap-reslice"}:
             if project_dir != ".project":
                 raise PipelineStateError("roadmap approval is legal only on the active track")
             assert selected_milestone is not None
             roadmap_path = project / "ROADMAP.md"
-            roadmap_after = _activate_roadmap_milestone(
-                pipeline_state._read_real_file(roadmap_path, "ROADMAP.md"),
-                selected_milestone,
-            )
+            roadmap_before = pipeline_state._read_real_file(roadmap_path, "ROADMAP.md")
+            if kind == "roadmap-reslice":
+                baseline = project / "ROADMAP.before-reslice.md"
+                roadmap_after = _reslice_roadmap(
+                    pipeline_state._read_real_file(baseline, "re-slice baseline"),
+                    roadmap_before, state, selected_milestone,
+                )
+            else:
+                roadmap_after = _activate_roadmap_milestone(roadmap_before, selected_milestone)
             pipeline_state._atomic_write(roadmap_path, roadmap_after)
         pipeline_state._atomic_write(state_path, state_after)
+        if baseline is not None:
+            baseline.unlink()
     return {
         "schema": CHECKPOINT_SCHEMA,
         "status": "approved",
@@ -1002,38 +1074,3 @@ def _classify_plan_drift(
         "contract_paths": sorted(contract_paths),
         "reason": "; ".join(reasons) if reasons else "approval contracts and declared paths are unchanged",
     }
-
-
-# pipeline_state imports this module, so the parent is resolved after the
-# definitions above. Parent functions are looked up on the module at call time
-# so patches applied to pipeline_state stay visible here.
-if __package__:  # imported as scripts.state_checkpoint
-    from . import pipeline_state
-    from .pipeline_state import (
-        CHECKPOINT_JOURNAL_NAME,
-        CHECKPOINT_KINDS,
-        CHECKPOINT_SCHEMA,
-        PLAN_APPROVAL_SUBJECT,
-        PROMOTION_TRACKS,
-        SLUG_RE,
-        TASK_FILE_RE,
-        TASK_ID_RE,
-        ApprovedTaskContract,
-        PipelineState,
-        PipelineStateError,
-    )
-else:  # standalone script or sibling import
-    import pipeline_state
-    from pipeline_state import (
-        CHECKPOINT_JOURNAL_NAME,
-        CHECKPOINT_KINDS,
-        CHECKPOINT_SCHEMA,
-        PLAN_APPROVAL_SUBJECT,
-        PROMOTION_TRACKS,
-        SLUG_RE,
-        TASK_FILE_RE,
-        TASK_ID_RE,
-        ApprovedTaskContract,
-        PipelineState,
-        PipelineStateError,
-    )

package/skills/gsd-path-build/scripts/state_promote.py

@@ -11,6 +11,31 @@ from pathlib import Path, PurePosixPath
 from typing import Mapping, Optional
 
 
+if __package__:  # imported as scripts.state_promote
+    from . import pipeline_state, state_checkpoint
+    from .pipeline_state import (
+        NULL,
+        PROMOTION_RESIDUAL,
+        PROMOTION_SCHEMA,
+        PROMOTION_TRACKS,
+        SLUG_RE,
+        PipelineState,
+        PipelineStateError,
+    )
+else:  # standalone script or sibling import
+    import pipeline_state
+    import state_checkpoint
+    from pipeline_state import (
+        NULL,
+        PROMOTION_RESIDUAL,
+        PROMOTION_SCHEMA,
+        PROMOTION_TRACKS,
+        SLUG_RE,
+        PipelineState,
+        PipelineStateError,
+    )
+
+
 def _render_roadmap(
     text: str,
     previous_milestone: str,
@@ -243,9 +268,9 @@ def _completed_promotion(
     if _head_with_exact_message(repo, subject, fields) != head:
         raise PipelineStateError("completed promotion has the wrong commit message")
 
-    active_text = pipeline_state._git_text_at(repo, base, ".project/STATE.md")
-    next_text = pipeline_state._git_text_at(repo, base, ".project/next/STATE.md")
-    roadmap_text = pipeline_state._git_text_at(repo, base, ".project/ROADMAP.md")
+    active_text = state_checkpoint._git_text_at(repo, base, ".project/STATE.md")
+    next_text = state_checkpoint._git_text_at(repo, base, ".project/next/STATE.md")
+    roadmap_text = state_checkpoint._git_text_at(repo, base, ".project/ROADMAP.md")
     if active_text is None or next_text is None or roadmap_text is None:
         raise PipelineStateError("promotion parent is missing required metadata")
     active_state = pipeline_state._state_from_text(active_text, "promotion parent STATE.md")
@@ -265,7 +290,7 @@ def _completed_promotion(
         )
 
     _promotion_tree_mapping(repo, base, head)
-    drift = pipeline_state._classify_plan_drift(repo, next_state, base, landing)
+    drift = state_checkpoint._classify_plan_drift(repo, next_state, base, landing)
     expected_roadmap = _render_roadmap(
         roadmap_text,
         active_state.milestone,
@@ -273,11 +298,11 @@ def _completed_promotion(
         branch,
         landing,
     )
-    current_roadmap = pipeline_state._git_text_at(repo, head, ".project/ROADMAP.md")
+    current_roadmap = state_checkpoint._git_text_at(repo, head, ".project/ROADMAP.md")
     if current_roadmap != expected_roadmap:
         raise PipelineStateError("completed promotion has invalid ROADMAP.md")
 
-    current_state = pipeline_state._git_text_at(repo, head, ".project/STATE.md")
+    current_state = state_checkpoint._git_text_at(repo, head, ".project/STATE.md")
     if current_state is None:
         raise PipelineStateError("completed promotion has no STATE.md")
     event = re.escape(_promotion_event(drift, branch, landing, base))
@@ -438,10 +463,10 @@ def _prepare_promotion(
         if source.exists() or source.is_symlink():
             if destination.exists() or destination.is_symlink():
                 raise PipelineStateError(f"promotion destination already exists: {destination}")
-            tracks[name] = pipeline_state._tree_digest(source)
+            tracks[name] = state_checkpoint._tree_digest(source)
     if not tracks:
         raise PipelineStateError("lookahead track has no promotable artifacts")
-    drift = pipeline_state._classify_plan_drift(repo, next_state, base, landing)
+    drift = state_checkpoint._classify_plan_drift(repo, next_state, base, landing)
     roadmap_path = project / "ROADMAP.md"
     roadmap_text = pipeline_state._read_real_file(roadmap_path, "ROADMAP.md")
     target_state = _promotion_state(
@@ -464,10 +489,10 @@ def _prepare_promotion(
         "landing": landing,
         "base": base,
         "tracks": tracks,
-        "residual_sha256": pipeline_state._tree_digest(next_root, tuple(tracks)),
-        "next_state_sha256": pipeline_state._sha256(next_text),
-        "active_state_sha256": pipeline_state._sha256(active_text),
-        "roadmap_sha256": pipeline_state._sha256(roadmap_text),
+        "residual_sha256": state_checkpoint._tree_digest(next_root, tuple(tracks)),
+        "next_state_sha256": state_checkpoint._sha256(next_text),
+        "active_state_sha256": state_checkpoint._sha256(active_text),
+        "roadmap_sha256": state_checkpoint._sha256(roadmap_text),
         "target_state": target_state,
         "target_roadmap": target_roadmap,
         "drift": drift,
@@ -521,7 +546,7 @@ def _resume_track_moves(project: Path, journal: dict[str, object], path: Path) -
         if not source_exists and not destination_exists:
             raise PipelineStateError(f"promotion lost both source and destination: {name}")
         candidate = source if source_exists else destination
-        if pipeline_state._tree_digest(candidate) != expected_digest:
+        if state_checkpoint._tree_digest(candidate) != expected_digest:
             raise PipelineStateError(f"promotion track drifted: {name}")
         if source_exists:
             source.rename(destination)
@@ -542,7 +567,7 @@ def _resume_metadata(project: Path, journal: dict[str, object], path: Path) -> N
             raise PipelineStateError("promotion journal has invalid metadata")
         if current == desired:
             continue
-        if pipeline_state._sha256(current) != expected_original:
+        if state_checkpoint._sha256(current) != expected_original:
             raise PipelineStateError(f"promotion metadata drifted: {target}")
         pipeline_state._atomic_write(target, desired)
         journal["stage"] = f"updated:{target.name}"
@@ -560,9 +585,9 @@ def _resume_next_removal(
         if residual.exists() or residual.is_symlink():
             raise PipelineStateError("promotion has both next track and residual staging")
         next_text = pipeline_state._read_real_file(next_root / "STATE.md", "next/STATE.md")
-        if pipeline_state._sha256(next_text) != journal.get("next_state_sha256"):
+        if state_checkpoint._sha256(next_text) != journal.get("next_state_sha256"):
             raise PipelineStateError("lookahead STATE drifted during promotion")
-        if pipeline_state._tree_digest(next_root) != journal.get("residual_sha256"):
+        if state_checkpoint._tree_digest(next_root) != journal.get("residual_sha256"):
             raise PipelineStateError("lookahead residual drifted during promotion")
         next_root.rename(residual)
         journal["stage"] = "next-staged"
@@ -574,7 +599,7 @@ def _resume_next_removal(
         raise PipelineStateError("promotion lost next track and residual staging")
     if residual.is_symlink() or not residual.is_dir():
         raise PipelineStateError(f"promotion residual must be a real directory: {residual}")
-    if pipeline_state._tree_digest(residual) != journal.get("residual_sha256"):
+    if state_checkpoint._tree_digest(residual) != journal.get("residual_sha256"):
         raise PipelineStateError("staged lookahead residual drifted during promotion")
 
 
@@ -714,30 +739,3 @@ def promote_next(
         "commit": commit,
         "drift": journal["drift"],
     }
-
-
-# pipeline_state imports this module, so the parent is resolved after the
-# definitions above. Parent functions are looked up on the module at call time
-# so patches applied to pipeline_state stay visible here.
-if __package__:  # imported as scripts.state_promote
-    from . import pipeline_state
-    from .pipeline_state import (
-        NULL,
-        PROMOTION_RESIDUAL,
-        PROMOTION_SCHEMA,
-        PROMOTION_TRACKS,
-        SLUG_RE,
-        PipelineState,
-        PipelineStateError,
-    )
-else:  # standalone script or sibling import
-    import pipeline_state
-    from pipeline_state import (
-        NULL,
-        PROMOTION_RESIDUAL,
-        PROMOTION_SCHEMA,
-        PROMOTION_TRACKS,
-        SLUG_RE,
-        PipelineState,
-        PipelineStateError,
-    )

package/skills/gsd-path-build/scripts/task_context.py

@@ -0,0 +1,73 @@
+#!/usr/bin/env python3
+"""Render a read-only coder intent view from the approved task and intent."""
+
+import argparse
+import hashlib
+import re
+import sys
+from pathlib import Path
+
+try:
+    from scripts import check_handoffs as contracts
+except ImportError:
+    import check_handoffs as contracts
+
+
+def render(repo: Path, task: Path) -> str:
+    intent_path = repo.resolve() / '.project/intent/INTENT.md'
+    task = task.resolve()
+    intent = intent_path.read_bytes().decode('utf-8')
+    task_text = task.read_bytes().decode('utf-8')
+    owned = contracts._owned_criteria(task_text, task.stem)
+    criteria = contracts._success_criteria(intent)
+    unknown = set(owned) - set(criteria)
+    if unknown:
+        raise contracts.HandoffError('unknown owned criteria: ' + ', '.join(sorted(unknown)))
+    projected, mode = intent, 'full-intent'
+    sections = list(re.finditer(r'(?ms)^## Success criteria[ \t]*\n(?P<body>.*?)(?=^## |\Z)', intent))
+    if len(sections) == 1:
+        section = sections[0]
+        body = section['body']
+        items = list(re.finditer(r'(?m)^(\d+)\. .+\n?', body))
+        # Project only simple numbered prose. Preserve unfamiliar Markdown in full.
+        simple = (items and not body[:items[0].start()].strip()
+                  and '```' not in body and '~~~' not in body and '<!--' not in body
+                  and [f'SC{item[1]}' for item in items] == list(criteria))
+        chunks = [body[item.start():items[n + 1].start() if n + 1 < len(items) else len(body)]
+                  for n, item in enumerate(items)]
+        simple = simple and all(not line.strip() or line[:1].isspace()
+                                for chunk in chunks for line in chunk.splitlines()[1:])
+        if simple:
+            before, after = intent[:section.start('body')], intent[section.end('body'):]
+            # Corrections and task interfaces can explicitly refer to another SC.
+            required = set(owned) | set(re.findall(r'\bSC\d+\b', before + after + task_text))
+            selected = ''.join(chunk for item, chunk in zip(items, chunks) if f'SC{item[1]}' in required)
+            projected = before + '\n' + (selected or '- No criteria assigned.\n\n') + after
+            mode = 'owned-criteria'
+    return ('## Generated intent context\n\n'
+            f'Source: {intent_path}\n'
+            f'Intent SHA256: {hashlib.sha256(intent.encode()).hexdigest()}\n'
+            f'Task: {task}\n'
+            f'Task SHA256: {hashlib.sha256(task_text.encode()).hexdigest()}\n'
+            f'Mode: {mode}\n\n'
+            'Use this view for intent. All non-criterion text is verbatim; selected criteria retain '
+            'their original numbers. The source remains authoritative. Read it if a dependency '
+            'or ambiguity requires omitted criteria.\n\n' + projected)
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument('--repo', type=Path, required=True)
+    parser.add_argument('--task', type=Path, required=True)
+    args = parser.parse_args()
+    try:
+        output = render(args.repo, args.task)
+    except (OSError, contracts.HandoffError) as error:
+        print(str(error), file=sys.stderr)
+        return 1
+    print(output, end='')
+    return 0
+
+
+if __name__ == '__main__':
+    raise SystemExit(main())

package/skills/gsd-path-build/scripts/token_budget.py

@@ -69,6 +69,24 @@ def output_usage(path: Path) -> int:
     return sum(usages)
 
 
+def cumulative_counter(path: Path):
+    """One completed CLI invocation, with the thread identity needed for resume."""
+    identities, counters = set(), []
+    for line in path.read_text(encoding="utf-8").splitlines():
+        event = json.loads(line)
+        if "raw" in event:
+            event = json.loads(event["raw"])
+        if event.get("type") == "thread.started":
+            identities.add(event["thread_id"])
+        if event.get("type") == "turn.completed":
+            counters.append(event["usage"]["output_tokens"])
+    if len(identities) != 1 or len(counters) != 1:
+        raise ValueError("cumulative usage requires one identified, completed CLI invocation")
+    if type(counters[0]) is not int or counters[0] < 0:
+        raise ValueError("invalid cumulative output counter")
+    return identities.pop(), counters[0]
+
+
 def operate(args):
     ledger = args.ledger.absolute()
     if ledger.is_symlink():
@@ -92,9 +110,28 @@ def operate(args):
         if args.action == "record":
             source = str(args.events.resolve())
             observation = {"task": args.task, "output_tokens": output_usage(args.events)}
+            prior_events = getattr(args, "previous_events", None)
+            if prior_events is not None:
+                prior_source = str(prior_events.resolve())
+                prior = data["observations"].get(prior_source)
+                identity, total = cumulative_counter(args.events)
+                prior_identity, prior_total = cumulative_counter(prior_events)
+                if source == prior_source or identity != prior_identity or total < prior_total:
+                    raise ValueError("cumulative resume has a different thread or a reset counter")
+                if prior is None or prior.get("reported_output_tokens", prior["output_tokens"]) != prior_total:
+                    raise ValueError("previous cumulative invocation must be recorded unchanged first")
+                if any(key != source and row.get("previous_events") == prior_source
+                       for key, row in data["observations"].items()):
+                    raise ValueError("previous cumulative invocation already has a recorded successor")
+                observation.update(output_tokens=total - prior_total, reported_output_tokens=total,
+                                   previous_events=prior_source, session_id=identity)
             previous = data["observations"].get(source)
+            if previous and previous != observation and any(
+                    row.get("previous_events") == source for row in data["observations"].values()):
+                raise ValueError("a cumulative predecessor cannot change after its successor is recorded")
             if previous and (previous["task"] != args.task or
-                             previous["output_tokens"] > observation["output_tokens"]):
+                             previous["output_tokens"] > observation["output_tokens"] or
+                             previous.get("previous_events") != observation.get("previous_events")):
                 raise ValueError("observation cannot change task or reduce recorded usage")
             data["observations"][source] = observation
             atomic_write(ledger, json.dumps(data, indent=2) + "\n")
@@ -131,6 +168,8 @@ def main(argv=None):
             command.add_argument("--task", required=True)
         if name == "record":
             command.add_argument("--events", type=Path, required=True)
+            command.add_argument("--previous-events", type=Path,
+                                 help="previous recorded invocation when this CLI reports cumulative resume counters")
         if name == "admit":
             command.add_argument("--require-hard-cap", action="store_true")
     try: