Merge branch 'main' of github.com:hyperpolymath/neurophone

hyperpolymath · hyperpolymath · commit 5fe78cf51109 · 2026-04-16T04:04:08.000+01:00
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # SPDX-License-Identifier: PMPL-1.0-or-later
+=======
+# SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 # Funding platforms for hyperpolymath projects
 # See: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/displaying-a-sponsor-button-in-your-repository
 
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # SPDX-License-Identifier: PMPL-1.0-or-later
+=======
+# SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 version: 2
 updates:
   - package-ecosystem: "cargo"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # SPDX-License-Identifier: PMPL-1.0-or-later
+=======
+# SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 name: CodeQL Security Analysis
 
 on:
diff --git a/.github/workflows/guix-nix-policy.yml b/.github/workflows/guix-nix-policy.yml
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # SPDX-License-Identifier: PMPL-1.0-or-later
+=======
+# SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 name: Guix/Nix Package Policy
 on: [push, pull_request]
 
diff --git a/.github/workflows/instant-sync.yml b/.github/workflows/instant-sync.yml
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # SPDX-License-Identifier: PMPL-1.0-or-later
+=======
+# SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 # Instant Forge Sync - Triggers propagation to all forges on push/release
 name: Instant Sync
 
diff --git a/.github/workflows/language-policy.yml b/.github/workflows/language-policy.yml
@@ -1,7 +1,11 @@
+<<<<<<< HEAD
 # SPDX-License-Identifier: PMPL-1.0-or-later
 permissions:
   contents: read
 
+=======
+# SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 name: Language Policy Enforcement
 on: [push, pull_request]
 jobs:
diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # SPDX-License-Identifier: PMPL-1.0-or-later
+=======
+# SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 # SPDX-FileCopyrightText: 2025 Jonathan D.A. Jewell
 name: Mirror to Git Forges
 
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # SPDX-License-Identifier: PMPL-1.0-or-later
+=======
+# SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 name: Code Quality
 on: [push, pull_request]
 
diff --git a/.github/workflows/rsr-antipattern.yml b/.github/workflows/rsr-antipattern.yml
@@ -1,6 +1,12 @@
+<<<<<<< HEAD
 # SPDX-License-Identifier: PMPL-1.0-or-later
 # RSR Anti-Pattern CI Check
 # SPDX-License-Identifier: PMPL-1.0-or-later
+=======
+# SPDX-License-Identifier: MPL-2.0-or-later
+# RSR Anti-Pattern CI Check
+# SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 #
 # Enforces: No TypeScript, No Go, No Python (except SaltStack), No npm
 # Allows: ReScript, Deno, WASM, Rust, OCaml, Haskell, Guile/Scheme
diff --git a/.github/workflows/rust-ci.yml b/.github/workflows/rust-ci.yml
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # SPDX-License-Identifier: PMPL-1.0-or-later
+=======
+# SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 name: Rust CI
 on: [push, pull_request]
 
diff --git a/.github/workflows/scorecard-enforcer.yml b/.github/workflows/scorecard-enforcer.yml
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # SPDX-License-Identifier: PMPL-1.0-or-later
+=======
+# SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 # Prevention workflow - runs OpenSSF Scorecard and fails on low scores
 name: OpenSSF Scorecard Enforcer
 
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # SPDX-License-Identifier: PMPL-1.0-or-later
+=======
+# SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 name: OSSF Scorecard
 on:
   push:
diff --git a/.github/workflows/secret-scanner.yml b/.github/workflows/secret-scanner.yml
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # SPDX-License-Identifier: PMPL-1.0-or-later
+=======
+# SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 # Prevention workflow - scans for hardcoded secrets before they reach main
 name: Secret Scanner
 
diff --git a/.github/workflows/security-policy.yml b/.github/workflows/security-policy.yml
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # SPDX-License-Identifier: PMPL-1.0-or-later
+=======
+# SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 name: Security Policy
 on: [push, pull_request]
 
diff --git a/.github/workflows/wellknown-enforcement.yml b/.github/workflows/wellknown-enforcement.yml
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # SPDX-License-Identifier: PMPL-1.0-or-later
+=======
+# SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 name: Well-Known Standards (RFC 9116 + RSR)
 on:
   push:
