@giamme/forge 0.10.0 → 0.11.1

package/scripts/forge_dataset/forecast.py

@@ -0,0 +1,355 @@
+"""`forge dataset forecast <plan>`: what a plan is likely to cost, from forge's own history.
+
+For each task of a plan, the tasks in the dataset that ran at the same tier on the same
+model (the dwarf spec resolved through the registry; the effort too when the spec names one)
+say what to expect: the median and p90 of tokens (input + output, dwarf and QA, over every
+attempt) and of wall time (the same dispatches' durations), and the first-attempt PASS rate
+with a 95% Wilson interval. Below MIN_HISTORY matching tasks a row says "not enough history"
+instead of numbers a handful of tasks would make up, and a task whose rate is under
+FLAG_BELOW is flagged as likely to need a retry.
+
+Advisory only: nothing that routes a task, builds a prompt or gates a run reads it. The
+rates are observational (who ran what was not randomized unless `--explore` drew it), so a
+low rate can be the tasks a model was given rather than the model.
+
+`forge-parallel.sh run` prints a short version before dispatching (`--no-forecast` or
+FORGE_FORECAST=off skip it). There it runs under a time budget (FORGE_FORECAST_BUDGET_S,
+default 3s), is silent when there is no history, never changes the run's exit code, and
+records what it predicted: `<plan>/forecast.json` and a `forecast` dataset event keyed by
+the run, so a later report can check the forecast against what happened.
+"""
+from __future__ import annotations
+
+import hashlib
+import json
+import math
+import os
+import statistics
+import sys
+import threading
+import time
+from collections import defaultdict
+from pathlib import Path
+
+from . import SKILL, connect, dataset_dir, record
+from .export import Runs, Store
+from .routing import tasks as routing_tasks, wilson
+
+MIN_HISTORY = 5
+FLAG_BELOW = 0.5
+BUDGET_S = 3.0
+OFF = {'0', 'off', 'false', 'no'}
+
+
+# --- the registry, as forge-route.py reads it (that module's name is not importable) ---
+
+def registry_models() -> dict:
+    """{alias: {harness: model id}}; the first row of an alias is its default."""
+    out = {}
+    path = Path(os.environ.get('FORGE_REGISTRY') or str(SKILL / 'registry.tsv'))
+    try:
+        lines = path.read_text().splitlines()
+    except OSError:
+        return out
+    for line in lines:
+        if not line.strip() or line.startswith('#'):
+            continue
+        cells = line.split('\t')
+        if len(cells) >= 3:
+            out.setdefault(cells[0], {}).setdefault(cells[1], cells[2])
+    return out
+
+
+def resolve(spec, registry: dict) -> tuple:
+    """(model id, effort or None) a dwarf spec such as `sol`, `sol:high` or `sol:high:codex` runs."""
+    parts = str(spec or '').split(':')
+    alias = parts[0]
+    effort = parts[1] if len(parts) > 1 and parts[1] else None
+    harness = parts[2] if len(parts) > 2 else None
+    rows = registry.get(alias)
+    if not rows:
+        return alias or None, effort
+    if harness and harness in rows:
+        return rows[harness], effort
+    return next(iter(rows.values())), effort
+
+
+# --- reading the plan ---
+
+def _tsv(path: Path) -> list:
+    try:
+        lines = path.read_text().splitlines()
+    except OSError:
+        return []
+    cols = ('id', 'deps', 'difficulty', 'files', 'dwarf', 'qa', 'title')
+    return [dict(zip(cols, line.split('\t'))) for line in lines if line.strip() and not line.startswith('#')]
+
+
+def plan_tasks(plan: Path) -> tuple:
+    """([task dicts to forecast], [ids already merged]) from tasks.tsv (declared tier when kept)."""
+    declared = {r['id']: r for r in _tsv(plan / 'tasks.declared.tsv')}
+    out, merged = [], []
+    for row in _tsv(plan / 'tasks.tsv'):
+        tid = row.get('id')
+        if not tid:
+            continue
+        if (plan / 'tasks' / tid / 'merged').exists():
+            merged.append(tid)
+            continue
+        tier = (declared.get(tid) or {}).get('difficulty') or row.get('difficulty') or None
+        out.append(dict(task=tid, tier=tier, spec=row.get('dwarf') or None))
+    return out, merged
+
+
+def waves(plan: Path) -> dict:
+    out = {}
+    try:
+        lines = (plan / 'waves.tsv').read_text().splitlines()
+    except OSError:
+        return out
+    for line in lines:
+        cells = line.split('\t')
+        if len(cells) >= 2 and cells[1].strip():
+            out[cells[1].strip()] = cells[0].strip()
+    return out
+
+
+def run_uid(plan: Path):
+    try:
+        value = (plan / 'dataset.uid').read_text().strip()
+    except OSError:
+        return None
+    return value or None
+
+
+# --- history ---
+
+def _cost(runs: Runs, run, task) -> tuple:
+    """(tokens, seconds) a task's dwarf and QA dispatches took over every attempt; None when unrecorded."""
+    tokens = seconds = None
+    for role in ('dwarf', 'qa'):
+        for e in runs.dispatches.get((run, task, role), []):
+            t = e['d'].get('tokens') or {}
+            used = [t.get(k) for k in ('input', 'output') if isinstance(t.get(k), (int, float))]
+            if used:
+                tokens = (tokens or 0) + sum(used)
+            d = e['d'].get('duration_s')
+            if isinstance(d, (int, float)):
+                seconds = (seconds or 0) + d
+    return tokens, seconds
+
+
+def history(runs: Runs, registry: dict, *, repo=None, exclude_run=None) -> list:
+    """Every task that ran, with the (tier, model, effort) it ran at and what it cost."""
+    out = []
+    for r in routing_tasks(runs, repo=repo):
+        if not r['attempts'] or r['run'] == exclude_run:
+            continue
+        model, effort = r.get('model_id'), r.get('effort')
+        if not model:
+            model, effort = resolve(r['ran'], registry)
+        if not model:
+            continue
+        tokens, seconds = _cost(runs, r['run'], r['task'])
+        out.append(dict(tier=r['tier'], model=model, effort=effort, first_pass=r['first_pass'],
+                        tokens=tokens, seconds=seconds))
+    return out
+
+
+def nearest_rank(values: list, q: float):
+    ordered = sorted(values)
+    return ordered[max(0, math.ceil(q * len(ordered)) - 1)]
+
+
+def _spread(values: list) -> dict:
+    if len(values) < MIN_HISTORY:
+        return dict(n=len(values), median=None, p90=None)
+    return dict(n=len(values), median=statistics.median(values), p90=nearest_rank(values, 0.9))
+
+
+def forecast_task(task: dict, past: list, registry: dict) -> dict:
+    model, effort = resolve(task['spec'], registry) if task['spec'] else (None, None)
+    same = [h for h in past if model and h['tier'] == task['tier'] and h['model'] == model
+            and (effort is None or h['effort'] == effort)]
+    outcomes = [h['first_pass'] for h in same if h['first_pass'] is not None]
+    k, n = sum(1 for x in outcomes if x), len(outcomes)
+    enough = n >= MIN_HISTORY
+    low, high = wilson(k, n) if enough else (None, None)
+    rate = k / n if enough else None
+    return dict(task=task['task'], tier=task['tier'], spec=task['spec'], model=model, effort=effort,
+                history=len(same), enough=enough,
+                first_pass=dict(k=k, n=n, rate=rate, ci=[low, high] if enough else None),
+                tokens=_spread([h['tokens'] for h in same if h['tokens'] is not None]),
+                time_s=_spread([h['seconds'] for h in same if h['seconds'] is not None]),
+                flag=bool(enough and rate < FLAG_BELOW),
+                note=None if enough else 'not enough history (%d/%d)' % (n, MIN_HISTORY))
+
+
+def totals(rows: list, wave_of: dict) -> dict:
+    tok = [r for r in rows if r['tokens']['median'] is not None]
+    sec = [r for r in rows if r['time_s']['median'] is not None]
+    rated = [r for r in rows if r['enough']]
+    by_wave = defaultdict(float)
+    for r in sec:
+        w = wave_of.get(r['task'], r['task'])
+        by_wave[w] = max(by_wave[w], r['time_s']['median'])
+    return dict(
+        tasks=len(rows), forecast=len(rated), flagged=sum(1 for r in rows if r['flag']),
+        tokens=dict(tasks=len(tok), median=sum(r['tokens']['median'] for r in tok) if tok else None,
+                    p90=sum(r['tokens']['p90'] for r in tok) if tok else None),
+        time_s=dict(tasks=len(sec), median=sum(r['time_s']['median'] for r in sec) if sec else None,
+                    p90=sum(r['time_s']['p90'] for r in sec) if sec else None,
+                    by_waves=sum(by_wave.values()) if (sec and wave_of) else None),
+        first_pass_expected=sum(r['first_pass']['rate'] for r in rated) if rated else None)
+
+
+def build(plan: Path, *, repo=None) -> dict | None:
+    """The forecast for a plan, or None when there is no history at all (no store, no tasks)."""
+    # Reading must not create a store: a fresh machine gets nothing, not an empty database.
+    if not (dataset_dir() / 'dataset.sqlite').exists():
+        return None
+    db = connect()
+    try:
+        runs = Runs(Store(db))
+    finally:
+        db.close()
+    registry = registry_models()
+    uid = run_uid(plan)
+    past = history(runs, registry, repo=repo, exclude_run=uid)
+    if not past:
+        return None
+    todo, merged = plan_tasks(plan)
+    rows = [forecast_task(t, past, registry) for t in todo]
+    return dict(plan=str(plan), run=uid, at=time.time(), min_history=MIN_HISTORY, flag_below=FLAG_BELOW,
+                history_tasks=len(past), tasks=rows, merged=merged, total=totals(rows, waves(plan)))
+
+
+# --- output ---
+
+def _tokens(v):
+    if v is None:
+        return '?'
+    return '%.1fM' % (v / 1e6) if v >= 1e6 else ('%.0fk' % (v / 1e3) if v >= 1e3 else '%d' % v)
+
+
+def _time(v):
+    if v is None:
+        return '?'
+    v = int(round(v))
+    return '%dh%02dm' % (v // 3600, v % 3600 // 60) if v >= 3600 else ('%dm%02ds' % (v // 60, v % 60) if v >= 60 else '%ds' % v)
+
+
+def _pct(v):
+    return '%.0f%%' % (v * 100)
+
+
+def lines(fc: dict) -> list:
+    out = ['forecast from %d past task(s) at the same tier and model (advisory; routing never reads it)'
+           % fc['history_tasks']]
+    for r in fc['tasks']:
+        where = '%s %s' % (r['tier'] or '?', r['spec'] or '?')
+        if not r['enough']:
+            out.append('  %-14s %-22s %s' % (r['task'], where, r['note']))
+            continue
+        fp = r['first_pass']
+        t, s = r['tokens'], r['time_s']
+        out.append('  %-14s %-22s first try %s [%s-%s] (%d/%d)  tokens %s (p90 %s)  time %s (p90 %s)%s' % (
+            r['task'], where, _pct(fp['rate']), _pct(fp['ci'][0]), _pct(fp['ci'][1]), fp['k'], fp['n'],
+            _tokens(t['median']), _tokens(t['p90']), _time(s['median']), _time(s['p90']),
+            '  <- likely to need a retry' if r['flag'] else ''))
+    if fc['merged']:
+        out.append('  %d task(s) already merged, not forecast' % len(fc['merged']))
+    tot = fc['total']
+    if tot['forecast'] or tot['tokens']['tasks']:
+        tk, tm = tot['tokens'], tot['time_s']
+        summary = '  total for %d/%d task(s) with history: tokens %s (p90 %s), time %s (p90 %s) summed' % (
+            max(tk['tasks'], tm['tasks']), tot['tasks'], _tokens(tk['median']), _tokens(tk['p90']),
+            _time(tm['median']), _time(tm['p90']))
+        if tm['by_waves'] is not None:
+            summary += ', about %s by waves (ignores --max-parallel)' % _time(tm['by_waves'])
+        out.append(summary)
+        if tot['first_pass_expected'] is not None:
+            out.append('  expected first-try passes: %.1f of %d forecast task(s)%s' % (
+                tot['first_pass_expected'], tot['forecast'],
+                ', %d flagged under %s' % (tot['flagged'], _pct(fc['flag_below'])) if tot['flagged'] else ''))
+    return out
+
+
+def save(plan: Path, fc: dict) -> None:
+    """Keep what was predicted, so it can be checked against what happened. Fail-open."""
+    body = {k: v for k, v in fc.items() if k != 'at'}
+    digest = hashlib.sha256(json.dumps(body, sort_keys=True).encode()).hexdigest()[:16]
+    try:
+        tmp = plan / ('.forecast.json.%d' % os.getpid())
+        tmp.write_text(json.dumps(fc, indent=2, sort_keys=True) + '\n')
+        tmp.replace(plan / 'forecast.json')
+    except OSError:
+        pass
+    if not fc.get('run'):   # record() itself does nothing under FORGE_DATASET=off
+        return
+    from .harvest import first_line, locate
+    run_id = locate(plan).get('run_id') or plan.name
+    repo = first_line(plan / 'repo') or None
+    record([dict(rid='forecast:%s:%s' % (fc['run'], digest), kind='forecast', ts=fc['at'], src='live',
+                 run=fc['run'], run_id=run_id, mode='parallel', task=None, data=fc)], repo=repo, where='forecast')
+
+
+def advise(plan: Path, shown: list) -> None:
+    """The run's advisory block: print it, record it. Never raises."""
+    try:
+        fc = build(plan)
+    except Exception:
+        return
+    if not fc or not fc['tasks']:
+        return
+    for line in lines(fc):
+        print(line)
+    sys.stdout.flush()
+    shown.append(True)
+    try:
+        save(plan, fc)
+    except Exception:
+        pass
+
+
+def budget() -> float:
+    try:
+        value = float(os.environ.get('FORGE_FORECAST_BUDGET_S') or BUDGET_S)
+    except ValueError:
+        return BUDGET_S
+    return value if value > 0 else BUDGET_S
+
+
+def main(args) -> int:
+    plan = Path(args.plan).resolve()
+    if args.run:
+        # Called by forge-parallel.sh run: silent on anything unexpected, exit 0, and never longer than the budget.
+        if os.environ.get('FORGE_FORECAST', 'on').strip().lower() in OFF or not (plan / 'tasks.tsv').is_file():
+            return 0
+        shown = []
+        worker = threading.Thread(target=advise, args=(plan, shown), daemon=True)
+        worker.start()
+        worker.join(budget())
+        if worker.is_alive():
+            # Past the budget the run goes on without it. Once the block is out, only the
+            # recording is cut short, which is not worth a line.
+            if not shown:
+                print('forecast skipped: reading the history took over %gs' % budget())
+                sys.stdout.flush()
+            os._exit(0)
+        return 0
+    if not (plan / 'tasks.tsv').is_file():
+        print('forge dataset forecast: no tasks.tsv in %s' % plan, file=sys.stderr)
+        return 2
+    fc = build(plan, repo=os.path.realpath(args.repo) if args.repo else None)
+    if args.json:
+        print(json.dumps(fc, indent=2, sort_keys=True))
+        return 0
+    if not fc:
+        print('no task history in the dataset yet, so nothing to forecast from')
+        return 0
+    for line in lines(fc):
+        print(line)
+    print('  tokens are input + output of the dwarf and QA dispatches over every attempt; time is their summed duration')
+    print('  rates are observational: a low one can be the tasks a model was given rather than the model')
+    return 0

package/scripts/forge_dataset/harvest.py

@@ -30,7 +30,7 @@ PIPELINE_ROLES = ('task', 'solo', 'verification', 'parallel')
 TASKS_COLS = ('id', 'deps', 'difficulty', 'files', 'dwarf', 'qa', 'title')
 STRUCTURED = ('codex', 'claude', 'openclaude', 'grok', 'opencode')   # as forge-runtime.py's: .last is the message, not the log
 # Plan files that change what a plan decides, added to its rid only when present (see plan_event).
-PLAN_RID_LATER = ('decompose_level', 'shadow_qa', 'shadow_rate', 'explore')
+PLAN_RID_LATER = ('decompose_level', 'shadow_qa', 'shadow_rate', 'explore', 'reviewer_session')
 
 # Files a task or solo execution may write. begin() snapshots their signatures so
 # finish() can tell this execution's outputs from what an earlier one left behind.
@@ -369,12 +369,32 @@ def intervention_rid(name: str, uid: str | None, task: str | None, values: dict)
 
 # --- dispatch: one model call ----------------------------------------------------------
 
+def session_record(attempt: Path, role: str, metrics: dict) -> tuple[str | None, str | None]:
+    """The harness session, and whether this dispatch was asked to continue one.
+
+    `<role>.session` is the id live capture published; `metrics.json` fills it in when an
+    archive has the id and not the file. `<role>.continue` exists only when continuing was
+    requested. `mode=continued` is the success. Any other mode, or a file with no mode, is
+    `failed`: the request is what makes the judgment not independent, and a failed continue
+    can still have printed a verdict.
+    """
+    recorded = first_line(attempt / (role + '.session'))
+    if not recorded:
+        value = metrics.get('session_id')
+        recorded = value.strip() if isinstance(value, str) and value.strip() else None
+    path = attempt / (role + '.continue')
+    if not path.exists():
+        return recorded, None
+    return recorded, 'continued' if kv(path).get('mode') == 'continued' else 'failed'
+
+
 def dispatch_event(attempt: Path, root: Path, role: str, harness: str, rc, prov: dict, src: str = 'live') -> dict:
     metrics = read_json(attempt / 'metrics.json') or {}
     resolved = kv(attempt / (role + '.resolved'))
     infra = kv(attempt / (role + '.infra'))
     harness = harness or metrics.get('harness') or resolved.get('harness')
     message = text(attempt / (role + '.last'))
+    session_id, session_continue = session_record(attempt, role, metrics)
     final_source = 'structured' if harness in STRUCTURED else 'log_copy'
     delivery = resolved.get('delivery') or 'custom'
     orphans = text(attempt / (role + '.orphans'))
@@ -399,6 +419,7 @@ def dispatch_event(attempt: Path, root: Path, role: str, harness: str, rc, prov:
         prompt_bytes=metrics.get('prompt_bytes'), final_source=final_source,
         verdict=verdict, findings=found, learnings=learnings(message),
         findings_parse=review_completeness(verdict, found, parsed) if role == 'qa' else None,
+        session_id=session_id, session_continue=session_continue,
         root=str(root), scope=prov.get('scope'), trigger=prov.get('trigger'),
         **({'shadow': shadow} if shadow else {}),
     )
@@ -672,7 +693,7 @@ def plan_event(plan: Path, prov: dict, src: str = 'live', inventory: bool = True
         fractal_selection=read_json(plan / 'fractal-selection.json'),
         jev_coupling=read_json(plan / 'jev-coupling.json'),
         options={name: first_line(plan / name) for name in ('qa_threshold', 'verify_retries', 'timeout', 'final_qa',
-                                                            'shadow_qa', 'shadow_rate', 'explore')
+                                                            'shadow_qa', 'shadow_rate', 'explore', 'reviewer_session')
                  if (plan / name).exists()},
         flags=sorted(name for name in ('no_memory', 'no_ripwire', 'yolo_dwarf', 'yolo_qa') if (plan / name).exists()),
         blobs=blobs(goal=put_file(plan / 'goal.txt'), request=put_file(plan / 'request.md', 'prompt'),

package/scripts/forge_dataset/importer.py

@@ -501,13 +501,19 @@ ARCHIVE_FORMAT = 1
 ARCHIVE_MAX_FILE = 50 << 20
 
 
-def _archive_mapper(work: Path, source: Path | None) -> Mapper:
-    """Where an extracted archive's run dir lived: its own FORGE_ARCHIVE.json, else a MANIFEST's source.
-
-    The archive's word wins, and it brings the run's dataset.uid along for the case where
-    the run dir it was taken from no longer has one to read.
+def _archive_mapper(work: Path, source: Path | None) -> tuple[Path, Mapper]:
+    """The run dir in an extracted archive, and where that dir lived.
+
+    FORGE_ARCHIVE.json names it. A legacy MANIFEST archive holds it under the source
+    path's basename; the extraction root still maps to the source's parent, as before.
+    Import walks that dir, so a run named review-* is read and the review-* skip applies
+    only inside a run. An archive whose layout cannot be identified is unchanged: a bad
+    description or a forge archive with no run dir still raises, and anything else is
+    walked from the extraction root. The archive's word wins, and it brings the run's
+    dataset.uid along when the dir it was taken from no longer has one.
     """
     mapper = Mapper()
+    root = work
     meta_path = work / ARCHIVE_META
     if meta_path.is_file():
         meta = json.loads(meta_path.read_text())
@@ -530,9 +536,13 @@ def _archive_mapper(work: Path, source: Path | None) -> Mapper:
         for rel, value in (legacy.items() if isinstance(legacy, dict) else ()):
             if isinstance(value, str) and value.strip() and not os.path.isabs(rel) and '..' not in Path(rel).parts:
                 mapper.legacy[str(Path(original) / rel)] = value.strip()
+        root = run
     elif source is not None:
         mapper.add(work, source.parent)
-    return mapper
+        named = work / Path(source).name
+        if named.is_dir():
+            root = named
+    return root, mapper
 
 
 def import_run(path, strict: bool = True, include_temp: bool = True) -> dict:
@@ -577,7 +587,8 @@ def import_run(path, strict: bool = True, include_temp: bool = True) -> dict:
             work = Path(tempfile.mkdtemp(prefix='forge-dataset-import-'))
             try:
                 _extract(path, work)
-                write(import_tree(work, _archive_mapper(work, None), args, counts), blob_failures)
+                root, mapper = _archive_mapper(work, None)
+                write(import_tree(root, mapper, args, counts), blob_failures)
             except Exception as error:
                 counts.setdefault('failed', []).append('%s: %s' % (path, error))
             finally:
@@ -789,7 +800,8 @@ def main(args) -> int:
         work = Path(tempfile.mkdtemp(prefix='forge-dataset-import-'))
         try:
             _extract(archive, work)
-            write(import_tree(work, _archive_mapper(work, source), args, counts))
+            root, mapper = _archive_mapper(work, source)
+            write(import_tree(root, mapper, args, counts))
         except Exception as error:
             counts.setdefault('failed', []).append('%s: %s' % (archive, error))
         finally:

package/scripts/forge_dataset/reviewers.py

@@ -0,0 +1,145 @@
+"""`forge dataset reviewers`: how the work each reviewer passed held up afterwards.
+
+A report card per reviewer (qa) model. For every attempt a primary reviewer PASSed whose
+reviewed commit was integrated and then followed by `forge dataset outcomes`, the outcome
+at one horizon (default 14 days) says whether the work held: it did not if a later commit
+reverted it, or if fewer than 80% of the lines it added were still there (rewritten; the
+same rule as the export's `survives` label). The rate of work that did not hold has a
+95% Wilson interval, and is only given from MIN_LANDED outcomes on: below that the row
+says "not enough data" rather than a rate a handful of tasks would make up.
+
+Advisory only. Nothing that builds a prompt or routes a task reads this report, and it
+counts only what forge saw: survival is followed for parallel integrations
+(`integrate_advanced`), so solo runs and work merged by hand are not here. A row is keyed by
+the reviewer's alias, as the forge-ui Models view is, or by its model when no alias was recorded.
+"""
+from __future__ import annotations
+
+import json
+import os
+import sys
+from collections import defaultdict
+
+from . import connect, dataset_dir
+from .export import SURVIVES_AT, Runs, Store
+from .routing import wilson
+
+MIN_LANDED = 10
+HORIZON_DAYS = 14
+
+
+def _empty(horizon_days):
+    return dict(horizon_days=horizon_days, min_landed=MIN_LANDED, survives_at=SURVIVES_AT, reviewers=[],
+                unattributed=dict(not_passed=0, no_review=0), skipped=dict(lost=0, no_additions=0),
+                other_horizons=[])
+
+
+def report(runs: Runs, *, horizon_days: int = HORIZON_DAYS, repo: str = None) -> dict:
+    out = _empty(horizon_days)
+    paths = runs.store.repo_paths
+    # Which attempts reviewed each commit: a QA-only resume or a combined task can share one.
+    attempts_of = defaultdict(list)
+    for key, commit in runs.reviewed.items():
+        attempts_of[commit].append(key)
+    outcomes, horizons = {}, set()
+    for e in runs.store.of('outcome'):
+        d = e['d']
+        if d.get('name') != 'survival' or not d.get('reviewed'):
+            continue
+        if repo and paths.get(e['repo']) != repo:
+            continue
+        if d.get('horizon_days') != horizon_days:
+            horizons.add(d.get('horizon_days'))
+            continue
+        outcomes.setdefault(d['reviewed'], d)     # one outcome per commit and horizon
+    out['other_horizons'] = sorted(h for h in horizons if isinstance(h, int))
+    rows = {}
+    for commit, d in sorted(outcomes.items()):
+        if d.get('status') == 'lost':
+            out['skipped']['lost'] += 1
+            continue
+        if d.get('status') != 'ok' or not d.get('added'):
+            out['skipped']['no_additions'] += 1
+            continue
+        reviews = []
+        for run, task, attempt in attempts_of.get(commit, ()):
+            reviews += [r for r in runs.dispatches.get((run, task, 'qa'), ()) if r['attempt'] == attempt]
+        passed = {}
+        for r in sorted(reviews, key=lambda r: r['ts']):
+            name = r['d'].get('alias') or r['d'].get('model')
+            if r['d'].get('verdict') == 'PASS' and name:
+                passed[name] = r['d']
+        if not passed:
+            # Reviewed and FAILed, then accepted by the severity gate or a human; or no review recorded.
+            out['unattributed']['not_passed' if reviews else 'no_review'] += 1
+            continue
+        reverted = bool(d.get('reverted_by'))
+        rewritten = not reverted and d['surviving'] / d['added'] < SURVIVES_AT
+        for name, r in passed.items():
+            row = rows.setdefault(name, dict(reviewer=name, specs=set(), landed=0, reverted=0, rewritten=0))
+            spec = ':'.join(x for x in (r.get('model'), r.get('effort')) if x)
+            if spec:
+                row['specs'].add(spec)
+            row['landed'] += 1
+            row['reverted'] += reverted
+            row['rewritten'] += rewritten
+    for row in rows.values():
+        row['specs'] = sorted(row['specs'])
+        row['did_not_hold'] = row['reverted'] + row['rewritten']
+        row['enough'] = row['landed'] >= MIN_LANDED
+        if row['enough']:
+            row['rate'] = row['did_not_hold'] / row['landed']
+            row['ci'] = list(wilson(row['did_not_hold'], row['landed']))
+        else:
+            row['rate'], row['ci'] = None, None
+            row['note'] = 'not enough data (%d/%d)' % (row['landed'], MIN_LANDED)
+    out['reviewers'] = sorted(rows.values(), key=lambda r: (not r['enough'], -r['landed'], r['reviewer']))
+    return out
+
+
+def load(horizon_days: int = HORIZON_DAYS, repo: str = None) -> dict:
+    # Reading must not create a store: a fresh machine (or forge-ui asking) gets an empty report.
+    if not (dataset_dir() / 'dataset.sqlite').exists():
+        return _empty(horizon_days)
+    db = connect()
+    try:
+        runs = Runs(Store(db))
+    finally:
+        db.close()
+    return report(runs, horizon_days=horizon_days, repo=repo)
+
+
+def _pct(v):
+    return '%.0f%%' % (v * 100)
+
+
+def main(args) -> int:
+    if args.horizon_days < 1:
+        print('forge dataset reviewers: --horizon-days must be at least 1', file=sys.stderr)
+        return 2
+    rep = load(args.horizon_days, os.path.realpath(args.repo) if args.repo else None)
+    if args.json:
+        print(json.dumps(rep, indent=2, sort_keys=True))
+        return 0
+    print('reviewers: PASSed work that did not hold up %d days after integrate' % rep['horizon_days'])
+    print('  (reverted, or under %d%% of its added lines kept; advisory only, routing never reads it)'
+          % (SURVIVES_AT * 100))
+    if not rep['reviewers']:
+        print('  no PASSed work with a %d-day outcome yet; `forge dataset outcomes --horizon-days %d` records them'
+              % (rep['horizon_days'], rep['horizon_days']))
+    else:
+        print('  %-24s %6s %8s %9s  %s' % ('reviewer', 'landed', 'reverted', 'rewritten', 'did not hold'))
+    for r in rep['reviewers']:
+        held = r['note'] if not r['enough'] else '%s [%s-%s] (%d/%d)' % (
+            _pct(r['rate']), _pct(r['ci'][0]), _pct(r['ci'][1]), r['did_not_hold'], r['landed'])
+        print('  %-24s %6d %8d %9d  %s' % (r['reviewer'], r['landed'], r['reverted'], r['rewritten'], held))
+    u, s = rep['unattributed'], rep['skipped']
+    if u['not_passed'] or u['no_review']:
+        print('  not counted for any reviewer: %d landed after a FAIL (accepted by the gate or by hand), %d with no review'
+              % (u['not_passed'], u['no_review']))
+    if s['lost'] or s['no_additions']:
+        print('  skipped: %d lost (history rewritten past the integration), %d added no lines' % (s['lost'], s['no_additions']))
+    if rep['other_horizons']:
+        print('  outcomes also recorded at %s days: pass --horizon-days to see them'
+              % ', '.join(str(h) for h in rep['other_horizons']))
+    return 0

package/scripts/forge_dataset/routing.py

@@ -107,6 +107,7 @@ def tasks(runs: Runs, *, repo=None, since=None) -> list:
             out.append(dict(
                 run=run, task=tid, tier=row.get('declared_difficulty') or row.get('difficulty'),
                 ran=first['events'][0]['d'].get('dwarf') if first else None, model=model,
+                model_id=resolved.get('model'), effort=resolved.get('effort'),
                 first_pass=first['outcome'] if first else None,
                 censored=(first['reason'] if first and first['outcome'] is None else (None if first else 'not_run')),
                 passed=any(a['outcome'] for a in attempts) or (run, tid) in runs.accepted,

package/scripts/forge_jev/__init__.py

@@ -149,9 +149,13 @@ _runtime_spec.loader.exec_module(_runtime)
 
 
 def config_path() -> Path:
-    # An empty XDG_CONFIG_HOME counts as unset (XDG spec): taken literally it put jev.json
-    # below the current directory.
-    return Path(os.environ.get('XDG_CONFIG_HOME') or str(Path.home() / '.config')).expanduser() / 'forge/jev.json'
+    # An empty or relative XDG_CONFIG_HOME counts as unset (XDG spec): taken literally it put
+    # jev.json below the current directory. Same rule as forge_registry.registry_dir().
+    value = os.environ.get('XDG_CONFIG_HOME') or ''
+    base = Path(value).expanduser() if value else None
+    if base is None or not base.is_absolute():
+        base = Path.home() / '.config'
+    return base / 'forge/jev.json'
 
 
 def load_config() -> dict: