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>
1056 lines
42 KiB
Python
1056 lines
42 KiB
Python
"""Immutable, copy-on-write task assets for workflow benchmark clones.
|
|
|
|
``sandbox_copy`` inputs can include a several-hundred-megabyte GitNexus
|
|
index. This module captures each declared input set once, freezes that
|
|
snapshot, and then reflinks it into every arm clone. A clone therefore gets
|
|
an independent inode without paying for another full buffered copy or being
|
|
able to mutate the snapshot used by another arm.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import errno
|
|
import fcntl
|
|
import hashlib
|
|
import json
|
|
import os
|
|
import posixpath
|
|
import shutil
|
|
import stat
|
|
import tempfile
|
|
import uuid
|
|
from collections.abc import Mapping
|
|
from dataclasses import dataclass
|
|
from pathlib import Path, PurePosixPath
|
|
from typing import Any
|
|
|
|
from .proposer_sandbox import (
|
|
SANDBOX_WORKSPACE,
|
|
ReadOnlyMount,
|
|
SandboxError,
|
|
_prepare_clone_target,
|
|
_real_directory,
|
|
)
|
|
|
|
# The shipped index is roughly 428 MiB. These are containment limits rather
|
|
# than expected-size assertions: they admit normal growth while preventing a
|
|
# task declaration from turning snapshot preparation into an unbounded walk.
|
|
MAX_TASK_ASSET_ENTRIES = 100_000
|
|
MAX_TASK_ASSET_PATH_BYTES = 4_096
|
|
MAX_TASK_ASSET_BYTES = 2 * 1024 * 1024 * 1024
|
|
|
|
# A filesystem without reflink support may still run tiny fixtures. Large
|
|
# assets fail closed instead of silently returning to one full copy per arm.
|
|
MAX_BUFFERED_FALLBACK_BYTES = 16 * 1024 * 1024
|
|
COPY_CHUNK_BYTES = 1024 * 1024
|
|
|
|
# linux/fs.h: #define FICLONE _IOW(0x94, 9, int)
|
|
FICLONE = 0x40049409
|
|
_REFLINK_UNAVAILABLE = {
|
|
errno.EXDEV,
|
|
errno.EINVAL,
|
|
errno.ENOTTY,
|
|
errno.EOPNOTSUPP,
|
|
errno.ENOSYS,
|
|
}
|
|
|
|
DEPENDENCY_CONTENT_BINDING_FIELD = "sandbox_dependency_content_digest"
|
|
DEPENDENCY_MANIFEST_BINDING_FIELD = "sandbox_dependency_manifest_digest"
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class AssetManifestEntry:
|
|
path: PurePosixPath
|
|
kind: str
|
|
size: int = 0
|
|
sha256: str = ""
|
|
mode: int = 0
|
|
link_target: str = ""
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class DependencySnapshot:
|
|
"""One declared dependency captured below the immutable snapshot root."""
|
|
|
|
source: str
|
|
target: str
|
|
snapshot_path: PurePosixPath
|
|
kind: str
|
|
entries: tuple[AssetManifestEntry, ...]
|
|
total_bytes: int
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class TaskAssetSnapshot:
|
|
"""A frozen task-asset tree and its provenance identity."""
|
|
|
|
root: Path
|
|
digest: str
|
|
manifest_digest: str
|
|
repo_identity: Path
|
|
resolved_sha: str
|
|
declarations: tuple[str, ...]
|
|
entries: tuple[AssetManifestEntry, ...]
|
|
dependency_declarations: tuple[tuple[str, str], ...]
|
|
dependencies: tuple[DependencySnapshot, ...]
|
|
dependency_content_digest: str
|
|
dependency_manifest_digest: str
|
|
total_bytes: int
|
|
|
|
@property
|
|
def dependency_binding(self) -> dict[str, str]:
|
|
"""Canonical fields stored in and validated against task bindings."""
|
|
|
|
return {
|
|
DEPENDENCY_CONTENT_BINDING_FIELD: self.dependency_content_digest,
|
|
DEPENDENCY_MANIFEST_BINDING_FIELD: self.dependency_manifest_digest,
|
|
}
|
|
|
|
def validate_dependency_binding(self, binding: Mapping[str, Any]) -> None:
|
|
"""Fail closed unless ``binding`` names this exact dependency snapshot."""
|
|
|
|
_validate_dependency_binding_values(
|
|
binding,
|
|
content_digest=self.dependency_content_digest,
|
|
manifest_digest=self.dependency_manifest_digest,
|
|
)
|
|
|
|
def materialize(self, clone: Path) -> None:
|
|
"""Replace every declared ``sandbox_copy`` root with its exact snapshot tree."""
|
|
|
|
clone = _real_directory(clone, label="asset-staging clone")
|
|
snapshot_root = _real_directory(self.root / "sandbox-copy", label="task asset snapshot")
|
|
staging = Path(tempfile.mkdtemp(prefix=".wfbench-assets-", dir=clone.parent))
|
|
fallback_bytes = 0
|
|
try:
|
|
for entry in self.entries:
|
|
destination = staging / Path(*entry.path.parts)
|
|
if entry.kind == "directory":
|
|
destination.mkdir(mode=0o700, parents=True, exist_ok=True)
|
|
continue
|
|
destination.parent.mkdir(mode=0o700, parents=True, exist_ok=True)
|
|
source = snapshot_root / Path(*entry.path.parts)
|
|
fallback_bytes += _materialize_file(
|
|
source,
|
|
destination,
|
|
entry,
|
|
fallback_budget=MAX_BUFFERED_FALLBACK_BYTES - fallback_bytes,
|
|
)
|
|
|
|
roots = tuple(PurePosixPath(declaration) for declaration in self.declarations)
|
|
for relative in roots:
|
|
_preflight_exact_root(clone, relative)
|
|
for relative in roots:
|
|
_publish_exact_root(staging, clone, relative)
|
|
finally:
|
|
shutil.rmtree(staging, ignore_errors=True)
|
|
|
|
def dependency_mounts(self, clone: Path) -> list[ReadOnlyMount]:
|
|
"""Mount only immutable captured dependency roots into an arm clone."""
|
|
|
|
clone = _real_directory(clone, label="dependency clone")
|
|
snapshot_root = _real_directory(self.root, label="task asset snapshot")
|
|
mounts: list[ReadOnlyMount] = []
|
|
for dependency in self.dependencies:
|
|
source = snapshot_root / Path(*dependency.snapshot_path.parts)
|
|
metadata = source.lstat()
|
|
expected_directory = dependency.kind == "directory"
|
|
if stat.S_ISLNK(metadata.st_mode) or (
|
|
expected_directory and not stat.S_ISDIR(metadata.st_mode)
|
|
) or (not expected_directory and not stat.S_ISREG(metadata.st_mode)):
|
|
raise SandboxError(f"dependency snapshot changed: {dependency.source}")
|
|
target = PurePosixPath(dependency.target)
|
|
_prepare_clone_target(
|
|
clone,
|
|
target,
|
|
directory=expected_directory,
|
|
label="dependency",
|
|
)
|
|
mounts.append(
|
|
ReadOnlyMount(
|
|
source=source,
|
|
target=f"{SANDBOX_WORKSPACE}/{target.as_posix()}",
|
|
)
|
|
)
|
|
return mounts
|
|
|
|
|
|
class TaskAssetCache:
|
|
"""Own immutable snapshots for one benchmark invocation."""
|
|
|
|
def __init__(self, root: Path):
|
|
self.root = root.expanduser().absolute()
|
|
self.root.mkdir(mode=0o700, parents=True, exist_ok=False)
|
|
self._by_definition: dict[
|
|
tuple[str, str, tuple[str, ...], tuple[tuple[str, str], ...]],
|
|
TaskAssetSnapshot,
|
|
] = {}
|
|
self._closed = False
|
|
|
|
def __enter__(self) -> TaskAssetCache:
|
|
return self
|
|
|
|
def __exit__(self, _exc_type: object, _exc: object, _traceback: object) -> None:
|
|
self.close()
|
|
|
|
def prepare(
|
|
self,
|
|
task: Mapping[str, Any],
|
|
*,
|
|
repo: Path,
|
|
resolved_sha: str,
|
|
expected_dependency_binding: Mapping[str, Any] | None = None,
|
|
) -> TaskAssetSnapshot:
|
|
"""Capture or reuse all copied and mounted task bytes in one snapshot."""
|
|
|
|
if self._closed:
|
|
raise SandboxError("task asset cache is already closed")
|
|
repo_identity = _real_directory(repo, label="task asset repository")
|
|
declarations, relative_paths = _sandbox_copy_declarations(task)
|
|
dependency_declarations = _sandbox_dependency_declarations(task)
|
|
dependency_identity = tuple(
|
|
(declaration.source, declaration.target) for declaration in dependency_declarations
|
|
)
|
|
definition = (str(repo_identity), resolved_sha, declarations, dependency_identity)
|
|
existing = self._by_definition.get(definition)
|
|
if existing is not None:
|
|
if expected_dependency_binding is not None:
|
|
existing.validate_dependency_binding(expected_dependency_binding)
|
|
return existing
|
|
|
|
building = Path(tempfile.mkdtemp(prefix=".building-", dir=self.root))
|
|
try:
|
|
copy_root = building / "sandbox-copy"
|
|
dependency_root = building / "dependencies"
|
|
copy_root.mkdir(mode=0o700)
|
|
dependency_root.mkdir(mode=0o700)
|
|
budget = _SnapshotBudget()
|
|
builder = _SnapshotBuilder(copy_root, budget=budget)
|
|
dependency_snapshots: list[DependencySnapshot] = []
|
|
repo_fd = os.open(
|
|
repo_identity,
|
|
os.O_RDONLY | os.O_DIRECTORY | getattr(os, "O_CLOEXEC", 0) | getattr(os, "O_NOFOLLOW", 0),
|
|
)
|
|
try:
|
|
for relative in relative_paths:
|
|
descriptor = _open_relative(repo_fd, relative)
|
|
try:
|
|
builder.copy_descriptor(descriptor, relative)
|
|
finally:
|
|
os.close(descriptor)
|
|
for index, declaration in enumerate(dependency_declarations):
|
|
container_name = f"{index:05d}"
|
|
container = dependency_root / container_name
|
|
container.mkdir(mode=0o700)
|
|
dependency_builder = _SnapshotBuilder(
|
|
container,
|
|
budget=budget,
|
|
allow_symlinks=True,
|
|
preserve_modes=True,
|
|
)
|
|
descriptor = _open_relative(repo_fd, declaration.source_path)
|
|
try:
|
|
dependency_builder.copy_descriptor(descriptor, PurePosixPath("payload"))
|
|
finally:
|
|
os.close(descriptor)
|
|
dependency_entries = dependency_builder.finished_entries()
|
|
_validate_dependency_symlinks(
|
|
container,
|
|
dependency_entries,
|
|
mount_target=declaration.target_path,
|
|
)
|
|
payload = next(
|
|
(entry for entry in dependency_entries if entry.path == PurePosixPath("payload")),
|
|
None,
|
|
)
|
|
if payload is None:
|
|
raise SandboxError(f"dependency snapshot is empty: {declaration.source}")
|
|
dependency_snapshots.append(
|
|
DependencySnapshot(
|
|
source=declaration.source,
|
|
target=declaration.target,
|
|
snapshot_path=PurePosixPath("dependencies", container_name, "payload"),
|
|
kind=payload.kind,
|
|
entries=dependency_entries,
|
|
total_bytes=dependency_builder.total_bytes,
|
|
)
|
|
)
|
|
finally:
|
|
os.close(repo_fd)
|
|
|
|
entries = builder.finished_entries()
|
|
manifest_digest = _manifest_digest(entries)
|
|
dependencies = tuple(dependency_snapshots)
|
|
dependency_content_digest, dependency_manifest_digest = _dependency_digests(dependencies)
|
|
if expected_dependency_binding is not None:
|
|
_validate_dependency_binding_values(
|
|
expected_dependency_binding,
|
|
content_digest=dependency_content_digest,
|
|
manifest_digest=dependency_manifest_digest,
|
|
)
|
|
digest = _snapshot_digest(
|
|
repo_identity=repo_identity,
|
|
resolved_sha=resolved_sha,
|
|
declarations=declarations,
|
|
manifest_digest=manifest_digest,
|
|
dependency_content_digest=dependency_content_digest,
|
|
dependency_manifest_digest=dependency_manifest_digest,
|
|
)
|
|
destination = self.root / digest
|
|
if destination.exists():
|
|
raise SandboxError(f"task asset snapshot key collision: {digest}")
|
|
os.replace(building, destination)
|
|
_freeze_snapshot(destination)
|
|
snapshot = TaskAssetSnapshot(
|
|
root=destination,
|
|
digest=digest,
|
|
manifest_digest=manifest_digest,
|
|
repo_identity=repo_identity,
|
|
resolved_sha=resolved_sha,
|
|
declarations=declarations,
|
|
entries=entries,
|
|
dependency_declarations=dependency_identity,
|
|
dependencies=dependencies,
|
|
dependency_content_digest=dependency_content_digest,
|
|
dependency_manifest_digest=dependency_manifest_digest,
|
|
total_bytes=budget.total_bytes,
|
|
)
|
|
self._by_definition[definition] = snapshot
|
|
return snapshot
|
|
except BaseException:
|
|
if building.exists():
|
|
shutil.rmtree(building, ignore_errors=True)
|
|
raise
|
|
|
|
def close(self) -> None:
|
|
if self._closed:
|
|
return
|
|
self._closed = True
|
|
if not self.root.exists():
|
|
return
|
|
_thaw_tree(self.root)
|
|
shutil.rmtree(self.root)
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class _DependencyDeclaration:
|
|
source: str
|
|
target: str
|
|
source_path: PurePosixPath
|
|
target_path: PurePosixPath
|
|
|
|
|
|
@dataclass
|
|
class _SnapshotBudget:
|
|
entries: int = 0
|
|
total_bytes: int = 0
|
|
|
|
|
|
class _SnapshotBuilder:
|
|
def __init__(
|
|
self,
|
|
destination: Path,
|
|
*,
|
|
budget: _SnapshotBudget | None = None,
|
|
allow_symlinks: bool = False,
|
|
preserve_modes: bool = False,
|
|
):
|
|
self.destination = destination
|
|
self.entries: dict[PurePosixPath, AssetManifestEntry] = {}
|
|
self.total_bytes = 0
|
|
self.budget = budget if budget is not None else _SnapshotBudget()
|
|
self.allow_symlinks = allow_symlinks
|
|
self.preserve_modes = preserve_modes
|
|
|
|
def copy_descriptor(self, descriptor: int, relative: PurePosixPath) -> None:
|
|
before = os.fstat(descriptor)
|
|
if stat.S_ISDIR(before.st_mode):
|
|
self._record_directory(relative)
|
|
try:
|
|
names = sorted(os.listdir(descriptor))
|
|
except OSError as exc:
|
|
raise SandboxError(f"sandbox_copy directory is unreadable: {relative}: {exc}") from exc
|
|
for name in names:
|
|
child_relative = relative / name
|
|
child_metadata = os.stat(name, dir_fd=descriptor, follow_symlinks=False)
|
|
if stat.S_ISLNK(child_metadata.st_mode):
|
|
if not self.allow_symlinks:
|
|
raise SandboxError(f"sandbox_copy must not traverse a symlink: {child_relative}")
|
|
self._copy_symlink(descriptor, name, child_relative, child_metadata)
|
|
continue
|
|
child = _open_child(descriptor, name, child_relative)
|
|
try:
|
|
self.copy_descriptor(child, child_relative)
|
|
finally:
|
|
os.close(child)
|
|
after = os.fstat(descriptor)
|
|
if _mutation_identity(before) != _mutation_identity(after):
|
|
raise SandboxError(f"sandbox_copy directory changed while snapshotting: {relative}")
|
|
return
|
|
if not stat.S_ISREG(before.st_mode):
|
|
raise SandboxError(f"sandbox_copy accepts only regular files and directories: {relative}")
|
|
self._copy_file(descriptor, relative, before)
|
|
|
|
def _record_directory(self, relative: PurePosixPath) -> None:
|
|
self._ensure_parents(relative.parent)
|
|
self._record(AssetManifestEntry(path=relative, kind="directory"))
|
|
destination = self.destination / Path(*relative.parts)
|
|
destination.mkdir(mode=0o700, exist_ok=True)
|
|
|
|
def _copy_file(self, descriptor: int, relative: PurePosixPath, before: os.stat_result) -> None:
|
|
self._ensure_parents(relative.parent)
|
|
if self.budget.total_bytes + before.st_size > MAX_TASK_ASSET_BYTES:
|
|
raise SandboxError("sandbox_copy exceeds the total byte limit")
|
|
destination = self.destination / Path(*relative.parts)
|
|
flags = os.O_WRONLY | os.O_CREAT | os.O_EXCL | getattr(os, "O_CLOEXEC", 0)
|
|
output = os.open(destination, flags, 0o600)
|
|
digest = hashlib.sha256()
|
|
copied = 0
|
|
try:
|
|
while True:
|
|
chunk = _read_source_chunk(descriptor, COPY_CHUNK_BYTES)
|
|
if not chunk:
|
|
break
|
|
copied += len(chunk)
|
|
if self.budget.total_bytes + copied > MAX_TASK_ASSET_BYTES:
|
|
raise SandboxError("sandbox_copy exceeds the total byte limit")
|
|
digest.update(chunk)
|
|
_write_all(output, chunk)
|
|
captured_mode = stat.S_IMODE(before.st_mode) if self.preserve_modes else 0
|
|
frozen_mode = 0o400 | (0o100 if self.preserve_modes and captured_mode & 0o111 else 0)
|
|
os.fchmod(output, frozen_mode)
|
|
finally:
|
|
os.close(output)
|
|
after = os.fstat(descriptor)
|
|
if copied != before.st_size or _mutation_identity(before) != _mutation_identity(after):
|
|
raise SandboxError(f"sandbox_copy file changed while snapshotting: {relative}")
|
|
self.total_bytes += copied
|
|
self.budget.total_bytes += copied
|
|
self._record(
|
|
AssetManifestEntry(
|
|
path=relative,
|
|
kind="file",
|
|
size=copied,
|
|
sha256=digest.hexdigest(),
|
|
mode=captured_mode,
|
|
)
|
|
)
|
|
|
|
def _copy_symlink(
|
|
self,
|
|
parent_descriptor: int,
|
|
name: str,
|
|
relative: PurePosixPath,
|
|
before: os.stat_result,
|
|
) -> None:
|
|
try:
|
|
target = os.readlink(name, dir_fd=parent_descriptor)
|
|
target_bytes = target.encode("utf-8")
|
|
except (OSError, UnicodeEncodeError) as exc:
|
|
raise SandboxError(f"dependency symlink is unreadable or not UTF-8: {relative}") from exc
|
|
if not target or PurePosixPath(target).is_absolute() or "\x00" in target:
|
|
raise SandboxError(f"dependency symlink must be a bounded relative link: {relative}")
|
|
if len(target_bytes) > MAX_TASK_ASSET_PATH_BYTES:
|
|
raise SandboxError(f"dependency symlink target exceeds the path limit: {relative}")
|
|
if self.budget.total_bytes + len(target_bytes) > MAX_TASK_ASSET_BYTES:
|
|
raise SandboxError("sandbox_copy exceeds the total byte limit")
|
|
destination = self.destination / Path(*relative.parts)
|
|
os.symlink(target, destination)
|
|
after = os.stat(name, dir_fd=parent_descriptor, follow_symlinks=False)
|
|
if _mutation_identity(before) != _mutation_identity(after) or os.readlink(
|
|
name,
|
|
dir_fd=parent_descriptor,
|
|
) != target:
|
|
raise SandboxError(f"dependency symlink changed while snapshotting: {relative}")
|
|
self.total_bytes += len(target_bytes)
|
|
self.budget.total_bytes += len(target_bytes)
|
|
self._record(
|
|
AssetManifestEntry(
|
|
path=relative,
|
|
kind="symlink",
|
|
size=len(target_bytes),
|
|
sha256=hashlib.sha256(target_bytes).hexdigest(),
|
|
link_target=target,
|
|
)
|
|
)
|
|
|
|
def _ensure_parents(self, relative: PurePosixPath) -> None:
|
|
current = PurePosixPath()
|
|
for part in relative.parts:
|
|
current /= part
|
|
existing = self.entries.get(current)
|
|
if existing is not None:
|
|
if existing.kind != "directory":
|
|
raise SandboxError(f"sandbox_copy paths collide at {current}")
|
|
continue
|
|
self._record(AssetManifestEntry(path=current, kind="directory"))
|
|
(self.destination / Path(*current.parts)).mkdir(mode=0o700, exist_ok=True)
|
|
|
|
def _record(self, entry: AssetManifestEntry) -> None:
|
|
_validate_manifest_path(entry.path)
|
|
existing = self.entries.get(entry.path)
|
|
if existing is not None:
|
|
if existing != entry:
|
|
raise SandboxError(f"sandbox_copy paths collide at {entry.path}")
|
|
return
|
|
if self.budget.entries >= MAX_TASK_ASSET_ENTRIES:
|
|
raise SandboxError("sandbox_copy exceeds the entry limit")
|
|
self.entries[entry.path] = entry
|
|
self.budget.entries += 1
|
|
|
|
def finished_entries(self) -> tuple[AssetManifestEntry, ...]:
|
|
return tuple(sorted(self.entries.values(), key=lambda entry: entry.path.as_posix()))
|
|
|
|
|
|
def _sandbox_copy_declarations(
|
|
task: Mapping[str, Any],
|
|
) -> tuple[tuple[str, ...], tuple[PurePosixPath, ...]]:
|
|
raw_declarations = task.get("sandbox_copy", [])
|
|
if not isinstance(raw_declarations, list) or not all(isinstance(item, str) and item for item in raw_declarations):
|
|
raise SandboxError("sandbox_copy must be a list of nonblank repository-relative paths")
|
|
declarations = tuple(raw_declarations)
|
|
paths: list[PurePosixPath] = []
|
|
for raw in declarations:
|
|
relative = PurePosixPath(raw)
|
|
if relative.is_absolute() or not relative.parts or ".." in relative.parts:
|
|
raise SandboxError(f"sandbox_copy must be a repository-relative path: {raw!r}")
|
|
_validate_manifest_path(relative)
|
|
paths.append(relative)
|
|
for index, path in enumerate(paths):
|
|
for other in paths[index + 1 :]:
|
|
if path == other or path in other.parents or other in path.parents:
|
|
raise SandboxError(f"sandbox_copy declarations overlap: {path} and {other}")
|
|
return declarations, tuple(paths)
|
|
|
|
|
|
def _sandbox_dependency_declarations(
|
|
task: Mapping[str, Any],
|
|
) -> tuple[_DependencyDeclaration, ...]:
|
|
raw_declarations = task.get("sandbox_dependencies", [])
|
|
if not isinstance(raw_declarations, list):
|
|
raise SandboxError("sandbox_dependencies must be a list")
|
|
declarations: list[_DependencyDeclaration] = []
|
|
for item in raw_declarations:
|
|
if (
|
|
not isinstance(item, Mapping)
|
|
or set(item) != {"source", "target"}
|
|
or not all(isinstance(item[field], str) and item[field] for field in ("source", "target"))
|
|
):
|
|
raise SandboxError("sandbox_dependencies entries require only nonblank source and target")
|
|
source = str(item["source"])
|
|
target = str(item["target"])
|
|
source_path = PurePosixPath(source)
|
|
target_path = PurePosixPath(target)
|
|
if source_path.is_absolute() or ".." in source_path.parts or not source_path.parts:
|
|
raise SandboxError(f"dependency source must stay inside the repository: {source_path}")
|
|
if target_path.is_absolute() or ".." in target_path.parts or not target_path.parts:
|
|
raise SandboxError(f"dependency target must stay inside the clone: {target_path}")
|
|
_validate_manifest_path(source_path)
|
|
_validate_manifest_path(target_path)
|
|
declarations.append(
|
|
_DependencyDeclaration(
|
|
source=source,
|
|
target=target,
|
|
source_path=source_path,
|
|
target_path=target_path,
|
|
)
|
|
)
|
|
for index, declaration in enumerate(declarations):
|
|
for other in declarations[index + 1 :]:
|
|
if (
|
|
declaration.target_path == other.target_path
|
|
or declaration.target_path in other.target_path.parents
|
|
or other.target_path in declaration.target_path.parents
|
|
):
|
|
raise SandboxError(
|
|
f"sandbox dependency targets overlap: {declaration.target} and {other.target}"
|
|
)
|
|
return tuple(declarations)
|
|
|
|
|
|
def _open_relative(repo_descriptor: int, relative: PurePosixPath) -> int:
|
|
current = os.dup(repo_descriptor)
|
|
try:
|
|
for index, part in enumerate(relative.parts):
|
|
last = index == len(relative.parts) - 1
|
|
child = _open_child(current, part, PurePosixPath(*relative.parts[: index + 1]), require_directory=not last)
|
|
os.close(current)
|
|
current = child
|
|
return current
|
|
except BaseException:
|
|
os.close(current)
|
|
raise
|
|
|
|
|
|
def _open_child(
|
|
parent_descriptor: int,
|
|
name: str,
|
|
relative: PurePosixPath,
|
|
*,
|
|
require_directory: bool = False,
|
|
) -> int:
|
|
try:
|
|
metadata = os.stat(name, dir_fd=parent_descriptor, follow_symlinks=False)
|
|
except OSError as exc:
|
|
raise SandboxError(f"sandbox_copy path is unavailable: {relative}: {exc}") from exc
|
|
if stat.S_ISLNK(metadata.st_mode):
|
|
raise SandboxError(f"sandbox_copy must not traverse a symlink: {relative}")
|
|
if require_directory and not stat.S_ISDIR(metadata.st_mode):
|
|
raise SandboxError(f"sandbox_copy parent must be a directory: {relative}")
|
|
if not (stat.S_ISDIR(metadata.st_mode) or stat.S_ISREG(metadata.st_mode)):
|
|
raise SandboxError(f"sandbox_copy accepts only regular files and directories: {relative}")
|
|
flags = os.O_RDONLY | getattr(os, "O_CLOEXEC", 0) | getattr(os, "O_NOFOLLOW", 0)
|
|
if stat.S_ISDIR(metadata.st_mode):
|
|
flags |= os.O_DIRECTORY
|
|
else:
|
|
flags |= getattr(os, "O_NONBLOCK", 0)
|
|
try:
|
|
descriptor = os.open(name, flags, dir_fd=parent_descriptor)
|
|
except OSError as exc:
|
|
raise SandboxError(f"sandbox_copy path changed or is unreadable: {relative}: {exc}") from exc
|
|
opened = os.fstat(descriptor)
|
|
if not (stat.S_ISDIR(opened.st_mode) or stat.S_ISREG(opened.st_mode)):
|
|
os.close(descriptor)
|
|
raise SandboxError(f"sandbox_copy accepts only regular files and directories: {relative}")
|
|
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(descriptor)
|
|
raise SandboxError(f"sandbox_copy path changed while opening: {relative}")
|
|
return descriptor
|
|
|
|
|
|
def _validate_dependency_symlinks(
|
|
container: Path,
|
|
entries: tuple[AssetManifestEntry, ...],
|
|
*,
|
|
mount_target: PurePosixPath,
|
|
) -> None:
|
|
snapshot_boundary = (container / "payload").resolve(strict=True)
|
|
manifest_boundary = PurePosixPath("payload")
|
|
sandbox_boundary = PurePosixPath(SANDBOX_WORKSPACE)
|
|
sandbox_mount = sandbox_boundary / mount_target
|
|
for entry in entries:
|
|
if entry.kind != "symlink":
|
|
continue
|
|
target = PurePosixPath(entry.link_target)
|
|
relative_to_payload = entry.path.relative_to(manifest_boundary)
|
|
sandbox_resolved = PurePosixPath(
|
|
posixpath.normpath((sandbox_mount / relative_to_payload.parent / target).as_posix())
|
|
)
|
|
if sandbox_resolved != sandbox_boundary and sandbox_boundary not in sandbox_resolved.parents:
|
|
raise SandboxError(f"dependency symlink escapes the sandbox workspace: {entry.path}")
|
|
manifest_resolved = PurePosixPath(
|
|
posixpath.normpath((entry.path.parent / target).as_posix())
|
|
)
|
|
if manifest_resolved != manifest_boundary and manifest_boundary not in manifest_resolved.parents:
|
|
continue
|
|
link = container / Path(*entry.path.parts)
|
|
try:
|
|
resolved = link.resolve(strict=True)
|
|
resolved.relative_to(snapshot_boundary)
|
|
except (OSError, RuntimeError, ValueError) as exc:
|
|
raise SandboxError(f"dependency symlink is dangling or escapes its snapshot: {entry.path}") from exc
|
|
|
|
|
|
def _preflight_exact_root(clone: Path, relative: PurePosixPath) -> None:
|
|
"""Reject symlink/special hazards while permitting replaceable type conflicts."""
|
|
|
|
flags = os.O_RDONLY | os.O_DIRECTORY | getattr(os, "O_CLOEXEC", 0) | getattr(os, "O_NOFOLLOW", 0)
|
|
current = os.open(clone, flags)
|
|
try:
|
|
for index, part in enumerate(relative.parts):
|
|
try:
|
|
mode = os.stat(part, dir_fd=current, follow_symlinks=False).st_mode
|
|
except FileNotFoundError:
|
|
return
|
|
last = index == len(relative.parts) - 1
|
|
if stat.S_ISLNK(mode):
|
|
role = "target cannot be a symlink" if last else "target has a symlink parent"
|
|
raise SandboxError(f"sandbox_copy {role}: {relative}")
|
|
if last:
|
|
if not (stat.S_ISDIR(mode) or stat.S_ISREG(mode)):
|
|
raise SandboxError(f"sandbox_copy target has an unsupported type: {relative}")
|
|
return
|
|
if stat.S_ISREG(mode):
|
|
return
|
|
if not stat.S_ISDIR(mode):
|
|
raise SandboxError(f"sandbox_copy target parent has an unsupported type: {relative}")
|
|
next_descriptor = os.open(part, flags, dir_fd=current)
|
|
os.close(current)
|
|
current = next_descriptor
|
|
finally:
|
|
os.close(current)
|
|
|
|
|
|
def _open_publish_parent(clone: Path, parent: PurePosixPath) -> int:
|
|
flags = os.O_RDONLY | os.O_DIRECTORY | getattr(os, "O_CLOEXEC", 0) | getattr(os, "O_NOFOLLOW", 0)
|
|
current = os.open(clone, flags)
|
|
try:
|
|
for part in parent.parts:
|
|
try:
|
|
mode = os.stat(part, dir_fd=current, follow_symlinks=False).st_mode
|
|
except FileNotFoundError:
|
|
mode = None
|
|
if mode is not None and stat.S_ISLNK(mode):
|
|
raise SandboxError(f"sandbox_copy target cannot traverse a symlink: {parent}")
|
|
if mode is not None and not stat.S_ISDIR(mode):
|
|
if not stat.S_ISREG(mode):
|
|
raise SandboxError(f"sandbox_copy target parent has an unsupported type: {parent}")
|
|
os.unlink(part, dir_fd=current)
|
|
mode = None
|
|
if mode is None:
|
|
os.mkdir(part, mode=0o700, dir_fd=current)
|
|
next_descriptor = os.open(part, flags, dir_fd=current)
|
|
os.close(current)
|
|
current = next_descriptor
|
|
return current
|
|
except BaseException:
|
|
os.close(current)
|
|
raise
|
|
|
|
|
|
def _open_existing_parent(root: Path, parent: PurePosixPath) -> int:
|
|
flags = os.O_RDONLY | os.O_DIRECTORY | getattr(os, "O_CLOEXEC", 0) | getattr(os, "O_NOFOLLOW", 0)
|
|
current = os.open(root, flags)
|
|
try:
|
|
for part in parent.parts:
|
|
next_descriptor = os.open(part, flags, dir_fd=current)
|
|
os.close(current)
|
|
current = next_descriptor
|
|
return current
|
|
except BaseException:
|
|
os.close(current)
|
|
raise
|
|
|
|
|
|
def _remove_entry_at(parent: int, name: str, relative: PurePosixPath) -> None:
|
|
try:
|
|
mode = os.stat(name, dir_fd=parent, follow_symlinks=False).st_mode
|
|
except FileNotFoundError:
|
|
return
|
|
if stat.S_ISLNK(mode) or stat.S_ISREG(mode):
|
|
os.unlink(name, dir_fd=parent)
|
|
return
|
|
if not stat.S_ISDIR(mode):
|
|
raise SandboxError(f"sandbox_copy target has an unsupported type: {relative}")
|
|
flags = os.O_RDONLY | os.O_DIRECTORY | getattr(os, "O_CLOEXEC", 0) | getattr(os, "O_NOFOLLOW", 0)
|
|
directory = os.open(name, flags, dir_fd=parent)
|
|
try:
|
|
for child in os.listdir(directory):
|
|
_remove_entry_at(directory, child, relative / child)
|
|
finally:
|
|
os.close(directory)
|
|
os.rmdir(name, dir_fd=parent)
|
|
|
|
|
|
def _publish_exact_root(staging: Path, clone: Path, relative: PurePosixPath) -> None:
|
|
source_parent = _open_existing_parent(staging, relative.parent)
|
|
destination_parent = _open_publish_parent(clone, relative.parent)
|
|
try:
|
|
_remove_entry_at(destination_parent, relative.name, relative)
|
|
os.rename(
|
|
relative.name,
|
|
relative.name,
|
|
src_dir_fd=source_parent,
|
|
dst_dir_fd=destination_parent,
|
|
)
|
|
finally:
|
|
os.close(destination_parent)
|
|
os.close(source_parent)
|
|
|
|
|
|
def _materialize_file(
|
|
source: Path,
|
|
destination: Path,
|
|
entry: AssetManifestEntry,
|
|
*,
|
|
fallback_budget: int,
|
|
) -> int:
|
|
metadata = source.lstat()
|
|
if stat.S_ISLNK(metadata.st_mode) or not stat.S_ISREG(metadata.st_mode) or metadata.st_size != entry.size:
|
|
raise SandboxError(f"task asset snapshot file changed: {entry.path}")
|
|
temporary = destination.with_name(f".{destination.name}.{uuid.uuid4().hex}.tmp")
|
|
source_descriptor = os.open(source, os.O_RDONLY | getattr(os, "O_CLOEXEC", 0) | getattr(os, "O_NOFOLLOW", 0))
|
|
destination_descriptor = os.open(
|
|
temporary,
|
|
os.O_WRONLY | os.O_CREAT | os.O_EXCL | getattr(os, "O_CLOEXEC", 0),
|
|
0o600,
|
|
)
|
|
fallback_bytes = 0
|
|
try:
|
|
opened = os.fstat(source_descriptor)
|
|
if _mutation_identity(opened) != _mutation_identity(metadata):
|
|
raise SandboxError(f"task asset snapshot file changed: {entry.path}")
|
|
if _try_reflink(source_descriptor, destination_descriptor):
|
|
if os.fstat(destination_descriptor).st_size != entry.size:
|
|
raise SandboxError(f"task asset reflink produced an invalid file: {entry.path}")
|
|
else:
|
|
if entry.size > fallback_budget:
|
|
raise SandboxError(
|
|
"task asset filesystem cannot reflink the snapshot and the buffered fallback limit would be exceeded"
|
|
)
|
|
os.ftruncate(destination_descriptor, 0)
|
|
os.lseek(source_descriptor, 0, os.SEEK_SET)
|
|
while True:
|
|
chunk = os.read(source_descriptor, COPY_CHUNK_BYTES)
|
|
if not chunk:
|
|
break
|
|
_write_all(destination_descriptor, chunk)
|
|
fallback_bytes += len(chunk)
|
|
if fallback_bytes != entry.size:
|
|
raise SandboxError(f"task asset snapshot file changed while materializing: {entry.path}")
|
|
if _mutation_identity(opened) != _mutation_identity(os.fstat(source_descriptor)):
|
|
raise SandboxError(f"task asset snapshot file changed while materializing: {entry.path}")
|
|
os.fchmod(destination_descriptor, 0o600)
|
|
finally:
|
|
os.close(destination_descriptor)
|
|
os.close(source_descriptor)
|
|
try:
|
|
os.replace(temporary, destination)
|
|
except BaseException:
|
|
temporary.unlink(missing_ok=True)
|
|
raise
|
|
return fallback_bytes
|
|
|
|
|
|
def _try_reflink(source_descriptor: int, destination_descriptor: int) -> bool:
|
|
try:
|
|
fcntl.ioctl(destination_descriptor, FICLONE, source_descriptor)
|
|
return True
|
|
except OSError as exc:
|
|
if exc.errno in _REFLINK_UNAVAILABLE:
|
|
return False
|
|
raise
|
|
|
|
|
|
def _read_source_chunk(descriptor: int, size: int) -> bytes:
|
|
return os.read(descriptor, size)
|
|
|
|
|
|
def _write_all(descriptor: int, data: bytes) -> None:
|
|
view = memoryview(data)
|
|
while view:
|
|
written = os.write(descriptor, view)
|
|
if written <= 0:
|
|
raise OSError("short write while copying task assets")
|
|
view = view[written:]
|
|
|
|
|
|
def _mutation_identity(metadata: os.stat_result) -> tuple[int, int, int, int, int, int]:
|
|
return (
|
|
metadata.st_dev,
|
|
metadata.st_ino,
|
|
metadata.st_mode,
|
|
metadata.st_size,
|
|
metadata.st_mtime_ns,
|
|
metadata.st_ctime_ns,
|
|
)
|
|
|
|
|
|
def _validate_manifest_path(relative: PurePosixPath) -> None:
|
|
try:
|
|
path_bytes = len(relative.as_posix().encode("utf-8"))
|
|
except UnicodeEncodeError as exc:
|
|
raise SandboxError(f"sandbox_copy path is not valid UTF-8: {relative!s}") from exc
|
|
if path_bytes > MAX_TASK_ASSET_PATH_BYTES:
|
|
raise SandboxError("sandbox_copy exceeds the path byte limit")
|
|
|
|
|
|
def _manifest_digest(entries: tuple[AssetManifestEntry, ...]) -> str:
|
|
payload = [
|
|
{
|
|
"kind": entry.kind,
|
|
"link_target": entry.link_target,
|
|
"mode": entry.mode,
|
|
"path": entry.path.as_posix(),
|
|
"sha256": entry.sha256,
|
|
"size": entry.size,
|
|
}
|
|
for entry in entries
|
|
]
|
|
return hashlib.sha256(json.dumps(payload, sort_keys=True, separators=(",", ":")).encode()).hexdigest()
|
|
|
|
|
|
def _dependency_digests(dependencies: tuple[DependencySnapshot, ...]) -> tuple[str, str]:
|
|
content_payload = [
|
|
{
|
|
"entries": [
|
|
{
|
|
"kind": entry.kind,
|
|
"link_target": entry.link_target,
|
|
"mode": entry.mode,
|
|
"path": entry.path.as_posix(),
|
|
"sha256": entry.sha256,
|
|
"size": entry.size,
|
|
}
|
|
for entry in dependency.entries
|
|
]
|
|
}
|
|
for dependency in dependencies
|
|
]
|
|
content_digest = hashlib.sha256(
|
|
json.dumps(content_payload, sort_keys=True, separators=(",", ":")).encode()
|
|
).hexdigest()
|
|
manifest_payload = {
|
|
"dependencies": [
|
|
{
|
|
"content": content,
|
|
"source": dependency.source,
|
|
"target": dependency.target,
|
|
}
|
|
for dependency, content in zip(dependencies, content_payload, strict=True)
|
|
],
|
|
"schema_version": 1,
|
|
}
|
|
manifest_digest = hashlib.sha256(
|
|
json.dumps(manifest_payload, sort_keys=True, separators=(",", ":")).encode()
|
|
).hexdigest()
|
|
return content_digest, manifest_digest
|
|
|
|
|
|
def _validate_dependency_binding_values(
|
|
binding: Mapping[str, Any],
|
|
*,
|
|
content_digest: str,
|
|
manifest_digest: str,
|
|
) -> None:
|
|
expected = {
|
|
DEPENDENCY_CONTENT_BINDING_FIELD: content_digest,
|
|
DEPENDENCY_MANIFEST_BINDING_FIELD: manifest_digest,
|
|
}
|
|
supplied = {field: binding.get(field) for field in expected}
|
|
if supplied != expected:
|
|
raise SandboxError("sandbox dependency content changed after task binding")
|
|
|
|
|
|
def _snapshot_digest(
|
|
*,
|
|
repo_identity: Path,
|
|
resolved_sha: str,
|
|
declarations: tuple[str, ...],
|
|
manifest_digest: str,
|
|
dependency_content_digest: str,
|
|
dependency_manifest_digest: str,
|
|
) -> str:
|
|
payload = {
|
|
"declarations": declarations,
|
|
"dependency_content_digest": dependency_content_digest,
|
|
"dependency_manifest_digest": dependency_manifest_digest,
|
|
"manifest_digest": manifest_digest,
|
|
"repo_identity": str(repo_identity),
|
|
"resolved_sha": resolved_sha,
|
|
"schema_version": 2,
|
|
}
|
|
return hashlib.sha256(json.dumps(payload, sort_keys=True, separators=(",", ":")).encode()).hexdigest()
|
|
|
|
|
|
def _freeze_snapshot(root: Path) -> None:
|
|
for current, directories, files in os.walk(root, topdown=False, followlinks=False):
|
|
for name in files:
|
|
path = Path(current) / name
|
|
mode = path.lstat().st_mode
|
|
relative = path.relative_to(root)
|
|
if stat.S_ISLNK(mode):
|
|
if not relative.parts or relative.parts[0] != "dependencies":
|
|
raise SandboxError(f"task asset snapshot contains an unexpected symlink: {path}")
|
|
continue
|
|
if not stat.S_ISREG(mode):
|
|
raise SandboxError(f"task asset snapshot contains a special file: {path}")
|
|
path.chmod(0o400 | (0o100 if stat.S_IMODE(mode) & 0o111 else 0))
|
|
for name in directories:
|
|
path = Path(current) / name
|
|
mode = path.lstat().st_mode
|
|
relative = path.relative_to(root)
|
|
if stat.S_ISLNK(mode):
|
|
if not relative.parts or relative.parts[0] != "dependencies":
|
|
raise SandboxError(f"task asset snapshot contains an unexpected symlink: {path}")
|
|
continue
|
|
if not stat.S_ISDIR(mode):
|
|
raise SandboxError(f"task asset snapshot contains a special directory: {path}")
|
|
path.chmod(0o500)
|
|
Path(current).chmod(0o500)
|
|
|
|
|
|
def _thaw_tree(root: Path) -> None:
|
|
for current, directories, files in os.walk(root, topdown=True, followlinks=False):
|
|
Path(current).chmod(0o700)
|
|
for name in directories:
|
|
path = Path(current) / name
|
|
if not path.is_symlink():
|
|
path.chmod(0o700)
|
|
for name in files:
|
|
path = Path(current) / name
|
|
if not path.is_symlink():
|
|
path.chmod(0o600)
|
|
|
|
|
|
def capture_task_dependency_binding(
|
|
task: Mapping[str, Any],
|
|
*,
|
|
repo: Path,
|
|
resolved_sha: str,
|
|
) -> dict[str, str]:
|
|
"""Capture dependency bytes long enough to produce their canonical binding."""
|
|
|
|
dependency_task = {
|
|
"sandbox_copy": [],
|
|
"sandbox_dependencies": task.get("sandbox_dependencies", []),
|
|
}
|
|
with tempfile.TemporaryDirectory(prefix="wfbench-dependency-binding-") as temporary:
|
|
with TaskAssetCache(Path(temporary) / "cache") as cache:
|
|
snapshot = cache.prepare(dependency_task, repo=repo, resolved_sha=resolved_sha)
|
|
return snapshot.dependency_binding
|
|
|
|
|
|
def _dependency_mounts(
|
|
task: Mapping[str, Any],
|
|
*,
|
|
clone: Path,
|
|
snapshot: TaskAssetSnapshot,
|
|
) -> list[ReadOnlyMount]:
|
|
declarations = tuple(
|
|
(declaration.source, declaration.target)
|
|
for declaration in _sandbox_dependency_declarations(task)
|
|
)
|
|
if snapshot.dependency_declarations != declarations:
|
|
raise SandboxError("task asset snapshot does not match this dependency declaration")
|
|
return snapshot.dependency_mounts(clone)
|
|
|
|
|
|
def stage_task_assets(
|
|
task: Mapping[str, Any],
|
|
*,
|
|
repo: Path,
|
|
clone: Path,
|
|
snapshot: TaskAssetSnapshot | None = None,
|
|
) -> list[ReadOnlyMount]:
|
|
"""Materialize copied assets and validate read-only dependency mounts.
|
|
|
|
``snapshot`` is supplied by the benchmark runner so every arm reuses one
|
|
capture. The optional path preserves the historic standalone helper API
|
|
for containment tests and external callers.
|
|
"""
|
|
|
|
repo_identity = _real_directory(repo, label="task asset repository")
|
|
declarations, _ = _sandbox_copy_declarations(task)
|
|
if snapshot is not None:
|
|
if snapshot.repo_identity != repo_identity or snapshot.declarations != declarations:
|
|
raise SandboxError("task asset snapshot does not match this task declaration")
|
|
snapshot.materialize(clone)
|
|
return _dependency_mounts(task, clone=clone, snapshot=snapshot)
|
|
|
|
if _sandbox_dependency_declarations(task):
|
|
raise SandboxError("sandbox_dependencies require a caller-owned immutable task asset snapshot")
|
|
|
|
with tempfile.TemporaryDirectory(prefix="wfbench-asset-snapshot-") as temporary:
|
|
with TaskAssetCache(Path(temporary) / "cache") as cache:
|
|
ephemeral = cache.prepare(task, repo=repo_identity, resolved_sha="unbound")
|
|
ephemeral.materialize(clone)
|
|
return []
|