feat(snapshots): add upload command - #1186

Merged
BYK merged 5 commits into
mainfrom
byk/feat/snapshots-upload
Jul 3, 2026
Merged

feat(snapshots): add upload command#1186
BYK merged 5 commits into
mainfrom
byk/feat/snapshots-upload

Conversation

@BYK

@BYKBYK commented Jul 3, 2026

Copy link
Copy Markdown
Member

Ports snapshots upload from the legacy Rust CLI, completing the snapshots trio (upload/download/diff). Scans a folder of screenshots, uploads them to Sentry's object store, and creates a snapshot for visual diffing. Sentry SaaS only.

Objectstore approach

The object store is live; a native TS objectstore client is still pending, so — as agreed — we replicate the raw HTTP calls the Rust objectstore-client crate makes (reverse-engineered from getsentry/objectstore):

  • GETprojects/{org}/{project}/preprodartifacts/snapshots/upload-options/{ objectstore: { url, scopes, authToken, expirationPolicy } }.
  • HEAD{url}/v1/objects/preprod/{scope}/{key} to dedup (404 = missing), where scope = k=v;k=v (ordered) and key = {orgId}/{projectId}/{sha256}. Auth is a pre-signed JWT sent as x-os-auth: Bearer <token> (not Authorization).
  • PUT the bytes with x-sn-expiration: <policy>. The key is the original file's SHA-256, so dedup is independent of upload compression — images are already-compressed formats, so they're uploaded raw (no Content-Encoding).
  • POSTprojects/{org}/{project}/preprodartifacts/snapshots/ with the manifest → { artifactId, imageCount, snapshotUrl? }.

HEAD/PUT run with bounded concurrency (8).

Behavior (parity with Rust)

  • <path> (a directory) + --app-id (required).
  • Walks for PNG/JPEG (skips hidden files/dirs); reads dimensions via image-size (header-only), SHA-256, and a companion <image>.json sidecar (its keys merge into the manifest; CLI width/height/content_hash win).
  • Rejects any image over 40,000,000 px, listing violators.
  • --selective / --all-image-file-names[-file] for subset uploads (the latter validates every uploaded image is in the list; both imply selective).
  • --diff-threshold (0.0–1.0). Full git-metadata flags (auto-collected in CI, like build upload); a --pr-number without a resolvable base SHA errors.
  • Manifest flattens VCS at the top level (reuses vcsInfoToBody).
  • Empty folder → exits 0 with "No image files found".

Memory

Each image is read once (dimensions + hash) and released; only the missing ones are re-read for the PUT body — bounded to a few images at a time.

New files / deps

src/lib/objectstore.ts, src/lib/snapshots/images.ts, fetchSnapshotsUploadOptions/createPreprodSnapshot in preprod-artifacts.ts, src/commands/snapshots/upload.ts. Adds image-size as a devDependency (the analog of Rust's imagesize). The VCS flag block is inlined (matching build upload); extracting a shared definition is a noted follow-up.

Tests

Objectstore client (URL/auth/HEAD/PUT), image collection + validation (real pngjs fixtures), both API calls, and the command's dedup (HEAD skips existing → fewer PUTs) + manifest shape. typecheck/lint/check:deps/check:fragments pass; full suite 8332 passed.

Port `snapshots upload` from the legacy Rust CLI. Scans a folder for PNG/JPEG
screenshots, uploads each to Sentry's object store (skipping any already present
by content hash), and POSTs a manifest to create the snapshot for visual diffing.
Objectstore is live; until a native TS objectstore client ships we make the raw
calls the Rust `objectstore-client` crate makes:
- GET snapshots/upload-options → { objectstore: { url, scopes, authToken, expirationPolicy } }.
- HEAD {url}/v1/objects/preprod/{k=v;...}/{orgId}/{projectId}/{sha256} (dedup),
auth via `x-os-auth: Bearer <jwt>`.
- PUT the raw bytes with `x-sn-expiration`. Objects are keyed by the original
file's SHA-256, so dedup is compression-independent (images are already
compressed → uploaded raw).
- POST snapshots/ with the manifest (app_id, per-image width/height/content_hash
+ sidecar, flattened VCS, diff_threshold/selective/all_image_file_names).
New: src/lib/objectstore.ts (HEAD/PUT client), src/lib/snapshots/images.ts
(collect + validate, dimensions via image-size), preprod-artifacts
fetchSnapshotsUploadOptions/createPreprodSnapshot, src/commands/snapshots/upload.ts.
Adds image-size as a devDependency. Tests cover the objectstore client, image
collection/validation, the two API calls, and the command's dedup + manifest.
@github-actionsgithub-actionsBot added the risk: high PR risk score: high label Jul 3, 2026
@github-actions

github-actionsBot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor
PR Preview Action v1.8.1

QR code for preview link

🚀 View preview at
https://cli.sentry.dev/_preview/pr-1186/

Built to branch gh-pages at 2026-07-03 10:46 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

@cursorcursorBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 035242a. Configure here.

Comment threadsrc/commands/snapshots/upload.ts Outdated
Comment threadsrc/commands/snapshots/upload.ts Outdated
@github-actions

github-actionsBot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

Codecov Results 📊

✅ Patch coverage is 82.63%. Project has 5247 uncovered lines.
❌ Project coverage is 81.69%. Comparing base (base) to head (head).

Files with missing lines (3)
FilePatch %Lines
src/commands/snapshots/upload.ts76.79%⚠️ 26 Missing and 11 partials
src/lib/snapshots/images.ts87.50%⚠️ 5 Missing and 3 partials
src/lib/api/infrastructure.ts75.00%⚠️ 2 Missing and 2 partials
Coverage diff
@@ Coverage Diff @@## main #PR +/-##
==========================================
- Coverage 81.70% 81.69% -0.01%
==========================================
Files 410 413 +3
Lines 28467 28657 +190
Branches 18497 18599 +102
==========================================
+ Hits 23257 23410 +153- Misses 5210 5247 +37- Partials 1901 1918 +17

Generated by Codecov Action

