Skip to content

feat: merge atlas gr2 design stack (exec surface + prototypes)#558

Merged
laynepenney merged 23 commits intomainfrom
merge/atlas-gr2-stack
Apr 12, 2026
Merged

feat: merge atlas gr2 design stack (exec surface + prototypes)#558
laynepenney merged 23 commits intomainfrom
merge/atlas-gr2-stack

Conversation

@laynepenney
Copy link
Copy Markdown
Collaborator

Summary

What's included

Rust (from #550):

  • gr2/src/exec.rs: ExecStatusReport with load/render for lane-aware execution
  • gr2/src/args.rs: ExecCommands subcommand
  • gr2/src/dispatch.rs: Exec dispatch wiring
  • gr2/src/lane.rs: Public load_lane() API
  • tests/cli_tests.rs: 2 new integration tests (exec status + repo filtering)

Prototypes (from #556):

  • cross_mode_lane_stress.py: 4 adversarial scenarios (solo, single-agent, multi-agent, mixed)
  • concurrent_lease_stress.py: fcntl-based transaction locking (0% failure rate)
  • lane_workspace_prototype.py: Full lane model with leases, conflict matrix, scratchpads
  • real_git_lane_materialization.py + real_git_playground.py: Real-git verification
  • cache_materialization_probe.py, layout_model_probe.py, repo_transport_probe.py

Docs:

  • Updated manifesto, needs-and-criteria, shared scratchpads docs (latest iterations)

Conflict resolution

Doc conflicts resolved by taking the most complete version for each file:

  • ASSESS-gr2-lanes-cross-mode-stress.md: kept main's version (257 lines vs 54)
  • All others: took playground-stack's versions (later iterations, more complete)

Test plan

  • cargo build passes
  • cargo test - all unit + integration tests pass (761+ tests, 0 failures)
  • New exec status tests included and passing

Premium boundary: core OSS (gr2 workspace orchestration).

Supersedes #550, #556. Close #554 as superseded.

Merges PR #550: gr2 exec status surface with lane-scoped
execution planning. Resolves doc conflicts by keeping main's
canonical versions (already merged via #557, #549, #548, #543).

New: gr2/src/exec.rs, ExecCommands in args.rs, dispatch.rs
wiring, load_lane() in lane.rs, two integration tests.
Merges PR #556: gr2 design exploration stack including:
- Lane workspace prototype with leases, conflict matrix, scratchpads
- Cross-mode lane stress harness (4 adversarial user modes)
- Concurrent lease stress harness (fcntl-based transaction locking)
- Real-git lane materialization and playground harness
- Cache materialization probe, layout model probe, repo transport probe
- Updated manifesto, needs-and-criteria, shared scratchpads docs

Resolves doc conflicts by taking the most complete version of each
(playground-stack for most, main for cross-mode assessment which had
a more complete version from a separate merge).
@laynepenney
Copy link
Copy Markdown
Collaborator Author

Code review: Reviewed all Rust changes from #550 (exec.rs, args.rs, dispatch.rs, lane.rs, lib.rs, cli_tests.rs). Clean implementation with proper error handling, input validation, and comprehensive integration tests. No issues found. Prototypes from #556 verified via the design loop earlier today.

@laynepenney laynepenney merged commit 12a1293 into main Apr 12, 2026
9 of 10 checks passed
@laynepenney laynepenney deleted the merge/atlas-gr2-stack branch April 12, 2026 13:57
@laynepenney laynepenney mentioned this pull request Apr 14, 2026
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant