fix: resolveTimeRange 中 --from/--to 优先于 --last (#8)

--last 有默认值导致显式传入的 --from/--to 被忽略，
调整判断顺序使 --from/--to 优先生效，影响 11 个命令。

Author: longger-kanyun

.changeset/fix-time-range-priority.md

@@ -0,0 +1,8 @@
+---
+'octo-cli': patch
+---
+
+修复 --from/--to 参数被 --last 默认值覆盖的问题
+
+- resolveTimeRange 中 --from/--to 优先级提升至 --last 之前
+- 修复 alerts search、issues search、trace search 等 11 个命令的时间范围参数失效问题

src/time.test.ts

@@ -58,4 +58,14 @@ describe('resolveTimeRange', () => {
     expect(from).toBe(new Date('2024-01-01T00:00:00Z').getTime());
     expect(to).toBe(new Date('2024-01-01T01:00:00Z').getTime());
   });
+
+  it('--from/--to takes precedence over --last', () => {
+    const { from, to } = resolveTimeRange({
+      last: '1h',
+      from: '2024-06-01T00:00:00Z',
+      to: '2024-06-01T23:59:59Z',
+    });
+    expect(from).toBe(new Date('2024-06-01T00:00:00Z').getTime());
+    expect(to).toBe(new Date('2024-06-01T23:59:59Z').getTime());
+  });
 });

src/time.ts

@@ -29,17 +29,17 @@ export function resolveTimeRange(opts: {
 }): { from: number; to: number } {
   const now = Date.now();
 
-  if (opts.last) {
-    const ms = parseDuration(opts.last);
-    return { from: now - ms, to: now };
-  }
-
   if (opts.from) {
     const from = parseTimestamp(opts.from);
     const to = opts.to ? parseTimestamp(opts.to) : now;
     return { from, to };
   }
 
+  if (opts.last) {
+    const ms = parseDuration(opts.last);
+    return { from: now - ms, to: now };
+  }
+
   // Default: last 15 minutes
   return { from: now - 15 * 60_000, to: now };
 }