Comment threadsrc/lib/objectstore.ts
BYK added 2 commits July 3, 2026 10:31
- M1: POST the create-snapshot manifest with Content-Encoding: zstd (matching
the legacy CLI's with_zstd_json_body) so large image suites don't risk a body
limit. Adds an opt-in `bodyEncoding: "zstd"` to apiRequestToRegion (additive;
falls back to plain JSON when the runtime lacks zstd).
- L2: ignore array/scalar JSON sidecars (only objects are usable metadata).
- L3: enforce the --all-image-file-names[/-file] conflict before the empty-folder
early return.
- N1: reject an empty --diff-threshold (Number("") was silently accepted as 0).
- Tests: assert the objectstore key is {orgId}/{projectId}/{sha256}; sidecar
width/height/content_hash override; --pr-number without a base SHA is rejected.
Reduce the upload func's cognitive complexity below the Biome limit after the
added flag-conflict check.
@BYK

BYK commented Jul 3, 2026

Copy link
Copy Markdown
MemberAuthor

Self-review (subagent-assisted) + fixes

Protocol parity was verified exact against the Python objectstore client + Rust upload.rs (URL/scope format, x-os-auth header, object key {orgId}/{projectId}/{sha256}, manifest shape, sidecar override, VCS flatten, selective/all-names normalization). Fixes applied:

  • M1 (was the one blocking item): the create-snapshot manifest was POSTed as plain JSON; the legacy CLI uses with_zstd_json_body. A large image suite → large manifest → potential body-limit failure. Added an opt-in bodyEncoding: "zstd" to apiRequestToRegion (additive; falls back to plain JSON when the runtime lacks zstd) and use it for the manifest, matching the reference. zstd round-trip verified.
  • L2: array/scalar JSON sidecars are now ignored (only objects are usable metadata — the Rust deserializes into a map and drops non-objects).
  • L3: the --all-image-file-names / -file conflict is now enforced before the empty-folder early return (so it always fires).
  • N1: an empty --diff-threshold is rejected (Number("") was silently accepted as 0).

Tests added for the flagged gaps: the objectstore key is {orgId}/{projectId}/{sha256}; CLI width/height/content_hash override sidecar keys; --pr-number without a resolvable base SHA is rejected.

Confirmed safe as-is by the review (no change needed): uploading images raw (no Content-Encoding) — the key is the original file's sha256, so dedup is encoding-independent and the store transparently decodes on GET; and throw-on-first-upload-failure — the snapshot is only created after all uploads succeed, so a mid-upload failure leaves no snapshot. Deferred as follow-ups: streaming image hash/upload (L1, memory) and aggregate error reporting (N4).

- Cursor (High): resolve the positional folder against the command's cwd before
scanning — the walker requires an absolute path, so a relative `./screenshots`
passed the stat check but would fail the walk.
- Warden (High): add request timeouts to the objectstore HEAD (30s) and PUT
(120s) via AbortSignal.timeout, so a stalled connection can't hang the CLI /
a CI job forever.
- Tests: relative-path resolution against cwd; HEAD/PUT carry an AbortSignal.
@BYK
BYK merged commit 41f5e24 into mainJul 3, 2026
32 checks passed
@BYK
BYK deleted the byk/feat/snapshots-upload branch July 3, 2026 11:03
betegon added a commit that referenced this pull request Aug 10, 2026
## Summary
#1186 ported `snapshots upload` from the legacy `getsentry/sentry-cli`,
including its empty-directory early return. That return runs before
`--all-image-file-names[-file]` is parsed, so selective runs with no
changed images exit successfully without creating a snapshot.
Resolve the full image list before the early return. When it is present,
post an empty selective manifest and skip objectstore; plain empty
uploads remain no-ops. Explicitly empty list flags are now validated
instead of treated as absent.
Closes#1397.
## Test plan
- `pnpm exec vitest run test/commands/snapshots/upload.test.ts
test/lib/api/preprod-artifacts.test.ts test/lib/snapshots/images.test.ts
test/lib/objectstore.test.ts` — 55 passed
- `pnpm run lint`
- `pnpm run generate:schema && pnpm run typecheck`
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

risk: highPR risk score: high

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@BYK
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

feat(snapshots): add upload command - #1186

Merged
BYK merged 5 commits into
mainfrom
byk/feat/snapshots-upload
Jul 3, 2026
Merged

feat(snapshots): add upload command#1186
BYK merged 5 commits into
mainfrom
byk/feat/snapshots-upload

Conversation

@BYK

@BYKBYK commented Jul 3, 2026

Copy link
Copy Markdown
Member

Ports snapshots upload from the legacy Rust CLI, completing the snapshots trio (upload/download/diff). Scans a folder of screenshots, uploads them to Sentry's object store, and creates a snapshot for visual diffing. Sentry SaaS only.

Objectstore approach

The object store is live; a native TS objectstore client is still pending, so — as agreed — we replicate the raw HTTP calls the Rust objectstore-client crate makes (reverse-engineered from getsentry/objectstore):

  • GETprojects/{org}/{project}/preprodartifacts/snapshots/upload-options/{ objectstore: { url, scopes, authToken, expirationPolicy } }.
  • HEAD{url}/v1/objects/preprod/{scope}/{key} to dedup (404 = missing), where scope = k=v;k=v (ordered) and key = {orgId}/{projectId}/{sha256}. Auth is a pre-signed JWT sent as x-os-auth: Bearer <token> (not Authorization).
  • PUT the bytes with x-sn-expiration: <policy>. The key is the original file's SHA-256, so dedup is independent of upload compression — images are already-compressed formats, so they're uploaded raw (no Content-Encoding).
  • POSTprojects/{org}/{project}/preprodartifacts/snapshots/ with the manifest → { artifactId, imageCount, snapshotUrl? }.

HEAD/PUT run with bounded concurrency (8).

Behavior (parity with Rust)

  • <path> (a directory) + --app-id (required).
  • Walks for PNG/JPEG (skips hidden files/dirs); reads dimensions via image-size (header-only), SHA-256, and a companion <image>.json sidecar (its keys merge into the manifest; CLI width/height/content_hash win).
  • Rejects any image over 40,000,000 px, listing violators.
  • --selective / --all-image-file-names[-file] for subset uploads (the latter validates every uploaded image is in the list; both imply selective).
  • --diff-threshold (0.0–1.0). Full git-metadata flags (auto-collected in CI, like build upload); a --pr-number without a resolvable base SHA errors.
  • Manifest flattens VCS at the top level (reuses vcsInfoToBody).
  • Empty folder → exits 0 with "No image files found".

Memory

Each image is read once (dimensions + hash) and released; only the missing ones are re-read for the PUT body — bounded to a few images at a time.

New files / deps

src/lib/objectstore.ts, src/lib/snapshots/images.ts, fetchSnapshotsUploadOptions/createPreprodSnapshot in preprod-artifacts.ts, src/commands/snapshots/upload.ts. Adds image-size as a devDependency (the analog of Rust's imagesize). The VCS flag block is inlined (matching build upload); extracting a shared definition is a noted follow-up.

Tests

Objectstore client (URL/auth/HEAD/PUT), image collection + validation (real pngjs fixtures), both API calls, and the command's dedup (HEAD skips existing → fewer PUTs) + manifest shape. typecheck/lint/check:deps/check:fragments pass; full suite 8332 passed.

Port `snapshots upload` from the legacy Rust CLI. Scans a folder for PNG/JPEG
screenshots, uploads each to Sentry's object store (skipping any already present
by content hash), and POSTs a manifest to create the snapshot for visual diffing.
Objectstore is live; until a native TS objectstore client ships we make the raw
calls the Rust `objectstore-client` crate makes:
- GET snapshots/upload-options → { objectstore: { url, scopes, authToken, expirationPolicy } }.
- HEAD {url}/v1/objects/preprod/{k=v;...}/{orgId}/{projectId}/{sha256} (dedup),
auth via `x-os-auth: Bearer <jwt>`.
- PUT the raw bytes with `x-sn-expiration`. Objects are keyed by the original
file's SHA-256, so dedup is compression-independent (images are already
compressed → uploaded raw).
- POST snapshots/ with the manifest (app_id, per-image width/height/content_hash
+ sidecar, flattened VCS, diff_threshold/selective/all_image_file_names).
New: src/lib/objectstore.ts (HEAD/PUT client), src/lib/snapshots/images.ts
(collect + validate, dimensions via image-size), preprod-artifacts
fetchSnapshotsUploadOptions/createPreprodSnapshot, src/commands/snapshots/upload.ts.
Adds image-size as a devDependency. Tests cover the objectstore client, image
collection/validation, the two API calls, and the command's dedup + manifest.
@github-actionsgithub-actionsBot added the risk: high PR risk score: high label Jul 3, 2026
@github-actions

github-actionsBot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor
PR Preview Action v1.8.1

QR code for preview link

🚀 View preview at
https://cli.sentry.dev/_preview/pr-1186/

Built to branch gh-pages at 2026-07-03 10:46 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

@cursorcursorBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 035242a. Configure here.

Comment threadsrc/commands/snapshots/upload.ts Outdated
Comment threadsrc/commands/snapshots/upload.ts Outdated
@github-actions

github-actionsBot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

Codecov Results 📊

✅ Patch coverage is 82.63%. Project has 5247 uncovered lines.
❌ Project coverage is 81.69%. Comparing base (base) to head (head).

Files with missing lines (3)
FilePatch %Lines
src/commands/snapshots/upload.ts76.79%⚠️ 26 Missing and 11 partials
src/lib/snapshots/images.ts87.50%⚠️ 5 Missing and 3 partials
src/lib/api/infrastructure.ts75.00%⚠️ 2 Missing and 2 partials
Coverage diff
@@ Coverage Diff @@## main #PR +/-##
==========================================
- Coverage 81.70% 81.69% -0.01%
==========================================
Files 410 413 +3
Lines 28467 28657 +190
Branches 18497 18599 +102
==========================================
+ Hits 23257 23410 +153- Misses 5210 5247 +37- Partials 1901 1918 +17

Generated by Codecov Action

