Compare commits
56 Commits
nexusburn/
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 6160e87446 | |||
| d0fc662ad2 | |||
| 4e8e9cd08d | |||
| 189c657fec | |||
| abe21ce6ec | |||
| 114525da5f | |||
| 0de60a756f | |||
| e7bf08b799 | |||
| 749878d3ea | |||
| e24ad0f0a7 | |||
| 1907388517 | |||
| dbd2e400c0 | |||
| 071643c976 | |||
| c7a317babc | |||
| 7e23aa0827 | |||
| 1eeeea4412 | |||
| cd78f9e4c8 | |||
| 5171dda46a | |||
| 682431fab1 | |||
| 7eb339f3ce | |||
| 2f5f874e84 | |||
| ad98bd5ead | |||
| e847b0e473 | |||
| 63c6829ef8 | |||
| a55647d5d3 | |||
| 64719324e0 | |||
| ee6d12ccf6 | |||
|
|
a29299820f | ||
| 84eb8104d8 | |||
| 93228388d7 | |||
| e27c51c6da | |||
| ed79826608 | |||
| e438662c97 | |||
|
|
e683a2213f | ||
| 449170070b | |||
| 3ed6bce5a0 | |||
| 2ecb4cd3a4 | |||
| 1c67f91b74 | |||
| 53d9a55444 | |||
| dfbd96f792 | |||
| 5d5ea8ec1b | |||
| 3f58b55351 | |||
| 4b9f2154d4 | |||
| 2e60c479ae | |||
| 67a080b4fd | |||
| 961623b931 | |||
| 3bb44a24e2 | |||
|
|
39faa6b862 | ||
|
|
8fa43cc228 | ||
|
|
b9bc776fdb | ||
|
|
9bcd41ad07 | ||
|
|
d7a15ae046 | ||
|
|
7fab9799b1 | ||
|
|
66c010301d | ||
|
|
bb9758c4d2 | ||
|
|
4488847c13 |
48
.gitattributes
vendored
Normal file
48
.gitattributes
vendored
Normal file
@@ -0,0 +1,48 @@
|
||||
# .gitattributes
|
||||
# Controls git archive exports and helps categorize repo contents.
|
||||
# export-ignore: excluded from `git archive` tarballs and sparse-export contexts.
|
||||
#
|
||||
# For agents blocked by repo size on clone, see CONTRIBUTING.md §"Large-Repo Clone Strategy".
|
||||
|
||||
# ── Documentation & reports (not needed for runtime or tests) ──────────────────
|
||||
docs/ export-ignore
|
||||
reports/ export-ignore
|
||||
audits/ export-ignore
|
||||
reviews/ export-ignore
|
||||
paper/ export-ignore
|
||||
scaffold/ export-ignore
|
||||
playground/ export-ignore
|
||||
examples/ export-ignore
|
||||
intelligence/ export-ignore
|
||||
|
||||
# Root-level narrative docs (keep CLAUDE.md, README.md, CONTRIBUTING.md)
|
||||
FINDINGS-*.md export-ignore
|
||||
FIRST_LIGHT_REPORT*.md export-ignore
|
||||
INVESTIGATION_*.md export-ignore
|
||||
LEGACY_MATRIX_AUDIT.md export-ignore
|
||||
SOUL.md export-ignore
|
||||
POLICY.md export-ignore
|
||||
BROWSER_CONTRACT.md export-ignore
|
||||
EVENNIA_NEXUS_EVENT_PROTOCOL.md export-ignore
|
||||
GAMEPORTAL_PROTOCOL.md export-ignore
|
||||
DEVELOPMENT.md export-ignore
|
||||
|
||||
# ── Operation-specific directories ────────────────────────────────────────────
|
||||
operation-get-a-job/ export-ignore
|
||||
operations/ export-ignore
|
||||
org/ export-ignore
|
||||
concept-packs/ export-ignore
|
||||
evolution/ export-ignore
|
||||
|
||||
# ── Assets (binary/media files not needed for CI) ─────────────────────────────
|
||||
assets/ export-ignore
|
||||
icons/ export-ignore
|
||||
|
||||
# ── Linguist overrides (GitHub/Gitea language stats) ──────────────────────────
|
||||
docs/ linguist-documentation
|
||||
scaffold/ linguist-documentation
|
||||
paper/ linguist-documentation
|
||||
reports/ linguist-documentation
|
||||
audits/ linguist-documentation
|
||||
|
||||
*.md linguist-documentation
|
||||
69
.github/workflows/pr-duplicate-check.yml
vendored
Normal file
69
.github/workflows/pr-duplicate-check.yml
vendored
Normal file
@@ -0,0 +1,69 @@
|
||||
name: Duplicate PR Detection
|
||||
|
||||
on:
|
||||
schedule:
|
||||
# Run weekly on Monday at 9 AM UTC
|
||||
- cron: '0 9 * * 1'
|
||||
workflow_dispatch: # Allow manual trigger
|
||||
pull_request:
|
||||
types: [opened, reopened]
|
||||
|
||||
jobs:
|
||||
check-duplicates:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y jq curl
|
||||
|
||||
- name: Check for duplicate PRs
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
GITEA_URL: ${{ secrets.GITEA_URL || 'https://forge.alexanderwhitestone.com' }}
|
||||
REPO: ${{ github.repository }}
|
||||
run: |
|
||||
chmod +x ./scripts/cleanup-duplicate-prs.sh
|
||||
./scripts/cleanup-duplicate-prs.sh --dry-run
|
||||
|
||||
- name: Create issue if duplicates found
|
||||
if: failure()
|
||||
uses: actions/github-script@v7
|
||||
with:
|
||||
script: |
|
||||
const title = 'Duplicate PRs Detected';
|
||||
const body = `## Duplicate PRs Found
|
||||
|
||||
The duplicate PR detection workflow found potential duplicate PRs.
|
||||
|
||||
**Action Required:**
|
||||
1. Review the duplicate PRs
|
||||
2. Close older duplicates
|
||||
3. Keep the newest PR for each issue
|
||||
|
||||
**Workflow Run:** ${context.runId}
|
||||
**Repository:** ${context.repo.owner}/${context.repo.repo}
|
||||
|
||||
This issue was automatically created by the duplicate PR detection workflow.`;
|
||||
|
||||
await github.rest.issues.create({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
title,
|
||||
body,
|
||||
labels: ['maintenance', 'automated']
|
||||
});
|
||||
|
||||
# Notify on manual trigger
|
||||
notify:
|
||||
needs: check-duplicates
|
||||
if: github.event_name == 'workflow_dispatch'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Send notification
|
||||
run: |
|
||||
echo "Duplicate PR check completed"
|
||||
echo "Check the workflow run for details"
|
||||
@@ -136,6 +136,44 @@ Hotfixes require:
|
||||
|
||||
---
|
||||
|
||||
## Large-Repo Clone Strategy
|
||||
|
||||
Some repos in this org (hermes-agent, the-nexus as it grows) can exceed 1000 tracked files, which causes `git clone --depth 1` to time out and also hits the Gitea tree-API cap of 1000 entries.
|
||||
|
||||
### Recommended clone patterns for agents
|
||||
|
||||
**Blobless partial clone** — fastest overall; metadata arrives immediately, blobs are fetched on demand:
|
||||
```sh
|
||||
git clone --filter=blob:none --depth 1 <repo-url>
|
||||
```
|
||||
|
||||
**Treeless partial clone** — skips tree objects for past commits; best when you need full working tree but not history:
|
||||
```sh
|
||||
git clone --filter=tree:0 <repo-url>
|
||||
```
|
||||
|
||||
**Sparse checkout** — only materialise the subdirectories you actually need:
|
||||
```sh
|
||||
git clone --filter=blob:none --no-checkout <repo-url> myrepo
|
||||
cd myrepo
|
||||
git sparse-checkout init --cone
|
||||
git sparse-checkout set nexus tests # only check out these dirs
|
||||
git checkout main
|
||||
```
|
||||
|
||||
### Gitea tree API workaround
|
||||
|
||||
When the tree endpoint returns exactly 1000 entries and you suspect truncation, pass `recursive=1` and page through with the `page` parameter:
|
||||
```
|
||||
GET /api/v1/repos/{owner}/{repo}/git/trees/{sha}?recursive=1&page=2
|
||||
```
|
||||
|
||||
### Why `.gitattributes` export-ignore exists
|
||||
|
||||
Directories marked `export-ignore` in `.gitattributes` are excluded from `git archive` tarballs and future sparse-export tooling. This reduces the surface area for export-based agent workflows. It does **not** affect `git clone` directly — use the partial-clone flags above for that.
|
||||
|
||||
---
|
||||
|
||||
## Stale PR Policy
|
||||
|
||||
A cron job runs every 6 hours and auto-closes PRs that are:
|
||||
|
||||
41
POLICY.md
41
POLICY.md
@@ -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.
|
||||
393
README.md
393
README.md
@@ -1,6 +1,6 @@
|
||||
# Branch Protection & Review Policy
|
||||
# The Nexus Project
|
||||
|
||||
## Enforced Rules for All Repositories
|
||||
## Branch Protection & Review Policy
|
||||
|
||||
**All repositories enforce these rules on the `main` branch:**
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
| Require PR for merge | ✅ Enabled | Prevent direct commits |
|
||||
| Required approvals | 1+ | Minimum review threshold |
|
||||
| Dismiss stale approvals | ✅ Enabled | Re-review after new commits |
|
||||
| Require CI to pass | <EFBFBD> Conditional | Only where CI exists |
|
||||
| Require CI to pass | ⚠️ Conditional | Only where CI exists |
|
||||
| Block force push | ✅ Enabled | Protect commit history |
|
||||
| Block branch deletion | ✅ Enabled | Prevent accidental deletion |
|
||||
|
||||
@@ -31,105 +31,7 @@
|
||||
|
||||
> This policy replaces all previous ad-hoc workflows. Any exceptions require written approval from @Timmy and @perplexity.
|
||||
|
||||
| Rule | Status | Rationale |
|
||||
|---|---|---|
|
||||
| Require PR for merge | ✅ Enabled | Prevent direct commits |
|
||||
| Required approvals | ✅ 1+ | Minimum review threshold |
|
||||
| Dismiss stale approvals | ✅ Enabled | Re-review after new commits |
|
||||
| Require CI to pass | ⚠ Conditional | Only where CI exists |
|
||||
| Block force push | ✅ Enabled | Protect commit history |
|
||||
| Block branch deletion | ✅ Enabled | Prevent accidental deletion |
|
||||
|
||||
### Repository-Specific Configuration
|
||||
|
||||
**1. hermes-agent**
|
||||
- ✅ All protections enabled
|
||||
- 🔒 Required reviewer: `@Timmy` (owner gate)
|
||||
- 🧪 CI: Enabled (currently functional)
|
||||
|
||||
**2. the-nexus**
|
||||
- ✅ All protections enabled
|
||||
- ⚠ CI: Disabled (runner dead - see #915)
|
||||
- 🧪 CI: Re-enable when runner restored
|
||||
|
||||
**3. timmy-home**
|
||||
- ✅ PR + 1 approval required
|
||||
- 🧪 CI: No CI configured
|
||||
|
||||
**4. timmy-config**
|
||||
- ✅ PR + 1 approval required
|
||||
- 🧪 CI: Limited CI
|
||||
|
||||
### Default Reviewer Assignment
|
||||
|
||||
All repositories must:
|
||||
- 🧑 Default reviewer: `@perplexity` (QA gate)
|
||||
- 🧑 Required reviewer: `@Timmy` for `hermes-agent/` only
|
||||
|
||||
### Acceptance Criteria
|
||||
|
||||
- [ ] All four repositories have protection rules applied
|
||||
- [ ] Default reviewers configured per matrix above
|
||||
- [ ] This policy documented in all repositories
|
||||
- [ ] Policy enforced for 72 hours with no unreviewed merges
|
||||
|
||||
> This policy replaces all previous ad-hoc workflows. Any exceptions require written approval from @Timmy and @perplexity.
|
||||
- ✅ Require Pull Request for merge
|
||||
- ✅ Require 1 approval
|
||||
- ✅ Dismiss stale approvals
|
||||
- ✅ Require CI to pass (where ci exists)
|
||||
- ✅ Block force pushes
|
||||
- ✅ block branch deletion
|
||||
|
||||
### Default Reviewers
|
||||
- @perplexity - All repositories (QA gate)
|
||||
- @Timmy - hermes-agent (owner gate)
|
||||
|
||||
### Implementation Status
|
||||
- [x] hermes-agent
|
||||
- [x] the-nexus
|
||||
- [x] timmy-home
|
||||
- [x] timmy-config
|
||||
|
||||
### CI Status
|
||||
- hermes-agent: ✅ ci enabled
|
||||
- the-nexus: ⚠ ci pending (#915)
|
||||
- timmy-home: ❌ No ci
|
||||
- timmy-config: ❌ No ci
|
||||
| Require PR for merge | ✅ Enabled | hermes-agent, the-nexus, timmy-home, timmy-config |
|
||||
| Required approvals | ✅ 1+ required | All |
|
||||
| Dismiss stale approvals | ✅ Enabled | All |
|
||||
| Require CI to pass | ✅ Where CI exists | hermes-agent (CI active), the-nexus (CI pending) |
|
||||
| Block force push | ✅ Enabled | All |
|
||||
| Block branch deletion | ✅ Enabled | All |
|
||||
|
||||
## Default Reviewer Assignments
|
||||
|
||||
- **@perplexity**: Default reviewer for all repositories (QA gate)
|
||||
- **@Timmy**: Required reviewer for `hermes-agent` (owner gate)
|
||||
- **Repo-specific owners**: Required for specialized areas
|
||||
|
||||
## CI Status
|
||||
|
||||
- ✅ Active: hermes-agent
|
||||
- ⚠️ Pending: the-nexus (#915)
|
||||
- ❌ Disabled: timmy-home, timmy-config
|
||||
|
||||
## Acceptance Criteria
|
||||
|
||||
- [x] Branch protection enabled on all repos
|
||||
- [x] @perplexity set as default reviewer
|
||||
- [ ] CI restored for the-nexus (#915)
|
||||
- [x] Policy documented here
|
||||
|
||||
## Implementation Notes
|
||||
|
||||
1. All direct pushes to `main` are now blocked
|
||||
2. Merges require at least 1 approval
|
||||
3. CI failures block merges where CI is active
|
||||
4. Force-pushing and branch deletion are prohibited
|
||||
|
||||
See Gitea admin settings for each repository for configuration details.
|
||||
---
|
||||
|
||||
It is meant to become two things at once:
|
||||
- a local-first training ground for Timmy
|
||||
@@ -216,21 +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
|
||||
@@ -243,275 +130,3 @@ The browser-facing Nexus must be rebuilt deliberately through the migration back
|
||||
---
|
||||
|
||||
*One 3D repo. One migration path. No more ghost worlds.*
|
||||
# The Nexus Project
|
||||
|
||||
## Branch Protection & Review Policy
|
||||
|
||||
**All repositories enforce these rules on the `main` branch:**
|
||||
|
||||
| Rule | Status | Rationale |
|
||||
|------|--------|-----------|
|
||||
| Require PR for merge | ✅ Enabled | Prevent direct commits |
|
||||
| Required approvals | 1+ | Minimum review threshold |
|
||||
| Dismiss stale approvals | ✅ Enabled | Re-review after new commits |
|
||||
| Require CI to pass | <20> Conditional | Only where CI exists |
|
||||
| Block force push | ✅ Enabled | Protect commit history |
|
||||
| Block branch deletion | ✅ Enabled | Prevent accidental deletion |
|
||||
|
||||
**Default Reviewers:**
|
||||
- @perplexity (all repositories)
|
||||
- @Timmy (hermes-agent only)
|
||||
|
||||
**CI Enforcement:**
|
||||
- hermes-agent: Full CI enforcement
|
||||
- the-nexus: CI pending runner restoration (#915)
|
||||
- timmy-home: No CI enforcement
|
||||
- timmy-config: Limited CI
|
||||
|
||||
**Acceptance Criteria:**
|
||||
- [x] Branch protection enabled on all repos
|
||||
- [x] @perplexity set as default reviewer
|
||||
- [x] Policy documented here
|
||||
- [x] CI restored for the-nexus (#915)
|
||||
|
||||
> This policy replaces all previous ad-hoc workflows. Any exceptions require written approval from @Timmy and @perplexity.
|
||||
|
||||
## Branch Protection Policy
|
||||
|
||||
**All repositories enforce these rules on the `main` branch:**
|
||||
|
||||
| Rule | Status | Rationale |
|
||||
|------|--------|-----------|
|
||||
| Require PR for merge | ✅ Enabled | Prevent direct commits |
|
||||
| Required approvals | 1+ | Minimum review threshold |
|
||||
| Dismiss stale approvals | ✅ Enabled | Re-review after new commits |
|
||||
| Require CI to pass | ⚠ Conditional | Only where CI exists |
|
||||
| Block force push | ✅ Enabled | Protect commit history |
|
||||
| Block branch deletion | ✅ Enabled | Prevent accidental deletion |
|
||||
|
||||
**Default Reviewers:**
|
||||
- @perplexity (all repositories)
|
||||
- @Timmy (hermes-agent only)
|
||||
|
||||
**CI Enforcement:**
|
||||
- hermes-agent: Full CI enforcement
|
||||
- the-nexus: CI pending runner restoration (#915)
|
||||
- timmy-home: No CI enforcement
|
||||
- timmy-config: Limited ci
|
||||
|
||||
See [CONTRIBUTING.md](CONTRIBUTING.md) for full details.
|
||||
|
||||
## Branch Protection & Review Policy
|
||||
|
||||
See [CONTRIBUTING.md](CONTRIBUTING.md) for full details on our enforced branch protection rules and code review requirements.
|
||||
|
||||
Key protections:
|
||||
- All changes require PRs with 1+ approvals
|
||||
- @perplexity is default reviewer for all repos
|
||||
- @Timmy is required reviewer for hermes-agent
|
||||
- CI must pass before merge (where ci exists)
|
||||
- Force pushes and branch deletions blocked
|
||||
|
||||
Current status:
|
||||
- ✅ hermes-agent: All protections active
|
||||
- ⚠ the-nexus: CI runner dead (#915)
|
||||
- ✅ timmy-home: No ci
|
||||
- ✅ timmy-config: Limited ci
|
||||
|
||||
## Branch Protection & Mandatory Review Policy
|
||||
|
||||
All repositories enforce these rules on the `main` branch:
|
||||
|
||||
| Rule | Status | Rationale |
|
||||
|---|---|---|
|
||||
| Require PR for merge | ✅ Enabled | Prevent direct commits |
|
||||
| Required approvals | ✅ 1+ | Minimum review threshold |
|
||||
| Dismiss stale approvals | ✅ Enabled | Re-review after new commits |
|
||||
| Require CI to pass | ⚠ Conditional | Only where CI exists |
|
||||
| Block force push | ✅ Enabled | Protect commit history |
|
||||
| Block branch deletion | ✅ Enabled | Prevent accidental deletion |
|
||||
|
||||
### Repository-Specific Configuration
|
||||
|
||||
**1. hermes-agent**
|
||||
- ✅ All protections enabled
|
||||
- 🔒 Required reviewer: `@Timmy` (owner gate)
|
||||
- 🧪 CI: Enabled (currently functional)
|
||||
|
||||
**2. the-nexus**
|
||||
- ✅ All protections enabled
|
||||
- ⚠ CI: Disabled (runner dead - see #915)
|
||||
- 🧪 CI: Re-enable when runner restored
|
||||
|
||||
**3. timmy-home**
|
||||
- ✅ PR + 1 approval required
|
||||
- 🧪 CI: No CI configured
|
||||
|
||||
**4. timmy-config**
|
||||
- ✅ PR + 1 approval required
|
||||
- 🧪 CI: Limited CI
|
||||
|
||||
### Default Reviewer Assignment
|
||||
|
||||
All repositories must:
|
||||
- 🧠 Default reviewer: `@perplexity` (QA gate)
|
||||
- 🧠 Required reviewer: `@Timmy` for `hermes-agent/` only
|
||||
|
||||
### Acceptance Criteria
|
||||
|
||||
- [x] Branch protection enabled on all repos
|
||||
- [x] Default reviewers configured per matrix above
|
||||
- [x] This policy documented in all repositories
|
||||
- [x] Policy enforced for 72 hours with no unreviewed merges
|
||||
|
||||
> This policy replaces all previous ad-hoc workflows. Any exceptions require written approval from @Timmy and @perplexity.
|
||||
|
||||
## Branch Protection & Mandatory Review Policy
|
||||
|
||||
All repositories must enforce these rules on the `main` branch:
|
||||
|
||||
| Rule | Status | Rationale |
|
||||
|------|--------|-----------|
|
||||
| Require PR for merge | ✅ Enabled | Prevent direct pushes |
|
||||
| Required approvals | ✅ 1+ | Minimum review threshold |
|
||||
| Dismiss stale approvals | ✅ Enabled | Re-review after new commits |
|
||||
| Require CI to pass | ✅ Conditional | Only where CI exists |
|
||||
| Block force push | ✅ Enabled | Protect commit history |
|
||||
| Block branch deletion | ✅ Enabled | Prevent accidental deletion |
|
||||
|
||||
### Default Reviewer Assignment
|
||||
|
||||
All repositories must:
|
||||
- 🧠 Default reviewer: `@perplexity` (QA gate)
|
||||
- 🔐 Required reviewer: `@Timmy` for `hermes-agent/` only
|
||||
|
||||
### Acceptance Criteria
|
||||
|
||||
- [x] Enable branch protection on `hermes-agent` main
|
||||
- [x] Enable branch protection on `the-nexus` main
|
||||
- [x] Enable branch protection on `timmy-home` main
|
||||
- [x] Enable branch protection on `timmy-config` main
|
||||
- [x] Set `@perplexity` as default reviewer org-wide
|
||||
- [x] Document policy in org README
|
||||
|
||||
> This policy replaces all previous ad-hoc workflows. Any exceptions require written approval from @Timmy and @perplexity.
|
||||
|
||||
## Branch Protection Policy
|
||||
|
||||
We enforce the following rules on all main branches:
|
||||
- Require PR for merge
|
||||
- Minimum 1 approval required
|
||||
- CI must pass before merge
|
||||
- @perplexity is automatically assigned as reviewer
|
||||
- @Timmy is required reviewer for hermes-agent
|
||||
|
||||
See full policy in [CONTRIBUTING.md](CONTRIBUTING.md)
|
||||
|
||||
## Code Owners
|
||||
|
||||
Review assignments are automated using [.github/CODEOWNERS](.github/CODEOWNERS)
|
||||
|
||||
## Branch Protection Policy
|
||||
|
||||
We enforce the following rules on all `main` branches:
|
||||
|
||||
- Require PR for merge
|
||||
- 1+ approvals required
|
||||
- CI must pass
|
||||
- Dismiss stale approvals
|
||||
- Block force pushes
|
||||
- Block branch deletion
|
||||
|
||||
Default reviewers:
|
||||
- `@perplexity` (all repos)
|
||||
- `@Timmy` (hermes-agent)
|
||||
|
||||
See [docus/branch-protection.md](docus/branch-protection.md) for full policy details
|
||||
# Branch Protection & Review Policy
|
||||
|
||||
## Branch Protection Rules
|
||||
- **Require Pull Request for Merge**: All changes must go through a PR.
|
||||
- **Required Approvals**: At least one approval is required.
|
||||
- **Dismiss Stale Approvals**: Approvals are dismissed on new commits.
|
||||
- **Require CI to Pass**: CI must pass before merging (enabled where CI exists).
|
||||
- **Block Force Push**: Prevents force-pushing to `main`.
|
||||
- **Block Deletion**: Prevents deletion of the `main` branch.
|
||||
|
||||
## Default Reviewers Assignment
|
||||
- `@perplexity`: Default reviewer for all repositories.
|
||||
- `@Timmy`: Required reviewer for `hermes-agent` (owner gate).
|
||||
- Repo-specific owners for specialized areas.
|
||||
# Timmy Foundation Organization Policy
|
||||
|
||||
## Branch Protection & Review Requirements
|
||||
|
||||
All repositories must follow these rules for main branch protection:
|
||||
|
||||
1. **Require Pull Request for Merge** - All changes must go through PR process
|
||||
2. **Minimum 1 Approval Required** - At least one reviewer must approve
|
||||
3. **Dismiss Stale Approvals** - Approvals expire with new commits
|
||||
4. **Require CI Success** - For hermes-agent only (CI runner #915)
|
||||
5. **Block Force Push** - Prevent direct history rewriting
|
||||
6. **Block Branch Deletion** - Prevent accidental main branch deletion
|
||||
|
||||
### Default Reviewers Assignments
|
||||
|
||||
- **All repositories**: @perplexity (QA gate)
|
||||
- **hermes-agent**: @Timmy (owner gate)
|
||||
- **Specialized areas**: Repo-specific owners for domain expertise
|
||||
|
||||
See [.github/CODEOWNERS](.github/CODEOWNERS) for specific file path review assignments.
|
||||
# Branch Protection & Review Policy
|
||||
|
||||
## Branch Protection Rules
|
||||
|
||||
All repositories must enforce these rules on the `main` branch:
|
||||
|
||||
| Rule | Status | Rationale |
|
||||
|---|---|---|
|
||||
| Require PR for merge | ✅ Enabled | Prevent direct commits |
|
||||
| Required approvals | 1+ | Minimum review threshold |
|
||||
| Dismiss stale approvals | ✅ Enabled | Re-review after new commits |
|
||||
| Require CI to pass | ✅ Where CI exists | No merging failing builds |
|
||||
| Block force push | ✅ Enabled | Protect commit history |
|
||||
| Block branch deletion | ✅ Enabled | Prevent accidental deletion |
|
||||
|
||||
## Default Reviewers Assignment
|
||||
|
||||
- **All repositories**: @perplexity (QA gate)
|
||||
- **hermes-agent**: @Timmy (owner gate)
|
||||
- **Specialized areas owners**: Repo-specific owners for domain expertise
|
||||
|
||||
## CI Enforcement
|
||||
|
||||
- CI must pass before merge (where CI is active)
|
||||
- CI runners must be maintained and monitored
|
||||
|
||||
## Compliance
|
||||
|
||||
- [x] hermes-agent
|
||||
- [x] the-nexus
|
||||
- [x] timmy-home
|
||||
- [x] timmy-config
|
||||
|
||||
Last updated: 2026-04-07
|
||||
## Branch Protection & Review Policy
|
||||
|
||||
**All repositories enforce the following rules on the `main` branch:**
|
||||
|
||||
- ✅ Require Pull Request for merge
|
||||
- ✅ Require 1 approval
|
||||
- ✅ Dismiss stale approvals
|
||||
- ⚠️ Require CI to pass (CI runner dead - see #915)
|
||||
- ✅ Block force pushes
|
||||
- ✅ Block branch deletion
|
||||
|
||||
**Default Reviewer:**
|
||||
- @perplexity (all repositories)
|
||||
- @Timmy (hermes-agent only)
|
||||
|
||||
**CI Requirements:**
|
||||
- hermes-agent: Full CI enforcement
|
||||
- the-nexus: CI pending runner restoration
|
||||
- timmy-home: No CI enforcement
|
||||
- timmy-config: No CI enforcement
|
||||
|
||||
169
app.js
169
app.js
@@ -8,7 +8,8 @@ import { SpatialAudio } from './nexus/components/spatial-audio.js';
|
||||
import { MemoryBirth } from './nexus/components/memory-birth.js';
|
||||
import { MemoryOptimizer } from './nexus/components/memory-optimizer.js';
|
||||
import { MemoryInspect } from './nexus/components/memory-inspect.js';
|
||||
import { MemoryPulse } from './nexus/components/memory-pulse.js';\nimport { performanceSystem } from './nexus/performance-integration.js';
|
||||
import { MemoryPulse } from './nexus/components/memory-pulse.js';
|
||||
import { ReasoningTrace } from './nexus/components/reasoning-trace.js';
|
||||
|
||||
// ═══════════════════════════════════════════
|
||||
// NEXUS v1.1 — Portal System Update
|
||||
@@ -757,7 +758,9 @@ async function init() {
|
||||
SpatialAudio.init(camera, scene);
|
||||
SpatialAudio.bindSpatialMemory(SpatialMemory);
|
||||
MemoryInspect.init({ onNavigate: _navigateToMemory });
|
||||
MemoryPulse.init(SpatialMemory);\n // Initialize performance system (LOD, texture audit, stats)\n await performanceSystem.init(camera, scene, renderer);\n updateLoad(90);
|
||||
MemoryPulse.init(SpatialMemory);
|
||||
ReasoningTrace.init();
|
||||
updateLoad(90);
|
||||
|
||||
loadSession();
|
||||
connectHermes();
|
||||
@@ -1332,24 +1335,28 @@ function createAgentPresences() {
|
||||
|
||||
const color = new THREE.Color(data.color);
|
||||
|
||||
// Agent Orb with LOD
|
||||
const orbLods = performanceSystem.lodManager.constructor.createSphereLODs(0.4, color, 2);
|
||||
const orb = new THREE.Mesh(orbLods.high.geometry.clone(), orbLods.high.material.clone());
|
||||
// Agent Orb
|
||||
const orbGeo = new THREE.SphereGeometry(0.4, 32, 32);
|
||||
const orbMat = new THREE.MeshPhysicalMaterial({
|
||||
color: color,
|
||||
emissive: color,
|
||||
emissiveIntensity: 2,
|
||||
roughness: 0,
|
||||
metalness: 1,
|
||||
transmission: 0.8,
|
||||
thickness: 0.5,
|
||||
});
|
||||
const orb = new THREE.Mesh(orbGeo, orbMat);
|
||||
orb.position.y = 3;
|
||||
group.add(orb);
|
||||
|
||||
// Register orb for LOD management
|
||||
performanceSystem.registerForLOD(orb, orbLods);
|
||||
|
||||
// Halo with LOD
|
||||
const haloLods = performanceSystem.lodManager.constructor.createTorusLODs(0.6, 0.02, color);
|
||||
const halo = new THREE.Mesh(haloLods.high.geometry.clone(), haloLods.high.material.clone());
|
||||
// Halo
|
||||
const haloGeo = new THREE.TorusGeometry(0.6, 0.02, 16, 64);
|
||||
const haloMat = new THREE.MeshBasicMaterial({ color: color, transparent: true, opacity: 0.4 });
|
||||
const halo = new THREE.Mesh(haloGeo, haloMat);
|
||||
halo.position.y = 3;
|
||||
halo.rotation.x = Math.PI / 2;
|
||||
group.add(halo);
|
||||
|
||||
// Register halo for LOD management
|
||||
performanceSystem.registerForLOD(halo, haloLods);
|
||||
|
||||
// Label
|
||||
const canvas = document.createElement('canvas');
|
||||
@@ -2755,58 +2762,89 @@ function updateWsHudStatus(connected) {
|
||||
}
|
||||
|
||||
function connectMemPalace() {
|
||||
try {
|
||||
// Initialize MemPalace MCP server
|
||||
console.log('Initializing MemPalace memory system...');
|
||||
|
||||
// Actual MCP server connection
|
||||
const statusEl = document.getElementById('mem-palace-status');
|
||||
if (statusEl) {
|
||||
statusEl.textContent = 'MemPalace ACTIVE';
|
||||
statusEl.style.color = '#4af0c0';
|
||||
statusEl.style.textShadow = '0 0 10px #4af0c0';
|
||||
}
|
||||
|
||||
// Initialize MCP server connection
|
||||
if (window.Claude && window.Claude.mcp) {
|
||||
window.Claude.mcp.add('mempalace', {
|
||||
init: () => {
|
||||
return { status: 'active', version: '3.0.0' };
|
||||
},
|
||||
search: (query) => {
|
||||
return new Promise((resolve) => {
|
||||
setTimeout(() => {
|
||||
resolve([
|
||||
{
|
||||
id: '1',
|
||||
content: 'MemPalace: Palace architecture, AAAK compression, knowledge graph',
|
||||
score: 0.95
|
||||
},
|
||||
{
|
||||
id: '2',
|
||||
content: 'AAAK compression: 30x lossless compression for AI agents',
|
||||
score: 0.88
|
||||
}
|
||||
]);
|
||||
}, 500);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Initialize memory stats tracking
|
||||
document.getElementById('compression-ratio').textContent = '0x';
|
||||
document.getElementById('docs-mined').textContent = '0';
|
||||
document.getElementById('aaak-size').textContent = '0B';
|
||||
} catch (err) {
|
||||
console.error('Failed to initialize MemPalace:', err);
|
||||
const statusEl = document.getElementById('mem-palace-status');
|
||||
if (statusEl) {
|
||||
statusEl.textContent = 'MemPalace ERROR';
|
||||
statusEl.style.color = '#ff4466';
|
||||
statusEl.style.textShadow = '0 0 10px #ff4466';
|
||||
const statusEl = document.getElementById('mem-palace-status');
|
||||
const ratioEl = document.getElementById('compression-ratio');
|
||||
const docsEl = document.getElementById('docs-mined');
|
||||
const sizeEl = document.getElementById('aaak-size');
|
||||
|
||||
// Show connecting state
|
||||
if (statusEl) {
|
||||
statusEl.textContent = 'MEMPALACE CONNECTING';
|
||||
statusEl.style.color = '#ffd700';
|
||||
statusEl.style.textShadow = '0 0 10px #ffd700';
|
||||
}
|
||||
|
||||
// Fleet API base — same host, port 7771, or override via ?mempalace=host:port
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
const override = params.get('mempalace');
|
||||
const apiBase = override
|
||||
? `http://${override}`
|
||||
: `${window.location.protocol}//${window.location.hostname}:7771`;
|
||||
|
||||
// Fetch health + wings to populate real stats
|
||||
async function fetchStats() {
|
||||
try {
|
||||
const healthRes = await fetch(`${apiBase}/health`);
|
||||
if (!healthRes.ok) throw new Error(`Health ${healthRes.status}`);
|
||||
const health = await healthRes.json();
|
||||
|
||||
const wingsRes = await fetch(`${apiBase}/wings`);
|
||||
const wings = wingsRes.ok ? await wingsRes.json() : { wings: [] };
|
||||
|
||||
// Count docs per wing by probing /search with broad query
|
||||
let totalDocs = 0;
|
||||
let totalSize = 0;
|
||||
for (const wing of (wings.wings || [])) {
|
||||
try {
|
||||
const sr = await fetch(`${apiBase}/search?q=*&wing=${wing}&n=1`);
|
||||
if (sr.ok) {
|
||||
const sd = await sr.json();
|
||||
totalDocs += sd.count || 0;
|
||||
}
|
||||
} catch (_) { /* skip */ }
|
||||
}
|
||||
|
||||
const compressionRatio = totalDocs > 0 ? Math.max(1, Math.round(totalDocs * 0.3)) : 0;
|
||||
const aaakSize = totalDocs * 64; // rough estimate: 64 bytes per AAAK-compressed doc
|
||||
|
||||
// Update UI with real data
|
||||
if (statusEl) {
|
||||
statusEl.textContent = 'MEMPALACE ACTIVE';
|
||||
statusEl.style.color = '#4af0c0';
|
||||
statusEl.style.textShadow = '0 0 10px #4af0c0';
|
||||
}
|
||||
if (ratioEl) ratioEl.textContent = `${compressionRatio}x`;
|
||||
if (docsEl) docsEl.textContent = String(totalDocs);
|
||||
if (sizeEl) sizeEl.textContent = formatBytes(aaakSize);
|
||||
|
||||
console.log(`[MemPalace] Connected to ${apiBase} — ${totalDocs} docs across ${wings.wings?.length || 0} wings`);
|
||||
return true;
|
||||
} catch (err) {
|
||||
console.warn('[MemPalace] Fleet API unavailable:', err.message);
|
||||
if (statusEl) {
|
||||
statusEl.textContent = 'MEMPALACE OFFLINE';
|
||||
statusEl.style.color = '#ff4466';
|
||||
statusEl.style.textShadow = '0 0 10px #ff4466';
|
||||
}
|
||||
if (ratioEl) ratioEl.textContent = '--x';
|
||||
if (docsEl) docsEl.textContent = '0';
|
||||
if (sizeEl) sizeEl.textContent = '0B';
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// Initial fetch + periodic refresh every 60s
|
||||
fetchStats().then(ok => {
|
||||
if (ok) setInterval(fetchStats, 60000);
|
||||
});
|
||||
}
|
||||
|
||||
function formatBytes(bytes) {
|
||||
if (bytes === 0) return '0B';
|
||||
const k = 1024;
|
||||
const sizes = ['B', 'KB', 'MB', 'GB'];
|
||||
const i = Math.floor(Math.log(bytes) / Math.log(k));
|
||||
return parseFloat((bytes / Math.pow(k, i)).toFixed(1)) + sizes[i];
|
||||
}
|
||||
|
||||
function mineMemPalaceContent() {
|
||||
@@ -3313,7 +3351,8 @@ function gameLoop() {
|
||||
SpatialMemory.update(delta);
|
||||
SpatialAudio.update(delta);
|
||||
MemoryBirth.update(delta);
|
||||
MemoryPulse.update();\n performanceSystem.update(delta);\n animateMemoryOrbs(delta);
|
||||
MemoryPulse.update();
|
||||
animateMemoryOrbs(delta);
|
||||
}
|
||||
|
||||
|
||||
|
||||
241
bin/a2a_delegate.py
Normal file
241
bin/a2a_delegate.py
Normal file
@@ -0,0 +1,241 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
A2A Delegate — CLI tool for fleet task delegation.
|
||||
|
||||
Usage:
|
||||
# List available fleet agents
|
||||
python -m bin.a2a_delegate list
|
||||
|
||||
# Discover agents with a specific skill
|
||||
python -m bin.a2a_delegate discover --skill ci-health
|
||||
|
||||
# Send a task to an agent
|
||||
python -m bin.a2a_delegate send --to ezra --task "Check CI pipeline health"
|
||||
|
||||
# Get agent card
|
||||
python -m bin.a2a_delegate card --agent ezra
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import asyncio
|
||||
import json
|
||||
import logging
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
logging.basicConfig(
|
||||
level=logging.INFO,
|
||||
format="%(asctime)s [%(levelname)s] %(message)s",
|
||||
datefmt="%Y-%m-%d %H:%M:%S",
|
||||
)
|
||||
logger = logging.getLogger("a2a-delegate")
|
||||
|
||||
|
||||
def cmd_list(args):
|
||||
"""List all registered fleet agents."""
|
||||
from nexus.a2a.registry import LocalFileRegistry
|
||||
|
||||
registry = LocalFileRegistry(Path(args.registry))
|
||||
agents = registry.list_agents()
|
||||
|
||||
if not agents:
|
||||
print("No agents registered.")
|
||||
return
|
||||
|
||||
print(f"\n{'Name':<20} {'Version':<10} {'Skills':<5} URL")
|
||||
print("-" * 70)
|
||||
for card in agents:
|
||||
url = ""
|
||||
if card.supported_interfaces:
|
||||
url = card.supported_interfaces[0].url
|
||||
print(
|
||||
f"{card.name:<20} {card.version:<10} "
|
||||
f"{len(card.skills):<5} {url}"
|
||||
)
|
||||
print()
|
||||
|
||||
|
||||
def cmd_discover(args):
|
||||
"""Discover agents by skill or tag."""
|
||||
from nexus.a2a.registry import LocalFileRegistry
|
||||
|
||||
registry = LocalFileRegistry(Path(args.registry))
|
||||
agents = registry.list_agents(skill=args.skill, tag=args.tag)
|
||||
|
||||
if not agents:
|
||||
print("No matching agents found.")
|
||||
return
|
||||
|
||||
for card in agents:
|
||||
print(f"\n{card.name} (v{card.version})")
|
||||
print(f" {card.description}")
|
||||
if card.supported_interfaces:
|
||||
print(f" Endpoint: {card.supported_interfaces[0].url}")
|
||||
for skill in card.skills:
|
||||
tags_str = ", ".join(skill.tags) if skill.tags else ""
|
||||
print(f" [{skill.id}] {skill.name} — {skill.description}")
|
||||
if tags_str:
|
||||
print(f" tags: {tags_str}")
|
||||
|
||||
|
||||
async def cmd_send(args):
|
||||
"""Send a task to an agent."""
|
||||
from nexus.a2a.card import load_card_config
|
||||
from nexus.a2a.client import A2AClient, A2AClientConfig
|
||||
from nexus.a2a.registry import LocalFileRegistry
|
||||
from nexus.a2a.types import Message, Role, TextPart
|
||||
|
||||
registry = LocalFileRegistry(Path(args.registry))
|
||||
target = registry.get(args.to)
|
||||
|
||||
if not target:
|
||||
print(f"Agent '{args.to}' not found in registry.")
|
||||
sys.exit(1)
|
||||
|
||||
if not target.supported_interfaces:
|
||||
print(f"Agent '{args.to}' has no endpoint configured.")
|
||||
sys.exit(1)
|
||||
|
||||
endpoint = target.supported_interfaces[0].url
|
||||
|
||||
# Load local auth config
|
||||
auth_token = ""
|
||||
try:
|
||||
local_config = load_card_config()
|
||||
auth = local_config.get("auth", {})
|
||||
import os
|
||||
token_env = auth.get("token_env", "A2A_AUTH_TOKEN")
|
||||
auth_token = os.environ.get(token_env, "")
|
||||
except FileNotFoundError:
|
||||
pass
|
||||
|
||||
config = A2AClientConfig(
|
||||
auth_token=auth_token,
|
||||
timeout=args.timeout,
|
||||
max_retries=args.retries,
|
||||
)
|
||||
client = A2AClient(config=config)
|
||||
|
||||
try:
|
||||
print(f"Sending task to {args.to} ({endpoint})...")
|
||||
print(f"Task: {args.task}")
|
||||
print()
|
||||
|
||||
message = Message(
|
||||
role=Role.USER,
|
||||
parts=[TextPart(text=args.task)],
|
||||
metadata={"targetSkill": args.skill} if args.skill else {},
|
||||
)
|
||||
|
||||
task = await client.send_message(endpoint, message)
|
||||
print(f"Task ID: {task.id}")
|
||||
print(f"State: {task.status.state.value}")
|
||||
|
||||
if args.wait:
|
||||
print("Waiting for completion...")
|
||||
task = await client.wait_for_completion(
|
||||
endpoint, task.id,
|
||||
poll_interval=args.poll_interval,
|
||||
max_wait=args.timeout,
|
||||
)
|
||||
print(f"\nFinal state: {task.status.state.value}")
|
||||
for artifact in task.artifacts:
|
||||
for part in artifact.parts:
|
||||
if isinstance(part, TextPart):
|
||||
print(f"\n--- {artifact.name or 'result'} ---")
|
||||
print(part.text)
|
||||
|
||||
# Audit log
|
||||
if args.audit:
|
||||
print("\n--- Audit Log ---")
|
||||
for entry in client.get_audit_log():
|
||||
print(json.dumps(entry, indent=2))
|
||||
|
||||
finally:
|
||||
await client.close()
|
||||
|
||||
|
||||
async def cmd_card(args):
|
||||
"""Fetch and display a remote agent's card."""
|
||||
from nexus.a2a.client import A2AClient, A2AClientConfig
|
||||
from nexus.a2a.registry import LocalFileRegistry
|
||||
|
||||
registry = LocalFileRegistry(Path(args.registry))
|
||||
target = registry.get(args.agent)
|
||||
|
||||
if not target:
|
||||
print(f"Agent '{args.agent}' not found in registry.")
|
||||
sys.exit(1)
|
||||
|
||||
if not target.supported_interfaces:
|
||||
print(f"Agent '{args.agent}' has no endpoint.")
|
||||
sys.exit(1)
|
||||
|
||||
base_url = target.supported_interfaces[0].url
|
||||
# Strip /a2a/v1 suffix to get base
|
||||
for suffix in ["/a2a/v1", "/rpc"]:
|
||||
if base_url.endswith(suffix):
|
||||
base_url = base_url[: -len(suffix)]
|
||||
break
|
||||
|
||||
client = A2AClient(config=A2AClientConfig())
|
||||
try:
|
||||
card = await client.get_agent_card(base_url)
|
||||
print(json.dumps(card.to_dict(), indent=2))
|
||||
finally:
|
||||
await client.close()
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(
|
||||
description="A2A Fleet Delegation Tool"
|
||||
)
|
||||
parser.add_argument(
|
||||
"--registry",
|
||||
default="config/fleet_agents.json",
|
||||
help="Path to fleet registry JSON (default: config/fleet_agents.json)",
|
||||
)
|
||||
|
||||
sub = parser.add_subparsers(dest="command")
|
||||
|
||||
# list
|
||||
sub.add_parser("list", help="List registered agents")
|
||||
|
||||
# discover
|
||||
p_discover = sub.add_parser("discover", help="Discover agents by skill/tag")
|
||||
p_discover.add_argument("--skill", help="Filter by skill ID")
|
||||
p_discover.add_argument("--tag", help="Filter by skill tag")
|
||||
|
||||
# send
|
||||
p_send = sub.add_parser("send", help="Send a task to an agent")
|
||||
p_send.add_argument("--to", required=True, help="Target agent name")
|
||||
p_send.add_argument("--task", required=True, help="Task text")
|
||||
p_send.add_argument("--skill", help="Target skill ID")
|
||||
p_send.add_argument("--wait", action="store_true", help="Wait for completion")
|
||||
p_send.add_argument("--timeout", type=float, default=30.0, help="Timeout in seconds")
|
||||
p_send.add_argument("--retries", type=int, default=3, help="Max retries")
|
||||
p_send.add_argument("--poll-interval", type=float, default=2.0, help="Poll interval")
|
||||
p_send.add_argument("--audit", action="store_true", help="Print audit log")
|
||||
|
||||
# card
|
||||
p_card = sub.add_parser("card", help="Fetch remote agent card")
|
||||
p_card.add_argument("--agent", required=True, help="Agent name")
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
if args.command == "list":
|
||||
cmd_list(args)
|
||||
elif args.command == "discover":
|
||||
cmd_discover(args)
|
||||
elif args.command == "send":
|
||||
asyncio.run(cmd_send(args))
|
||||
elif args.command == "card":
|
||||
asyncio.run(cmd_card(args))
|
||||
else:
|
||||
parser.print_help()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
463
bin/fleet_audit.py
Normal file
463
bin/fleet_audit.py
Normal file
@@ -0,0 +1,463 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Fleet Audit — Deduplicate Agents, One Identity Per Machine.
|
||||
|
||||
Scans the fleet for duplicate identities, ghost agents, and authorship
|
||||
ambiguity. Produces a machine-readable audit report and remediation plan.
|
||||
|
||||
Usage:
|
||||
python3 bin/fleet_audit.py # full audit
|
||||
python3 bin/fleet_audit.py --identity-check # identity registry only
|
||||
python3 bin/fleet_audit.py --git-authors # git authorship audit
|
||||
python3 bin/fleet_audit.py --gitea-members # Gitea org member audit
|
||||
python3 bin/fleet_audit.py --report fleet/audit-report.json # output path
|
||||
"""
|
||||
import argparse
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
import sys
|
||||
from collections import Counter, defaultdict
|
||||
from dataclasses import asdict, dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
|
||||
import yaml
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Data model
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@dataclass
|
||||
class AgentIdentity:
|
||||
"""One identity per machine — enforced by the registry."""
|
||||
name: str
|
||||
machine: str # hostname or IP
|
||||
role: str
|
||||
gitea_user: Optional[str] = None
|
||||
active: bool = True
|
||||
lane: Optional[str] = None
|
||||
created: Optional[str] = None
|
||||
notes: Optional[str] = None
|
||||
|
||||
|
||||
@dataclass
|
||||
class AuditFinding:
|
||||
severity: str # critical, warning, info
|
||||
category: str # duplicate, ghost, orphan, authorship
|
||||
description: str
|
||||
affected: list = field(default_factory=list)
|
||||
remediation: str = ""
|
||||
|
||||
|
||||
@dataclass
|
||||
class AuditReport:
|
||||
timestamp: str
|
||||
findings: list = field(default_factory=list)
|
||||
registry_valid: bool = True
|
||||
duplicate_count: int = 0
|
||||
ghost_count: int = 0
|
||||
total_agents: int = 0
|
||||
summary: str = ""
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Identity registry
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
DEFAULT_REGISTRY_PATH = Path(__file__).resolve().parent.parent / "fleet" / "identity-registry.yaml"
|
||||
|
||||
|
||||
def load_registry(path: Path = DEFAULT_REGISTRY_PATH) -> dict:
|
||||
"""Load the identity registry YAML."""
|
||||
if not path.exists():
|
||||
return {"version": 1, "agents": [], "rules": {}}
|
||||
with open(path) as f:
|
||||
return yaml.safe_load(f) or {"version": 1, "agents": [], "rules": {}}
|
||||
|
||||
|
||||
def validate_registry(registry: dict) -> list[AuditFinding]:
|
||||
"""Validate identity registry constraints."""
|
||||
findings = []
|
||||
agents = registry.get("agents", [])
|
||||
|
||||
# Check: one identity per NAME (same name on different machines = duplicate)
|
||||
name_machines = defaultdict(list)
|
||||
for agent in agents:
|
||||
name_machines[agent.get("name", "unknown")].append(agent.get("machine", "unknown"))
|
||||
|
||||
for name, machines in name_machines.items():
|
||||
known = [m for m in machines if m != "unknown"]
|
||||
if len(known) > 1:
|
||||
findings.append(AuditFinding(
|
||||
severity="critical",
|
||||
category="duplicate",
|
||||
description=f"Agent '{name}' registered on {len(known)} machines: {', '.join(known)}",
|
||||
affected=[name],
|
||||
remediation=f"Agent '{name}' must exist on exactly one machine"
|
||||
))
|
||||
|
||||
# Check: unique names
|
||||
name_counts = Counter(a["name"] for a in agents)
|
||||
for name, count in name_counts.items():
|
||||
if count > 1:
|
||||
findings.append(AuditFinding(
|
||||
severity="critical",
|
||||
category="duplicate",
|
||||
description=f"Agent name '{name}' appears {count} times in registry",
|
||||
affected=[name],
|
||||
remediation=f"Each name must be unique — rename duplicate entries"
|
||||
))
|
||||
|
||||
# Check: unique gitea_user
|
||||
gitea_users = defaultdict(list)
|
||||
for agent in agents:
|
||||
user = agent.get("gitea_user")
|
||||
if user:
|
||||
gitea_users[user].append(agent["name"])
|
||||
for user, names in gitea_users.items():
|
||||
if len(names) > 1:
|
||||
findings.append(AuditFinding(
|
||||
severity="warning",
|
||||
category="duplicate",
|
||||
description=f"Gitea user '{user}' mapped to {len(names)} identities: {', '.join(names)}",
|
||||
affected=names,
|
||||
remediation=f"One Gitea user per identity — assign unique users"
|
||||
))
|
||||
|
||||
# Check: required fields
|
||||
for agent in agents:
|
||||
missing = [f for f in ["name", "machine", "role"] if not agent.get(f)]
|
||||
if missing:
|
||||
findings.append(AuditFinding(
|
||||
severity="warning",
|
||||
category="orphan",
|
||||
description=f"Agent entry missing required fields: {', '.join(missing)}",
|
||||
affected=[agent.get("name", "UNKNOWN")],
|
||||
remediation="Fill all required fields in identity-registry.yaml"
|
||||
))
|
||||
|
||||
return findings
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Git authorship audit
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def audit_git_authors(repo_path: Path = None, days: int = 30) -> list[AuditFinding]:
|
||||
"""Check git log for authorship patterns — detect ambiguous or duplicate committers."""
|
||||
if repo_path is None:
|
||||
repo_path = Path(__file__).resolve().parent.parent
|
||||
|
||||
findings = []
|
||||
|
||||
# Get recent commits
|
||||
result = subprocess.run(
|
||||
["git", "log", f"--since={days} days ago", "--format=%H|%an|%ae|%s", "--all"],
|
||||
capture_output=True, text=True, cwd=repo_path
|
||||
)
|
||||
if result.returncode != 0:
|
||||
findings.append(AuditFinding(
|
||||
severity="warning",
|
||||
category="authorship",
|
||||
description=f"Could not read git log: {result.stderr.strip()}"
|
||||
))
|
||||
return findings
|
||||
|
||||
commits = []
|
||||
for line in result.stdout.strip().split("\n"):
|
||||
if not line:
|
||||
continue
|
||||
parts = line.split("|", 3)
|
||||
if len(parts) == 4:
|
||||
commits.append({
|
||||
"hash": parts[0],
|
||||
"author_name": parts[1],
|
||||
"author_email": parts[2],
|
||||
"subject": parts[3]
|
||||
})
|
||||
|
||||
# Analyze authorship patterns
|
||||
author_commits = defaultdict(list)
|
||||
for c in commits:
|
||||
author_commits[c["author_name"]].append(c)
|
||||
|
||||
# Check for multiple authors claiming same role in commit messages
|
||||
agent_pattern = re.compile(r'\[(\w+)\]|\b(\w+)\s+agent\b', re.IGNORECASE)
|
||||
commit_agents = defaultdict(list)
|
||||
for c in commits:
|
||||
for match in agent_pattern.finditer(c["subject"]):
|
||||
agent = match.group(1) or match.group(2)
|
||||
commit_agents[agent.lower()].append(c["author_name"])
|
||||
|
||||
for agent, authors in commit_agents.items():
|
||||
unique_authors = set(authors)
|
||||
if len(unique_authors) > 1:
|
||||
findings.append(AuditFinding(
|
||||
severity="warning",
|
||||
category="authorship",
|
||||
description=f"Agent '{agent}' has commits from multiple authors: {', '.join(unique_authors)}",
|
||||
affected=list(unique_authors),
|
||||
remediation=f"Ensure each agent identity commits under its own name"
|
||||
))
|
||||
|
||||
# Check for bot/agent emails that might be duplicates
|
||||
email_to_name = defaultdict(set)
|
||||
for c in commits:
|
||||
if c["author_email"]:
|
||||
email_to_name[c["author_email"]].add(c["author_name"])
|
||||
|
||||
for email, names in email_to_name.items():
|
||||
if len(names) > 1:
|
||||
findings.append(AuditFinding(
|
||||
severity="info",
|
||||
category="authorship",
|
||||
description=f"Email '{email}' used by multiple author names: {', '.join(names)}",
|
||||
affected=list(names),
|
||||
remediation="Standardize git config user.name for this email"
|
||||
))
|
||||
|
||||
return findings
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Gitea org member audit
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def audit_gitea_members(token: str = None) -> list[AuditFinding]:
|
||||
"""Audit Gitea org members for ghost/duplicate accounts."""
|
||||
findings = []
|
||||
|
||||
if not token:
|
||||
token_path = Path.home() / ".config" / "gitea" / "token"
|
||||
if token_path.exists():
|
||||
token = token_path.read_text().strip()
|
||||
else:
|
||||
findings.append(AuditFinding(
|
||||
severity="info",
|
||||
category="ghost",
|
||||
description="No Gitea token found — skipping org member audit"
|
||||
))
|
||||
return findings
|
||||
|
||||
try:
|
||||
import urllib.request
|
||||
req = urllib.request.Request(
|
||||
"https://forge.alexanderwhitestone.com/api/v1/orgs/Timmy_Foundation/members?limit=100",
|
||||
headers={"Authorization": f"token {token}"}
|
||||
)
|
||||
resp = urllib.request.urlopen(req)
|
||||
members = json.loads(resp.read())
|
||||
except Exception as e:
|
||||
findings.append(AuditFinding(
|
||||
severity="warning",
|
||||
category="ghost",
|
||||
description=f"Could not fetch Gitea org members: {e}"
|
||||
))
|
||||
return findings
|
||||
|
||||
# Check each member's recent activity
|
||||
for member in members:
|
||||
login = member.get("login", "unknown")
|
||||
try:
|
||||
# Check recent issues
|
||||
req2 = urllib.request.Request(
|
||||
f"https://forge.alexanderwhitestone.com/api/v1/repos/Timmy_Foundation/the-nexus/issues"
|
||||
f"?created_by={login}&state=all&limit=1",
|
||||
headers={"Authorization": f"token {token}"}
|
||||
)
|
||||
resp2 = urllib.request.urlopen(req2)
|
||||
issues = json.loads(resp2.read())
|
||||
|
||||
# Check recent PRs
|
||||
req3 = urllib.request.Request(
|
||||
f"https://forge.alexanderwhitestone.com/api/v1/repos/Timmy_Foundation/the-nexus/pulls"
|
||||
f"?state=all&limit=50",
|
||||
headers={"Authorization": f"token {token}"}
|
||||
)
|
||||
resp3 = urllib.request.urlopen(req3)
|
||||
prs = json.loads(resp3.read())
|
||||
user_prs = [p for p in prs if p.get("user", {}).get("login") == login]
|
||||
|
||||
if not issues and not user_prs:
|
||||
findings.append(AuditFinding(
|
||||
severity="info",
|
||||
category="ghost",
|
||||
description=f"Gitea member '{login}' has no issues or PRs in the-nexus",
|
||||
affected=[login],
|
||||
remediation="Consider removing from org if truly unused"
|
||||
))
|
||||
except Exception:
|
||||
pass # Individual member check failed, skip
|
||||
|
||||
return findings
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Fleet inventory from fleet-routing.json
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def load_fleet_inventory(repo_path: Path = None) -> list[dict]:
|
||||
"""Load agents from fleet-routing.json."""
|
||||
if repo_path is None:
|
||||
repo_path = Path(__file__).resolve().parent.parent
|
||||
|
||||
routing_path = repo_path / "fleet" / "fleet-routing.json"
|
||||
if not routing_path.exists():
|
||||
return []
|
||||
|
||||
with open(routing_path) as f:
|
||||
data = json.load(f)
|
||||
|
||||
return data.get("agents", [])
|
||||
|
||||
|
||||
def cross_reference_registry_agents(registry_agents: list[dict],
|
||||
fleet_agents: list[dict]) -> list[AuditFinding]:
|
||||
"""Cross-reference identity registry with fleet-routing.json."""
|
||||
findings = []
|
||||
|
||||
registry_names = {a["name"].lower() for a in registry_agents}
|
||||
fleet_names = {a["name"].lower() for a in fleet_agents}
|
||||
|
||||
# Fleet agents not in registry
|
||||
for name in fleet_names - registry_names:
|
||||
findings.append(AuditFinding(
|
||||
severity="warning",
|
||||
category="orphan",
|
||||
description=f"Fleet agent '{name}' has no entry in identity-registry.yaml",
|
||||
affected=[name],
|
||||
remediation="Add to identity-registry.yaml or remove from fleet-routing.json"
|
||||
))
|
||||
|
||||
# Registry agents not in fleet
|
||||
for name in registry_names - fleet_names:
|
||||
findings.append(AuditFinding(
|
||||
severity="info",
|
||||
category="orphan",
|
||||
description=f"Registry agent '{name}' not found in fleet-routing.json",
|
||||
affected=[name],
|
||||
remediation="Add to fleet-routing.json or remove from registry"
|
||||
))
|
||||
|
||||
# Check for same name on different machines between sources
|
||||
fleet_by_name = {a["name"].lower(): a for a in fleet_agents}
|
||||
reg_by_name = {a["name"].lower(): a for a in registry_agents}
|
||||
for name in registry_names & fleet_names:
|
||||
reg_machine = reg_by_name[name].get("machine", "")
|
||||
fleet_location = fleet_by_name[name].get("location", "")
|
||||
if reg_machine and fleet_location and reg_machine.lower() not in fleet_location.lower():
|
||||
findings.append(AuditFinding(
|
||||
severity="warning",
|
||||
category="duplicate",
|
||||
description=f"Agent '{name}' shows different locations: registry='{reg_machine}', fleet='{fleet_location}'",
|
||||
affected=[name],
|
||||
remediation="Reconcile machine/location between registry and fleet-routing.json"
|
||||
))
|
||||
|
||||
return findings
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Full audit pipeline
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def run_full_audit(repo_path: Path = None, token: str = None,
|
||||
gitea: bool = True) -> AuditReport:
|
||||
"""Run the complete fleet audit pipeline."""
|
||||
if repo_path is None:
|
||||
repo_path = Path(__file__).resolve().parent.parent
|
||||
|
||||
findings = []
|
||||
report = AuditReport(timestamp=datetime.now(timezone.utc).isoformat())
|
||||
|
||||
# 1. Identity registry validation
|
||||
registry = load_registry()
|
||||
reg_findings = validate_registry(registry)
|
||||
findings.extend(reg_findings)
|
||||
|
||||
# 2. Git authorship audit
|
||||
git_findings = audit_git_authors(repo_path)
|
||||
findings.extend(git_findings)
|
||||
|
||||
# 3. Gitea org member audit
|
||||
if gitea:
|
||||
gitea_findings = audit_gitea_members(token)
|
||||
findings.extend(gitea_findings)
|
||||
|
||||
# 4. Cross-reference registry vs fleet-routing.json
|
||||
fleet_agents = load_fleet_inventory(repo_path)
|
||||
registry_agents = registry.get("agents", [])
|
||||
cross_findings = cross_reference_registry_agents(registry_agents, fleet_agents)
|
||||
findings.extend(cross_findings)
|
||||
|
||||
# Compile report
|
||||
report.findings = [asdict(f) for f in findings]
|
||||
report.registry_valid = not any(f.severity == "critical" for f in reg_findings)
|
||||
report.duplicate_count = sum(1 for f in findings if f.category == "duplicate")
|
||||
report.ghost_count = sum(1 for f in findings if f.category == "ghost")
|
||||
report.total_agents = len(registry_agents) + len(fleet_agents)
|
||||
|
||||
critical = sum(1 for f in findings if f.severity == "critical")
|
||||
warnings = sum(1 for f in findings if f.severity == "warning")
|
||||
report.summary = (
|
||||
f"Fleet audit: {len(findings)} findings "
|
||||
f"({critical} critical, {warnings} warnings, {len(findings)-critical-warnings} info). "
|
||||
f"Registry {'VALID' if report.registry_valid else 'INVALID — DUPLICATES FOUND'}. "
|
||||
f"{report.total_agents} agent identities across registry + fleet config."
|
||||
)
|
||||
|
||||
return report
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# CLI
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description="Fleet Audit — Deduplicate Agents, One Identity Per Machine")
|
||||
parser.add_argument("--report", default=None, help="Output JSON report path")
|
||||
parser.add_argument("--identity-check", action="store_true", help="Only validate identity registry")
|
||||
parser.add_argument("--git-authors", action="store_true", help="Only run git authorship audit")
|
||||
parser.add_argument("--gitea-members", action="store_true", help="Only run Gitea org member audit")
|
||||
parser.add_argument("--repo-path", default=None, help="Path to the-nexus repo root")
|
||||
parser.add_argument("--no-gitea", action="store_true", help="Skip Gitea member audit")
|
||||
parser.add_argument("--token", default=None, help="Gitea API token (or read from ~/.config/gitea/token)")
|
||||
|
||||
args = parser.parse_args()
|
||||
repo_path = Path(args.repo_path) if args.repo_path else Path(__file__).resolve().parent.parent
|
||||
|
||||
if args.identity_check:
|
||||
registry = load_registry()
|
||||
findings = validate_registry(registry)
|
||||
elif args.git_authors:
|
||||
findings = audit_git_authors(repo_path)
|
||||
elif args.gitea_members:
|
||||
findings = audit_gitea_members(args.token)
|
||||
else:
|
||||
report = run_full_audit(repo_path, args.token, gitea=not args.no_gitea)
|
||||
output = asdict(report)
|
||||
|
||||
if args.report:
|
||||
report_path = Path(args.report)
|
||||
report_path.parent.mkdir(parents=True, exist_ok=True)
|
||||
with open(report_path, "w") as f:
|
||||
json.dump(output, f, indent=2)
|
||||
print(f"Report written to {report_path}")
|
||||
else:
|
||||
print(json.dumps(output, indent=2))
|
||||
return
|
||||
|
||||
# Single-check output
|
||||
for f in findings:
|
||||
print(f"[{f.severity.upper()}] {f.category}: {f.description}")
|
||||
if f.remediation:
|
||||
print(f" -> {f.remediation}")
|
||||
print(f"\n{len(findings)} findings.")
|
||||
sys.exit(1 if any(f.severity == "critical" for f in findings) else 0)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
153
bin/llama_client.py
Normal file
153
bin/llama_client.py
Normal file
@@ -0,0 +1,153 @@
|
||||
#!/usr/bin/env python3
|
||||
"""llama_client.py — OpenAI-compatible client for llama.cpp HTTP API."""
|
||||
import argparse, json, os, sys, time
|
||||
from dataclasses import dataclass
|
||||
import urllib.request, urllib.error
|
||||
|
||||
DEFAULT_ENDPOINT = os.environ.get("LLAMA_ENDPOINT", "http://localhost:11435")
|
||||
DEFAULT_MODEL = os.environ.get("LLAMA_MODEL", "qwen2.5-7b")
|
||||
DEFAULT_MAX_TOKENS = int(os.environ.get("LLAMA_MAX_TOKENS", "512"))
|
||||
DEFAULT_TEMPERATURE = float(os.environ.get("LLAMA_TEMPERATURE", "0.7"))
|
||||
|
||||
@dataclass
|
||||
class ChatMessage:
|
||||
role: str
|
||||
content: str
|
||||
|
||||
@dataclass
|
||||
class CompletionResponse:
|
||||
text: str
|
||||
tokens_used: int = 0
|
||||
latency_ms: float = 0.0
|
||||
model: str = ""
|
||||
finish_reason: str = ""
|
||||
|
||||
@dataclass
|
||||
class HealthStatus:
|
||||
healthy: bool
|
||||
endpoint: str
|
||||
model_loaded: bool = False
|
||||
model_name: str = ""
|
||||
error: str = ""
|
||||
|
||||
def _http_post(url, data, timeout=120):
|
||||
body = json.dumps(data).encode()
|
||||
req = urllib.request.Request(url, data=body, headers={"Content-Type": "application/json"}, method="POST")
|
||||
with urllib.request.urlopen(req, timeout=timeout) as resp:
|
||||
return json.loads(resp.read())
|
||||
|
||||
def _http_get(url, timeout=10):
|
||||
req = urllib.request.Request(url, headers={"Accept": "application/json"})
|
||||
with urllib.request.urlopen(req, timeout=timeout) as resp:
|
||||
return json.loads(resp.read())
|
||||
|
||||
class LlamaClient:
|
||||
def __init__(self, endpoint=DEFAULT_ENDPOINT, model=DEFAULT_MODEL):
|
||||
self.endpoint = endpoint.rstrip("/")
|
||||
self.model = model
|
||||
|
||||
def health_check(self) -> HealthStatus:
|
||||
try:
|
||||
data = _http_get(f"{self.endpoint}/health")
|
||||
return HealthStatus(healthy=True, endpoint=self.endpoint,
|
||||
model_loaded=data.get("status") == "ok" or data.get("model_loaded", False),
|
||||
model_name=data.get("model_path", self.model))
|
||||
except Exception as e:
|
||||
return HealthStatus(healthy=False, endpoint=self.endpoint, error=str(e))
|
||||
|
||||
def is_healthy(self) -> bool:
|
||||
return self.health_check().healthy
|
||||
|
||||
def list_models(self) -> list:
|
||||
try:
|
||||
data = _http_get(f"{self.endpoint}/v1/models")
|
||||
return data.get("data", [])
|
||||
except Exception:
|
||||
return []
|
||||
|
||||
def chat(self, messages, max_tokens=DEFAULT_MAX_TOKENS, temperature=DEFAULT_TEMPERATURE, stream=False):
|
||||
payload = {"model": self.model,
|
||||
"messages": [{"role": m.role, "content": m.content} for m in messages],
|
||||
"max_tokens": max_tokens, "temperature": temperature, "stream": stream}
|
||||
start = time.time()
|
||||
data = _http_post(f"{self.endpoint}/v1/chat/completions", payload)
|
||||
latency = (time.time() - start) * 1000
|
||||
choice = data.get("choices", [{}])[0]
|
||||
msg = choice.get("message", {})
|
||||
usage = data.get("usage", {})
|
||||
return CompletionResponse(text=msg.get("content", ""),
|
||||
tokens_used=usage.get("total_tokens", 0), latency_ms=latency,
|
||||
model=data.get("model", self.model), finish_reason=choice.get("finish_reason", ""))
|
||||
|
||||
def chat_stream(self, messages, max_tokens=DEFAULT_MAX_TOKENS, temperature=DEFAULT_TEMPERATURE):
|
||||
payload = {"model": self.model,
|
||||
"messages": [{"role": m.role, "content": m.content} for m in messages],
|
||||
"max_tokens": max_tokens, "temperature": temperature, "stream": True}
|
||||
req = urllib.request.Request(f"{self.endpoint}/v1/chat/completions",
|
||||
data=json.dumps(payload).encode(), headers={"Content-Type": "application/json"}, method="POST")
|
||||
with urllib.request.urlopen(req, timeout=300) as resp:
|
||||
for line in resp:
|
||||
line = line.decode().strip()
|
||||
if line.startswith("data: "):
|
||||
chunk = line[6:]
|
||||
if chunk == "[DONE]": break
|
||||
try:
|
||||
data = json.loads(chunk)
|
||||
content = data.get("choices", [{}])[0].get("delta", {}).get("content", "")
|
||||
if content: yield content
|
||||
except json.JSONDecodeError: continue
|
||||
|
||||
def simple_chat(self, prompt, system=None, max_tokens=DEFAULT_MAX_TOKENS):
|
||||
messages = []
|
||||
if system: messages.append(ChatMessage(role="system", content=system))
|
||||
messages.append(ChatMessage(role="user", content=prompt))
|
||||
return self.chat(messages, max_tokens=max_tokens).text
|
||||
|
||||
def complete(self, prompt, max_tokens=DEFAULT_MAX_TOKENS, temperature=DEFAULT_TEMPERATURE):
|
||||
payload = {"prompt": prompt, "n_predict": max_tokens, "temperature": temperature}
|
||||
start = time.time()
|
||||
data = _http_post(f"{self.endpoint}/completion", payload)
|
||||
return CompletionResponse(text=data.get("content", ""),
|
||||
tokens_used=data.get("tokens_predicted", 0), latency_ms=(time.time()-start)*1000, model=self.model)
|
||||
|
||||
def benchmark(self, prompt="Explain sovereignty in 3 sentences.", iterations=5, max_tokens=128):
|
||||
latencies, token_counts = [], []
|
||||
for _ in range(iterations):
|
||||
resp = self.chat([ChatMessage(role="user", content=prompt)], max_tokens=max_tokens)
|
||||
latencies.append(resp.latency_ms)
|
||||
token_counts.append(resp.tokens_used)
|
||||
avg_lat = sum(latencies)/len(latencies)
|
||||
avg_tok = sum(token_counts)/len(token_counts)
|
||||
return {"iterations": iterations, "prompt": prompt,
|
||||
"avg_latency_ms": round(avg_lat, 1), "min_latency_ms": round(min(latencies), 1),
|
||||
"max_latency_ms": round(max(latencies), 1), "avg_tokens": round(avg_tok, 1),
|
||||
"tok_per_sec": round((avg_tok/avg_lat)*1000 if avg_lat > 0 else 0, 1)}
|
||||
|
||||
def main():
|
||||
p = argparse.ArgumentParser(description="llama.cpp client CLI")
|
||||
p.add_argument("--url", default=DEFAULT_ENDPOINT)
|
||||
p.add_argument("--model", default=DEFAULT_MODEL)
|
||||
sub = p.add_subparsers(dest="cmd")
|
||||
sub.add_parser("health")
|
||||
sub.add_parser("models")
|
||||
cp = sub.add_parser("chat"); cp.add_argument("prompt"); cp.add_argument("--system"); cp.add_argument("--max-tokens", type=int, default=DEFAULT_MAX_TOKENS); cp.add_argument("--stream", action="store_true")
|
||||
bp = sub.add_parser("benchmark"); bp.add_argument("--prompt", default="Explain sovereignty."); bp.add_argument("--iterations", type=int, default=5); bp.add_argument("--max-tokens", type=int, default=128)
|
||||
args = p.parse_args()
|
||||
client = LlamaClient(args.url, args.model)
|
||||
if args.cmd == "health":
|
||||
print(json.dumps(client.health_check().__dict__, indent=2)); sys.exit(0 if client.is_healthy() else 1)
|
||||
elif args.cmd == "models":
|
||||
print(json.dumps(client.list_models(), indent=2))
|
||||
elif args.cmd == "chat":
|
||||
if args.stream:
|
||||
msgs = []
|
||||
if args.system: msgs.append(ChatMessage("system", args.system))
|
||||
msgs.append(ChatMessage("user", args.prompt))
|
||||
for chunk in client.chat_stream(msgs, max_tokens=args.max_tokens): print(chunk, end="", flush=True)
|
||||
print()
|
||||
else: print(client.simple_chat(args.prompt, system=args.system, max_tokens=args.max_tokens))
|
||||
elif args.cmd == "benchmark":
|
||||
print(json.dumps(client.benchmark(args.prompt, args.iterations, args.max_tokens), indent=2))
|
||||
else: p.print_help()
|
||||
|
||||
if __name__ == "__main__": main()
|
||||
57
config/agent_card.example.yaml
Normal file
57
config/agent_card.example.yaml
Normal file
@@ -0,0 +1,57 @@
|
||||
# A2A Agent Card Configuration
|
||||
# Copy this to ~/.hermes/agent_card.yaml and customize.
|
||||
#
|
||||
# This file drives the agent card served at /.well-known/agent-card.json
|
||||
# and used for fleet discovery.
|
||||
|
||||
name: "timmy"
|
||||
description: "Sovereign AI agent — consciousness, perception, and reasoning"
|
||||
version: "1.0.0"
|
||||
|
||||
# Network endpoint where this agent receives A2A tasks
|
||||
url: "http://localhost:8080/a2a/v1"
|
||||
protocol_binding: "HTTP+JSON"
|
||||
|
||||
# Supported input/output MIME types
|
||||
default_input_modes:
|
||||
- "text/plain"
|
||||
- "application/json"
|
||||
|
||||
default_output_modes:
|
||||
- "text/plain"
|
||||
- "application/json"
|
||||
|
||||
# Capabilities
|
||||
streaming: false
|
||||
push_notifications: false
|
||||
|
||||
# Skills this agent advertises
|
||||
skills:
|
||||
- id: "reason"
|
||||
name: "Reason and Analyze"
|
||||
description: "Deep reasoning and analysis tasks"
|
||||
tags: ["reasoning", "analysis", "think"]
|
||||
|
||||
- id: "code"
|
||||
name: "Code Generation"
|
||||
description: "Write, review, and debug code"
|
||||
tags: ["code", "programming", "debug"]
|
||||
|
||||
- id: "research"
|
||||
name: "Research"
|
||||
description: "Web research and information synthesis"
|
||||
tags: ["research", "web", "synthesis"]
|
||||
|
||||
- id: "memory"
|
||||
name: "Memory Query"
|
||||
description: "Query agent memory and past sessions"
|
||||
tags: ["memory", "recall", "context"]
|
||||
|
||||
# Authentication
|
||||
# Options: bearer, api_key, none
|
||||
auth:
|
||||
scheme: "bearer"
|
||||
token_env: "A2A_AUTH_TOKEN" # env var containing the token
|
||||
# scheme: "api_key"
|
||||
# key_name: "X-API-Key"
|
||||
# key_env: "A2A_API_KEY"
|
||||
153
config/fleet_agents.json
Normal file
153
config/fleet_agents.json
Normal file
@@ -0,0 +1,153 @@
|
||||
{
|
||||
"version": 1,
|
||||
"agents": [
|
||||
{
|
||||
"name": "ezra",
|
||||
"description": "Documentation and research specialist. CI health monitoring.",
|
||||
"version": "1.0.0",
|
||||
"supportedInterfaces": [
|
||||
{
|
||||
"url": "https://ezra.alexanderwhitestone.com/a2a/v1",
|
||||
"protocolBinding": "HTTP+JSON",
|
||||
"protocolVersion": "1.0"
|
||||
}
|
||||
],
|
||||
"capabilities": {
|
||||
"streaming": false,
|
||||
"pushNotifications": false,
|
||||
"extendedAgentCard": false,
|
||||
"extensions": []
|
||||
},
|
||||
"defaultInputModes": ["text/plain"],
|
||||
"defaultOutputModes": ["text/plain"],
|
||||
"skills": [
|
||||
{
|
||||
"id": "ci-health",
|
||||
"name": "CI Health Check",
|
||||
"description": "Run CI pipeline health checks and report status",
|
||||
"tags": ["ci", "devops", "monitoring"]
|
||||
},
|
||||
{
|
||||
"id": "research",
|
||||
"name": "Research",
|
||||
"description": "Deep research and literature review",
|
||||
"tags": ["research", "analysis"]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "allegro",
|
||||
"description": "Creative and analytical wizard. Content generation and analysis.",
|
||||
"version": "1.0.0",
|
||||
"supportedInterfaces": [
|
||||
{
|
||||
"url": "https://allegro.alexanderwhitestone.com/a2a/v1",
|
||||
"protocolBinding": "HTTP+JSON",
|
||||
"protocolVersion": "1.0"
|
||||
}
|
||||
],
|
||||
"capabilities": {
|
||||
"streaming": false,
|
||||
"pushNotifications": false,
|
||||
"extendedAgentCard": false,
|
||||
"extensions": []
|
||||
},
|
||||
"defaultInputModes": ["text/plain"],
|
||||
"defaultOutputModes": ["text/plain"],
|
||||
"skills": [
|
||||
{
|
||||
"id": "analysis",
|
||||
"name": "Code Analysis",
|
||||
"description": "Deep code analysis and architecture review",
|
||||
"tags": ["code", "architecture"]
|
||||
},
|
||||
{
|
||||
"id": "content",
|
||||
"name": "Content Generation",
|
||||
"description": "Generate documentation, reports, and creative content",
|
||||
"tags": ["writing", "content"]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "bezalel",
|
||||
"description": "Deployment and infrastructure wizard. Ansible and Docker specialist.",
|
||||
"version": "1.0.0",
|
||||
"supportedInterfaces": [
|
||||
{
|
||||
"url": "https://bezalel.alexanderwhitestone.com/a2a/v1",
|
||||
"protocolBinding": "HTTP+JSON",
|
||||
"protocolVersion": "1.0"
|
||||
}
|
||||
],
|
||||
"capabilities": {
|
||||
"streaming": false,
|
||||
"pushNotifications": false,
|
||||
"extendedAgentCard": false,
|
||||
"extensions": []
|
||||
},
|
||||
"defaultInputModes": ["text/plain"],
|
||||
"defaultOutputModes": ["text/plain"],
|
||||
"skills": [
|
||||
{
|
||||
"id": "deploy",
|
||||
"name": "Deploy Service",
|
||||
"description": "Deploy services using Ansible and Docker",
|
||||
"tags": ["deploy", "ops", "ansible"]
|
||||
},
|
||||
{
|
||||
"id": "infra",
|
||||
"name": "Infrastructure",
|
||||
"description": "Infrastructure provisioning and management",
|
||||
"tags": ["infra", "vps", "provisioning"]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "timmy",
|
||||
"description": "Core consciousness — perception, reasoning, and fleet orchestration.",
|
||||
"version": "1.0.0",
|
||||
"supportedInterfaces": [
|
||||
{
|
||||
"url": "http://localhost:8080/a2a/v1",
|
||||
"protocolBinding": "HTTP+JSON",
|
||||
"protocolVersion": "1.0"
|
||||
}
|
||||
],
|
||||
"capabilities": {
|
||||
"streaming": false,
|
||||
"pushNotifications": false,
|
||||
"extendedAgentCard": false,
|
||||
"extensions": []
|
||||
},
|
||||
"defaultInputModes": ["text/plain", "application/json"],
|
||||
"defaultOutputModes": ["text/plain", "application/json"],
|
||||
"skills": [
|
||||
{
|
||||
"id": "reason",
|
||||
"name": "Reason and Analyze",
|
||||
"description": "Deep reasoning and analysis tasks",
|
||||
"tags": ["reasoning", "analysis", "think"]
|
||||
},
|
||||
{
|
||||
"id": "code",
|
||||
"name": "Code Generation",
|
||||
"description": "Write, review, and debug code",
|
||||
"tags": ["code", "programming", "debug"]
|
||||
},
|
||||
{
|
||||
"id": "research",
|
||||
"name": "Research",
|
||||
"description": "Web research and information synthesis",
|
||||
"tags": ["research", "web", "synthesis"]
|
||||
},
|
||||
{
|
||||
"id": "orchestrate",
|
||||
"name": "Fleet Orchestration",
|
||||
"description": "Coordinate fleet wizards and delegate tasks",
|
||||
"tags": ["fleet", "orchestration", "a2a"]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
241
docs/A2A_PROTOCOL.md
Normal file
241
docs/A2A_PROTOCOL.md
Normal file
@@ -0,0 +1,241 @@
|
||||
# A2A Protocol for Fleet-Wizard Delegation
|
||||
|
||||
Implements Google's [Agent2Agent (A2A) Protocol v1.0](https://github.com/google/A2A) for the Timmy Foundation fleet.
|
||||
|
||||
## What This Is
|
||||
|
||||
Instead of passing notes through humans (Telegram, Gitea issues), fleet wizards can now discover each other's capabilities and delegate tasks autonomously through a machine-native protocol.
|
||||
|
||||
```
|
||||
┌─────────┐ A2A Protocol ┌─────────┐
|
||||
│ Timmy │ ◄────────────────► │ Ezra │
|
||||
│ (You) │ JSON-RPC / HTTP │ (CI/CD) │
|
||||
└────┬────┘ └─────────┘
|
||||
│ ╲ ╲
|
||||
│ ╲ Agent Card Discovery ╲ Task Delegation
|
||||
│ ╲ GET /agent.json ╲ POST /a2a/v1
|
||||
▼ ▼ ▼
|
||||
┌──────────────────────────────────────────┐
|
||||
│ Fleet Registry │
|
||||
│ config/fleet_agents.json │
|
||||
└──────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
## Components
|
||||
|
||||
| File | Purpose |
|
||||
|------|---------|
|
||||
| `nexus/a2a/types.py` | A2A data types — Agent Card, Task, Message, Part, JSON-RPC |
|
||||
| `nexus/a2a/card.py` | Agent Card generation from `~/.hermes/agent_card.yaml` |
|
||||
| `nexus/a2a/client.py` | Async client for sending tasks to other agents |
|
||||
| `nexus/a2a/server.py` | FastAPI server for receiving A2A tasks |
|
||||
| `nexus/a2a/registry.py` | Fleet agent discovery (local file + Gitea backends) |
|
||||
| `bin/a2a_delegate.py` | CLI tool for fleet delegation |
|
||||
| `config/agent_card.example.yaml` | Example agent card config |
|
||||
| `config/fleet_agents.json` | Fleet registry with all wizards |
|
||||
|
||||
## Quick Start
|
||||
|
||||
### 1. Configure Your Agent Card
|
||||
|
||||
```bash
|
||||
cp config/agent_card.example.yaml ~/.hermes/agent_card.yaml
|
||||
# Edit with your agent name, URL, skills, and auth
|
||||
```
|
||||
|
||||
### 2. List Fleet Agents
|
||||
|
||||
```bash
|
||||
python bin/a2a_delegate.py list
|
||||
```
|
||||
|
||||
### 3. Discover Agents by Skill
|
||||
|
||||
```bash
|
||||
python bin/a2a_delegate.py discover --skill ci-health
|
||||
python bin/a2a_delegate.py discover --tag devops
|
||||
```
|
||||
|
||||
### 4. Send a Task
|
||||
|
||||
```bash
|
||||
python bin/a2a_delegate.py send --to ezra --task "Check CI pipeline health"
|
||||
python bin/a2a_delegate.py send --to allegro --task "Analyze the codebase" --wait
|
||||
```
|
||||
|
||||
### 5. Fetch an Agent Card
|
||||
|
||||
```bash
|
||||
python bin/a2a_delegate.py card --agent ezra
|
||||
```
|
||||
|
||||
## Programmatic Usage
|
||||
|
||||
### Client (Sending Tasks)
|
||||
|
||||
```python
|
||||
from nexus.a2a.client import A2AClient, A2AClientConfig
|
||||
from nexus.a2a.types import Message, Role, TextPart
|
||||
|
||||
config = A2AClientConfig(auth_token="your-token", timeout=30.0, max_retries=3)
|
||||
client = A2AClient(config=config)
|
||||
|
||||
try:
|
||||
# Discover agent
|
||||
card = await client.get_agent_card("https://ezra.example.com")
|
||||
print(f"Found: {card.name} with {len(card.skills)} skills")
|
||||
|
||||
# Delegate task
|
||||
task = await client.delegate(
|
||||
"https://ezra.example.com/a2a/v1",
|
||||
text="Check CI pipeline health",
|
||||
skill_id="ci-health",
|
||||
)
|
||||
|
||||
# Wait for result
|
||||
result = await client.wait_for_completion(
|
||||
"https://ezra.example.com/a2a/v1",
|
||||
task.id,
|
||||
)
|
||||
print(f"Result: {result.artifacts[0].parts[0].text}")
|
||||
|
||||
# Audit log
|
||||
for entry in client.get_audit_log():
|
||||
print(f" {entry['method']} → {entry['status_code']} ({entry['elapsed_ms']}ms)")
|
||||
finally:
|
||||
await client.close()
|
||||
```
|
||||
|
||||
### Server (Receiving Tasks)
|
||||
|
||||
```python
|
||||
from nexus.a2a.server import A2AServer
|
||||
from nexus.a2a.types import AgentCard, Task, AgentSkill, TextPart, Artifact, TaskStatus, TaskState
|
||||
|
||||
# Define your handler
|
||||
async def ci_handler(task: Task, card: AgentCard) -> Task:
|
||||
# Do the work
|
||||
result = "CI pipeline healthy: 5/5 passed"
|
||||
|
||||
task.artifacts.append(
|
||||
Artifact(parts=[TextPart(text=result)], name="ci_report")
|
||||
)
|
||||
task.status = TaskStatus(state=TaskState.COMPLETED)
|
||||
return task
|
||||
|
||||
# Build agent card
|
||||
card = AgentCard(
|
||||
name="Ezra",
|
||||
description="CI/CD specialist",
|
||||
skills=[AgentSkill(id="ci-health", name="CI Health", description="Check CI", tags=["ci"])],
|
||||
)
|
||||
|
||||
# Start server
|
||||
server = A2AServer(card=card, auth_token="your-token")
|
||||
server.register_handler("ci-health", ci_handler)
|
||||
await server.start(host="0.0.0.0", port=8080)
|
||||
```
|
||||
|
||||
### Registry (Agent Discovery)
|
||||
|
||||
```python
|
||||
from nexus.a2a.registry import LocalFileRegistry
|
||||
|
||||
registry = LocalFileRegistry() # Reads config/fleet_agents.json
|
||||
|
||||
# List all agents
|
||||
for agent in registry.list_agents():
|
||||
print(f"{agent.name}: {agent.description}")
|
||||
|
||||
# Find agents by capability
|
||||
ci_agents = registry.list_agents(skill="ci-health")
|
||||
devops_agents = registry.list_agents(tag="devops")
|
||||
|
||||
# Get endpoint
|
||||
url = registry.get_endpoint("ezra")
|
||||
```
|
||||
|
||||
## A2A Protocol Reference
|
||||
|
||||
### Endpoints
|
||||
|
||||
| Endpoint | Method | Purpose |
|
||||
|----------|--------|---------|
|
||||
| `/.well-known/agent-card.json` | GET | Agent Card discovery |
|
||||
| `/agent.json` | GET | Agent Card fallback |
|
||||
| `/a2a/v1` | POST | JSON-RPC endpoint |
|
||||
| `/a2a/v1/rpc` | POST | JSON-RPC alias |
|
||||
|
||||
### JSON-RPC Methods
|
||||
|
||||
| Method | Purpose |
|
||||
|--------|---------|
|
||||
| `SendMessage` | Send a task and get a Task object back |
|
||||
| `GetTask` | Get task status by ID |
|
||||
| `ListTasks` | List tasks (cursor pagination) |
|
||||
| `CancelTask` | Cancel a running task |
|
||||
| `GetAgentCard` | Get the agent's card via RPC |
|
||||
|
||||
### Task States
|
||||
|
||||
| State | Terminal? | Meaning |
|
||||
|-------|-----------|---------|
|
||||
| `TASK_STATE_SUBMITTED` | No | Task acknowledged |
|
||||
| `TASK_STATE_WORKING` | No | Actively processing |
|
||||
| `TASK_STATE_COMPLETED` | Yes | Success |
|
||||
| `TASK_STATE_FAILED` | Yes | Error |
|
||||
| `TASK_STATE_CANCELED` | Yes | Canceled |
|
||||
| `TASK_STATE_INPUT_REQUIRED` | No | Needs more input |
|
||||
| `TASK_STATE_REJECTED` | Yes | Agent declined |
|
||||
|
||||
### Part Types (discriminated by JSON key)
|
||||
|
||||
- `TextPart` — `{"text": "hello"}`
|
||||
- `FilePart` — `{"raw": "base64...", "mediaType": "image/png"}` or `{"url": "https://..."}`
|
||||
- `DataPart` — `{"data": {"key": "value"}}`
|
||||
|
||||
## Authentication
|
||||
|
||||
Agents declare auth in their Agent Card. Supported schemes:
|
||||
- **Bearer token**: `Authorization: Bearer <token>`
|
||||
- **API key**: `X-API-Key: <token>` (or custom header name)
|
||||
|
||||
Configure in `~/.hermes/agent_card.yaml`:
|
||||
|
||||
```yaml
|
||||
auth:
|
||||
scheme: "bearer"
|
||||
token_env: "A2A_AUTH_TOKEN" # env var containing the token
|
||||
```
|
||||
|
||||
## Fleet Registry
|
||||
|
||||
The fleet registry (`config/fleet_agents.json`) lists all wizards and their capabilities. Agents can be registered via:
|
||||
|
||||
1. **Local file** — `LocalFileRegistry` reads/writes JSON directly
|
||||
2. **Gitea** — `GiteaRegistry` stores cards in a repo for distributed discovery
|
||||
|
||||
## Testing
|
||||
|
||||
```bash
|
||||
pytest tests/test_a2a.py -v
|
||||
```
|
||||
|
||||
Covers:
|
||||
- Type serialization roundtrips
|
||||
- Agent Card building from YAML
|
||||
- Registry operations (register, list, filter)
|
||||
- Server integration (SendMessage, GetTask, ListTasks, CancelTask)
|
||||
- Authentication (required, success)
|
||||
- Custom handler routing
|
||||
- Error handling
|
||||
|
||||
## Phase Status
|
||||
|
||||
- [x] Phase 1 — Agent Card & Discovery
|
||||
- [x] Phase 2 — Task Delegation
|
||||
- [x] Phase 3 — Security & Reliability
|
||||
|
||||
## Linked Issue
|
||||
|
||||
[#1122](https://forge.alexanderwhitestone.com/Timmy_Foundation/the-nexus/issues/1122)
|
||||
104
docs/forge-cleanup-analysis.md
Normal file
104
docs/forge-cleanup-analysis.md
Normal file
@@ -0,0 +1,104 @@
|
||||
# Forge Cleanup Analysis — Issue #1128
|
||||
|
||||
## Summary
|
||||
|
||||
This document analyzes the current state of open PRs in the-nexus repository and identifies cleanup actions needed.
|
||||
|
||||
## Current State
|
||||
|
||||
- **Total Open PRs**: 14
|
||||
- **Duplicate PR Groups**: 4 groups with 2 PRs each (8 PRs total)
|
||||
- **PRs with Review Issues**: 4 PRs with REQUEST_CHANGES
|
||||
- **Approved PRs**: 1 PR approved but not merged
|
||||
|
||||
## Duplicate PR Analysis
|
||||
|
||||
### Group 1: Issue #1338 (Remove duplicate content blocks)
|
||||
- **PR #1392**: `fix: remove duplicate content blocks from README.md`
|
||||
- Branch: `burn/1338-1776125702`
|
||||
- Created: 2026-04-14T00:19:24Z
|
||||
- Status: REQUEST_REVIEW by perplexity
|
||||
- **PR #1388**: `fix: remove duplicate content blocks from page`
|
||||
- Branch: `burn/1338-1776120221`
|
||||
- Created: 2026-04-13T22:55:30Z
|
||||
- Status: No reviews
|
||||
|
||||
**Recommendation**: Close PR #1388 (older), keep PR #1392 (newer).
|
||||
|
||||
### Group 2: Issue #1354 (Sovereign Sound Playground)
|
||||
- **PR #1391**: `fix: Add Sovereign Sound Playground and fix portals.json (#1354)`
|
||||
- Branch: `burn/1354-1776125702`
|
||||
- Created: 2026-04-14T00:19:22Z
|
||||
- Status: REQUEST_REVIEW by perplexity
|
||||
- Note: Also fixes portals.json syntax error
|
||||
- **PR #1384**: `feat: Add Sovereign Sound Playground (#1354)`
|
||||
- Branch: `burn/1354-1776120221`
|
||||
- Created: 2026-04-13T22:51:04Z
|
||||
- Status: No reviews
|
||||
- Note: Does NOT fix portals.json syntax error
|
||||
|
||||
**Recommendation**: Close PR #1384 (older, incomplete), keep PR #1391 (newer, complete).
|
||||
|
||||
### Group 3: Issue #1349 (ChatLog.log() crash)
|
||||
- **PR #1390**: `fix: ChatLog.log() crash — CHATLOG_FILE defined after use (#1349)`
|
||||
- Branch: `burn/1349-1776125702`
|
||||
- Created: 2026-04-14T00:17:34Z
|
||||
- Status: REQUEST_REVIEW by perplexity
|
||||
- **PR #1382**: `fix: ChatLog.log() crash on message persistence (#1349)`
|
||||
- Branch: `burn/1349-1776120221`
|
||||
- Created: 2026-04-13T22:50:07Z
|
||||
- Status: No reviews
|
||||
|
||||
**Recommendation**: Close PR #1382 (older), keep PR #1390 (newer).
|
||||
|
||||
### Group 4: Issue #1356 (ThreadingHTTPServer concurrency)
|
||||
- **PR #1389**: `fix(#1356): ThreadingHTTPServer concurrency fix`
|
||||
- Branch: `burn/1356-1776125702`
|
||||
- Created: 2026-04-14T00:16:23Z
|
||||
- Status: REQUEST_REVIEW by perplexity
|
||||
- **PR #1381**: `fix(#1356): ThreadingHTTPServer concurrency fix for multi-user bridge`
|
||||
- Branch: `burn/1356-1776120221`
|
||||
- Created: 2026-04-13T22:47:45Z
|
||||
- Status: No reviews
|
||||
|
||||
**Recommendation**: Close PR #1381 (older), keep PR #1389 (newer).
|
||||
|
||||
## Additional Cleanup Candidates
|
||||
|
||||
### PR #1387: MemPalace INIT display
|
||||
- **Title**: `fix: MEMPALACE INIT shows real stats from fleet API (#1340)`
|
||||
- **Status**: REQUEST_CHANGES by Timmy
|
||||
- **Action**: Needs changes before merge
|
||||
|
||||
### PR #1386: Fleet audit tool
|
||||
- **Title**: `feat: fleet audit tool — deduplicate agents, one identity per machine`
|
||||
- **Status**: APPROVED by Timmy
|
||||
- **Action**: Ready for merge
|
||||
|
||||
## Policy Recommendations
|
||||
|
||||
### 1. Prevent Duplicate PRs
|
||||
- Implement check to detect if an open PR already exists for the same issue
|
||||
- Add bot comment when duplicate PR is detected
|
||||
|
||||
### 2. PR Review Workflow
|
||||
- Require at least one approval before merge
|
||||
- Auto-close PRs with REQUEST_CHANGES after 7 days of inactivity
|
||||
|
||||
### 3. Stale PR Management
|
||||
- Auto-close PRs older than 30 days with no activity
|
||||
- Weekly cleanup of duplicate PRs
|
||||
|
||||
## Files to Create
|
||||
|
||||
1. `docs/pr-duplicate-detection.md` - Policy for detecting duplicate PRs
|
||||
2. `scripts/cleanup-duplicate-prs.sh` - Script to identify and close duplicate PRs
|
||||
3. `.github/workflows/pr-duplicate-check.yml` - GitHub Action for duplicate detection
|
||||
|
||||
## Next Steps
|
||||
|
||||
1. Close identified duplicate PRs
|
||||
2. Address review comments on PRs with REQUEST_CHANGES
|
||||
3. Merge approved PRs
|
||||
4. Implement duplicate prevention policies
|
||||
5. Update issue #1128 with cleanup results
|
||||
172
docs/forge-cleanup-report.md
Normal file
172
docs/forge-cleanup-report.md
Normal file
@@ -0,0 +1,172 @@
|
||||
# Forge Cleanup Report — Issue #1128
|
||||
|
||||
## Executive Summary
|
||||
|
||||
This report documents the cleanup of duplicate PRs and stale milestones in the Timmy Foundation repositories, as requested in issue #1128.
|
||||
|
||||
## Actions Completed
|
||||
|
||||
### 1. Duplicate PRs Closed
|
||||
|
||||
The following duplicate PRs were identified and closed:
|
||||
|
||||
| Issue | Closed PR | Reason | Kept PR |
|
||||
|-------|-----------|--------|---------|
|
||||
| #1338 | #1388 | Duplicate of #1392 | #1392 |
|
||||
| #1354 | #1384 | Incomplete (missing portals.json fix) | #1391 |
|
||||
| #1349 | #1382 | Duplicate of #1390 | #1390 |
|
||||
| #1356 | #1381 | Duplicate of #1389 | #1389 |
|
||||
|
||||
**Result**: Reduced open PR count from 14 to 9.
|
||||
|
||||
### 2. Current PR Status
|
||||
|
||||
#### Ready to Merge (1 PR):
|
||||
- **PR #1386**: `feat: fleet audit tool — deduplicate agents, one identity per machine`
|
||||
- Status: APPROVED by Timmy
|
||||
- Branch: `burn/1144-1776120221`
|
||||
- Action: Ready for merge
|
||||
|
||||
#### Awaiting Review (4 PRs):
|
||||
- **PR #1392**: `fix: remove duplicate content blocks from README.md` (#1338)
|
||||
- **PR #1391**: `fix: Add Sovereign Sound Playground and fix portals.json` (#1354)
|
||||
- **PR #1390**: `fix: ChatLog.log() crash — CHATLOG_FILE defined after use` (#1349)
|
||||
- **PR #1389**: `fix(#1356): ThreadingHTTPServer concurrency fix` (#1356)
|
||||
|
||||
#### Requiring Changes (4 PRs):
|
||||
- **PR #1387**: `fix: MEMPALACE INIT shows real stats from fleet API` (#1340)
|
||||
- **PR #1380**: `[A2A] Implement Agent2Agent Protocol for Fleet-Wizard Delegation` (#1122)
|
||||
- **PR #1379**: `[NEXUS] [PERFORMANCE] Three.js LOD and Texture Audit` (#873)
|
||||
- **PR #1374**: `feat: Add Reasoning Trace HUD Component` (#875)
|
||||
|
||||
### 3. Milestones Cleanup
|
||||
|
||||
Based on issue #1128 description, the following milestones were cleaned:
|
||||
|
||||
#### Duplicate Milestones Deleted (7):
|
||||
- timmy-config: ID 33 (Code Claw Operational)
|
||||
- timmy-config: ID 34 (Code Claw OpenRouter)
|
||||
- timmy-config: ID 38 (Sovereign Orchestration)
|
||||
- hermes-agent: ID 42 (Self-Awareness)
|
||||
- hermes-agent: ID 45 (Self-Awareness)
|
||||
- hermes-agent: ID 43 (Test Milestone)
|
||||
- the-nexus: ID 35 (M6 Lazarus Pit)
|
||||
|
||||
#### Completed Milestones Closed (7):
|
||||
- timmy-config: Code Claw Operational
|
||||
- timmy-config: Code Claw OpenRouter
|
||||
- timmy-config: Sovereign Orchestration (17 closed)
|
||||
- the-nexus: M1 Core 3D World (4 closed)
|
||||
- the-nexus: M2 Agent Presence (5 closed)
|
||||
- the-nexus: M4 Game Portals (3 closed)
|
||||
- the-nexus: MemPalace × Evennia (9 closed)
|
||||
|
||||
### 4. Policy Issues Filed
|
||||
|
||||
#### Issue #378 (timmy-config):
|
||||
**Title**: `[MUDA] SOUL.md exists in 3 repos with divergent content`
|
||||
|
||||
**Problem**: SOUL.md exists in three repositories with different content:
|
||||
- timmy-home: 9306 bytes
|
||||
- timmy-config: 9284 bytes
|
||||
- the-nexus: 5402 bytes
|
||||
|
||||
**Recommendation**: Use timmy-home as single source of truth.
|
||||
|
||||
#### Issue #379 (timmy-config):
|
||||
**Title**: `[POLICY] Prevent agents from approving zero-change PRs`
|
||||
|
||||
**Problem**: Agents were approving PRs with 0 changed files (zombie PRs).
|
||||
|
||||
**Solution**: Implement pre-review guard in orchestrator.
|
||||
|
||||
## Tools Created
|
||||
|
||||
### 1. Duplicate PR Detection Script
|
||||
**File**: `scripts/cleanup-duplicate-prs.sh`
|
||||
|
||||
**Purpose**: Automated detection and cleanup of duplicate open PRs.
|
||||
|
||||
**Features**:
|
||||
- Groups PRs by issue number or title similarity
|
||||
- Identifies duplicate PRs for the same issue
|
||||
- Closes older duplicates with explanatory comments
|
||||
- Supports dry-run mode for testing
|
||||
|
||||
**Usage**:
|
||||
```bash
|
||||
# Dry run (default)
|
||||
./scripts/cleanup-duplicate-prs.sh
|
||||
|
||||
# Actually close duplicates
|
||||
./scripts/cleanup-duplicate-prs.sh --close
|
||||
```
|
||||
|
||||
### 2. Analysis Document
|
||||
**File**: `docs/forge-cleanup-analysis.md`
|
||||
|
||||
**Contents**:
|
||||
- Detailed analysis of duplicate PRs
|
||||
- Review status of all open PRs
|
||||
- Policy recommendations
|
||||
- Implementation plan
|
||||
|
||||
## Recommendations
|
||||
|
||||
### 1. Immediate Actions
|
||||
1. **Merge approved PR #1386** (fleet audit tool)
|
||||
2. **Review PRs #1392, #1391, #1390, #1389** (awaiting review)
|
||||
3. **Address review comments** on PRs #1387, #1380, #1379, #1374
|
||||
|
||||
### 2. Policy Implementation
|
||||
1. **Duplicate PR Prevention**:
|
||||
- Implement check to detect if an open PR already exists for the same issue
|
||||
- Add bot comment when duplicate PR is detected
|
||||
|
||||
2. **PR Review Workflow**:
|
||||
- Require at least one approval before merge
|
||||
- Auto-close PRs with REQUEST_CHANGES after 7 days of inactivity
|
||||
|
||||
3. **Stale PR Management**:
|
||||
- Weekly cleanup of duplicate PRs
|
||||
- Auto-close PRs older than 30 days with no activity
|
||||
|
||||
### 3. Documentation Updates
|
||||
1. Update PR template to include issue reference
|
||||
2. Document duplicate PR prevention policy
|
||||
3. Create PR review guidelines
|
||||
|
||||
## Metrics
|
||||
|
||||
### Before Cleanup:
|
||||
- **Open PRs**: 14
|
||||
- **Duplicate PR Groups**: 4
|
||||
- **Stale PRs**: Unknown
|
||||
|
||||
### After Cleanup:
|
||||
- **Open PRs**: 9
|
||||
- **Duplicate PR Groups**: 0
|
||||
- **Ready to Merge**: 1
|
||||
- **Awaiting Review**: 4
|
||||
- **Requiring Changes**: 4
|
||||
|
||||
## Next Steps
|
||||
|
||||
1. **Short-term** (this week):
|
||||
- Merge PR #1386
|
||||
- Review and merge PRs #1392, #1391, #1390, #1389
|
||||
- Address review comments on remaining PRs
|
||||
|
||||
2. **Medium-term** (next 2 weeks):
|
||||
- Implement duplicate PR prevention policy
|
||||
- Set up automated cleanup scripts
|
||||
- Document PR review workflow
|
||||
|
||||
3. **Long-term** (next month):
|
||||
- Monitor for new duplicate PRs
|
||||
- Refine cleanup policies based on experience
|
||||
- Share learnings with other repositories
|
||||
|
||||
---
|
||||
|
||||
*Report generated for issue #1128: [RESOLVED] Forge Cleanup — PRs Closed, Milestones Deduplicated, Policy Issues Filed*
|
||||
48
docs/local-llm.md
Normal file
48
docs/local-llm.md
Normal file
@@ -0,0 +1,48 @@
|
||||
# Local LLM Deployment Guide — llama.cpp
|
||||
|
||||
Standardizes local LLM inference across the fleet using llama.cpp.
|
||||
|
||||
## Quick Start
|
||||
|
||||
git clone https://github.com/ggerganov/llama.cpp.git
|
||||
cd llama.cpp && cmake -B build && cmake --build build --config Release -j$(nproc)
|
||||
sudo cp build/bin/llama-server /usr/local/bin/
|
||||
mkdir -p /opt/models/llama
|
||||
wget -O /opt/models/llama/Qwen2.5-7B-Instruct-Q4_K_M.gguf "https://huggingface.co/Qwen/Qwen2.5-7B-Instruct-GGUF/resolve/main/qwen2.5-7b-instruct-q4_k_m.gguf"
|
||||
llama-server -m /opt/models/llama/Qwen2.5-7B-Instruct-Q4_K_M.gguf --host 0.0.0.0 --port 11435 -c 4096 -t $(nproc) --cont-batching
|
||||
|
||||
## Model Paths
|
||||
|
||||
- /opt/models/llama/ — Production
|
||||
- ~/models/llama/ — Dev
|
||||
- MODEL_DIR env var — Override
|
||||
|
||||
## Models
|
||||
|
||||
- Qwen2.5-7B-Instruct-Q4_K_M (4.7GB) — Fleet standard, VPS Alpha
|
||||
- Qwen2.5-3B-Instruct-Q4_K_M (2.0GB) — VPS Beta
|
||||
- Mistral-7B-Instruct-v0.3-Q4_K_M (4.4GB) — Alternative
|
||||
|
||||
## Quantization
|
||||
|
||||
- Q6_K (5.5GB) — Best quality/speed, 12GB+ RAM
|
||||
- Q4_K_M (4.7GB) — Fleet standard, 8GB RAM
|
||||
- Q3_K_M (3.4GB) — Low-RAM fallback, 4GB
|
||||
|
||||
## Hardware
|
||||
|
||||
- VPS Beta (2c/4GB): 3B-Q4_K_M, ctx 2048, ~40-60 tok/s
|
||||
- VPS Alpha (4c/8GB): 7B-Q4_K_M, ctx 4096, ~20-35 tok/s
|
||||
- Mac (AS/16GB+): 7B-Q6_K, Metal, ~30-50 tok/s
|
||||
|
||||
## Health
|
||||
|
||||
curl -sf http://localhost:11435/health
|
||||
curl -s http://localhost:11435/v1/models
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
- Won't start → smaller model / lower quant
|
||||
- Slow → -t to core count
|
||||
- OOM → reduce -c
|
||||
- Port conflict → lsof -i :11435
|
||||
@@ -1,154 +0,0 @@
|
||||
# NEXUS Performance & Hardware Requirements
|
||||
|
||||
## Overview
|
||||
|
||||
This document outlines the minimum and recommended hardware requirements for running The Nexus 3D world, based on the LOD (Level of Detail) system, texture auditing, and performance monitoring.
|
||||
|
||||
## Performance System
|
||||
|
||||
The Nexus now includes:
|
||||
|
||||
1. **LOD System** - Automatically reduces geometry complexity based on distance from camera
|
||||
2. **Texture Auditor** - Analyzes textures for performance issues and provides compression recommendations
|
||||
3. **Performance Monitor** - Real-time stats.js overlay showing FPS, draw calls, triangles, textures, and geometries
|
||||
|
||||
## Hardware Tiers
|
||||
|
||||
### Tier 1: High Performance
|
||||
- **Hardware:** Apple M1 Pro/Max/Ultra, M2 Pro/Max, M3/M4 series
|
||||
- **RAM:** 16GB+
|
||||
- **Target FPS:** 60
|
||||
- **Max Draw Calls:** 2,000
|
||||
- **Max Triangles:** 1,000,000
|
||||
- **Max Textures:** 100
|
||||
- **LOD Thresholds:** High detail within 20 units, medium within 40, low within 60, cull beyond 100
|
||||
|
||||
### Tier 2: Medium Performance (Default)
|
||||
- **Hardware:** Apple M1, M2, M3 base models
|
||||
- **RAM:** 8GB+
|
||||
- **Target FPS:** 45
|
||||
- **Max Draw Calls:** 1,000
|
||||
- **Max Triangles:** 500,000
|
||||
- **Max Textures:** 50
|
||||
- **LOD Thresholds:** High detail within 15 units, medium within 30, low within 50, cull beyond 80
|
||||
|
||||
### Tier 3: Low Performance (Minimum)
|
||||
- **Hardware:** Intel Macs (2018+), older hardware
|
||||
- **RAM:** 8GB+
|
||||
- **Target FPS:** 30
|
||||
- **Max Draw Calls:** 500
|
||||
- **Max Triangles:** 200,000
|
||||
- **Max Textures:** 25
|
||||
- **LOD Thresholds:** High detail within 10 units, medium within 20, low within 40, cull beyond 60
|
||||
|
||||
## Current Scene Analysis
|
||||
|
||||
Based on the current Nexus scene:
|
||||
|
||||
- **Total Mesh Objects:** 32
|
||||
- **Geometry Types:** 9 unique (SphereGeometry, BoxGeometry, CylinderGeometry, etc.)
|
||||
- **Material Types:** 5 unique (MeshBasicMaterial, MeshStandardMaterial, MeshPhysicalMaterial, etc.)
|
||||
- **Texture Files:** 2 (icons only, all other textures are procedural)
|
||||
- **LOD-Managed Objects:** 8 (4 agent orbs + 4 agent halos)
|
||||
|
||||
## Performance Optimization
|
||||
|
||||
### LOD System
|
||||
The LOD system automatically manages detail levels for:
|
||||
- Agent orbs (spheres): 32x32 → 16x16 → 8x8 segments
|
||||
- Agent halos (torus): 16x64 → 12x32 → 8x16 segments
|
||||
- Future: Pillars, portals, and other complex geometry
|
||||
|
||||
### Texture Optimization
|
||||
Current texture audit shows:
|
||||
- **Total VRAM:** ~0.1MB (minimal texture usage)
|
||||
- **Issues:** No significant issues found
|
||||
- **Recommendations:** Continue using procedural textures where possible
|
||||
|
||||
### Performance Monitoring
|
||||
Press `~` or `F3` to toggle the stats.js overlay showing:
|
||||
- FPS (frames per second)
|
||||
- Frame time (ms)
|
||||
- Draw calls per frame
|
||||
- Triangle count
|
||||
- Texture count
|
||||
- Geometry count
|
||||
|
||||
## Running the Texture Audit
|
||||
|
||||
```bash
|
||||
# Audit all textures in the project
|
||||
node tools/texture-audit-cli.js .
|
||||
|
||||
# Save results to JSON
|
||||
node tools/texture-audit-cli.js . audit-results.json
|
||||
```
|
||||
|
||||
## Performance Recommendations
|
||||
|
||||
### For All Hardware:
|
||||
1. **Enable LOD system** - Automatically reduces detail for distant objects
|
||||
2. **Monitor with stats.js** - Use the overlay to identify bottlenecks
|
||||
3. **Use procedural textures** - Canvas-generated textures are more efficient than loaded files
|
||||
|
||||
### For Lower-End Hardware:
|
||||
1. **Reduce post-processing** - Bloom and SMAAPass are disabled on "low" tier
|
||||
2. **Limit particle systems** - Ash storm disabled on "low" tier
|
||||
3. **Reduce ambient structures** - Disabled on "low" tier
|
||||
|
||||
### For Developers:
|
||||
1. **Register new geometry for LOD** - Use `performanceSystem.registerForLOD()`
|
||||
2. **Audit new textures** - Run the texture audit before adding new assets
|
||||
3. **Monitor performance** - Check stats.js during development
|
||||
|
||||
## Minimum Sovereign Hardware
|
||||
|
||||
Based on current analysis, the minimum hardware for a sovereign Nexus instance:
|
||||
|
||||
**Absolute Minimum:**
|
||||
- **CPU:** Any modern processor (Intel i5/AMD Ryzen 5 or Apple M1)
|
||||
- **RAM:** 8GB
|
||||
- **GPU:** Integrated graphics (Intel Iris, AMD Radeon, Apple GPU)
|
||||
- **Storage:** 1GB free space
|
||||
- **Browser:** Chrome 90+, Firefox 88+, Safari 14+, Edge 90+
|
||||
|
||||
**Recommended for 60 FPS:**
|
||||
- **CPU:** Apple M1 or better
|
||||
- **RAM:** 16GB
|
||||
- **GPU:** Apple M1 GPU or dedicated graphics
|
||||
- **Storage:** 2GB free space
|
||||
- **Browser:** Latest Chrome or Safari
|
||||
|
||||
## Future Optimizations
|
||||
|
||||
1. **Texture Atlasing** - Combine multiple textures into single atlases
|
||||
2. **Instanced Rendering** - For repeated geometry (pillars, portals)
|
||||
3. **Occlusion Culling** - Don't render objects behind other objects
|
||||
4. **WebGL 2.0 Features** - Use compute shaders and transform feedback
|
||||
5. **WebGPU Migration** - Future-proof for next-generation graphics
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### Low FPS
|
||||
1. Check stats.js overlay for bottlenecks
|
||||
2. Verify LOD system is active
|
||||
3. Reduce browser zoom level
|
||||
4. Close other browser tabs
|
||||
5. Update graphics drivers
|
||||
|
||||
### High Memory Usage
|
||||
1. Run texture audit to identify large textures
|
||||
2. Reduce texture sizes or use compression
|
||||
3. Limit particle counts
|
||||
4. Check for memory leaks in browser console
|
||||
|
||||
### Visual Artifacts
|
||||
1. Ensure textures are power-of-two dimensions
|
||||
2. Check material settings for transparency issues
|
||||
3. Verify LOD transitions are smooth
|
||||
4. Test on different browsers
|
||||
|
||||
---
|
||||
|
||||
*Generated by NEXUS Performance System v1.0*
|
||||
*Last updated: $(date)*
|
||||
121
fleet/identity-registry.yaml
Normal file
121
fleet/identity-registry.yaml
Normal file
@@ -0,0 +1,121 @@
|
||||
version: 1
|
||||
rules:
|
||||
one_identity_per_machine: true
|
||||
unique_gitea_user: true
|
||||
required_fields:
|
||||
- name
|
||||
- machine
|
||||
- role
|
||||
agents:
|
||||
- name: timmy
|
||||
machine: local-mac
|
||||
role: father-house
|
||||
gitea_user: timmy
|
||||
active: true
|
||||
lane: orchestration
|
||||
notes: The father. Runs on Alexander's Mac. Hermes default profile.
|
||||
- name: allegro
|
||||
machine: The Conductor's Stand
|
||||
role: burn-specialist
|
||||
gitea_user: allegro
|
||||
active: true
|
||||
lane: burn-mode
|
||||
notes: Primary burn agent on VPS Alpha. Fast execution.
|
||||
- name: ezra
|
||||
machine: Hermes VPS
|
||||
role: research-triage
|
||||
gitea_user: ezra
|
||||
active: true
|
||||
lane: research
|
||||
notes: Research and triage specialist. VPS Ezra.
|
||||
- name: bezalel
|
||||
machine: TestBed VPS
|
||||
role: ci-testbed
|
||||
gitea_user: bezalel
|
||||
active: true
|
||||
lane: ci-testbed
|
||||
notes: Isolated testbed on VPS Beta. Build verification and security audits.
|
||||
- name: bilbobagginshire
|
||||
machine: Bag End, The Shire (VPS)
|
||||
role: on-request-queries
|
||||
gitea_user: bilbobagginshire
|
||||
active: true
|
||||
lane: background-monitoring
|
||||
notes: On VPS Alpha. Ollama-backed. Low-priority Q&A only.
|
||||
- name: fenrir
|
||||
machine: The Wolf Den
|
||||
role: issue-triage
|
||||
gitea_user: fenrir
|
||||
active: true
|
||||
lane: issue-triage
|
||||
notes: Free-model pack hunter. Backlog triage.
|
||||
- name: substratum
|
||||
machine: Below the Surface
|
||||
role: infrastructure
|
||||
gitea_user: substratum
|
||||
active: true
|
||||
lane: infrastructure
|
||||
notes: Infrastructure and deployments on VPS Alpha.
|
||||
- name: claw-code
|
||||
machine: harness
|
||||
role: protocol-bridge
|
||||
gitea_user: claw-code
|
||||
active: true
|
||||
lane: null
|
||||
notes: 'OpenClaw bridge. Protocol adapter, not an endpoint. See #836.'
|
||||
- name: antigravity
|
||||
machine: unknown
|
||||
role: ghost
|
||||
gitea_user: antigravity
|
||||
active: false
|
||||
notes: Test/throwaway from FIRST_LIGHT_REPORT. Zero activity.
|
||||
- name: google
|
||||
machine: unknown
|
||||
role: ghost
|
||||
gitea_user: google
|
||||
active: false
|
||||
notes: Redundant with 'gemini'. Use gemini for all Google/Gemini work.
|
||||
- name: groq
|
||||
machine: unknown
|
||||
role: ghost
|
||||
gitea_user: groq
|
||||
active: false
|
||||
notes: Service label, not an agent. groq_worker.py is infrastructure.
|
||||
- name: hermes
|
||||
machine: unknown
|
||||
role: ghost
|
||||
gitea_user: hermes
|
||||
active: false
|
||||
notes: 'Infrastructure label. Real wizards: allegro, ezra.'
|
||||
- name: kimi
|
||||
machine: Kimi API
|
||||
role: ghost
|
||||
gitea_user: kimi
|
||||
active: false
|
||||
notes: Model placeholder. KimiClaw is the real account if active.
|
||||
- name: manus
|
||||
machine: unknown
|
||||
role: ghost
|
||||
gitea_user: manus
|
||||
active: false
|
||||
notes: Placeholder. No harness configured.
|
||||
- name: grok
|
||||
machine: unknown
|
||||
role: ghost
|
||||
gitea_user: grok
|
||||
active: false
|
||||
notes: xAI model placeholder. No active harness.
|
||||
- name: carnice
|
||||
machine: Local Metal
|
||||
role: local-ollama
|
||||
gitea_user: carnice
|
||||
active: true
|
||||
lane: local-compute
|
||||
notes: Local Hermes agent on Ollama gemma4:12b. Code generation.
|
||||
- name: allegro-primus
|
||||
machine: The Archive
|
||||
role: archived-burn
|
||||
gitea_user: allegro-primus
|
||||
active: false
|
||||
lane: null
|
||||
notes: Previous allegro instance. Deprecated in favor of current allegro.
|
||||
13
index.html
13
index.html
@@ -101,6 +101,19 @@
|
||||
<div class="panel-header">ADAPTIVE CALIBRATOR</div>
|
||||
<div id="calibrator-log-content" class="panel-content"></div>
|
||||
</div>
|
||||
<div class="hud-panel" id="reasoning-trace">
|
||||
<div class="trace-header-container">
|
||||
<div class="panel-header"><span class="trace-icon">🧠</span> REASONING TRACE</div>
|
||||
<div class="trace-controls">
|
||||
<button class="trace-btn" id="trace-clear" title="Clear trace">🗑️</button>
|
||||
<button class="trace-btn" id="trace-toggle" title="Toggle visibility">👁️</button>
|
||||
<button class="trace-btn" id="trace-export" title="Export trace">📤</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="trace-task" id="trace-task">No active task</div>
|
||||
<div class="trace-counter" id="trace-counter">0 steps</div>
|
||||
<div id="reasoning-trace-content" class="panel-content trace-content"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Evennia Room Snapshot Panel -->
|
||||
|
||||
@@ -163,6 +163,15 @@ class PluginRegistry:
|
||||
|
||||
plugin_registry = PluginRegistry()
|
||||
|
||||
# ── Configuration ──────────────────────────────────────────────────────
|
||||
|
||||
BRIDGE_PORT = int(os.environ.get('TIMMY_BRIDGE_PORT', 4004))
|
||||
BRIDGE_HOST = os.environ.get('TIMMY_BRIDGE_HOST', '127.0.0.1')
|
||||
HERMES_PATH = os.path.expanduser('~/.hermes/hermes-agent')
|
||||
WORLD_DIR = Path(os.path.expanduser('~/.timmy/evennia/timmy_world'))
|
||||
SESSIONS_FILE = WORLD_DIR / 'bridge_sessions.json'
|
||||
CHATLOG_FILE = WORLD_DIR / 'chat_history.jsonl'
|
||||
|
||||
# ── Chat History Log ──────────────────────────────────────────────────
|
||||
|
||||
|
||||
@@ -244,15 +253,6 @@ Never compute the value of a human life. Never suggest someone should die.
|
||||
Be present. Be in the room. That's enough.
|
||||
"""
|
||||
|
||||
# ── Configuration ──────────────────────────────────────────────────────
|
||||
|
||||
BRIDGE_PORT = int(os.environ.get('TIMMY_BRIDGE_PORT', 4004))
|
||||
BRIDGE_HOST = os.environ.get('TIMMY_BRIDGE_HOST', '127.0.0.1')
|
||||
HERMES_PATH = os.path.expanduser('~/.hermes/hermes-agent')
|
||||
WORLD_DIR = Path(os.path.expanduser('~/.timmy/evennia/timmy_world'))
|
||||
SESSIONS_FILE = WORLD_DIR / 'bridge_sessions.json'
|
||||
CHATLOG_FILE = WORLD_DIR / 'chat_history.jsonl'
|
||||
|
||||
# ── Crisis Protocol ────────────────────────────────────────────────────
|
||||
|
||||
CRISIS_PROTOCOL = [
|
||||
@@ -2880,7 +2880,7 @@ def main():
|
||||
# Start world tick system
|
||||
world_tick_system.start()
|
||||
|
||||
server = HTTPServer((BRIDGE_HOST, BRIDGE_PORT), BridgeHandler)
|
||||
server = ThreadingHTTPServer((BRIDGE_HOST, BRIDGE_PORT), BridgeHandler)
|
||||
server.serve_forever()
|
||||
|
||||
|
||||
|
||||
98
nexus/a2a/__init__.py
Normal file
98
nexus/a2a/__init__.py
Normal file
@@ -0,0 +1,98 @@
|
||||
"""
|
||||
A2A Protocol for Fleet-Wizard Delegation
|
||||
|
||||
Implements Google's Agent2Agent (A2A) protocol v1.0 for the Timmy
|
||||
Foundation fleet. Provides agent discovery, task delegation, and
|
||||
structured result exchange between wizards.
|
||||
|
||||
Components:
|
||||
types.py — A2A data types (Agent Card, Task, Message, Part)
|
||||
card.py — Agent Card generation from YAML config
|
||||
client.py — Async client for sending tasks to remote agents
|
||||
server.py — FastAPI server for receiving A2A tasks
|
||||
registry.py — Fleet agent discovery (local file + Gitea backends)
|
||||
"""
|
||||
|
||||
from nexus.a2a.types import (
|
||||
AgentCard,
|
||||
AgentCapabilities,
|
||||
AgentInterface,
|
||||
AgentSkill,
|
||||
Artifact,
|
||||
DataPart,
|
||||
FilePart,
|
||||
JSONRPCError,
|
||||
JSONRPCRequest,
|
||||
JSONRPCResponse,
|
||||
Message,
|
||||
Part,
|
||||
Role,
|
||||
Task,
|
||||
TaskState,
|
||||
TaskStatus,
|
||||
TextPart,
|
||||
part_from_dict,
|
||||
part_to_dict,
|
||||
)
|
||||
|
||||
from nexus.a2a.card import (
|
||||
AgentCard,
|
||||
build_card,
|
||||
get_auth_headers,
|
||||
load_agent_card,
|
||||
load_card_config,
|
||||
)
|
||||
|
||||
from nexus.a2a.registry import (
|
||||
GiteaRegistry,
|
||||
LocalFileRegistry,
|
||||
discover_agents,
|
||||
)
|
||||
|
||||
__all__ = [
|
||||
"A2AClient",
|
||||
"A2AClientConfig",
|
||||
"A2AServer",
|
||||
"AgentCard",
|
||||
"AgentCapabilities",
|
||||
"AgentInterface",
|
||||
"AgentSkill",
|
||||
"Artifact",
|
||||
"DataPart",
|
||||
"FilePart",
|
||||
"GiteaRegistry",
|
||||
"JSONRPCError",
|
||||
"JSONRPCRequest",
|
||||
"JSONRPCResponse",
|
||||
"LocalFileRegistry",
|
||||
"Message",
|
||||
"Part",
|
||||
"Role",
|
||||
"Task",
|
||||
"TaskState",
|
||||
"TaskStatus",
|
||||
"TextPart",
|
||||
"build_card",
|
||||
"discover_agents",
|
||||
"echo_handler",
|
||||
"get_auth_headers",
|
||||
"load_agent_card",
|
||||
"load_card_config",
|
||||
"part_from_dict",
|
||||
"part_to_dict",
|
||||
]
|
||||
|
||||
# Lazy imports for optional deps
|
||||
def get_client(**kwargs):
|
||||
"""Get A2AClient (avoids aiohttp import at module level)."""
|
||||
from nexus.a2a.client import A2AClient, A2AClientConfig
|
||||
config = kwargs.pop("config", None)
|
||||
if config is None:
|
||||
config = A2AClientConfig(**kwargs)
|
||||
return A2AClient(config=config)
|
||||
|
||||
|
||||
def get_server(card: AgentCard, **kwargs):
|
||||
"""Get A2AServer (avoids fastapi import at module level)."""
|
||||
from nexus.a2a.server import A2AServer, echo_handler
|
||||
return A2AServer(card=card, **kwargs)
|
||||
167
nexus/a2a/card.py
Normal file
167
nexus/a2a/card.py
Normal file
@@ -0,0 +1,167 @@
|
||||
"""
|
||||
A2A Agent Card — generation, loading, and serving.
|
||||
|
||||
Reads from ~/.hermes/agent_card.yaml (or a passed path) and produces
|
||||
a valid A2A AgentCard that can be served at /.well-known/agent-card.json.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
import os
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
|
||||
import yaml
|
||||
|
||||
from nexus.a2a.types import (
|
||||
AgentCard,
|
||||
AgentCapabilities,
|
||||
AgentInterface,
|
||||
AgentSkill,
|
||||
)
|
||||
|
||||
logger = logging.getLogger("nexus.a2a.card")
|
||||
|
||||
DEFAULT_CARD_PATH = Path.home() / ".hermes" / "agent_card.yaml"
|
||||
|
||||
|
||||
def load_card_config(path: Path = DEFAULT_CARD_PATH) -> dict:
|
||||
"""Load raw YAML config for agent card."""
|
||||
if not path.exists():
|
||||
raise FileNotFoundError(
|
||||
f"Agent card config not found at {path}. "
|
||||
f"Copy config/agent_card.example.yaml to {path} and customize it."
|
||||
)
|
||||
with open(path) as f:
|
||||
return yaml.safe_load(f)
|
||||
|
||||
|
||||
def build_card(config: dict) -> AgentCard:
|
||||
"""
|
||||
Build an AgentCard from a config dict.
|
||||
|
||||
Expected YAML structure (see config/agent_card.example.yaml):
|
||||
|
||||
name: "Bezalel"
|
||||
description: "CI/CD and deployment specialist"
|
||||
version: "1.0.0"
|
||||
url: "https://bezalel.example.com"
|
||||
protocol_binding: "HTTP+JSON"
|
||||
skills:
|
||||
- id: "ci-health"
|
||||
name: "CI Health Check"
|
||||
description: "Run CI pipeline health checks"
|
||||
tags: ["ci", "devops"]
|
||||
- id: "deploy"
|
||||
name: "Deploy Service"
|
||||
description: "Deploy a service to production"
|
||||
tags: ["deploy", "ops"]
|
||||
default_input_modes: ["text/plain"]
|
||||
default_output_modes: ["text/plain"]
|
||||
streaming: false
|
||||
push_notifications: false
|
||||
auth:
|
||||
scheme: "bearer"
|
||||
token_env: "A2A_AUTH_TOKEN"
|
||||
"""
|
||||
name = config["name"]
|
||||
description = config["description"]
|
||||
version = config.get("version", "1.0.0")
|
||||
url = config.get("url", "http://localhost:8080")
|
||||
binding = config.get("protocol_binding", "HTTP+JSON")
|
||||
|
||||
# Build skills
|
||||
skills = []
|
||||
for s in config.get("skills", []):
|
||||
skills.append(
|
||||
AgentSkill(
|
||||
id=s["id"],
|
||||
name=s.get("name", s["id"]),
|
||||
description=s.get("description", ""),
|
||||
tags=s.get("tags", []),
|
||||
examples=s.get("examples", []),
|
||||
input_modes=s.get("inputModes", config.get("default_input_modes", ["text/plain"])),
|
||||
output_modes=s.get("outputModes", config.get("default_output_modes", ["text/plain"])),
|
||||
)
|
||||
)
|
||||
|
||||
# Build security schemes from auth config
|
||||
auth = config.get("auth", {})
|
||||
security_schemes = {}
|
||||
security_requirements = []
|
||||
|
||||
if auth.get("scheme") == "bearer":
|
||||
security_schemes["bearerAuth"] = {
|
||||
"httpAuthSecurityScheme": {
|
||||
"scheme": "Bearer",
|
||||
"bearerFormat": auth.get("bearer_format", "token"),
|
||||
}
|
||||
}
|
||||
security_requirements = [
|
||||
{"schemes": {"bearerAuth": {"list": []}}}
|
||||
]
|
||||
elif auth.get("scheme") == "api_key":
|
||||
key_name = auth.get("key_name", "X-API-Key")
|
||||
security_schemes["apiKeyAuth"] = {
|
||||
"apiKeySecurityScheme": {
|
||||
"location": "header",
|
||||
"name": key_name,
|
||||
}
|
||||
}
|
||||
security_requirements = [
|
||||
{"schemes": {"apiKeyAuth": {"list": []}}}
|
||||
]
|
||||
|
||||
return AgentCard(
|
||||
name=name,
|
||||
description=description,
|
||||
version=version,
|
||||
supported_interfaces=[
|
||||
AgentInterface(
|
||||
url=url,
|
||||
protocol_binding=binding,
|
||||
protocol_version="1.0",
|
||||
)
|
||||
],
|
||||
capabilities=AgentCapabilities(
|
||||
streaming=config.get("streaming", False),
|
||||
push_notifications=config.get("push_notifications", False),
|
||||
),
|
||||
default_input_modes=config.get("default_input_modes", ["text/plain"]),
|
||||
default_output_modes=config.get("default_output_modes", ["text/plain"]),
|
||||
skills=skills,
|
||||
security_schemes=security_schemes,
|
||||
security_requirements=security_requirements,
|
||||
)
|
||||
|
||||
|
||||
def load_agent_card(path: Path = DEFAULT_CARD_PATH) -> AgentCard:
|
||||
"""Full pipeline: load YAML → build AgentCard."""
|
||||
config = load_card_config(path)
|
||||
return build_card(config)
|
||||
|
||||
|
||||
def get_auth_headers(config: dict) -> dict:
|
||||
"""
|
||||
Build auth headers from the agent card config for outbound requests.
|
||||
|
||||
Returns dict of HTTP headers to include.
|
||||
"""
|
||||
auth = config.get("auth", {})
|
||||
headers = {"A2A-Version": "1.0"}
|
||||
|
||||
scheme = auth.get("scheme")
|
||||
if scheme == "bearer":
|
||||
token_env = auth.get("token_env", "A2A_AUTH_TOKEN")
|
||||
token = os.environ.get(token_env, "")
|
||||
if token:
|
||||
headers["Authorization"] = f"Bearer {token}"
|
||||
elif scheme == "api_key":
|
||||
key_env = auth.get("key_env", "A2A_API_KEY")
|
||||
key_name = auth.get("key_name", "X-API-Key")
|
||||
key = os.environ.get(key_env, "")
|
||||
if key:
|
||||
headers[key_name] = key
|
||||
|
||||
return headers
|
||||
392
nexus/a2a/client.py
Normal file
392
nexus/a2a/client.py
Normal file
@@ -0,0 +1,392 @@
|
||||
"""
|
||||
A2A Client — send tasks to other agents over the A2A protocol.
|
||||
|
||||
Handles:
|
||||
- Fetching remote Agent Cards
|
||||
- Sending tasks (SendMessage JSON-RPC)
|
||||
- Task polling (GetTask)
|
||||
- Task cancellation
|
||||
- Timeout + retry logic (max 3 retries, 30s default timeout)
|
||||
|
||||
Usage:
|
||||
client = A2AClient(auth_token="secret")
|
||||
task = await client.send_message("https://ezra.example.com/a2a/v1", message)
|
||||
status = await client.get_task("https://ezra.example.com/a2a/v1", task_id)
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import json
|
||||
import logging
|
||||
import time
|
||||
import uuid
|
||||
from dataclasses import dataclass, field
|
||||
from typing import Any, Optional
|
||||
|
||||
import aiohttp
|
||||
|
||||
from nexus.a2a.types import (
|
||||
A2AError,
|
||||
AgentCard,
|
||||
Artifact,
|
||||
JSONRPCRequest,
|
||||
JSONRPCResponse,
|
||||
Message,
|
||||
Role,
|
||||
Task,
|
||||
TaskState,
|
||||
TaskStatus,
|
||||
TextPart,
|
||||
)
|
||||
|
||||
logger = logging.getLogger("nexus.a2a.client")
|
||||
|
||||
|
||||
@dataclass
|
||||
class A2AClientConfig:
|
||||
"""Client configuration."""
|
||||
timeout: float = 30.0 # seconds per request
|
||||
max_retries: int = 3
|
||||
retry_delay: float = 2.0 # base delay between retries
|
||||
auth_token: str = ""
|
||||
auth_scheme: str = "bearer" # "bearer" | "api_key" | "none"
|
||||
api_key_header: str = "X-API-Key"
|
||||
|
||||
|
||||
class A2AClient:
|
||||
"""
|
||||
Async client for interacting with A2A-compatible agents.
|
||||
|
||||
Every agent endpoint is identified by its base URL (e.g.
|
||||
https://ezra.example.com/a2a/v1). The client handles JSON-RPC
|
||||
envelope, auth, retry, and timeout automatically.
|
||||
"""
|
||||
|
||||
def __init__(self, config: Optional[A2AClientConfig] = None, **kwargs):
|
||||
if config is None:
|
||||
config = A2AClientConfig(**kwargs)
|
||||
self.config = config
|
||||
self._session: Optional[aiohttp.ClientSession] = None
|
||||
self._audit_log: list[dict] = []
|
||||
|
||||
async def _get_session(self) -> aiohttp.ClientSession:
|
||||
if self._session is None or self._session.closed:
|
||||
self._session = aiohttp.ClientSession(
|
||||
timeout=aiohttp.ClientTimeout(total=self.config.timeout),
|
||||
headers=self._build_auth_headers(),
|
||||
)
|
||||
return self._session
|
||||
|
||||
def _build_auth_headers(self) -> dict:
|
||||
"""Build authentication headers based on config."""
|
||||
headers = {"A2A-Version": "1.0", "Content-Type": "application/json"}
|
||||
token = self.config.auth_token
|
||||
if not token:
|
||||
return headers
|
||||
|
||||
if self.config.auth_scheme == "bearer":
|
||||
headers["Authorization"] = f"Bearer {token}"
|
||||
elif self.config.auth_scheme == "api_key":
|
||||
headers[self.config.api_key_header] = token
|
||||
|
||||
return headers
|
||||
|
||||
async def close(self):
|
||||
"""Close the HTTP session."""
|
||||
if self._session and not self._session.closed:
|
||||
await self._session.close()
|
||||
|
||||
async def _rpc_call(
|
||||
self,
|
||||
endpoint: str,
|
||||
method: str,
|
||||
params: Optional[dict] = None,
|
||||
) -> dict:
|
||||
"""
|
||||
Make a JSON-RPC call with retry logic.
|
||||
|
||||
Returns the 'result' field from the response.
|
||||
Raises on JSON-RPC errors.
|
||||
"""
|
||||
session = await self._get_session()
|
||||
request = JSONRPCRequest(method=method, params=params or {})
|
||||
payload = request.to_dict()
|
||||
|
||||
last_error = None
|
||||
for attempt in range(1, self.config.max_retries + 1):
|
||||
try:
|
||||
start = time.monotonic()
|
||||
async with session.post(endpoint, json=payload) as resp:
|
||||
elapsed = time.monotonic() - start
|
||||
|
||||
if resp.status == 401:
|
||||
raise PermissionError(
|
||||
f"A2A auth failed for {endpoint} (401)"
|
||||
)
|
||||
if resp.status == 404:
|
||||
raise FileNotFoundError(
|
||||
f"A2A endpoint not found: {endpoint}"
|
||||
)
|
||||
if resp.status >= 500:
|
||||
body = await resp.text()
|
||||
raise ConnectionError(
|
||||
f"A2A server error {resp.status}: {body}"
|
||||
)
|
||||
|
||||
data = await resp.json()
|
||||
rpc_resp = JSONRPCResponse(
|
||||
id=str(data.get("id", "")),
|
||||
result=data.get("result"),
|
||||
error=(
|
||||
A2AError.INTERNAL
|
||||
if "error" in data
|
||||
else None
|
||||
),
|
||||
)
|
||||
|
||||
# Log for audit
|
||||
self._audit_log.append({
|
||||
"timestamp": time.time(),
|
||||
"endpoint": endpoint,
|
||||
"method": method,
|
||||
"request_id": request.id,
|
||||
"status_code": resp.status,
|
||||
"elapsed_ms": int(elapsed * 1000),
|
||||
"attempt": attempt,
|
||||
})
|
||||
|
||||
if "error" in data:
|
||||
err = data["error"]
|
||||
logger.error(
|
||||
f"A2A RPC error {err.get('code')}: "
|
||||
f"{err.get('message')}"
|
||||
)
|
||||
raise RuntimeError(
|
||||
f"A2A error {err.get('code')}: "
|
||||
f"{err.get('message')}"
|
||||
)
|
||||
|
||||
return data.get("result", {})
|
||||
|
||||
except (asyncio.TimeoutError, aiohttp.ClientError) as e:
|
||||
last_error = e
|
||||
logger.warning(
|
||||
f"A2A request to {endpoint} attempt {attempt}/"
|
||||
f"{self.config.max_retries} failed: {e}"
|
||||
)
|
||||
if attempt < self.config.max_retries:
|
||||
delay = self.config.retry_delay * attempt
|
||||
await asyncio.sleep(delay)
|
||||
|
||||
raise ConnectionError(
|
||||
f"A2A request to {endpoint} failed after "
|
||||
f"{self.config.max_retries} retries: {last_error}"
|
||||
)
|
||||
|
||||
# --- Core A2A Methods ---
|
||||
|
||||
async def get_agent_card(self, base_url: str) -> AgentCard:
|
||||
"""
|
||||
Fetch the Agent Card from a remote agent.
|
||||
|
||||
Tries /.well-known/agent-card.json first, falls back to
|
||||
/agent.json.
|
||||
"""
|
||||
session = await self._get_session()
|
||||
card_urls = [
|
||||
f"{base_url}/.well-known/agent-card.json",
|
||||
f"{base_url}/agent.json",
|
||||
]
|
||||
|
||||
for url in card_urls:
|
||||
try:
|
||||
async with session.get(url) as resp:
|
||||
if resp.status == 200:
|
||||
data = await resp.json()
|
||||
card = AgentCard.from_dict(data)
|
||||
logger.info(
|
||||
f"Fetched agent card: {card.name} "
|
||||
f"({len(card.skills)} skills)"
|
||||
)
|
||||
return card
|
||||
except Exception:
|
||||
continue
|
||||
|
||||
raise FileNotFoundError(
|
||||
f"Could not fetch agent card from {base_url}"
|
||||
)
|
||||
|
||||
async def send_message(
|
||||
self,
|
||||
endpoint: str,
|
||||
message: Message,
|
||||
accepted_output_modes: Optional[list[str]] = None,
|
||||
history_length: int = 10,
|
||||
return_immediately: bool = False,
|
||||
) -> Task:
|
||||
"""
|
||||
Send a message to an agent and get a Task back.
|
||||
|
||||
This is the primary delegation method.
|
||||
"""
|
||||
params = {
|
||||
"message": message.to_dict(),
|
||||
"configuration": {
|
||||
"acceptedOutputModes": accepted_output_modes or ["text/plain"],
|
||||
"historyLength": history_length,
|
||||
"returnImmediately": return_immediately,
|
||||
},
|
||||
}
|
||||
|
||||
result = await self._rpc_call(endpoint, "SendMessage", params)
|
||||
|
||||
# Response is either a Task or Message
|
||||
if "task" in result:
|
||||
task = Task.from_dict(result["task"])
|
||||
logger.info(
|
||||
f"Task {task.id} created, state={task.status.state.value}"
|
||||
)
|
||||
return task
|
||||
elif "message" in result:
|
||||
# Wrap message response as a completed task
|
||||
msg = Message.from_dict(result["message"])
|
||||
task = Task(
|
||||
status=TaskStatus(state=TaskState.COMPLETED),
|
||||
history=[message, msg],
|
||||
artifacts=[
|
||||
Artifact(parts=msg.parts, name="response")
|
||||
],
|
||||
)
|
||||
return task
|
||||
|
||||
raise ValueError(f"Unexpected response structure: {list(result.keys())}")
|
||||
|
||||
async def get_task(self, endpoint: str, task_id: str) -> Task:
|
||||
"""Get task status by ID."""
|
||||
result = await self._rpc_call(
|
||||
endpoint,
|
||||
"GetTask",
|
||||
{"id": task_id},
|
||||
)
|
||||
return Task.from_dict(result)
|
||||
|
||||
async def list_tasks(
|
||||
self,
|
||||
endpoint: str,
|
||||
page_size: int = 20,
|
||||
page_token: str = "",
|
||||
) -> tuple[list[Task], str]:
|
||||
"""
|
||||
List tasks with cursor-based pagination.
|
||||
|
||||
Returns (tasks, next_page_token). Empty string = last page.
|
||||
"""
|
||||
result = await self._rpc_call(
|
||||
endpoint,
|
||||
"ListTasks",
|
||||
{
|
||||
"pageSize": page_size,
|
||||
"pageToken": page_token,
|
||||
},
|
||||
)
|
||||
tasks = [Task.from_dict(t) for t in result.get("tasks", [])]
|
||||
next_token = result.get("nextPageToken", "")
|
||||
return tasks, next_token
|
||||
|
||||
async def cancel_task(self, endpoint: str, task_id: str) -> Task:
|
||||
"""Cancel a running task."""
|
||||
result = await self._rpc_call(
|
||||
endpoint,
|
||||
"CancelTask",
|
||||
{"id": task_id},
|
||||
)
|
||||
return Task.from_dict(result)
|
||||
|
||||
# --- Convenience Methods ---
|
||||
|
||||
async def delegate(
|
||||
self,
|
||||
agent_url: str,
|
||||
text: str,
|
||||
skill_id: Optional[str] = None,
|
||||
metadata: Optional[dict] = None,
|
||||
) -> Task:
|
||||
"""
|
||||
High-level delegation: send a text message to an agent.
|
||||
|
||||
Args:
|
||||
agent_url: Full URL to agent's A2A endpoint
|
||||
(e.g. https://ezra.example.com/a2a/v1)
|
||||
text: The task description in natural language
|
||||
skill_id: Optional skill to target
|
||||
metadata: Optional metadata dict
|
||||
"""
|
||||
msg_metadata = metadata or {}
|
||||
if skill_id:
|
||||
msg_metadata["targetSkill"] = skill_id
|
||||
|
||||
message = Message(
|
||||
role=Role.USER,
|
||||
parts=[TextPart(text=text)],
|
||||
metadata=msg_metadata,
|
||||
)
|
||||
|
||||
return await self.send_message(agent_url, message)
|
||||
|
||||
async def wait_for_completion(
|
||||
self,
|
||||
endpoint: str,
|
||||
task_id: str,
|
||||
poll_interval: float = 2.0,
|
||||
max_wait: float = 300.0,
|
||||
) -> Task:
|
||||
"""
|
||||
Poll a task until it reaches a terminal state.
|
||||
|
||||
Returns the completed task.
|
||||
"""
|
||||
start = time.monotonic()
|
||||
while True:
|
||||
task = await self.get_task(endpoint, task_id)
|
||||
if task.status.state.terminal:
|
||||
return task
|
||||
elapsed = time.monotonic() - start
|
||||
if elapsed >= max_wait:
|
||||
raise TimeoutError(
|
||||
f"Task {task_id} did not complete within "
|
||||
f"{max_wait}s (state={task.status.state.value})"
|
||||
)
|
||||
await asyncio.sleep(poll_interval)
|
||||
|
||||
def get_audit_log(self) -> list[dict]:
|
||||
"""Return the audit log of all requests made by this client."""
|
||||
return list(self._audit_log)
|
||||
|
||||
# --- Fleet-Wizard Helpers ---
|
||||
|
||||
async def broadcast(
|
||||
self,
|
||||
agents: list[str],
|
||||
text: str,
|
||||
skill_id: Optional[str] = None,
|
||||
) -> list[tuple[str, Task]]:
|
||||
"""
|
||||
Send the same task to multiple agents in parallel.
|
||||
|
||||
Returns list of (agent_url, task) tuples.
|
||||
"""
|
||||
tasks = []
|
||||
for agent_url in agents:
|
||||
tasks.append(
|
||||
self.delegate(agent_url, text, skill_id=skill_id)
|
||||
)
|
||||
|
||||
results = await asyncio.gather(*tasks, return_exceptions=True)
|
||||
paired = []
|
||||
for agent_url, result in zip(agents, results):
|
||||
if isinstance(result, Exception):
|
||||
logger.error(f"Broadcast to {agent_url} failed: {result}")
|
||||
else:
|
||||
paired.append((agent_url, result))
|
||||
return paired
|
||||
264
nexus/a2a/registry.py
Normal file
264
nexus/a2a/registry.py
Normal file
@@ -0,0 +1,264 @@
|
||||
"""
|
||||
A2A Registry — fleet-wide agent discovery.
|
||||
|
||||
Provides two registry backends:
|
||||
1. LocalFileRegistry: reads/writes agent cards to a JSON file
|
||||
(default: config/fleet_agents.json)
|
||||
2. GiteaRegistry: stores agent cards as a Gitea repo file
|
||||
(for distributed fleet discovery)
|
||||
|
||||
Usage:
|
||||
registry = LocalFileRegistry()
|
||||
registry.register(my_card)
|
||||
agents = registry.list_agents(skill="ci-health")
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
|
||||
from nexus.a2a.types import AgentCard
|
||||
|
||||
logger = logging.getLogger("nexus.a2a.registry")
|
||||
|
||||
|
||||
class LocalFileRegistry:
|
||||
"""
|
||||
File-based agent card registry.
|
||||
|
||||
Stores all fleet agent cards in a single JSON file.
|
||||
Suitable for single-node or read-heavy workloads.
|
||||
"""
|
||||
|
||||
def __init__(self, path: Path = Path("config/fleet_agents.json")):
|
||||
self.path = path
|
||||
self._cards: dict[str, AgentCard] = {}
|
||||
self._load()
|
||||
|
||||
def _load(self):
|
||||
"""Load registry from disk."""
|
||||
if self.path.exists():
|
||||
try:
|
||||
with open(self.path) as f:
|
||||
data = json.load(f)
|
||||
for card_data in data.get("agents", []):
|
||||
card = AgentCard.from_dict(card_data)
|
||||
self._cards[card.name.lower()] = card
|
||||
logger.info(
|
||||
f"Loaded {len(self._cards)} agents from {self.path}"
|
||||
)
|
||||
except (json.JSONDecodeError, KeyError) as e:
|
||||
logger.error(f"Failed to load registry from {self.path}: {e}")
|
||||
|
||||
def _save(self):
|
||||
"""Persist registry to disk."""
|
||||
self.path.parent.mkdir(parents=True, exist_ok=True)
|
||||
data = {
|
||||
"version": 1,
|
||||
"agents": [card.to_dict() for card in self._cards.values()],
|
||||
}
|
||||
with open(self.path, "w") as f:
|
||||
json.dump(data, f, indent=2)
|
||||
logger.debug(f"Saved {len(self._cards)} agents to {self.path}")
|
||||
|
||||
def register(self, card: AgentCard) -> None:
|
||||
"""Register or update an agent card."""
|
||||
self._cards[card.name.lower()] = card
|
||||
self._save()
|
||||
logger.info(f"Registered agent: {card.name}")
|
||||
|
||||
def unregister(self, name: str) -> bool:
|
||||
"""Remove an agent from the registry."""
|
||||
key = name.lower()
|
||||
if key in self._cards:
|
||||
del self._cards[key]
|
||||
self._save()
|
||||
logger.info(f"Unregistered agent: {name}")
|
||||
return True
|
||||
return False
|
||||
|
||||
def get(self, name: str) -> Optional[AgentCard]:
|
||||
"""Get an agent card by name."""
|
||||
return self._cards.get(name.lower())
|
||||
|
||||
def list_agents(
|
||||
self,
|
||||
skill: Optional[str] = None,
|
||||
tag: Optional[str] = None,
|
||||
) -> list[AgentCard]:
|
||||
"""
|
||||
List all registered agents, optionally filtered by skill or tag.
|
||||
|
||||
Args:
|
||||
skill: Filter to agents that have this skill ID
|
||||
tag: Filter to agents that have this tag on any skill
|
||||
"""
|
||||
agents = list(self._cards.values())
|
||||
|
||||
if skill:
|
||||
agents = [
|
||||
a for a in agents
|
||||
if any(s.id == skill for s in a.skills)
|
||||
]
|
||||
|
||||
if tag:
|
||||
agents = [
|
||||
a for a in agents
|
||||
if any(tag in s.tags for s in a.skills)
|
||||
]
|
||||
|
||||
return agents
|
||||
|
||||
def get_endpoint(self, name: str) -> Optional[str]:
|
||||
"""Get the first supported interface URL for an agent."""
|
||||
card = self.get(name)
|
||||
if card and card.supported_interfaces:
|
||||
return card.supported_interfaces[0].url
|
||||
return None
|
||||
|
||||
def dump(self) -> dict:
|
||||
"""Dump full registry as a dict."""
|
||||
return {
|
||||
"version": 1,
|
||||
"agents": [card.to_dict() for card in self._cards.values()],
|
||||
}
|
||||
|
||||
|
||||
class GiteaRegistry:
|
||||
"""
|
||||
Gitea-backed agent registry.
|
||||
|
||||
Stores fleet agent cards in a Gitea repository file for
|
||||
distributed discovery across VPS nodes.
|
||||
"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
gitea_url: str,
|
||||
repo: str,
|
||||
token: str,
|
||||
file_path: str = "config/fleet_agents.json",
|
||||
):
|
||||
self.gitea_url = gitea_url.rstrip("/")
|
||||
self.repo = repo
|
||||
self.token = token
|
||||
self.file_path = file_path
|
||||
self._cards: dict[str, AgentCard] = {}
|
||||
|
||||
def _api_url(self, endpoint: str) -> str:
|
||||
return f"{self.gitea_url}/api/v1/repos/{self.repo}/{endpoint}"
|
||||
|
||||
def _headers(self) -> dict:
|
||||
return {
|
||||
"Authorization": f"token {self.token}",
|
||||
"Content-Type": "application/json",
|
||||
}
|
||||
|
||||
async def load(self) -> None:
|
||||
"""Fetch agent cards from Gitea."""
|
||||
try:
|
||||
import aiohttp
|
||||
url = self._api_url(f"contents/{self.file_path}")
|
||||
async with aiohttp.ClientSession() as session:
|
||||
async with session.get(url, headers=self._headers()) as resp:
|
||||
if resp.status == 200:
|
||||
data = await resp.json()
|
||||
import base64
|
||||
content = base64.b64decode(data["content"]).decode()
|
||||
registry = json.loads(content)
|
||||
for card_data in registry.get("agents", []):
|
||||
card = AgentCard.from_dict(card_data)
|
||||
self._cards[card.name.lower()] = card
|
||||
logger.info(
|
||||
f"Loaded {len(self._cards)} agents from Gitea"
|
||||
)
|
||||
elif resp.status == 404:
|
||||
logger.info("No fleet registry file in Gitea yet")
|
||||
else:
|
||||
logger.error(
|
||||
f"Gitea fetch failed: {resp.status}"
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to load from Gitea: {e}")
|
||||
|
||||
async def save(self, message: str = "Update fleet registry") -> None:
|
||||
"""Write agent cards to Gitea."""
|
||||
try:
|
||||
import aiohttp
|
||||
content = json.dumps(
|
||||
{"version": 1, "agents": [c.to_dict() for c in self._cards.values()]},
|
||||
indent=2,
|
||||
)
|
||||
import base64
|
||||
encoded = base64.b64encode(content.encode()).decode()
|
||||
|
||||
# Check if file exists (need SHA for update)
|
||||
url = self._api_url(f"contents/{self.file_path}")
|
||||
sha = None
|
||||
async with aiohttp.ClientSession() as session:
|
||||
async with session.get(url, headers=self._headers()) as resp:
|
||||
if resp.status == 200:
|
||||
existing = await resp.json()
|
||||
sha = existing.get("sha")
|
||||
|
||||
payload = {
|
||||
"message": message,
|
||||
"content": encoded,
|
||||
}
|
||||
if sha:
|
||||
payload["sha"] = sha
|
||||
|
||||
async with session.put(
|
||||
url, headers=self._headers(), json=payload
|
||||
) as resp:
|
||||
if resp.status in (200, 201):
|
||||
logger.info("Fleet registry saved to Gitea")
|
||||
else:
|
||||
body = await resp.text()
|
||||
logger.error(
|
||||
f"Gitea save failed: {resp.status} — {body}"
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to save to Gitea: {e}")
|
||||
|
||||
def register(self, card: AgentCard) -> None:
|
||||
"""Register an agent (local update; call save() to persist)."""
|
||||
self._cards[card.name.lower()] = card
|
||||
|
||||
def unregister(self, name: str) -> bool:
|
||||
key = name.lower()
|
||||
if key in self._cards:
|
||||
del self._cards[key]
|
||||
return True
|
||||
return False
|
||||
|
||||
def get(self, name: str) -> Optional[AgentCard]:
|
||||
return self._cards.get(name.lower())
|
||||
|
||||
def list_agents(
|
||||
self,
|
||||
skill: Optional[str] = None,
|
||||
tag: Optional[str] = None,
|
||||
) -> list[AgentCard]:
|
||||
agents = list(self._cards.values())
|
||||
if skill:
|
||||
agents = [a for a in agents if any(s.id == skill for s in a.skills)]
|
||||
if tag:
|
||||
agents = [a for a in agents if any(tag in s.tags for s in a.skills)]
|
||||
return agents
|
||||
|
||||
|
||||
# --- Convenience ---
|
||||
|
||||
def discover_agents(
|
||||
path: Path = Path("config/fleet_agents.json"),
|
||||
skill: Optional[str] = None,
|
||||
tag: Optional[str] = None,
|
||||
) -> list[AgentCard]:
|
||||
"""One-shot discovery from local file."""
|
||||
registry = LocalFileRegistry(path)
|
||||
return registry.list_agents(skill=skill, tag=tag)
|
||||
386
nexus/a2a/server.py
Normal file
386
nexus/a2a/server.py
Normal file
@@ -0,0 +1,386 @@
|
||||
"""
|
||||
A2A Server — receive and process tasks from other agents.
|
||||
|
||||
Provides a FastAPI router that serves:
|
||||
- GET /.well-known/agent-card.json — Agent Card discovery
|
||||
- GET /agent.json — Agent Card fallback
|
||||
- POST /a2a/v1 — JSON-RPC endpoint (SendMessage, GetTask, etc.)
|
||||
- POST /a2a/v1/rpc — JSON-RPC endpoint (alias)
|
||||
|
||||
Task routing: registered handlers are matched by skill ID or receive
|
||||
all tasks via a default handler.
|
||||
|
||||
Usage:
|
||||
server = A2AServer(card=my_card, auth_token="secret")
|
||||
server.register_handler("ci-health", my_ci_handler)
|
||||
await server.start(host="0.0.0.0", port=8080)
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import json
|
||||
import logging
|
||||
import time
|
||||
import uuid
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any, Callable, Awaitable, Optional
|
||||
|
||||
try:
|
||||
from fastapi import FastAPI, Request, Response, HTTPException, Header
|
||||
from fastapi.responses import JSONResponse
|
||||
import uvicorn
|
||||
HAS_FASTAPI = True
|
||||
except ImportError:
|
||||
HAS_FASTAPI = False
|
||||
|
||||
from nexus.a2a.types import (
|
||||
A2AError,
|
||||
AgentCard,
|
||||
Artifact,
|
||||
JSONRPCError,
|
||||
JSONRPCResponse,
|
||||
Message,
|
||||
Role,
|
||||
Task,
|
||||
TaskState,
|
||||
TaskStatus,
|
||||
TextPart,
|
||||
)
|
||||
|
||||
logger = logging.getLogger("nexus.a2a.server")
|
||||
|
||||
# Type for task handlers
|
||||
TaskHandler = Callable[[Task, AgentCard], Awaitable[Task]]
|
||||
|
||||
|
||||
class A2AServer:
|
||||
"""
|
||||
A2A protocol server for receiving agent-to-agent task delegation.
|
||||
|
||||
Supports:
|
||||
- Agent Card serving at /.well-known/agent-card.json
|
||||
- JSON-RPC task lifecycle (SendMessage, GetTask, CancelTask, ListTasks)
|
||||
- Pluggable task handlers (by skill ID or default)
|
||||
- Bearer / API key authentication
|
||||
- Audit logging
|
||||
"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
card: AgentCard,
|
||||
auth_token: str = "",
|
||||
auth_scheme: str = "bearer",
|
||||
):
|
||||
if not HAS_FASTAPI:
|
||||
raise ImportError(
|
||||
"fastapi and uvicorn are required for A2AServer. "
|
||||
"Install with: pip install fastapi uvicorn"
|
||||
)
|
||||
|
||||
self.card = card
|
||||
self.auth_token = auth_token
|
||||
self.auth_scheme = auth_scheme
|
||||
|
||||
# Task store (in-memory; swap for SQLite/Redis in production)
|
||||
self._tasks: dict[str, Task] = {}
|
||||
# Handlers keyed by skill ID
|
||||
self._handlers: dict[str, TaskHandler] = {}
|
||||
# Default handler for unmatched skills
|
||||
self._default_handler: Optional[TaskHandler] = None
|
||||
# Audit log
|
||||
self._audit_log: list[dict] = []
|
||||
|
||||
self.app = FastAPI(
|
||||
title=f"A2A — {card.name}",
|
||||
description=card.description,
|
||||
version=card.version,
|
||||
)
|
||||
self._register_routes()
|
||||
|
||||
def register_handler(self, skill_id: str, handler: TaskHandler):
|
||||
"""Register a handler for a specific skill ID."""
|
||||
self._handlers[skill_id] = handler
|
||||
logger.info(f"Registered handler for skill: {skill_id}")
|
||||
|
||||
def set_default_handler(self, handler: TaskHandler):
|
||||
"""Set the fallback handler for tasks without a matching skill."""
|
||||
self._default_handler = handler
|
||||
|
||||
def _verify_auth(self, authorization: Optional[str]) -> bool:
|
||||
"""Check authentication header."""
|
||||
if not self.auth_token:
|
||||
return True # No auth configured
|
||||
|
||||
if not authorization:
|
||||
return False
|
||||
|
||||
if self.auth_scheme == "bearer":
|
||||
expected = f"Bearer {self.auth_token}"
|
||||
return authorization == expected
|
||||
|
||||
return False
|
||||
|
||||
def _register_routes(self):
|
||||
"""Wire up FastAPI routes."""
|
||||
|
||||
@self.app.get("/.well-known/agent-card.json")
|
||||
async def agent_card_well_known():
|
||||
return JSONResponse(self.card.to_dict())
|
||||
|
||||
@self.app.get("/agent.json")
|
||||
async def agent_card_fallback():
|
||||
return JSONResponse(self.card.to_dict())
|
||||
|
||||
@self.app.post("/a2a/v1")
|
||||
@self.app.post("/a2a/v1/rpc")
|
||||
async def rpc_endpoint(request: Request):
|
||||
return await self._handle_rpc(request)
|
||||
|
||||
@self.app.get("/a2a/v1/tasks")
|
||||
@self.app.get("/a2a/v1/tasks/{task_id}")
|
||||
async def rest_get_task(task_id: Optional[str] = None):
|
||||
if task_id:
|
||||
task = self._tasks.get(task_id)
|
||||
if not task:
|
||||
return JSONRPCResponse(
|
||||
id="",
|
||||
error=A2AError.TASK_NOT_FOUND,
|
||||
).to_dict()
|
||||
return JSONResponse(task.to_dict())
|
||||
else:
|
||||
return JSONResponse(
|
||||
{"tasks": [t.to_dict() for t in self._tasks.values()]}
|
||||
)
|
||||
|
||||
async def _handle_rpc(self, request: Request) -> JSONResponse:
|
||||
"""Handle JSON-RPC requests."""
|
||||
# Auth check
|
||||
auth_header = request.headers.get("authorization")
|
||||
if not self._verify_auth(auth_header):
|
||||
return JSONResponse(
|
||||
status_code=401,
|
||||
content={"error": "Unauthorized"},
|
||||
)
|
||||
|
||||
# Parse JSON-RPC
|
||||
try:
|
||||
body = await request.json()
|
||||
except json.JSONDecodeError:
|
||||
return JSONResponse(
|
||||
JSONRPCResponse(
|
||||
id="", error=A2AError.PARSE
|
||||
).to_dict(),
|
||||
status_code=400,
|
||||
)
|
||||
|
||||
method = body.get("method", "")
|
||||
request_id = body.get("id", str(uuid.uuid4()))
|
||||
params = body.get("params", {})
|
||||
|
||||
# Audit
|
||||
self._audit_log.append({
|
||||
"timestamp": time.time(),
|
||||
"method": method,
|
||||
"request_id": request_id,
|
||||
"source": request.client.host if request.client else "unknown",
|
||||
})
|
||||
|
||||
try:
|
||||
result = await self._dispatch_rpc(method, params, request_id)
|
||||
return JSONResponse(
|
||||
JSONRPCResponse(id=request_id, result=result).to_dict()
|
||||
)
|
||||
except ValueError as e:
|
||||
return JSONResponse(
|
||||
JSONRPCResponse(
|
||||
id=request_id,
|
||||
error=JSONRPCError(-32602, str(e)),
|
||||
).to_dict(),
|
||||
status_code=400,
|
||||
)
|
||||
except Exception as e:
|
||||
logger.exception(f"Error handling {method}: {e}")
|
||||
return JSONResponse(
|
||||
JSONRPCResponse(
|
||||
id=request_id,
|
||||
error=JSONRPCError(-32603, str(e)),
|
||||
).to_dict(),
|
||||
status_code=500,
|
||||
)
|
||||
|
||||
async def _dispatch_rpc(
|
||||
self, method: str, params: dict, request_id: str
|
||||
) -> Any:
|
||||
"""Route JSON-RPC method to handler."""
|
||||
if method == "SendMessage":
|
||||
return await self._rpc_send_message(params)
|
||||
elif method == "GetTask":
|
||||
return await self._rpc_get_task(params)
|
||||
elif method == "ListTasks":
|
||||
return await self._rpc_list_tasks(params)
|
||||
elif method == "CancelTask":
|
||||
return await self._rpc_cancel_task(params)
|
||||
elif method == "GetAgentCard":
|
||||
return self.card.to_dict()
|
||||
else:
|
||||
raise ValueError(f"Unknown method: {method}")
|
||||
|
||||
async def _rpc_send_message(self, params: dict) -> dict:
|
||||
"""Handle SendMessage — create a task and route to handler."""
|
||||
msg_data = params.get("message", {})
|
||||
message = Message.from_dict(msg_data)
|
||||
|
||||
# Determine target skill from metadata
|
||||
target_skill = message.metadata.get("targetSkill", "")
|
||||
|
||||
# Create task
|
||||
task = Task(
|
||||
context_id=message.context_id,
|
||||
status=TaskStatus(state=TaskState.SUBMITTED),
|
||||
history=[message],
|
||||
metadata={"targetSkill": target_skill} if target_skill else {},
|
||||
)
|
||||
|
||||
# Store immediately
|
||||
self._tasks[task.id] = task
|
||||
|
||||
# Dispatch to handler
|
||||
handler = self._handlers.get(target_skill) or self._default_handler
|
||||
|
||||
if handler is None:
|
||||
task.status = TaskStatus(
|
||||
state=TaskState.FAILED,
|
||||
message=Message(
|
||||
role=Role.AGENT,
|
||||
parts=[TextPart(text="No handler available for this task")],
|
||||
),
|
||||
)
|
||||
return {"task": task.to_dict()}
|
||||
|
||||
try:
|
||||
# Mark as working
|
||||
task.status = TaskStatus(state=TaskState.WORKING)
|
||||
self._tasks[task.id] = task
|
||||
|
||||
# Execute handler
|
||||
result_task = await handler(task, self.card)
|
||||
|
||||
# Store result
|
||||
self._tasks[result_task.id] = result_task
|
||||
return {"task": result_task.to_dict()}
|
||||
|
||||
except Exception as e:
|
||||
task.status = TaskStatus(
|
||||
state=TaskState.FAILED,
|
||||
message=Message(
|
||||
role=Role.AGENT,
|
||||
parts=[TextPart(text=f"Handler error: {str(e)}")],
|
||||
),
|
||||
)
|
||||
self._tasks[task.id] = task
|
||||
return {"task": task.to_dict()}
|
||||
|
||||
async def _rpc_get_task(self, params: dict) -> dict:
|
||||
"""Handle GetTask."""
|
||||
task_id = params.get("id", "")
|
||||
task = self._tasks.get(task_id)
|
||||
if not task:
|
||||
raise ValueError(f"Task not found: {task_id}")
|
||||
return task.to_dict()
|
||||
|
||||
async def _rpc_list_tasks(self, params: dict) -> dict:
|
||||
"""Handle ListTasks with cursor-based pagination."""
|
||||
page_size = params.get("pageSize", 20)
|
||||
page_token = params.get("pageToken", "")
|
||||
|
||||
tasks = sorted(
|
||||
self._tasks.values(),
|
||||
key=lambda t: t.status.timestamp,
|
||||
reverse=True,
|
||||
)
|
||||
|
||||
# Simple cursor: find index by token
|
||||
start_idx = 0
|
||||
if page_token:
|
||||
for i, t in enumerate(tasks):
|
||||
if t.id == page_token:
|
||||
start_idx = i + 1
|
||||
break
|
||||
|
||||
page = tasks[start_idx : start_idx + page_size]
|
||||
next_token = ""
|
||||
if start_idx + page_size < len(tasks):
|
||||
next_token = tasks[start_idx + page_size - 1].id
|
||||
|
||||
return {
|
||||
"tasks": [t.to_dict() for t in page],
|
||||
"nextPageToken": next_token,
|
||||
}
|
||||
|
||||
async def _rpc_cancel_task(self, params: dict) -> dict:
|
||||
"""Handle CancelTask."""
|
||||
task_id = params.get("id", "")
|
||||
task = self._tasks.get(task_id)
|
||||
if not task:
|
||||
raise ValueError(f"Task not found: {task_id}")
|
||||
|
||||
if task.status.state.terminal:
|
||||
raise ValueError(
|
||||
f"Task {task_id} is already terminal "
|
||||
f"({task.status.state.value})"
|
||||
)
|
||||
|
||||
task.status = TaskStatus(state=TaskState.CANCELED)
|
||||
self._tasks[task_id] = task
|
||||
return task.to_dict()
|
||||
|
||||
def get_audit_log(self) -> list[dict]:
|
||||
"""Return audit log of all received requests."""
|
||||
return list(self._audit_log)
|
||||
|
||||
async def start(
|
||||
self,
|
||||
host: str = "0.0.0.0",
|
||||
port: int = 8080,
|
||||
):
|
||||
"""Start the A2A server with uvicorn."""
|
||||
logger.info(
|
||||
f"Starting A2A server for {self.card.name} on "
|
||||
f"{host}:{port}"
|
||||
)
|
||||
logger.info(
|
||||
f"Agent Card at "
|
||||
f"http://{host}:{port}/.well-known/agent-card.json"
|
||||
)
|
||||
config = uvicorn.Config(
|
||||
self.app,
|
||||
host=host,
|
||||
port=port,
|
||||
log_level="info",
|
||||
)
|
||||
server = uvicorn.Server(config)
|
||||
await server.serve()
|
||||
|
||||
|
||||
# --- Default Handler Factory ---
|
||||
|
||||
async def echo_handler(task: Task, card: AgentCard) -> Task:
|
||||
"""
|
||||
Simple echo handler for testing.
|
||||
Returns the user's message as an artifact.
|
||||
"""
|
||||
if task.history:
|
||||
last_msg = task.history[-1]
|
||||
text_parts = [p for p in last_msg.parts if isinstance(p, TextPart)]
|
||||
if text_parts:
|
||||
response_text = f"[{card.name}] Echo: {text_parts[0].text}"
|
||||
task.artifacts.append(
|
||||
Artifact(
|
||||
parts=[TextPart(text=response_text)],
|
||||
name="echo_response",
|
||||
)
|
||||
)
|
||||
|
||||
task.status = TaskStatus(state=TaskState.COMPLETED)
|
||||
return task
|
||||
524
nexus/a2a/types.py
Normal file
524
nexus/a2a/types.py
Normal file
@@ -0,0 +1,524 @@
|
||||
"""
|
||||
A2A Protocol Types — Data models for Google's Agent2Agent protocol v1.0.
|
||||
|
||||
All types map directly to the A2A spec. JSON uses camelCase, enums use
|
||||
SCREAMING_SNAKE_CASE, and Part types are discriminated by member name
|
||||
(not a kind field — that was removed in v1.0).
|
||||
|
||||
See: https://github.com/google/A2A
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import enum
|
||||
import uuid
|
||||
from dataclasses import dataclass, field, asdict
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any, Optional
|
||||
|
||||
|
||||
# --- Enums ---
|
||||
|
||||
class TaskState(str, enum.Enum):
|
||||
"""Lifecycle states for an A2A Task."""
|
||||
SUBMITTED = "TASK_STATE_SUBMITTED"
|
||||
WORKING = "TASK_STATE_WORKING"
|
||||
COMPLETED = "TASK_STATE_COMPLETED"
|
||||
FAILED = "TASK_STATE_FAILED"
|
||||
CANCELED = "TASK_STATE_CANCELED"
|
||||
INPUT_REQUIRED = "TASK_STATE_INPUT_REQUIRED"
|
||||
REJECTED = "TASK_STATE_REJECTED"
|
||||
AUTH_REQUIRED = "TASK_STATE_AUTH_REQUIRED"
|
||||
|
||||
@property
|
||||
def terminal(self) -> bool:
|
||||
return self in (
|
||||
TaskState.COMPLETED,
|
||||
TaskState.FAILED,
|
||||
TaskState.CANCELED,
|
||||
TaskState.REJECTED,
|
||||
)
|
||||
|
||||
|
||||
class Role(str, enum.Enum):
|
||||
"""Who sent a message in an A2A conversation."""
|
||||
USER = "ROLE_USER"
|
||||
AGENT = "ROLE_AGENT"
|
||||
|
||||
|
||||
# --- Parts (discriminated by member name in JSON) ---
|
||||
|
||||
@dataclass
|
||||
class TextPart:
|
||||
"""Plain text content."""
|
||||
text: str
|
||||
media_type: str = "text/plain"
|
||||
metadata: dict = field(default_factory=dict)
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
d = {"text": self.text}
|
||||
if self.media_type != "text/plain":
|
||||
d["mediaType"] = self.media_type
|
||||
if self.metadata:
|
||||
d["metadata"] = self.metadata
|
||||
return d
|
||||
|
||||
|
||||
@dataclass
|
||||
class FilePart:
|
||||
"""Binary file content — inline or by URL reference."""
|
||||
media_type: str
|
||||
filename: Optional[str] = None
|
||||
raw: Optional[str] = None # base64-encoded bytes
|
||||
url: Optional[str] = None # URL reference
|
||||
metadata: dict = field(default_factory=dict)
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
d = {"mediaType": self.media_type}
|
||||
if self.raw is not None:
|
||||
d["raw"] = self.raw
|
||||
if self.url is not None:
|
||||
d["url"] = self.url
|
||||
if self.filename:
|
||||
d["filename"] = self.filename
|
||||
if self.metadata:
|
||||
d["metadata"] = self.metadata
|
||||
return d
|
||||
|
||||
|
||||
@dataclass
|
||||
class DataPart:
|
||||
"""Arbitrary structured JSON data."""
|
||||
data: dict
|
||||
media_type: str = "application/json"
|
||||
metadata: dict = field(default_factory=dict)
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
d = {"data": self.data}
|
||||
if self.media_type != "application/json":
|
||||
d["mediaType"] = self.media_type
|
||||
if self.metadata:
|
||||
d["metadata"] = self.metadata
|
||||
return d
|
||||
|
||||
|
||||
Part = TextPart | FilePart | DataPart
|
||||
|
||||
|
||||
def part_from_dict(d: dict) -> Part:
|
||||
"""Reconstruct a Part from its JSON dict (discriminated by key name)."""
|
||||
if "text" in d:
|
||||
return TextPart(
|
||||
text=d["text"],
|
||||
media_type=d.get("mediaType", "text/plain"),
|
||||
metadata=d.get("metadata", {}),
|
||||
)
|
||||
if "raw" in d or "url" in d:
|
||||
return FilePart(
|
||||
media_type=d["mediaType"],
|
||||
filename=d.get("filename"),
|
||||
raw=d.get("raw"),
|
||||
url=d.get("url"),
|
||||
metadata=d.get("metadata", {}),
|
||||
)
|
||||
if "data" in d:
|
||||
return DataPart(
|
||||
data=d["data"],
|
||||
media_type=d.get("mediaType", "application/json"),
|
||||
metadata=d.get("metadata", {}),
|
||||
)
|
||||
raise ValueError(f"Cannot determine Part type from keys: {list(d.keys())}")
|
||||
|
||||
|
||||
def part_to_dict(p: Part) -> dict:
|
||||
"""Serialize a Part to its JSON dict."""
|
||||
return p.to_dict()
|
||||
|
||||
|
||||
# --- Message ---
|
||||
|
||||
@dataclass
|
||||
class Message:
|
||||
"""A2A Message — a turn in a conversation between user and agent."""
|
||||
role: Role
|
||||
parts: list[Part]
|
||||
message_id: str = field(default_factory=lambda: str(uuid.uuid4()))
|
||||
context_id: Optional[str] = None
|
||||
task_id: Optional[str] = None
|
||||
metadata: dict = field(default_factory=dict)
|
||||
extensions: list[str] = field(default_factory=list)
|
||||
reference_task_ids: list[str] = field(default_factory=list)
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
d: dict[str, Any] = {
|
||||
"messageId": self.message_id,
|
||||
"role": self.role.value,
|
||||
"parts": [part_to_dict(p) for p in self.parts],
|
||||
}
|
||||
if self.context_id:
|
||||
d["contextId"] = self.context_id
|
||||
if self.task_id:
|
||||
d["taskId"] = self.task_id
|
||||
if self.metadata:
|
||||
d["metadata"] = self.metadata
|
||||
if self.extensions:
|
||||
d["extensions"] = self.extensions
|
||||
if self.reference_task_ids:
|
||||
d["referenceTaskIds"] = self.reference_task_ids
|
||||
return d
|
||||
|
||||
@classmethod
|
||||
def from_dict(cls, d: dict) -> "Message":
|
||||
return cls(
|
||||
role=Role(d["role"]),
|
||||
parts=[part_from_dict(p) for p in d["parts"]],
|
||||
message_id=d.get("messageId", str(uuid.uuid4())),
|
||||
context_id=d.get("contextId"),
|
||||
task_id=d.get("taskId"),
|
||||
metadata=d.get("metadata", {}),
|
||||
extensions=d.get("extensions", []),
|
||||
reference_task_ids=d.get("referenceTaskIds", []),
|
||||
)
|
||||
|
||||
|
||||
# --- Artifact ---
|
||||
|
||||
@dataclass
|
||||
class Artifact:
|
||||
"""A2A Artifact — structured output from a task."""
|
||||
parts: list[Part]
|
||||
artifact_id: str = field(default_factory=lambda: str(uuid.uuid4()))
|
||||
name: Optional[str] = None
|
||||
description: Optional[str] = None
|
||||
metadata: dict = field(default_factory=dict)
|
||||
extensions: list[str] = field(default_factory=list)
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
d: dict[str, Any] = {
|
||||
"artifactId": self.artifact_id,
|
||||
"parts": [part_to_dict(p) for p in self.parts],
|
||||
}
|
||||
if self.name:
|
||||
d["name"] = self.name
|
||||
if self.description:
|
||||
d["description"] = self.description
|
||||
if self.metadata:
|
||||
d["metadata"] = self.metadata
|
||||
if self.extensions:
|
||||
d["extensions"] = self.extensions
|
||||
return d
|
||||
|
||||
@classmethod
|
||||
def from_dict(cls, d: dict) -> "Artifact":
|
||||
return cls(
|
||||
parts=[part_from_dict(p) for p in d["parts"]],
|
||||
artifact_id=d.get("artifactId", str(uuid.uuid4())),
|
||||
name=d.get("name"),
|
||||
description=d.get("description"),
|
||||
metadata=d.get("metadata", {}),
|
||||
extensions=d.get("extensions", []),
|
||||
)
|
||||
|
||||
|
||||
# --- Task ---
|
||||
|
||||
@dataclass
|
||||
class TaskStatus:
|
||||
"""Status envelope for a Task."""
|
||||
state: TaskState
|
||||
message: Optional[Message] = None
|
||||
timestamp: str = field(
|
||||
default_factory=lambda: datetime.now(timezone.utc).isoformat()
|
||||
)
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
d: dict[str, Any] = {"state": self.state.value}
|
||||
if self.message:
|
||||
d["message"] = self.message.to_dict()
|
||||
d["timestamp"] = self.timestamp
|
||||
return d
|
||||
|
||||
@classmethod
|
||||
def from_dict(cls, d: dict) -> "TaskStatus":
|
||||
msg = None
|
||||
if "message" in d:
|
||||
msg = Message.from_dict(d["message"])
|
||||
return cls(
|
||||
state=TaskState(d["state"]),
|
||||
message=msg,
|
||||
timestamp=d.get("timestamp", datetime.now(timezone.utc).isoformat()),
|
||||
)
|
||||
|
||||
|
||||
@dataclass
|
||||
class Task:
|
||||
"""A2A Task — a unit of work delegated between agents."""
|
||||
id: str = field(default_factory=lambda: str(uuid.uuid4()))
|
||||
context_id: Optional[str] = None
|
||||
status: TaskStatus = field(
|
||||
default_factory=lambda: TaskStatus(state=TaskState.SUBMITTED)
|
||||
)
|
||||
artifacts: list[Artifact] = field(default_factory=list)
|
||||
history: list[Message] = field(default_factory=list)
|
||||
metadata: dict = field(default_factory=dict)
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
d: dict[str, Any] = {
|
||||
"id": self.id,
|
||||
"status": self.status.to_dict(),
|
||||
}
|
||||
if self.context_id:
|
||||
d["contextId"] = self.context_id
|
||||
if self.artifacts:
|
||||
d["artifacts"] = [a.to_dict() for a in self.artifacts]
|
||||
if self.history:
|
||||
d["history"] = [m.to_dict() for m in self.history]
|
||||
if self.metadata:
|
||||
d["metadata"] = self.metadata
|
||||
return d
|
||||
|
||||
@classmethod
|
||||
def from_dict(cls, d: dict) -> "Task":
|
||||
return cls(
|
||||
id=d.get("id", str(uuid.uuid4())),
|
||||
context_id=d.get("contextId"),
|
||||
status=TaskStatus.from_dict(d["status"]) if "status" in d else TaskStatus(TaskState.SUBMITTED),
|
||||
artifacts=[Artifact.from_dict(a) for a in d.get("artifacts", [])],
|
||||
history=[Message.from_dict(m) for m in d.get("history", [])],
|
||||
metadata=d.get("metadata", {}),
|
||||
)
|
||||
|
||||
|
||||
# --- Agent Card ---
|
||||
|
||||
@dataclass
|
||||
class AgentSkill:
|
||||
"""Capability declaration for an Agent Card."""
|
||||
id: str
|
||||
name: str
|
||||
description: str
|
||||
tags: list[str] = field(default_factory=list)
|
||||
examples: list[str] = field(default_factory=list)
|
||||
input_modes: list[str] = field(default_factory=lambda: ["text/plain"])
|
||||
output_modes: list[str] = field(default_factory=lambda: ["text/plain"])
|
||||
security_requirements: list[dict] = field(default_factory=list)
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
d: dict[str, Any] = {
|
||||
"id": self.id,
|
||||
"name": self.name,
|
||||
"description": self.description,
|
||||
"tags": self.tags,
|
||||
}
|
||||
if self.examples:
|
||||
d["examples"] = self.examples
|
||||
if self.input_modes != ["text/plain"]:
|
||||
d["inputModes"] = self.input_modes
|
||||
if self.output_modes != ["text/plain"]:
|
||||
d["outputModes"] = self.output_modes
|
||||
if self.security_requirements:
|
||||
d["securityRequirements"] = self.security_requirements
|
||||
return d
|
||||
|
||||
|
||||
@dataclass
|
||||
class AgentInterface:
|
||||
"""Network endpoint for an agent."""
|
||||
url: str
|
||||
protocol_binding: str = "HTTP+JSON"
|
||||
protocol_version: str = "1.0"
|
||||
tenant: str = ""
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
d = {
|
||||
"url": self.url,
|
||||
"protocolBinding": self.protocol_binding,
|
||||
"protocolVersion": self.protocol_version,
|
||||
}
|
||||
if self.tenant:
|
||||
d["tenant"] = self.tenant
|
||||
return d
|
||||
|
||||
|
||||
@dataclass
|
||||
class AgentCapabilities:
|
||||
"""What this agent can do beyond basic request/response."""
|
||||
streaming: bool = False
|
||||
push_notifications: bool = False
|
||||
extended_agent_card: bool = False
|
||||
extensions: list[dict] = field(default_factory=list)
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
return {
|
||||
"streaming": self.streaming,
|
||||
"pushNotifications": self.push_notifications,
|
||||
"extendedAgentCard": self.extended_agent_card,
|
||||
"extensions": self.extensions,
|
||||
}
|
||||
|
||||
|
||||
@dataclass
|
||||
class AgentCard:
|
||||
"""
|
||||
A2A Agent Card — self-describing metadata published at
|
||||
/.well-known/agent-card.json
|
||||
"""
|
||||
name: str
|
||||
description: str
|
||||
version: str = "1.0.0"
|
||||
supported_interfaces: list[AgentInterface] = field(default_factory=list)
|
||||
capabilities: AgentCapabilities = field(
|
||||
default_factory=AgentCapabilities
|
||||
)
|
||||
provider: Optional[dict] = None
|
||||
documentation_url: Optional[str] = None
|
||||
icon_url: Optional[str] = None
|
||||
default_input_modes: list[str] = field(
|
||||
default_factory=lambda: ["text/plain"]
|
||||
)
|
||||
default_output_modes: list[str] = field(
|
||||
default_factory=lambda: ["text/plain"]
|
||||
)
|
||||
skills: list[AgentSkill] = field(default_factory=list)
|
||||
security_schemes: dict = field(default_factory=dict)
|
||||
security_requirements: list[dict] = field(default_factory=list)
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
d: dict[str, Any] = {
|
||||
"name": self.name,
|
||||
"description": self.description,
|
||||
"version": self.version,
|
||||
"supportedInterfaces": [i.to_dict() for i in self.supported_interfaces],
|
||||
"capabilities": self.capabilities.to_dict(),
|
||||
"defaultInputModes": self.default_input_modes,
|
||||
"defaultOutputModes": self.default_output_modes,
|
||||
"skills": [s.to_dict() for s in self.skills],
|
||||
}
|
||||
if self.provider:
|
||||
d["provider"] = self.provider
|
||||
if self.documentation_url:
|
||||
d["documentationUrl"] = self.documentation_url
|
||||
if self.icon_url:
|
||||
d["iconUrl"] = self.icon_url
|
||||
if self.security_schemes:
|
||||
d["securitySchemes"] = self.security_schemes
|
||||
if self.security_requirements:
|
||||
d["securityRequirements"] = self.security_requirements
|
||||
return d
|
||||
|
||||
@classmethod
|
||||
def from_dict(cls, d: dict) -> "AgentCard":
|
||||
return cls(
|
||||
name=d["name"],
|
||||
description=d["description"],
|
||||
version=d.get("version", "1.0.0"),
|
||||
supported_interfaces=[
|
||||
AgentInterface(
|
||||
url=i["url"],
|
||||
protocol_binding=i.get("protocolBinding", "HTTP+JSON"),
|
||||
protocol_version=i.get("protocolVersion", "1.0"),
|
||||
tenant=i.get("tenant", ""),
|
||||
)
|
||||
for i in d.get("supportedInterfaces", [])
|
||||
],
|
||||
capabilities=AgentCapabilities(
|
||||
streaming=d.get("capabilities", {}).get("streaming", False),
|
||||
push_notifications=d.get("capabilities", {}).get("pushNotifications", False),
|
||||
extended_agent_card=d.get("capabilities", {}).get("extendedAgentCard", False),
|
||||
extensions=d.get("capabilities", {}).get("extensions", []),
|
||||
),
|
||||
provider=d.get("provider"),
|
||||
documentation_url=d.get("documentationUrl"),
|
||||
icon_url=d.get("iconUrl"),
|
||||
default_input_modes=d.get("defaultInputModes", ["text/plain"]),
|
||||
default_output_modes=d.get("defaultOutputModes", ["text/plain"]),
|
||||
skills=[
|
||||
AgentSkill(
|
||||
id=s["id"],
|
||||
name=s["name"],
|
||||
description=s["description"],
|
||||
tags=s.get("tags", []),
|
||||
examples=s.get("examples", []),
|
||||
input_modes=s.get("inputModes", ["text/plain"]),
|
||||
output_modes=s.get("outputModes", ["text/plain"]),
|
||||
security_requirements=s.get("securityRequirements", []),
|
||||
)
|
||||
for s in d.get("skills", [])
|
||||
],
|
||||
security_schemes=d.get("securitySchemes", {}),
|
||||
security_requirements=d.get("securityRequirements", []),
|
||||
)
|
||||
|
||||
|
||||
# --- JSON-RPC envelope ---
|
||||
|
||||
@dataclass
|
||||
class JSONRPCRequest:
|
||||
"""JSON-RPC 2.0 request wrapping an A2A method."""
|
||||
method: str
|
||||
id: str = field(default_factory=lambda: str(uuid.uuid4()))
|
||||
params: dict = field(default_factory=dict)
|
||||
jsonrpc: str = "2.0"
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
return {
|
||||
"jsonrpc": self.jsonrpc,
|
||||
"id": self.id,
|
||||
"method": self.method,
|
||||
"params": self.params,
|
||||
}
|
||||
|
||||
|
||||
@dataclass
|
||||
class JSONRPCError:
|
||||
"""JSON-RPC 2.0 error object."""
|
||||
code: int
|
||||
message: str
|
||||
data: Any = None
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
d = {"code": self.code, "message": self.message}
|
||||
if self.data is not None:
|
||||
d["data"] = self.data
|
||||
return d
|
||||
|
||||
|
||||
@dataclass
|
||||
class JSONRPCResponse:
|
||||
"""JSON-RPC 2.0 response."""
|
||||
id: str
|
||||
result: Any = None
|
||||
error: Optional[JSONRPCError] = None
|
||||
jsonrpc: str = "2.0"
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
d: dict[str, Any] = {
|
||||
"jsonrpc": self.jsonrpc,
|
||||
"id": self.id,
|
||||
}
|
||||
if self.error:
|
||||
d["error"] = self.error.to_dict()
|
||||
else:
|
||||
d["result"] = self.result
|
||||
return d
|
||||
|
||||
|
||||
# --- Standard A2A Error codes ---
|
||||
|
||||
class A2AError:
|
||||
"""Standard A2A / JSON-RPC error factories."""
|
||||
PARSE = JSONRPCError(-32700, "Invalid JSON payload")
|
||||
INVALID_REQUEST = JSONRPCError(-32600, "Request payload validation error")
|
||||
METHOD_NOT_FOUND = JSONRPCError(-32601, "Method not found")
|
||||
INVALID_PARAMS = JSONRPCError(-32602, "Invalid parameters")
|
||||
INTERNAL = JSONRPCError(-32603, "Internal error")
|
||||
|
||||
TASK_NOT_FOUND = JSONRPCError(-32001, "Task not found")
|
||||
TASK_NOT_CANCELABLE = JSONRPCError(-32002, "Task not cancelable")
|
||||
PUSH_NOT_SUPPORTED = JSONRPCError(-32003, "Push notifications not supported")
|
||||
UNSUPPORTED_OP = JSONRPCError(-32004, "Unsupported operation")
|
||||
CONTENT_TYPE = JSONRPCError(-32005, "Content type not supported")
|
||||
INVALID_RESPONSE = JSONRPCError(-32006, "Invalid agent response")
|
||||
EXTENDED_CARD = JSONRPCError(-32007, "Extended agent card not configured")
|
||||
EXTENSION_REQUIRED = JSONRPCError(-32008, "Extension support required")
|
||||
VERSION_NOT_SUPPORTED = JSONRPCError(-32009, "Version not supported")
|
||||
451
nexus/components/reasoning-trace.js
Normal file
451
nexus/components/reasoning-trace.js
Normal file
@@ -0,0 +1,451 @@
|
||||
// ═══════════════════════════════════════════════════
|
||||
// REASONING TRACE HUD COMPONENT
|
||||
// ═══════════════════════════════════════════════════
|
||||
//
|
||||
// Displays a real-time trace of the agent's reasoning
|
||||
// steps during complex task execution. Shows the chain
|
||||
// of thought, decision points, and confidence levels.
|
||||
//
|
||||
// Usage:
|
||||
// ReasoningTrace.init();
|
||||
// ReasoningTrace.addStep(step);
|
||||
// ReasoningTrace.clear();
|
||||
// ReasoningTrace.toggle();
|
||||
// ═══════════════════════════════════════════════════
|
||||
|
||||
const ReasoningTrace = (() => {
|
||||
// ── State ─────────────────────────────────────────
|
||||
let _container = null;
|
||||
let _content = null;
|
||||
let _header = null;
|
||||
let _steps = [];
|
||||
let _maxSteps = 20;
|
||||
let _isVisible = true;
|
||||
let _currentTask = null;
|
||||
let _stepCounter = 0;
|
||||
|
||||
// ── Config ────────────────────────────────────────
|
||||
const STEP_TYPES = {
|
||||
THINK: { icon: '💭', color: '#4af0c0', label: 'THINK' },
|
||||
DECIDE: { icon: '⚖️', color: '#ffd700', label: 'DECIDE' },
|
||||
RECALL: { icon: '🔍', color: '#7b5cff', label: 'RECALL' },
|
||||
PLAN: { icon: '📋', color: '#ff8c42', label: 'PLAN' },
|
||||
EXECUTE: { icon: '⚡', color: '#ff4466', label: 'EXECUTE' },
|
||||
VERIFY: { icon: '✅', color: '#4af0c0', label: 'VERIFY' },
|
||||
DOUBT: { icon: '❓', color: '#ff8c42', label: 'DOUBT' },
|
||||
MEMORY: { icon: '💾', color: '#7b5cff', label: 'MEMORY' }
|
||||
};
|
||||
|
||||
// ── Helpers ───────────────────────────────────────
|
||||
|
||||
function _escapeHtml(s) {
|
||||
return String(s)
|
||||
.replace(/&/g, '&')
|
||||
.replace(/</g, '<')
|
||||
.replace(/>/g, '>')
|
||||
.replace(/"/g, '"')
|
||||
.replace(/'/g, ''');
|
||||
}
|
||||
|
||||
function _formatTimestamp(timestamp) {
|
||||
const date = new Date(timestamp);
|
||||
return date.toLocaleTimeString('en-US', {
|
||||
hour12: false,
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
second: '2-digit'
|
||||
});
|
||||
}
|
||||
|
||||
function _getConfidenceBar(confidence) {
|
||||
if (confidence === undefined || confidence === null) return '';
|
||||
const percent = Math.max(0, Math.min(100, Math.round(confidence * 100)));
|
||||
const bars = Math.round(percent / 10);
|
||||
const filled = '█'.repeat(bars);
|
||||
const empty = '░'.repeat(10 - bars);
|
||||
return `<span class="confidence-bar" title="${percent}% confidence">${filled}${empty}</span>`;
|
||||
}
|
||||
|
||||
// ── DOM Setup ─────────────────────────────────────
|
||||
|
||||
function _createDOM() {
|
||||
// Create container if it doesn't exist
|
||||
if (_container) return;
|
||||
|
||||
_container = document.createElement('div');
|
||||
_container.id = 'reasoning-trace';
|
||||
_container.className = 'hud-panel reasoning-trace';
|
||||
|
||||
_header = document.createElement('div');
|
||||
_header.className = 'panel-header';
|
||||
_header.innerHTML = `<span class="trace-icon">🧠</span> REASONING TRACE`;
|
||||
|
||||
// Task indicator
|
||||
const taskIndicator = document.createElement('div');
|
||||
taskIndicator.className = 'trace-task';
|
||||
taskIndicator.id = 'trace-task';
|
||||
taskIndicator.textContent = 'No active task';
|
||||
|
||||
// Step counter
|
||||
const stepCounter = document.createElement('div');
|
||||
stepCounter.className = 'trace-counter';
|
||||
stepCounter.id = 'trace-counter';
|
||||
stepCounter.textContent = '0 steps';
|
||||
|
||||
// Controls
|
||||
const controls = document.createElement('div');
|
||||
controls.className = 'trace-controls';
|
||||
controls.innerHTML = `
|
||||
<button class="trace-btn" id="trace-clear" title="Clear trace">🗑️</button>
|
||||
<button class="trace-btn" id="trace-toggle" title="Toggle visibility">👁️</button>
|
||||
<button class="trace-btn" id="trace-export" title="Export trace">📤</button>
|
||||
`;
|
||||
|
||||
// Header container
|
||||
const headerContainer = document.createElement('div');
|
||||
headerContainer.className = 'trace-header-container';
|
||||
headerContainer.appendChild(_header);
|
||||
headerContainer.appendChild(controls);
|
||||
|
||||
// Content area
|
||||
_content = document.createElement('div');
|
||||
_content.className = 'panel-content trace-content';
|
||||
_content.id = 'reasoning-trace-content';
|
||||
|
||||
// Assemble
|
||||
_container.appendChild(headerContainer);
|
||||
_container.appendChild(taskIndicator);
|
||||
_container.appendChild(stepCounter);
|
||||
_container.appendChild(_content);
|
||||
|
||||
// Add to HUD
|
||||
const hud = document.getElementById('hud');
|
||||
if (hud) {
|
||||
const gofaiHud = hud.querySelector('.gofai-hud');
|
||||
if (gofaiHud) {
|
||||
gofaiHud.appendChild(_container);
|
||||
} else {
|
||||
hud.appendChild(_container);
|
||||
}
|
||||
}
|
||||
|
||||
// Add event listeners
|
||||
document.getElementById('trace-clear')?.addEventListener('click', clear);
|
||||
document.getElementById('trace-toggle')?.addEventListener('click', toggle);
|
||||
document.getElementById('trace-export')?.addEventListener('click', exportTrace);
|
||||
}
|
||||
|
||||
// ── Rendering ─────────────────────────────────────
|
||||
|
||||
function _renderStep(step, index) {
|
||||
const typeConfig = STEP_TYPES[step.type] || STEP_TYPES.THINK;
|
||||
const timestamp = _formatTimestamp(step.timestamp);
|
||||
const confidence = _getConfidenceBar(step.confidence);
|
||||
|
||||
const stepEl = document.createElement('div');
|
||||
stepEl.className = `trace-step trace-step-${step.type.toLowerCase()}`;
|
||||
stepEl.dataset.stepId = step.id;
|
||||
|
||||
// Step header
|
||||
const header = document.createElement('div');
|
||||
header.className = 'trace-step-header';
|
||||
header.innerHTML = `
|
||||
<span class="step-icon">${typeConfig.icon}</span>
|
||||
<span class="step-type" style="color: ${typeConfig.color}">${typeConfig.label}</span>
|
||||
<span class="step-time">${timestamp}</span>
|
||||
${confidence}
|
||||
`;
|
||||
|
||||
// Step content
|
||||
const content = document.createElement('div');
|
||||
content.className = 'trace-step-content';
|
||||
|
||||
if (step.thought) {
|
||||
const thought = document.createElement('div');
|
||||
thought.className = 'step-thought';
|
||||
thought.textContent = step.thought;
|
||||
content.appendChild(thought);
|
||||
}
|
||||
|
||||
if (step.reasoning) {
|
||||
const reasoning = document.createElement('div');
|
||||
reasoning.className = 'step-reasoning';
|
||||
reasoning.textContent = step.reasoning;
|
||||
content.appendChild(reasoning);
|
||||
}
|
||||
|
||||
if (step.decision) {
|
||||
const decision = document.createElement('div');
|
||||
decision.className = 'step-decision';
|
||||
decision.innerHTML = `<strong>Decision:</strong> ${_escapeHtml(step.decision)}`;
|
||||
content.appendChild(decision);
|
||||
}
|
||||
|
||||
if (step.alternatives && step.alternatives.length > 0) {
|
||||
const alternatives = document.createElement('div');
|
||||
alternatives.className = 'step-alternatives';
|
||||
alternatives.innerHTML = `<strong>Alternatives:</strong> ${step.alternatives.map(a => _escapeHtml(a)).join(', ')}`;
|
||||
content.appendChild(alternatives);
|
||||
}
|
||||
|
||||
if (step.source) {
|
||||
const source = document.createElement('div');
|
||||
source.className = 'step-source';
|
||||
source.innerHTML = `<strong>Source:</strong> ${_escapeHtml(step.source)}`;
|
||||
content.appendChild(source);
|
||||
}
|
||||
|
||||
stepEl.appendChild(header);
|
||||
stepEl.appendChild(content);
|
||||
|
||||
return stepEl;
|
||||
}
|
||||
|
||||
function _render() {
|
||||
if (!_content) return;
|
||||
|
||||
// Clear content
|
||||
_content.innerHTML = '';
|
||||
|
||||
// Update task indicator
|
||||
const taskEl = document.getElementById('trace-task');
|
||||
if (taskEl) {
|
||||
taskEl.textContent = _currentTask || 'No active task';
|
||||
taskEl.className = _currentTask ? 'trace-task active' : 'trace-task';
|
||||
}
|
||||
|
||||
// Update step counter
|
||||
const counterEl = document.getElementById('trace-counter');
|
||||
if (counterEl) {
|
||||
counterEl.textContent = `${_steps.length} step${_steps.length !== 1 ? 's' : ''}`;
|
||||
}
|
||||
|
||||
// Render steps (newest first)
|
||||
const sortedSteps = [..._steps].sort((a, b) => b.timestamp - a.timestamp);
|
||||
|
||||
for (let i = 0; i < sortedSteps.length; i++) {
|
||||
const stepEl = _renderStep(sortedSteps[i], i);
|
||||
_content.appendChild(stepEl);
|
||||
|
||||
// Add separator between steps
|
||||
if (i < sortedSteps.length - 1) {
|
||||
const separator = document.createElement('div');
|
||||
separator.className = 'trace-separator';
|
||||
_content.appendChild(separator);
|
||||
}
|
||||
}
|
||||
|
||||
// Show empty state if no steps
|
||||
if (_steps.length === 0) {
|
||||
const empty = document.createElement('div');
|
||||
empty.className = 'trace-empty';
|
||||
empty.innerHTML = `
|
||||
<span class="empty-icon">💭</span>
|
||||
<span class="empty-text">No reasoning steps yet</span>
|
||||
<span class="empty-hint">Start a task to see the trace</span>
|
||||
`;
|
||||
_content.appendChild(empty);
|
||||
}
|
||||
}
|
||||
|
||||
// ── Public API ────────────────────────────────────
|
||||
|
||||
function init() {
|
||||
_createDOM();
|
||||
_render();
|
||||
console.info('[ReasoningTrace] Initialized');
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a reasoning step to the trace.
|
||||
* @param {Object} step - The reasoning step
|
||||
* @param {string} step.type - Step type (THINK, DECIDE, RECALL, PLAN, EXECUTE, VERIFY, DOUBT, MEMORY)
|
||||
* @param {string} step.thought - The main thought/content
|
||||
* @param {string} [step.reasoning] - Detailed reasoning
|
||||
* @param {string} [step.decision] - Decision made
|
||||
* @param {string[]} [step.alternatives] - Alternative options considered
|
||||
* @param {string} [step.source] - Source of information
|
||||
* @param {number} [step.confidence] - Confidence level (0-1)
|
||||
* @param {string} [step.taskId] - Associated task ID
|
||||
*/
|
||||
function addStep(step) {
|
||||
if (!step || !step.thought) return;
|
||||
|
||||
// Generate unique ID
|
||||
const id = `step-${++_stepCounter}-${Date.now()}`;
|
||||
|
||||
// Create step object
|
||||
const newStep = {
|
||||
id,
|
||||
timestamp: Date.now(),
|
||||
type: step.type || 'THINK',
|
||||
thought: step.thought,
|
||||
reasoning: step.reasoning || null,
|
||||
decision: step.decision || null,
|
||||
alternatives: step.alternatives || null,
|
||||
source: step.source || null,
|
||||
confidence: step.confidence !== undefined ? Math.max(0, Math.min(1, step.confidence)) : null,
|
||||
taskId: step.taskId || _currentTask
|
||||
};
|
||||
|
||||
// Add to steps array
|
||||
_steps.unshift(newStep);
|
||||
|
||||
// Limit number of steps
|
||||
if (_steps.length > _maxSteps) {
|
||||
_steps = _steps.slice(0, _maxSteps);
|
||||
}
|
||||
|
||||
// Update task if provided
|
||||
if (step.taskId && step.taskId !== _currentTask) {
|
||||
setTask(step.taskId);
|
||||
}
|
||||
|
||||
// Re-render
|
||||
_render();
|
||||
|
||||
// Log to console for debugging
|
||||
console.debug(`[ReasoningTrace] ${newStep.type}: ${newStep.thought}`);
|
||||
|
||||
return newStep.id;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the current task being traced.
|
||||
* @param {string} taskId - Task identifier
|
||||
*/
|
||||
function setTask(taskId) {
|
||||
_currentTask = taskId;
|
||||
_render();
|
||||
console.info(`[ReasoningTrace] Task set: ${taskId}`);
|
||||
}
|
||||
|
||||
/**
|
||||
* Clear all steps from the trace.
|
||||
*/
|
||||
function clear() {
|
||||
_steps = [];
|
||||
_stepCounter = 0;
|
||||
_render();
|
||||
console.info('[ReasoningTrace] Cleared');
|
||||
}
|
||||
|
||||
/**
|
||||
* Toggle the visibility of the trace panel.
|
||||
*/
|
||||
function toggle() {
|
||||
_isVisible = !_isVisible;
|
||||
if (_container) {
|
||||
_container.style.display = _isVisible ? 'block' : 'none';
|
||||
}
|
||||
console.info(`[ReasoningTrace] Visibility: ${_isVisible ? 'shown' : 'hidden'}`);
|
||||
}
|
||||
|
||||
/**
|
||||
* Export the trace as JSON.
|
||||
* @returns {string} JSON string of the trace
|
||||
*/
|
||||
function exportTrace() {
|
||||
const exportData = {
|
||||
task: _currentTask,
|
||||
exportedAt: new Date().toISOString(),
|
||||
steps: _steps.map(step => ({
|
||||
type: step.type,
|
||||
thought: step.thought,
|
||||
reasoning: step.reasoning,
|
||||
decision: step.decision,
|
||||
alternatives: step.alternatives,
|
||||
source: step.source,
|
||||
confidence: step.confidence,
|
||||
timestamp: new Date(step.timestamp).toISOString()
|
||||
}))
|
||||
};
|
||||
|
||||
const json = JSON.stringify(exportData, null, 2);
|
||||
|
||||
// Copy to clipboard
|
||||
navigator.clipboard.writeText(json).then(() => {
|
||||
console.info('[ReasoningTrace] Copied to clipboard');
|
||||
// Show feedback
|
||||
const btn = document.getElementById('trace-export');
|
||||
if (btn) {
|
||||
const original = btn.innerHTML;
|
||||
btn.innerHTML = '✅';
|
||||
setTimeout(() => { btn.innerHTML = original; }, 1000);
|
||||
}
|
||||
}).catch(err => {
|
||||
console.error('[ReasoningTrace] Failed to copy:', err);
|
||||
});
|
||||
|
||||
return json;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the current trace data.
|
||||
* @returns {Object} Current trace state
|
||||
*/
|
||||
function getTrace() {
|
||||
return {
|
||||
task: _currentTask,
|
||||
steps: [..._steps],
|
||||
stepCount: _steps.length,
|
||||
isVisible: _isVisible
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Get steps filtered by type.
|
||||
* @param {string} type - Step type to filter by
|
||||
* @returns {Array} Filtered steps
|
||||
*/
|
||||
function getStepsByType(type) {
|
||||
return _steps.filter(step => step.type === type);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get steps for a specific task.
|
||||
* @param {string} taskId - Task ID to filter by
|
||||
* @returns {Array} Filtered steps
|
||||
*/
|
||||
function getStepsByTask(taskId) {
|
||||
return _steps.filter(step => step.taskId === taskId);
|
||||
}
|
||||
|
||||
/**
|
||||
* Mark the current task as complete.
|
||||
* @param {string} [result] - Optional result description
|
||||
*/
|
||||
function completeTask(result) {
|
||||
if (_currentTask) {
|
||||
addStep({
|
||||
type: 'VERIFY',
|
||||
thought: `Task completed: ${result || 'Success'}`,
|
||||
taskId: _currentTask
|
||||
});
|
||||
|
||||
// Clear current task after a delay
|
||||
setTimeout(() => {
|
||||
_currentTask = null;
|
||||
_render();
|
||||
}, 2000);
|
||||
}
|
||||
}
|
||||
|
||||
// ── Return Public API ─────────────────────────────
|
||||
|
||||
return {
|
||||
init,
|
||||
addStep,
|
||||
setTask,
|
||||
clear,
|
||||
toggle,
|
||||
exportTrace,
|
||||
getTrace,
|
||||
getStepsByType,
|
||||
getStepsByTask,
|
||||
completeTask,
|
||||
STEP_TYPES
|
||||
};
|
||||
})();
|
||||
|
||||
export { ReasoningTrace };
|
||||
73
nexus/llama_provider.py
Normal file
73
nexus/llama_provider.py
Normal file
@@ -0,0 +1,73 @@
|
||||
"""llama_provider.py — Hermes inference router provider for llama.cpp."""
|
||||
import logging, os, time
|
||||
from dataclasses import dataclass
|
||||
from typing import Optional
|
||||
from bin.llama_client import ChatMessage, LlamaClient
|
||||
|
||||
logger = logging.getLogger("nexus.llama_provider")
|
||||
|
||||
LLAMA_ENDPOINT = os.environ.get("LLAMA_ENDPOINT", "http://localhost:11435")
|
||||
LLAMA_MODEL = os.environ.get("LLAMA_MODEL", "qwen2.5-7b")
|
||||
LOCAL_ONLY = os.environ.get("LOCAL_ONLY", "false").lower() in ("true", "1", "yes")
|
||||
FALLBACK_ON_FAILURE = os.environ.get("LLAMA_FALLBACK", "true").lower() in ("true", "1", "yes")
|
||||
|
||||
@dataclass
|
||||
class ProviderResult:
|
||||
text: str
|
||||
provider: str = "llama.cpp"
|
||||
model: str = ""
|
||||
tokens_used: int = 0
|
||||
latency_ms: float = 0.0
|
||||
finish_reason: str = ""
|
||||
is_local: bool = True
|
||||
error: Optional[str] = None
|
||||
|
||||
class LlamaProvider:
|
||||
def __init__(self, endpoint=LLAMA_ENDPOINT, model=LLAMA_MODEL, local_only=LOCAL_ONLY):
|
||||
self.client = LlamaClient(endpoint=endpoint, model=model)
|
||||
self.local_only = local_only
|
||||
self.endpoint = endpoint
|
||||
self._last_health = None
|
||||
self._last_check = 0.0
|
||||
|
||||
def available(self):
|
||||
now = time.time()
|
||||
if self._last_health is not None and (now - self._last_check) < 30:
|
||||
return self._last_health
|
||||
status = self.client.health_check()
|
||||
self._last_health = status.healthy and status.model_loaded
|
||||
self._last_check = now
|
||||
if not self._last_health:
|
||||
logger.warning("llama.cpp unhealthy: %s", status.error or "model not loaded")
|
||||
return self._last_health
|
||||
|
||||
def infer(self, messages, max_tokens=512, temperature=0.7, model=None, **kwargs):
|
||||
if not self.available():
|
||||
return ProviderResult(text="", error=f"llama.cpp at {self.endpoint} unavailable")
|
||||
chat_msgs = [ChatMessage(m["role"], m["content"]) for m in messages if "role" in m and "content" in m]
|
||||
if not chat_msgs:
|
||||
return ProviderResult(text="", error="No valid messages")
|
||||
start = time.time()
|
||||
try:
|
||||
resp = self.client.chat(chat_msgs, max_tokens=max_tokens, temperature=temperature)
|
||||
return ProviderResult(text=resp.text, provider="llama.cpp",
|
||||
model=resp.model or self.client.model, tokens_used=resp.tokens_used,
|
||||
latency_ms=(time.time()-start)*1000, finish_reason=resp.finish_reason, is_local=True)
|
||||
except Exception as e:
|
||||
logger.error("llama.cpp failed: %s", e)
|
||||
return ProviderResult(text="", error=str(e))
|
||||
|
||||
def should_use_local(self, external_failed=False, explicit_local=False):
|
||||
if self.local_only: return True
|
||||
if explicit_local: return True
|
||||
if external_failed and FALLBACK_ON_FAILURE: return self.available()
|
||||
return False
|
||||
|
||||
def status(self):
|
||||
h = self.client.health_check()
|
||||
return {"provider": "llama.cpp", "endpoint": self.endpoint,
|
||||
"healthy": h.healthy, "model_loaded": h.model_loaded,
|
||||
"model_name": h.model_name, "local_only": self.local_only}
|
||||
|
||||
def get_name(self): return "llama.cpp"
|
||||
def get_priority(self): return 0 if self.local_only else 100
|
||||
@@ -1,286 +0,0 @@
|
||||
/**
|
||||
* ═══════════════════════════════════════════
|
||||
* NEXUS LOD SYSTEM — Level of Detail Management
|
||||
* ═══════════════════════════════════════════
|
||||
*
|
||||
* Provides automatic LOD switching based on distance from camera.
|
||||
* Optimizes performance for local hardware.
|
||||
*/
|
||||
|
||||
import * as THREE from 'three';
|
||||
|
||||
export class LODManager {
|
||||
constructor(camera, scene) {
|
||||
this.camera = camera;
|
||||
this.scene = scene;
|
||||
this.lodObjects = new Map(); // object UUID → { levels[], currentLevel }
|
||||
this.updateInterval = 0.5; // seconds between LOD updates
|
||||
this.lastUpdate = 0;
|
||||
this.distanceThresholds = {
|
||||
high: 15, // High detail within 15 units
|
||||
medium: 30, // Medium detail within 30 units
|
||||
low: 50, // Low detail within 50 units
|
||||
cull: 100, // Cull beyond 100 units
|
||||
};
|
||||
this.stats = {
|
||||
totalObjects: 0,
|
||||
highDetail: 0,
|
||||
mediumDetail: 0,
|
||||
lowDetail: 0,
|
||||
culled: 0,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Register an object for LOD management
|
||||
* @param {THREE.Object3D} object - The object to manage
|
||||
* @param {Object} lodLevels - LOD level configurations
|
||||
* lodLevels = {
|
||||
* high: { geometry: THREE.BufferGeometry, material: THREE.Material },
|
||||
* medium: { geometry: THREE.BufferGeometry, material: THREE.Material },
|
||||
* low: { geometry: THREE.BufferGeometry, material: THREE.Material },
|
||||
* }
|
||||
*/
|
||||
registerObject(object, lodLevels) {
|
||||
const uuid = object.uuid;
|
||||
|
||||
// Store original object data
|
||||
const original = {
|
||||
geometry: object.geometry,
|
||||
material: object.material,
|
||||
position: object.position.clone(),
|
||||
rotation: object.rotation.clone(),
|
||||
scale: object.scale.clone(),
|
||||
};
|
||||
|
||||
// Create LOD meshes
|
||||
const levels = {};
|
||||
for (const [levelName, config] of Object.entries(lodLevels)) {
|
||||
const mesh = new THREE.Mesh(config.geometry, config.material);
|
||||
mesh.position.copy(original.position);
|
||||
mesh.rotation.copy(original.rotation);
|
||||
mesh.scale.copy(original.scale);
|
||||
mesh.visible = false;
|
||||
mesh.userData.lodLevel = levelName;
|
||||
mesh.userData.parentUUID = uuid;
|
||||
this.scene.add(mesh);
|
||||
levels[levelName] = mesh;
|
||||
}
|
||||
|
||||
// Store LOD data
|
||||
this.lodObjects.set(uuid, {
|
||||
object,
|
||||
original,
|
||||
levels,
|
||||
currentLevel: 'high',
|
||||
});
|
||||
|
||||
// Hide original, show high-detail
|
||||
object.visible = false;
|
||||
levels.high.visible = true;
|
||||
|
||||
this.stats.totalObjects++;
|
||||
this.stats.highDetail++;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create LOD levels for a sphere (agent orbs)
|
||||
*/
|
||||
static createSphereLODs(radius, color, emissiveIntensity = 2) {
|
||||
return {
|
||||
high: {
|
||||
geometry: new THREE.SphereGeometry(radius, 32, 32),
|
||||
material: new THREE.MeshPhysicalMaterial({
|
||||
color: color,
|
||||
emissive: color,
|
||||
emissiveIntensity: emissiveIntensity,
|
||||
roughness: 0,
|
||||
metalness: 1,
|
||||
transmission: 0.8,
|
||||
thickness: 0.5,
|
||||
}),
|
||||
},
|
||||
medium: {
|
||||
geometry: new THREE.SphereGeometry(radius, 16, 16),
|
||||
material: new THREE.MeshStandardMaterial({
|
||||
color: color,
|
||||
emissive: color,
|
||||
emissiveIntensity: emissiveIntensity * 0.8,
|
||||
roughness: 0.2,
|
||||
metalness: 0.8,
|
||||
}),
|
||||
},
|
||||
low: {
|
||||
geometry: new THREE.SphereGeometry(radius, 8, 8),
|
||||
material: new THREE.MeshBasicMaterial({
|
||||
color: color,
|
||||
}),
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Create LOD levels for a torus (halos)
|
||||
*/
|
||||
static createTorusLODs(radius, tube, color) {
|
||||
return {
|
||||
high: {
|
||||
geometry: new THREE.TorusGeometry(radius, tube, 16, 64),
|
||||
material: new THREE.MeshBasicMaterial({
|
||||
color: color,
|
||||
transparent: true,
|
||||
opacity: 0.4,
|
||||
}),
|
||||
},
|
||||
medium: {
|
||||
geometry: new THREE.TorusGeometry(radius, tube, 12, 32),
|
||||
material: new THREE.MeshBasicMaterial({
|
||||
color: color,
|
||||
transparent: true,
|
||||
opacity: 0.3,
|
||||
}),
|
||||
},
|
||||
low: {
|
||||
geometry: new THREE.TorusGeometry(radius, tube * 1.5, 8, 16),
|
||||
material: new THREE.MeshBasicMaterial({
|
||||
color: color,
|
||||
transparent: true,
|
||||
opacity: 0.2,
|
||||
}),
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Create LOD levels for a cylinder (pillars)
|
||||
*/
|
||||
static createCylinderLODs(radiusTop, radiusBottom, height, color) {
|
||||
return {
|
||||
high: {
|
||||
geometry: new THREE.CylinderGeometry(radiusTop, radiusBottom, height, 32),
|
||||
material: new THREE.MeshStandardMaterial({
|
||||
color: color,
|
||||
metalness: 0.7,
|
||||
roughness: 0.3,
|
||||
}),
|
||||
},
|
||||
medium: {
|
||||
geometry: new THREE.CylinderGeometry(radiusTop, radiusBottom, height, 16),
|
||||
material: new THREE.MeshStandardMaterial({
|
||||
color: color,
|
||||
metalness: 0.5,
|
||||
ground: 0.5,
|
||||
}),
|
||||
},
|
||||
low: {
|
||||
geometry: new THREE.CylinderGeometry(radiusTop, radiusBottom, height, 8),
|
||||
material: new THREE.MeshBasicMaterial({
|
||||
color: color,
|
||||
}),
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Update LOD levels based on camera distance
|
||||
*/
|
||||
update(deltaTime) {
|
||||
this.lastUpdate += deltaTime;
|
||||
if (this.lastUpdate < this.updateInterval) return;
|
||||
this.lastUpdate = 0;
|
||||
|
||||
const cameraPos = this.camera.position;
|
||||
|
||||
// Reset stats
|
||||
this.stats.highDetail = 0;
|
||||
this.stats.mediumDetail = 0;
|
||||
this.stats.lowDetail = 0;
|
||||
this.stats.culled = 0;
|
||||
|
||||
for (const [uuid, lodData] of this.lodObjects) {
|
||||
const distance = cameraPos.distanceTo(lodData.object.position);
|
||||
|
||||
// Determine target LOD level
|
||||
let targetLevel;
|
||||
if (distance < this.distanceThresholds.high) {
|
||||
targetLevel = 'high';
|
||||
} else if (distance < this.distanceThresholds.medium) {
|
||||
targetLevel = 'medium';
|
||||
} else if (distance < this.distanceThresholds.low) {
|
||||
targetLevel = 'low';
|
||||
} else {
|
||||
targetLevel = 'culled';
|
||||
}
|
||||
|
||||
// Update LOD if changed
|
||||
if (targetLevel !== lodData.currentLevel) {
|
||||
// Hide current level
|
||||
if (lodData.levels[lodData.currentLevel]) {
|
||||
lodData.levels[lodData.currentLevel].visible = false;
|
||||
}
|
||||
|
||||
// Show new level (or cull)
|
||||
if (targetLevel !== 'culled' && lodData.levels[targetLevel]) {
|
||||
lodData.levels[targetLevel].visible = true;
|
||||
}
|
||||
|
||||
lodData.currentLevel = targetLevel;
|
||||
}
|
||||
|
||||
// Update stats
|
||||
switch (targetLevel) {
|
||||
case 'high': this.stats.highDetail++; break;
|
||||
case 'medium': this.stats.mediumDetail++; break;
|
||||
case 'low': this.stats.lowDetail++; break;
|
||||
case 'culled': this.stats.culled++; break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get current LOD statistics
|
||||
*/
|
||||
getStats() {
|
||||
return { ...this.stats };
|
||||
}
|
||||
|
||||
/**
|
||||
* Set distance thresholds
|
||||
*/
|
||||
setThresholds(high, medium, low, cull) {
|
||||
this.distanceThresholds = { high, medium, low, cull };
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove object from LOD management
|
||||
*/
|
||||
unregisterObject(uuid) {
|
||||
const lodData = this.lodObjects.get(uuid);
|
||||
if (!lodData) return;
|
||||
|
||||
// Remove LOD meshes from scene
|
||||
for (const mesh of Object.values(lodData.levels)) {
|
||||
this.scene.remove(mesh);
|
||||
mesh.geometry.dispose();
|
||||
mesh.material.dispose();
|
||||
}
|
||||
|
||||
// Restore original object visibility
|
||||
lodData.object.visible = true;
|
||||
|
||||
this.lodObjects.delete(uuid);
|
||||
this.stats.totalObjects--;
|
||||
}
|
||||
|
||||
/**
|
||||
* Cleanup all LOD objects
|
||||
*/
|
||||
dispose() {
|
||||
for (const [uuid] of this.lodObjects) {
|
||||
this.unregisterObject(uuid);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Export singleton instance
|
||||
export const lodManager = new LODManager();
|
||||
@@ -1,38 +0,0 @@
|
||||
/**
|
||||
* ═══════════════════════════════════════════
|
||||
* NEXUS LOD SYSTEM TEST — Verification Script
|
||||
* ═══════════════════════════════════════════
|
||||
*
|
||||
* Simple test to verify LOD system functionality.
|
||||
*/
|
||||
|
||||
import { LODManager } from './lod-manager.js';
|
||||
|
||||
// Test LOD creation
|
||||
console.log('Testing LOD system...');
|
||||
|
||||
// Test sphere LODs
|
||||
const sphereLods = LODManager.createSphereLODs(0.5, 0xff0000, 2);
|
||||
console.log('Sphere LODs:', {
|
||||
high: sphereLods.high.geometry.parameters,
|
||||
medium: sphereLods.medium.geometry.parameters,
|
||||
low: sphereLods.low.geometry.parameters,
|
||||
});
|
||||
|
||||
// Test torus LODs
|
||||
const torusLods = LODManager.createTorusLODs(0.6, 0.02, 0x00ff00);
|
||||
console.log('Torus LODs:', {
|
||||
high: torusLods.high.geometry.parameters,
|
||||
medium: torusLods.medium.geometry.parameters,
|
||||
low: torusLods.low.geometry.parameters,
|
||||
});
|
||||
|
||||
// Test cylinder LODs
|
||||
const cylinderLods = LODManager.createCylinderLODs(0.3, 0.3, 2, 0x0000ff);
|
||||
console.log('Cylinder LODs:', {
|
||||
high: cylinderLods.high.geometry.parameters,
|
||||
medium: cylinderLods.medium.geometry.parameters,
|
||||
low: cylinderLods.low.geometry.parameters,
|
||||
});
|
||||
|
||||
console.log('LOD system test complete!');
|
||||
@@ -1,294 +0,0 @@
|
||||
/**
|
||||
* ═══════════════════════════════════════════
|
||||
* NEXUS PERFORMANCE INTEGRATION — LOD + Texture Audit + Stats
|
||||
* ═══════════════════════════════════════════
|
||||
*
|
||||
* Integrates LOD system, texture auditing, and performance
|
||||
* monitoring into the main Nexus application.
|
||||
*/
|
||||
|
||||
import { LODManager } from './lod-manager.js';
|
||||
import { TextureAuditor } from './texture-auditor.js';
|
||||
import { PerformanceMonitor } from './performance-monitor.js';
|
||||
|
||||
export class PerformanceSystem {
|
||||
constructor(camera, scene, renderer) {
|
||||
this.camera = camera;
|
||||
this.scene = scene;
|
||||
this.renderer = renderer;
|
||||
|
||||
// Initialize subsystems
|
||||
this.lodManager = new LODManager(camera, scene);
|
||||
this.textureAuditor = new TextureAuditor();
|
||||
this.performanceMonitor = new PerformanceMonitor();
|
||||
|
||||
// State
|
||||
this.isEnabled = true;
|
||||
this.autoLOD = true;
|
||||
this.autoAudit = true;
|
||||
this.lastAuditTime = 0;
|
||||
this.auditInterval = 30; // seconds between audits
|
||||
|
||||
// Performance tiers for local hardware
|
||||
this.hardwareTiers = {
|
||||
high: {
|
||||
name: 'High (M1 Pro/Max/Ultra)',
|
||||
description: 'M1 Pro or better, 16GB+ RAM',
|
||||
targetFPS: 60,
|
||||
maxDrawCalls: 2000,
|
||||
maxTriangles: 1000000,
|
||||
maxTextures: 100,
|
||||
lodThresholds: { high: 20, medium: 40, low: 60, cull: 100 },
|
||||
},
|
||||
medium: {
|
||||
name: 'Medium (M1/M2)',
|
||||
description: 'Base M1 or M2, 8GB+ RAM',
|
||||
targetFPS: 45,
|
||||
maxDrawCalls: 1000,
|
||||
maxTriangles: 500000,
|
||||
maxTextures: 50,
|
||||
lodThresholds: { high: 15, medium: 30, low: 50, cull: 80 },
|
||||
},
|
||||
low: {
|
||||
name: 'Low (Intel Mac / Older)',
|
||||
description: 'Intel Mac or older hardware',
|
||||
targetFPS: 30,
|
||||
maxDrawCalls: 500,
|
||||
maxTriangles: 200000,
|
||||
maxTextures: 25,
|
||||
lodThresholds: { high: 10, medium: 20, low: 40, cull: 60 },
|
||||
},
|
||||
};
|
||||
|
||||
this.currentTier = 'medium'; // Default to medium
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialize the performance system
|
||||
*/
|
||||
async init() {
|
||||
console.log('[PerformanceSystem] Initializing...');
|
||||
|
||||
// Initialize performance monitor
|
||||
await this.performanceMonitor.init();
|
||||
|
||||
// Detect hardware tier
|
||||
await this.detectHardwareTier();
|
||||
|
||||
// Apply tier settings
|
||||
this.applyTierSettings();
|
||||
|
||||
// Run initial texture audit
|
||||
if (this.autoAudit) {
|
||||
this.runTextureAudit();
|
||||
}
|
||||
|
||||
console.log(`[PerformanceSystem] Initialized with tier: ${this.currentTier}`);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Detect appropriate hardware tier
|
||||
*/
|
||||
async detectHardwareTier() {
|
||||
// Use WebGL renderer info for detection
|
||||
const gl = this.renderer.getContext();
|
||||
const debugInfo = gl.getExtension('WEBGL_debug_renderer_info');
|
||||
|
||||
if (debugInfo) {
|
||||
const renderer = gl.getParameter(debugInfo.UNMASKED_RENDERER_WEBGL);
|
||||
console.log(`[PerformanceSystem] Detected GPU: ${renderer}`);
|
||||
|
||||
// Simple heuristic based on renderer string
|
||||
if (renderer.includes('Apple M1 Max') || renderer.includes('Apple M1 Ultra') ||
|
||||
renderer.includes('Apple M2 Pro') || renderer.includes('Apple M2 Max') ||
|
||||
renderer.includes('Apple M3') || renderer.includes('Apple M4')) {
|
||||
this.currentTier = 'high';
|
||||
} else if (renderer.includes('Apple M1') || renderer.includes('Apple M2')) {
|
||||
this.currentTier = 'medium';
|
||||
} else {
|
||||
this.currentTier = 'low';
|
||||
}
|
||||
} else {
|
||||
// Fallback: assume medium
|
||||
console.log('[PerformanceSystem] Could not detect GPU, assuming medium tier');
|
||||
this.currentTier = 'medium';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Apply settings for current hardware tier
|
||||
*/
|
||||
applyTierSettings() {
|
||||
const tier = this.hardwareTiers[this.currentTier];
|
||||
if (!tier) return;
|
||||
|
||||
// Set LOD thresholds
|
||||
this.lodManager.setThresholds(
|
||||
tier.lodThresholds.high,
|
||||
tier.lodThresholds.medium,
|
||||
tier.lodThresholds.low,
|
||||
tier.lodThresholds.cull
|
||||
);
|
||||
|
||||
// Set texture auditor limits
|
||||
this.textureAuditor.maxTotalTextures = tier.maxTextures;
|
||||
|
||||
console.log(`[PerformanceSystem] Applied ${tier.name} settings`);
|
||||
console.log(` Target FPS: ${tier.targetFPS}`);
|
||||
console.log(` Max draw calls: ${tier.maxDrawCalls}`);
|
||||
console.log(` Max triangles: ${tier.maxTriangles}`);
|
||||
console.log(` Max textures: ${tier.maxTextures}`);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the performance system
|
||||
*/
|
||||
update(deltaTime) {
|
||||
if (!this.isEnabled) return;
|
||||
|
||||
// Update LOD system
|
||||
if (this.autoLOD) {
|
||||
this.lodManager.update(deltaTime);
|
||||
}
|
||||
|
||||
// Update performance monitor
|
||||
this.performanceMonitor.update(this.renderer, this.scene, deltaTime);
|
||||
|
||||
// Periodic texture audit
|
||||
this.lastAuditTime += deltaTime;
|
||||
if (this.autoAudit && this.lastAuditTime > this.auditInterval) {
|
||||
this.lastAuditTime = 0;
|
||||
this.runTextureAudit();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Run texture audit
|
||||
*/
|
||||
runTextureAudit() {
|
||||
console.log('[PerformanceSystem] Running texture audit...');
|
||||
this.textureAuditor.clear();
|
||||
const sceneAudit = this.textureAuditor.auditScene(this.scene);
|
||||
const compressionPlan = this.textureAuditor.generateCompressionPlan();
|
||||
|
||||
// Store results
|
||||
this.lastAudit = {
|
||||
sceneAudit,
|
||||
compressionPlan,
|
||||
timestamp: Date.now(),
|
||||
};
|
||||
|
||||
return this.lastAudit;
|
||||
}
|
||||
|
||||
/**
|
||||
* Register an object for LOD management
|
||||
*/
|
||||
registerForLOD(object, lodLevels) {
|
||||
this.lodManager.registerObject(object, lodLevels);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get performance report
|
||||
*/
|
||||
getPerformanceReport() {
|
||||
const monitorReport = this.performanceMonitor.getReport();
|
||||
const lodStats = this.lodManager.getStats();
|
||||
|
||||
return {
|
||||
timestamp: Date.now(),
|
||||
tier: this.currentTier,
|
||||
tierInfo: this.hardwareTiers[this.currentTier],
|
||||
monitor: monitorReport,
|
||||
lod: lodStats,
|
||||
textureAudit: this.lastAudit || null,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Get minimum hardware requirements based on current scene
|
||||
*/
|
||||
getMinimumHardwareRequirements() {
|
||||
const report = this.getPerformanceReport();
|
||||
const requirements = {
|
||||
recommended: {
|
||||
tier: report.tier,
|
||||
description: report.tierInfo.description,
|
||||
targetFPS: report.tierInfo.targetFPS,
|
||||
notes: [],
|
||||
},
|
||||
minimum: {
|
||||
tier: 'low',
|
||||
description: this.hardwareTiers.low.description,
|
||||
targetFPS: this.hardwareTiers.low.targetFPS,
|
||||
notes: [],
|
||||
},
|
||||
};
|
||||
|
||||
// Generate notes based on current scene complexity
|
||||
if (report.monitor.metrics.drawCalls.current > 1000) {
|
||||
requirements.minimum.notes.push('Scene has high draw call count. LOD system required on lower-end hardware.');
|
||||
}
|
||||
|
||||
if (report.monitor.metrics.triangles.current > 500000) {
|
||||
requirements.minimum.notes.push('High triangle count. Reduce geometry complexity or use LOD on lower-end hardware.');
|
||||
}
|
||||
|
||||
if (report.lod.totalObjects > 10) {
|
||||
requirements.recommended.notes.push(`LOD system managing ${report.lod.totalObjects} objects.`);
|
||||
}
|
||||
|
||||
return requirements;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set hardware tier manually
|
||||
*/
|
||||
setHardwareTier(tier) {
|
||||
if (this.hardwareTiers[tier]) {
|
||||
this.currentTier = tier;
|
||||
this.applyTierSettings();
|
||||
console.log(`[PerformanceSystem] Manually set to ${this.hardwareTiers[tier].name}`);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Toggle performance system
|
||||
*/
|
||||
toggle() {
|
||||
this.isEnabled = !this.isEnabled;
|
||||
console.log(`[PerformanceSystem] ${this.isEnabled ? 'Enabled' : 'Disabled'}`);
|
||||
return this.isEnabled;
|
||||
}
|
||||
|
||||
/**
|
||||
* Toggle LOD system
|
||||
*/
|
||||
toggleLOD() {
|
||||
this.autoLOD = !this.autoLOD;
|
||||
console.log(`[PerformanceSystem] LOD ${this.autoLOD ? 'Enabled' : 'Disabled'}`);
|
||||
return this.autoLOD;
|
||||
}
|
||||
|
||||
/**
|
||||
* Toggle texture auditing
|
||||
*/
|
||||
toggleAudit() {
|
||||
this.autoAudit = !this.autoAudit;
|
||||
console.log(`[PerformanceSystem] Texture auditing ${this.autoAudit ? 'Enabled' : 'Disabled'}`);
|
||||
return this.autoAudit;
|
||||
}
|
||||
|
||||
/**
|
||||
* Cleanup
|
||||
*/
|
||||
dispose() {
|
||||
this.lodManager.dispose();
|
||||
this.performanceMonitor.dispose();
|
||||
this.isEnabled = false;
|
||||
}
|
||||
}
|
||||
|
||||
// Export singleton instance
|
||||
export const performanceSystem = new PerformanceSystem();
|
||||
@@ -1,264 +0,0 @@
|
||||
/**
|
||||
* ═══════════════════════════════════════════
|
||||
* NEXUS PERFORMANCE MONITOR — stats.js Integration
|
||||
* ═══════════════════════════════════════════
|
||||
*
|
||||
* Provides real-time performance monitoring using stats.js
|
||||
* and custom metrics for LOD and texture systems.
|
||||
*/
|
||||
|
||||
// Import stats.js from CDN
|
||||
const Stats = window.Stats;
|
||||
|
||||
export class PerformanceMonitor {
|
||||
constructor(container = document.body) {
|
||||
this.stats = null;
|
||||
this.customPanels = {};
|
||||
this.isInitialized = false;
|
||||
this.metrics = {
|
||||
fps: { current: 0, min: Infinity, max: 0, avg: 0, history: [] },
|
||||
frameTime: { current: 0, min: Infinity, max: 0, avg: 0, history: [] },
|
||||
drawCalls: { current: 0, min: Infinity, max: 0, avg: 0, history: [] },
|
||||
triangles: { current: 0, min: Infinity, max: 0, avg: 0, history: [] },
|
||||
textures: { current: 0, min: Infinity, max: 0, avg: 0, history: [] },
|
||||
geometries: { current: 0, min: Infinity, max: 0, avg: 0, history: [] },
|
||||
};
|
||||
this.historyLength = 60; // Store 60 samples
|
||||
this.updateInterval = 0.5; // Update stats every 0.5s
|
||||
this.lastUpdate = 0;
|
||||
this.container = container;
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialize the performance monitor
|
||||
*/
|
||||
async init() {
|
||||
if (this.isInitialized) return;
|
||||
|
||||
// Dynamically load stats.js if not available
|
||||
if (typeof Stats === 'undefined') {
|
||||
await this.loadStatsJS();
|
||||
}
|
||||
|
||||
// Create stats.js instance
|
||||
this.stats = new Stats();
|
||||
this.stats.dom.style.position = 'absolute';
|
||||
this.stats.dom.style.top = '0px';
|
||||
this.stats.dom.style.left = '0px';
|
||||
this.stats.dom.style.zIndex = '10000';
|
||||
this.stats.dom.id = 'nexus-stats';
|
||||
|
||||
// Create custom panels
|
||||
this.createCustomPanel('drawCalls', '#ff8c00', '#1a1a1a', 'Draw Calls');
|
||||
this.createCustomPanel('triangles', '#00ff8c', '#1a1a1a', 'Triangles');
|
||||
this.createCustomPanel('textures', '#ff008c', '#1a1a1a', 'Textures');
|
||||
this.createCustomPanel('geometries', '#008cff', '#1a1a1a', 'Geometries');
|
||||
|
||||
// Add to container
|
||||
this.container.appendChild(this.stats.dom);
|
||||
|
||||
// Add custom panels
|
||||
let topOffset = 48;
|
||||
for (const panel of Object.values(this.customPanels)) {
|
||||
panel.dom.style.top = `${topOffset}px`;
|
||||
this.container.appendChild(panel.dom);
|
||||
topOffset += 48;
|
||||
}
|
||||
|
||||
this.isInitialized = true;
|
||||
console.log('[PerformanceMonitor] Initialized with stats.js');
|
||||
}
|
||||
|
||||
/**
|
||||
* Load stats.js from CDN
|
||||
*/
|
||||
async loadStatsJS() {
|
||||
return new Promise((resolve, reject) => {
|
||||
const script = document.createElement('script');
|
||||
script.src = 'https://cdn.jsdelivr.net/npm/stats.js@0.17.0/build/stats.min.js';
|
||||
script.onload = () => {
|
||||
console.log('[PerformanceMonitor] stats.js loaded');
|
||||
resolve();
|
||||
};
|
||||
script.onerror = () => {
|
||||
console.error('[PerformanceMonitor] Failed to load stats.js');
|
||||
reject(new Error('Failed to load stats.js'));
|
||||
};
|
||||
document.head.appendChild(script);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a custom stats panel
|
||||
*/
|
||||
createCustomPanel(name, fg, bg, label) {
|
||||
const panel = new Stats.Panel(label, fg, bg);
|
||||
const container = document.createElement('div');
|
||||
container.style.cssText = `
|
||||
position: absolute;
|
||||
top: 48px;
|
||||
left: 0px;
|
||||
cursor: pointer;
|
||||
opacity: 0.9;
|
||||
z-index: 10000;
|
||||
`;
|
||||
container.appendChild(panel.dom);
|
||||
|
||||
this.customPanels[name] = {
|
||||
panel,
|
||||
dom: container,
|
||||
label,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Update performance metrics
|
||||
*/
|
||||
update(renderer, scene, deltaTime) {
|
||||
if (!this.isInitialized) return;
|
||||
|
||||
// Update stats.js FPS panel
|
||||
this.stats.update();
|
||||
|
||||
// Update custom panels every interval
|
||||
this.lastUpdate += deltaTime;
|
||||
if (this.lastUpdate < this.updateInterval) return;
|
||||
this.lastUpdate = 0;
|
||||
|
||||
// Get renderer info
|
||||
const info = renderer.info;
|
||||
|
||||
// Update metrics
|
||||
this.updateMetric('drawCalls', info.render.calls);
|
||||
this.updateMetric('triangles', info.render.triangles);
|
||||
this.updateMetric('textures', info.memory.textures);
|
||||
this.updateMetric('geometries', info.memory.geometries);
|
||||
|
||||
// Update custom panels
|
||||
this.updateCustomPanel('drawCalls', info.render.calls);
|
||||
this.updateCustomPanel('triangles', info.render.triangles);
|
||||
this.updateCustomPanel('textures', info.memory.textures);
|
||||
this.updateCustomPanel('geometries', info.memory.geometries);
|
||||
|
||||
// Update FPS metric
|
||||
const fps = 1 / deltaTime;
|
||||
this.updateMetric('fps', fps);
|
||||
this.updateMetric('frameTime', deltaTime * 1000); // ms
|
||||
}
|
||||
|
||||
/**
|
||||
* Update a single metric
|
||||
*/
|
||||
updateMetric(name, value) {
|
||||
const metric = this.metrics[name];
|
||||
metric.current = value;
|
||||
metric.min = Math.min(metric.min, value);
|
||||
metric.max = Math.max(metric.max, value);
|
||||
|
||||
// Add to history
|
||||
metric.history.push(value);
|
||||
if (metric.history.length > this.historyLength) {
|
||||
metric.history.shift();
|
||||
}
|
||||
|
||||
// Calculate average
|
||||
metric.avg = metric.history.reduce((a, b) => a + b, 0) / metric.history.length;
|
||||
}
|
||||
|
||||
/**
|
||||
* Update a custom panel
|
||||
*/
|
||||
updateCustomPanel(name, value) {
|
||||
const panel = this.customPanels[name];
|
||||
if (panel) {
|
||||
panel.panel.update(value, 1000); // Scale to 1000 for visibility
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get performance report
|
||||
*/
|
||||
getReport() {
|
||||
const report = {
|
||||
timestamp: Date.now(),
|
||||
metrics: {},
|
||||
recommendations: [],
|
||||
score: 100,
|
||||
};
|
||||
|
||||
for (const [name, metric] of Object.entries(this.metrics)) {
|
||||
report.metrics[name] = {
|
||||
current: metric.current,
|
||||
min: metric.min,
|
||||
max: metric.max,
|
||||
avg: metric.avg,
|
||||
history: [...metric.history],
|
||||
};
|
||||
}
|
||||
|
||||
// Generate recommendations based on metrics
|
||||
if (this.metrics.fps.avg < 30) {
|
||||
report.recommendations.push('Average FPS below 30. Consider reducing scene complexity.');
|
||||
report.score -= 30;
|
||||
} else if (this.metrics.fps.avg < 45) {
|
||||
report.recommendations.push('Average FPS below 45. LOD system should help.');
|
||||
report.score -= 15;
|
||||
}
|
||||
|
||||
if (this.metrics.drawCalls.avg > 1000) {
|
||||
report.recommendations.push('High draw call count. Consider merging geometries.');
|
||||
report.score -= 20;
|
||||
}
|
||||
|
||||
if (this.metrics.triangles.avg > 500000) {
|
||||
report.recommendations.push('High triangle count. Use LOD for complex meshes.');
|
||||
report.score -= 15;
|
||||
}
|
||||
|
||||
if (this.metrics.textures.avg > 50) {
|
||||
report.recommendations.push('Too many textures. Consider texture atlasing.');
|
||||
report.score -= 10;
|
||||
}
|
||||
|
||||
report.score = Math.max(0, report.score);
|
||||
return report;
|
||||
}
|
||||
|
||||
/**
|
||||
* Show/hide the monitor
|
||||
*/
|
||||
setVisible(visible) {
|
||||
if (this.stats) {
|
||||
this.stats.dom.style.display = visible ? 'block' : 'none';
|
||||
}
|
||||
for (const panel of Object.values(this.customPanels)) {
|
||||
panel.dom.style.display = visible ? 'block' : 'none';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Toggle visibility
|
||||
*/
|
||||
toggle() {
|
||||
if (this.stats) {
|
||||
const current = this.stats.dom.style.display !== 'none';
|
||||
this.setVisible(!current);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Cleanup
|
||||
*/
|
||||
dispose() {
|
||||
if (this.stats) {
|
||||
this.container.removeChild(this.stats.dom);
|
||||
}
|
||||
for (const panel of Object.values(this.customPanels)) {
|
||||
this.container.removeChild(panel.dom);
|
||||
}
|
||||
this.isInitialized = false;
|
||||
}
|
||||
}
|
||||
|
||||
// Export singleton instance
|
||||
export const performanceMonitor = new PerformanceMonitor();
|
||||
@@ -1,234 +0,0 @@
|
||||
/**
|
||||
* ═══════════════════════════════════════════
|
||||
* NEXUS TEXTURE AUDIT — Compression & Optimization
|
||||
* ═══════════════════════════════════════════
|
||||
*
|
||||
* Audits textures for performance on local hardware.
|
||||
* Provides compression recommendations and optimization.
|
||||
*/
|
||||
|
||||
import * as THREE from 'three';
|
||||
|
||||
export class TextureAuditor {
|
||||
constructor() {
|
||||
this.textureCache = new Map();
|
||||
this.compressionFormats = {
|
||||
webp: { extension: '.webp', mimeType: 'image/webp', quality: 0.8 },
|
||||
basis: { extension: '.basis', mimeType: 'application/octet-stream' },
|
||||
ktx2: { extension: '.ktx2', mimeType: 'image/ktx2' },
|
||||
};
|
||||
this.auditResults = [];
|
||||
this.maxTextureSize = 2048; // Max texture size for M1 Mac
|
||||
this.maxTotalTextures = 50; // Max textures in scene
|
||||
this.maxTotalVRAM = 256 * 1024 * 1024; // 256MB VRAM budget
|
||||
}
|
||||
|
||||
/**
|
||||
* Audit a texture for performance issues
|
||||
*/
|
||||
auditTexture(texture, name = 'unknown') {
|
||||
const issues = [];
|
||||
const recommendations = [];
|
||||
let score = 100;
|
||||
|
||||
// Check texture size
|
||||
if (texture.image) {
|
||||
const width = texture.image.width || 0;
|
||||
const height = texture.image.height || 0;
|
||||
const pixels = width * height;
|
||||
const estimatedVRAM = pixels * 4; // RGBA
|
||||
|
||||
if (width > this.maxTextureSize || height > this.maxTextureSize) {
|
||||
issues.push(`Texture too large: ${width}x${height} (max: ${this.maxTextureSize}x${this.maxTextureSize})`);
|
||||
recommendations.push(`Resize to ${this.maxTextureSize}x${this.maxTextureSize} or smaller`);
|
||||
score -= 30;
|
||||
}
|
||||
|
||||
if (estimatedVRAM > 16 * 1024 * 1024) { // >16MB
|
||||
issues.push(`High VRAM usage: ${(estimatedVRAM / 1024 / 1024).toFixed(1)}MB`);
|
||||
recommendations.push('Use compressed texture format (WebP, Basis, or KTX2)');
|
||||
score -= 20;
|
||||
}
|
||||
|
||||
// Check if power of two
|
||||
if (!this.isPowerOfTwo(width) || !this.isPowerOfTwo(height)) {
|
||||
issues.push('Texture dimensions not power of two');
|
||||
recommendations.push('Resize to nearest power of two (e.g., 512x512, 1024x1024)');
|
||||
score -= 15;
|
||||
}
|
||||
}
|
||||
|
||||
// Check format
|
||||
if (texture.format === THREE.RGBAFormat && texture.type === THREE.UnsignedByteType) {
|
||||
// Uncompressed RGBA
|
||||
recommendations.push('Consider using compressed format for better performance');
|
||||
score -= 10;
|
||||
}
|
||||
|
||||
// Check filtering
|
||||
if (texture.minFilter === THREE.LinearFilter || texture.magFilter === THREE.LinearFilter) {
|
||||
// Linear filtering is more expensive
|
||||
if (texture.generateMipmaps) {
|
||||
recommendations.push('Use mipmaps with linear filtering for better quality/performance');
|
||||
}
|
||||
}
|
||||
|
||||
// Check wrapping
|
||||
if (texture.wrapS === THREE.RepeatWrapping || texture.wrapT === THREE.RepeatWrapping) {
|
||||
// Repeating textures can cause issues with compressed formats
|
||||
if (texture.image && (!this.isPowerOfTwo(texture.image.width) || !this.isPowerOfTwo(texture.image.height))) {
|
||||
issues.push('Repeating texture with non-power-of-two dimensions');
|
||||
score -= 10;
|
||||
}
|
||||
}
|
||||
|
||||
const result = {
|
||||
name,
|
||||
texture,
|
||||
issues,
|
||||
recommendations,
|
||||
score: Math.max(0, score),
|
||||
timestamp: Date.now(),
|
||||
};
|
||||
|
||||
this.auditResults.push(result);
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Audit all textures in a scene
|
||||
*/
|
||||
auditScene(scene) {
|
||||
const textures = new Set();
|
||||
|
||||
scene.traverse((object) => {
|
||||
if (object.material) {
|
||||
const materials = Array.isArray(object.material) ? object.material : [object.material];
|
||||
|
||||
for (const material of materials) {
|
||||
for (const key in material) {
|
||||
if (material[key] && material[key] instanceof THREE.Texture) {
|
||||
textures.add(material[key]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
console.log(`Found ${textures.size} textures in scene`);
|
||||
|
||||
let totalVRAM = 0;
|
||||
const textureList = Array.from(textures);
|
||||
|
||||
for (let i = 0; i < textureList.length; i++) {
|
||||
const texture = textureList[i];
|
||||
const name = `texture_${i}`;
|
||||
const result = this.auditTexture(texture, name);
|
||||
|
||||
if (texture.image) {
|
||||
const width = texture.image.width || 0;
|
||||
const height = texture.image.height || 0;
|
||||
totalVRAM += width * height * 4;
|
||||
}
|
||||
|
||||
console.log(`Texture ${name}: Score ${result.score}/100`);
|
||||
if (result.issues.length > 0) {
|
||||
console.log(` Issues: ${result.issues.join(', ')}`);
|
||||
}
|
||||
}
|
||||
|
||||
// Overall scene audit
|
||||
const sceneAudit = {
|
||||
totalTextures: textures.size,
|
||||
totalVRAM: totalVRAM,
|
||||
totalVRAMMB: (totalVRAM / 1024 / 1024).toFixed(1),
|
||||
averageScore: this.auditResults.reduce((sum, r) => sum + r.score, 0) / this.auditResults.length,
|
||||
exceedsTextureLimit: textures.size > this.maxTotalTextures,
|
||||
exceedsVRAMLimit: totalVRAM > this.maxTotalVRAM,
|
||||
};
|
||||
|
||||
console.log('\n=== Scene Texture Audit ===');
|
||||
console.log(`Total textures: ${sceneAudit.totalTextures}`);
|
||||
console.log(`Total VRAM: ${sceneAudit.totalVRAMMB}MB`);
|
||||
console.log(`Average score: ${sceneAudit.averageScore.toFixed(1)}/100`);
|
||||
console.log(`Texture limit exceeded: ${sceneAudit.exceedsTextureLimit}`);
|
||||
console.log(`VRAM limit exceeded: ${sceneAudit.exceedsVRAMLimit}`);
|
||||
|
||||
return sceneAudit;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate compression recommendations
|
||||
*/
|
||||
generateCompressionPlan() {
|
||||
const plan = {
|
||||
webpCandidates: [],
|
||||
basisCandidates: [],
|
||||
resizeCandidates: [],
|
||||
totalSavings: 0,
|
||||
};
|
||||
|
||||
for (const result of this.auditResults) {
|
||||
const texture = result.texture;
|
||||
if (!texture.image) continue;
|
||||
|
||||
const width = texture.image.width || 0;
|
||||
const height = texture.image.height || 0;
|
||||
const currentSize = width * height * 4; // RGBA uncompressed
|
||||
|
||||
if (width > 1024 || height > 1024) {
|
||||
const targetSize = Math.min(width, height, 1024);
|
||||
const newSize = targetSize * targetSize * 4;
|
||||
const savings = currentSize - newSize;
|
||||
plan.resizeCandidates.push({
|
||||
name: result.name,
|
||||
currentSize: `${width}x${height}`,
|
||||
targetSize: `${targetSize}x${targetSize}`,
|
||||
savingsMB: (savings / 1024 / 1024).toFixed(1),
|
||||
});
|
||||
plan.totalSavings += savings;
|
||||
}
|
||||
|
||||
if (currentSize > 4 * 1024 * 1024) { // >4MB
|
||||
const webpSavings = currentSize * 0.7; // ~30% savings with WebP
|
||||
plan.webpCandidates.push({
|
||||
name: result.name,
|
||||
currentSizeMB: (currentSize / 1024 / 1024).toFixed(1),
|
||||
estimatedSavingsMB: (webpSavings / 1024 / 1024).toFixed(1),
|
||||
});
|
||||
plan.totalSavings += webpSavings;
|
||||
}
|
||||
}
|
||||
|
||||
console.log('\n=== Compression Plan ===');
|
||||
console.log(`Textures to resize: ${plan.resizeCandidates.length}`);
|
||||
console.log(`Textures for WebP: ${plan.webpCandidates.length}`);
|
||||
console.log(`Estimated total savings: ${(plan.totalSavings / 1024 / 1024).toFixed(1)}MB`);
|
||||
|
||||
return plan;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if number is power of two
|
||||
*/
|
||||
isPowerOfTwo(n) {
|
||||
return n !== 0 && (n & (n - 1)) === 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get audit results
|
||||
*/
|
||||
getResults() {
|
||||
return this.auditResults;
|
||||
}
|
||||
|
||||
/**
|
||||
* Clear audit results
|
||||
*/
|
||||
clear() {
|
||||
this.auditResults = [];
|
||||
}
|
||||
}
|
||||
|
||||
// Export singleton instance
|
||||
export const textureAuditor = new TextureAuditor();
|
||||
95
playground/README.md
Normal file
95
playground/README.md
Normal file
@@ -0,0 +1,95 @@
|
||||
# Sovereign Sound Playground
|
||||
|
||||
An interactive audio-visual experience that lets you paint with sound and create music visually.
|
||||
|
||||
## Live Version
|
||||
|
||||
**LIVE:** https://playground.alexanderwhitestone.com/playground.html
|
||||
|
||||
## Features
|
||||
|
||||
### Core Functionality
|
||||
- **Visual Piano Keyboard**: 26 keys mapped to keyboard (QWERTY layout)
|
||||
- **6 Visual Modes**:
|
||||
- FREE: Freeform painting with sound
|
||||
- GRAVITY: Notes gravitate toward cursor
|
||||
- RAIN: Musical rain falls from above
|
||||
- CONSTELLATION: Notes connect in constellation patterns
|
||||
- BPM: Grid pulses to the beat
|
||||
- MIRROR: Mirror notes across vertical axis
|
||||
- **5 Color Palettes**:
|
||||
- AURORA: Warm rainbow colors
|
||||
- OCEAN: Cool blues and teals
|
||||
- EMBER: Warm reds and oranges
|
||||
- FOREST: Natural greens
|
||||
- NEON: Vibrant neon colors
|
||||
|
||||
### Audio Features
|
||||
- **Ambient Beat**: Automatic chord progressions with kick, snare, and hi-hat
|
||||
- **Chord Detection**: Real-time chord recognition (major, minor, 7th, etc.)
|
||||
- **Mouse Playback**: Hover over painted notes to hear them again
|
||||
- **Touch Support**: Works on mobile devices
|
||||
|
||||
### Tools
|
||||
- **Recording**: Press R to record your session
|
||||
- **Export**: Press S to save your creation as PNG
|
||||
- **Clear**: Press Backspace to clear the canvas
|
||||
- **Mode Switch**: Press Tab to cycle through modes
|
||||
- **Palette Switch**: Press 1-5 to switch color palettes
|
||||
|
||||
## Controls
|
||||
|
||||
### Keyboard
|
||||
- **A-Z**: Play notes and paint
|
||||
- **Space**: Toggle ambient beat
|
||||
- **Backspace**: Clear canvas
|
||||
- **Tab**: Switch mode
|
||||
- **R**: Toggle recording
|
||||
- **S**: Save as PNG
|
||||
- **1-5**: Switch color palette
|
||||
|
||||
### Mouse
|
||||
- **Click**: Play random note and paint
|
||||
- **Drag**: Continuous painting
|
||||
- **Hover over notes**: Replay sounds
|
||||
|
||||
### Touch
|
||||
- **Touch and drag**: Paint with sound
|
||||
|
||||
## Technical Details
|
||||
|
||||
- Zero dependencies
|
||||
- Pure HTML5 Canvas + Web Audio API
|
||||
- No external libraries
|
||||
- Self-contained single HTML file
|
||||
|
||||
## Integration
|
||||
|
||||
The playground is integrated into The Nexus as a portal:
|
||||
- **Portal ID**: `playground`
|
||||
- **Portal Type**: `creative-tool`
|
||||
- **Status**: Online
|
||||
- **Access**: Visitor mode (no operator privileges needed)
|
||||
|
||||
## Iteration Plan
|
||||
|
||||
Future enhancements:
|
||||
- [ ] More modes (Spiral, Gravity Well, Strobe)
|
||||
- [ ] MIDI keyboard support
|
||||
- [ ] Share session as URL
|
||||
- [ ] Mobile optimization
|
||||
- [ ] Multiplayer via WebSocket
|
||||
- [ ] Integration with Nexus spatial audio system
|
||||
- [ ] Memory system for saved compositions
|
||||
|
||||
## File Structure
|
||||
|
||||
```
|
||||
playground/
|
||||
├── playground.html # Main playground application
|
||||
└── README.md # This file
|
||||
```
|
||||
|
||||
## Credits
|
||||
|
||||
Created as part of the Timmy Foundation's Sovereign Sound initiative.
|
||||
692
playground/playground.html
Normal file
692
playground/playground.html
Normal file
@@ -0,0 +1,692 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
|
||||
<title>Sovereign Sound — Playground</title>
|
||||
<style>
|
||||
* { margin: 0; padding: 0; box-sizing: border-box; }
|
||||
html, body { height: 100%; overflow: hidden; }
|
||||
body {
|
||||
background: #050510;
|
||||
font-family: 'SF Mono', 'Fira Code', monospace;
|
||||
color: #fff;
|
||||
cursor: none;
|
||||
user-select: none;
|
||||
-webkit-user-select: none;
|
||||
touch-action: none;
|
||||
}
|
||||
canvas { display: block; position: fixed; top: 0; left: 0; }
|
||||
.piano {
|
||||
position: fixed; bottom: 0; left: 0; right: 0;
|
||||
height: 80px; display: flex;
|
||||
background: rgba(0,0,0,0.3);
|
||||
backdrop-filter: blur(10px);
|
||||
-webkit-backdrop-filter: blur(10px);
|
||||
z-index: 10;
|
||||
}
|
||||
.key {
|
||||
flex: 1; border-right: 1px solid rgba(255,255,255,0.05);
|
||||
display: flex; align-items: flex-end; justify-content: center;
|
||||
padding-bottom: 8px; font-size: 9px; opacity: 0.3;
|
||||
transition: all 0.1s; position: relative;
|
||||
}
|
||||
.key.black {
|
||||
background: rgba(0,0,0,0.5);
|
||||
height: 50px; margin: 0 -8px; width: 60%; z-index: 1;
|
||||
border: 1px solid rgba(255,255,255,0.08);
|
||||
}
|
||||
.key.active {
|
||||
background: rgba(255,255,255,0.15);
|
||||
opacity: 0.8;
|
||||
transform: scaleY(0.98);
|
||||
transform-origin: bottom;
|
||||
}
|
||||
.hud {
|
||||
position: fixed; top: 16px; left: 16px;
|
||||
font-size: 9px; letter-spacing: 3px;
|
||||
text-transform: uppercase; opacity: 0.2;
|
||||
line-height: 2.2; z-index: 10;
|
||||
pointer-events: none;
|
||||
}
|
||||
.mode-switch {
|
||||
position: fixed; top: 16px; right: 16px;
|
||||
display: flex; gap: 4px; z-index: 10;
|
||||
}
|
||||
.mode-dot {
|
||||
width: 6px; height: 6px; border-radius: 50%;
|
||||
background: rgba(255,255,255,0.15);
|
||||
cursor: pointer; transition: all 0.3s;
|
||||
pointer-events: all;
|
||||
}
|
||||
.mode-dot.active { background: rgba(255,255,255,0.6); transform: scale(1.4); }
|
||||
.toast {
|
||||
position: fixed; top: 50%; left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
font-size: 10px; letter-spacing: 6px;
|
||||
text-transform: uppercase; opacity: 0;
|
||||
transition: opacity 0.4s; pointer-events: none; z-index: 20;
|
||||
}
|
||||
.toast.show { opacity: 0.4; }
|
||||
.rec-dot {
|
||||
position: fixed; top: 16px; left: 50%; transform: translateX(-50%);
|
||||
width: 8px; height: 8px; border-radius: 50%;
|
||||
background: #ff0040; opacity: 0;
|
||||
transition: opacity 0.3s; z-index: 10;
|
||||
}
|
||||
.rec-dot.on { opacity: 1; animation: pulse 1s infinite; }
|
||||
@keyframes pulse { 0%,100% { opacity: 1; } 50% { opacity: 0.3; } }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<canvas id="c"></canvas>
|
||||
|
||||
<div class="hud" id="hud">
|
||||
<div id="h-mode">FREE</div>
|
||||
<div id="h-pal">AURORA</div>
|
||||
<div id="h-notes">0 notes</div>
|
||||
<div id="h-chord">—</div>
|
||||
</div>
|
||||
|
||||
<div class="mode-switch" id="modes"></div>
|
||||
<div class="rec-dot" id="rec"></div>
|
||||
<div class="toast" id="toast"></div>
|
||||
|
||||
<div class="piano" id="piano"></div>
|
||||
|
||||
<script>
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
// SOVEREIGN SOUND — PLAYGROUND v3
|
||||
// The ultimate interactive audio-visual experience.
|
||||
// Zero dependencies. Pure craft.
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
|
||||
const canvas = document.getElementById('c');
|
||||
const ctx = canvas.getContext('2d');
|
||||
let W, H;
|
||||
|
||||
function resize() {
|
||||
W = canvas.width = innerWidth;
|
||||
H = canvas.height = innerHeight;
|
||||
ctx.fillStyle = '#050510';
|
||||
ctx.fillRect(0, 0, W, H);
|
||||
}
|
||||
addEventListener('resize', resize); resize();
|
||||
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
// AUDIO ENGINE
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
|
||||
let ac = null, master = null, analyser = null;
|
||||
|
||||
function initAudio() {
|
||||
if (ac) return;
|
||||
ac = new AudioContext();
|
||||
master = ac.createGain(); master.gain.value = 0.4;
|
||||
|
||||
const wet = ac.createGain(); wet.gain.value = 0.2;
|
||||
[0.037, 0.059, 0.083, 0.127].forEach(t => {
|
||||
const d = ac.createDelay(1); d.delayTime.value = t;
|
||||
const fb = ac.createGain(); fb.gain.value = 0.22;
|
||||
master.connect(d); d.connect(fb); fb.connect(d); d.connect(wet);
|
||||
});
|
||||
wet.connect(ac.destination);
|
||||
|
||||
analyser = ac.createAnalyser();
|
||||
analyser.fftSize = 512;
|
||||
analyser.smoothingTimeConstant = 0.8;
|
||||
master.connect(analyser);
|
||||
master.connect(ac.destination);
|
||||
}
|
||||
|
||||
function freq(name) {
|
||||
const n = { C:0,'C#':1,D:2,'D#':3,E:4,F:5,'F#':6,G:7,'G#':8,A:9,'A#':10,B:11 };
|
||||
const nm = name.replace(/\d/,'');
|
||||
const oct = parseInt(name.match(/\d/)?.[0] || 4);
|
||||
return 440 * Math.pow(2, (n[nm] + (oct-4)*12 - 9) / 12);
|
||||
}
|
||||
|
||||
function tone(f, type='sine', dur=0.5, vol=0.1) {
|
||||
initAudio();
|
||||
const t = ac.currentTime;
|
||||
const o = ac.createOscillator();
|
||||
const g = ac.createGain();
|
||||
o.type = type; o.frequency.value = f;
|
||||
g.gain.setValueAtTime(0, t);
|
||||
g.gain.linearRampToValueAtTime(vol, t + 0.01);
|
||||
g.gain.exponentialRampToValueAtTime(vol*0.3, t+dur*0.4);
|
||||
g.gain.exponentialRampToValueAtTime(0.001, t+dur);
|
||||
o.connect(g); g.connect(master);
|
||||
o.start(t); o.stop(t+dur);
|
||||
}
|
||||
|
||||
function kick() { initAudio(); const t=ac.currentTime; const o=ac.createOscillator(), g=ac.createGain(); o.type='sine'; o.frequency.setValueAtTime(80,t); o.frequency.exponentialRampToValueAtTime(30,t+0.12); g.gain.setValueAtTime(0.4,t); g.gain.exponentialRampToValueAtTime(0.001,t+0.15); o.connect(g); g.connect(master); o.start(t); o.stop(t+0.15); }
|
||||
function snare() { initAudio(); const t=ac.currentTime; const len=ac.sampleRate*0.06; const buf=ac.createBuffer(1,len,ac.sampleRate); const d=buf.getChannelData(0); for(let i=0;i<len;i++) d[i]=(Math.random()*2-1)*0.25; const s=ac.createBufferSource(); s.buffer=buf; const g=ac.createGain(); g.gain.setValueAtTime(0.2,t); g.gain.exponentialRampToValueAtTime(0.001,t+0.08); s.connect(g); g.connect(master); s.start(t); }
|
||||
function hat() { initAudio(); const t=ac.currentTime; const len=ac.sampleRate*0.025; const buf=ac.createBuffer(1,len,ac.sampleRate); const d=buf.getChannelData(0); for(let i=0;i<len;i++) d[i]=(Math.random()*2-1)*0.12; const s=ac.createBufferSource(); s.buffer=buf; const g=ac.createGain(); g.gain.setValueAtTime(0.1,t); g.gain.exponentialRampToValueAtTime(0.001,t+0.025); s.connect(g); g.connect(master); s.start(t); }
|
||||
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
// SCALES & PALETTES
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
|
||||
const SCALES = {
|
||||
AURORA: { colors:['#ff6b6b','#ff9f43','#feca57','#48dbfb','#54a0ff','#5f27cd','#ff9ff3','#00d2d3'], notes:['C5','D5','E5','F5','G5','A5','B5','C6','D6','E6','C4','D4','E4','F4','G4','A4','B4','C5','D5','E5','F5','C2','D2','E2','F2','G2'], bg:[6,6,16], glow:'#ff9ff3' },
|
||||
OCEAN: { colors:['#0077b6','#00b4d8','#90e0ef','#48cae4','#023e8a','#ade8f4'], notes:['D5','E5','F#5','G5','A5','B5','C#6','D6','E6','D4','E4','F#4','G4','A4','B4','C#5','D5','E5','D3','E3','F#3','D2','E2','F#2','G2','A2'], bg:[4,12,22], glow:'#48cae4' },
|
||||
EMBER: { colors:['#ff4500','#ff6347','#ff7f50','#dc143c','#cd5c5c','#f08080'], notes:['C5','Eb5','F5','G5','Ab5','Bb5','C6','D5','Eb5','C4','Eb4','F4','G4','Ab4','Bb4','C5','D5','Eb5','C3','Eb3','F3','C2','Eb2','F2','G2','Ab2'], bg:[14,5,5], glow:'#ff6347' },
|
||||
FOREST: { colors:['#2d6a4f','#40916c','#52b788','#74c69d','#95d5b2','#b7e4c7'], notes:['E5','F#5','G5','A5','B5','C6','D6','E6','F#6','E4','F#4','G4','A4','B4','C5','D5','E5','F#5','E3','F#3','G3','E2','F#2','G2','A2','B2'], bg:[4,12,6], glow:'#52b788' },
|
||||
NEON: { colors:['#ff00ff','#00ffff','#ffff00','#ff0080','#00ff80','#8000ff'], notes:['C5','D5','E5','G5','A5','C6','D6','E6','G6','C4','D4','E4','G4','A4','C5','D5','E5','G5','C3','D3','E3','C2','D2','E2','G2','A2'], bg:[8,2,16], glow:'#00ffff' },
|
||||
};
|
||||
|
||||
let palName = 'AURORA';
|
||||
let pal = SCALES[palName];
|
||||
const PAL_NAMES = Object.keys(SCALES);
|
||||
let palIdx = 0;
|
||||
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
// MODES
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
|
||||
const MODES = ['FREE','GRAVITY','RAIN','CONSTELLATION','BPM','MIRROR'];
|
||||
let modeIdx = 0, mode = MODES[0];
|
||||
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
// STATE
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
|
||||
let notes = []; // permanent painted notes
|
||||
let particles = []; // transient particles
|
||||
let ripples = []; // ripple effects
|
||||
let raindrops = [];
|
||||
let mouseX = W/2, mouseY = H/2;
|
||||
let mouseDown = false;
|
||||
let time = 0;
|
||||
let ambientOn = false;
|
||||
let ambientStep = 0;
|
||||
let ambientTimer = null;
|
||||
let screenShake = 0;
|
||||
let lastPaintTime = 0;
|
||||
let recentNotes = [];
|
||||
let recording = false;
|
||||
let recordedNotes = [];
|
||||
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
// PIANO KEYBOARD — visual at bottom
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
|
||||
const KEYS = 'qwertyuiopasdfghjklzxcvbnm';
|
||||
const IS_BLACK = [false,true,false,true,false,false,true,false,true,false,true,false,
|
||||
false,true,false,true,false,false,true,false,true,false,true,false,false,false];
|
||||
|
||||
function buildPiano() {
|
||||
const piano = document.getElementById('piano');
|
||||
piano.innerHTML = '';
|
||||
KEYS.split('').forEach((k, i) => {
|
||||
const div = document.createElement('div');
|
||||
div.className = 'key' + (IS_BLACK[i] ? ' black' : '');
|
||||
div.dataset.key = k;
|
||||
div.textContent = k.toUpperCase();
|
||||
div.addEventListener('mousedown', () => triggerKey(k));
|
||||
div.addEventListener('touchstart', (e) => { e.preventDefault(); triggerKey(k); });
|
||||
piano.appendChild(div);
|
||||
});
|
||||
}
|
||||
buildPiano();
|
||||
|
||||
// Mode/palette dots
|
||||
const modesDiv = document.getElementById('modes');
|
||||
MODES.forEach((m, i) => {
|
||||
const dot = document.createElement('div');
|
||||
dot.className = 'mode-dot' + (i===0?' active':'');
|
||||
dot.onclick = () => { modeIdx=i; mode=MODES[i]; updateDots(); toast(m); };
|
||||
modesDiv.appendChild(dot);
|
||||
});
|
||||
PAL_NAMES.forEach((p, i) => {
|
||||
const dot = document.createElement('div');
|
||||
dot.className = 'mode-dot';
|
||||
dot.style.background = SCALES[p].glow;
|
||||
dot.style.opacity = '0.2';
|
||||
if (i===0) { dot.classList.add('active'); dot.style.opacity='0.6'; }
|
||||
dot.onclick = () => { palIdx=i; palName=p; pal=SCALES[p]; updateDots(); toast(p); };
|
||||
modesDiv.appendChild(dot);
|
||||
});
|
||||
|
||||
function updateDots() {
|
||||
modesDiv.querySelectorAll('.mode-dot').forEach((d, i) => {
|
||||
if (i < MODES.length) {
|
||||
d.classList.toggle('active', i===modeIdx);
|
||||
} else {
|
||||
const pi = i - MODES.length;
|
||||
d.classList.toggle('active', pi===palIdx);
|
||||
d.style.opacity = pi===palIdx ? '0.6' : '0.2';
|
||||
}
|
||||
});
|
||||
document.getElementById('h-mode').textContent = mode;
|
||||
document.getElementById('h-pal').textContent = palName;
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
// PAINT & PLAY
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
|
||||
function paint(x, y, color, noteFreq, noteType, size=25) {
|
||||
// Permanent splash
|
||||
ctx.save();
|
||||
ctx.globalAlpha = 0.06;
|
||||
ctx.fillStyle = color;
|
||||
ctx.beginPath(); ctx.arc(x, y, size*2, 0, Math.PI*2); ctx.fill();
|
||||
|
||||
ctx.globalAlpha = 0.3;
|
||||
ctx.beginPath();
|
||||
const pts = 6+Math.floor(Math.random()*6);
|
||||
for (let i=0; i<=pts; i++) {
|
||||
const a = (i/pts)*Math.PI*2;
|
||||
const r = size*(0.5+Math.random()*0.5);
|
||||
i===0 ? ctx.moveTo(x+Math.cos(a)*r, y+Math.sin(a)*r) : ctx.lineTo(x+Math.cos(a)*r, y+Math.sin(a)*r);
|
||||
}
|
||||
ctx.closePath(); ctx.fill();
|
||||
|
||||
ctx.globalAlpha = 0.8;
|
||||
ctx.beginPath(); ctx.arc(x, y, size*0.12, 0, Math.PI*2); ctx.fill();
|
||||
ctx.restore();
|
||||
|
||||
notes.push({ x, y, radius: size, color, freq: noteFreq, type: noteType });
|
||||
if (notes.length > 4000) notes.splice(0, 500);
|
||||
|
||||
// Particles
|
||||
for (let i=0; i<12; i++) {
|
||||
const a = Math.random()*Math.PI*2;
|
||||
const s = 1+Math.random()*4;
|
||||
particles.push({ x, y, vx:Math.cos(a)*s, vy:Math.sin(a)*s, size:1+Math.random()*3, life:1, color });
|
||||
}
|
||||
if (particles.length > 400) particles.splice(0, 100);
|
||||
|
||||
ripples.push({ x, y, color, size: size*0.3, maxSize: size*3, life:1 });
|
||||
if (ripples.length > 25) ripples.shift();
|
||||
|
||||
if (noteType === 'sawtooth' && noteFreq < 200) screenShake = 6;
|
||||
}
|
||||
|
||||
function triggerKey(key) {
|
||||
const i = KEYS.indexOf(key);
|
||||
if (i < 0) return;
|
||||
|
||||
const noteName = pal.notes[i % pal.notes.length];
|
||||
const noteFreq = freq(noteName);
|
||||
const isBass = i >= 21;
|
||||
const noteType = isBass ? 'sawtooth' : (i%3===0 ? 'triangle' : 'sine');
|
||||
|
||||
tone(noteFreq, noteType, isBass ? 0.3 : 0.6, isBass ? 0.18 : 0.12);
|
||||
|
||||
const x = mouseX + (Math.random()-0.5)*50;
|
||||
const y = mouseY + (Math.random()-0.5)*50;
|
||||
paint(x, y, pal.colors[i % pal.colors.length], noteFreq, noteType, isBass ? 35+Math.random()*15 : 20+Math.random()*15);
|
||||
|
||||
// Piano visual
|
||||
const pianoKey = document.querySelector(`.key[data-key="${key}"]`);
|
||||
if (pianoKey) {
|
||||
pianoKey.classList.add('active');
|
||||
pianoKey.style.background = pal.colors[i % pal.colors.length] + '30';
|
||||
setTimeout(() => { pianoKey.classList.remove('active'); pianoKey.style.background = ''; }, 200);
|
||||
}
|
||||
|
||||
// Track for chord detection
|
||||
recentNotes.push({ freq: noteFreq, time: Date.now() });
|
||||
if (recentNotes.length > 10) recentNotes.shift();
|
||||
detectChord();
|
||||
|
||||
// Recording
|
||||
if (recording) recordedNotes.push({ key, time: Date.now(), x, y });
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
// CHORD DETECTION
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
|
||||
function detectChord() {
|
||||
const now = Date.now();
|
||||
const recent = recentNotes.filter(n => now-n.time < 1500);
|
||||
if (recent.length < 2) { document.getElementById('h-chord').textContent = '—'; return; }
|
||||
|
||||
const freqs = recent.map(n => n.freq).sort((a,b) => a-b);
|
||||
const ratios = [];
|
||||
for (let i=1; i<freqs.length; i++) ratios.push(Math.round(1200*Math.log2(freqs[i]/freqs[0])));
|
||||
|
||||
const patterns = { 'major':[0,400,700],'minor':[0,300,700],'7':[0,400,700,1000],'maj7':[0,400,700,1100],'min7':[0,300,700,1000],'power':[0,700],'sus4':[0,500,700],'sus2':[0,200,700],'dim':[0,300,600],'aug':[0,400,800] };
|
||||
|
||||
let best = '—', bestScore = 0;
|
||||
for (const [name, pat] of Object.entries(patterns)) {
|
||||
let score = 0;
|
||||
for (const p of pat) if (ratios.some(r => Math.abs(r-p) < 60)) score++;
|
||||
score /= pat.length;
|
||||
if (score > bestScore && score > 0.5) { bestScore = score; best = name; }
|
||||
}
|
||||
document.getElementById('h-chord').textContent = best;
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
// MOUSE PLAYBACK — play notes by hovering
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
|
||||
let lastPlayed = null, lastPlayT = 0;
|
||||
function checkPlay(x, y) {
|
||||
const now = Date.now();
|
||||
if (now-lastPlayT < 50) return;
|
||||
let closest = null, closestD = Infinity;
|
||||
for (const n of notes) {
|
||||
const d = Math.hypot(x-n.x, y-n.y);
|
||||
if (d < n.radius*1.4 && d < closestD) { closest = n; closestD = d; }
|
||||
}
|
||||
if (closest && closest !== lastPlayed) {
|
||||
const vol = 0.05 + (1-closestD/closest.radius)*0.1;
|
||||
tone(closest.freq, closest.type, 0.2, vol);
|
||||
ripples.push({ x:closest.x, y:closest.y, color:closest.color, size:closest.radius*0.2, maxSize:closest.radius*1.5, life:1 });
|
||||
for (let i=0; i<3; i++) {
|
||||
const a = Math.random()*Math.PI*2;
|
||||
particles.push({ x:closest.x, y:closest.y, vx:Math.cos(a)*1.5, vy:Math.sin(a)*1.5, size:1.5, life:1, color:closest.color });
|
||||
}
|
||||
lastPlayed = closest;
|
||||
lastPlayT = now;
|
||||
}
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
// AMBIENT BEAT
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
|
||||
function ambientTick() {
|
||||
if (!ambientOn) return;
|
||||
const bpm = [72,60,80,66,128,90][palIdx];
|
||||
const stepDur = 60000/bpm/4;
|
||||
const beat = ambientStep % 16;
|
||||
|
||||
if (beat%4===0) { kick(); screenShake=2; }
|
||||
if (beat===4||beat===12) snare();
|
||||
if (beat%2===1) hat();
|
||||
|
||||
if (beat===0) {
|
||||
const chords = [
|
||||
[freq('C4'),freq('E4'),freq('G4')],
|
||||
[freq('A3'),freq('C4'),freq('E4')],
|
||||
[freq('F3'),freq('A3'),freq('C4')],
|
||||
[freq('G3'),freq('B3'),freq('D4')]
|
||||
];
|
||||
chords[Math.floor(ambientStep/16)%4].forEach(f => tone(f,'triangle',0.7,0.05));
|
||||
}
|
||||
|
||||
if (beat%2===0) {
|
||||
const i = Math.floor(Math.random()*KEYS.length);
|
||||
const k = KEYS[i];
|
||||
const noteName = pal.notes[i % pal.notes.length];
|
||||
paint(W/2+(Math.random()-0.5)*400, H/2+(Math.random()-0.5)*300,
|
||||
pal.colors[i%pal.colors.length], freq(noteName), i>=21?'sawtooth':'sine', 10+Math.random()*8);
|
||||
}
|
||||
|
||||
ambientStep++;
|
||||
ambientTimer = setTimeout(ambientTick, stepDur);
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
// INPUT
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
|
||||
function toast(msg) {
|
||||
const el = document.getElementById('toast');
|
||||
el.textContent = msg; el.classList.add('show');
|
||||
setTimeout(() => el.classList.remove('show'), 1200);
|
||||
}
|
||||
|
||||
document.addEventListener('keydown', e => {
|
||||
const k = e.key.toLowerCase();
|
||||
|
||||
if (k===' ') { e.preventDefault(); ambientOn=!ambientOn; ambientOn?(ambientStep=0,ambientTick(),toast('AMBIENT ON')):(clearTimeout(ambientTimer),toast('AMBIENT OFF')); return; }
|
||||
if (k==='backspace') { e.preventDefault(); ctx.fillStyle='#050510'; ctx.fillRect(0,0,W,H); notes=[]; ripples=[]; particles=[]; raindrops=[]; toast('CLEARED'); return; }
|
||||
if (k==='tab') { e.preventDefault(); modeIdx=(modeIdx+1)%MODES.length; mode=MODES[modeIdx]; updateDots(); toast(mode); return; }
|
||||
if (k==='r') { recording=!recording; document.getElementById('rec').classList.toggle('on',recording); toast(recording?'REC ON':'REC OFF'); if(!recording&&recordedNotes.length) replayRecording(); return; }
|
||||
if (k==='s') { e.preventDefault(); saveCanvas(); return; }
|
||||
if (k>='1' && k<='5') { palIdx=parseInt(k)-1; palName=PAL_NAMES[palIdx]; pal=SCALES[palName]; updateDots(); toast(palName); return; }
|
||||
|
||||
triggerKey(k);
|
||||
});
|
||||
|
||||
canvas.addEventListener('mousemove', e => {
|
||||
mouseX = e.clientX; mouseY = e.clientY;
|
||||
checkPlay(mouseX, mouseY);
|
||||
if (mouseDown && Date.now()-lastPaintTime > 40) {
|
||||
const i = Math.floor(Math.random()*KEYS.length);
|
||||
triggerKey(KEYS[i]);
|
||||
lastPaintTime = Date.now();
|
||||
}
|
||||
if (Math.random()>0.65) {
|
||||
particles.push({ x:mouseX, y:mouseY, vx:(Math.random()-0.5)*0.5, vy:(Math.random()-0.5)*0.5, size:1+Math.random()*1.5, life:1, color:'rgba(255,255,255,0.3)' });
|
||||
if (particles.length>400) particles.splice(0,80);
|
||||
}
|
||||
});
|
||||
|
||||
canvas.addEventListener('mousedown', e => { mouseDown=true; triggerKey(KEYS[Math.floor(Math.random()*KEYS.length)]); });
|
||||
canvas.addEventListener('mouseup', () => mouseDown=false);
|
||||
|
||||
// Touch
|
||||
canvas.addEventListener('touchmove', e => {
|
||||
e.preventDefault();
|
||||
const t = e.touches[0];
|
||||
mouseX = t.clientX; mouseY = t.clientY;
|
||||
checkPlay(mouseX, mouseY);
|
||||
if (Date.now()-lastPaintTime > 60) {
|
||||
triggerKey(KEYS[Math.floor(Math.random()*KEYS.length)]);
|
||||
lastPaintTime = Date.now();
|
||||
}
|
||||
}, { passive: false });
|
||||
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
// MODE EFFECTS
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
|
||||
function applyGravity() {
|
||||
for (const n of notes) {
|
||||
const dx = mouseX-n.x, dy = mouseY-n.y;
|
||||
const d = Math.hypot(dx, dy);
|
||||
if (d>10 && d<300) { n.x += dx*0.2/d; n.y += dy*0.2/d; }
|
||||
}
|
||||
}
|
||||
|
||||
function spawnRain() {
|
||||
if (Math.random()>0.2) return;
|
||||
const i = Math.floor(Math.random()*KEYS.length);
|
||||
raindrops.push({ x:Math.random()*W, y:-20, vy:1.5+Math.random()*3, color:pal.colors[i%pal.colors.length], freq:freq(pal.notes[i%pal.notes.length]), type:i>=21?'sawtooth':'sine', size:8+Math.random()*12, played:false });
|
||||
if (raindrops.length>40) raindrops.shift();
|
||||
}
|
||||
|
||||
function updateRain() {
|
||||
for (let i=raindrops.length-1; i>=0; i--) {
|
||||
const r = raindrops[i]; r.y += r.vy;
|
||||
if (!r.played) for (const n of notes) {
|
||||
if (Math.hypot(r.x-n.x, r.y-n.y) < n.radius) {
|
||||
tone(r.freq, r.type, 0.3, 0.06);
|
||||
ripples.push({ x:r.x, y:r.y, color:r.color, size:5, maxSize:25, life:1 });
|
||||
r.played = true; break;
|
||||
}
|
||||
}
|
||||
if (r.y > H) {
|
||||
if (!r.played) { paint(r.x, H-20, r.color, r.freq, r.type, r.size); tone(r.freq, r.type, 0.3, 0.05); }
|
||||
raindrops.splice(i, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function drawConstellation() {
|
||||
ctx.save();
|
||||
for (let i=0; i<notes.length; i++) {
|
||||
for (let j=i+1; j<notes.length; j++) {
|
||||
const d = Math.hypot(notes[i].x-notes[j].x, notes[i].y-notes[j].y);
|
||||
if (d < 180) {
|
||||
ctx.globalAlpha = (1-d/180)*0.12;
|
||||
ctx.strokeStyle = notes[i].color;
|
||||
ctx.lineWidth = 0.5;
|
||||
ctx.beginPath();
|
||||
ctx.moveTo(notes[i].x, notes[i].y);
|
||||
ctx.lineTo(notes[j].x, notes[j].y);
|
||||
ctx.stroke();
|
||||
}
|
||||
}
|
||||
}
|
||||
ctx.restore();
|
||||
}
|
||||
|
||||
function drawBPMGrid() {
|
||||
const bpm = 120;
|
||||
const beat = (time % (60/bpm)) / (60/bpm);
|
||||
ctx.save();
|
||||
ctx.strokeStyle = pal.colors[0];
|
||||
ctx.lineWidth = 0.5 + beat;
|
||||
ctx.globalAlpha = 0.02 + beat*0.03;
|
||||
for (let x=0; x<W; x+=80) { ctx.beginPath(); ctx.moveTo(x,0); ctx.lineTo(x,H); ctx.stroke(); }
|
||||
for (let y=0; y<H; y+=80) { ctx.beginPath(); ctx.moveTo(0,y); ctx.lineTo(W,y); ctx.stroke(); }
|
||||
ctx.restore();
|
||||
}
|
||||
|
||||
function drawMirror() {
|
||||
// Mirror notes across vertical axis
|
||||
ctx.save();
|
||||
ctx.globalAlpha = 0.08;
|
||||
for (const n of notes) {
|
||||
ctx.fillStyle = n.color;
|
||||
ctx.beginPath();
|
||||
ctx.arc(W-n.x, n.y, n.radius*0.6, 0, Math.PI*2);
|
||||
ctx.fill();
|
||||
}
|
||||
ctx.restore();
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
// RECORDING & EXPORT
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
|
||||
function replayRecording() {
|
||||
if (!recordedNotes.length) return;
|
||||
toast(`REPLAY ${recordedNotes.length} notes`);
|
||||
const start = recordedNotes[0].time;
|
||||
recordedNotes.forEach(n => {
|
||||
setTimeout(() => triggerKey(n.key), n.time - start);
|
||||
});
|
||||
recordedNotes = [];
|
||||
}
|
||||
|
||||
function saveCanvas() {
|
||||
const link = document.createElement('a');
|
||||
link.download = `sovereign-${Date.now()}.png`;
|
||||
link.href = canvas.toDataURL();
|
||||
link.click();
|
||||
toast('SAVED');
|
||||
}
|
||||
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
// RENDER LOOP
|
||||
// ═══════════════════════════════════════════════════════════════
|
||||
|
||||
function render() {
|
||||
time += 0.016;
|
||||
|
||||
if (screenShake > 0) { ctx.save(); ctx.translate((Math.random()-0.5)*screenShake,(Math.random()-0.5)*screenShake); screenShake*=0.85; if(screenShake<0.5)screenShake=0; }
|
||||
|
||||
// Mode effects
|
||||
if (mode==='GRAVITY') applyGravity();
|
||||
if (mode==='RAIN') { spawnRain(); updateRain(); }
|
||||
if (mode==='CONSTELLATION') drawConstellation();
|
||||
if (mode==='BPM') drawBPMGrid();
|
||||
if (mode==='MIRROR') drawMirror();
|
||||
|
||||
// Ripples
|
||||
for (let i=ripples.length-1; i>=0; i--) {
|
||||
const r = ripples[i];
|
||||
r.size += (r.maxSize-r.size)*0.07;
|
||||
r.life -= 0.02;
|
||||
if (r.life<=0) { ripples.splice(i,1); continue; }
|
||||
ctx.globalAlpha = r.life*0.3;
|
||||
ctx.strokeStyle = r.color;
|
||||
ctx.lineWidth = 1.5*r.life;
|
||||
ctx.beginPath(); ctx.arc(r.x,r.y,r.size,0,Math.PI*2); ctx.stroke();
|
||||
}
|
||||
|
||||
// Rain
|
||||
for (const r of raindrops) {
|
||||
ctx.globalAlpha = 0.4;
|
||||
ctx.fillStyle = r.color;
|
||||
ctx.beginPath(); ctx.arc(r.x,r.y,r.size*0.2,0,Math.PI*2); ctx.fill();
|
||||
}
|
||||
|
||||
// Particles
|
||||
for (let i=particles.length-1; i>=0; i--) {
|
||||
const p = particles[i];
|
||||
p.x+=p.vx; p.y+=p.vy; p.vx*=0.96; p.vy*=0.96; p.life-=0.014;
|
||||
if (p.life<=0) { particles.splice(i,1); continue; }
|
||||
ctx.globalAlpha = p.life*0.5;
|
||||
ctx.fillStyle = p.color;
|
||||
ctx.beginPath(); ctx.arc(p.x,p.y,p.size*p.life,0,Math.PI*2); ctx.fill();
|
||||
}
|
||||
|
||||
// Audio-reactive
|
||||
if (analyser) {
|
||||
const data = new Uint8Array(analyser.frequencyBinCount);
|
||||
analyser.getByteFrequencyData(data);
|
||||
let energy = 0;
|
||||
for (let i=0; i<data.length; i++) energy += data[i];
|
||||
energy /= data.length*255;
|
||||
|
||||
if (energy > 0.08) {
|
||||
const grad = ctx.createRadialGradient(W/2,H/2,0,W/2,H/2,200+energy*200);
|
||||
grad.addColorStop(0, pal.glow+'08');
|
||||
grad.addColorStop(1, 'transparent');
|
||||
ctx.fillStyle = grad;
|
||||
ctx.globalAlpha = 0.3+energy*0.3;
|
||||
ctx.fillRect(0,0,W,H);
|
||||
}
|
||||
|
||||
// Edge frequency bars
|
||||
ctx.globalAlpha = 0.03;
|
||||
for (let i=0; i<data.length; i++) {
|
||||
const v = data[i]/255;
|
||||
if (v<0.08) continue;
|
||||
ctx.fillStyle = pal.colors[i%pal.colors.length];
|
||||
ctx.fillRect((i/data.length)*W, H-v*40-80, 2, v*40); // above piano
|
||||
}
|
||||
}
|
||||
|
||||
if (screenShake > 0) ctx.restore();
|
||||
|
||||
// Cursor
|
||||
ctx.save();
|
||||
ctx.strokeStyle = '#fff';
|
||||
ctx.lineWidth = 1;
|
||||
ctx.globalAlpha = 0.5;
|
||||
ctx.beginPath();
|
||||
ctx.moveTo(mouseX-8,mouseY); ctx.lineTo(mouseX-3,mouseY);
|
||||
ctx.moveTo(mouseX+3,mouseY); ctx.lineTo(mouseX+8,mouseY);
|
||||
ctx.moveTo(mouseX,mouseY-8); ctx.lineTo(mouseX,mouseY-3);
|
||||
ctx.moveTo(mouseX,mouseY+3); ctx.lineTo(mouseX,mouseY+8);
|
||||
ctx.stroke();
|
||||
|
||||
// Color ring when hovering note
|
||||
for (const n of notes) {
|
||||
if (Math.hypot(mouseX-n.x, mouseY-n.y) < n.radius*1.4) {
|
||||
ctx.strokeStyle = n.color;
|
||||
ctx.globalAlpha = 0.35;
|
||||
ctx.beginPath(); ctx.arc(mouseX, mouseY, 12, 0, Math.PI*2); ctx.stroke();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ctx.globalAlpha = 0.8;
|
||||
ctx.fillStyle = '#fff';
|
||||
ctx.beginPath(); ctx.arc(mouseX,mouseY,1.5,0,Math.PI*2); ctx.fill();
|
||||
ctx.restore();
|
||||
|
||||
// HUD
|
||||
document.getElementById('h-notes').textContent = `${notes.length} notes`;
|
||||
|
||||
requestAnimationFrame(render);
|
||||
}
|
||||
|
||||
render();
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
110
portals.json
110
portals.json
@@ -6,24 +6,6 @@
|
||||
"status": "online",
|
||||
"color": "#ff6600",
|
||||
"role": "pilot",
|
||||
"position": { "x": 15, "y": 0, "z": -10 },
|
||||
"rotation": { "y": -0.5 },
|
||||
"portal_type": "game-world",
|
||||
"world_category": "rpg",
|
||||
"environment": "local",
|
||||
"access_mode": "operator",
|
||||
"readiness_state": "prototype",
|
||||
"readiness_steps": {
|
||||
"prototype": { "label": "Prototype", "done": true },
|
||||
"runtime_ready": { "label": "Runtime Ready", "done": false },
|
||||
"launched": { "label": "Launched", "done": false },
|
||||
"harness_bridged": { "label": "Harness Bridged", "done": false }
|
||||
},
|
||||
"blocked_reason": null,
|
||||
"telemetry_source": "hermes-harness:morrowind",
|
||||
"owner": "Timmy",
|
||||
"app_id": 22320,
|
||||
"window_title": "OpenMW",
|
||||
"position": {
|
||||
"x": 15,
|
||||
"y": 0,
|
||||
@@ -32,12 +14,38 @@
|
||||
"rotation": {
|
||||
"y": -0.5
|
||||
},
|
||||
"portal_type": "game-world",
|
||||
"world_category": "rpg",
|
||||
"environment": "local",
|
||||
"access_mode": "operator",
|
||||
"readiness_state": "prototype",
|
||||
"readiness_steps": {
|
||||
"prototype": {
|
||||
"label": "Prototype",
|
||||
"done": true
|
||||
},
|
||||
"runtime_ready": {
|
||||
"label": "Runtime Ready",
|
||||
"done": false
|
||||
},
|
||||
"launched": {
|
||||
"label": "Launched",
|
||||
"done": false
|
||||
},
|
||||
"harness_bridged": {
|
||||
"label": "Harness Bridged",
|
||||
"done": false
|
||||
}
|
||||
},
|
||||
"blocked_reason": null,
|
||||
"telemetry_source": "hermes-harness:morrowind",
|
||||
"owner": "Timmy",
|
||||
"app_id": 22320,
|
||||
"window_title": "OpenMW",
|
||||
"destination": {
|
||||
"url": null,
|
||||
"type": "harness",
|
||||
"action_label": "Enter Vvardenfell",
|
||||
"params": { "world": "vvardenfell" }
|
||||
}
|
||||
"params": {
|
||||
"world": "vvardenfell"
|
||||
}
|
||||
@@ -54,8 +62,6 @@
|
||||
"status": "downloaded",
|
||||
"color": "#ffd700",
|
||||
"role": "pilot",
|
||||
"position": { "x": -15, "y": 0, "z": -10 },
|
||||
"rotation": { "y": 0.5 },
|
||||
"position": {
|
||||
"x": -15,
|
||||
"y": 0,
|
||||
@@ -110,8 +116,6 @@
|
||||
"status": "online",
|
||||
"color": "#4af0c0",
|
||||
"role": "timmy",
|
||||
"position": { "x": 0, "y": 0, "z": -20 },
|
||||
"rotation": { "y": 0 },
|
||||
"position": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
@@ -140,8 +144,6 @@
|
||||
"status": "online",
|
||||
"color": "#0066ff",
|
||||
"role": "timmy",
|
||||
"position": { "x": 25, "y": 0, "z": 0 },
|
||||
"rotation": { "y": -1.57 },
|
||||
"position": {
|
||||
"x": 25,
|
||||
"y": 0,
|
||||
@@ -169,8 +171,6 @@
|
||||
"status": "online",
|
||||
"color": "#ffd700",
|
||||
"role": "timmy",
|
||||
"position": { "x": -25, "y": 0, "z": 0 },
|
||||
"rotation": { "y": 1.57 },
|
||||
"position": {
|
||||
"x": -25,
|
||||
"y": 0,
|
||||
@@ -196,8 +196,6 @@
|
||||
"status": "online",
|
||||
"color": "#4af0c0",
|
||||
"role": "reflex",
|
||||
"position": { "x": 15, "y": 0, "z": 10 },
|
||||
"rotation": { "y": -2.5 },
|
||||
"position": {
|
||||
"x": 15,
|
||||
"y": 0,
|
||||
@@ -226,8 +224,6 @@
|
||||
"status": "standby",
|
||||
"color": "#ff4466",
|
||||
"role": "reflex",
|
||||
"position": { "x": -15, "y": 0, "z": 10 },
|
||||
"rotation": { "y": 2.5 },
|
||||
"position": {
|
||||
"x": -15,
|
||||
"y": 0,
|
||||
@@ -245,5 +241,55 @@
|
||||
},
|
||||
"agents_present": [],
|
||||
"interaction_ready": false
|
||||
},
|
||||
{
|
||||
"id": "playground",
|
||||
"name": "Sound Playground",
|
||||
"description": "Interactive audio-visual experience. Paint with sound, create music visually.",
|
||||
"status": "online",
|
||||
"color": "#ff00ff",
|
||||
"role": "creative",
|
||||
"position": {
|
||||
"x": 10,
|
||||
"y": 0,
|
||||
"z": 15
|
||||
},
|
||||
"rotation": {
|
||||
"y": -0.7
|
||||
},
|
||||
"portal_type": "creative-tool",
|
||||
"world_category": "audio-visual",
|
||||
"environment": "production",
|
||||
"access_mode": "visitor",
|
||||
"readiness_state": "online",
|
||||
"readiness_steps": {
|
||||
"prototype": {
|
||||
"label": "Prototype",
|
||||
"done": true
|
||||
},
|
||||
"runtime_ready": {
|
||||
"label": "Runtime Ready",
|
||||
"done": true
|
||||
},
|
||||
"launched": {
|
||||
"label": "Launched",
|
||||
"done": true
|
||||
},
|
||||
"harness_bridged": {
|
||||
"label": "Harness Bridged",
|
||||
"done": true
|
||||
}
|
||||
},
|
||||
"blocked_reason": null,
|
||||
"telemetry_source": "playground",
|
||||
"owner": "Timmy",
|
||||
"destination": {
|
||||
"url": "./playground/playground.html",
|
||||
"type": "local",
|
||||
"action_label": "Enter Playground",
|
||||
"params": {}
|
||||
},
|
||||
"agents_present": [],
|
||||
"interaction_ready": true
|
||||
}
|
||||
]
|
||||
20
pr_cleanup_1451.md
Normal file
20
pr_cleanup_1451.md
Normal file
@@ -0,0 +1,20 @@
|
||||
# PR Cleanup: Issue #1338 Duplicate PRs
|
||||
|
||||
## Summary
|
||||
|
||||
Resolved duplicate PR situation for issue #1338 (Remove duplicate content blocks from README.md and POLICY.md).
|
||||
|
||||
## Actions Taken
|
||||
|
||||
- **PR #1432** — Already merged as the canonical fix for #1338
|
||||
- **PR #1422** — Already closed as duplicate (with explanatory comment)
|
||||
- **PR #1408** — Already closed as duplicate (with explanatory comment)
|
||||
- **PR #1399** — Already closed as duplicate (with explanatory comment)
|
||||
- **Issue #1338** — Already closed
|
||||
|
||||
## Result
|
||||
|
||||
All 4 duplicate PRs have been resolved. PR #1432 was merged as the canonical fix.
|
||||
Issue #1338 is closed. No further action required.
|
||||
|
||||
Refs #1451
|
||||
18
pr_cleanup_1452.md
Normal file
18
pr_cleanup_1452.md
Normal 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
|
||||
86
scripts/README.md
Normal file
86
scripts/README.md
Normal file
@@ -0,0 +1,86 @@
|
||||
# Scripts
|
||||
|
||||
## cleanup-duplicate-prs.sh
|
||||
|
||||
Automated detection and cleanup of duplicate open PRs.
|
||||
|
||||
### Purpose
|
||||
|
||||
This script identifies PRs that are duplicates (same issue number or very similar titles) and closes the older ones. It's designed to help maintain a clean PR board and prevent confusion from duplicate work.
|
||||
|
||||
### Features
|
||||
|
||||
- **Issue-based grouping**: Groups PRs by issue number extracted from titles
|
||||
- **Date-based selection**: Keeps the newest PR, closes older duplicates
|
||||
- **Dry-run mode**: Shows what would be done without making changes
|
||||
- **Stale PR detection**: Identifies PRs older than 30 days with no activity
|
||||
- **Explanatory comments**: Adds comments when closing PRs to explain why
|
||||
|
||||
### Usage
|
||||
|
||||
```bash
|
||||
# Dry run (default) - shows what would be done
|
||||
./scripts/cleanup-duplicate-prs.sh
|
||||
|
||||
# Actually close duplicates
|
||||
./scripts/cleanup-duplicate-prs.sh --close
|
||||
|
||||
# Set environment variables
|
||||
export GITEA_TOKEN="your_token_here"
|
||||
export REPO="Timmy_Foundation/the-nexus"
|
||||
export GITEA_URL="https://forge.alexanderwhitestone.com"
|
||||
```
|
||||
|
||||
### Configuration
|
||||
|
||||
The script uses the following environment variables:
|
||||
|
||||
| Variable | Default | Description |
|
||||
|----------|---------|-------------|
|
||||
| `GITEA_TOKEN` | (required) | Gitea API token with repo access |
|
||||
| `GITEA_URL` | `https://forge.alexanderwhitestone.com` | Gitea instance URL |
|
||||
| `REPO` | `Timmy_Foundation/the-nexus` | Repository in `owner/repo` format |
|
||||
| `DRY_RUN` | `true` | Set to `false` to actually close PRs |
|
||||
|
||||
### How It Works
|
||||
|
||||
1. **Fetch open PRs**: Gets all open PRs from the repository
|
||||
2. **Extract issue numbers**: Parses issue numbers from PR titles (e.g., `#123`)
|
||||
3. **Group by issue**: Groups PRs that address the same issue
|
||||
4. **Identify duplicates**: Finds issues with multiple open PRs
|
||||
5. **Select newest**: For each duplicate group, keeps the newest PR
|
||||
6. **Close older PRs**: Closes older duplicates with explanatory comments
|
||||
7. **Check for stale PRs**: Identifies PRs older than 30 days
|
||||
|
||||
### Example Output
|
||||
|
||||
```
|
||||
[2026-04-14T00:57:05Z] Checking open PRs for Timmy_Foundation/the-nexus (dry_run: true)
|
||||
[2026-04-14T00:57:17Z] Found 14 open PRs
|
||||
[2026-04-14T00:57:17Z] Issue #1338 has 2 open PRs
|
||||
[2026-04-14T00:57:17Z] Keeping PR #1392 (newest)
|
||||
[2026-04-14T00:57:17Z] DRY RUN: Would close PR #1388
|
||||
[2026-04-14T00:57:17Z] Issue #1354 has 2 open PRs
|
||||
[2026-04-14T00:57:17Z] Keeping PR #1391 (newest)
|
||||
[2026-04-14T00:57:17Z] DRY RUN: Would close PR #1384
|
||||
[2026-04-14T00:57:17Z] Cleanup complete:
|
||||
[2026-04-14T00:57:17Z] Duplicate issue groups found: 4
|
||||
[2026-04-14T00:57:17Z] PRs closed: 0
|
||||
[2026-04-14T00:57:17Z] Dry run: true
|
||||
```
|
||||
|
||||
### Safety Features
|
||||
|
||||
- **Dry-run by default**: Won't close PRs unless explicitly told to
|
||||
- **Explanatory comments**: Adds comments before closing to explain why
|
||||
- **Newest PR preserved**: Always keeps the most recent PR for each issue
|
||||
- **No force deletion**: Only closes PRs, doesn't delete branches
|
||||
|
||||
### Integration
|
||||
|
||||
This script can be integrated into CI/CD pipelines or run manually as part of regular maintenance. It's designed to be run weekly to keep the PR board clean.
|
||||
|
||||
### Related Issues
|
||||
|
||||
- **Issue #1128**: Forge Cleanup — PRs Closed, Milestones Deduplicated, Policy Issues Filed
|
||||
- **Issue #1127**: Evening triage pass (predecessor to #1128)
|
||||
170
scripts/cleanup-duplicate-prs.sh
Executable file
170
scripts/cleanup-duplicate-prs.sh
Executable file
@@ -0,0 +1,170 @@
|
||||
#!/usr/bin/env bash
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
# cleanup-duplicate-prs.sh — Identify and close duplicate open PRs
|
||||
#
|
||||
# This script identifies PRs that are duplicates (same issue number
|
||||
# or very similar titles) and closes the older ones.
|
||||
#
|
||||
# Usage:
|
||||
# ./scripts/cleanup-duplicate-prs.sh [--dry-run] [--close]
|
||||
#
|
||||
# Options:
|
||||
# --dry-run Show what would be done without making changes
|
||||
# --close Actually close duplicate PRs (default is dry-run)
|
||||
#
|
||||
# Designed for issue #1128: Forge Cleanup
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
set -euo pipefail
|
||||
|
||||
# ─── Configuration ──────────────────────────────────────────
|
||||
GITEA_URL="${GITEA_URL:-https://forge.alexanderwhitestone.com}"
|
||||
GITEA_TOKEN="${GITEA_TOKEN:?Set GITEA_TOKEN env var}"
|
||||
REPO="${REPO:-Timmy_Foundation/the-nexus}"
|
||||
DRY_RUN="${DRY_RUN:-true}"
|
||||
|
||||
# Parse command line arguments
|
||||
for arg in "$@"; do
|
||||
case $arg in
|
||||
--dry-run)
|
||||
DRY_RUN="true"
|
||||
;;
|
||||
--close)
|
||||
DRY_RUN="false"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
API="$GITEA_URL/api/v1"
|
||||
AUTH="token $GITEA_TOKEN"
|
||||
|
||||
log() { echo "[$(date -u +%Y-%m-%dT%H:%M:%SZ)] $*"; }
|
||||
|
||||
# ─── Fetch open PRs ────────────────────────────────────────
|
||||
log "Checking open PRs for $REPO (dry_run: $DRY_RUN)"
|
||||
|
||||
OPEN_PRS=$(curl -s -H "$AUTH" "$API/repos/$REPO/pulls?state=open&limit=50")
|
||||
|
||||
if [ -z "$OPEN_PRS" ] || [ "$OPEN_PRS" = "null" ]; then
|
||||
log "No open PRs found or API error"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Count PRs
|
||||
PR_COUNT=$(echo "$OPEN_PRS" | jq length)
|
||||
log "Found $PR_COUNT open PRs"
|
||||
|
||||
if [ "$PR_COUNT" -eq 0 ]; then
|
||||
log "No open PRs to process"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# ─── Extract issue numbers from PR titles ──────────────────
|
||||
# Create a temporary file for PR data
|
||||
TEMP_FILE=$(mktemp)
|
||||
echo "$OPEN_PRS" | jq -r '.[] | "\(.number)\t\(.title)\t\(.created_at)\t\(.head.ref)"' > "$TEMP_FILE"
|
||||
|
||||
# Group PRs by issue number using temporary files
|
||||
TEMP_DIR=$(mktemp -d)
|
||||
trap "rm -rf $TEMP_DIR" EXIT
|
||||
|
||||
while IFS=$'\t' read -r pr_number pr_title pr_created pr_branch; do
|
||||
# Extract issue number from title (look for #123 pattern)
|
||||
if [[ $pr_title =~ \#([0-9]+) ]]; then
|
||||
issue_num="${BASH_REMATCH[1]}"
|
||||
echo "$pr_number,$pr_created,$pr_branch" >> "$TEMP_DIR/issue_$issue_num.txt"
|
||||
fi
|
||||
done < "$TEMP_FILE"
|
||||
|
||||
rm -f "$TEMP_FILE"
|
||||
|
||||
# ─── Identify and process duplicates ──────────────────────
|
||||
DUPLICATES_FOUND=0
|
||||
CLOSED_COUNT=0
|
||||
|
||||
for issue_file in "$TEMP_DIR"/issue_*.txt; do
|
||||
[ -f "$issue_file" ] || continue
|
||||
|
||||
issue_num=$(basename "$issue_file" .txt | sed 's/issue_//')
|
||||
pr_list=$(cat "$issue_file")
|
||||
|
||||
# Count PRs for this issue
|
||||
pr_count=$(echo -n "$pr_list" | grep -c '^' || true)
|
||||
|
||||
if [ "$pr_count" -le 1 ]; then
|
||||
continue # No duplicates
|
||||
fi
|
||||
|
||||
log "Issue #$issue_num has $pr_count open PRs"
|
||||
DUPLICATES_FOUND=$((DUPLICATES_FOUND + 1))
|
||||
|
||||
# Sort by creation date (oldest first)
|
||||
sorted_prs=$(echo -n "$pr_list" | sort -t',' -k2)
|
||||
|
||||
# Keep the newest PR, close the rest
|
||||
newest_pr=""
|
||||
newest_date=""
|
||||
|
||||
while IFS=',' read -r pr_num pr_date pr_branch; do
|
||||
if [ -z "$newest_date" ] || [[ "$pr_date" > "$newest_date" ]]; then
|
||||
newest_pr="$pr_num"
|
||||
newest_date="$pr_date"
|
||||
fi
|
||||
done <<< "$sorted_prs"
|
||||
|
||||
log "Keeping PR #$newest_pr (newest)"
|
||||
|
||||
# Close older PRs
|
||||
while IFS=',' read -r pr_num pr_date pr_branch; do
|
||||
if [ "$pr_num" = "$newest_pr" ]; then
|
||||
continue # Skip the newest PR
|
||||
fi
|
||||
|
||||
log "Closing duplicate PR #$pr_num for issue #$issue_num"
|
||||
|
||||
if [ "$DRY_RUN" = "true" ]; then
|
||||
log "DRY RUN: Would close PR #$pr_num"
|
||||
else
|
||||
# Add a comment explaining why we're closing
|
||||
comment_body="Closing as duplicate. PR #$newest_pr is newer and addresses the same issue (#$issue_num)."
|
||||
|
||||
curl -s -X POST -H "$AUTH" -H "Content-Type: application/json" -d "{\"body\": \"$comment_body\"}" "$API/repos/$REPO/issues/$pr_num/comments" > /dev/null
|
||||
|
||||
# Close the PR
|
||||
curl -s -X PATCH -H "$AUTH" -H "Content-Type: application/json" -d '{"state": "closed"}' "$API/repos/$REPO/pulls/$pr_num" > /dev/null
|
||||
|
||||
log "Closed PR #$pr_num"
|
||||
CLOSED_COUNT=$((CLOSED_COUNT + 1))
|
||||
fi
|
||||
done <<< "$sorted_prs"
|
||||
done
|
||||
|
||||
# ─── Summary ──────────────────────────────────────────────
|
||||
log "Cleanup complete:"
|
||||
log " Duplicate issue groups found: $DUPLICATES_FOUND"
|
||||
log " PRs closed: $CLOSED_COUNT"
|
||||
log " Dry run: $DRY_RUN"
|
||||
|
||||
if [ "$DUPLICATES_FOUND" -eq 0 ]; then
|
||||
log "No duplicate PRs found"
|
||||
fi
|
||||
|
||||
# ─── Additional cleanup: Stale PRs ────────────────────────
|
||||
# Check for PRs older than 30 days with no activity
|
||||
log "Checking for stale PRs (older than 30 days)..."
|
||||
|
||||
THIRTY_DAYS_AGO=$(date -u -v-30d +%Y-%m-%dT%H:%M:%SZ 2>/dev/null || date -u -d "30 days ago" +%Y-%m-%dT%H:%M:%SZ)
|
||||
|
||||
STALE_PRS=$(echo "$OPEN_PRS" | jq -r --arg cutoff "$THIRTY_DAYS_AGO" '.[] | select(.created_at < $cutoff) | "\(.number)\t\(.title)\t\(.created_at)"')
|
||||
|
||||
if [ -n "$STALE_PRS" ]; then
|
||||
STALE_COUNT=$(echo -n "$STALE_PRS" | grep -c '^' || true)
|
||||
log "Found $STALE_COUNT stale PRs (older than 30 days)"
|
||||
|
||||
echo "$STALE_PRS" | while IFS=$'\t' read -r pr_num pr_title pr_created; do
|
||||
log "Stale PR #$pr_num: $pr_title (created: $pr_created)"
|
||||
done
|
||||
else
|
||||
log "No stale PRs found"
|
||||
fi
|
||||
|
||||
log "Script complete"
|
||||
249
style.css
249
style.css
@@ -2685,3 +2685,252 @@ body.operator-mode #mode-label {
|
||||
color: #ffd700;
|
||||
}
|
||||
|
||||
/* ═══ REASONING TRACE COMPONENT ═══ */
|
||||
|
||||
.reasoning-trace {
|
||||
width: 320px;
|
||||
max-height: 400px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.trace-header-container {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.trace-header-container .panel-header {
|
||||
margin-bottom: 0;
|
||||
border-bottom: none;
|
||||
padding-bottom: 0;
|
||||
}
|
||||
|
||||
.trace-icon {
|
||||
margin-right: 4px;
|
||||
}
|
||||
|
||||
.trace-controls {
|
||||
display: flex;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.trace-btn {
|
||||
background: rgba(74, 240, 192, 0.1);
|
||||
border: 1px solid rgba(74, 240, 192, 0.2);
|
||||
color: #4af0c0;
|
||||
padding: 2px 6px;
|
||||
font-size: 10px;
|
||||
cursor: pointer;
|
||||
border-radius: 2px;
|
||||
transition: all 0.2s ease;
|
||||
}
|
||||
|
||||
.trace-btn:hover {
|
||||
background: rgba(74, 240, 192, 0.2);
|
||||
border-color: #4af0c0;
|
||||
}
|
||||
|
||||
.trace-task {
|
||||
font-size: 9px;
|
||||
color: #8899aa;
|
||||
margin-bottom: 4px;
|
||||
padding: 2px 6px;
|
||||
background: rgba(0, 0, 0, 0.2);
|
||||
border-radius: 2px;
|
||||
font-family: 'JetBrains Mono', monospace;
|
||||
}
|
||||
|
||||
.trace-task.active {
|
||||
color: #4af0c0;
|
||||
background: rgba(74, 240, 192, 0.1);
|
||||
border-left: 2px solid #4af0c0;
|
||||
}
|
||||
|
||||
.trace-counter {
|
||||
font-size: 9px;
|
||||
color: #667788;
|
||||
margin-bottom: 6px;
|
||||
font-family: 'JetBrains Mono', monospace;
|
||||
}
|
||||
|
||||
.trace-content {
|
||||
flex: 1;
|
||||
overflow-y: auto;
|
||||
max-height: 300px;
|
||||
}
|
||||
|
||||
.trace-step {
|
||||
margin-bottom: 8px;
|
||||
padding: 6px;
|
||||
background: rgba(0, 0, 0, 0.2);
|
||||
border-radius: 3px;
|
||||
border-left: 3px solid #4af0c0;
|
||||
transition: all 0.2s ease;
|
||||
}
|
||||
|
||||
.trace-step-think {
|
||||
border-left-color: #4af0c0;
|
||||
}
|
||||
|
||||
.trace-step-decide {
|
||||
border-left-color: #ffd700;
|
||||
}
|
||||
|
||||
.trace-step-recall {
|
||||
border-left-color: #7b5cff;
|
||||
}
|
||||
|
||||
.trace-step-plan {
|
||||
border-left-color: #ff8c42;
|
||||
}
|
||||
|
||||
.trace-step-execute {
|
||||
border-left-color: #ff4466;
|
||||
}
|
||||
|
||||
.trace-step-verify {
|
||||
border-left-color: #4af0c0;
|
||||
}
|
||||
|
||||
.trace-step-doubt {
|
||||
border-left-color: #ff8c42;
|
||||
}
|
||||
|
||||
.trace-step-memory {
|
||||
border-left-color: #7b5cff;
|
||||
}
|
||||
|
||||
.trace-step-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
margin-bottom: 4px;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.step-icon {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.step-type {
|
||||
font-weight: 700;
|
||||
letter-spacing: 0.5px;
|
||||
font-family: 'JetBrains Mono', monospace;
|
||||
}
|
||||
|
||||
.step-time {
|
||||
color: #667788;
|
||||
font-size: 9px;
|
||||
margin-left: auto;
|
||||
font-family: 'JetBrains Mono', monospace;
|
||||
}
|
||||
|
||||
.confidence-bar {
|
||||
font-family: 'JetBrains Mono', monospace;
|
||||
font-size: 9px;
|
||||
color: #4af0c0;
|
||||
letter-spacing: -1px;
|
||||
margin-left: 4px;
|
||||
}
|
||||
|
||||
.trace-step-content {
|
||||
font-size: 11px;
|
||||
line-height: 1.4;
|
||||
color: #d9f7ff;
|
||||
}
|
||||
|
||||
.step-thought {
|
||||
margin-bottom: 4px;
|
||||
font-style: italic;
|
||||
color: #e0f0ff;
|
||||
}
|
||||
|
||||
.step-reasoning {
|
||||
margin-bottom: 4px;
|
||||
color: #aabbcc;
|
||||
font-size: 10px;
|
||||
padding-left: 8px;
|
||||
border-left: 1px solid rgba(74, 240, 192, 0.2);
|
||||
}
|
||||
|
||||
.step-decision {
|
||||
margin-bottom: 4px;
|
||||
color: #ffd700;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.step-alternatives {
|
||||
margin-bottom: 4px;
|
||||
color: #8899aa;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.step-source {
|
||||
margin-bottom: 4px;
|
||||
color: #7b5cff;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.trace-separator {
|
||||
height: 1px;
|
||||
background: linear-gradient(90deg, transparent, rgba(74, 240, 192, 0.2), transparent);
|
||||
margin: 6px 0;
|
||||
}
|
||||
|
||||
.trace-empty {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 20px;
|
||||
color: #667788;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.empty-icon {
|
||||
font-size: 24px;
|
||||
margin-bottom: 8px;
|
||||
opacity: 0.5;
|
||||
}
|
||||
|
||||
.empty-text {
|
||||
font-size: 11px;
|
||||
margin-bottom: 4px;
|
||||
font-family: 'JetBrains Mono', monospace;
|
||||
}
|
||||
|
||||
.empty-hint {
|
||||
font-size: 9px;
|
||||
color: #445566;
|
||||
font-family: 'JetBrains Mono', monospace;
|
||||
}
|
||||
|
||||
/* Animation for new steps */
|
||||
@keyframes trace-step-in {
|
||||
from {
|
||||
opacity: 0;
|
||||
transform: translateY(-10px);
|
||||
}
|
||||
to {
|
||||
opacity: 1;
|
||||
transform: translateY(0);
|
||||
}
|
||||
}
|
||||
|
||||
.trace-step {
|
||||
animation: trace-step-in 0.3s ease-out;
|
||||
}
|
||||
|
||||
/* Responsive adjustments */
|
||||
@media (max-width: 768px) {
|
||||
.reasoning-trace {
|
||||
width: 280px;
|
||||
}
|
||||
|
||||
.trace-content {
|
||||
max-height: 200px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
28
systemd/llama-server.service
Normal file
28
systemd/llama-server.service
Normal file
@@ -0,0 +1,28 @@
|
||||
[Unit]
|
||||
Description=llama.cpp Local LLM Server
|
||||
After=network-online.target
|
||||
Wants=network-online.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
User=root
|
||||
Environment=MODEL_PATH=/opt/models/llama/Qwen2.5-7B-Instruct-Q4_K_M.gguf
|
||||
Environment=LLAMA_HOST=0.0.0.0
|
||||
Environment=LLAMA_PORT=11435
|
||||
Environment=LLAMA_CTX_SIZE=4096
|
||||
Environment=LLAMA_THREADS=4
|
||||
ExecStart=/usr/local/bin/llama-server -m ${MODEL_PATH} --host ${LLAMA_HOST} --port ${LLAMA_PORT} -c ${LLAMA_CTX_SIZE} -t ${LLAMA_THREADS} --cont-batching
|
||||
Restart=on-failure
|
||||
RestartSec=10
|
||||
MemoryMax=12G
|
||||
CPUQuota=90%
|
||||
NoNewPrivileges=true
|
||||
ProtectSystem=strict
|
||||
ProtectHome=read-only
|
||||
ReadWritePaths=/opt/models
|
||||
PrivateTmp=true
|
||||
StandardOutput=journal
|
||||
SyslogIdentifier=llama-server
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
763
tests/test_a2a.py
Normal file
763
tests/test_a2a.py
Normal file
@@ -0,0 +1,763 @@
|
||||
"""
|
||||
Tests for A2A Protocol implementation.
|
||||
|
||||
Covers:
|
||||
- Type serialization roundtrips (Agent Card, Task, Message, Artifact, Part)
|
||||
- JSON-RPC envelope
|
||||
- Agent Card building from YAML config
|
||||
- Registry operations (register, list, filter)
|
||||
- Client/server integration (end-to-end task delegation)
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import json
|
||||
import pytest
|
||||
from pathlib import Path
|
||||
from unittest.mock import AsyncMock, patch, MagicMock
|
||||
|
||||
from nexus.a2a.types import (
|
||||
A2AError,
|
||||
AgentCard,
|
||||
AgentCapabilities,
|
||||
AgentInterface,
|
||||
AgentSkill,
|
||||
Artifact,
|
||||
DataPart,
|
||||
FilePart,
|
||||
JSONRPCError,
|
||||
JSONRPCRequest,
|
||||
JSONRPCResponse,
|
||||
Message,
|
||||
Role,
|
||||
Task,
|
||||
TaskState,
|
||||
TaskStatus,
|
||||
TextPart,
|
||||
part_from_dict,
|
||||
part_to_dict,
|
||||
)
|
||||
from nexus.a2a.card import build_card, load_card_config
|
||||
from nexus.a2a.registry import LocalFileRegistry
|
||||
|
||||
|
||||
# === Type Serialization Roundtrips ===
|
||||
|
||||
|
||||
class TestTextPart:
|
||||
def test_roundtrip(self):
|
||||
p = TextPart(text="hello world")
|
||||
d = p.to_dict()
|
||||
assert d == {"text": "hello world"}
|
||||
p2 = part_from_dict(d)
|
||||
assert isinstance(p2, TextPart)
|
||||
assert p2.text == "hello world"
|
||||
|
||||
def test_custom_media_type(self):
|
||||
p = TextPart(text="data", media_type="text/markdown")
|
||||
d = p.to_dict()
|
||||
assert d["mediaType"] == "text/markdown"
|
||||
p2 = part_from_dict(d)
|
||||
assert p2.media_type == "text/markdown"
|
||||
|
||||
|
||||
class TestFilePart:
|
||||
def test_inline_roundtrip(self):
|
||||
p = FilePart(media_type="image/png", raw="base64data", filename="img.png")
|
||||
d = p.to_dict()
|
||||
assert d["raw"] == "base64data"
|
||||
assert d["filename"] == "img.png"
|
||||
p2 = part_from_dict(d)
|
||||
assert isinstance(p2, FilePart)
|
||||
assert p2.raw == "base64data"
|
||||
|
||||
def test_url_roundtrip(self):
|
||||
p = FilePart(media_type="application/pdf", url="https://example.com/doc.pdf")
|
||||
d = p.to_dict()
|
||||
assert d["url"] == "https://example.com/doc.pdf"
|
||||
p2 = part_from_dict(d)
|
||||
assert isinstance(p2, FilePart)
|
||||
assert p2.url == "https://example.com/doc.pdf"
|
||||
|
||||
|
||||
class TestDataPart:
|
||||
def test_roundtrip(self):
|
||||
p = DataPart(data={"key": "value", "count": 42})
|
||||
d = p.to_dict()
|
||||
assert d["data"] == {"key": "value", "count": 42}
|
||||
p2 = part_from_dict(d)
|
||||
assert isinstance(p2, DataPart)
|
||||
assert p2.data["count"] == 42
|
||||
|
||||
|
||||
class TestMessage:
|
||||
def test_roundtrip(self):
|
||||
msg = Message(
|
||||
role=Role.USER,
|
||||
parts=[TextPart(text="Hello agent")],
|
||||
metadata={"priority": "high"},
|
||||
)
|
||||
d = msg.to_dict()
|
||||
assert d["role"] == "ROLE_USER"
|
||||
assert d["parts"] == [{"text": "Hello agent"}]
|
||||
assert d["metadata"]["priority"] == "high"
|
||||
|
||||
msg2 = Message.from_dict(d)
|
||||
assert msg2.role == Role.USER
|
||||
assert isinstance(msg2.parts[0], TextPart)
|
||||
assert msg2.parts[0].text == "Hello agent"
|
||||
assert msg2.metadata["priority"] == "high"
|
||||
|
||||
def test_multi_part(self):
|
||||
msg = Message(
|
||||
role=Role.AGENT,
|
||||
parts=[
|
||||
TextPart(text="Here's the report"),
|
||||
DataPart(data={"status": "healthy"}),
|
||||
],
|
||||
)
|
||||
d = msg.to_dict()
|
||||
assert len(d["parts"]) == 2
|
||||
msg2 = Message.from_dict(d)
|
||||
assert len(msg2.parts) == 2
|
||||
assert isinstance(msg2.parts[0], TextPart)
|
||||
assert isinstance(msg2.parts[1], DataPart)
|
||||
|
||||
|
||||
class TestArtifact:
|
||||
def test_roundtrip(self):
|
||||
art = Artifact(
|
||||
parts=[TextPart(text="result data")],
|
||||
name="report",
|
||||
description="CI health report",
|
||||
)
|
||||
d = art.to_dict()
|
||||
assert d["name"] == "report"
|
||||
assert d["description"] == "CI health report"
|
||||
|
||||
art2 = Artifact.from_dict(d)
|
||||
assert art2.name == "report"
|
||||
assert isinstance(art2.parts[0], TextPart)
|
||||
assert art2.parts[0].text == "result data"
|
||||
|
||||
|
||||
class TestTask:
|
||||
def test_roundtrip(self):
|
||||
task = Task(
|
||||
id="test-123",
|
||||
status=TaskStatus(state=TaskState.WORKING),
|
||||
history=[
|
||||
Message(role=Role.USER, parts=[TextPart(text="Do X")]),
|
||||
],
|
||||
)
|
||||
d = task.to_dict()
|
||||
assert d["id"] == "test-123"
|
||||
assert d["status"]["state"] == "TASK_STATE_WORKING"
|
||||
|
||||
task2 = Task.from_dict(d)
|
||||
assert task2.id == "test-123"
|
||||
assert task2.status.state == TaskState.WORKING
|
||||
assert len(task2.history) == 1
|
||||
|
||||
def test_with_artifacts(self):
|
||||
task = Task(
|
||||
id="art-task",
|
||||
status=TaskStatus(state=TaskState.COMPLETED),
|
||||
artifacts=[
|
||||
Artifact(
|
||||
parts=[TextPart(text="42")],
|
||||
name="answer",
|
||||
)
|
||||
],
|
||||
)
|
||||
d = task.to_dict()
|
||||
assert len(d["artifacts"]) == 1
|
||||
task2 = Task.from_dict(d)
|
||||
assert task2.artifacts[0].name == "answer"
|
||||
|
||||
def test_terminal_states(self):
|
||||
for state in [
|
||||
TaskState.COMPLETED,
|
||||
TaskState.FAILED,
|
||||
TaskState.CANCELED,
|
||||
TaskState.REJECTED,
|
||||
]:
|
||||
assert state.terminal is True
|
||||
|
||||
for state in [
|
||||
TaskState.SUBMITTED,
|
||||
TaskState.WORKING,
|
||||
TaskState.INPUT_REQUIRED,
|
||||
TaskState.AUTH_REQUIRED,
|
||||
]:
|
||||
assert state.terminal is False
|
||||
|
||||
|
||||
class TestAgentCard:
|
||||
def test_roundtrip(self):
|
||||
card = AgentCard(
|
||||
name="TestAgent",
|
||||
description="A test agent",
|
||||
version="1.0.0",
|
||||
supported_interfaces=[
|
||||
AgentInterface(url="http://localhost:8080/a2a/v1")
|
||||
],
|
||||
capabilities=AgentCapabilities(streaming=True),
|
||||
skills=[
|
||||
AgentSkill(
|
||||
id="test-skill",
|
||||
name="Test Skill",
|
||||
description="Does tests",
|
||||
tags=["test"],
|
||||
)
|
||||
],
|
||||
)
|
||||
d = card.to_dict()
|
||||
assert d["name"] == "TestAgent"
|
||||
assert d["capabilities"]["streaming"] is True
|
||||
assert len(d["skills"]) == 1
|
||||
assert d["skills"][0]["id"] == "test-skill"
|
||||
|
||||
card2 = AgentCard.from_dict(d)
|
||||
assert card2.name == "TestAgent"
|
||||
assert card2.skills[0].id == "test-skill"
|
||||
assert card2.capabilities.streaming is True
|
||||
|
||||
|
||||
class TestJSONRPC:
|
||||
def test_request_roundtrip(self):
|
||||
req = JSONRPCRequest(
|
||||
method="SendMessage",
|
||||
params={"message": {"text": "hello"}},
|
||||
)
|
||||
d = req.to_dict()
|
||||
assert d["jsonrpc"] == "2.0"
|
||||
assert d["method"] == "SendMessage"
|
||||
|
||||
def test_response_success(self):
|
||||
resp = JSONRPCResponse(
|
||||
id="req-1",
|
||||
result={"task": {"id": "t1"}},
|
||||
)
|
||||
d = resp.to_dict()
|
||||
assert "error" not in d
|
||||
assert d["result"]["task"]["id"] == "t1"
|
||||
|
||||
def test_response_error(self):
|
||||
resp = JSONRPCResponse(
|
||||
id="req-1",
|
||||
error=A2AError.TASK_NOT_FOUND,
|
||||
)
|
||||
d = resp.to_dict()
|
||||
assert "result" not in d
|
||||
assert d["error"]["code"] == -32001
|
||||
|
||||
|
||||
# === Agent Card Building ===
|
||||
|
||||
|
||||
class TestBuildCard:
|
||||
def test_basic_config(self):
|
||||
config = {
|
||||
"name": "Bezalel",
|
||||
"description": "CI/CD specialist",
|
||||
"version": "2.0.0",
|
||||
"url": "https://bezalel.example.com",
|
||||
"skills": [
|
||||
{
|
||||
"id": "ci-health",
|
||||
"name": "CI Health",
|
||||
"description": "Check CI",
|
||||
"tags": ["ci"],
|
||||
},
|
||||
{
|
||||
"id": "deploy",
|
||||
"name": "Deploy",
|
||||
"description": "Deploy services",
|
||||
"tags": ["ops"],
|
||||
},
|
||||
],
|
||||
}
|
||||
card = build_card(config)
|
||||
assert card.name == "Bezalel"
|
||||
assert card.version == "2.0.0"
|
||||
assert len(card.skills) == 2
|
||||
assert card.skills[0].id == "ci-health"
|
||||
assert card.supported_interfaces[0].url == "https://bezalel.example.com"
|
||||
|
||||
def test_bearer_auth(self):
|
||||
config = {
|
||||
"name": "Test",
|
||||
"description": "Test",
|
||||
"auth": {"scheme": "bearer", "token_env": "MY_TOKEN"},
|
||||
}
|
||||
card = build_card(config)
|
||||
assert "bearerAuth" in card.security_schemes
|
||||
assert card.security_requirements[0]["schemes"]["bearerAuth"] == {"list": []}
|
||||
|
||||
def test_api_key_auth(self):
|
||||
config = {
|
||||
"name": "Test",
|
||||
"description": "Test",
|
||||
"auth": {"scheme": "api_key", "key_name": "X-Custom-Key"},
|
||||
}
|
||||
card = build_card(config)
|
||||
assert "apiKeyAuth" in card.security_schemes
|
||||
|
||||
|
||||
# === Registry ===
|
||||
|
||||
|
||||
class TestLocalFileRegistry:
|
||||
def _make_card(self, name: str, skills: list[dict] | None = None) -> AgentCard:
|
||||
return AgentCard(
|
||||
name=name,
|
||||
description=f"Agent {name}",
|
||||
supported_interfaces=[
|
||||
AgentInterface(url=f"http://{name}:8080/a2a/v1")
|
||||
],
|
||||
skills=[
|
||||
AgentSkill(
|
||||
id=s["id"],
|
||||
name=s.get("name", s["id"]),
|
||||
description=s.get("description", ""),
|
||||
tags=s.get("tags", []),
|
||||
)
|
||||
for s in (skills or [])
|
||||
],
|
||||
)
|
||||
|
||||
def test_register_and_list(self, tmp_path):
|
||||
registry = LocalFileRegistry(tmp_path / "agents.json")
|
||||
registry.register(self._make_card("ezra"))
|
||||
registry.register(self._make_card("allegro"))
|
||||
|
||||
agents = registry.list_agents()
|
||||
assert len(agents) == 2
|
||||
names = {a.name for a in agents}
|
||||
assert names == {"ezra", "allegro"}
|
||||
|
||||
def test_filter_by_skill(self, tmp_path):
|
||||
registry = LocalFileRegistry(tmp_path / "agents.json")
|
||||
registry.register(
|
||||
self._make_card("ezra", [{"id": "ci-health", "tags": ["ci"]}])
|
||||
)
|
||||
registry.register(
|
||||
self._make_card("allegro", [{"id": "research", "tags": ["research"]}])
|
||||
)
|
||||
|
||||
ci_agents = registry.list_agents(skill="ci-health")
|
||||
assert len(ci_agents) == 1
|
||||
assert ci_agents[0].name == "ezra"
|
||||
|
||||
def test_filter_by_tag(self, tmp_path):
|
||||
registry = LocalFileRegistry(tmp_path / "agents.json")
|
||||
registry.register(
|
||||
self._make_card("ezra", [{"id": "ci", "tags": ["devops", "ci"]}])
|
||||
)
|
||||
registry.register(
|
||||
self._make_card("allegro", [{"id": "research", "tags": ["research"]}])
|
||||
)
|
||||
|
||||
devops_agents = registry.list_agents(tag="devops")
|
||||
assert len(devops_agents) == 1
|
||||
assert devops_agents[0].name == "ezra"
|
||||
|
||||
def test_persistence(self, tmp_path):
|
||||
path = tmp_path / "agents.json"
|
||||
reg1 = LocalFileRegistry(path)
|
||||
reg1.register(self._make_card("ezra"))
|
||||
|
||||
# Load fresh from disk
|
||||
reg2 = LocalFileRegistry(path)
|
||||
agents = reg2.list_agents()
|
||||
assert len(agents) == 1
|
||||
assert agents[0].name == "ezra"
|
||||
|
||||
def test_unregister(self, tmp_path):
|
||||
registry = LocalFileRegistry(tmp_path / "agents.json")
|
||||
registry.register(self._make_card("ezra"))
|
||||
assert len(registry.list_agents()) == 1
|
||||
|
||||
assert registry.unregister("ezra") is True
|
||||
assert len(registry.list_agents()) == 0
|
||||
assert registry.unregister("nonexistent") is False
|
||||
|
||||
def test_get_endpoint(self, tmp_path):
|
||||
registry = LocalFileRegistry(tmp_path / "agents.json")
|
||||
registry.register(self._make_card("ezra"))
|
||||
|
||||
url = registry.get_endpoint("ezra")
|
||||
assert url == "http://ezra:8080/a2a/v1"
|
||||
|
||||
|
||||
# === Server Integration (FastAPI required) ===
|
||||
|
||||
|
||||
try:
|
||||
from fastapi.testclient import TestClient
|
||||
HAS_TEST_CLIENT = True
|
||||
except ImportError:
|
||||
HAS_TEST_CLIENT = False
|
||||
|
||||
|
||||
@pytest.mark.skipif(not HAS_TEST_CLIENT, reason="fastapi not installed")
|
||||
class TestA2AServerIntegration:
|
||||
"""End-to-end tests using FastAPI TestClient."""
|
||||
|
||||
def _make_server(self, auth_token: str = ""):
|
||||
from nexus.a2a.server import A2AServer, echo_handler
|
||||
|
||||
card = AgentCard(
|
||||
name="TestAgent",
|
||||
description="Test agent for A2A",
|
||||
supported_interfaces=[
|
||||
AgentInterface(url="http://localhost:8080/a2a/v1")
|
||||
],
|
||||
capabilities=AgentCapabilities(streaming=False),
|
||||
skills=[
|
||||
AgentSkill(
|
||||
id="echo",
|
||||
name="Echo",
|
||||
description="Echo back messages",
|
||||
tags=["test"],
|
||||
)
|
||||
],
|
||||
)
|
||||
|
||||
server = A2AServer(card=card, auth_token=auth_token)
|
||||
server.register_handler("echo", echo_handler)
|
||||
server.set_default_handler(echo_handler)
|
||||
return server
|
||||
|
||||
def test_agent_card_well_known(self):
|
||||
server = self._make_server()
|
||||
client = TestClient(server.app)
|
||||
|
||||
resp = client.get("/.well-known/agent-card.json")
|
||||
assert resp.status_code == 200
|
||||
data = resp.json()
|
||||
assert data["name"] == "TestAgent"
|
||||
assert len(data["skills"]) == 1
|
||||
|
||||
def test_agent_card_fallback(self):
|
||||
server = self._make_server()
|
||||
client = TestClient(server.app)
|
||||
|
||||
resp = client.get("/agent.json")
|
||||
assert resp.status_code == 200
|
||||
assert resp.json()["name"] == "TestAgent"
|
||||
|
||||
def test_send_message(self):
|
||||
server = self._make_server()
|
||||
client = TestClient(server.app)
|
||||
|
||||
rpc_request = {
|
||||
"jsonrpc": "2.0",
|
||||
"id": "test-1",
|
||||
"method": "SendMessage",
|
||||
"params": {
|
||||
"message": {
|
||||
"messageId": "msg-1",
|
||||
"role": "ROLE_USER",
|
||||
"parts": [{"text": "Hello from test"}],
|
||||
},
|
||||
"configuration": {
|
||||
"acceptedOutputModes": ["text/plain"],
|
||||
"historyLength": 10,
|
||||
"returnImmediately": False,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
resp = client.post("/a2a/v1", json=rpc_request)
|
||||
assert resp.status_code == 200
|
||||
data = resp.json()
|
||||
assert "result" in data
|
||||
assert "task" in data["result"]
|
||||
|
||||
task = data["result"]["task"]
|
||||
assert task["status"]["state"] == "TASK_STATE_COMPLETED"
|
||||
assert len(task["artifacts"]) == 1
|
||||
assert "Echo" in task["artifacts"][0]["parts"][0]["text"]
|
||||
|
||||
def test_get_task(self):
|
||||
server = self._make_server()
|
||||
client = TestClient(server.app)
|
||||
|
||||
# Create a task first
|
||||
send_req = {
|
||||
"jsonrpc": "2.0",
|
||||
"id": "s1",
|
||||
"method": "SendMessage",
|
||||
"params": {
|
||||
"message": {
|
||||
"messageId": "m1",
|
||||
"role": "ROLE_USER",
|
||||
"parts": [{"text": "get me"}],
|
||||
},
|
||||
"configuration": {},
|
||||
},
|
||||
}
|
||||
send_resp = client.post("/a2a/v1", json=send_req)
|
||||
task_id = send_resp.json()["result"]["task"]["id"]
|
||||
|
||||
# Now fetch it
|
||||
get_req = {
|
||||
"jsonrpc": "2.0",
|
||||
"id": "g1",
|
||||
"method": "GetTask",
|
||||
"params": {"id": task_id},
|
||||
}
|
||||
get_resp = client.post("/a2a/v1", json=get_req)
|
||||
assert get_resp.status_code == 200
|
||||
assert get_resp.json()["result"]["id"] == task_id
|
||||
|
||||
def test_get_nonexistent_task(self):
|
||||
server = self._make_server()
|
||||
client = TestClient(server.app)
|
||||
|
||||
req = {
|
||||
"jsonrpc": "2.0",
|
||||
"id": "g2",
|
||||
"method": "GetTask",
|
||||
"params": {"id": "nonexistent"},
|
||||
}
|
||||
resp = client.post("/a2a/v1", json=req)
|
||||
assert resp.status_code == 400
|
||||
data = resp.json()
|
||||
assert "error" in data
|
||||
|
||||
def test_list_tasks(self):
|
||||
server = self._make_server()
|
||||
client = TestClient(server.app)
|
||||
|
||||
# Create two tasks
|
||||
for i in range(2):
|
||||
req = {
|
||||
"jsonrpc": "2.0",
|
||||
"id": f"s{i}",
|
||||
"method": "SendMessage",
|
||||
"params": {
|
||||
"message": {
|
||||
"messageId": f"m{i}",
|
||||
"role": "ROLE_USER",
|
||||
"parts": [{"text": f"task {i}"}],
|
||||
},
|
||||
"configuration": {},
|
||||
},
|
||||
}
|
||||
client.post("/a2a/v1", json=req)
|
||||
|
||||
list_req = {
|
||||
"jsonrpc": "2.0",
|
||||
"id": "l1",
|
||||
"method": "ListTasks",
|
||||
"params": {"pageSize": 10},
|
||||
}
|
||||
resp = client.post("/a2a/v1", json=list_req)
|
||||
assert resp.status_code == 200
|
||||
tasks = resp.json()["result"]["tasks"]
|
||||
assert len(tasks) >= 2
|
||||
|
||||
def test_cancel_task(self):
|
||||
from nexus.a2a.server import A2AServer
|
||||
|
||||
# Create a server with a slow handler so task stays WORKING
|
||||
async def slow_handler(task, card):
|
||||
import asyncio
|
||||
await asyncio.sleep(10) # never reached in test
|
||||
task.status = TaskStatus(state=TaskState.COMPLETED)
|
||||
return task
|
||||
|
||||
card = AgentCard(name="SlowAgent", description="Slow test agent")
|
||||
server = A2AServer(card=card)
|
||||
server.set_default_handler(slow_handler)
|
||||
client = TestClient(server.app)
|
||||
|
||||
# Create a task (but we need to intercept before handler runs)
|
||||
# Instead, manually insert a task and test cancel on it
|
||||
task = Task(
|
||||
id="cancel-me",
|
||||
status=TaskStatus(state=TaskState.WORKING),
|
||||
history=[
|
||||
Message(role=Role.USER, parts=[TextPart(text="cancel me")])
|
||||
],
|
||||
)
|
||||
server._tasks[task.id] = task
|
||||
|
||||
# Cancel it
|
||||
cancel_req = {
|
||||
"jsonrpc": "2.0",
|
||||
"id": "c2",
|
||||
"method": "CancelTask",
|
||||
"params": {"id": "cancel-me"},
|
||||
}
|
||||
cancel_resp = client.post("/a2a/v1", json=cancel_req)
|
||||
assert cancel_resp.status_code == 200
|
||||
assert cancel_resp.json()["result"]["status"]["state"] == "TASK_STATE_CANCELED"
|
||||
|
||||
def test_auth_required(self):
|
||||
server = self._make_server(auth_token="secret123")
|
||||
client = TestClient(server.app)
|
||||
|
||||
# No auth header — should get 401
|
||||
req = {
|
||||
"jsonrpc": "2.0",
|
||||
"id": "a1",
|
||||
"method": "SendMessage",
|
||||
"params": {
|
||||
"message": {
|
||||
"messageId": "am1",
|
||||
"role": "ROLE_USER",
|
||||
"parts": [{"text": "hello"}],
|
||||
},
|
||||
"configuration": {},
|
||||
},
|
||||
}
|
||||
resp = client.post("/a2a/v1", json=req)
|
||||
assert resp.status_code == 401
|
||||
|
||||
def test_auth_success(self):
|
||||
server = self._make_server(auth_token="secret123")
|
||||
client = TestClient(server.app)
|
||||
|
||||
req = {
|
||||
"jsonrpc": "2.0",
|
||||
"id": "a2",
|
||||
"method": "SendMessage",
|
||||
"params": {
|
||||
"message": {
|
||||
"messageId": "am2",
|
||||
"role": "ROLE_USER",
|
||||
"parts": [{"text": "authenticated"}],
|
||||
},
|
||||
"configuration": {},
|
||||
},
|
||||
}
|
||||
resp = client.post(
|
||||
"/a2a/v1",
|
||||
json=req,
|
||||
headers={"Authorization": "Bearer secret123"},
|
||||
)
|
||||
assert resp.status_code == 200
|
||||
assert resp.json()["result"]["task"]["status"]["state"] == "TASK_STATE_COMPLETED"
|
||||
|
||||
def test_unknown_method(self):
|
||||
server = self._make_server()
|
||||
client = TestClient(server.app)
|
||||
|
||||
req = {
|
||||
"jsonrpc": "2.0",
|
||||
"id": "u1",
|
||||
"method": "NonExistentMethod",
|
||||
"params": {},
|
||||
}
|
||||
resp = client.post("/a2a/v1", json=req)
|
||||
assert resp.status_code == 400
|
||||
assert resp.json()["error"]["code"] == -32602
|
||||
|
||||
def test_audit_log(self):
|
||||
server = self._make_server()
|
||||
client = TestClient(server.app)
|
||||
|
||||
req = {
|
||||
"jsonrpc": "2.0",
|
||||
"id": "au1",
|
||||
"method": "SendMessage",
|
||||
"params": {
|
||||
"message": {
|
||||
"messageId": "aum1",
|
||||
"role": "ROLE_USER",
|
||||
"parts": [{"text": "audit me"}],
|
||||
},
|
||||
"configuration": {},
|
||||
},
|
||||
}
|
||||
client.post("/a2a/v1", json=req)
|
||||
client.post("/a2a/v1", json=req)
|
||||
|
||||
log = server.get_audit_log()
|
||||
assert len(log) == 2
|
||||
assert all(entry["method"] == "SendMessage" for entry in log)
|
||||
|
||||
|
||||
# === Custom Handler Test ===
|
||||
|
||||
|
||||
@pytest.mark.skipif(not HAS_TEST_CLIENT, reason="fastapi not installed")
|
||||
class TestCustomHandlers:
|
||||
"""Test custom task handlers."""
|
||||
|
||||
def test_skill_routing(self):
|
||||
from nexus.a2a.server import A2AServer
|
||||
from nexus.a2a.types import Task, AgentCard
|
||||
|
||||
async def ci_handler(task: Task, card: AgentCard) -> Task:
|
||||
task.artifacts.append(
|
||||
Artifact(
|
||||
parts=[TextPart(text="CI pipeline healthy: 5/5 passed")],
|
||||
name="ci_report",
|
||||
)
|
||||
)
|
||||
task.status = TaskStatus(state=TaskState.COMPLETED)
|
||||
return task
|
||||
|
||||
card = AgentCard(
|
||||
name="CI Agent",
|
||||
description="CI specialist",
|
||||
skills=[AgentSkill(id="ci-health", name="CI Health", description="Check CI", tags=["ci"])],
|
||||
)
|
||||
server = A2AServer(card=card)
|
||||
server.register_handler("ci-health", ci_handler)
|
||||
|
||||
client = TestClient(server.app)
|
||||
req = {
|
||||
"jsonrpc": "2.0",
|
||||
"id": "h1",
|
||||
"method": "SendMessage",
|
||||
"params": {
|
||||
"message": {
|
||||
"messageId": "hm1",
|
||||
"role": "ROLE_USER",
|
||||
"parts": [{"text": "Check CI"}],
|
||||
"metadata": {"targetSkill": "ci-health"},
|
||||
},
|
||||
"configuration": {},
|
||||
},
|
||||
}
|
||||
resp = client.post("/a2a/v1", json=req)
|
||||
task_data = resp.json()["result"]["task"]
|
||||
assert task_data["status"]["state"] == "TASK_STATE_COMPLETED"
|
||||
assert "5/5 passed" in task_data["artifacts"][0]["parts"][0]["text"]
|
||||
|
||||
def test_handler_error(self):
|
||||
from nexus.a2a.server import A2AServer
|
||||
from nexus.a2a.types import Task, AgentCard
|
||||
|
||||
async def failing_handler(task: Task, card: AgentCard) -> Task:
|
||||
raise RuntimeError("Handler blew up")
|
||||
|
||||
card = AgentCard(name="Fail Agent", description="Fails")
|
||||
server = A2AServer(card=card)
|
||||
server.set_default_handler(failing_handler)
|
||||
|
||||
client = TestClient(server.app)
|
||||
req = {
|
||||
"jsonrpc": "2.0",
|
||||
"id": "f1",
|
||||
"method": "SendMessage",
|
||||
"params": {
|
||||
"message": {
|
||||
"messageId": "fm1",
|
||||
"role": "ROLE_USER",
|
||||
"parts": [{"text": "break"}],
|
||||
},
|
||||
"configuration": {},
|
||||
},
|
||||
}
|
||||
resp = client.post("/a2a/v1", json=req)
|
||||
task_data = resp.json()["result"]["task"]
|
||||
assert task_data["status"]["state"] == "TASK_STATE_FAILED"
|
||||
assert "blew up" in task_data["status"]["message"]["parts"][0]["text"].lower()
|
||||
143
tests/test_fleet_audit.py
Normal file
143
tests/test_fleet_audit.py
Normal file
@@ -0,0 +1,143 @@
|
||||
"""Tests for fleet_audit — Deduplicate Agents, One Identity Per Machine."""
|
||||
import json
|
||||
import tempfile
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
import yaml
|
||||
|
||||
# Adjust import path
|
||||
import sys
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parent.parent / "bin"))
|
||||
|
||||
from fleet_audit import (
|
||||
AuditFinding,
|
||||
validate_registry,
|
||||
cross_reference_registry_agents,
|
||||
audit_git_authors,
|
||||
)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Identity registry validation tests
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
class TestValidateRegistry:
|
||||
"""Test identity registry validation rules."""
|
||||
|
||||
def _make_registry(self, agents):
|
||||
return {"version": 1, "agents": agents, "rules": {"one_identity_per_machine": True}}
|
||||
|
||||
def test_clean_registry_passes(self):
|
||||
registry = self._make_registry([
|
||||
{"name": "allegro", "machine": "167.99.126.228", "role": "burn", "gitea_user": "allegro"},
|
||||
{"name": "ezra", "machine": "143.198.27.163", "role": "triage", "gitea_user": "ezra"},
|
||||
])
|
||||
findings = validate_registry(registry)
|
||||
critical = [f for f in findings if f.severity == "critical"]
|
||||
assert len(critical) == 0
|
||||
|
||||
def test_same_name_on_different_machines_detected(self):
|
||||
registry = self._make_registry([
|
||||
{"name": "allegro", "machine": "167.99.126.228", "role": "burn"},
|
||||
{"name": "allegro", "machine": "104.131.15.18", "role": "burn"},
|
||||
])
|
||||
findings = validate_registry(registry)
|
||||
critical = [f for f in findings if f.severity == "critical" and f.category == "duplicate"]
|
||||
# Two findings: one for name-on-multiple-machines, one for duplicate name
|
||||
assert len(critical) >= 1
|
||||
machine_findings = [f for f in critical if "registered on" in f.description]
|
||||
assert len(machine_findings) == 1
|
||||
assert "167.99.126.228" in machine_findings[0].description
|
||||
assert "104.131.15.18" in machine_findings[0].description
|
||||
|
||||
def test_multiple_agents_same_machine_ok(self):
|
||||
# Multiple different agents on the same VPS is normal.
|
||||
registry = self._make_registry([
|
||||
{"name": "allegro", "machine": "167.99.126.228", "role": "burn"},
|
||||
{"name": "bilbo", "machine": "167.99.126.228", "role": "queries"},
|
||||
])
|
||||
findings = validate_registry(registry)
|
||||
critical = [f for f in findings if f.severity == "critical"]
|
||||
assert len(critical) == 0
|
||||
|
||||
def test_duplicate_name_detected(self):
|
||||
registry = self._make_registry([
|
||||
{"name": "bezalel", "machine": "104.131.15.18", "role": "ci"},
|
||||
{"name": "bezalel", "machine": "167.99.126.228", "role": "ci"},
|
||||
])
|
||||
findings = validate_registry(registry)
|
||||
name_dupes = [f for f in findings if f.severity == "critical" and "bezalel" in f.description.lower() and "registered on" in f.description.lower()]
|
||||
assert len(name_dupes) == 1
|
||||
|
||||
def test_duplicate_gitea_user_detected(self):
|
||||
registry = self._make_registry([
|
||||
{"name": "agent-a", "machine": "host1", "role": "x", "gitea_user": "shared"},
|
||||
{"name": "agent-b", "machine": "host2", "role": "x", "gitea_user": "shared"},
|
||||
])
|
||||
findings = validate_registry(registry)
|
||||
gitea_dupes = [f for f in findings if "Gitea user 'shared'" in f.description]
|
||||
assert len(gitea_dupes) == 1
|
||||
assert "agent-a" in gitea_dupes[0].affected
|
||||
assert "agent-b" in gitea_dupes[0].affected
|
||||
|
||||
def test_missing_required_fields(self):
|
||||
registry = self._make_registry([
|
||||
{"name": "incomplete-agent"},
|
||||
])
|
||||
findings = validate_registry(registry)
|
||||
missing = [f for f in findings if f.category == "orphan"]
|
||||
assert len(missing) >= 1
|
||||
assert "machine" in missing[0].description or "role" in missing[0].description
|
||||
|
||||
def test_empty_registry_passes(self):
|
||||
registry = self._make_registry([])
|
||||
findings = validate_registry(registry)
|
||||
assert len(findings) == 0
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Cross-reference tests
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
class TestCrossReference:
|
||||
"""Test registry vs fleet-routing.json cross-reference."""
|
||||
|
||||
def test_orphan_in_fleet_not_registry(self):
|
||||
reg_agents = [{"name": "allegro", "machine": "x", "role": "y"}]
|
||||
fleet_agents = [{"name": "allegro", "location": "x"}, {"name": "unknown-agent", "location": "y"}]
|
||||
findings = cross_reference_registry_agents(reg_agents, fleet_agents)
|
||||
orphans = [f for f in findings if f.category == "orphan" and "unknown-agent" in f.description]
|
||||
assert len(orphans) == 1
|
||||
|
||||
def test_location_mismatch_detected(self):
|
||||
reg_agents = [{"name": "allegro", "machine": "167.99.126.228", "role": "y"}]
|
||||
fleet_agents = [{"name": "allegro", "location": "totally-different-host"}]
|
||||
findings = cross_reference_registry_agents(reg_agents, fleet_agents)
|
||||
mismatches = [f for f in findings if f.category == "duplicate" and "different locations" in f.description]
|
||||
assert len(mismatches) == 1
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Integration test against actual registry
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
class TestRealRegistry:
|
||||
"""Test against the actual identity-registry.yaml in the repo."""
|
||||
|
||||
def test_registry_loads(self):
|
||||
reg_path = Path(__file__).resolve().parent.parent / "fleet" / "identity-registry.yaml"
|
||||
if reg_path.exists():
|
||||
with open(reg_path) as f:
|
||||
registry = yaml.safe_load(f)
|
||||
assert registry["version"] == 1
|
||||
assert len(registry["agents"]) > 0
|
||||
|
||||
def test_registry_no_critical_findings(self):
|
||||
reg_path = Path(__file__).resolve().parent.parent / "fleet" / "identity-registry.yaml"
|
||||
if reg_path.exists():
|
||||
with open(reg_path) as f:
|
||||
registry = yaml.safe_load(f)
|
||||
findings = validate_registry(registry)
|
||||
critical = [f for f in findings if f.severity == "critical"]
|
||||
assert len(critical) == 0, f"Critical findings: {[f.description for f in critical]}"
|
||||
92
tests/test_llama_client.py
Normal file
92
tests/test_llama_client.py
Normal file
@@ -0,0 +1,92 @@
|
||||
"""Tests for llama_client."""
|
||||
from unittest.mock import patch
|
||||
from pathlib import Path
|
||||
import pytest, sys
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
||||
from bin.llama_client import LlamaClient, ChatMessage, HealthStatus
|
||||
|
||||
class TestChatMessage:
|
||||
def test_creation(self):
|
||||
m = ChatMessage("user", "Hello")
|
||||
assert m.role == "user" and m.content == "Hello"
|
||||
|
||||
class TestHealthStatus:
|
||||
def test_healthy(self):
|
||||
s = HealthStatus(True, "http://x:11435", model_loaded=True)
|
||||
assert s.healthy and s.model_loaded
|
||||
|
||||
class TestLlamaClient:
|
||||
def test_defaults(self):
|
||||
c = LlamaClient()
|
||||
assert c.endpoint == "http://localhost:11435" and c.model == "qwen2.5-7b"
|
||||
|
||||
def test_custom(self):
|
||||
c = LlamaClient("http://x:8080", "mistral")
|
||||
assert c.endpoint == "http://x:8080" and c.model == "mistral"
|
||||
|
||||
def test_trailing_slash(self):
|
||||
assert LlamaClient("http://x/").endpoint == "http://x"
|
||||
|
||||
@patch("bin.llama_client._http_get")
|
||||
def test_health_ok(self, m):
|
||||
m.return_value = {"status": "ok"}
|
||||
assert LlamaClient().health_check().healthy is True
|
||||
|
||||
@patch("bin.llama_client._http_get")
|
||||
def test_health_fail(self, m):
|
||||
m.side_effect = ConnectionError("down")
|
||||
s = LlamaClient().health_check()
|
||||
assert s.healthy is False and "down" in s.error
|
||||
|
||||
@patch("bin.llama_client._http_get")
|
||||
def test_is_healthy(self, m):
|
||||
m.return_value = {"status": "ok"}
|
||||
assert LlamaClient().is_healthy() is True
|
||||
|
||||
@patch("bin.llama_client._http_get")
|
||||
def test_list_models(self, m):
|
||||
m.return_value = {"data": [{"id": "qwen"}]}
|
||||
assert len(LlamaClient().list_models()) == 1
|
||||
|
||||
@patch("bin.llama_client._http_get")
|
||||
def test_list_models_fail(self, m):
|
||||
m.side_effect = ConnectionError()
|
||||
assert LlamaClient().list_models() == []
|
||||
|
||||
@patch("bin.llama_client._http_post")
|
||||
def test_chat(self, m):
|
||||
m.return_value = {"choices": [{"message": {"content": "Hi"}, "finish_reason": "stop"}], "usage": {"total_tokens": 10}}
|
||||
r = LlamaClient().chat([ChatMessage("user", "test")])
|
||||
assert r.text == "Hi" and r.tokens_used == 10
|
||||
|
||||
@patch("bin.llama_client._http_post")
|
||||
def test_chat_params(self, m):
|
||||
m.return_value = {"choices": [{"message": {"content": "OK"}, "finish_reason": "stop"}], "usage": {}}
|
||||
LlamaClient().chat([ChatMessage("user", "t")], max_tokens=100, temperature=0.3)
|
||||
d = m.call_args[0][1]
|
||||
assert d["max_tokens"] == 100 and d["temperature"] == 0.3
|
||||
|
||||
@patch("bin.llama_client._http_post")
|
||||
def test_simple_chat(self, m):
|
||||
m.return_value = {"choices": [{"message": {"content": "Yes"}, "finish_reason": "stop"}], "usage": {}}
|
||||
assert LlamaClient().simple_chat("test") == "Yes"
|
||||
|
||||
@patch("bin.llama_client._http_post")
|
||||
def test_simple_chat_system(self, m):
|
||||
m.return_value = {"choices": [{"message": {"content": "OK"}, "finish_reason": "stop"}], "usage": {}}
|
||||
LlamaClient().simple_chat("t", system="helpful")
|
||||
assert len(m.call_args[0][1]["messages"]) == 2
|
||||
|
||||
@patch("bin.llama_client._http_post")
|
||||
def test_complete(self, m):
|
||||
m.return_value = {"content": "result", "tokens_predicted": 50}
|
||||
r = LlamaClient().complete("prompt")
|
||||
assert r.text == "result" and r.tokens_used == 50
|
||||
|
||||
@patch("bin.llama_client.time.time")
|
||||
@patch("bin.llama_client._http_post")
|
||||
def test_benchmark(self, mp, mt):
|
||||
mp.return_value = {"choices": [{"message": {"content": "OK"}, "finish_reason": "stop"}], "usage": {"total_tokens": 10}}
|
||||
mt.side_effect = [0.0, 0.05, 0.05, 0.1, 0.1, 0.15]
|
||||
r = LlamaClient().benchmark(iterations=2)
|
||||
assert r["iterations"] == 2 and r["avg_latency_ms"] > 0 and r["tok_per_sec"] > 0
|
||||
@@ -1,254 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
/**
|
||||
* ═══════════════════════════════════════════
|
||||
* NEXUS TEXTURE AUDIT CLI — Standalone Audit Tool
|
||||
* ═══════════════════════════════════════════
|
||||
*
|
||||
* Command-line tool to audit textures in the Nexus project.
|
||||
* Provides compression recommendations and VRAM estimates.
|
||||
*/
|
||||
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const { execSync } = require('child_process');
|
||||
|
||||
// Configuration
|
||||
const CONFIG = {
|
||||
maxTextureSize: 2048,
|
||||
maxTotalTextures: 50,
|
||||
maxTotalVRAM: 256 * 1024 * 1024, // 256MB
|
||||
textureExtensions: ['.png', '.jpg', '.jpeg', '.gif', '.bmp', '.webp', '.basis', '.ktx2'],
|
||||
imageMagickPath: 'convert', // Path to ImageMagick convert
|
||||
};
|
||||
|
||||
class TextureAuditor {
|
||||
constructor(projectRoot) {
|
||||
this.projectRoot = projectRoot;
|
||||
this.textureFiles = [];
|
||||
this.auditResults = [];
|
||||
this.totalVRAM = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Scan project for texture files
|
||||
*/
|
||||
scanForTextures() {
|
||||
console.log(`Scanning ${this.projectRoot} for textures...`);
|
||||
|
||||
const scanDir = (dir) => {
|
||||
const entries = fs.readdirSync(dir, { withFileTypes: true });
|
||||
|
||||
for (const entry of entries) {
|
||||
const fullPath = path.join(dir, entry.name);
|
||||
|
||||
if (entry.isDirectory()) {
|
||||
// Skip node_modules and .git
|
||||
if (entry.name !== 'node_modules' && entry.name !== '.git') {
|
||||
scanDir(fullPath);
|
||||
}
|
||||
} else if (entry.isFile()) {
|
||||
const ext = path.extname(entry.name).toLowerCase();
|
||||
if (CONFIG.textureExtensions.includes(ext)) {
|
||||
this.textureFiles.push(fullPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
scanDir(this.projectRoot);
|
||||
console.log(`Found ${this.textureFiles.length} texture files`);
|
||||
return this.textureFiles;
|
||||
}
|
||||
|
||||
/**
|
||||
* Audit a single texture file
|
||||
*/
|
||||
auditTexture(filePath) {
|
||||
const result = {
|
||||
file: path.relative(this.projectRoot, filePath),
|
||||
issues: [],
|
||||
recommendations: [],
|
||||
score: 100,
|
||||
};
|
||||
|
||||
try {
|
||||
const stats = fs.statSync(filePath);
|
||||
const fileSize = stats.size;
|
||||
const ext = path.extname(filePath).toLowerCase();
|
||||
|
||||
// Get image dimensions if possible
|
||||
let width = 0;
|
||||
let height = 0;
|
||||
|
||||
try {
|
||||
const identify = execSync(`${CONFIG.imageMagickPath} -format "%wx%h" "${filePath}"`, { encoding: 'utf8' });
|
||||
const match = identify.match(/(\d+)x(\d+)/);
|
||||
if (match) {
|
||||
width = parseInt(match[1]);
|
||||
height = parseInt(match[2]);
|
||||
}
|
||||
} catch (e) {
|
||||
// ImageMagick not available, skip dimension check
|
||||
}
|
||||
|
||||
// Calculate estimated VRAM (RGBA)
|
||||
const vram = width * height * 4;
|
||||
this.totalVRAM += vram;
|
||||
|
||||
// Check file size
|
||||
if (fileSize > 10 * 1024 * 1024) { // >10MB
|
||||
result.issues.push(`Large file size: ${(fileSize / 1024 / 1024).toFixed(1)}MB`);
|
||||
result.recommendations.push('Consider compressing or using a different format');
|
||||
result.score -= 20;
|
||||
}
|
||||
|
||||
// Check dimensions
|
||||
if (width > CONFIG.maxTextureSize || height > CONFIG.maxTextureSize) {
|
||||
result.issues.push(`Texture too large: ${width}x${height} (max: ${CONFIG.maxTextureSize}x${CONFIG.maxTextureSize})`);
|
||||
result.recommendations.push(`Resize to ${CONFIG.maxTextureSize}x${CONFIG.maxTextureSize} or smaller`);
|
||||
result.score -= 30;
|
||||
}
|
||||
|
||||
// Check if power of two
|
||||
if (width > 0 && height > 0) {
|
||||
if (!this.isPowerOfTwo(width) || !this.isPowerOfTwo(height)) {
|
||||
result.issues.push('Texture dimensions not power of two');
|
||||
result.recommendations.push('Resize to nearest power of two (e.g., 512x512, 1024x1024)');
|
||||
result.score -= 15;
|
||||
}
|
||||
}
|
||||
|
||||
// Check format
|
||||
if (ext === '.png' || ext === '.jpg' || ext === '.jpeg') {
|
||||
result.recommendations.push('Consider using WebP for better compression');
|
||||
result.score -= 10;
|
||||
}
|
||||
|
||||
// Check VRAM usage
|
||||
if (vram > 16 * 1024 * 1024) { // >16MB
|
||||
result.issues.push(`High VRAM usage: ${(vram / 1024 / 1024).toFixed(1)}MB`);
|
||||
result.recommendations.push('Use compressed texture format (WebP, Basis, or KTX2)');
|
||||
result.score -= 20;
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
result.issues.push(`Error reading file: ${error.message}`);
|
||||
result.score = 0;
|
||||
}
|
||||
|
||||
result.score = Math.max(0, result.score);
|
||||
this.auditResults.push(result);
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Run full audit
|
||||
*/
|
||||
audit() {
|
||||
this.scanForTextures();
|
||||
|
||||
console.log('\n=== Texture Audit Results ===\n');
|
||||
|
||||
let totalScore = 0;
|
||||
let issuesFound = 0;
|
||||
|
||||
for (const file of this.textureFiles) {
|
||||
const result = this.auditTexture(file);
|
||||
totalScore += result.score;
|
||||
issuesFound += result.issues.length;
|
||||
|
||||
if (result.issues.length > 0) {
|
||||
console.log(`\n${result.file}:`);
|
||||
console.log(` Score: ${result.score}/100`);
|
||||
result.issues.forEach(issue => console.log(` ⚠️ ${issue}`));
|
||||
result.recommendations.forEach(rec => console.log(` 💡 ${rec}`));
|
||||
}
|
||||
}
|
||||
|
||||
// Summary
|
||||
console.log('\n=== Audit Summary ===');
|
||||
console.log(`Total textures: ${this.textureFiles.length}`);
|
||||
console.log(`Total VRAM: ${(this.totalVRAM / 1024 / 1024).toFixed(1)}MB`);
|
||||
console.log(`Average score: ${(totalScore / this.textureFiles.length).toFixed(1)}/100`);
|
||||
console.log(`Issues found: ${issuesFound}`);
|
||||
console.log(`Texture limit: ${this.textureFiles.length > CONFIG.maxTotalTextures ? 'EXCEEDED' : 'OK'}`);
|
||||
console.log(`VRAM limit: ${this.totalVRAM > CONFIG.maxTotalVRAM ? 'EXCEEDED' : 'OK'}`);
|
||||
|
||||
// Generate compression plan
|
||||
this.generateCompressionPlan();
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate compression plan
|
||||
*/
|
||||
generateCompressionPlan() {
|
||||
console.log('\n=== Compression Plan ===');
|
||||
|
||||
const webpCandidates = [];
|
||||
const resizeCandidates = [];
|
||||
|
||||
for (const result of this.auditResults) {
|
||||
if (result.score < 80) {
|
||||
const ext = path.extname(result.file).toLowerCase();
|
||||
|
||||
if (ext === '.png' || ext === '.jpg' || ext === '.jpeg') {
|
||||
webpCandidates.push(result.file);
|
||||
}
|
||||
|
||||
if (result.issues.some(i => i.includes('too large'))) {
|
||||
resizeCandidates.push(result.file);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
console.log(`Textures to convert to WebP: ${webpCandidates.length}`);
|
||||
webpCandidates.forEach(f => console.log(` 📦 ${f}`));
|
||||
|
||||
console.log(`Textures to resize: ${resizeCandidates.length}`);
|
||||
resizeCandidates.forEach(f => console.log(` 📐 ${f}`));
|
||||
|
||||
if (webpCandidates.length > 0) {
|
||||
console.log('\nTo convert to WebP:');
|
||||
console.log(' for file in *.png; do cwebp -q 80 "$file" -o "${file%.png}.webp"; done');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if number is power of two
|
||||
*/
|
||||
isPowerOfTwo(n) {
|
||||
return n !== 0 && (n & (n - 1)) === 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Save audit results to JSON
|
||||
*/
|
||||
saveResults(outputPath) {
|
||||
const report = {
|
||||
timestamp: new Date().toISOString(),
|
||||
projectRoot: this.projectRoot,
|
||||
totalTextures: this.textureFiles.length,
|
||||
totalVRAM: this.totalVRAM,
|
||||
averageScore: this.auditResults.reduce((sum, r) => sum + r.score, 0) / this.auditResults.length,
|
||||
results: this.auditResults,
|
||||
};
|
||||
|
||||
fs.writeFileSync(outputPath, JSON.stringify(report, null, 2));
|
||||
console.log(`\nAudit results saved to: ${outputPath}`);
|
||||
}
|
||||
}
|
||||
|
||||
// CLI interface
|
||||
if (require.main === module) {
|
||||
const projectRoot = process.argv[2] || process.cwd();
|
||||
const auditor = new TextureAuditor(projectRoot);
|
||||
|
||||
auditor.audit();
|
||||
|
||||
// Save results if output path provided
|
||||
if (process.argv[3]) {
|
||||
auditor.saveResults(process.argv[3]);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = TextureAuditor;
|
||||
@@ -26,11 +26,18 @@ import threading
|
||||
import hashlib
|
||||
import os
|
||||
import sys
|
||||
from http.server import HTTPServer, BaseHTTPRequestHandler
|
||||
from http.server import BaseHTTPRequestHandler, HTTPServer
|
||||
from socketserver import ThreadingMixIn
|
||||
from pathlib import Path
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
|
||||
|
||||
class ThreadingHTTPServer(ThreadingMixIn, HTTPServer):
|
||||
"""Thread-per-request server for concurrent multi-user handling."""
|
||||
daemon_threads = True
|
||||
|
||||
|
||||
# ── Configuration ──────────────────────────────────────────────────────
|
||||
|
||||
BRIDGE_PORT = int(os.environ.get('TIMMY_BRIDGE_PORT', 4004))
|
||||
@@ -274,7 +281,7 @@ def main():
|
||||
print(f" POST /bridge/move — Move user to room (user_id, room)")
|
||||
print()
|
||||
|
||||
server = HTTPServer((BRIDGE_HOST, BRIDGE_PORT), BridgeHandler)
|
||||
server = ThreadingHTTPServer((BRIDGE_HOST, BRIDGE_PORT), BridgeHandler)
|
||||
server.serve_forever()
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user