mirror of
https://github.com/abhigyanpatwari/GitNexus.git
synced 2026-08-28 05:25:25 +00:00
* feat(skills): add ce-plan — GitNexus+PDG implementation-planning skill Adds .claude/skills/ce-plan: a planning-only skill that builds implementation-ready plans from GitNexus graph navigation (query/context/ impact/trace), bounded statement-level PDG slices (pdg_query, impact mode:pdg, explain), and targeted source verification, with a context ledger to prevent repeated reads and a machine-readable implementation context pack (stable contract for a future ce-implement). Whitelisted in .gitignore and registered in AGENTS.md and CLAUDE.md outside the auto-managed gitnexus block. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(skills): apply ce-plan validation findings (tool contract, consistency, conventions) Tool contract: impact mode:'pdg' shape now includes the schema-required direction param; CDG branch sense documented as the result 'label' field (reason is cypher/raw-edge only); explain caveats corrected to its real false-negative classes (cross-function TAINT_PATH is modeled). Consistency: PDG slice homed in working memory (ledger keeps one-liners); depth knob defined and category-overrides-baseline ordering stated; call_depth (consumed by nothing) and content-hash bookkeeping dropped; Never section folded into Hard rules; Phase 3 deduplicated to a pointer; allowed-repeat escalations defined; budget/discard accounting clarified; verification-commands gathering added to Phase 4; open_questions added to the context pack. From scenario runs: plans now pin the verified-at HEAD commit and index freshness in a header, tag claims [verified]/[graph]/[inferred]/[assumed], quote load-bearing tool output, prefer pre-hook-carrying npm scripts, and support an out:<path> destination override; output path defined as the Phase 1 target repo root. Conventions: AGENTS.md 1.9.0 / CLAUDE.md 1.4.0 changelog rows + metadata bumps; future ce-implement qualified as future. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(skills): rename ce-plan → gitnexus-plan; add cross-CLI (Codex) entrypoints Renames the skill dir, frontmatter, output filename convention, plan H1 (GitNexus Engineering Plan), the future executor handle (gitnexus-implement), the .gitignore whitelist entry, and all AGENTS.md/CLAUDE.md references. Follows the pr-swarm-review cross-CLI pattern: SKILL.md is the canonical CLI-neutral spec, AGENTS.md § Engineering planning is the Codex/any-agent entrypoint, and the README documents the optional user-level ~/.codex/prompts/gitnexus-plan.md slash command plus an invocation matrix. Skill prose de-branded from Claude Code (agent-neutral verification layer). Also fixes two post-review README contradictions: the anti-reread claim now names the ledger's allowed escalations, and 'read-only by contract' is now 'planning-only' (the skill writes exactly one repo file — the plan); the scope-creep rule and template §12 now agree on where deferred follow-ups land. Drops the stale plugin-collision limitation. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs(skills): document Codex user-level install path for gitnexus-plan Codex discovers SKILL.md skills from ~/.agents/skills (same path the other gitnexus-* skills install to); README now documents the cp install plus the optional ~/.codex/prompts slash-command file, with the prompt body preferring the repo copy and falling back to the user-level install. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(skills): gitnexus-plan freshness gate + active PDG-layer refresh Freshness is now a Phase 1 gate, not advisory: under the default freshness:strict, a stale index is refreshed once per planning session via node .gitnexus/run.cjs analyze --index-only (appending --pdg when the task will reach the PDG phase), then the context resource is re-read. A missing PDG layer likewise triggers the one permitted --index-only --pdg refresh and re-probe instead of a passive recommendation. freshness:accept (or a failed/impractical refresh) preserves the old behavior: plan on the stale graph, source-weighted, labelled in the plan header. --index-only is the load-bearing flag choice — it suppresses all file generation, so the planning-only contract holds (only the .gitnexus store changes). Ledger gains an index_refresh record; plan header states fresh / refreshed / refresh-skipped-with-reason. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(skills): gitnexus-plan runner build check before freshness refresh When the target repo builds the analyzer from its own source (bin → dist/ mapping, as gitnexus/ does), the Phase 1 freshness gate now verifies dist/ is current before running the analyze refresh — rebuilding via the package's build script when any analyzer source file is newer than the built entrypoint — and prefers that freshly built CLI. Otherwise a stale dist re-indexes with outdated extraction logic and the 'fresh' index lies. Rebuilds are recorded in the ledger's index_refresh; the PDG-phase refresh inherits the same check. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(skills): add gitnexus-work executor and gitnexus-lfg pipeline gitnexus-work executes a gitnexus-plan as verified atomic commits: consumes the §11 implementation_context pack, drift-checks the plan's evidence pin against HEAD, re-verifies assumptions before relying on them, runs impact before every symbol edit and detect_changes before every commit (repo mandates), builds tests from the plan's scenarios, and routes structural drift back to gitnexus-plan Deepen mode instead of coding around it. gitnexus-lfg is a thin orchestrator: gitnexus-plan → blocking user gate (deepen / proceed / stop, deepen loops allowed) → gitnexus-work → review via the existing gitnexus-pr-review skill (open PR, else branch diff vs default). One bounded fix cycle for review findings; never pushes or opens a PR on its own. gitnexus-plan gains a Deepen mode (re-run freshness gate, escalate to depth:deep, re-verify graph/inferred/assumed claims toward verified, rewrite the same file); its 'future gitnexus-implement' placeholder is retired in favor of gitnexus-work. Registered via .gitignore whitelists, AGENTS.md 1.10.0 (section renamed to Engineering planning & execution), CLAUDE.md 1.5.0. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(skills): apply cross-skill review findings to the gitnexus skill family Two P1s: gitnexus-plan Deepen mode now re-anchors before re-pinning (diffs the old evidence pin over every [verified]-claim file and re-reads or downgrades before the header moves — moving the pin without this laundered stale claims as verified); the index-refresh budget is stated once in Phase 1 (one --index-only refresh plus at most one Phase 3 --pdg upgrade per session, Deepen = its own session) with ledger and pdg-slice deferring to it. Contract fixes: gitnexus-work's drift check now covers every file the pack cites (not just files_to_modify) and parses the full pack incl. primary/related symbols and acceptance_criteria (walked in Phase 4 alongside §13); a pre-completed check skips §7 steps already landed and Deepen gains a reconcile-execution-state step, closing the mid-execution route-back loop; pack assumptions must name what to check and how. lfg: Lane 4 passes the merge-base to detect_changes compare (two-dot diff misattributes upstream commits when default advanced), branch-diff is the stated normal case, oversized review findings route to the plan gate instead of overflowing direct mode, the one-fix-cycle cap is explicit on re-run, and headless runs end at the plan gate with the plan as deliverable. work: blank mode narrowed to *gitnexus-plan*.md with a re-execution guard, direct-mode discipline spelled out, branch meaningfulness defined against the plan slug, and the plan document is committed as the branch's docs commit (review diff includes it). Planning-only contract now names the dist/ rebuild as the second permitted state change; Phase 5.1 names the four claim tags; stale AGENTS.md anchors fixed. Known latent issue left untouched: gitnexus/gitnexus-pr-review pairs a three-dot example with a two-dot detect_changes compare — that skill is also shipped by the plugin, so fixing it here would drift the copies; lfg compensates by passing the merge-base. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(skills): ship the engineering skill family with the gitnexus package npm i -g gitnexus users now get gitnexus-plan / gitnexus-work / gitnexus-lfg: the three skills are added to gitnexus/skills/ in directory form (SKILL.md + references/), which installSkillsTo already enumerates dynamically and copies recursively to every editor target (~/.agents/skills for Codex, Cursor, OpenCode, Qoder, ...) on gitnexus setup — uninstall enumerates the same root, so removal stays clean. The Claude Code plugin channel (gitnexus-claude-plugin/skills/) carries the same copies plus the standard per-skill mcp.json. Global-install support in the skill text: gitnexus-plan Phase 1 now resolves the analyzer runner explicitly — node .gitnexus/run.cjs analyze when the project has a runner, else gitnexus analyze (installed CLI), else npx gitnexus analyze — and all analyze mentions route through it, satisfying the skills-steering policy (#1939/#1945) which sweeps the plugin copies. New drift guard test/unit/shipped-skills-sync.test.ts asserts the npm and plugin copies stay byte-identical to the canonical .claude/skills/ family (plugin = canonical + mcp.json), same discipline as run.cjs ↔ resolve-invocation.ts. skills-steering + shipped-skills-sync: 11/11 green. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(eval): workflow_bench — measure the skill workflow's token savings Benchmarks gitnexus-plan → gitnexus-work against a baseline agent (--disallowedTools Skill) on identical tasks, in fresh detached worktrees, using real headless Claude Code sessions; every number comes from the CLI's --output-format json usage report (field names validated against a live 2.1.207 session). Reports per-arm medians (input/cache/output tokens, cost, wall time, turns), a savings row, and resolve status from a per-task verify command — savings on failed tasks are flagged, not celebrated. Per-task setup hook prepares fresh worktrees (deps); --permission-mode bypassPermissions (default) lets sessions run unattended in the throwaway trees. Free-model support: --base-url/--auth-token/--model route headless sessions through any Anthropic-compatible endpoint; free-model.litellm.yaml is a ready litellm-proxy template for OpenRouter :free variants or local Ollama, so benchmarking burns no paid tokens (README documents rate limits and the small-model skill-following caveat). Harness validated end-to-end with a stub CLI (worktree lifecycle, both arms, plan→work chaining, verify, aggregation, report) and 4 pytest units for the pure aggregation/savings/report helpers. AGENTS.md 1.11.0. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs(eval): record first workflow_bench calibration run Trivial-task calibration (add -V alias): both arms resolved; workflow arm ~4.3x baseline cost — the documented overhead-dominated regime, recorded so the regime boundary is empirical rather than asserted. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(eval): workflow_bench scenario matrix — arm variants, task classes, churn Ground-base measurement across scenarios: tasks.scenarios.yaml spans four labeled classes (trivial → investigation-bug → investigation-feature → cross-module) with deterministic verifies (prescribed test files). New arms: workflow_direct (gitnexus-work direct mode — the middle option that locates the routing boundary lfg's gate and work's triage encode) and baseline_nomcp (no skills AND no graph tools — separates workflow-discipline value from GitNexus-tool value; off by default). Records now carry task class and diff churn (files/+ins/−del vs the starting commit) as an over-engineering proxy; the report renders a class column and per-arm savings rows vs baseline. 5 pytest units + stub-CLI e2e of the full three-arm matrix. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs(eval): record workflow_bench ground base; fix churn measurement bias Ground base (3 classes x 3 arms, n=1/cell): every arm resolved every task — pass/fail quality saturates at this difficulty, making the comparison pure cost. Full plan→work never amortized its ~$9-11 fixed cost on tasks a baseline finishes in ≤35 turns (−211% to −333% cost); workflow_direct sits near baseline (−15% to −55%, once faster wall) with more test coverage. Routing implication recorded: direct mode/plain agent below this scale, full workflow for cross-module / multi-session / plan-as-deliverable work. The cross-module cell and multi-run variance are the next measurements. Churn fix: git add --intent-to-add -A before diffing (arms that never commit no longer undercount new files) and :(exclude)docs/plans (the committed plan doc no longer inflates workflow churn); this run's churn numbers predate the fix and are omitted from the recorded table. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * perf(skills): cost-optimize the workflow from measured ground base Every optimization targets a measured fixed-cost component (eval/workflow_bench ground base: workflow arm −211% to −333% vs baseline, all tasks resolved): - Plan form is category-priced: compact form (core sections w/ § anchors preserved, ≤80 lines excl. pack, mini-pack subset of the context pack) for narrow/default categories; the full 13 sections only for deep work (refactor/security/performance/concurrency/architecture). A compact plan outgrowing its cap reclassifies to full rather than overflowing. - Freshness gate is category-priced: compact categories default to accept (source-weighted, refresh only when a graph claim becomes load-bearing); strict stays the default for full-plan categories — the rebuild+re-index was the largest single fixed cost. - Turn economy: per-category tool-call budgets (~10 to ~45; architecture uncapped); budget exhaustion routes open questions to §12 instead of more digging. - gitnexus-work fast path: HEAD == evidence pin → skip all citation re-reading (the pin's entire point); mini-pack fields tolerated. - lfg Lane 1 boundary triage: tasks below the measured ~35-turn boundary get offered gitnexus-work direct mode before the plan lane is spent. Copies re-synced (npm skills/, plugin, ~/.agents); steering + sync guards green. Re-measurement of the workflow arm follows to verify the numbers actually improve. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs(eval): record optimization re-measurement — inv-bug workflow cell −20% cost Same task, same conditions, post-830a0459 skills: $14.56→$11.70 (−20%), 83→72 turns, cache_read −24%; verified in-transcript that the compact form, turn budget, and skipped rebuild/re-index all fired. Wall +15% from a work- session test-debugging tail (n=1 variance). Regime unchanged (~3.5x baseline on this class) — routing rule stands. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(eval): per-arm clone isolation — worktree ref-namespace leak contaminated an arm The cross-module workflow_direct cell reported an impossible 28-turn solve with churn byte-identical to the workflow arm: git worktree add shares the repo's ref namespace, so the workflow arm's slug branch (created by gitnexus-work Phase 2) survived worktree removal and the direct arm found and adopted the completed work. Arms now get isolated git clone --shared copies (object store via alternates, refs clone-local — agent branches and stashes die with the clone; origin/<ref> fallback for non-default refs). Leaked branch deleted; baseline arm verified clean (0 branch references in its transcript); cell marked invalidated pending re-run. Records the valid cross-module cells: workflow $18.32 vs baseline $18.03 (premium −1.6%, vs −211%..−333% on smaller classes) — fixed costs amortize at this scale, with a less destructive diff and a plan artifact as bonus; resolve rate still tied. Churn fingerprinting is what caught the contamination — noted in the README as an integrity check. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs(eval): complete cross-module cell — direct mode wins 47% cost / 56% wall Clean clone-isolated re-run: workflow_direct resolved the hardest class at $9.53/52 turns/15m vs $18.03/98/34m baseline and $18.32/107/37m full workflow. The measured story across all four classes: the execution discipline (gitnexus-work) is the consistent sweet spot and delivers real token savings on hard tasks; the planning pass buys its artifact, not same-session savings. Resolve rate tied everywhere (n=1/cell caveat). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(eval): add trajectory-gated skill evolution (#2431) - Pair prompt candidates with incumbent workflow arms - Gate promotions on pinned-model quality and efficiency - Expire router evidence and document its lifecycle * fix(eval): allow pr-review skill candidates * feat(skills): rename and generalize GitNexus review * feat(eval): external-comparator and review arms for workflow_bench - ce_workflow / ce_workflow_direct: compound-engineering ce-plan/ce-work arms prompted with the same structure as the gitnexus arms - review / ce_review: gitnexus-review vs ce-code-review on an identical diff applied by the task's setup - plan handoff is snapshot-based: committed example plans in docs/plans/ tie on clone mtimes and broke the name-glob pick (executed a stale plan) - verify output tail is recorded per run and the final working-tree patch is kept, so failed rows are diagnosable after the clone is destroyed Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(skills,eval): address #2431 review — data-safe rename migration, fail-closed bench evidence - setup: never delete a legacy renamed skill dir — the installer cannot prove ownership (users customize or hand-write skills under these names); warn with the path instead, and the test now asserts survival - workflow_bench: fail closed when a session's --output-format json report is empty, malformed, or missing usage fields — an exit-0 shell with no parseable usage no longer counts as measured evidence (5 parametrized regression tests) - workflow_bench: document the trust model prominently (task setup/verify are shell-executed, sessions run bypassPermissions with the parent env, candidate overlays are prompt injection surface) in README + docstring - free-model.litellm.yaml: master_key from LITELLM_MASTER_KEY env instead of a static token; loopback-binding warning - ci: run the eval workflow_bench pytest suite on ubuntu (pytest+pyyaml only — no full eval stack) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(eval): demand observed foreground verification in headless work-arm prompts In a headless -p session there is no later turn: a work arm backgrounded its slow test run, scheduled wakeups that can never fire, and reported done while two of its tests failed. All four work-arm prompts (both skill families, symmetric) now require verification output to be observed inside the session. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(skills): ask plan depth up front instead of offering deepen afterwards gitnexus-plan Phase 0 now asks one blocking question in interactive sessions — quick / standard / deep, mapped onto the existing depth/form/ freshness knobs — when the invocation carries no explicit depth signal. Explicit knobs and headless runs skip the question (category posture unchanged, so benchmarks and automation behave as before). gitnexus-lfg's plan gate slims to proceed/stop: depth was already the user's up-front choice, so deepening is no longer offered by default — an explicit deepen request at the gate and executor route-backs still run Deepen mode, which remains the mechanism for strengthening an existing plan document. All shipped copies resynced (npm skills/, Claude plugin); AGENTS.md 1.13.0 and CLAUDE.md 1.7.0 pointers updated, including the analyzer's regenerated index-stats block at this branch's head. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(skills): taint pass, expert lenses, and post-work index refresh gitnexus-review gains a PDG-backed taint-and-dependence pass (explain + pdg_query, --pdg folded into the stale refresh on trust-boundary diffs) and an Expert lenses section: domain reviewers derived from the graph's clusters plus four cross-cutting lenses (architectural fit, language conformance per the repo's own contract, Definition of Done, simplicity), dispatched once after the evidence-gathering steps and scaled to the diff. gitnexus-work Phase 4 now refreshes the knowledge graph after the DoD walk via the resolved-runner ladder with analyze --index-only, so the lfg review lane and later sessions query the finished work without dirtying the tree. lfg's threshold-governance paragraph moves to its README; eval citations are tagged as measured in the GitNexus repo. All shipped copies re-synced. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(cli): remove legacy gitnexus-pr-review on uninstall; cover the rename migration uninstall's removal set now includes LEGACY_SKILL_DIR_NAMES derived from RENAMED_SKILL_DIRS, so a pre-rename install is cleaned up instead of orphaned. The rename warning gains behavioral coverage (fires with a legacy dir present, silent without), and shipped-skills-sync asserts legacy names stay absent from every shipped tree. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(eval): metric provenance, error-kind rows, skill-invocation verification, gate noise floor The promotion gate defaults to cost_usd (the only metric that includes subagent spend); token metrics carry an explicit main-loop-only warning in the report and promotion.json. Rows are classified by error_kind (session-error / verify-failed / infra-error), excluded from efficiency medians, and the gate requires equal valid-run counts. Each session's transcript is scanned for the expected Skill invocation and fails closed on a verified miss; a one-run resolution edge no longer promotes (noise floor). Per-run timeouts and setup failures record an infra-error row instead of aborting the sweep. Overlays touching skills no candidate arm exercises are rejected up front. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs: fix skill routing paths, version headers, and skill rosters Routing tables point at the tracked direct skill paths (matching the post-#2434 generator output), AGENTS.md/CLAUDE.md headers match their latest changelog rows, the 1.12.0 row describes what the migration actually does, package/cursor READMEs list the full shipped skill roster, and the swarm READMEs describe /gitnexus-review's expert lenses instead of calling it single-agent. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * ci: drift-guard workflow for skill copies; pin eval pip deps; track docs/plans ci.yml ignores '**.md', so an md-only skill edit would merge without the shipped-skills-sync test running — skill-sync.yml triggers exactly on the guarded trees. The eval job's pip install is version-pinned, and docs/plans/ is unignored so gitnexus-plan output can be committed. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(ci): keep the runner-invocation literal in gitnexus-review; add concurrency block to skill-sync skills-steering requires skills with a stale-index hint to carry the exact 'node .gitnexus/run.cjs analyze' form — restore it with the fallback ladder as a parenthetical instead of replacing it. skill-sync.yml gains the top-level concurrency block the workflow-convention check enforces. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(skills): token-economy guidance for expert lenses Merge lenses that ground in the same material into one reviewer, and use cheaper model/effort tiers for mechanical lenses where the harness offers them, reserving the strongest engine for adversarial judgment. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test(eval): isolate transcript home on Windows Ensure workflow_bench transcript tests set USERPROFILE alongside HOME so Path.home() resolves to the temporary test home on Windows. * docs(skills): fold PR #2522 execution learnings into review/work/plan Eight incident-backed hardenings from running the full skill cycle (review -> plan -> work, 28-finding fix series) on PR #2522: gitnexus-review: - Expert lenses execute the code under review on candidate failing shapes (empirical probe outranks source reading — every HIGH the language lenses found came from a probe, not a read). - Step 7 re-runs the exact CI check for refreshed baselines/fingerprints (a stale committed artifact is invisible in the diff; caught a red benchmarks arm). - Step 8 treats version/invalidation constants as review surface (INCREMENTAL_SCHEMA_VERSION class recurred verbatim from #2494). gitnexus-work: - Step 4 proves regression tests discriminate against the pre-fix tree. - Step 5 rebuilds executed build output before every verification run (parse workers load dist/; a correct fix 'failed' until rebuilt). - Step 6 makes stage -> detect_changes -> commit one unbroken sequence. gitnexus-plan: - Phase 0 seeded-evidence mode: plan FROM a completed review's verified findings instead of re-running the graph ladder. - Template §7: fingerprint/golden-guarded output rebaselines once, at the series tip. All distribution copies resynced; shipped-skills-sync + skills-steering 24/24 locally. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(eval): close the skill-evolution loop with an automated proposer driver workflow_bench.evolve adds the three arrows the README described as manual: a proposer session that turns loser trajectories (results.jsonl rows, transcripts, patches, the learning queue) into ONE bounded candidate overlay, a driver that iterates propose -> paired benchmark -> deterministic gate up to --generations, and an --apply step that copies a promoted overlay onto the canonical skills and shipped mirrors as a working-tree diff. The trust boundary is unchanged: overlays re-validate through candidate_overlay_files before any benchmark or apply consumes them, and committing, CI, and the PR merge stay human. learnings.jsonl is gitignored: it is machine-local evidence, like the session transcripts it complements. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs(skills): route live-task friction into the evolution learning queue Each family skill gains a short 'Skill feedback' section: on friction with the skill's own instructions, append one JSON line to eval/workflow_bench/learnings.jsonl (GitNexus repo only) — never self-edit the skill from a live task. The proposer in workflow_bench.evolve consumes the queue as hints; a learning reaches a shipped skill only by beating the incumbent on the paired benchmark. All shipped mirrors re-copied byte- identical. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * ci(tests): run the evolve helper tests in the eval pytest job test_evolve.py needs only pytest+pyyaml, same as the harness tests the job already runs — without this line the new module had no CI coverage. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(ci): comment-triggered GitNexus review agent for PRs '@gitnexus review' from a maintainer (OWNER/MEMBER/COLLABORATOR; the action re-validates write access) runs the repo's gitnexus-review skill headlessly against the PR and posts the review as a sticky comment — remote triggering with no local setup. Read-only by construction: contents: read token, Write/Edit and web tools disallowed, Bash allowlisted to git reads and the gitnexus CLI; analyze parses PR code with tree-sitter, never executes it. Requires the ANTHROPIC_API_KEY repository secret; activates once the file is on the default branch. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(ci): dispatch lane + existing OAuth secret for the review agent Align with claude.yml: same action pin and the CLAUDE_CODE_OAUTH_TOKEN secret the repo already carries — no new secret to configure. Add a workflow_dispatch lane (PR number input) so the agent can be triggered from the Actions UI and tested before the issue_comment trigger reaches the default branch. Allowlist gh pr view/diff and gh api, which the review skill uses to pin PR SHAs. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(ci): close a fork-PR RCE vector in the review agent's tool allowlist A live headless run of the exact workflow session against PR #2431 (66 turns, full gitnexus-review pass) surfaced a real HIGH-severity confused deputy: .gitnexus/ is gitignored, not blocked — a fork PR can commit its own .gitnexus/run.cjs, issue_comment checks out PR-head content, and the skill's runner ladder tries 'node .gitnexus/run.cjs analyze' first. That would execute fork-controlled JS inside a job holding CLAUDE_CODE_OAUTH_TOKEN and a write-scoped GITHUB_TOKEN — the opposite of the 'PR code is read, never executed' claim in the workflow's own header. Fix: drop the run.cjs allowlist entry so analyze always resolves through npx gitnexus (npm registry, not the checked-out tree); the skill's documented fallback mode covers the resulting graceful degradation. Also drop 'gh api' (not read-only — accepts -X POST/PATCH/DELETE) and downgrade pull-requests: write to read (comment posting only needs issues: write; the prompt already forbids formal review submission). Same session flagged a latent evolve.py bug: select_evidence's cost sort used dict.get's missing-key default, which doesn't cover an explicit JSON null in a foreign --seed-results row and crashes proposer setup with TypeError. Guarded with 'or 0.0' and added a regression test. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix: harden PR review and evolution trust boundaries * ci: follow workflow concurrency convention * fix(eval): make terminating error paths explicit * fix: unblock hardened review runtime checks * test: make containment canaries deterministic * test: expose Claude canary tool failures * fix: adapt clean shell environment for Claude * fix(eval): accept the runner's transcript source key in evidence preflight The proposer evidence preflight required transcript-artifact metadata to be exactly {path, sha256, bytes}, but the runner stamps a fourth provenance key (source=parent-captured-stream-json). Any --seed-results or generation>=2 run therefore aborted with SandboxError before proposing or promoting. Pin the producer literal as PARENT_EVENT_STREAM_SOURCE and validate it in the metadata check, and round-trip real producer output through sum_sessions into the preflight so the schema can't drift again. * fix(eval): treat an unmeasured session cost as unavailable, not $0 well_formed validated only the nested usage block, so an otherwise-successful session missing total_cost_usd was recorded as cost_usd=0.0 — and cost_usd is the default promotion metric (lower wins), so a cost-less session scored as free and could win promotion it never earned. Extract cost via measured_cost() (None on absent/garbage, a measured 0.0 preserved), propagate None through sum_sessions/aggregate/savings/report, and have the gate refuse to rank on a metric that was not measured on every run in both arms. * fix(eval): warn when ranking on the main-loop-only num_turns metric num_turns comes from the CLI's top-level usage (main-loop session only), like output_tokens, but selecting it emitted no metric_warning — so a subagent-heavy candidate could look artificially efficient. Add num_turns to MAIN_LOOP_ONLY_METRICS and broaden the warning to cover turns. * fix(eval): fail closed when an overlay adds a file with no committed base An overlay adding a new .md under gitnexus-{plan,work} passes the structural overlay checks but has no committed base for committed_destination_base_digests to bind against, so it raised an uncaught ValueError that crashed the evolve driver (and runner --candidate-overlay) mid-run. Catch it at both call sites: evolve reports NOT PROMOTED and exits, runner routes it through parser.error. * feat(eval): circuit-break the runner sweep on a systemic outage A sustained upstream outage used to pay out every remaining --timeout window one session at a time. Track consecutive session/infra/cleanup failures via a pure systemic_outage_streak helper; after --outage-streak (default 5) in a row, stop the sweep, still write report.md/promotion.json from partial evidence, and exit non-zero so evolve.py halts instead of proposing from truncated evidence. A task's own resolved=False never trips the breaker. * fix(cli): report a dirty working tree as stale in gitnexus status status --json (and the human output) computed up-to-date from commit + runner identity + completeness only, so a repo with uncommitted source changes at a matching HEAD was reported up-to-date while analyze would still re-index it. A graph-backed agent gating on that JSON could skip re-analysis on a stale graph. Extract analyze's dirty-tree check into a shared isWorkingTreeDirty() in storage/git and fold it into the status freshness decision. * fix(ci): use single-slash deny globs in the review agent's disallowedTools github.workspace already expands to an absolute path, so Read(/${{ github.workspace }}/**) and Read(//proc/**),(//sys/**),(//dev/**) produced double-slash patterns that a normalizing matcher may not match — silently no-opping the deny layer. Not exploitable (the allowlist is the primary control and never grants those paths), but the globs should be well-formed. Update the pinned test strings. * ci: install gitnexus-shared with npm ci from the committed lockfile The gitnexus-shared build floated its deps via npm install in three workflows (skill-sync, ci-tests, and — most importantly — the release publish.yml) while every other install step uses npm ci. The lockfile is committed and in sync, so switch all three to npm ci for reproducible, locked installs. * test(cli): make the shipped-skills drift guard reject symlinks listFilesRecursive walked with readdirSync and snapshotDir read with readFileSync, both of which follow symlinks — so a mirror file symlinked to the canonical tree passed the byte-compare (and a symlinked mirror dir would be followed too). Reject a symlinked root via lstat and any symlinked entry via Dirent.isSymbolicLink, with negative tests (skipped on Windows). * test(eval): guard the candidate-skill vs mirror-root coverage invariant MIRROR_SKILL_ROOTS omits the Cursor tree, safe only because no candidate skill is cursor-shipped. Pin that invariant: every CANDIDATE_SKILLS entry must exist under canonical + every mirror root and must not ship to Cursor, so adding a cursor-shipped skill to the candidate set (the PR #2488 asymmetric-sync class) fails loudly instead of syncing three of four trees. * docs(ci): describe the review agent's staged post-merge rollout The DoD asked for a dry-run or triggered run before merge, but an issue_comment (or newly added workflow_dispatch) workflow only ever executes the default-branch copy, so it cannot be exercised from the PR that introduces it. Reword the DoD and the activation checklist to a staged rollout: merge registered-but-disabled, validate same-repo and fork execution post-merge, then enable the variable. * fix: pin plugin skill mcp.json to the release version via #2445 tooling The ten plugin skill mcp.json launched `npx -y gitnexus@latest mcp` on every skill connect — non-reproducible and a supply-chain surface, and (unlike the persisted setup config) never pinned. Extend sync-plugin-manifests.mjs with an mcp surface kind that stamps the gitnexus@<version> launch arg, pin all ten to 1.6.9 now, and keep them byte-identical so the drift guard stays green. The release lifecycle + publish.yml --check now re-stamp them like the four manifest surfaces; only READMEs stay on @latest as docs. * test(eval): prove the proposer's built-in file tools are confined The real-Claude canary only exercised Bash + MCP, so it proved process/MCP containment but not that the proposer's built-in file tools stay inside their mounts. Add a canary over the exact PROPOSER_ALLOWED_TOOLS surface and the same read-only /evidence mount as run_proposer (allowlist extracted to a shared constant so it can't drift): Read reaches /evidence, a Write into the read-only evidence mount is denied, and a Write lands in the output tree. * fix(eval): apply the candidate overlay after task setup for fair arms The candidate overlay was applied before the task's untrusted setup ran, so setup could observe candidate prose and the incumbent/candidate arms started from different pre-overlay state. Reorder within the sandbox: capture the base (pre-overlay) skill digest, run setup against the base skills, verify setup did not tamper them, then apply the overlay and capture the post-overlay digest the model must preserve. apply_candidate_overlay stages path-specific overlay files, so setup's uncommitted changes stay out of the baseline and churn is unchanged. Graph freshness for the review arm is handled by the status dirty-tree fix plus the review skill's stale-triggered re-index, not by reordering the cached per-task-sha graph materialization (which is mechanically blocked). * test(eval): end-to-end containment proof of the autonomous proposer Drives the real run_proposer through bubblewrap with a deterministic scripted model (no paid API): it reads the read-only evidence bundle and writes a candidate gitnexus-plan skill edit plus a rationale into the sandbox output tree; run_proposer enforces the trust boundary and copies only the validated overlay + proposal out. This exercises the autonomous-proposal stage of the self-evolution loop end-to-end in the eval/containment CI job (the gate and apply stages are covered by test_workflow_bench_evolution and test_promotion_apply). Env-gated on GITNEXUS_REQUIRE_CLAUDE_CANARY, so it runs only where the pinned Claude binary and user namespaces are available. * fix(eval): let the proposer author its overlay via Bash Running the end-to-end proposer canary in the containment CI job surfaced a real bug: run_proposer starts the session with --bare, which hard-disables the Write/Edit tools ("Write exists but is not enabled in this context"), yet allowlisted Edit/Write and omitted Bash. The proposer therefore had no working way to write its candidate overlay — the self-evolution loop could never produce a candidate. The sandbox settings already pre-authorize Bash (autoAllowBashIfSandboxed) and confine writes to workspace/tmp/home, so switch PROPOSER_ALLOWED_TOOLS to Read/Grep/Glob/Bash and tell the proposer to author files with Bash. The end-to-end test now drives the real run_proposer through bubblewrap and asserts a validated overlay + proposal are produced (this also replaces the earlier file-tool canary, whose Write/Edit premise was moot). * test(eval): author the proposer overlay with newline-free Bash content The nested shell-sandbox prefix mangles embedded newlines, so the multi-line overlay content never landed. Use single-line content for the deterministic proposer canary. * test(eval): drop the unverifiable end-to-end proposer canary The scripted proposer overlay never materialized in the containment job across runs, and the model tool-result content is not visible in CI logs, so the test cannot be finalized without an environment where the sandbox can actually run. Keep the verified production fix (Bash-authoring in run_proposer); the proposer sandbox/containment stays covered by the existing Bash+MCP and process-tree canaries. * test(cli): drop run-analyze.ts from the windowsHide spawn-family list U7 moved run-analyze.ts's only child_process call (the git status --porcelain dirty check) into storage/git.ts (already covered by this test, with windowsHide). run-analyze.ts no longer imports a spawn-family function, so the windowsHide-regression test's 'must have >=1 spawn call' invariant failed for it. Remove it from SRC_FILES. --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com> Co-authored-by: Zander Raycraft <zanderjraycraft@gmail.com> Co-authored-by: Azizur Rahman <azizur100389@gmail.com>
931 lines
37 KiB
Python
931 lines
37 KiB
Python
"""Evidence-bound, transactional application of promoted skill overlays."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import ctypes
|
|
import errno
|
|
import hashlib
|
|
import json
|
|
import os
|
|
import secrets
|
|
import shutil
|
|
import stat
|
|
import sys
|
|
import tempfile
|
|
from datetime import UTC, datetime
|
|
from pathlib import Path, PurePosixPath
|
|
from typing import Any
|
|
|
|
from .evolution import MAX_CANDIDATE_OVERLAY_BYTES, candidate_overlay_payload
|
|
from .process_control import run_managed
|
|
|
|
# Shipped byte-identical mirrors of .claude/skills/<name> (see
|
|
# gitnexus/test/unit/shipped-skills-sync.test.ts — the drift guard).
|
|
MIRROR_SKILL_ROOTS = ("gitnexus/skills", "gitnexus-claude-plugin/skills")
|
|
REPO_ROOT = Path(__file__).resolve().parents[2]
|
|
|
|
|
|
class _StagingCleanupError(RuntimeError):
|
|
"""A staged name still needs transaction-owned cleanup/recovery."""
|
|
|
|
def __init__(self, name: str, failure: BaseException, cleanup: BaseException) -> None:
|
|
self.name = name
|
|
super().__init__(
|
|
f"staging failed ({type(failure).__name__}: {failure}) and cleanup failed "
|
|
f"({type(cleanup).__name__}: {cleanup})"
|
|
)
|
|
|
|
|
|
def mirror_targets(relative: PurePosixPath) -> list[PurePosixPath]:
|
|
"""Every repo path one overlay file lands on: canonical + shipped mirrors."""
|
|
skill = relative.parts[2]
|
|
rest = PurePosixPath(*relative.parts[3:])
|
|
targets = [relative]
|
|
targets += [PurePosixPath(root, skill, rest) for root in MIRROR_SKILL_ROOTS]
|
|
return targets
|
|
|
|
|
|
def freeze_overlay(overlay: Path, destination: Path) -> str:
|
|
"""Copy authorized bytes into a private, read-only benchmark snapshot."""
|
|
digest, payload = candidate_overlay_payload(overlay)
|
|
destination = destination.expanduser().absolute()
|
|
if destination.exists() or destination.is_symlink():
|
|
raise ValueError(f"overlay snapshot destination already exists: {destination}")
|
|
destination.parent.mkdir(parents=True, exist_ok=True)
|
|
staging = Path(tempfile.mkdtemp(prefix=".overlay-snapshot-", dir=destination.parent))
|
|
try:
|
|
for relative, content in payload:
|
|
target = staging / relative
|
|
target.parent.mkdir(parents=True, exist_ok=True, mode=0o700)
|
|
descriptor = os.open(target, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0o400)
|
|
try:
|
|
with os.fdopen(descriptor, "wb", closefd=False) as handle:
|
|
handle.write(content)
|
|
handle.flush()
|
|
os.fsync(handle.fileno())
|
|
finally:
|
|
os.close(descriptor)
|
|
for directory in sorted(
|
|
(path for path in staging.rglob("*") if path.is_dir()),
|
|
key=lambda path: len(path.parts),
|
|
reverse=True,
|
|
):
|
|
directory.chmod(0o500)
|
|
staging.chmod(0o500)
|
|
os.replace(staging, destination)
|
|
except BaseException:
|
|
if staging.exists():
|
|
shutil.rmtree(staging)
|
|
raise
|
|
frozen_digest, _ = candidate_overlay_payload(destination)
|
|
if frozen_digest != digest:
|
|
raise RuntimeError("frozen overlay bytes do not match the authorized input")
|
|
return digest
|
|
|
|
|
|
def _stage_replacement(path: Path, content: bytes, mode: int) -> Path:
|
|
descriptor, raw_path = tempfile.mkstemp(prefix=".wfevolve-", dir=path.parent)
|
|
staged = Path(raw_path)
|
|
try:
|
|
os.fchmod(descriptor, stat.S_IMODE(mode))
|
|
with os.fdopen(descriptor, "wb", closefd=False) as handle:
|
|
handle.write(content)
|
|
handle.flush()
|
|
os.fsync(handle.fileno())
|
|
except BaseException:
|
|
# A partially written candidate/backup is never eligible for later
|
|
# cleanup through the replacements list, so remove it here before the
|
|
# staging exception escapes.
|
|
os.close(descriptor)
|
|
staged.unlink(missing_ok=True)
|
|
raise
|
|
else:
|
|
os.close(descriptor)
|
|
return staged
|
|
|
|
|
|
def _read_destination(path: Path, *, target: PurePosixPath) -> tuple[bytes, int]:
|
|
"""Read one mirror without following links and reject concurrent mutation."""
|
|
|
|
try:
|
|
before = path.lstat()
|
|
except FileNotFoundError as exc:
|
|
raise ValueError(f"overlay destination must already be a regular file: {target}") from exc
|
|
if stat.S_ISLNK(before.st_mode) or not stat.S_ISREG(before.st_mode):
|
|
raise ValueError(f"overlay destination must already be a regular file: {target}")
|
|
descriptor = os.open(path, os.O_RDONLY | getattr(os, "O_NOFOLLOW", 0))
|
|
try:
|
|
opened = os.fstat(descriptor)
|
|
if not stat.S_ISREG(opened.st_mode):
|
|
raise ValueError(f"overlay destination must already be a regular file: {target}")
|
|
chunks: list[bytes] = []
|
|
while chunk := os.read(descriptor, 64 * 1024):
|
|
chunks.append(chunk)
|
|
after = os.fstat(descriptor)
|
|
finally:
|
|
os.close(descriptor)
|
|
try:
|
|
final = path.lstat()
|
|
except FileNotFoundError as exc:
|
|
raise ValueError(f"overlay destination changed while being read: {target}") from exc
|
|
|
|
def identity(value: os.stat_result) -> tuple[int, int, int, int, int]:
|
|
return (
|
|
value.st_dev,
|
|
value.st_ino,
|
|
value.st_size,
|
|
value.st_mtime_ns,
|
|
stat.S_IMODE(value.st_mode),
|
|
)
|
|
|
|
if (
|
|
stat.S_ISLNK(final.st_mode)
|
|
or not stat.S_ISREG(final.st_mode)
|
|
or not (identity(before) == identity(opened) == identity(after) == identity(final))
|
|
):
|
|
raise ValueError(f"overlay destination changed while being read: {target}")
|
|
return b"".join(chunks), opened.st_mode
|
|
|
|
|
|
def _open_repository_root(repo_root: Path) -> tuple[Path, int]:
|
|
root = repo_root.expanduser().absolute()
|
|
try:
|
|
metadata = root.lstat()
|
|
resolved = root.resolve(strict=True)
|
|
except OSError as exc:
|
|
raise ValueError(f"repository root is unavailable: {root}") from exc
|
|
if stat.S_ISLNK(metadata.st_mode) or not stat.S_ISDIR(metadata.st_mode):
|
|
raise ValueError(f"repository root must be a real directory: {root}")
|
|
if resolved != root:
|
|
raise ValueError(f"repository root must not traverse symlinks: {root}")
|
|
flags = os.O_RDONLY | os.O_DIRECTORY | getattr(os, "O_CLOEXEC", 0) | getattr(os, "O_NOFOLLOW", 0)
|
|
try:
|
|
descriptor = os.open(root, flags)
|
|
except OSError as exc:
|
|
raise ValueError(f"repository root changed while opening: {root}") from exc
|
|
try:
|
|
opened = os.fstat(descriptor)
|
|
final = root.lstat()
|
|
final_resolved = root.resolve(strict=True)
|
|
|
|
def identity(value: os.stat_result) -> tuple[int, int, int]:
|
|
return value.st_dev, value.st_ino, stat.S_IFMT(value.st_mode)
|
|
|
|
if (
|
|
stat.S_ISLNK(final.st_mode)
|
|
or not stat.S_ISDIR(opened.st_mode)
|
|
or not stat.S_ISDIR(final.st_mode)
|
|
or final_resolved != root
|
|
or not (identity(metadata) == identity(opened) == identity(final))
|
|
):
|
|
raise ValueError(f"repository root changed while opening: {root}")
|
|
except OSError as exc:
|
|
os.close(descriptor)
|
|
raise ValueError(f"repository root changed while opening: {root}") from exc
|
|
except BaseException:
|
|
os.close(descriptor)
|
|
raise
|
|
return root, descriptor
|
|
|
|
|
|
def _open_target_parent(root_descriptor: int, target: PurePosixPath) -> int:
|
|
if target.is_absolute() or not target.parts or ".." in target.parts:
|
|
raise ValueError(f"overlay destination escapes repository: {target}")
|
|
flags = os.O_RDONLY | os.O_DIRECTORY | getattr(os, "O_CLOEXEC", 0) | getattr(os, "O_NOFOLLOW", 0)
|
|
current = os.dup(root_descriptor)
|
|
try:
|
|
for part in target.parts[:-1]:
|
|
try:
|
|
metadata = os.stat(part, dir_fd=current, follow_symlinks=False)
|
|
except OSError as exc:
|
|
raise ValueError(f"overlay destination parent is unavailable: {target}") from exc
|
|
if stat.S_ISLNK(metadata.st_mode) or not stat.S_ISDIR(metadata.st_mode):
|
|
raise ValueError(f"overlay destination parent must not be a symlink: {target}")
|
|
try:
|
|
child = os.open(part, flags, dir_fd=current)
|
|
except OSError as exc:
|
|
raise ValueError(f"overlay destination parent changed while opening: {target}") from exc
|
|
opened = os.fstat(child)
|
|
if (
|
|
opened.st_dev,
|
|
opened.st_ino,
|
|
stat.S_IFMT(opened.st_mode),
|
|
) != (
|
|
metadata.st_dev,
|
|
metadata.st_ino,
|
|
stat.S_IFMT(metadata.st_mode),
|
|
):
|
|
os.close(child)
|
|
raise ValueError(f"overlay destination parent changed while opening: {target}")
|
|
os.close(current)
|
|
current = child
|
|
return current
|
|
except BaseException:
|
|
os.close(current)
|
|
raise
|
|
|
|
|
|
def _directory_identity(metadata: os.stat_result) -> tuple[int, int, int]:
|
|
return metadata.st_dev, metadata.st_ino, stat.S_IFMT(metadata.st_mode)
|
|
|
|
|
|
def _validate_repository_root_binding(root: Path, root_descriptor: int, *, phase: str) -> None:
|
|
"""Prove the held root still names the repository's lexical directory."""
|
|
|
|
flags = os.O_RDONLY | os.O_DIRECTORY | getattr(os, "O_CLOEXEC", 0) | getattr(os, "O_NOFOLLOW", 0)
|
|
try:
|
|
lexical = root.lstat()
|
|
resolved = root.resolve(strict=True)
|
|
reopened = os.open(root, flags)
|
|
except OSError as exc:
|
|
raise ValueError(f"repository root changed during overlay {phase}: {root}") from exc
|
|
try:
|
|
opened = os.fstat(reopened)
|
|
held = os.fstat(root_descriptor)
|
|
if (
|
|
stat.S_ISLNK(lexical.st_mode)
|
|
or not stat.S_ISDIR(lexical.st_mode)
|
|
or resolved != root
|
|
or not stat.S_ISDIR(opened.st_mode)
|
|
or not stat.S_ISDIR(held.st_mode)
|
|
or _directory_identity(lexical) != _directory_identity(opened)
|
|
or _directory_identity(opened) != _directory_identity(held)
|
|
):
|
|
raise ValueError(f"repository root changed during overlay {phase}: {root}")
|
|
finally:
|
|
os.close(reopened)
|
|
|
|
|
|
def _validate_prepared_paths(
|
|
root: Path,
|
|
root_descriptor: int,
|
|
prepared: list[dict[str, Any]],
|
|
*,
|
|
phase: str,
|
|
) -> None:
|
|
"""Rebind every held parent descriptor to its current lexical repo path."""
|
|
|
|
_validate_repository_root_binding(root, root_descriptor, phase=phase)
|
|
for item in prepared:
|
|
reopened = _open_target_parent(root_descriptor, item["target"])
|
|
try:
|
|
if _directory_identity(os.fstat(reopened)) != _directory_identity(os.fstat(item["parent_descriptor"])):
|
|
raise ValueError(f"overlay destination parent changed during {phase}: {item['target']}")
|
|
finally:
|
|
os.close(reopened)
|
|
# Catch a repository-root replacement that raced the parent walk itself.
|
|
_validate_repository_root_binding(root, root_descriptor, phase=phase)
|
|
|
|
|
|
def _read_destination_at(
|
|
parent_descriptor: int,
|
|
name: str,
|
|
*,
|
|
target: PurePosixPath,
|
|
) -> tuple[bytes, int]:
|
|
try:
|
|
before = os.stat(name, dir_fd=parent_descriptor, follow_symlinks=False)
|
|
except FileNotFoundError as exc:
|
|
raise ValueError(f"overlay destination must already be a regular file: {target}") from exc
|
|
if stat.S_ISLNK(before.st_mode) or not stat.S_ISREG(before.st_mode):
|
|
raise ValueError(f"overlay destination must already be a regular file: {target}")
|
|
descriptor = os.open(
|
|
name,
|
|
os.O_RDONLY | getattr(os, "O_CLOEXEC", 0) | getattr(os, "O_NOFOLLOW", 0),
|
|
dir_fd=parent_descriptor,
|
|
)
|
|
try:
|
|
opened = os.fstat(descriptor)
|
|
chunks: list[bytes] = []
|
|
while chunk := os.read(descriptor, 64 * 1024):
|
|
chunks.append(chunk)
|
|
after = os.fstat(descriptor)
|
|
finally:
|
|
os.close(descriptor)
|
|
try:
|
|
final = os.stat(name, dir_fd=parent_descriptor, follow_symlinks=False)
|
|
except FileNotFoundError as exc:
|
|
raise ValueError(f"overlay destination changed while being read: {target}") from exc
|
|
|
|
def identity(value: os.stat_result) -> tuple[int, int, int, int, int]:
|
|
return (
|
|
value.st_dev,
|
|
value.st_ino,
|
|
value.st_size,
|
|
value.st_mtime_ns,
|
|
stat.S_IMODE(value.st_mode),
|
|
)
|
|
|
|
if (
|
|
not stat.S_ISREG(opened.st_mode)
|
|
or stat.S_ISLNK(final.st_mode)
|
|
or not stat.S_ISREG(final.st_mode)
|
|
or not (identity(before) == identity(opened) == identity(after) == identity(final))
|
|
):
|
|
raise ValueError(f"overlay destination changed while being read: {target}")
|
|
return b"".join(chunks), opened.st_mode
|
|
|
|
|
|
def _stage_replacement_at(parent_descriptor: int, content: bytes, mode: int) -> str:
|
|
for _ in range(100):
|
|
name = f".wfevolve-{secrets.token_hex(16)}"
|
|
try:
|
|
descriptor = os.open(
|
|
name,
|
|
os.O_WRONLY | os.O_CREAT | os.O_EXCL | getattr(os, "O_CLOEXEC", 0),
|
|
stat.S_IMODE(mode),
|
|
dir_fd=parent_descriptor,
|
|
)
|
|
except FileExistsError:
|
|
continue
|
|
try:
|
|
os.fchmod(descriptor, stat.S_IMODE(mode))
|
|
view = memoryview(content)
|
|
while view:
|
|
written = os.write(descriptor, view)
|
|
if written <= 0:
|
|
raise OSError("short write while staging overlay replacement")
|
|
view = view[written:]
|
|
os.fsync(descriptor)
|
|
except BaseException as exc:
|
|
os.close(descriptor)
|
|
try:
|
|
os.unlink(name, dir_fd=parent_descriptor)
|
|
os.fsync(parent_descriptor)
|
|
except OSError as cleanup_exc:
|
|
raise _StagingCleanupError(name, exc, cleanup_exc) from exc
|
|
raise
|
|
else:
|
|
os.close(descriptor)
|
|
try:
|
|
os.fsync(parent_descriptor)
|
|
except OSError as exc:
|
|
try:
|
|
os.unlink(name, dir_fd=parent_descriptor)
|
|
os.fsync(parent_descriptor)
|
|
except OSError as cleanup_exc:
|
|
raise _StagingCleanupError(name, exc, cleanup_exc) from exc
|
|
raise
|
|
return name
|
|
raise FileExistsError("could not allocate a unique overlay staging file")
|
|
|
|
|
|
def _temporary_exists(parent_descriptor: int, name: str) -> bool:
|
|
try:
|
|
os.stat(name, dir_fd=parent_descriptor, follow_symlinks=False)
|
|
except FileNotFoundError:
|
|
return False
|
|
return True
|
|
|
|
|
|
def _unlink_temporary(parent_descriptor: int, name: str) -> None:
|
|
try:
|
|
os.unlink(name, dir_fd=parent_descriptor)
|
|
except FileNotFoundError:
|
|
return
|
|
os.fsync(parent_descriptor)
|
|
|
|
|
|
def _entry_identity_at(parent_descriptor: int, name: str) -> tuple[int, int, int, int, int, int]:
|
|
metadata = os.stat(name, dir_fd=parent_descriptor, follow_symlinks=False)
|
|
return (
|
|
metadata.st_dev,
|
|
metadata.st_ino,
|
|
stat.S_IFMT(metadata.st_mode),
|
|
metadata.st_size,
|
|
metadata.st_mtime_ns,
|
|
stat.S_IMODE(metadata.st_mode),
|
|
)
|
|
|
|
|
|
def _same_entry(
|
|
left: tuple[int, int, int, int, int, int],
|
|
right: tuple[int, int, int, int, int, int],
|
|
) -> bool:
|
|
return left[:2] == right[:2]
|
|
|
|
|
|
_RENAME_EXCHANGE = 2
|
|
|
|
|
|
def _exchange_at(parent_descriptor: int, left: str, right: str) -> None:
|
|
"""Atomically exchange two existing names in one held directory."""
|
|
|
|
try:
|
|
renameat2 = ctypes.CDLL(None, use_errno=True).renameat2
|
|
except AttributeError as exc:
|
|
raise RuntimeError("atomic overlay exchange is unavailable on this platform") from exc
|
|
renameat2.argtypes = [ctypes.c_int, ctypes.c_char_p, ctypes.c_int, ctypes.c_char_p, ctypes.c_uint]
|
|
renameat2.restype = ctypes.c_int
|
|
if (
|
|
renameat2(
|
|
parent_descriptor,
|
|
os.fsencode(left),
|
|
parent_descriptor,
|
|
os.fsencode(right),
|
|
_RENAME_EXCHANGE,
|
|
)
|
|
== 0
|
|
):
|
|
os.fsync(parent_descriptor)
|
|
return
|
|
error = ctypes.get_errno()
|
|
if error in {errno.ENOSYS, errno.EINVAL, errno.EOPNOTSUPP}:
|
|
raise RuntimeError("atomic overlay exchange is unavailable on this filesystem")
|
|
raise OSError(error, os.strerror(error), f"{left} <-> {right}")
|
|
|
|
|
|
def _prepare_targets(
|
|
payload: list[tuple[PurePosixPath, bytes]],
|
|
repo_root: Path,
|
|
) -> tuple[Path, int, list[dict[str, Any]]]:
|
|
"""Resolve and snapshot every canonical/shipped destination exactly once."""
|
|
|
|
root, root_descriptor = _open_repository_root(repo_root)
|
|
prepared: list[dict[str, Any]] = []
|
|
seen: set[PurePosixPath] = set()
|
|
try:
|
|
for relative, content in payload:
|
|
for target in mirror_targets(relative):
|
|
if target in seen:
|
|
raise ValueError(f"duplicate overlay destination: {target}")
|
|
seen.add(target)
|
|
parent_descriptor = _open_target_parent(root_descriptor, target)
|
|
try:
|
|
original, mode = _read_destination_at(
|
|
parent_descriptor,
|
|
target.name,
|
|
target=target,
|
|
)
|
|
except BaseException:
|
|
os.close(parent_descriptor)
|
|
raise
|
|
prepared.append(
|
|
{
|
|
"target": target,
|
|
"destination": root / target,
|
|
"parent_path": root / target.parent,
|
|
"parent_descriptor": parent_descriptor,
|
|
"name": target.name,
|
|
"content": content,
|
|
"original": original,
|
|
"base_digest": hashlib.sha256(original).hexdigest(),
|
|
"mode": mode,
|
|
}
|
|
)
|
|
_validate_prepared_paths(
|
|
root,
|
|
root_descriptor,
|
|
prepared,
|
|
phase="preparation",
|
|
)
|
|
return root, root_descriptor, prepared
|
|
except BaseException:
|
|
for item in prepared:
|
|
os.close(item["parent_descriptor"])
|
|
os.close(root_descriptor)
|
|
raise
|
|
|
|
|
|
def _close_prepared(root_descriptor: int, prepared: list[dict[str, Any]]) -> None:
|
|
try:
|
|
for item in prepared:
|
|
os.close(item["parent_descriptor"])
|
|
finally:
|
|
os.close(root_descriptor)
|
|
|
|
|
|
def destination_base_digests(
|
|
overlay: Path,
|
|
repo_root: Path = REPO_ROOT,
|
|
) -> dict[str, str]:
|
|
"""Bind promotion evidence to the current bytes of every apply target."""
|
|
|
|
_, payload = candidate_overlay_payload(overlay)
|
|
root, root_descriptor, prepared = _prepare_targets(payload, repo_root)
|
|
try:
|
|
_validate_prepared_paths(
|
|
root,
|
|
root_descriptor,
|
|
prepared,
|
|
phase="base-digest capture",
|
|
)
|
|
return {item["target"].as_posix(): item["base_digest"] for item in prepared}
|
|
finally:
|
|
_close_prepared(root_descriptor, prepared)
|
|
|
|
|
|
def committed_destination_base_digests(
|
|
overlay: Path,
|
|
repo_root: Path = REPO_ROOT,
|
|
*,
|
|
ref: str = "HEAD",
|
|
) -> dict[str, str]:
|
|
"""Bind targets to one immutable committed incumbent, never live edits."""
|
|
|
|
_, payload = candidate_overlay_payload(overlay)
|
|
root, root_descriptor = _open_repository_root(repo_root)
|
|
os.close(root_descriptor)
|
|
rev = run_managed(
|
|
["git", "-C", str(root), "rev-parse", f"{ref}^{{commit}}"],
|
|
timeout=60,
|
|
capture_stdout_bytes=256,
|
|
)
|
|
if not rev.ok or rev.stdout_capture_overflow or rev.stdout_capture is None:
|
|
raise ValueError("could not resolve the committed promotion base")
|
|
commit = rev.stdout_capture.decode("ascii", errors="strict").strip()
|
|
if not commit or any(character not in "0123456789abcdefABCDEF" for character in commit):
|
|
raise ValueError("committed promotion base is not an immutable object id")
|
|
bindings: dict[str, str] = {}
|
|
for relative, _content in payload:
|
|
for target in mirror_targets(relative):
|
|
key = target.as_posix()
|
|
if key in bindings:
|
|
raise ValueError(f"duplicate overlay destination: {target}")
|
|
result = run_managed(
|
|
["git", "-C", str(root), "show", f"{commit}:{key}"],
|
|
timeout=60,
|
|
capture_stdout_bytes=MAX_CANDIDATE_OVERLAY_BYTES + 1,
|
|
)
|
|
if not result.ok or result.stdout_capture_overflow or result.stdout_capture is None:
|
|
raise ValueError(f"committed overlay destination is unavailable: {target}")
|
|
bindings[key] = hashlib.sha256(result.stdout_capture).hexdigest()
|
|
return bindings
|
|
|
|
|
|
def _write_recovery_artifact(
|
|
root_descriptor: int,
|
|
repo_root: Path,
|
|
*,
|
|
failure: BaseException,
|
|
rollback_failures: list[str],
|
|
replacements: list[dict[str, Any]],
|
|
transaction_state: str,
|
|
) -> Path:
|
|
recovery_name = ".wfbench-overlay-recovery-" + datetime.now(UTC).strftime("%Y%m%dT%H%M%S%fZ") + ".json"
|
|
|
|
def descriptor_path(descriptor: int, fallback: Path) -> Path:
|
|
try:
|
|
return Path(os.readlink(f"/proc/self/fd/{descriptor}"))
|
|
except OSError:
|
|
return fallback
|
|
|
|
root_path = descriptor_path(root_descriptor, repo_root)
|
|
records = []
|
|
for replacement in replacements:
|
|
parent = descriptor_path(replacement["parent_descriptor"], replacement["parent_path"])
|
|
candidate_exists = _temporary_exists(replacement["parent_descriptor"], replacement["candidate"])
|
|
backup = replacement.get("backup")
|
|
backup_exists = backup is not None and _temporary_exists(replacement["parent_descriptor"], backup)
|
|
if candidate_exists or backup_exists:
|
|
records.append(
|
|
{
|
|
"target": replacement["target"].as_posix(),
|
|
"destination": str(parent / replacement["name"]),
|
|
"candidate": str(parent / replacement["candidate"]),
|
|
"candidate_exists": candidate_exists,
|
|
"backup": str(parent / backup) if backup is not None else None,
|
|
"backup_exists": backup_exists,
|
|
}
|
|
)
|
|
|
|
descriptor = os.open(
|
|
recovery_name,
|
|
os.O_WRONLY | os.O_CREAT | os.O_EXCL | getattr(os, "O_CLOEXEC", 0),
|
|
0o600,
|
|
dir_fd=root_descriptor,
|
|
)
|
|
payload = {
|
|
"failure": f"{type(failure).__name__}: {failure}",
|
|
"transaction_state": transaction_state,
|
|
"rollback_failures": rollback_failures,
|
|
"backups": records,
|
|
}
|
|
try:
|
|
with os.fdopen(descriptor, "w", encoding="utf-8", closefd=False) as handle:
|
|
json.dump(payload, handle, indent=2)
|
|
handle.write("\n")
|
|
handle.flush()
|
|
os.fsync(handle.fileno())
|
|
finally:
|
|
os.close(descriptor)
|
|
os.fsync(root_descriptor)
|
|
return root_path / recovery_name
|
|
|
|
|
|
def apply_promoted_overlay(
|
|
overlay: Path,
|
|
repo_root: Path = REPO_ROOT,
|
|
*,
|
|
expected_digest: str | None = None,
|
|
expected_target_bases: dict[str, str] | None = None,
|
|
) -> list[str]:
|
|
"""Compare-and-swap one evidence-bound overlay across every mirror."""
|
|
digest, payload = candidate_overlay_payload(overlay)
|
|
if expected_digest is not None and digest != expected_digest:
|
|
raise ValueError("candidate overlay digest no longer matches promotion evidence")
|
|
|
|
repo_root, root_descriptor, prepared = _prepare_targets(payload, repo_root)
|
|
current_bases = {item["target"].as_posix(): item["base_digest"] for item in prepared}
|
|
if expected_target_bases is not None and expected_target_bases != current_bases:
|
|
expected_paths = set(expected_target_bases)
|
|
current_paths = set(current_bases)
|
|
missing = sorted(current_paths - expected_paths)
|
|
unexpected = sorted(expected_paths - current_paths)
|
|
drifted = sorted(
|
|
path for path in current_paths & expected_paths if current_bases[path] != expected_target_bases[path]
|
|
)
|
|
details = []
|
|
if missing:
|
|
details.append("missing=" + ",".join(missing))
|
|
if unexpected:
|
|
details.append("unexpected=" + ",".join(unexpected))
|
|
if drifted:
|
|
details.append("drifted=" + ",".join(drifted))
|
|
_close_prepared(root_descriptor, prepared)
|
|
raise ValueError("overlay destination base binding mismatch: " + "; ".join(details))
|
|
|
|
replacements: list[dict[str, Any]] = []
|
|
completed: list[dict[str, Any]] = []
|
|
preserve_backups = False
|
|
published_all = False
|
|
rollback_complete = False
|
|
|
|
def entry_state(replacement: dict[str, Any], name: str) -> tuple[str, int]:
|
|
current, mode = _read_destination_at(
|
|
replacement["parent_descriptor"],
|
|
name,
|
|
target=replacement["target"],
|
|
)
|
|
return hashlib.sha256(current).hexdigest(), stat.S_IMODE(mode)
|
|
|
|
def current_state(replacement: dict[str, Any]) -> tuple[str, int]:
|
|
return entry_state(replacement, replacement["name"])
|
|
|
|
def candidate_is_intact(replacement: dict[str, Any], name: str) -> bool:
|
|
try:
|
|
identity = _entry_identity_at(replacement["parent_descriptor"], name)
|
|
state = entry_state(replacement, name)
|
|
except (OSError, ValueError):
|
|
return False
|
|
return identity == replacement["candidate_identity"] and state == replacement["candidate_state"]
|
|
|
|
def rollback_exchange_is_valid(
|
|
replacement: dict[str, Any],
|
|
displaced_identity: tuple[int, int, int, int, int, int],
|
|
displaced_state: tuple[str, int] | None,
|
|
) -> bool:
|
|
try:
|
|
destination_identity = _entry_identity_at(
|
|
replacement["parent_descriptor"],
|
|
replacement["name"],
|
|
)
|
|
if destination_identity != displaced_identity:
|
|
return False
|
|
if displaced_state is not None and current_state(replacement) != displaced_state:
|
|
return False
|
|
return candidate_is_intact(replacement, replacement["candidate"])
|
|
except (OSError, ValueError):
|
|
return False
|
|
|
|
try:
|
|
for item in prepared:
|
|
try:
|
|
candidate = _stage_replacement_at(item["parent_descriptor"], item["content"], item["mode"])
|
|
except _StagingCleanupError as stage_exc:
|
|
replacements.append(
|
|
{
|
|
**item,
|
|
"candidate": stage_exc.name,
|
|
"backup": None,
|
|
"candidate_identity": None,
|
|
}
|
|
)
|
|
raise
|
|
replacement = {
|
|
**item,
|
|
"candidate": candidate,
|
|
"backup": None,
|
|
"candidate_digest": hashlib.sha256(item["content"]).hexdigest(),
|
|
"base_state": (item["base_digest"], stat.S_IMODE(item["mode"])),
|
|
"candidate_state": (
|
|
hashlib.sha256(item["content"]).hexdigest(),
|
|
stat.S_IMODE(item["mode"]),
|
|
),
|
|
"candidate_identity": None,
|
|
}
|
|
replacements.append(replacement)
|
|
replacement["candidate_identity"] = _entry_identity_at(item["parent_descriptor"], candidate)
|
|
try:
|
|
replacement["backup"] = _stage_replacement_at(
|
|
item["parent_descriptor"],
|
|
item["original"],
|
|
item["mode"],
|
|
)
|
|
except _StagingCleanupError as stage_exc:
|
|
replacement["backup"] = stage_exc.name
|
|
raise
|
|
# Recheck the entire compare set after staging and before the first
|
|
# replacement, then check each member immediately before its swap.
|
|
_validate_prepared_paths(
|
|
repo_root,
|
|
root_descriptor,
|
|
replacements,
|
|
phase="pre-publication",
|
|
)
|
|
for replacement in replacements:
|
|
if current_state(replacement) != replacement["base_state"]:
|
|
raise ValueError(f"overlay destination drifted before apply: {replacement['target']}")
|
|
for replacement in replacements:
|
|
_validate_prepared_paths(
|
|
repo_root,
|
|
root_descriptor,
|
|
[replacement],
|
|
phase="publication",
|
|
)
|
|
if current_state(replacement) != replacement["base_state"]:
|
|
raise ValueError(f"overlay destination drifted during apply: {replacement['target']}")
|
|
previous_identity = _entry_identity_at(
|
|
replacement["parent_descriptor"],
|
|
replacement["name"],
|
|
)
|
|
replacement["publication_previous_identity"] = previous_identity
|
|
try:
|
|
_exchange_at(
|
|
replacement["parent_descriptor"],
|
|
replacement["candidate"],
|
|
replacement["name"],
|
|
)
|
|
except BaseException:
|
|
# A wrapper/interruption can raise after the atomic exchange.
|
|
# Classify by inode movement so a raced edit in the displaced
|
|
# slot cannot be mistaken for an exchange that never landed.
|
|
try:
|
|
destination_identity = _entry_identity_at(
|
|
replacement["parent_descriptor"],
|
|
replacement["name"],
|
|
)
|
|
temporary_identity = _entry_identity_at(
|
|
replacement["parent_descriptor"],
|
|
replacement["candidate"],
|
|
)
|
|
except OSError:
|
|
completed.append(replacement)
|
|
else:
|
|
if _same_entry(destination_identity, replacement["candidate_identity"]) or not _same_entry(
|
|
temporary_identity,
|
|
replacement["candidate_identity"],
|
|
):
|
|
completed.append(replacement)
|
|
raise
|
|
else:
|
|
completed.append(replacement)
|
|
observed_destination = current_state(replacement)
|
|
observed_previous = entry_state(replacement, replacement["candidate"])
|
|
destination_identity = _entry_identity_at(
|
|
replacement["parent_descriptor"],
|
|
replacement["name"],
|
|
)
|
|
displaced_identity = _entry_identity_at(
|
|
replacement["parent_descriptor"],
|
|
replacement["candidate"],
|
|
)
|
|
if (
|
|
observed_destination == replacement["candidate_state"]
|
|
and observed_previous == replacement["base_state"]
|
|
and destination_identity == replacement["candidate_identity"]
|
|
and displaced_identity == previous_identity
|
|
):
|
|
continue
|
|
raise RuntimeError(f"atomic overlay exchange parity check failed: {replacement['target']}")
|
|
for replacement in replacements:
|
|
if (
|
|
current_state(replacement) != replacement["candidate_state"]
|
|
or entry_state(replacement, replacement["candidate"]) != replacement["base_state"]
|
|
or _entry_identity_at(replacement["parent_descriptor"], replacement["name"])
|
|
!= replacement["candidate_identity"]
|
|
or _entry_identity_at(replacement["parent_descriptor"], replacement["candidate"])
|
|
!= replacement["publication_previous_identity"]
|
|
):
|
|
raise RuntimeError(f"post-apply parity check failed: {replacement['target']}")
|
|
_validate_prepared_paths(
|
|
repo_root,
|
|
root_descriptor,
|
|
replacements,
|
|
phase="post-apply validation",
|
|
)
|
|
published_all = True
|
|
except BaseException as exc:
|
|
rollback_failures: list[str] = []
|
|
for replacement in reversed(completed):
|
|
try:
|
|
destination_identity = _entry_identity_at(
|
|
replacement["parent_descriptor"],
|
|
replacement["name"],
|
|
)
|
|
temporary_identity = _entry_identity_at(
|
|
replacement["parent_descriptor"],
|
|
replacement["candidate"],
|
|
)
|
|
except BaseException as rollback_exc:
|
|
rollback_failures.append(
|
|
f"{replacement['target']}: cannot inspect exchange state: "
|
|
f"{type(rollback_exc).__name__}: {rollback_exc}"
|
|
)
|
|
continue
|
|
candidate_at_temporary = candidate_is_intact(replacement, replacement["candidate"])
|
|
candidate_at_destination = candidate_is_intact(replacement, replacement["name"])
|
|
if candidate_at_temporary and candidate_at_destination:
|
|
rollback_failures.append(
|
|
f"{replacement['target']}: candidate inode is linked at both destination and temporary name"
|
|
)
|
|
continue
|
|
if candidate_at_temporary:
|
|
continue
|
|
if not candidate_at_destination:
|
|
rollback_failures.append(f"{replacement['target']}: destination changed after apply")
|
|
continue
|
|
try:
|
|
displaced_state: tuple[str, int] | None = entry_state(replacement, replacement["candidate"])
|
|
except (OSError, ValueError):
|
|
displaced_state = None
|
|
try:
|
|
_exchange_at(
|
|
replacement["parent_descriptor"],
|
|
replacement["candidate"],
|
|
replacement["name"],
|
|
)
|
|
except BaseException as rollback_exc:
|
|
if not rollback_exchange_is_valid(replacement, temporary_identity, displaced_state):
|
|
rollback_failures.append(f"{replacement['target']}: {type(rollback_exc).__name__}: {rollback_exc}")
|
|
else:
|
|
if not rollback_exchange_is_valid(replacement, temporary_identity, displaced_state):
|
|
rollback_failures.append(f"{replacement['target']}: rollback parity check failed")
|
|
if rollback_failures:
|
|
preserve_backups = True
|
|
recovery = _write_recovery_artifact(
|
|
root_descriptor,
|
|
repo_root,
|
|
failure=exc,
|
|
rollback_failures=rollback_failures,
|
|
replacements=replacements,
|
|
transaction_state="rollback-incomplete",
|
|
)
|
|
raise RuntimeError(f"overlay apply failed and rollback was incomplete; recovery: {recovery}") from exc
|
|
rollback_complete = True
|
|
if isinstance(exc, (KeyboardInterrupt, SystemExit)):
|
|
raise
|
|
raise RuntimeError("overlay apply failed and all replacements were rolled back") from exc
|
|
finally:
|
|
active_failure = sys.exc_info()[1]
|
|
try:
|
|
if not preserve_backups:
|
|
cleanup_failures: list[str] = []
|
|
cleanup_exception: BaseException | None = None
|
|
for replacement in replacements:
|
|
for temporary in (replacement["candidate"], replacement["backup"]):
|
|
if temporary is None:
|
|
continue
|
|
try:
|
|
_unlink_temporary(replacement["parent_descriptor"], temporary)
|
|
except BaseException as cleanup_exc:
|
|
cleanup_exception = cleanup_exc
|
|
cleanup_failures.append(
|
|
f"{replacement['target']}:{temporary}: {type(cleanup_exc).__name__}: {cleanup_exc}"
|
|
)
|
|
break
|
|
if cleanup_failures:
|
|
break
|
|
if cleanup_failures:
|
|
preserve_backups = True
|
|
transaction_state = (
|
|
"published" if published_all else "rolled-back" if rollback_complete else "not-fully-published"
|
|
)
|
|
cleanup_failure = RuntimeError(
|
|
f"overlay transaction is {transaction_state}, but temporary cleanup was incomplete"
|
|
)
|
|
try:
|
|
recovery = _write_recovery_artifact(
|
|
root_descriptor,
|
|
repo_root,
|
|
failure=active_failure or cleanup_failure,
|
|
rollback_failures=cleanup_failures,
|
|
replacements=replacements,
|
|
transaction_state=transaction_state,
|
|
)
|
|
except BaseException as recovery_exc:
|
|
cleanup_failure.add_note(
|
|
f"recovery artifact creation also failed: {type(recovery_exc).__name__}: {recovery_exc}"
|
|
)
|
|
else:
|
|
cleanup_failure = RuntimeError(f"{cleanup_failure}; recovery: {recovery}")
|
|
interrupt = active_failure if isinstance(active_failure, (KeyboardInterrupt, SystemExit)) else None
|
|
if interrupt is None and isinstance(cleanup_exception, (KeyboardInterrupt, SystemExit)):
|
|
interrupt = cleanup_exception
|
|
if interrupt is not None:
|
|
interrupt.add_note(str(cleanup_failure))
|
|
raise interrupt
|
|
raise cleanup_failure from active_failure
|
|
finally:
|
|
_close_prepared(root_descriptor, prepared)
|
|
return [replacement["target"].as_posix() for replacement in replacements]
|