Comment threadsrc/lib/objectstore.ts
BYK added 2 commits July 3, 2026 10:31
- M1: POST the create-snapshot manifest with Content-Encoding: zstd (matching
the legacy CLI's with_zstd_json_body) so large image suites don't risk a body
limit. Adds an opt-in `bodyEncoding: "zstd"` to apiRequestToRegion (additive;
falls back to plain JSON when the runtime lacks zstd).
- L2: ignore array/scalar JSON sidecars (only objects are usable metadata).
- L3: enforce the --all-image-file-names[/-file] conflict before the empty-folder
early return.
- N1: reject an empty --diff-threshold (Number("") was silently accepted as 0).
- Tests: assert the objectstore key is {orgId}/{projectId}/{sha256}; sidecar
width/height/content_hash override; --pr-number without a base SHA is rejected.
Reduce the upload func's cognitive complexity below the Biome limit after the
added flag-conflict check.
@BYK

BYK commented Jul 3, 2026

Copy link
Copy Markdown
MemberAuthor

Self-review (subagent-assisted) + fixes

Protocol parity was verified exact against the Python objectstore client + Rust upload.rs (URL/scope format, x-os-auth header, object key {orgId}/{projectId}/{sha256}, manifest shape, sidecar override, VCS flatten, selective/all-names normalization). Fixes applied:

  • M1 (was the one blocking item): the create-snapshot manifest was POSTed as plain JSON; the legacy CLI uses with_zstd_json_body. A large image suite → large manifest → potential body-limit failure. Added an opt-in bodyEncoding: "zstd" to apiRequestToRegion (additive; falls back to plain JSON when the runtime lacks zstd) and use it for the manifest, matching the reference. zstd round-trip verified.
  • L2: array/scalar JSON sidecars are now ignored (only objects are usable metadata — the Rust deserializes into a map and drops non-objects).
  • L3: the --all-image-file-names / -file conflict is now enforced before the empty-folder early return (so it always fires).
  • N1: an empty --diff-threshold is rejected (Number("") was silently accepted as 0).

Tests added for the flagged gaps: the objectstore key is {orgId}/{projectId}/{sha256}; CLI width/height/content_hash override sidecar keys; --pr-number without a resolvable base SHA is rejected.

Confirmed safe as-is by the review (no change needed): uploading images raw (no Content-Encoding) — the key is the original file's sha256, so dedup is encoding-independent and the store transparently decodes on GET; and throw-on-first-upload-failure — the snapshot is only created after all uploads succeed, so a mid-upload failure leaves no snapshot. Deferred as follow-ups: streaming image hash/upload (L1, memory) and aggregate error reporting (N4).

- Cursor (High): resolve the positional folder against the command's cwd before
scanning — the walker requires an absolute path, so a relative `./screenshots`
passed the stat check but would fail the walk.
- Warden (High): add request timeouts to the objectstore HEAD (30s) and PUT
(120s) via AbortSignal.timeout, so a stalled connection can't hang the CLI /
a CI job forever.
- Tests: relative-path resolution against cwd; HEAD/PUT carry an AbortSignal.
@BYK
BYK merged commit 41f5e24 into mainJul 3, 2026
32 checks passed
@BYK
BYK deleted the byk/feat/snapshots-upload branch July 3, 2026 11:03
betegon added a commit that referenced this pull request Aug 10, 2026
## Summary
#1186 ported `snapshots upload` from the legacy `getsentry/sentry-cli`,
including its empty-directory early return. That return runs before
`--all-image-file-names[-file]` is parsed, so selective runs with no
changed images exit successfully without creating a snapshot.
Resolve the full image list before the early return. When it is present,
post an empty selective manifest and skip objectstore; plain empty
uploads remain no-ops. Explicitly empty list flags are now validated
instead of treated as absent.
Closes#1397.
## Test plan
- `pnpm exec vitest run test/commands/snapshots/upload.test.ts
test/lib/api/preprod-artifacts.test.ts test/lib/snapshots/images.test.ts
test/lib/objectstore.test.ts` — 55 passed
- `pnpm run lint`
- `pnpm run generate:schema && pnpm run typecheck`
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

risk: highPR risk score: high

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@BYK
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(snapshots): add upload command - #1186

Merged
BYK merged 5 commits into
mainfrom
byk/feat/snapshots-upload
Jul 3, 2026
Merged

feat(snapshots): add upload command#1186
BYK merged 5 commits into
mainfrom
byk/feat/snapshots-upload

Conversation

@BYK

@BYKBYK commented Jul 3, 2026

Copy link
Copy Markdown
Member

Ports snapshots upload from the legacy Rust CLI, completing the snapshots trio (upload/download/diff). Scans a folder of screenshots, uploads them to Sentry's object store, and creates a snapshot for visual diffing. Sentry SaaS only.

Objectstore approach

The object store is live; a native TS objectstore client is still pending, so — as agreed — we replicate the raw HTTP calls the Rust objectstore-client crate makes (reverse-engineered from getsentry/objectstore):

  • GETprojects/{org}/{project}/preprodartifacts/snapshots/upload-options/{ objectstore: { url, scopes, authToken, expirationPolicy } }.
  • HEAD{url}/v1/objects/preprod/{scope}/{key} to dedup (404 = missing), where scope = k=v;k=v (ordered) and key = {orgId}/{projectId}/{sha256}. Auth is a pre-signed JWT sent as x-os-auth: Bearer <token> (not Authorization).
  • PUT the bytes with x-sn-expiration: <policy>. The key is the original file's SHA-256, so dedup is independent of upload compression — images are already-compressed formats, so they're uploaded raw (no Content-Encoding).
  • POSTprojects/{org}/{project}/preprodartifacts/snapshots/ with the manifest → { artifactId, imageCount, snapshotUrl? }.

HEAD/PUT run with bounded concurrency (8).

Behavior (parity with Rust)

  • <path> (a directory) + --app-id (required).
  • Walks for PNG/JPEG (skips hidden files/dirs); reads dimensions via image-size (header-only), SHA-256, and a companion <image>.json sidecar (its keys merge into the manifest; CLI width/height/content_hash win).
  • Rejects any image over 40,000,000 px, listing violators.
  • --selective / --all-image-file-names[-file] for subset uploads (the latter validates every uploaded image is in the list; both imply selective).
  • --diff-threshold (0.0–1.0). Full git-metadata flags (auto-collected in CI, like build upload); a --pr-number without a resolvable base SHA errors.
  • Manifest flattens VCS at the top level (reuses vcsInfoToBody).
  • Empty folder → exits 0 with "No image files found".

Memory

Each image is read once (dimensions + hash) and released; only the missing ones are re-read for the PUT body — bounded to a few images at a time.

New files / deps

src/lib/objectstore.ts, src/lib/snapshots/images.ts, fetchSnapshotsUploadOptions/createPreprodSnapshot in preprod-artifacts.ts, src/commands/snapshots/upload.ts. Adds image-size as a devDependency (the analog of Rust's imagesize). The VCS flag block is inlined (matching build upload); extracting a shared definition is a noted follow-up.

Tests

Objectstore client (URL/auth/HEAD/PUT), image collection + validation (real pngjs fixtures), both API calls, and the command's dedup (HEAD skips existing → fewer PUTs) + manifest shape. typecheck/lint/check:deps/check:fragments pass; full suite 8332 passed.

Port `snapshots upload` from the legacy Rust CLI. Scans a folder for PNG/JPEG
screenshots, uploads each to Sentry's object store (skipping any already present
by content hash), and POSTs a manifest to create the snapshot for visual diffing.
Objectstore is live; until a native TS objectstore client ships we make the raw
calls the Rust `objectstore-client` crate makes:
- GET snapshots/upload-options → { objectstore: { url, scopes, authToken, expirationPolicy } }.
- HEAD {url}/v1/objects/preprod/{k=v;...}/{orgId}/{projectId}/{sha256} (dedup),
auth via `x-os-auth: Bearer <jwt>`.
- PUT the raw bytes with `x-sn-expiration`. Objects are keyed by the original
file's SHA-256, so dedup is compression-independent (images are already
compressed → uploaded raw).
- POST snapshots/ with the manifest (app_id, per-image width/height/content_hash
+ sidecar, flattened VCS, diff_threshold/selective/all_image_file_names).
New: src/lib/objectstore.ts (HEAD/PUT client), src/lib/snapshots/images.ts
(collect + validate, dimensions via image-size), preprod-artifacts
fetchSnapshotsUploadOptions/createPreprodSnapshot, src/commands/snapshots/upload.ts.
Adds image-size as a devDependency. Tests cover the objectstore client, image
collection/validation, the two API calls, and the command's dedup + manifest.
@github-actionsgithub-actionsBot added the risk: high PR risk score: high label Jul 3, 2026
@github-actions

github-actionsBot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor
PR Preview Action v1.8.1

QR code for preview link

🚀 View preview at
https://cli.sentry.dev/_preview/pr-1186/

Built to branch gh-pages at 2026-07-03 10:46 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

@cursorcursorBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 035242a. Configure here.

Comment threadsrc/commands/snapshots/upload.ts Outdated
Comment threadsrc/commands/snapshots/upload.ts Outdated
@github-actions

github-actionsBot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

Codecov Results 📊

✅ Patch coverage is 82.63%. Project has 5247 uncovered lines.
❌ Project coverage is 81.69%. Comparing base (base) to head (head).

Files with missing lines (3)
FilePatch %Lines
src/commands/snapshots/upload.ts76.79%⚠️ 26 Missing and 11 partials
src/lib/snapshots/images.ts87.50%⚠️ 5 Missing and 3 partials
src/lib/api/infrastructure.ts75.00%⚠️ 2 Missing and 2 partials
Coverage diff
@@ Coverage Diff @@## main #PR +/-##
==========================================
- Coverage 81.70% 81.69% -0.01%
==========================================
Files 410 413 +3
Lines 28467 28657 +190
Branches 18497 18599 +102
==========================================
+ Hits 23257 23410 +153- Misses 5210 5247 +37- Partials 1901 1918 +17

Generated by Codecov Action

