react-terminal-viewer-cicd 3.0.0-beta.42 → 3.0.0-beta.43

package/dist/esm/Addon/WorkerLog/LogWorker.js

@@ -1,7 +1,7 @@
 function LogWorker() {
   var workerPath = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/worker';
   var worker = null;
-  var version = "3.0.0-beta.42" || '0.0.0';
+  var version = "3.0.0-beta.43" || '0.0.0';
   var path = workerPath.includes('http') ? "".concat(workerPath, "/log.worker.js") : "".concat(window.location.origin).concat(workerPath, "/log.worker.js");
   var blob = new Blob(["importScripts(\"".concat(path, "?v=").concat(version, "\")")], {
     type: 'application/javascript'

package/dist/esm/PipelineLogViewer/PipelineLogViewer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PipelineLogViewer.d.ts","sourceRoot":"","sources":["../../../src/PipelineLogViewer/PipelineLogViewer.tsx"],"names":[],"mappings":"AAoBA,OAAO,KASN,MAAM,OAAO,CAAC;AAef,OAAO,cAAc,CAAC;AACtB,OAAO,KAAK,EAGV,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,SAAS,CAAC;AAuEjB,QAAA,MAAM,iBAAiB,qGAotCtB,CAAC;AAIF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"PipelineLogViewer.d.ts","sourceRoot":"","sources":["../../../src/PipelineLogViewer/PipelineLogViewer.tsx"],"names":[],"mappings":"AAoBA,OAAO,KASN,MAAM,OAAO,CAAC;AAef,OAAO,cAAc,CAAC;AACtB,OAAO,KAAK,EAGV,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,SAAS,CAAC;AAwEjB,QAAA,MAAM,iBAAiB,qGAoxCtB,CAAC;AAIF,eAAe,iBAAiB,CAAC"}

package/dist/esm/PipelineLogViewer/PipelineLogViewer.js

@@ -44,6 +44,7 @@ import useLogSearch from "./hooks/useLogSearch";
 import useStickyHeader from "./hooks/useStickyHeader";
 import "./index.less";
 import { getGlobalVisibleLineNumberLabel } from "./utils/groupLineNumber";
+import normalizeGroupsForPipelineStatus from "./utils/normalizeGroupsForPipelineStatus";
 import { applyBoundaryScrollCompensation } from "./utils/virtuosoBoundaryScroll";
 import { firstVisibleIndexFromRenderedItems, lastVisibleIndexFromRenderedItems } from "./utils/virtuosoVisibleItems";
 
@@ -156,14 +157,14 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
         case 2:
           groupData = _context.sent;
           if (groupData && groupData.length > 0) {
-            setGroups(groupData);
+            setGroups(normalizeGroupsForPipelineStatus(groupData, status));
           }
         case 4:
         case "end":
           return _context.stop();
       }
     }, _callee);
-  })), [fetchGroups]);
+  })), [fetchGroups, status]);
 
   // ===================================================================
   // 二、日志数据获取与游标管理
@@ -221,6 +222,8 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     ensureGroupExpanded: groupManager.ensureGroupExpanded,
     expandAllGroups: groupManager.expandAll
   });
+  var searchStateRef = useRef(logSearchResult.searchState);
+  searchStateRef.current = logSearchResult.searchState;
 
   // ===================================================================
   // 五、展示数据计算 (折叠过滤)
@@ -237,11 +240,12 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
 
   /**
    * 有搜索关键字时禁用 followOutput、并阻止 running 下 currentEndRow 触发的兜底置底。
-   * 必须在 handleSearch 内 await 之前同步置 true：setSearchState 尚未提交时 ref 若仍为 false，
+   * 首次 Enter 搜索 await searchLogs 期间 searchState 尚未写入 keyword，仅靠 keyword 会为 false，
    * 轮询增大 currentEndRow 会误触 useLayoutEffect 的 scrollToIndex(LAST)，导致刚跳转的命中行被「跳走」。
+   * 合并 searching：useLogSearch 在请求期间保持 searching=true，与 keyword 二选一即可顶住该窗口。
    */
   var searchKeywordActiveRef = useRef(false);
-  searchKeywordActiveRef.current = Boolean((_logSearchResult$sear = logSearchResult.searchState.keyword) === null || _logSearchResult$sear === void 0 ? void 0 : _logSearchResult$sear.trim());
+  searchKeywordActiveRef.current = Boolean((_logSearchResult$sear = logSearchResult.searchState.keyword) === null || _logSearchResult$sear === void 0 ? void 0 : _logSearchResult$sear.trim()) || logSearchResult.searching;
 
   // ===================================================================
   // 待滚动行号（pending scroll）
