Repository navigation
feat(dashboard): render .pptx slides in the file panel, degrade honestly without LibreOffice - #10738
Conversation
Design Review (Fable 5) — 🟡 CONCERNSDesign-level review of Design-Verdict: CONCERNS Spec and description misname the cache trust root as WatchThe committed spec says "503 [DESIGN-REVIEWED] ec27174 |
GPT 5.6 Review — ✅ human override acceptedHuman judgment by @iamwhatever overrides the GPT 5.6 finding for [GPT-OVERRIDE] ec27174 This comment is updated in place on each push. The model was not re-run because an authorized human decision supersedes it. False positive or not applicable? A repository writer can comment: |
First Principles Review (Fable 5) — 🟡 CONCERNSPremise-level review of First-Principles-Verdict: CONCERNS The manifest ships three fields nothing reads, and a Windows-only eviction walk for a cache the Windows render path can never populate. Not justified as shipped
What this change shipsInventory (10 items) — 8 justifiedIntent: show a
[FIRST-PRINCIPLES-REVIEWED] ec27174 |
UX Review (Fable 5) — 🟡 CONCERNSUX-level review of UX-Verdict: CONCERNS "Render slides again" can silently do nothing — no pending state, and after cache eviction the failure never clears; readers fear the install hand-off. Watch
Suggestions
[UX-REVIEWED] ec27174 |
Opus 5 Review — ✅ no blocking findingsReviewed Review detailsNo blocking findings. FINDING — website/src/components/FileRenderers.tsx:872 — the "Render slides again" button is inert for an evicted slide: FINDING — src/kiro_crew/dashboard/handlers/office_slides.py:1455 — [OPUS-REVIEWED] ec27174 Verdict parsed from the review's SHA-scoped output markers for commit False positive or not applicable? A repository writer can comment: |
dd0c99c to
c84e924
Compare
c84e924 to
572ef4b
Compare
|
Round 1 disposition (reviews of GPT F1 (security, fenced) — agent-writable cache enables credential disclosure. Fixed structurally, not adjudicated. The cache is now treated as untrusted storage: the manifest is HMAC-signed with a subkey derived from the SEL trust root under the label GPT F2 — slide-render failures bypass ErrorNotice. Fixed: a failed render keeps the server's GPT F3 / Feature Map Gate — map untouched. Fixed: a Opus (advisory) — stale slide from the browser cache after an edit. Real, fixed: Design "Watch" — spec. Added under Office previews in UX "Watch" — first open blocks behind "Rendering slides…". Fixed as suggested: the text outline renders immediately under the rendering row and the pager swaps in when the manifest lands (screenshot "while the first render runs" and the first seconds of the recording). UX suggestion ( First Principles — "undeclared renderer inside a fix". The lanes ran against the previous description, which predated the scope change (the owner asked for real slide rendering after the outline-only fix was opened). The PR title, commit and description now declare the renderer, the two endpoints, the cache, Semgrep / Brand. Evidence re-attached from |
572ef4b to
4f08075
Compare
4f08075 to
2df9900
Compare
|
Re the GPT 5.6 and UX Review verdicts on GPT F1 — staging permits symlink traversal (security, fixed). The work directory is now pinned by a descriptor from the moment it is created ( GPT F2 — stat collisions serve obsolete slides (security, fixed rather than overridden). The GPT F3 — footer clips at 320 px (fixed). The pager footer is GPT F4 — feature-map row (fixed). The row now distinguishes the GPT finding — module doc (fixed). States that rendering is refused ( UX evidence gaps (closed). Screenshots added for the failed-render UX watch — the install remedy was unactionable (fixed). The no-LibreOffice row now carries Ask the agent to install it: it stages a prompt naming the gateway's own install command into the chat composer ( UX watch — counter wrapping mid-phrase (fixed). Also fixed from the CI shards on |
2aca745 to
729086b
Compare
5486d71 to
2335440
Compare
|
Addressed two of the three GPT/Opus review findings in code (head
Remaining GPT finding — staging by-name paths handed to the LibreOffice child (office_slides.py ~:572): the gateway's own I/O is descriptor-pinned, but soffice receives by-name |
2335440 to
e8d747d
Compare
e8d747d to
57ee711
Compare
|
Addressed the three GPT/Opus findings on the prior head in code (head
Also fixed a cross-platform regression in the eviction hardening: Disposition on the non-blocking |
|
Stopping code changes here on this PR's security-review lane (head The findings, for a maintainer/author to weigh:
Everything else this PR owns is green: rebase, the OOM pixel cap, the credential-screen memory cap with fail-safe refusal on truncation, the descriptor-hardened eviction (with a Windows by-name fallback), executable validation, no resolve() on the loop, the redaction-sink registration, and the i18n fixes. The remaining non-GPT reds (Frontend Tests 2/3 + Coverage) are inherited main drift, fixed main-side by #14138. |
57ee711 to
8e05b6c
Compare
…tly without LibreOffice
Opening a .pptx in the side panel rendered the deck as one wall of text with
`--- Slide N ---` separators, which reads as "the panel cannot render my
slides". A presentation is its layout; the panel showed none of it and said
nothing about why.
Slides. Nothing in the dashboard can draw a slide itself: that takes an
office suite, and the one open-source renderer with a faithful Impress
import is LibreOffice (`soffice`), a system package the product does not
install from a browser request. So the panel renders slides WHEN soffice is
on the gateway host and says so when it is not.
Backend (handlers/office_slides.py): `GET /api/file-office-slides` answers a
manifest -- `{status: "ready", digest, count, slides}` once the deck is
rendered, `{status: "unavailable", reason, hint}` with the pptx-maker app's
own per-OS install command when soffice is absent -- and
`GET /api/file-office-slide?n=` serves one PNG. Both run the file endpoints'
shared open-and-check prefix (path validation, sensitive-path fence,
symlink-refusing open, 50 MB cap) and audit to SEL. The deck's bytes are
copied from the checked handle into a private work dir, converted by
`soffice --headless --convert-to pdf` as an argv list through the strict
sandbox chokepoint with a throwaway `-env:UserInstallation` profile, a
minimal environment and a hard timeout, then rasterized in-process with
pypdfium2 (already a core dependency through pdfplumber) at 1280 px. The
result lives under `<data home>/cache/slide-previews/<sha256 of bytes>/`:
content-keyed so an edited deck re-renders and an unchanged one never does,
published by atomic rename, deduped by a per-digest lock, bounded by
least-recently-used eviction. `.ppt` is accepted too -- LibreOffice reads it.
soffice discovery is the pptx-maker app's (`optional_dep_path`,
`soffice_hint`), imported lazily like the AWS Control consent handler does.
Frontend (FileRenderers.tsx): `OfficeViewer` dispatches decks to
`OfficeSlidesRenderer` -- a pager (prev/next, keyboard, live counter) over
the current slide with a lazy thumbstrip, the card's Open/Download actions
in its footer, and a "Rendering slides..." state for the first open. When
the manifest says `unavailable` or the render fails, it degrades to the text
outline under a row that names the missing piece and the install command.
Text outline (the degrade). doc_parser gains `extract_slides()` -- the slide
walk `extract_text()` flattens, returned per slide -- and `join_slides()`
owns the separator, so the two cannot disagree. `/api/file-office-preview`
returns `slides: [{index, text}]` beside `text` for a .pptx from ONE
extraction, redacted per slide under the shared 512 KB cap; the panel
renders them as numbered cards under a text-only notice. `.docx` is
unchanged.
Eleven catalog keys, all locales, en-XA regenerated.
Closes #10736
Co-authored-by: CrysisDeu <32421101+CrysisDeu@users.noreply.github.com>
|
Rebased: main moved to |
|
/ai-review override gpt ec27174: the staging tree sits in the same agent-writable cache a same-uid writer could use to rewrite the source deck itself, so the signed cache closes the disclosure class and cannot exceed the deck's own integrity; moving staging to a gateway-private root is a repo-wide sandbox-mask decision, not a local fix. |
Human judgment recorded@iamwhatever marked the gpt AI finding as false positive, not applicable, or explicitly accepted for
This decision applies only to this commit. A new push requires a new judgment. |
buluoray
left a comment
There was a problem hiding this comment.
LGTM. I checked this at head ec27174c.
- Paths. All three worker entry points go through
_files._open_checked_file, which validates the path, appliesis_sensitive_pathand opens withO_NOFOLLOW. The slide PNG route re-authorizes and re-hashes the source on every request. - Route auth. The routes are plain
add_getbehindtoken_auth_middleware, with no exemption entry. - LibreOffice.
sofficemust passvalidate_provider_executable, so a binary planted on PATH is refused. It runs from a list argv (no shell) undersandboxed_spawn_argv(..., "strict")with rlimits and capped pipes. On timeout the whole process tree is killed. - Bounds. Deck size is capped at fstat, there are at most 500 slides, and pixel area is capped. If the text screen would be truncated, the deck is refused rather than rendered without the screen. The cache checks integrity with
compare_digeston per-slide sha256. - No LibreOffice. Without it, the route returns a 200
unavailableand the panel degrades to the text outline.
I mutation-tested two things. Weakening the cache hash check turns test_a_slide_file_that_is_a_symlink_or_altered_is_refused_and_audited red. Stubbing out the rendered-text screen turns test_a_deck_whose_slides_show_a_credential_is_not_rendered red. With pypdfium2 present (pdfplumber>=0.10 pulls it in), 165 targeted tests pass.
I agree with the codex override. A writer with the same uid who swaps the staged deck or its outputs mid-conversion gets nothing beyond what editing the deck would give them, since outputs are read through pinned fds and still pass the text screen.
Non-blocking follow-ups: _ConvertFailed from _render_prepare surfaces as a 500 instead of a 502, the spec still says "SEL trust root" where the code uses token_signing.key, and the "Render again" button can be inert.
|
Readiness sweep 2026-09-29 (bolichen97): holding this one for a rebase rather than merging as-is.
Please rebase onto main; once |
Problem / Motivation
Goal: A
.pptxopened in the dashboard file panel is shown as its actual slides, page by page, and says plainly when it can only show the text.Opening a
.pptxin the dashboard's right-hand file panel showed the deck as one wall of plain text with--- Slide 1 ---,--- Slide 2 ---separators inside a single<pre>. A user reads that as "the panel cannot render my slides": a presentation is its layout, the panel showed none of it, and nothing said why. The reporting instance's audit log shows the same deck re-opened five times in fifteen minutes, each time landing on the same dump.Why it matters
The file panel is where an agent's deliverables get inspected, and decks are a common deliverable (pptx-maker, python-pptx scripts, uploaded review material). A deck the panel cannot show sends the user to Download and out of the dashboard; a deck it can show slide by slide keeps the review in the panel where the agent is.
Not a goal
.docxpreview behaviour is unchanged.What changed (motivation → approach → change)
Symptom. A
.pptxin the side panel renders as a flat text dump.Root cause.
.pptxsupport in the file panel was only ever plaintext extraction:/api/file-office-previewflattened every slide's runs into ONE string andOfficeViewerput it in one<pre>. There was no slide renderer anywhere in the dashboard, and no statement on the surface that text was all it could show.Approach (feasibility recorded on #10736). Nothing in the dashboard can draw a slide itself — that takes an office suite. LibreOffice (
soffice) has the one faithful open-source Impress import, and it is a system package the product neither ships nor installs from a browser request (the stance the pptx-maker app already takes for its own thumbnails). So: render slides server-side when LibreOffice is on the gateway host, reusing the app's tool discovery (optional_dep_path("soffice"),soffice_hint()); rasterize the PDF in-process withpypdfium2, which is already a core dependency throughpdfplumber(no new dependency, no poppler, no second venv); and degrade honestly without it — the text outline under a row naming the install command. Pure-JS rendering was evaluated and not taken:pptx-preview(ISC, single maintainer, echarts+lodash, MB-scale chunk, fonts substituted, no SmartArt) andpptxtojson(parser only) are both a fidelity step below LibreOffice and a second renderer to maintain.Change.
src/kiro_crew/dashboard/handlers/office_slides.py(new):GET /api/file-office-slides?path=→{status:"ready", digest, count, truncated, slides:[{n,width,height}]}or{status:"unavailable", reason:"soffice_unavailable", hint};GET /api/file-office-slide?path=&n=→ one PNG. Both run the file endpoints' shared_open_checked_fileprefix (dashboard path validation, sensitive-path fence, symlink-refusing open, 50 MB fstat cap), map its refusals onto the same codes as the text preview, audit to SEL, and do all filesystem work on the transfer pool. The deck's bytes are copied from the checked handle into a private work directory (the child never opens the user's path; re-hashed before staging so a file that changed under the lock is refused with 409, not rendered under the old key).soffice --headless --norestore --convert-to pdf --outdir …runs as an argv list throughsandboxed_spawn_argv(…, "strict", extra_hidden_dirs=<trust root>), with a throwaway-env:UserInstallationprofile (no profile-lock contention between concurrent renders, no read of the operator's LibreOffice settings), a minimal environment (TMPDIRinside the work dir, noDISPLAY), captured pipes with a byte cap, and a 180 s wall-clock timeout that kills the process tree. PDF pages are rasterized at 1280 px wide (cap 500 slides,truncatedflagged). Cache:<data home>/cache/slide-previews/<sha256>/withmanifest.json+slide-<n>.png, published by atomic rename, per-digestasyncio.Lock(refcounted registry) to dedupe concurrent requests, LRU eviction to a 256 MB budget that spares the deck just rendered and sweeps abandoned work dirs. A(realpath, size, mtime_ns) → digestmap lets the per-slide endpoint avoid re-hashing on every fetch; any stat change misses it..pptaccepted (LibreOffice reads it). The cache is not a trust root — it is same-uid agent-writable, so nothing served from it is taken on faith: the manifest is HMAC-signed with a subkey derived from the SEL trust root (sel_hmac.key, deny-listed for agent shells) under a purpose label (thesession_pid_sigconstruction), records every slide's sha256, and every cache read opensO_NOFOLLOW, refuses non-regular or oversize files, and serves a slide only when its bytes hash to the signed record. An unsigned, forged, foreign-digest or unverifiable entry is a cache miss; a planted symlink at the deck directory is unlinked (never followed) before publishing; without a loadable trust root the cache is inert (503cache_unsigned). The slide URL carries the manifestdigest: the browser may cache a pinned URL (private, max-age=3600) because an edited deck gets a new digest and a new URL, a digest that no longer matches answers 409stale_digest, and a digest-less request isno-store.handlers/__init__.py,routes/taskrunner.py: export + register the two routes beside/api/file-office-preview.website/src/components/FileRenderers.tsx:OfficeViewerdispatches.pptx/.ppttoOfficeSlidesRenderer: a "Rendering slides…" state (first open converts on the host, later opens are instant), thenSlidePager— current slide, prev/next, liveSlide n of N, keyboard (arrows/Page/Home/End) bound on the pager, a lazy thumbstrip withrole=listbox, and the card's Open/Download actions in the footer (OfficeCard compact). While the manifest loads, the text outline renders at once under a "Rendering slides…" row — no blank wait on content the panel already has — and the pager swaps in when the manifest lands.unavailabledegrades toOfficeTextViewerunder a row with the gateway host's install command as a code chip; a failed render degrades under the sharedErrorNotice(askAgent) carrying the server's reason and code..docxnever touches the slides endpoint.sendErrorToChat, the same hand-off everyErrorNoticegets); the user reads and sends it, nothing runs on the click. The pager footer wraps instead of clipping, so a 320 px panel keeps every control visible.token_signing.key(gateway-only: masked inside every agent sandbox and behind the file-tool fence). The SEL key would not do — in-sandbox MCP servers read it to resolve their session identity, so it is deliberately visible to sandboxed processes and a same-uid agent could forge a signed manifest with it._open_cache_root, descriptor-relativemkdir/openwithO_NOFOLLOW); the deck is hashed WHILE it is staged, so the bytes the child converts are the bytes the digest names (a rewrite between hash and copy is refused, 409file_changed); and the work directory is pinned by descriptors from the moment it exists (_Staging):O_NOFOLLOWon every open,O_EXCLon every create, descriptor-relative unlink, the PDF opened through it as a regular file, per-slide hashes taken from the bytes written, the manifest and the publish renamed relative to the cache-root descriptor and verified by inode. A name swapped for a link mid-render is refused, never followed, written through or deleted through. There is no by-name fallback: a platform without descriptor-relative file operations (Windows) does not render — the manifest answersunavailable/platform_unsupported(SELdenied) and the panel shows the text outline under a row saying so; a by-name path behindlstatchecks was considered and rejected because it leaves a window in which a same-uid process swaps the work directory for a junction and the cleanup deletes through it. A conversion failure's diagnostic (the child's stderr tail) goes through the credential and exfiltration-URL redactors before it is logged or returned. There is no stat-keyed digest shortcut: every request hashes the file, so a same-size rewrite that keeps the timestamp cannot be answered with the previous deck's slides.{status: "unavailable", reason: "content_redacted"}, nothing is published, the refusal is a SELdeniedevent — and the panel shows the redacted text outline under a row that says why. Every served slide is a SELsuccessinvocation, like every refusal is adenied/not_foundone.ErrorNoticein a row of its own above Open and Download, so no row carries more than the two file actions.ErrorNotice(agent hand-off included) with a Render slides again action that re-asks for the manifest — a changed deck gets its new digest, an evicted one is rendered again.website/src/utils/fileReadUrl.ts:fileOfficeSlidesUrl,fileOfficeSlideUrl(derived fromfileDownloadUrllike the preview URL;nafter the encoded path).doc_parser.extract_slides()/join_slides()(one walk, the flat text is the join),/api/file-office-previewreturnsslides:[{index,text}]besidetextfor a.pptx, redacted per slide under the shared 512 KB cap; the panel renders numbered cards under a text-only notice..docxunchanged.en.manual.jsonand all twelve locales;en-XAregenerated.docs/feature-map/README.md: a row for the slide preview;docs/system-specs/modules/learn-cron-dashboard.md: the two endpoints, the degrade contract, the signed cache and the frontend contract under Office previews.Tests
test/test_file_office_slides.py(new) —sofficestubbed at_run_sofficewith a real PDF written bypypdfium2; everything else runs for real. Degrade: no soffice →unavailable+ hint, nothing written, SEL-audited. Render path: one conversion for two requests (second from cache), manifest shape, 1280×720 from a 16:9 page, intermediates and work dir gone. Conversion failure → 502convert_failed, no work dir left. The child is handed the staged copy, never the user's path._run_sofficeprepares throughsandboxed_spawn_argv(…, "strict")with the trust root hidden and a minimal env (noDISPLAY,TMPDIRin the work dir) and spawns viacreate_subprocess_limited— pinned on the chokepoint call._soffice_argvis a list with a private profile. Slide endpoint: PNG bytes +nosnifffor the authorized path,max-ageonly with the digest pin,no-storewithout, 409 for a stale digest, 400 for a malformed one; out-of-range/malformedn→ 404/400; never-rendered → 404. Edited deck misses the cache. Cache is not a trust root: an unsigned or field-forged manifest is a miss for both endpoints; a slide file replaced by a symlink to a secret, or with altered bytes, is refused (404) and SEL-audited ascache_integrity, and the secret's bytes never appear in the response; with no trust root the cache is inert (503, nothing rendered, nothing read); a symlink planted at the deck directory is unlinked and its target untouched. Shared envelope: 415 unsupported, 413 oversized before any conversion, 403 sensitive, 400 forbidden. Eviction: LRU order,keepspared, abandoned work dir swept; manifest for another digest rejected.test/test_file_office_slides.pyalso pins the staging: a work directory whose name is swapped for a link mid-render is neither published nor deleted through (the link's target is untouched, no deck appears at the digest, the real directory received the manifest); a cache root swapped for a link is refused before anything is staged into its target. The trust root is stubbed attoken_secret._get_secret; without one the cache is inert (503cache_unsigned). A deck whose rendered text carries a credential answersunavailable/content_redacted, publishes nothing, discards its staging dir and is SEL-audited as denied; a served slide is SEL-audited as a success. Without descriptor-relative operations (_DIR_FD_OPSpatched false) the manifest answersplatform_unsupported, no conversion runs and the refusal is audited; the render-path tests are skipped where the platform lacks those operations, so the Windows shards exercise the fail-closed answer instead.test/test_doc_parser.py—TestExtractSlides(order, deck numbering with gaps,join_slides == extract_text, budget, fileobj, sensitive-path audit, parse failure).test/test_file_office_preview.py—.docxcarries noslides;.pptxslides beside the flat text; slides share the cap; redaction before the per-slide cut.website/src/test/FileRenderers.test.tsx— pager renders from the slides endpoint (the outline that stood in while rendering is gone once slides are ready), stage/thumbstrip/prev-next/keyboard/Home behaviour,Download originalreachable;unavailable→ outline under the degrade row showing the hint, whose Ask the agent to install it stages a prompt carrying that command and navigates to the chat; a slide whose image fails to load is replaced by theErrorNoticewith Render slides again, which re-fetches the manifest, while paging to other slides keeps working; acontent_redactedmanifest renders the redacted outline under a row naming the reason, with no install hand-off; a failed Open on the compact card puts its notice in a separate row from the two file actions; render error → outline under anErrorNoticecarrying the server's reason and code; while the manifest is pending the outline is already shown under the rendering row;.pptwithout soffice → degrade row + download card;.docxnever asks the slides endpoint; flat text kept when noslides.website/src/utils/fileReadUrl.test.ts— the two new builders join the shared encoding table;nlands after the encoded path andresolve=1.Static gates run locally on the head:
tsc -b,eslint(touched files),i18n-checkvsorigin/main(19/19),black(non-baselined files),flake8,isort,mypy,check_sync_io_in_async,check_subprocess_encoding,check_black_formatting,check_brand_name,check_feature_map,docs-lint. Tests were written, not executed locally; CI runs them.Manual verification
Real gateway built from this head (live source, isolated home, dark theme, 1280×820), the owner's 30-slide PowerPoint export and a python-pptx deck, on the same host in two states:
/api/file-office-slides→ready, 30 slides, signed manifest with 30 hashes;/api/file-office-slide?n=5&digest=…→ 1280×720 PNG withprivate, max-age=3600, the same URL without the digest →no-store, a stale digest → 409; cache dir 2.1 MB; second open instant from cache; pager, thumbstrip and keyboard paging work (recording below). Tamper probes on the live cache:slide-7.pngreplaced by a symlink to the gateway's.local_secret→ 404, secret bytes absent from the response, SELcache_integrity;slide-8.pngwith appended bytes → 404, audited;manifest.jsonwithcountedited → treated as a miss and the deck re-rendered with a fresh signature.PATH, cache cleared): manifest →unavailablewithsudo apt install libreoffice (or: sudo dnf install libreoffice); panel shows the degrade row (command + Ask the agent to install it) over the text outline; a.pptshows the same row over the download card.sofficeonPATHthat exits 77): manifest → 502convert_failedwith the child's last stderr line; panel shows the outline under anErrorNoticecarryingsoffice exited 77: … (convert_failed)and Ask the agent.count: 500, truncated: true; slide 500 serves; the pager footer readsSlide limit reached at 500; the rest of the deck is not shown.AKIAIOSFODNN7EXAMPLEwritten into a slide-1 text run →/api/file-office-slidesanswers{status: "unavailable", reason: "content_redacted"}in 1 s (converted, screened, never rasterized), no cache directory appears,security_eventsgains onedenied/content_redactedrow; the panel shows the redacted outline under the reason row. The same deck without the key renders as before.{status: "unavailable", reason: "platform_unsupported"}, nothing staged; the panel shows the outline under the reason row.Endpressed to a slide the lazy thumbstrip had not fetched →/api/file-office-slideanswers 404 → the stage shows the noticeSlide 30 did not load: …with Ask the agent and Render slides again; the button re-renders the deck and slide 30 appears..docxunchanged;/api/file-readand/api/file-watchunchanged.Screenshots / video
Side panel, dark theme, 1280×820, the same 30-slide deck:
Every other state the diff introduces (same deck unless noted; the fifth is the pager forced to 320 px, the sixth the 30-slide deck after its cache directory was removed, the seventh the same deck with an AWS key written into slide 1, the eighth the gateway with descriptor-relative operations forced off):
.pptwithout LibreOfficeCold open then paging through the deck (outline under "Rendering slides…" → pager; Next ×6, a thumbnail jump, arrow keys, End, Home; ~51 s):
paging-deck.mp4
recorded from 1deb8dc · kirodotdev/KiroCrew fix/sidepanel-pptx-preview · mode: live-source gateway, dark theme, soffice on PATH, empty cache · real server + real deck, no fixtures
Full-page context, 1280×820
Related Issues
Closes #10736
Pattern harvest
Rule candidate: review-prompt
Pattern: a visual document format shown as extracted text with no statement of the limitation — when a panel cannot render a format faithfully, say what is missing and how to get it, and structure what it can show.
Checklist
feat|fix|docs|refactor|perf|test|chore|ci|build|revert: ...)