FE-745: Epic-scoped sandbox merge for verify-epic by kostandinang · Pull Request #152 · hashintel/brunch

kostandinang · 2026-05-22T15:44:49Z

Summary

verify-epic now runs in a merged tree at <parentSandbox>/__epic__/<epicId>/ built from completed slice sandboxes, following plan order (later slice wins on duplicate relative paths).
Adds epic-sandbox-merge handler/transition and epic-sandbox-merged report event; SPEC invariant I124-K captures merge semantics for reviewers and future automation.

Context

FE-743 gave each slice an isolated sandbox and enabled parallel firing. Epic integration tests that span multiple slices previously executed in an empty parent sandbox, so multi-slice plans with cross-slice checks could not pass honestly.
Merge order follows plan topology so dependency direction is reflected in which slice artifacts land in the epic tree when paths collide.
Follow-up fixes in this branch address parallel races, rework orphans, and dependency seeding so merge does not overwrite in-flight slice work.

What changed

epic-sandbox-merge: assembles slice outputs into an epic-scoped directory immediately before verify-epic runs.
Dependency-aware seeding and pruning so parallel rework and cross-epic dependencies preserve completed slice artifacts and do not leave orphan sandboxes.
Reserved __epic__ slice id rejected at validation time to prevent merge namespace poisoning.

Verification

Five focused merger unit tests plus updated engine contract coverage on the epic verification path.
npm run verify green.

Out of scope

Declarative conditional output arcs and static reachability (FE-747).
Promoting cook branches or merging run results back to the user’s main branch (artifact lifecycle frontier).

Traceability

Requirement 49; decision D159-K; invariant I124-K; frontier petri-epic-verification-merge in memory/PLAN.md; umbrella H-6476.

cursor · 2026-05-22T15:44:56Z

PR Summary

Medium Risk
Changes filesystem merge and sandbox cwd semantics for epic integration tests; impact is bounded to cook worktrees and is heavily unit/contract tested, but wrong merge order or seeding could still break multi-slice runs.

Overview
Epic verification no longer runs in the parent worktree or a single slice dir. Before verify-epic, the orchestrator rebuilds <parentSandbox>/__epic__/<epicId>/ by merging completed slice worktrees in plan order (later slice wins on path clashes; clashes are logged on the epic-sandbox-merged report). Slice trees are not modified by the merge.

A new epic-sandbox-merge module drives that merge, plan-derived slice/epic inclusion (including cross-epic depends_on), and dependency seeding into slice sandboxes at action/test time (preserveExisting so parallel work is not overwritten). net-compiler wires verify-epic to the merged dir and drops the old parent-sandbox fallback.

SPEC/PLAN record invariant I124-K and mark petri-epic-verification-merge done. Contract tests assert the merged path and event; dedicated merge unit tests cover collisions, symlinks, and safety checks.

Smaller diffs: txt fixture plan defers scaffolding epic integration until text-ops exists; brunch --version reads package.json with tests/version.test.ts.

^{Reviewed by Cursor Bugbot for commit 1c4e36a. Bugbot is set up for automated code reviews on this repo. Configure here.}

kostandinang · 2026-05-22T15:45:03Z

This stack of pull requests is managed by Graphite. Learn more about stacking.

augmentcode · 2026-05-22T15:48:22Z

🤖 Augment PR Summary

Summary: This PR fixes multi-slice epic verification by running verify-epic against a deterministic, freshly-merged epic-scoped sandbox directory.

Changes:

Added mergeSlicesIntoEpicSandbox to materialize <parentSandboxDir>/__epic__/<epicId>/ from completed slice worktrees, with last-wins collision handling.
Updated the Petri net compiler’s verify-epic wiring to invoke the merger and emit a new epic-sandbox-merged report event.
Extended contract coverage to assert verify-epic receives the merged epic sandbox and that the merge event is logged.
Documented the new invariant (I124-K) and marked the related plan frontier item as completed.

Technical Notes: Merge order follows slice declaration order; later slices overwrite earlier paths and conflicts are surfaced in the event payload. Per-slice worktrees remain unmodified and the epic sandbox is rebuilt on each verification run.

_{🤖 Was this summary useful? React with 👍 or 👎}

augmentcode

Review completed. 1 suggestion posted.