@@ -292,6 +296,12 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
   // 用户主动停止跟随：分组操作、置顶等交互后持续抑制自动滚动与 poll，
   // 仅 scrollToBottom 时清除，恢复跟随。
   var userStoppedFollowingRef = useRef(false);
+  /**
+   * running→结束态瞬间：若仍在底部且未停跟，则结束后继续 followOutput / 兜底置底（衔接 drain 拉尾）。
+   * 再次进入 running 或切换数据源时清除。
+   */
+  var tailFollowAfterRunRef = useRef(false);
+  var prevStatusForTailFollowRef = useRef(status);
   // 正在空降加载的分组（可多组排队尝试，但 fetch 层同一时刻只跑一个 airdrop）
   var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
@@ -342,7 +352,7 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     initializedRef.current = true;
     Promise.all([fetchGroups().then(function (groupData) {
       if (groupData && groupData.length > 0) {
-        setGroups(groupData);
+        setGroups(normalizeGroupsForPipelineStatus(groupData, status));
       }
     }), initLoadRef.current()]).then(function () {
       ignoreBoundaryFetchRef.current = Date.now() + 500;
@@ -355,7 +365,7 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
         });
       });
     });
-  }, [fetchLogs, fetchGroups]);
+  }, [fetchLogs, fetchGroups, status]);
 
   // fetchLogs 引用变化 = 新日志源（如外部 logUrl 切换）：清空状态并允许首屏 init 重新跑
   /* eslint-disable react-hooks/exhaustive-deps -- 仅响应 fetchLogs 引用变化；reset/clearSearch/expandAll 为稳定回调 */
@@ -370,6 +380,8 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     airdropExpandInFlightRef.current.clear();
     initializedRef.current = false;
     userStoppedFollowingRef.current = false;
+    tailFollowAfterRunRef.current = false;
+    prevStatusForTailFollowRef.current = status;
     collapseAirdropActiveRef.current = false;
     isAtBottomRef.current = true;
     pendingScrollRowRef.current = null;
@@ -378,7 +390,7 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     pendingScrollAfterPrevRef.current = null;
     pendingScrollAfterNextRef.current = null;
     ignoreBoundaryFetchRef.current = Date.now() + 500;
-  }, [fetchLogs, logFetcherResult.reset, groupManager.expandAll, logSearchResult.clearSearch]);
+  }, [fetchLogs, logFetcherResult.reset, groupManager.expandAll, logSearchResult.clearSearch, status]);
   /* eslint-enable react-hooks/exhaustive-deps */
 
   // ===================================================================