Comment threadsrc/lib/objectstore.ts
BYK added 2 commits July 3, 2026 10:31
- M1: POST the create-snapshot manifest with Content-Encoding: zstd (matching
the legacy CLI's with_zstd_json_body) so large image suites don't risk a body
limit. Adds an opt-in `bodyEncoding: "zstd"` to apiRequestToRegion (additive;
falls back to plain JSON when the runtime lacks zstd).
- L2: ignore array/scalar JSON sidecars (only objects are usable metadata).
- L3: enforce the --all-image-file-names[/-file] conflict before the empty-folder
early return.
- N1: reject an empty --diff-threshold (Number("") was silently accepted as 0).
- Tests: assert the objectstore key is {orgId}/{projectId}/{sha256}; sidecar
width/height/content_hash override; --pr-number without a base SHA is rejected.
Reduce the upload func's cognitive complexity below the Biome limit after the
added flag-conflict check.
@BYK

BYK commented Jul 3, 2026

Copy link
Copy Markdown
MemberAuthor

Self-review (subagent-assisted) + fixes

Protocol parity was verified exact against the Python objectstore client + Rust upload.rs (URL/scope format, x-os-auth header, object key {orgId}/{projectId}/{sha256}, manifest shape, sidecar override, VCS flatten, selective/all-names normalization). Fixes applied:

  • M1 (was the one blocking item): the create-snapshot manifest was POSTed as plain JSON; the legacy CLI uses with_zstd_json_body. A large image suite → large manifest → potential body-limit failure. Added an opt-in bodyEncoding: "zstd" to apiRequestToRegion (additive; falls back to plain JSON when the runtime lacks zstd) and use it for the manifest, matching the reference. zstd round-trip verified.
  • L2: array/scalar JSON sidecars are now ignored (only objects are usable metadata — the Rust deserializes into a map and drops non-objects).
  • L3: the --all-image-file-names / -file conflict is now enforced before the empty-folder early return (so it always fires).
  • N1: an empty --diff-threshold is rejected (Number("") was silently accepted as 0).

Tests added for the flagged gaps: the objectstore key is {orgId}/{projectId}/{sha256}; CLI width/height/content_hash override sidecar keys; --pr-number without a resolvable base SHA is rejected.

Confirmed safe as-is by the review (no change needed): uploading images raw (no Content-Encoding) — the key is the original file's sha256, so dedup is encoding-independent and the store transparently decodes on GET; and throw-on-first-upload-failure — the snapshot is only created after all uploads succeed, so a mid-upload failure leaves no snapshot. Deferred as follow-ups: streaming image hash/upload (L1, memory) and aggregate error reporting (N4).

- Cursor (High): resolve the positional folder against the command's cwd before
scanning — the walker requires an absolute path, so a relative `./screenshots`
passed the stat check but would fail the walk.
- Warden (High): add request timeouts to the objectstore HEAD (30s) and PUT
(120s) via AbortSignal.timeout, so a stalled connection can't hang the CLI /
a CI job forever.
- Tests: relative-path resolution against cwd; HEAD/PUT carry an AbortSignal.
@BYK
BYK merged commit 41f5e24 into mainJul 3, 2026
32 checks passed
@BYK
BYK deleted the byk/feat/snapshots-upload branch July 3, 2026 11:03
betegon added a commit that referenced this pull request Aug 10, 2026
## Summary
#1186 ported `snapshots upload` from the legacy `getsentry/sentry-cli`,
including its empty-directory early return. That return runs before
`--all-image-file-names[-file]` is parsed, so selective runs with no
changed images exit successfully without creating a snapshot.
Resolve the full image list before the early return. When it is present,
post an empty selective manifest and skip objectstore; plain empty
uploads remain no-ops. Explicitly empty list flags are now validated
instead of treated as absent.
Closes#1397.
## Test plan
- `pnpm exec vitest run test/commands/snapshots/upload.test.ts
test/lib/api/preprod-artifacts.test.ts test/lib/snapshots/images.test.ts
test/lib/objectstore.test.ts` — 55 passed
- `pnpm run lint`
- `pnpm run generate:schema && pnpm run typecheck`
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

risk: highPR risk score: high

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@BYK
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(snapshots): add upload command - #1186

Merged
BYK merged 5 commits into
mainfrom
byk/feat/snapshots-upload
Jul 3, 2026
Merged

feat(snapshots): add upload command#1186
BYK merged 5 commits into
mainfrom
byk/feat/snapshots-upload

Conversation

@BYK

@BYKBYK commented Jul 3, 2026

Copy link
Copy Markdown
Member

Ports snapshots upload from the legacy Rust CLI, completing the snapshots trio (upload/download/diff). Scans a folder of screenshots, uploads them to Sentry's object store, and creates a snapshot for visual diffing. Sentry SaaS only.

Objectstore approach

The object store is live; a native TS objectstore client is still pending, so — as agreed — we replicate the raw HTTP calls the Rust objectstore-client crate makes (reverse-engineered from getsentry/objectstore):

  • GETprojects/{org}/{project}/preprodartifacts/snapshots/upload-options/{ objectstore: { url, scopes, authToken, expirationPolicy } }.
  • HEAD{url}/v1/objects/preprod/{scope}/{key} to dedup (404 = missing), where scope = k=v;k=v (ordered) and key = {orgId}/{projectId}/{sha256}. Auth is a pre-signed JWT sent as x-os-auth: Bearer <token> (not Authorization).
  • PUT the bytes with x-sn-expiration: <policy>. The key is the original file's SHA-256, so dedup is independent of upload compression — images are already-compressed formats, so they're uploaded raw (no Content-Encoding).
  • POSTprojects/{org}/{project}/preprodartifacts/snapshots/ with the manifest → { artifactId, imageCount, snapshotUrl? }.

HEAD/PUT run with bounded concurrency (8).

Behavior (parity with Rust)

  • <path> (a directory) + --app-id (required).
  • Walks for PNG/JPEG (skips hidden files/dirs); reads dimensions via image-size (header-only), SHA-256, and a companion <image>.json sidecar (its keys merge into the manifest; CLI width/height/content_hash win).
  • Rejects any image over 40,000,000 px, listing violators.
  • --selective / --all-image-file-names[-file] for subset uploads (the latter validates every uploaded image is in the list; both imply selective).
  • --diff-threshold (0.0–1.0). Full git-metadata flags (auto-collected in CI, like build upload); a --pr-number without a resolvable base SHA errors.
  • Manifest flattens VCS at the top level (reuses vcsInfoToBody).
  • Empty folder → exits 0 with "No image files found".

Memory

Each image is read once (dimensions + hash) and released; only the missing ones are re-read for the PUT body — bounded to a few images at a time.

New files / deps

src/lib/objectstore.ts, src/lib/snapshots/images.ts, fetchSnapshotsUploadOptions/createPreprodSnapshot in preprod-artifacts.ts, src/commands/snapshots/upload.ts. Adds image-size as a devDependency (the analog of Rust's imagesize). The VCS flag block is inlined (matching build upload); extracting a shared definition is a noted follow-up.

Tests

Objectstore client (URL/auth/HEAD/PUT), image collection + validation (real pngjs fixtures), both API calls, and the command's dedup (HEAD skips existing → fewer PUTs) + manifest shape. typecheck/lint/check:deps/check:fragments pass; full suite 8332 passed.

Port `snapshots upload` from the legacy Rust CLI. Scans a folder for PNG/JPEG
screenshots, uploads each to Sentry's object store (skipping any already present
by content hash), and POSTs a manifest to create the snapshot for visual diffing.
Objectstore is live; until a native TS objectstore client ships we make the raw
calls the Rust `objectstore-client` crate makes:
- GET snapshots/upload-options → { objectstore: { url, scopes, authToken, expirationPolicy } }.
- HEAD {url}/v1/objects/preprod/{k=v;...}/{orgId}/{projectId}/{sha256} (dedup),
auth via `x-os-auth: Bearer <jwt>`.
- PUT the raw bytes with `x-sn-expiration`. Objects are keyed by the original
file's SHA-256, so dedup is compression-independent (images are already
compressed → uploaded raw).
- POST snapshots/ with the manifest (app_id, per-image width/height/content_hash
+ sidecar, flattened VCS, diff_threshold/selective/all_image_file_names).
New: src/lib/objectstore.ts (HEAD/PUT client), src/lib/snapshots/images.ts
(collect + validate, dimensions via image-size), preprod-artifacts
fetchSnapshotsUploadOptions/createPreprodSnapshot, src/commands/snapshots/upload.ts.
Adds image-size as a devDependency. Tests cover the objectstore client, image
collection/validation, the two API calls, and the command's dedup + manifest.
@github-actionsgithub-actionsBot added the risk: high PR risk score: high label Jul 3, 2026
@github-actions

github-actionsBot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor
PR Preview Action v1.8.1

QR code for preview link

🚀 View preview at
https://cli.sentry.dev/_preview/pr-1186/

Built to branch gh-pages at 2026-07-03 10:46 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

@cursorcursorBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 035242a. Configure here.

Comment threadsrc/commands/snapshots/upload.ts Outdated
Comment threadsrc/commands/snapshots/upload.ts Outdated
@github-actions

github-actionsBot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

Codecov Results 📊

✅ Patch coverage is 82.63%. Project has 5247 uncovered lines.
❌ Project coverage is 81.69%. Comparing base (base) to head (head).

Files with missing lines (3)
FilePatch %Lines
src/commands/snapshots/upload.ts76.79%⚠️ 26 Missing and 11 partials
src/lib/snapshots/images.ts87.50%⚠️ 5 Missing and 3 partials
src/lib/api/infrastructure.ts75.00%⚠️ 2 Missing and 2 partials
Coverage diff
@@ Coverage Diff @@## main #PR +/-##
==========================================
- Coverage 81.70% 81.69% -0.01%
==========================================
Files 410 413 +3
Lines 28467 28657 +190
Branches 18497 18599 +102
==========================================
+ Hits 23257 23410 +153- Misses 5210 5247 +37- Partials 1901 1918 +17

Generated by Codecov Action