Comment augment review to trigger a new review at any time.

The base branch was changed.

Parallel firing policy (petri-net.ts): - FiringPolicy = 'serial' | 'parallel' - runParallel: greedy token claiming + Promise.allSettled concurrent fire - Extracted isEnabled() private helper Shared resource pools (net-compiler.ts): - pool:test-agent / pool:code-agent replace per-slice agent places - agentPoolSize on RunPolicy bounds global concurrency - Worktree-per-slice: join(worktreeDir, sliceId) for all action contexts CLI (cook-cli.ts): - Retired dead --engine=proc|petri flag - Added --policy=serial|parallel wired to createOrchestrator Tests (engine-contract.test.ts): - Parallel added to all engines arrays (serial parity) - Concurrency proof, wall-clock benchmark, pool-bounded tests - Extracted withConcurrencyTracking() helper - Worktree isolation adapter test Decision gate passed: parallel measurably beats serial on wall clock. Co-authored-by: Amp <amp@ampcode.com>

Per-slice test-agent/code-agent places were replaced by shared pool:* places in FE-743; pool places are already excluded by the pool: prefix check.

Co-authored-by: Cursor <cursoragent@cursor.com>

verify-epic now runs against a freshly-merged <parentSandboxDir>/__epic__/<epicId>/ built from the epic's completed slice worktrees. Slices apply in plan declaration order; later slices overwrite earlier ones on the same path and the collision is reported via the new epic-sandbox-merged event. Per-slice worktrees are not mutated. Unblocks multi-slice cook runs (verify-epic previously fell back to the empty parent worktree root, halting every multi-slice plan). - new src/orchestrator/src/epic-sandbox-merge.{ts,test.ts} - net-compiler.ts verify-epic case wires the merger + emits epic-sandbox-merged - engine-contract.test.ts: 'verify-epic receives parent sandboxDir' assertion updated to pin the new __epic__/<epicId>/ invariant - memory/SPEC.md: new I124-K invariant alongside I123-K - memory/PLAN.md: petri-epic-verification-merge → Recently Completed; bullet retired from petri-graph-compilation (no longer blocked on FE-700)

Validate epic/slice ids and relative paths, skip symlinks during merge walks, handle file/directory collisions safely, and only honor --version as a top-level flag. Co-authored-by: Cursor <cursoragent@cursor.com>

Slice sandboxes must not collide with the epic merge root; skip any accidental epic-root paths during merge and mirror the guard in net-compiler. Co-authored-by: Cursor <cursoragent@cursor.com>

Defer scaffolding epic verify in fixtures/txt plan and move CLI integration tests to text-ops. Merge verify-epic from worktree/<epicId>/ trees in plan order (target plus transitive deps) so slice work accumulates per epic instead of per-slice last-winner overwrites such as cli.ts. Co-authored-by: Cursor <cursoragent@cursor.com>

Restore per-slice runtime sandboxes with dependency seeding so parallel slices do not corrupt a shared epic worktree. verify-epic merges completed slice worktrees and follows slice depends_on across epics, not just epic depends_on. Co-authored-by: Cursor <cursoragent@cursor.com>

…rphans. Use preserveExisting for post-action test/assess passes; on action/rework reset, drop paths outside the dependency baseline before overlaying deps. Co-authored-by: Cursor <cursoragent@cursor.com>

The generic action transition was calling seedSliceSandboxFromDeps without preserveExisting, wiping files from prior steps in dependent slices. Co-authored-by: Cursor <cursoragent@cursor.com>

Seed dependency files in plan declaration order, always drop paths outside dep trees even when preserveExisting is set, and reuse resolveSliceWorktreeDir from net-compiler. Co-authored-by: Cursor <cursoragent@cursor.com>

Re-seeding before assess/run-tests must not delete slice-owned artifacts that are absent from dependency worktrees. Co-authored-by: Cursor <cursoragent@cursor.com>

visitSliceDeps now tracks visited slice ids so malformed plans with circular slice.depends_on cannot blow the stack. Co-authored-by: Cursor <cursoragent@cursor.com>

Mark epics before recursing into depends_on so cyclic epic graphs cannot blow the stack; add regression test. Co-authored-by: Cursor <cursoragent@cursor.com>

Co-authored-by: Cursor <cursoragent@cursor.com>

