francy51
607f3fbd8b
When the merge-all batch hits a conflict, spawn a conflict-resolution agent in the main worktree (where the merge is mid-conflict), await it, and continue the batch through the remaining branches instead of aborting for manual resolution. - worktrees: replace abort-on-conflict mergeBranches with non-aborting attemptMerge (leaves the tree mid-merge, returns conflicted paths), plus abortMerge/hasMergeInProgress/unmergedPaths/createRecoveryBranch. Batch types gain conflict/resolutionRunId/recoveryRef. - prompt: buildConflictResolutionPrompt resolves both sides preserving intent, honors repo conventions (no Rust warning suppression), runs cargo/pnpm checks, then completes the merge with a commit. - runs: mergeAll() is async; per branch it attemptMerges, and on conflict starts a streamable resolution run in REPO_ROOT, awaits it, and verifies the merge actually completed (no MERGE_HEAD, clean tree) before continuing — otherwise aborts and halts. A mergeBatchInProgress guard prevents two batches at once; a pre-batch recovery ref snapshots HEAD. - route: /runs/merge-all is async; node request/socket timeouts disabled so a long multi-conflict batch survives. - UI: per-branch status shows "conflict resolved by agent" + resolution run id; a recovery-ref banner documents how to roll the batch back. Safety: resolution only counts if verified; otherwise the merge is aborted and main left clean. Resolution runs are real agent_runs (stream into the dock, stoppable) and own no worktree. EOF && echo "" && git log --oneline -3
VOID::NAV
A single-player narrative-driven space exploration experience where you author your own mini-series. Inspired by Windward's open-world freedom, Stellaris's strategic depth, and AI-generated storytelling in the style of The Templin Institute. Every campaign generates a unique tale of exploration, commerce, diplomacy, and conquest.
You are a young captain with an entire galaxy to explore—and a story to write. Every campaign features a unique, procedurally generated galaxy. Trade between stations, broker alliances between factions, wage war or maintain peace, and watch as the AI Story Director weaves your choices into an evolving narrative. Prefer a quieter life? Simply sail the stars and let your story unfold.
Conflict occurs through FTL-style tactical resource management—not dogfighting. When combat happens, it's a dramatic beat in your story. Click a hostile, your ship auto-engages, and you manage reactor power between Weapons / Shields / Engines / Auxiliary. The skill is in what you power and when, not how fast you click. But combat is a feature, not the focus.
VOID::NAV is a pnpm workspace monorepo for the game website, living design docs, and game client. V1 focuses on single-player emergent storytelling with local persistence and AI-driven narrative generation.
Core Pillars
| Pillar | Description |
|---|---|
| AI Story Director | Emergent narrative generation tracks your choices, alliances, conflicts, and discoveries. The AI weaves your actions into an ongoing saga. V1: real-time emergent storytelling. Future: episodic mini-series generation. |
| Exploration & Discovery | Procedurally generated galaxy with fog of war. Discover anomalies, derelicts, new factions. Every discovery becomes part of your story. |
| Trade & Diplomacy | Stellaris-inspired economic and political systems. Supply factions, broker alliances, negotiate borders. Commerce and conversation are equally viable paths. |
| Ship Customization | Your ship is your narrative vessel. Customize for trade, exploration, or conflict. Multiple classes from nimble scouts to powerful cruisers. |
| Dynamic Galaxy | Your actions shape both the world AND the story. Faction relations, territory control, and world events evolve through your choices. |
| Solo Adventure | A personal galaxy to explore at your own pace. Your story, your pace. The architecture supports optional co-op servers later. |
Secondary Features
- FTL-Style Tactical Combat — Power management combat exists as a dramatic beat in your story, not the gameplay loop
- Mining and resource gathering
- Mission and quest systems
Layout
apps/docs Living design docs and interactive demos
apps/site Public landing page / game website
apps/game Playable game client (Rust + Bevy)
packages/ui Shared UI primitives and CSS tokens
archive/legacy-static Legacy static prototype files kept for reference
Prerequisites
- Node.js 24+
- pnpm 9+
- Rust toolchain (for the game client)
Quick Start
pnpm install
pnpm dev
This launches the docs and site servers.
Open http://localhost:5175 to play the game.
Press Ctrl+C to stop everything.
Development
pnpm dev # Docs + site servers
pnpm dev:docs # Docs only (port 5173)
pnpm dev:site # Site only (port 5174)
cd apps/game && cargo run # Game client
Default ports:
- docs:
http://localhost:5173/docs - site:
http://localhost:5174 - game:
http://localhost:5175
Builds
pnpm build # Build all apps
pnpm check # Typecheck all packages
cd apps/game && cargo build # Build game client
Game Client
The game client (apps/game) is built with Rust and Bevy. It runs locally and persists game state locally with full single-player campaign support.