Skip to content

Commit c3a741f

Browse files
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 sides
2 parents 4b3bd7f + a5fa054 commit c3a741f

File tree

20 files changed

+1593
-292
lines changed

20 files changed

+1593
-292
lines changed

AGENTS.md

Lines changed: 48 additions & 36 deletions
Large diffs are not rendered by default.

plugins/sentry-cli/skills/sentry-cli/SKILL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ sentry log list my-org/backend -f -q 'level:error'
550550

551551
#### `sentry log view <args...>`
552552

553-
View details of a specific log entry
553+
View details of one or more log entries
554554

555555
**Flags:**
556556
- `--json - Output as JSON`

0 commit comments

Comments
 (0)