@@ -596,21 +608,35 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
   // startReached / endReached 第二次以后不再触发。
   // ===================================================================
   var handleRangeChanged = useCallback(function (range) {
-    var _el$scrollTop2;
+    var _el$scrollTop2, _el$clientHeight2, _topIdx, _bottomIdx;
     lastRangeChangedRef.current = range;
+    var prevStartIndex = currentStartIndexRef.current;
     currentStartIndexRef.current = range.startIndex;
+    var scrollDirection = 'none';
+    if (range.startIndex < prevStartIndex) {
+      scrollDirection = 'up';
+    } else if (range.startIndex > prevStartIndex) {
+      scrollDirection = 'down';
+    }
     var currentDisplayLogs = displayLogsRef.current;
     // 吸顶：在 rangeChanged 内用当前 scrollTop + 已渲染项算视口顶行，避免先于 itemsRendered
     // 时 ref 滞后，且排除 overscan 渲染在视口上方的项（不用 range.startIndex 当顶行）。
     var el = scrollerDomRef.current;
     var viewportScrollTop = (_el$scrollTop2 = el === null || el === void 0 ? void 0 : el.scrollTop) !== null && _el$scrollTop2 !== void 0 ? _el$scrollTop2 : 0;
+    var viewportHeight = (_el$clientHeight2 = el === null || el === void 0 ? void 0 : el.clientHeight) !== null && _el$clientHeight2 !== void 0 ? _el$clientHeight2 : 0;
     var items = lastRenderedItemsRef.current;
     var topIdx = items.length ? firstVisibleIndexFromRenderedItems(items, viewportScrollTop) : null;
+    var bottomIdx = items.length ? lastVisibleIndexFromRenderedItems(items, viewportScrollTop, viewportHeight) : null;
     if (topIdx !== null) {
       firstVisibleDisplayIndexRef.current = topIdx;
     } else if (currentDisplayLogs.length > 0) {
       topIdx = Math.max(0, Math.min(range.startIndex, currentDisplayLogs.length - 1));
     }
+    if (bottomIdx !== null) {
+      lastVisibleDisplayIndexRef.current = bottomIdx;
+    } else if (currentDisplayLogs.length > 0) {
+      bottomIdx = Math.max(0, Math.min(range.endIndex, currentDisplayLogs.length - 1));
+    }
     var topLine = topIdx !== null ? currentDisplayLogs[topIdx] : undefined;
     var absoluteTop = topLine === null || topLine === void 0 ? void 0 : topLine.absoluteRow;
     var bufferEnd = currentDisplayLogs.length > 0 ? currentDisplayLogs[currentDisplayLogs.length - 1].absoluteRow : logFetcherResult.cursor.currentStartRow;
@@ -620,14 +646,16 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
 
     // 程序触发滚动（如初始化、搜索跨页）时，短暂屏蔽 rangeChanged 的误触发加载
     if (Date.now() < ignoreBoundaryFetchRef.current) return;
+    if (currentDisplayLogs.length === 0) return;
+    var topThreshold = BOUNDARY_PREFETCH_INDEX_MARGIN;
+    var bottomThreshold = Math.max(0, currentDisplayLogs.length - 1 - BOUNDARY_PREFETCH_INDEX_MARGIN);
+    var nearTop = ((_topIdx = topIdx) !== null && _topIdx !== void 0 ? _topIdx : range.startIndex) <= topThreshold;
+    var nearBottom = ((_bottomIdx = bottomIdx) !== null && _bottomIdx !== void 0 ? _bottomIdx : range.endIndex) >= bottomThreshold;
 
-    // 边界检测：触顶 → 加载历史（见 constants BOUNDARY_PREFETCH_INDEX_MARGIN）
-    if (range.startIndex <= BOUNDARY_PREFETCH_INDEX_MARGIN && !logFetcherResult.boundaryLock.isFirstPage) {
+    // 边界检测（可见索引 + 方向感知 + 互斥触发）：触顶 → 加载历史
+    if ((scrollDirection === 'up' || scrollDirection === 'none') && nearTop && !logFetcherResult.boundaryLock.isFirstPage) {
       handleStartReached();
-    }
-
-    // 边界检测：触底 → 加载更新
-    if (range.endIndex >= currentDisplayLogs.length - 1 - BOUNDARY_PREFETCH_INDEX_MARGIN && !logFetcherResult.boundaryLock.isLastPage) {
+    } else if ((scrollDirection === 'down' || scrollDirection === 'none') && nearBottom && !logFetcherResult.boundaryLock.isLastPage) {
       handleEndReached();
     }
   }, [logFetcherResult.boundaryLock.isFirstPage, logFetcherResult.boundaryLock.isLastPage, logFetcherResult.cursor.currentStartRow, stickyHeader, handleStartReached, handleEndReached]);
@@ -666,12 +694,25 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
   // 避免依赖 isUserBrowsingHistory React 状态的异步更新导致跳帧抖动
   var statusRef = useRef(status);
   statusRef.current = status;
+  useLayoutEffect(function () {
+    var prev = prevStatusForTailFollowRef.current;
+    prevStatusForTailFollowRef.current = status;
+    if (prev === 'running' && status !== 'running') {
+      if (isAtBottomRef.current && !userStoppedFollowingRef.current) {
+        tailFollowAfterRunRef.current = true;
+      }
+    }
+    if (status === 'running') {
+      tailFollowAfterRunRef.current = false;
+    }
+  }, [status]);
   var handleFollowOutput = useCallback(function (isAtBottom) {
-    if (statusRef.current !== 'running') return false;
     if (searchKeywordActiveRef.current) return false;
     if (groupActionRef.current) return false;
     if (collapseAirdropActiveRef.current) return false;
     if (userStoppedFollowingRef.current) return false;
+    var running = statusRef.current === 'running';
+    if (!running && !tailFollowAfterRunRef.current) return false;
     return isAtBottom ? 'auto' : false;
   }, []);
   var currentEndRow = logFetcherResult.cursor.currentEndRow;
@@ -682,7 +723,8 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
 
     // 仅在有新行到达时处理
     if (currentEndRow <= prevEndRow) return;
-    if (status !== 'running') return;
+    var followNewRows = status === 'running' || tailFollowAfterRunRef.current;
+    if (!followNewRows) return;
     if (searchKeywordActiveRef.current) return;
     if (groupActionRef.current) return;
     if (collapseAirdropActiveRef.current) return;
@@ -691,7 +733,9 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     requestAnimationFrame(function () {
       var _virtuosoRef$current4;
       // 在 rAF 回调执行时再次检查，防止在排队期间用户执行了置顶/搜索/折叠等操作（产生竞态被强行拉回底部）
-      if (statusRef.current !== 'running') return;
+      if (statusRef.current !== 'running' && !tailFollowAfterRunRef.current) {
+        return;
+      }
       if (searchKeywordActiveRef.current) return;
       if (groupActionRef.current) return;
       if (collapseAirdropActiveRef.current) return;
@@ -744,16 +788,22 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.next = 2;
+            // 查询跳转优先级最高：取消边界 loadPrev/loadNext 的待执行滚动补偿，避免命中行到位后被拉回底部
+            pendingScrollAfterPrevRef.current = null;
+            pendingScrollAfterNextRef.current = null;
+            displayLogsLenBeforeLoadPrevRef.current = null;
+            displayLogsLenBeforeLoadNextRef.current = null;
+            ignoreBoundaryFetchRef.current = Math.max(ignoreBoundaryFetchRef.current, Date.now() + 1500);
+            _context2.next = 7;
             return logSearchResult.resolveTargetRow(absoluteRow);
-          case 2:
+          case 7:
             targetRow = _context2.sent;
             if (!(targetRow === null)) {
-              _context2.next = 5;
+              _context2.next = 10;
               break;
             }
             return _context2.abrupt("return");
-          case 5:
+          case 10:
             currentDisplayLogs = displayLogsRef.current;
             displayIndex = currentDisplayLogs.findIndex(function (line) {
               return line.absoluteRow === targetRow;
@@ -766,7 +816,7 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
               pendingScrollAlignRef.current = 'center';
               pendingScrollRowRef.current = targetRow;
             }
-          case 8:
+          case 13:
           case "end":
             return _context2.stop();
         }
@@ -781,7 +831,6 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
   var handleSearchPrev = useCallback(function () {
     var targetRow = logSearchResult.searchPrev();
     if (targetRow !== null) {
-      searchKeywordActiveRef.current = true;
       scrollToAbsoluteRow(targetRow);
     }
   }, [logSearchResult, scrollToAbsoluteRow]);
@@ -790,7 +839,6 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
   var handleSearchNext = useCallback(function () {
     var targetRow = logSearchResult.searchNext();
     if (targetRow !== null) {
-      searchKeywordActiveRef.current = true;
       scrollToAbsoluteRow(targetRow);
     }
   }, [logSearchResult, scrollToAbsoluteRow]);
@@ -802,17 +850,14 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            if (keyword.trim()) {
-              searchKeywordActiveRef.current = true;
-            }
-            _context3.next = 3;
+            _context3.next = 2;
             return logSearchResult.search(keyword);
-          case 3:
+          case 2:
             targetRow = _context3.sent;
             if (targetRow !== null) {
               scrollToAbsoluteRow(targetRow);
             }
-          case 5:
+          case 4:
           case "end":
             return _context3.stop();
         }
@@ -1134,8 +1179,6 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
   groupManagerRef.current = groupManager;
   var handleToggleGroupRef = useRef(handleToggleGroup);
   handleToggleGroupRef.current = handleToggleGroup;
-  var searchStateRef = useRef(logSearchResult.searchState);
-  searchStateRef.current = logSearchResult.searchState;
   var lineNumberWidthRef = useRef(lineNumberWidth);
   lineNumberWidthRef.current = lineNumberWidth;
   var controlMarkerRowsRef = useRef(controlMarkerRows);
@@ -1343,7 +1386,7 @@ var PipelineLogViewer = /*#__PURE__*/forwardRef(function (_ref2, ref) {
       searchNext: handleSearchNext,
       clearSearch: logSearchResult.clearSearch
     };
-  }, [handleCollapseAll, handleExpandAll, handleSearch, handleSearchPrev, handleSearchNext, logSearchResult, logFetcherResult, groupManager, groups, status]);
+  }, [handleCollapseAll, handleExpandAll, handleSearch, handleSearchPrev, handleSearchNext, logSearchResult, logFetcherResult, groupManager, groups, status, waitForFetchUnlock]);
   var lastGroupStatus = useMemo(function () {
     return groups.length > 0 ? groups[groups.length - 1].status : status;
   }, [groups, status]);