Comment threadsrc/lib/objectstore.ts
BYK added 2 commits July 3, 2026 10:31
- M1: POST the create-snapshot manifest with Content-Encoding: zstd (matching
the legacy CLI's with_zstd_json_body) so large image suites don't risk a body
limit. Adds an opt-in `bodyEncoding: "zstd"` to apiRequestToRegion (additive;
falls back to plain JSON when the runtime lacks zstd).
- L2: ignore array/scalar JSON sidecars (only objects are usable metadata).
- L3: enforce the --all-image-file-names[/-file] conflict before the empty-folder
early return.
- N1: reject an empty --diff-threshold (Number("") was silently accepted as 0).
- Tests: assert the objectstore key is {orgId}/{projectId}/{sha256}; sidecar
width/height/content_hash override; --pr-number without a base SHA is rejected.
Reduce the upload func's cognitive complexity below the Biome limit after the
added flag-conflict check.
@BYK

BYK commented Jul 3, 2026

Copy link
Copy Markdown
MemberAuthor

Self-review (subagent-assisted) + fixes

Protocol parity was verified exact against the Python objectstore client + Rust upload.rs (URL/scope format, x-os-auth header, object key {orgId}/{projectId}/{sha256}, manifest shape, sidecar override, VCS flatten, selective/all-names normalization). Fixes applied:

  • M1 (was the one blocking item): the create-snapshot manifest was POSTed as plain JSON; the legacy CLI uses with_zstd_json_body. A large image suite → large manifest → potential body-limit failure. Added an opt-in bodyEncoding: "zstd" to apiRequestToRegion (additive; falls back to plain JSON when the runtime lacks zstd) and use it for the manifest, matching the reference. zstd round-trip verified.
  • L2: array/scalar JSON sidecars are now ignored (only objects are usable metadata — the Rust deserializes into a map and drops non-objects).
  • L3: the --all-image-file-names / -file conflict is now enforced before the empty-folder early return (so it always fires).
  • N1: an empty --diff-threshold is rejected (Number("") was silently accepted as 0).

Tests added for the flagged gaps: the objectstore key is {orgId}/{projectId}/{sha256}; CLI width/height/content_hash override sidecar keys; --pr-number without a resolvable base SHA is rejected.

Confirmed safe as-is by the review (no change needed): uploading images raw (no Content-Encoding) — the key is the original file's sha256, so dedup is encoding-independent and the store transparently decodes on GET; and throw-on-first-upload-failure — the snapshot is only created after all uploads succeed, so a mid-upload failure leaves no snapshot. Deferred as follow-ups: streaming image hash/upload (L1, memory) and aggregate error reporting (N4).

- Cursor (High): resolve the positional folder against the command's cwd before
scanning — the walker requires an absolute path, so a relative `./screenshots`
passed the stat check but would fail the walk.
- Warden (High): add request timeouts to the objectstore HEAD (30s) and PUT
(120s) via AbortSignal.timeout, so a stalled connection can't hang the CLI /
a CI job forever.
- Tests: relative-path resolution against cwd; HEAD/PUT carry an AbortSignal.
@BYK
BYK merged commit 41f5e24 into mainJul 3, 2026
32 checks passed
@BYK
BYK deleted the byk/feat/snapshots-upload branch July 3, 2026 11:03
betegon added a commit that referenced this pull request Aug 10, 2026
## Summary
#1186 ported `snapshots upload` from the legacy `getsentry/sentry-cli`,
including its empty-directory early return. That return runs before
`--all-image-file-names[-file]` is parsed, so selective runs with no
changed images exit successfully without creating a snapshot.
Resolve the full image list before the early return. When it is present,
post an empty selective manifest and skip objectstore; plain empty
uploads remain no-ops. Explicitly empty list flags are now validated
instead of treated as absent.
Closes#1397.
## Test plan
- `pnpm exec vitest run test/commands/snapshots/upload.test.ts
test/lib/api/preprod-artifacts.test.ts test/lib/snapshots/images.test.ts
test/lib/objectstore.test.ts` — 55 passed
- `pnpm run lint`
- `pnpm run generate:schema && pnpm run typecheck`
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

risk: highPR risk score: high

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@BYK
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

feat(snapshots): add upload command - #1186

Merged
BYK merged 5 commits into
mainfrom
byk/feat/snapshots-upload
Jul 3, 2026
Merged

feat(snapshots): add upload command#1186
BYK merged 5 commits into
mainfrom
byk/feat/snapshots-upload

Conversation

@BYK

@BYKBYK commented Jul 3, 2026

Copy link
Copy Markdown
Member

Ports snapshots upload from the legacy Rust CLI, completing the snapshots trio (upload/download/diff). Scans a folder of screenshots, uploads them to Sentry's object store, and creates a snapshot for visual diffing. Sentry SaaS only.

Objectstore approach

The object store is live; a native TS objectstore client is still pending, so — as agreed — we replicate the raw HTTP calls the Rust objectstore-client crate makes (reverse-engineered from getsentry/objectstore):

  • GETprojects/{org}/{project}/preprodartifacts/snapshots/upload-options/{ objectstore: { url, scopes, authToken, expirationPolicy } }.
  • HEAD{url}/v1/objects/preprod/{scope}/{key} to dedup (404 = missing), where scope = k=v;k=v (ordered) and key = {orgId}/{projectId}/{sha256}. Auth is a pre-signed JWT sent as x-os-auth: Bearer <token> (not Authorization).
  • PUT the bytes with x-sn-expiration: <policy>. The key is the original file's SHA-256, so dedup is independent of upload compression — images are already-compressed formats, so they're uploaded raw (no Content-Encoding).
  • POSTprojects/{org}/{project}/preprodartifacts/snapshots/ with the manifest → { artifactId, imageCount, snapshotUrl? }.

HEAD/PUT run with bounded concurrency (8).

Behavior (parity with Rust)

  • <path> (a directory) + --app-id (required).
  • Walks for PNG/JPEG (skips hidden files/dirs); reads dimensions via image-size (header-only), SHA-256, and a companion <image>.json sidecar (its keys merge into the manifest; CLI width/height/content_hash win).
  • Rejects any image over 40,000,000 px, listing violators.
  • --selective / --all-image-file-names[-file] for subset uploads (the latter validates every uploaded image is in the list; both imply selective).
  • --diff-threshold (0.0–1.0). Full git-metadata flags (auto-collected in CI, like build upload); a --pr-number without a resolvable base SHA errors.
  • Manifest flattens VCS at the top level (reuses vcsInfoToBody).
  • Empty folder → exits 0 with "No image files found".

Memory

Each image is read once (dimensions + hash) and released; only the missing ones are re-read for the PUT body — bounded to a few images at a time.

New files / deps

src/lib/objectstore.ts, src/lib/snapshots/images.ts, fetchSnapshotsUploadOptions/createPreprodSnapshot in preprod-artifacts.ts, src/commands/snapshots/upload.ts. Adds image-size as a devDependency (the analog of Rust's imagesize). The VCS flag block is inlined (matching build upload); extracting a shared definition is a noted follow-up.

Tests

Objectstore client (URL/auth/HEAD/PUT), image collection + validation (real pngjs fixtures), both API calls, and the command's dedup (HEAD skips existing → fewer PUTs) + manifest shape. typecheck/lint/check:deps/check:fragments pass; full suite 8332 passed.

Port `snapshots upload` from the legacy Rust CLI. Scans a folder for PNG/JPEG
screenshots, uploads each to Sentry's object store (skipping any already present
by content hash), and POSTs a manifest to create the snapshot for visual diffing.
Objectstore is live; until a native TS objectstore client ships we make the raw
calls the Rust `objectstore-client` crate makes:
- GET snapshots/upload-options → { objectstore: { url, scopes, authToken, expirationPolicy } }.
- HEAD {url}/v1/objects/preprod/{k=v;...}/{orgId}/{projectId}/{sha256} (dedup),
auth via `x-os-auth: Bearer <jwt>`.
- PUT the raw bytes with `x-sn-expiration`. Objects are keyed by the original
file's SHA-256, so dedup is compression-independent (images are already
compressed → uploaded raw).
- POST snapshots/ with the manifest (app_id, per-image width/height/content_hash
+ sidecar, flattened VCS, diff_threshold/selective/all_image_file_names).
New: src/lib/objectstore.ts (HEAD/PUT client), src/lib/snapshots/images.ts
(collect + validate, dimensions via image-size), preprod-artifacts
fetchSnapshotsUploadOptions/createPreprodSnapshot, src/commands/snapshots/upload.ts.
Adds image-size as a devDependency. Tests cover the objectstore client, image
collection/validation, the two API calls, and the command's dedup + manifest.
@github-actionsgithub-actionsBot added the risk: high PR risk score: high label Jul 3, 2026
@github-actions

github-actionsBot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor
PR Preview Action v1.8.1

QR code for preview link

🚀 View preview at
https://cli.sentry.dev/_preview/pr-1186/

Built to branch gh-pages at 2026-07-03 10:46 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

@cursorcursorBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 035242a. Configure here.

Comment threadsrc/commands/snapshots/upload.ts Outdated
Comment threadsrc/commands/snapshots/upload.ts Outdated
@github-actions

github-actionsBot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

Codecov Results 📊

✅ Patch coverage is 82.63%. Project has 5247 uncovered lines.
❌ Project coverage is 81.69%. Comparing base (base) to head (head).

Files with missing lines (3)
FilePatch %Lines
src/commands/snapshots/upload.ts76.79%⚠️ 26 Missing and 11 partials
src/lib/snapshots/images.ts87.50%⚠️ 5 Missing and 3 partials
src/lib/api/infrastructure.ts75.00%⚠️ 2 Missing and 2 partials
Coverage diff
@@ Coverage Diff @@## main #PR +/-##
==========================================
- Coverage 81.70% 81.69% -0.01%
==========================================
Files 410 413 +3
Lines 28467 28657 +190
Branches 18497 18599 +102
==========================================
+ Hits 23257 23410 +153- Misses 5210 5247 +37- Partials 1901 1918 +17

Generated by Codecov Action

