From 70908745bd7f8a2e27e603a9c71686ebda509617 Mon Sep 17 00:00:00 2001
From: NixReaper <nixreaper@outlook.com>
Date: Sat, 11 Apr 2026 15:03:46 -0500
Subject: [PATCH] fix(update): discard local package-lock.json before git pull,
 bump v0.4.9

npm install modifies package-lock.json on the server, causing
'git pull --ff-only' to abort with 'your local changes would be
overwritten'. Add 'git checkout -- package-lock.json' before the pull
so the generated lock file never blocks updates.
---
 CHANGELOG.md      | 7 +++++++
 package.json      | 2 +-
 scripts/update.sh | 2 ++
 server/src/app.ts | 2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b48ebc6..1961286 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,13 @@ Pre-1.0 versions treat MINOR as feature releases and PATCH as bug fixes.
 
 ---
 
+## [0.4.9] — 2026-04-11
+
+### Bug Fixes
+- **`update.sh` fails when `package-lock.json` has local changes** — `git pull --ff-only` aborted with "Your local changes would be overwritten by merge" whenever npm had modified the lock file on the server. Fixed by running `git checkout -- package-lock.json` before the pull to discard local changes to the generated lock file.
+
+---
+
 ## [0.4.8] — 2026-04-11
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 4782a38..5828654 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nixpanel-server",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "private": true,
   "workspaces": [
     "server",
diff --git a/scripts/update.sh b/scripts/update.sh
index 801ec9e..e2deaed 100755
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -14,6 +14,8 @@ INSTALL_DIR="${1:-/opt/nixpanel}"
 [[ -d "$INSTALL_DIR/.git" ]] || error "NixPanel not found at $INSTALL_DIR"
 
 step "Pulling latest code"
+# Discard any local changes to generated/lock files so git pull never conflicts
+git -C "$INSTALL_DIR" checkout -- package-lock.json 2>/dev/null || true
 git -C "$INSTALL_DIR" pull --ff-only
 success "Code updated"
 
diff --git a/server/src/app.ts b/server/src/app.ts
index f101569..e41c984 100644
--- a/server/src/app.ts
+++ b/server/src/app.ts
@@ -73,7 +73,7 @@ export async function buildApp() {
 
   fastify.get('/api/health', async () => ({
     status: 'ok',
-    version: '0.4.8',
+    version: '0.4.9',
     timestamp: new Date().toISOString(),
   }))