package/dist/esm/PipelineLogViewer/hooks/useLogFetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useLogFetcher.d.ts","sourceRoot":"","sources":["../../../../src/PipelineLogViewer/hooks/useLogFetcher.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EACd,SAAS,EACT,aAAa,EACb,QAAQ,EACR,iBAAiB,EAClB,MAAM,UAAU,CAAC;AAElB,UAAU,oBAAoB;IAC5B,MAAM,EAAE,iBAAiB,CAAC;IAC1B,SAAS,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;IAC9D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAED,wCAAwC;AACxC,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG,YAAY,GAAG,SAAS,GAAG,OAAO,GAAG,OAAO,CAAC;AAEvF,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,kBAAkB,CAAC;CACjC;AAED,UAAU,mBAAmB;IAC3B,8BAA8B;IAC9B,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,WAAW;IACX,MAAM,EAAE,SAAS,CAAC;IAClB,YAAY;IACZ,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,4CAA4C;IAC5C,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,gDAAgD;IAChD,QAAQ,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,CAAC;IACxC,+DAA+D;IAC/D,aAAa,EAAE,MAAM,OAAO,CAAC;IAC7B,mCAAmC;IACnC,iBAAiB,EAAE,MAAM,OAAO,CAAC;IACjC,iDAAiD;IACjD,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE;QACnB,mBAAmB,CAAC,EAAE,OAAO,CAAC;KAC/B,KAAK,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACrF;;;OAGG;IACH,8CAA8C;IAC9C,WAAW,EAAE,CACX,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,KAC5D,OAAO,CAAC,OAAO,CAAC,CAAC;IACtB,0BAA0B;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,kBAAkB;IAClB,wBAAwB,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IACjD,WAAW;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY;IACZ,kBAAkB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC;IAC7D,mCAAmC;IACnC,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB;AAeD;;;;;;;;GAQG;AACH,iBAAS,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,mBAAmB,CAwezE;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"useLogFetcher.d.ts","sourceRoot":"","sources":["../../../../src/PipelineLogViewer/hooks/useLogFetcher.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EACd,SAAS,EACT,aAAa,EACb,QAAQ,EACR,iBAAiB,EAClB,MAAM,UAAU,CAAC;AAElB,UAAU,oBAAoB;IAC5B,MAAM,EAAE,iBAAiB,CAAC;IAC1B,SAAS,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;IAC9D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAED,wCAAwC;AACxC,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG,YAAY,GAAG,SAAS,GAAG,OAAO,GAAG,OAAO,CAAC;AAEvF,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,kBAAkB,CAAC;CACjC;AAED,UAAU,mBAAmB;IAC3B,8BAA8B;IAC9B,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,WAAW;IACX,MAAM,EAAE,SAAS,CAAC;IAClB,YAAY;IACZ,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,4CAA4C;IAC5C,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,gDAAgD;IAChD,QAAQ,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,CAAC;IACxC,+DAA+D;IAC/D,aAAa,EAAE,MAAM,OAAO,CAAC;IAC7B,mCAAmC;IACnC,iBAAiB,EAAE,MAAM,OAAO,CAAC;IACjC,iDAAiD;IACjD,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE;QACnB,mBAAmB,CAAC,EAAE,OAAO,CAAC;KAC/B,KAAK,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACrF;;;OAGG;IACH,8CAA8C;IAC9C,WAAW,EAAE,CACX,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,KAC5D,OAAO,CAAC,OAAO,CAAC,CAAC;IACtB,0BAA0B;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,kBAAkB;IAClB,wBAAwB,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IACjD,WAAW;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY;IACZ,kBAAkB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC;IAC7D,mCAAmC;IACnC,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB;AAeD;;;;;;;;GAQG;AACH,iBAAS,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,mBAAmB,CA+fzE;AAED,eAAe,aAAa,CAAC"}

