From 5721262240b0ae31a9a0740be5d9b0e0caa0109a Mon Sep 17 00:00:00 2001
From: Mark Randall Havens <mark.r.havens@gmail.com>
Date: Sat, 31 May 2025 00:59:10 -0500
Subject: [PATCH] updated radicle again

---
 .radicle-push-state |  2 +-
 gitfield-radicle    | 59 +++++++++++++++------------------------------
 2 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/.radicle-push-state b/.radicle-push-state
index 9ca9a14..a1199ab 100644
--- a/.radicle-push-state
+++ b/.radicle-push-state
@@ -1 +1 @@
-91c7e471421b756dcb7edfbda2e6168a0490a586
+0d32c6edb204b92180b753119e8364c3dccd71da
diff --git a/gitfield-radicle b/gitfield-radicle
index 9cf85fb..b6faaf3 100755
--- a/gitfield-radicle
+++ b/gitfield-radicle
@@ -2,9 +2,6 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-# ╭───────────────────────────────╮
-# │         Config & Paths        │
-# ╰───────────────────────────────╯
 PROJECT_NAME=$(basename "$(pwd)")
 DEFAULT_NAME="Mark Randall Havens"
 DEFAULT_EMAIL="mark.r.havens@gmail.com"
@@ -23,7 +20,6 @@ info()  { echo -e "\e[1;34m[INFO]\e[0m $*"; }
 warn()  { echo -e "\e[1;33m[WARN]\e[0m $*"; }
 error() { echo -e "\e[1;31m[ERROR]\e[0m $*" >&2; exit 1; }
 
-# Git check
 command -v git >/dev/null || {
   sudo apt update && sudo apt install -y git || error "Failed to install Git"
 }
@@ -35,20 +31,15 @@ EMAIL=$(git config --global user.email || true)
   git config --global user.email "$DEFAULT_EMAIL"
 }
 
-# Radicle CLI install
 if [ ! -x "$RAD_BIN" ]; then
   sudo apt install -y curl jq unzip || error "Missing dependencies"
   curl -sSf https://radicle.xyz/install | sh || error "Radicle install failed"
 fi
 
 export PATH="$HOME/.radicle/bin:$PATH"
-if ! grep -Fxq "$RAD_PATH_LINE" "$PROFILE_FILE"; then
-  echo "$RAD_PATH_LINE" >> "$PROFILE_FILE"
-fi
-
+grep -Fxq "$RAD_PATH_LINE" "$PROFILE_FILE" || echo "$RAD_PATH_LINE" >> "$PROFILE_FILE"
 command -v rad >/dev/null || error "Radicle CLI unavailable"
 
-# Identity & backup
 mkdir -p "$(dirname "$RAD_BACKUP")"
 if [ ! -f "$RAD_KEYS" ]; then
   if [ -f "$RAD_BACKUP" ]; then
@@ -59,25 +50,15 @@ if [ ! -f "$RAD_KEYS" ]; then
   fi
 fi
 
-# Start Radicle node
 pgrep -f "rad node start" >/dev/null || {
   nohup rad node start > /dev/null 2>&1 &
   sleep 3
 }
 
-# Git init
-if [ ! -d .git ]; then
-  git init
-  git add .
-  git commit -m "Initial commit"
-fi
+[ -d .git ] || { git init && git add . && git commit -m "Initial commit"; }
 
-# Register Radicle project
-if ! rad projects | grep -q "$PROJECT_NAME"; then
-  rad init --name "$PROJECT_NAME" --description "Radicle sovereign repo for $PROJECT_NAME" || warn "Repo may already exist"
-fi
+rad projects | grep -q "$PROJECT_NAME" || rad init --name "$PROJECT_NAME" --description "Radicle sovereign repo for $PROJECT_NAME" || warn "Repo may already exist"
 
-# Push commit
 CURRENT_BRANCH=$(git symbolic-ref --short HEAD)
 CURRENT_COMMIT=$(git rev-parse HEAD)
 LAST_PUSHED_COMMIT=$(cat "$PUSH_STATE_FILE" 2>/dev/null || echo "none")