Comment threadsrc/lib/objectstore.ts
BYK added 2 commits July 3, 2026 10:31
- M1: POST the create-snapshot manifest with Content-Encoding: zstd (matching
the legacy CLI's with_zstd_json_body) so large image suites don't risk a body
limit. Adds an opt-in `bodyEncoding: "zstd"` to apiRequestToRegion (additive;
falls back to plain JSON when the runtime lacks zstd).
- L2: ignore array/scalar JSON sidecars (only objects are usable metadata).
- L3: enforce the --all-image-file-names[/-file] conflict before the empty-folder
early return.
- N1: reject an empty --diff-threshold (Number("") was silently accepted as 0).
- Tests: assert the objectstore key is {orgId}/{projectId}/{sha256}; sidecar
width/height/content_hash override; --pr-number without a base SHA is rejected.
Reduce the upload func's cognitive complexity below the Biome limit after the
added flag-conflict check.
@BYK

BYK commented Jul 3, 2026

Copy link
Copy Markdown
MemberAuthor

Self-review (subagent-assisted) + fixes

Protocol parity was verified exact against the Python objectstore client + Rust upload.rs (URL/scope format, x-os-auth header, object key {orgId}/{projectId}/{sha256}, manifest shape, sidecar override, VCS flatten, selective/all-names normalization). Fixes applied:

  • M1 (was the one blocking item): the create-snapshot manifest was POSTed as plain JSON; the legacy CLI uses with_zstd_json_body. A large image suite → large manifest → potential body-limit failure. Added an opt-in bodyEncoding: "zstd" to apiRequestToRegion (additive; falls back to plain JSON when the runtime lacks zstd) and use it for the manifest, matching the reference. zstd round-trip verified.
  • L2: array/scalar JSON sidecars are now ignored (only objects are usable metadata — the Rust deserializes into a map and drops non-objects).
  • L3: the --all-image-file-names / -file conflict is now enforced before the empty-folder early return (so it always fires).
  • N1: an empty --diff-threshold is rejected (Number("") was silently accepted as 0).

Tests added for the flagged gaps: the objectstore key is {orgId}/{projectId}/{sha256}; CLI width/height/content_hash override sidecar keys; --pr-number without a resolvable base SHA is rejected.

Confirmed safe as-is by the review (no change needed): uploading images raw (no Content-Encoding) — the key is the original file's sha256, so dedup is encoding-independent and the store transparently decodes on GET; and throw-on-first-upload-failure — the snapshot is only created after all uploads succeed, so a mid-upload failure leaves no snapshot. Deferred as follow-ups: streaming image hash/upload (L1, memory) and aggregate error reporting (N4).

- Cursor (High): resolve the positional folder against the command's cwd before
scanning — the walker requires an absolute path, so a relative `./screenshots`
passed the stat check but would fail the walk.
- Warden (High): add request timeouts to the objectstore HEAD (30s) and PUT
(120s) via AbortSignal.timeout, so a stalled connection can't hang the CLI /
a CI job forever.
- Tests: relative-path resolution against cwd; HEAD/PUT carry an AbortSignal.
@BYK
BYK merged commit 41f5e24 into mainJul 3, 2026
32 checks passed
@BYK
BYK deleted the byk/feat/snapshots-upload branch July 3, 2026 11:03
betegon added a commit that referenced this pull request Aug 10, 2026
## Summary
#1186 ported `snapshots upload` from the legacy `getsentry/sentry-cli`,
including its empty-directory early return. That return runs before
`--all-image-file-names[-file]` is parsed, so selective runs with no
changed images exit successfully without creating a snapshot.
Resolve the full image list before the early return. When it is present,
post an empty selective manifest and skip objectstore; plain empty
uploads remain no-ops. Explicitly empty list flags are now validated
instead of treated as absent.
Closes#1397.
## Test plan
- `pnpm exec vitest run test/commands/snapshots/upload.test.ts
test/lib/api/preprod-artifacts.test.ts test/lib/snapshots/images.test.ts
test/lib/objectstore.test.ts` — 55 passed
- `pnpm run lint`
- `pnpm run generate:schema && pnpm run typecheck`
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

risk: highPR risk score: high

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@BYK
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(snapshots): add upload command - #1186

Merged
BYK merged 5 commits into
mainfrom
byk/feat/snapshots-upload
Jul 3, 2026
Merged

feat(snapshots): add upload command#1186
BYK merged 5 commits into
mainfrom
byk/feat/snapshots-upload

Conversation

@BYK

@BYKBYK commented Jul 3, 2026

Copy link
Copy Markdown
Member

Ports snapshots upload from the legacy Rust CLI, completing the snapshots trio (upload/download/diff). Scans a folder of screenshots, uploads them to Sentry's object store, and creates a snapshot for visual diffing. Sentry SaaS only.

Objectstore approach

The object store is live; a native TS objectstore client is still pending, so — as agreed — we replicate the raw HTTP calls the Rust objectstore-client crate makes (reverse-engineered from getsentry/objectstore):

  • GETprojects/{org}/{project}/preprodartifacts/snapshots/upload-options/{ objectstore: { url, scopes, authToken, expirationPolicy } }.
  • HEAD{url}/v1/objects/preprod/{scope}/{key} to dedup (404 = missing), where scope = k=v;k=v (ordered) and key = {orgId}/{projectId}/{sha256}. Auth is a pre-signed JWT sent as x-os-auth: Bearer <token> (not Authorization).
  • PUT the bytes with x-sn-expiration: <policy>. The key is the original file's SHA-256, so dedup is independent of upload compression — images are already-compressed formats, so they're uploaded raw (no Content-Encoding).
  • POSTprojects/{org}/{project}/preprodartifacts/snapshots/ with the manifest → { artifactId, imageCount, snapshotUrl? }.

HEAD/PUT run with bounded concurrency (8).

Behavior (parity with Rust)

  • <path> (a directory) + --app-id (required).
  • Walks for PNG/JPEG (skips hidden files/dirs); reads dimensions via image-size (header-only), SHA-256, and a companion <image>.json sidecar (its keys merge into the manifest; CLI width/height/content_hash win).
  • Rejects any image over 40,000,000 px, listing violators.
  • --selective / --all-image-file-names[-file] for subset uploads (the latter validates every uploaded image is in the list; both imply selective).
  • --diff-threshold (0.0–1.0). Full git-metadata flags (auto-collected in CI, like build upload); a --pr-number without a resolvable base SHA errors.
  • Manifest flattens VCS at the top level (reuses vcsInfoToBody).
  • Empty folder → exits 0 with "No image files found".

Memory

Each image is read once (dimensions + hash) and released; only the missing ones are re-read for the PUT body — bounded to a few images at a time.

New files / deps

src/lib/objectstore.ts, src/lib/snapshots/images.ts, fetchSnapshotsUploadOptions/createPreprodSnapshot in preprod-artifacts.ts, src/commands/snapshots/upload.ts. Adds image-size as a devDependency (the analog of Rust's imagesize). The VCS flag block is inlined (matching build upload); extracting a shared definition is a noted follow-up.

Tests

Objectstore client (URL/auth/HEAD/PUT), image collection + validation (real pngjs fixtures), both API calls, and the command's dedup (HEAD skips existing → fewer PUTs) + manifest shape. typecheck/lint/check:deps/check:fragments pass; full suite 8332 passed.

Port `snapshots upload` from the legacy Rust CLI. Scans a folder for PNG/JPEG
screenshots, uploads each to Sentry's object store (skipping any already present
by content hash), and POSTs a manifest to create the snapshot for visual diffing.
Objectstore is live; until a native TS objectstore client ships we make the raw
calls the Rust `objectstore-client` crate makes:
- GET snapshots/upload-options → { objectstore: { url, scopes, authToken, expirationPolicy } }.
- HEAD {url}/v1/objects/preprod/{k=v;...}/{orgId}/{projectId}/{sha256} (dedup),
auth via `x-os-auth: Bearer <jwt>`.
- PUT the raw bytes with `x-sn-expiration`. Objects are keyed by the original
file's SHA-256, so dedup is compression-independent (images are already
compressed → uploaded raw).
- POST snapshots/ with the manifest (app_id, per-image width/height/content_hash
+ sidecar, flattened VCS, diff_threshold/selective/all_image_file_names).
New: src/lib/objectstore.ts (HEAD/PUT client), src/lib/snapshots/images.ts
(collect + validate, dimensions via image-size), preprod-artifacts
fetchSnapshotsUploadOptions/createPreprodSnapshot, src/commands/snapshots/upload.ts.
Adds image-size as a devDependency. Tests cover the objectstore client, image
collection/validation, the two API calls, and the command's dedup + manifest.
@github-actionsgithub-actionsBot added the risk: high PR risk score: high label Jul 3, 2026
@github-actions

github-actionsBot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor
PR Preview Action v1.8.1

QR code for preview link

🚀 View preview at
https://cli.sentry.dev/_preview/pr-1186/

Built to branch gh-pages at 2026-07-03 10:46 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

@cursorcursorBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 035242a. Configure here.

Comment threadsrc/commands/snapshots/upload.ts Outdated
Comment threadsrc/commands/snapshots/upload.ts Outdated
@github-actions

github-actionsBot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

Codecov Results 📊

✅ Patch coverage is 82.63%. Project has 5247 uncovered lines.
❌ Project coverage is 81.69%. Comparing base (base) to head (head).

Files with missing lines (3)
FilePatch %Lines
src/commands/snapshots/upload.ts76.79%⚠️ 26 Missing and 11 partials
src/lib/snapshots/images.ts87.50%⚠️ 5 Missing and 3 partials
src/lib/api/infrastructure.ts75.00%⚠️ 2 Missing and 2 partials
Coverage diff
@@ Coverage Diff @@## main #PR +/-##
==========================================
- Coverage 81.70% 81.69% -0.01%
==========================================
Files 410 413 +3
Lines 28467 28657 +190
Branches 18497 18599 +102
==========================================
+ Hits 23257 23410 +153- Misses 5210 5247 +37- Partials 1901 1918 +17

Generated by Codecov Action