package/dist/esm/PipelineLogViewer/hooks/useLogFetcher.js

@@ -86,6 +86,10 @@ function useLogFetcher(options) {
     _useState8 = _slicedToArray(_useState7, 2),
     isUserBrowsingHistory = _useState8[0],
     setIsUserBrowsingHistory = _useState8[1];
+  var isUserBrowsingHistoryRef = useRef(false);
+  useEffect(function () {
+    isUserBrowsingHistoryRef.current = isUserBrowsingHistory;
+  }, [isUserBrowsingHistory]);
 
   // 游标 & 边界锁使用 ref 避免 stale closure，同时用 state 暴露给外部
   var cursorRef = useRef({
@@ -117,7 +121,10 @@ function useLogFetcher(options) {
   var mountedRef = useRef(true);
   // 轮询定时器（setTimeout 递归，等上一次完成后再安排下一次）
   var pollTimerRef = useRef(null);
-  /** 用于检测 running→结束态，触发一次性拉尾（轮询已停，避免漏掉结束时暴增的日志） */
+  /**
+   * 用于检测 running→结束态，或首屏即结束态，触发一次性拉尾。
+   * null = 尚未写入（首帧）；写入后保存上一 status。
+   */
   var prevStatusRef = useRef(null);
 
   // ----- 辅助：同步更新游标 -----
@@ -157,6 +164,7 @@ function useLogFetcher(options) {
       isFirstPage: false,
       isLastPage: false
     });
+    prevStatusRef.current = null;
   }, []);
 
   // ===================================================================
@@ -607,13 +615,14 @@ function useLogFetcher(options) {
       }
       return;
     }
