@cvtoolman/huawei-lts-cli 2.1.0 → 2.1.1

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2024 cvtoolman
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2024 cvtoolman
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -153,10 +153,10 @@ lts-cli query --last 1h -f json | jq '.logs[].content'
 --app <取值>              appName:"<取值>"，与 -q 用 AND 合并
 --content <关键词>        content:"<关键词>"，与 -q 用 AND 合并
 --request-id <id>         REQUEST_ID:"<id>"，按时间正序输出
--l, --limit <n>           每页条数（默认 100），--all 时即单页大小
+-l, --limit <n>           每页条数（默认 100，上限 5000），--all 时同时是总数上限
 -r, --reverse             最新优先
 -f, --format <fmt>        pretty（默认）/ table / json
---all                     沿游标读到末尾（上限 10000 条）
+--all                     沿游标读到末尾（默认上限 10000 条，显式 -l 则为 -l）
 ```
 
 `--app` / `--content` / `--request-id` 自动为值加双引号——含连字符的 UUID 不加引号会被分词导致匹配不到。
@@ -167,12 +167,21 @@ lts-cli query --last 1h -f json | jq '.logs[].content'
 lts-cli trace <id> [--field <name>] [--last 24h] [-l 200] [-f fmt]
 ```
 
-按时间正序拉出一条 ID 的完整链路。默认走全文检索（不依赖任何特定字段命名）；如果你的日志流有专用字段，配一次即可：
+按时间正序拉出一条 ID 的完整链路。字段选择顺序是 `--field` → `config.traceField` → 运行时读一次流的索引配置：把 `REQUEST_ID` / `trace_id` / `span_id` 这类 ID 字段和全文检索 `content` 一起 OR 上。结构化日志的 ID 住在 labels 里，全文索引只覆盖正文，所以不能只靠 `content`。零命中时 stderr 会列出试过哪些字段。
 
 ```bash
-lts-cli config --set traceField=REQUEST_ID
+lts-cli trace <id> --field REQUEST_ID        # 临时指定
+lts-cli config --set traceField=REQUEST_ID   # 这条流长期如此才值得配
 ```
 
+### `lts-cli context`
+
+```bash
+lts-cli context --line-num <lineNum> [--time <毫秒>] [--before 20] [--after 20]
+```
+
+`--time` 可省：`line_num` 本身就是纳秒时间戳，前 13 位即毫秒，CLI 自己推。
+
 ## 配置说明
 
 配置文件 `~/.lts-cli/config.json`（Windows 为 `%USERPROFILE%\.lts-cli\config.json`）：
@@ -186,7 +195,7 @@ lts-cli config --set traceField=REQUEST_ID
 | `endpoint` | 否 | 需包含 `https://` |
 | `groupId` | 否 | 默认日志组 ID |
 | `streamId` | 否 | 默认日志流 ID |
-| `traceField` | 否 | `trace` 默认匹配的字段名，缺省为 `content` |
+| `traceField` | 否 | `trace` 的匹配字段名；不配则自动从流索引里发现 ID 字段 |
 
 `lts-cli config --list` 会把 `ak` / `sk` 脱敏输出，避免凭证进入终端滚屏、shell 历史或 AI 上下文。
 

package/dist/cli/commands/common.js

@@ -8,6 +8,7 @@ exports.resolveFormat = resolveFormat;
 exports.warnIfIncomplete = warnIfIncomplete;
 exports.handleCommandError = handleCommandError;
 const config_1 = require("../../config");
+const client_1 = require("../../lts/client");
 /** 加载配置并校验凭证，缺失时打印引导并退出 */
 function loadCheckedConfig() {
     const config = (0, config_1.loadConfig)();
@@ -39,7 +40,14 @@ function resolveGroupStream(options, config) {
     }
     return { groupId, streamId };
 }
-/** 解析时间选项：--last 与 --st/--et 互斥，至少提供一组 */
+/**
+ * 解析时间选项：`--last` 与 `--st/--et` 互斥，至少提供一组。
+ *
+ * 返回值一律是绝对区间（ISO 8601）。相对时长必须在这里就换算掉、只算一次：
+ * 若把 `last` 传下去，每翻一页都会重算一次 `Date.now()`，窗口随时间往前滑，
+ * 游标（line_num）一旦滑出 [start, end]，服务端直接报
+ * “line_num must be between them”，`--all` 会中途失败。
+ */
 function resolveTimeParams(options, defaultLast) {
     const startTime = options.startTime || options.st;
     const endTime = options.endTime || options.et;
@@ -52,7 +60,18 @@ function resolveTimeParams(options, defaultLast) {
         console.error('Error: time range required. Use --last (e.g. --last 2h) or both --start-time and --end-time.');
         process.exit(1);
     }
-    return last ? { last } : { startTime, endTime };
+    let range;
+    try {
+        range = (0, client_1.resolveTimeRange)(last ? { last } : { startTime, endTime });
+    }
+    catch (error) {
+        console.error(`Error: ${error.message}`);
+        process.exit(1);
+    }
+    return {
+        startTime: new Date(range.startMs).toISOString(),
+        endTime: new Date(range.endMs).toISOString(),
+    };
 }
 /** 将 -q 表达式与便捷筛选 flag 合并为一个查询表达式（AND 连接）
  *  字段值统一加双引号：含连字符等分词符的值（如 UUID）不加引号会匹配不到 */

package/dist/cli/commands/config.js

@@ -1,5 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.maskSecret = maskSecret;
+exports.displayValue = displayValue;
+exports.parseAssignment = parseAssignment;
 exports.createConfigCommand = createConfigCommand;
 const commander_1 = require("commander");
 const config_1 = require("../../config");
@@ -10,6 +13,17 @@ function maskSecret(value) {
         return '****';
     return `${value.slice(0, 2)}${'*'.repeat(Math.max(4, value.length - 4))}${value.slice(-2)}`;
 }
