From 952cb90973d8dbd56bb1478fe320bc253948ad30 Mon Sep 17 00:00:00 2001
From: Lars <Lars@stommer.de>
Date: Sun, 5 Apr 2026 11:39:15 +0200
Subject: [PATCH] feat: Update deployment scripts to use git fetch and reset
 for more reliable state management

---
 .gitea/workflows/deploy-dev.yml  |  3 ++-
 .gitea/workflows/deploy-prod.yml |  4 +++-
 .gitignore                       |  3 ++-
 frontend/src/pages/Analysis.jsx  | 17 +++++++++++++++--
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml
index 8e9d3d1..7425a8d 100644
--- a/.gitea/workflows/deploy-dev.yml
+++ b/.gitea/workflows/deploy-dev.yml
@@ -13,7 +13,8 @@ jobs:
           set -e
           echo "=== Deploying to DEVELOPMENT ==="
           cd /home/lars/docker/bodytrack-dev
-          git pull origin develop
+          git fetch origin develop
+          git reset --hard origin/develop
           docker compose -f docker-compose.dev-env.yml build --no-cache
           docker compose -f docker-compose.dev-env.yml up -d
           sleep 5
diff --git a/.gitea/workflows/deploy-prod.yml b/.gitea/workflows/deploy-prod.yml
index ca356fd..e0b25a0 100644
--- a/.gitea/workflows/deploy-prod.yml
+++ b/.gitea/workflows/deploy-prod.yml
@@ -13,7 +13,9 @@ jobs:
           set -e
           echo "=== Deploying to PRODUCTION ==="
           cd /home/lars/docker/bodytrack
-          git pull origin main
+          # Arbeitskopie = exakt origin/main (vermeidet Abbruch bei lokalem package-lock o. ä.)
+          git fetch origin main
+          git reset --hard origin/main
           docker compose -f docker-compose.yml build --no-cache
           docker compose -f docker-compose.yml up -d
           sleep 5
diff --git a/.gitignore b/.gitignore
index 97d2d19..e105a20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,4 +64,5 @@ tmp/
 
 # Cursor MCP mit Secrets (Example: .cursor/mcp.json.example)
 .cursor/mcp.json
-.claude/settings.local.jsonfrontend/package-lock.json
+.claude/settings.local.json
+frontend/package-lock.json
diff --git a/frontend/src/pages/Analysis.jsx b/frontend/src/pages/Analysis.jsx
index 1cc6ae1..3823823 100644
--- a/frontend/src/pages/Analysis.jsx
+++ b/frontend/src/pages/Analysis.jsx
@@ -508,8 +508,8 @@ export default function Analysis() {
       {/* ── Analysen starten ── */}
       {tab==='run' && (
         <div>
-          {/* Fresh result shown immediately */}
-          {newResult && (
+          {/* Fallback: Ergebnis oben nur wenn keine Pipeline-Split-Ansicht (z. B. keine Prompts) */}
+          {newResult && !(canUseAI && pipelinePrompts.length > 0) && (
             <div style={{marginBottom:16}}>
               <div style={{fontSize:12,fontWeight:600,color:'var(--accent)',marginBottom:8}}>
                 ✅ Neue Analyse erstellt:
@@ -565,6 +565,19 @@ export default function Analysis() {
                   </nav>
                 </div>
                 <div className="analysis-split__main">
+                  {newResult && (
+                    <div style={{ marginBottom: 20 }}>
+                      <div style={{ fontSize: 12, fontWeight: 600, color: 'var(--accent)', marginBottom: 8 }}>
+                        ✅ Neue Analyse erstellt:
+                      </div>
+                      <InsightCard
+                        ins={{ ...newResult, created: new Date().toISOString() }}
+                        onDelete={deleteInsight}
+                        defaultOpen={true}
+                        prompts={prompts}
+                      />
+                    </div>
+                  )}
                   {activeCategoryKey && (() => {
                     const group = pipelineGroups.find(g => g.categoryKey === activeCategoryKey)
                     if (!group?.prompts?.length) return null