+    var cancelled = false;
     var scheduleNext = function scheduleNext() {
       pollTimerRef.current = setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         var tasks;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              if (mountedRef.current) {
+              if (!(cancelled || !mountedRef.current)) {
                 _context5.next = 2;
                 break;
               }
@@ -623,7 +632,9 @@ function useLogFetcher(options) {
                 _context5.next = 7;
                 break;
               }
-              tasks = [loadNext()];
+              tasks = [initLoad({
+                silent: true
+              })];
               if (runningPollSync) {
                 tasks.push(runningPollSync());
               }
@@ -632,7 +643,7 @@ function useLogFetcher(options) {
                 console.error('[PipelineLogViewer] running poll failed:', err);
               });
             case 7:
-              if (mountedRef.current) scheduleNext();
+              if (!cancelled && mountedRef.current) scheduleNext();
             case 8:
             case "end":
               return _context5.stop();
@@ -642,19 +653,20 @@ function useLogFetcher(options) {
     };
     scheduleNext();
     return function () {
+      cancelled = true;
       if (pollTimerRef.current) {
         clearTimeout(pollTimerRef.current);
         pollTimerRef.current = null;
       }
     };
-  }, [status, pollInterval, loadNext, isUserBrowsingHistory, runningPollSync]);
+  }, [status, pollInterval, initLoad, isUserBrowsingHistory, runningPollSync]);
 
   // ===================================================================
   // running→结束态：轮询已停；waitIdle 后 fetchGroups → silent initLoad → fetchGroups；再按间隔并行 loadNext+fetchGroups 追尾部。
   // ===================================================================
   useEffect(function () {
     var prev = prevStatusRef.current;
-    var shouldDrain = prev === 'running' && status !== 'running';
+    var shouldDrain = prev === 'running' && status !== 'running' || prev === null && status !== 'running';
     prevStatusRef.current = status;
     if (!shouldDrain) return;
     var cancelled = false;
@@ -691,79 +703,96 @@ function useLogFetcher(options) {
               }
               return _context6.abrupt("return");
             case 4:
+              console.log('>>>drain start', isUserBrowsingHistoryRef.current);
+              // 用户正在查阅历史时，不打断当前窗口；仅同步分组状态/图标
+              if (!isUserBrowsingHistoryRef.current) {
+                _context6.next = 12;
+                break;
+              }
+              console.log('>>>drain runningPollSync');
               if (!runningPollSync) {
-                _context6.next = 7;
+                _context6.next = 11;
                 break;
               }
-              _context6.next = 7;
+              console.log('>>>drain runningPollSync running');
+              _context6.next = 11;
               return runningPollSync();
-            case 7:
+            case 11:
+              return _context6.abrupt("return");
+            case 12:
+              if (!runningPollSync) {
+                _context6.next = 15;
+                break;
+              }
+              _context6.next = 15;
+              return runningPollSync();
+            case 15:
               if (!(cancelled || !mountedRef.current)) {
-                _context6.next = 9;
+                _context6.next = 17;
                 break;
               }
               return _context6.abrupt("return");
-            case 9:
-              _context6.next = 11;
+            case 17:
+              _context6.next = 19;
               return initLoad({
                 silent: true
               });
-            case 11:
+            case 19:
               if (!(cancelled || !mountedRef.current)) {
-                _context6.next = 13;
+                _context6.next = 21;
                 break;
               }
               return _context6.abrupt("return");
-            case 13:
+            case 21:
               if (!runningPollSync) {
-                _context6.next = 16;
+                _context6.next = 24;
                 break;
               }
-              _context6.next = 16;
+              _context6.next = 24;
               return runningPollSync();
-            case 16:
+            case 24:
               if (!(cancelled || !mountedRef.current)) {
-                _context6.next = 18;
+                _context6.next = 26;
                 break;
               }
               return _context6.abrupt("return");
-            case 18:
+            case 26:
               i = 0;
-            case 19:
+            case 27:
               if (!(i < TERMINAL_TAIL_LOAD_NEXT_COUNT)) {
-                _context6.next = 32;
+                _context6.next = 40;
                 break;
               }
               if (!(cancelled || !mountedRef.current)) {
-                _context6.next = 22;
+                _context6.next = 30;
                 break;
               }
               return _context6.abrupt("return");
-            case 22:
+            case 30:
               if (!(i > 0)) {
-                _context6.next = 27;
+                _context6.next = 35;
                 break;
               }
-              _context6.next = 25;
+              _context6.next = 33;
               return delay(TERMINAL_TAIL_LOAD_NEXT_INTERVAL_MS);
-            case 25:
+            case 33:
               if (!(cancelled || !mountedRef.current)) {
-                _context6.next = 27;
+                _context6.next = 35;
                 break;
               }
               return _context6.abrupt("return");
-            case 27:
+            case 35:
               tailTasks = [loadNext({
                 bypassLastPageGuard: true
               })];
               if (runningPollSync) {
                 tailTasks.push(runningPollSync());
               }
-            case 29:
+            case 37:
               i += 1;
-              _context6.next = 19;
+              _context6.next = 27;
               break;
-            case 32:
+            case 40:
             case "end":
               return _context6.stop();
           }
@@ -773,13 +802,14 @@ function useLogFetcher(options) {
         return _ref6.apply(this, arguments);
       };
     }();
