From b625e0a70a2fbab78bccadac66e2bb2a2e26b461 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 22 Mar 2026 12:18:08 -0400
Subject: [PATCH] v0.2.5 - Fix increment_and_push upstream auto-setup and
 finalize SIGINT shutdown fix

---
 README.md             |  4 ++--
 increment_and_push.sh | 26 ++++++++++++++++++++++----
 src/main.h            |  4 ++--
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 90c5665..fc79d04 100644
--- a/README.md
+++ b/README.md
@@ -54,11 +54,11 @@ Skills compose by adoption-list order (`10123`) and trigger tags carry runtime e
 
 Didactyl will support local inference, which is very privacy preserving. Remote inference does however have it's advantages, and in those cases Didactyl supports using Bitcoin Lightning and eCash inference providers.
 
-## Current Status — v0.2.4
+## Current Status — v0.2.5
 
 **Active build — this project is barely working. Experiment at your own risk.**
 
-> Last release update: v0.2.4 — Fix SIGINT handling so Ctrl-C exits didactyl reliably
+> Last release update: v0.2.5 — Fix increment_and_push upstream auto-setup and finalize SIGINT shutdown fix
 
 - Connects to configured relays with auto-reconnect and relay state transition logging
 - Publishes configured startup events per relay as each relay becomes connected
diff --git a/increment_and_push.sh b/increment_and_push.sh
index e1fce1e..e728b6f 100755
--- a/increment_and_push.sh
+++ b/increment_and_push.sh
@@ -299,11 +299,29 @@ git_commit_and_push_no_tag() {
 
     # Push changes
     print_status "Pushing to remote repository..."
-    if git push > /dev/null 2>&1; then
-        print_success "Pushed changes"
+    local current_branch
+    current_branch=$(git branch --show-current 2>/dev/null || echo "")
+
+    if git rev-parse --abbrev-ref --symbolic-full-name "@{u}" > /dev/null 2>&1; then
+        if git push > /dev/null 2>&1; then
+            print_success "Pushed changes"
+        else
+            print_error "Failed to push changes"
+            exit 1
+        fi
     else
-        print_error "Failed to push changes"
-        exit 1
+        if [[ -z "$current_branch" ]]; then
+            print_error "Unable to determine current branch for push"
+            exit 1
+        fi
+
+        print_warning "No upstream configured for branch '$current_branch'; setting upstream to origin/$current_branch"
+        if git push -u origin "$current_branch" > /dev/null 2>&1; then
+            print_success "Pushed changes and configured upstream"
+        else
+            print_error "Failed to push changes while configuring upstream"
+            exit 1
+        fi
     fi
 
     # Push only the new tag to avoid conflicts with existing tags
diff --git a/src/main.h b/src/main.h
index 5adb56f..15e4901 100644
--- a/src/main.h
+++ b/src/main.h
@@ -12,8 +12,8 @@
 // Using DIDACTYL_ prefix to avoid conflicts with nostr_core_lib VERSION macros
 #define DIDACTYL_VERSION_MAJOR 0
 #define DIDACTYL_VERSION_MINOR 2
-#define DIDACTYL_VERSION_PATCH 4
-#define DIDACTYL_VERSION "v0.2.4"
+#define DIDACTYL_VERSION_PATCH 5
+#define DIDACTYL_VERSION "v0.2.5"
 
 // Agent metadata
 #define DIDACTYL_NAME "Didactyl"