kostandinang mentioned this pull request May 22, 2026

FE-743: Petri parallel execution with resource pools and per-slice sandboxes #149

Merged

kostandinang changed the title ~~FE-745: merge slice worktrees into epic-scoped dir for verify-epic~~ FE-745: Merge slice worktrees into epic-scoped dir for verify-epic May 22, 2026

This was referenced May 22, 2026

FE-738: Petri semantic lanes with two-lane subnet and engine factory #148

Merged

FE-730: Greenfield orchestrator POC with pi-agent dispatch #143

Merged

augmentcode Bot reviewed May 22, 2026

View reviewed changes

Comment thread src/orchestrator/src/epic-sandbox-merge.ts Outdated

cursor Bot reviewed May 22, 2026

View reviewed changes

Comment thread src/orchestrator/src/epic-sandbox-merge.ts Outdated

Comment thread src/orchestrator/src/epic-sandbox-merge.ts

Comment thread src/server/cli.ts

Comment thread src/orchestrator/src/epic-sandbox-merge.ts Outdated

kostandinang force-pushed the ka/fe-743-petri-parallel-execution branch from 0f5cdbf to 9e6a0e8 Compare May 25, 2026 10:20

kostandinang force-pushed the ka/fe-745-petri-epic-verification-merge branch from 701c569 to 257e1e0 Compare May 25, 2026 10:26

cursor Bot reviewed May 25, 2026

View reviewed changes

Comment thread src/orchestrator/src/epic-sandbox-merge.ts

kostandinang force-pushed the ka/fe-745-petri-epic-verification-merge branch from 1b11685 to ad5652f Compare May 25, 2026 11:02

kostandinang force-pushed the ka/fe-743-petri-parallel-execution branch from 97540d6 to 2f0aba4 Compare May 25, 2026 11:02

kostandinang force-pushed the ka/fe-745-petri-epic-verification-merge branch from ad5652f to fb39377 Compare May 25, 2026 11:05

kostandinang force-pushed the ka/fe-743-petri-parallel-execution branch 2 times, most recently from f1ff792 to 33a84c1 Compare May 25, 2026 11:17

kostandinang force-pushed the ka/fe-745-petri-epic-verification-merge branch from fb39377 to 2436dd5 Compare May 25, 2026 11:17

kostandinang force-pushed the ka/fe-743-petri-parallel-execution branch from 33a84c1 to 71a21e2 Compare May 25, 2026 11:23

kostandinang force-pushed the ka/fe-745-petri-epic-verification-merge branch from 2436dd5 to 46fe008 Compare May 25, 2026 11:23

cursor Bot reviewed May 25, 2026

View reviewed changes

Comment thread src/orchestrator/src/net-compiler.ts Outdated

Comment thread src/orchestrator/src/epic-sandbox-merge.ts

cursor Bot reviewed May 25, 2026

View reviewed changes

Comment thread src/orchestrator/src/epic-sandbox-merge.ts

Comment thread src/orchestrator/src/epic-sandbox-merge.ts

cursor Bot reviewed May 25, 2026

View reviewed changes

Comment thread src/orchestrator/src/net-compiler.ts

kostandinang mentioned this pull request May 25, 2026

FE-747: Declarative output routing for branching transitions #154

Merged

kostandinang requested a review from lunelson May 26, 2026 07:54

cursor Bot reviewed May 26, 2026

View reviewed changes

Comment thread src/orchestrator/src/epic-sandbox-merge.ts

Comment thread src/orchestrator/src/net-compiler.ts

Comment thread src/orchestrator/src/net-compiler.ts Outdated

kostandinang self-assigned this May 26, 2026

cursor Bot reviewed May 26, 2026

View reviewed changes

Comment thread src/orchestrator/src/epic-sandbox-merge.ts

kostandinang mentioned this pull request May 26, 2026

FE-755: Cook codebase mode for brownfield brunch #155

Merged

cursor Bot reviewed May 27, 2026

View reviewed changes

Comment thread src/orchestrator/src/epic-sandbox-merge.ts

kostandinang changed the base branch from graphite-base/152 to ka/fe-743-petri-parallel-execution June 2, 2026 08:11

kostandinang force-pushed the ka/fe-745-petri-epic-verification-merge branch from 9ee7f6d to 7d2e69b Compare June 2, 2026 09:56