+    console.log('>>>drain start', isUserBrowsingHistory);
     drain().catch(function (err) {
       console.error('[PipelineLogViewer] terminal log drain failed:', err);
     });
     return function () {
       cancelled = true;
     };
-  }, [status, initLoad, runningPollSync, loadNext]);
+  }, [status, initLoad, runningPollSync, loadNext]); // eslint-disable-line react-hooks/exhaustive-deps
 
   // ===================================================================
   // 组件卸载清理

package/dist/esm/PipelineLogViewer/hooks/useStickyHeader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useStickyHeader.d.ts","sourceRoot":"","sources":["../../../../src/PipelineLogViewer/hooks/useStickyHeader.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,UAAU,sBAAsB;IAC9B,WAAW;IACX,MAAM,EAAE,SAAS,EAAE,CAAC;CACrB;AAED,UAAU,qBAAqB;IAC7B,0CAA0C;IAC1C,WAAW,EAAE,SAAS,GAAG,IAAI,CAAC;IAC9B;;;;OAIG;IACH,kBAAkB,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CACzE;AAqCD;;GAEG;AACH,iBAAS,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,qBAAqB,CAgB/E;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"useStickyHeader.d.ts","sourceRoot":"","sources":["../../../../src/PipelineLogViewer/hooks/useStickyHeader.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,UAAU,sBAAsB;IAC9B,WAAW;IACX,MAAM,EAAE,SAAS,EAAE,CAAC;CACrB;AAED,UAAU,qBAAqB;IAC7B,0CAA0C;IAC1C,WAAW,EAAE,SAAS,GAAG,IAAI,CAAC;IAC9B;;;;OAIG;IACH,kBAAkB,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CACzE;AAqCD;;GAEG;AACH,iBAAS,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,qBAAqB,CA0B/E;AAED,eAAe,eAAe,CAAC"}

package/dist/esm/PipelineLogViewer/hooks/useStickyHeader.js

@@ -14,7 +14,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 //     与下一组 start 计算有效区间
 // ============================================================================
 