@@ -90,22 +71,23 @@ if [[ "$CURRENT_COMMIT" != "$LAST_PUSHED_COMMIT" ]]; then
   fi
 fi
 
-# Robust metadata parsing
+# 🛡 Safe JSON fallback
 RAD_SELF=$(rad self --json 2>/dev/null || echo '{}')
-PROJECT_ID=$(echo "$RAD_SELF" | jq -r '.projectId // empty')
-PEER_ID=$(echo "$RAD_SELF" | jq -r '.peerId // empty')
-REMOTE_SERVERS=$(rad node status 2>/dev/null | grep 'connected to' || echo "Unavailable")
-
-if [[ -n "$PROJECT_ID" ]]; then
-  PROJECT_SLUG="${PROJECT_ID#rad:}"
-  RAD_GATEWAY_URL="https://app.radicle.network/$PROJECT_SLUG"
+if echo "$RAD_SELF" | jq empty >/dev/null 2>&1; then
+  PROJECT_ID=$(echo "$RAD_SELF" | jq -r '.projectId // empty')
+  PEER_ID=$(echo "$RAD_SELF" | jq -r '.peerId // empty')
 else
-  RAD_GATEWAY_URL=""
+  warn "rad self output is not valid JSON"
+  PROJECT_ID=""
+  PEER_ID=""
 fi
 
-# Metadata
+REMOTE_SERVERS=$(rad node status 2>/dev/null | grep 'connected to' || echo "Unavailable")
+RAD_GATEWAY_URL=""
+[[ -n "$PROJECT_ID" ]] && RAD_GATEWAY_URL="https://app.radicle.network/${PROJECT_ID#rad:}"
+
+# 📦 Metadata
 TIMESTAMP=$(date '+%Y-%m-%d %H:%M:%S')
-DEFAULT_BRANCH=$(git symbolic-ref --short HEAD)
 REPO_PATH=$(pwd)
 LATEST_SHA=$(git rev-parse HEAD)
 LAST_COMMIT_MSG=$(git log -1 --pretty=format:"%s")
@@ -131,7 +113,7 @@ LOCAL_IP=$(hostname -I | awk '{print $1}')
 CPU_MODEL=$(grep -m1 'model name' /proc/cpuinfo | cut -d: -f2 | sed 's/^ //')
 RAM_GB=$(awk '/MemTotal/ {printf "%.2f", $2/1024/1024}' /proc/meminfo)
 
-# Markdown Artifact
+# 🧾 Markdown output
 cat > "$MARKDOWN_FILE" <<EOF
 # 🔗 Radicle Repository Link
 
@@ -139,7 +121,7 @@ cat > "$MARKDOWN_FILE" <<EOF
 - **Project ID**: \`$PROJECT_ID\`
 - **Peer ID**: \`$PEER_ID\`
 - **Local Repo Path**: \`$REPO_PATH\`
-- **Default Branch**: \`$DEFAULT_BRANCH\`
+- **Default Branch**: \`$CURRENT_BRANCH\`
 - **Timestamp**: \`$TIMESTAMP\`
 - **Public Gateway URL**: [${RAD_GATEWAY_URL:-Unavailable}](${RAD_GATEWAY_URL:-#})
 
@@ -202,12 +184,11 @@ $REMOTE_SERVERS
 _Auto-generated by \`gitfield-radicle\` push script._
 EOF
 
-# Commit the metadata
 git add "$MARKDOWN_FILE"
 git commit -m "Radicle metadata link commit at $TIMESTAMP" || warn "No changes to commit"
 
-# Final Output
+# ✅ Output Summary
 echo -e "\n✅ Radicle metadata written."
-echo -e "→ Project ID: $PROJECT_ID"
-echo -e "→ Peer ID: $PEER_ID"
+echo -e "→ Project ID: ${PROJECT_ID:-Unavailable}"
+echo -e "→ Peer ID: ${PEER_ID:-Unavailable}"
 [[ -n "$RAD_GATEWAY_URL" ]] && echo -e "🔗 View in Radicle Gateway: $RAD_GATEWAY_URL"