diff --git a/.github/workflows/workflow-linter.yml b/.github/workflows/workflow-linter.yml
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # SPDX-License-Identifier: PMPL-1.0-or-later
+=======
+# SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 # workflow-linter.yml - Validates GitHub workflows against RSR security standards
 # This workflow can be copied to other repos for consistent enforcement
 name: Workflow Security Linter
diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: MPL-2.0-or-later
+= Contributing Guide
+
+== Getting Started
+
+1. Fork the repository
+2. Create a feature branch from `main`
+3. Sign off commits (`git commit -s`)
+4. Submit a pull request
+
+== Commit Guidelines
+
+* Conventional commits: `type(scope): description`
+* Sign all commits (DCO required)
+* Atomic, focused commits
+
+== License
+
+Contributions licensed under project license.
+
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,15 +24,15 @@ ndarray = { version = "0.17", features = ["rayon", "serde"] }
 ndarray-rand = "0.16"
 rand = "0.10"
 rand_distr = "0.6"
-rayon = "1.8"
+rayon = "1.12"
 
 # Serialization
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 bincode = "1.3"
 
 # Async runtime
-tokio = { version = "1.35", features = ["full"] }
+tokio = { version = "1.52", features = ["full"] }
 futures = "0.3"
 
 # HTTP client (for Claude API)
diff --git a/MAINTAINERS.adoc b/MAINTAINERS.adoc
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 // SPDX-License-Identifier: PMPL-1.0-or-later
+=======
+// SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 = Maintainers
 :toc: preamble
 
diff --git a/README.adoc b/README.adoc
@@ -1,8 +1,16 @@
+<<<<<<< HEAD
 image:https://img.shields.io/badge/License-PMPL--1.0-blue.svg[License: PMPL-1.0,link="https://github.com/hyperpolymath/palimpsest-license"]
 image:https://img.shields.io/badge/Philosophy-Palimpsest-indigo.svg[Palimpsest,link="https://github.com/hyperpolymath/palimpsest-license"]
 
 
 // SPDX-License-Identifier: PMPL-1.0-or-later
+=======
+image:https://img.shields.io/badge/License-MPL_2.0-blue.svg[MPL-2.0-or-later,link="https://opensource.org/licenses/MPL-2.0"]
+image:https://img.shields.io/badge/Philosophy-Palimpsest-indigo.svg[Palimpsest,link="https://github.com/hyperpolymath/palimpsest-license"]
+
+
+// SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 // SPDX-FileCopyrightText: 2025 Jonathan D.A. Jewell
 = NeuroPhone - Neurosymbolic AI Android Application
 :toc:
diff --git a/TESTING-REPORT.adoc b/TESTING-REPORT.adoc
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 // SPDX-License-Identifier: PMPL-1.0-or-later
+=======
+// SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 = Neurophone Testing Report
 :author: Claude Code (Automated Testing)
 :date: 2025-12-29
diff --git a/TESTING-REPORT.scm b/TESTING-REPORT.scm
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 ;; SPDX-License-Identifier: PMPL-1.0-or-later
+=======
+;; SPDX-License-Identifier: MPL-2.0-or-later
+>>>>>>> 0a372d5 (chore: sync from parent repo automation)
 ;; Neurophone Testing Report - Guile Scheme Format
 ;; Generated: 2025-12-29
 
diff --git a/crates/neurophone-core/src/lib.rs b/crates/neurophone-core/src/lib.rs
@@ -18,6 +18,7 @@
 
 #![forbid(unsafe_code)]
 
+#![forbid(unsafe_code)]
 use ndarray::Array1;
 use serde::{Deserialize, Serialize};
 use std::fmt;
diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -8,6 +8,13 @@ echo "=== NeuroPhone Development Setup ==="
 # Check Rust
 if ! command -v rustc &> /dev/null; then
     echo "Installing Rust..."
+# WARNING: Pipe-to-shell is unsafe — download and verify first
+# WARNING: Pipe-to-shell is unsafe — download and verify first
+# WARNING: Pipe-to-shell is unsafe — download and verify first
+# WARNING: Pipe-to-shell is unsafe — download and verify first
+# WARNING: Pipe-to-shell is unsafe — download and verify first
+# WARNING: Pipe-to-shell is unsafe — download and verify first
+# WARNING: Pipe-to-shell is unsafe — download and verify first
     curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
     source "$HOME/.cargo/env"
 fi