-import { useCallback, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 /** 与 useDisplayLogs 折叠区间算法一致的有效上界（用于判断行是否落在该组） */
 function effectiveGroupEnd(group, gi, groups, bufferEnd) {
   var start = group.start,
@@ -51,6 +51,18 @@ function useStickyHeader(options) {
     _useState2 = _slicedToArray(_useState, 2),
     stickyGroup = _useState2[0],
     setStickyGroup = _useState2[1];
+
+  // 当外部的 groups 更新时，如果当前有吸顶的分组，更新其状态
+  useEffect(function () {
+    if (stickyGroup) {
+      var updatedGroup = groups.find(function (g) {
+        return g.name === stickyGroup.name;
+      });
+      if (updatedGroup && updatedGroup.status !== stickyGroup.status) {
+        setStickyGroup(updatedGroup);
+      }
+    }
+  }, [groups, stickyGroup]);
   var handleRangeChanged = useCallback(function (absoluteTopRow, bufferEnd) {
     if (groups.length === 0) {
       setStickyGroup(null);

package/dist/esm/PipelineLogViewer/utils/normalizeGroupsForPipelineStatus.d.ts

@@ -0,0 +1,7 @@
+import type { GroupData, PipelineLogStatus } from '../types';
+/**
+ * 当流水线已非 running 时，将仍标记为 running 的分组对齐为流水线终态，
+ * 避免 UI 与拉取策略误判为「仍在运行」。
+ */
+declare function normalizeGroupsForPipelineStatus(groups: GroupData[], pipelineStatus: PipelineLogStatus): GroupData[];
+export default normalizeGroupsForPipelineStatus;

package/dist/esm/PipelineLogViewer/utils/normalizeGroupsForPipelineStatus.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalizeGroupsForPipelineStatus.d.ts","sourceRoot":"","sources":["../../../../src/PipelineLogViewer/utils/normalizeGroupsForPipelineStatus.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE7D;;;GAGG;AACH,iBAAS,gCAAgC,CACvC,MAAM,EAAE,SAAS,EAAE,EACnB,cAAc,EAAE,iBAAiB,GAChC,SAAS,EAAE,CAgBb;AAED,eAAe,gCAAgC,CAAC"}

package/dist/esm/PipelineLogViewer/utils/normalizeGroupsForPipelineStatus.js

@@ -0,0 +1,35 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+// ============================================================================
+// 分组数据与流水线状态对齐
+//
+// 场景：任务被快速取消/结束时，/groups 仍返回某阶段 status: running、end/endTime 为 null，
+// 而流水线 props.status 已是 cancel / failure / succeed。若不纠正，展开逻辑仍按「运行中」处理，
+// 吸顶/折叠区间也与「已结束」不一致。
+// ============================================================================
+
+/**
+ * 当流水线已非 running 时，将仍标记为 running 的分组对齐为流水线终态，
+ * 避免 UI 与拉取策略误判为「仍在运行」。
+ */
+function normalizeGroupsForPipelineStatus(groups, pipelineStatus) {
+  if (pipelineStatus === 'running' || groups.length === 0) {
+    return groups;
+  }
+  return groups.map(function (g) {
+    var _g$endTime;
+    if (g.status !== 'running') {
+      return g;
+    }
+    return _objectSpread(_objectSpread({}, g), {}, {
+      status: pipelineStatus,
+      /** 接口未回填结束时，用开始时间占位，避免时间展示永远「进行中」 */
+      endTime: (_g$endTime = g.endTime) !== null && _g$endTime !== void 0 ? _g$endTime : g.startTime
+    });
+  });
+}
+export default normalizeGroupsForPipelineStatus;

package/dist/worker/src/PipelineLogViewer/utils/normalizeGroupsForPipelineStatus.d.ts

@@ -0,0 +1,7 @@
+import type { GroupData, PipelineLogStatus } from '../types';
+/**
+ * 当流水线已非 running 时，将仍标记为 running 的分组对齐为流水线终态，
+ * 避免 UI 与拉取策略误判为「仍在运行」。
+ */
+declare function normalizeGroupsForPipelineStatus(groups: GroupData[], pipelineStatus: PipelineLogStatus): GroupData[];
+export default normalizeGroupsForPipelineStatus;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-terminal-viewer-cicd",
-  "version": "3.0.0-beta.42",
+  "version": "3.0.0-beta.43",
   "author": "https://gitee.com/gitee-frontend",
   "license": "MIT",
   "keywords": [