BS-PR-706 - Source-control status and collaborative file safety #49
Closed
opened 2026-07-10 04:04:47 -04:00 by Rbanh
·
3 comments
No Branch/Tag Specified
main
codex/m2-content-workspace
codex/fbx-external-textures
codex/deterministic-asset-fingerprints
codex/guarded-shutdown-savepoints
codex/sample-regression-pack
codex/operator-invariants-completion
codex/renderer-foundation-acceptance
codex/collider-diagnostics
codex/physics-placement
codex/terrain-material-layers
codex/terrain-sculpt-strokes
codex/terrain-foundation
codex/non-blocking-native-dialogs
codex/collaboration-live-acceptance
codex/material-library-targeted-drop
codex/source-control-collaboration-safety
codex/renderer-material-component-foundation
No results found.
Labels
Clear labels
area:animation
area:assets
area:audio
area:brushes
area:build-release
area:extensions
area:governance
area:hierarchy
area:inspector
area:navigation
area:operators
area:physics
area:project-ux
area:quality
area:rendering
area:runtime
area:scene-io
area:terrain
area:viewport
priority:P0
priority:P1
priority:P2
priority:P3
roadmap:jackdaw
roadmap:production
type:architecture
type:docs
type:epic
type:feature
Skeletal animation import, preview, graph/state authoring, and runtime integration.
Asset browser, material browser, thumbnails, import, processing, and asset watcher.
Audio source/listener authoring, buses, spatial preview, and runtime integration.
Brush geometry, CSG, face editing, UVs, and brush diagnostics.
Build profiles, packaging, content validation, release gates, and distribution diagnostics.
Static extension API, extension scaffolds, dylib exploration.
Policy, attribution, planning, and production process.
Outliner hierarchy, parenting, grouping, prefab structure, ordering, and selection workflows.
Inspector, component metadata, component editing UX.
Navigation mesh authoring, baking, diagnostics, and AI path preview.
Editor operator/action framework, undo, commit/cancel semantics.
Physics placement, colliders, rigid bodies, diagnostics, and overlays.
Project launcher, profiles, templates, or first-run project workflow.
Regression packs, tests, performance budgets, profiler, first-hour UX.
Static and skinned renderers, material slots, shaders, ray tracing, and render-path integration.
BRP, remote inspector, PIE, game preview, runtime integration.
Scene document, save/load, schema, migration, or reference repair.
Terrain authoring, terrain sculpting, heightmaps, and terrain materials.
Viewport interaction, selection, shortcuts, camera, overlays, and controls.
Must-have prerequisite or milestone-critical item.
Important production feature after P0 work is stable.
Useful follow-up or polish item.
Exploratory or later spike.
Jackdaw-inspired Blacksite editor roadmap item.
Blacksite production-readiness roadmap item beyond the Jackdaw-inspired foundation.
Architecture, internal framework, or hard-to-reverse technical decision.
Documentation, policy, samples, or issue-board structure.
Tracking epic that groups related milestone work.
User-visible feature or capability.
Milestone
No items
No Milestone
M7 - Content production and shipping
Projects
Clear projects
No projects
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: Falling-Metal-Interactive/Blacksite#49
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
Summary
Reduce accidental overwrites in small teams without embedding a full source-control client.
Scope
Acceptance criteria
Source/headless implementation checkpoint
Status: implementation is complete and verified in the local worktree on
codex/source-control-collaboration-safety. Commit/push and live visual acceptance are still pending, so this issue remains open.Implemented
Authored File Not Savedmodal.Focused regression coverage
The new tests cover:
Verification
cargo test -p settings: 13 passed.cargo test -p editor: 195 passed; editor bins/doc tests clean.cargo clippy -p settings -p editor --all-targets -- -D warnings: clean.cargo check --workspace --all-targets: clean.cargo fmt --all -- --checkandgit diff --check: clean.cargo validate-levels --project .: 59 dependencies, 5 documented non-blocking findings, 0 blocking errors.cargo bake-navigation --project . --check: 1 current artifact.Remaining acceptance
Documentation is included in ADR 0037 and
docs/editor/collaborative-file-safety.mdin the pending worktree.Published implementation and integrated source gate
The collaborative-safety implementation is now published:
5a82a9ef2ad88fmain:3931de1The main integration gate also exposed and fixed a missing hot-reload macro import before publication.
Exact integrated-tree verification:
cargo fmt --all -- --check: passcargo check --workspace --all-targets: passcargo clippy --workspace --all-targets -- -D warnings: passcargo clippy -p editor -p game --bins --features dev,hot-reload -- -D warnings: pass after the integration fixcargo test --workspace: pass across all crates; 195 editor tests, 89 shared tests, 83 scene tests with the intentional manual migration test ignored, 40 game tests, and all remaining crate/doc tests greencargo validate-levels --project .: 59 dependencies, 5 documented non-blocking findings, 0 blocking errorscargo bake-navigation --project . --check: 1 current artifactorigin/mainand the clean local worktree both point to3931de1f0a241c9acb90baae006364962ed9f8c0.Remaining acceptance is unchanged: live debug-editor visual/interaction QA for the compact chips and conflict modal. Packaged/release testing remains explicitly deferred by the project owner. This issue stays open until the live UI gate passes.
Live acceptance complete
Implementation:
5a82a9e,f2ad88fLive evidence:
61be244Native Wayland QA verified:
UNTRACKEDstate;The permanent verification record is in docs/editor/evaluations/collaborative-file-safety/README.md.
Source verification on integrated
mainpassed formatting, workspace check, strict Clippy, workspace tests, level validation, and navigation-artifact validation. Packaged acceptance remains deferred by project-owner direction.