Compare commits

...

9 Commits

Author SHA1 Message Date
Alexander Whitestone
b8104b7822 fix: duplicate atlas-toggle-btn ID from merge conflict (#1336)
Some checks failed
CI / test (pull_request) Failing after 44s
Review Approval Gate / verify-review (pull_request) Failing after 6s
CI / validate (pull_request) Failing after 35s
Two buttons had id="atlas-toggle-btn" — one incomplete (no closing tag,
no content) and one complete. Removed the incomplete duplicate and fixed
the HTML structure so all buttons have proper opening/closing tags.
2026-04-13 22:11:16 -04:00
7e23aa0827 [claude] Close duplicate PRs for issue #1336 (#1452) (#1456)
Some checks failed
Deploy Nexus / deploy (push) Has been cancelled
Staging Verification Gate / verify-staging (push) Has been cancelled
2026-04-14 02:07:06 +00:00
1eeeea4412 Merge pull request 'fix: Remove duplicate content blocks from README.md and POLICY.md (#1338)' (#1432) from q/1338-1776129480 into main
Some checks failed
Deploy Nexus / deploy (push) Has been cancelled
Staging Verification Gate / verify-staging (push) Has been cancelled
2026-04-14 02:02:52 +00:00
cd78f9e4c8 feat: standardize llama.cpp backend for sovereign local inference (#1123)
Some checks failed
Deploy Nexus / deploy (push) Has been cancelled
Staging Verification Gate / verify-staging (push) Has been cancelled
2026-04-14 01:57:22 +00:00
5171dda46a feat: standardize llama.cpp backend for sovereign local inference (#1123)
Some checks failed
Deploy Nexus / deploy (push) Has been cancelled
Staging Verification Gate / verify-staging (push) Has been cancelled
2026-04-14 01:57:17 +00:00
682431fab1 feat: standardize llama.cpp backend for sovereign local inference (#1123)
Some checks failed
Deploy Nexus / deploy (push) Has been cancelled
Staging Verification Gate / verify-staging (push) Has been cancelled
2026-04-14 01:57:14 +00:00
7eb339f3ce feat: standardize llama.cpp backend for sovereign local inference (#1123)
Some checks failed
Deploy Nexus / deploy (push) Has been cancelled
Staging Verification Gate / verify-staging (push) Has been cancelled
2026-04-14 01:57:13 +00:00
2f5f874e84 feat: standardize llama.cpp backend for sovereign local inference (#1123)
Some checks failed
Deploy Nexus / deploy (push) Has been cancelled
Staging Verification Gate / verify-staging (push) Has been cancelled
2026-04-14 01:57:11 +00:00
Alexander Whitestone
e683a2213f fix: Remove duplicate content blocks from README.md and POLICY.md (#1338)
Some checks failed
CI / test (pull_request) Failing after 40s
Review Approval Gate / verify-review (pull_request) Failing after 6s
CI / validate (pull_request) Failing after 38s
This commit fixes issue #1338 by removing duplicate content blocks that
were appearing 3-4 times on the page.

Changes:
1. README.md:
   - Removed duplicate "Branch Protection & Review Policy" section (lines 121-134)
   - Removed duplicate "Running Locally" section (lines 149-167)
   - Kept the detailed "Branch Protection & Review Policy" section at the top
   - Kept the first "Running Locally" section with all content

2. POLICY.md:
   - Consolidated duplicate content into single cohesive policy
   - Merged two "Branch Protection Rules" sections
   - Merged two "Default Reviewer" sections
   - Merged two "Acceptance Criteria" sections
   - Added "Enforcement" and "Notes" sections from second half

The duplicate content was likely caused by a bad merge or template duplication.
This cleanup ensures each section appears only once while preserving all content.

Closes #1338
2026-04-13 21:44:26 -04:00
5 changed files with 31 additions and 81 deletions

View File

@@ -27,7 +27,7 @@ All repositories must define default reviewers using CODEOWNERS-style configurat
---
### <EFBFBD> Affected Repositories
### 📋 Affected Repositories
| Repository | Status | Notes |
|-------------|--------|-------|
@@ -49,46 +49,15 @@ All repositories must define default reviewers using CODEOWNERS-style configurat
---
### <EFBFBD> Blocks
- Blocks #916, #917
- cc @Timmy @Rockachopa
@perplexity, Integration Architect + QA
## 🛡️ Branch Protection Rules
These rules must be applied to the `main` branch of all repositories:
- [R] **Require Pull Request for Merge** No direct pushes to `main`
- [x] **Require 1 Approval** At least one reviewer must approve
- [R] **Dismiss Stale Approvals** Re-review after new commits
- [x] **Require CI to Pass** Only allow merges with passing CI (where CI exists)
- [x] **Block Force Push** Prevent rewrite history
- [x] **Block Branch Deletion** Prevent accidental deletion of `main`
## 👤 Default Reviewer
- `@perplexity` Default reviewer for all repositories
- `@Timmy` Required reviewer for `hermes-agent` (owner gate)
## 🚧 Enforcement
### 🚧 Enforcement
- All repositories must have these rules applied in the Gitea UI under **Settings > Branches > Branch Protection**.
- CI must be configured and enforced for repositories with CI pipelines.
- Reviewers assignments must be set via CODEOWNERS or manually in the UI.
## 📌 Acceptance Criteria
---
- [ ] Branch protection rules applied to `main` in:
- `hermes-agent`
- `the-nexus`
- `timmy-home`
- `timmy-config`
- [ ] `@perplexity` set as default reviewer
- [ ] `@Timmy` set as required reviewer for `hermes-agent`
- [ ] This policy documented in each repository's root
## 🧠 Notes
### 🧠 Notes
- For repositories without CI, the "Require CI to Pass" rule is optional.
- This policy is versioned and must be updated as needed.
- This policy is versioned and must be updated as needed.

View File

@@ -118,41 +118,6 @@ Those pieces should be carried forward only if they serve the mission and are re
There is no root browser app on current `main`.
Do not tell people to static-serve the repo root and expect a world.
### Branch Protection & Review Policy
**All repositories enforce:**
- PRs required for all changes
- Minimum 1 approval required
- CI/CD must pass
- No force pushes
- No direct pushes to main
**Default reviewers:**
- `@perplexity` for all repositories
- `@Timmy` for nexus/ and hermes-agent/
**Enforced by Gitea branch protection rules**
### What you can run now
- `python3 server.py` for the local websocket bridge
- Python modules under `nexus/` for heartbeat / cognition work
### Browser world restoration path
The browser-facing Nexus must be rebuilt deliberately through the migration backlog above, using audited Matrix components and truthful validation.
---
*One 3D repo. One migration path. No more ghost worlds.*
## Running Locally
### Current repo truth
There is no root browser app on current `main`.
Do not tell people to static-serve the repo root and expect a world.
### What you can run now
- `python3 server.py` for the local websocket bridge

View File

@@ -46,5 +46,3 @@ Standardizes local LLM inference across the fleet using llama.cpp.
- Slow → -t to core count
- OOM → reduce -c
- Port conflict → lsof -i :11435
See systemd/llama-server.service for production deployment.

View File

@@ -165,18 +165,18 @@
<!-- Top Right: Agent Log, Atlas & SOUL Toggle -->
<div class="hud-top-right">
<button id="atlas-toggle-btn" class="hud-icon-btn" title="World Directory">
<button id="soul-toggle-btn" class="hud-icon-btn" title="Timmy's SOUL">
<span class="hud-icon"></span>
<span class="hud-btn-label">SOUL</span>
<button id="mode-toggle-btn" class="hud-icon-btn mode-toggle" title="Toggle Mode">
<span class="hud-icon">👁</span>
<span class="hud-btn-label" id="mode-label">VISITOR</span>
</button>
<button id="atlas-toggle-btn" class="hud-icon-btn" title="Portal Atlas">
<span class="hud-icon">🌐</span>
<span class="hud-btn-label">WORLDS</span>
</button>
<button id="soul-toggle-btn" class="hud-icon-btn" title="Timmy's SOUL">
<span class="hud-icon"></span>
<span class="hud-btn-label">SOUL</span>
</button>
<button id="mode-toggle-btn" class="hud-icon-btn mode-toggle" title="Toggle Mode">
<span class="hud-icon">👁</span>
<span class="hud-btn-label" id="mode-label">VISITOR</span>
</button>
<div id="bannerlord-status" class="hud-status-item" title="Bannerlord Readiness">
<span class="status-dot"></span>
<span class="status-label">BANNERLORD</span>

18
pr_cleanup_1452.md Normal file
View File

@@ -0,0 +1,18 @@
# PR Cleanup: Issue #1336 Duplicate PRs
## Summary
Resolved duplicate PR situation for issue #1336 (Fix merge conflict artifacts).
## Actions Taken
- **PR #1438** — Left open as canonical fix for #1336
- **PR #1406** — Closed as duplicate (with explanatory comment)
- **PR #1402** — Closed as duplicate (with explanatory comment)
- **Issue #1336** — Updated with cleanup status comment
## Result
One canonical PR (#1438) remains open for review and merge.
Refs #1452