Comment threadsrc/lib/objectstore.ts
BYK added 2 commits July 3, 2026 10:31
- M1: POST the create-snapshot manifest with Content-Encoding: zstd (matching
the legacy CLI's with_zstd_json_body) so large image suites don't risk a body
limit. Adds an opt-in `bodyEncoding: "zstd"` to apiRequestToRegion (additive;
falls back to plain JSON when the runtime lacks zstd).
- L2: ignore array/scalar JSON sidecars (only objects are usable metadata).
- L3: enforce the --all-image-file-names[/-file] conflict before the empty-folder
early return.
- N1: reject an empty --diff-threshold (Number("") was silently accepted as 0).
- Tests: assert the objectstore key is {orgId}/{projectId}/{sha256}; sidecar
width/height/content_hash override; --pr-number without a base SHA is rejected.
Reduce the upload func's cognitive complexity below the Biome limit after the
added flag-conflict check.
@BYK

BYK commented Jul 3, 2026

Copy link
Copy Markdown
MemberAuthor

Self-review (subagent-assisted) + fixes

Protocol parity was verified exact against the Python objectstore client + Rust upload.rs (URL/scope format, x-os-auth header, object key {orgId}/{projectId}/{sha256}, manifest shape, sidecar override, VCS flatten, selective/all-names normalization). Fixes applied:

  • M1 (was the one blocking item): the create-snapshot manifest was POSTed as plain JSON; the legacy CLI uses with_zstd_json_body. A large image suite → large manifest → potential body-limit failure. Added an opt-in bodyEncoding: "zstd" to apiRequestToRegion (additive; falls back to plain JSON when the runtime lacks zstd) and use it for the manifest, matching the reference. zstd round-trip verified.
  • L2: array/scalar JSON sidecars are now ignored (only objects are usable metadata — the Rust deserializes into a map and drops non-objects).
  • L3: the --all-image-file-names / -file conflict is now enforced before the empty-folder early return (so it always fires).
  • N1: an empty --diff-threshold is rejected (Number("") was silently accepted as 0).

Tests added for the flagged gaps: the objectstore key is {orgId}/{projectId}/{sha256}; CLI width/height/content_hash override sidecar keys; --pr-number without a resolvable base SHA is rejected.

Confirmed safe as-is by the review (no change needed): uploading images raw (no Content-Encoding) — the key is the original file's sha256, so dedup is encoding-independent and the store transparently decodes on GET; and throw-on-first-upload-failure — the snapshot is only created after all uploads succeed, so a mid-upload failure leaves no snapshot. Deferred as follow-ups: streaming image hash/upload (L1, memory) and aggregate error reporting (N4).

- Cursor (High): resolve the positional folder against the command's cwd before
scanning — the walker requires an absolute path, so a relative `./screenshots`
passed the stat check but would fail the walk.
- Warden (High): add request timeouts to the objectstore HEAD (30s) and PUT
(120s) via AbortSignal.timeout, so a stalled connection can't hang the CLI /
a CI job forever.
- Tests: relative-path resolution against cwd; HEAD/PUT carry an AbortSignal.
@BYK
BYK merged commit 41f5e24 into mainJul 3, 2026
32 checks passed
@BYK
BYK deleted the byk/feat/snapshots-upload branch July 3, 2026 11:03
betegon added a commit that referenced this pull request Aug 10, 2026
## Summary
#1186 ported `snapshots upload` from the legacy `getsentry/sentry-cli`,
including its empty-directory early return. That return runs before
`--all-image-file-names[-file]` is parsed, so selective runs with no
changed images exit successfully without creating a snapshot.
Resolve the full image list before the early return. When it is present,
post an empty selective manifest and skip objectstore; plain empty
uploads remain no-ops. Explicitly empty list flags are now validated
instead of treated as absent.
Closes#1397.
## Test plan
- `pnpm exec vitest run test/commands/snapshots/upload.test.ts
test/lib/api/preprod-artifacts.test.ts test/lib/snapshots/images.test.ts
test/lib/objectstore.test.ts` — 55 passed
- `pnpm run lint`
- `pnpm run generate:schema && pnpm run typecheck`
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

risk: highPR risk score: high

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@BYK
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(snapshots): add upload command - #1186

Merged
BYK merged 5 commits into
mainfrom
byk/feat/snapshots-upload
Jul 3, 2026
Merged

feat(snapshots): add upload command#1186
BYK merged 5 commits into
mainfrom
byk/feat/snapshots-upload

Conversation

@BYK

@BYKBYK commented Jul 3, 2026

Copy link
Copy Markdown
Member

Ports snapshots upload from the legacy Rust CLI, completing the snapshots trio (upload/download/diff). Scans a folder of screenshots, uploads them to Sentry's object store, and creates a snapshot for visual diffing. Sentry SaaS only.

Objectstore approach

The object store is live; a native TS objectstore client is still pending, so — as agreed — we replicate the raw HTTP calls the Rust objectstore-client crate makes (reverse-engineered from getsentry/objectstore):

  • GETprojects/{org}/{project}/preprodartifacts/snapshots/upload-options/{ objectstore: { url, scopes, authToken, expirationPolicy } }.
  • HEAD{url}/v1/objects/preprod/{scope}/{key} to dedup (404 = missing), where scope = k=v;k=v (ordered) and key = {orgId}/{projectId}/{sha256}. Auth is a pre-signed JWT sent as x-os-auth: Bearer <token> (not Authorization).
  • PUT the bytes with x-sn-expiration: <policy>. The key is the original file's SHA-256, so dedup is independent of upload compression — images are already-compressed formats, so they're uploaded raw (no Content-Encoding).
  • POSTprojects/{org}/{project}/preprodartifacts/snapshots/ with the manifest → { artifactId, imageCount, snapshotUrl? }.

HEAD/PUT run with bounded concurrency (8).

Behavior (parity with Rust)

  • <path> (a directory) + --app-id (required).
  • Walks for PNG/JPEG (skips hidden files/dirs); reads dimensions via image-size (header-only), SHA-256, and a companion <image>.json sidecar (its keys merge into the manifest; CLI width/height/content_hash win).
  • Rejects any image over 40,000,000 px, listing violators.
  • --selective / --all-image-file-names[-file] for subset uploads (the latter validates every uploaded image is in the list; both imply selective).
  • --diff-threshold (0.0–1.0). Full git-metadata flags (auto-collected in CI, like build upload); a --pr-number without a resolvable base SHA errors.
  • Manifest flattens VCS at the top level (reuses vcsInfoToBody).
  • Empty folder → exits 0 with "No image files found".

Memory

Each image is read once (dimensions + hash) and released; only the missing ones are re-read for the PUT body — bounded to a few images at a time.

New files / deps

src/lib/objectstore.ts, src/lib/snapshots/images.ts, fetchSnapshotsUploadOptions/createPreprodSnapshot in preprod-artifacts.ts, src/commands/snapshots/upload.ts. Adds image-size as a devDependency (the analog of Rust's imagesize). The VCS flag block is inlined (matching build upload); extracting a shared definition is a noted follow-up.

Tests

Objectstore client (URL/auth/HEAD/PUT), image collection + validation (real pngjs fixtures), both API calls, and the command's dedup (HEAD skips existing → fewer PUTs) + manifest shape. typecheck/lint/check:deps/check:fragments pass; full suite 8332 passed.

Port `snapshots upload` from the legacy Rust CLI. Scans a folder for PNG/JPEG
screenshots, uploads each to Sentry's object store (skipping any already present
by content hash), and POSTs a manifest to create the snapshot for visual diffing.
Objectstore is live; until a native TS objectstore client ships we make the raw
calls the Rust `objectstore-client` crate makes:
- GET snapshots/upload-options → { objectstore: { url, scopes, authToken, expirationPolicy } }.
- HEAD {url}/v1/objects/preprod/{k=v;...}/{orgId}/{projectId}/{sha256} (dedup),
auth via `x-os-auth: Bearer <jwt>`.
- PUT the raw bytes with `x-sn-expiration`. Objects are keyed by the original
file's SHA-256, so dedup is compression-independent (images are already
compressed → uploaded raw).
- POST snapshots/ with the manifest (app_id, per-image width/height/content_hash
+ sidecar, flattened VCS, diff_threshold/selective/all_image_file_names).
New: src/lib/objectstore.ts (HEAD/PUT client), src/lib/snapshots/images.ts
(collect + validate, dimensions via image-size), preprod-artifacts
fetchSnapshotsUploadOptions/createPreprodSnapshot, src/commands/snapshots/upload.ts.
Adds image-size as a devDependency. Tests cover the objectstore client, image
collection/validation, the two API calls, and the command's dedup + manifest.
@github-actionsgithub-actionsBot added the risk: high PR risk score: high label Jul 3, 2026
@github-actions

github-actionsBot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor
PR Preview Action v1.8.1

QR code for preview link

🚀 View preview at
https://cli.sentry.dev/_preview/pr-1186/

Built to branch gh-pages at 2026-07-03 10:46 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

@cursorcursorBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 035242a. Configure here.

Comment threadsrc/commands/snapshots/upload.ts Outdated
Comment threadsrc/commands/snapshots/upload.ts Outdated
@github-actions

github-actionsBot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

Codecov Results 📊

✅ Patch coverage is 82.63%. Project has 5247 uncovered lines.
❌ Project coverage is 81.69%. Comparing base (base) to head (head).

Files with missing lines (3)
FilePatch %Lines
src/commands/snapshots/upload.ts76.79%⚠️ 26 Missing and 11 partials
src/lib/snapshots/images.ts87.50%⚠️ 5 Missing and 3 partials
src/lib/api/infrastructure.ts75.00%⚠️ 2 Missing and 2 partials
Coverage diff
@@ Coverage Diff @@## main #PR +/-##
==========================================
- Coverage 81.70% 81.69% -0.01%
==========================================
Files 410 413 +3
Lines 28467 28657 +190
Branches 18497 18599 +102
==========================================
+ Hits 23257 23410 +153- Misses 5210 5247 +37- Partials 1901 1918 +17

Generated by Codecov Action

