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

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

diff --git a/.radicle-push-state b/.radicle-push-state
index ee8db39..9ca9a14 100644
--- a/.radicle-push-state
+++ b/.radicle-push-state
@@ -1 +1 @@
-2c7f51509853aac3e494cad3892862e9acf6bf2c
+91c7e471421b756dcb7edfbda2e6168a0490a586
diff --git a/gitfield-radicle b/gitfield-radicle
index 845215d..9cf85fb 100755
--- a/gitfield-radicle
+++ b/gitfield-radicle
@@ -23,6 +23,7 @@ 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"
 }
@@ -34,6 +35,7 @@ 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"
@@ -46,7 +48,8 @@ fi
 
 command -v rad >/dev/null || error "Radicle CLI unavailable"
 
-mkdir -p "$(dirname \"$RAD_BACKUP\")"
+# Identity & backup
+mkdir -p "$(dirname "$RAD_BACKUP")"
 if [ ! -f "$RAD_KEYS" ]; then
   if [ -f "$RAD_BACKUP" ]; then
     cp "$RAD_BACKUP" "$RAD_KEYS"
@@ -56,21 +59,25 @@ 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
 
+# 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
 
+# 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")
@@ -83,12 +90,20 @@ if [[ "$CURRENT_COMMIT" != "$LAST_PUSHED_COMMIT" ]]; then
   fi
 fi
 
-PROJECT_ID=$(rad self | grep 'Project ID' | awk '{print $NF}' || true)
-PEER_ID=$(rad self | grep 'Peer ID' | awk '{print $NF}' || true)
-REMOTE_SERVERS=$(rad node status | grep 'connected to' || echo "Unavailable")
-PROJECT_SLUG="${PROJECT_ID#rad:}"
-RAD_GATEWAY_URL="https://app.radicle.network/$PROJECT_SLUG"
+# Robust metadata parsing
+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"
+else
+  RAD_GATEWAY_URL=""
+fi
+
+# Metadata
 TIMESTAMP=$(date '+%Y-%m-%d %H:%M:%S')
 DEFAULT_BRANCH=$(git symbolic-ref --short HEAD)
 REPO_PATH=$(pwd)
@@ -116,6 +131,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
 cat > "$MARKDOWN_FILE" <<EOF
 # 🔗 Radicle Repository Link
 
@@ -125,7 +141,7 @@ cat > "$MARKDOWN_FILE" <<EOF
 - **Local Repo Path**: \`$REPO_PATH\`
 - **Default Branch**: \`$DEFAULT_BRANCH\`
 - **Timestamp**: \`$TIMESTAMP\`
-- **Public Gateway URL**: [$RAD_GATEWAY_URL]($RAD_GATEWAY_URL)
+- **Public Gateway URL**: [${RAD_GATEWAY_URL:-Unavailable}](${RAD_GATEWAY_URL:-#})
 
 ---
 
@@ -175,21 +191,23 @@ cat > "$MARKDOWN_FILE" <<EOF
 
 ## 🌐 Radicle Network Info
 
-- **Connected Servers**: 
+- **Connected Servers**:
 \`\`\`
 $REMOTE_SERVERS
 \`\`\`
-- **Public Gateway URL**: [$RAD_GATEWAY_URL]($RAD_GATEWAY_URL)
+- **Public Gateway URL**: [${RAD_GATEWAY_URL:-Unavailable}](${RAD_GATEWAY_URL:-#})
 
 ---
 
-_Auto-generated by `gitfield-radicle` push script._
+_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
 echo -e "\n✅ Radicle metadata written."
 echo -e "→ Project ID: $PROJECT_ID"
 echo -e "→ Peer ID: $PEER_ID"
-echo -e "🔗 View in Radicle Gateway: $RAD_GATEWAY_URL"
+[[ -n "$RAD_GATEWAY_URL" ]] && echo -e "🔗 View in Radicle Gateway: $RAD_GATEWAY_URL"