+/** 输出任何配置值时都经过这里：密钥只看得到首尾，其余原样。 */
+function displayValue(key, value) {
+    return SECRET_KEYS.has(key) ? maskSecret(value) : value;
+}
+/** 拆 `key=value`。值里可能含 `=`（base64 密钥、URL 参数），只切第一个等号。 */
+function parseAssignment(input) {
+    const eq = input.indexOf('=');
+    if (eq <= 0)
+        return undefined;
+    return { key: input.slice(0, eq), value: input.slice(eq + 1) };
+}
 function createConfigCommand() {
     const cmd = new commander_1.Command('config');
     cmd.description('Manage LTS CLI configuration')
@@ -19,19 +33,19 @@ function createConfigCommand() {
         .option('--unset <key>', 'Remove a configuration value')
         .action((options) => {
         if (options.set) {
-            const parts = options.set.split('=');
-            if (parts.length !== 2) {
+            const assignment = parseAssignment(options.set);
+            if (!assignment) {
                 console.error('Usage: config --set key=value');
                 process.exit(1);
             }
-            const [key, value] = parts;
+            const { key, value } = assignment;
             (0, config_1.setConfig)(key, value);
-            console.log(`Set ${key}=${value}`);
+            console.log(`Set ${key}=${displayValue(key, value)}`);
         }
         else if (options.get) {
             const value = (0, config_1.getConfig)(options.get);
             if (value !== undefined) {
-                console.log(SECRET_KEYS.has(options.get) ? maskSecret(value) : value);
+                console.log(displayValue(options.get, value));
             }
             else {
                 console.error(`Config key '${options.get}' not found`);
@@ -46,7 +60,7 @@ function createConfigCommand() {
             }
             else {
                 for (const [key, value] of entries) {
-                    console.log(`${key}=${SECRET_KEYS.has(key) ? maskSecret(value) : value}`);
+                    console.log(`${key}=${displayValue(key, value)}`);
                 }
             }
         }

package/dist/cli/commands/context.js

@@ -11,7 +11,7 @@ function createContextCommand() {
         .option('-g, --group-id <groupId>', 'Log group ID (can also be set via config)')
         .option('-s, --stream-id <streamId>', 'Log stream ID (can also be set via config)')
         .requiredOption('--line-num <lineNum>', 'line_num of the anchor log entry')
-        .requiredOption('--time <time>', 'Timestamp (ms) of the anchor log entry')
+        .option('--time <time>', 'Timestamp (ms) of the anchor log entry (derived from --line-num when omitted)')
         .option('--before <count>', 'Number of logs before the anchor', (v) => parseInt(v, 10), 20)
         .option('--after <count>', 'Number of logs after the anchor', (v) => parseInt(v, 10), 20)
         .option('-f, --format <format>', 'Output format: json, table, pretty', 'pretty')
@@ -19,12 +19,19 @@ function createContextCommand() {
         const config = (0, common_1.loadCheckedConfig)();
         const { groupId, streamId } = (0, common_1.resolveGroupStream)(options, config);
         const format = (0, common_1.resolveFormat)(options.format);
+        // line_num 本身就是纳秒时间戳，前 13 位即目标日志的毫秒时间。
+        // 让用户再抄一遍 --time 是纯粹的重复劳动，还会抄错。
+        const time = options.time ?? (0, client_1.anchorTimeFromLineNum)(options.lineNum);
+        if (!time) {
+            console.error(`Cannot derive the anchor time from line_num '${options.lineNum}'. Pass --time <ms>.`);
+            process.exit(1);
+        }
         const client = new client_1.LTSClient(config);
         const params = {
             groupId,
             streamId,
             lineNum: options.lineNum,
-            time: options.time,
+            time,
             before: options.before,
             after: options.after,
         };

package/dist/cli/commands/query.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseLimitOption = parseLimitOption;
 exports.createQueryCommand = createQueryCommand;
 const commander_1 = require("commander");
 const client_1 = require("../../lts/client");
@@ -10,6 +11,17 @@ const common_1 = require("./common");
 function parseIntOption(value) {
     return parseInt(value, 10);
 }
+/** --all 读不到末尾时的止损上限 */
+const ALL_CAP = 10000;
+/** 超限的 limit 本地就拦下：服务端会回一个 LTS.1903，还要多一次往返 */
+function parseLimitOption(value) {
+    const limit = parseIntOption(value);
+    if (!Number.isInteger(limit) || limit < 1 || limit > pagination_1.MAX_PAGE_SIZE) {
+        // 用 commander 的 InvalidArgumentError：它会打印一行提示，而不是整个堆栈
+        throw new commander_1.InvalidArgumentError(`--limit must be between 1 and ${pagination_1.MAX_PAGE_SIZE}`);
+    }
+    return limit;
+}
 function createQueryCommand() {
     const cmd = new commander_1.Command('query');
     cmd.description('Query LTS logs')
@@ -28,10 +40,10 @@ function createQueryCommand() {
         .option('--app <appName>', 'Filter by appName field, merged with -q via AND')
         .option('--content <keyword>', 'Filter by log content (content:<keyword>), merged with -q via AND')
         .option('--request-id <id>', 'Filter by REQUEST_ID field; output in chronological order')
-        .option('-l, --limit <limit>', 'Page size (also the cap for --all)', parseIntOption, 100)
+        .option('-l, --limit <limit>', `Page size; with --all it also caps the total (max ${pagination_1.MAX_PAGE_SIZE})`, parseLimitOption, 100)
         .option('-r, --reverse', 'Reverse order (newest first)')
         .option('-f, --format <format>', 'Output format: json, table, pretty', 'pretty')
-        .option('--all', 'Follow the cursor to the end (up to 10000 logs; default is a single page)')
+        .option('--all', `Follow the cursor to the end (up to ${ALL_CAP} logs unless -l is given)`)
         .action(async (options) => {
         const config = (0, common_1.loadCheckedConfig)();
         const { groupId, streamId } = (0, common_1.resolveGroupStream)(options, config);
@@ -57,9 +69,11 @@ function createQueryCommand() {
                 console.log((0, output_1.formatOutput)(result, format));
             }
             else {
-                // --all：沿游标读到末尾，上限 10000 条防止失控
+                // --all：沿游标读到末尾。显式给了 -l 就以它为上限（帮助里就是这么写的），
+                // 否则用 ALL_CAP 防止失控。
+                const max = cmd.getOptionValueSource('limit') === 'cli' ? options.limit : ALL_CAP;
                 const result = await (0, pagination_1.fetchAllPages)((p) => client.queryLogs(p), params, {
-                    max: 10000,
+                    max,
                     pageSize: options.limit,
                 });
                 (0, common_1.warnIfIncomplete)(result);

package/dist/cli/commands/trace.js

@@ -3,6 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.traceCandidateFields = traceCandidateFields;
+exports.buildTraceExpression = buildTraceExpression;
 exports.createTraceCommand = createTraceCommand;
 const commander_1 = require("commander");
 const chalk_1 = __importDefault(require("chalk"));
@@ -12,20 +14,39 @@ const output_1 = require("../../output");
 const config_1 = require("../../config");
 const common_1 = require("./common");
 /**
- * 默认按全文索引检索，而不是 REQUEST_ID。
+ * 默认字段的选择顺序：`--field` → `config.traceField` → 运行时发现。
  *
- * 理由：`REQUEST_ID` 是某类应用的字段命名约定，不是 LTS 的通用概念。新用户的日志流
- * 里往往没有这个字段，写死它会让 `trace` 在正确的用法下返回空。全文检索总能命中，
- * 而用到专用字段的人可以在 config 里设一次 `traceField`。
+ * 以前第三步写死 `content`（全文检索）。实测不对：结构化日志的 ID 住在 labels 里
+ * （REQUEST_ID / trace_id …），而全文索引只覆盖正文，`content:"<uuid>"` 一条都
+ * 匹配不到——而且不报错，只是空结果。所以第三步改成读索引配置，把形如
+ * request/trace/span + id 的字段都 OR 上，再由 full-text 兜底。
  */
 const DEFAULT_TRACE_FIELD = 'content';
+/** 字段名能凭空进查询语句（不能含连字符，否则会被当成运算符） */
+const SAFE_FIELD_NAME = /^[A-Za-z][A-Za-z0-9_]*$/;
+const ID_FIELD_PATTERN = /(request|trace|span)[_-]?id$/i;
+/** 从索引配置里挑出可能装链路 ID 的字段名（运行时发现，不维护字段表） */
+function traceCandidateFields(index) {
+    const idFields = index.fields
+        .map((f) => f.name)
+        .filter((name) => SAFE_FIELD_NAME.test(name) && ID_FIELD_PATTERN.test(name));
+    // 全文索引用在两种情况下：有 ID 字段时做兜底，没有 ID 字段时是唯一手段
+    if (idFields.length === 0 || index.fullText.enabled) {
+        return [...idFields, DEFAULT_TRACE_FIELD];
+    }
+    return idFields;
+}
+/** 候选字段拼成 OR 表达式，值统一加双引号（含连字符的 UUID 不分词就匹配不到） */
+function buildTraceExpression(fields, requestId) {
+    return fields.map((field) => `${field}:"${requestId}"`).join(' OR ');
+}
 function createTraceCommand() {
     const cmd = new commander_1.Command('trace');
     cmd.description('Trace a request by ID — fetch the full request chain in chronological order')
         .argument('<requestId>', 'Value to trace (request ID, trace ID, or any search text)')
         .option('-g, --group-id <groupId>', 'Log group ID (can also be set via config)')
         .option('-s, --stream-id <streamId>', 'Log stream ID (can also be set via config)')
-        .option('--field <name>', `Field to match. Defaults to config.traceField, then "${DEFAULT_TRACE_FIELD}"`)
+        .option('--field <name>', 'Field to match. Defaults to config.traceField, then the ID fields found in the stream index')
         .option('--last <duration>', 'Relative time range: 30m, 2h, 1d, 7d (default: 24h)')
         .option('--start-time <startTime>', 'Start time (ISO 8601)')
         .option('--end-time <endTime>', 'End time (ISO 8601)')
@@ -38,20 +59,23 @@ function createTraceCommand() {
         const { groupId, streamId } = (0, common_1.resolveGroupStream)(options, config);
         const timeParams = (0, common_1.resolveTimeParams)(options, '24h');
         const format = (0, common_1.resolveFormat)(options.format);
-        const field = options.field || (0, config_1.getConfig)('traceField') || DEFAULT_TRACE_FIELD;
-        // 值加双引号：含连字符的 UUID 不加引号会被分词导致匹配不到
-        const query = `${field}:"${requestId}"`;
+        const explicitField = options.field || (0, config_1.getConfig)('traceField');
         const client = new client_1.LTSClient(config);
+        // 链路按时间正序，且不加应用过滤：一条链路本来就会横跨多个应用
         const params = {
             groupId,
             streamId,
             ...timeParams,
-            query,
-            reverse: false, // 链路按时间正序
+            reverse: false,
         };
         try {
+            const fields = explicitField
+                ? [explicitField]
+                : await discoverTraceFields(client, groupId, streamId);
+            params.query = buildTraceExpression(fields, requestId);
             const maxTotal = options.limit || 200;
-            // 每页不超过 500：再大 LTS 会开始截断，且首屏延迟明显变差
+            // 每页 500 条：服务端单页最多 5000，但 500 的首屏延迟明显更好，
+            // 而一条链路本来就只有几十条，多跑几页也不痛不痒
             const pageSize = Math.min(maxTotal, 500);
             const result = await (0, pagination_1.fetchAllPages)((p) => client.queryLogs(p), params, {
                 max: maxTotal,
@@ -61,6 +85,10 @@ function createTraceCommand() {
             if (result.truncated) {
                 console.error(`Warning: stopped at --limit ${maxTotal}; the chain may continue. Re-run with a larger --limit.`);
             }
+            if (result.logs.length === 0) {
+                console.error(`No logs matched "${requestId}" in ${fields.join(', ')}. ` +
+                    'Widen --last, or pick the exact field with --field <name>.');
+            }
             let output = (0, output_1.formatOutput)({ logs: result.logs, total: result.total }, format);
             // pretty 格式下高亮 requestId，便于肉眼定位
             if (format === 'pretty' && result.logs.length > 0) {
@@ -74,3 +102,15 @@ function createTraceCommand() {
     });
     return cmd;
 }
+/**
+ * 读一次索引配置来决定搜哪些字段。读不到（权限/接口异常）时退回全文检索：
+ * 宁可退化成以前的行为，也不要让 trace 直接报错。
+ */
+async function discoverTraceFields(client, groupId, streamId) {
+    try {
+        return traceCandidateFields(await client.getStreamIndex(groupId, streamId));
+    }
+    catch {
+        return [DEFAULT_TRACE_FIELD];
+    }
+}

package/dist/cli/index.js

@@ -65,25 +65,25 @@ program
     .name('lts-cli')
     .description('Huawei Cloud LTS (Log Tank Service) CLI — query logs from the terminal')
     .version(readVersion())
-    .addHelpText('after', `
-Examples:
-  $ lts-cli init                     Setup credentials interactively
-  $ lts-cli init --from-url <url>    Import region/groupId/streamId from a console URL
-  $ lts-cli config --list            Show current configuration
-  $ lts-cli groups                   List log groups
-  $ lts-cli streams                  List log streams in a group
-  $ lts-cli fields                   Show the index config of a log stream
-  $ lts-cli query --last 2h -q 'level:error' --all
-  $ lts-cli trace <requestId>        Fetch the full request chain
-
-Environment variables:
-  LTS_AK           Access Key
-  LTS_SK           Secret Key
-  LTS_PROJECT_ID   Project ID
-  LTS_REGION       Region
-  LTS_ENDPOINT     Service endpoint
-  LTS_GROUP_ID     Default log group ID
-  LTS_STREAM_ID    Default log stream ID
+    .addHelpText('after', `
+Examples:
+  $ lts-cli init                     Setup credentials interactively
+  $ lts-cli init --from-url <url>    Import region/groupId/streamId from a console URL
+  $ lts-cli config --list            Show current configuration
+  $ lts-cli groups                   List log groups
+  $ lts-cli streams                  List log streams in a group
+  $ lts-cli fields                   Show the index config of a log stream
+  $ lts-cli query --last 2h -q 'level:error' --all
+  $ lts-cli trace <requestId>        Fetch the full request chain
+
+Environment variables:
+  LTS_AK           Access Key
+  LTS_SK           Secret Key
+  LTS_PROJECT_ID   Project ID
+  LTS_REGION       Region
+  LTS_ENDPOINT     Service endpoint
+  LTS_GROUP_ID     Default log group ID
+  LTS_STREAM_ID    Default log stream ID
 `);
 program.addCommand((0, init_1.createInitCommand)());
 program.addCommand((0, query_1.createQueryCommand)());
@@ -99,6 +99,7 @@ program.addCommand((0, config_1.createConfigCommand)());
  */
 const QUERY_OPTS = '-g --group-id -s --stream-id --start-time --end-time --st --et --last -q --query --app --content --request-id -l --limit -r --reverse -f --format --all';
 const TRACE_OPTS = '-g --group-id -s --stream-id --field --last --start-time --end-time --st --et -l --limit -f --format';
+const CONTEXT_OPTS = '-g --group-id -s --stream-id --line-num --time --before --after -f --format';
 const VALUE_OPTS = '-g --group-id -s --stream-id -f --format';
 // Shell completion support
 const completionCmd = new commander_1.Command('completion')
@@ -107,179 +108,200 @@ const completionCmd = new commander_1.Command('completion')
     .action((shell) => {
     switch (shell) {
         case 'bash':
-            console.log(`# lts-cli bash completion — add to ~/.bashrc or ~/.bash_profile
-_lts_cli_completion() {
-  local words cword
-  _get_comp_words_by_ref -n : words cword
-  local cur="\${words[cword]}"
-
-  if (( cword == 1 )); then
-    COMPREPLY=( $(compgen -W "query trace context groups streams fields config init completion" -- "\$cur") )
-    return
-  fi
-
-  local cmd="\${words[1]}"
-  case "\$cmd" in
-    query)
-      case "\$prev" in
-        -g|--group-id|-s|--stream-id|-q|--query|--app|--content|--request-id|-l|--limit|-f|--format)
-          COMPREPLY=()
-          return
-          ;;
-        *)
-          COMPREPLY=( $(compgen -W "${QUERY_OPTS}" -- "\$cur") )
-          return
-          ;;
-      esac
-      ;;
-    trace)
-      case "\$prev" in
-        -g|--group-id|-s|--stream-id|--field|--last|-l|--limit|-f|--format)
-          COMPREPLY=()
-          return
-          ;;
-        *)
-          COMPREPLY=( $(compgen -W "${TRACE_OPTS}" -- "\$cur") )
-          return
-          ;;
-      esac
-      ;;
-    fields)
-      COMPREPLY=( $(compgen -W "${VALUE_OPTS}" -- "\$cur") )
-      return
-      ;;
-    config)
-      COMPREPLY=( $(compgen -W "--set --get --list --unset" -- "\$cur") )
-      return
-      ;;
-    completion)
-      COMPREPLY=( $(compgen -W "bash zsh powershell" -- "\$cur") )
-      return
-      ;;
-    *)
-      COMPREPLY=()
-      return
-      ;;
-  esac
-}
+            console.log(`# lts-cli bash completion — add to ~/.bashrc or ~/.bash_profile
+_lts_cli_completion() {
+  local words cword
+  _get_comp_words_by_ref -n : words cword
+  local cur="\${words[cword]}"
+  local prev="\${words[cword-1]}"
+
+  if (( cword == 1 )); then
+    COMPREPLY=( $(compgen -W "query trace context groups streams fields config init completion" -- "\$cur") )
+    return
+  fi
+
+  local cmd="\${words[1]}"
+  case "\$cmd" in
+    query)
+      case "\$prev" in
+        -g|--group-id|-s|--stream-id|-q|--query|--app|--content|--request-id|--start-time|--end-time|--st|--et|--last|-l|--limit|-f|--format)
+          COMPREPLY=()
+          return
+          ;;
+        *)
+          COMPREPLY=( $(compgen -W "${QUERY_OPTS}" -- "\$cur") )
+          return
+          ;;
+      esac
+      ;;
+    trace)
+      case "\$prev" in
+        -g|--group-id|-s|--stream-id|--field|--start-time|--end-time|--st|--et|--last|-l|--limit|-f|--format)
+          COMPREPLY=()
+          return
+          ;;
+        *)
+          COMPREPLY=( $(compgen -W "${TRACE_OPTS}" -- "\$cur") )
+          return
+          ;;
+      esac
+      ;;
+    context)
+      case "\$prev" in
+        -g|--group-id|-s|--stream-id|--line-num|--time|--before|--after|-f|--format)
+          COMPREPLY=()
+          return
+          ;;
+        *)
+          COMPREPLY=( $(compgen -W "${CONTEXT_OPTS}" -- "\$cur") )
+          return
+          ;;
+      esac
+      ;;
+    groups)
+      COMPREPLY=( $(compgen -W "-f --format" -- "\$cur") )
+      return
+      ;;
+    streams)
+      COMPREPLY=( $(compgen -W "${VALUE_OPTS}" -- "\$cur") )
+      return
+      ;;
+    fields)
+      COMPREPLY=( $(compgen -W "${VALUE_OPTS}" -- "\$cur") )
+      return
+      ;;
+    config)
+      COMPREPLY=( $(compgen -W "--set --get --list --unset" -- "\$cur") )
+      return
+      ;;
+    completion)
+      COMPREPLY=( $(compgen -W "bash zsh powershell" -- "\$cur") )
+      return
+      ;;
+    *)
+      COMPREPLY=()
+      return
+      ;;
+  esac
+}
 complete -F _lts_cli_completion lts-cli`);
             break;
         case 'zsh':
-            console.log(`# lts-cli zsh completion — add to ~/.zshrc
-#compdef lts-cli
-_lts_cli() {
-  local -a commands
-  commands=(
-    'query:Query LTS logs'
-    'trace:Trace a request by ID'
-    'context:View logs before/after a log entry'
-    'groups:List log groups'
-    'streams:List log streams'
-    'fields:Show the index config of a log stream'
-    'config:Manage configuration'
-    'init:Interactive setup wizard'
-    'completion:Generate shell completion script'
-  )
-
-  local context state state_descr line
-  typeset -A opt_args
-
-  _arguments -C \\
-    '1: :->command' \\
-    '*:: :->args'
-
-  case "\$state" in
-    command)
-      _describe 'command' commands
-      ;;
-    args)
-      case "\$line[1]" in
-        query)
-          _arguments \\
-            '-g[Log group ID]:group ID:' \\
-            '-s[Log stream ID]:stream ID:' \\
-            '--start-time[Start time (ISO 8601)]:time:' \\
-            '--end-time[End time (ISO 8601)]:time:' \\
-            '--st[Alias for --start-time]:time:' \\
-            '--et[Alias for --end-time]:time:' \\
-            '--last[Relative range: 30m, 2h, 1d, 7d]:duration:' \\
-            '-q[Query expression]:query:' \\
-            '--app[Filter by appName]:appName:' \\
-            '--content[Filter by content]:keyword:' \\
-            '--request-id[Filter by REQUEST_ID]:id:' \\
-            '-l[Page size]:number:' \\
-            '-r[Reverse order]' \\
-            '-f[Output format]:format:(json table pretty)' \\
-            '--all[Follow the cursor to the end]'
-          ;;
-        trace)
-          _arguments \\
-            '-g[Log group ID]:group ID:' \\
-            '-s[Log stream ID]:stream ID:' \\
-            '--field[Field to match]:field:' \\
-            '--last[Relative range: 30m, 2h, 1d, 7d]:duration:' \\
-            '--start-time[Start time (ISO 8601)]:time:' \\
-            '--end-time[End time (ISO 8601)]:time:' \\
-            '--st[Alias for --start-time]:time:' \\
-            '--et[Alias for --end-time]:time:' \\
-            '-l[Max logs]:number:' \\
-            '-f[Output format]:format:(json table pretty)'
-          ;;
-        fields|groups|streams)
-          _arguments \\
-            '-g[Log group ID]:group ID:' \\
-            '-s[Log stream ID]:stream ID:' \\
-            '-f[Output format]:format:(json table pretty)'
-          ;;
-        config)
-          _arguments \\
-            '--set[Set config value]:key=value:' \\
-            '--get[Get config value]:key:' \\
-            '--list[List all config]' \\
-            '--unset[Remove config value]:key:'
-          ;;
-        completion)
-          _values 'shell' bash zsh powershell
-          ;;
-      esac
-      ;;
-  esac
-}
+            console.log(`# lts-cli zsh completion — add to ~/.zshrc
+#compdef lts-cli
+_lts_cli() {
+  local -a commands
+  commands=(
+    'query:Query LTS logs'
+    'trace:Trace a request by ID'
+    'context:View logs before/after a log entry'
+    'groups:List log groups'
+    'streams:List log streams'
+    'fields:Show the index config of a log stream'
+    'config:Manage configuration'
+    'init:Interactive setup wizard'
+    'completion:Generate shell completion script'
+  )
+
+  local context state state_descr line
+  typeset -A opt_args
+
+  _arguments -C \\
+    '1: :->command' \\
+    '*:: :->args'
+
+  case "\$state" in
+    command)
+      _describe 'command' commands
+      ;;
+    args)
+      case "\$line[1]" in
+        query)
+          _arguments \\
+            '-g[Log group ID]:group ID:' \\
+            '-s[Log stream ID]:stream ID:' \\
+            '--start-time[Start time (ISO 8601)]:time:' \\
+            '--end-time[End time (ISO 8601)]:time:' \\
+            '--st[Alias for --start-time]:time:' \\
+            '--et[Alias for --end-time]:time:' \\
+            '--last[Relative range: 30m, 2h, 1d, 7d]:duration:' \\
+            '-q[Query expression]:query:' \\
+            '--app[Filter by appName]:appName:' \\
+            '--content[Filter by content]:keyword:' \\
+            '--request-id[Filter by REQUEST_ID]:id:' \\
+            '-l[Page size]:number:' \\
+            '-r[Reverse order]' \\
+            '-f[Output format]:format:(json table pretty)' \\
+            '--all[Follow the cursor to the end]'
+          ;;
+        trace)
+          _arguments \\
+            '-g[Log group ID]:group ID:' \\
+            '-s[Log stream ID]:stream ID:' \\
+            '--field[Field to match]:field:' \\
+            '--last[Relative range: 30m, 2h, 1d, 7d]:duration:' \\
+            '--start-time[Start time (ISO 8601)]:time:' \\
+            '--end-time[End time (ISO 8601)]:time:' \\
+            '--st[Alias for --start-time]:time:' \\
+            '--et[Alias for --end-time]:time:' \\
+            '-l[Max logs]:number:' \\
+            '-f[Output format]:format:(json table pretty)'
+          ;;
+        fields|groups|streams)
+          _arguments \\
+            '-g[Log group ID]:group ID:' \\
+            '-s[Log stream ID]:stream ID:' \\
+            '-f[Output format]:format:(json table pretty)'
+          ;;
+        config)
+          _arguments \\
+            '--set[Set config value]:key=value:' \\
+            '--get[Get config value]:key:' \\
+            '--list[List all config]' \\
+            '--unset[Remove config value]:key:'
+          ;;
+        completion)
+          _values 'shell' bash zsh powershell
+          ;;
+      esac
+      ;;
+  esac
+}
 compdef _lts_cli lts-cli`);
             break;
         case 'powershell':
-            console.log(`# lts-cli PowerShell completion — add to $PROFILE
-Register-ArgumentCompleter -CommandName lts-cli -ScriptBlock {
-  param(\$wordToComplete, \$commandAst, \$cursorPosition)
-
-  \$commands = @('query', 'trace', 'context', 'groups', 'streams', 'fields', 'config', 'init', 'completion')
-
-  \$args = \$commandAst.ToString() -split '\\s+'
-  if (\$args.Count -le 1) {
-    return \$commands | Where-Object { \$_ -like "\$wordToComplete*" }
-  }
-
-  switch (\$args[1]) {
-    'query' {
-      \$opts = @('-g', '-s', '--start-time', '--end-time', '--st', '--et', '--last', '-q', '--app', '--content', '--request-id', '-l', '-r', '-f', '--all')
-      return \$opts | Where-Object { \$_ -like "\$wordToComplete*" }
-    }
-    'trace' {
-      \$opts = @('-g', '-s', '--field', '--last', '--start-time', '--end-time', '--st', '--et', '-l', '-f')
-      return \$opts | Where-Object { \$_ -like "\$wordToComplete*" }
-    }
-    'fields' {
-      \$opts = @('-g', '-s', '-f')
-      return \$opts | Where-Object { \$_ -like "\$wordToComplete*" }
-    }
-    'config' {
-      \$opts = @('--set', '--get', '--list', '--unset')
-      return \$opts | Where-Object { \$_ -like "\$wordToComplete*" }
-    }
-    'completion' {
-      return @('bash', 'zsh', 'powershell') | Where-Object { \$_ -like "\$wordToComplete*" }
-    }
-  }
+            console.log(`# lts-cli PowerShell completion — add to $PROFILE
+Register-ArgumentCompleter -CommandName lts-cli -ScriptBlock {
+  param(\$wordToComplete, \$commandAst, \$cursorPosition)
+
+  \$commands = @('query', 'trace', 'context', 'groups', 'streams', 'fields', 'config', 'init', 'completion')
+
+  \$args = \$commandAst.ToString() -split '\\s+'
+  if (\$args.Count -le 1) {
+    return \$commands | Where-Object { \$_ -like "\$wordToComplete*" }
+  }
+
+  switch (\$args[1]) {
+    'query' {
+      \$opts = @('-g', '-s', '--start-time', '--end-time', '--st', '--et', '--last', '-q', '--app', '--content', '--request-id', '-l', '-r', '-f', '--all')
+      return \$opts | Where-Object { \$_ -like "\$wordToComplete*" }
+    }
+    'trace' {
+      \$opts = @('-g', '-s', '--field', '--last', '--start-time', '--end-time', '--st', '--et', '-l', '-f')
+      return \$opts | Where-Object { \$_ -like "\$wordToComplete*" }
+    }
+    'fields' {
+      \$opts = @('-g', '-s', '-f')
+      return \$opts | Where-Object { \$_ -like "\$wordToComplete*" }
+    }
+    'config' {
+      \$opts = @('--set', '--get', '--list', '--unset')
+      return \$opts | Where-Object { \$_ -like "\$wordToComplete*" }
+    }
+    'completion' {
+      return @('bash', 'zsh', 'powershell') | Where-Object { \$_ -like "\$wordToComplete*" }
+    }
+  }
 }`);
             break;
         default:

package/dist/lts/client.js

@@ -1,8 +1,43 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LTSClient = void 0;
 exports.resolveTimeRange = resolveTimeRange;
 exports.parseQueryExpression = parseQueryExpression;
+exports.anchorTimeFromLineNum = anchorTimeFromLineNum;
+const path = __importStar(require("path"));
 const LtsClient_1 = require("@huaweicloud/huaweicloud-sdk-lts/v2/LtsClient");
 const ClientBuilder_1 = require("@huaweicloud/huaweicloud-sdk-core/ClientBuilder");
 const BasicCredentials_1 = require("@huaweicloud/huaweicloud-sdk-core/auth/BasicCredentials");
@@ -15,6 +50,32 @@ const ListLogGroupsRequest_1 = require("@huaweicloud/huaweicloud-sdk-lts/v2/mode
 const ListLogStreamsRequest_1 = require("@huaweicloud/huaweicloud-sdk-lts/v2/model/ListLogStreamsRequest");
 const ListLogStreamIndexRequest_1 = require("@huaweicloud/huaweicloud-sdk-lts/v2/model/ListLogStreamIndexRequest");
 const pagination_1 = require("./pagination");
+/**
+ * 华为云 SDK 把 log4js 的 console appender 指向 stdout，任何 API 错误都会把整个
+ * axios 错误对象（含 Authorization 头）倒进 stdout——`-f json` 的输出因此变成
+ * 不可解析的混合体。这里把 SDK 日志改道 stderr 并默认关闭：CLI 自己会打印
+ * 一行可读的错误，6KB 的 axios dump 只会淹没它。要排查 SDK 层问题时设
+ * LTS_CLI_DEBUG=1。
+ *
+ * 解析到的必须是 SDK 自己那个 log4js 实例，否则 configure 改的是另一份模块状态。
+ * 拿不到就保持原状：日志难看，但不影响结果本身。
+ */
+function configureSdkLogger() {
+    try {
+        const corePkg = require.resolve('@huaweicloud/huaweicloud-sdk-core/package.json');
+        const log4js = require(require.resolve('log4js', { paths: [path.dirname(corePkg)] }));
+        log4js.configure({
+            appenders: { sdkStderr: { type: 'stderr' } },
+            categories: {
+                default: { appenders: ['sdkStderr'], level: process.env.LTS_CLI_DEBUG ? 'all' : 'off' },
+            },
+        });
+    }
+    catch {
+        /* 无法改道时不做任何事 */
+    }
+}
+configureSdkLogger();
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -71,6 +132,14 @@ function parseQueryExpression(expr) {
     }
     return { keywords: trimmed, isAnalysisQuery: false };
 }
+/**
+ * line_num 是 19 位纳秒时间戳，前 13 位就是毫秒（实测与日志时间严格对齐）。
+ * `context` 接口要求传毫秒时间戳，而 LTS 的日志记录本身不带时间字段，只能从
+ * line_num 推。格式不符时返回 undefined，让调用方要求显式 --time。
+ */
+function anchorTimeFromLineNum(lineNum) {
+    return /^\d{19}$/.test(lineNum) ? lineNum.slice(0, 13) : undefined;
+}
 /** 服务端默认在命中词上包裹 <HighLightTag>，输出前剥离 */
 function stripHighlightTags(value) {
     return value.replace(/<\/?HighLightTag>/g, '');
@@ -118,7 +187,7 @@ class LTSClient {
         // 游标翻页：首屏不带游标，后续页把上一页末条的 line_num 当作续读起点
         if (params.lineNum) {
             queryParams.withLineNum(params.lineNum);
-            queryParams.withSearchType(params.searchType ?? (0, pagination_1.cursorDirection)(params.reverse));
+            queryParams.withSearchType(params.searchType ?? pagination_1.CONTINUE_SEARCH_TYPE);
         }
         const request = new ListLogsRequest_1.ListLogsRequest(params.groupId, params.streamId, 'application/json')
             .withBody(queryParams);

package/dist/lts/pagination.js

@@ -1,12 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cursorDirection = cursorDirection;
+exports.MAX_PAGE_SIZE = exports.CONTINUE_SEARCH_TYPE = void 0;
 exports.nextCursor = nextCursor;
+exports.shiftLineNum = shiftLineNum;
 exports.fetchAllPages = fetchAllPages;
-/** 倒序（新到旧）→ 往更早读；正序 → 往更晚读。 */
-function cursorDirection(reverse) {
-    return reverse ? 'backwards' : 'forwards';
-}
+/**
+ * LTS 的翻页语义：服务端没有 offset，只有「从某个 line_num 继续读」。
+ *
+ * 第一页不带游标；之后每页把上一页最后一条的 line_num 作为续读起点。
+ *
+ * 续读方向只有一种：`forwards`，它表示「沿当前排序方向继续」，与 `is_desc` 无关。
+ * 实测（2026-10，cn-south-1）降序查询配 `backwards` 时，第二页与第一页的 line_num
+ * 重叠 38%~100%：正序配 backwards 更直接，返回的就是第一页那一段。而且全程不报
+ * 错。所以这里不再按排序方向推方向——反了会静默产出重复数据，比报错难查得多。
+ * 对照：无论升降序，`forwards` 连翻 10 页、每页 100 条，边界重叠为 0。
+ *
+ * 游标是排他的：从 line_num=L 续读只会返回严格在 L 之后的记录。但 line_num 在
+ * 纳秒级并不唯一——同一纳秒的多条日志共用一个值，一组日志正好被页边界切开时，
+ * 后半组会被整组跳过（实测：单页查得到 18 条，--all 只拿到 17 条）。所以续读
+ * 游标取 L 的前一格（正序 L-1、降序 L+1），让下一页从这一组的组头开始读，再按
+ * 「line_num + 内容 + labels」跳过本页已经收走的那几条。line_num 不唯一，不能
+ * 只按它去重，否则会把同纳秒的真实日志一起丢掉。
+ */
+/** 续读游标时唯一正确的 search_type。 */
+exports.CONTINUE_SEARCH_TYPE = 'forwards';
+/** 服务端单页上限：limit=5001 直接回 LTS.1903 "limit must be between 1 and 5000"。 */
+exports.MAX_PAGE_SIZE = 5000;
 /** 游标取本页最后一条的 line_num；拿不到就返回 undefined（调用方据此停止）。 */
 function nextCursor(logs) {
     if (logs.length === 0)
@@ -14,39 +33,119 @@ function nextCursor(logs) {
     const last = logs[logs.length - 1].lineNum;
     return last ? last : undefined;
 }
+/** line_num 是纳秒整数；游标前后挪一格，才能把被页边界切开的同值组重新纳入。 */
+function shiftLineNum(lineNum, delta) {
+    if (!/^\d+$/.test(lineNum))
+        return undefined;
+    return (BigInt(lineNum) + delta).toString();
+}
+/** line_num 不唯一，同纳秒同内容也可能是两条真实日志；回放判定要带上内容与 labels。 */
+function entrySignature(entry) {
+    const labels = Object.keys(entry.labels)
+        .sort()
+        .map((key) => `${key}=${entry.labels[key]}`)
+        .join('\u0001');
+    return `${entry.content}\u0000${labels}`;
+}
+/** 统计某一 line_num 组内各签名的条数，下一页据此跳过回放。 */
+function countSignatures(entries, lineNum) {
+    const counts = new Map();
+    for (const entry of entries) {
+        if (entry.lineNum !== lineNum)
+            continue;
+        const signature = entrySignature(entry);
+        counts.set(signature, (counts.get(signature) ?? 0) + 1);
+    }
+    return counts;
+}
+function mergeCounts(into, extra) {
+    for (const [signature, count] of extra) {
+        into.set(signature, (into.get(signature) ?? 0) + count);
+    }
+    return into;
+}
 async function fetchAllPages(fetchPage, params, options = {}) {
     const max = options.max ?? 10000;
-    const pageSize = options.pageSize ?? params.limit ?? 100;
-    const direction = cursorDirection(params.reverse);
+    // 每页条数不能超过服务端上限，否则整次 --all 直接报错
+    const basePageSize = Math.min(options.pageSize ?? params.limit ?? 100, exports.MAX_PAGE_SIZE);
+    // forwards 沿当前排序方向推进：正序越来越晚（-1），降序越来越早（+1）
+    const step = params.reverse === true ? 1n : -1n;
     const collected = [];
     let cursor;
+    // 上一页末条所在的 line_num 组；下一页从该组组头重读，组内已收走的条目按签名跳过
+    let boundaryLineNum;
+    let boundaryCounts = new Map();
     let isQueryComplete;
     let truncated = false;
     while (collected.length < max) {
-        const page = await fetchPage({
-            ...params,
-            limit: pageSize,
-            lineNum: cursor,
-            searchType: cursor ? direction : undefined,
-        });
-        if (page.isQueryComplete === false) {
-            isQueryComplete = false;
+        // 重读组头会带回已收走的同值组；多要这么多条，保证每页仍有 pageSize 条新数据
+        const boundarySize = [...boundaryCounts.values()].reduce((sum, count) => sum + count, 0);
+        let pageSize = Math.min(basePageSize + boundarySize, exports.MAX_PAGE_SIZE);
+        let pageLength = 0;
+        let fresh = [];
+        let reachedEnd = false;
+        // 同纳秒的日志多到一页装不下时，重读组头永远只能拿到前 pageSize 条；
+        // 放大一页才可能越过这一组。
+        while (true) {
+            const page = await fetchPage({
+                ...params,
+                limit: pageSize,
+                lineNum: cursor,
+                searchType: cursor ? exports.CONTINUE_SEARCH_TYPE : undefined,
+            });
+            if (page.isQueryComplete === false) {
+                isQueryComplete = false;
+            }
+            else if (isQueryComplete === undefined && page.isQueryComplete === true) {
+                isQueryComplete = true;
+            }
+            pageLength = page.logs.length;
+            if (pageLength === 0) {
+                reachedEnd = true;
+                break;
+            }
+            const pending = new Map(boundaryCounts);
+            fresh = [];
+            for (const entry of page.logs) {
+                if (boundaryLineNum !== undefined && entry.lineNum === boundaryLineNum) {
+                    const signature = entrySignature(entry);
+                    const remaining = pending.get(signature) ?? 0;
+                    if (remaining > 0) {
+                        pending.set(signature, remaining - 1);
+                        continue;
+                    }
+                }
+                fresh.push(entry);
+            }
+            if (fresh.length > 0)
+                break;
+            // 不满一页且全是回放 = 同值组之后再无日志，已经到底
+            if (pageLength < pageSize) {
+                reachedEnd = true;
+                break;
+            }
+            if (pageSize >= exports.MAX_PAGE_SIZE) {
+                truncated = true;
+                reachedEnd = true;
+                break;
+            }
+            pageSize = Math.min(pageSize * 2, exports.MAX_PAGE_SIZE);
         }
-        else if (isQueryComplete === undefined && page.isQueryComplete === true) {
-            isQueryComplete = true;
-        }
-        if (page.logs.length === 0)
-            break;
-        const next = nextCursor(page.logs);
-        // 服务端把同一段原样又给了一遍：整页丢弃并停止。
-        // 先判游标再入账，否则重放的一页会被当成新数据拼进结果。
-        if (cursor !== undefined && next === cursor)
+        if (reachedEnd)
             break;
-        collected.push(...page.logs);
-        // 不满一页 = 没有更多了；拿不到游标则无法继续翻页
-        if (page.logs.length < pageSize || !next)
+        collected.push(...fresh);
+        const lastLineNum = fresh[fresh.length - 1]?.lineNum;
+        // 不满一页 = 没有更多了；游标推不动则无法继续翻页
+        const next = lastLineNum ? shiftLineNum(lastLineNum, step) : undefined;
+        if (pageLength < pageSize || !next)
             break;
         cursor = next;
+        // 同值组可能横跨多页：计数必须累计，否则重读组头时会把前几页收走的条目再收一遍
+        boundaryCounts =
+            lastLineNum === boundaryLineNum
+                ? mergeCounts(boundaryCounts, countSignatures(fresh, lastLineNum))
+                : countSignatures(fresh, lastLineNum);
+        boundaryLineNum = lastLineNum;
         if (collected.length >= max) {
             truncated = true;
         }

package/package.json

@@ -1,57 +1,57 @@
-{
-  "name": "@cvtoolman/huawei-lts-cli",
-  "version": "2.1.0",
-  "description": "Command-line tool for querying Huawei Cloud Log Tank Service (LTS) logs",
-  "main": "dist/cli/index.js",
-  "bin": {
-    "lts-cli": "dist/cli/index.js"
-  },
-  "files": [
-    "dist/"
-  ],
-  "scripts": {
-    "build": "tsc",
-    "dev": "tsx src/cli/index.ts",
-    "start": "node dist/cli/index.js",
-    "test": "node --import tsx --test \"test/**/*.test.ts\"",
-    "typecheck": "tsc --noEmit",
-    "clean": "node -e \"require('fs').rmSync('dist', {recursive: true, force: true})\"",
-    "prepublishOnly": "npm run clean && npm run build"
-  },
-  "keywords": [
-    "huawei-cloud",
-    "huawei",
-    "lts",
-    "log-tank-service",
-    "logs",
-    "cli",
-    "log-query",
-    "cloud-logging"
-  ],
-  "author": "cvtoolman",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/jcxy/huawei-lts-cli.git"
-  },
-  "bugs": {
-    "url": "https://github.com/jcxy/huawei-lts-cli/issues"
-  },
-  "homepage": "https://github.com/jcxy/huawei-lts-cli#readme",
-  "engines": {
-    "node": ">=18.0.0"
-  },
-  "dependencies": {
-    "@huaweicloud/huaweicloud-sdk-core": "^3.1.200",
-    "@huaweicloud/huaweicloud-sdk-lts": "^3.1.200",
-    "chalk": "^4.1.2",
-    "cli-table3": "^0.6.5",
-    "commander": "^15.0.0",
-    "uuid": "^9.0.0"
-  },
-  "devDependencies": {
-    "@types/node": "^26.0.0",
-    "tsx": "^4.22.4",
-    "typescript": "^6.0.3"
-  }
-}
+{
+  "name": "@cvtoolman/huawei-lts-cli",
+  "version": "2.1.1",
+  "description": "Command-line tool for querying Huawei Cloud Log Tank Service (LTS) logs",
+  "main": "dist/cli/index.js",
+  "bin": {
+    "lts-cli": "dist/cli/index.js"
+  },
+  "files": [
+    "dist/"
+  ],
+  "scripts": {
+    "build": "tsc",
+    "dev": "tsx src/cli/index.ts",
+    "start": "node dist/cli/index.js",
+    "test": "node --import tsx --test \"test/**/*.test.ts\"",
+    "typecheck": "tsc --noEmit",
+    "clean": "node -e \"require('fs').rmSync('dist', {recursive: true, force: true})\"",
+    "prepublishOnly": "npm run clean && npm run build"
+  },
+  "keywords": [
+    "huawei-cloud",
+    "huawei",
+    "lts",
+    "log-tank-service",
+    "logs",
+    "cli",
+    "log-query",
+    "cloud-logging"
+  ],
+  "author": "cvtoolman",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jcxy/huawei-lts-cli.git"
+  },
+  "bugs": {
+    "url": "https://github.com/jcxy/huawei-lts-cli/issues"
+  },
+  "homepage": "https://github.com/jcxy/huawei-lts-cli#readme",
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "dependencies": {
+    "@huaweicloud/huaweicloud-sdk-core": "^3.1.200",
+    "@huaweicloud/huaweicloud-sdk-lts": "^3.1.200",
+    "chalk": "^4.1.2",
+    "cli-table3": "^0.6.5",
+    "commander": "^15.0.0",
+    "uuid": "^9.0.0"
+  },
+  "devDependencies": {
+    "@types/node": "^26.0.0",
+    "tsx": "^4.22.4",
+    "typescript": "^6.0.3"
+  }
+}

package/dist/cli/options.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.queryOptions = void 0;
-exports.queryOptions = {
-    groupId: { short: '-g', long: '--group-id <groupId>', description: 'Log group ID', required: true },
-    streamId: { short: '-s', long: '--stream-id <streamId>', description: 'Log stream ID', required: true },
-    startTime: { short: '--start-time <startTime>', long: '--start-time <startTime>', description: 'Start time (ISO 8601)', required: true },
-    endTime: { short: '--end-time <endTime>', long: '--end-time <endTime>', description: 'End time (ISO 8601)', required: true },
-    keyword: { short: '-k', long: '--keyword <keyword>', description: 'Search keyword', required: false },
-    limit: { short: '-l', long: '--limit <limit>', description: 'Limit number of results', required: false },
-    offset: { short: '-o', long: '--offset <offset>', description: 'Offset for pagination', required: false },
-    reverse: { short: '-r', long: '--reverse', description: 'Reverse order', required: false },
-    format: { short: '-f', long: '--format <format>', description: 'Output format: json, table, pretty', required: false },
-    noPaginate: { short: '', long: '--no-paginate', description: 'Disable pagination', required: false },
-};