PUT-1903

.github/workflows/ai-provider-integration-tests.yaml

@@ -22,7 +22,7 @@ jobs:
             - name: Set up Node.js
               uses: actions/setup-node@v7
               with:
-                  node-version: '26'
+                  node-version: '24'
                   cache: 'npm'
 
             - name: Install dependencies
@@ -47,13 +47,3 @@ jobs:
                   PUTER_TEST_AI_MOONSHOT_API_KEY: ${{ secrets.PUTER_TEST_AI_MOONSHOT_API_KEY }}
                   PUTER_TEST_AI_ZAI_API_KEY: ${{ secrets.PUTER_TEST_AI_ZAI_API_KEY }}
                   PUTER_TEST_AI_ELEVENLABS_API_KEY: ${{ secrets.PUTER_TEST_AI_ELEVENLABS_API_KEY }}
-
-            # Realtime conversations through the SDK against live OpenAI. Builds
-            # the SDK bundle these tests load itself, so it runs even when the
-            # step above fails; the tests skip themselves without the key.
-            - name: Run live realtime conversation tests
-              if: ${{ !cancelled() }}
-              run: npm run setupExtensions && (cd src/puter-js && npm run build) && npx vitest run --config src/puter-js/tests/api/vitest.config.ts src/puter-js/tests/api/realtime/realtimeLive.test.ts
-              env:
-                  CI: 'true'
-                  PUTER_TEST_AI_OPENAI_API_KEY: ${{ secrets.PUTER_TEST_AI_OPENAI_API_KEY }}

.github/workflows/backend-tests.yaml

@@ -57,7 +57,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v7
         with:
-          node-version: '26'
+          node-version: '24'
           cache: 'npm'
 
       - name: Install dependencies
@@ -88,7 +88,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v7
         with:
-          node-version: '26'
+          node-version: '24'
           cache: 'npm'
 
       - name: Install dependencies
@@ -154,7 +154,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v7
         with:
-          node-version: '26'
+          node-version: '24'
           cache: 'npm'
 
       - name: Install dependencies

.github/workflows/docs-build.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v7
         with:
-          node-version: '26'
+          node-version: '24'
           cache: 'npm'
 
       - name: Install dependencies

.github/workflows/notify-dev.yaml

@@ -1,48 +0,0 @@
-name: Notify HeyPuter (dev)
-
-on:
-  workflow_dispatch:
-    inputs:
-      puter_ref:
-        description: "puter branch, tag or SHA"
-        type: string
-        default: "main"
-
-permissions:
-  contents: read
-
-jobs:
-  authorize:
-    if: github.repository == 'HeyPuter/puter'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Require maintain or admin
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ACTOR: ${{ github.triggering_actor }}
-        run: |
-          ROLE=$(gh api "repos/$GITHUB_REPOSITORY/collaborators/$ACTOR/permission" --jq .role_name)
-          if [ "$ROLE" != "maintain" ] && [ "$ROLE" != "admin" ]; then
-            echo "::error::$ACTOR has role '$ROLE'; maintain or admin required"
-            exit 1
-          fi
-
-  notify:
-    needs: authorize
-    runs-on: ubuntu-latest
-    # Holds HEYPUTER_DISPATCH_TOKEN; limited to main so branch copies of this file can't read it.
-    environment: heyputer-dispatch
-    steps:
-      - name: Trigger heyputer dev deploy
-        env:
-          PUTER_REF: ${{ inputs.puter_ref }}
-          TOKEN: ${{ secrets.HEYPUTER_DISPATCH_TOKEN }}
-        run: |
-          jq -nc --arg ref "$PUTER_REF" \
-            '{event_type: "puter-dev-requested", client_payload: {puter_ref: $ref}}' |
-          curl -fsS -X POST \
-            -H "Authorization: token $TOKEN" \
-            -H "Accept: application/vnd.github.v3+json" \
-            https://api.github.com/repos/HeyPuter/heyputer/dispatches \
-            -d @-
-          echo "Requested \`$PUTER_REF\`" >> "$GITHUB_STEP_SUMMARY"

.github/workflows/notify-prod.yaml

@@ -8,7 +8,6 @@ on:
 jobs:
   notify:
     runs-on: ubuntu-latest
-    environment: heyputer-dispatch
     steps:
       - name: Trigger heyputer build
         run: |
@@ -16,4 +15,4 @@ jobs:
             -H "Authorization: token ${{ secrets.HEYPUTER_DISPATCH_TOKEN }}" \
             -H "Accept: application/vnd.github.v3+json" \
             https://api.github.com/repos/HeyPuter/heyputer/dispatches \
-            -d '{"event_type":"puter-main-updated","client_payload":{"puter_ref":"main"}}'
+            -d '{"event_type":"puter-main-updated","client_payload":{"puter_ref":"main"}}'

.github/workflows/puterjs-tests.yaml

@@ -57,7 +57,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v7
         with:
-          node-version: '26'
+          node-version: '24'
           cache: 'npm'
 
       - name: Install dependencies
@@ -78,7 +78,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v7
         with:
-          node-version: '26'
+          node-version: '24'
           cache: 'npm'
 
       - name: Install dependencies
@@ -118,13 +118,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # The base branch lives in this repo; for a fork PR, the head
-          # repo's copy of it can be arbitrarily stale.
           - ref: ${{ github.base_ref }}
-            repository: ${{ github.repository }}
             artifact: base
           - ref: ${{ github.head_ref }}
-            repository: ${{ github.event.pull_request.head.repo.full_name }}
             artifact: pr
 
     steps:
@@ -133,13 +129,13 @@ jobs:
         uses: actions/checkout@v7
         with:
           ref: ${{ matrix.ref }}
-          repository: ${{ matrix.repository }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - name: Set up Node.js
         if: needs.changes.outputs.puterjs == 'true'
         uses: actions/setup-node@v7
         with:
-          node-version: '26'
+          node-version: '24'
           cache: 'npm'
 
       - name: Install dependencies
@@ -176,10 +172,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v7
 
-      # Missing when the PR leg failed; `coverage (pr)` already reports that.
       - name: Download PR coverage
-        id: pr-coverage
-        continue-on-error: true
         uses: actions/download-artifact@v8
         with:
           name: puterjs-coverage-pr
@@ -189,7 +182,6 @@ jobs:
       # base run) — then report without the comparison column.
       - name: Download base coverage
         id: base-coverage
-        if: steps.pr-coverage.outcome == 'success'
         continue-on-error: true
         uses: actions/download-artifact@v8
         with:
@@ -197,7 +189,7 @@ jobs:
           path: coverage-base
 
       - name: Report coverage on PR
-        if: steps.pr-coverage.outcome == 'success' && steps.base-coverage.outcome == 'success'
+        if: steps.base-coverage.outcome == 'success'
         uses: davelosert/vitest-coverage-report-action@v2
         with:
           name: puter.js SDK
@@ -206,7 +198,7 @@ jobs:
           json-summary-compare-path: coverage-base/coverage-summary.json
 
       - name: Report coverage on PR (no base comparison)
-        if: steps.pr-coverage.outcome == 'success' && steps.base-coverage.outcome != 'success'
+        if: steps.base-coverage.outcome != 'success'
         uses: davelosert/vitest-coverage-report-action@v2
         with:
           name: puter.js SDK

AGENTS.md

@@ -159,42 +159,13 @@ The reference has two kinds of page:
 
 An overview page answers "what is this API and is it what I need?", and a function page answers "how exactly does this call behave?". A change to one function usually only touches that function's page, so a new `kv.list()` option goes in `KV/list.md` without a matching update to `KV.md`. Don't copy a function's options, limits, or edge cases onto the overview page for completeness. Where a detail goes is a judgment call, not a hard rule: update the overview when a change affects how someone would describe the API as a whole.
 
-When you add a page, add it to [src/docs/src/sidebar.js](src/docs/src/sidebar.js) under its area, or it won't show up in the navigation.
-
-**Sidebar order.** Order the API areas in the sidebar by how often developers use them, most common first. Overview stays first and Objects stays last. Inside an area, order the pages by use too, and keep pages that make up one feature next to each other, such as `share()`, `unshare()`, `listShared()`, and `listSharedByMe()`. A group goes where its most-used page would go. A helper that only supports another function, such as `listModels()` for `chat()`, goes by its own use. Put create, list, get, update, and delete in that order, and constants such as `MAX_KEY_SIZE` last. The function list on the area's overview page uses the sidebar's order. When you add a runnable example, add its HTML to `src/docs/src/playground/examples/<slug>.html`, register the slug in [src/docs/src/examples.js](src/docs/src/examples.js), and link the code block to it by putting the slug after the language with a semicolon (` ```html;kv-set `).
-
-### Function page layout
-
-A function page opens with one sentence that says what the function does, in its own paragraph, such as "Given a prompt, generate an image using AI." Put any more detail in the paragraphs after it.
-
-After the intro, a function page has these `##` sections, in this order:
-
-1. Syntax
-2. Parameters
-3. Return value
-4. Errors, if the function has any
-5. Sections for specific topics, if the page needs them, with `## Model-specific features` last
-6. Examples
-
-[chat.md](src/docs/src/AI/chat.md) follows this layout.
-
-- **Options as a table.** Document an options object as a table with Option, Type, and Description columns. Give each option its own row, even when two options go together, such as `width` and `height`. Order the rows by how often developers use them, most common first, without group rows. In chat.md that's the core options, then reasoning, tools, response handling, request control, and output.
-- **Common options in the table, model-specific behavior in its own section.** A page whose function works with many models or providers, such as [chat.md](src/docs/src/AI/chat.md) and [txt2img.md](src/docs/src/AI/txt2img.md), splits its options this way:
-  - **The options table** under Parameters lists the options that work with every model, and describes each one the way it works for every model.
-  - **`## Model-specific features`**, the last section before Examples, covers everything else. It has a `###` for each model family or provider, named after it, such as "OpenAI models" or "Cloudflare models". Under it go the options only some models accept, and the common options a model handles differently, such as a narrower range, other allowed values, or an option it ignores.
-  - **Write there only what's different.** A `###` lists an option only when that model or provider adds it or handles it differently. An option that works the same everywhere stays out, even if the provider supports it, and a model or provider with nothing different gets no `###`.
-  - **Model-specific features is the only place for model-specific details.** Every limit, format, allowed value, default, price, or quirk that applies to some models goes there, in that model's or provider's `###`, and nowhere else. The options table and topic sections (such as Image inputs or Video input) describe what's true for every model and link to Model-specific features for the rest. Don't add a table or sentence there that compares providers or repeats a model's limits. Each copy is another source of truth to keep in sync, and copies drift when a model changes.
-  - **Link the two.** Directly under the options table, put `Some models accept additional options or handle these options differently. See [Model-specific features](#model-specific-features).` A row whose option behaves differently on some models can also end with `See [Model-specific features](#model-specific-features).`
-- **A long topic gets its own `##` section.** When explaining an option or feature takes more than a sentence or two, such as function calling or output dimensions, give it a section between Errors and Examples and link to it from the options table. This keeps the reference sections short.
-- **Usage patterns are examples.** A way of using the API, such as stopping a stream, goes in a runnable example that the relevant section links to ("See the [stop a stream example](/playground/ai-chat-stop-stream/)."), not in a section of its own.
-- **Each example has a `###` heading** under `## Examples`, so every example shows in the table of contents.
+When you add a page, add it to [src/docs/src/sidebar.js](src/docs/src/sidebar.js) under its area, or it won't show up in the navigation. When you add a runnable example, add its HTML to `src/docs/src/playground/examples/<slug>.html`, register the slug in [src/docs/src/examples.js](src/docs/src/examples.js), and link the code block to it by putting the slug after the language with a semicolon (` ```html;kv-set `).
 
 ### Writing docs
 
 These apply to reference pages and recipes alike.
 
 - **Document the developer-facing side only.** The reader is building on top of puter.js, so cover what affects their code: signatures, defaults, return shapes, errors, limits, and behavior they can observe. Leave out internal workings (which service handles the call, storage layout, caching, retries) unless they change what the developer has to do. [rate-limits-and-quotas.md](src/docs/src/rate-limits-and-quotas.md) is the exception: it publishes every limit, including timeouts and caps that come from how the backend works.
-- **Document Puter as it runs on puter.com.** The docs are for developers building on production Puter. Leave out behavior that only happens on a self-hosted or differently configured server, such as a provider that isn't set up there.
 - **Describe the current state.** Docs aren't a changelog. Write how the API behaves now, without "now", "no longer", "existing code is unaffected", or other wording that compares it to an older version.
 - **Verify before you document.** Run the calls you describe against a running Puter instead of inferring behavior from the source.
 - **Write plainly.** Use the literal words a developer would say out loud, with contractions and everyday words. No idioms or figurative verbs ("walk away from something shared with you" → "remove your own access", "nothing to page through" → "without pagination"). No formal register ("present only while more pages remain" → "includes a `cursor` if there are more pages to load"). Prefer dev terms such as atomic, concurrent, and insertion order.
@@ -202,7 +173,6 @@ These apply to reference pages and recipes alike.
 - **Describe behavior directly.** No quoted inner-voice phrases. Write "`isNew` is `true` when the person did not have access before", not "this tells 'I just gave this to someone' from 'they already had it'".
 - **Keep references easy to follow.** Name what a list or code block belongs to in the sentence directly above it. Name a thing once and keep that name. Introduce an actor as "a user" before giving them a role: "A user can create a team. The user who creates the team becomes its owner."
 - **Sentence mechanics.** Never start a sentence with inline code: write "To store data, use the [`set()`](/KV/set/) method." Link every inline mention of an API to its page, every time. No em dashes, and no colons or semicolons mid-sentence; a colon that introduces a code block is fine.
-- **No `##` or `###` headings inside tabs.** The table of contents lists every `##` and `###` heading on the page, including the ones in a hidden tab (an `example-content` block switched by the `example-group` pills), so its links lead to content the reader can't see. Put the heading above the tabs, or use `####` inside a tab, which the table of contents skips.
 - **Show the correct way.** No "don't" and no wrong-way-first examples, in recipes and playground examples alike. Mention a wrong approach only when developers already hit it in practice, and state how it fails as a fact: "`add()` reads a plain object as a path map, so the call rejects with …".
 
 ### Recipes
@@ -214,12 +184,10 @@ Recipes are tested, copy-pasteable patterns for a task, one layer above the per-
 - **Description.** Written for someone who has never heard of Puter. Start with "Learn how to", put the action first, and say what the reader's app gains: "Learn how to add file sharing to your app with Puter.js, so users can share files in their Puter account with other people." No API names, no mechanism, no list of example cases, and no "not just …" contrast.
 - **Intro.** Explain the situation and why you'd do this, tied to something the reader already knows ("`puter.kv` is your database in Puter.js"). No "Use this when" bullet list.
 - **Structure.** Get to the first working call as early as possible, then add validation, rate limits, and sign-in after it. Explain a Puter concept the first time it appears, such as what `me.puter` is or that `puter.workers.exec()` opens the Puter sign-in window. Split recipes by what the reader needs, not by technique, and give a family of recipes a shared tag.
-- **Reading order.** A recipe reads top to bottom. Each code block uses only functions and variables from blocks above it, so the reader never has to search further down the page to understand it. Start with a small version that works, and have each section add one case. When a section changes a function from earlier, show the whole new version of that function there. If the code is built up over several sections, end with a `## Full Code` block that has all of it.
 - **Link to the reference for full option lists.** Mention only the options the recipe uses, then link to the function page for the rest ("All the sort options are listed on [`puter.fs.readdir()`](/FS/readdir/)."). A copied list of options, rules, or scopes goes stale when the reference changes.
-- **Limits.** Mention a limit only when it's the reason for a pattern the recipe uses, such as one wildcard subscription instead of one per key, and link to [rate-limits-and-quotas.md](src/docs/src/rate-limits-and-quotas.md) or the function page for the number. Leave out limits that code following the recipe never reaches.
 - **Code.** Platform-neutral: just the code, with top-level `await`. No `<script>` or `<html>` wrapper, no IIFE.
 - **Tradeoffs.** Justify a choice with one scenario the reader can picture right away, in about two short paragraphs, or fold each point into the section where it matters. The description states the benefit only.
-- **Notes.** Leave out `## Notes` by default. Use it only to point to an architecturally different approach. A limit the recipe needs goes in the section it applies to, and other facts belong on the linked reference page.
+- **Notes.** Leave out `## Notes` by default. Use it only to point to an architecturally different approach. A limit goes in the section it applies to; other facts belong on the linked reference page.
 
 ---
 
@@ -231,6 +199,6 @@ Recipes are tested, copy-pasteable patterns for a task, one layer above the per-
 
 - **Reuse existing UI primitives before writing new ones.** Windows and dialogs are `UIWindow*` functions in [src/gui/src/UI/](src/gui/src/UI/); generic pieces already exist (`UIAlert`, `UIPrompt`, `UIContextMenu`, `UINotification`, `UIPopover`, widgets in [UI/Components/](src/gui/src/UI/Components/)). A new window should read like its neighbors: an async function taking an options object, composing an HTML string, wiring behavior with jQuery, delegating to `UIWindow(...)`.
 - **Match the visual language.** Use existing CSS classes (`button`, `button-primary`, window chrome, form styles) and copy the layout patterns of neighboring windows; new styles go in [src/gui/src/css/](src/gui/src/css/) following existing conventions. Verify anything positional (menus, overlays, z-index) on both desktop and mobile viewports.
-- **i18n every user-facing string.** No hardcoded UI text — use `i18n('key')` and add the key to [src/gui/src/i18n/translations/en.js](src/gui/src/i18n/translations/en.js).
+- **i18n every user-facing string.** No hardcoded UI text — use `i18n('key')` and add the key to [src/gui/src/i18n/translations/en.js](src/gui/src/i18n/translations/en.js). Run `npm run check-translations` before opening the PR.
 - **Shared logic goes in helpers/services.** Reusable non-UI logic belongs in [src/gui/src/helpers/](src/gui/src/helpers/) or [src/gui/src/services/](src/gui/src/services/), not copy-pasted between windows.
 - **Tests.** Vitest is wired for the GUI (`src/**/*.test.js`; see [appOrder.test.js](src/gui/src/UI/Dashboard/appOrder.test.js) for the shape). Extract pure logic into functions and test those. Desktop behavior driven through puter.js (`puter.ui.*`) is covered by the Playwright harness in [src/puter-js/tests/e2e/](src/puter-js/tests/e2e/) — add a spec there when you change how the desktop renders SDK-driven UI.

BUG-BOUNTY.md

@@ -17,21 +17,6 @@ Out-of-scope:
 - Denial of Service (DoS), spam, or volumetric attacks.
 - Physical security issues.
 
-## Eligibility
-
-We pay bounties for issues that threaten user security and privacy, or the security and health of the platform. We appreciate every report, but hardening suggestions and correctness bugs are not eligible, even when we fix them. Please open a GitHub issue for those.
-
-A report must show how an attacker can directly perform the action against another account or the system. It is not eligible if it:
-
-- Starts from access the attacker should not already have: a stolen session or token, the victim's password, a root or full-access token, or script execution on `puter.com`.
-- Needs the victim to do more than ordinary use (opening a link or an app), such as publishing their own secrets, sending a verification link to an address they don't control, or approving a prompt that accurately states what it grants.
-- Gives the attacker nothing they couldn't already get through a supported API.
-- Only reproduces in a non-default or development setup (SQLite, a `custom` OIDC provider, an unset outbound proxy, cookies or config planted by hand). Findings in the open-source code must affect `puter.com` or a default self-hosted install.
-
-**Shared state.** Sharing files, KV entries, or cross-app KV access means the sharer trusts the sharee. Exploits that depend on that trust, such as a sharee misusing access the sharer granted, may be treated as hardening or lower severity.
-
-Hardening we ship in a public PR does not make similar code paths vulnerabilities. They are judged by these same rules.
-
 ## Known Non-Issues (Please Check Before Submitting)
 
 The following have already been reviewed and determined **not to be vulnerabilities**. Reports that only re-describe one of these are **not eligible for a reward** and will be closed as non-issues — even if they include new code references. Please review this list before submitting:
@@ -40,14 +25,13 @@ The following have already been reviewed and determined **not to be vulnerabilit
 - **SSRF via `secureFetch`.** Production routes outbound requests through an isolated proxy that has no access to internal/SSRF-sensitive resources.
 - **Attacks that depend on guessing an `appInstanceID` or app UID.** These are random 128-bit secret values and are not considered guessable.
 - **Apps invoking drivers, creating workers, or using KV.** Applications are intended to do this; worker permissions are scoped to the owning app. This is by design.
-- **App metadata or app user-count "leaks".** This information is currently public by design. This covers **private apps** too: private apps are an unreleased, admin-only beta for paid listings in the Puter App Center. Their `index_url` and other metadata are not secret, the flag is not user-settable, and no production app relies on it. Reports that a private app's metadata is reachable through a sibling route (`/get-launch-apps`, `index_url` drift on the hosting gate, etc.) are normalization work, not vulnerabilities.
+- **App metadata or app user-count "leaks".** This information is currently public by design. This covers **private apps** too: private apps are an unreleased, admin-only beta for paid listings in the Puter App Center. Their `index_url` and other metadata are not secret, the flag is not user-settable, and no production app relies on it. Reports that a private app's metadata is reachable through a sibling route (taskbar items, `/get-launch-apps`, `index_url` drift on the hosting gate, etc.) are normalization work, not vulnerabilities.
 - **Worker hot-reload driven by a share recipient.** Sharing a worker's source file with write access is how you let a collaborator change that worker's code and have it deploy live. The redeploy running as the file owner, with the owner's worker credentials, is the intended behavior of that grant — the owner chose to hand out write access to executable code. If you do not want that, do not share the source file with write access.
-- **Re-claiming a site or worker name its owner deleted.** A hosted site or worker name that its owner deletes is treated as abandoned by that owner. If one of their apps still points at it, whoever claims the name next serves that app's `index_url` and receives what the app is launched with, and a new app on the same origin may share the old one's identity. Guarding app identities against being recycled this way is ongoing hardening, not a security boundary, so new ways to re-claim an abandoned name, or to inherit an app's tokens or data through one, are not eligible.
 - **Share-mode downgrades that do not cascade.** Demoting a delegate does not retroactively revoke the grants that delegate already issued downstream. Shares are independent grants once issued, not a live-evaluated chain. Revoking the downstream grant is a separate, supported action.
-- **Metering, credit-hold, and quota inaccuracies.** Credit holds and quota checks are up-front estimates, and actual usage is billed afterwards. Overspend that is bounded and still billed is a correctness bug, including concurrent requests that exceed a hold or quota by some margin; the per-account concurrency and rate-limit gates are the control we rely on. Report these only if you can use a service without it being billed, or overspend without bound.
-- **Existence-only oracles.** A response that tells "exists but forbidden" apart from "not found" for a path or ID the caller already supplied, without revealing anything else about it, is hardening.
+- **Concurrency / TOCTOU overspend of credits or storage quota.** Firing concurrent requests to exceed an AI credit hold or a storage quota by some margin is known and accepted; the per-account concurrency and rate-limit gates are the control we rely on, and the residual overage is bounded and billed. Report these only if you can demonstrate _unbounded_ overspend.
 - **Session and credential lifecycle around 2FA enrollment.** Enrolling in 2FA is not a credential-revocation event: existing authenticated sessions stay valid, and outstanding password-reset links stay valid. Likewise, account-management actions behind the `/user-protected/*` gate are password-gated by design, not TOTP-gated. A recovery code that stops being accepted fails _closed_ — it denies access rather than granting it, so it is a bug report, not a vulnerability.
 - **Group permissions** (`/auth/revoke-user-group` and siblings). The group-permission surface is unfinished and not exposed anywhere in the product. Findings there are not reachable by any user.
+- **Correctness bugs with no security boundary crossed.** For example, an API that reports success while silently leaving data behind. We want these reported — please open a GitHub issue — but they are not bounty-eligible.
 - **Missing Subresource Integrity (SRI) on external scripts/styles.** Accepted as hardening, not as a vulnerability, absent a demonstrated compromise of the CDN in question.
 - **General "token in a URL" / token-lifetime / token-storage designs** — signed directory URLs exposing children, a write signature implying read, app tokens outliving a web session, or the session token being held in `localStorage` on `puter.com`. These are current intended behaviors. Shorter-lived tokens with a refresh flow are on the roadmap; their absence is not a vulnerability on its own. Show a reproducible attack that does not already presuppose script execution on `puter.com`.
 - **Missing PKCE, unverified `id_token` signatures, or other OIDC hardening.** Provider tokens are obtained through a server-to-server authorization-code exchange with the provider's token endpoint over TLS, so the resulting `id_token` / userinfo claims are trusted from that channel rather than from local JWKS signature verification — the callback never accepts a caller-supplied `id_token`. Adding local signature / `aud` / `iss` / `exp` checks is welcome defense-in-depth (please open a GitHub issue/PR), but their absence is not an account-takeover vector on its own.
@@ -68,7 +52,7 @@ To participate, you must:
 3. **Respect availability**: Do not perform denial-of-service attacks or automated scans that degrade service.
 4. **Follow disclosure policy**: Do not publicly disclose vulnerabilities until we have confirmed and patched the issue.
 5. **Act in good faith**: Make every effort to avoid privacy violations, destruction of data, and interruption or degradation of services.
-6. **Check Eligibility and Known Non-Issues**: Reports that fall outside "Eligibility" or match an item in "Known Non-Issues" above are not eligible and will be closed.
+6. **Check the Known Non-Issues list**: Reports matching an item in the "Known Non-Issues" section above are not eligible and will be closed.
 
 Reports that do not meet these guidelines may not be eligible for a reward.
 
@@ -79,14 +63,14 @@ Reports **MUST** demonstrate a **working, reproducible exploit with real impact*
 - Exact steps to reproduce, the relevant request/response or code path, and the commit or version you tested.
 - The **observed** result versus the **expected** result.
 - For client-side, UI, or authentication-flow bugs: a short screen recording (≤ 2 minutes) showing the exploit working end-to-end on a real Puter instance.
-- For server-side bugs: a runnable proof-of-concept and screenshot or video showing the attack process. A unit test or in-process harness alone does not count; show it against a running instance.
+- For server-side bugs: a runnable proof-of-concept and screenshot or video showing the attack process.
 
 Reports based solely on reading the source ("source review only, not tested") or unverified AI/LLM-generated reports are the **lowest triage priority and not eligible for bounty**.
-If you used an AI tool to help find an issue, you must personally verify that it actually reproduces before submitting. Reports sent by automated agents are not eligible.
+If you used an AI tool to help find an issue, you must personally verify that it actually reproduces before submitting.
 
 Please submit **one issue per report**.
-Bundled "audit packs" of many speculative findings will not be eligible for bounty; send each confirmed issue separately.
-Additionally please **DO NOT** submit too many issues at once; these will be treated as a bundled report, and will not be eligible for bounty.
+Bundled "audit packs" of many speculative findings will not be elligible for bounty; send each confirmed issue separately.
+Additionally please **DO NOT** submit too many issues at once; these will be treated as a bundled report, and will not be elligible for bounty.
 
 ## Reporting Process
 
@@ -99,8 +83,6 @@ Include:
 - Suggested remediation (if available)
 - Paypal id where we can send the bounty (if eligible)
 
-Send the full report in your first email. We don't reply to messages that only ask whether we run a bounty or where to report.
-
 We aim to acknowledge receipt within **72 hours** and provide a resolution timeline.
 
 ## Reward Structure
@@ -113,7 +95,7 @@ We offer monetary rewards based on the severity of the vulnerability, as determi
 - **Low: \$50 – \$100**
 
 Non-security issues, suggestions, and best practices feedback are always welcome, but may not qualify for a reward.
-If multiple researchers report the same issue, the bounty will be awarded to the first eligible report we receive. Issues we already know about, from internal review, an open ticket, or a fix already in a public commit or PR, count as duplicates.
+If multiple researchers report the same issue, the bounty will be awarded to the first eligible report we receive.
 
 ## Payments Disclaimer
 

CLAUDE.md

@@ -1 +1 @@
-FOLLOW @AGENTS.md
+FOLLOW ./AGENTS.md

Dockerfile

@@ -14,7 +14,7 @@
 # config.default.json, so partial overrides work. Absent file = defaults.
 
 # ---- Build stage ----
-FROM node:26-bookworm-slim AS build
+FROM node:24-slim AS build
 
 WORKDIR /opt/puter
 
@@ -59,7 +59,7 @@ RUN set -e; \
     wait $pjs_pid
 
 # ---- Runtime stage (slim — no build tools) ----
-FROM node:26-bookworm-slim
+FROM node:24-slim
 
 WORKDIR /opt/puter
 
@@ -73,12 +73,6 @@ COPY --from=build --chown=node:node /opt/puter .
 RUN mkdir -p /etc/puter /var/puter && \
     chown -R node:node /etc/puter /var/puter
 
-# Fix outdated HOME_URL in /etc/os-release (see issue #4329)
-# The base image may contain a reference to the old phoenix repository.
-RUN if [ -f /etc/os-release ]; then \
-      sed -i 's|HOME_URL="https://github.com/HeyPuter/phoenix"|HOME_URL="https://github.com/HeyPuter/puter"|' /etc/os-release; \
-    fi
-
 # Self-hosters mount their override at this exact path. The v2 loader
 # deep-merges it over config.default.json (see backend/index.ts).
 ENV PUTER_CONFIG_PATH=/etc/puter/config.json
@@ -93,4 +87,4 @@ USER node
 HEALTHCHECK --interval=30s --timeout=3s --start-period=30s --retries=3 \
     CMD wget --no-verbose --tries=1 --spider http://puter.localhost:4100/test || exit 1
 
-CMD ["node", "-r", "./dist/src/backend/telemetry.js", "./dist/src/backend/index.js"]
+CMD ["node", "-r", "./dist/src/backend/telemetry.js", "./dist/src/backend/index.js"]

config.template.jsonc

@@ -7,8 +7,9 @@
     // Each setting lives at exactly one canonical key — there are no fallback
     // aliases. Values shown are illustrative, not production secrets.
     //
-    // Keys consumed only by closed-source / hosted-prod extensions are
-    // intentionally omitted.
+    // Keys consumed only by closed-source / hosted-prod extensions (clickhouse,
+    // cacheUpdateHandler, pages, prodMeteringAndBilling, …) are intentionally
+    // omitted.
 
     // ── Environment / identity ──────────────────────────────────────────
     "config_name": "template",
@@ -34,7 +35,7 @@
     // Idle keep-alive timeout in ms. Must stay above the idle timeout of any
     // proxy in front, or the proxy reuses connections this server has closed
     // and its clients see 502s.
-    "keep_alive_timeout": 920000,
+    "keep_alive_timeout": 620000,
     "protocol": "http",
     "domain": "puter.localhost",
     // Fully-qualified externally-visible URL. Computed from protocol/domain/
@@ -215,9 +216,7 @@
         // "bootstrapTables": true,
         "path": "",
         // Credentials. NOTE: snake_case here, unlike `s3.s3Config` below.
-        // For dynamodb-local, any non-empty values work. On AWS,
-        // `"useCredentialChain": true` uses the default credential chain
-        // instead of keys.
+        // For dynamodb-local, any non-empty values work.
         "aws": {
             "access_key": "",
             "secret_key": "",
@@ -315,8 +314,7 @@
     // The tables ship either way and sit inert; this gates whether `/teams`
     // is registered at all, so with it off the paths do not exist rather than
     // existing and refusing. It is also the backout: turning it off removes
-    // the feature without touching data. Teams ships as an extension; on,
-    // the server refuses to boot unless one registers it.
+    // the feature without touching data.
     "teams_enabled": false,
     //
     // Live teams one user may own. Soft-deleted ones do not count, so
@@ -350,9 +348,6 @@
     // not, a row past this is swept. Off by default; any value above 0 arms
     // the sweep.
     // "notificationRetentionDays": 14,
-    //
-    // Ms a live notification waits for open tabs to acknowledge it.
-    // "notificationAckTimeoutMs": 5000,
 
     // ── Alarms / alerting ───────────────────────────────────────────────
     // Where system alarms go. Severity is the routing decision — each
@@ -436,8 +431,6 @@
         "mistral": { "apiKey": "" },
         "xai": { "apiKey": "" },
         "moonshot": { "apiKey": "" },
-        // MiniMax. One key powers chat and video generation (H3, Hailuo);
-        // video calls go to the same host, beside the chat API's `/v1`.
         "minimax": {
             "apiKey": "",
             "apiBaseUrl": "https://api.minimax.io/v1"
@@ -458,10 +451,6 @@
             "apiKey": "",
             "apiBaseUrl": "https://ark.ap-southeast.bytepluses.com/api/v3"
         },
-        // Kling AI. One API key (not the legacy AccessKey/SecretKey pair)
-        // powers video generation, image generation and TTS; `apiBaseUrl`
-        // defaults to https://api-singapore.klingai.com.
-        "kling": { "apiKey": "" },
         "zai": { "apiKey": "" },
         "alibaba": { "apiKey": "" },
         "hoonify": {
@@ -500,8 +489,6 @@
             "defaultVoiceId": "",
             "speechToSpeechModelId": ""
         },
-        // Both AWS providers also take `"useCredentialChain": true` in place
-        // of keys, like `dynamo.aws`.
         "aws-polly": {
             "access_key": "",
             "secret_key": "",

doc/contributing-apis.md

@@ -45,12 +45,6 @@ Both are supported ways to define an API. **Prefer a controller when you need fi
 - **A specific verified factor:** `requireVerified` (email, and only under `strict_email_verification_required`), `requirePhoneVerified`, `requireCardVerified`. Opt-in, and the factor must actually have been verified, unlike the default-on gate that turns away accounts still carrying a pending verification the abuse harness asked for. `requireAnyVerified: ['phone', 'card']` is the OR of the last two: any listed factor verified at any point passes, as does a paid plan when `card` is listed (a paying account already has a card on file). Otherwise only the factors the deployment can verify are asked for (an SMS provider configured, a card gate an extension reports on); with none verifiable the gate is inert rather than locking the route on a self-hosted install. A denial carries the first verifiable factor's code plus `factors` (the verifiable ones, in the route's order), so a client can lead with one flow and offer the other. `verifiedFactorGate.enabled: false` in config stops every declared gate at once, e.g. during an SMS-provider outage.
 - **Metered spend:** an endpoint that spends metered resources on the caller's behalf (moving file content, object-store requests, anything else the account is billed for) declares `requireCredits: true`, which turns an account with no budget left away with a 402 before the handler runs. Endpoints that only describe or delete things deliberately don't: an account that has run out still has to see what it has, clear it, and reach its billing pages. Drivers have no route options, so they call `assertActorHasCredits` themselves ([src/backend/services/metering/enforcement.ts](../src/backend/services/metering/enforcement.ts)) — see `KVStoreDriver`, which does it once for every method.
 
-Provider sign-in requires the account's authenticator or a recovery code when 2FA is enabled, including signup callbacks that resolve an existing account. The five-minute challenge uses the same single-use `/login/otp` and `/login/recovery-code` verification as password sign-in. The GUI carries it in a URL fragment and removes it before initialization. A session and successful popup-return proof are issued only after verification; cancelling retains the popup's signed retry context without marking it authenticated.
-
-Disabling 2FA through `/user-protected/disable-2fa` requires both password or OIDC revalidation and either the current six-digit authenticator `code` or an unused recovery code in `code`. Recovery codes are consumed atomically. Missing or incorrect codes leave the secret and remaining recovery codes intact. A team's requirement for 2FA still prevents disabling it.
-
-Email changes through `/user-protected/change-email` require the password or OIDC revalidation cookie, plus a six-digit `code` from the authenticator when 2FA is enabled. Missing or malformed codes return `400 bad_request`; incorrect codes return `401 code_mismatch`. Both include `factor: 'otp'`. Confirmation links are bound to that verified request. A 2FA-enabled account must request a new link if its existing link was issued without second-factor verification.
-
 ### 3. puter.js
 
 - Add the method to the matching module in [src/puter-js/src/modules/](../src/puter-js/src/modules/), matching the calling conventions of its siblings (promise-returning; positional shortcut plus options form where that's the local pattern).

doc/embedding-app-browser.md

@@ -1,365 +0,0 @@
-# Embedded app browser
-
-`GET /embed/apps` on the deployment's main GUI origin renders the same app browser
-as the dashboard's Apps tab, without the desktop or dashboard navigation.
-
-It supports search, paging, saved folders, and saved ordering. It uses the same
-installed-app and recommendation data as the dashboard, including the user's
-removed recommendations. Editing, adding, reordering, renaming, and uninstalling
-are disabled. Selecting an app opens it in a new browser tab at its own URL, the
-same way the dashboard does, and the host page stays open. The app's token isn't
-put in the URL: the app's SDK asks the embed for it once the tab loads, so the
-embed must still be open then. If the iframe is removed first, the app falls back
-to its normal sign-in. Apps that need the desktop (built-in and godmode apps,
-private apps the user can't open, or a failed token request) open `/app/<name>`
-on the GUI origin, cut off from the embed. Website shortcuts open their external
-destination with no opener.
-The embed follows the OS's light or dark setting. A host with a fixed theme adds
-`theme=dark` or `theme=light` to the fragment (`#user=<uuid>&theme=dark`), since
-Chromium doesn't pass an iframe's `color-scheme` on to the page inside it.
-Apps opened from the embed carry `utm_source=puter.com&utm_medium=referral&utm_campaign=app_browser_embed`;
-the desktop and dashboard send `utm_campaign=desktop` and `utm_campaign=dashboard`.
-
-## Session and framing
-
-The embed shows the GUI session only to the user the host page is signed in as.
-The host names that user's `uuid` (from `puter.auth.getUser()`) in the iframe
-URL's fragment, as `/embed/apps#user=<uuid>`. The embed reads the session, asks
-`/whoami` which user it belongs to, and shows the signed-out view unless the two
-match. So a host that names no user, a malformed one, or a user other than the
-session's, gets the signed-out view, and so does a session the API refuses. A
-failed `/whoami` check shows the error state. The fragment never reaches the
-server and can only narrow what the embed shows: naming the session's own user
-gives the same view as a direct visit to the GUI. Changing the fragment of a
-loaded embed reloads it.
-
-The embed reads the existing GUI session from local storage on its own origin.
-If that storage holds no session, the embed gets the session from the GUI origin's session cookie through
-`/get-gui-token`. This matters in Safari, which gives a framed origin separate
-local storage under each top-level origin, so even a sibling subdomain's iframe
-can't see the GUI's stored token. The session cookie is still sent, because the
-host is on the same site. The embed doesn't write that token back to storage. It
-does not create accounts, show a login dialog, or accept a token from its parent.
-Being signed in on a subdomain alone does not create a session on the main GUI
-origin.
-
-Without a session it can show, the embed shows the recommended apps (`RecommendedAppsService`)
-that the server put in the page, and nothing else: no installed apps, folders, or
-saved order, and no puter.js. Selecting one opens it at the same URL a signed-in
-launch uses, with no opener and no token on offer, so the app signs in on its own.
-Apps that need the desktop open `/app/<name>`. If the page carries no recommended
-apps, or a load fails, the embed displays an unavailable/error state.
-
-The route's `Content-Security-Policy: frame-ancestors` allows the GUI origin and
-the embedding page's origin when it is exactly one label under `config.domain`
-with the scheme and port from `config.origin`. Subdomains the server answers
-itself (`api`, `dav`, `js`, `www`, the native-app hosts, and the host of
-`api_base_url`) and the user-content hosting domains (`static_hosting_domain`,
-`private_app_hosting_domain`, and their `_alt` variants) are refused. For
-example, `https://puter.com` permits `https://spreadsheet.puter.com` but not
-`https://api.puter.com`, and `http://puter.localhost:4100` permits
-`http://spreadsheet.puter.localhost:4100` but not
-`http://someone.site.puter.localhost:4100`. The embedding page is read from the
-iframe request's referrer, so the host must not suppress it (the browser default
-`strict-origin-when-cross-origin` is enough). All ancestors in a nested iframe
-chain must be allowed. Other GUI routes retain `X-Frame-Options: SAMEORIGIN`.
-
-The embed accepts no query parameters. Requests with a query string redirect to
-the same embed path so SDK bootstrap parameters cannot override the session or API
-origin. The host needs to allow the GUI origin in its own `frame-src` CSP if it
-sets one. If sandboxing the iframe, allow scripts, same-origin storage, popups,
-and popups to escape the sandbox.
-
-## Host integration
-
-A first-party app that signs in with puter.js can place `<puter-user-menu>` from
-the SDK in its header instead (see `src/puter-js/src/ui/components.md`). It opens
-this embed with the signed-in user named and closes it when the app's sign-in
-changes. The rest of this section is for a host that builds the iframe itself.
-
-The iframe can be shown whether or not the user is signed in. Create it when
-“More apps” is opened, naming the signed-in user in its fragment, and remove it
-on close so reopening loads current apps and preferences. Remove it when the
-host's own sign-in changes too, such as on sign-out, so an open embed doesn't
-keep the previous user. The host owns the modal and close control;
-there is no parent messaging API and no app list or credential is sent to it.
-The app browser fills its iframe and responds to its size. It shows a spinner until its apps load.
-
-This example assumes `puterOrigin` comes from the host app's deployment
-settings. Translate the button and frame labels using the host app's
-localization system.
-
-```html
-<button id="more-apps" type="button">More apps</button>
-<dialog id="apps-dialog" aria-label="More apps">
-  <button id="close-apps" type="button">Close</button>
-  <div id="apps-frame"></div>
-</dialog>
-<style>
-  #apps-dialog { padding: 12px; width: min(900px, 90vw); }
-  #apps-frame iframe { width: 100%; height: min(650px, 75vh); border: 0; }
-</style>
-<script type="module">
-  const puterOrigin = 'https://puter.com'; // Use this deployment's configured origin.
-  const dialog = document.querySelector('#apps-dialog');
-  const container = document.querySelector('#apps-frame');
-  const trigger = document.querySelector('#more-apps');
-
-  trigger.addEventListener('click', async () => {
-    const url = new URL('/embed/apps', puterOrigin);
-    // Signed out, the embed shows the recommended apps.
-    const user = puter.auth.isSignedIn() ? await puter.auth.getUser().catch(() => null) : null;
-    if (user) url.hash = `user=${encodeURIComponent(user.uuid)}`;
-    const frame = document.createElement('iframe');
-    frame.title = 'Your apps';
-    frame.src = url.href;
-    container.replaceChildren(frame);
-    dialog.showModal();
-  });
-  document.querySelector('#close-apps').addEventListener('click', () => dialog.close());
-  dialog.addEventListener('close', () => {
-    container.replaceChildren();
-    trigger.focus();
-  });
-</script>
-```
-
-## Implementation
-
-`createAppBrowser` in `src/gui/src/UI/Dashboard/AppBrowser.js` owns the shared UI
-and data behavior; its `guestApps` option is the signed-out list. `TabApps.js`
-injects desktop actions. `appsEmbed.js` supplies new-tab launching through
-`launchAppInTab` (signed in) and `guestAppLaunchUrl` (signed out) in
-`src/gui/src/helpers/appTabLaunch.js`, which build the same app URL as
-`launch_app`, and loads only the embed entry, its SDK, and shared styles. `embedHostUser` in
-`src/gui/src/helpers/embedHostUser.js` reads the host's user from the fragment, and
-`embedHostTheme.js` beside it applies the host's theme.
-The normal GUI webpack build emits `bundle.min.js`, `apps-embed.min.js`, and `feedback-embed.min.js`.
-The `/embed/apps` route puts the recommended list in the page's config as
-`guestApps`. No puter.js API or app-list endpoint changes are needed.
-
-## Feedback dialog
-
-`GET /embed/feedback` is the app feedback dialog (`puter.ui.showFeedbackDialog()`)
-for a first-party page, with the same framing rules, query redirect, and
-host-user binding as `/embed/apps`. It sends the feedback for the framing
-page's origin, which the server reads from the referrer and pins with
-`frame-ancestors`; opened top-level, it does nothing. Its page is transparent
-so the dialog's own scrim covers the host.
-
-puter.js uses it on a page one label under the GUI origin, other than the
-subdomains the server refuses, when the page is signed in, framing it in a
-modal `<dialog>` that stays hidden until the embed is ready. A session check that takes longer than 200ms shows a loading scrim
-with a spinner in its place; Escape or a click on it cancels. The embed posts `{ msg: 'feedbackEmbed', state }` to its parent
-(`loading`, then `ready` or `unavailable`) and finally
-`{ msg: 'feedbackDialogClosed', sent }`. It reports `unavailable` without the
-named user's session, or while that user's email still needs confirming, and
-puter.js then uses the `/action/send-feedback` popup, which can sign in. So does
-a frame that never answers, such as one the host's CSP blocks. `feedbackEmbed.js`
-is the entry, sharing `embedSession` in `src/gui/src/helpers/embedSession.js`
-with the app browser; `showFeedbackEmbed` in `src/puter-js/src/lib/guiEmbed.js`
-is the host side.
-
-## Sign-in and file pickers
-
-`GET /embed/sign-in`, `/embed/show-open-file-picker`, `/embed/show-save-file-picker`
-and `/embed/show-directory-picker` serve the same GUI popups as `/action/<action>`
-for a first-party page, with the same framing rules, query redirect, and
-`no-store` as `/embed/apps`. Any other spelling of the path (another case, a
-trailing slash) redirects to it, since the shell boots the desktop for it. They render the normal GUI shell, which names the
-framing page (read from the referrer, pinned with `frame-ancestors`) as
-`gui_params.embed_host_origin`. The GUI then runs the popup boot unchanged, with
-the framing page as `window.opener`, and `window.close()` asks the page to
-remove the frame (`src/gui/src/helpers/popupFrame.js`). Without a framing page
-to answer (opened top-level, or framed by a refused page) it does nothing. The
-popup's parameters come from the fragment instead of the query: `msg_id`,
-`options` and `request_auth`, plus `user` for a picker.
-
-The frame posts `{ msg: 'puterPopupFrame', state }` to its parent: `loading` as
-soon as the shell boots, `ready` once it shows a window or dialog, `unavailable`
-when the page has to use the popup, `provider` when the user picks a sign-in
-provider (below), and `closed` where a popup would close. Its
-answers (`puter.token`, `fileOpenPicked`, `directoryPicked`, `fileSaved`, the
-cancel messages, `sendMeFileData`) are the popup's.
-
-puter.js uses them on a page one label under the GUI origin, other than the
-subdomains the server refuses, unless the page is cross-origin isolated or in a
-frame of another site (which `frame-ancestors` refuses too).
-`showPopupFrame` in `src/puter-js/src/lib/guiEmbed.js` shows the frame in a box
-the size of the popup window, over a scrim, hidden until `ready` and behind the
-loading spinner after 200ms. Escape closes it, on the page or in the frame. One shows per popup, as each
-popup has its own window name: a second picker request of the same kind
-replaces the one showing, and a `signIn()` call made while a framed sign-in is
-open settles with it. On
-screens up to 600px wide the box fills the screen. A frame that is refused,
-never answers, or reports `unavailable` falls back to the popup, opened through
-a consent dialog when the click that asked for it has expired. A reload or navigation the frame
-starts itself (logging out, a sign-out in another tab) names the frame as its
-referrer, so the server refuses it; the page then shows its spinner and opens
-the frame again, once per `ready`.
-
-- **Sign-in** (`puter.auth.signIn()`) has no host-user binding: it is how the
-  page gets a user. The box has a close button, which rejects with
-  `auth_window_closed` as closing the popup does. Providers refuse to be
-  framed, so choosing one posts `{ state: 'provider', url }` with the
-  provider's start URL for this sign-in's `msg_id`, then `unavailable`. The
-  page opens the popup straight at that URL, once it checks the URL is the
-  GUI's `/auth/oidc/<provider>/start` for this `msg_id`, and the provider
-  returns it as this sign-in's popup. `attempt_temp_user_creation` keeps the popup, since
-  only the popup creates a temporary account.
-- **Pickers** frame only for a signed-in page. The GUI reports `unavailable`
-  unless its session belongs to the user named in `user`, and the page then uses
-  the popup, which can sign in and switch accounts. The token the GUI sends
-  before a picker's answer isn't adopted, since it is for the page's own user.
-  Dismissing the loading scrim settles the picker as cancelled.
-
-## Upgrade
-
-`GET /embed/upgrade` is the deployment's upgrade dialog for a first-party page,
-served like the popups above: the GUI shell with the same framing rules, query
-redirect, exact-path redirect and `no-store`, naming the framing page as
-`gui_params.embed_host_origin`. It runs only when framed by an allowed page.
-
-puter.js frames it on a signed-in first-party page (the same pages as the
-pickers) for `puter.ui.requestUpgrade(details)`, and for the Upgrade button of
-the usage limit dialog a refused call shows there. Elsewhere both keep their
-behavior: inside an app `requestUpgrade()` asks the desktop, and on any other
-page the usage limit dialog opens the dashboard's upgrade page in a new tab.
-
-The frame covers the page with no box or close button, and the GUI page is
-transparent (`html.popup-frame-transparent`) so the dialog's own scrim covers
-the host. The frame allows `payment` as well as `otp-credentials`. Escape on the
-page is left to the dialog, since one there shouldn't drop a payment in
-progress. Its fragment names `user` (the page's signed-in user) and, when the
-refusal gave them, `reason` (`funds`, `subscription` or `storage`) and `method`.
-
-The GUI reports `unavailable` unless its session belongs to `user`, the account
-has no verification or password change waiting (which the frame couldn't be
-closed from), and the deployment defines `window.UIUpgradeAccount` with
-`UIUpgradeAccount.embeddable === true`. Otherwise it runs:
-
-```js
-new UIUpgradeAccount({ attribution: { appUid, reason, method }, onClose }).open_as_window();
-```
-
-`appUid` is the app the framing page's origin resolves to, never one the
-fragment names. `open_as_window()` resolves once the dialog shows, and the GUI
-then posts `ready`. While the page still hides the frame, which Chromium and
-WebKit lay out at 0x0, the GUI posts `ready` first and opens the dialog once
-the frame has a viewport, so a window it opens doesn't center on 0x0.
-`onClose({ upgraded })` must run exactly once, when the
-dialog closes or when it declines to open for the account; the GUI then posts
-`{ msg: 'puterPopupFrame', state: 'closed', upgraded }` and the page removes
-the frame. If `open_as_window()` rejects, the GUI posts `unavailable` instead. `requestUpgrade()` resolves `{ upgraded }`. A call made while the
-frame shows settles with it rather than replacing it, and a call refused while
-it shows still rejects but opens no usage limit dialog over it.
-
-When the frame can't show the upgrade (refused, never ready, `unavailable`, or
-no user to name), puter.js opens the dashboard's upgrade page in a new tab with
-what was refused, through a consent dialog when the click has expired or the
-tab is blocked, and `requestUpgrade()` resolves `{ upgraded: false }`.
-
-## Top-up
-
-`GET /embed/top-up` is the deployment's top-up dialog, where a user with a plan
-buys add-on credit, served and framed like the upgrade: a transparent GUI page
-covering the host with no box or close button, allowing `payment` and
-`otp-credentials`, with Escape left to the dialog. Its fragment names `user`.
-
-puter.js frames it for the **Add credits** item of `<puter-user-menu>`, which
-shows only when whoami reports `subscribed: true` and no `team` paying for the
-account. On a page that can't frame the GUI, the item opens the dashboard with
-`?topup=` in a new tab instead.
-
-The GUI reports `unavailable` unless its session belongs to `user`, the account
-has no verification or password change waiting, and the deployment defines
-`window.UITopUp` with `UITopUp.embeddable === true`. Otherwise it runs:
-
-```js
-new UITopUp({ onClose }).open();
-```
-
-`open()` resolves once the dialog has loaded the account and shows what it can
-buy, and `onClose({ toppedUp })` must run exactly once, when the dialog closes
-or when it declines to open for the account. The GUI then posts `{ msg: 'puterPopupFrame', state: 'closed', toppedUp }`
-and the page removes the frame. When the frame can't show the top-up, puter.js
-opens the dashboard's top-up in a new tab, as it does the upgrade.
-
-While the top-up shows, a call refused for funds still rejects but opens no
-usage limit dialog over it, and `requestUpgrade()` frames nothing over it: it
-resolves `{ upgraded: false }` once the top-up closes.
-
-## Email confirmation
-
-`GET /embed/request-email-confirmation` walks a first-party page's user through
-confirming their email, served like the upgrade: the GUI shell with the same
-framing rules, redirects and `no-store`, run only when framed by an allowed
-page. puter.js frames it on a signed-in first-party page for
-`puter.ui.requestEmailConfirmation()`. Inside an app the desktop shows the same
-windows over the app instead.
-
-Like the upgrade, the frame covers the page with no box or close button, over a
-transparent GUI page, and its fragment names `user`. Escape closes it, on the
-page or on the save-account or code window. On a window, Escape closes that
-window as its close button does, so a code already sent still answers. The GUI
-reports `unavailable` unless its session belongs to `user` and the account has
-no phone, card or password check waiting.
-An email check is fine: the boot skips its own email gate for this action, so
-the user gets one code window they can close.
-
-The GUI then runs `ensureConfirmedEmail` (`src/gui/src/helpers/ensureConfirmedEmail.js`),
-which the desktop's handler uses too: a temporary account gets the save-account
-window first, then an unconfirmed email gets the code window, each at most
-once. When the page's whoami already reads the email as confirmed,
-`requestEmailConfirmation()` resolves `{ response: true }` without framing
-anything, and a confirmation in the frame marks that whoami confirmed for the
-calls after it. An email the GUI reads as confirmed shows nothing. Before
-opening a window the GUI waits for the frame to have a viewport, as the upgrade
-does. It then posts
-`{ msg: 'puterPopupFrame', state: 'closed', confirmed }`, and
-`requestEmailConfirmation()` resolves `{ response: confirmed }`, the field an
-app reads from the desktop's answer. A call made while the frame shows settles
-with it. A frame that is refused, never ready, or `unavailable` resolves
-`{ response: false }`, since there's no popup to fall back to.
-
-## Custom domains
-
-`GET /embed/attach-custom-domain` is the custom domain dialog of
-`puter.hosting.attach()`, the popup at `/action/attach-custom-domain`, served
-like the upgrade: the GUI shell with the same framing rules, redirects and
-`no-store`, run only when framed by an allowed page. puter.js frames it on a
-signed-in first-party page (the same pages as the pickers).
-
-The frame covers the page with no box or close button, over a transparent GUI
-page, so the dialog floats over the host with its own scrim as it does on the
-desktop. The frame allows `clipboard-write`, for the dialog's copy buttons, as
-well as `otp-credentials`. Escape on the page is left to the dialog, which
-doesn't close while a request is in flight. Its fragment names `user` (the
-page's signed-in user), `subdomain` (the site to attach a domain to) and
-`msg_id`.
-
-The GUI reports `unavailable` unless its session belongs to `user` and the
-account has no verification or password change waiting. It then runs the
-popup's action unchanged, with the framing page as the requester the dialog
-names: it posts `ready` once the dialog is on the page, answers
-`{ msg: 'customDomainAttached', domain, original_msg_id }` once the dialog has
-closed and its exit has played, and then posts `closed`. `domain` is the domain the user chose, or
-null. `attach()` resolves it. A frame that closes without an answer, or a
-loading scrim the user dismisses, resolves null.
-
-A call made while the frame shows resolves null without replacing it, as a
-second call does on the desktop. A frame that is refused, never ready, or
-`unavailable` falls back to the popup, which can sign in, through a consent
-dialog when the click has expired.
-
-## Checks
-
-Run the GUI component/browser tests (with the SDK bundle built and Playwright
-Chromium installed), and the backend route tests:
-
-```sh
-npx vitest run --config src/gui/vitest.config.js src/gui/src/UI/Dashboard/AppBrowser src/feedbackEmbed
-npx vitest run src/puter-js/src/lib/guiEmbed.test.js src/puter-js/src/modules/UI.showFeedbackDialog.test.js src/puter-js/src/modules/Auth.signInFrame.test.js src/puter-js/src/modules/UI.pickerFrame.test.js src/puter-js/src/modules/UI.requestUpgrade.test.js src/puter-js/src/modules/UI.showTopUp.test.js src/puter-js/src/modules/UI.attachCustomDomainFrame.test.js src/puter-js/src/lib/upgradePrompt.test.js src/puter-js/src/modules/UsageLimitDialog.upgrade.test.js
-npx vitest run --config src/gui/vitest.config.js src/gui/src/helpers/popupFrame.test.js
-npx vitest run --config src/backend/vitest.config.ts src/backend/server.test.ts
-```

doc/pagination.md

@@ -51,21 +51,11 @@ two pages can't be decoded into how fast the table grows; `openCursor` still
 reads a plain cursor. What a cursor wraps is an implementation detail per
 store:
 
-- DynamoDB-backed lists wrap `LastEvaluatedKey`. A kv listing of another
-  namespace (cross-app or through a share handle) resumes after the last entry
-  it returned instead, since the scan can stop on a private one, and its cursor
-  is sealed to that listing and padded to one length.
+- DynamoDB-backed lists wrap `LastEvaluatedKey`.
 - SQL-backed lists wrap a keyset position — `(sortValue, id)` of the last
   row — and the query seeks past it (`WHERE (col, id) > (?, ?) ORDER BY col,
   id`). Any SQL list gaining a cursor must have a deterministic `ORDER BY`
   ending in a unique tiebreaker (`id`).
-- The notification catch-up (`GET /events/fetch`) holds two keysets in one
-  sealed cursor: the last `id` it returned, and the last `(replaced_at, id)`
-  among rows up to that id. Each is its own indexed read, merged into one
-  page, so a row replaced after a client read it comes back from that cursor.
-  `from=end` with no cursor answers an empty page whose cursor holds the
-  slice's newest `id` and the slice's latest `(replaced_at, id)` as the
-  replacement mark.
 
 Cursors that carry a sort also pin it: a request that passes a cursor plus a
 conflicting sort is rejected with 400.

doc/push-client.md

@@ -1,80 +0,0 @@
-# Browser push client
-
-Puter's desktop shows pushes through `/sw.js`. Core shows Settings → Notifications only when the `pushEnabled` gui param is `true`; core never sets it. The worker is registered only when push is turned on in the browser, and a load removes one left without a subscription. A backend extension that delivers pushes sets it with `services.homepage.setGuiParam('pushEnabled', true)` and can load its own code into the worker with `services.homepage.registerServiceWorkerScript(path)`.
-
-Core subscribes the browser to a push service only when the server also publishes `pushWebPushKey` (see [Built-in Web Push client](#built-in-web-push-client)), and it has no `/push/*` routes of its own. The device, app, preference and subscription endpoints below come from that extension. On a deployment without one, such as most self-hosted servers, they answer core's plain 404 (`code: 'not_found'`), which `puter.notifications` reports as `push_unavailable` and the Notifications tab shows as unavailable. A device the extension can't find is `device_not_found`.
-
-## Push payload
-
-`sw.js` reads the push's JSON body. The message is its `puter` field, or `data.puter` for services that only carry string data, as an object or a JSON string:
-
-```ts
-{ uid?: string; title?: string; body?: string; icon?: string; group?: string;
-  target?: { app?: string; path?: string }; data?: unknown; channel?: string;
-  type?: 'challenge'; challenge?: string }
-```
-
-`uid` is the notification's uid, a later push with the same `group` replaces the one showing, and `target` and `data` reach the app when the user taps it.
-
-When the browser replaces the subscription (`pushsubscriptionchange`), `sw.js` posts `{ type: 'puter-push-subscription-changed' }` to every open window on Puter's origin. The worker has no token or session, so the page's push client registers the new subscription.
-
-## Receipts
-
-Before a notification is pushed, the server asks the open clients whether they received it live. It sends `notif.receipt` with `{ uid }` on the user's sockets for the app that sent it, or on the desktop's sockets for Puter's own notifications. The SDK remembers the uids its page received through `onNotification()`, `onPush()` or the desktop's feed, and answers once its page has that notification, or with `{ received: false }` when it never gets it. The server waits up to 5 seconds (`notificationAckTimeoutMs`).
-
-An answer carries `visibilityState` and `focused` as they were when the page received the notification. Pages never show a browser notification themselves; pushes do.
-
-- An answer from a page that was visible and focused stops the push (`handled` on `notif.delivery.settled`). An older client that doesn't send `focused` counts while visible.
-- Otherwise the notification is pushed, to every browser the user subscribed. A website's pushes go only to the browsers that subscribed through its own worker, never to Puter's `/sw.js`. An app inside the desktop pushes through `/sw.js`, which shows the app's name and icon.
-- A client that can't answer, such as an older puter.js, doesn't hold the push back.
-
-The ask reaches only the sockets in the asking region. So that other regions hear about a page too, a page that receives a notification live while visible and focused also sends `notif.handled` with `{ uid }` on the socket it came on. Core relays it as the node-local `notif.handled` event with the socket's user and app, at most 60 a minute per user; an extension that delivers pushes decides what to do with it.
-
-## Registering
-
-The registry is in [src/gui/src/helpers/pushClient.js](../src/gui/src/helpers/pushClient.js). A service script registers its client like this:
-
-```js
-service_script(async (api) => {
-    api.use()['push.registerPushClient']?.(client);
-});
-```
-
-`use(id)` throws when nothing is registered under `id`, so the form above also runs on a Puter version without the registry and does nothing there. Any script that runs after the GUI bundle can call `use()['push.registerPushClient']?.(client)` the same way. Registering again replaces the client. Registering dispatches `push-client-registered` on `window`, and an open Notifications tab redraws.
-
-With no client registered, the tab says push notifications aren't available in this browser.
-
-### Built-in Web Push client
-
-When the server also sets the `pushWebPushKey` gui param (a VAPID public key), core registers its own client ([webPushClient.js](../src/gui/src/helpers/webPushClient.js)) unless an extension registered one first. It uses `puter.notifications.enable()` / `disable()`, the same standard Web Push flow apps use on their own origins:
-
-1. `GET /push/web/key` for the key, then `pushManager.subscribe()` on the `/sw.js` registration.
-2. `POST /push/web/subscriptions { subscription }`. A subscription the server already has answers `{ status: 'active' }`. A new one answers `{ status: 'pending' }`, and the server sends it a push with `{ type: 'challenge', challenge }`.
-3. The worker shows that push and posts `{ type: 'puter-push-challenge', challenge }` to the origin's windows; the page sends it to `POST /push/web/subscriptions/verify`. The device is registered once the page hands the confirmation back.
-4. `DELETE /push/web/subscriptions { endpoint }` removes it.
-
-Apps on their own origin do the same through `push-sw.js`, which they import into their own worker. A subscription made with an app token is the app's: its pushes are that app's notifications only.
-
-## Interface
-
-```ts
-interface PushClient {
-    enable(): Promise<{ deviceUid: string }>;
-    disable(): Promise<void>;
-    status(): Promise<{
-        permission: 'default' | 'granted' | 'denied';
-        registered: boolean;
-        deviceUid?: string;
-    }>;
-}
-```
-
-- `enable()` may ask for notification permission, so core calls it from a click: Turn on in the Notifications tab, Allow on a permission prompt that includes `notifications:push` while this browser is off, and the "Turn on notifications" button of the `/action/enable-push` popup and the matching desktop dialog (`UIEnablePushDialog`). Core also calls it without a click, from `helpers/pushSync.js`, when `Notification.permission` is already `granted`, `status()` reports the browser as not registered, the user has not turned push off in this browser, and an app holds `notifications:push`; the browser does not prompt then. The built-in client runs `puter.notifications.enable()`, which subscribes with the `/sw.js` registration and registers the browser through the Web Push flow above (`platform: 'webpush'`). It then resolves the `uid` of this browser's `webpush` device from `listDevices()`. It rejects when permission is refused or the browser wasn't registered.
-- `disable()` runs `puter.notifications.disable()`, which sends `DELETE /push/web/subscriptions { endpoint }` and ends the browser's subscription. The tab calls it for Turn off, and for Remove on the device marked as this browser. Remove on any other device is `DELETE /push/devices/:uid`.
-- `status()` reports the state without prompting. `permission` is `Notification.permission`. `registered` is true when this browser has a device registered for the signed-in user, and `deviceUid` is that device's `uid`.
-
-After `enable()` resolves, the tab calls `POST /push/devices/:uid/test` and asks the user whether a notification showed up.
-
-The tab also reads `GET /push/apps` and `GET`/`POST /push/preferences`.
-
-Core keeps its own record of a browser the user turned off, `puter.push.browser-off:<user uuid>` in `localStorage`, written by Turn off and by Remove on this browser's device, and cleared when `enable()` resolves. The silent registration above skips a browser with that record, so a device removed here stays removed while one removed from another device, or a new sign-in in a browser that already allows notifications, registers again.

doc/self-hosting.md

@@ -12,17 +12,7 @@ Generates secrets, writes `.env` + `puter/config/config.json`, downloads `docker
 
 ## Requirements
 
-- **Docker** with the `compose` plugin. This is the one thing you have to install
-  yourself — the installer checks for it and stops with an explanation rather
-  than installing it for you.
-  - **macOS / Windows:** [Docker Desktop](https://docs.docker.com/get-docker/).
-    Both ship the `compose` plugin.
-  - **Linux:** [Docker Engine](https://docs.docker.com/engine/install/) plus the
-    [`docker-compose-plugin`](https://docs.docker.com/compose/install/) package.
-  - Confirm before running anything else: `docker compose version` should print a
-    version, not `command not found`.
-  - If Docker is installed but the shell can't see it, make sure your user is in
-    the `docker` group (Linux) or that Docker Desktop is actually running.
+- **Docker** with the `compose` plugin.
 - A **domain** with DNS access — you need a wildcard record (`*.your-domain.com` → server IP). Puter routes by subdomain (`api.<domain>`, `site.<domain>`, `app.<domain>`).
 - Optional: **TLS certs** (or `certbot` to grab them — see Step 3).
 
@@ -667,14 +657,6 @@ Migrations re-apply idempotently across pulls. Volumes are preserved.
 
 ## Troubleshooting
 
-**`missing required command: docker` — the installer stops immediately.**
-Docker isn't on your `PATH` yet. Puter self-hosting is a Docker Compose stack, so
-nothing can run without it. Install [Docker Desktop](https://docs.docker.com/get-docker/)
-on macOS/Windows or [Docker Engine](https://docs.docker.com/engine/install/) plus
-`docker-compose-plugin` on Linux, then confirm `docker compose version` works in
-the same shell and re-run the installer. On Linux, a fresh Docker install usually
-needs a new login session before your user picks up the `docker` group.
-
 **Site loads but I get a 502 / "Bad Gateway" from Caddy.**
 The puter container failed to come up. `docker compose logs puter` will tell you which dependency rejected it (most often DB password mismatch between `.env` and `config.json`).
 

extensions/metering.test.ts

@@ -309,41 +309,4 @@ describe('metering extension — handleMeteringAllCosts', () => {
         // per request).
         expect(costsA).toBe(costsB);
     });
-
-    it('refreshes a warm catalogue at the UTC price boundary', async () => {
-        vi.useFakeTimers({ toFake: ['Date'] });
-        try {
-            vi.setSystemTime(new Date('2026-11-30T23:59:59Z'));
-            const before = makeRes();
-            await handleMeteringAllCosts(makeReq(), before.res);
-            vi.setSystemTime(new Date('2026-12-01T00:00:00Z'));
-            const after = makeRes();
-            await handleMeteringAllCosts(makeReq(), after.res);
-            expect(
-                (after.captured.body as { costs: unknown[] }).costs,
-            ).not.toBe((before.captured.body as { costs: unknown[] }).costs);
-        } finally {
-            vi.useRealTimers();
-        }
-    });
-
-    // A scheduled price change has to reach the catalogue without a restart.
-    it('collects the catalogue again once the cache expires', async () => {
-        vi.useFakeTimers({ toFake: ['Date'] });
-        try {
-            vi.setSystemTime(new Date('2026-12-02T00:00:00Z'));
-            const a = makeRes();
-            const b = makeRes();
-            await handleMeteringAllCosts(makeReq(), a.res);
-            vi.setSystemTime(Date.now() + 10 * 60 * 1000 + 1);
-            await handleMeteringAllCosts(makeReq(), b.res);
-
-            const costsA = (a.captured.body as { costs: unknown[] }).costs;
-            const costsB = (b.captured.body as { costs: unknown[] }).costs;
-            expect(costsB).not.toBe(costsA);
-            expect(costsB).toEqual(costsA);
-        } finally {
-            vi.useRealTimers();
-        }
-    });
 });

extensions/metering.ts

@@ -16,11 +16,9 @@ import type { Request, Response } from 'express';
 const services = extension.import('service');
 const stores = extension.import('store');
 
-// Catalogues change on deploy or on a scheduled price change, so the cache
-// expires rather than living as long as the process.
-const ALL_COSTS_TTL_MS = 10 * 60 * 1000;
+// Cached on first request — the underlying cost catalogues are baked into
+// driver/controller source so they only change on deploy.
 let cachedAllCosts: Record<string, unknown>[] | null = null;
-let allCostsExpireAt = 0;
 
 function collectAllCosts(): Record<string, unknown>[] {
     const all: Record<string, unknown>[] = [];
@@ -189,14 +187,12 @@ export const handleMeteringGlobalUsage = async (
     res.json(globalUsage);
 };
 
-// A hit walks the registries when the in-memory cache is missing or expired.
+// First hit walks the registries; subsequent hits serve the in-memory cache.
 export const handleMeteringAllCosts = async (
     _req: Request,
     res: Response,
 ): Promise<void> => {
-    if (!cachedAllCosts || Date.now() >= allCostsExpireAt) {
-        allCostsExpireAt =
-            (Math.floor(Date.now() / ALL_COSTS_TTL_MS) + 1) * ALL_COSTS_TTL_MS;
+    if (!cachedAllCosts) {
         const raw = collectAllCosts();
         const multiplier = creditMultiplierFrom(extension.config);
         // Price the catalogue in the same unit the usage endpoints report:

extensions/thumbnails.test.ts

@@ -314,41 +314,6 @@ describe('thumbnails extension — handleThumbnailRead', () => {
         await server?.shutdown();
     });
 
-    it('keeps read URLs stable within an hour and rotates them at the next hour', async () => {
-        const key = mintedKey();
-        const signedAt = Date.UTC(2026, 9, 26, 10);
-        const read = async () => {
-            const entry: Record<string, unknown> = {
-                thumbnail: `s3://${BUCKET}/${key}`,
-            };
-            await handleThumbnailRead(entry, {
-                s3,
-                s3Presign,
-                bucketName: BUCKET,
-                bucketEndpoint: BUCKET_ENDPOINT,
-                fsEntry: server.stores.fsEntry,
-            });
-            return entry.thumbnail as string;
-        };
-        vi.useFakeTimers({ toFake: ['Date'] });
-        try {
-            vi.setSystemTime(signedAt + 1000);
-            const first = await read();
-            vi.setSystemTime(signedAt + 3599_000);
-            expect(await read()).toBe(first);
-            expect(new URL(first).searchParams.get('X-Amz-Date')).toBe(
-                '20261026T100000Z',
-            );
-            expect(new URL(first).searchParams.get('X-Amz-Expires')).toBe(
-                '604800',
-            );
-            vi.setSystemTime(signedAt + 3600_000);
-            expect(await read()).not.toBe(first);
-        } finally {
-            vi.useRealTimers();
-        }
-    });
-
     // Thumbnails stored before keys were bound to entries keep displaying.
     it.each([
         ['an entry-bound key', () => mintedKey()],

extensions/thumbnails.ts

@@ -307,9 +307,6 @@ export const handleThumbnailRead = async (
     const thumb = entry.thumbnail;
     if (typeof thumb !== 'string' || !thumb) return;
     const presignClient = deps.s3Presign;
-    const signingDate = new Date(
-        Math.floor(Date.now() / 3_600_000) * 3_600_000,
-    );
 
     if (isStoragePointer(thumb, deps.bucketEndpoint)) {
         const key = resolveThumbnailKey(thumb);
@@ -322,7 +319,7 @@ export const handleThumbnailRead = async (
         entry.thumbnail = await getSignedUrl(
             presignClient,
             new GetObjectCommand({ Bucket: deps.bucketName, Key: key }),
-            { expiresIn: 604800, signingDate },
+            { expiresIn: 604800 },
         );
     } else if (thumb.startsWith('data')) {
         // Move an inline thumbnail into storage. The row only takes the new
@@ -376,7 +373,7 @@ export const handleThumbnailRead = async (
         entry.thumbnail = await getSignedUrl(
             presignClient,
             new GetObjectCommand({ Bucket: deps.bucketName, Key: key }),
-            { expiresIn: 604800, signingDate },
+            { expiresIn: 604800 },
         );
     }
 };

extensions/whoami.test.ts

@@ -1,7 +1,13 @@
 import type { Request, Response } from 'express';
-import { installSeatStub } from '@heyputer/backend/testFixtures/seatStub';
 import { v4 as uuidv4 } from 'uuid';
-import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
+import {
+    afterAll,
+    beforeAll,
+    describe,
+    expect,
+    it,
+    vi,
+} from 'vitest';
 import { makeActor, type Actor } from '../src/backend/core/actor.ts';
 import { runWithContext } from '../src/backend/core/context.ts';
 import { configContainer } from '../src/backend/exports.ts';
@@ -43,6 +49,7 @@ beforeAll(async () => {
             create_shortcut: true,
             payment_bypass: true,
         },
+        teams_enabled: true,
     } as never);
 });
 
@@ -76,20 +83,21 @@ describe('whoami extension — handleWhoami', () => {
         };
 
         const seatOf = async (teamName: string) => {
+            const owner = await seedUser();
             const seat = await seedSeat();
-            const team = {
-                uid: `wt-${Math.random().toString(36).slice(2, 9)}`,
+            const team = await server.stores.team.create({
+                ownerUserId: owner.id as number,
                 name: teamName,
-            };
-            installSeatStub(server as never, [seat.id as number], {
-                teamUid: team.uid,
-                teamName: team.name,
+                handle: `wt-${Math.random().toString(36).slice(2, 9)}`,
+            });
+            await server.stores.team.addMember(team.uid, seat.id as number, {
+                orgOwned: true,
             });
             return { seat, team };
         };
 
-        it('names no team where teams is off', async () => {
-            const { seat } = await seatOf('Acme Corp');
+        it('names the team for a seat', async () => {
+            const { seat, team } = await seatOf('Acme Corp');
             const { res, captured } = makeRes();
 
             await runWithContext(
@@ -97,8 +105,10 @@ describe('whoami extension — handleWhoami', () => {
                 () => handleWhoami(makeReq(), res),
             );
 
-            // Off, so the seat is never looked up.
-            expect((captured.body as { team?: unknown }).team).toBeUndefined();
+            expect((captured.body as { team?: unknown }).team).toEqual({
+                uid: team.uid,
+                name: 'Acme Corp',
+            });
         });
 
         it('says nothing for an account that is not a seat', async () => {
@@ -160,81 +170,6 @@ describe('whoami extension — handleWhoami', () => {
         expect(captured.body).toEqual({ error: 'User not found' });
     });
 
-    describe("an app's view of the email", () => {
-        const appActorFor = async (user: { uuid: string; id: unknown }) => {
-            const app = await (
-                server.stores.app.create as unknown as (
-                    fields: Record<string, unknown>,
-                    opts: { ownerUserId: number },
-                ) => Promise<{ uid: string; id: number }>
-            )(
-                {
-                    name: `we-${uuidv4()}`,
-                    title: 'Email reader',
-                    index_url: `https://${uuidv4()}.example/`,
-                },
-                { ownerUserId: user.id as number },
-            );
-            return {
-                app,
-                actor: makeActor({
-                    user: { uuid: user.uuid, id: user.id as number },
-                    app: { uid: app.uid, id: app.id },
-                }),
-            };
-        };
-
-        const whoamiAs = async (actor: Actor) => {
-            const { res, captured } = makeRes();
-            await runWithContext({ actor }, () =>
-                handleWhoami(makeReq(), res),
-            );
-            return captured;
-        };
-
-        it('is withheld until the user grants it, then shown', async () => {
-            const user = await seedUser();
-            const { app, actor } = await appActorFor(user);
-
-            const before = (await whoamiAs(actor)).body as Record<
-                string,
-                unknown
-            >;
-            expect(before).not.toHaveProperty('email');
-            expect(before).not.toHaveProperty('unconfirmed_email');
-
-            await server.services.permission.grantUserAppPermission(
-                makeActor({ user: { uuid: user.uuid, id: user.id as number } }),
-                app.uid,
-                `user:${user.uuid}:email:read`,
-            );
-            const after = (await whoamiAs(actor)).body as Record<
-                string,
-                unknown
-            >;
-            expect(after.email).toBe(user.email);
-            expect(after.unconfirmed_email).toBe(user.email);
-        });
-
-        it('answers 404 for a missing account even when the check fails', async () => {
-            const check = vi
-                .spyOn(server.services.permission, 'check')
-                .mockRejectedValue(new Error('scan failed'));
-            try {
-                const captured = await whoamiAs(
-                    makeActor({
-                        user: { uuid: 'ghost-uuid', id: 99_999_998 },
-                        app: { uid: 'app-ghost', id: 1 },
-                    }),
-                );
-                expect(captured.statusCode).toBe(404);
-                expect(captured.body).toEqual({ error: 'User not found' });
-            } finally {
-                check.mockRestore();
-            }
-        });
-    });
-
     it('returns full user details for a user actor', async () => {
         const user = await seedUser();
         const { res, captured } = makeRes();
@@ -257,41 +192,8 @@ describe('whoami extension — handleWhoami', () => {
         expect(body.created_ts).toBeGreaterThan(0);
         // `directories` is only sent to user actors — confirm it’s present.
         expect(body.directories).toBeDefined();
-    });
-
-    it('leaves out taskbar items saved on the account', async () => {
-        const user = await seedUser();
-        await server.stores.user.update(user.id as number, {
-            taskbar_items: JSON.stringify([{ type: 'app', name: 'editor' }]),
-        });
-        const { res, captured } = makeRes();
-
-        await runWithContext(
-            { actor: { user: { uuid: user.uuid, id: user.id as number } } },
-            () => handleWhoami(makeReq(), res),
-        );
-
-        expect(captured.body).not.toHaveProperty('taskbar_items');
-    });
-
-    it('leaves out a desktop background saved on the account', async () => {
-        const user = await seedUser();
-        await server.stores.user.update(user.id as number, {
-            desktop_bg_url: 'https://cdn.test/wallpaper.png',
-            desktop_bg_color: '#000000',
-            desktop_bg_fit: 'cover',
-        });
-        const { res, captured } = makeRes();
-
-        await runWithContext(
-            { actor: { user: { uuid: user.uuid, id: user.id as number } } },
-            () => handleWhoami(makeReq(), res),
-        );
-
-        const body = captured.body as Record<string, unknown>;
-        expect(body).not.toHaveProperty('desktop_bg_url');
-        expect(body).not.toHaveProperty('desktop_bg_color');
-        expect(body).not.toHaveProperty('desktop_bg_fit');
+        // taskbar_items is only sent to user actors.
+        expect(body).toHaveProperty('taskbar_items');
     });
 
     it('reports the SMS-to-card fallback only once a send has opened it', async () => {
@@ -355,7 +257,7 @@ describe('whoami extension — handleWhoami', () => {
         expect(flags.payment_bypass).toBeUndefined();
     });
 
-    it('strips created_ts and human_readable_age fields for app actors', async () => {
+    it('strips desktop_bg_*, created_ts and human_readable_age fields for app actors', async () => {
         const user = await seedUser();
         const { res, captured } = makeRes();
 
@@ -373,6 +275,9 @@ describe('whoami extension — handleWhoami', () => {
         expect(body.app_name).toBe('app-test-actor');
         // is_user_token is stripped for app actors.
         expect(body.is_user_token).toBeUndefined();
+        expect(body.desktop_bg_url).toBeUndefined();
+        expect(body.desktop_bg_color).toBeUndefined();
+        expect(body.desktop_bg_fit).toBeUndefined();
         expect(body.human_readable_age).toBeUndefined();
         // Account age, in either form, is not exposed to apps.
         expect(body.created_ts).toBeUndefined();
@@ -462,7 +367,7 @@ describe('whoami extension — handleWhoami', () => {
             });
         });
 
-        it('cannot add directories for an app actor, which core omits', async () => {
+        it('cannot add taskbar_items for an app actor, which core omits', async () => {
             const user = await seedUser();
             const body = await whoamiWithListener(
                 makeActor({
@@ -470,11 +375,11 @@ describe('whoami extension — handleWhoami', () => {
                     app: { uid: 'app-test-actor' },
                 }),
                 (_key, event) => {
-                    event.details.directories = { '/injected': 'uuid' };
+                    event.details.taskbar_items = [{ name: 'injected' }];
                 },
             );
 
-            expect(body).not.toHaveProperty('directories');
+            expect(body).not.toHaveProperty('taskbar_items');
         });
     });
 
@@ -546,7 +451,9 @@ describe('whoami extension — handleWhoami', () => {
             }),
         ]) {
             const { res, captured } = makeRes();
-            await runWithContext({ actor }, () => handleWhoami(makeReq(), res));
+            await runWithContext({ actor }, () =>
+                handleWhoami(makeReq(), res),
+            );
 
             const body = captured.body as Record<string, unknown>;
             expect(body.phone).toBeUndefined();
@@ -555,7 +462,7 @@ describe('whoami extension — handleWhoami', () => {
             expect(body.otp_secret).toBeUndefined();
             expect(body.signup_ip).toBeUndefined();
             // Not just absent as a key — the values must not appear anywhere
-            // in the payload (nested under metadata, …).
+            // in the payload (nested under metadata, taskbar items, …).
             const serialized = JSON.stringify(body);
             expect(serialized).not.toContain('5551234567');
             expect(serialized).not.toContain('fp_ABC123');

extensions/whoami.ts

@@ -1,5 +1,6 @@
 import { Context } from '@heyputer/backend/src/core';
 import { extension } from '@heyputer/backend/src/extensions';
+import { APP_ICON_SIZES } from '@heyputer/backend/src/util/appIcon.js';
 import {
     buildUserDetails,
     scrubSensitive,
@@ -35,28 +36,25 @@ export const handleWhoami = async (
     }
 
     const isUser = !actor.effectiveApp;
-    const canReadEmail = async (uuid: unknown) => {
-        try {
-            return await services.permission.check(
-                actor,
-                `user:${uuid}:email:read`,
-            );
-        } catch {
-            return false;
-        }
-    };
-    // Started beside the row read: the actor carries the row's uuid.
-    const emailCheck = isUser ? null : canReadEmail(actor.user.uuid);
     const user = await stores.user.getById(actor.user.id);
     if (!user) {
         res.status(404).json({ error: 'User not found' });
         return;
     }
 
+    const rawIconSize =
+        typeof req.query?.icon_size === 'string'
+            ? Number(req.query.icon_size)
+            : undefined;
+    const iconSize =
+        rawIconSize !== undefined && APP_ICON_SIZES.includes(rawIconSize)
+            ? rawIconSize
+            : undefined;
+
     const details = await buildUserDetails(
         user,
         { config: extension.config, clients, stores, services },
-        { isUser },
+        { isUser, iconSize, noIcons: !iconSize },
     );
     details.human_readable_age = user.timestamp
         ? timeago.format(new Date(user.timestamp as string))
@@ -64,13 +62,16 @@ export const handleWhoami = async (
 
     // Strip sensitive fields for app actors
     if (!isUser) {
-        const emailReadable = await (user.uuid === actor.user.uuid
-            ? emailCheck
-            : canReadEmail(user.uuid));
-        if (!emailReadable) {
+        const canReadEmail = await services.permission
+            .check(actor, `user:${user.uuid}:email:read`)
+            .catch(() => false);
+        if (!canReadEmail) {
             delete details.email;
             delete details.unconfirmed_email;
         }
+        delete details.desktop_bg_url;
+        delete details.desktop_bg_color;
+        delete details.desktop_bg_fit;
         delete details.human_readable_age;
         delete details.created_ts;
         delete details.is_user_token;

install.ps1

@@ -190,13 +190,6 @@ S3_BUCKET=puter-local
         providers = [ordered]@{
             ollama = [ordered]@{ enabled = $false }
         }
-        # Off because a self-hosted install has no paid plans: every account
-        # is on the free policy, so the plan gates would 402 the surfaces that
-        # declare one (the OpenAI/Anthropic-compatible AI endpoints) for
-        # everybody. Same as install.sh.
-        meteringEnforcement = [ordered]@{
-            subscriptions = $false
-        }
         trust_proxy = 1
     }
     $configJson = $config | ConvertTo-Json -Depth 10

install.sh

@@ -53,29 +53,9 @@ need() {
     command -v "$1" >/dev/null 2>&1 || die "missing required command: $1"
 }
 
-check_docker() {
-    if command -v docker >/dev/null 2>&1; then
-        return 0
-    fi
-    echo >&2 ""
-    echo >&2 "[puter-install] missing required command: docker"
-    echo >&2 ""
-    echo >&2 "Docker is required to run Puter self-hosted."
-    echo >&2 ""
-    echo >&2 "Installation instructions:"
-    echo >&2 "  - macOS (Apple Silicon & Intel): https://docs.docker.com/desktop/setup/install/mac-install/"
-    echo >&2 "    (Docker Desktop is recommended. Alternatives: OrbStack, Colima)"
-    echo >&2 "  - Linux: https://docs.docker.com/engine/install/"
-    echo >&2 "  - Windows: https://docs.docker.com/desktop/setup/install/windows-install/"
-    echo >&2 ""
-    echo >&2 "After installing Docker, make sure it's running and try again."
-    echo >&2 ""
-    exit 1
-}
-
 # ── Step 1: dependency check ────────────────────────────────────────
 log "checking dependencies"
-check_docker
+need docker
 need curl
 need openssl
 docker compose version >/dev/null 2>&1 \

package.json

@@ -54,6 +54,7 @@
     "dev": "npm start",
     "build": "npm run setupExtensions && npm run build:ts && cd src/gui && node ./build.js && cd ../puter-js && npm run build",
     "build:workerLib": "cd src/puter-js && npm run build && cd ../worker && npm run build",
+    "check-translations": "node tools/check-translations.js",
     "prepare": "husky",
     "build:ts": "tsc -p tsconfig.build.json && node ./tools/write-dist-package-json.mjs",
     "check:puterjs:types": "node tools/checkPuterjsTypes.mjs",
@@ -76,10 +77,9 @@
     "@aws-sdk/s3-request-presigner": "^3.1028.0",
     "dedent": "^1.5.3",
     "javascript-time-ago": "^2.5.11",
-    "libphonenumber-js": "1.13.15",
+    "libphonenumber-js": "1.13.14",
     "miniflare": "^4.20260617.1",
-    "open": "^10.1.0",
-    "sharp": "^0.35.5"
+    "open": "^10.1.0"
   },
   "engines": {
     "node": ">=24.0.0"

src/backend/TeamsOptional.test.ts

@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2024-present Puter Technologies Inc.
- *
- * This file is part of Puter.
- *
- * Puter is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import { v4 as uuidv4 } from 'uuid';
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-
-import type { PuterServer } from './server.ts';
-import { createTestUser, setupTestServer } from './testUtil.ts';
-
-/**
- * Teams is optional, so core has to work when neither the service nor the store
- * is registered, which is how this test server boots.
- */
-describe('core without a teams registration', () => {
-    let server: PuterServer;
-
-    const makeUser = async (): Promise<{ id: number; username: string }> => {
-        const username = `nt_${Math.random().toString(36).slice(2, 10)}`;
-        const created = (await server.stores.user.create({
-            username,
-            uuid: uuidv4(),
-            password: null,
-            email: `${username}@test.local`,
-        })) as unknown as { id: number };
-        return { id: created.id, username };
-    };
-
-    beforeAll(async () => {
-        server = await setupTestServer({
-            // Without this the allowlist check returns before asking Teams.
-            teams_allowed_email_domains: ['test.local'],
-        } as never);
-    });
-
-    afterAll(async () => {
-        await server?.shutdown();
-    });
-
-    it('has no teams in the registry', () => {
-        expect(server.services.team).toBeUndefined();
-        expect(server.stores.team).toBeUndefined();
-    });
-
-    it('refuses to boot when the config asks for teams', async () => {
-        await expect(
-            setupTestServer({ teams_enabled: true } as never),
-        ).rejects.toThrow(/teams_enabled/);
-    });
-
-    it('deletes an account without asking what it was charged for', async () => {
-        const user = await makeUser();
-        await expect(
-            server.services.userAccount.cascadeDelete(user.id),
-        ).resolves.not.toThrow();
-        expect(await server.stores.user.getById(user.id)).toBeFalsy();
-    });
-
-    it('answers the address-claim question signup asks', async () => {
-        const user = await makeUser();
-        const row = (await server.stores.user.getById(user.id))!;
-        // Nothing is a seat, so the holder is returned as-is.
-        await expect(
-            server.services.signup.signupEmailHolder(row.email as string, {
-                releaseSeat: true,
-            }),
-        ).resolves.toMatchObject({ id: user.id });
-    });
-
-    it('lists what is shared with an account, folding in no team shares', async () => {
-        const user = await makeUser();
-        await expect(
-            server.services.share.listSharedWithMe({
-                user: { id: user.id },
-            } as never),
-        ).resolves.toMatchObject({ items: [] });
-    });
-
-    it('refuses a share aimed at a team, rather than failing', async () => {
-        // A real home directory, so the refusal is the recipient's and not
-        // the entry's.
-        const username = `nt_${Math.random().toString(36).slice(2, 10)}`;
-        const creds = await createTestUser(server, {
-            username,
-            password: 'Nt-Pw-12345!',
-        });
-        const row = (await server.stores.user.getByUsername(username))!;
-        const user = { id: row.id, username };
-        const actor = { user: row } as never;
-        expect(creds).toBeTruthy();
-        // The recipient cannot exist, so this is a 404 and not a crash.
-        await expect(
-            server.services.share.share(actor, {
-                recipient: { teamHandle: 'nobody' },
-                mode: 'read',
-                path: `/${user.username}`,
-            } as never),
-        ).rejects.toMatchObject({ statusCode: 404 });
-    });
-
-    it('serves the homepage shell with the teams tab off', async () => {
-        const user = await makeUser();
-        const row = (await server.stores.user.getById(user.id))!;
-        let html = '';
-        const res = { send: (out: string) => (html = out) };
-        await server.services.homepage.send(
-            {
-                req: { headers: {}, query: {}, get: () => undefined },
-                res,
-                actor: { user: row },
-            } as never,
-            { title: 'Puter' } as never,
-        );
-        const params = JSON.parse(
-            /gui\((\{.*?\})\);/s.exec(html)![1].replaceAll('\\u003c', '<'),
-        );
-        expect(params.teams_ui).toBe(false);
-    });
-});

src/backend/clients/database/DatabaseClient.test.ts

@@ -108,25 +108,6 @@ describe('AbstractDatabaseClient — unimplemented surface', () => {
 });
 
 describe('AbstractDatabaseClient — replica-aware reads', () => {
-    it('avoids a primary read when the replica has rows in sequential mode', async () => {
-        const client = new FixtureDatabaseClient([{ id: 1 }], [{ id: 2 }]);
-        expect(
-            await client.tryHardRead('SELECT 1', [], { race: false }),
-        ).toEqual([{ id: 1 }]);
-        expect(client.preads).toEqual([]);
-    });
-
-    it.each([[], new Error('replica unavailable')])(
-        'falls back once in sequential mode',
-        async (replica) => {
-            const client = new FixtureDatabaseClient(replica, [{ id: 2 }]);
-            expect(
-                await client.tryHardRead('SELECT 1', [], { race: false }),
-            ).toEqual([{ id: 2 }]);
-            expect(client.preads).toEqual(['SELECT 1']);
-        },
-    );
-
     it('returns replica rows without waiting on the primary', async () => {
         const client = new FixtureDatabaseClient([{ id: 1 }], [{ id: 2 }]);
         await expect(client.tryHardRead('SELECT 1')).resolves.toEqual([
@@ -275,28 +256,6 @@ describe('AbstractDatabaseClient — SQL generation', () => {
         expect(postgres().timestampFromUnixSql()).toBe('to_timestamp(?)');
     });
 
-    it('reads a timestamp column back as unix seconds in each engine', () => {
-        expect(sqlite().unixSecondsSql('`t`')).toBe(
-            "CAST(strftime('%s', `t`) AS INTEGER)",
-        );
-        expect(mysql().unixSecondsSql('`t`')).toBe('UNIX_TIMESTAMP(`t`)');
-        expect(postgres().unixSecondsSql('`t`')).toBe(
-            'EXTRACT(EPOCH FROM `t`)::bigint',
-        );
-    });
-
-    it('reads the database clock as epoch milliseconds in each dialect', () => {
-        expect(sqlite().nowMsExpr()).toBe(
-            "CAST((julianday('now') - 2440587.5) * 86400000 AS INTEGER)",
-        );
-        expect(mysql().nowMsExpr()).toBe(
-            "(TIMESTAMPDIFF(MICROSECOND, '1970-01-01 00:00:00', UTC_TIMESTAMP(6)) DIV 1000)",
-        );
-        expect(postgres().nowMsExpr()).toBe(
-            'CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)',
-        );
-    });
-
     it('describes a stored timestamp the way each driver reads it back', () => {
         const seconds = Date.UTC(2026, 9, 11, 8, 5, 9) / 1000;
         expect(sqlite().timestampValue(seconds)).toBe('2026-10-11 08:05:09');
@@ -318,13 +277,3 @@ describe('AbstractDatabaseClient — SQL generation', () => {
         );
     });
 });
-
-
-it('builds an insert for batchWrite and shares it with insert', async () => {
-    const client = new FixtureDatabaseClient([]);
-    const entry = client.insertEntry('widget', { name: "reader's", enabled: true });
-    expect(entry.values).toEqual(["reader's", true]);
-    expect(entry.statement).toContain('VALUES (?, ?)');
-    await client.insert('widget', { name: "reader's", enabled: true });
-    expect(client.writes).toEqual([{ query: entry.statement, params: entry.values }]);
-});

src/backend/clients/database/DatabaseClient.ts

@@ -28,12 +28,6 @@ export interface WriteResult {
     insertId: number | bigint;
     affectedRows: number;
     anyRowsAffected: boolean;
-    /**
-     * Warnings the statement raised; nonzero means a value may have been stored
-     * differently from how it was sent. Absent when the engine can't vouch that
-     * a clean insert stored exactly what was sent, on a fresh id.
-     */
-    warningStatus?: number;
 }
 
 export interface BatchEntry {
@@ -110,23 +104,14 @@ export class AbstractDatabaseClient extends PuterClient {
         tableName: string,
         data: Record<string, unknown>,
     ): Promise<WriteResult> {
-        const entry = this.insertEntry(tableName, data);
-        return this.write(
-            entry.statement + this.returningIdClause(),
-            entry.values,
-        );
-    }
-
-    /** An insert that can join other writes in a transaction. */
-    insertEntry(tableName: string, data: Record<string, unknown>): BatchEntry {
         const cols = Object.keys(data);
-        return {
-            statement:
-                `INSERT INTO ${this.quoteIdentifier(tableName)} ` +
-                `(${cols.map((c) => this.quoteIdentifier(c)).join(', ')}) ` +
-                `VALUES (${cols.map(() => '?').join(', ')})`,
-            values: Object.values(data),
-        };
+        const values = Object.values(data);
+        const sql =
+            `INSERT INTO ${this.quoteIdentifier(tableName)} ` +
+            `(${cols.map((c) => this.quoteIdentifier(c)).join(', ')}) ` +
+            `VALUES (${cols.map(() => '?').join(', ')})` +
+            this.returningIdClause();
+        return this.write(sql, values);
     }
 
     /** Whether `read()` goes to a separate replica rather than the primary. */
@@ -147,27 +132,25 @@ export class AbstractDatabaseClient extends PuterClient {
 
     /**
      * Like `read()`, but an empty or failed replica read falls back to the
-     * primary, so replication lag can't hide a row that was just written. By
-     * default the primary read starts alongside the replica one; `race: false`
-     * reads the primary only after the replica returns empty or fails. Without
-     * a replica this is a single `read()`.
+     * primary, so replication lag can't hide a row that was just written. The
+     * primary read starts alongside the replica one rather than after it.
+     * Without a replica this is a single `read()`.
      */
     @Span('db.tryHardRead', (query: string) => ({ 'db.statement': query }))
     async tryHardRead(
         query: string,
         params: unknown[] = [],
-        { race = true }: { race?: boolean } = {},
     ): Promise<Record<string, unknown>[]> {
         if (!this.hasReadReplica()) return this.read(query, params);
 
-        const primary = race ? settle(this.pread(query, params)) : null;
+        const primary = settle(this.pread(query, params));
         try {
             const rows = await this.replicaRead(query, params);
             if (rows.length > 0) return rows;
         } catch {
             // replica failed — fall through to primary
         }
-        const result = await (primary ?? settle(this.pread(query, params)));
+        const result = await primary;
         if ('error' in result) throw result.error;
         return result.value;
     }
@@ -347,30 +330,6 @@ export class AbstractDatabaseClient extends PuterClient {
         });
     }
 
-    /**
-     * Whole `periodSeconds` buckets since the epoch, from a unix-seconds
-     * column. MySQL's `/` yields a decimal, which would split a bucket.
-     */
-    periodBucket(secondsExpression: string, periodSeconds: number): string {
-        return this.case({
-            mysql: `(${secondsExpression} DIV ${periodSeconds})`,
-            otherwise: `(${secondsExpression} / ${periodSeconds})`,
-        });
-    }
-
-    /**
-     * Counts each (`userExpression`, bucket) pair once. `COUNT(DISTINCT a, b)`
-     * is MySQL-only, so the pair folds into one number — injective while the
-     * bucket stays under the multiplier, which hourly reaches in the 2980s.
-     */
-    countDistinctUserPeriods(
-        userExpression: string,
-        secondsExpression: string,
-        periodSeconds: number,
-    ): string {
-        return `COUNT(DISTINCT ${userExpression} * 10000000 + ${this.periodBucket(secondsExpression, periodSeconds)})`;
-    }
-
     nullCoalesce(...expressions: readonly string[]): string {
         if (expressions.length === 0) {
             throw new Error('nullCoalesce requires at least one expression');
@@ -397,34 +356,6 @@ export class AbstractDatabaseClient extends PuterClient {
         });
     }
 
-    /**
-     * A timestamp column as unix seconds, computed by the database: the mysql
-     * driver reads a stored UTC timestamp as local time, so parsing it in JS
-     * can be off by the server's UTC offset.
-     */
-    unixSecondsSql(column: string): string {
-        return this.case({
-            postgres: `EXTRACT(EPOCH FROM ${column})::bigint`,
-            mysql: `UNIX_TIMESTAMP(${column})`,
-            otherwise: `CAST(strftime('%s', ${column}) AS INTEGER)`,
-        });
-    }
-
-    /**
-     * The database's own clock as epoch milliseconds, so nodes whose clocks
-     * disagree still agree on it. The mysql form ignores the session time zone,
-     * so a DST change can't shift it.
-     */
-    nowMsExpr(): string {
-        return this.case({
-            sqlite: "CAST((julianday('now') - 2440587.5) * 86400000 AS INTEGER)",
-            postgres:
-                'CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)',
-            otherwise:
-                "(TIMESTAMPDIFF(MICROSECOND, '1970-01-01 00:00:00', UTC_TIMESTAMP(6)) DIV 1000)",
-        });
-    }
-
     /**
      * What a read of a timestamp column holding `seconds` returns: sqlite gives
      * back the UTC text it stored, mysql2 and pg a `Date` read in node's time

src/backend/clients/database/MySQLDatabaseClient.test.ts

@@ -435,105 +435,6 @@ describe('MySQLDatabaseClient — query interface', () => {
         ]);
     });
 
-    it.each([
-        { method: 'pread', poolIndex: 0, maxTimeInQueue: 30 },
-        { method: 'read', poolIndex: 1, maxTimeInQueue: 10 },
-    ] as const)(
-        '$method: flushes lone reads at once until 8 are in flight, then waits $maxTimeInQueue ms and coalesces',
-        async ({ method, poolIndex, maxTimeInQueue }) => {
-            const client = await startClient({ replica: { host: 'replica' } });
-            const pool = createdPools[poolIndex];
-            const held: Array<() => void> = [];
-            pool.respond = (sql) =>
-                new Promise((resolve) => {
-                    const sets = sql
-                        .split(';')
-                        .slice(0, -1)
-                        .map((stmt) => [{ stmt }]);
-                    held.push(() => resolve(rowSets(...sets)));
-                });
-            vi.useFakeTimers({
-                toFake: [
-                    'setTimeout',
-                    'clearTimeout',
-                    'setImmediate',
-                    'clearImmediate',
-                ],
-            });
-            try {
-                const reads: Promise<unknown>[] = [];
-                for (let i = 0; i < 8; i++) {
-                    reads.push(client[method](`SELECT ${i}`));
-                    await vi.advanceTimersByTimeAsync(0);
-                }
-                expect(pool.calls).toHaveLength(8);
-
-                reads.push(client[method]('SELECT 8'));
-                await vi.advanceTimersByTimeAsync(maxTimeInQueue - 1);
-                reads.push(client[method]('SELECT 9'));
-                expect(pool.calls).toHaveLength(8);
-                await vi.advanceTimersByTimeAsync(1);
-                expect(pool.calls.map((c) => c.sql).at(-1)).toBe(
-                    'SELECT 8;SELECT 9; SELECT 1',
-                );
-
-                for (const release of held.splice(0)) release();
-                const rows = await Promise.all(reads);
-                expect(rows.at(-2)).toEqual([{ stmt: 'SELECT 8' }]);
-                expect(rows.at(-1)).toEqual([{ stmt: 'SELECT 9' }]);
-            } finally {
-                vi.useRealTimers();
-            }
-        },
-    );
-
-    it.each([
-        { setup: 'single node', replica: undefined, waits: true },
-        { setup: 'replica', replica: { host: 'replica' }, waits: false },
-    ])(
-        '$setup: 8 primary reads in flight hold back a lone read: $waits',
-        async ({ replica, waits }) => {
-            const client = await startClient(replica ? { replica } : {});
-            const held: Array<() => void> = [];
-            for (const pool of createdPools) {
-                pool.respond = (sql) =>
-                    new Promise((resolve) => {
-                        const sets = sql
-                            .split(';')
-                            .slice(0, -1)
-                            .map((stmt) => [{ stmt }]);
-                        held.push(() => resolve(rowSets(...sets)));
-                    });
-            }
-            const sent = () => createdPools.flatMap((pool) => pool.calls);
-            vi.useFakeTimers({
-                toFake: [
-                    'setTimeout',
-                    'clearTimeout',
-                    'setImmediate',
-                    'clearImmediate',
-                ],
-            });
-            try {
-                const reads: Promise<unknown>[] = [];
-                for (let i = 0; i < 8; i++) {
-                    reads.push(client.pread(`SELECT ${i}`));
-                    await vi.advanceTimersByTimeAsync(0);
-                }
-                reads.push(client.read('SELECT 8'));
-                await vi.advanceTimersByTimeAsync(0);
-                expect(sent()).toHaveLength(waits ? 8 : 9);
-                await vi.advanceTimersByTimeAsync(10);
-                expect(sent()).toHaveLength(9);
-
-                for (const release of held.splice(0)) release();
-                await Promise.all(reads);
-            } finally {
-                vi.useRealTimers();
-            }
-        },
-    );
-
     it('sends a write on its own, outside a transaction', async () => {
         const client = await startClient();
         const pool = createdPools[0];
@@ -571,23 +472,6 @@ describe('MySQLDatabaseClient — query interface', () => {
         });
     });
 
-    it('passes the warning count through, so callers can tell a clean write', async () => {
-        const client = await startClient();
-        createdPools[0].respond = () =>
-            writeHeader({ insertId: 9, affectedRows: 1, warningStatus: 1 });
-
-        await expect(
-            client.write('INSERT IGNORE INTO `user` (`username`) VALUES (?)', [
-                'ada',
-            ]),
-        ).resolves.toEqual({
-            insertId: 9,
-            affectedRows: 1,
-            anyRowsAffected: true,
-            warningStatus: 1,
-        });
-    });
-
     it('reports no rows affected when the header omits the counters', async () => {
         const client = await startClient();
         createdPools[0].respond = () => writeHeader({});

src/backend/clients/database/MySQLDatabaseClient.ts

@@ -78,13 +78,8 @@ export class MySQLDatabaseClient extends AbstractDatabaseClient {
         });
         console.log('[mysql] connected to primary');
 
-        // Read batchers on one pool share the cap on immediate flushes.
-        const primaryReadFlushes = { count: 0 };
         this.db = this.createPrimaryBatcher(this.primaryPool);
-        this.dbPrimaryRead = this.createPrimaryReadBatcher(
-            this.primaryPool,
-            primaryReadFlushes,
-        );
+        this.dbPrimaryRead = this.createPrimaryReadBatcher(this.primaryPool);
 
         if (dbConf.replica) {
             this.replicaPool = this.createPool(dbConf.replica);
@@ -95,12 +90,7 @@ export class MySQLDatabaseClient extends AbstractDatabaseClient {
             this.configuration = Configuration.SINGLE;
         }
 
-        this.dbReplica = this.createReplicaBatcher(
-            this.replicaPool,
-            this.configuration === Configuration.SINGLE
-                ? primaryReadFlushes
-                : { count: 0 },
-        );
+        this.dbReplica = this.createReplicaBatcher(this.replicaPool);
 
         await this.applyMigrationPaths(
             () => this.primaryPool.promise().getConnection(),
@@ -174,14 +164,12 @@ export class MySQLDatabaseClient extends AbstractDatabaseClient {
         const header = result[0] as {
             insertId?: number;
             affectedRows?: number;
-            warningStatus?: number;
         };
         const affectedRows = header.affectedRows ?? 0;
         return {
             insertId: header.insertId ?? 0,
             affectedRows,
             anyRowsAffected: affectedRows > 0,
-            warningStatus: header.warningStatus,
         };
     }
 
@@ -217,8 +205,7 @@ export class MySQLDatabaseClient extends AbstractDatabaseClient {
         return this.configuration === Configuration.REPLICA;
     }
 
-    // No failover: `tryHardRead` falls back to the primary on an empty result
-    // or error (raced alongside by default, after the replica with `race: false`).
+    // No failover: `tryHardRead` already has a primary read in flight.
     protected override async replicaRead(
         query: string,
         params: unknown[],
@@ -287,14 +274,9 @@ export class MySQLDatabaseClient extends AbstractDatabaseClient {
     }
 
     /** Reads that must see the primary, still coalesced. */
-    private createPrimaryReadBatcher(
-        pool: Pool,
-        inFlight: { count: number },
-    ): SQLBatcher {
+    private createPrimaryReadBatcher(pool: Pool): SQLBatcher {
         return new SQLBatcher(pool, {
             maxTimeInQueue: 30,
-            maxInFlightImmediate: 8,
-            inFlight,
             maxBatchSize: 5,
             poolLabel: 'primary',
             readOnly: true,
@@ -302,14 +284,9 @@ export class MySQLDatabaseClient extends AbstractDatabaseClient {
         });
     }
 
-    private createReplicaBatcher(
-        pool: Pool,
-        inFlight: { count: number },
-    ): SQLBatcher {
+    private createReplicaBatcher(pool: Pool): SQLBatcher {
         return new SQLBatcher(pool, {
             maxTimeInQueue: 10,
-            maxInFlightImmediate: 8,
-            inFlight,
             maxBatchSize: 5,
             poolLabel: 'replica',
             readOnly: true,

src/backend/clients/database/SQLBatcher.js

@@ -76,7 +76,6 @@ const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 export class SQLBatcher {
     dbPool;
     maxTimeInQueue;
-    maxInFlightImmediate;
     maxBatchSize;
     maxQueueSize;
     failureThreshold;
@@ -85,9 +84,7 @@ export class SQLBatcher {
     readOnly;
     acquireTimeoutMs;
     queue = [];
-    #flushTimer = null;
-    #flushTimerIsImmediate = false;
-    #inFlight;
+    timeouts = [];
     #consecutiveFailures = 0;
     #lastFailureAt = 0;
     #metricAttrs;
@@ -96,11 +93,6 @@ export class SQLBatcher {
      * @param {object} dbPool Mysql2 pool
      * @param {object} [opts]
      * @param {number} [opts.maxTimeInQueue] Ms an item may wait before flush
-     * @param {number} [opts.maxInFlightImmediate] While fewer flushes than this
-     *   are in flight, a lone item flushes on the next turn instead of waiting
-     *   maxTimeInQueue; past it, items wait and coalesce to spare connections
-     * @param {{ count: number }} [opts.inFlight] In-flight flush counter the
-     *   cap reads; batchers sharing a pool can share one
      * @param {number} [opts.maxBatchSize] Items coalesced per flush
      * @param {number} [opts.maxQueueSize] Drop-oldest high-water mark
      * @param {number} [opts.failureThreshold] Consecutive failures to open the
@@ -119,8 +111,6 @@ export class SQLBatcher {
         dbPool,
         {
             maxTimeInQueue = 20,
-            maxInFlightImmediate = 0,
-            inFlight = { count: 0 },
             maxBatchSize = 50,
             maxQueueSize = DEFAULT_MAX_QUEUE_SIZE,
             failureThreshold = DEFAULT_FAILURE_THRESHOLD,
@@ -132,8 +122,6 @@ export class SQLBatcher {
     ) {
         this.dbPool = dbPool;
         this.maxTimeInQueue = maxTimeInQueue;
-        this.maxInFlightImmediate = maxInFlightImmediate;
-        this.#inFlight = inFlight;
         this.maxBatchSize = maxBatchSize;
         this.maxQueueSize = maxQueueSize;
         this.failureThreshold = failureThreshold;
@@ -197,34 +185,17 @@ export class SQLBatcher {
 
         if (this.queue.length >= this.maxBatchSize) {
             this.flush(this.queue.splice(0, this.maxBatchSize));
-        } else if (this.#flushTimer === null) {
-            this.#armFlushTimer();
+        } else if (this.queue.length === 1) {
+            this.timeouts.push(
+                setTimeout(() => {
+                    this.flush(this.queue.splice(0, this.queue.length));
+                }, this.maxTimeInQueue),
+            );
         }
 
         return promise;
     }
 
-    // A lone flush holds a pooled connection for a full round trip, so only
-    // the first maxInFlightImmediate flushes skip the wait.
-    #armFlushTimer() {
-        const run = () => {
-            this.#flushTimer = null;
-            this.flush(this.queue.splice(0, this.queue.length));
-        };
-        this.#flushTimerIsImmediate =
-            this.#inFlight.count < this.maxInFlightImmediate;
-        this.#flushTimer = this.#flushTimerIsImmediate
-            ? setImmediate(run)
-            : setTimeout(run, this.maxTimeInQueue);
-    }
-
-    #clearFlushTimer() {
-        if (this.#flushTimer === null) return;
-        if (this.#flushTimerIsImmediate) clearImmediate(this.#flushTimer);
-        else clearTimeout(this.#flushTimer);
-        this.#flushTimer = null;
-    }
-
     // Bounded wait for a pooled connection. Without a bound, a stalled
     // database turns every flush into an indefinite hang — nothing fails,
     // so neither the breaker nor callers' own timeouts ever engage.
@@ -281,18 +252,12 @@ export class SQLBatcher {
     }
 
     async flush(batch) {
-        this.#clearFlushTimer();
+        const timeout = this.timeouts.shift();
+        if (timeout && !timeout._destroyed) {
+            clearTimeout(timeout);
+        }
         if (batch.length === 0) return;
 
-        this.#inFlight.count++;
-        try {
-            await this.#flushBatch(batch);
-        } finally {
-            this.#inFlight.count--;
-        }
-    }
-
-    async #flushBatch(batch) {
         let connection;
         try {
             connection = await this.#acquireConnection();

src/backend/clients/database/SQLBatcher.test.ts

@@ -69,356 +69,6 @@ const happyBatch = (sql: string) => {
     ];
 };
 
-// Each query on this connection waits until the test releases it, so its
-// flush stays in flight.
-const makeHeldConnection = () => {
-    const held: Array<() => void> = [];
-    const conn = makeConnection(
-        (sql) =>
-            new Promise((resolve) => {
-                held.push(() => resolve(happyBatch(sql)));
-            }),
-    );
-    const releaseAll = () => {
-        for (const release of held.splice(0)) release();
-    };
-    const sent = () => conn.query.mock.calls.map(([sql]) => sql);
-    return { conn, releaseAll, sent };
-};
-
-const fakeFlushTimers = () =>
-    vi.useFakeTimers({
-        toFake: [
-            'setTimeout',
-            'clearTimeout',
-            'setImmediate',
-            'clearImmediate',
-        ],
-    });
-
-describe('SQLBatcher flush timing', () => {
-    it('flushes a lone query on the next turn while under the in-flight cap', async () => {
-        const conn = makeConnection(happyBatch);
-        const { pool, getConnection } = makePool(conn);
-        const batcher = new SQLBatcher(pool, {
-            readOnly: true,
-            maxTimeInQueue: 60_000,
-            maxInFlightImmediate: 2,
-        });
-
-        const pending = batcher.query('SELECT a', []);
-        expect(getConnection).not.toHaveBeenCalled();
-        await new Promise((resolve) => setImmediate(resolve));
-        expect(getConnection).toHaveBeenCalledTimes(1);
-        expect((await pending)[0]).toEqual([{ n: 0 }]);
-    });
-
-    it('holds a lone query for maxTimeInQueue without an in-flight cap', async () => {
-        fakeFlushTimers();
-        try {
-            const conn = makeConnection(happyBatch);
-            const { pool, getConnection } = makePool(conn);
-            const batcher = new SQLBatcher(pool, {
-                readOnly: true,
-                maxTimeInQueue: 30,
-            });
-
-            const pending = batcher.query('SELECT a', []);
-            await vi.advanceTimersByTimeAsync(29);
-            expect(getConnection).not.toHaveBeenCalled();
-            await vi.advanceTimersByTimeAsync(1);
-            expect(getConnection).toHaveBeenCalledTimes(1);
-            expect((await pending)[0]).toEqual([{ n: 0 }]);
-        } finally {
-            vi.useRealTimers();
-        }
-    });
-
-    it('batches queries from the same turn and sends later ones separately', async () => {
-        const conn = makeConnection(happyBatch);
-        const { pool, getConnection } = makePool(conn);
-        const batcher = new SQLBatcher(pool, {
-            readOnly: true,
-            maxInFlightImmediate: 8,
-        });
-
-        const sameTurn = [
-            batcher.query('SELECT a', []),
-            batcher.query('SELECT b', []),
-            batcher.query('SELECT c', []),
-        ];
-        await new Promise((resolve) => setImmediate(resolve));
-        const nextTurn = batcher.query('SELECT d', []);
-        const results = await Promise.all([...sameTurn, nextTurn]);
-
-        expect(results.map((r) => r[0])).toEqual([
-            [{ n: 0 }],
-            [{ n: 1 }],
-            [{ n: 2 }],
-            [{ n: 0 }],
-        ]);
-        expect(getConnection).toHaveBeenCalledTimes(2);
-        expect(conn.query.mock.calls.map(([sql]) => sql)).toEqual([
-            'SELECT a;SELECT b;SELECT c; SELECT 1',
-            'SELECT d; SELECT 1',
-        ]);
-    });
-
-    it('gives a query enqueued during an in-flight flush its own flush while under the cap', async () => {
-        const { conn, releaseAll, sent } = makeHeldConnection();
-        const { pool } = makePool(conn);
-        const batcher = new SQLBatcher(pool, {
-            readOnly: true,
-            maxInFlightImmediate: 2,
-        });
-        const turn = () => new Promise((resolve) => setImmediate(resolve));
-
-        const a = batcher.query('SELECT a', []);
-        await turn();
-        const b = batcher.query('SELECT b', []);
-        await turn();
-        expect(sent()).toEqual(['SELECT a; SELECT 1', 'SELECT b; SELECT 1']);
-
-        releaseAll();
-        expect((await a)[0]).toEqual([{ n: 0 }]);
-        expect((await b)[0]).toEqual([{ n: 0 }]);
-    });
-
-    it('holds a lone query for maxTimeInQueue at the in-flight cap and coalesces what follows', async () => {
-        fakeFlushTimers();
-        try {
-            const { conn, releaseAll, sent } = makeHeldConnection();
-            const { pool } = makePool(conn);
-            const batcher = new SQLBatcher(pool, {
-                readOnly: true,
-                maxTimeInQueue: 30,
-                maxInFlightImmediate: 1,
-            });
-
-            const a = batcher.query('SELECT a', []);
-            await vi.advanceTimersByTimeAsync(0);
-            expect(sent()).toEqual(['SELECT a; SELECT 1']);
-
-            const b = batcher.query('SELECT b', []);
-            await vi.advanceTimersByTimeAsync(29);
-            const c = batcher.query('SELECT c', []);
-            expect(sent()).toHaveLength(1);
-            await vi.advanceTimersByTimeAsync(1);
-            expect(sent()).toEqual([
-                'SELECT a; SELECT 1',
-                'SELECT b;SELECT c; SELECT 1',
-            ]);
-
-            releaseAll();
-            expect((await a)[0]).toEqual([{ n: 0 }]);
-            expect((await b)[0]).toEqual([{ n: 0 }]);
-            expect((await c)[0]).toEqual([{ n: 1 }]);
-
-            // Settled flushes free the cap again.
-            const d = batcher.query('SELECT d', []);
-            await vi.advanceTimersByTimeAsync(0);
-            expect(sent()).toHaveLength(3);
-            releaseAll();
-            expect((await d)[0]).toEqual([{ n: 0 }]);
-        } finally {
-            vi.useRealTimers();
-        }
-    });
-
-    it('shares the in-flight cap between batchers given one counter', async () => {
-        fakeFlushTimers();
-        try {
-            const { conn, releaseAll, sent } = makeHeldConnection();
-            const { pool } = makePool(conn);
-            const inFlight = { count: 0 };
-            const opts = {
-                readOnly: true,
-                maxTimeInQueue: 30,
-                maxInFlightImmediate: 1,
-                inFlight,
-            };
-            const first = new SQLBatcher(pool, opts);
-            const second = new SQLBatcher(pool, opts);
-            const own = new SQLBatcher(pool, { ...opts, inFlight: undefined });
-
-            const a = first.query('SELECT a', []);
-            await vi.advanceTimersByTimeAsync(0);
-            const b = second.query('SELECT b', []);
-            const c = own.query('SELECT c', []);
-            await vi.advanceTimersByTimeAsync(0);
-            expect(sent()).toEqual([
-                'SELECT a; SELECT 1',
-                'SELECT c; SELECT 1',
-            ]);
-            await vi.advanceTimersByTimeAsync(30);
-            expect(sent()).toHaveLength(3);
-            expect(sent()[2]).toBe('SELECT b; SELECT 1');
-
-            releaseAll();
-            await Promise.all([a, b, c]);
-            expect(inFlight.count).toBe(0);
-        } finally {
-            vi.useRealTimers();
-        }
-    });
-
-    it('counts a flush as in flight until its per-item fallback settles', async () => {
-        const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
-        fakeFlushTimers();
-        try {
-            const held: Array<() => void> = [];
-            const conn = makeConnection((sql) => {
-                if (isBatchQuery(sql)) throw makeError('ECONNRESET');
-                return new Promise((resolve) => {
-                    held.push(() => resolve([[{ ok: sql }], undefined]));
-                });
-            });
-            const { pool } = makePool(conn);
-            const sent = () => conn.query.mock.calls.map(([sql]) => sql);
-            const batcher = new SQLBatcher(pool, {
-                readOnly: true,
-                maxTimeInQueue: 30,
-                maxInFlightImmediate: 1,
-                acquireTimeoutMs: 0,
-            });
-
-            const a = batcher.query('SELECT a', []);
-            await vi.advanceTimersByTimeAsync(0);
-            // The batch failed; the per-item retry of `a` is still running.
-            expect(sent()).toEqual(['SELECT a; SELECT 1', 'SELECT a']);
-
-            const b = batcher.query('SELECT b', []);
-            await vi.advanceTimersByTimeAsync(29);
-            expect(sent()).toHaveLength(2);
-            await vi.advanceTimersByTimeAsync(1);
-            expect(sent()).toEqual([
-                'SELECT a; SELECT 1',
-                'SELECT a',
-                'SELECT b; SELECT 1',
-                'SELECT b',
-            ]);
-
-            for (const release of held.splice(0)) release();
-            expect((await a)[0]).toEqual([{ ok: 'SELECT a' }]);
-            expect((await b)[0]).toEqual([{ ok: 'SELECT b' }]);
-        } finally {
-            vi.useRealTimers();
-            warnSpy.mockRestore();
-        }
-    });
-
-    it('flushes a full batch at once past the cap and cancels the armed wait', async () => {
-        fakeFlushTimers();
-        try {
-            const { conn, releaseAll, sent } = makeHeldConnection();
-            const { pool, getConnection } = makePool(conn);
-            const batcher = new SQLBatcher(pool, {
-                readOnly: true,
-                maxBatchSize: 2,
-                maxTimeInQueue: 30,
-                maxInFlightImmediate: 1,
-                acquireTimeoutMs: 0,
-            });
-
-            const a = batcher.query('SELECT a', []);
-            await vi.advanceTimersByTimeAsync(0);
-            const b = batcher.query('SELECT b', []);
-            expect(vi.getTimerCount()).toBe(1);
-            const c = batcher.query('SELECT c', []);
-            expect(getConnection).toHaveBeenCalledTimes(2);
-            expect(vi.getTimerCount()).toBe(0);
-
-            // A later lone query waits its own full maxTimeInQueue.
-            await vi.advanceTimersByTimeAsync(10);
-            const d = batcher.query('SELECT d', []);
-            await vi.advanceTimersByTimeAsync(29);
-            expect(getConnection).toHaveBeenCalledTimes(2);
-            await vi.advanceTimersByTimeAsync(1);
-            expect(getConnection).toHaveBeenCalledTimes(3);
-            expect(sent()).toEqual([
-                'SELECT a; SELECT 1',
-                'SELECT b;SELECT c; SELECT 1',
-                'SELECT d; SELECT 1',
-            ]);
-
-            releaseAll();
-            await Promise.all([a, b, c, d]);
-        } finally {
-            vi.useRealTimers();
-        }
-    });
-
-    it('cancels the pending next-turn flush when a batch fills up', async () => {
-        fakeFlushTimers();
-        try {
-            const conn = makeConnection(happyBatch);
-            const { pool, getConnection } = makePool(conn);
-            const batcher = new SQLBatcher(pool, {
-                maxBatchSize: 2,
-                readOnly: true,
-                maxInFlightImmediate: 8,
-                acquireTimeoutMs: 0,
-            });
-
-            const a = batcher.query('SELECT a', []);
-            expect(vi.getTimerCount()).toBe(1);
-            const b = batcher.query('SELECT b', []);
-            expect(vi.getTimerCount()).toBe(0);
-
-            const c = batcher.query('SELECT c', []);
-            expect(vi.getTimerCount()).toBe(1);
-            await vi.runAllTimersAsync();
-            await Promise.all([a, b, c]);
-
-            expect(vi.getTimerCount()).toBe(0);
-            expect(getConnection).toHaveBeenCalledTimes(2);
-        } finally {
-            vi.useRealTimers();
-        }
-    });
-
-    it('leaves no timer armed after a failed flush, a drop or a breaker rejection', async () => {
-        const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
-        fakeFlushTimers();
-        try {
-            const getConnection = vi.fn(async () => {
-                throw makeError('ECONNREFUSED');
-            });
-            const batcher = new SQLBatcher(
-                { promise: () => ({ getConnection }) },
-                {
-                    readOnly: true,
-                    maxQueueSize: 1,
-                    failureThreshold: 1,
-                    cooldownMs: 60_000,
-                    maxInFlightImmediate: 8,
-                },
-            );
-
-            const dropped = expect(
-                batcher.query('SELECT a', []),
-            ).rejects.toMatchObject({ reason: 'queueOverflow' });
-            const failed = expect(
-                batcher.query('SELECT b', []),
-            ).rejects.toMatchObject({ reason: 'connAcquire' });
-            expect(vi.getTimerCount()).toBe(1);
-            await vi.runAllTimersAsync();
-            await dropped;
-            await failed;
-            expect(vi.getTimerCount()).toBe(0);
-
-            await expect(batcher.query('SELECT c', [])).rejects.toMatchObject({
-                reason: 'breakerOpen',
-            });
-            expect(vi.getTimerCount()).toBe(0);
-            expect(batcher.queue).toHaveLength(0);
-        } finally {
-            vi.useRealTimers();
-            warnSpy.mockRestore();
-        }
-    });
-});
-
 describe('SQLBatcher', () => {
     it('resolves each batched item with its own result', async () => {
         const conn = makeConnection(happyBatch);

src/backend/clients/database/SqliteDatabaseClient.test.ts

@@ -27,7 +27,7 @@ import { DatabaseClientFactory } from './index.js';
 import { SqliteDatabaseClient } from './SqliteDatabaseClient.js';
 
 /** Highest schema version the migration table can reach. */
-const CURRENT_SCHEMA_VERSION = 98;
+const CURRENT_SCHEMA_VERSION = 89;
 
 /**
  * These suites migrate real files on disk. Idle they finish in well under a
@@ -673,38 +673,6 @@ describe('SqliteDatabaseClient — boot and migrations', { timeout: DISK_MIGRATI
         });
     });
 
-    it('adds kv_share_handles.notify from 0099, off for every existing share', async () => {
-        const dir = mkdtempSync(join(tmpdir(), 'puter-sqlite-notify-'));
-        const path = join(dir, 'puter.sqlite');
-        try {
-            const before = new SqliteDatabaseClient(
-                sqliteConfig({ inMemory: false, path, targetVersion: 94 }),
-            );
-            await before.onServerStart();
-            await before.write(
-                'INSERT INTO `kv_share_handles` (`handle`, `owner_user_id`, ' +
-                    '`grantee_user_id`, `app_uid`, `key_prefix`, `permission`, ' +
-                    '`created_at`) VALUES (?, 1, 1, ?, ?, ?, 0)',
-                ['kvh-before-notify', 'os-global', 'a:', 'kv-share:x'],
-            );
-            before.onServerShutdown();
-
-            const after = new SqliteDatabaseClient(
-                sqliteConfig({ inMemory: false, path }),
-            );
-            await after.onServerStart();
-            await expect(
-                after.read(
-                    'SELECT `notify` FROM `kv_share_handles` WHERE `handle` = ?',
-                    ['kvh-before-notify'],
-                ),
-            ).resolves.toEqual([{ notify: 0 }]);
-            after.onServerShutdown();
-        } finally {
-            rmSync(dir, { recursive: true, force: true });
-        }
-    });
-
     it('indexes notification.created_at for the retention sweep', async () => {
         const rows = await client.read('PRAGMA index_list(`notification`)');
         expect(rows.map((r) => String(r.name))).toContain(
@@ -712,97 +680,6 @@ describe('SqliteDatabaseClient — boot and migrations', { timeout: DISK_MIGRATI
         );
     });
 
-    it('indexes notification.replaced_at per mailbox slice for catch-up', async () => {
-        const columns = await client.read(
-            'PRAGMA index_info(`idx_notification_replaced`)',
-        );
-        expect(columns.map((c) => String(c.name))).toEqual([
-            'user_id',
-            'audience',
-            'app_uid',
-            'replaced_at',
-        ]);
-    });
-
-    it('keeps notification.send_key unique', async () => {
-        const rows = await client.read('PRAGMA index_list(`notification`)');
-        expect(
-            rows.find((r) => r.name === 'idx_notification_send_key'),
-        ).toMatchObject({ unique: 1 });
-        const columns = await client.read(
-            'PRAGMA index_info(`idx_notification_send_key`)',
-        );
-        expect(columns.map((c) => String(c.name))).toEqual(['send_key']);
-    });
-
-    it('creates event_user_handlers with its unique and holder indexes', async () => {
-        const columns = await client.read(
-            'PRAGMA table_info(`event_user_handlers`)',
-        );
-        expect(columns.map((c) => String(c.name))).toEqual([
-            'id',
-            'app_uid',
-            'holder_user_id',
-            'name',
-            'source',
-            'source_hash',
-            'created_at',
-            'updated_at',
-            'scope_since',
-        ]);
-        const indexes = await client.read(
-            'PRAGMA index_list(`event_user_handlers`)',
-        );
-        expect(
-            indexes.find(
-                (i) => i.name === 'idx_event_user_handlers_app_holder_name',
-            ),
-        ).toMatchObject({ unique: 1 });
-        expect(
-            indexes.find((i) => i.name === 'idx_event_user_handlers_holder_app'),
-        ).toMatchObject({ unique: 0 });
-        const columnsOf = async (index: string) =>
-            (await client.read(`PRAGMA index_info(\`${index}\`)`)).map((c) =>
-                String(c.name),
-            );
-        expect(await columnsOf('idx_event_user_handlers_app_holder_name')).toEqual(
-            ['app_uid', 'holder_user_id', 'name'],
-        );
-        expect(await columnsOf('idx_event_user_handlers_holder_app')).toEqual([
-            'holder_user_id',
-            'app_uid',
-        ]);
-    });
-
-    it('leaves event_handlers as it was', async () => {
-        const columns = await client.read('PRAGMA table_info(`event_handlers`)');
-        expect(columns.map((c) => String(c.name))).toEqual([
-            'id',
-            'app_uid',
-            'name',
-            'source',
-            'source_hash',
-            'created_at',
-            'updated_at',
-        ]);
-    });
-
-    it('adds event_subscriptions.handler_scope, app scope for existing rows', async () => {
-        const columns = await client.read(
-            'PRAGMA table_info(`event_subscriptions`)',
-        );
-        expect(columns.find((c) => c.name === 'handler_scope')).toMatchObject({
-            notnull: 1,
-            dflt_value: '0',
-        });
-        const indexes = await client.read(
-            'PRAGMA index_list(`event_subscriptions`)',
-        );
-        expect(indexes.map((i) => String(i.name))).toContain(
-            'idx_event_subscriptions_holder',
-        );
-    });
-
     it('leaves an already-migrated database untouched on a second boot', async () => {
         const dir = mkdtempSync(join(tmpdir(), 'puter-sqlite-'));
         const path = join(dir, 'nested', 'puter.sqlite');
@@ -1053,7 +930,6 @@ describe('SqliteDatabaseClient — query interface', () => {
             affectedRows: 1,
             anyRowsAffected: true,
         });
-        expect(inserted).not.toHaveProperty('warningStatus');
 
         const missed = await client.write(
             'UPDATE `widget` SET `name` = ? WHERE `id` = ?',

src/backend/clients/database/SqliteDatabaseClient.ts

@@ -128,15 +128,6 @@ const AVAILABLE_MIGRATIONS: [number, string[]][] = [
     [86, ['0091_icloud-dot-significance.sql']],
     [87, ['0092_share-entry-owner.sql']],
     [88, ['0093_fsentries-parent-uid-index.sql']],
-    [89, ['0094_deleted-apps.sql']],
-    [90, ['0095_kv-share-handle-levels.sql']],
-    [91, ['0096_kv-share-handle-quota-indexes.sql']],
-    [92, ['0097_user-to-user-holder-permission-index.sql']],
-    [93, ['0098_notification-groups.sql']],
-    [94, ['0099_kv-share-handle-notify.sql']],
-    [95, ['0100_notification-send-key.sql']],
-    [96, ['0101_user-scoped-handlers.sql']],
-    [97, ['0102_notification-scope-id-index.sql']],
 ];
 
 export class SqliteDatabaseClient extends AbstractDatabaseClient {
@@ -215,9 +206,6 @@ export class SqliteDatabaseClient extends AbstractDatabaseClient {
             insertId: info.lastInsertRowid,
             affectedRows: info.changes,
             anyRowsAffected: info.changes > 0,
-            // No warningStatus: SQLite raises none, but a new row can reuse a
-            // deleted row's rowid that other tables still name, so a clean
-            // insert doesn't prove the row is all the caller sent.
         };
     }
 

src/backend/clients/database/migrations/mysql/mysql_mig_48.sql

@@ -1,26 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- Uid and owner of each deleted app. Mirrors SQLite migration 0094.
---
--- Idempotent: `CREATE TABLE IF NOT EXISTS` lets the directory replay safely.
-
-CREATE TABLE IF NOT EXISTS `deleted_apps` (
-    `uid` VARCHAR(40) NOT NULL,
-    `owner_user_id` INT UNSIGNED DEFAULT NULL,
-    PRIMARY KEY (`uid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

src/backend/clients/database/migrations/mysql/mysql_mig_49.sql

@@ -1,50 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- Share levels on `kv_share_handles`. See
--- sqlite/0095_kv-share-handle-levels.sql for the rationale. No per-file
--- applied-state tracking, so every step is guarded and a replay does nothing.
-
-CALL _puter_add_col('kv_share_handles', 'revoked_by', '`revoked_by` varchar(8) DEFAULT NULL');
-CALL _puter_add_col('kv_share_handles', 'label', '`label` varchar(512) DEFAULT NULL');
-
-DROP PROCEDURE IF EXISTS _puter_add_kv_share_handle_indexes;
-DELIMITER //
-CREATE PROCEDURE _puter_add_kv_share_handle_indexes()
-BEGIN
-  IF NOT EXISTS (
-    SELECT 1 FROM INFORMATION_SCHEMA.STATISTICS
-    WHERE TABLE_SCHEMA = DATABASE()
-      AND TABLE_NAME = 'kv_share_handles'
-      AND INDEX_NAME = 'idx_kv_share_handles_grantee'
-  ) THEN
-    ALTER TABLE `kv_share_handles` ADD INDEX `idx_kv_share_handles_grantee` (`grantee_user_id`, `id`);
-  END IF;
-  IF NOT EXISTS (
-    SELECT 1 FROM INFORMATION_SCHEMA.STATISTICS
-    WHERE TABLE_SCHEMA = DATABASE()
-      AND TABLE_NAME = 'kv_share_handles'
-      AND INDEX_NAME = 'idx_kv_share_handles_app'
-  ) THEN
-    ALTER TABLE `kv_share_handles` ADD INDEX `idx_kv_share_handles_app` (`app_uid`);
-  END IF;
-END//
-DELIMITER ;
-
-CALL _puter_add_kv_share_handle_indexes();
-
-DROP PROCEDURE IF EXISTS _puter_add_kv_share_handle_indexes;

src/backend/clients/database/migrations/mysql/mysql_mig_50.sql

@@ -1,72 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- Share-handle quota, listing and purge indexes. See
--- sqlite/0096_kv-share-handle-quota-indexes.sql for what each serves. No
--- per-file applied-state tracking, so every index is guarded and a replay does
--- nothing.
-
-DROP PROCEDURE IF EXISTS _puter_add_kv_share_handle_quota_indexes;
-DELIMITER //
-CREATE PROCEDURE _puter_add_kv_share_handle_quota_indexes()
-BEGIN
-  IF NOT EXISTS (
-    SELECT 1 FROM INFORMATION_SCHEMA.STATISTICS
-    WHERE TABLE_SCHEMA = DATABASE()
-      AND TABLE_NAME = 'kv_share_handles'
-      AND INDEX_NAME = 'idx_kv_share_handles_owner_live'
-  ) THEN
-    ALTER TABLE `kv_share_handles` ADD INDEX `idx_kv_share_handles_owner_live` (`owner_user_id`, `revoked_at`, `app_uid`);
-  END IF;
-  IF NOT EXISTS (
-    SELECT 1 FROM INFORMATION_SCHEMA.STATISTICS
-    WHERE TABLE_SCHEMA = DATABASE()
-      AND TABLE_NAME = 'kv_share_handles'
-      AND INDEX_NAME = 'idx_kv_share_handles_owner_app'
-  ) THEN
-    ALTER TABLE `kv_share_handles` ADD INDEX `idx_kv_share_handles_owner_app` (`owner_user_id`, `app_uid`, `id`);
-  END IF;
-  IF NOT EXISTS (
-    SELECT 1 FROM INFORMATION_SCHEMA.STATISTICS
-    WHERE TABLE_SCHEMA = DATABASE()
-      AND TABLE_NAME = 'kv_share_handles'
-      AND INDEX_NAME = 'idx_kv_share_handles_grantee_app'
-  ) THEN
-    ALTER TABLE `kv_share_handles` ADD INDEX `idx_kv_share_handles_grantee_app` (`grantee_user_id`, `app_uid`, `id`);
-  END IF;
-  IF NOT EXISTS (
-    SELECT 1 FROM INFORMATION_SCHEMA.STATISTICS
-    WHERE TABLE_SCHEMA = DATABASE()
-      AND TABLE_NAME = 'kv_share_handles'
-      AND INDEX_NAME = 'idx_kv_share_handles_pair'
-  ) THEN
-    ALTER TABLE `kv_share_handles` ADD INDEX `idx_kv_share_handles_pair` (`owner_user_id`, `grantee_user_id`, `revoked_at`);
-  END IF;
-  IF NOT EXISTS (
-    SELECT 1 FROM INFORMATION_SCHEMA.STATISTICS
-    WHERE TABLE_SCHEMA = DATABASE()
-      AND TABLE_NAME = 'kv_share_handles'
-      AND INDEX_NAME = 'idx_kv_share_handles_revoked'
-  ) THEN
-    ALTER TABLE `kv_share_handles` ADD INDEX `idx_kv_share_handles_revoked` (`revoked_at`);
-  END IF;
-END//
-DELIMITER ;
-
-CALL _puter_add_kv_share_handle_quota_indexes();
-
-DROP PROCEDURE IF EXISTS _puter_add_kv_share_handle_quota_indexes;

src/backend/clients/database/migrations/mysql/mysql_mig_51.sql

@@ -1,38 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- Lets a holder's grant check read only the permissions it names. Guarded, so
--- a replay does nothing.
-
-DROP PROCEDURE IF EXISTS _puter_add_u2u_holder_permission_index;
-DELIMITER //
-CREATE PROCEDURE _puter_add_u2u_holder_permission_index()
-BEGIN
-  IF NOT EXISTS (
-    SELECT 1 FROM INFORMATION_SCHEMA.STATISTICS
-    WHERE TABLE_SCHEMA = DATABASE()
-      AND TABLE_NAME = 'user_to_user_permissions'
-      AND INDEX_NAME = 'idx_user_to_user_permissions_holder_permission'
-  ) THEN
-    ALTER TABLE `user_to_user_permissions` ADD INDEX `idx_user_to_user_permissions_holder_permission` (`holder_user_id`, `permission`);
-  END IF;
-END//
-DELIMITER ;
-
-CALL _puter_add_u2u_holder_permission_index();
-
-DROP PROCEDURE IF EXISTS _puter_add_u2u_holder_permission_index;

src/backend/clients/database/migrations/mysql/mysql_mig_52.sql

@@ -1,53 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- `notification`.`group_key` and `replaced_at`. See
--- sqlite/0098_notification-groups.sql for the rationale. The key is a hex
--- digest, so ascii and compared byte for byte. No per-file applied-state
--- tracking, so every step is guarded and a replay does nothing.
-
-CALL _puter_add_col('notification', 'group_key', '`group_key` char(64) CHARACTER SET ascii COLLATE ascii_bin DEFAULT NULL');
-CALL _puter_add_col('notification', 'replaced_at', '`replaced_at` bigint DEFAULT NULL');
-
-DROP PROCEDURE IF EXISTS _puter_add_notification_group_indexes;
-DELIMITER //
-CREATE PROCEDURE _puter_add_notification_group_indexes()
-BEGIN
-  IF NOT EXISTS (
-    SELECT 1 FROM INFORMATION_SCHEMA.STATISTICS
-    WHERE TABLE_SCHEMA = DATABASE()
-      AND TABLE_NAME = 'notification'
-      AND INDEX_NAME = 'idx_notification_group'
-  ) THEN
-    ALTER TABLE `notification` ADD INDEX `idx_notification_group`
-      (`user_id`, `app_uid`, `group_key`);
-  END IF;
-  IF NOT EXISTS (
-    SELECT 1 FROM INFORMATION_SCHEMA.STATISTICS
-    WHERE TABLE_SCHEMA = DATABASE()
-      AND TABLE_NAME = 'notification'
-      AND INDEX_NAME = 'idx_notification_replaced'
-  ) THEN
-    ALTER TABLE `notification` ADD INDEX `idx_notification_replaced`
-      (`user_id`, `audience`, `app_uid`, `replaced_at`);
-  END IF;
-END//
-DELIMITER ;
-
-CALL _puter_add_notification_group_indexes();
-
-DROP PROCEDURE IF EXISTS _puter_add_notification_group_indexes;

src/backend/clients/database/migrations/mysql/mysql_mig_53.sql

@@ -1,23 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- Notifications through a share handle. See
--- sqlite/0099_kv-share-handle-notify.sql for the column. No per-file
--- applied-state tracking, so it goes through _puter_add_col and a replay does
--- nothing.
-
-CALL _puter_add_col('kv_share_handles', 'notify', '`notify` tinyint(1) NOT NULL DEFAULT 0');

src/backend/clients/database/migrations/mysql/mysql_mig_54.sql

@@ -1,43 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- `notification`.`send_key`. See sqlite/0100_notification-send-key.sql for the
--- rationale. The key is a uuid, so ascii and compared byte for byte. No
--- per-file applied-state tracking, so every step is guarded and a replay does
--- nothing.
-
-CALL _puter_add_col('notification', 'send_key', '`send_key` char(36) CHARACTER SET ascii COLLATE ascii_bin DEFAULT NULL');
-
-DROP PROCEDURE IF EXISTS _puter_add_notification_send_key_index;
-DELIMITER //
-CREATE PROCEDURE _puter_add_notification_send_key_index()
-BEGIN
-  IF NOT EXISTS (
-    SELECT 1 FROM INFORMATION_SCHEMA.STATISTICS
-    WHERE TABLE_SCHEMA = DATABASE()
-      AND TABLE_NAME = 'notification'
-      AND INDEX_NAME = 'idx_notification_send_key'
-  ) THEN
-    ALTER TABLE `notification` ADD UNIQUE KEY `idx_notification_send_key`
-      (`send_key`), ALGORITHM=INPLACE, LOCK=NONE;
-  END IF;
-END//
-DELIMITER ;
-
-CALL _puter_add_notification_send_key_index();
-
-DROP PROCEDURE IF EXISTS _puter_add_notification_send_key_index;

src/backend/clients/database/migrations/mysql/mysql_mig_55.sql

@@ -1,66 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- Handlers an app's user published into their own scope, kept apart from
--- `event_handlers` so code that predates them never reads them. See
--- sqlite/0101_user-scoped-handlers.sql for the column rationale.
---
--- Idempotent: `CREATE TABLE IF NOT EXISTS` with the indexes declared inline,
--- and a guarded column add. There is no per-file applied-state tracking, so a
--- replay has to be a no-op.
-
-CREATE TABLE IF NOT EXISTS `event_user_handlers` (
-    `id` bigint unsigned NOT NULL AUTO_INCREMENT,
-    -- Matches `apps`.`uid` exactly, charset included, so an equality against
-    -- one never falls back to a conversion.
-    `app_uid` char(40) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL,
-    `holder_user_id` int unsigned NOT NULL,
-    `name` varchar(128) NOT NULL,
-    `source` mediumtext NOT NULL,
-    `source_hash` char(64) NOT NULL,
-    `created_at` bigint NOT NULL,
-    `updated_at` bigint NOT NULL,
-    -- When the scope first held a handler; kept across handler churn, so the
-    -- rent sweep sees the scope's age, not its oldest remaining handler's.
-    `scope_since` bigint NOT NULL,
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `idx_event_user_handlers_app_holder_name` (`app_uid`, `holder_user_id`, `name`),
-    KEY `idx_event_user_handlers_holder_app` (`holder_user_id`, `app_uid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
--- Guarded here rather than through `_puter_add_col`, so the file also applies
--- on its own to a database that never ran the earlier migrations.
-DROP PROCEDURE IF EXISTS _puter_add_event_subscriptions_handler_scope;
-DELIMITER //
-CREATE PROCEDURE _puter_add_event_subscriptions_handler_scope()
-BEGIN
-  IF NOT EXISTS (
-    SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE TABLE_SCHEMA = DATABASE()
-      AND TABLE_NAME = 'event_subscriptions'
-      AND COLUMN_NAME = 'handler_scope'
-  ) THEN
-    ALTER TABLE `event_subscriptions`
-      ADD COLUMN `handler_scope` tinyint unsigned NOT NULL DEFAULT 0,
-      ALGORITHM=INSTANT;
-  END IF;
-END//
-DELIMITER ;
-
-CALL _puter_add_event_subscriptions_handler_scope();
-
-DROP PROCEDURE IF EXISTS _puter_add_event_subscriptions_handler_scope;

src/backend/clients/database/migrations/mysql/mysql_mig_56.sql

@@ -1,41 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- `notification` (`user_id`, `audience`, `app_uid`, `id`). See
--- sqlite/0102_notification-scope-id-index.sql for the rationale. No per-file
--- applied-state tracking, so the index is added only when missing and a
--- replay does nothing.
-
-DROP PROCEDURE IF EXISTS _puter_add_notification_scope_id_index;
-DELIMITER //
-CREATE PROCEDURE _puter_add_notification_scope_id_index()
-BEGIN
-  IF NOT EXISTS (
-    SELECT 1 FROM INFORMATION_SCHEMA.STATISTICS
-    WHERE TABLE_SCHEMA = DATABASE()
-      AND TABLE_NAME = 'notification'
-      AND INDEX_NAME = 'idx_notification_scope_id'
-  ) THEN
-    ALTER TABLE `notification` ADD INDEX `idx_notification_scope_id`
-      (`user_id`, `audience`, `app_uid`, `id`), ALGORITHM=INPLACE, LOCK=NONE;
-  END IF;
-END//
-DELIMITER ;
-
-CALL _puter_add_notification_scope_id_index();
-
-DROP PROCEDURE IF EXISTS _puter_add_notification_scope_id_index;

src/backend/clients/database/migrations/postgres/postgres_mig_37.sql

@@ -1,26 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- Uid and owner of each deleted app. Mirrors SQLite migration 0094 / MySQL
--- mysql_mig_48.
---
--- Idempotent via IF NOT EXISTS.
-
-CREATE TABLE IF NOT EXISTS deleted_apps (
-    uid VARCHAR(40) PRIMARY KEY,
-    owner_user_id INTEGER DEFAULT NULL
-);

src/backend/clients/database/migrations/postgres/postgres_mig_38.sql

@@ -1,29 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- Share levels on kv_share_handles. See
--- sqlite/0095_kv-share-handle-levels.sql for the rationale. Idempotent via
--- IF NOT EXISTS; there is no per-file applied-state tracking.
-
-ALTER TABLE kv_share_handles ADD COLUMN IF NOT EXISTS revoked_by VARCHAR(8) DEFAULT NULL;
-ALTER TABLE kv_share_handles ADD COLUMN IF NOT EXISTS label VARCHAR(512) DEFAULT NULL;
-
-CREATE INDEX IF NOT EXISTS idx_kv_share_handles_grantee
-    ON kv_share_handles (grantee_user_id, id);
-
-CREATE INDEX IF NOT EXISTS idx_kv_share_handles_app
-    ON kv_share_handles (app_uid);

src/backend/clients/database/migrations/postgres/postgres_mig_39.sql

@@ -1,35 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- Share-handle quota, listing and purge indexes. See
--- sqlite/0096_kv-share-handle-quota-indexes.sql for what each serves.
--- Idempotent via IF NOT EXISTS; there is no per-file applied-state tracking.
-
-CREATE INDEX IF NOT EXISTS idx_kv_share_handles_owner_live
-    ON kv_share_handles (owner_user_id, revoked_at, app_uid);
-
-CREATE INDEX IF NOT EXISTS idx_kv_share_handles_owner_app
-    ON kv_share_handles (owner_user_id, app_uid, id);
-
-CREATE INDEX IF NOT EXISTS idx_kv_share_handles_grantee_app
-    ON kv_share_handles (grantee_user_id, app_uid, id);
-
-CREATE INDEX IF NOT EXISTS idx_kv_share_handles_pair
-    ON kv_share_handles (owner_user_id, grantee_user_id, revoked_at);
-
-CREATE INDEX IF NOT EXISTS idx_kv_share_handles_revoked
-    ON kv_share_handles (revoked_at);

src/backend/clients/database/migrations/postgres/postgres_mig_40.sql

@@ -1,21 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- Lets a holder's grant check read only the permissions it names.
-
-CREATE INDEX IF NOT EXISTS idx_user_to_user_permissions_holder_permission
-    ON user_to_user_permissions (holder_user_id, permission);

src/backend/clients/database/migrations/postgres/postgres_mig_41.sql

@@ -1,29 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- notification.group_key and replaced_at. See
--- sqlite/0098_notification-groups.sql for the rationale. Idempotent via IF NOT
--- EXISTS.
-
-ALTER TABLE notification ADD COLUMN IF NOT EXISTS group_key varchar(64) DEFAULT NULL;
-ALTER TABLE notification ADD COLUMN IF NOT EXISTS replaced_at bigint DEFAULT NULL;
-
-CREATE INDEX IF NOT EXISTS idx_notification_group
-    ON notification (user_id, app_uid, group_key);
-
-CREATE INDEX IF NOT EXISTS idx_notification_replaced
-    ON notification (user_id, audience, app_uid, replaced_at);

src/backend/clients/database/migrations/postgres/postgres_mig_42.sql

@@ -1,22 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- Notifications through a share handle. See
--- sqlite/0099_kv-share-handle-notify.sql for the column. Idempotent via
--- IF NOT EXISTS; there is no per-file applied-state tracking.
-
-ALTER TABLE kv_share_handles ADD COLUMN IF NOT EXISTS notify smallint NOT NULL DEFAULT 0;

src/backend/clients/database/migrations/postgres/postgres_mig_43.sql

@@ -1,24 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- notification.send_key. See sqlite/0100_notification-send-key.sql for the
--- rationale. Idempotent via IF NOT EXISTS.
-
-ALTER TABLE notification ADD COLUMN IF NOT EXISTS send_key char(36) DEFAULT NULL;
-
-CREATE UNIQUE INDEX IF NOT EXISTS idx_notification_send_key
-    ON notification (send_key);

src/backend/clients/database/migrations/postgres/postgres_mig_44.sql

@@ -1,39 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- Handlers an app's user published into their own scope. See
--- sqlite/0101_user-scoped-handlers.sql for the column rationale.
--- Idempotent via IF NOT EXISTS.
-
-CREATE TABLE IF NOT EXISTS event_user_handlers (
-    id BIGSERIAL PRIMARY KEY,
-    app_uid VARCHAR(40) NOT NULL,
-    holder_user_id INTEGER NOT NULL,
-    name VARCHAR(128) NOT NULL,
-    source TEXT NOT NULL,
-    source_hash VARCHAR(64) NOT NULL,
-    created_at BIGINT NOT NULL,
-    updated_at BIGINT NOT NULL,
-    scope_since BIGINT NOT NULL
-);
-
-CREATE UNIQUE INDEX IF NOT EXISTS idx_event_user_handlers_app_holder_name
-    ON event_user_handlers (app_uid, holder_user_id, name);
-CREATE INDEX IF NOT EXISTS idx_event_user_handlers_holder_app
-    ON event_user_handlers (holder_user_id, app_uid);
-
-ALTER TABLE event_subscriptions ADD COLUMN IF NOT EXISTS handler_scope smallint NOT NULL DEFAULT 0;

src/backend/clients/database/migrations/postgres/postgres_mig_45.sql

@@ -1,23 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- notification (user_id, audience, app_uid, id). See
--- sqlite/0102_notification-scope-id-index.sql for the rationale. Idempotent via
--- IF NOT EXISTS.
-
-CREATE INDEX IF NOT EXISTS idx_notification_scope_id
-    ON notification (user_id, audience, app_uid, id);

src/backend/clients/database/migrations/sqlite/0094_deleted-apps.sql

@@ -1,25 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- Uid and owner of each deleted app. An origin-derived uid comes back when the
--- origin is used again; on a hosted subdomain now registered to someone else,
--- AuthService moves on to a fresh uid so the deleted app's data stays put.
-
-CREATE TABLE IF NOT EXISTS `deleted_apps` (
-    "uid" TEXT PRIMARY KEY NOT NULL,
-    "owner_user_id" INTEGER DEFAULT NULL
-);

src/backend/clients/database/migrations/sqlite/0095_kv-share-handle-levels.sql

@@ -1,35 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- What share levels need from `kv_share_handles`. The level itself is not a
--- column: it is the root of the stored `permission`.
---
---   - `revoked_by` : `owner`, `holder` or `system` (the namespace app was
---                    deleted). Null while live, and on rows retired before
---                    this existed.
---   - `label`      : optional owner-set text the holder is shown.
---   - the grantee index serves the holder's listing and their unshare, and
---     the app index retiring a deleted app's handles.
-
-ALTER TABLE `kv_share_handles` ADD COLUMN `revoked_by` TEXT DEFAULT NULL;
-ALTER TABLE `kv_share_handles` ADD COLUMN `label` TEXT DEFAULT NULL;
-
-CREATE INDEX IF NOT EXISTS `idx_kv_share_handles_grantee`
-    ON `kv_share_handles` (`grantee_user_id`, `id`);
-
-CREATE INDEX IF NOT EXISTS `idx_kv_share_handles_app`
-    ON `kv_share_handles` (`app_uid`);

src/backend/clients/database/migrations/sqlite/0096_kv-share-handle-quota-indexes.sql

@@ -1,42 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- Indexes behind the share-handle quotas, the app-filtered listings and the
--- retention purge on `kv_share_handles`.
---
---   - owner_live  : the owner's live count, in total and per app, read off
---                   the index alone.
---   - owner_app   : the owner's listing narrowed to one app, in id order.
---   - grantee_app : the holder's listing narrowed to one app, in id order.
---   - pair        : live handles one owner holds out to one holder, counted at
---                   mint and walked on revoke and unshare.
---   - revoked     : retired rows past retention, for the purge.
-
-CREATE INDEX IF NOT EXISTS `idx_kv_share_handles_owner_live`
-    ON `kv_share_handles` (`owner_user_id`, `revoked_at`, `app_uid`);
-
-CREATE INDEX IF NOT EXISTS `idx_kv_share_handles_owner_app`
-    ON `kv_share_handles` (`owner_user_id`, `app_uid`, `id`);
-
-CREATE INDEX IF NOT EXISTS `idx_kv_share_handles_grantee_app`
-    ON `kv_share_handles` (`grantee_user_id`, `app_uid`, `id`);
-
-CREATE INDEX IF NOT EXISTS `idx_kv_share_handles_pair`
-    ON `kv_share_handles` (`owner_user_id`, `grantee_user_id`, `revoked_at`);
-
-CREATE INDEX IF NOT EXISTS `idx_kv_share_handles_revoked`
-    ON `kv_share_handles` (`revoked_at`);

src/backend/clients/database/migrations/sqlite/0097_user-to-user-holder-permission-index.sql

@@ -1,21 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- Lets a holder's grant check read only the permissions it names.
-
-CREATE INDEX IF NOT EXISTS `idx_user_to_user_permissions_holder_permission`
-    ON `user_to_user_permissions` (`holder_user_id`, `permission`);

src/backend/clients/database/migrations/sqlite/0098_notification-groups.sql

@@ -1,38 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- What app message groups need from `notification`:
---
---   - `group_key`   : a sha256 hex digest of an app message's `group`, so the
---                     notification a newer one replaces is found by index.
---                     Null on every other row, and on rows written before
---                     this, which therefore never match.
---   - `replaced_at` : epoch milliseconds of the last replacement, null for a
---                     row never replaced. Live and fetched copies carry it as
---                     their version, so a client can tell a replacement from a
---                     copy it already has. Indexed per mailbox slice, so a
---                     catch-up reads the rows replaced since its cursor
---                     without scanning the ones that never were.
-
-ALTER TABLE `notification` ADD COLUMN `group_key` TEXT DEFAULT NULL;
-ALTER TABLE `notification` ADD COLUMN `replaced_at` INTEGER DEFAULT NULL;
-
-CREATE INDEX IF NOT EXISTS `idx_notification_group`
-    ON `notification` (`user_id`, `app_uid`, `group_key`);
-
-CREATE INDEX IF NOT EXISTS `idx_notification_replaced`
-    ON `notification` (`user_id`, `audience`, `app_uid`, `replaced_at`);

src/backend/clients/database/migrations/sqlite/0099_kv-share-handle-notify.sql

@@ -1,23 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- Whether the two parties of a share may send each other notifications through
--- its handle. Off by default, so every existing share reads as not allowing
--- them.
-
-ALTER TABLE `kv_share_handles`
-    ADD COLUMN `notify` INTEGER NOT NULL DEFAULT 0;

src/backend/clients/database/migrations/sqlite/0100_notification-send-key.sql

@@ -1,27 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- `notification`.`send_key`: the key of the delayed send (a `deferred`
--- schedule) that wrote this row or last replaced it, derived from the
--- schedule and its slot. Unique, so one slot can never write two rows, and a
--- send that crashed after writing finds its row again by it. Null on every row
--- a delayed send never touched.
-
-ALTER TABLE `notification` ADD COLUMN `send_key` TEXT DEFAULT NULL;
-
-CREATE UNIQUE INDEX IF NOT EXISTS `idx_notification_send_key`
-    ON `notification` (`send_key`);

src/backend/clients/database/migrations/sqlite/0101_user-scoped-handlers.sql

@@ -1,48 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- Handlers an app's user published into their own scope, in a table of their
--- own so `event_handlers` stays the app owner's set. Same columns as
--- `event_handlers` (see 0076_event-handlers.sql) plus the holder.
---
---   - `holder_user_id` : the user whose scope this is. A name is unique per
---                        (app, holder), so the same name can live in the app's
---                        set and in each holder's.
---   - `(holder_user_id, app_uid)` : a holder's scopes, for listing and for the
---                        rent count.
---
--- `event_subscriptions.handler_scope` says which table a row's `handler_name`
--- refers to: 0 the app's set, 1 the row holder's scope.
-
-CREATE TABLE IF NOT EXISTS `event_user_handlers` (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "app_uid" TEXT NOT NULL,
-    "holder_user_id" INTEGER NOT NULL,
-    "name" TEXT NOT NULL,
-    "source" TEXT NOT NULL,
-    "source_hash" TEXT NOT NULL,
-    "created_at" INTEGER NOT NULL,    -- unix seconds
-    "updated_at" INTEGER NOT NULL,
-    "scope_since" INTEGER NOT NULL    -- unix seconds; the scope's first handler, kept across churn
-);
-
-CREATE UNIQUE INDEX IF NOT EXISTS `idx_event_user_handlers_app_holder_name`
-    ON `event_user_handlers` (`app_uid`, `holder_user_id`, `name`);
-CREATE INDEX IF NOT EXISTS `idx_event_user_handlers_holder_app`
-    ON `event_user_handlers` (`holder_user_id`, `app_uid`);
-
-ALTER TABLE `event_subscriptions` ADD COLUMN `handler_scope` INTEGER NOT NULL DEFAULT 0;

src/backend/clients/database/migrations/sqlite/0102_notification-scope-id-index.sql

@@ -1,22 +0,0 @@
--- Copyright (C) 2024-present Puter Technologies Inc.
---
--- This file is part of Puter.
---
--- Puter is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as published
--- by the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
--- Index a mailbox slice by row id, so a fetch finds the newest row of a slice,
--- and pages forward through one, with a seek rather than a scan of the slice.
-
-CREATE INDEX IF NOT EXISTS `idx_notification_scope_id`
-    ON `notification` (`user_id`, `audience`, `app_uid`, `id`);

src/backend/clients/dynamodb/DDBClient.test.ts

@@ -188,47 +188,6 @@ describe('DDBClient — item operations', () => {
         ).toBeUndefined();
     });
 
-    it('puts only while its condition holds', async () => {
-        const absent = {
-            expression: 'attribute_not_exists(#pk)',
-            names: { '#pk': 'pk' },
-        };
-        await client.put(
-            TABLE,
-            { pk: 'u7', sk: 'once', v: 1 },
-            {
-                condition: absent,
-            },
-        );
-        await expect(
-            client.put(
-                TABLE,
-                { pk: 'u7', sk: 'once', v: 2 },
-                {
-                    condition: absent,
-                },
-            ),
-        ).rejects.toMatchObject({ name: 'ConditionalCheckFailedException' });
-        expect(
-            (await client.get(TABLE, { pk: 'u7', sk: 'once' })).Item?.v,
-        ).toBe(1);
-
-        await client.put(
-            TABLE,
-            { pk: 'u7', sk: 'once', v: 3 },
-            {
-                condition: {
-                    expression: '#v = :held',
-                    names: { '#v': 'v' },
-                    values: { ':held': 1 },
-                },
-            },
-        );
-        expect(
-            (await client.get(TABLE, { pk: 'u7', sk: 'once' })).Item?.v,
-        ).toBe(3);
-    });
-
     it('fetches keys from several tables in one batch', async () => {
         await client.put(TABLE, { pk: 'b1', sk: 'a', v: 1 });
         await client.put(TABLE, { pk: 'b1', sk: 'b', v: 2 });
@@ -542,19 +501,6 @@ describe('DDBClient — credentialled configuration', () => {
         ).toThrow('requires both `access_key` and `secret_key`');
     });
 
-    it('accepts the credential chain in place of keys', async () => {
-        const client = new DDBClient({
-            port: 0,
-            extensions: [],
-            dynamo: {
-                aws: { useCredentialChain: true, region: 'us-west-2' },
-                endpoint: 'http://127.0.0.1:1',
-            },
-        } as unknown as IConfig);
-
-        await expect(client.recreateClient()).resolves.toBeUndefined();
-    });
-
     it('skips table creation on a managed deployment', async () => {
         const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
         const client = new DDBClient({

src/backend/clients/dynamodb/DDBClient.ts

@@ -43,10 +43,6 @@ import { once } from 'node:events';
 import { Agent as httpsAgent } from 'node:https';
 import { HttpError } from '../../core/http';
 import type { IConfig, IDynamoConfig } from '../../types';
-import {
-    awsCredentialsFrom,
-    type AwsCredentials,
-} from '../../util/awsCredentials.js';
 import { BoundedTtlMap } from '../../util/boundedTtlMap.js';
 import { runWithConcurrencyLimitSettled } from '../../util/concurrency.js';
 import { Span } from '../../util/span.js';
@@ -252,19 +248,7 @@ export class DDBClient extends PuterClient {
     }
 
     @Span('ddb.put', (table: string) => ({ 'db.table': table }))
-    async put<T extends Record<string, unknown>>(
-        table: string,
-        item: T,
-        opts?: {
-            /** Refused (`ConditionalCheckFailedException`) unless it holds. */
-            condition?: {
-                expression: string;
-                names?: Record<string, string>;
-                values?: Record<string, unknown>;
-            };
-        },
-    ) {
-        const condition = opts?.condition;
+    async put<T extends Record<string, unknown>>(table: string, item: T) {
         const client = await this.#getDocumentClient();
         return sendRepairingValues(
             item,
@@ -274,23 +258,6 @@ export class DDBClient extends PuterClient {
                         TableName: table,
                         Item: itemToWrite,
                         ReturnConsumedCapacity: 'TOTAL',
-                        ...(condition
-                            ? {
-                                  ConditionExpression: condition.expression,
-                                  ...(condition.names
-                                      ? {
-                                            ExpressionAttributeNames:
-                                                condition.names,
-                                        }
-                                      : {}),
-                                  ...(condition.values
-                                      ? {
-                                            ExpressionAttributeValues:
-                                                condition.values,
-                                        }
-                                      : {}),
-                              }
-                            : {}),
                     }),
                 ),
             () => `a put to ${table}`,
@@ -534,8 +501,6 @@ export class DDBClient extends PuterClient {
             scanIndexForward?: boolean;
             beginsWith?: { key: string; value: string };
             select?: 'COUNT';
-            /** Attributes to return instead of the whole item. */
-            projection?: string[];
             filter?: {
                 expression: string;
                 values?: Record<string, unknown>;
@@ -576,10 +541,6 @@ export class DDBClient extends PuterClient {
             Object.assign(expressionAttributeValues, options.filter.values);
             Object.assign(expressionAttributeNames, options.filter.names);
         }
-        const projection = (options?.projection ?? []).map((name) => {
-            expressionAttributeNames[`#p_${name}`] = name;
-            return `#p_${name}`;
-        });
 
         const command = new QueryCommand({
             TableName: table,
@@ -594,9 +555,6 @@ export class DDBClient extends PuterClient {
                 ? { FilterExpression: options.filter.expression }
                 : {}),
             ...(options?.select ? { Select: options.select } : {}),
-            ...(projection.length > 0
-                ? { ProjectionExpression: projection.join(', ') }
-                : {}),
             ...(options?.scanIndexForward !== undefined
                 ? { ScanIndexForward: options.scanIndexForward }
                 : {}),
@@ -730,15 +688,17 @@ export class DDBClient extends PuterClient {
     }
 
     #bindAwsClient() {
-        const credentials = awsCredentialsFrom(this.#ddbConfig.aws);
-        if (!credentials) {
+        const accessKeyId = this.#ddbConfig.aws?.access_key;
+        const secretAccessKey = this.#ddbConfig.aws?.secret_key;
+
+        if (!accessKeyId || !secretAccessKey) {
             throw new Error(
-                'DynamoDB aws config requires both `access_key` and `secret_key`, or `useCredentialChain`',
+                'DynamoDB aws config requires both `access_key` and `secret_key`',
             );
         }
 
         this.#bindClient({
-            credentials,
+            credentials: { accessKeyId, secretAccessKey },
             region: this.#ddbConfig.aws?.region || 'us-west-2',
             endpoint: this.#ddbConfig.endpoint,
         });
@@ -760,7 +720,7 @@ export class DDBClient extends PuterClient {
         region,
         endpoint,
     }: {
-        credentials: AwsCredentials;
+        credentials: { accessKeyId: string; secretAccessKey: string };
         region: string;
         endpoint?: string;
     }) {

src/backend/clients/event/EventClient.test.ts

@@ -1,9 +1,3 @@
-import { trace } from '@opentelemetry/api';
-import {
-    BasicTracerProvider,
-    InMemorySpanExporter,
-    SimpleSpanProcessor,
-} from '@opentelemetry/sdk-trace-base';
 import {
     afterAll,
     afterEach,
@@ -213,122 +207,6 @@ describe('EventClient', () => {
             await target.emitAndWait(`${key}.child`, {}, {});
             expect(resolved).toBe(true);
         });
-
-        describe('tracing', () => {
-            const exporter = new InMemorySpanExporter();
-            const provider = new BasicTracerProvider({
-                spanProcessors: [new SimpleSpanProcessor(exporter)],
-            });
-            const spansFor = (eventKey: string) =>
-                exporter
-                    .getFinishedSpans()
-                    .filter(
-                        (s) =>
-                            s.name === 'event.emitAndWait' &&
-                            s.attributes['event.key'] === eventKey,
-                    );
-
-            beforeAll(() => {
-                trace.setGlobalTracerProvider(provider);
-            });
-
-            afterAll(async () => {
-                await provider.shutdown();
-                trace.disable();
-            });
-
-            it('resolves without a span when nothing listens', async () => {
-                const meta: { listener_failed?: boolean } = {};
-                await expect(
-                    target.emitAndWait(`${key}.child`, {}, meta),
-                ).resolves.toBeUndefined();
-                expect(meta).toEqual({});
-                expect(spansFor(`${key}.child`)).toHaveLength(0);
-            });
-
-            it('spans the wait whenever a listener matches, wildcards included', async () => {
-                target.on(`${key}.*`, vi.fn());
-                await expect(
-                    target.emitAndWait(`${key}.child`, {}, {}),
-                ).resolves.toBeUndefined();
-                expect(spansFor(`${key}.child`)).toHaveLength(1);
-
-                extensionStore.events[`${key}.ext`] = [vi.fn()];
-                try {
-                    await target.emitAndWait(`${key}.ext`, {}, {});
-                } finally {
-                    delete extensionStore.events[`${key}.ext`];
-                }
-                expect(spansFor(`${key}.ext`)).toHaveLength(1);
-            });
-        });
-    });
-
-    describe('emitAndWaitConcurrently', () => {
-        it('runs every listener at once, wildcards included, and awaits them all', async () => {
-            let inFlight = 0;
-            let peak = 0;
-            const contribute =
-                (share: number) => async (_k: string, data: unknown) => {
-                    inFlight++;
-                    peak = Math.max(peak, inFlight);
-                    await new Promise((r) => setTimeout(r, 10));
-                    inFlight--;
-                    (data as { total: number }).total += share;
-                };
-            target.on(`${key}.*`, contribute(1));
-            target.on(`${key}.child`, contribute(10));
-            target.on(`${key}.child`, contribute(100));
-
-            const data = { total: 0 };
-            await target.emitAndWaitConcurrently(`${key}.child`, data, {});
-
-            expect(peak).toBe(3);
-            expect(data.total).toBe(111);
-        });
-
-        it('flags a failed exact-key listener and still awaits the rest', async () => {
-            const errSpy = vi
-                .spyOn(console, 'error')
-                .mockImplementation(() => {});
-            let finished = false;
-            target.on(key, () => {
-                throw new Error('boom');
-            });
-            target.on(key, async () => {
-                await new Promise((r) => setTimeout(r, 5));
-                finished = true;
-            });
-            const meta: Record<string, unknown> = {};
-            await target.emitAndWaitConcurrently(key, {}, meta);
-            expect(finished).toBe(true);
-            expect(meta.listener_failed).toBe(true);
-            expect(errSpy).toHaveBeenCalledWith(
-                'Error in event listener for event',
-                key,
-                expect.any(Error),
-            );
-            errSpy.mockRestore();
-        });
-
-        it('leaves the flag alone when only a wildcard listener fails', async () => {
-            const errSpy = vi
-                .spyOn(console, 'error')
-                .mockImplementation(() => {});
-            target.on(`${key}.*`, () => {
-                throw new Error('observer');
-            });
-            const meta: Record<string, unknown> = {};
-            await target.emitAndWaitConcurrently(`${key}.child`, {}, meta);
-            expect(meta.listener_failed).toBeUndefined();
-            errSpy.mockRestore();
-        });
-
-        it('resolves at once with nobody listening', async () => {
-            await expect(
-                target.emitAndWaitConcurrently(`${key}.nobody`, {}, {}),
-            ).resolves.toBeUndefined();
-        });
     });
 
     describe('off', () => {

src/backend/clients/event/EventClient.ts

@@ -94,7 +94,6 @@ export class EventClient extends PuterClient {
         data: EventMap[T],
         meta: EventMetadata,
     ) {
-        if (!this.hasListeners(key)) return;
         // Spanned because callers block on listeners — this is where time
         // spent in extension hooks (e.g. `ip.validate`) gets attributed.
         return withSpan('event.emitAndWait', { 'event.key': key }, async () => {
@@ -119,43 +118,6 @@ export class EventClient extends PuterClient {
         });
     }
 
-    /**
-     * Like `emitAndWait`, but every matched listener runs at once, so none sees
-     * another's mutation of `data` before all have finished. Only for events
-     * whose listeners each add an independent share, written after their own
-     * awaits (`const v = await x; data.n += v`).
-     */
-    async emitAndWaitConcurrently<T extends keyof EventMap>(
-        key: T,
-        data: EventMap[T],
-        meta: EventMetadata,
-    ) {
-        const matched = this.#matchKeys(key).flatMap((matchKey) =>
-            this.#listenersFor(matchKey).map((listener) => ({
-                listener,
-                // A wildcard listener observes the event; it does not implement it.
-                isExact: matchKey === key,
-            })),
-        );
-        if (matched.length === 0) return;
-        return withSpan('event.emitAndWait', { 'event.key': key }, async () => {
-            await Promise.all(
-                matched.map(async ({ listener, isExact }) => {
-                    try {
-                        await listener(key, data, meta);
-                    } catch (e) {
-                        if (isExact) meta.listener_failed = true;
-                        console.error(
-                            'Error in event listener for event',
-                            key,
-                            e,
-                        );
-                    }
-                }),
-            );
-        });
-    }
-
     /**
      * Whether anything would run if `key` were emitted, wildcards included.
      *

src/backend/clients/event/types.ts

@@ -75,15 +75,6 @@ export type EventMap = {
     serverStart: Record<string, never>;
     serverPrepareShutdown: Record<string, never>;
     serverShutdown: Record<string, never>;
-    /**
-     * Emitted by a host extension that knows this server will restart soon.
-     * Long-lived connections ask their clients to reconnect; nothing is refused
-     * or closed, so a false alarm is harmless.
-     */
-    serverRestartAnnounced: {
-        /** How long until the server stops, when known. */
-        closeInMs?: number;
-    };
 
     // ---- AI ----
     'ai.prompt.validate': {
@@ -117,7 +108,7 @@ export type EventMap = {
         model_used: string;
         service_used: string;
         intended_service: string;
-        model_details?: {
+        model_details: {
             id: string;
             provider: string;
             input_cost_key: string;
@@ -146,17 +137,6 @@ export type EventMap = {
     };
     'app.new-icon': { app_uid: string; data_url: string };
     'app.opened': { app_uid: string; user_id: number; ts: number };
-    /**
-     * A user removed an app: its grants and worker sessions are gone. With
-     * `deleteData`, the user asked for the app's data in their account to go
-     * too. Awaited by the emitter.
-     */
-    'app.uninstalled': {
-        userId: number;
-        userUuid: string;
-        appUid: string;
-        deleteData: boolean;
-    };
     'app.rename': {
         app_uid: string;
         old_name: string;
@@ -200,16 +180,6 @@ export type EventMap = {
     };
 
     // ---- Auth / signup ----
-    /**
-     * Which signup methods are open, emitted via `emitAndWait` before every
-     * signup and whenever the GUI reads the provider list. A listener sets
-     * `oidcOnly` to refuse form and temp signups, leaving OIDC and team
-     * provisioning open; `message` is what a refused form signup is told.
-     */
-    'puter.signup.policy': {
-        oidcOnly: boolean;
-        message: string | null;
-    };
     'puter.signup.validate': {
         allow: boolean;
         email?: string;
@@ -227,7 +197,7 @@ export type EventMap = {
          */
         is_temp?: boolean;
         ip?: string | null;
-        source?: 'oidc' | 'team_provision';
+        source?: 'oidc';
         req?: unknown;
         data?: unknown;
         abuse?: unknown;
@@ -287,7 +257,7 @@ export type EventMap = {
         ip?: string | null;
         fingerprint?: string | null;
         reputation?: number | null;
-        source?: 'oidc' | 'team_provision';
+        source?: 'oidc';
         requires_phone_verification: boolean;
         requires_card_verification: boolean;
         accepted: boolean;
@@ -333,8 +303,6 @@ export type EventMap = {
         // the abuse extension cap sends per device (across accounts) so a
         // device farm can't dodge the per-account cap with fresh signups.
         device_fingerprint: string | null;
-        // Browser-signals dispatch id the client sent, or null.
-        dispatch_id: string | null;
         allowed: boolean;
         reason: string | null;
         // With `allowed` false, offer the card fallback in place of SMS. Only
@@ -420,14 +388,7 @@ export type EventMap = {
         old_username: string;
         new_username: string;
     };
-    'user.email-changed': {
-        user_id: number;
-        old_email: string | null;
-        new_email: string;
-    };
-    /** An account was suspended, or its suspension lifted. Local events. */
-    'user.suspended': { userId: number };
-    'user.unsuspended': { userId: number };
+    'user.email-changed': { user_id: number; new_email: string };
     // Fired after an account is torn down (self-serve, admin, or temp-user
     // logout cleanup). Listeners purge external state tied to the account —
     // e.g. the marketplace extension cancels the user's Stripe subscriptions.
@@ -436,8 +397,6 @@ export type EventMap = {
         user_id: number;
         user_uuid?: string;
         stripe_customer_id?: string | null;
-        /** Apps the account owned, which cascaded away with it. */
-        appUids?: string[];
     };
 
     // ---- Team billing ---- the trigger, never the charge ----
@@ -500,11 +459,7 @@ export type EventMap = {
             [key: string]: unknown;
         };
     };
-    /**
-     * Bytes to add to a user's storage allowance. Listeners run concurrently:
-     * add to `extra` after your own awaits, never `extra += await x`.
-     */
-    'storage.quota.bonus': { userId: number; userUuid?: string; extra: number };
+    'storage.quota.bonus': { userId: number; extra: number };
 
     // ---- Key-value ----
     /**
@@ -531,43 +486,15 @@ export type EventMap = {
         noShareKeys?: string[];
         /** Events handler runs behind the write; see `Actor.handlerDepth`. */
         handlerDepth?: number;
-        /**
-         * The user who made the change. Differs from `userId` when a share
-         * holder wrote into the owner's namespace.
-         */
-        actingUserId?: number;
-        /** Made by a worker session or an events handler; see `viaWorkerOf`. */
-        viaWorker?: true;
     };
     /**
      * A whole namespace was emptied. Namespace-level on purpose: `flush`'s own
      * key enumeration is truncated for a large namespace, so the keys it saw
      * are not the keys it removed.
      */
-    'kv.flushed': {
-        namespace: string;
-        userId: number;
-        actingUserId?: number;
-        viaWorker?: true;
-    };
-    /**
-     * Share handles stopped being addresses, whoever retired them. `userId` is
-     * one user who could have subscribed through them, their owner or their
-     * holder. Listeners end what was made through them even where another grant
-     * still covers the region. Local, like `permission.revoked`: one region
-     * settling covers every other.
-     */
-    'kv.share.retired': { handles: string[]; userId: number };
+    'kv.flushed': { namespace: string; userId: number };
 
     // ---- Notifications ----
-    /** An app message was acknowledged after its state committed. */
-    'notif.acknowledged': {
-        userId: number;
-        uid: string;
-        type: string;
-        audience: string;
-        appUid: string;
-    };
     /**
      * A notification row exists. Emitted after the insert commits — nothing
      * pushes a uid before there is a row to name — and carries the scope tuple
@@ -582,32 +509,9 @@ export type EventMap = {
         appUid: string | null;
         value: Record<string, unknown>;
         createdAt: number;
-        /** An earlier notification replaced in place; `createdAt` is when. */
-        replaced?: true;
         /** Events handler runs behind whatever created it. */
         handlerDepth?: number;
     };
-    /**
-     * Every non-silent write or update, only on the node that wrote it. The
-     * value is the listener's own copy of what the socket carries.
-     */
-    'notif.written': {
-        userId: number;
-        uid: string;
-        type: string;
-        audience: string;
-        /** The row's app; null when it names none or an update could not tell. */
-        appUid: string | null;
-        value: Record<string, unknown>;
-        /** An earlier notification rewritten in place. */
-        updated?: true;
-        /** Replaced an earlier notification in its group. */
-        replaced?: true;
-        /** Names this one send, for a receipt asked about it. */
-        sendId: string;
-        /** The same `sendId` may be emitted again, as a delayed send is. */
-        replayable?: true;
-    };
     /**
      * One notification, addressed at whatever sockets each region holds for the
      * recipient. `outer.*` reaches peer regions and never sibling nodes, so
@@ -616,43 +520,9 @@ export type EventMap = {
      */
     'outer.notif.delivery': {
         userId: number;
-        wire: 'notif.message' | 'notif.unreads' | 'notif.ack' | 'notif.removed';
+        wire: 'notif.message' | 'notif.unreads' | 'notif.ack';
         response: unknown;
     };
-    /**
-     * How one live notification went, on the node that asked for its receipt:
-     * from the desktop's sockets, or with `appUid` the app's own.
-     */
-    'notif.delivery.settled': {
-        sendId?: string;
-        uid: string;
-        userId: number;
-        type: string;
-        /** The app whose own sockets were asked; absent for the desktop's. */
-        appUid?: string;
-        outcome: NotifDeliveryOutcome;
-        /** A socket in this region acknowledges the receipt. */
-        ackCapable: boolean;
-        /** No socket here is an older client that acknowledges nothing. */
-        everySocketAcks: boolean;
-        /** Every node here answered the ask, not just this one. */
-        complete: boolean;
-        /** A peer region holds a socket for the user. */
-        peerRegions: boolean;
-        responders: NotifDeliveryResponder[];
-        /** A page here got it live while visible and focused. */
-        handled: boolean;
-    };
-    /**
-     * A page reported that it got a notification live while visible and
-     * focused. Node-local; `appUid` is the reporting socket's app, absent for
-     * the desktop.
-     */
-    'notif.handled': {
-        userId: number;
-        appUid?: string;
-        uid: string;
-    };
 
     // ---- Metering ----
     // Recurring charges are pure mechanism here: the metering service knows
@@ -702,18 +572,9 @@ export type EventMap = {
     // and going away (1→0, whether by removing the last handler or by the
     // destroy route). `actor.user` is the app's owner, not the caller — a
     // developer session publishing for an app it owns is the common case, but
-    // billing follows ownership. For `scope: 'user'` the unit is one user's
-    // handlers in one app instead, and `actor.user` is that user.
-    'events.worker.create': {
-        actor: Actor;
-        appUid: string;
-        scope: 'app' | 'user';
-    };
-    'events.worker.destroy': {
-        actor: Actor;
-        appUid: string;
-        scope: 'app' | 'user';
-    };
+    // billing follows ownership.
+    'events.worker.create': { actor: Actor; appUid: string };
+    'events.worker.destroy': { actor: Actor; appUid: string };
 
     // ---- Outer / GUI broadcast ----
     'outer.cacheUpdate': {
@@ -736,8 +597,6 @@ export type EventMap = {
     'outer.permission.flatInvalidated': {
         entries: Array<{ holderUserId: number; permission: string }>;
     };
-    /** Links on these nodes were removed; read them from the primary. */
-    'outer.share.linksRevoked': { fsentryIds: number[]; uuids: string[] };
     /**
      * A user's subscription set changed, so every process must drop its cached
      * "does this user have any subscriptions" answer. Carries the counter the
@@ -780,13 +639,6 @@ export type EventMap = {
      * reason as the events generation bump: a per-process cache.
      */
     'outer.pubsub.share.ownerShared': { ownerUserId: number };
-    /**
-     * Share handles were retired or changed, so every process must drop its
-     * cached copy. `outer.pubsub.*` because the cache is a per-process map.
-     */
-    'outer.pubsub.kv.share.forget': { handles: string[] };
-    /** The same, for every cached handle one owner holds out. */
-    'outer.pubsub.kv.share.forgetOwner': { ownerUserId: number };
     'outer.fs.write-hash': { hash: string; uuid: string };
     /**
      * Cache keys the KV read cache must stop serving, because the entries
@@ -805,7 +657,6 @@ export type EventMap = {
     'outer.gui.item.renamed': GuiEvent;
     'outer.gui.notif.ack': GuiEvent<{ uid: string }>;
     'outer.gui.notif.message': GuiEvent<{ uid: string; notification: unknown }>;
-    'outer.gui.notif.removed': GuiEvent<{ uid: string }>;
     'outer.gui.notif.unreads': GuiEvent<{
         unreads: { uid: string; notification: unknown }[];
     }>;
@@ -813,7 +664,7 @@ export type EventMap = {
     // ---- Subdomains ----
     // `uid` is the row uuid — for `delete` it is the only surviving handle a
     // listener can use to find state keyed to the row after it is gone.
-    'subdomain.delete': { subdomain: string; uid?: string; userId: number };
+    'subdomain.delete': { subdomain: string; uid?: string };
     'subdomain.update': { subdomain: string; uid?: string };
     'site.htmlServed': {
         subdomain: string;
@@ -824,10 +675,6 @@ export type EventMap = {
         requestHash?: string;
         mime: string;
     };
-    // Asked for a request whose host is outside every configured domain. A
-    // listener that recognises the host sets `result.subdomain` to the site
-    // it serves; an unclaimed host is answered with a 404.
-    'site.resolveHost': { host: string; result: { subdomain: string | null } };
     // Asked before a hosted file is streamed. A listener that owns the site
     // sets `result.allowed = false` to withhold the entry; the visitor then
     // sees the same 404 as for a missing file.
@@ -876,17 +723,8 @@ export type EventMap = {
         session_uids: string[];
     };
 
-    /**
-     * One access token was revoked; only its own connections should drop.
-     * `outer.*` for the same reason as `outer.auth.sessions.revoked`.
-     */
-    'outer.auth.access-token.revoked': { token_uid: string };
-
-    /** Same-cluster eviction for raw realtime WebSockets. */
-    'pubsub.realtime.auth-revoked': {
-        sessionUids?: string[];
-        tokenUid?: string;
-    };
+    /** One access token was revoked; only its own connections should drop. */
+    'auth.access-token.revoked': { token_uid: string };
 
     /**
      * A grant was withdrawn, so whatever was standing on it has to be settled
@@ -1010,9 +848,6 @@ export type AiCostFactorEvent = {
  */
 export type LifecyclePhase = 'before' | 'after' | 'error' | 'reject';
 
-/** Status a vetoing `before` listener may answer with. */
-export type LifecycleRejectStatus = 403 | 429;
-
 /**
  * Payload for `driver.<iface>.<method>.<phase>` events.
  *
@@ -1042,8 +877,6 @@ export type DriverMethodLifecycleEvent = {
     allow?: boolean;
     /** Optional human-readable reason surfaced to the caller when vetoed. */
     rejectReason?: string;
-    /** Status for a veto: 403 (default) or 429 for a throttle. */
-    rejectStatus?: LifecycleRejectStatus;
 };
 
 /**
@@ -1078,8 +911,6 @@ export type RouteLifecycleEvent = {
     allow?: boolean;
     /** Optional human-readable reason surfaced to the caller when vetoed. */
     rejectReason?: string;
-    /** Status for a veto: 403 (default) or 429 for a throttle. */
-    rejectStatus?: LifecycleRejectStatus;
 };
 
 export type EventKey = keyof EventMap & string;
@@ -1100,17 +931,6 @@ export type MatchingEvents<P extends ListenKey> = P extends `${infer Prefix}.*`
     ? Extract<EventKey, `${Prefix}.${string}`>
     : P & EventKey;
 
-/** Acked, not acked, no socket anywhere, or sockets only in a peer region. */
-export type NotifDeliveryOutcome =
-    'received' | 'unreceived' | 'no-socket' | 'remote-only';
-
-/** One socket's receipt for a live notification. */
-export interface NotifDeliveryResponder {
-    visibilityState: 'visible' | 'hidden' | 'unknown';
-    /** The page's window has focus. Absent from older clients. */
-    focused?: boolean;
-}
-
 export type EventMetadata = {
     from_outside?: boolean;
     /** Set by `emitAndWait` when a listener threw, so a verdict hook can refuse. */

src/backend/clients/s3/S3Client.test.ts

@@ -3,31 +3,28 @@
  *
  * This file is part of Puter.
  *
- * Puter is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Affero General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
+ * Puter is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
- * details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
- * [https://www.gnu.org/licenses/](https://www.gnu.org/licenses/).
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 import { GetObjectCommand } from '@aws-sdk/client-s3';
 import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
 import { existsSync } from 'node:fs';
-import { createServer, type Server } from 'node:http';
-import type { AddressInfo } from 'node:net';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import type { IConfig } from '../../types';
-import { S3Client, withPresignHeadroom } from './S3Client';
+import { S3Client } from './S3Client';
 
 const LOCAL_BUCKET = 'puter-local';
 
@@ -202,77 +199,6 @@ describe('S3Client — remote endpoint configuration', () => {
     });
 });
 
-describe('S3Client — bucket in another region', () => {
-    let server: Server;
-    let client: S3Client;
-    let signedRegions: string[];
-
-    // Answers like a bucket that lives in us-west-2: a request signed for any
-    // other region gets S3's 301 naming the bucket's region.
-    beforeEach(async () => {
-        signedRegions = [];
-        server = createServer((req, res) => {
-            const region =
-                /Credential=[^/]+\/\d{8}\/([^/]+)\//.exec(
-                    req.headers.authorization ?? '',
-                )?.[1] ?? '';
-            signedRegions.push(region);
-            if (region !== 'us-west-2') {
-                res.writeHead(301, {
-                    'content-type': 'application/xml',
-                    'x-amz-bucket-region': 'us-west-2',
-                });
-                res.end(
-                    '<?xml version="1.0" encoding="UTF-8"?><Error><Code>PermanentRedirect</Code><Message>The bucket you are attempting to access must be addressed using the specified endpoint.</Message></Error>',
-                );
-                return;
-            }
-            res.writeHead(200, {
-                'content-type': 'text/plain',
-                'content-length': '5',
-            });
-            res.end('hello');
-        });
-        await new Promise<void>((resolve) =>
-            server.listen(0, '127.0.0.1', resolve),
-        );
-        const { port } = server.address() as AddressInfo;
-        client = new S3Client({
-            port: 0,
-            extensions: [],
-            s3: {
-                s3Config: {
-                    endpoint: `http://127.0.0.1:${port}`,
-                    accessKeyId: 'fakeAccessKeyId',
-                    secretAccessKey: 'fakeSecretAccessKey',
-                    forcePathStyle: true,
-                },
-            },
-        } as unknown as IConfig);
-        await client.onServerStart();
-    });
-
-    afterEach(async () => {
-        await client.onServerShutdown();
-        server.closeAllConnections();
-        await new Promise<void>((resolve) => server.close(() => resolve()));
-    });
-
-    it("retries a read in the bucket's region when S3 redirects it", async () => {
-        const result = await client
-            .get('ap-northeast-2')
-            .send(
-                new GetObjectCommand({
-                    Bucket: 'other-bucket',
-                    Key: 'index.html',
-                }),
-            );
-
-        expect(await result.Body?.transformToString()).toBe('hello');
-        expect(signedRegions).toEqual(['ap-northeast-2', 'us-west-2']);
-    });
-});
-
 describe('S3Client — legacy storage migration', () => {
     let client: S3Client;
     let dir: string;
@@ -561,54 +487,3 @@ describe('S3Client — short reads during multipart', () => {
         expect(parts).toEqual([10, 10]);
     });
 });
-
-describe('withPresignHeadroom', () => {
-    const HOUR = 60 * 60 * 1000;
-    const creds = (msLeft?: number, id = 'a') => ({
-        accessKeyId: id,
-        secretAccessKey: 's',
-        ...(msLeft === undefined
-            ? {}
-            : { expiration: new Date(Date.now() + msLeft) }),
-    });
-
-    it('reports expiry an hour early so the SDK refreshes while an hour remains', async () => {
-        const chain = vi.fn(async () => creds(5 * HOUR));
-        const identity = await withPresignHeadroom(chain)();
-
-        expect(chain).toHaveBeenCalledTimes(1);
-        const left = identity.expiration!.getTime() - Date.now();
-        expect(left).toBeGreaterThan(4 * HOUR - 1000);
-        expect(left).toBeLessThanOrEqual(4 * HOUR);
-    });
-
-    it('force-refreshes credentials that are inside the presign window', async () => {
-        const chain = vi.fn(async (options?: { forceRefresh?: boolean }) =>
-            options?.forceRefresh
-                ? creds(6 * HOUR, 'fresh')
-                : creds(30 * 60 * 1000, 'stale'),
-        );
-        const identity = await withPresignHeadroom(chain)();
-
-        expect(chain).toHaveBeenLastCalledWith(
-            expect.objectContaining({ forceRefresh: true }),
-        );
-        expect(identity.accessKeyId).toBe('fresh');
-    });
-
-    it('leaves long-lived credentials alone', async () => {
-        const chain = vi.fn(async () => creds(undefined));
-        const identity = await withPresignHeadroom(chain)();
-
-        expect(chain).toHaveBeenCalledTimes(1);
-        expect(identity.expiration).toBeUndefined();
-    });
-
-    it('never reports an expiry inside the SDK refresh margin', async () => {
-        const chain = vi.fn(async () => creds(20 * 60 * 1000));
-        const identity = await withPresignHeadroom(chain)();
-
-        const left = identity.expiration!.getTime() - Date.now();
-        expect(left).toBeGreaterThan(5 * 60 * 1000);
-    });
-});

src/backend/clients/s3/S3Client.ts

@@ -43,43 +43,6 @@ const DEFAULT_MULTIPART_PART_SIZE_BYTES = 5 * 1024 * 1024;
 const FAUXQS_SAFE_PUT_OBJECT_LIMIT_BYTES = 10 * 1024 * 1024;
 const LEGACY_STORAGE_BUCKET = 'puter-local';
 
-// A presigned URL stops working when the credentials that signed it expire.
-// Presigns last up to an hour, but the SDK only refreshes temporary
-// credentials five minutes before expiry.
-const PRESIGN_MAX_LIFETIME_MS = 60 * 60 * 1000;
-const SDK_REFRESH_MARGIN_MS = 5 * 60 * 1000;
-
-type CredentialChain = ReturnType<typeof fromNodeProviderChain>;
-
-/**
- * Keeps temporary credentials at least an hour from expiry when they sign. The
- * SDK is handed each identity with its expiration moved an hour early, so its
- * own refresh comes back here while an hour remains, and a credential already
- * inside that window is force-refreshed from the chain.
- */
-export function withPresignHeadroom(chain: CredentialChain): CredentialChain {
-    return async (options) => {
-        let identity = await chain(options);
-        const remaining = (i: typeof identity) =>
-            i.expiration ? i.expiration.getTime() - Date.now() : Infinity;
-        if (
-            remaining(identity) <
-            PRESIGN_MAX_LIFETIME_MS + SDK_REFRESH_MARGIN_MS
-        ) {
-            identity = await chain({ ...options, forceRefresh: true });
-        }
-        if (!identity.expiration) return identity;
-        // If even fresh credentials are short-lived, report an expiry just past
-        // the SDK's margin rather than one in the past, which would make it
-        // re-resolve on every request.
-        const reported = Math.max(
-            identity.expiration.getTime() - PRESIGN_MAX_LIFETIME_MS,
-            Date.now() + SDK_REFRESH_MARGIN_MS + 60 * 1000,
-        );
-        return { ...identity, expiration: new Date(reported) };
-    };
-}
-
 type S3CommandSender = Pick<AwsS3Client, 'send'>;
 
 export class S3Client extends PuterClient {
@@ -120,9 +83,7 @@ export class S3Client extends PuterClient {
 
             if (useCredentialChain) {
                 this.useProviderChain = true;
-                this.awsConfig = {
-                    credentials: withPresignHeadroom(fromNodeProviderChain()),
-                };
+                this.awsConfig = { credentials: fromNodeProviderChain() };
                 this.partSize = 64 * 1024 * 1024;
                 this.maxSingleUploadSize = 128 * 1024 * 1024;
             } else {
@@ -235,9 +196,6 @@ export class S3Client extends PuterClient {
 
         const client = new AwsS3Client({
             region,
-            // Rows without a stored region are read with the server's own, so
-            // retry where S3's 301 says the bucket actually lives.
-            followRegionRedirects: true,
             requestStreamBufferSize: 32 * 1024,
             requestHandler: new NodeHttpHandler({
                 socketTimeout: 5000,

src/backend/controllers/apps/AppController.js

@@ -52,8 +52,8 @@ const APP_READ_LIMIT = {
 /**
  * Unauthenticated icon serving; no actor to key on, so the bucket is the
  * address — and an address is a NAT, a campus or a carrier gateway that can
- * hold hundreds of desktops. Each dashboard load pulls its app icons at once,
- * so a single burst from one network is already thousands of requests.
+ * hold hundreds of desktops. Each desktop boot pulls the taskbar's icons at
+ * once, so a single burst from one network is already thousands of requests.
  * Responses are publicly cacheable and usually a redirect, so the ceiling is
  * not protecting bandwidth; it is there so a client looping on a broken icon
  * can't spin unbounded.
@@ -523,7 +523,7 @@ export class AppController extends PuterController {
         };
 
         // Icons are <img src> targets from the GUI (root) AND resolved via
-        // api_base_url in app summaries. Register on both so either origin
+        // api_base_url in taskbar payloads. Register on both so either origin
         // works without a cross-subdomain redirect.
         router.get(
             '/app-icon/:app_uid',

src/backend/controllers/apps/AppController.test.ts

@@ -338,42 +338,6 @@ describe('AppController POST /rao', () => {
         expect(rows).toHaveLength(1);
     });
 
-    it('keeps every open as a row, and counts one per account per hour', async () => {
-        const owner = await makeUser();
-        const other = await makeUser();
-        const app = await createApp(owner.actor);
-
-        const open = async (user: { actor: Actor; userId: number }) => {
-            const { res } = makeRes();
-            await withActor(user.actor, () =>
-                callRoute(
-                    'post',
-                    '/rao',
-                    makeReq({ body: { app_uid: app.uid }, actor: user.actor }),
-                    res,
-                ),
-            );
-        };
-
-        for (let i = 0; i < 5; i++) await open(owner);
-        await open(other);
-        await server.controllers.apps.drainPendingAppOpens();
-
-        // Every open is still a row: the recent-apps list orders on them.
-        const rows = (await server.clients.db.read(
-            'SELECT `user_id` FROM `app_opens` WHERE `app_uid` = ?',
-            [app.uid],
-        )) as Array<{ user_id: number }>;
-        expect(rows).toHaveLength(6);
-
-        // The count is accounts-per-hour, so repeats do not move it.
-        const stats = await server.stores.app.getAppsStats([app.uid]);
-        expect(stats.get(app.uid)).toMatchObject({
-            open_count: 2,
-            user_count: 2,
-        });
-    });
-
     // `app_opens` is analytics: the response carries nothing derived from it
     // and the client never awaits the post. Holding the response open for a
     // primary write put that write's latency inside the app launch it was
@@ -1271,7 +1235,7 @@ describe('AppController app-icon rate limit', () => {
     it('sizes the icon bucket for a whole network rather than one desktop', () => {
         // Icons are unauthenticated `<img src>` targets, so the only key is
         // the address — which one NAT shares across every desktop behind it,
-        // and each dashboard load pulls its app icons in a burst.
+        // and each boot pulls the taskbar's icons in a burst.
         for (const path of ['/app-icon/:app_uid', '/app-icon/:app_uid/:size']) {
             const route = router.routes.find(
                 (r) => r.method === 'get' && r.path === path,

src/backend/controllers/auth/AuthController.elevation.http.test.ts

@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2024-present Puter Technologies Inc.
- *
- * This file is part of Puter.
- *
- * Puter is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-import { setupPuterTestEnv, type PuterTestEnv } from '../../testUtil.js';
-
-describe('auth elevation cookies over HTTP', () => {
-    let env: PuterTestEnv;
-
-    beforeAll(async () => {
-        env = await setupPuterTestEnv();
-    }, 120_000);
-
-    afterAll(async () => {
-        await env?.shutdown();
-    });
-
-    it.each(['bearer', 'cookie'])(
-        'API host returns a usable token without setting cookies (%s auth)',
-        async (credential) => {
-            const { token, password, username } = env.users.user;
-            const res = await fetch(new URL('/auth/elevate', env.apiOrigin), {
-                method: 'POST',
-                headers: {
-                    'content-type': 'application/json',
-                    ...(credential === 'cookie'
-                        ? { cookie: `puter_auth_token=${token}` }
-                        : { authorization: `Bearer ${token}` }),
-                },
-                body: JSON.stringify({ password }),
-            });
-            expect(res.status).toBe(200);
-            expect(res.headers.get('set-cookie')).toBeNull();
-            const body = (await res.json()) as {
-                elevated: boolean;
-                token: string;
-            };
-            expect(body.elevated).toBe(true);
-            expect(typeof body.token).toBe('string');
-            const user = await env.server.stores.user.getByUsername(username);
-            const { verifyStepUpSession } =
-                await import('../../core/http/middleware/stepUpSession.js');
-            expect(
-                verifyStepUpSession(
-                    {
-                        headers: { 'x-puter-elevation': body.token },
-                        actor: { user: { uuid: user!.uuid } },
-                    } as never,
-                    { tokenService: env.server.services.token },
-                ),
-            ).toBe(true);
-        },
-    );
-
-    it('GUI host sets the elevation cookie and omits the raw token for cookie auth', async () => {
-        const { token, password } = env.users.user;
-        const res = await fetch(new URL('/auth/elevate', env.origin), {
-            method: 'POST',
-            headers: {
-                'content-type': 'application/json',
-                cookie: `puter_auth_token=${token}`,
-            },
-            body: JSON.stringify({ password }),
-        });
-        expect(res.status).toBe(200);
-        expect(res.headers.get('set-cookie')).toContain('puter_elevated=');
-        expect(await res.json()).toEqual({ elevated: true });
-    });
-});

src/backend/controllers/auth/AuthController.http.test.ts

@@ -18,17 +18,17 @@
  */
 
 import { TOTP } from 'otpauth';
-import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
+import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 import { makeActor } from '../../core/actor.js';
 import { runWithContext } from '../../core/context.js';
 import { createSecret as otpCreateSecret } from '../../services/auth/OTPUtil.js';
 import { FULL_API_ACCESS } from '../../services/permission/consts.js';
-import { tokenClaimsDigest } from '../../../gui/src/helpers/guiToken.js';
 import {
     createTestUser,
     setupPuterTestEnv,
     type PuterTestEnv,
 } from '../../testUtil.js';
+import type { IConfig } from '../../types';
 
 /**
  * HTTP-level coverage for `/auth/revoke-own-access-token` — the route that
@@ -424,7 +424,7 @@ describe('2FA enrollment over HTTP', () => {
     let env: PuterTestEnv;
 
     beforeAll(async () => {
-        env = await setupPuterTestEnv();
+        env = await setupPuterTestEnv({ teams_enabled: true } as IConfig);
     }, 120_000);
 
     afterAll(async () => {
@@ -561,6 +561,56 @@ describe('2FA enrollment over HTTP', () => {
         expect((await otpState(account.userId)).enabled).toBe(true);
     });
 
+    it('lets a seat its team holds for 2FA enroll through the same gate', async () => {
+        const owner = await makeAccount();
+        // The rule can only be turned on by an owner who has 2FA.
+        await env.server.stores.user.update(owner.userId, { otp_enabled: 1 });
+        await env.server.stores.user.invalidateById(owner.userId);
+        const team = await env.server.services.team.createTeam(owner.userId, {
+            name: 'Acme',
+        });
+        const seatName = `seat_${uniq()}`;
+        const { userId, temporaryPassword } =
+            await env.server.services.team.provisionAccount(
+                team.uid,
+                owner.userId,
+                { username: seatName },
+            );
+        await env.server.services.team.updateTeam(team.uid, owner.userId, {
+            require2fa: true,
+        });
+        const { token } = await env.server.services.auth.createSessionToken(
+            (await env.server.stores.user.getById(userId))!,
+        );
+
+        // First sign-in replaces the temporary password.
+        const changed = await protectedPost(
+            '/user-protected/change-password',
+            token,
+            { password: temporaryPassword, new_pass: 'seat-own-password' },
+        );
+        expect(changed.status).toBe(200);
+
+        const held = await fetch(new URL('/teams', env.apiOrigin), {
+            headers: { authorization: `Bearer ${token}` },
+        });
+        expect(held.status).toBe(403);
+        expect(await held.text()).toContain('two_factor_required');
+
+        const res = await setup(token, { password: 'seat-own-password' });
+        expect(res.status).toBe(200);
+        const { secret } = (await res.json()) as { secret: string };
+        const enabled = await configure(token, 'enable', {
+            code: liveTotp(seatName, secret),
+        });
+        expect(enabled.status).toBe(200);
+        expect((await otpState(userId)).enabled).toBe(true);
+
+        const released = await fetch(new URL('/teams', env.apiOrigin), {
+            headers: { authorization: `Bearer ${token}` },
+        });
+        expect(released.status).toBe(200);
+    });
 });
 
 /**
@@ -630,152 +680,3 @@ describe('temp-account reauth over HTTP', () => {
         expect(who.status).toBe(200);
     });
 });
-
-describe('session token helpers over HTTP', () => {
-    let env: PuterTestEnv;
-
-    beforeAll(async () => {
-        env = await setupPuterTestEnv();
-    }, 120_000);
-
-    afterAll(async () => {
-        await env?.shutdown();
-    }, 120_000);
-
-    const signupTemp = async () => {
-        const res = await fetch(new URL('/signup', env.origin), {
-            method: 'POST',
-            headers: { 'content-type': 'application/json' },
-            body: JSON.stringify({ is_temp: true }),
-        });
-        expect(res.status).toBe(200);
-        return (await res.json()) as { token: string; user: { uuid: string } };
-    };
-
-    const get = (path: string, token: string) =>
-        fetch(new URL(path, env.origin), {
-            headers: { authorization: `Bearer ${token}` },
-        });
-
-    const claims = (token: string) =>
-        env.server.services.token.verify('auth', token) as {
-            type: string;
-            user_uid: string;
-            session_uid: string;
-        };
-
-    it('mint tokens for the session the request authenticated with', async () => {
-        const { token, user } = await signupTemp();
-        const session = claims(token);
-        const row = await env.server.stores.user.getByUuid(user.uuid);
-        const getById = vi.spyOn(env.server.stores.user, 'getById');
-        try {
-            const gui = await get('/get-gui-token', token);
-            expect(gui.status).toBe(200);
-            const { token: guiToken } = (await gui.json()) as {
-                token: string;
-            };
-            expect(claims(guiToken)).toMatchObject({
-                type: 'gui',
-                user_uid: user.uuid,
-                session_uid: session.session_uid,
-            });
-
-            const sync = await get('/session/sync-cookie', token);
-            expect(sync.status).toBe(204);
-            const cookie = sync.headers.get('set-cookie') ?? '';
-            const cookieToken = /puter_auth_token=([^;]+)/.exec(cookie)?.[1];
-            expect(claims(cookieToken!)).toMatchObject({
-                type: 'session',
-                user_uid: user.uuid,
-                session_uid: session.session_uid,
-            });
-
-            // The user is the row token auth already read.
-            expect(getById.mock.calls.filter(([id]) => id === row!.id)).toEqual(
-                [],
-            );
-        } finally {
-            getById.mockRestore();
-        }
-    });
-
-    it("refuse a deleted account's session before either handler runs", async () => {
-        const { token, user } = await signupTemp();
-        const row = await env.server.stores.user.getByUuid(user.uuid);
-        await env.server.clients.db.write('DELETE FROM `user` WHERE `id` = ?', [
-            row!.id,
-        ]);
-        await env.server.stores.user.markDeleted(row!);
-
-        expect((await get('/get-gui-token', token)).status).toBe(401);
-        const sync = await get('/session/sync-cookie', token);
-        expect(sync.status).toBe(401);
-        expect(sync.headers.get('set-cookie') ?? '').not.toContain(
-            'puter_auth_token=',
-        );
-    });
-
-    describe("the shell's guiTokenDigest", () => {
-        /** The session cookie `/session/sync-cookie` sets for `token`. */
-        const sessionCookie = async (token: string) => {
-            const sync = await get('/session/sync-cookie', token);
-            expect(sync.status).toBe(204);
-            const value = /puter_auth_token=([^;]+)/.exec(
-                sync.headers.get('set-cookie') ?? '',
-            )?.[1];
-            expect(value).toBeTruthy();
-            return `puter_auth_token=${value}`;
-        };
-
-        /** What the shell at `path` renders for `guiTokenDigest`. */
-        const shellDigest = async (path: string, cookie?: string) => {
-            const res = await fetch(new URL(path, env.origin), {
-                headers: cookie ? { cookie } : {},
-            });
-            expect(res.status).toBe(200);
-            const html = await res.text();
-            const match = /"guiTokenDigest":(null|"[0-9a-f]{32}")/.exec(html);
-            if (!match) {
-                expect(html).not.toContain('guiTokenDigest');
-                return undefined;
-            }
-            return JSON.parse(match[1]) as string | null;
-        };
-
-        it("names the token /get-gui-token hands over for the session cookie", async () => {
-            const { token } = await signupTemp();
-            const cookie = await sessionCookie(token);
-
-            const gui = await fetch(new URL('/get-gui-token', env.origin), {
-                headers: { cookie },
-            });
-            expect(gui.status).toBe(200);
-            const { token: guiToken } = (await gui.json()) as { token: string };
-
-            const digest = await shellDigest('/', cookie);
-            expect(digest).toBe(await tokenClaimsDigest(guiToken));
-            // The token the browser stored at sign-up is for the same session.
-            expect(await tokenClaimsDigest(token)).toBe(digest);
-        });
-
-        it('is null without a session cookie, even with a token in the URL', async () => {
-            const { token } = await signupTemp();
-            expect(await shellDigest('/')).toBe(null);
-            expect(
-                await shellDigest(`/?auth_token=${encodeURIComponent(token)}`),
-            ).toBe(null);
-        });
-
-        it('is left out when the session cookie does not resolve to a session', async () => {
-            const { token } = await signupTemp();
-            const cookie = await sessionCookie(token);
-            await env.server.services.auth.revokeSession(claims(token).session_uid);
-
-            expect(await shellDigest('/', cookie)).toBe(undefined);
-            expect(await shellDigest('/', 'puter_auth_token=garbage')).toBe(
-                undefined,
-            );
-        });
-    });
-});

src/backend/controllers/auth/AuthController.ts

@@ -33,7 +33,7 @@ import {
     hasVerifiedPhone,
 } from '../../core/http/middleware/gates.js';
 import type { Actor } from '../../core/actor.js';
-import { isAppActor, isPlainUserActor, makeActor } from '../../core/actor.js';
+import { isPlainUserActor, makeActor } from '../../core/actor.js';
 import {
     checkRateLimit,
     consumeRouteRateLimit,
@@ -66,7 +66,6 @@ import {
     isCardFallbackEnabled,
     phoneAttemptsKey,
 } from '../../util/cardFallback.js';
-import { isEmailGateLast } from '../../util/verificationOrder.js';
 import { sessionCookieFlags } from '../../util/cookieFlags.js';
 import { cleanEmail, isStorableEmail } from '../../util/email.js';
 import { isGodmodeApp } from '../../util/godmodeApps.js';
@@ -89,16 +88,13 @@ import {
 import { promoteToVerifiedGroup } from '../../util/userProvisioning.js';
 import {
     assertBoundedManageGrant,
-    assertNewShareSegments,
-    assertPrefixFitsAccess,
     isKvSharePermission,
-} from '../../services/kvShare/kvShares.js';
+} from '../../services/events/kvShares.js';
 import {
     APP_DATA_PERMISSION_PREFIX,
     appDataSharingAllowed,
     parseAppDataPermission,
 } from '../../services/permission/appDataScopes.js';
-import { parseAppGrantablePermission } from '../../services/permission/appGrantable.js';
 import {
     assertCreatablePath,
     isOwnHomePath,
@@ -115,7 +111,6 @@ import { normalizeAbsolutePath } from '../../services/fs/resolveNode.js';
 import type { FSEntry } from '../../stores/fs/FSEntry.js';
 import { PuterController } from '../types.js';
 import { startWebSession } from './webSession.js';
-import { completeOidcLoginReturn } from './oidcLoginReturn.js';
 
 const FINGERPRINT_MAX_LENGTH = 128;
 // One consent prompt covers a handful of scopes at most. The cap keeps a
@@ -600,7 +595,6 @@ export class AuthController extends PuterController {
                 user_uid: string;
                 purpose: string;
                 auth_id?: string;
-                oidcContinuation?: unknown;
             }>('otp', token);
         } catch {
             throw new HttpError(400, 'Invalid token.', {
@@ -634,7 +628,7 @@ export class AuthController extends PuterController {
 
         await this.#enforceAuthIdMatch(req, user, decoded.auth_id ?? null);
 
-        await this.#completeLogin(req, res, user, decoded.oidcContinuation);
+        await this.#completeLogin(req, res, user);
     }
 
     // -- Login: recovery code ----------------------------------------
@@ -670,7 +664,6 @@ export class AuthController extends PuterController {
                 user_uid: string;
                 purpose: string;
                 auth_id?: string;
-                oidcContinuation?: unknown;
             }>('otp', token);
         } catch {
             throw new HttpError(400, 'Invalid token.', {
@@ -695,11 +688,6 @@ export class AuthController extends PuterController {
         }
 
         await this.#assertSecondFactorAttemptsRemain(user.uuid);
-        if (typeof code !== 'string') {
-            throw new HttpError(400, 'code must be a string.', {
-                legacyCode: 'bad_request',
-            });
-        }
         const hashed = hashRecoveryCode(code);
         const codes = ((user.otp_recovery_codes as string) || '')
             .split(',')
@@ -712,15 +700,15 @@ export class AuthController extends PuterController {
         }
         await this.#consumeOtpLoginToken(token);
 
-        if (!(await this.stores.user.consumeOtpRecoveryCode(user.id, hashed))) {
-            await this.#recordSecondFactorFailure(user.uuid);
-            res.json({ proceed: false });
-            return;
-        }
+        // Consume the recovery code
+        codes.splice(idx, 1);
+        await this.stores.user.update(user.id, {
+            otp_recovery_codes: codes.join(','),
+        });
 
         await this.#enforceAuthIdMatch(req, user, decoded.auth_id ?? null);
 
-        await this.#completeLogin(req, res, user, decoded.oidcContinuation);
+        await this.#completeLogin(req, res, user);
     }
 
     // -- Signup ------------------------------------------------------
@@ -1221,18 +1209,6 @@ export class AuthController extends PuterController {
         }
     }
 
-    /** The email-gate-last confirmation email; a failure never fails the gate. */
-    private async sendDeferredConfirmation(userId: number): Promise<void> {
-        try {
-            await this.services.signup.sendDeferredConfirmationEmail(userId);
-        } catch (e) {
-            console.warn(
-                '[verification] deferred confirmation email failed:',
-                e,
-            );
-        }
-    }
-
     private async isCardFallbackEligible(user: {
         id: number;
         requires_phone_verification?: boolean | number | null;
@@ -1278,12 +1254,6 @@ export class AuthController extends PuterController {
             throw new HttpError(403, 'Account suspended.', {
                 legacyCode: 'account_suspended',
             });
-        if (isEmailGateLast(user) && user.requires_card_verification)
-            throw new HttpError(
-                409,
-                'Card verification must be completed first.',
-                { legacyCode: 'conflict' },
-            );
         if (!this.clients.prelude?.isConfigured())
             throw await this.smsSendError(
                 503,
@@ -1354,7 +1324,6 @@ export class AuthController extends PuterController {
             user_uid: user.uuid,
             phone: parsed.e164,
             device_fingerprint: req.deviceFingerprint ?? null,
-            dispatch_id: dispatchId ?? null,
             allowed: true,
             reason: null as string | null,
             card_fallback_instead: false,
@@ -1593,7 +1562,6 @@ export class AuthController extends PuterController {
             requires_phone_verification: 0,
             phone: pendingPhone,
         });
-        await this.sendDeferredConfirmation(user.id);
 
         // Run the verified-event listeners synchronously (emitAndWait, not
         // fire-and-forget emit) so a carrier-based card-verification waiver in
@@ -1674,11 +1642,7 @@ export class AuthController extends PuterController {
             res.json({ card_verified: true });
             return;
         }
-        if (
-            user.requires_phone_verification &&
-            !fallbackEligible &&
-            !isEmailGateLast(user)
-        )
+        if (user.requires_phone_verification && !fallbackEligible)
             throw new HttpError(
                 409,
                 'Phone verification must be completed first.',
@@ -1741,7 +1705,6 @@ export class AuthController extends PuterController {
             await this.stores.user.update(user.id, {
                 requires_card_verification: 0,
             });
-            await this.sendDeferredConfirmation(user.id);
             res.json({ card_verified: true, disabled: true });
             return;
         }
@@ -1801,11 +1764,7 @@ export class AuthController extends PuterController {
             res.json({ card_verified: true });
             return;
         }
-        if (
-            user.requires_phone_verification &&
-            !fallbackEligible &&
-            !isEmailGateLast(user)
-        )
+        if (user.requires_phone_verification && !fallbackEligible)
             throw new HttpError(
                 409,
                 'Phone verification must be completed first.',
@@ -1846,7 +1805,6 @@ export class AuthController extends PuterController {
             await this.stores.user.update(user.id, {
                 requires_card_verification: 0,
             });
-            await this.sendDeferredConfirmation(user.id);
             res.json({ card_verified: true, disabled: true });
             return;
         }
@@ -1871,7 +1829,6 @@ export class AuthController extends PuterController {
             requires_card_verification: 0,
             ...(clearedPhoneGate ? { requires_phone_verification: 0 } : {}),
         });
-        await this.sendDeferredConfirmation(user.id);
 
         // Awaited like `user.phone-verified`, so whatever a listener grants on
         // verification is in place before the client refreshes. emitAndWait
@@ -1975,7 +1932,7 @@ export class AuthController extends PuterController {
         // A seat's address is admin-supplied and never verified, so whoever
         // holds that inbox could take the seat over. Its recovery channel is
         // the team admin's password reset, not this one.
-        if (await this.stores.team?.getOrgSeat(user.id)) {
+        if (await this.stores.team.getOrgSeat(user.id)) {
             res.json({ message: genericMessage });
             return;
         }
@@ -2176,16 +2133,10 @@ export class AuthController extends PuterController {
         const password_hash = await bcrypt.hash(password, 8);
         let result;
         try {
-            result = await this.stores.user.update(
-                user.id,
-                {
-                    password: password_hash,
-                    pass_recovery_token: null,
-                    change_email_confirm_token: null,
-                    requires_password_change: false,
-                    temp_password_expires_at: null,
-                },
-                { expectedRecoveryToken: decoded.token },
+            result = await this.clients.db.write(
+                'UPDATE `user` SET `password` = ?, `pass_recovery_token` = NULL, `change_email_confirm_token` = NULL, ' +
+                    '`requires_password_change` = 0, `temp_password_expires_at` = NULL WHERE `id` = ? AND `pass_recovery_token` = ?',
+                [password_hash, user.id, decoded.token],
             );
         } catch (e) {
             if (!isOwnedEmailConflict(e)) throw e;
@@ -2201,16 +2152,22 @@ export class AuthController extends PuterController {
                 { legacyCode: 'email_already_in_use' as never },
             );
         }
-        if (!result) {
+        const affected =
+            (result as { affectedRows?: number; changes?: number })
+                ?.affectedRows ??
+            (result as { affectedRows?: number; changes?: number })?.changes ??
+            0;
+        if (affected === 0) {
             throw new HttpError(400, 'Token has already been used.', {
                 legacyCode: 'bad_request',
             });
         }
+        await this.stores.user.invalidateById(user.id);
         // Best effort: the password is already committed, and an audit write
         // must not skip the eviction below.
         await this.services.team
-            ?.recordPasswordSelfChange(user.id as number)
-            ?.catch((err: unknown) => {
+            .recordPasswordSelfChange(user.id as number)
+            .catch((err: unknown) => {
                 console.warn('[team] password self-change audit failed:', err);
             });
 
@@ -2265,8 +2222,8 @@ export class AuthController extends PuterController {
             temp_password_expires_at: null,
         });
         await this.services.team
-            ?.recordPasswordSelfChange(user.id)
-            ?.catch((err: unknown) => {
+            .recordPasswordSelfChange(user.id)
+            .catch((err: unknown) => {
                 console.warn('[team] password self-change audit failed:', err);
             });
 
@@ -2300,7 +2257,7 @@ export class AuthController extends PuterController {
         // A provisioned account's name belongs to the team that made it: the
         // console lists its members by username and the audit log records them
         // by username, so a self-service rename would desync both.
-        if (await this.stores.team?.getOrgSeat(req.actor!.user.id!)) {
+        if (await this.stores.team.getOrgSeat(req.actor!.user.id!)) {
             throw new HttpError(
                 403,
                 'Your team set this username. Ask a team admin to change it.',
@@ -2394,34 +2351,6 @@ export class AuthController extends PuterController {
         res.json({ username: new_username });
     }
 
-    #requireAccountTwoFactor(user: UserRow, code: unknown): void {
-        if (user.otp_enabled) {
-            if (typeof code !== 'string' || !/^\d{6}$/.test(code)) {
-                throw new HttpError(
-                    400,
-                    'Enter the 6-digit code from your authenticator app.',
-                    {
-                        legacyCode: 'bad_request',
-                        fields: { factor: 'otp' },
-                    },
-                );
-            }
-            let verified = false;
-            try {
-                verified =
-                    typeof user.otp_secret === 'string' &&
-                    verifyOtp(user.username, user.otp_secret, code);
-            } catch {
-                // Invalid or unavailable secrets cannot authorize a change.
-            }
-            if (!verified)
-                throw new HttpError(401, 'Incorrect code.', {
-                    legacyCode: 'code_mismatch',
-                    fields: { factor: 'otp' },
-                });
-        }
-    }
-
     @Post('/user-protected/change-email', {
         userProtected: true,
         rateLimit: {
@@ -2434,7 +2363,7 @@ export class AuthController extends PuterController {
     async handleChangeEmail(req: Request, res: Response): Promise<void> {
         // The address is where admin-issued credentials and team notices go;
         // same reasoning as the username and deletion guards above.
-        if (await this.stores.team?.getOrgSeat(req.actor!.user.id!)) {
+        if (await this.stores.team.getOrgSeat(req.actor!.user.id!)) {
             throw new HttpError(
                 403,
                 'Your team set this address. Ask a team admin to change it.',
@@ -2442,17 +2371,6 @@ export class AuthController extends PuterController {
             );
         }
 
-        const user =
-            req.userProtected?.user ??
-            (await this.stores.user.getById(req.actor!.user.id!, {
-                force: true,
-            }));
-        if (!user)
-            throw new HttpError(404, 'User not found', {
-                legacyCode: 'not_found',
-            });
-        this.#requireAccountTwoFactor(user, req.body?.code);
-
         const { new_email } = req.body ?? {};
         if (!new_email || typeof new_email !== 'string') {
             throw new HttpError(400, '`new_email` is required', {
@@ -2494,7 +2412,6 @@ export class AuthController extends PuterController {
                 token: confirm_token,
                 user_id: req.actor!.user.id,
                 purpose: 'change-email',
-                twoFactorVerified: Boolean(user.otp_enabled),
             },
             { expiresIn: '1h' },
         );
@@ -2512,7 +2429,10 @@ export class AuthController extends PuterController {
                 console.warn('[change-email] new-address email failed:', e);
             }
             // Notify the old address too
-            if (user.email) {
+            const user = await this.stores.user.getById(req.actor!.user.id!, {
+                force: true,
+            });
+            if (user?.email) {
                 try {
                     await (
                         this.clients.email as unknown as {
@@ -2569,21 +2489,19 @@ export class AuthController extends PuterController {
             });
         }
 
-        const user =
-            typeof decoded.user_id === 'number' &&
-            Number.isInteger(decoded.user_id) &&
-            decoded.user_id > 0
-                ? await this.stores.user.getById(decoded.user_id, {
-                      force: true,
-                  })
-                : null;
-        if (
-            !user ||
-            user.change_email_confirm_token !== decoded.token ||
-            typeof user.unconfirmed_change_email !== 'string' ||
-            !user.unconfirmed_change_email ||
-            (user.otp_enabled && decoded.twoFactorVerified !== true)
-        ) {
+        const rows = (await this.clients.db.read(
+            'SELECT * FROM `user` WHERE `change_email_confirm_token` = ? ORDER BY `id` ASC LIMIT 1',
+            [decoded.token],
+        )) as Array<Record<string, unknown>>;
+        const user = rows[0] as
+            | {
+                  id: number;
+                  email_confirmed?: number | boolean;
+                  password?: string | null;
+                  unconfirmed_change_email?: string;
+              }
+            | undefined;
+        if (!user || !user.unconfirmed_change_email) {
             throw new HttpError(400, 'Invalid or expired token.', {
                 legacyCode: 'token_expired' as never,
             });
@@ -2647,7 +2565,6 @@ export class AuthController extends PuterController {
                 'user.email-changed' as never,
                 {
                     user_id: user.id,
-                    old_email: user.email ?? null,
                     new_email: newEmail,
                 } as never,
                 {},
@@ -3033,45 +2950,6 @@ export class AuthController extends PuterController {
         return typeof permission === 'string' && permission ? [permission] : [];
     }
 
-    /**
-     * Refuses any entry outside the families an app can be granted. Anything
-     * else is a row the backend never checks for an app, or one wider than the
-     * consent prompt can describe.
-     */
-    async #assertAppGrantable(
-        actor: Actor,
-        appIdentifier: string,
-        list: string[],
-    ): Promise<void> {
-        const refuse = (entry: string) =>
-            new HttpError(
-                400,
-                `Permission cannot be granted to an app: ${entry}`,
-                { legacyCode: 'permission_not_grantable' },
-            );
-        let appUid: string | undefined;
-        for (const entry of list) {
-            // A delegation over a whole key-value namespace has no bounded
-            // description; refused with its own code.
-            assertBoundedManageGrant(entry);
-            const parsed = parseAppGrantablePermission(entry, actor.user!.uuid);
-            if (!parsed) throw refuse(entry);
-            if (parsed.family !== 'kvShare') continue;
-            // Held to what a new share's prefix may be, so a consent never
-            // covers shares that could not be made.
-            assertNewShareSegments(parsed.segments);
-            assertPrefixFitsAccess(
-                parsed.ownerUuid,
-                parsed.appUid,
-                parsed.segments.join(':'),
-                parsed.level,
-            );
-            // An app shares regions of its own namespace only.
-            appUid ??= (await this.stores.app.resolveApp(appIdentifier))?.uid;
-            if (parsed.appUid !== appUid) throw refuse(entry);
-        }
-    }
-
     /**
      * Gate a cross-app data grant: the target must exist, must not have opted
      * out of sharing, and must be named. Also creates the target's AppData
@@ -3250,7 +3128,6 @@ export class AuthController extends PuterController {
         }
         // 400 on a bad value, before anything else runs. Absent means create.
         const create = parseCreateFlag(req.body?.create);
-        await this.#assertAppGrantable(req.actor!, app_uid, list);
 
         // Validate every entry before writing or creating anything, so a bad
         // one in the list cannot leave a partially-granted set behind: the
@@ -3263,6 +3140,10 @@ export class AuthController extends PuterController {
             kind: FsCreateKind;
         }> = [];
         for (const entry of list) {
+            // A delegation over a whole key-value namespace has no bounded
+            // description, so it is refused where it is asked for rather than
+            // prompted for and then refused at use.
+            assertBoundedManageGrant(entry);
             await this.#prepareAppDataGrant(req.actor!, entry);
             const plan = await this.#planFsPathCreate(
                 req.actor!,
@@ -3337,14 +3218,6 @@ export class AuthController extends PuterController {
                 { legacyCode: 'bad_request' },
             );
         }
-        // Only unsharing retires the handle along with its grant; withdrawing
-        // the grant alone would leave the share listed and dead.
-        if (typeof permission === 'string' && isKvSharePermission(permission))
-            throw new HttpError(
-                400,
-                'Stop a key-value share with `puter.kv.unshare()` (`DELETE /kv/shares/:handle`)',
-                { legacyCode: 'bad_request' },
-            );
         await this.services.permission.revokeUserUserPermission(
             req.actor!,
             target_username,
@@ -3368,8 +3241,7 @@ export class AuthController extends PuterController {
     })
     async handleRevokeUserApp(req: Request, res: Response): Promise<void> {
         let { app_uid } = req.body ?? {};
-        const { origin, permission, permissions, meta, deleteData } =
-            req.body ?? {};
+        const { origin, permission, permissions, meta } = req.body ?? {};
         this.#validateAppPermissionParams({
             app_uid,
             origin,
@@ -3385,25 +3257,20 @@ export class AuthController extends PuterController {
                 legacyCode: 'bad_request',
             });
         }
-        if (deleteData !== undefined && typeof deleteData !== 'boolean') {
-            throw new HttpError(400, '`deleteData` must be a boolean', {
-                legacyCode: 'bad_request',
-            });
-        }
-        if (deleteData && permission !== '*') {
-            throw new HttpError(
-                400,
-                '`deleteData` only applies when `permission` is "*"',
-                { legacyCode: 'bad_request' },
-            );
-        }
         // Deliberately not gated by the target's sharing flag: a user must
         // always be able to withdraw a grant, whatever the target now says.
         if (permission === '*') {
-            await this.services.auth.uninstallApp(req.actor!, app_uid, {
-                deleteData: deleteData === true,
-                meta: meta ?? undefined,
-            });
+            await this.services.permission.revokeUserAppAll(
+                req.actor!,
+                app_uid,
+                meta ?? undefined,
+            );
+            // Withdrawing everything also retires the workers the app deployed
+            // under this user; their tokens would otherwise act as the app.
+            await this.services.auth.deleteWorkerSessionsForApp(
+                req.actor!.user!.id as number,
+                app_uid,
+            );
         } else {
             for (const entry of list) {
                 await this.services.permission.revokeUserAppPermission(
@@ -3483,28 +3350,11 @@ export class AuthController extends PuterController {
         const unique = [...new Set(permissions)] as string[];
         const result: Record<string, boolean> = {};
 
-        // A share grant names its owner and prefix, which its holder is never
-        // told, so asking about one would confirm a guess. `manage:` arms are
-        // the app's own consent and stay answerable.
-        const answerable: string[] = [];
-        for (const permission of unique) {
-            if (
-                typeof permission === 'string' &&
-                isKvSharePermission(permission)
-            )
-                result[permission] = false;
-            else answerable.push(permission);
-        }
-
-        // `fs:` reaches down a tree, and only ACL walks that. An app asking
-        // about itself gets the same answer, so a grant on a parent folder
-        // doesn't read as missing and prompt again.
+        // `fs:` reaches down a tree, and only ACL walks that.
         const viaAcl = new Set(
-            app_uid || isAppActor(actor)
-                ? answerable.filter((p) => aclAnswerableFsPermission(p))
-                : [],
+            app_uid ? unique.filter((p) => aclAnswerableFsPermission(p)) : [],
         );
-        const viaScan = answerable.filter((p) => !viaAcl.has(p));
+        const viaScan = unique.filter((p) => !viaAcl.has(p));
 
         let granted: Map<string, boolean>;
         try {
@@ -3585,18 +3435,21 @@ export class AuthController extends PuterController {
                 { legacyCode: 'bad_request' },
             );
         }
-        // Missing, already revoked and other users' rows all answer 404; an
-        // expired row is still revoked so its children go with it.
-        const session = await this.stores.session.getByUuidAny(uuid);
-        if (
-            !session ||
-            session.revoked_at != null ||
-            session.user_id !== req.actor!.user.id
-        ) {
+        // `getByUuid` returns null when the row is missing, already
+        // soft-revoked, or past `expires_at` — surface as 404 so a stale
+        // manage-sessions UI doesn't 500 when it clicks revoke on a row
+        // that already went away.
+        const session = await this.stores.session.getByUuid(uuid);
+        if (!session) {
             throw new HttpError(404, 'Session not found', {
                 legacyCode: 'not_found',
             });
         }
+        if (session.user_id !== req.actor!.user.id) {
+            throw new HttpError(403, 'Can only revoke your own sessions', {
+                legacyCode: 'unauthorized',
+            });
+        }
         await this.services.auth.revokeSession(uuid);
         const sessions = await this.services.auth.listSessions(req.actor!);
         res.json({ sessions });
@@ -3848,9 +3701,8 @@ export class AuthController extends PuterController {
 
         let app = await this.stores.app.getByUid(app_uid);
         if (!app && resolvedFromOrigin) {
-            // Hosted-subdomain and custom-domain origins get the site owner
-            // stamped as the app's creator at bootstrap; external origins
-            // stay unowned.
+            // Hosted-subdomain origins get the site owner stamped as the
+            // app's creator at bootstrap; external origins stay unowned.
             // Canonical origin only, so alternate hosts share one row.
             const canonicalOrigin =
                 this.services.auth.canonicalizeOrigin(origin);
@@ -3866,10 +3718,9 @@ export class AuthController extends PuterController {
             // An origin's uid is a deterministic uuidv5, so a deleted app
             // reappears here under the identical uid. Withdraw any cross-app
             // data grants left pointing at it before this new row can inherit
-            // consent the user gave its predecessor. Only `createFromOrigin`
-            // reuses a uid, here or wherever else an origin app is bootstrapped:
-            // `AppStore.create` mints a random uuid4, which no deleted app can
-            // ever hold again.
+            // consent the user gave its predecessor. Only *this* path can reuse
+            // a uid: `AppStore.create` mints a random uuid4, which no deleted
+            // app can ever hold again.
             //
             // Called directly rather than through `app.changed`: the token is
             // issued below, so this has to be able to stop that, and
@@ -3880,9 +3731,6 @@ export class AuthController extends PuterController {
                 app_uid,
                 'uid reused by a new app',
             );
-            // Key-value shares the predecessor left read as gone already,
-            // being older than this row; this only cleans them up.
-            this.services.kvShare.retireSharesOlderThanApp(app);
         }
         if (!app) {
             throw new HttpError(404, `App ${app_uid} does not exist`, {
@@ -3902,7 +3750,6 @@ export class AuthController extends PuterController {
                 APP_AUTHENTICATED_FLAG,
                 {},
                 {},
-                app,
             );
 
         const tokenPromise: Promise<{ token: string; expiresAt?: number }> =
@@ -3912,7 +3759,6 @@ export class AuthController extends PuterController {
                       token: await this.services.auth.getUserAppToken(
                           req.actor!,
                           app_uid,
-                          app,
                       ),
                   }))();
 
@@ -4015,7 +3861,6 @@ export class AuthController extends PuterController {
             result.token = await this.services.auth.getUserAppToken(
                 req.actor!,
                 app!.uid,
-                app!,
             );
         }
         res.json(result);
@@ -4235,7 +4080,7 @@ export class AuthController extends PuterController {
 
         if (action === 'enable') {
             // A seat has no email by design, so this would bar it forever.
-            const seat = await this.stores.team?.getOrgSeat(user.id);
+            const seat = await this.stores.team.getOrgSeat(user.id);
             if (!user.email_confirmed && !seat) {
                 throw new HttpError(
                     403,
@@ -4309,7 +4154,7 @@ export class AuthController extends PuterController {
                 legacyCode: 'not_found',
             });
 
-        const seat = await this.stores.team?.getOrgSeat(user.id);
+        const seat = await this.stores.team.getOrgSeat(user.id);
         if (seat && Number(seat.require_2fa) === 1) {
             throw new HttpError(
                 409,
@@ -4318,28 +4163,6 @@ export class AuthController extends PuterController {
             );
         }
 
-        const code = req.body?.code;
-        if (
-            user.otp_enabled &&
-            typeof code === 'string' &&
-            /^[A-Z0-9]{8}$/.test(code)
-        ) {
-            await this.#assertSecondFactorAttemptsRemain(user.uuid);
-            const consumed = await this.stores.user.consumeOtpRecoveryCode(
-                user.id,
-                hashRecoveryCode(code),
-            );
-            if (!consumed) {
-                await this.#recordSecondFactorFailure(user.uuid);
-                throw new HttpError(401, 'Incorrect code.', {
-                    legacyCode: 'code_mismatch',
-                    fields: { factor: 'otp' },
-                });
-            }
-        } else {
-            this.#requireAccountTwoFactor(user, code);
-        }
-
         await this.stores.user.update(user.id, {
             otp_enabled: false,
             otp_recovery_codes: null,
@@ -4417,10 +4240,13 @@ export class AuthController extends PuterController {
             throw new HttpError(400, 'No session bound to this actor', {
                 legacyCode: 'session_required' as never,
             });
-        // Token auth built this actor from the user's row in this request, and
-        // a deleted user fails it.
+        const user = await this.stores.user.getById(req.actor.user.id!);
+        if (!user)
+            throw new HttpError(404, 'User not found', {
+                legacyCode: 'not_found',
+            });
         const guiToken = this.services.auth.createGuiToken(
-            req.actor.user as UserRow,
+            user,
             req.actor.session.uid,
         );
         res.json({ token: guiToken });
@@ -4450,9 +4276,13 @@ export class AuthController extends PuterController {
             res.status(400).end();
             return;
         }
-        // As in `/get-gui-token`: the actor is the user's row as auth read it.
+        const user = await this.stores.user.getById(req.actor.user.id!);
+        if (!user) {
+            res.status(404).end();
+            return;
+        }
         const sessionToken = this.services.auth.createSessionTokenForSession(
-            req.actor.user as UserRow,
+            user,
             req.actor.session.uid,
         );
         res.cookie(this.config.cookie_name ?? 'puter_token', sessionToken, {
@@ -4548,14 +4378,11 @@ export class AuthController extends PuterController {
         }
 
         const token = signStepUpToken(this.services.token, user as never);
-        const isApiHost = req.subdomains?.at(-1) === 'api';
-        if (!isApiHost) {
-            res.cookie(
-                STEP_UP_COOKIE_NAME,
-                token,
-                stepUpCookieOptions(this.config),
-            );
-        }
+        res.cookie(
+            STEP_UP_COOKIE_NAME,
+            token,
+            stepUpCookieOptions(this.config),
+        );
 
         // A browser reads its elevation back from the httpOnly cookie and never
         // needs the raw value; handing it to page JS would put the second factor
@@ -4564,9 +4391,7 @@ export class AuthController extends PuterController {
         // password/TOTP — this only avoids needless exposure, it isn't a gate.
         const cookieName = this.config.cookie_name ?? 'puter_token';
         const usedSessionCookie =
-            !isApiHost &&
-            !!req.token &&
-            req.token === req.cookies?.[cookieName];
+            !!req.token && req.token === req.cookies?.[cookieName];
         res.json(
             usedSessionCookie ? { elevated: true } : { elevated: true, token },
         );
@@ -4587,7 +4412,7 @@ export class AuthController extends PuterController {
         const userId = req.actor!.user.id!;
         // The team owns the account and is billed for it; only they may close
         // it, through the console that keeps the audit trail.
-        if (await this.stores.team?.getOrgSeat(userId)) {
+        if (await this.stores.team.getOrgSeat(userId)) {
             throw new HttpError(
                 403,
                 'Your team owns this account. Ask a team admin to remove it.',
@@ -4597,7 +4422,7 @@ export class AuthController extends PuterController {
         // The other direction: deleting an owner sets `owner_user_id` NULL and
         // cascades their membership, leaving a team no one can administer —
         // not even an admin, since every team route resolves by membership.
-        if (await this.stores.team?.countOwned(userId)) {
+        if (await this.stores.team.countOwned(userId)) {
             throw new HttpError(
                 403,
                 'Delete the teams you own before closing this account.',
@@ -4606,7 +4431,7 @@ export class AuthController extends PuterController {
         }
         // A deleted team's seats are suspended, not gone, and only its owner
         // can retire them.
-        if (await this.stores.team?.countOwnedTeamsWithAccounts(userId)) {
+        if (await this.stores.team.countOwnedTeamsWithAccounts(userId)) {
             throw new HttpError(
                 403,
                 'Close the accounts your teams created before closing this one.',
@@ -4679,19 +4504,13 @@ export class AuthController extends PuterController {
         await checkRateLimit(`${scope}:${userUid}`, limit, window);
     }
 
-    /**
-     * An `otp-login` JWT completes one sign-in; a second redemption is refused.
-     * Fails closed: while the store can't say whether the token was used, the
-     * sign-in is refused rather than letting a captured token replay.
-     */
+    /** An `otp-login` JWT completes one sign-in; a second redemption is refused. */
     async #consumeOtpLoginToken(token: string): Promise<void> {
         const digest = crypto.createHash('sha256').update(token).digest('hex');
         const firstUse = await checkRateLimit(
             `login-otp-token-used:${digest}`,
             1,
             OTP_LOGIN_TOKEN_USED_WINDOW_MS,
-            undefined,
-            { failOpen: false },
         );
         if (!firstUse) {
             throw new HttpError(400, 'Invalid token.', {
@@ -4765,15 +4584,7 @@ export class AuthController extends PuterController {
         req: Request,
         res: Response,
         user: UserRow,
-        oidcContinuation?: unknown,
     ): Promise<void> {
-        const redirectUrl =
-            oidcContinuation === undefined
-                ? undefined
-                : completeOidcLoginReturn(res, user, oidcContinuation, {
-                      config: this.config,
-                      oidc: this.services.oidc,
-                  });
         const gui_token = await startWebSession(req, res, user, {
             config: this.config,
             auth: this.services.auth,
@@ -4799,7 +4610,6 @@ export class AuthController extends PuterController {
             next_step: 'complete',
             token: gui_token,
             user: details,
-            ...(redirectUrl ? { redirectUrl } : {}),
         });
     }
 }

src/backend/controllers/auth/emailChange2fa.http.test.ts

@@ -1,371 +0,0 @@
-import { TOTP } from 'otpauth';
-import { v4 as uuidv4 } from 'uuid';
-import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
-import {
-    createTestUser,
-    setupPuterTestEnv,
-    type PuterTestEnv,
-} from '../../testUtil.js';
-import { installSeatStub } from '../../testFixtures/seatStub.js';
-
-describe('account change second-factor verification', () => {
-    let env: PuterTestEnv;
-    const password = 'email-change-password';
-    const links = new Map<string, string>();
-
-    beforeAll(async () => {
-        env = await setupPuterTestEnv();
-        vi.spyOn(env.server.clients.email, 'send').mockImplementation(
-            async (to, template, values) => {
-                if (template === 'email_verification_link')
-                    links.set(to, String(values?.link));
-                return null;
-            },
-        );
-    }, 120_000);
-    afterAll(async () => {
-        await env?.shutdown();
-    });
-
-    const account = async (enabled = true, oidcOnly = false) => {
-        const username = `email2fa_${uuidv4().slice(0, 8)}`;
-        const credentials = await createTestUser(env.server, {
-            username,
-            password,
-        });
-        const user = (await env.server.stores.user.getByUsername(username))!;
-        const otp = new TOTP({
-            issuer: 'puter.com',
-            label: username,
-            algorithm: 'SHA1',
-            digits: 6,
-        });
-        await env.server.stores.user.update(user.id, {
-            email: `${username}@example.com`,
-            email_confirmed: true,
-            otp_enabled: enabled,
-            otp_secret: otp.secret.base32,
-            ...(oidcOnly ? { password: null } : {}),
-        });
-        return { ...credentials, id: user.id, uuid: user.uuid, otp };
-    };
-
-    const change = (
-        token: string,
-        body: Record<string, unknown>,
-        revalidation?: string,
-        path = '/user-protected/change-email',
-    ) =>
-        fetch(new URL(path, env.origin), {
-            method: 'POST',
-            headers: {
-                'content-type': 'application/json',
-                cookie: `puter_auth_token=${token}${revalidation ? `; puter_revalidation=${revalidation}` : ''}`,
-            },
-            body: JSON.stringify(body),
-        });
-
-    it.each([undefined, 'invalid-code', 123456, {}])(
-        'rejects an enabled account with code %j before staging a change',
-        async (code) => {
-            const user = await account();
-            const response = await change(user.token, {
-                password,
-                new_email: '[email protected]',
-                code,
-            });
-            expect(response.status).toBeGreaterThanOrEqual(400);
-            expect(response.status).toBeLessThan(500);
-            expect(await response.json()).toMatchObject({ factor: 'otp' });
-            const after = await env.server.stores.user.getById(user.id, {
-                force: true,
-            });
-            expect(after!.change_email_confirm_token).toBeFalsy();
-            expect(after!.unconfirmed_change_email).toBeFalsy();
-        },
-    );
-
-    it('rejects an incorrect six-digit code without staging the address', async () => {
-        const user = await account();
-        const code = ['000000', '000001', '000002', '000003'].find(
-            (token) => user.otp.validate({ token, window: 1 }) === null,
-        );
-        const response = await change(user.token, {
-            password,
-            new_email: '[email protected]',
-            code,
-        });
-        expect(response.status).toBe(401);
-        expect(await response.json()).toMatchObject({
-            code: 'code_mismatch',
-            factor: 'otp',
-        });
-        expect(
-            (await env.server.stores.user.getById(user.id, { force: true }))!
-                .change_email_confirm_token,
-        ).toBeFalsy();
-    });
-
-    it('refuses a change when the enabled account secret is unavailable', async () => {
-        const user = await account();
-        await env.server.stores.user.update(user.id, {
-            otp_secret: 'invalid!',
-        });
-        expect(
-            (
-                await change(user.token, {
-                    password,
-                    new_email: '[email protected]',
-                    code: '000000',
-                })
-            ).status,
-        ).toBe(401);
-    });
-
-    it('requires a code even after OIDC revalidation', async () => {
-        const user = await account(true, true);
-        const proof = env.server.services.token.sign(
-            'oidc-state',
-            {
-                user_uuid: user.uuid,
-                purpose: 'revalidate',
-            },
-            { expiresIn: '5m' },
-        );
-        expect(
-            (
-                await change(
-                    user.token,
-                    { new_email: '[email protected]' },
-                    proof,
-                )
-            ).status,
-        ).toBe(400);
-        expect(
-            (
-                await change(
-                    user.token,
-                    {
-                        new_email: '[email protected]',
-                        code: user.otp.generate(),
-                    },
-                    proof,
-                )
-            ).status,
-        ).toBe(200);
-    });
-
-    it.each([true, false])(
-        'completes the change with the required factors (2FA enabled: %s)',
-        async (enabled) => {
-            const user = await account(enabled);
-            const newEmail = `${uuidv4()}@example.com`;
-            expect(
-                (
-                    await change(user.token, {
-                        password,
-                        new_email: newEmail,
-                        ...(enabled ? { code: user.otp.generate() } : {}),
-                    })
-                ).status,
-            ).toBe(200);
-            const link = links.get(newEmail)!;
-            expect(link).toBeTruthy();
-            expect((await fetch(link, { redirect: 'manual' })).status).toBe(
-                200,
-            );
-            expect(
-                (await env.server.stores.user.getById(user.id, {
-                    force: true,
-                }))!.email,
-            ).toBe(newEmail);
-        },
-    );
-
-    it('requires a new request if 2FA is enabled after the link was issued', async () => {
-        const user = await account(false);
-        const newEmail = `${uuidv4()}@example.com`;
-        expect(
-            (await change(user.token, { password, new_email: newEmail }))
-                .status,
-        ).toBe(200);
-        await env.server.stores.user.update(user.id, { otp_enabled: true });
-        expect(
-            (await fetch(links.get(newEmail)!, { redirect: 'manual' })).status,
-        ).toBe(400);
-        expect(
-            (await env.server.stores.user.getById(user.id, { force: true }))!
-                .email,
-        ).not.toBe(newEmail);
-    });
-
-    it('refuses an existing confirmation link that never verified 2FA', async () => {
-        const user = await account();
-        const token = uuidv4();
-        await env.server.stores.user.update(user.id, {
-            change_email_confirm_token: token,
-            unconfirmed_change_email: '[email protected]',
-        });
-        const link = env.server.services.token.sign(
-            'otp',
-            {
-                token,
-                user_id: user.id,
-                purpose: 'change-email',
-            },
-            { expiresIn: '1h' },
-        );
-        const response = await fetch(
-            new URL(`/change_email/confirm?token=${link}`, env.origin),
-            { redirect: 'manual' },
-        );
-        expect(response.status).toBe(400);
-        expect(
-            (await env.server.stores.user.getById(user.id, { force: true }))!
-                .email,
-        ).toBe(`${user.username}@example.com`);
-    });
-    describe('disabling 2FA', () => {
-        it.each([undefined, 'invalid-code', 123456, {}])(
-            'refuses code %j and retains the second-factor configuration',
-            async (code) => {
-                const user = await account();
-                await env.server.stores.user.update(user.id, {
-                    otp_recovery_codes: 'one,two,three',
-                });
-                const response = await change(
-                    user.token,
-                    { password, code },
-                    undefined,
-                    '/user-protected/disable-2fa',
-                );
-                expect(response.status).toBe(400);
-                expect(await response.json()).toMatchObject({ factor: 'otp' });
-                const after = await env.server.stores.user.getById(user.id, {
-                    force: true,
-                });
-                expect(after!.otp_enabled).toBeTruthy();
-                expect(after!.otp_secret).toBe(user.otp.secret.base32);
-                expect(after!.otp_recovery_codes).toBe('one,two,three');
-            },
-        );
-
-        it('rejects an incorrect six-digit code', async () => {
-            const user = await account();
-            const code = ['000000', '000001', '000002', '000003'].find(
-                (token) => user.otp.validate({ token, window: 1 }) === null,
-            );
-            const response = await change(
-                user.token,
-                { password, code },
-                undefined,
-                '/user-protected/disable-2fa',
-            );
-            expect(response.status).toBe(401);
-            expect(await response.json()).toMatchObject({
-                code: 'code_mismatch',
-                factor: 'otp',
-            });
-            expect(
-                (await env.server.stores.user.getById(user.id, {
-                    force: true,
-                }))!.otp_enabled,
-            ).toBeTruthy();
-        });
-
-        it.each([false, true])(
-            'accepts a current code after proving identity (OIDC-only: %s)',
-            async (oidcOnly) => {
-                const user = await account(true, oidcOnly);
-                const proof = oidcOnly
-                    ? env.server.services.token.sign(
-                          'oidc-state',
-                          {
-                              user_uuid: user.uuid,
-                              purpose: 'revalidate',
-                          },
-                          { expiresIn: '5m' },
-                      )
-                    : undefined;
-                const missing = await change(
-                    user.token,
-                    oidcOnly ? {} : { password },
-                    proof,
-                    '/user-protected/disable-2fa',
-                );
-                expect(missing.status).toBe(400);
-                const response = await change(
-                    user.token,
-                    {
-                        ...(oidcOnly ? {} : { password }),
-                        code: user.otp.generate(),
-                    },
-                    proof,
-                    '/user-protected/disable-2fa',
-                );
-                expect(response.status).toBe(200);
-                const after = await env.server.stores.user.getById(user.id, {
-                    force: true,
-                });
-                expect(after!.otp_enabled).toBeFalsy();
-                expect(after!.otp_secret).toBeNull();
-                expect(after!.otp_recovery_codes).toBeNull();
-            },
-        );
-
-        it('does not accept a code without password or OIDC revalidation', async () => {
-            const user = await account();
-            const response = await change(
-                user.token,
-                { code: user.otp.generate() },
-                undefined,
-                '/user-protected/disable-2fa',
-            );
-            expect(response.status).toBe(403);
-            expect(await response.json()).toMatchObject({
-                code: 'password_required',
-            });
-            expect(
-                (await env.server.stores.user.getById(user.id, {
-                    force: true,
-                }))!.otp_enabled,
-            ).toBeTruthy();
-        });
-
-        it('does not let a valid code override a team requirement for 2FA', async () => {
-            const member = await account(true, true);
-            installSeatStub(env.server as never, [member.id], {
-                require2fa: true,
-            });
-            const proof = env.server.services.token.sign('oidc-state', {
-                user_uuid: member.uuid, purpose: 'revalidate',
-            }, { expiresIn: '5m' });
-            const response = await change(
-                member.token,
-                { code: member.otp.generate() },
-                proof,
-                '/user-protected/disable-2fa',
-            );
-            expect(response.status).toBe(409);
-            expect(
-                (await env.server.stores.user.getById(member.id, {
-                    force: true,
-                }))!.otp_enabled,
-            ).toBeTruthy();
-        });
-
-        it('remains idempotent for an account with 2FA already disabled', async () => {
-            const user = await account(false);
-            expect(
-                (
-                    await change(
-                        user.token,
-                        { password },
-                        undefined,
-                        '/user-protected/disable-2fa',
-                    )
-                ).status,
-            ).toBe(200);
-        });
-    });
-});

src/backend/controllers/auth/oidcLoginReturn.ts

@@ -1,93 +0,0 @@
-import crypto from 'node:crypto';
-import type { Response } from 'express';
-import { HttpError } from '../../core/http/HttpError.js';
-import type { OIDCService } from '../../services/auth/OIDCService.js';
-import type { UserRow } from '../../stores/user/UserStore.js';
-import type { IConfig } from '../../types.js';
-import { sessionCookieFlags } from '../../util/cookieFlags.js';
-
-export const OIDC_POPUP_RETURN_COOKIE_NAME = 'puter_oidc_popup_return';
-export const OIDC_POPUP_RETURN_EXPIRY_SEC = 300;
-
-export interface OidcLoginContinuation {
-    userUuid: string;
-    redirectUri: string;
-    embeddedInPopup: boolean;
-    openerOrigin: string | null;
-    messageId: string | null;
-}
-
-interface OidcReturnDeps {
-    config: IConfig;
-    oidc: OIDCService;
-}
-
-/** Bind an attested popup return to the browser that completed sign-in. */
-export function mintOidcPopupReturn(
-    res: Response,
-    payload: Record<string, unknown>,
-    deps: OidcReturnDeps,
-): string {
-    const nonce = crypto.randomBytes(32).toString('base64url');
-    res.cookie(OIDC_POPUP_RETURN_COOKIE_NAME, nonce, {
-        ...sessionCookieFlags(deps.config, { crossSite: false }),
-        httpOnly: true,
-        maxAge: OIDC_POPUP_RETURN_EXPIRY_SEC * 1000,
-        path: '/',
-    });
-    return deps.oidc.signPopupReturn({ action: 'sign-in', ...payload, nonce });
-}
-
-/** Call only after both the provider and the account's second factor succeed. */
-export function completeOidcLoginReturn(
-    res: Response,
-    user: Pick<UserRow, 'uuid'>,
-    continuation: unknown,
-    deps: OidcReturnDeps,
-): string {
-    if (!continuation || typeof continuation !== 'object') {
-        throw new HttpError(400, 'Invalid login continuation.', {
-            legacyCode: 'bad_request',
-        });
-    }
-    const data = continuation as OidcLoginContinuation;
-    if (
-        data.userUuid !== user.uuid ||
-        typeof data.redirectUri !== 'string' ||
-        typeof data.embeddedInPopup !== 'boolean' ||
-        (data.openerOrigin !== null && typeof data.openerOrigin !== 'string') ||
-        (data.messageId !== null && typeof data.messageId !== 'string')
-    ) {
-        throw new HttpError(400, 'Invalid login continuation.', {
-            legacyCode: 'bad_request',
-        });
-    }
-    const origin = (deps.config.origin ?? '').replace(/\/$/, '');
-    let target = data.redirectUri || origin || '/';
-    try {
-        if (origin && new URL(target).origin !== new URL(origin).origin)
-            target = origin;
-    } catch {
-        target = origin || '/';
-    }
-    const append = (key: string, value: string) => {
-        target += `${target.includes('?') ? '&' : '?'}${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
-    };
-    if (data.embeddedInPopup) {
-        append('oidc_login', 'true');
-        append(
-            'opener_state',
-            mintOidcPopupReturn(
-                res,
-                {
-                    opener_origin: data.openerOrigin,
-                    msg_id: data.messageId,
-                    oidc_login: true,
-                    user_uuid: user.uuid,
-                },
-                deps,
-            ),
-        );
-    }
-    return target;
-}

src/backend/controllers/auth/recoveryCode.http.test.ts

@@ -1,139 +0,0 @@
-import { v4 as uuidv4 } from 'uuid';
-import {
-    afterAll,
-    afterEach,
-    beforeAll,
-    describe,
-    expect,
-    it,
-    vi,
-} from 'vitest';
-import { hashRecoveryCode } from '../../services/auth/OTPUtil.js';
-import {
-    createTestUser,
-    setupPuterTestEnv,
-    type PuterTestEnv,
-} from '../../testUtil.js';
-
-describe('recovery code consumption', () => {
-    let env: PuterTestEnv;
-    const password = 'recovery-code-password';
-
-    beforeAll(async () => {
-        env = await setupPuterTestEnv();
-    }, 120_000);
-    afterAll(async () => {
-        await env?.shutdown();
-    });
-    afterEach(() => {
-        vi.restoreAllMocks();
-    });
-
-    // Hold the same cached snapshot until every concurrent request has read it.
-    const overlapReads = (userUuid: string, count: number) => {
-        const redis = env.server.clients.redis;
-        const get = redis.get.bind(redis);
-        const ready = Promise.withResolvers<void>();
-        let reads = 0;
-        vi.spyOn(redis, 'get').mockImplementation(async (key: string) => {
-            const value = await get(key);
-            if (key.includes(userUuid) && reads < count) {
-                if (++reads === count) ready.resolve();
-                await ready.promise;
-            }
-            return value;
-        });
-    };
-
-    const post = async (path: string, body: Record<string, unknown>) => {
-        const response = await fetch(new URL(path, env.origin), {
-            method: 'POST',
-            headers: { 'content-type': 'application/json' },
-            body: JSON.stringify(body),
-        });
-        return { response, body: await response.json() };
-    };
-
-    const account = async (codes: string[]) => {
-        const username = `recovery_${uuidv4().slice(0, 8)}`;
-        await createTestUser(env.server, { username, password });
-        const user = (await env.server.stores.user.getByUsername(username))!;
-        await env.server.stores.user.update(user.id, {
-            otp_enabled: true,
-            otp_secret: 'TESTSECRETBASE32',
-            otp_recovery_codes: codes.map(hashRecoveryCode).join(','),
-        });
-        const challenge = async () => {
-            const { response, body } = await post('/login', {
-                username,
-                password,
-            });
-            expect(response.status).toBe(202);
-            expect(body.next_step).toBe('otp');
-            return body.otp_jwt_token as string;
-        };
-        return { user, challenge };
-    };
-
-    it('allows only one concurrent redemption of the same code', async () => {
-        const { user, challenge } = await account(['RECOVER1', 'RECOVER2']);
-        const tokens = await Promise.all([challenge(), challenge()]);
-        overlapReads(user.uuid, tokens.length);
-        const results = await Promise.all(
-            tokens.map((token) =>
-                post('/login/recovery-code', { token, code: 'RECOVER1' }),
-            ),
-        );
-        expect(
-            results.filter((result) => result.body.next_step === 'complete'),
-        ).toHaveLength(1);
-        expect(
-            results.filter((result) => result.body.proceed === false),
-        ).toHaveLength(1);
-        const after = await env.server.stores.user.getById(user.id, {
-            force: true,
-        });
-        expect(after!.otp_recovery_codes).toBe(hashRecoveryCode('RECOVER2'));
-    });
-
-    it('consumes different concurrent codes without restoring either one', async () => {
-        const codes = ['RECOVER1', 'RECOVER2', 'RECOVER3'];
-        const { user, challenge } = await account(codes);
-        const tokens = await Promise.all(codes.map(() => challenge()));
-        overlapReads(user.uuid, tokens.length);
-        const results = await Promise.all(
-            codes.map((code, index) =>
-                post('/login/recovery-code', { token: tokens[index], code }),
-            ),
-        );
-        expect(
-            results.every((result) => result.body.next_step === 'complete'),
-        ).toBe(true);
-        const after = await env.server.stores.user.getById(user.id, {
-            force: true,
-        });
-        expect(after!.otp_recovery_codes).toBe('');
-        const replay = await post('/login/recovery-code', {
-            token: tokens[0],
-            code: codes[0],
-        });
-        expect(replay.body).toMatchObject({ proceed: false });
-    });
-
-    it.each([{ code: 123456 }, { code: {} }, { code: [] }])(
-        'rejects a non-string recovery code $code without consuming a code',
-        async ({ code }) => {
-            const { user, challenge } = await account(['RECOVER1']);
-            const result = await post('/login/recovery-code', {
-                token: await challenge(),
-                code,
-            });
-            expect(result.response.status).toBe(400);
-            expect(
-                (await env.server.stores.user.getById(user.id, {
-                    force: true,
-                }))!.otp_recovery_codes,
-            ).toBe(hashRecoveryCode('RECOVER1'));
-        },
-    );
-});

src/backend/controllers/auth/recoveryDisable2fa.http.test.ts

@@ -1,89 +0,0 @@
-import { v4 as uuidv4 } from 'uuid';
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-import { hashRecoveryCode } from '../../services/auth/OTPUtil.js';
-import {
-    createTestUser,
-    setupPuterTestEnv,
-    type PuterTestEnv,
-} from '../../testUtil.js';
-
-describe('2FA after signing in with a recovery code', () => {
-    let env: PuterTestEnv;
-    const password = 'lost-authenticator-password';
-
-    beforeAll(async () => {
-        env = await setupPuterTestEnv();
-    }, 120_000);
-    afterAll(async () => {
-        await env?.shutdown();
-    });
-
-    const post = (
-        path: string,
-        body: Record<string, unknown>,
-        cookie?: string,
-    ) =>
-        fetch(new URL(path, env.origin), {
-            method: 'POST',
-            headers: {
-                'content-type': 'application/json',
-                ...(cookie ? { cookie } : {}),
-            },
-            body: JSON.stringify(body),
-        });
-
-    it('allows an unused recovery code to disable 2FA after password revalidation', async () => {
-        const username = `lost2fa_${uuidv4().slice(0, 8)}`;
-        await createTestUser(env.server, { username, password });
-        const user = (await env.server.stores.user.getByUsername(username))!;
-        await env.server.stores.user.update(user.id, {
-            email: `${username}@example.com`,
-            email_confirmed: true,
-            otp_enabled: true,
-            otp_secret: 'TESTSECRETBASE32',
-            otp_recovery_codes: ['RECOVER1', 'RECOVER2', 'RECOVER3']
-                .map(hashRecoveryCode)
-                .join(','),
-        });
-
-        // Sign in with a recovery code: works, and yields a web session.
-        const login = await post('/login', { username, password });
-        expect(login.status).toBe(202);
-        const { otp_jwt_token } = await login.json();
-        const recovered = await post('/login/recovery-code', {
-            token: otp_jwt_token,
-            code: 'RECOVER1',
-        });
-        expect((await recovered.json()).next_step).toBe('complete');
-        const cookie = recovered.headers
-            .getSetCookie()
-            .find((value) => value.startsWith('puter_auth_token='))!
-            .split(';')[0]!;
-
-        const reused = await post(
-            '/user-protected/disable-2fa',
-            { password, code: 'RECOVER1' },
-            cookie,
-        );
-        expect(reused.status).toBe(401);
-        expect(
-            (await env.server.stores.user.getById(user.id, { force: true }))!
-                .otp_enabled,
-        ).toBeTruthy();
-
-        const disable = await post(
-            '/user-protected/disable-2fa',
-            { password, code: 'RECOVER2' },
-            cookie,
-        );
-        expect(disable.status).toBe(200);
-        expect(await disable.json()).toMatchObject({ success: true });
-
-        const after = await env.server.stores.user.getById(user.id, {
-            force: true,
-        });
-        expect(after!.otp_enabled).toBeFalsy();
-        expect(after!.otp_secret).toBeNull();
-        expect(after!.otp_recovery_codes).toBeNull();
-    });
-});

src/backend/controllers/broadcast/BroadcastController.ts

@@ -19,7 +19,6 @@
 
 import type { Request, Response } from 'express';
 import { Controller, Post } from '../../core/http/decorators.js';
-import { schedulesUnavailable } from '../../core/schedules.js';
 import type { BroadcastService } from '../../services/broadcast/BroadcastService.js';
 import type { ForwardBatch } from '../../services/events/forwardQueue.js';
 import { PuterController } from '../types.js';
@@ -109,42 +108,6 @@ export class BroadcastController extends PuterController {
         );
         res.status(200).json({ ok: true, ...reply });
     }
-
-    /**
-     * Schedule changes a region made for schedules this one owns, handed to
-     * `services.schedules`; `events_disabled` on a server without it.
-     */
-    @Post('/events/schedules', { subdomain: '*' })
-    async schedules(req: Request, res: Response): Promise<void> {
-        const broadcast = this.services.broadcast as unknown as
-            BroadcastService | undefined;
-        if (!broadcast) {
-            res.status(503).json({
-                error: { message: 'Broadcast service not registered' },
-            });
-            return;
-        }
-
-        const verified = await broadcast.verifySignedRequest(
-            req.rawBody,
-            broadcastHeaders(req),
-        );
-        if (!verified.ok) {
-            res.status(verified.status ?? 400).json({
-                error: { message: verified.message ?? 'Bad request' },
-            });
-            return;
-        }
-        if (verified.info?.ignored) {
-            res.status(200).json({ ok: true, ...verified.info });
-            return;
-        }
-
-        const schedules = this.services.schedules;
-        if (!schedules) throw schedulesUnavailable();
-        const reply = await schedules.receivePeerChanges(req.body);
-        res.status(200).json({ ok: true, ...reply });
-    }
 }
 
 const broadcastHeaders = (req: Request) => {

src/backend/controllers/desktop/DesktopController.js

@@ -25,13 +25,18 @@ const ALLOWED_SORT_BY = ['name', 'size', 'modified', 'type'];
 const ALLOWED_SORT_ORDER = ['asc', 'desc'];
 
 /**
- * Folder view preference routes: layout and sort_by/sort_order, stored on the
- * folder's fsentries row.
+ * Desktop/UI preference routes.
+ *
+ * Two categories:
+ *
+ * - User-level: desktop background, taskbar items (UserStore)
+ * - Folder-level: layout, sort_by/sort_order (fsentries table)
  */
 /**
- * Desktop preference writes — layout, sort order. Each persists on every call,
- * and the GUI fires them on direct user action, so a per-minute ceiling well
- * above human speed is enough to catch a stuck client.
+ * Desktop preference writes — background, taskbar, layout, sort order. All four
+ * persist to the user row on every call, and the GUI fires them on direct user
+ * action, so a per-minute ceiling well above human speed is enough to catch a
+ * stuck client.
  */
 const PREFERENCE_WRITE_LIMIT = {
     scope: 'desktop-preference',
@@ -42,6 +47,89 @@ const PREFERENCE_WRITE_LIMIT = {
 
 export class DesktopController extends PuterController {
     registerRoutes(router) {
+        // -- Desktop background --------------------------------------
+
+        router.post(
+            '/set-desktop-bg',
+            {
+                subdomain: 'api',
+                requireUserActor: true,
+                allowFullAccessToken: true,
+                rateLimit: PREFERENCE_WRITE_LIMIT,
+            },
+            async (req, res) => {
+                const { url, color, fit } = req.body ?? {};
+
+                const patch = {};
+                if (url !== undefined) {
+                    if (url !== null && typeof url !== 'string') {
+                        throw new HttpError(
+                            400,
+                            '`url` must be a string or null',
+                            { legacyCode: 'bad_request' },
+                        );
+                    }
+                    patch.desktop_bg_url = url;
+                }
+                if (color !== undefined) {
+                    if (color !== null && typeof color !== 'string') {
+                        throw new HttpError(
+                            400,
+                            '`color` must be a string or null',
+                            { legacyCode: 'bad_request' },
+                        );
+                    }
+                    patch.desktop_bg_color = color;
+                }
+                if (fit !== undefined) {
+                    if (fit !== null && typeof fit !== 'string') {
+                        throw new HttpError(
+                            400,
+                            '`fit` must be a string or null',
+                            { legacyCode: 'bad_request' },
+                        );
+                    }
+                    patch.desktop_bg_fit = fit;
+                }
+
+                if (Object.keys(patch).length === 0) {
+                    throw new HttpError(400, 'No fields provided', {
+                        legacyCode: 'bad_request',
+                    });
+                }
+
+                await this.stores.user.update(req.actor.user.id, patch);
+                res.json({});
+            },
+        );
+
+        // -- Taskbar items -------------------------------------------
+
+        router.post(
+            '/update-taskbar-items',
+            {
+                subdomain: 'api',
+                requireUserActor: true,
+                allowFullAccessToken: true,
+                rateLimit: PREFERENCE_WRITE_LIMIT,
+            },
+            async (req, res) => {
+                const { items } = req.body ?? {};
+                if (!Array.isArray(items)) {
+                    throw new HttpError(
+                        400,
+                        'Missing or invalid `items` array',
+                        { legacyCode: 'bad_request' },
+                    );
+                }
+
+                await this.stores.user.update(req.actor.user.id, {
+                    taskbar_items: JSON.stringify(items),
+                });
+                res.json({});
+            },
+        );
+
         // -- Folder layout -------------------------------------------
 
         router.post(

src/backend/controllers/desktop/DesktopController.test.ts

@@ -130,17 +130,147 @@ const callRoute = async (
     });
 };
 
-describe('DesktopController routes', () => {
-    it('has no desktop background route', () => {
-        expect(
-            router.routes.some((r) => r.path === '/set-desktop-bg'),
-        ).toBe(false);
+// ── /set-desktop-bg ─────────────────────────────────────────────────
+
+describe('DesktopController POST /set-desktop-bg', () => {
+    it('persists url/color/fit on the user row', async () => {
+        const { actor, userId } = await makeUser();
+        const { res, captured } = makeRes();
+        await callRoute(
+            'post',
+            '/set-desktop-bg',
+            makeReq({
+                body: {
+                    url: 'https://cdn.test/wallpaper.png',
+                    color: '#000000',
+                    fit: 'cover',
+                },
+                actor,
+            }),
+            res,
+        );
+        expect(captured.body).toEqual({});
+
+        const refreshed = await server.stores.user.getById(userId);
+        expect(refreshed?.desktop_bg_url).toBe(
+            'https://cdn.test/wallpaper.png',
+        );
+        expect(refreshed?.desktop_bg_color).toBe('#000000');
+        expect(refreshed?.desktop_bg_fit).toBe('cover');
     });
 
-    it('has no taskbar items route', () => {
-        expect(
-            router.routes.some((r) => r.path === '/update-taskbar-items'),
-        ).toBe(false);
+    it('persists only the supplied fields (partial update)', async () => {
+        const { actor, userId } = await makeUser();
+        const { res } = makeRes();
+        await callRoute(
+            'post',
+            '/set-desktop-bg',
+            makeReq({ body: { color: '#ffffff' }, actor }),
+            res,
+        );
+        const refreshed = await server.stores.user.getById(userId);
+        expect(refreshed?.desktop_bg_color).toBe('#ffffff');
+        // Untouched fields remain at their column default.
+        expect(refreshed?.desktop_bg_url).toBeFalsy();
+        expect(refreshed?.desktop_bg_fit).toBeFalsy();
+    });
+
+    it('passes through `null` to clear a field', async () => {
+        const { actor, userId } = await makeUser();
+        // First populate, then clear.
+        const populate = makeRes();
+        await callRoute(
+            'post',
+            '/set-desktop-bg',
+            makeReq({
+                body: { url: 'https://cdn.test/x.png' },
+                actor,
+            }),
+            populate.res,
+        );
+        const before = await server.stores.user.getById(userId);
+        expect(before?.desktop_bg_url).toBe('https://cdn.test/x.png');
+
+        const clear = makeRes();
+        await callRoute(
+            'post',
+            '/set-desktop-bg',
+            makeReq({ body: { url: null }, actor }),
+            clear.res,
+        );
+        const after = await server.stores.user.getById(userId);
+        expect(after?.desktop_bg_url).toBeNull();
+    });
+
+    it('throws 400 when url is not a string or null', async () => {
+        const { actor } = await makeUser();
+        const { res } = makeRes();
+        await expect(
+            callRoute(
+                'post',
+                '/set-desktop-bg',
+                makeReq({ body: { url: 123 }, actor }),
+                res,
+            ),
+        ).rejects.toMatchObject({ statusCode: 400 });
+    });
+
+    it('throws 400 when no fields are provided', async () => {
+        const { actor } = await makeUser();
+        const { res } = makeRes();
+        await expect(
+            callRoute(
+                'post',
+                '/set-desktop-bg',
+                makeReq({ body: {}, actor }),
+                res,
+            ),
+        ).rejects.toMatchObject({ statusCode: 400 });
+    });
+});
+
+// ── /update-taskbar-items ───────────────────────────────────────────
+
+describe('DesktopController POST /update-taskbar-items', () => {
+    it('persists items as a JSON-encoded string', async () => {
+        const { actor, userId } = await makeUser();
+        const items = [{ name: 'editor' }, { name: 'browser' }];
+        const { res } = makeRes();
+        await callRoute(
+            'post',
+            '/update-taskbar-items',
+            makeReq({ body: { items }, actor }),
+            res,
+        );
+
+        const refreshed = await server.stores.user.getById(userId);
+        expect(refreshed?.taskbar_items).toBe(JSON.stringify(items));
+    });
+
+    it('throws 400 when items is missing', async () => {
+        const { actor } = await makeUser();
+        const { res } = makeRes();
+        await expect(
+            callRoute(
+                'post',
+                '/update-taskbar-items',
+                makeReq({ body: {}, actor }),
+                res,
+            ),
+        ).rejects.toMatchObject({ statusCode: 400 });
+    });
+
+    it('throws 400 when items is not an array', async () => {
+        const { actor } = await makeUser();
+        const { res } = makeRes();
+        await expect(
+            callRoute(
+                'post',
+                '/update-taskbar-items',
+                makeReq({ body: { items: 'oops' }, actor }),
+                res,
+            ),
+        ).rejects.toMatchObject({ statusCode: 400 });
     });
 });
 

src/backend/controllers/drivers/DriverController.concurrent.test.ts

@@ -21,7 +21,7 @@
 import { EventEmitter } from 'node:events';
 import type { Request, RequestHandler, Response } from 'express';
 import { beforeEach, describe, expect, it } from 'vitest';
-import { Context, runWithContext } from '../../core/context.js';
+import { runWithContext } from '../../core/context.js';
 import { isHttpError } from '../../core/http/HttpError.js';
 import { configureRateLimit } from '../../core/http/middleware/rateLimit.js';
 import { DriverController } from './DriverController.js';
@@ -278,86 +278,6 @@ describe('DriverController — concurrent acquire/release', () => {
         expect(res2.body).toMatchObject({ success: true, result: 'pong' });
     });
 
-    // A driver that keeps working after the caller hangs up (async video
-    // polling) must keep counting against the cap until it settles.
-    it('holds the slot while the driver still works after a disconnect', async () => {
-        let finish = () => {};
-        const driver = {
-            ...makeSyntheticDriver(),
-            ping: () =>
-                new Promise<string>((resolve) => {
-                    finish = () => resolve('pong');
-                }),
-        };
-        const handler = captureCallHandler(buildController(driver));
-        const req = () =>
-            makeReq({ interface: 'test-iface', method: 'ping' }, 'working');
-
-        const res1 = new StubRes();
-        const first = callInScope(handler, req(), res1 as unknown as Response);
-        await new Promise((r) => setImmediate(r));
-        res1.emit('close');
-        await new Promise((r) => setImmediate(r));
-
-        await expect(
-            callInScope(handler, req(), new StubRes() as unknown as Response),
-        ).rejects.toSatisfy(
-            (e) =>
-                isHttpError(e) &&
-                (e as { statusCode: number }).statusCode === 429,
-        );
-
-        finish();
-        await first;
-        await new Promise((r) => setImmediate(r));
-        const res2 = new StubRes();
-        const second = callInScope(handler, req(), res2 as unknown as Response);
-        await new Promise((r) => setImmediate(r));
-        finish();
-        await second;
-        res2.emit('finish');
-        expect(res2.body).toMatchObject({ success: true, result: 'pong' });
-    });
-
-    it('holds the slot for work a driver keeps past its response', async () => {
-        let settleWork = () => {};
-        const driver = {
-            ...makeSyntheticDriver(),
-            ping: async () => {
-                Context.get('keepDriverSlot')?.(
-                    new Promise<void>((resolve) => {
-                        settleWork = resolve;
-                    }),
-                );
-                return 'pong';
-            },
-        };
-        const handler = captureCallHandler(buildController(driver));
-        const req = () =>
-            makeReq({ interface: 'test-iface', method: 'ping' }, 'kept');
-
-        const res1 = new StubRes();
-        await callInScope(handler, req(), res1 as unknown as Response);
-        res1.emit('finish');
-        await new Promise((r) => setImmediate(r));
-
-        await expect(
-            callInScope(handler, req(), new StubRes() as unknown as Response),
-        ).rejects.toSatisfy(
-            (e) =>
-                isHttpError(e) &&
-                (e as { statusCode: number }).statusCode === 429,
-        );
-
-        settleWork();
-        await new Promise((r) => setImmediate(r));
-        const res2 = new StubRes();
-        await callInScope(handler, req(), res2 as unknown as Response);
-        res2.emit('finish');
-        settleWork();
-        expect(res2.body).toMatchObject({ success: true, result: 'pong' });
-    });
-
     it('does not attach release listeners when the driver declares no concurrent config', async () => {
         // With no spec there is nothing to release, so the gate must not
         // wire `finish`/`close` release listeners. The client-disconnect

src/backend/controllers/drivers/DriverController.test.ts

@@ -501,29 +501,6 @@ describe('DriverController.#handleCall (via captured router)', () => {
         expect(body.service.name).toBe('puter-kvstore');
     });
 
-    it('treats null `args` as no arguments', async () => {
-        const actor = await makeUserActor();
-        await server.stores.permission.setFlatUserPerm(
-            actor.user!.id!,
-            'service:puter-subdomains:ii:puter-subdomains',
-            {
-                permission: 'service:puter-subdomains:ii:puter-subdomains',
-                deleted: false,
-                issuer_user_id: actor.user!.id!,
-            } as never,
-        );
-
-        const res = makeRes();
-        const req = makeReq(
-            { interface: 'puter-subdomains', method: 'select', args: null },
-            actor,
-        );
-        await runWithContext({ actor }, () =>
-            routes['POST /call'](req, res as unknown as Response, () => {}),
-        );
-        expect((res.body as { success: boolean }).success).toBe(true);
-    });
-
     it('pipes a stream-shaped result instead of JSON', async () => {
         // Use an ephemeral driver registered onto the controller's bag.
         const streamPayload = Buffer.from('hello-world');
@@ -759,42 +736,6 @@ describe('DriverController driver-method lifecycle events', () => {
             rejectReason: 'blocked in test',
         });
     });
-
-    it('answers 429 when a before listener vetoes with rejectStatus 429', async () => {
-        const actor = await makeUserActor();
-        await grantKvPerm(actor);
-        const key = `throttle-${uuidv4()}`;
-        server.clients.event.on(
-            'driver.puter-kvstore.set.before',
-            (_k, data) => {
-                if ((data.args as { key?: string })?.key === key) {
-                    data.allow = false;
-                    data.rejectStatus = 429;
-                }
-            },
-        );
-
-        const req = makeReq(
-            {
-                interface: 'puter-kvstore',
-                method: 'set',
-                args: { key, value: 'v' },
-            },
-            actor,
-        );
-        await expect(
-            runWithContext({ actor }, () =>
-                routes['POST /call'](
-                    req,
-                    makeRes() as unknown as Response,
-                    () => {},
-                ),
-            ),
-        ).rejects.toMatchObject({
-            statusCode: 429,
-            legacyCode: 'too_many_requests',
-        });
-    });
 });
 
 describe('DriverController.#handleListInterfaces', () => {
@@ -882,10 +823,9 @@ describe('DriverController.#handleCall tracing', () => {
             'driver.method': 'set',
             'driver.name': 'puter-kvstore',
         });
-        // The KV store's dynamo writes produce spans of their own. The
-        // permission gate doesn't: every user holds `service` by default, which
-        // `check` answers without a scan.
-        expect(names).not.toContain('permission.scan');
+        // The call path exercises the permission gate and the KV store's
+        // dynamo writes — both should have produced spans of their own.
+        expect(names).toContain('permission.scan');
         expect(names.some((n) => n.startsWith('ddb.'))).toBe(true);
     });
 });

src/backend/controllers/drivers/DriverController.ts

@@ -31,7 +31,6 @@ import {
     checkDriverRateLimit,
 } from '../../core/http/middleware/rateLimit.js';
 import type { PuterRouter } from '../../core/http/PuterRouter.js';
-import type { LifecycleRejectStatus } from '../../clients/event/types.js';
 import type { DriverMeta } from '../../drivers/meta.js';
 import {
     isCreditExhaustion,
@@ -51,7 +50,6 @@ import { PermissionUtil } from '../../services/permission/permissionUtil.js';
 import type { WithLifecycle } from '../../types';
 import { withSpan } from '../../util/span.js';
 import { PuterController } from '../types.js';
-import { CallSlot } from './callSlot.js';
 
 type DriverInstance = WithLifecycle & Record<string, unknown>;
 
@@ -261,25 +259,12 @@ export class DriverController extends PuterController {
     // -- Handlers ----------------------------------------------------
 
     #handleCall = async (req: Request, res: Response): Promise<void> => {
-        const slot = new CallSlot();
-        const call = this.#call(req, res, slot);
-        slot.keep(call);
-        await call;
-    };
-
-    #call = async (
-        req: Request,
-        res: Response,
-        slot: CallSlot,
-    ): Promise<void> => {
         const {
             interface: ifaceName,
             method,
             driver: driverName,
-            args: rawArgs,
+            args = {},
         } = (req.body ?? {}) as Record<string, unknown>;
-        // Drivers read fields off `args`, so a null one counts as absent.
-        const args = rawArgs ?? {};
 
         if (!ifaceName || typeof ifaceName !== 'string') {
             throw new HttpError(400, 'Missing or invalid `interface`', {
@@ -337,8 +322,7 @@ export class DriverController extends PuterController {
 
         if (req.actor) {
             const permService = this.services.permission as unknown as
-                | PermissionService
-                | undefined;
+                PermissionService | undefined;
             if (permService) {
                 // Build via PermissionUtil.join so any `:` in a driver or
                 // interface name is escaped — raw interpolation would let a
@@ -411,9 +395,10 @@ export class DriverController extends PuterController {
 
         // Per-method rate-limit and concurrent specs both live on the
         // driver's resolved meta. Rate-limit is single-shot; concurrent
-        // acquires a slot held until the response is done and the call's
-        // work has settled, so streamed responses hold it until the stream
-        // drains and work that continues after a disconnect still counts.
+        // acquires a slot that must be released when the response is done
+        // — we hook `res.finish` / `res.close` for that so streamed
+        // responses hold their slot until the stream drains, and aborted
+        // requests still give the slot back.
         const rateLimitSpec = resolvePerMethod(driverMeta?.rateLimit, method);
         if (
             !(await checkDriverRateLimit(req, ifaceName, method, rateLimitSpec))
@@ -445,8 +430,18 @@ export class DriverController extends PuterController {
                     legacyCode: 'too_many_requests',
                 });
             }
-            slot.attach(handle, res);
-            Context.set('keepDriverSlot', (work) => slot.keep(work));
+            let released = false;
+            const release = () => {
+                if (released) return;
+                released = true;
+                void handle.release();
+            };
+            // If the handler throws before responding, the express error
+            // handler will eventually send a response — `finish` fires then,
+            // so we still release. `close` covers client aborts.
+            res.once('finish', release);
+            res.once('close', release);
+            if (res.destroyed || res.writableFinished) release();
         }
 
         // Stash the requested driver name in Context so multi-provider
@@ -479,7 +474,6 @@ export class DriverController extends PuterController {
             args,
             allow: true as boolean,
             rejectReason: undefined as string | undefined,
-            rejectStatus: undefined as LifecycleRejectStatus | undefined,
         };
         await this.clients.event?.emitAndWait(
             `driver.${ifaceName}.${method}.before`,
@@ -501,12 +495,11 @@ export class DriverController extends PuterController {
                 },
                 {},
             );
-            const throttled = beforeEvent.rejectStatus === 429;
             throw new HttpError(
-                throttled ? 429 : 403,
+                403,
                 beforeEvent.rejectReason ??
                     `Blocked by policy: ${ifaceName}:${method}`,
-                { legacyCode: throttled ? 'too_many_requests' : 'forbidden' },
+                { legacyCode: 'forbidden' },
             );
         }
 

src/backend/controllers/drivers/callSlot.test.ts

@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2024-present Puter Technologies Inc.
- *
- * This file is part of Puter.
- *
- * Puter is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import { EventEmitter } from 'node:events';
-import type { Response } from 'express';
-import { afterEach, describe, expect, it, vi } from 'vitest';
-import { CallSlot } from './callSlot.js';
-
-const handle = () => ({
-    release: vi.fn(() => Promise.resolve()),
-    renew: vi.fn(() => Promise.resolve()),
-});
-
-const deferred = () => {
-    let resolve = () => {};
-    const promise = new Promise<void>((r) => {
-        resolve = r;
-    });
-    return { promise, resolve };
-};
-
-afterEach(() => {
-    vi.useRealTimers();
-});
-
-describe('CallSlot', () => {
-    it('renews a slot held by a long call and stops once it is released', async () => {
-        vi.useFakeTimers();
-        const slot = new CallSlot();
-        const slotHandle = handle();
-        const res = new EventEmitter();
-        const call = deferred();
-        slot.keep(call.promise);
-        slot.attach(slotHandle, res as unknown as Response);
-
-        res.emit('close');
-        await vi.advanceTimersByTimeAsync(25 * 60 * 1000);
-        expect(slotHandle.renew).toHaveBeenCalledTimes(2);
-        expect(slotHandle.release).not.toHaveBeenCalled();
-
-        call.resolve();
-        await vi.advanceTimersByTimeAsync(0);
-        expect(slotHandle.release).toHaveBeenCalledOnce();
-        await vi.advanceTimersByTimeAsync(25 * 60 * 1000);
-        expect(slotHandle.renew).toHaveBeenCalledTimes(2);
-    });
-
-    it('releases once the response is done if no work is outstanding', async () => {
-        const slot = new CallSlot();
-        const slotHandle = handle();
-        const res = new EventEmitter();
-        slot.attach(slotHandle, res as unknown as Response);
-        res.emit('finish');
-        expect(slotHandle.release).toHaveBeenCalledOnce();
-        expect(slotHandle.renew).not.toHaveBeenCalled();
-    });
-});

src/backend/controllers/drivers/callSlot.ts

@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2024-present Puter Technologies Inc.
- *
- * This file is part of Puter.
- *
- * Puter is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import type { Response } from 'express';
-
-// Under the concurrency store's one-hour orphan TTL.
-const SLOT_RENEW_MS = 10 * 60 * 1000;
-
-interface SlotHandle {
-    release(): Promise<void>;
-    renew?(): Promise<void>;
-}
-
-/**
- * A driver call's concurrency slot, held until the response is done and the
- * call's work has settled, including work a driver carries on after the caller
- * hung up or was answered.
- */
-export class CallSlot {
-    #handle?: SlotHandle;
-    #work = new Set<Promise<unknown>>();
-    #responded = false;
-    #released = false;
-    #renew?: NodeJS.Timeout;
-
-    attach(handle: SlotHandle, res: Response): void {
-        this.#handle = handle;
-        const responded = () => {
-            this.#responded = true;
-            this.#maybeRelease();
-        };
-        res.once('finish', responded);
-        res.once('close', responded);
-        if (res.destroyed || res.writableFinished) responded();
-        if (!this.#released && this.#work.size > 0) this.#startRenewing();
-    }
-
-    keep(work: Promise<unknown>): void {
-        if (this.#released) return;
-        this.#work.add(work);
-        if (this.#handle) this.#startRenewing();
-        const settled = () => {
-            this.#work.delete(work);
-            this.#maybeRelease();
-        };
-        work.then(settled, settled);
-    }
-
-    #startRenewing(): void {
-        if (this.#renew) return;
-        this.#renew = setInterval(() => {
-            void this.#handle?.renew?.();
-        }, SLOT_RENEW_MS);
-        this.#renew.unref?.();
-    }
-
-    #maybeRelease(): void {
-        if (this.#released || !this.#handle) return;
-        if (!this.#responded || this.#work.size > 0) return;
-        this.#released = true;
-        clearInterval(this.#renew);
-        void this.#handle.release();
-    }
-}

src/backend/controllers/events/EventsController.ts

@@ -25,11 +25,6 @@ import { bodyRecord } from '../../core/http/requestBody.js';
 import { DURABLE_LIST_LIMIT_CAP } from '../../stores/events/DurableSubscriptionStore.js';
 import { EVENTS_WORKERS_LIST_LIMIT_CAP } from '../../stores/events/EventHandlerStore.js';
 import { KV_HANDLE_LIST_LIMIT_CAP } from '../../stores/events/KvShareHandleStore.js';
-import {
-    SCHEDULE_LIST_LIMIT_CAP,
-    schedulesUnavailable,
-    type ScheduleServiceContract,
-} from '../../core/schedules.js';
 import { normalizeLimit } from '../../util/pagination.js';
 import { PuterController } from '../types.js';
 import { EVENTS_WORKER_PREFIX } from '../../services/events/workerRuntime.js';
@@ -64,8 +59,6 @@ const EVENTS_SCRIPT_REGEX = new RegExp(`^${EVENTS_WORKER_PREFIX}[a-f0-9]{32}$`);
 
 /** Matches the edge dispatcher's own validation of the app uid it forwards. */
 const APP_UID_REGEX = /^app-[A-Za-z0-9_-]{1,64}$/;
-/** A user uuid. */
-const HOLDER_REGEX = /^[A-Za-z0-9-]{1,64}$/;
 
 @Controller('/events')
 export class EventsController extends PuterController {
@@ -111,31 +104,12 @@ export class EventsController extends PuterController {
         });
     }
 
-    /**
-     * POST /events/subscriptions/update — replace one subscription's `context`
-     * in place. An id the caller does not hold reads as absent.
-     */
-    @Post('/subscriptions/update', {
-        subdomain: 'api',
-        requireAuth: true,
-        allowAccessToken: true,
-    })
-    async update(req: Request, res: Response): Promise<void> {
-        const actor = this.#requireActor(req);
-        const { sub } = await this.services.events.updateDurable(
-            actor,
-            bodyRecord(req),
-        );
-        res.json(sub);
-    }
-
     /**
      * GET /events/fetch — what the caller missed, one page at a time.
      *
      * Stateless: no subscription, no stored position, nothing written. The
      * cursor comes back to the caller and goes out again as `cursor` (or
-     * `after`, the name it first shipped under). `from=end` with no cursor
-     * starts at the newest row instead of the oldest.
+     * `after`, the name it first shipped under).
      */
     @Get('/fetch', {
         subdomain: 'api',
@@ -146,16 +120,9 @@ export class EventsController extends PuterController {
     async fetch(req: Request, res: Response): Promise<void> {
         const actor = this.#requireActor(req);
         const query = (req.query ?? {}) as Record<string, unknown>;
-        const from = query.from as 'start' | 'end' | undefined;
-        if (from !== undefined && from !== 'start' && from !== 'end') {
-            throw new HttpError(400, '`from` must be `start` or `end`', {
-                legacyCode: 'bad_request',
-            });
-        }
 
         const page = await this.services.events.fetchMissed(actor, {
             subject: typeof query.subject === 'string' ? query.subject : '',
-            from,
             cursor: typeof query.cursor === 'string' ? query.cursor : undefined,
             after: typeof query.after === 'string' ? query.after : undefined,
             limit: normalizeLimit(query.limit, {
@@ -184,105 +151,11 @@ export class EventsController extends PuterController {
         res.json({});
     }
 
-    // -- Schedules ---------------------------------------------------
-    //
-    // An app's handler run on a timer, served by `services.schedules` when a
-    // server has it and answered `events_disabled` when it doesn't. Creating
-    // one needs an app context; listing, reading and removing are scoped the
-    // way the durable verbs are. The create and remove verbs spend the
-    // subscribe and unsubscribe budgets in the service, shared with those
-    // verbs.
-
-    #schedules(): ScheduleServiceContract {
-        const schedules = this.services.schedules;
-        if (!schedules) throw schedulesUnavailable();
-        return schedules;
-    }
-
-    /** POST /events/schedules — create a schedule for the calling app. */
-    @Post('/schedules', {
-        subdomain: 'api',
-        requireAuth: true,
-        allowAccessToken: true,
-    })
-    async createSchedule(req: Request, res: Response): Promise<void> {
-        const actor = this.#requireActor(req);
-        res.json(await this.#schedules().createFor(actor, bodyRecord(req)));
-    }
-
-    /** GET /events/schedules — the caller's schedules, one page at a time. */
-    @Get('/schedules', {
-        subdomain: 'api',
-        requireAuth: true,
-        allowAccessToken: true,
-        rateLimit: EVENTS_LIST_LIMIT,
-    })
-    async listSchedules(req: Request, res: Response): Promise<void> {
-        const actor = this.#requireActor(req);
-        const query = (req.query ?? {}) as Record<string, unknown>;
-
-        const page = await this.#schedules().list(actor, {
-            limit: normalizeLimit(query.limit, {
-                cap: SCHEDULE_LIST_LIMIT_CAP,
-            }),
-            cursor: typeof query.cursor === 'string' ? query.cursor : undefined,
-            includeTotal: query.includeTotal === 'true',
-        });
-
-        res.json({
-            items: page.items,
-            ...(page.cursor ? { cursor: page.cursor } : {}),
-            ...(page.total !== undefined ? { total: page.total } : {}),
-        });
-    }
-
-    @Post('/schedules/update', {
-        subdomain: 'api',
-        requireAuth: true,
-        allowAccessToken: true,
-    })
-    async updateSchedule(req: Request, res: Response): Promise<void> {
-        const actor = this.#requireActor(req);
-        const { scheduleId, changes } = bodyRecord(req);
-        res.json(await this.#schedules().update(actor, scheduleId, changes));
-    }
-
-    /**
-     * POST /events/schedules/remove — end one schedule. An id the caller does
-     * not hold reads as absent.
-     */
-    @Post('/schedules/remove', {
-        subdomain: 'api',
-        requireAuth: true,
-        allowAccessToken: true,
-    })
-    async removeSchedule(req: Request, res: Response): Promise<void> {
-        const actor = this.#requireActor(req);
-        await this.#schedules().remove(actor, bodyRecord(req).scheduleId);
-        res.json({});
-    }
-
-    /**
-     * GET /events/schedules/:scheduleId — one schedule, ended or not. An id the
-     * caller does not hold reads as absent.
-     */
-    @Get('/schedules/:scheduleId', {
-        subdomain: 'api',
-        requireAuth: true,
-        allowAccessToken: true,
-        rateLimit: EVENTS_LIST_LIMIT,
-    })
-    async getSchedule(req: Request, res: Response): Promise<void> {
-        const actor = this.#requireActor(req);
-        res.json(await this.#schedules().get(actor, req.params.scheduleId));
-    }
-
     // -- Cross-user key-value handles --------------------------------
 
     /**
-     * POST /events/kv-handles — hand another user a region of this account's
-     * key-value data, `watch` unless the body asks for more. The older name for
-     * `POST /kv/shares`, keeping its own body and response shapes.
+     * POST /events/kv-handles — hand another user a watchable region of this
+     * account's key-value data.
      *
      * An account session, or an app session holding a `manage:` delegation on
      * the region — the service tells those apart and gates each rather than the
@@ -294,32 +167,12 @@ export class EventsController extends PuterController {
         subdomain: 'api',
         requireAuth: true,
         allowAccessToken: true,
-        requireVerified: true,
     })
     async mintKvHandle(req: Request, res: Response): Promise<void> {
         const actor = this.#requireActor(req);
-        const body = bodyRecord(req);
-        const share = await this.services.kvShare.mintKvHandle(
-            actor,
-            {
-                prefix: body.prefix,
-                recipient: {
-                    username:
-                        typeof body.granteeUsername === 'string'
-                            ? body.granteeUsername
-                            : undefined,
-                    uid:
-                        typeof body.granteeUid === 'string'
-                            ? body.granteeUid
-                            : undefined,
-                },
-                access: body.access,
-                appUid: body.appUid,
-            },
-            // Callers of this route mint again to get the same handle back.
-            { defaultAccess: 'watch', keepLevelUnlessNamed: true },
+        res.json(
+            await this.services.events.mintKvHandle(actor, bodyRecord(req)),
         );
-        res.json({ handle: share.handle, prefix: share.prefix });
     }
 
     /**
@@ -336,7 +189,7 @@ export class EventsController extends PuterController {
         const actor = this.#requireActor(req);
         const query = (req.query ?? {}) as Record<string, unknown>;
 
-        const page = await this.services.kvShare.listKvHandles(actor, {
+        const page = await this.services.events.listKvHandles(actor, {
             limit: normalizeLimit(query.limit, {
                 cap: KV_HANDLE_LIST_LIMIT_CAP,
             }),
@@ -345,10 +198,7 @@ export class EventsController extends PuterController {
         });
 
         res.json({
-            items: page.items.map(({ holderUsername, ...row }) => ({
-                ...row,
-                granteeUsername: holderUsername,
-            })),
+            items: page.items,
             ...(page.cursor ? { cursor: page.cursor } : {}),
             ...(page.total !== undefined ? { total: page.total } : {}),
         });
@@ -367,10 +217,7 @@ export class EventsController extends PuterController {
     async revokeKvHandle(req: Request, res: Response): Promise<void> {
         const actor = this.#requireActor(req);
         res.json(
-            await this.services.kvShare.revokeKvHandle(
-                actor,
-                req.params.handle,
-            ),
+            await this.services.events.revokeKvHandle(actor, req.params.handle),
         );
     }
 
@@ -423,7 +270,6 @@ export class EventsController extends PuterController {
             handlers: await this.services.events.listHandlers(actor, {
                 appUid:
                     typeof query.appUid === 'string' ? query.appUid : undefined,
-                scope: query.scope,
             }),
         });
     }
@@ -522,15 +368,6 @@ export class EventsController extends PuterController {
             throw new HttpError(400, 'Missing or invalid `script`/`appUid`', {
                 legacyCode: 'bad_request',
             });
-        // Absent or empty is the app's own scope.
-        const holder = body.holder === undefined ? '' : body.holder;
-        if (
-            typeof holder !== 'string' ||
-            !(holder === '' || HOLDER_REGEX.test(holder))
-        )
-            throw new HttpError(400, 'Invalid `holder`', {
-                legacyCode: 'bad_request',
-            });
 
         const deployer = this.#eventsWorkerDeployer();
         if (!deployer.enabled) {
@@ -538,25 +375,15 @@ export class EventsController extends PuterController {
             return;
         }
 
-        const scope = await deployer.scopeFor(appUid, holder);
-        if (!scope) {
-            res.status(404).json({ deployed: false, reason: 'no-holder' });
-            return;
-        }
-
-        const outcome = await deployer.ensure(scope, script);
+        const outcome = await deployer.ensure(appUid, script);
         if (outcome === 'deployed') {
             res.json({ deployed: true });
             return;
         }
-        // `failed`, `throttled` and `busy` are worth another attempt: the rest
-        // say this script is not what the app's handlers currently are.
+        // `failed` and `throttled` are worth another attempt: the rest say
+        // this script is not what the app's handlers currently are.
         res.status(
-            outcome === 'failed' ||
-                outcome === 'throttled' ||
-                outcome === 'busy'
-                ? 502
-                : 404,
+            outcome === 'failed' || outcome === 'throttled' ? 502 : 404,
         ).json({
             deployed: false,
             reason: outcome,
@@ -577,22 +404,14 @@ export class EventsController extends PuterController {
     override onServerStart(): void {
         const deployer = this.#eventsWorkerDeployer();
         if (!deployer.enabled) return;
-        this.services.events.useEagerDeploy((scope, script) =>
-            deployer.deployEagerly(scope, script),
-        );
         if (this.config.workers?.localServer) {
             this.services.events.useWorkerTransport(
                 new LocalEventsInvokeTransport(this.services, deployer),
             );
             return;
         }
-        this.services.events.useWorkerMissHandler(
-            async (appUid, script, options) => {
-                const scope = await deployer.scopeFor(appUid, options.holder);
-                return scope
-                    ? deployer.ensure(scope, script, options)
-                    : 'no-holder';
-            },
+        this.services.events.useWorkerMissHandler((appUid, script) =>
+            deployer.ensure(appUid, script),
         );
     }
 

src/backend/controllers/events/limits.test.ts

@@ -34,46 +34,23 @@ import {
     EVENTS_DURABLE_SUBSCRIPTIONS_MAX,
     EVENTS_DURABLE_SUBSCRIPTIONS_PER_APP,
     EVENTS_DURABLE_SUBSCRIPTIONS_PER_USER,
-    EVENTS_HANDLER_PUBLISH_LIMIT,
-    EVENTS_HANDLER_SOURCE_MAX_BYTES,
-    EVENTS_HANDLERS_PER_APP,
     EVENTS_KV_HANDLES_PER_APP,
     EVENTS_KV_HANDLES_PER_USER,
     EVENTS_KV_FILTER_EVALUATIONS_PER_EVENT,
     EVENTS_KV_MATCHED_SUBSCRIPTIONS_PER_EVENT,
     EVENTS_SINGLE_DELIVERY_LIMIT,
-    EVENTS_USER_HANDLERS_PER_SCOPE,
-    EVENTS_USER_SCOPE_SOURCE_MAX_BYTES,
-    EVENTS_USER_WORKER_DEPLOYS_PER_HOUR,
-    EVENTS_WORKER_DEPLOYS_PER_HOUR,
     EVENTS_WORKER_INVOCATION_LIMIT,
-    EVENTS_WORKER_SOURCE_MAX_BYTES,
-    RENTED_UNITS_PER_USER,
     limitFor,
-    tiered,
     type TieredLimit,
 } from './limits.js';
 
 const tiers: Array<[string, TieredLimit]> = [
-    [
-        'durable subscriptions per account',
-        EVENTS_DURABLE_SUBSCRIPTIONS_PER_USER,
-    ],
+    ['durable subscriptions per account', EVENTS_DURABLE_SUBSCRIPTIONS_PER_USER],
     ['durable subscriptions per app', EVENTS_DURABLE_SUBSCRIPTIONS_PER_APP],
     ['live share handles per account', EVENTS_KV_HANDLES_PER_USER],
     ['live share handles per app', EVENTS_KV_HANDLES_PER_APP],
 ];
 
-describe('tiered', () => {
-    it('gives paid plans the base, and the free and temporary tiers their own', () => {
-        const limit = tiered(30, 20, 10);
-        expect(limitFor(limit, null)).toBe(30);
-        expect(limitFor(limit, 'some_plan')).toBe(30);
-        expect(limitFor(limit, DEFAULT_FREE_SUBSCRIPTION)).toBe(20);
-        expect(limitFor(limit, DEFAULT_TEMP_SUBSCRIPTION)).toBe(10);
-    });
-});
-
 describe('the tiered subscription quotas', () => {
     it.each(tiers)('%s never lets a free tier exceed paid', (_name, tier) => {
         for (const n of Object.values(tier.bySubscription))
@@ -128,9 +105,9 @@ describe('the tiered subscription quotas', () => {
     });
 
     it('holds an unrecognised plan to the paid base', () => {
-        expect(
-            limitFor(EVENTS_DURABLE_SUBSCRIPTIONS_PER_USER, 'some_plan'),
-        ).toBe(EVENTS_DURABLE_SUBSCRIPTIONS_PER_USER.limit);
+        expect(limitFor(EVENTS_DURABLE_SUBSCRIPTIONS_PER_USER, 'some_plan')).toBe(
+            EVENTS_DURABLE_SUBSCRIPTIONS_PER_USER.limit,
+        );
         expect(limitFor(EVENTS_DURABLE_SUBSCRIPTIONS_PER_USER, null)).toBe(
             EVENTS_DURABLE_SUBSCRIPTIONS_PER_USER.limit,
         );
@@ -154,22 +131,22 @@ describe('the delivery budgets', () => {
             expect(
                 limitFor(EVENTS_KV_MATCHED_SUBSCRIPTIONS_PER_EVENT, plan),
             ).toBe(matched);
-            expect(limitFor(EVENTS_KV_FILTER_EVALUATIONS_PER_EVENT, plan)).toBe(
-                evaluated,
-            );
+            expect(
+                limitFor(EVENTS_KV_FILTER_EVALUATIONS_PER_EVENT, plan),
+            ).toBe(evaluated);
             expect(evaluated).toBeGreaterThanOrEqual(matched);
         }
     });
 
     it('pins the share-handle quotas by plan', () => {
-        expect(EVENTS_KV_HANDLES_PER_USER.limit).toBe(25_000);
-        expect(EVENTS_KV_HANDLES_PER_APP.limit).toBe(10_000);
+        expect(EVENTS_KV_HANDLES_PER_USER.limit).toBe(512);
+        expect(EVENTS_KV_HANDLES_PER_APP.limit).toBe(512);
         expect(
             limitFor(EVENTS_KV_HANDLES_PER_USER, DEFAULT_FREE_SUBSCRIPTION),
-        ).toBe(5_000);
+        ).toBe(200);
         expect(
             limitFor(EVENTS_KV_HANDLES_PER_APP, DEFAULT_FREE_SUBSCRIPTION),
-        ).toBe(2_000);
+        ).toBe(128);
     });
 
     it('keeps `single` well under broadcast — each one costs far more', () => {
@@ -192,42 +169,3 @@ describe('the delivery budgets', () => {
         }
     });
 });
-
-describe('the handler limits', () => {
-    it('pins the app-scope numbers the quotas page lists', () => {
-        expect(EVENTS_HANDLERS_PER_APP).toBe(100);
-        expect(EVENTS_HANDLER_SOURCE_MAX_BYTES).toBe(64 * 1024);
-        expect(EVENTS_WORKER_SOURCE_MAX_BYTES).toBe(5 * 1024 * 1024);
-        expect(EVENTS_WORKER_DEPLOYS_PER_HOUR).toBe(30);
-        expect(EVENTS_HANDLER_PUBLISH_LIMIT.limit).toBe(60);
-        expect(EVENTS_HANDLER_PUBLISH_LIMIT.window).toBe(60_000);
-    });
-
-    it('pins the user-scope numbers the quotas page lists', () => {
-        expect(EVENTS_USER_HANDLERS_PER_SCOPE).toBe(20);
-        expect(EVENTS_USER_SCOPE_SOURCE_MAX_BYTES).toBe(1024 * 1024);
-        expect(EVENTS_USER_WORKER_DEPLOYS_PER_HOUR).toBe(10);
-    });
-
-    it('keeps a user scope tighter than an app scope', () => {
-        expect(EVENTS_USER_HANDLERS_PER_SCOPE).toBeLessThan(
-            EVENTS_HANDLERS_PER_APP,
-        );
-        expect(EVENTS_USER_SCOPE_SOURCE_MAX_BYTES).toBeLessThan(
-            EVENTS_WORKER_SOURCE_MAX_BYTES,
-        );
-        expect(EVENTS_USER_WORKER_DEPLOYS_PER_HOUR).toBeLessThan(
-            EVENTS_WORKER_DEPLOYS_PER_HOUR,
-        );
-    });
-
-    it('pins the rented-unit cap by plan', () => {
-        expect(RENTED_UNITS_PER_USER.limit).toBe(100);
-        expect(limitFor(RENTED_UNITS_PER_USER, DEFAULT_FREE_SUBSCRIPTION)).toBe(
-            16,
-        );
-        expect(limitFor(RENTED_UNITS_PER_USER, DEFAULT_TEMP_SUBSCRIPTION)).toBe(
-            16,
-        );
-    });
-});

src/backend/controllers/events/limits.ts

@@ -53,12 +53,7 @@ export interface TieredLimit {
     bySubscription: Record<string, number>;
 }
 
-/** Paid, free and temporary caps as a {@link TieredLimit}. Called by extensions. */
-export const tiered = (
-    paid: number,
-    free: number,
-    temp: number,
-): TieredLimit => ({
+const tiered = (paid: number, free: number, temp: number): TieredLimit => ({
     limit: paid,
     bySubscription: {
         [DEFAULT_FREE_SUBSCRIPTION]: free,
@@ -98,18 +93,6 @@ export interface TieredQuota {
  */
 export const EVENTS_SESSION_SUBSCRIPTIONS_PER_SOCKET = 50;
 
-/**
- * Live subscriptions one user may hold through a share handle someone else
- * minted for them, across all of their connections.
- *
- * Those rows sit in the owner's keyspace, where each one costs a filter
- * evaluation on the owner's writes. The count also takes in connections that
- * dropped and haven't been reaped yet, so the cap sits far above what
- * reconnects leave behind. The owner's own rows through the handle don't
- * count.
- */
-export const EVENTS_SESSION_SUBSCRIPTIONS_PER_KV_HANDLE = 1000;
-
 /**
  * Durable subscriptions one account may hold, across every app.
  *
@@ -142,13 +125,6 @@ export const EVENTS_DURABLE_SUBSCRIPTIONS_MAX =
  */
 export const SUSPENDED_ROW_TTL_DAYS = 30;
 
-/**
- * Subscriptions stopped by a revoked grant that one account keeps for `list`.
- * They hold no quota slot, so past this the oldest are deleted when the account
- * subscribes again, keeping its rows bounded.
- */
-export const EVENTS_REVOKED_SUBSCRIPTIONS_KEPT = 500;
-
 /**
  * Subscribe calls per minute, per user.
  *
@@ -179,13 +155,6 @@ export const EVENTS_LIST_LIMIT = userWindow('events:list', 120);
  */
 export const EVENTS_ACK_LIMIT = userWindow('events:ack', 600);
 
-/**
- * How long a connected client holds a queued delivery before the events worker
- * may take it. A client that has no handler for it, or whose handler fails,
- * declines it at once; this only bounds one that never answers.
- */
-export const EVENTS_SOCKET_LEASE_MS = 15_000;
-
 /**
  * Share-handle mint + revoke calls per minute, per user.
  *
@@ -194,68 +163,23 @@ export const EVENTS_SOCKET_LEASE_MS = 15_000;
  */
 export const EVENTS_KV_HANDLE_LIMIT = userWindow('events:kvHandles', 60);
 
-/**
- * `kv.share.received` notices per hour, per owner and holder. A share past it
- * is still made, without a notice.
- */
-export const KV_SHARE_NOTICE_LIMIT = userWindow(
-    'kvShare:notices',
-    5,
-    60 * 60_000,
-);
-
 /**
  * Live share handles one account may hold out at a time, across every app.
  *
- * A backstop above the per-app cap: every count reads a covering index, so the
- * bound is on standing grants, not query cost. A temporary account holds none:
- * the grant outlives the session that made it, and no account is left to take
- * it back.
+ * Each is a standing grant on part of the account's data, and revoking marks
+ * rather than deletes, so without a ceiling the rate limit alone lets the rows
+ * grow forever. A temporary account holds none: the grant outlives the session
+ * that made it, and no account is left to take it back.
  */
-export const EVENTS_KV_HANDLES_PER_USER = tiered(25_000, 5_000, 0);
+export const EVENTS_KV_HANDLES_PER_USER = tiered(512, 200, 0);
 
 /**
- * Live share handles one app may hold out for one account, so one namespace
- * cannot consume the whole account budget.
+ * Live share handles one app may hold out for one account.
+ *
+ * Separately bounded from the account cap so one namespace cannot consume the
+ * whole budget on free accounts.
  */
-export const EVENTS_KV_HANDLES_PER_APP = tiered(10_000, 2_000, 0);
-
-/**
- * Live share handles one owner may hold out to one holder, on every plan.
- * Bounds the rows a revoke or unshare walks to find the narrower handles inside
- * one.
- */
-export const EVENTS_KV_HANDLES_PER_HOLDER = 256;
-
-/**
- * Recipients one account may share with, per minute and per hour. A call spends
- * one per recipient that doesn't already hold the share, on top of the per-call
- * mint budget.
- */
-export const KV_SHARE_GRANT_LIMITS = [
-    userWindow('kvShare:grants:minute', 300),
-    userWindow('kvShare:grants:hour', 2_000, 60 * 60_000),
-] as const;
-
-/**
- * Recipients one account may name in share calls per minute, existing shares
- * included. Each one is looked up before the call knows whether it changes
- * anything, so a client that shares again on every load is bounded here.
- */
-export const KV_SHARE_LOOKUP_LIMIT = userWindow('kvShare:lookups', 1_200);
-
-/** Recipients one `POST /kv/shares` call may name. */
-export const KV_SHARE_BATCH_MAX = 50;
-
-/**
- * Notifications one party of a share may send the other through share handles,
- * per minute and per day, in one app. Keeps one share from spending the
- * recipient's whole notification allowance.
- */
-export const KV_SHARE_NOTIFY_LIMITS = [
-    userWindow('kvShare:notify:minute', 30),
-    userWindow('kvShare:notify:day', 500, 24 * 60 * 60_000),
-] as const;
+export const EVENTS_KV_HANDLES_PER_APP = tiered(512, 128, 0);
 
 // -- Handler surface -------------------------------------------------
 
@@ -269,12 +193,6 @@ export const KV_SHARE_NOTIFY_LIMITS = [
  */
 export const EVENTS_HANDLERS_PER_APP = 100;
 
-/**
- * Handlers one user may hold in their own scope of one app. Each is a script of
- * its own, so the cap is tighter than the app's.
- */
-export const EVENTS_USER_HANDLERS_PER_SCOPE = 20;
-
 /** Longest a serialized handler may be. */
 export const EVENTS_HANDLER_SOURCE_MAX_BYTES = 64 * 1024;
 
@@ -286,9 +204,6 @@ export const EVENTS_HANDLER_SOURCE_MAX_BYTES = 64 * 1024;
  */
 export const EVENTS_WORKER_SOURCE_MAX_BYTES = 5 * 1024 * 1024;
 
-/** Source one user scope may hold, all its handlers combined. */
-export const EVENTS_USER_SCOPE_SOURCE_MAX_BYTES = 1024 * 1024;
-
 /**
  * Deploys one app's events worker may trigger per hour.
  *
@@ -298,16 +213,6 @@ export const EVENTS_USER_SCOPE_SOURCE_MAX_BYTES = 1024 * 1024;
  */
 export const EVENTS_WORKER_DEPLOYS_PER_HOUR = 30;
 
-/** Deploys one user scope may trigger per hour. */
-export const EVENTS_USER_WORKER_DEPLOYS_PER_HOUR = 10;
-
-/**
- * Units one user may rent at once: ordinary workers, user scopes, and the
- * events workers of apps they own. Only creating a unit is refused; holdings
- * over the cap are kept.
- */
-export const RENTED_UNITS_PER_USER = tiered(100, 16, 16);
-
 /**
  * Handlers one `publishAll` may carry. A build step publishes its whole set in
  * one call, and the set is capped by what an app may hold anyway.
@@ -372,11 +277,8 @@ export const EVENTS_KV_MATCHED_SUBSCRIPTIONS_PER_EVENT = tiered(512, 128, 128);
  */
 export const EVENTS_KV_FILTER_EVALUATIONS_PER_EVENT = tiered(2048, 512, 512);
 
-/**
- * Deliveries of one key-value change that carry its value inline, in the order
- * the fan-out serves them. Later ones carry the key alone.
- */
-export const EVENTS_KV_VALUE_DELIVERIES_PER_EVENT = 128;
+/** Omit all inline KV values when the matched audience exceeds this count. */
+export const EVENTS_KV_VALUE_OMIT_MATCHED_SUBSCRIPTIONS = 128;
 
 /**
  * Largest inline KV value in serialized bytes. Larger values are omitted;
@@ -468,20 +370,16 @@ export const EVENTS_REGION_PENDING_CEILING = 1_000_000;
 // a handler that answers "no" is not. Retrying on a fixed cadence turns one
 // broken deploy into a permanent load on whatever is failing, so the wait
 // doubles per attempt up to a ceiling, and a run of failures stops the
-// subscription rather than retrying it forever. A run Puter could not start or
-// finish backs off the same way but is not the handler's failure, so it never
-// counts toward that run.
+// subscription rather than retrying it forever.
 
-// Wait before the first retry of a delivery a handler could not take, the
-// longest wait, and the doubling between them. Shared with system jobs.
-export {
-    deliveryBackoffMs,
-    EVENTS_RETRY_BASE_MS,
-    EVENTS_RETRY_MAX_MS,
-} from '../../util/retryBackoff.js';
+/** Wait before the first retry of a delivery a handler could not take. */
+export const EVENTS_RETRY_BASE_MS = 2_000;
+
+/** Longest wait between retries, however many have failed. */
+export const EVENTS_RETRY_MAX_MS = 5 * 60 * 1000;
 
 /**
- * Handler failures in a row before a subscription is suspended. Counted per
+ * Failures in a row before a subscription is suspended. Counted per
  * subscription and reset by the first delivery a handler takes, so an
  * occasional failure never accumulates into one.
  */
@@ -494,6 +392,13 @@ export const EVENTS_CONSECUTIVE_FAILURES = 5;
  */
 export const EVENTS_FAILURE_COUNTER_TTL_MS = 60 * 60 * 1000;
 
+/** How long to hold a delivery whose handler has failed `attempts` times. */
+export const deliveryBackoffMs = (attempts: number): number =>
+    Math.min(
+        EVENTS_RETRY_MAX_MS,
+        EVENTS_RETRY_BASE_MS * 2 ** Math.max(0, attempts - 1),
+    );
+
 // -- Suspended backlog -----------------------------------------------
 //
 // A suspended subscription stops metering but keeps what it is owed, and that

src/backend/controllers/events/scheduleRoutes.test.ts

@@ -1,289 +0,0 @@
-/*
- * Copyright (C) 2024-present Puter Technologies Inc.
- *
- * This file is part of Puter.
- *
- * Puter is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- * The schedule routes are thin delegates: without `services.schedules` every
- * one answers 503 `events_disabled`; with it, each hands its request over and
- * answers what it returns.
- */
-
-import type { Request, Response } from 'express';
-import {
-    afterAll,
-    afterEach,
-    beforeAll,
-    describe,
-    expect,
-    it,
-    vi,
-} from 'vitest';
-import { makeActor, type Actor } from '../../core/actor.js';
-import { isHttpError } from '../../core/http/HttpError.js';
-import type {
-    ScheduleServiceContract,
-    ScheduleView,
-} from '../../core/schedules.js';
-import type { PuterServer } from '../../server.js';
-import { setupTestServer } from '../../testUtil.js';
-import type { BroadcastController } from '../broadcast/BroadcastController.js';
-import type { EventsController } from './EventsController.js';
-
-let server: PuterServer;
-let events: EventsController;
-let broadcast: BroadcastController;
-let actor: Actor;
-let saved: unknown;
-
-const SCHEDULE_ID = '0b3a3c9e-9f61-4f0e-8d2a-2f1b6f8f2c11';
-
-const view = {
-    scheduleId: SCHEDULE_ID,
-    kind: 'recurring',
-    appUid: 'app-x',
-} as ScheduleView;
-
-const slot = () => server.services as unknown as { schedules?: unknown };
-/** Put `schedules` in the slot, or leave the slot empty. */
-const setSchedules = (schedules: unknown): void => {
-    if (schedules === undefined) delete slot().schedules;
-    else slot().schedules = schedules;
-};
-
-const fakeSchedules = () =>
-    ({
-        onSubscriptionsChanged: vi.fn(async () => {}),
-        createFor: vi.fn(async () => view),
-        list: vi.fn(async () => ({
-            items: [view],
-            cursor: 'next',
-            total: 3,
-        })),
-        get: vi.fn(async () => view),
-        update: vi.fn(async () => view),
-        remove: vi.fn(async () => {}),
-        receivePeerChanges: vi.fn(async () => ({ applied: 2 })),
-        prepareSendAt: vi.fn(),
-        createDeferredAppMessage: vi.fn(),
-    }) satisfies ScheduleServiceContract;
-
-const req = (init: {
-    body?: unknown;
-    query?: Record<string, unknown>;
-    params?: Record<string, string>;
-}): Request =>
-    ({
-        actor,
-        body: init.body ?? {},
-        query: init.query ?? {},
-        params: init.params ?? {},
-        headers: {},
-        rawBody: Buffer.from(JSON.stringify(init.body ?? {})),
-    }) as unknown as Request;
-
-const res = () => {
-    const sent: { status: number; body: unknown } = {
-        status: 200,
-        body: undefined,
-    };
-    const response = {
-        json: vi.fn((body: unknown) => {
-            sent.body = body;
-            return response;
-        }),
-        status: vi.fn((code: number) => {
-            sent.status = code;
-            return response;
-        }),
-        setHeader: vi.fn(() => response),
-    };
-    return { response: response as unknown as Response, sent };
-};
-
-/** Each route, called as the router would. */
-const routes: Array<[string, (response: Response) => Promise<void>]> = [
-    [
-        'POST /events/schedules',
-        (r) => events.createSchedule(req({ body: { every: 60_000 } }), r),
-    ],
-    [
-        'GET /events/schedules',
-        (r) => events.listSchedules(req({ query: { limit: '5' } }), r),
-    ],
-    [
-        'GET /events/schedules/:scheduleId',
-        (r) =>
-            events.getSchedule(req({ params: { scheduleId: SCHEDULE_ID } }), r),
-    ],
-    [
-        'POST /events/schedules/update',
-        (r) => events.updateSchedule(req({ body: { scheduleId: SCHEDULE_ID, changes: { every: '2h' } } }), r),
-    ],
-    [
-        'POST /events/schedules/remove',
-        (r) =>
-            events.removeSchedule(
-                req({ body: { scheduleId: SCHEDULE_ID } }),
-                r,
-            ),
-    ],
-    [
-        'POST /broadcast/events/schedules',
-        (r) =>
-            broadcast.schedules(
-                req({ body: { namespace: 'n', changes: [] } }),
-                r,
-            ),
-    ],
-];
-
-beforeAll(async () => {
-    server = await setupTestServer();
-    events = server.controllers.events as unknown as EventsController;
-    broadcast = server.controllers.broadcast as unknown as BroadcastController;
-    actor = makeActor({
-        user: { id: 1, uuid: 'u-1', username: 'someone' },
-    } as never);
-    saved = slot().schedules;
-    vi.spyOn(
-        server.services.broadcast,
-        'verifySignedRequest',
-    ).mockResolvedValue({ ok: true, peerId: 'peer' } as never);
-});
-
-afterEach(() => {
-    setSchedules(saved);
-});
-
-afterAll(async () => {
-    vi.restoreAllMocks();
-    await server?.shutdown();
-});
-
-describe('without services.schedules', () => {
-    it.each(routes)('%s answers 503 events_disabled', async (_name, call) => {
-        setSchedules(undefined);
-        const { response } = res();
-        let thrown: unknown;
-        try {
-            await call(response);
-        } catch (err) {
-            thrown = err;
-        }
-        expect(isHttpError(thrown)).toBe(true);
-        expect(thrown).toMatchObject({
-            statusCode: 503,
-            legacyCode: 'events_disabled',
-            // The designed answer, so it never pages.
-            noAlarm: true,
-        });
-    });
-
-    it('refuses an unsigned peer batch before saying schedules are off', async () => {
-        setSchedules(undefined);
-        vi.spyOn(
-            server.services.broadcast,
-            'verifySignedRequest',
-        ).mockResolvedValueOnce({
-            ok: false,
-            status: 401,
-            message: 'bad signature',
-        } as never);
-        const { response, sent } = res();
-        await broadcast.schedules(
-            req({ body: { namespace: 'n', changes: [] } }),
-            response,
-        );
-        expect(sent.status).toBe(401);
-    });
-});
-
-describe('with services.schedules', () => {
-    it('creates through createFor and answers its view', async () => {
-        const schedules = fakeSchedules();
-        setSchedules(schedules);
-        const { response, sent } = res();
-        await events.createSchedule(req({ body: { every: 60_000 } }), response);
-        expect(schedules.createFor).toHaveBeenCalledWith(actor, {
-            every: 60_000,
-        });
-        expect(sent.body).toEqual(view);
-    });
-
-    it('lists with the limit capped, the cursor and includeTotal', async () => {
-        const schedules = fakeSchedules();
-        setSchedules(schedules);
-        const { response, sent } = res();
-        await events.listSchedules(
-            req({
-                query: { limit: '5000', cursor: 'c', includeTotal: 'true' },
-            }),
-            response,
-        );
-        expect(schedules.list).toHaveBeenCalledWith(actor, {
-            limit: 200,
-            cursor: 'c',
-            includeTotal: true,
-        });
-        expect(sent.body).toEqual({ items: [view], cursor: 'next', total: 3 });
-    });
-
-    it('reads one through get', async () => {
-        const schedules = fakeSchedules();
-        setSchedules(schedules);
-        const { response, sent } = res();
-        await events.getSchedule(
-            req({ params: { scheduleId: SCHEDULE_ID } }),
-            response,
-        );
-        expect(schedules.get).toHaveBeenCalledWith(actor, SCHEDULE_ID);
-        expect(sent.body).toEqual(view);
-    });
-
-    it('updates through update and answers its view', async () => {
-        const schedules = fakeSchedules();
-        setSchedules(schedules);
-        const { response, sent } = res();
-        const changes = { every: '2h' };
-        await events.updateSchedule(req({ body: { scheduleId: SCHEDULE_ID, changes } }), response);
-        expect(schedules.update).toHaveBeenCalledWith(actor, SCHEDULE_ID, changes);
-        expect(sent.body).toEqual(view);
-    });
-
-    it('removes through remove and answers {}', async () => {
-        const schedules = fakeSchedules();
-        setSchedules(schedules);
-        const { response, sent } = res();
-        await events.removeSchedule(
-            req({ body: { scheduleId: SCHEDULE_ID } }),
-            response,
-        );
-        expect(schedules.remove).toHaveBeenCalledWith(actor, SCHEDULE_ID);
-        expect(sent.body).toEqual({});
-    });
-
-    it('hands a signed peer batch to receivePeerChanges', async () => {
-        const schedules = fakeSchedules();
-        setSchedules(schedules);
-        const { response, sent } = res();
-        const body = { namespace: 'n', changes: [] };
-        await broadcast.schedules(req({ body }), response);
-        expect(schedules.receivePeerChanges).toHaveBeenCalledWith(body);
-        expect(sent).toEqual({ status: 200, body: { ok: true, applied: 2 } });
-    });
-});

src/backend/controllers/events/updateSchedule.test.ts

@@ -1,77 +0,0 @@
-import type { Request, Response } from 'express';
-import { describe, expect, it } from 'vitest';
-import { makeActor } from '../../core/actor.js';
-import type {
-    ScheduleServiceContract,
-    ScheduleView,
-} from '../../core/schedules.js';
-import { EventsController } from './EventsController.js';
-
-const actor = makeActor({
-    user: { id: 1, uuid: 'user-1', username: 'user1' } as never,
-});
-const request = (body: unknown) => ({ actor, body }) as Request;
-const controller = (schedules?: Pick<ScheduleServiceContract, 'update'>) =>
-    new EventsController(
-        {} as never,
-        {} as never,
-        {} as never,
-        { schedules } as never,
-        {} as never,
-    );
-
-describe('update schedule route contract', () => {
-    it('answers events_disabled when schedules are unavailable', async () => {
-        await expect(
-            controller().updateSchedule(
-                request({ scheduleId: 'id', changes: {} }),
-                {} as Response,
-            ),
-        ).rejects.toMatchObject({
-            legacyCode: 'events_disabled',
-            statusCode: 503,
-            noAlarm: true,
-        });
-    });
-
-    it('passes the actor, id and changes through and returns the updated view', async () => {
-        const view = {
-            scheduleId: 'id',
-            kind: 'recurring',
-            state: 'suspended',
-        } as ScheduleView;
-        const changes = { cron: '0 9 * * *', tz: 'UTC' };
-        const calls: unknown[][] = [];
-        const events = controller({
-            update: async (...args) => {
-                calls.push(args);
-                return view;
-            },
-        });
-        let sent: unknown;
-        await events.updateSchedule(request({ scheduleId: 'id', changes }), {
-            json: (value: unknown) => {
-                sent = value;
-            },
-        } as Response);
-        expect(calls).toEqual([[actor, 'id', changes]]);
-        expect(sent).toBe(view);
-    });
-
-    it('preserves validation and sending errors from the implementation', async () => {
-        const error = {
-            code: 'events_schedule_sending',
-            message: 'Already sending',
-        };
-        await expect(
-            controller({
-                update: async () => {
-                    throw error;
-                },
-            }).updateSchedule(
-                request({ scheduleId: 'id', changes: {} }),
-                {} as Response,
-            ),
-        ).rejects.toBe(error);
-    });
-});

src/backend/controllers/events/workerDeploy.test.ts

@@ -25,35 +25,9 @@
 
 import MockRedis from 'ioredis-mock';
 import { describe, expect, it } from 'vitest';
-import type { fetch as undiciFetch } from 'undici';
-import {
-    DispatcherInvokeTransport,
-    EVENTS_DEPLOYED_HEADER,
-    EVENTS_DISPATCH_ERROR_HEADER,
-    EVENTS_HANDLED_HEADER,
-    EventsWorkerInvokerClient,
-    type EventsInvokeCall,
-} from '../../clients/events/EventsWorkerInvokerClient.js';
-import { INTERNAL_DEPLOY_TARGET } from '../../drivers/workers/WorkerDriver.js';
-import {
-    EVENTS_USER_WORKER_DEPLOYS_PER_HOUR,
-    EVENTS_WORKER_DEPLOYS_PER_HOUR,
-} from './limits.js';
-import {
-    EventsWorkerDeployer,
-    LocalEventsInvokeTransport,
-    type EventsDeployOptions,
-    type EventsDeployOutcome,
-} from './workerDeploy.js';
-import {
-    eventsWorkerScript,
-    userHandlerScript,
-} from '../../services/events/workerRuntime.js';
-import {
-    appHandlerScope,
-    hashContent,
-    type HandlerScope,
-} from '../../stores/events/EventHandlerStore.js';
+import { EVENTS_WORKER_DEPLOYS_PER_HOUR } from './limits.js';
+import { EventsWorkerDeployer } from './workerDeploy.js';
+import { eventsWorkerScript } from '../../services/events/workerRuntime.js';
 import { handlerSetHash } from '../../services/events/workerSource.js';
 import type { IConfig } from '../../types.js';
 
@@ -72,22 +46,12 @@ interface Owner {
 type Layers = ConstructorParameters<typeof EventsWorkerDeployer>[0];
 
 /** Stub layers whose only real dependency is a fresh redis mock. */
-const makeLayers = (
-    owners: Record<string, Owner | null>,
-    events: Record<string, unknown> = {},
-) => {
+const makeLayers = (owners: Record<string, Owner | null>) => {
     const redis = new MockRedis.Cluster(['redis://localhost:7001']);
     const created: string[] = [];
-    const targets: Array<Record<string, unknown>> = [];
-    /** Apps whose handler sources were read, once per read. */
-    const sourceReads: string[] = [];
     const layers = {
         config: {
-            events: {
-                workerRuntime: true,
-                internalSecret: 'sekret',
-                ...events,
-            },
+            events: { workerRuntime: true, internalSecret: 'sekret' },
             // `#namespace()` needs a local-worker shape to resolve without
             // throwing — this stub never reaches a real Cloudflare or
             // Miniflare deploy either way.
@@ -96,20 +60,16 @@ const makeLayers = (
         clients: { redis },
         stores: {
             eventHandler: {
-                setForApp: async () => [{ name: 'h', sourceHash: SOURCE_HASH }],
-                allForApp: async ({ appUid }: { appUid: string }) => {
-                    sourceReads.push(appUid);
-                    return [
-                        {
-                            appUid,
-                            name: 'h',
-                            source: 'async () => {}',
-                            sourceHash: SOURCE_HASH,
-                            createdAt: 0,
-                            updatedAt: 0,
-                        },
-                    ];
-                },
+                allForApp: async (appUid: string) => [
+                    {
+                        appUid,
+                        name: 'h',
+                        source: 'async () => {}',
+                        sourceHash: SOURCE_HASH,
+                        createdAt: 0,
+                        updatedAt: 0,
+                    },
+                ],
             },
             app: {
                 getByUid: async (appUid: string) => {
@@ -120,18 +80,6 @@ const makeLayers = (
                 },
             },
             user: {
-                getByUuid: async (uuid: string) => {
-                    const owner = Object.values(owners).find(
-                        (o) => `uuid-${o?.ownerUserId}` === uuid,
-                    );
-                    if (!owner) return null;
-                    return {
-                        id: owner.ownerUserId,
-                        uuid,
-                        username: `user-${owner.ownerUserId}`,
-                        suspended: owner.suspended ?? false,
-                    };
-                },
                 getById: async (id: number) => {
                     const owner = Object.values(owners).find(
                         (o) => o?.ownerUserId === id,
@@ -149,24 +97,14 @@ const makeLayers = (
         services: {},
         drivers: {
             workers: {
-                create: async (args: {
-                    workerName: string;
-                    [INTERNAL_DEPLOY_TARGET]?: Record<string, unknown>;
-                }) => {
+                create: async (args: { workerName: string }) => {
                     created.push(args.workerName);
-                    targets.push(args[INTERNAL_DEPLOY_TARGET] ?? {});
                     return { success: true, errors: [] };
                 },
             },
         },
     };
-    return {
-        layers: layers as unknown as Layers,
-        created,
-        targets,
-        redis,
-        sourceReads,
-    };
+    return { layers: layers as unknown as Layers, created, redis };
 };
 
 describe('EventsWorkerDeployer.ensure', () => {
@@ -182,17 +120,15 @@ describe('EventsWorkerDeployer.ensure', () => {
         const deployer = new EventsWorkerDeployer(layers);
 
         const [a, b] = await Promise.all([
-            deployer.ensure(appHandlerScope('app-a'), SCRIPT),
-            deployer.ensure(appHandlerScope('app-b'), SCRIPT),
+            deployer.ensure('app-a', SCRIPT),
+            deployer.ensure('app-b', SCRIPT),
         ]);
         expect(a).toBe('deployed');
         expect(b).toBe('no-owner');
     });
 
-    it('refuses once the app has deployed past the hourly cap, before reading or building any source', async () => {
-        const { layers, redis, sourceReads, created } = makeLayers({
-            'app-c': { ownerUserId: 3 },
-        });
+    it('refuses once the app has deployed past the hourly cap', async () => {
+        const { layers, redis } = makeLayers({ 'app-c': { ownerUserId: 3 } });
         const deployer = new EventsWorkerDeployer(layers);
         const hour = new Date().toISOString().slice(0, 13);
         await redis.set(
@@ -200,697 +136,12 @@ describe('EventsWorkerDeployer.ensure', () => {
             String(EVENTS_WORKER_DEPLOYS_PER_HOUR),
         );
 
-        expect(await deployer.ensure(appHandlerScope('app-c'), SCRIPT)).toBe(
-            'throttled',
-        );
-        expect(sourceReads).toEqual([]);
-        expect(created).toEqual([]);
-    });
-
-    it('answers a stale script without spending the hourly cap', async () => {
-        const { layers, redis, sourceReads } = makeLayers({
-            'app-e': { ownerUserId: 5 },
-        });
-        const deployer = new EventsWorkerDeployer(layers);
-        const stale = eventsWorkerScript(
-            handlerSetHash([{ name: 'h', sourceHash: 'b'.repeat(64) }]),
-            '',
-        );
-
-        expect(await deployer.ensure(appHandlerScope('app-e'), stale)).toBe(
-            'stale',
-        );
-        expect(sourceReads).toEqual([]);
-        const hour = new Date().toISOString().slice(0, 13);
-        expect(await redis.get(`ev:deploys:{app-e}:${hour}`)).toBeNull();
-    });
-
-    it('passes events.workerCpuMs to the deploy target', async () => {
-        const { layers, targets } = makeLayers(
-            { 'app-f': { ownerUserId: 6 } },
-            { workerCpuMs: 50 },
-        );
-        const deployer = new EventsWorkerDeployer(layers);
-        expect(await deployer.ensure(appHandlerScope('app-f'), SCRIPT)).toBe(
-            'deployed',
-        );
-        expect(targets[0]!.cpuMs).toBe(50);
-    });
-
-    it('passes no cpuMs when events.workerCpuMs is unset', async () => {
-        const { layers, targets } = makeLayers({ 'app-g': { ownerUserId: 7 } });
-        const deployer = new EventsWorkerDeployer(layers);
-        expect(await deployer.ensure(appHandlerScope('app-g'), SCRIPT)).toBe(
-            'deployed',
-        );
-        expect(targets[0]!.cpuMs).toBeUndefined();
+        expect(await deployer.ensure('app-c', SCRIPT)).toBe('throttled');
     });
 
     it('deploys normally under the cap', async () => {
         const { layers } = makeLayers({ 'app-d': { ownerUserId: 4 } });
         const deployer = new EventsWorkerDeployer(layers);
-        expect(await deployer.ensure(appHandlerScope('app-d'), SCRIPT)).toBe(
-            'deployed',
-        );
-    });
-});
-
-/** A server's schedules with a deploy gate that records and can refuse. */
-const withGate = (
-    layers: Layers,
-    refuse: (capped: boolean) => boolean = () => false,
-) => {
-    const gated: Array<{ script: string; capped: boolean }> = [];
-    const gate = {
-        gateDeploy: async (
-            script: string,
-            options: { capped: boolean },
-            deploy: () => Promise<EventsDeployOutcome>,
-        ): Promise<EventsDeployOutcome> => {
-            gated.push({ script, capped: options.capped });
-            return refuse(options.capped) ? 'busy' : deploy();
-        },
-    };
-    const deployer = new EventsWorkerDeployer({
-        ...layers,
-        services: { ...layers.services, schedules: gate },
-    } as unknown as Layers);
-    return { deployer, gated };
-};
-
-describe('the schedules` deploy gate', () => {
-    it('is skipped without schedules, or with schedules that have no gate', async () => {
-        const { layers, created } = makeLayers({ 'app-x': { ownerUserId: 1 } });
-        await expect(
-            new EventsWorkerDeployer(layers).ensure(
-                appHandlerScope('app-x'),
-                SCRIPT,
-                {
-                    lane: 'schedule',
-                },
-            ),
-        ).resolves.toBe('deployed');
-        const gateless = new EventsWorkerDeployer({
-            ...layers,
-            services: { ...layers.services, schedules: {} },
-        } as unknown as Layers);
-        await expect(
-            gateless.ensure(appHandlerScope('app-x'), SCRIPT, {
-                lane: 'schedule',
-            }),
-        ).resolves.toBe('deployed');
-        expect(created).toEqual([SCRIPT, SCRIPT]);
-    });
-
-    it('takes every deploy, capped only for a schedule run', async () => {
-        const { layers, created } = makeLayers({ 'app-x': { ownerUserId: 1 } });
-        const { deployer, gated } = withGate(layers);
-
-        await expect(
-            deployer.ensure(appHandlerScope('app-x'), SCRIPT),
-        ).resolves.toBe('deployed');
-        await expect(
-            deployer.ensure(appHandlerScope('app-x'), SCRIPT, {
-                lane: 'schedule',
-            }),
-        ).resolves.toBe('deployed');
-        expect(gated).toEqual([
-            { script: SCRIPT, capped: false },
-            { script: SCRIPT, capped: true },
-        ]);
-        expect(created).toEqual([SCRIPT, SCRIPT]);
-    });
-
-    it('answers a refused schedule run busy, and a delivery still deploys', async () => {
-        const { layers, created } = makeLayers({ 'app-x': { ownerUserId: 1 } });
-        const { deployer } = withGate(layers, (capped) => capped);
-
-        await expect(
-            deployer.ensure(appHandlerScope('app-x'), SCRIPT, {
-                lane: 'schedule',
-            }),
-        ).resolves.toBe('busy');
-        await expect(
-            deployer.ensure(appHandlerScope('app-x'), SCRIPT),
-        ).resolves.toBe('deployed');
-        expect(created).toEqual([SCRIPT]);
-    });
-
-    it('lets deliveries that join a schedule run`s refused deploy deploy once', async () => {
-        const { layers, created } = makeLayers({ 'app-x': { ownerUserId: 1 } });
-        const { deployer, gated } = withGate(layers, (capped) => capped);
-
-        const scheduled = deployer.ensure(appHandlerScope('app-x'), SCRIPT, {
-            lane: 'schedule',
-        });
-        const deliveries = [
-            deployer.ensure(appHandlerScope('app-x'), SCRIPT),
-            deployer.ensure(appHandlerScope('app-x'), SCRIPT),
-        ];
-        await expect(scheduled).resolves.toBe('busy');
-        await expect(Promise.all(deliveries)).resolves.toEqual([
-            'deployed',
-            'deployed',
-        ]);
-        expect(created).toEqual([SCRIPT]);
-        expect(gated.map((g) => g.capped)).toEqual([true, false]);
-    });
-
-    it('lets a schedule run join a delivery`s deploy in flight', async () => {
-        const { layers, created } = makeLayers({ 'app-x': { ownerUserId: 1 } });
-        const { deployer, gated } = withGate(layers, (capped) => capped);
-
-        const delivery = deployer.ensure(appHandlerScope('app-x'), SCRIPT);
-        const scheduled = deployer.ensure(appHandlerScope('app-x'), SCRIPT, {
-            lane: 'schedule',
-        });
-        await expect(Promise.all([delivery, scheduled])).resolves.toEqual([
-            'deployed',
-            'deployed',
-        ]);
-        expect(gated).toEqual([{ script: SCRIPT, capped: false }]);
-        expect(created).toEqual([SCRIPT]);
-    });
-});
-
-describe('LocalEventsInvokeTransport', () => {
-    it('renders each request as it goes out, after a cold deploy', async () => {
-        const bodies: string[] = [];
-        let resident = false;
-        const transport = new LocalEventsInvokeTransport(
-            {
-                localworkerservice: {
-                    dispatchEventsWorker: async (request: Request) => {
-                        bodies.push(await request.text());
-                        if (!resident) return null;
-                        return new Response(null, {
-                            status: 200,
-                            headers: { 'x-puter-events-handled': '1' },
-                        });
-                    },
-                },
-            } as never,
-            {
-                ensure: async () => {
-                    resident = true;
-                    return 'deployed';
-                },
-                scopeFor: async (appUid: string) => appHandlerScope(appUid),
-            } as unknown as EventsWorkerDeployer,
-        );
-        let renders = 0;
-        const call: EventsInvokeCall = {
-            script: SCRIPT,
-            appUid: 'app-x',
-            key: 'k',
-            body: '{"n":0}',
-            timeoutMs: 5000,
-            render: () => `{"n":${++renders}}`,
-        };
-        await expect(transport.send(call)).resolves.toMatchObject({
-            status: 200,
-        });
-        expect(bodies).toEqual(['{"n":1}', '{"n":2}']);
-    });
-});
-
-describe('deploy-on-miss of an evicted script', () => {
-    it('redeploys the evicted script, then resends the run with the deployed marker', async () => {
-        const { layers, created } = makeLayers({ 'app-m': { ownerUserId: 8 } });
-        // The namespace only has the script once the deploy lands: before
-        // that the dispatcher answers a miss.
-        let resident = false;
-        layers.drivers.workers.create = (async (args: {
-            workerName: string;
-        }) => {
-            created.push(args.workerName);
-            resident = true;
-            return { success: true, errors: [] };
-        }) as never;
-        const deployer = new EventsWorkerDeployer(layers);
-
-        const sent: boolean[] = [];
-        const fetchImpl = (async (_url: string, init?: RequestInit) => {
-            const headers = (init?.headers ?? {}) as Record<string, string>;
-            sent.push(headers[EVENTS_DEPLOYED_HEADER] === '1');
-            if (resident)
-                return new Response(null, {
-                    status: 200,
-                    headers: { [EVENTS_HANDLED_HEADER]: '1' },
-                });
-            return new Response(null, {
-                status: 404,
-                headers: { [EVENTS_DISPATCH_ERROR_HEADER]: 'missing' },
-            });
-        }) as unknown as typeof undiciFetch;
-
-        const client = new EventsWorkerInvokerClient({
-            events: { workerRuntime: true },
-        } as IConfig);
-        client.setTransport(
-            new DispatcherInvokeTransport('http://dispatcher', 's', {
-                fetchImpl,
-            }),
-        );
-        client.setMissHandler((appUid, script, options) =>
-            deployer.ensure(appHandlerScope(appUid), script, options),
-        );
-
-        const result = await client.invoke({
-            script: SCRIPT,
-            appUid: 'app-m',
-            handler: 'h',
-            token: 't',
-            key: 'k',
-            event: {},
-            ctx: {},
-        });
-
-        expect(result).toEqual({ outcome: 'settled', status: 200 });
-        expect(created).toEqual([SCRIPT]);
-        // One miss, then the resend carrying the deployed marker.
-        expect(sent).toEqual([false, true]);
-    });
-});
-
-// The redis mock is shared across tests, so each one uses its own app and code.
-let fresh = 0;
-const nextApp = () => `app-u${++fresh}`;
-const userScope = (holder: number, appUid: string) => ({ appUid, holder });
-const sourceN = (label: string) =>
-    `async () => { await ${label}${++fresh}(); }`;
-const scriptOf = (name: string, source: string) =>
-    userHandlerScript({ name, sourceHash: hashContent(source) }, '');
-
-type Sets = Record<number, Array<{ name: string; source: string }>>;
-
-/** Layers whose handler sets are per holder (0 is the app's own). */
-const withSets = (layers: Layers, sets: Sets) => {
-    const handlersOf = (scope: { appUid: string; holder: number }) =>
-        (sets[scope.holder] ?? []).map((h) => ({
-            appUid: scope.appUid,
-            name: h.name,
-            source: h.source,
-            sourceHash: hashContent(h.source),
-            createdAt: 0,
-            updatedAt: 0,
-        }));
-    const store = layers.stores.eventHandler as unknown as Record<
-        string,
-        unknown
-    >;
-    store.setForApp = async (scope: { appUid: string; holder: number }) =>
-        handlersOf(scope).map(({ name, sourceHash }) => ({ name, sourceHash }));
-    store.allForApp = async (scope: { appUid: string; holder: number }) =>
-        handlersOf(scope);
-};
-
-const holders = (...ids: number[]) =>
-    Object.fromEntries(
-        ids.map((id) => [`holder-${id}`, { ownerUserId: id }]),
-    ) as Record<string, Owner>;
-
-describe('EventsWorkerDeployer in a user scope', () => {
-    it('deploys the one handler whose script was asked for, as the holder', async () => {
-        const app = nextApp();
-        const a = sourceN('a');
-        const b = sourceN('b');
-        const { layers, created, targets } = makeLayers(holders(10));
-        withSets(layers, {
-            10: [
-                { name: 'a', source: a },
-                { name: 'b', source: b },
-            ],
-        });
-        const deployer = new EventsWorkerDeployer(layers);
-
-        const script = scriptOf('b', b);
-        expect(await deployer.ensure(userScope(10, app), script)).toBe(
-            'deployed',
-        );
-
-        expect(created).toEqual([script]);
-        const target = targets[0]!;
-        expect(target.tags).toEqual([`events-app:${app}`, 'user:uuid-10']);
-        // One handler's script: the other one's code is not in it.
-        expect(target.source).toContain(b);
-        expect(target.source).not.toContain(a);
-    });
-
-    it('answers a script no handler of the scope matches as stale, before the throttle', async () => {
-        const app = nextApp();
-        const { layers, redis, created } = makeLayers(holders(10));
-        withSets(layers, { 10: [{ name: 'a', source: sourceN('a') }] });
-        const deployer = new EventsWorkerDeployer(layers);
-
-        expect(
-            await deployer.ensure(
-                userScope(10, app),
-                scriptOf('b', sourceN('b')),
-            ),
-        ).toBe('stale');
-        expect(created).toEqual([]);
-        const hour = new Date().toISOString().slice(0, 13);
-        expect(await redis.get(`ev:deploys:{${app}}:10:${hour}`)).toBeNull();
-    });
-
-    it('answers a scope with no handlers as no-handlers', async () => {
-        const { layers } = makeLayers(holders(10));
-        withSets(layers, {});
-        const deployer = new EventsWorkerDeployer(layers);
-        expect(
-            await deployer.ensure(
-                userScope(10, nextApp()),
-                scriptOf('a', sourceN('a')),
-            ),
-        ).toBe('no-handlers');
-    });
-
-    it('does not deploy for a holder that is suspended or gone', async () => {
-        const source = sourceN('a');
-        const { layers, created } = makeLayers({
-            'holder-10': { ownerUserId: 10, suspended: true },
-        });
-        withSets(layers, {
-            10: [{ name: 'a', source }],
-            11: [{ name: 'a', source }],
-        });
-        const deployer = new EventsWorkerDeployer(layers);
-        const script = scriptOf('a', source);
-        const app = nextApp();
-
-        expect(await deployer.ensure(userScope(10, app), script)).toBe(
-            'no-owner',
-        );
-        expect(await deployer.ensure(userScope(11, app), script)).toBe(
-            'no-owner',
-        );
-        expect(created).toEqual([]);
-    });
-
-    it('gives each scope its own hourly cap, apart from the app scope', async () => {
-        const app = nextApp();
-        const source = sourceN('a');
-        const { layers, created } = makeLayers({
-            ...holders(10, 11),
-            [app]: { ownerUserId: 12 },
-        });
-        withSets(layers, {
-            0: [{ name: 'a', source }],
-            10: [{ name: 'a', source }],
-            11: [{ name: 'a', source }],
-        });
-        const deployer = new EventsWorkerDeployer(layers);
-        const script = scriptOf('a', source);
-
-        for (let i = 0; i < EVENTS_USER_WORKER_DEPLOYS_PER_HOUR; i++)
-            expect(await deployer.ensure(userScope(10, app), script)).toBe(
-                'deployed',
-            );
-        expect(await deployer.ensure(userScope(10, app), script)).toBe(
-            'throttled',
-        );
-        expect(created).toHaveLength(EVENTS_USER_WORKER_DEPLOYS_PER_HOUR);
-
-        // Another holder of the same app, and the app's own scope, still go.
-        expect(await deployer.ensure(userScope(11, app), script)).toBe(
-            'deployed',
-        );
-        expect(await deployer.ensure(appHandlerScope(app), script)).toBe(
-            'deployed',
-        );
-    });
-
-    it('collapses concurrent deploys of one script across holders into one upload', async () => {
-        const app = nextApp();
-        const source = sourceN('a');
-        const { layers, created } = makeLayers(holders(10, 11));
-        withSets(layers, {
-            10: [{ name: 'a', source }],
-            11: [{ name: 'a', source }],
-        });
-        const deployer = new EventsWorkerDeployer(layers);
-        const script = scriptOf('a', source);
-
-        await Promise.all([
-            deployer.ensure(userScope(10, app), script),
-            deployer.ensure(userScope(10, app), script),
-            deployer.ensure(userScope(11, app), script),
-            deployer.ensure(userScope(11, nextApp()), script),
-        ]);
-        expect(created).toHaveLength(1);
-    });
-
-    it('names a script for identical code the same under any holder and app', async () => {
-        const source = sourceN('a');
-        const { layers, created } = makeLayers(holders(10, 11));
-        withSets(layers, {
-            10: [{ name: '@x', source }],
-            11: [{ name: '@x', source }],
-        });
-        const deployer = new EventsWorkerDeployer(layers);
-        const script = scriptOf('@x', source);
-
-        expect(await deployer.ensure(userScope(10, nextApp()), script)).toBe(
-            'deployed',
-        );
-        expect(await deployer.ensure(userScope(11, nextApp()), script)).toBe(
-            'deployed',
-        );
-        expect(created).toEqual([script, script]);
-    });
-});
-
-describe('the deployed marker', () => {
-    const setup = () => {
-        const source = sourceN('a');
-        const made = makeLayers(holders(10, 11));
-        withSets(made.layers, {
-            10: [{ name: 'a', source }],
-            11: [{ name: 'a', source }],
-        });
-        return {
-            ...made,
-            deployer: new EventsWorkerDeployer(made.layers),
-            script: scriptOf('a', source),
-            app: nextApp(),
-        };
-    };
-
-    it('is left by a user-scope deploy with a ttl under a day', async () => {
-        const { deployer, redis, script, app } = setup();
-        await deployer.ensure(userScope(10, app), script);
-        const ttl = await redis.ttl(`ev:deployed:${script}`);
-        expect(ttl).toBeGreaterThan(0);
-        expect(ttl).toBeLessThan(24 * 60 * 60);
-    });
-
-    it('lets an eager deploy skip the upload another holder already made', async () => {
-        const { deployer, created, script, app } = setup();
-        expect(await deployer.deployEagerly(userScope(10, app), script)).toBe(
-            'deployed',
-        );
-        expect(await deployer.deployEagerly(userScope(11, app), script)).toBe(
-            'deployed',
-        );
-        expect(created).toEqual([script]);
-    });
-
-    it('spends no throttle on a skipped eager deploy', async () => {
-        const { deployer, redis, script, app } = setup();
-        await deployer.deployEagerly(userScope(10, app), script);
-        await deployer.deployEagerly(userScope(11, app), script);
-        const hour = new Date().toISOString().slice(0, 13);
-        expect(await redis.get(`ev:deploys:{${app}}:11:${hour}`)).toBeNull();
-    });
-
-    it('never skips a deploy-on-miss', async () => {
-        const { deployer, created, script, app } = setup();
-        await deployer.deployEagerly(userScope(10, app), script);
-        expect(await deployer.ensure(userScope(11, app), script)).toBe(
-            'deployed',
-        );
-        expect(created).toEqual([script, script]);
-    });
-
-    it('is not left by an app-scope deploy', async () => {
-        const app = nextApp();
-        const source = sourceN('a');
-        const { layers, redis, created } = makeLayers({
-            [app]: { ownerUserId: 4 },
-        });
-        withSets(layers, { 0: [{ name: 'a', source }] });
-        const deployer = new EventsWorkerDeployer(layers);
-        const script = scriptOf('a', source);
-        await deployer.ensure(appHandlerScope(app), script);
-        expect(created).toEqual([script]);
-        expect(await redis.get(`ev:deployed:${script}`)).toBeNull();
-    });
-
-    it('still deploys eagerly when the marker cannot be read', async () => {
-        const { deployer, redis, created, script, app } = setup();
-        await deployer.deployEagerly(userScope(10, app), script);
-        const get = redis.get.bind(redis);
-        redis.get = (async (key: string) => {
-            if (key.startsWith('ev:deployed:')) throw new Error('down');
-            return get(key);
-        }) as never;
-        expect(await deployer.deployEagerly(userScope(11, app), script)).toBe(
-            'deployed',
-        );
-        expect(created).toEqual([script, script]);
-    });
-});
-
-describe('scopeFor', () => {
-    it('reads no holder as the app scope, and resolves a uuid to the user scope', async () => {
-        const { layers } = makeLayers(holders(10));
-        const deployer = new EventsWorkerDeployer(layers);
-        expect(await deployer.scopeFor('app-u')).toEqual({
-            appUid: 'app-u',
-            holder: 0,
-        });
-        expect(await deployer.scopeFor('app-u', '')).toEqual({
-            appUid: 'app-u',
-            holder: 0,
-        });
-        expect(await deployer.scopeFor('app-u', 'uuid-10')).toEqual({
-            appUid: 'app-u',
-            holder: 10,
-        });
-        expect(await deployer.scopeFor('app-u', 'uuid-99')).toBeNull();
-    });
-});
-
-describe('LocalEventsInvokeTransport in a user scope', () => {
-    it('deploys the holder`s script on a miss and refuses an unknown holder', async () => {
-        const source = sourceN('a');
-        const { layers, created } = makeLayers(holders(10));
-        withSets(layers, { 10: [{ name: 'a', source }] });
-        const deployer = new EventsWorkerDeployer(layers);
-        let resident = false;
-        const transport = new LocalEventsInvokeTransport(
-            {
-                localworkerservice: {
-                    dispatchEventsWorker: async () => {
-                        if (!resident) return null;
-                        return new Response(null, {
-                            status: 200,
-                            headers: { 'x-puter-events-handled': '1' },
-                        });
-                    },
-                },
-            } as never,
-            {
-                ensure: async (
-                    scope: HandlerScope,
-                    script: string,
-                    options: EventsDeployOptions,
-                ) => {
-                    const outcome = await deployer.ensure(
-                        scope,
-                        script,
-                        options,
-                    );
-                    resident = outcome === 'deployed';
-                    return outcome;
-                },
-                scopeFor: (appUid: string, holder?: string) =>
-                    deployer.scopeFor(appUid, holder),
-            } as unknown as EventsWorkerDeployer,
-        );
-        const script = scriptOf('a', source);
-        const call: EventsInvokeCall = {
-            script,
-            appUid: nextApp(),
-            holder: 'uuid-10',
-            key: 'k',
-            body: '{}',
-            timeoutMs: 5000,
-        };
-
-        await expect(transport.send(call)).resolves.toMatchObject({
-            status: 200,
-        });
-        expect(created).toEqual([script]);
-
-        resident = false;
-        await expect(
-            transport.send({ ...call, holder: 'uuid-99' }),
-        ).resolves.toMatchObject({ status: null, error: 'deploy: no-holder' });
-        expect(created).toEqual([script]);
-    });
-});
-
-describe('concurrent eager deploys of one script', () => {
-    const setup = () => {
-        const source = sourceN('a');
-        const made = makeLayers(holders(10, 11));
-        withSets(made.layers, {
-            10: [{ name: 'a', source }],
-            11: [{ name: 'a', source }],
-        });
-        return {
-            ...made,
-            script: scriptOf('a', source),
-            app: nextApp(),
-        };
-    };
-
-    it('upload once when two holders publish the same new code together', async () => {
-        const { layers, created, script, app } = setup();
-        const deployer = new EventsWorkerDeployer(layers);
-
-        const outcomes = await Promise.all([
-            deployer.deployEagerly(userScope(10, app), script),
-            deployer.deployEagerly(userScope(11, app), script),
-        ]);
-
-        expect(outcomes).toEqual(['deployed', 'deployed']);
-        expect(created).toEqual([script]);
-    });
-
-    it('skip the upload when the marker appears while they wait on the gate', async () => {
-        const { layers, redis, created, script, app } = setup();
-        // Another node's deploy of the script finishes before the gate opens.
-        const gated = new EventsWorkerDeployer({
-            ...layers,
-            services: {
-                schedules: {
-                    gateDeploy: async (
-                        _script: string,
-                        _options: { capped: boolean },
-                        deploy: () => Promise<EventsDeployOutcome>,
-                    ) => {
-                        await redis.set(`ev:deployed:${script}`, '1');
-                        return deploy();
-                    },
-                },
-            },
-        } as unknown as Layers);
-
-        expect(
-            await gated.ensure(userScope(10, app), script, { eager: true }),
-        ).toBe('deployed');
-        expect(created).toEqual([]);
-        // A miss still uploads, whatever the marker says.
-        expect(await gated.ensure(userScope(11, app), script)).toBe('deployed');
-        expect(created).toEqual([script]);
-    });
-
-    it('make a miss that joins an eager deploy deploy after it', async () => {
-        const { layers, redis, created, script, app } = setup();
-        const deployer = new EventsWorkerDeployer(layers);
-        await redis.set(`ev:deployed:${script}`, '1');
-
-        const eager = deployer.ensure(userScope(10, app), script, {
-            eager: true,
-        });
-        const miss = deployer.ensure(userScope(11, app), script);
-
-        expect(await eager).toBe('deployed');
-        expect(await miss).toBe('deployed');
-        // The eager one skipped on the marker; the miss uploaded.
-        expect(created).toEqual([script]);
+        expect(await deployer.ensure('app-d', SCRIPT)).toBe('deployed');
     });
 });

src/backend/controllers/events/workerDeploy.ts

@@ -26,100 +26,50 @@ import {
     INTERNAL_ADMISSION_BYPASS,
     INTERNAL_DEPLOY_TARGET,
 } from '../../drivers/workers/WorkerDriver.js';
-import type {
-    EventsInvokeAnswer,
-    EventsInvokeCall,
-    InvokeLane,
-} from '../../clients/events/EventsWorkerInvokerClient.js';
+import type { EventsInvokeCall } from '../../clients/events/EventsWorkerInvokerClient.js';
 import {
+    EVENTS_HANDLED_HEADER,
     EVENTS_INVOKE_PATH,
-    answerFrom,
-    failedAnswer,
 } from '../../clients/events/EventsWorkerInvokerClient.js';
 import type { puterServices } from '../../services/index.js';
-import type { IExtensionServiceInstances } from '../../services/types.js';
 import {
     eventsInvokeKey,
     eventsWorkerScope,
     eventsWorkerScript,
-    userHandlerScript,
 } from '../../services/events/workerRuntime.js';
-import {
-    generateEventsWorkerSource,
-    handlerSetHash,
-} from '../../services/events/workerSource.js';
-import {
-    appHandlerScope,
-    type HandlerScope,
-} from '../../stores/events/EventHandlerStore.js';
+import { generateEventsWorkerSource } from '../../services/events/workerSource.js';
 import type { puterStores } from '../../stores/index.js';
 import type { IConfig, LayerInstances } from '../../types.js';
-import {
-    EVENTS_USER_WORKER_DEPLOYS_PER_HOUR,
-    EVENTS_WORKER_DEPLOYS_PER_HOUR,
-} from './limits.js';
+import { EVENTS_WORKER_DEPLOYS_PER_HOUR } from './limits.js';
 
 /**
  * Deploys an app's events worker from its published handlers.
  *
  * Deployed the first time a delivery needs it and again on eviction — a publish
- * only writes rows (a user-scope publish also deploys eagerly). An app's scope
- * is one script for the whole set; a user scope is one script per handler,
- * deployed as the holder. Scripts carry no worker token and no `subdomains`
- * row: not one of the owner's workers, not addressable from the internet, not
- * listed or deleted as if it were. A republished set leaves the old script
- * behind rather than deleting it; redeploying a still-live one is always safe.
+ * only writes rows. Scripts carry no worker token and no `subdomains` row: not
+ * one of the owner's workers, not addressable from the internet, not listed or
+ * deleted as if it were. A republished set leaves the old script behind rather
+ * than deleting it; redeploying a still-live one is always safe.
  */
 
 /** Why a deploy could not happen, for the callers that answer differently. */
 export type EventsDeployOutcome =
-    | 'deployed'
-    | 'stale'
-    | 'no-handlers'
-    | 'no-owner'
-    | 'throttled'
-    | 'failed'
-    | 'busy';
-
-/** Whose call asked for the deploy: a schedule run's is held to a share. */
-export interface EventsDeployOptions {
-    lane?: InvokeLane;
-    /**
-     * A user-scope publish's deploy, which skips the upload when the script's
-     * deployed marker is already set. A deploy-on-miss is never eager.
-     */
-    eager?: boolean;
-}
+    'deployed' | 'stale' | 'no-handlers' | 'no-owner' | 'throttled' | 'failed';
 
 interface DeployLayers {
     config: IConfig;
     clients: LayerInstances<typeof puterClients>;
     stores: LayerInstances<typeof puterStores>;
-    services: LayerInstances<typeof puterServices> &
-        Pick<IExtensionServiceInstances, 'schedules'>;
+    services: LayerInstances<typeof puterServices>;
     drivers: LayerInstances<typeof puterDrivers>;
 }
 
 /**
- * `ev:deploys:{<appUid>}[:<holder>]:<hour>` bucket TTL — comfortably past the
- * hour it counts.
+ * `ev:deploys:{<appUid>}:<hour>` bucket TTL — comfortably past the hour it
+ * counts.
  */
 const DEPLOY_THROTTLE_TTL_SECONDS = 2 * 60 * 60;
 
-/** How long `ev:deployed:<script>` says a script was uploaded. Under a day. */
-const DEPLOYED_MARKER_TTL_SECONDS = 20 * 60 * 60;
-
-const deployedMarkerKey = (script: string): string => `ev:deployed:${script}`;
-
-const isUserScope = (scope: HandlerScope): boolean => scope.holder !== 0;
-
-interface InFlightDeploy {
-    /** A schedule run's, which the region's deploy slots may refuse. */
-    capped: boolean;
-    eager: boolean;
-    promise: Promise<EventsDeployOutcome>;
-}
-
 interface DeployResult {
     success?: boolean;
     errors?: unknown[];
@@ -128,7 +78,7 @@ interface DeployResult {
 export class EventsWorkerDeployer {
     readonly #layers: DeployLayers;
     /** Collapses the burst of misses one cold app produces into one deploy. */
-    readonly #inFlight = new Map<string, InFlightDeploy>();
+    readonly #inFlight = new Map<string, Promise<EventsDeployOutcome>>();
 
     constructor(layers: DeployLayers) {
         this.#layers = layers;
@@ -143,187 +93,39 @@ export class EventsWorkerDeployer {
     }
 
     /**
-     * Deploy `script`, which must be what the scope's handlers currently hash
-     * to: the whole set for an app, one handler for a user scope. A request for
-     * anything else is `stale` — the handlers moved on, and the next delivery
-     * resolves the new script rather than this one being revived. Always
-     * uploads; a deploy-on-miss means whatever said it was there is wrong.
+     * Deploy `script`, which must be what the app's handlers currently hash to.
+     * A request for anything else is `stale` — the set moved on, and the next
+     * delivery resolves the new script rather than this one being revived.
      */
-    ensure(
-        scope: HandlerScope,
-        script: string,
-        options: EventsDeployOptions = {},
-    ): Promise<EventsDeployOutcome> {
-        // A user scope's script is the same bytes whoever holds it, so
-        // concurrent deploys of it from any holder or app are one.
-        const key = isUserScope(scope)
-            ? `user|${script}`
-            : `${scope.appUid}|${scope.holder}|${script}`;
-        const capped = options.lane === 'schedule';
+    ensure(appUid: string, script: string): Promise<EventsDeployOutcome> {
+        const key = `${appUid}|${script}`;
         const existing = this.#inFlight.get(key);
-        if (!existing) return this.#start(key, scope, script, options);
-        // An eager deploy may have skipped the upload, which a miss must not
-        // take for done.
-        if (existing.eager && !options.eager)
-            return this.#afterEager(
-                existing.promise,
-                key,
-                scope,
-                script,
-                options,
-            );
-        if (capped || !existing.capped) return existing.promise;
-        return this.#afterCapped(existing.promise, key, scope, script, options);
-    }
-
-    /**
-     * {@link ensure} for the deploy a user-scope publish starts, which skips the
-     * upload when another holder's deploy of the same script left its marker.
-     * Only this path reads the marker.
-     */
-    async deployEagerly(
-        scope: HandlerScope,
-        script: string,
-    ): Promise<EventsDeployOutcome> {
-        if (await this.#markedDeployed(script)) return 'deployed';
-        return this.ensure(scope, script, { eager: true });
-    }
-
-    /**
-     * The scope a script request names: the app's own, or the user scope of
-     * `holder` (a user uuid). Null for a holder that does not exist.
-     */
-    async scopeFor(
-        appUid: string,
-        holder?: string | null,
-    ): Promise<HandlerScope | null> {
-        if (!holder) return appHandlerScope(appUid);
-        const user = await this.#layers.stores.user.getByUuid(holder);
-        if (!user?.id) return null;
-        return { appUid, holder: Number(user.id) };
-    }
-
-    #start(
-        key: string,
-        scope: HandlerScope,
-        script: string,
-        options: EventsDeployOptions,
-    ): Promise<EventsDeployOutcome> {
-        const entry: InFlightDeploy = {
-            capped: options.lane === 'schedule',
-            eager: options.eager === true,
-            promise: this.#gated(scope, script, options).finally(() => {
-                if (this.#inFlight.get(key) === entry)
-                    this.#inFlight.delete(key);
-            }),
-        };
-        this.#inFlight.set(key, entry);
-        return entry.promise;
-    }
-
-    /** A miss that found an eager deploy in flight deploys after it. */
-    async #afterEager(
-        eager: Promise<EventsDeployOutcome>,
-        key: string,
-        scope: HandlerScope,
-        script: string,
-        options: EventsDeployOptions,
-    ): Promise<EventsDeployOutcome> {
-        await eager;
-        const current = this.#inFlight.get(key);
-        if (current && !current.eager) return current.promise;
-        return this.#start(key, scope, script, options);
-    }
-
-    /**
-     * A delivery that joined a schedule run's deploy: `busy` means no deploy
-     * started, and a delivery is never refused a slot, so it asks again.
-     */
-    async #afterCapped(
-        capped: Promise<EventsDeployOutcome>,
-        key: string,
-        scope: HandlerScope,
-        script: string,
-        options: EventsDeployOptions,
-    ): Promise<EventsDeployOutcome> {
-        const outcome = await capped;
-        if (outcome !== 'busy') return outcome;
-        const current = this.#inFlight.get(key);
-        if (current && !current.capped) return current.promise;
-        return this.#start(key, scope, script, options);
-    }
-
-    /**
-     * Every deploy goes through the schedules' deploy gate when a server has
-     * one: a per-script lock, so a burst of runs of an evicted script deploys
-     * it once, and a region-wide cap that a schedule run's deploy (`capped`)
-     * may be refused with `busy`. A delivery's deploy is never refused.
-     */
-    #gated(
-        scope: HandlerScope,
-        script: string,
-        options: EventsDeployOptions,
-    ): Promise<EventsDeployOutcome> {
-        const deploy = () =>
-            this.#deploy(scope, script, options.eager === true);
-        return (
-            this.#layers.services.schedules?.gateDeploy?.(
-                script,
-                { capped: options.lane === 'schedule' },
-                deploy,
-            ) ?? deploy()
+        if (existing) return existing;
+        const started = this.#deploy(appUid, script).finally(() =>
+            this.#inFlight.delete(key),
         );
+        this.#inFlight.set(key, started);
+        return started;
     }
 
     async #deploy(
-        handlerScope: HandlerScope,
+        appUid: string,
         script: string,
-        eager: boolean,
     ): Promise<EventsDeployOutcome> {
-        const { appUid } = handlerScope;
         const { stores, drivers } = this.#layers;
-        const backend = eventsWorkerScope(this.#layers.config);
-        const userScope = isUserScope(handlerScope);
 
-        // Names and hashes are enough to tell a stale request, so the set's
-        // sources are read and built only once the throttle has let it through.
-        const set = await stores.eventHandler.setForApp(handlerScope);
-        if (set.length === 0) return 'no-handlers';
+        const handlers = await stores.eventHandler.allForApp(appUid);
+        if (handlers.length === 0) return 'no-handlers';
+
+        const generated = generateEventsWorkerSource(handlers);
         // Two apps that published byte-identical sets share one script, which
         // is sound: the source is the same, and everything per-app arrives with
-        // the invocation. Whoever deploys first owns it. A user scope's script
-        // is one handler's, so it is shared the same way across holders.
-        const wanted = userScope
-            ? set.find((entry) => userHandlerScript(entry, backend) === script)
-            : undefined;
+        // the invocation. Whoever deploys first owns it.
         if (
-            userScope
-                ? !wanted
-                : eventsWorkerScript(handlerSetHash(set), backend) !== script
-        )
-            return 'stale';
-
-        // Asked again inside the gate, where another deploy of this script may
-        // have just finished.
-        if (eager && userScope && (await this.#markedDeployed(script)))
-            return 'deployed';
-
-        if (await this.#tooManyDeploysThisHour(handlerScope))
-            return 'throttled';
-
-        const all = await stores.eventHandler.allForApp(handlerScope);
-        const handlers = wanted
-            ? all.filter(
-                  (handler) =>
-                      handler.name === wanted.name &&
-                      handler.sourceHash === wanted.sourceHash,
-              )
-            : all;
-        const generated = generateEventsWorkerSource(handlers);
-        // The set can move between the two reads.
-        if (
-            handlers.length === 0 ||
-            eventsWorkerScript(generated.setHash, backend) !== script
+            eventsWorkerScript(
+                generated.setHash,
+                eventsWorkerScope(this.#layers.config),
+            ) !== script
         )
             return 'stale';
         if (generated.tooLarge) {
@@ -338,7 +140,9 @@ export class EventsWorkerDeployer {
                 generated.broken.join(', '),
             );
 
-        const owner = await this.#owner(handlerScope);
+        if (await this.#tooManyDeploysThisHour(appUid)) return 'throttled';
+
+        const owner = await this.#owner(appUid);
         if (!owner) return 'no-owner';
 
         const secret = this.#layers.config.events?.internalSecret;
@@ -367,7 +171,6 @@ export class EventsWorkerDeployer {
                         runtime: 'events',
                         source: generated.source,
                         omitOwnerToken: true,
-                        cpuMs: this.#layers.config.events?.workerCpuMs,
                         // What the script compares an invocation against.
                         // Derived from the script name, so a redeploy of
                         // the same set binds the same key.
@@ -398,74 +201,34 @@ export class EventsWorkerDeployer {
             );
             return 'failed';
         }
-        if (userScope) await this.#markDeployed(script);
         return 'deployed';
     }
 
-    async #markedDeployed(script: string): Promise<boolean> {
-        try {
-            return !!(await this.#layers.clients.redis.get(
-                deployedMarkerKey(script),
-            ));
-        } catch (err) {
-            console.warn('[events] deployed marker unreadable', err);
-            return false;
-        }
-    }
-
-    async #markDeployed(script: string): Promise<void> {
-        try {
-            await this.#layers.clients.redis.set(
-                deployedMarkerKey(script),
-                '1',
-                'EX',
-                DEPLOYED_MARKER_TTL_SECONDS,
-            );
-        } catch (err) {
-            console.warn('[events] could not mark a script deployed', err);
-        }
-    }
-
     /**
-     * Whether this scope has already deployed its hourly cap this hour. A
-     * flapping set (publish, remove, republish) provisions upstream on every
-     * miss, and this is the ceiling on that loop. An app's counter is per app;
-     * a user scope has its own, so one user cannot spend another's.
+     * Whether this app has already deployed `EVENTS_WORKER_DEPLOYS_PER_HOUR`
+     * times this hour. A flapping set (publish, remove, republish) provisions
+     * upstream on every miss, and this is the ceiling on that loop.
      */
-    async #tooManyDeploysThisHour(scope: HandlerScope): Promise<boolean> {
+    async #tooManyDeploysThisHour(appUid: string): Promise<boolean> {
         const redis = this.#layers.clients.redis;
         const hour = new Date().toISOString().slice(0, 13);
-        const userScope = isUserScope(scope);
-        const key = userScope
-            ? `ev:deploys:{${scope.appUid}}:${scope.holder}:${hour}`
-            : `ev:deploys:{${scope.appUid}}:${hour}`;
+        const key = `ev:deploys:{${appUid}}:${hour}`;
         const count = await redis.incr(key);
         if (count === 1) await redis.expire(key, DEPLOY_THROTTLE_TTL_SECONDS);
-        return (
-            count >
-            (userScope
-                ? EVENTS_USER_WORKER_DEPLOYS_PER_HOUR
-                : EVENTS_WORKER_DEPLOYS_PER_HOUR)
-        );
+        return count > EVENTS_WORKER_DEPLOYS_PER_HOUR;
     }
 
-    /**
-     * The user a scope's deploy runs as, as an actor: the app's owner, or the
-     * holder of a user scope.
-     */
+    /** The app owner, as an actor the deploy can run as. */
     async #owner(
-        scope: HandlerScope,
+        appUid: string,
     ): Promise<
         | (Actor & { user: { id: number; uuid: string; username: string } })
         | null
     > {
         const { stores } = this.#layers;
-        let ownerUserId = scope.holder;
-        if (!isUserScope(scope)) {
-            const app = await stores.app.getByUid(scope.appUid);
-            ownerUserId = Number(app?.owner_user_id);
-            if (!app || !Number.isFinite(ownerUserId)) return null;
-        }
+        const app = await stores.app.getByUid(appUid);
+        const ownerUserId = Number(app?.owner_user_id);
+        if (!app || !Number.isFinite(ownerUserId)) return null;
 
         const user = await stores.user.getById(ownerUserId);
         if (!user?.id || !user.uuid || !user.username || user.suspended)
@@ -526,9 +289,11 @@ export class LocalEventsInvokeTransport {
         this.#deployer = deployer;
     }
 
-    async send(call: EventsInvokeCall): Promise<EventsInvokeAnswer> {
-        // Built per attempt, so a send time stamped into the body is taken
-        // after a cold deploy rather than before it.
+    async send(call: EventsInvokeCall): Promise<{
+        status: number | null;
+        handled?: boolean;
+        error?: string;
+    }> {
         const request = (): Request =>
             new Request(
                 `http://${call.script}.workers.puter.localhost${EVENTS_INVOKE_PATH}`,
@@ -538,7 +303,7 @@ export class LocalEventsInvokeTransport {
                         'content-type': 'application/json',
                         'x-puter-events-key': call.key,
                     },
-                    body: call.render ? call.render() : call.body,
+                    body: call.body,
                 },
             );
 
@@ -546,27 +311,22 @@ export class LocalEventsInvokeTransport {
             const resident = await this.#dispatch(request(), call.timeoutMs);
             if (resident !== null) return resident;
 
-            const scope = await this.#deployer.scopeFor(
+            const outcome = await this.#deployer.ensure(
                 call.appUid,
-                call.holder,
+                call.script,
             );
-            if (!scope) return { status: null, error: 'deploy: no-holder' };
-            const outcome = await this.#deployer.ensure(scope, call.script, {
-                lane: call.lane,
-            });
             if (outcome !== 'deployed')
-                return {
-                    status: null,
-                    error: `deploy: ${outcome}`,
-                    ...(outcome === 'busy' ? { deployBusy: true } : {}),
-                };
+                return { status: null, error: `deploy: ${outcome}` };
 
             const retried = await this.#dispatch(request(), call.timeoutMs);
             if (retried === null)
                 return { status: null, error: 'script not resident' };
             return retried;
         } catch (err) {
-            return failedAnswer(err);
+            return {
+                status: null,
+                error: err instanceof Error ? err.message : String(err),
+            };
         }
     }
 
@@ -577,7 +337,7 @@ export class LocalEventsInvokeTransport {
     async #dispatch(
         request: Request,
         timeoutMs: number,
-    ): Promise<EventsInvokeAnswer | null> {
+    ): Promise<{ status: number; handled: boolean } | null> {
         let timer: ReturnType<typeof setTimeout> | undefined;
         const timeout = new Promise<'timeout'>((resolve) => {
             timer = setTimeout(() => resolve('timeout'), timeoutMs);
@@ -588,10 +348,12 @@ export class LocalEventsInvokeTransport {
                 this.#services.localworkerservice.dispatchEventsWorker(request),
                 timeout,
             ]);
-            if (response === 'timeout')
-                throw new DOMException('invocation timed out', 'TimeoutError');
+            if (response === 'timeout') throw new Error('invocation timed out');
             if (response === null) return null;
-            return answerFrom(response);
+            return {
+                status: response.status,
+                handled: response.headers.get(EVENTS_HANDLED_HEADER) === '1',
+            };
         } finally {
             clearTimeout(timer);
         }

src/backend/controllers/fs/FSController.http.test.ts

@@ -17,9 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { GetObjectCommand } from '@aws-sdk/client-s3';
-import { Readable } from 'node:stream';
-import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
+import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 import { setupPuterTestEnv, type PuterTestEnv } from '../../testUtil.js';
 
 /**
@@ -154,26 +152,6 @@ describe('GET /fs/readdir over HTTP', () => {
         ).toEqual(['a', 'a/b']);
     });
 
-    it('answers 404 for a directory whose parent chain is broken', async () => {
-        const { username, token } = env.users.user;
-        const path = `/${username}/Documents/http-orphan-${Date.now()}`;
-        const created = await fetch(new URL('/fs/mkdir', env.apiOrigin), {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ path, auth_token: token }),
-        });
-        expect(created.status).toBe(200);
-        const { uid } = (await created.json()) as { uid: string };
-        await env.server.clients.db.write(
-            'UPDATE fsentries SET path = NULL, parent_uid = ? WHERE uuid = ?',
-            ['does-not-exist', uid],
-        );
-        await env.server.stores.fsEntry.invalidateEntryCacheByUuid(uid);
-
-        const response = await fetch(readdirUrl({ uid, auth_token: token }));
-        expect(response.status).toBe(404);
-    });
-
     it('mkdir does not return internal ids, storage columns or tokens', async () => {
         const { username, token } = env.users.user;
         const response = await fetch(new URL('/fs/mkdir', env.apiOrigin), {
@@ -571,111 +549,3 @@ describe('POST /fs/startWrite storage quota over HTTP', () => {
         expect(responseBody.code).toBe('bad_request');
     });
 });
-
-describe('file reads over HTTP when storage fails mid-download', () => {
-    let env: PuterTestEnv;
-
-    beforeAll(async () => {
-        env = await setupPuterTestEnv();
-    }, 120_000);
-
-    afterAll(async () => {
-        await env?.shutdown();
-    });
-
-    const writeFile = async (name: string, content: string) => {
-        const { username } = env.users.user;
-        const user = await env.server.stores.user.getByUsername(username);
-        const body = Buffer.from(content);
-        const { fsEntry } = await env.server.services.fs.write(user!.id, {
-            fileMetadata: {
-                path: `/${username}/Documents/${name}`,
-                size: body.byteLength,
-                contentType: 'text/plain',
-            },
-            fileContent: body,
-        });
-        return fsEntry;
-    };
-
-    // Storage hands over one chunk and then fails, the way a dropped
-    // connection or a checksum mismatch surfaces on a read in flight.
-    const breakReadsOf = (objectKey: string) => {
-        const s3 = env.server.stores.s3Object;
-        const client = env.server.clients.s3.get(s3.resolveRegion(null));
-        const send = client.send.bind(client);
-        return vi.spyOn(client, 'send').mockImplementation(((
-            command: unknown,
-        ) => {
-            if (
-                !(command instanceof GetObjectCommand) ||
-                command.input.Key !== objectKey
-            ) {
-                return send(command as never);
-            }
-            let reads = 0;
-            const body = new Readable({
-                read() {
-                    reads += 1;
-                    if (reads === 1) this.push('partial');
-                    // Late enough for the headers and first chunk to go out.
-                    else if (reads === 2)
-                        setTimeout(
-                            () => this.destroy(new Error('Checksum mismatch')),
-                            25,
-                        );
-                },
-            });
-            return Promise.resolve({
-                Body: body,
-                ContentLength: 64,
-                ContentType: 'text/plain',
-            });
-        }) as never);
-    };
-
-    it.each([
-        ['/fs/read', 'path'],
-        ['/read', 'file'],
-    ])(
-        'GET %s fails that response and keeps serving others',
-        async (route, param) => {
-            const { username, token } = env.users.user;
-            const urlFor = (name: string) => {
-                const url = new URL(route, env.apiOrigin);
-                url.searchParams.set(param, `/${username}/Documents/${name}`);
-                return url;
-            };
-            const suffix = route.replace(/\W/g, '');
-            const broken = await writeFile(
-                `broken-${suffix}.txt`,
-                'x'.repeat(64),
-            );
-            await writeFile(`healthy-${suffix}.txt`, 'still fine');
-
-            const send = breakReadsOf(broken.uuid);
-            let status = 0;
-            let completed = false;
-            try {
-                const response = await fetch(urlFor(`broken-${suffix}.txt`), {
-                    headers: { Authorization: `Bearer ${token}` },
-                });
-                status = response.status;
-                await response.arrayBuffer();
-                completed = true;
-            } catch {
-                // Expected: the transfer is cut short.
-            } finally {
-                send.mockRestore();
-            }
-            expect(status).toBe(200);
-            expect(completed).toBe(false);
-
-            const healthy = await fetch(urlFor(`healthy-${suffix}.txt`), {
-                headers: { Authorization: `Bearer ${token}` },
-            });
-            expect(healthy.status).toBe(200);
-            expect(await healthy.text()).toBe('still fine');
-        },
-    );
-});

src/backend/controllers/fs/FSController.recursiveOffset.http.test.ts

@@ -1,80 +0,0 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-import { setupPuterTestEnv, type PuterTestEnv } from '../../testUtil.js';
-
-describe('recursive readdir with offset', () => {
-    let env: PuterTestEnv;
-
-    beforeAll(async () => {
-        env = await setupPuterTestEnv();
-    }, 120_000);
-
-    afterAll(async () => {
-        await env?.shutdown();
-    });
-
-    const post = async (path: string, token: string, body: unknown) =>
-        fetch(new URL(path, env.apiOrigin), {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                Authorization: `Bearer ${token}`,
-            },
-            body: JSON.stringify(body),
-        });
-
-    it('skips entries before applying the recursive page limit', async () => {
-        const { username, token } = env.users.user;
-        const base = `/${username}/Documents/rec-offset`;
-        for (const path of [base, `${base}/a`, `${base}/b`, `${base}/c`]) {
-            expect((await post('/fs/mkdir', token, { path })).status).toBe(200);
-        }
-
-        const list = async (body: Record<string, unknown>) => {
-            const response = await post('/fs/readdir', token, {
-                path: base,
-                recursive: true,
-                ...body,
-            });
-            expect(response.status).toBe(200);
-            const page = (await response.json()) as {
-                items: Array<{ name: string }>;
-            };
-            return page.items.map((item) => item.name);
-        };
-
-        expect(await list({ limit: 3 })).toEqual(['a', 'b', 'c']);
-        // Non-recursive honours offset.
-        const flat = await post('/fs/readdir', token, {
-            path: base,
-            limit: 1,
-            offset: 2,
-        });
-        expect(
-            ((await flat.json()) as Array<{ name: string }>).map((e) => e.name),
-        ).toEqual(['c']);
-        expect(await list({ limit: 1, offset: 2 })).toEqual(['c']);
-        expect(await list({ offset: 2 })).toEqual(['c']);
-        expect(await list({ offset: 20 })).toEqual([]);
-        expect(await list({ limit: 1, offset: 1, sortOrder: 'desc' })).toEqual([
-            'b',
-        ]);
-        const first = await post('/fs/readdir', token, {
-            path: base,
-            recursive: true,
-            limit: 1,
-            offset: 1,
-        });
-        const page = await first.json();
-        expect(page.items.map((item: { name: string }) => item.name)).toEqual([
-            'b',
-        ]);
-        expect(page.cursor).toBeTypeOf('string');
-        expect(await list({ limit: 1, cursor: page.cursor })).toEqual(['c']);
-        // A cursor wins over offset, and an invalid offset is ignored, as
-        // recursive listings did before they honoured offset.
-        expect(
-            await list({ limit: 1, cursor: page.cursor, offset: 1 }),
-        ).toEqual(['c']);
-        expect(await list({ limit: 1, offset: -1 })).toEqual(['a']);
-    });
-});

src/backend/controllers/fs/FSController.test.ts

@@ -1948,27 +1948,6 @@ describe('FSController.readEntry (file streaming)', () => {
         expect(captured.statusCode).toBe(206);
     });
 
-    it('returns 206 with Range honored when offset and byte_count query params are supplied', async () => {
-        const { actor, userId } = await makeUser();
-        const username = actor.user!.username!;
-        const body = Buffer.from('abcdefghij');
-        const target = `/${username}/Documents/ranged-query.bin`;
-        await writeFile(userId, target, body, 'application/octet-stream');
-
-        const { res, captured } = makeStreamingRes();
-        await withActor(actor, () =>
-            controller.readEntry(
-                makeReq({
-                    query: { path: target, offset: '2', byte_count: '4' },
-                    actor,
-                }),
-                res,
-            ),
-        );
-        expect(captured.statusCode).toBe(206);
-        expect(Buffer.concat(captured.bodyChunks).toString()).toBe('cdef');
-    });
-
     it('throws 404 when the path does not exist', async () => {
         const { actor } = await makeUser();
         const username = actor.user!.username!;

src/backend/controllers/fs/FSController.ts

@@ -20,15 +20,12 @@
 import Busboy from 'busboy';
 import type { Request, Response } from 'express';
 import { posix as pathPosix } from 'node:path';
+import { pipeline } from 'node:stream/promises';
 import type { Actor } from '../../core/actor.js';
 import { Context } from '../../core/context.js';
 import { HttpError } from '../../core/http/HttpError.js';
 import { Controller, Get, Post } from '../../core/http/decorators.js';
-import { pipeToResponse } from '../../core/http/pipeToResponse.js';
-import {
-    FS_ROUTE_REFUSAL,
-    type ResourceDescriptor,
-} from '../../services/acl/ACLService.js';
+import { FS_ROUTE_REFUSAL } from '../../services/acl/ACLService.js';
 import { clientParentUid } from '../../services/fs/rootListing.js';
 import {
     expandTildePath,
@@ -45,11 +42,7 @@ import type {
     UploadedBatchWriteItem,
     UploadProgressTrackerLike,
 } from '../../services/fs/types.js';
-import type {
-    FSEntry,
-    FSEntryWriteInput,
-    PendingUploadSession,
-} from '../../stores/fs/FSEntry.js';
+import type { FSEntry, FSEntryWriteInput } from '../../stores/fs/FSEntry.js';
 import {
     runWithConcurrencyLimit,
     runWithConcurrencyLimitSettled,
@@ -82,8 +75,6 @@ import {
     type GuiItemEventName,
     loadLegacyAssociatedApps,
     replacedByMove,
-    resolveOrNotFound,
-    resolveReadRange,
     signEntryThumbnail,
 } from './legacyFsHelpers.js';
 import type {
@@ -159,14 +150,8 @@ export class FSController extends PuterController {
         );
     }
 
-    // Write routes admit scoped access tokens for the same reason the reads
-    // do (see the note above `/stat`): every handler authorizes the target
-    // through the ACL, which intersects a token's grant with its issuer's, so
-    // a token writes exactly where it was granted write — the parity WebDAV
-    // already has. Upload sessions are re-checked on complete, sign and abort.
     @Post('/startWrite', {
         subdomain: 'api',
-        allowAccessToken: true,
         requireVerified: true,
         requireCredits: true,
         rateLimit: FS_MULTIPART_LIMIT,
@@ -233,7 +218,6 @@ export class FSController extends PuterController {
 
     @Post('/startBatchWrite', {
         subdomain: 'api',
-        allowAccessToken: true,
         requireVerified: true,
         requireCredits: true,
         rateLimit: FS_MULTIPART_LIMIT,
@@ -340,7 +324,6 @@ export class FSController extends PuterController {
 
     @Post('/completeWrite', {
         subdomain: 'api',
-        allowAccessToken: true,
         requireVerified: true,
         requireCredits: true,
         rateLimit: FS_MULTIPART_LIMIT,
@@ -383,7 +366,6 @@ export class FSController extends PuterController {
 
     @Post('/completeBatchWrite', {
         subdomain: 'api',
-        allowAccessToken: true,
         requireVerified: true,
         requireCredits: true,
         rateLimit: FS_MULTIPART_LIMIT,
@@ -414,26 +396,26 @@ export class FSController extends PuterController {
             userId,
             requests,
         );
-        const withSideEffects = await this.#applyWriteResponsesSideEffects(
-            userId,
-            response.map((writeResponse, index) => {
-                const write: WriteResponse = {
-                    fsEntry: writeResponse.fsEntry,
-                    wasOverwrite: writeResponse.wasOverwrite,
-                    requestedThumbnail: writeResponse.requestedThumbnail,
-                    contentHashSha256: null,
-                };
-                return {
-                    response: write,
-                    guiMetadata: requests[index]?.guiMetadata,
-                };
-            }),
+        const updatedResponse = await runWithConcurrencyLimit(
+            response,
             DEFAULT_BATCH_WRITE_SIDE_EFFECT_CONCURRENCY,
+            async (writeResponse, index) => {
+                const requestBody = requests[index];
+                const withSideEffects =
+                    await this.#applyWriteResponseSideEffects(
+                        userId,
+                        {
+                            fsEntry: writeResponse.fsEntry,
+                            wasOverwrite: writeResponse.wasOverwrite,
+                            requestedThumbnail:
+                                writeResponse.requestedThumbnail,
+                            contentHashSha256: null,
+                        },
+                        requestBody?.guiMetadata,
+                    );
+                return { ...writeResponse, fsEntry: withSideEffects.fsEntry };
+            },
         );
-        const updatedResponse = response.map((writeResponse, index) => ({
-            ...writeResponse,
-            fsEntry: withSideEffects[index]?.fsEntry ?? writeResponse.fsEntry,
-        }));
         res.json(
             updatedResponse.map((r) => this.#withRequiredClientFsEntry(r)),
         );
@@ -441,7 +423,6 @@ export class FSController extends PuterController {
 
     @Post('/abortWrite', {
         subdomain: 'api',
-        allowAccessToken: true,
         requireVerified: true,
         rateLimit: FS_MULTIPART_LIMIT,
     })
@@ -456,31 +437,12 @@ export class FSController extends PuterController {
             });
         }
 
-        // An unknown id stays a no-op, as it always was.
-        try {
-            await this.services.fs.getUploadSessions(userId, [
-                req.body.uploadId,
-            ]);
-        } catch (error) {
-            if (!(error instanceof HttpError && error.statusCode === 404)) {
-                throw error;
-            }
-            res.json({ ok: true });
-            return;
-        }
-        // Same re-check as complete/sign: a scoped token may only abort an
-        // upload whose target it could write.
-        await this.#assertUploadSessionWriteAccess(req, userId, [
-            req.body.uploadId,
-        ]);
-
         await this.services.fs.abortUrlWrite(userId, req.body.uploadId);
         res.json({ ok: true });
     }
 
     @Post('/signMultipartParts', {
         subdomain: 'api',
-        allowAccessToken: true,
         requireVerified: true,
         requireCredits: true,
         rateLimit: FS_MULTIPART_LIMIT,
@@ -501,22 +463,18 @@ export class FSController extends PuterController {
                 { legacyCode: 'bad_request' },
             );
         }
-        const sessions = await this.#assertUploadSessionWriteAccess(
-            req,
-            userId,
-            [req.body?.uploadId],
-        );
+        await this.#assertUploadSessionWriteAccess(req, userId, [
+            req.body?.uploadId,
+        ]);
         const response = await this.services.fs.signMultipartParts(
             userId,
             req.body,
-            sessions?.[0],
         );
         res.json(this.#withoutStorageInternals(response));
     }
 
     @Post('/write', {
         subdomain: 'api',
-        allowAccessToken: true,
         requireVerified: true,
         requireCredits: true,
         rateLimit: FS_WRITE_LIMIT,
@@ -572,7 +530,6 @@ export class FSController extends PuterController {
 
     @Post('/batchWrite', {
         subdomain: 'api',
-        allowAccessToken: true,
         requireVerified: true,
         requireCredits: true,
         rateLimit: FS_WRITE_LIMIT,
@@ -908,13 +865,17 @@ export class FSController extends PuterController {
                     preparedBatch,
                     uploadedItems,
                 );
-            const updatedResponses = await this.#applyWriteResponsesSideEffects(
-                userId,
-                writeResponses.map((writeResponse, index) => ({
-                    response: writeResponse,
-                    guiMetadata: preparedBatch?.items[index]?.guiMetadata,
-                })),
+            const updatedResponses = await runWithConcurrencyLimit(
+                writeResponses,
                 32,
+                async (writeResponse, index) => {
+                    const preparedItem = preparedBatch?.items[index];
+                    return this.#applyWriteResponseSideEffects(
+                        userId,
+                        writeResponse,
+                        preparedItem?.guiMetadata,
+                    );
+                },
             );
             res.json(
                 updatedResponses.map((r) => this.#withRequiredClientFsEntry(r)),
@@ -1027,13 +988,17 @@ export class FSController extends PuterController {
                 preparedBatch,
                 uploadedItems,
             );
-        const updatedResponses = await this.#applyWriteResponsesSideEffects(
-            userId,
-            writeResponses.map((writeResponse, index) => ({
-                response: writeResponse,
-                guiMetadata: filteredRequests[index]?.guiMetadata,
-            })),
+        const updatedResponses = await runWithConcurrencyLimit(
+            writeResponses,
             32,
+            async (writeResponse, index) => {
+                const requestBody = filteredRequests[index];
+                return this.#applyWriteResponseSideEffects(
+                    userId,
+                    writeResponse,
+                    requestBody?.guiMetadata,
+                );
+            },
         );
         res.json(
             updatedResponses.map((r) => this.#withRequiredClientFsEntry(r)),
@@ -1056,9 +1021,7 @@ export class FSController extends PuterController {
         const actor = this.#requireActor(req);
         const body = this.#toObjectRecord(req.body);
         const entry = await this.#resolveEntryForRequest(body);
-        // One descriptor for both checks, so the chain is read at most once.
-        const descriptor = this.services.acl.fsDescriptor(entry.path);
-        await this.#assertAccess(actor, descriptor, 'see');
+        await this.#assertAccess(actor, entry.path, 'see');
 
         const wantsSize = this.#toBoolean(body.return_size);
         const wantsShares = this.#toBoolean(body.return_shares);
@@ -1076,7 +1039,7 @@ export class FSController extends PuterController {
         const mayReadSize =
             entry.isDir &&
             wantsSize &&
-            (await this.#canAccess(actor, descriptor, 'list'));
+            (await this.#canAccess(actor, entry.path, 'list'));
 
         const [subtreeSize, suggestedApps, shareFlags, shares, parentUid] =
             await Promise.all([
@@ -1335,7 +1298,6 @@ export class FSController extends PuterController {
                 parent.path,
                 {
                     limit,
-                    offset,
                     cursor:
                         typeof body.cursor === 'string'
                             ? body.cursor
@@ -1497,7 +1459,10 @@ export class FSController extends PuterController {
             );
         }
 
-        const range = resolveReadRange(req.headers.range, query);
+        const range =
+            typeof req.headers.range === 'string'
+                ? req.headers.range
+                : undefined;
         const download = await this.services.fs.readContent(entry, {
             range,
         });
@@ -1523,14 +1488,19 @@ export class FSController extends PuterController {
         );
         res.status(range ? 206 : 200);
 
-        await pipeToResponse(download.body, res);
+        try {
+            await pipeline(download.body, res);
+        } catch {
+            // Client disconnect or upstream stream error — pipeline already
+            // tore down both ends. Response is partially sent; nothing to do.
+            return;
+        }
     }
 
     // -- Mutation routes ------------------------------------------------
 
     @Post('/mkdir', {
         subdomain: 'api',
-        allowAccessToken: true,
         requireVerified: true,
         rateLimit: FS_MUTATE_LIMIT,
     })
@@ -1576,7 +1546,6 @@ export class FSController extends PuterController {
 
     @Post('/touch', {
         subdomain: 'api',
-        allowAccessToken: true,
         requireVerified: true,
         rateLimit: FS_MUTATE_LIMIT,
     })
@@ -1617,7 +1586,6 @@ export class FSController extends PuterController {
 
     @Post('/rename', {
         subdomain: 'api',
-        allowAccessToken: true,
         requireVerified: true,
         rateLimit: FS_MUTATE_LIMIT,
     })
@@ -1641,7 +1609,6 @@ export class FSController extends PuterController {
 
     @Post('/delete', {
         subdomain: 'api',
-        allowAccessToken: true,
         requireVerified: true,
         rateLimit: FS_MUTATE_LIMIT,
     })
@@ -1668,7 +1635,6 @@ export class FSController extends PuterController {
 
     @Post('/move', {
         subdomain: 'api',
-        allowAccessToken: true,
         requireVerified: true,
         rateLimit: FS_MUTATE_LIMIT,
     })
@@ -1722,7 +1688,6 @@ export class FSController extends PuterController {
 
     @Post('/copy', {
         subdomain: 'api',
-        allowAccessToken: true,
         requireVerified: true,
         requireCredits: true,
         rateLimit: FS_MUTATE_LIMIT,
@@ -1774,7 +1739,6 @@ export class FSController extends PuterController {
 
     @Post('/mkshortcut', {
         subdomain: 'api',
-        allowAccessToken: true,
         requireVerified: true,
         rateLimit: FS_MUTATE_LIMIT,
     })
@@ -1826,6 +1790,7 @@ export class FSController extends PuterController {
     }
 
     async #resolveEntryForRequest(source: Record<string, unknown>) {
+        const mod = await import('../../services/fs/resolveNode.js');
         const username = Context.get('actor')?.user?.username;
         const rawPath =
             typeof source.path === 'string' ? source.path : undefined;
@@ -1845,8 +1810,15 @@ export class FSController extends PuterController {
                     ? source.id
                     : undefined,
         };
-        // The resolved path is the owner's real one, so a miss must not echo it.
-        return resolveOrNotFound(this.stores.fsEntry, ref);
+        const entry = await mod.resolveNode(this.stores.fsEntry, ref, {
+            required: true,
+        });
+        if (!entry) {
+            throw new HttpError(404, 'Entry not found', {
+                legacyCode: 'not_found',
+            });
+        }
+        return entry;
     }
 
     async #assertCanDedupeCreate(actor: Actor, targetPath: string) {
@@ -1863,20 +1835,16 @@ export class FSController extends PuterController {
     /** As `#assertAccess`, but for what to include rather than what to serve. */
     async #canAccess(
         actor: Actor,
-        path: string | ResourceDescriptor,
+        path: string,
         mode: 'see' | 'list' | 'read' | 'write',
     ): Promise<boolean> {
         const acl = this.services.acl;
-        return acl.check(
-            actor,
-            typeof path === 'string' ? acl.fsDescriptor(path) : path,
-            mode,
-        );
+        return acl.check(actor, acl.fsDescriptor(path), mode);
     }
 
     async #assertAccess(
         actor: Actor,
-        path: string | ResourceDescriptor,
+        path: string,
         mode: 'see' | 'list' | 'read' | 'write',
     ) {
         await this.services.acl.assertFsAccess(
@@ -2272,8 +2240,7 @@ export class FSController extends PuterController {
         // the ActorUser type. Access via the escape hatch until a proper
         // storage-quota mechanism is in place.
         const actorUser = req.actor?.user as
-            | Record<string, unknown>
-            | undefined;
+            Record<string, unknown> | undefined;
 
         const candidates = [
             this.#toStorageCapacityCandidate(actorUser?.free_storage),
@@ -2511,24 +2478,19 @@ export class FSController extends PuterController {
      * `startWrite` checked has to be re-checked against the session's recorded
      * target every time the caller signs more parts or completes the upload —
      * otherwise a revoked sharee still lands bytes in the owner's tree.
-     *
-     * Returns the sessions it checked, in request order, for signing to reuse;
-     * undefined when any id was left to the service to read and reject.
-     * Completion reads its own, so a session settled during this check still
-     * gets a 409.
      */
     async #assertUploadSessionWriteAccess(
         req: Request,
         userId: number,
         uploadIds: Array<string | undefined>,
-    ): Promise<PendingUploadSession[] | undefined> {
+    ): Promise<void> {
         // A malformed id is left to the service, which owns that error shape.
         const knownUploadIds = uploadIds.filter(
             (uploadId): uploadId is string =>
                 typeof uploadId === 'string' && uploadId.length > 0,
         );
         if (knownUploadIds.length === 0) {
-            return undefined;
+            return;
         }
         const sessions = await this.services.fs.getUploadSessions(
             userId,
@@ -2543,9 +2505,6 @@ export class FSController extends PuterController {
             })),
             { pathAlreadyNormalized: true },
         );
-        return knownUploadIds.length === uploadIds.length
-            ? sessions
-            : undefined;
     }
 
     #toEventGuiMetadata(
@@ -2660,16 +2619,16 @@ export class FSController extends PuterController {
         return this.#estimateDataUrlSize(thumbnail) > MAX_THUMBNAIL_BYTES;
     }
 
-    /** The thumbnail a write should store on `fsEntry`, or null for none. */
-    async #thumbnailToStore(
+    async #applyThumbnailAfterWrite(
+        userId: number,
         fsEntry: FSEntry,
         requestedThumbnail: string | null | undefined,
-    ): Promise<string | null> {
+    ): Promise<FSEntry> {
         if (!requestedThumbnail || this.#isAppDataPath(fsEntry.path)) {
-            return null;
+            return fsEntry;
         }
         if (this.#isOversizedThumbnailDataUrl(requestedThumbnail)) {
-            return null;
+            return fsEntry;
         }
 
         const thumbnailPayload = {
@@ -2690,10 +2649,15 @@ export class FSController extends PuterController {
                 ? thumbnailPayload.url
                 : null;
 
-        if (finalThumbnail === fsEntry.thumbnail) {
-            return null;
+        if (finalThumbnail === fsEntry.thumbnail || finalThumbnail === null) {
+            return fsEntry;
         }
-        return finalThumbnail;
+
+        return this.services.fs.updateEntryThumbnail(
+            userId,
+            fsEntry.uuid,
+            finalThumbnail,
+        );
     }
 
     #toThumbnailPrepareItem(
@@ -2923,130 +2887,36 @@ export class FSController extends PuterController {
         response: WriteResponse,
         guiMetadata: WriteGuiMetadata | undefined,
     ): Promise<WriteResponse> {
-        const [result] = await this.#applyWriteResponsesSideEffects(
-            userId,
-            [{ response, guiMetadata }],
-            1,
-        );
-        return result ?? response;
-    }
+        let fsEntry = response.fsEntry;
 
-    /**
-     * Each write's hash event, thumbnail and GUI event. Thumbnails are vetted
-     * `concurrency` writes at a time, then the caller's own go to the store in
-     * one update; a write into someone else's folder is updated alone.
-     */
-    async #applyWriteResponsesSideEffects(
-        userId: number,
-        writes: Array<{
-            response: WriteResponse;
-            guiMetadata: WriteGuiMetadata | undefined;
-        }>,
-        concurrency: number,
-    ): Promise<WriteResponse[]> {
-        type Write = (typeof writes)[number];
-        const results: WriteResponse[] = new Array(writes.length);
-        const finish = async (
-            index: number,
-            { response, guiMetadata }: Write,
-            fsEntry: FSEntry,
-            hashEventPromise: Promise<void>,
-        ) => {
-            await this.#runNonCritical(async () => {
-                await this.#emitGuiWriteEvent(
-                    response.wasOverwrite
-                        ? 'outer.gui.item.updated'
-                        : 'outer.gui.item.added',
-                    fsEntry,
-                    guiMetadata,
-                );
-            }, 'emitGuiWriteEvent');
-            await hashEventPromise;
-            results[index] = { ...response, fsEntry };
-        };
+        const hashEventPromise = this.#runNonCritical(async () => {
+            await this.#emitWriteHashEvent(
+                response.contentHashSha256,
+                fsEntry.uuid,
+            );
+        }, 'emitWriteHashEvent');
 
-        const toStore: Array<{
-            index: number;
-            write: Write;
-            thumbnail: string;
-            hashEventPromise: Promise<void>;
-        }> = [];
-        await runWithConcurrencyLimit(
-            writes,
-            concurrency,
-            async (write, index) => {
-                const { fsEntry, contentHashSha256, requestedThumbnail } =
-                    write.response;
-                const hashEventPromise = this.#runNonCritical(async () => {
-                    await this.#emitWriteHashEvent(
-                        contentHashSha256,
-                        fsEntry.uuid,
-                    );
-                }, 'emitWriteHashEvent');
-                let thumbnail = null as string | null;
-                await this.#runNonCritical(async () => {
-                    thumbnail = await this.#thumbnailToStore(
-                        fsEntry,
-                        requestedThumbnail,
-                    );
-                }, 'applyThumbnailAfterWrite');
-                if (thumbnail === null) {
-                    await finish(index, write, fsEntry, hashEventPromise);
-                    return;
-                }
-                toStore.push({ index, write, thumbnail, hashEventPromise });
-            },
-        );
-        if (toStore.length === 0) return results;
+        await this.#runNonCritical(async () => {
+            fsEntry = await this.#applyThumbnailAfterWrite(
+                userId,
+                response.fsEntry,
+                response.requestedThumbnail,
+            );
+        }, 'applyThumbnailAfterWrite');
 
-        // The update is scoped to the caller's rows, so batching anyone else's
-        // would only fail the batch.
-        const own = toStore.filter(
-            ({ write }) => write.response.fsEntry.userId === userId,
-        );
-        const groups = [
-            own,
-            ...toStore
-                .filter(({ write }) => write.response.fsEntry.userId !== userId)
-                .map((item) => [item]),
-        ].filter((group) => group.length > 0);
-        const stored = new Map<number, PromiseSettledResult<FSEntry>>();
-        await runWithConcurrencyLimit(groups, concurrency, async (group) => {
-            let outcomes: PromiseSettledResult<FSEntry>[];
-            try {
-                outcomes = await this.services.fs.updateEntryThumbnails(
-                    userId,
-                    group.map(({ write, thumbnail }) => ({
-                        uuid: write.response.fsEntry.uuid,
-                        thumbnail,
-                    })),
-                );
-            } catch (error) {
-                outcomes = group.map(() => ({
-                    status: 'rejected',
-                    reason: error,
-                }));
-            }
-            group.forEach(({ index }, i) => {
-                const outcome = outcomes[i];
-                if (outcome) stored.set(index, outcome);
-            });
-        });
+        await this.#runNonCritical(async () => {
+            await this.#emitGuiWriteEvent(
+                response.wasOverwrite
+                    ? 'outer.gui.item.updated'
+                    : 'outer.gui.item.added',
+                fsEntry,
+                guiMetadata,
+            );
+        }, 'emitGuiWriteEvent');
 
-        await runWithConcurrencyLimit(
-            toStore,
-            concurrency,
-            async ({ index, write, hashEventPromise }) => {
-                let fsEntry = write.response.fsEntry;
-                await this.#runNonCritical(async () => {
-                    const outcome = stored.get(index);
-                    if (outcome?.status === 'rejected') throw outcome.reason;
-                    if (outcome) fsEntry = outcome.value;
-                }, 'applyThumbnailAfterWrite');
-                await finish(index, write, fsEntry, hashEventPromise);
-            },
-        );
-        return results;
+        await hashEventPromise;
+
+        return { ...response, fsEntry };
     }
 
     #shouldIgnoreUploadPath(targetPath: string): boolean {