Commit c3a741f
committed
merge: resolve conflicts with origin/main (log-view multi-ID support)
Merge origin/main's fix(log-view): support multiple log IDs and validate
hex format (#362) into the argument parsing improvements branch.
Key conflict resolutions:
- src/commands/log/view.ts: Keep main's multi-ID structure (logIds[],
validateHexId, resolveTarget helper), add swap detection and
looksLikeIssueShortId suggestion for 2-arg case using flat ternaries
to stay under cognitive complexity limit
- test/commands/log/view.test.ts: Update func test spies from getLog to
getLogs with array return values; swap-detection func test now expects
ValidationError since hex validation fires first
- test/commands/log/view.property.test.ts: Keep main's typed arbitraries
(slugArb, logIdArb), remove unnecessary pre() guard
- AGENTS.md: Keep all lore entries from both sidesFile tree
20 files changed
+1593
-292
lines changed- plugins/sentry-cli/skills/sentry-cli
- src
- commands
- log
- trace
- lib
- test
- commands
- log
- trace
- e2e
- fixtures
- isolated
- lib
- mocks
20 files changed
+1593
-292
lines changedLarge diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
550 | 550 | | |
551 | 551 | | |
552 | 552 | | |
553 | | - | |
| 553 | + | |
554 | 554 | | |
555 | 555 | | |
556 | 556 | | |
| |||
0 commit comments