From 040f27bf8793a25f6648792d7c5c67655b9ae57a Mon Sep 17 00:00:00 2001
From: qwerty287 <80460567+qwerty287@users.noreply.github.com>
Date: Mon, 2 Feb 2026 19:25:30 +0100
Subject: [PATCH] Dynamic log following (#6036)

---
 web/src/assets/locales/en.json                |  4 +--
 .../components/repo/pipeline/PipelineLog.vue  | 25 ++++++++-----------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/web/src/assets/locales/en.json b/web/src/assets/locales/en.json
index a26e87cae..63a8c89f0 100644
--- a/web/src/assets/locales/en.json
+++ b/web/src/assets/locales/en.json
@@ -227,9 +227,7 @@
         "deploy": "Deploy",
         "restart_success": "Pipeline restarted",
         "log_download": "Download",
-        "log_delete": "Delete",
-        "log_auto_scroll": "Enable automatic scrolling",
-        "log_auto_scroll_off": "Disable automatic scrolling"
+        "log_delete": "Delete"
       },
       "protected": {
         "awaits": "This pipeline is awaiting approval from a maintainer!",
diff --git a/web/src/components/repo/pipeline/PipelineLog.vue b/web/src/components/repo/pipeline/PipelineLog.vue
index 5a0e9747c..2793a906e 100644
--- a/web/src/components/repo/pipeline/PipelineLog.vue
+++ b/web/src/components/repo/pipeline/PipelineLog.vue
@@ -44,16 +44,6 @@
             icon="trash"
             @click="deleteLogs"
           />
-          <IconButton
-            v-if="step?.finished === undefined"
-            :title="
-              autoScroll ? $t('repo.pipeline.actions.log_auto_scroll_off') : $t('repo.pipeline.actions.log_auto_scroll')
-            "
-            class="hover:bg-white/10!"
-            :icon="autoScroll ? 'auto-scroll' : 'auto-scroll-off'"
-            @click="autoScroll = !autoScroll"
-          />
-          <IconButton class="hover:bg-white/10! md:hidden!" icon="close" @click="$emit('update:step-id', null)" />
         </div>
       </div>
 
@@ -122,7 +112,6 @@
 <script lang="ts" setup>
 import '~/style/console.css';
 
-import { useStorage } from '@vueuse/core';
 import { AnsiUp } from 'ansi_up';
 import { decode } from 'js-base64';
 import { debounce } from 'lodash';
@@ -177,7 +166,7 @@ const hasLogs = computed(
     // we do not have logs for skipped steps
     repo?.value && pipeline.value && step.value && step.value.state !== 'skipped',
 );
-const autoScroll = useStorage('woodpecker:log-auto-scroll', false);
+
 const showActions = ref(false);
 const downloadInProgress = ref(false);
 const ansiUp = ref(new AnsiUp());
@@ -187,6 +176,14 @@ const logBuffer = ref<LogLine[]>([]);
 const maxLineCount = 5000; // TODO(2653): set back to 500 and implement lazy-loading support
 const hasPushPermission = computed(() => repoPermissions?.value?.push);
 
+function isScrolledToBottom(): boolean {
+  if (!consoleElement.value) {
+    return false;
+  }
+  // we use 5 as threshold
+  return consoleElement.value.scrollHeight - consoleElement.value.scrollTop - consoleElement.value.clientHeight < 5;
+}
+
 function isSelected(line: LogLine): boolean {
   return route.hash === `#L${line.number}`;
 }
@@ -259,7 +256,7 @@ const flushLogs = debounce((scroll: boolean) => {
 
   if (route.hash.length > 0) {
     nextTick(() => document.getElementById(route.hash.substring(1))?.scrollIntoView());
-  } else if (scroll && autoScroll.value) {
+  } else if (scroll && isScrolledToBottom()) {
     scrollDown();
   }
 }, 500);
@@ -383,7 +380,7 @@ watch(stepSlug, async () => {
 
 watch(step, async (newStep, oldStep) => {
   if (oldStep?.name === newStep?.name) {
-    if (oldStep?.finished !== newStep?.finished && autoScroll.value) {
+    if (oldStep?.finished !== newStep?.finished && isScrolledToBottom()) {
       scrollDown();
     }