Comment threadsrc/lib/objectstore.ts
BYK added 2 commits July 3, 2026 10:31
- M1: POST the create-snapshot manifest with Content-Encoding: zstd (matching
the legacy CLI's with_zstd_json_body) so large image suites don't risk a body
limit. Adds an opt-in `bodyEncoding: "zstd"` to apiRequestToRegion (additive;
falls back to plain JSON when the runtime lacks zstd).
- L2: ignore array/scalar JSON sidecars (only objects are usable metadata).
- L3: enforce the --all-image-file-names[/-file] conflict before the empty-folder
early return.
- N1: reject an empty --diff-threshold (Number("") was silently accepted as 0).
- Tests: assert the objectstore key is {orgId}/{projectId}/{sha256}; sidecar
width/height/content_hash override; --pr-number without a base SHA is rejected.
Reduce the upload func's cognitive complexity below the Biome limit after the
added flag-conflict check.
@BYK

BYK commented Jul 3, 2026

Copy link
Copy Markdown
MemberAuthor

Self-review (subagent-assisted) + fixes

Protocol parity was verified exact against the Python objectstore client + Rust upload.rs (URL/scope format, x-os-auth header, object key {orgId}/{projectId}/{sha256}, manifest shape, sidecar override, VCS flatten, selective/all-names normalization). Fixes applied:

  • M1 (was the one blocking item): the create-snapshot manifest was POSTed as plain JSON; the legacy CLI uses with_zstd_json_body. A large image suite → large manifest → potential body-limit failure. Added an opt-in bodyEncoding: "zstd" to apiRequestToRegion (additive; falls back to plain JSON when the runtime lacks zstd) and use it for the manifest, matching the reference. zstd round-trip verified.
  • L2: array/scalar JSON sidecars are now ignored (only objects are usable metadata — the Rust deserializes into a map and drops non-objects).
  • L3: the --all-image-file-names / -file conflict is now enforced before the empty-folder early return (so it always fires).
  • N1: an empty --diff-threshold is rejected (Number("") was silently accepted as 0).

Tests added for the flagged gaps: the objectstore key is {orgId}/{projectId}/{sha256}; CLI width/height/content_hash override sidecar keys; --pr-number without a resolvable base SHA is rejected.

Confirmed safe as-is by the review (no change needed): uploading images raw (no Content-Encoding) — the key is the original file's sha256, so dedup is encoding-independent and the store transparently decodes on GET; and throw-on-first-upload-failure — the snapshot is only created after all uploads succeed, so a mid-upload failure leaves no snapshot. Deferred as follow-ups: streaming image hash/upload (L1, memory) and aggregate error reporting (N4).

- Cursor (High): resolve the positional folder against the command's cwd before
scanning — the walker requires an absolute path, so a relative `./screenshots`
passed the stat check but would fail the walk.
- Warden (High): add request timeouts to the objectstore HEAD (30s) and PUT
(120s) via AbortSignal.timeout, so a stalled connection can't hang the CLI /
a CI job forever.
- Tests: relative-path resolution against cwd; HEAD/PUT carry an AbortSignal.
@BYK
BYK merged commit 41f5e24 into mainJul 3, 2026
32 checks passed
@BYK
BYK deleted the byk/feat/snapshots-upload branch July 3, 2026 11:03
betegon added a commit that referenced this pull request Aug 10, 2026
## Summary
#1186 ported `snapshots upload` from the legacy `getsentry/sentry-cli`,
including its empty-directory early return. That return runs before
`--all-image-file-names[-file]` is parsed, so selective runs with no
changed images exit successfully without creating a snapshot.
Resolve the full image list before the early return. When it is present,
post an empty selective manifest and skip objectstore; plain empty
uploads remain no-ops. Explicitly empty list flags are now validated
instead of treated as absent.
Closes#1397.
## Test plan
- `pnpm exec vitest run test/commands/snapshots/upload.test.ts
test/lib/api/preprod-artifacts.test.ts test/lib/snapshots/images.test.ts
test/lib/objectstore.test.ts` — 55 passed
- `pnpm run lint`
- `pnpm run generate:schema && pnpm run typecheck`
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

risk: highPR risk score: high

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@BYK
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

feat(snapshots): add upload command - #1186

Merged
BYK merged 5 commits into
mainfrom
byk/feat/snapshots-upload
Jul 3, 2026
Merged

feat(snapshots): add upload command#1186
BYK merged 5 commits into
mainfrom
byk/feat/snapshots-upload

Conversation

@BYK

@BYKBYK commented Jul 3, 2026

Copy link
Copy Markdown
Member

Ports snapshots upload from the legacy Rust CLI, completing the snapshots trio (upload/download/diff). Scans a folder of screenshots, uploads them to Sentry's object store, and creates a snapshot for visual diffing. Sentry SaaS only.

Objectstore approach

The object store is live; a native TS objectstore client is still pending, so — as agreed — we replicate the raw HTTP calls the Rust objectstore-client crate makes (reverse-engineered from getsentry/objectstore):

  • GETprojects/{org}/{project}/preprodartifacts/snapshots/upload-options/{ objectstore: { url, scopes, authToken, expirationPolicy } }.
  • HEAD{url}/v1/objects/preprod/{scope}/{key} to dedup (404 = missing), where scope = k=v;k=v (ordered) and key = {orgId}/{projectId}/{sha256}. Auth is a pre-signed JWT sent as x-os-auth: Bearer <token> (not Authorization).
  • PUT the bytes with x-sn-expiration: <policy>. The key is the original file's SHA-256, so dedup is independent of upload compression — images are already-compressed formats, so they're uploaded raw (no Content-Encoding).
  • POSTprojects/{org}/{project}/preprodartifacts/snapshots/ with the manifest → { artifactId, imageCount, snapshotUrl? }.

HEAD/PUT run with bounded concurrency (8).

Behavior (parity with Rust)

  • <path> (a directory) + --app-id (required).
  • Walks for PNG/JPEG (skips hidden files/dirs); reads dimensions via image-size (header-only), SHA-256, and a companion <image>.json sidecar (its keys merge into the manifest; CLI width/height/content_hash win).
  • Rejects any image over 40,000,000 px, listing violators.
  • --selective / --all-image-file-names[-file] for subset uploads (the latter validates every uploaded image is in the list; both imply selective).
  • --diff-threshold (0.0–1.0). Full git-metadata flags (auto-collected in CI, like build upload); a --pr-number without a resolvable base SHA errors.
  • Manifest flattens VCS at the top level (reuses vcsInfoToBody).
  • Empty folder → exits 0 with "No image files found".

Memory

Each image is read once (dimensions + hash) and released; only the missing ones are re-read for the PUT body — bounded to a few images at a time.

New files / deps

src/lib/objectstore.ts, src/lib/snapshots/images.ts, fetchSnapshotsUploadOptions/createPreprodSnapshot in preprod-artifacts.ts, src/commands/snapshots/upload.ts. Adds image-size as a devDependency (the analog of Rust's imagesize). The VCS flag block is inlined (matching build upload); extracting a shared definition is a noted follow-up.

Tests

Objectstore client (URL/auth/HEAD/PUT), image collection + validation (real pngjs fixtures), both API calls, and the command's dedup (HEAD skips existing → fewer PUTs) + manifest shape. typecheck/lint/check:deps/check:fragments pass; full suite 8332 passed.

Port `snapshots upload` from the legacy Rust CLI. Scans a folder for PNG/JPEG
screenshots, uploads each to Sentry's object store (skipping any already present
by content hash), and POSTs a manifest to create the snapshot for visual diffing.
Objectstore is live; until a native TS objectstore client ships we make the raw
calls the Rust `objectstore-client` crate makes:
- GET snapshots/upload-options → { objectstore: { url, scopes, authToken, expirationPolicy } }.
- HEAD {url}/v1/objects/preprod/{k=v;...}/{orgId}/{projectId}/{sha256} (dedup),
auth via `x-os-auth: Bearer <jwt>`.
- PUT the raw bytes with `x-sn-expiration`. Objects are keyed by the original
file's SHA-256, so dedup is compression-independent (images are already
compressed → uploaded raw).
- POST snapshots/ with the manifest (app_id, per-image width/height/content_hash
+ sidecar, flattened VCS, diff_threshold/selective/all_image_file_names).
New: src/lib/objectstore.ts (HEAD/PUT client), src/lib/snapshots/images.ts
(collect + validate, dimensions via image-size), preprod-artifacts
fetchSnapshotsUploadOptions/createPreprodSnapshot, src/commands/snapshots/upload.ts.
Adds image-size as a devDependency. Tests cover the objectstore client, image
collection/validation, the two API calls, and the command's dedup + manifest.
@github-actionsgithub-actionsBot added the risk: high PR risk score: high label Jul 3, 2026
@github-actions

github-actionsBot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor
PR Preview Action v1.8.1

QR code for preview link

🚀 View preview at
https://cli.sentry.dev/_preview/pr-1186/

Built to branch gh-pages at 2026-07-03 10:46 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

@cursorcursorBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 035242a. Configure here.

Comment threadsrc/commands/snapshots/upload.ts Outdated
Comment threadsrc/commands/snapshots/upload.ts Outdated
@github-actions

github-actionsBot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

Codecov Results 📊

✅ Patch coverage is 82.63%. Project has 5247 uncovered lines.
❌ Project coverage is 81.69%. Comparing base (base) to head (head).

Files with missing lines (3)
FilePatch %Lines
src/commands/snapshots/upload.ts76.79%⚠️ 26 Missing and 11 partials
src/lib/snapshots/images.ts87.50%⚠️ 5 Missing and 3 partials
src/lib/api/infrastructure.ts75.00%⚠️ 2 Missing and 2 partials
Coverage diff
@@ Coverage Diff @@## main #PR +/-##
==========================================
- Coverage 81.70% 81.69% -0.01%
==========================================
Files 410 413 +3
Lines 28467 28657 +190
Branches 18497 18599 +102
==========================================
+ Hits 23257 23410 +153- Misses 5210 5247 +37- Partials 1901 1918 +17

Generated by Codecov Action

Comment threadsrc/lib/objectstore.ts
BYK added 2 commits July 3, 2026 10:31
- M1: POST the create-snapshot manifest with Content-Encoding: zstd (matching
the legacy CLI's with_zstd_json_body) so large image suites don't risk a body
limit. Adds an opt-in `bodyEncoding: "zstd"` to apiRequestToRegion (additive;
falls back to plain JSON when the runtime lacks zstd).
- L2: ignore array/scalar JSON sidecars (only objects are usable metadata).
- L3: enforce the --all-image-file-names[/-file] conflict before the empty-folder
early return.
- N1: reject an empty --diff-threshold (Number("") was silently accepted as 0).
- Tests: assert the objectstore key is {orgId}/{projectId}/{sha256}; sidecar
width/height/content_hash override; --pr-number without a base SHA is rejected.
Reduce the upload func's cognitive complexity below the Biome limit after the
added flag-conflict check.
@BYK

BYK commented Jul 3, 2026

Copy link
Copy Markdown
MemberAuthor

Self-review (subagent-assisted) + fixes

Protocol parity was verified exact against the Python objectstore client + Rust upload.rs (URL/scope format, x-os-auth header, object key {orgId}/{projectId}/{sha256}, manifest shape, sidecar override, VCS flatten, selective/all-names normalization). Fixes applied:

  • M1 (was the one blocking item): the create-snapshot manifest was POSTed as plain JSON; the legacy CLI uses with_zstd_json_body. A large image suite → large manifest → potential body-limit failure. Added an opt-in bodyEncoding: "zstd" to apiRequestToRegion (additive; falls back to plain JSON when the runtime lacks zstd) and use it for the manifest, matching the reference. zstd round-trip verified.
  • L2: array/scalar JSON sidecars are now ignored (only objects are usable metadata — the Rust deserializes into a map and drops non-objects).
  • L3: the --all-image-file-names / -file conflict is now enforced before the empty-folder early return (so it always fires).
  • N1: an empty --diff-threshold is rejected (Number("") was silently accepted as 0).

Tests added for the flagged gaps: the objectstore key is {orgId}/{projectId}/{sha256}; CLI width/height/content_hash override sidecar keys; --pr-number without a resolvable base SHA is rejected.

Confirmed safe as-is by the review (no change needed): uploading images raw (no Content-Encoding) — the key is the original file's sha256, so dedup is encoding-independent and the store transparently decodes on GET; and throw-on-first-upload-failure — the snapshot is only created after all uploads succeed, so a mid-upload failure leaves no snapshot. Deferred as follow-ups: streaming image hash/upload (L1, memory) and aggregate error reporting (N4).

- Cursor (High): resolve the positional folder against the command's cwd before
scanning — the walker requires an absolute path, so a relative `./screenshots`
passed the stat check but would fail the walk.
- Warden (High): add request timeouts to the objectstore HEAD (30s) and PUT
(120s) via AbortSignal.timeout, so a stalled connection can't hang the CLI /
a CI job forever.
- Tests: relative-path resolution against cwd; HEAD/PUT carry an AbortSignal.
@BYK
BYK merged commit 41f5e24 into mainJul 3, 2026
32 checks passed
@BYK
BYK deleted the byk/feat/snapshots-upload branch July 3, 2026 11:03
betegon added a commit that referenced this pull request Aug 10, 2026
## Summary
#1186 ported `snapshots upload` from the legacy `getsentry/sentry-cli`,
including its empty-directory early return. That return runs before
`--all-image-file-names[-file]` is parsed, so selective runs with no
changed images exit successfully without creating a snapshot.
Resolve the full image list before the early return. When it is present,
post an empty selective manifest and skip objectstore; plain empty
uploads remain no-ops. Explicitly empty list flags are now validated
instead of treated as absent.
Closes#1397.
## Test plan
- `pnpm exec vitest run test/commands/snapshots/upload.test.ts
test/lib/api/preprod-artifacts.test.ts test/lib/snapshots/images.test.ts
test/lib/objectstore.test.ts` — 55 passed
- `pnpm run lint`
- `pnpm run generate:schema && pnpm run typecheck`
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

risk: highPR risk score: high

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@BYK