Base automatically changed from ka/fe-743-petri-parallel-execution to main June 2, 2026 11:23

kostandinang and others added 15 commits June 2, 2026 13:36

fix: drop stale per-slice agent places from benign residuals

61d9e29

Per-slice test-agent/code-agent places were replaced by shared pool:* places in FE-743; pool places are already excluded by the pool: prefix check.

Fix parallel rejection handling for falsy errors.

105eded

Co-authored-by: Cursor <cursoragent@cursor.com>

Fix bot review issues on epic sandbox merge and CLI version flag.

85f52c6

Validate epic/slice ids and relative paths, skip symlinks during merge walks, handle file/directory collisions safely, and only honor --version as a top-level flag. Co-authored-by: Cursor <cursoragent@cursor.com>

Reject reserved __epic__ slice id to prevent merge poisoning.

4877893

Slice sandboxes must not collide with the epic merge root; skip any accidental epic-root paths during merge and mirror the guard in net-compiler. Co-authored-by: Cursor <cursoragent@cursor.com>

Fix slice sandbox re-seed overwriting slice work and leaving rework o…

061349b

…rphans. Use preserveExisting for post-action test/assess passes; on action/rework reset, drop paths outside the dependency baseline before overlaying deps. Co-authored-by: Cursor <cursoragent@cursor.com>

Preserve slice artifacts when action handler seeds deps.

57818dc

The generic action transition was calling seedSliceSandboxFromDeps without preserveExisting, wiping files from prior steps in dependent slices. Co-authored-by: Cursor <cursoragent@cursor.com>

Align dep seeding with epic merge and prune rework orphans.

ab87b8f

Seed dependency files in plan declaration order, always drop paths outside dep trees even when preserveExisting is set, and reuse resolveSliceWorktreeDir from net-compiler. Co-authored-by: Cursor <cursoragent@cursor.com>

Skip dep orphan pruning when preserveExisting is set.

2bd29b4

Re-seeding before assess/run-tests must not delete slice-owned artifacts that are absent from dependency worktrees. Co-authored-by: Cursor <cursoragent@cursor.com>

Guard cyclic slice depends_on in epic verify merge.

e426658

visitSliceDeps now tracks visited slice ids so malformed plans with circular slice.depends_on cannot blow the stack. Co-authored-by: Cursor <cursoragent@cursor.com>

Fix epic dependency cycle guard in verify merge.

607be91

Mark epics before recursing into depends_on so cyclic epic graphs cannot blow the stack; add regression test. Co-authored-by: Cursor <cursoragent@cursor.com>

Document epic merge safety bounds.

1c4e36a

Co-authored-by: Cursor <cursoragent@cursor.com>

kostandinang force-pushed the ka/fe-745-petri-epic-verification-merge branch from 7d2e69b to 1c4e36a Compare June 2, 2026 11:37

kostandinang requested a review from lunelson June 2, 2026 11:38

lunelson approved these changes Jun 2, 2026

View reviewed changes

kostandinang added this pull request to the merge queue Jun 2, 2026

Merged via the queue into main with commit 561a0ed Jun 2, 2026
6 checks passed

kostandinang deleted the ka/fe-745-petri-epic-verification-merge branch June 2, 2026 12:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FE-745: Epic-scoped sandbox merge for verify-epic#152

FE-745: Epic-scoped sandbox merge for verify-epic#152
kostandinang merged 15 commits into
mainfrom
ka/fe-745-petri-epic-verification-merge

kostandinang commented May 22, 2026 •

edited

Loading

Uh oh!

cursor Bot commented May 22, 2026 •

edited

Loading

Uh oh!

kostandinang commented May 22, 2026 •

edited

Loading

Uh oh!

augmentcode Bot commented May 22, 2026

Uh oh!

augmentcode Bot left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

kostandinang commented May 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Context

What changed

Verification

Out of scope

Traceability

Uh oh!

cursor Bot commented May 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Summary

Uh oh!

kostandinang commented May 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

augmentcode Bot commented May 22, 2026

Uh oh!

augmentcode Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

kostandinang commented May 22, 2026 •

edited

Loading

cursor Bot commented May 22, 2026 •

edited

Loading

kostandinang commented May 22, 2026 •

edited

Loading