fix(dashboard): slide a drag back when a read-only folder refuses it

A drop a read-only shared folder refused left the drag chip to vanish
where it was let go, as if something had happened. It now slides back
to where the drag began, as any drop that doesn't land does.

.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: '24'
+                  node-version: '26'
                   cache: 'npm'
 
             - name: Install dependencies

.github/workflows/backend-tests.yaml

@@ -1,17 +1,21 @@
 name: Backend Tests
 
-# Always triggers so it can be a required PR check; the `changes` job below
+# Always triggers on PRs so it can be a required check; the `changes` job below
 # decides whether backend/extension paths actually changed (test-only changes
-# match the same globs, since tests are co-located with the code), and every
-# other job is skipped — not absent — when they didn't, which still satisfies
-# a required check. puter.js SDK changes are covered by puterjs-tests.yaml.
+# match the same globs, since tests are co-located with the code), and `test`
+# still reports success when they didn't. Pushes to main produce the coverage
+# PRs compare against. puter.js SDK changes are covered by puterjs-tests.yaml.
 on:
   pull_request:
     types: [opened, synchronize, reopened]
+  push:
+    branches: [main]
 
 permissions:
   contents: read
   pull-requests: write
+  # Reads main's coverage artifact for the PR comparison.
+  actions: read
 
 jobs:
   changes:
@@ -42,12 +46,9 @@ jobs:
   # The consuming repo runs an equivalent gate, but only once someone bumps the
   # submodule pointer — too late to keep the error off this repo's default
   # branch. Hence a gate here, on this repo's own pull requests.
-  #
-  # Its own job rather than a step in `test`: that one runs a base/PR matrix for
-  # coverage comparison, and the check only needs the PR ref, once.
   typecheck:
     needs: changes
-    if: needs.changes.outputs.backend == 'true'
+    if: github.event_name == 'pull_request' && needs.changes.outputs.backend == 'true'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -56,7 +57,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v7
         with:
-          node-version: '24'
+          node-version: '26'
           cache: 'npm'
 
       - name: Install dependencies
@@ -65,85 +66,146 @@ jobs:
       - name: Type check (new errors only)
         run: npm run typecheck
 
-  # `needs.changes` gates the steps below, not this job, on purpose: a
-  # job-level `if` on a matrix job skips the whole job as one unexpanded
-  # check ("test (${{ matrix.artifact }})", literally, since there's no
-  # matrix context to fill it in) instead of the two real per-artifact
-  # checks a required rule pins to ("test (base)" / "test (pr)") — so the
-  # required check never gets reported and the PR blocks forever. Letting
-  # the matrix always expand keeps the check names stable either way.
-  test:
+  # The suite is CPU-bound, so it's split across runners. Each shard writes a
+  # blob report (results plus coverage) that the `coverage` job merges.
+  test-shard:
     needs: changes
-    # Overrides the default matrix naming, which would otherwise bake the
-    # base/head branch name (matrix.ref) into the check name — making it a
-    # different string on every PR and impossible to pin as a required check.
-    name: test (${{ matrix.artifact }})
+    if: needs.changes.outputs.backend == 'true'
+    name: test shard ${{ matrix.shard }}/${{ strategy.job-total }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - ref: ${{ github.base_ref }}
-            artifact: base
-          - ref: ${{ github.head_ref }}
-            artifact: pr
+        shard: [1, 2, 3, 4]
 
     steps:
-      - name: Checkout ${{ matrix.ref }}
-        if: needs.changes.outputs.backend == 'true'
+      - name: Checkout
         uses: actions/checkout@v7
         with:
-          ref: ${{ matrix.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+          repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
 
       - name: Set up Node.js
-        if: needs.changes.outputs.backend == 'true'
         uses: actions/setup-node@v7
         with:
-          node-version: '24'
+          node-version: '26'
           cache: 'npm'
 
       - name: Install dependencies
-        if: needs.changes.outputs.backend == 'true'
         run: npm ci
 
       - name: Run backend tests with coverage
-        if: needs.changes.outputs.backend == 'true'
-        run: npm run test:backend -- --coverage
+        run: >-
+          npm run test:backend --
+          --coverage
+          --shard=${{ matrix.shard }}/${{ strategy.job-total }}
+          --reporter=default
+          --reporter=blob
+        env:
+          CI: 'true'
+
+      - name: Upload blob report
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: backend-blob-${{ matrix.shard }}
+          path: .vitest-reports/
+          include-hidden-files: true
+          retention-days: 1
+
+  # Required check, so its PR name is pinned. A skipped job would satisfy it,
+  # so this always runs and fails on any shard that didn't pass.
+  test:
+    needs: [changes, test-shard]
+    if: ${{ !cancelled() }}
+    name: test (${{ github.event_name == 'push' && 'main' || 'pr' }})
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check shard results
+        env:
+          CHANGES_RESULT: ${{ needs.changes.result }}
+          BACKEND_CHANGED: ${{ needs.changes.outputs.backend }}
+          SHARDS_RESULT: ${{ needs.test-shard.result }}
+        run: |
+          if [ "$CHANGES_RESULT" != "success" ]; then
+            echo "changes job: $CHANGES_RESULT"
+            exit 1
+          fi
+          if [ "$BACKEND_CHANGED" != "true" ]; then
+            echo "No backend changes."
+            exit 0
+          fi
+          if [ "$SHARDS_RESULT" != "success" ]; then
+            echo "test shards: $SHARDS_RESULT"
+            exit 1
+          fi
+
+  coverage:
+    needs: [changes, test-shard]
+    if: ${{ !cancelled() && needs.test-shard.result == 'success' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v7
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+          repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v7
+        with:
+          node-version: '26'
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Download blob reports
+        uses: actions/download-artifact@v8
+        with:
+          pattern: backend-blob-*
+          path: .vitest-reports
+          merge-multiple: true
+
+      - name: Merge shard coverage
+        run: npx vitest run --config src/backend/vitest.config.ts --merge-reports --coverage
         env:
           CI: 'true'
 
       - name: Upload coverage artifact
-        if: needs.changes.outputs.backend == 'true' && !cancelled()
         uses: actions/upload-artifact@v7
         with:
-          name: backend-coverage-${{ matrix.artifact }}
+          name: backend-coverage-${{ github.event_name == 'push' && 'main' || 'pr' }}
           path: src/backend/coverage/
-          retention-days: 14
+          retention-days: ${{ github.event_name == 'push' && 30 || 14 }}
 
-  report-coverage:
-    needs: [changes, test]
-    if: always() && needs.changes.outputs.backend == 'true'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v7
-
-      - name: Download PR coverage
-        uses: actions/download-artifact@v8
-        with:
-          name: backend-coverage-pr
-          path: src/backend/coverage
-
-      - name: Download base coverage
-        uses: actions/download-artifact@v8
-        with:
-          name: backend-coverage-base
-          path: coverage-base
+      # Latest main coverage from this repo's own runs; a fork can't publish
+      # under this repository id.
+      - name: Download main coverage
+        id: base
+        if: github.event_name == 'pull_request'
+        env:
+          GH_TOKEN: ${{ github.token }}
+          REPO: ${{ github.repository }}
+        run: |
+          id=$(gh api "repos/$REPO/actions/artifacts?name=backend-coverage-main&per_page=20" --jq '
+            [.artifacts[]
+              | select(.expired | not)
+              | select(.workflow_run.head_branch == "main")
+              | select(.workflow_run.head_repository_id == .workflow_run.repository_id)
+            ][0].id // empty')
+          if [ -z "$id" ]; then
+            echo "No main coverage artifact; reporting without a comparison."
+            exit 0
+          fi
+          gh api "repos/$REPO/actions/artifacts/$id/zip" > coverage-base.zip
+          unzip -q coverage-base.zip -d coverage-base
+          echo "found=true" >> "$GITHUB_OUTPUT"
 
       - name: Report coverage on PR
+        if: github.event_name == 'pull_request'
         uses: davelosert/vitest-coverage-report-action@v2
         with:
           json-summary-path: src/backend/coverage/coverage-summary.json
           json-final-path: src/backend/coverage/coverage-final.json
-          json-summary-compare-path: coverage-base/coverage-summary.json
+          json-summary-compare-path: ${{ steps.base.outputs.found == 'true' && 'coverage-base/coverage-summary.json' || '' }}

.github/workflows/docs-build.yml

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

.github/workflows/puterjs-tests.yaml

@@ -57,7 +57,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v7
         with:
-          node-version: '24'
+          node-version: '26'
           cache: 'npm'
 
       - name: Install dependencies
@@ -78,7 +78,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v7
         with:
-          node-version: '24'
+          node-version: '26'
           cache: 'npm'
 
       - name: Install dependencies
@@ -135,7 +135,7 @@ jobs:
         if: needs.changes.outputs.puterjs == 'true'
         uses: actions/setup-node@v7
         with:
-          node-version: '24'
+          node-version: '26'
           cache: 'npm'
 
       - name: Install dependencies

.gitignore

@@ -66,6 +66,7 @@ AGENTS.md
 
 
 coverage/
+.vitest-reports/
 *.log
 undefined
 servers.json

AGENTS.md

@@ -1,18 +1,18 @@
 # AGENTS.md
 
-Guidance for AI coding agents working in this repository. Read this before making changes. FOLLOW GUIDANCE AS CLOSELY AS POSSIBLE. If you think the guidance is wrong, raise an issue or flag a maintainer — don't just do what you think is right. This is the source of truth for how we write code, tests, and docs in this repo.
+Guidance for AI coding agents working in this repository, and the source of truth for how we write code, tests, and docs here. Read it before making changes. FOLLOW GUIDANCE AS CLOSELY AS POSSIBLE. If you think a rule is wrong, raise an issue or flag a maintainer instead of doing what you think is right.
 
 ## Documentation Index
 
 Use these as the source of truth before exploring further:
 
 - [README.md](README.md) — project overview and quickstart.
-- [doc/architecture.md](doc/architecture.md) — backend layered stack (controllers → drivers → services → stores → clients), `PuterServer` wiring, `Context` (ALS), and extensions.
+- [doc/architecture.md](doc/architecture.md) — backend layered stack (controllers → drivers → services → stores → clients), `PuterServer` wiring, `Context` (ALS), actors, and extensions.
 - [doc/contributing-apis.md](doc/contributing-apis.md) — adding and maintaining public APIs end to end (backend surface → puter.js → types → docs → tests). Follow it for any API work.
 - [doc/pagination.md](doc/pagination.md) — the one pagination convention for list APIs (limit/cursor/offset/includeTotal, envelope shape, cursor semantics).
 - [doc/alarms.md](doc/alarms.md) — raising alarms and picking a severity (what pages, what only gets recorded), plus the config that routes them.
 - [doc/self-hosting.md](doc/self-hosting.md) — running Puter outside hosted infra.
-- [CONTRIBUTING.md](CONTRIBUTING.md) — testing, security, AI-assisted code, PR conventions, Boy Scout Rule.
+- [CONTRIBUTING.md](CONTRIBUTING.md) — contributor entry point and PR conventions.
 - [SECURITY.md](SECURITY.md) — how to report vulnerabilities (do not file them publicly).
 - [BUG-BOUNTY.md](BUG-BOUNTY.md) — bounty program scope.
 - [TRADEMARK.md](TRADEMARK.md) — trademark usage.
@@ -26,16 +26,16 @@ These apply everywhere — backend, puter.js, and GUI.
 ### Language & files
 
 - Write ES modules, not CommonJS — we transpile and build as needed.
-- TypeScript preferred for new files in the backend and extensions; convert existing JS there opportunistically when you're already touching a file. The GUI and puter.js are plain JavaScript — don't introduce TypeScript files in them. In puter.js, type with JSDoc instead (see the puter.js section for what must be typed).
-- **Reuse before adding.** Search for an existing type, helper, or implementation and extend it; only add a new one when nothing suitable exists.
-- Make new types findable: descriptive `PascalCase` names, exported from the obvious entry point. A type used from many places belongs in the owning module's `types.ts` (e.g. [src/backend/controllers/types.ts](src/backend/controllers/types.ts)) rather than bloating a logic file; a type with a single consumer can stay next to it.
-- Naming: `camelCase` for variables/functions, `PascalCase` for classes and files containing a class (`AuthService.ts`). **Prefer `camelCase` for all new code** — new local variables, parameters, functions, and internal object properties. `snake_case` is reserved for identifiers that are part of an external contract: wire/JSON keys sent to or received from the backend, stable API error codes, public option names that already ship as `snake_case`, and established `puter_*` namespaced fields. Don't rename those (it's a breaking change), but don't introduce new `snake_case` alongside them either — a camelCase local can carry a value into a `snake_case` wire key (`{ operation_id: operationId }`).
+- TypeScript preferred for new files in the backend and extensions; convert existing JS there opportunistically when you're already touching a file. The GUI and puter.js are plain JavaScript — don't introduce TypeScript files in them.
+- In plain-JS files, typing with JSDoc (`@type`/`@param`/`@returns`, `@typedef` for shared shapes, using the TypeScript type system) is encouraged. API types must not be `unknown` or untyped `...args`: spell out the real parameter and return shapes, unless the value passes through transparently to an upstream layer that owns its type. puter.js has stricter rules ([below](#types)).
+- Make new types findable: descriptive `PascalCase` names, exported from the obvious entry point. A type used from many places goes in the owning module's `types.ts` (e.g. [src/backend/controllers/types.ts](src/backend/controllers/types.ts)); a type with a single consumer can stay next to it.
+- Naming: `camelCase` for variables and functions, `PascalCase` for classes and files containing a class (`AuthService.ts`). **Prefer `camelCase` for all new code**, including parameters and internal object properties. `snake_case` is reserved for external contracts that already use it: wire/JSON keys, stable API error codes, public option names that already ship as `snake_case`, and established `puter_*` namespaced fields. Don't rename those (it's a breaking change), and don't add new `snake_case` beside them; a camelCase local can carry a value into a wire key (`{ operation_id: operationId }`).
 
 ### Comments
 
-Keep comments light; prefer self-documenting code. Comment only when the _why_ is non-obvious or a usage detail would trip the next reader. Use `//` for single lines and `/** ... */` JSDoc when it genuinely needs more — if a comment runs long, it's probably too long. Don't restate the code and don't reference the current task, PR, or version — those rot. **No ticket references** (`PUT-1234`, `// fix for FOO-99`) in code, comments, or test names; describe the why in domain terms, not project-management terms. Use plain ASCII `-` in comment section dividers (`// -- Section --`), never box-drawing characters.
+Prefer self-documenting code. Comment only when the _why_ is non-obvious or a usage detail would trip the next reader. **A comment is a sentence or two**: one or two lines of `//`, a few of `/** ... */` JSDoc. State the constraint and stop. Don't restate the code, narrate history ("used to swallow the failure, which meant…"), argue the design, or explain parameters the signature already shows. Reasoning that needs paragraphs belongs in a design doc.
 
-**Be concise — a comment is a sentence or two, not a paragraph block.** One or two lines for `//`, a few for JSDoc. Don't narrate the history ("used to swallow the failure, which meant…"), don't argue the design at length, and don't explain each parameter when the signature already does. State the constraint and stop. If the reasoning genuinely needs paragraphs, it belongs in a design doc, not above the function.
+Don't reference the current task, PR, or version; those rot. **No ticket references** (`PUT-1234`, `// fix for FOO-99`) in code, comments, or test names: describe the why in domain terms. Section dividers use plain ASCII (`// -- Section --`), never box-drawing characters.
 
 ### Security & privacy
 
@@ -49,77 +49,57 @@ When in doubt, return less. Auth-, permission-, or data-export-related changes d
 
 Commit messages and PR descriptions never credit anyone or mention a bug report. For security fixes, state what the change does mechanically ("scoped tokens do xyz now"), not the vulnerability or how it could be abused.
 
+### Reuse and abstraction
+
+- **Search before you build.** Before writing a type, helper, cache/TTL map, retry, lock, pagination, validator, serializer, error mapper, host/email normalizer, or provider adapter, grep `src/backend/util/`, the owning layer, and `extensions/` for one that exists, and extend it instead of adding a parallel copy. If you find two copies, consolidate them or flag it. Before opening the PR, check the diff for new helpers that duplicate existing ones.
+- **One path per operation.** Single-item variants call the batch version. Legacy and v2 endpoints share one service method. A second entry point (OIDC, WebDAV, admin, cron) calls the same service as the first instead of re-implementing it.
+- **No abstraction without a second caller.** No base class, interface, factory, registry, decorator, or option bag with one implementation. No wrappers that only forward, no interface methods nobody calls, no methods only tests call.
+- **Variants are data.** Providers or models that differ only in constants (base URL, prices, key names) are entries in a table read by one implementation, not one file each.
+
+### Hot paths
+
+- No per-row queries or awaits in loops: use the store's batch method (add one if missing) or [src/backend/util/concurrency.ts](src/backend/util/concurrency.ts).
+- Bound everything: queries get `LIMIT`/pagination, in-memory maps get eviction, outbound calls get a timeout and a size cap.
+- Build clients, catalogs, and config-derived lookups once, not per request.
+- Listeners on fleet-wide events (`fs.write.file`, route lifecycle) return before any I/O for requests they don't concern.
+
 ### Working rules of thumb
 
 - **Run it, don't just compile it.** "It type-checks" is not "it works." Exercise the code path end-to-end at least once.
 - **Read the neighbors before writing.** Match the shape of similar things already in the tree. If you think the existing pattern is wrong, raise it — don't quietly diverge.
 - **Test new behavior.** Every new function, endpoint, driver method, or logic branch gets a test; every bug fix gets a regression test that fails before the fix. If something is genuinely hard to test, skip it but say so in the PR.
-- **Boy Scout Rule, proportional to the change.** Fix the obvious typo or dead import in files you're already touching; don't ride a refactor along with a bug fix.
-- **Understand what you commit.** AI assistance is fine; shipping code you couldn't defend in review is not.
+- **Boy Scout Rule, proportional to the change.** In files you're already touching, fix the typo, the dead import, the missing test, the bit you had to read twice. Don't ride a refactor along with a bug fix.
+- **Understand what you commit.** AI assistance is fine; shipping code you couldn't have written, debugged, or defended in review is not.
 - **A limit change is not done until the docs change with it.** Every rate limit, concurrency cap, quota, and allowance in the code is published in [src/docs/src/rate-limits-and-quotas.md](src/docs/src/rate-limits-and-quotas.md) — an undisclosed limit is one developers discover as a service failure. If a PR moves any of these numbers, the same PR updates that page. The numbers live in `src/backend/controllers/fs/limits.ts` (filesystem), `src/backend/drivers/util/aiLimits.ts` (all AI drivers), per-driver `rateLimit`/`concurrent` configs, and `src/backend/data/subPolicies/` (free-tier allowances).
 
 ---
 
-## Local development configuration
+## Local development
 
-To test a local Docker build, create `docker-compose.override.yml` in the repository
-root (or merge into the existing file):
+To test a local Docker build, use the gitignored `docker-compose.override.yml` described in [Self-Hosting → Building from source](doc/self-hosting.md#building-from-source-instead-of-pulling). Keep local build settings there, not in `docker-compose.yml`.
 
-```yaml
-services:
-    puter:
-        pull_policy: never
-        build:
-            context: .
-```
-
-Compose merges it automatically. Run `docker compose up -d --build` to build and
-start the stack, and repeat after source changes. Keep local build settings in
-this gitignored override instead of editing `docker-compose.yml`, so they stay
-out of pull requests and do not conflict when pulling updates. See
-[Self-Hosting Puter](doc/self-hosting.md#building-from-source-instead-of-pulling)
-for the required runtime configuration.
-
-For local API testing, agents may decide whether to set `"unlimitedMetering": true`
-when budget checks block unrelated tests; no additional approval is needed.
-Merge it into the ignored `config.json` for `npm start` or
-`puter/config/config.json` for Docker, then restart Puter. It applies to all
-accounts on that local instance, including guests, and usage is still recorded.
-Keep normal settings when testing budget or subscription enforcement, and leave
-shared defaults unchanged.
+When budget checks block unrelated local API tests, you may set `"unlimitedMetering": true` without further approval. Merge it into the gitignored `config.json` (`npm start`) or `puter/config/config.json` (Docker) and restart Puter. It covers every account on that instance, guests included, and usage is still recorded. Keep normal settings when testing budget or subscription enforcement, and leave shared defaults unchanged.
 
 ---
 
 ## Backend
 
-A layered stack with explicit dependency injection: each layer depends only on the layers beneath it, receives them through its constructor, and `PuterServer` ([src/backend/server.ts](src/backend/server.ts)) wires the whole thing together. [doc/architecture.md](doc/architecture.md) is the full reference.
+Controllers → drivers (optional) → services → stores → clients, all configured from `IConfig`. Each layer depends only on the layers beneath it and receives them through its constructor; `PuterServer` ([src/backend/server.ts](src/backend/server.ts)) wires them. [doc/architecture.md](doc/architecture.md) is the full reference.
 
-| Layer (top → bottom) | Lives in                                             | Responsibility                                                                                                                                         |
-| -------------------- | ---------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| **Controllers**      | [src/backend/controllers/](src/backend/controllers/) | Route handlers: parse/validate input, per-route gates via `RouteOptions` (auth, subdomain, rate limit, body parsers), call services, format responses. |
-| **Drivers**          | [src/backend/drivers/](src/backend/drivers/)         | Optional RPC-style handlers on `/drivers/*`; thin shells that validate inputs and call services/stores.                                                |
-| **Services**         | [src/backend/services/](src/backend/services/)       | Business logic. Assume the caller is already authenticated/authorized.                                                                                 |
-| **Stores**           | [src/backend/stores/](src/backend/stores/)           | Persistence; wraps clients in the domain shapes services consume.                                                                                      |
-| **Clients**          | [src/backend/clients/](src/backend/clients/)         | Adapters for external/internal services (sql, redis, s3, email, event bus). Protocols, not domain concepts.                                            |
-| **Config**           | `config.*.json` → `IConfig`                          | Flat, typed config object every layer receives at construction.                                                                                        |
+A public API can be a controller or a driver. Prefer a controller when you need fine-grained control over routes and gates; [doc/contributing-apis.md](doc/contributing-apis.md#controller-or-driver) has the decision guide.
 
-A public API can be exposed through either a controller or a driver — both are supported; prefer a controller when you need fine-grained control over routes and gates. [doc/contributing-apis.md](doc/contributing-apis.md) has the decision guide with links to the decorators and middleware for each.
+Layer rules:
 
-Cross-layer rules:
-
-- **Don't reach across layers.** Controllers don't poke clients; services don't register routes. If you want to, the abstraction is wrong — fix the abstraction.
+- **Don't reach across layers.** Controllers don't poke clients; services don't register routes; lower layers never import from controllers. If you want to, the abstraction is wrong; fix the abstraction.
+- **Gates run at the edge.** Controllers and drivers validate input and apply auth gates; services assume the caller is already authenticated and authorized.
 - **Don't call sideways within a layer for code reuse.** Two services needing the same logic means a util/helper, not a service-to-service dependency.
-- **Prefer explicit arguments over `Context` (ALS).** Reach for [Context](src/backend/core/context.ts) only for genuinely request-scoped values that would otherwise thread through many layers — today mostly `actor` and `req`.
+- **A table's store owns every query against it.** Services, controllers, and extensions don't run raw SQL/redis against a table that has a store; add the store method so cache invalidation stays with the write.
+- **Drivers and controllers stay thin.** Domain rules a second entry point needs (signup, app CRUD, worker deploy, AI routing/billing) live in a service, not in the first driver or controller that needed them.
+- **Prefer explicit arguments over [`Context`](src/backend/core/context.ts) (ALS).** Use it only for request-scoped values that would otherwise thread through many layers; today that's mostly `actor` and `req`.
 
 ### Extensions
 
-[extensions/](extensions/) parallels the layered stack and is for **non-crucial parts of the system** — Puter still works with the extension removed. If core needs to call it, it belongs in core, not an extension (see [whoami](extensions/whoami.ts) as the cautionary example). The `extension` global ([src/backend/extensions.ts](src/backend/extensions.ts)) exposes:
-
-- `extension.registerClient/Store/Service/Driver/Controller(name, Class)` for first-class additions.
-- `extension.on(event, handler)` and `extension.get/post/put/delete/patch/use(path, opts?, handler)` for the lightweight common case. `opts` is the same `RouteOptions` controllers use.
-- `extension.import('client' | 'store' | 'service' | 'controller' | 'driver')` — lazy proxy to instantiated core objects. `extension.config` exposes live config.
-
-Follow the same layered structure inside an extension — unless it only needs a few route handlers, in which case the lightweight helpers are enough on their own.
+[extensions/](extensions/) is for **non-crucial parts of the system**: Puter must still work with the extension removed. If core needs to call it, it belongs in core ([whoami](extensions/whoami.ts) is the cautionary example). Inside an extension, follow the same layered structure, unless it only needs a few route handlers, in which case the `extension.get/post/...` helpers are enough on their own. The `extension` API is in [doc/architecture.md](doc/architecture.md#extension-api).
 
 ### Backend tests
 
@@ -132,44 +112,83 @@ Follow the same layered structure inside an extension — unless it only needs a
 
 ## puter.js (the SDK)
 
-[src/puter-js/](src/puter-js/) is the public SDK. It ships live from `https://js.puter.com/v2/` with no version pinning — every existing app picks up changes immediately. Treat every observable behavior (signatures, response fields, error codes) as something a production app depends on.
+[src/puter-js/](src/puter-js/) is the public SDK. It ships live from `https://js.puter.com/v2/` with no version pinning, so every change reaches every existing app at once; see [Rule zero](doc/contributing-apis.md#rule-zero-dont-break-callers).
 
 Layout: SDK modules in [src/puter-js/src/modules/](src/puter-js/src/modules/) (one file or directory per area — `FileSystem/`, `kv/`, `ai/`, …), shared plumbing in [src/puter-js/src/lib/](src/puter-js/src/lib/), generated (gitignored) type declarations in `src/puter-js/types/`, API tests in [src/puter-js/tests/api/](src/puter-js/tests/api/), UI e2e tests in [src/puter-js/tests/e2e/](src/puter-js/tests/e2e/), developer docs in [src/docs/](src/docs/).
 
-Language & typing: puter.js source is plain JavaScript — never TypeScript files — typed via JSDoc. **The JSDoc is the source of truth for the SDK's types.** `src/puter-js/types/` is `tsc --emitDeclarationOnly` output: the SDK build (`npm run build` in `src/puter-js`) generates it, the npm tarball ships it so TypeScript consumers get declarations, and git ignores it — it is never committed and never edited by hand. `npm run check:puterjs:types` generates it in CI and type-checks the result without `skipLibCheck`. The one hand-written declaration file is [src/puter-js/index.d.ts](src/puter-js/index.d.ts), which decides what is public and re-exports the generated names.
+Every SDK change carries all five of these, or the PR is incomplete. [doc/contributing-apis.md](doc/contributing-apis.md) has the steps for each.
 
-Declare a shape where it belongs, and reference it with an `import(...)` type from elsewhere. A shape more than one file needs lives in the module's `types.js`; a shape shared across modules lives in [src/puter-js/src/lib/types.js](src/puter-js/src/lib/types.js); a shape with one consumer can stay next to it:
+1. **Backward compatibility**, unless a maintainer explicitly signs off on a break ([rules](doc/contributing-apis.md#maintaining-an-existing-api)).
+2. **Tests** in the cross-platform API suite, or the Playwright harness for desktop-rendered `puter.ui.*` ([steps](doc/contributing-apis.md#6-tests)).
+3. **Docs** in [src/docs/src/](src/docs/src/) that match the implementation exactly ([steps](doc/contributing-apis.md#5-docs), [writing rules](#developer-docs)).
+4. **Types**, per the rules below.
+5. **Error handling**: `{ message, code }` with stable `snake_case` codes, as in [modules/kv/](src/puter-js/src/modules/kv/) ([steps](doc/contributing-apis.md#3-puterjs)).
+
+### Types
+
+puter.js source is plain JavaScript typed via JSDoc, and **the JSDoc is the source of truth for the SDK's types**. `src/puter-js/types/` is `tsc --emitDeclarationOnly` output: the SDK build (`npm run build` in `src/puter-js`) generates it, the npm tarball ships it, and git ignores it. Never commit or hand-edit it. `npm run check:puterjs:types` generates it and type-checks the result without `skipLibCheck`; run it after any type change. The one hand-written declaration file is [src/puter-js/index.d.ts](src/puter-js/index.d.ts): it decides what is public and re-exports the generated names, so name a new type there if consumers should be able to import it.
+
+- Public (exposed) methods carry JSDoc types for parameters and return value, with one `@overload` block per accepted call form; those overloads _are_ the published signature. Typing private helpers is at your discretion; annotate where it helps the next reader.
+- Tag members `@internal`, not `@private`, to strip them from the generated declarations.
+- Declarations must match runtime behavior exactly. A wrong type is worse than a missing one.
+
+Declare a shape where it belongs and reference it elsewhere with an `import(...)` type. A shape more than one file needs lives in the module's `types.js`; one shared across modules lives in [src/puter-js/src/lib/types.js](src/puter-js/src/lib/types.js); one with a single consumer can stay next to it:
 
 ```js
 /** @typedef {import('./types.js').KVOptConfig} KVOptConfig */
 ```
 
-Use `@typedef {Object}` + `@property` for any shape whose fields need documenting — it is the only JSDoc form that carries a doc comment per field into the generated declaration. Keep the inline object-literal form for small internal shapes with nothing to say about each field, and prefer `unknown` over `*`:
+Use `@typedef {Object}` + `@property` for any shape whose fields need documenting; it's the only JSDoc form that carries a per-field doc comment into the generated declarations. Use the inline form for small internal shapes with nothing to say per field, and prefer `unknown` over `*`:
 
 ```js
 /** @typedef {{ key: string; value: unknown }} KVEntry */
 ```
 
-Public (exposed) methods must carry JSDoc types — parameters and return value — with one `@overload` block per accepted call form, since those overloads _are_ the published signature. Unexposed/private helpers are typed at the contributor's discretion: annotate where it helps the next reader, and either way keep them clean. Members tagged `@internal` are stripped from the generated declarations, so use that tag rather than `@private` to keep something off the public surface.
+---
 
-Typing in JS files is encouraged: annotate with JSDoc `@type`/`@param`/`@returns` using the TypeScript type system, and define shared shapes with `@typedef`. API types must not be `unknown` or untyped `...args` — spell out the real parameter and return shapes; the only exception is values passed through transparently to an upstream layer that owns their type. For example:
+## Developer docs
 
-```js
-/** @typedef {{ key: string; value: unknown }} KVEntry */
+[src/docs/src/](src/docs/src/) is the published puter.js documentation: one reference page per method (`<Area>/<method>.md`, [steps](doc/contributing-apis.md#5-docs)) and recipes in [src/docs/src/recipes/](src/docs/src/recipes/).
 
-/** @type {KVEntry[]} */
-let entries = [];
-```
+### Page structure
 
-Every SDK change carries all five of the following — a puter.js PR missing one is incomplete:
+The reference has two kinds of page:
 
-1. **Backward compatibility.** Mandatory unless a maintainer explicitly signs off on a break. Existing call signatures keep working (including both positional and options-object forms where a method supports them); new parameters are optional with defaults that preserve old behavior; never rename or repurpose existing params, response fields, or error codes. New parameter names are `camelCase` (existing `snake_case` stays for compatibility). Say in the PR how existing callers are unaffected.
-2. **Tests.** Add or extend a suite in [tests/api/suites/](src/puter-js/tests/api/suites/) (`<area>.suite.ts`; register new suites in `suites/index.ts` — no globbing). One suite runs unchanged on node, browser, and workerd via `npm run test:puterjs`; never write a per-platform test. The runners execute the **built** bundle — run `npm run build:workerLib` after SDK changes or the suite silently tests stale code. For `puter.ui.*` methods rendered by the desktop, use the Playwright e2e harness instead — see [src/puter-js/TESTING.md](src/puter-js/TESTING.md).
-3. **Docs.** New or changed APIs update [src/docs/src/](src/docs/src/): the method page (`<Area>/<method>.md`, with frontmatter and a runnable example) and the area overview when the surface changes. Docs are the contract users code against — signatures, defaults, and return shapes must match the implementation exactly.
-4. **Types.** Type the change in JSDoc on the implementation, then run `npm run check:puterjs:types` to confirm it still produces declarations that type-check. Name any new type in [src/puter-js/index.d.ts](src/puter-js/index.d.ts) if consumers should be able to import it. Declarations must match runtime behavior exactly — a wrong type is worse than a missing one.
-5. **Error handling.** Reject/throw `{ message, code }` objects with stable `snake_case` codes, matching the existing modules (see `KV.js`). Validate cheap preconditions client-side before making the network call; pass backend errors through unchanged rather than swallowing or re-wrapping them. Error codes are API surface — changing one is a breaking change.
+- **API overview pages** (`<Area>.md`, such as [KV.md](src/docs/src/KV.md)) give a quick top-level picture of what the API is for and what it can do, with short examples and a list of its functions that links every function page in the area. Leave out the details. The first sentence of the intro says what the API is about. This is a judgment call too: when the API depends on a Puter concept the reader may not know, such as Teams, the first sentence can name it and the sentences after it explain it.
+- **Function pages** (`<Area>/<method>.md`) hold the details: parameters, defaults, return values, errors, limits, and edge cases.
 
-[doc/contributing-apis.md](doc/contributing-apis.md) walks the full lifecycle of adding an API across backend + SDK.
+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. 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.
+- **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.
+- **State the rule, then its consequence, in short sentences.** No metaphor in place of a rule. Name a concrete action ("you can create any files and folders inside it") over an abstract permission ("yours to organize freely"). Cut a sentence that only repeats the next one.
+- **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.
+- **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
+
+Recipes are tested, copy-pasteable patterns for a task, one layer above the per-method reference, often combining several APIs. Agents find them through the `## Recipes` section of `llms.txt`.
+
+- **Files.** One `.md` per recipe in [src/docs/src/recipes/](src/docs/src/recipes/), with `title`, `description`, `tags`, and optional `order` front matter; they're picked up automatically. Tags must exist in [src/docs/src/recipe-tags.js](src/docs/src/recipe-tags.js) or the build fails. Quote a `description` that contains a colon followed by a space. Every top-level `.md` in that directory is built as a recipe, so keep other markdown out of it.
+- **Title.** Short, Title Case, starts with a verb, and leaves out "to Your App" ("Add Team Support", "Deploy Workers Programmatically"). The slug is the title in kebab case, with no API-name prefix. In `llms.txt` an agent sees only the title and description before deciding to open a recipe, so word them to match the task the reader is trying to do.
+- **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.
+- **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.
 
 ---
 
@@ -177,7 +196,7 @@ Every SDK change carries all five of the following — a puter.js PR missing one
 
 [src/gui/](src/gui/) is the Puter desktop: deliberately plain JavaScript + jQuery with HTML-string templates. Don't introduce a UI framework or a new rendering pattern.
 
-The guiding rule here is **conformity over novelty** — match the existing design and code structure even where you'd personally choose differently. A visually or structurally divergent addition is a defect even when it works.
+**Conformity over novelty**: match the existing design and code structure even where you'd choose differently. A visually or structurally divergent addition is a defect even when it works.
 
 - **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.

BUG-BOUNTY.md

@@ -17,6 +17,21 @@ 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:
@@ -27,11 +42,12 @@ The following have already been reviewed and determined **not to be vulnerabilit
 - **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 (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.
-- **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.
+- **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.
 - **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.
@@ -52,7 +68,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 the Known Non-Issues list**: Reports matching an item in the "Known Non-Issues" section above are not eligible and will be closed.
+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.
 
 Reports that do not meet these guidelines may not be eligible for a reward.
 
@@ -63,14 +79,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.
+- 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.
 
 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.
+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.
 
 Please submit **one issue per report**.
-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.
+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.
 
 ## Reporting Process
 
@@ -83,6 +99,8 @@ 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
@@ -95,7 +113,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.
+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.
 
 ## Payments Disclaimer
 

CONTRIBUTING.md

@@ -1,46 +1,21 @@
-# Contributing to Puter Backend
+# Contributing to Puter
 
-Thanks for contributing. These rules aren't strictly enforced — but following them makes every PR easier. If anything's unclear, ping a core maintainer or open the PR and ask.
+Thanks for contributing. These rules aren't strictly enforced, but following them makes every PR easier. If anything's unclear, ping a core maintainer or open the PR and ask.
 
-New to the backend? Start with [doc/architecture.md](doc/architecture.md).
+- New to the backend? Start with [doc/architecture.md](doc/architecture.md).
+- Code, test, and docs conventions for the whole repo live in [AGENTS.md](AGENTS.md). It's written for AI agents; the conventions apply to human contributors too.
+- Adding or changing a public API (an endpoint, driver method, or puter.js method)? Follow [doc/contributing-apis.md](doc/contributing-apis.md): backward compatibility, [developer docs](src/docs/), types, and tests all move in the same PR.
+- Found a vulnerability? Report it privately per [SECURITY.md](SECURITY.md).
 
 ---
 
-## 1. Test it. Run it.
+## Before you open a PR
 
-Run the affected code path end-to-end before opening a PR. "It builds" is not "it works."
+Check your diff against these sections of AGENTS.md:
 
-Add tests for new behavior, endpoints, or bug fixes. If something's genuinely hard to test, say so in the PR.
-
-## 2. Follow existing patterns
-
-Match the shape of similar code already in the repo. [doc/architecture.md](doc/architecture.md) is the source of truth for layers, wiring, and naming. If you think a pattern is wrong, raise it — don't quietly diverge.
-
-In plain-JS files, typing is encouraged via JSDoc `@type` annotations using the TypeScript type system, with `@typedef` for shared shapes. Don't type API surfaces as `unknown` or untyped `...args` unless the values are passed through transparently to an upstream layer that owns their type.
-
-## 3. Don't expose system or user information
-
-Scan your diff for stray logs, debug routes, internal paths, secrets, tokens, or user data in errors/responses. When in doubt, return less. Flag any auth, permission, or data-export changes in the PR description.
-
-For private security reports, see [SECURITY.md](SECURITY.md).
-
-## 4. AI-assisted code is fine — understood code is required
-
-Don't commit code you couldn't have written, debugged, or defended yourself. Read the diff, run it, and be ready to explain it in review.
-
-## 5. Adding or changing APIs
-
-If you add or change a public API (an endpoint, driver method, or puter-js method), follow [doc/contributing-apis.md](doc/contributing-apis.md) — backward compatibility, [developer docs](src/docs/), types, and tests all move in the same PR.
-
-The same rule applies to limits: rate limits, concurrency caps, quotas, and allowances are published in [src/docs/src/rate-limits-and-quotas.md](src/docs/src/rate-limits-and-quotas.md), and a PR that changes one of those numbers updates that page in the same PR. A limit nobody published is a limit developers only discover as a service failure.
-
-## 6. Boy Scout Rule — leave it 1% better
-
-![Boy Scout Rule](https://imgs.search.brave.com/DMmIWl5-NuZVtrR9kXBb06AKF8kturkgSW9UMb2-6m4/rs:fit:860:0:0:0/g:ce/aHR0cHM6Ly9sYXdz/b2Zzb2Z0d2FyZWVu/Z2luZWVyaW5nLmNv/bS9pbWFnZXMvbGF3/cy9ib3ktc2NvdXQt/cnVsZS5wbmc)
-
-Fix the typo, the dead import, the missing test, the bit you had to read twice. Keep cleanup proportional to the change — no refactors riding along on bug fixes.
-
----
+- [Working rules of thumb](AGENTS.md#working-rules-of-thumb): run it end to end, test new behavior and bug fixes, understand every line you commit (AI assistance is fine), leave touched files a bit better, and publish limit changes.
+- [Reuse and abstraction](AGENTS.md#reuse-and-abstraction) and [hot paths](AGENTS.md#hot-paths).
+- [Security & privacy](AGENTS.md#security--privacy): expose nothing the caller doesn't need.
 
 ## Opening a PR
 

Dockerfile

@@ -14,7 +14,7 @@
 # config.default.json, so partial overrides work. Absent file = defaults.
 
 # ---- Build stage ----
-FROM node:24-slim AS build
+FROM node:26-bookworm-slim AS build
 
 WORKDIR /opt/puter
 
@@ -59,7 +59,7 @@ RUN set -e; \
     wait $pjs_pid
 
 # ---- Runtime stage (slim — no build tools) ----
-FROM node:24-slim
+FROM node:26-bookworm-slim
 
 WORKDIR /opt/puter
 

config.default.json

@@ -24,7 +24,7 @@
     "disable_user_signup": false,
     "teams_enabled": false,
     "max_teams_per_user": 1,
-    "max_seats_per_team_free": 4,
+    "max_seats_per_team_free": 3,
     "max_seats_per_team_paid": 40,
     "strict_email_verification_required": false,
     "gui_assets_root": "./src/gui",

config.template.jsonc

@@ -7,9 +7,8 @@
     // 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 (clickhouse,
-    // cacheUpdateHandler, pages, prodMeteringAndBilling, …) are intentionally
-    // omitted.
+    // Keys consumed only by closed-source / hosted-prod extensions are
+    // intentionally omitted.
 
     // ── Environment / identity ──────────────────────────────────────────
     "config_name": "template",
@@ -35,7 +34,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": 620000,
+    "keep_alive_timeout": 920000,
     "protocol": "http",
     "domain": "puter.localhost",
     // Fully-qualified externally-visible URL. Computed from protocol/domain/
@@ -216,7 +215,9 @@
         // "bootstrapTables": true,
         "path": "",
         // Credentials. NOTE: snake_case here, unlike `s3.s3Config` below.
-        // For dynamodb-local, any non-empty values work.
+        // For dynamodb-local, any non-empty values work. On AWS,
+        // `"useCredentialChain": true` uses the default credential chain
+        // instead of keys.
         "aws": {
             "access_key": "",
             "secret_key": "",
@@ -314,7 +315,8 @@
     // 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.
+    // the feature without touching data. Teams ships as an extension; on,
+    // the server refuses to boot unless one registers it.
     "teams_enabled": false,
     //
     // Live teams one user may own. Soft-deleted ones do not count, so
@@ -323,12 +325,13 @@
     //
     // Seats one team may provision. Each seat is a real Puter account taking a
     // name from the global username pool, so this is what bounds a team's blast
-    // radius. The owner's plan decides which of the two applies; defaults are 4
-    // and 40. Lowering either below a team's current seat count blocks new
-    // provisioning and disables nobody. Deployments upgrading from the old flat
-    // default of 50: without a billing extension every owner reads as free, so
-    // set `max_seats_per_team` to keep the old behavior.
-    "max_seats_per_team_free": 4,
+    // radius. The owner's plan decides which of the two applies; defaults are 3
+    // and 40. A plan registered with `teamSeatCap` uses that instead. Lowering
+    // a cap below a team's current seat count blocks new provisioning and
+    // disables nobody. Deployments upgrading from the old flat default of 50:
+    // without a billing extension every owner reads as free, so set
+    // `max_seats_per_team` to keep the old behavior.
+    "max_seats_per_team_free": 3,
     "max_seats_per_team_paid": 40,
     //
     // One flat cap for every team, whatever the owner pays. Setting it
@@ -430,6 +433,8 @@
         "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"
@@ -450,6 +455,10 @@
             "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": {
@@ -488,6 +497,8 @@
             "defaultVoiceId": "",
             "speechToSpeechModelId": ""
         },
+        // Both AWS providers also take `"useCredentialChain": true` in place
+        // of keys, like `dynamo.aws`.
         "aws-polly": {
             "access_key": "",
             "secret_key": "",

doc/alarms.md

@@ -36,9 +36,10 @@ pass one explicitly unless you really mean "page someone".
 ### Choosing one
 
 - Did the server fail to do its job in a way nobody expected? → `critical`
-- Is a background job, rate, or dependency degraded? → `warning`
-- Is this a user doing something notable (tripping an abuse heuristic,
-  overspending)? → `info`
+- Is a background job, rate, or dependency degraded, or has an account spent
+  far past its credits? → `warning`
+- Is this a user doing something notable (tripping an abuse heuristic)?
+  → `info`
 - Did one of *our own* limits reject a caller — a rate limit, a concurrency
   cap, a quota? → don't alarm at all. The limit doing its job is not an
   event; the 429 is the whole signal, and alarming on it only produces noise
@@ -133,6 +134,11 @@ occurrence is reported up to a small burst, then one per interval. A fault
 recurring hundreds of times a second still counts every occurrence, but it
 does not write a log line or build an alert payload for each one.
 
+The count lasts only as long as the client remembers the alarm. One that
+hasn't recurred for 24 hours is forgotten, and the client holds at most 1000
+at once, dropping the least recently raised first. Either way the next
+occurrence is a new alarm, with its count and burst starting over.
+
 Below that, the chat transport won't repost the same alarm id within
 `repeatThrottleMs` (default 15 minutes). The first occurrence always posts,
 and the next one that gets through reports how many piled up in between —

doc/architecture.md

@@ -1,6 +1,6 @@
 # Backend Architecture
 
-Loosely inspired by the Controller–Service–Repository pattern with dependency injection. The backend is organized as a stack of layers where each layer only depends on the layers beneath it, and `PuterServer` ([src/backend/server.ts](../src/backend/server.ts)) instantiates each layer in order and hands the instances down to the next.
+Loosely inspired by the Controller–Service–Repository pattern with dependency injection. The backend is a stack of layers; each depends only on the layers beneath it and receives them through its constructor from `PuterServer` ([src/backend/server.ts](../src/backend/server.ts)), which instantiates the layers in order. The rules for working within the layers are in [AGENTS.md](../AGENTS.md#backend).
 
 ## Layers
 
@@ -31,8 +31,6 @@ block-beta
     style CFG fill:#334155,stroke:#1e293b,color:#fff
 ```
 
-Each layer only depends on the layers beneath it, and every dependency is injected through the constructor by `PuterServer`. Extensions sit alongside this stack and can register into any layer — see [Extensions](#extensions) below.
-
 | Layer | Lives in | Responsibility |
 | --- | --- | --- |
 | **Controllers** | [src/backend/controllers/](../src/backend/controllers/) | Route handlers. Parse + validate input, apply per-route gates (auth, subdomain, rate limit, body parsers — see `RouteOptions`), call into services, format responses. |
@@ -42,7 +40,7 @@ Each layer only depends on the layers beneath it, and every dependency is inject
 | **Clients** | [src/backend/clients/](../src/backend/clients/) | Adapters for external/internal services (sql, redis, s3, dynamodb, email, event bus, …). Knows protocols, not domain concepts. |
 | **Config** | `config.*.json` → `IConfig` | The flat, typed config object every layer receives at construction. |
 
-Each layer receives the layers beneath it through its constructor, so dependencies are explicit and traceable from `PuterServer`. A controller does not reach into a client directly; if it needs one, the right move is usually a service.
+Extensions sit alongside this stack and can register into any layer; see [Extensions](#extensions).
 
 ## Entry point: `PuterServer`
 
@@ -55,13 +53,11 @@ Each layer receives the layers beneath it through its constructor, so dependenci
 
 ## Context (ALS)
 
-We use [`Context`](../src/backend/core/context.ts) — backed by `AsyncLocalStorage` — to carry per-request state without threading it through every function signature. It is used **sparingly**, mostly for `actor` and `req`. The request-context middleware opens a scope per request after the auth probe runs; anything inside a request handler can call `Context.get('actor')` / `Context.get('req')` instead of plumbing it as an argument.
-
-Prefer explicit arguments. Reach for `Context` only when the value is truly request-scoped and would otherwise need to thread through many layers.
+[`Context`](../src/backend/core/context.ts), backed by `AsyncLocalStorage`, carries per-request state without threading it through every function signature. The request-context middleware opens a scope per request after the auth probe runs, so anything inside a request handler can call `Context.get('actor')` / `Context.get('req')`. It's used sparingly, mostly for `actor` and `req`; see the [Context rule](../AGENTS.md#backend).
 
 ## Actors
 
-An [`Actor`](../src/backend/core/actor.ts) is who a request is acting as. It has two app-shaped fields and they are not interchangeable: `app` is the app the actor carries *directly* (an app-under-user token), while `effectiveApp` is the app it ultimately acts as — its own, or the one that issued its access token. An access-token actor has no `app` of its own, so a gate that reads `app` answers "no app" for it and falls open.
+An [`Actor`](../src/backend/core/actor.ts) is who a request is acting as. Its two app fields are not interchangeable: `app` is the app the actor carries *directly* (an app-under-user token), while `effectiveApp` is the app it ultimately acts as — its own, or the one that issued its access token. An access-token actor has no `app` of its own, so a gate that reads `app` answers "no app" for it and falls open.
 
 `makeActor` resolves `effectiveApp` once at construction, and `assertResolvedActor` at the request edge rejects any actor that skipped it — so reading `effectiveApp` needs no fallback. Reach for `app` only where the direct app genuinely is the question, and say why in a comment.
 
@@ -71,11 +67,11 @@ An [`Actor`](../src/backend/core/actor.ts) is who a request is acting as. It has
 
 ## Extensions
 
-Extensions live alongside core ([packages/puter/extensions/](../extensions/)) and parallel the layered stack. They are meant for **non-crucial parts of the system** — things Puter still works without if removed.
+Extensions live in [extensions/](../extensions/), parallel the layered stack, and hold the parts of the system Puter still works without. [AGENTS.md](../AGENTS.md#extensions) has the rule for what belongs in one.
 
 - **Good extensions**: [thumbnails](../extensions/thumbnails.ts), [serverInfo](../extensions/serverInfo.ts), [devWatcher](../extensions/devWatcher.ts) — opt-in features cleanly bolted on.
 - **Should probably be core**: [metering](../extensions/metering.ts), [appTelemetry](../extensions/appTelemetry.ts) — clients now expect these to be present, so the "extension" framing is misleading.
-- **Shouldn't have been an extension**: [whoami](../extensions/whoami.ts) — it's load-bearing for every authenticated client. Keep this one in mind as a cautionary example when deciding whether something belongs in an extension.
+- **Shouldn't have been an extension**: [whoami](../extensions/whoami.ts) — it's load-bearing for every authenticated client.
 
 ### Extension API
 
@@ -98,11 +94,11 @@ import { extension } from '@heyputer/backend/src/extensions';
 const services = extension.import('service');
 
 extension.get('/healthcheck/deep', { subdomain: 'api', adminOnly: true }, async (_req, res) => {
-    res.json({ ok: await services.health.runDeepCheck() });
+    res.json(await services.health.getStatus());
 });
 
-extension.on('user.signup', (_key, data) => {
-    console.log('new user', data.user.username);
+extension.on('puter.signup.success', (_key, data) => {
+    console.log('new user', data.username);
 });
 ```
 
@@ -117,10 +113,3 @@ extension.on('app.recommended', (_key, data) => {
     data.appNames = ['editor', 'camera'];
 });
 ```
-
-## Conventions
-
-- **TypeScript preferred** in new code where feasible. Existing JS is fine; convert opportunistically when you're already touching a file.
-- **`camelCase`** for variable/function names; **`PascalCase`** for classes and for files that contain a class (`AuthService.ts`, `KVStoreDriver.ts`).
-- **Deduplicate**. If two services need the same logic, lift it into a util/helper rather than calling sideways across the same layer — services should not depend on other services for code reuse.
-- **Don't reach across layers.** Controllers do not poke clients directly; services do not register routes. If you find yourself wanting to, that's usually a signal the abstraction is wrong.

doc/contributing-apis.md

@@ -12,21 +12,7 @@ Every change is backward compatible unless a maintainer has explicitly agreed to
 
 ## Core or extension?
 
-The first decision is where the API lives.
-
-If the API is **not crucial to core functionality — nothing in core will call it — prefer an extension** over wiring it into core. Extensions live in [extensions/](../extensions/), parallel the core layered stack, and reach core through `extension.import(...)`:
-
-```js
-const services = extension.import('service');
-const stores = extension.import('store');
-
-extension.registerDriver('myFeature', MyFeatureDriver);  // first-class driver
-extension.post('/my-feature/frobnicate', opts, handler); // or plain routes
-```
-
-Follow the same layered structure inside the extension (driver/controller → service → store) unless it genuinely only needs a couple of route handlers — then the lightweight `extension.get/post/...` helpers are enough on their own.
-
-The test is the direction of dependency: Puter must still work with the extension removed. The moment core needs to call your API, it belongs in core — see [whoami](../extensions/whoami.ts) for the cautionary example of a load-bearing "extension".
+The first decision is where the API lives. If **nothing in core will call it, prefer an extension** over wiring it into core. [AGENTS.md](../AGENTS.md#extensions) has the rule and its test; [architecture.md](architecture.md#extension-api) documents the `extension` API.
 
 ## Adding a new API
 
@@ -35,13 +21,13 @@ Work through all seven steps; the PR is complete when every one is.
 ### 1. Design the surface first
 
 - Sketch the signature, options, return shape, and error cases before writing code. Find the two or three most similar existing APIs and match their conventions.
-- New parameter and field names are `camelCase`. (Existing `snake_case` names stay where they already exist.)
+- New parameter and field names follow the [naming rule](../AGENTS.md#language--files) (`camelCase`).
 - Anything returning a list follows the [pagination convention](pagination.md): `limit`/`cursor` in, `{ items, cursor, total }` envelope out.
 - Prefer an options object over a growing list of positional parameters, but keep the common case callable with a single argument where siblings do.
 
 ### 2. Backend
 
-Follow the layered stack ([architecture.md](architecture.md)): a controller or driver at the edge, business logic in a service, persistence in a store. The edge parses and validates input and applies gates; services assume the caller is already authorized. Return exactly what the caller needs and no more — every response field you ship is permanent — and use stable `snake_case` error codes.
+Follow the layered stack ([architecture.md](architecture.md), [layer rules](../AGENTS.md#backend)): a controller or driver at the edge, business logic in a service, persistence in a store. Return exactly what the caller needs and no more — every response field you ship is permanent — and use stable `snake_case` error codes.
 
 #### Controller or driver?
 
@@ -54,10 +40,16 @@ Both are supported ways to define an API. **Prefer a controller when you need fi
 
 - **Controller routes** (and extension routes — same options) take [`RouteOptions`](../src/backend/core/http/types.ts): auth gates (`requireAuth`, `requireUserActor`, `noUserSession`, `adminOnly`, `allowedAppIds`, and the access-token controls), `subdomain` routing, per-route `rateLimit`, body parsers, and arbitrary extra `middleware`. The auth flavors are subtle and default-deny — read the JSDoc on each field before picking.
 - **Driver methods** get their policies from the `@Driver` options: per-method `rateLimit` (limit/window/backend), `concurrent` in-flight caps (optionally `bySubscription`), `requireSubscription`, `requireReputation`, and `noUserSession`. The `/drivers/call` surface enforces them.
-- **A surface only paying accounts should reach** declares `requireSubscription` — the route option on a controller endpoint, the per-method `@Driver({ requireSubscription })` block on a driver (`/drivers/call` is one shared route, so a driver's requirement can't live in route options). `true` accepts any plan that isn't free, so a plan registered by an extension counts without core naming it; an array of policy ids (`['business', 'pro']`) accepts only those; `false` is "no requirement", the same as leaving it out. An empty array is a boot error rather than a silent no-op — it reads as subscribers-only while admitting everyone. Off unless asked for, and answered from the metering service's cached per-actor subscription, so it costs a map lookup. Distinct from `requireCredits`: this asks which plan the account is on, not whether it has budget left. Deployments with no paid plans (self-hosted installs) turn the whole thing off with `meteringEnforcement.subscriptions: false`.
-- **A surface only a trusted-enough account should reach** declares `requireReputation` — the route option on a controller endpoint, the per-method `@Driver({ requireReputation })` block on a driver. The value names a tier; what that tier takes is `reputationGate.tiers` in config, so the score a surface is worth is a deployment call and can be retuned without editing the surface. A tier the running config doesn't define is inert and everyone passes — an install that doesn't score its accounts must not start turning traffic away on a score it never computed — and `reputationGate.enabled: false` stops every declared gate at once. Opt-in, implies `requireAuth`, and denies with a bare 403 `reputation_required` that names neither the score nor the tier. Nothing in the tree declares one yet: the mechanism ships ahead of the enrollment.
-- **An account must have verified a specific factor** — `requireVerified` (email, and only under `strict_email_verification_required`), `requirePhoneVerified`, `requireCardVerified`. These are opt-in and require the factor to have actually 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 where `card` is listed (a paying account has a card on file already); otherwise only the factors the deployment can verify are asked for (an SMS provider configured, a card gate an extension reports on), and with none verifiable the gate is inert rather than locking the route on a self-hosted install. It denies with 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, for an SMS-provider outage.
-- **An endpoint that spends metered resources** on the caller's behalf — moving file content, making object-store requests, anything else the account is billed for — also declares `requireCredits: true`, which turns an account with nothing left of its budget 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 be able to see what it has, clear it, and reach its billing pages. Drivers have no route options to declare this on, 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.
+- **Paying accounts only:** `requireSubscription`, as a route option on a controller endpoint or in the per-method `@Driver({ requireSubscription })` block on a driver (`/drivers/call` is one shared route, so a driver's requirement can't live in route options). `true` accepts any plan that isn't free, so a plan an extension registers counts without core naming it; an array of policy ids (`['business', 'pro']`) accepts only those; `false` or leaving it out means no requirement. An empty array is a boot error, since it would read as subscribers-only while admitting everyone. The check is a map lookup on the metering service's cached per-actor subscription. It asks which plan the account is on; `requireCredits` asks whether it has budget left. Deployments with no paid plans (self-hosted installs) turn it off with `meteringEnforcement.subscriptions: false`.
+- **Trusted-enough accounts only:** `requireReputation`, as a route option or in the per-method `@Driver({ requireReputation })` block. Opt-in; implies `requireAuth`. The value names a tier, and `reputationGate.tiers` in config sets the score that tier takes, so a deployment can retune it without editing the surface. A tier the running config doesn't define is inert and everyone passes, so an install that doesn't score its accounts never turns traffic away on a score it never computed. `reputationGate.enabled: false` stops every declared gate at once. Denials are a bare 403 `reputation_required` that names neither the score nor the tier. Nothing in the tree declares one yet.
+- **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 the current six-digit authenticator `code`. Missing, malformed, or incorrect codes leave the secret and 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
 
@@ -66,33 +58,32 @@ Both are supported ways to define an API. **Prefer a controller when you need fi
 
 ### 4. Types
 
-- Type the method where you wrote it, in JSDoc: `@param`/`@returns` on the implementation, one `@overload` block per accepted call form, and `@typedef {Object}` + `@property` for any new shape. The JSDoc is the source of truth — declarations are generated from it, so there is nothing to keep in sync by hand.
-- Put a shape more than one file needs in the module's `types.js` (e.g. [src/puter-js/src/modules/kv/types.js](../src/puter-js/src/modules/kv/types.js)); anything shared across modules goes in [src/puter-js/src/lib/types.js](../src/puter-js/src/lib/types.js). A shape with one consumer can stay next to it.
-- Run `npm run check:puterjs:types` — it generates the declarations and type-checks the published surface without `skipLibCheck`. **Never edit anything under `src/puter-js/types/`**: it is gitignored build output, produced by the SDK build and shipped in the npm tarball, and the next build overwrites it.
-- Name the new type in [src/puter-js/index.d.ts](../src/puter-js/index.d.ts) if consumers should be able to import it. That file is the one hand-written declaration in the package: it decides what is public and re-exports nothing else.
+Type the method in JSDoc on the implementation, following the [puter.js type rules](../AGENTS.md#types) (overloads, where shapes live, `index.d.ts`), then run `npm run check:puterjs:types`. Declarations are generated from the JSDoc, so there is nothing to keep in sync by hand.
 
 ### 5. Docs
 
 - Add the method page at [src/docs/src/](../src/docs/src/)`<Area>/<method>.md` — frontmatter (`title`, `description`, `platforms`), syntax, parameters, return value, and at least one runnable example — and update the area overview (`<Area>.md`). Copy the structure of an existing page.
+- The docs are the contract users code against: signatures, defaults, and return shapes match the implementation exactly.
 
 ### 6. Tests
 
-- **Backend:** colocated Vitest tests; prefer the in-memory test server (`setupPuterTestEnv` in [src/backend/testUtil.ts](../src/backend/testUtil.ts)) over mocking.
-- **SDK:** add cases to [src/puter-js/tests/api/suites/](../src/puter-js/tests/api/suites/)`<area>.suite.ts` (register new suites in `suites/index.ts`). One suite runs on node, browser, and workerd via `npm run test:puterjs` — never write per-platform tests, and rebuild first with `npm run build:workerLib` since the runners execute the built bundle.
+- **Backend:** see [backend tests](../AGENTS.md#backend-tests).
+- **SDK:** add cases to [src/puter-js/tests/api/suites/](../src/puter-js/tests/api/suites/)`<area>.suite.ts` (register new suites in `suites/index.ts`; there is no globbing). One suite runs on node, browser, and workerd via `npm run test:puterjs`; never write per-platform tests. The runners execute the built bundle, so run `npm run build:workerLib` first or the suite silently tests stale code.
 - **Desktop-rendered UI** (`puter.ui.*`): add a Playwright spec per [src/puter-js/TESTING.md](../src/puter-js/TESTING.md).
 
 ### 7. Security pass
 
-Scan the diff before opening the PR: no internals leaked in errors or logs, no over-broad responses, auth gates present. Flag anything auth-, permission-, or data-export-related in the PR description.
+Run the [security & privacy](../AGENTS.md#security--privacy) check on the diff, and confirm the auth gates are present.
 
 ## Maintaining an existing API
 
 Changes are **additive by default**:
 
+- Existing call signatures keep working, including both positional and options-object forms where a method supports them. Say in the PR how existing callers are unaffected.
 - New parameters are optional, with defaults that reproduce the old behavior exactly.
 - Never rename, repurpose, or remove existing parameters, response fields, or error codes. Don't change types, ordering guarantees, or which fields are present when.
 - New behavior that could surprise existing callers goes behind an opt-in flag.
-- Docs, types, and tests move in the same PR as the behavior. A signature change with stale docs is a bug — the docs are the contract users code against.
+- Docs, types, and tests move in the same PR as the behavior; a signature change with stale docs is a bug.
 - Bug fixes come with a regression test that fails before the fix. Be suspicious of fixes that change observable behavior: someone may depend on the bug. When in doubt, ask a maintainer.
 
 ### Breaking changes

doc/pagination.md

@@ -28,9 +28,6 @@ Paginated responses are an envelope:
   `cursor` is still returned. Never use `items.length < limit` as an
   end-of-list signal.
 
-New request params are camelCase (`includeTotal`, `fetchUntilFull`).
-Pre-existing snake_case params stay for compatibility.
-
 ## Backward compatibility
 
 Requests without pagination params keep returning the full result in the
@@ -48,8 +45,11 @@ The envelope trigger depends on the endpoint's history:
 ## Cursors
 
 Cursors are opaque base64-encoded JSON, produced and consumed only by the
-backend (`src/backend/util/pagination.ts`). What a cursor wraps is an
-implementation detail per store:
+backend (`src/backend/util/pagination.ts`). A cursor over a global sequence
+(an auto-increment `id`) is sealed with `sealCursor`/`openCursor` instead, so
+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`.
 - SQL-backed lists wrap a keyset position — `(sortValue, id)` of the last
@@ -91,7 +91,8 @@ hit, the response simply carries a cursor — still convention-legal.
 ## Adding pagination to a new endpoint
 
 1. Use `encodeCursor`/`decodeCursor`/`normalizeLimit`/`normalizeOffset` from
-   `src/backend/util/pagination.ts`.
+   `src/backend/util/pagination.ts` — `sealCursor`/`openCursor` when the
+   cursor wraps a global id.
 2. Push equality filters into the query so pages and counts operate on the
    true result set; only genuinely per-actor filtering may remain post-query
    (short-pages rule covers it).

doc/self-hosting.md

@@ -216,7 +216,7 @@ Drop the resulting `fullchain.pem` and `privkey.pem` into `./puter/tls/`.
     ```
     …and update the S3 public endpoint:
     ```json
-    "s3": { "s3Config": { "publicEndpoint": "https://s3.puter.local", ... } }
+    "s3": { "s3Config": { "publicEndpoint": "https://s3.puter.localhost", ... } }
     ```
 
 ## Running behind your own reverse proxy
@@ -263,15 +263,15 @@ Healthy startup:
 
 ```
 [config] override from /etc/puter/config.json
-[mysql] running migrations from /opt/puter/dist/src/backend/clients/database/migrations/mysql: 2 file(s)
+[mysql] running migrations from /opt/puter/dist/src/backend/clients/database/migrations/mysql: <n> file(s)
 [mysql] applied mysql_mig_1.sql (...)
-[mysql] applied mysql_mig_2.sql (9 statements)
+...
 ```
 
-Then open **<https://puter.local>** (or `http://` if you skipped TLS). Login is `admin` — the temp password is printed once in the puter container logs on first boot:
+Then open **<https://puter.localhost>** (or `http://` if you skipped TLS). Login is `admin`; its temporary password is printed in the puter container logs on every boot until you change it:
 
 ```bash
-docker compose logs puter | grep tmp_password
+docker compose logs puter | grep "password for admin"
 ```
 
 Change it in Settings after first login.
@@ -394,14 +394,14 @@ Full provider list (chat, image, video, TTS, OCR) is in the template.
 
 ### Per-user storage quota
 
-Default is 100 MB per user.
+Storage is unlimited by default (bounded by host disk). To cap each user:
 
 ```json
 "storage_capacity": 5368709120,   // 5 GB
 "is_storage_limited": true
 ```
 
-Set `is_storage_limited: false` for unlimited (bounded by host disk).
+`storage_capacity` defaults to 100 MB.
 
 ### Usage metering and budgets
 
@@ -413,8 +413,8 @@ deletion, stay available so an account can always see what it has and clear it.
 
 On a self-hosted install this is almost certainly not what you want. There is
 nowhere to buy more, so accounts are held to the free monthly allowance
-(US$0.25 of measured cost — roughly 2 GiB of downloads) and start being refused
-after that. Turn it off:
+(US$0.50 of measured cost for a registered account, roughly 2.5 GiB of
+downloads) and start being refused after that. Turn it off:
 
 ```json
 "unlimitedMetering": true
@@ -424,12 +424,6 @@ Every account then resolves to an unlimited policy. Usage is still recorded, so
 the dashboard still shows what is being consumed; nothing is ever refused for
 lack of budget.
 
-For API testing, you can also set `"unlimitedMetering": true` in your
-ignored runtime config: `puter/config/config.json` for Docker, or the repository's
-`config.json` for `npm start`. Merge it into the existing config and restart Puter.
-This includes guest accounts and applies to the whole local instance. Keep normal
-metering settings when testing budget or subscription enforcement.
-
 To keep the budgets but stop them blocking anything — recording only:
 
 ```json
@@ -470,9 +464,10 @@ temporary or permanent one.
 "disable_user_signup": true
 ```
 
-### Block disposable email TLDs
+### Block disposable email domains
 
-Only enforced when `env: "prod"`.
+Addresses on these domains (suffix match, so subdomains too) can't sign up or be
+set as an account's email.
 
 ```json
 "blockedEmailDomains": ["mailinator.com", "tempmail.com", "guerrillamail.com"]
@@ -623,12 +618,10 @@ services:
 ```
 
 If that file already exists, merge these settings into its `puter` service.
-Compose loads and merges the override automatically. `build.context: .` selects
-this checkout, and `pull_policy: never` prevents pulling the published Puter image.
-
-Use this override for local build settings instead of editing `docker-compose.yml`.
-The override is ignored by Git, keeping local configuration out of pull requests
-and avoiding conflicts in the shared Compose file when pulling updates.
+Compose merges the override automatically: `build.context: .` builds this
+checkout, and `pull_policy: never` stops it pulling the published image. Git
+ignores the override, so local build settings stay out of pull requests and
+don't conflict with `docker-compose.yml` when you pull updates.
 
 From the repository root, build and start the stack:
 
@@ -667,11 +660,11 @@ Migrations re-apply idempotently across pulls. Volumes are preserved.
 **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`).
 
-**Login screen says "admin password not set".**
-First-boot temp password is logged once. Find it: `docker compose logs puter | grep "tmp_password"`. After login, change it in Settings.
+**Can't find the admin password.**
+It's logged on every boot until you change it: `docker compose logs puter | grep "password for admin"`. After login, change it in Settings.
 
 **Healthcheck reports unhealthy but the site works.**
-The healthcheck hits `puter.localhost:4100/test` from inside the container. If you changed `domain` or `port`, the check still uses defaults. The site itself is fine.
+The compose healthcheck requests `http://localhost:4100/` from inside the container. If you changed `port` or set `allow_all_host_values: false`, the check fails while the site itself is fine.
 
 **Nothing resolves at `puter.example.com` after DNS changes.**
 DNS propagates slowly. `dig puter.example.com` and `dig api.puter.example.com` should both return your server IP. If not, give it 5–60 minutes.

extensions/appTelemetry.ts

@@ -1,5 +1,4 @@
 import { Context } from '@heyputer/backend/src/core';
-import type { Actor } from '@heyputer/backend/src/core/actor';
 import { HttpError } from '@heyputer/backend/src/core/http';
 import { PuterDriver } from '@heyputer/backend/src/drivers/types';
 import type {
@@ -133,51 +132,30 @@ export class AppTelemetryDriver extends PuterDriver {
         const owner = await this.stores.user.getById(ownerId);
         if (!owner?.uuid) throw new HttpError(404, 'App owner not found');
 
-        const actor = Context.get('actor');
-        if (!actor) throw new HttpError(401, 'Authentication required');
-        const ownsApp = await this.services.permission
-            .check(actor as Actor, `apps-of-user:${owner.uuid}:write`)
-            .catch(() => false);
+        // `/drivers/call` requires auth, so there is always an actor.
+        const actor = Context.get('actor')!;
+        let ownsApp = false;
+        try {
+            ownsApp = await this.services.permission.check(
+                actor,
+                `apps-of-user:${owner.uuid}:write`,
+            );
+        } catch {
+            // A failed check is a denial.
+        }
         if (!ownsApp) throw new HttpError(403, 'Permission denied');
 
-        const appId = (app as { id: number }).id;
-
-        const users = (await this.clients.db.read(
-            `SELECT u.id, u.username, u.uuid, u.email FROM user_to_app_permissions p
-             INNER JOIN ${this.clients.db.quoteIdentifier('user')} u ON p.user_id = u.id
-             WHERE p.permission = 'flag:app-is-authenticated' AND p.app_id = ?
-             ORDER BY (p.dt IS NOT NULL), p.dt, p.user_id
-             LIMIT ? OFFSET ?`,
-            [appId, safeLimit, safeOffset],
-        )) as Array<{
-            id: number;
-            username: string;
-            uuid: string;
-            email: string | null;
-        }>;
-
-        // Only surface a user's email if *that user* granted this app the
-        // `user:<their-uuid>:email:read` permission — the same grant
-        // `puter.perms.requestEmail()` obtains and `whoami` honours. This is a
-        // per-user check keyed on the app (not the calling owner-actor): a
-        // user may have authenticated into the app without sharing their
-        // email. Resolve the whole page in one query.
-        const emailPermitted = new Set<number>();
-        if (users.length > 0) {
-            const permStrings = users.map((u) => `user:${u.uuid}:email:read`);
-            const placeholders = permStrings.map(() => '?').join(', ');
-            const grants = (await this.clients.db.read(
-                `SELECT user_id FROM user_to_app_permissions
-                 WHERE app_id = ? AND permission IN (${placeholders})`,
-                [appId, ...permStrings],
-            )) as Array<{ user_id: number }>;
-            for (const g of grants) emailPermitted.add(g.user_id);
-        }
-
-        return users.map((e) =>
-            emailPermitted.has(e.id)
-                ? { user: e.username, user_uuid: e.uuid, user_email: e.email }
-                : { user: e.username, user_uuid: e.uuid },
+        // An email surfaces only for a user who granted *this app*
+        // `user:<their-uuid>:email:read` — the grant `puter.perms.requestEmail()`
+        // obtains and `whoami` honours. Authenticating alone doesn't share it.
+        const users = await this.stores.permission.listAppAuthenticatedUsers(
+            (app as { id: number }).id,
+            { limit: safeLimit, offset: safeOffset },
+        );
+        return users.map((u) =>
+            u.emailShared
+                ? { user: u.username, user_uuid: u.uuid, user_email: u.email }
+                : { user: u.username, user_uuid: u.uuid },
         );
     }
 
@@ -190,13 +168,7 @@ export class AppTelemetryDriver extends PuterDriver {
         const app = await this.stores.app.getByUid(app_uuid);
         if (!app) throw new HttpError(404, 'App not found');
 
-        const [row] = (await this.clients.db.read(
-            `SELECT COUNT(*) AS n FROM user_to_app_permissions
-             WHERE permission = 'flag:app-is-authenticated' AND app_id = ?`,
-            [(app as { id: number }).id],
-        )) as Array<{ n: number }>;
-
-        return row?.n ?? 0;
+        return this.stores.permission.countAppUsers((app as { id: number }).id);
     }
 }
 

extensions/installedApps.test.ts

@@ -74,15 +74,6 @@ const grantInstalled = async (appId: number, userId: number) => {
 };
 
 describe('installedApps extension — handleInstalledApps', () => {
-    it('throws HttpError(401) when no actor is on the context', async () => {
-        const { res } = makeRes();
-        await expect(
-            runWithContext({ actor: undefined }, () =>
-                handleInstalledApps(makeReq({}), res),
-            ),
-        ).rejects.toMatchObject({ statusCode: 401 });
-    });
-
     it('throws HttpError(400) when orderBy is not in the allowlist', async () => {
         const user = await seedUser();
         const { res } = makeRes();

extensions/installedApps.ts

@@ -2,68 +2,41 @@ import type { Request, Response } from 'express';
 import { Context } from '@heyputer/backend/src/core';
 import { HttpError } from '@heyputer/backend/src/core/http';
 import { extension } from '@heyputer/backend/src/extensions';
+import {
+    INSTALLED_APPS_ORDERS,
+    type InstalledAppsOrder,
+} from '@heyputer/backend/src/stores/permission/PermissionStore.js';
 import {
     getAppIconCdnUrl,
     getAppIconUrl,
 } from '@heyputer/backend/src/util/appIcon.js';
 
-const clients = extension.import('client');
-
-const ALLOWED_ORDER_BY = [
-    'id',
-    'name',
-    'uid',
-    'title',
-    'installed_at',
-] as const;
-const ORDER_BY_FIELD_MAP: Record<string, string> = {
-    id: 'apps.id',
-    name: 'apps.name',
-    uid: 'apps.uid',
-    title: 'apps.title',
-    installed_at: 'installed_at',
-};
+const stores = extension.import('store');
 
 export const handleInstalledApps = async (
     req: Request,
     res: Response,
 ): Promise<void> => {
-    const actor = Context.get('actor');
-    if (!actor?.user?.id) throw new HttpError(401, 'Authentication required');
+    // Behind `requireUserActor`, so there is always an actor.
+    const actor = Context.get('actor')!;
 
-    const orderBy = String(req.query.orderBy ?? 'installed_at');
-    if (!(ALLOWED_ORDER_BY as readonly string[]).includes(orderBy)) {
+    const orderBy = String(
+        req.query.orderBy ?? 'installed_at',
+    ) as InstalledAppsOrder;
+    if (!INSTALLED_APPS_ORDERS.includes(orderBy)) {
         throw new HttpError(
             400,
-            `Invalid orderBy. Allowed: ${ALLOWED_ORDER_BY.join(', ')}`,
+            `Invalid orderBy. Allowed: ${INSTALLED_APPS_ORDERS.join(', ')}`,
         );
     }
 
     const page = Math.max(Number(req.query.page) || 1, 1);
     const limit = Math.min(Math.max(Number(req.query.limit) || 100, 1), 100);
     const offset = (page - 1) * limit;
-    const orderByField = ORDER_BY_FIELD_MAP[orderBy];
-    const sortDirection = req.query.desc ? 'DESC' : 'ASC';
-
-    const installedApps = (await clients.db.read(
-        `SELECT
-            apps.name,
-            apps.uid,
-            apps.title,
-            apps.description,
-            apps.icon,
-            apps.index_url,
-            apps.owner_user_id,
-            MIN(perm.dt) AS installed_at
-        FROM apps
-        LEFT JOIN user_to_app_permissions AS perm ON apps.id = perm.app_id
-        WHERE perm.user_id = ?
-        GROUP BY apps.id, apps.name, apps.uid, apps.title, apps.description
-        ORDER BY ${orderByField} ${sortDirection}
-        LIMIT ?
-        OFFSET ?`,
-        [actor.user.id, limit, offset],
-    )) as Array<Record<string, unknown>>;
+    const installedApps = await stores.permission.listAppsGrantedByUser(
+        actor.user.id!,
+        { orderBy, descending: Boolean(req.query.desc), limit, offset },
+    );
 
     const apiBaseUrl = extension.config.api_base_url as string | undefined;
     res.json(

extensions/metering.test.ts

@@ -63,15 +63,6 @@ const seedUser = async () => {
 };
 
 describe('metering extension — handleMeteringUsage', () => {
-    it('throws HttpError(401) when no user actor is on the context', async () => {
-        const { res } = makeRes();
-        await expect(
-            runWithContext({ actor: undefined }, () =>
-                handleMeteringUsage(makeReq(), res),
-            ),
-        ).rejects.toMatchObject({ statusCode: 401 });
-    });
-
     it('returns usage details merged with allowanceInfo for an authenticated user', async () => {
         const user = await seedUser();
         const { res, captured } = makeRes();
@@ -166,18 +157,6 @@ describe('metering extension — handleMeteringUsage', () => {
 });
 
 describe('metering extension — handleMeteringUsageForApp', () => {
-    it('throws HttpError(401) when no user actor is on the context', async () => {
-        const { res } = makeRes();
-        await expect(
-            runWithContext({ actor: undefined }, () =>
-                handleMeteringUsageForApp(
-                    makeReq({ params: { appIdOrName: 'any' } }),
-                    res,
-                ),
-            ),
-        ).rejects.toMatchObject({ statusCode: 401 });
-    });
-
     it('throws HttpError(400) when no appId is supplied', async () => {
         const user = await seedUser();
         const { res } = makeRes();
@@ -330,4 +309,41 @@ 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

@@ -14,11 +14,13 @@ import {
 import type { Request, Response } from 'express';
 
 const services = extension.import('service');
-const clients = extension.import('client');
+const stores = extension.import('store');
 
-// Cached on first request — the underlying cost catalogues are baked into
-// driver/controller source so they only change on deploy.
+// 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;
 let cachedAllCosts: Record<string, unknown>[] | null = null;
+let allCostsExpireAt = 0;
 
 function collectAllCosts(): Record<string, unknown>[] {
     const all: Record<string, unknown>[] = [];
@@ -95,8 +97,8 @@ export const handleMeteringUsage = async (
     _req: Request,
     res: Response,
 ): Promise<void> => {
-    const actor = Context.get('actor');
-    if (!actor?.user) throw new HttpError(401, 'Authentication required');
+    // Behind `requireAuth`, so there is always an actor.
+    const actor = Context.get('actor')!;
 
     const [actorUsage, allowanceInfo] = await Promise.all([
         services.metering.getActorCurrentMonthUsageDetails(actor),
@@ -146,8 +148,8 @@ export const handleMeteringUsageForApp = async (
     req: Request,
     res: Response,
 ): Promise<void> => {
-    const actor = Context.get('actor');
-    if (!actor?.user) throw new HttpError(401, 'Authentication required');
+    // Behind `requireAuth`, so there is always an actor.
+    const actor = Context.get('actor')!;
 
     let appId = String(req.params.appIdOrName ?? '');
     if (!appId) throw new HttpError(400, 'appId parameter is required');
@@ -155,15 +157,9 @@ export const handleMeteringUsageForApp = async (
     // If not a UUID-shaped app UID or the global sentinel, look up by name.
     // Which apps an actor may read is MeteringService's call, not this route's.
     if (!appId.startsWith('app-') && appId !== GLOBAL_APP_KEY) {
-        const appRows = (await clients.db.read(
-            'SELECT `uid` FROM `apps` WHERE `name` = ? LIMIT 1',
-            [appId],
-        )) as Array<{ uid: string }>;
-        if (appRows.length > 0) {
-            appId = appRows[0].uid;
-        } else {
-            throw new HttpError(404, 'App not found');
-        }
+        const app = await stores.app.getByName(appId);
+        if (!app) throw new HttpError(404, 'App not found');
+        appId = app.uid;
     }
 
     const appUsage =
@@ -193,12 +189,14 @@ export const handleMeteringGlobalUsage = async (
     res.json(globalUsage);
 };
 
-// First hit walks the registries; subsequent hits serve the in-memory cache.
+// A hit walks the registries when the in-memory cache is missing or expired.
 export const handleMeteringAllCosts = async (
     _req: Request,
     res: Response,
 ): Promise<void> => {
-    if (!cachedAllCosts) {
+    if (!cachedAllCosts || Date.now() >= allCostsExpireAt) {
+        allCostsExpireAt =
+            (Math.floor(Date.now() / ALL_COSTS_TTL_MS) + 1) * ALL_COSTS_TTL_MS;
         const raw = collectAllCosts();
         const multiplier = creditMultiplierFrom(extension.config);
         // Price the catalogue in the same unit the usage endpoints report:

extensions/thumbnails.test.ts

@@ -2,7 +2,7 @@ import {
     GetObjectCommand,
     HeadObjectCommand,
     PutObjectCommand,
-    type S3Client,
+    S3Client,
 } from '@aws-sdk/client-s3';
 import type { Request, Response } from 'express';
 import crypto from 'node:crypto';
@@ -304,8 +304,6 @@ describe('thumbnails extension — handleThumbnailRead', () => {
     let s3: S3Client;
     let s3Presign: S3Client;
 
-    const stubDb = { write: vi.fn().mockResolvedValue(undefined) };
-
     beforeAll(async () => {
         server = await setupTestServer();
         s3 = server.clients.s3.get();
@@ -344,7 +342,7 @@ describe('thumbnails extension — handleThumbnailRead', () => {
                 s3Presign,
                 bucketName: BUCKET,
                 bucketEndpoint: 'http://127.0.0.1:4566/puter-local/',
-                db: stubDb,
+                fsEntry: server.stores.fsEntry,
             });
 
             expect(typeof entry.thumbnail).toBe('string');
@@ -383,7 +381,7 @@ describe('thumbnails extension — handleThumbnailRead', () => {
             s3Presign,
             bucketName: BUCKET,
             bucketEndpoint: 'http://127.0.0.1:4566/puter-local/',
-            db: stubDb,
+            fsEntry: server.stores.fsEntry,
         });
         expect(entry.thumbnail).toBeNull();
     });
@@ -398,7 +396,7 @@ describe('thumbnails extension — handleThumbnailRead', () => {
             s3Presign,
             bucketName: BUCKET,
             bucketEndpoint: 'http://127.0.0.1:4566/puter-local/',
-            db: stubDb,
+            fsEntry: server.stores.fsEntry,
         });
         // Signed for OUR bucket; `attacker-named-bucket` never reached S3.
         const signed = entry.thumbnail as string;
@@ -414,7 +412,7 @@ describe('thumbnails extension — handleThumbnailRead', () => {
             s3Presign,
             bucketName: BUCKET,
             bucketEndpoint: 'http://127.0.0.1:4566/puter-local/',
-            db: stubDb,
+            fsEntry: server.stores.fsEntry,
         });
         expect(entry.thumbnail).toBe('about:blank');
     });
@@ -426,43 +424,157 @@ describe('thumbnails extension — handleThumbnailRead', () => {
             s3Presign,
             bucketName: BUCKET,
             bucketEndpoint: 'http://127.0.0.1:4566/puter-local/',
-            db: stubDb,
+            fsEntry: server.stores.fsEntry,
         });
         expect(entry.thumbnail).toBeUndefined();
     });
 
-    it('migrates an inline data: URL by uploading to S3 and updating the DB row', async () => {
-        const entryUuid = crypto.randomUUID();
-        const entry: Record<string, unknown> = {
-            uuid: entryUuid,
-            thumbnail: `data:image/png;base64,${TINY_PNG_BASE64}`,
-        };
+    // -- inline data: URL migration --
 
+    // A file whose thumbnail was stored inline, as rows from before storage
+    // pointers are. Creating it leaves it in the entry cache.
+    const inlineThumbnailEntry = async (thumbnail: string) => {
+        const username = `thumb-${Math.random().toString(36).slice(2, 10)}`;
+        const user = await server.stores.user.create({
+            username,
+            uuid: crypto.randomUUID(),
+            password: null,
+            email: `${username}@test.local`,
+            free_storage: 100 * 1024 * 1024,
+            requires_email_confirmation: false,
+        });
+        await generateDefaultFsentries(
+            server.clients.db,
+            server.stores.user,
+            user,
+        );
+        const documents = (await server.stores.fsEntry.getEntryByPath(
+            `/${username}/Documents`,
+        ))!;
+        return server.stores.fsEntry.createNonFileEntry({
+            parent: documents,
+            name: 'legacy.png',
+            kind: 'empty-file',
+            thumbnail,
+        });
+    };
+
+    // Passes every command through, keeping the keys of the uploads.
+    const recordingClient = () => {
+        const putKeys: string[] = [];
+        const client = {
+            send: async (command: unknown) => {
+                if (command instanceof PutObjectCommand) {
+                    putKeys.push(command.input.Key!);
+                }
+                return s3.send(command as never);
+            },
+        } as unknown as S3Client;
+        return { client, putKeys };
+    };
+
+    // What a listing does: read the entry through the store, then sign it.
+    const readThumbnail = async (uuid: string, client: S3Client) => {
+        const stored = (await server.stores.fsEntry.getEntryByUuid(uuid))!;
+        const entry: Record<string, unknown> = {
+            uuid,
+            thumbnail: stored.thumbnail,
+        };
         await handleThumbnailRead(entry, {
-            s3,
+            s3: client,
             s3Presign,
             bucketName: BUCKET,
-            bucketEndpoint: 'http://127.0.0.1:4566/puter-local/',
-            db: stubDb,
+            bucketEndpoint: BUCKET_ENDPOINT,
+            fsEntry: server.stores.fsEntry,
         });
+        return entry.thumbnail;
+    };
 
-        // The handler should have replaced the data URL with a signed
-        // S3 URL and kicked off the DB migration write.
-        expect(typeof entry.thumbnail).toBe('string');
-        expect((entry.thumbnail as string).startsWith('http')).toBe(true);
-        // Allow the best-effort write microtask to settle.
-        await Promise.resolve();
-        expect(stubDb.write).toHaveBeenCalledWith(
-            'UPDATE `fsentries` SET `thumbnail` = ? WHERE `uuid` = ?',
-            [
-                expect.stringMatching(
-                    new RegExp(`^s3://${BUCKET}/thumbnails/${entryUuid}/`),
-                ),
-                entryUuid,
-            ],
+    it('migrates an inline data: URL to storage once, then serves the stored pointer', async () => {
+        const entry = await inlineThumbnailEntry(
+            `data:image/png;base64,${TINY_PNG_BASE64}`,
         );
+        const { client, putKeys } = recordingClient();
+
+        const first = await readThumbnail(entry.uuid, client);
+        const second = await readThumbnail(entry.uuid, client);
+
+        expect(putKeys).toHaveLength(1);
+        const [key] = putKeys;
+        expect(key).toMatch(new RegExp(`^thumbnails/${entry.uuid}/`));
+        const pointer = `s3://${BUCKET}/${key}`;
+        // The cached entry and the row both hold the new pointer.
+        expect(
+            (await server.stores.fsEntry.getEntryByUuid(entry.uuid))!.thumbnail,
+        ).toBe(pointer);
+        expect(
+            (await server.stores.fsEntry.getEntryByUuidFromPrimary(entry.uuid))!
+                .thumbnail,
+        ).toBe(pointer);
+        for (const signed of [first, second]) {
+            expect(signed).toMatch(/^http/);
+            expect(signed).toContain(key);
+        }
     });
 
+    it('keeps one object when reads of the same entry migrate it concurrently', async () => {
+        const thumbnail = `data:image/png;base64,${TINY_PNG_BASE64}`;
+        const entry = await inlineThumbnailEntry(thumbnail);
+        const { client, putKeys } = recordingClient();
+        const read = async () => {
+            const payload: Record<string, unknown> = {
+                uuid: entry.uuid,
+                thumbnail,
+            };
+            await handleThumbnailRead(payload, {
+                s3: client,
+                s3Presign,
+                bucketName: BUCKET,
+                bucketEndpoint: BUCKET_ENDPOINT,
+                fsEntry: server.stores.fsEntry,
+            });
+            return payload.thumbnail;
+        };
+
+        await Promise.all([read(), read()]);
+
+        expect(putKeys).toHaveLength(2);
+        const stored = (await server.stores.fsEntry.getEntryByUuidFromPrimary(
+            entry.uuid,
+        ))!.thumbnail;
+        const winner = putKeys.find(
+            (key) => stored === `s3://${BUCKET}/${key}`,
+        );
+        expect(winner).toBeDefined();
+        // The losing read's upload is not left behind.
+        for (const key of putKeys) {
+            expect(await objectExists(s3, key)).toBe(key === winner);
+        }
+    });
+
+    it.each([
+        [
+            'does not decode to an image',
+            `data:image/png;base64,${Buffer.from('not an image').toString('base64')}`,
+        ],
+        ['has no payload', 'data:image/png;base64'],
+    ])(
+        'does not migrate an inline thumbnail that %s',
+        async (_label, thumbnail) => {
+            const entry = await inlineThumbnailEntry(thumbnail);
+            const { client, putKeys } = recordingClient();
+
+            expect(await readThumbnail(entry.uuid, client)).toBe(thumbnail);
+
+            expect(putKeys).toHaveLength(0);
+            expect(
+                (await server.stores.fsEntry.getEntryByUuidFromPrimary(
+                    entry.uuid,
+                ))!.thumbnail,
+            ).toBe(thumbnail);
+        },
+    );
+
     it('leaves an inline data: URL as is when there is no entry to bind it to', async () => {
         const thumbnail = `data:image/png;base64,${TINY_PNG_BASE64}`;
         const entry: Record<string, unknown> = { thumbnail };
@@ -471,7 +583,7 @@ describe('thumbnails extension — handleThumbnailRead', () => {
             s3Presign,
             bucketName: BUCKET,
             bucketEndpoint: BUCKET_ENDPOINT,
-            db: stubDb,
+            fsEntry: server.stores.fsEntry,
         });
         expect(entry.thumbnail).toBe(thumbnail);
     });
@@ -563,13 +675,38 @@ describe('thumbnails extension — handleFsCopyNodeThumbnail', () => {
         await server?.shutdown();
     });
 
-    const copyNode = async (thumbnail: string | null, copyUuid: string) => {
-        const db = { write: vi.fn().mockResolvedValue(undefined) };
+    const copyNode = async (
+        thumbnail: string | null,
+        copyUuid: string,
+        client: S3Client = s3,
+    ) => {
+        const fsEntry = {
+            updateEntryThumbnailByUuid: vi.fn().mockResolvedValue(true),
+        };
         await handleFsCopyNodeThumbnail(
             { copy: { thumbnail, uuid: copyUuid } },
-            { s3, bucketName: BUCKET, bucketEndpoint: BUCKET_ENDPOINT, db },
+            {
+                s3: client,
+                bucketName: BUCKET,
+                bucketEndpoint: BUCKET_ENDPOINT,
+                fsEntry,
+            },
         );
-        return db;
+        return fsEntry.updateEntryThumbnailByUuid;
+    };
+
+    // The key the copied row was repointed at, asserting it is bound to it.
+    const repointedKey = (
+        update: Awaited<ReturnType<typeof copyNode>>,
+        copyUuid: string,
+    ): string => {
+        expect(update).toHaveBeenCalledTimes(1);
+        const [uuid, pointer] = update.mock.calls[0] as [string, string];
+        expect(uuid).toBe(copyUuid);
+        expect(pointer).toMatch(
+            new RegExp(`^s3://${BUCKET}/thumbnails/${copyUuid}/`),
+        );
+        return pointer.slice(`s3://${BUCKET}/`.length);
     };
 
     it.each([
@@ -583,15 +720,17 @@ describe('thumbnails extension — handleFsCopyNodeThumbnail', () => {
             await putObject(s3, sourceKey, body);
 
             const copyUuid = crypto.randomUUID();
-            const db = await copyNode(`s3://${BUCKET}/${sourceKey}`, copyUuid);
+            const update = await copyNode(
+                `s3://${BUCKET}/${sourceKey}`,
+                copyUuid,
+            );
 
             // The copied row was repointed at a fresh object of its own...
-            expect(db.write).toHaveBeenCalledTimes(1);
-            const [, params] = db.write.mock.calls[0] as [
+            expect(update).toHaveBeenCalledTimes(1);
+            const [updatedUuid, newPointer] = update.mock.calls[0] as [
+                string,
                 string,
-                [string, string],
             ];
-            const [newPointer, updatedUuid] = params;
             expect(updatedUuid).toBe(copyUuid);
             expect(
                 newPointer.startsWith(`s3://${BUCKET}/thumbnails/${copyUuid}/`),
@@ -603,6 +742,7 @@ describe('thumbnails extension — handleFsCopyNodeThumbnail', () => {
             const duplicated = await s3.send(
                 new GetObjectCommand({ Bucket: BUCKET, Key: newKey }),
             );
+            expect(duplicated.ContentType).toBe('image/png');
             expect(
                 (await streamToBuffer(duplicated.Body as never)).equals(body),
             ).toBe(true);
@@ -610,17 +750,80 @@ describe('thumbnails extension — handleFsCopyNodeThumbnail', () => {
         },
     );
 
+    // The SDK puts an endpoint's path in front of every Bucket/Key request but
+    // not in front of a CopyObject source, so on such a store HeadObject finds
+    // the source and CopyObject reports NoSuchKey.
+    it('duplicates through a client whose endpoint carries a path', async () => {
+        const endpoint = await s3.config.endpoint!();
+        const client = new S3Client({
+            region: await s3.config.region(),
+            endpoint: `${endpoint.protocol}//${endpoint.hostname}:${endpoint.port}/${BUCKET}`,
+            credentials: await s3.config.credentials(),
+            forcePathStyle: true,
+        });
+        const sourceKey = mintedKey();
+        const body = Buffer.from(TINY_PNG_BASE64, 'base64');
+        await putObject(client, sourceKey, body);
+
+        const copyUuid = crypto.randomUUID();
+        const update = await copyNode(
+            `s3://${BUCKET}/${sourceKey}`,
+            copyUuid,
+            client,
+        );
+
+        const duplicated = await client.send(
+            new GetObjectCommand({
+                Bucket: BUCKET,
+                Key: repointedKey(update, copyUuid),
+            }),
+        );
+        expect(duplicated.ContentType).toBe('image/png');
+        expect(
+            (await streamToBuffer(duplicated.Body as never)).equals(body),
+        ).toBe(true);
+    });
+
+    it("lets either entry's removal leave the other's thumbnail in place", async () => {
+        const sourceUuid = crypto.randomUUID();
+        const sourceKey = mintedKey(sourceUuid);
+        const sourcePointer = `s3://${BUCKET}/${sourceKey}`;
+        await putObject(s3, sourceKey, Buffer.from(TINY_PNG_BASE64, 'base64'));
+        const remove = (thumbnail: string, uuid: string) =>
+            handleFsRemoveNodeThumbnail(
+                { target: { thumbnail, uuid } },
+                { s3, bucketName: BUCKET, bucketEndpoint: BUCKET_ENDPOINT },
+            );
+
+        // Removing a copy leaves the source's object...
+        const firstUuid = crypto.randomUUID();
+        const firstKey = repointedKey(
+            await copyNode(sourcePointer, firstUuid),
+            firstUuid,
+        );
+        await remove(`s3://${BUCKET}/${firstKey}`, firstUuid);
+        expect(await objectExists(s3, firstKey)).toBe(false);
+        expect(await objectExists(s3, sourceKey)).toBe(true);
+
+        // ...and removing the source leaves a copy's.
+        const secondUuid = crypto.randomUUID();
+        const secondKey = repointedKey(
+            await copyNode(sourcePointer, secondUuid),
+            secondUuid,
+        );
+        await remove(sourcePointer, sourceUuid);
+        expect(await objectExists(s3, sourceKey)).toBe(false);
+        expect(await objectExists(s3, secondKey)).toBe(true);
+    });
+
     it('drops the pointer when the shared object is already gone', async () => {
         const copyUuid = crypto.randomUUID();
-        const db = await copyNode(
+        const update = await copyNode(
             `s3://${BUCKET}/${mintedKey()}`, // never uploaded
             copyUuid,
         );
 
-        expect(db.write).toHaveBeenCalledTimes(1);
-        const [sql, params] = db.write.mock.calls[0] as [string, [string]];
-        expect(sql).toContain('NULL');
-        expect(params).toEqual([copyUuid]);
+        expect(update.mock.calls).toEqual([[copyUuid, null]]);
     });
 
     // Only reachable for objects uploaded before upload URLs were size-bound;
@@ -630,36 +833,64 @@ describe('thumbnails extension — handleFsCopyNodeThumbnail', () => {
         await putObject(s3, sourceKey, Buffer.alloc(2 * 1024 * 1024 + 1));
 
         const copyUuid = crypto.randomUUID();
-        const db = await copyNode(`s3://${BUCKET}/${sourceKey}`, copyUuid);
+        const update = await copyNode(`s3://${BUCKET}/${sourceKey}`, copyUuid);
 
-        expect(db.write).toHaveBeenCalledTimes(1);
-        const [sql, params] = db.write.mock.calls[0] as [string, [string]];
-        expect(sql).toContain('NULL');
-        expect(params).toEqual([copyUuid]);
+        expect(update.mock.calls).toEqual([[copyUuid, null]]);
+    });
+
+    it('drops the pointer when the object outgrows the bound after its size was checked', async () => {
+        const sourceKey = mintedKey();
+        await putObject(s3, sourceKey, Buffer.from(TINY_PNG_BASE64, 'base64'));
+        const sent: unknown[] = [];
+        // Replaces the object between the HEAD and the GET.
+        const racing = {
+            send: async (command: unknown) => {
+                sent.push(command);
+                const result = await s3.send(command as never);
+                if (command instanceof HeadObjectCommand) {
+                    await putObject(
+                        s3,
+                        sourceKey,
+                        Buffer.alloc(2 * 1024 * 1024 + 1),
+                    );
+                }
+                return result;
+            },
+        } as unknown as S3Client;
+
+        const copyUuid = crypto.randomUUID();
+        const update = await copyNode(
+            `s3://${BUCKET}/${sourceKey}`,
+            copyUuid,
+            racing,
+        );
+
+        expect(update.mock.calls).toEqual([[copyUuid, null]]);
+        expect(sent.some((c) => c instanceof PutObjectCommand)).toBe(false);
     });
 
     it('does not duplicate an object the pointer names but we did not mint', async () => {
         const foreignKey = crypto.randomUUID(); // shaped like an fs object key
-        const db = await copyNode(
+        const update = await copyNode(
             `s3://${BUCKET}/${foreignKey}`,
             crypto.randomUUID(),
         );
-        expect(db.write).not.toHaveBeenCalled();
+        expect(update).not.toHaveBeenCalled();
     });
 
     it('leaves an external image URL to ride along as is', async () => {
         const sourceKey = legacyKey();
         await putObject(s3, sourceKey, Buffer.from(TINY_PNG_BASE64, 'base64'));
-        const db = await copyNode(
+        const update = await copyNode(
             `https://cdn.example.com/${BUCKET}/${sourceKey}`,
             crypto.randomUUID(),
         );
-        expect(db.write).not.toHaveBeenCalled();
+        expect(update).not.toHaveBeenCalled();
     });
 
     it('is a no-op when the copy has no thumbnail', async () => {
-        const db = await copyNode(null, crypto.randomUUID());
-        expect(db.write).not.toHaveBeenCalled();
+        const update = await copyNode(null, crypto.randomUUID());
+        expect(update).not.toHaveBeenCalled();
     });
 });
 
@@ -828,4 +1059,58 @@ describe('thumbnails extension — signed batch upload through /fs', () => {
         );
         expect(entry.thumbnail).toBe('https://example.com/thumb.png');
     });
+
+    it('gives a copy its own thumbnail that survives moves and the source being removed', async () => {
+        const { actor, username } = await makeActor();
+        const s3 = server.clients.s3.get();
+        const fs = server.services.fs;
+        const { entry: source } = await upload(
+            actor,
+            `/${username}/Documents/photo.png`,
+            (s) => s.thumbnailUrl,
+        );
+        const userId = source.userId;
+        const sourceKey = source.thumbnail!.slice(`s3://${BUCKET}/`.length);
+        const desktop = (await server.stores.fsEntry.getEntryByPath(
+            `/${username}/Desktop`,
+        ))!;
+        // Through the entry cache, which the listener's write refreshes.
+        const storedThumbnail = async (uuid: string) =>
+            (await server.stores.fsEntry.getEntryByUuid(uuid))?.thumbnail ??
+            null;
+
+        const copy = await runWithContext({ actor }, () =>
+            fs.copy(userId, { source, destinationParent: desktop }),
+        );
+        // `fs.copy.node` is fire-and-forget.
+        const copyPointer = await vi.waitFor(async () => {
+            const pointer = await storedThumbnail(copy.uuid);
+            expect(pointer).toMatch(
+                new RegExp(`^s3://${BUCKET}/thumbnails/${copy.uuid}/`),
+            );
+            return pointer!;
+        });
+        const copyKey = copyPointer.slice(`s3://${BUCKET}/`.length);
+
+        const documents = (await server.stores.fsEntry.getEntryByPath(
+            `/${username}/Documents`,
+        ))!;
+        const moved = await runWithContext({ actor }, () =>
+            fs.move(userId, {
+                source: copy,
+                destinationParent: documents,
+                newName: 'moved.png',
+            }),
+        );
+        expect(moved.uuid).toBe(copy.uuid);
+        expect(await storedThumbnail(moved.uuid)).toBe(copyPointer);
+
+        await runWithContext({ actor }, () =>
+            fs.remove(userId, { entry: source }),
+        );
+        await vi.waitFor(async () => {
+            expect(await objectExists(s3, sourceKey)).toBe(false);
+        });
+        expect(await objectExists(s3, copyKey)).toBe(true);
+    });
 });

extensions/thumbnails.ts

@@ -1,5 +1,4 @@
 import {
-    CopyObjectCommand,
     DeleteObjectCommand,
     GetObjectCommand,
     HeadObjectCommand,
@@ -8,10 +7,15 @@ import {
 } from '@aws-sdk/client-s3';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { extension } from '@heyputer/backend/src/extensions';
+import type { FSEntryStore } from '@heyputer/backend/src/stores/fs/FSEntryStore';
 import { isMissingObjectError } from '@heyputer/backend/src/stores/fs/S3ObjectStore';
 import crypto from 'node:crypto';
+import type { Readable } from 'node:stream';
 import sharp from 'sharp';
 const clients = extension.import('client');
+const stores = extension.import('store');
+
+type ThumbnailEntryStore = Pick<FSEntryStore, 'updateEntryThumbnailByUuid'>;
 
 const MAX_THUMBNAIL_BYTES = 2 * 1024 * 1024;
 const MAX_THUMBNAIL_PIXELS = 64e6;
@@ -135,13 +139,6 @@ function getPresignClient(): S3Client {
     return resolveClients().presign;
 }
 
-function base64ParseDataUrl(dataURL: string) {
-    dataURL = dataURL.slice(5);
-    const mimeType = dataURL.split(';')[0];
-    const data = Buffer.from(dataURL.split(',')[1], 'base64');
-    return { mimeType, data };
-}
-
 // Strictly decode a data: URL and validate the decoded image. Encoded-string
 // length lies about decoded byte count (whitespace, padding) and says nothing
 // about pixel count — a 2MB PNG can decompress to hundreds of MB of raster.
@@ -304,7 +301,7 @@ export const handleThumbnailRead = async (
         s3Presign: S3Client;
         bucketName: string;
         bucketEndpoint: string;
-        db: { write: (sql: string, params: unknown[]) => Promise<unknown> };
+        fsEntry: ThumbnailEntryStore;
     },
 ): Promise<void> => {
     const thumb = entry.thumbnail;
@@ -325,32 +322,52 @@ export const handleThumbnailRead = async (
             { expiresIn: 604800 },
         );
     } else if (thumb.startsWith('data')) {
-        // Inline data-URL migration: upload to S3 and update the DB entry.
+        // Move an inline thumbnail into storage. The row only takes the new
+        // pointer while it still holds this data URL, so of concurrent reads
+        // one wins and the rest discard their upload.
         const uuid = entry.uuid ?? entry.uid;
         if (!isUuid(uuid)) return;
+        // Same bar as an upload; anything else stays inline, unmigrated.
+        const decoded = await decodeAndValidateThumbnail(thumb);
+        if (!decoded) return;
         const key = mintThumbnailKey(uuid);
-        const { mimeType, data } = base64ParseDataUrl(thumb);
-        const newUrl = `s3://${deps.bucketName}/${key}`;
 
         await deps.s3.send(
             new PutObjectCommand({
                 Bucket: deps.bucketName,
                 Key: key,
-                Body: data,
-                ContentType: mimeType,
+                Body: decoded.data,
+                ContentType: decoded.mimeType,
             }),
         );
 
-        // Best-effort async DB update
-        if (uuid) {
-            deps.db
-                .write(
-                    'UPDATE `fsentries` SET `thumbnail` = ? WHERE `uuid` = ?',
-                    [newUrl, uuid],
-                )
-                .catch((err: unknown) =>
-                    console.warn('[thumbnails] inline migration failed', err),
+        let migrated: boolean;
+        try {
+            migrated = await deps.fsEntry.updateEntryThumbnailByUuid(
+                uuid,
+                `s3://${deps.bucketName}/${key}`,
+                thumb,
+            );
+        } catch (err) {
+            // The row may or may not point at the object now, so keep it.
+            console.warn('[thumbnails] inline migration failed', err);
+            return;
+        }
+        if (!migrated) {
+            try {
+                await deps.s3.send(
+                    new DeleteObjectCommand({
+                        Bucket: deps.bucketName,
+                        Key: key,
+                    }),
                 );
+            } catch (err) {
+                console.warn(
+                    '[thumbnails] failed to remove unused thumbnail',
+                    err,
+                );
+            }
+            return;
         }
 
         entry.thumbnail = await getSignedUrl(
@@ -367,7 +384,7 @@ export const handleFsCopyNodeThumbnail = async (
         s3: S3Client;
         bucketName: string;
         bucketEndpoint: string;
-        db: { write: (sql: string, params: unknown[]) => Promise<unknown> };
+        fsEntry: ThumbnailEntryStore;
     },
 ): Promise<void> => {
     const copy = payload.copy;
@@ -396,27 +413,37 @@ export const handleFsCopyNodeThumbnail = async (
         ) {
             throw new Error('thumbnail exceeds the size bound');
         }
+        // Read and rewrite rather than CopyObject: a copy source skips any path
+        // in the client's endpoint, so it can miss an object Bucket/Key reach.
+        const source = await deps.s3.send(
+            new GetObjectCommand({ Bucket: deps.bucketName, Key: sourceKey }),
+        );
+        // The object can be replaced after the HEAD; bound what gets buffered.
+        if ((source.ContentLength ?? 0) > MAX_THUMBNAIL_BYTES) {
+            (source.Body as Readable | undefined)?.destroy();
+            throw new Error('thumbnail exceeds the size bound');
+        }
+        const body = await source.Body?.transformToByteArray();
+        if (!body) throw new Error('thumbnail has no body');
         await deps.s3.send(
-            new CopyObjectCommand({
+            new PutObjectCommand({
                 Bucket: deps.bucketName,
-                CopySource: `${deps.bucketName}/${sourceKey}`,
                 Key: newKey,
+                Body: body,
+                ContentType: source.ContentType,
             }),
         );
     } catch (err) {
         // The shared object is gone or oversized — drop the pointer rather
         // than leave the row advertising a thumbnail it doesn't have.
-        await deps.db.write(
-            'UPDATE `fsentries` SET `thumbnail` = NULL WHERE `uuid` = ?',
-            [copy.uuid],
-        );
+        await deps.fsEntry.updateEntryThumbnailByUuid(copy.uuid, null);
         console.warn('[thumbnails] failed to duplicate thumbnail on copy', err);
         return;
     }
 
-    await deps.db.write(
-        'UPDATE `fsentries` SET `thumbnail` = ? WHERE `uuid` = ?',
-        [`s3://${deps.bucketName}/${newKey}`, copy.uuid],
+    await deps.fsEntry.updateEntryThumbnailByUuid(
+        copy.uuid,
+        `s3://${deps.bucketName}/${newKey}`,
     );
 };
 
@@ -472,7 +499,7 @@ extension.on('thumbnail.read', async (_key, entry: Record<string, unknown>) => {
         s3Presign: getPresignClient(),
         bucketName: thumbnailBucketName,
         bucketEndpoint: extensionBucketEndpoint,
-        db: clients.db,
+        fsEntry: stores.fsEntry,
     });
 });
 
@@ -489,7 +516,7 @@ extension.on('fs.copy.node', async (_key, payload) => {
             s3: getClient(),
             bucketName: thumbnailBucketName,
             bucketEndpoint: extensionBucketEndpoint,
-            db: clients.db,
+            fsEntry: stores.fsEntry,
         },
     );
 });

extensions/whoami.test.ts

@@ -1,13 +1,7 @@
 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';
@@ -49,7 +43,6 @@ beforeAll(async () => {
             create_shortcut: true,
             payment_bypass: true,
         },
-        teams_enabled: true,
     } as never);
 });
 
@@ -83,21 +76,20 @@ describe('whoami extension — handleWhoami', () => {
         };
 
         const seatOf = async (teamName: string) => {
-            const owner = await seedUser();
             const seat = await seedSeat();
-            const team = await server.stores.team.create({
-                ownerUserId: owner.id as number,
+            const team = {
+                uid: `wt-${Math.random().toString(36).slice(2, 9)}`,
                 name: teamName,
-                handle: `wt-${Math.random().toString(36).slice(2, 9)}`,
-            });
-            await server.stores.team.addMember(team.uid, seat.id as number, {
-                orgOwned: true,
+            };
+            installSeatStub(server as never, [seat.id as number], {
+                teamUid: team.uid,
+                teamName: team.name,
             });
             return { seat, team };
         };
 
-        it('names the team for a seat', async () => {
-            const { seat, team } = await seatOf('Acme Corp');
+        it('names no team where teams is off', async () => {
+            const { seat } = await seatOf('Acme Corp');
             const { res, captured } = makeRes();
 
             await runWithContext(
@@ -105,10 +97,8 @@ describe('whoami extension — handleWhoami', () => {
                 () => handleWhoami(makeReq(), res),
             );
 
-            expect((captured.body as { team?: unknown }).team).toEqual({
-                uid: team.uid,
-                name: 'Acme Corp',
-            });
+            // Off, so the seat is never looked up.
+            expect((captured.body as { team?: unknown }).team).toBeUndefined();
         });
 
         it('says nothing for an account that is not a seat', async () => {
@@ -170,6 +160,81 @@ 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();
@@ -451,9 +516,7 @@ 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();

extensions/whoami.ts

@@ -1,11 +1,10 @@
 import { Context } from '@heyputer/backend/src/core';
 import { extension } from '@heyputer/backend/src/extensions';
-import {
-    cardFallbackDepsFrom,
-    isCardFallbackEligible,
-} from '@heyputer/backend/src/util/cardFallback.js';
 import { APP_ICON_SIZES } from '@heyputer/backend/src/util/appIcon.js';
-import { getTaskbarItems } from '@heyputer/backend/src/util/taskbarItems.js';
+import {
+    buildUserDetails,
+    scrubSensitive,
+} from '@heyputer/backend/src/util/userDetails.js';
 import type { Request, Response } from 'express';
 import TimeAgo from 'javascript-time-ago';
 import localeEn from 'javascript-time-ago/locale/en';
@@ -19,58 +18,6 @@ const timeago = (() => {
     return new TimeAgo('en-US');
 })();
 
-// User timestamps come off the DB as SQL datetime strings; the wire format
-// for all of them is unix seconds. Unparseable values are dropped rather
-// than sent as NaN.
-const toUnixSeconds = (value: unknown): number | undefined => {
-    if (!value) return undefined;
-    const ms = new Date(value as string | number | Date).getTime();
-    return Number.isNaN(ms) ? undefined : Math.round(ms / 1000);
-};
-
-// Allowlist of `config.feature_flags` keys safe to surface via /whoami.
-// Anything not listed here stays server-side, so internal flags
-// (payment_bypass, staff_only_*, etc.) cannot leak by accident. Add a
-// flag here when, and only when, the client actually needs to read it.
-const CLIENT_VISIBLE_FEATURE_FLAGS: ReadonlySet<string> = new Set([
-    'create_shortcut',
-    'download_directory',
-    'prompt_user_when_navigation_away_from_puter',
-]);
-
-// Keys that must never leave the server, whoever put them on the response.
-// `details` is an explicit pick, but the `whoami.details` event hands
-// listeners the full UserRow next to the object they may write to, and
-// `metadata` is a free-form blob — so any of these can arrive on the
-// response without an edit to the pick above. The scrub runs last, over the
-// whole payload, and is the one place that decides what "sensitive" means.
-//
-// Credentials and single-use tokens, the payment/phone identifiers used for
-// verification (`card_fingerprint` is the Stripe fingerprint, stable per
-// card number), the network identity recorded at signup, and internal
-// anti-abuse bookkeeping. `requires_phone_verification` /
-// `requires_card_verification` stay: they are the flags the GUI acts on, and
-// they carry no identifier.
-const SENSITIVE_KEYS: ReadonlySet<string> = new Set([
-    'password',
-    'tmp_password',
-    'pass_recovery_token',
-    'email_confirm_code',
-    'email_confirm_token',
-    'change_email_confirm_token',
-    'otp_secret',
-    'otp_recovery_codes',
-    'card_fingerprint',
-    'phone',
-    'clean_email',
-    'signup_ip',
-    'signup_ip_forwarded',
-    'signup_user_agent',
-    'signup_origin',
-    'signup_server',
-    'audit_metadata',
-]);
-
 // What an app actor may receive from `whoami.details` listeners. Anything
 // else a listener adds describes the account, and only ships to user actors.
 const APP_VISIBLE_LISTENER_KEYS: ReadonlySet<string> = new Set([
@@ -78,35 +25,6 @@ const APP_VISIBLE_LISTENER_KEYS: ReadonlySet<string> = new Set([
     'paid_storage',
 ]);
 
-// Depth-limited, cycle-safe walk deleting every SENSITIVE_KEYS entry it finds
-// at any level (`metadata` and `taskbar_items` are both nested structures).
-const scrubSensitive = (
-    value: unknown,
-    seen: Set<object> = new Set(),
-    depth = 0,
-): void => {
-    if (depth > 8 || value === null || typeof value !== 'object') return;
-    if (seen.has(value as object)) return;
-    seen.add(value as object);
-
-    if (Array.isArray(value)) {
-        for (const entry of value) scrubSensitive(entry, seen, depth + 1);
-        return;
-    }
-
-    for (const key of Object.keys(value as Record<string, unknown>)) {
-        if (SENSITIVE_KEYS.has(key)) {
-            delete (value as Record<string, unknown>)[key];
-            continue;
-        }
-        scrubSensitive(
-            (value as Record<string, unknown>)[key],
-            seen,
-            depth + 1,
-        );
-    }
-};
-
 export const handleWhoami = async (
     req: Request,
     res: Response,
@@ -118,13 +36,24 @@ 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 oidcOnly = user.password === null;
     const rawIconSize =
         typeof req.query?.icon_size === 'string'
             ? Number(req.query.icon_size)
@@ -133,155 +62,22 @@ export const handleWhoami = async (
         rawIconSize !== undefined && APP_ICON_SIZES.includes(rawIconSize)
             ? rawIconSize
             : undefined;
-    const noIcons = !iconSize;
 
-    // Feature flags come from `config.feature_flags`. We only forward keys
-    // listed in CLIENT_VISIBLE_FEATURE_FLAGS so internal flags can't leak.
-    // Non-boolean values (e.g. `"true"` as a string) are coerced so the
-    // client never has to guess.
-    const rawFlags = extension.config.feature_flags ?? {};
-    const feature_flags: Record<string, boolean> = {};
-    for (const [k, v] of Object.entries(rawFlags)) {
-        if (CLIENT_VISIBLE_FEATURE_FLAGS.has(k)) {
-            feature_flags[k] = Boolean(v);
-        }
-    }
-
-    // Deep-copied (it is decoded JSON) so the scrub below edits the response
-    // and not the cached UserRow. Sensitive keys inside it — tmp_password and
-    // anything else on the denylist — are removed by scrubSensitive.
-    const metadata = user.metadata
-        ? structuredClone(user.metadata)
-        : user.metadata;
-
-    const details: Record<string, unknown> = {
-        username: user.username,
-        uuid: user.uuid,
-        email: user.email,
-        unconfirmed_email: user.email,
-        email_confirmed: user.email_confirmed || user.username === 'admin',
-        requires_email_confirmation: user.requires_email_confirmation,
-        // The phone number itself is deliberately absent: nothing on the
-        // client reads it, and it is PII that would otherwise be handed to
-        // every app actor. Only the verification flag ships.
-        requires_phone_verification: user.requires_phone_verification,
-        requires_card_verification: user.requires_card_verification,
-        // A seat reaches nothing until it replaces its admin's password.
-        requires_password_change: user.requires_password_change,
-        // The SMS-to-card escape hatch: true once this user is out of SMS send
-        // attempts and may verify a card instead. It has to ship from here
-        // because /send-confirm-phone can no longer say so — by the time the
-        // fallback opens, further sends are rejected by that route's own rate
-        // limit before any handler runs, so a page reload would otherwise lose
-        // an offer that stays valid for 24 hours. Only for user actors, and it
-        // costs no KV read unless the account is actually phone-gated.
-        card_fallback_available: isUser
-            ? await isCardFallbackEligible(
-                  extension.config,
-                  user,
-                  async (key) => (await stores.kv.get({ key })).res,
-                  cardFallbackDepsFrom(clients),
-              )
-            : false,
-        desktop_bg_url: user.desktop_bg_url,
-        desktop_bg_color: user.desktop_bg_color,
-        desktop_bg_fit: user.desktop_bg_fit,
-        is_temp: user.password === null && user.email === null,
-        is_user_token: true,
-        // Present only once the account has actually asked for a code (see the
-        // referral extension) — null until then, and never minted from here:
-        // this endpoint is polled, and a mint is a write.
-        referral_code: user.referral_code,
-        oidc_only: oidcOnly,
-        otp: !!user.otp_enabled,
-        feature_flags,
-        created_ts: toUnixSeconds(user.timestamp),
-        human_readable_age: user.timestamp
-            ? timeago.format(new Date(user.timestamp as string))
-            : null,
-        metadata,
-        hasDevAccountAccess: !!user.metadata?.hasDevAccountAccess,
-    };
-
-    // OIDC revalidate URL for password-less accounts
-    if (oidcOnly) {
-        try {
-            const provider = await services.oidc.getLinkedProviderForUser(
-                user.id as number,
-            );
-            if (provider) {
-                const origin = (extension.config.origin ?? '').replace(
-                    /\/$/,
-                    '',
-                );
-                details.oidc_revalidate_url = `${origin}/auth/oidc/${provider}/start?flow=revalidate&user_uuid=${encodeURIComponent(user.uuid)}`;
-            }
-        } catch {
-            // OIDC not configured
-        }
-    }
-
-    // Taskbar items — only sent to user actors
-    if (isUser) {
-        details.taskbar_items = await getTaskbarItems(
-            user,
-            {
-                clients,
-                stores,
-                services,
-                apiBaseUrl: String(extension.config.api_base_url ?? ''),
-                config: extension.config,
-            },
-            { iconSize, noIcons },
-        );
-    }
-
-    // Directories — only sent to user actors
-    if (isUser) {
-        const directories: Record<string, unknown> = {};
-        const nameToProp: Record<string, string> = {
-            desktop_uuid: `/${user.username}/Desktop`,
-            appdata_uuid: `/${user.username}/AppData`,
-            documents_uuid: `/${user.username}/Documents`,
-            pictures_uuid: `/${user.username}/Pictures`,
-            videos_uuid: `/${user.username}/Videos`,
-            trash_uuid: `/${user.username}/Trash`,
-        };
-        for (const k in nameToProp) {
-            directories[nameToProp[k]] = user[k];
-        }
-        details.directories = directories;
-    }
-
-    // The team an account belongs to, when it is one a team pays for. User
-    // actors only, and only where teams are on.
-    if (isUser && extension.config.teams_enabled === true) {
-        try {
-            const seat = await stores.team.getOrgSeat(user.id);
-            if (seat) {
-                details.team = {
-                    uid: seat.team_uid,
-                    name: seat.team_name ?? null,
-                };
-            }
-        } catch (e) {
-            // Never fail whoami over this; the account still works without it.
-            console.warn('[whoami] team lookup failed:', (e as Error).message);
-        }
-    }
-
-    // Last activity
-    const lastActivityTs = toUnixSeconds(user.last_activity_ts);
-    if (lastActivityTs !== undefined) {
-        details.last_activity_ts = lastActivityTs;
-    }
+    const details = await buildUserDetails(
+        user,
+        { config: extension.config, clients, stores, services },
+        { isUser, iconSize, noIcons: !iconSize },
+    );
+    details.human_readable_age = user.timestamp
+        ? timeago.format(new Date(user.timestamp as string))
+        : null;
 
     // Strip sensitive fields for app actors
     if (!isUser) {
-        const canReadEmail = await services.permission
-            .check(actor, `user:${user.uuid}:email:read`)
-            .catch(() => false);
-        if (!canReadEmail) {
+        const emailReadable = await (user.uuid === actor.user.uuid
+            ? emailCheck
+            : canReadEmail(user.uuid));
+        if (!emailReadable) {
             delete details.email;
             delete details.unconfirmed_email;
         }
@@ -325,7 +121,8 @@ export const handleWhoami = async (
     }
 
     const subscription = details.subscription as
-        { offering?: Record<string, unknown> } | undefined;
+        | { offering?: Record<string, unknown> }
+        | undefined;
     if (subscription?.offering) {
         delete subscription.offering.group;
         delete subscription.offering.benefits;

package.json

@@ -77,7 +77,7 @@
     "@aws-sdk/s3-request-presigner": "^3.1028.0",
     "dedent": "^1.5.3",
     "javascript-time-ago": "^2.5.11",
-    "libphonenumber-js": "1.13.14",
+    "libphonenumber-js": "1.13.15",
     "miniflare": "^4.20260617.1",
     "open": "^10.1.0"
   },

src/backend/TeamsOptional.test.ts

@@ -0,0 +1,135 @@
+/*
+ * 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,
+            {} as never,
+        );
+        const params = JSON.parse(
+            /gui\((\{.*?\})\);/s.exec(html)![1].replaceAll('\\u003c', '<'),
+        );
+        expect(params.teams_ui).toBe(false);
+    });
+});

src/backend/clients/alarm/AlarmClient.test.ts

@@ -1,5 +1,9 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { AlarmClient } from './AlarmClient';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import {
+    ALARM_IDLE_TTL_MS,
+    AlarmClient,
+    MAX_TRACKED_ALARMS,
+} from './AlarmClient';
 import type { IConfig, IPagerConfig } from '../../types';
 import type { AlertPayload } from './types';
 
@@ -342,6 +346,19 @@ describe('AlarmClient alarm registry', () => {
         expect(client.get(shortId)).toBeUndefined();
     });
 
+    it('keeps the short id of another alarm that shares it when one is cleared', () => {
+        const client = makeClient();
+        // These two ids hash to the same short id.
+        client.create('alarm:274', 'first');
+        const shortId = client.get('alarm:274')!.shortId;
+        client.create('alarm:643', 'second');
+        expect(client.get('alarm:643')!.shortId).toBe(shortId);
+
+        client.clear('alarm:274');
+
+        expect(client.get(shortId)?.id).toBe('alarm:643');
+    });
+
     it('ignores a clear for an alarm that is not active', () => {
         const client = makeClient();
         expect(() => client.clear('never-raised')).not.toThrow();
@@ -428,6 +445,110 @@ describe('AlarmClient alarm registry', () => {
     });
 });
 
+describe('AlarmClient alarm eviction', () => {
+    beforeEach(() => {
+        vi.useFakeTimers();
+        vi.spyOn(console, 'error').mockImplementation(() => {});
+        vi.spyOn(console, 'warn').mockImplementation(() => {});
+        vi.spyOn(console, 'log').mockImplementation(() => {});
+    });
+
+    afterEach(() => {
+        vi.useRealTimers();
+    });
+
+    it('forgets alarms that stay quiet past the idle window, under both ids', () => {
+        const client = makeClient();
+        const ids = Array.from(
+            { length: 50 },
+            (_, i) => `metering_usage_dropped:user-${i}`,
+        );
+        for (const id of ids) client.create(id, 'usage dropped');
+        const shortIds = ids.map((id) => client.get(id)!.shortId);
+
+        vi.advanceTimersByTime(ALARM_IDLE_TTL_MS + 1);
+        client.create('unrelated', 'the next alarm sweeps the registry');
+
+        expect(ids.filter((id) => client.get(id))).toEqual([]);
+        expect(shortIds.filter((shortId) => client.get(shortId))).toEqual([]);
+        expect(client.get('unrelated')).toBeDefined();
+    });
+
+    it('treats a recurrence after the idle window as a new alarm', () => {
+        const client = makeClient();
+        const seen = capture(client);
+
+        client.create('scan:failed', 'first');
+        client.create('scan:failed', 'second');
+        vi.advanceTimersByTime(ALARM_IDLE_TTL_MS + 1);
+        client.create('scan:failed', 'back again');
+
+        expect(seen.at(-1)).toMatchObject({ repeatCount: 1, isRepeat: false });
+        // A fresh start keeps per-occurrence incident keys from colliding.
+        expect(seen.at(-1)!.dedupKey).not.toBe(seen[0].dedupKey);
+    });
+
+    it('still treats a repeat inside the window as a repeat after a sweep', () => {
+        const client = makeClient();
+        const seen = capture(client);
+
+        for (let i = 0; i < 10; i++) client.create('flap', 'same fault');
+        vi.advanceTimersByTime(ALARM_IDLE_TTL_MS - 1000);
+        client.create('other', 'sweeps the registry');
+        client.create('flap', 'same fault');
+
+        // Occurrence 11 is past the burst, so nothing new goes out for it.
+        expect(seen.map((alert) => alert.id)).toEqual([
+            ...Array(10).fill('flap'),
+            'other',
+        ]);
+        expect(client.get('flap')?.count).toBe(11);
+    });
+
+    it('keeps an alarm that keeps recurring for longer than the window', () => {
+        const client = makeClient();
+
+        for (let i = 0; i < 6; i++) {
+            client.create('hot', 'still broken');
+            vi.advanceTimersByTime(ALARM_IDLE_TTL_MS / 2);
+            client.create(`noise:${i}`, 'sweeps the registry');
+        }
+
+        expect(client.get('hot')?.count).toBe(6);
+    });
+
+    it('drops the least recently raised alarm once full', () => {
+        const client = makeClient();
+
+        for (let i = 0; i < MAX_TRACKED_ALARMS; i++) {
+            client.create(`user:${i}`, 'per-user alarm');
+            vi.advanceTimersByTime(1);
+        }
+        // Raised again, so user:1 is now the one seen longest ago.
+        client.create('user:0', 'per-user alarm');
+        client.create('one-more', 'over the cap');
+
+        expect(client.get('user:1')).toBeUndefined();
+        expect(client.get('user:0')?.count).toBe(2);
+        expect(client.get('user:2')).toBeDefined();
+        expect(client.get('one-more')).toBeDefined();
+    });
+
+    it('never holds more than the cap', () => {
+        const client = makeClient();
+        const ids = Array.from(
+            { length: MAX_TRACKED_ALARMS * 3 },
+            (_, i) => `user:${i}`,
+        );
+
+        for (const id of ids) client.create(id, 'per-user alarm');
+
+        const held = ids.filter((id) => client.get(id));
+        expect(held).toHaveLength(MAX_TRACKED_ALARMS);
+        expect(held[0]).toBe(`user:${MAX_TRACKED_ALARMS * 2}`);
+    });
+});
+
 describe('AlarmClient known-error rules', () => {
     beforeEach(() => {
         vi.spyOn(console, 'error').mockImplementation(() => {});

src/backend/clients/alarm/AlarmClient.ts

@@ -61,14 +61,24 @@ interface RegisteredHandler {
 /** Severity used when neither the call site nor config picks one. */
 const FALLBACK_SEVERITY: PagerSeverity = 'critical';
 /**
- * How many recent occurrences an alarm keeps. An alarm is never cleared unless
- * something calls `clear`, and a hot one repeats for as long as the fault lasts
- * — so retaining every occurrence means retaining every message and field set
- * it was ever raised with, request bodies and actors included, for the life of
- * the process. The last few are what a human reads; the rest is only a count,
- * and `count` keeps that.
+ * How many recent occurrences an alarm keeps. A hot alarm repeats for as long
+ * as the fault lasts, so retaining every occurrence means retaining every
+ * message and field set it was ever raised with, request bodies and actors
+ * included. The last few are what a human reads; the rest is only a count, and
+ * `count` keeps that.
  */
 const OCCURRENCE_HISTORY_LIMIT = 20;
+/**
+ * An alarm that hasn't recurred for this long is forgotten; its next occurrence
+ * is a new alarm with a fresh count. Kept far past the chat transport's repeat
+ * throttle so a slowly recurring fault still counts as one alarm.
+ */
+export const ALARM_IDLE_TTL_MS = 24 * 60 * 60 * 1000;
+/**
+ * Most alarms held at once. Ids that embed a user or key can outrun the idle
+ * window; past this the least recently raised alarm is dropped.
+ */
+export const MAX_TRACKED_ALARMS = 1000;
 
 // A fast-recurring fault repeats far faster than it is useful to report, and
 // every report allocates a log line and a payload. Report every occurrence up
@@ -187,6 +197,7 @@ function cleanFields(fields: AlarmFields): Record<string, string> {
  * `pager.severityOverrides` in {@link IConfig}.
  */
 export class AlarmClient extends PuterClient {
+    /** Ordered by last occurrence: a repeat moves its alarm to the back. */
     private alarms = new Map<string, Alarm>();
     private aliases = new Map<string, Alarm>();
     private alertHandlers: RegisteredHandler[] = [];
@@ -290,7 +301,8 @@ export class AlarmClient extends PuterClient {
 
     /**
      * Create or update an alarm. If the alarm ID already exists, the occurrence
-     * count is incremented and a repeat alert is dispatched.
+     * count is incremented and a repeat alert is dispatched. An alarm idle for
+     * {@link ALARM_IDLE_TTL_MS} is forgotten, so its next occurrence is new.
      *
      * `severity` decides where the alarm lands:
      *
@@ -321,9 +333,12 @@ export class AlarmClient extends PuterClient {
             return;
         }
 
+        this.evict();
         const existing = this.alarms.get(id);
 
         if (existing) {
+            this.alarms.delete(id);
+            this.alarms.set(id, existing);
             this.recordOccurrence(existing, message, fields);
             this.handleRepeat(existing);
             return;
@@ -348,6 +363,7 @@ export class AlarmClient extends PuterClient {
         this.alarms.set(id, alarm);
         this.aliases.set(alarm.shortId, alarm);
         this.recordOccurrence(alarm, message, fields);
+        this.evict();
         this.handleNew(alarm);
     }
 
@@ -356,8 +372,7 @@ export class AlarmClient extends PuterClient {
         const alarm = this.alarms.get(id);
         if (!alarm) return;
 
-        this.alarms.delete(id);
-        this.aliases.delete(alarm.shortId);
+        this.forget(alarm);
         console.log(`[alarm] CLEAR ${displayId(alarm)} :: ${alarm.message}`);
     }
 
@@ -395,6 +410,32 @@ export class AlarmClient extends PuterClient {
 
     // -- Internals ----------------------------------------------------
 
+    /**
+     * Drop idle alarms, then the least recently raised ones past the cap. The
+     * map's order puts both at the front, so this stops at the first keeper.
+     */
+    private evict(): void {
+        const now = Date.now();
+        for (const alarm of this.alarms.values()) {
+            const lastSeen = alarm.timestamps.at(-1) ?? alarm.started;
+            if (
+                this.alarms.size <= MAX_TRACKED_ALARMS &&
+                now - lastSeen < ALARM_IDLE_TTL_MS
+            ) {
+                return;
+            }
+            this.forget(alarm);
+        }
+    }
+
+    private forget(alarm: Alarm): void {
+        this.alarms.delete(alarm.id);
+        // Short ids can collide; leave an alias that now names another alarm.
+        if (this.aliases.get(alarm.shortId) === alarm) {
+            this.aliases.delete(alarm.shortId);
+        }
+    }
+
     private recordOccurrence(
         alarm: Alarm,
         message: string,

src/backend/clients/alarm/slack.ts

@@ -18,6 +18,7 @@
  */
 
 import type { ISlackAlertConfig, PagerSeverity } from '../../types';
+import { BoundedTtlMap } from '../../util/boundedTtlMap';
 import type { AlertHandler, AlertPayload } from './types';
 
 const REQUEST_TIMEOUT_MS = 5000;
@@ -123,30 +124,14 @@ export function createSlackAlertHandler(
 ): AlertHandler {
     const webhookUrl = conf.webhookUrl as string;
     const throttleMs = conf.repeatThrottleMs ?? DEFAULT_REPEAT_THROTTLE_MS;
-    const lastPosted = new Map<string, number>();
-
-    const shouldPost = (alert: AlertPayload): boolean => {
-        if (throttleMs <= 0) return true;
-        const now = Date.now();
-        const previous = lastPosted.get(alert.id);
-        if (previous !== undefined && now - previous < throttleMs) return false;
-
-        if (lastPosted.size >= MAX_THROTTLE_ENTRIES) {
-            for (const [id, at] of lastPosted) {
-                if (now - at >= throttleMs) lastPosted.delete(id);
-            }
-            // Still full of live entries — drop the oldest to stay bounded.
-            if (lastPosted.size >= MAX_THROTTLE_ENTRIES) {
-                const oldest = lastPosted.keys().next().value;
-                if (oldest !== undefined) lastPosted.delete(oldest);
-            }
-        }
-        lastPosted.set(alert.id, now);
-        return true;
-    };
+    // A zero or negative throttle expires every entry on arrival.
+    const lastPosted = new BoundedTtlMap<string, true>({
+        maxEntries: MAX_THROTTLE_ENTRIES,
+        ttlMs: throttleMs,
+    });
 
     return async (alert) => {
-        if (!shouldPost(alert)) return;
+        if (!lastPosted.shouldEmit(alert.id)) return;
 
         const controller = new AbortController();
         const timer = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);

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

@@ -45,10 +45,15 @@ class FixtureDatabaseClient extends AbstractDatabaseClient {
     constructor(
         private readonly replicaRows: Record<string, unknown>[] | Error,
         private readonly primaryRows: Record<string, unknown>[] = [],
+        private readonly replica = true,
     ) {
         super(config('fixture'));
     }
 
+    protected override hasReadReplica(): boolean {
+        return this.replica;
+    }
+
     override async read(query: string): Promise<Record<string, unknown>[]> {
         this.reads.push(query);
         if (this.replicaRows instanceof Error) throw this.replicaRows;
@@ -127,14 +132,22 @@ describe('AbstractDatabaseClient — replica-aware reads', () => {
         ]);
     });
 
-    it('names the failing query when a required read finds nothing', async () => {
-        const client = new FixtureDatabaseClient([], []);
-        await expect(
-            client.requireRead('SELECT * FROM `user` WHERE `id` = ?'),
-        ).rejects.toThrow(
-            'required read returned no rows: SELECT * FROM `user` WHERE `id` = ?',
+    it('surfaces the primary error when both reads fail', async () => {
+        const client = new FixtureDatabaseClient(new Error('replica down'));
+        client.pread = async () => {
+            throw new Error('primary down');
+        };
+        await expect(client.tryHardRead('SELECT 1')).rejects.toThrow(
+            'primary down',
         );
     });
+
+    it('issues a single read when there is no replica', async () => {
+        const client = new FixtureDatabaseClient([], [{ id: 2 }], false);
+        await expect(client.tryHardRead('SELECT 1')).resolves.toEqual([]);
+        expect(client.reads).toEqual(['SELECT 1']);
+        expect(client.preads).toEqual([]);
+    });
 });
 
 describe('AbstractDatabaseClient — SQL generation', () => {
@@ -235,6 +248,25 @@ describe('AbstractDatabaseClient — SQL generation', () => {
         expect(mysql().returningIdClause()).toBe('');
     });
 
+    it('stamps a timestamp from unix seconds in each dialect', () => {
+        expect(sqlite().timestampFromUnixSql()).toBe(
+            "datetime(?, 'unixepoch')",
+        );
+        expect(mysql().timestampFromUnixSql()).toBe('FROM_UNIXTIME(?)');
+        expect(postgres().timestampFromUnixSql()).toBe('to_timestamp(?)');
+    });
+
+    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');
+        expect(mysql().timestampValue(seconds)).toEqual(
+            new Date(seconds * 1000),
+        );
+        expect(postgres().timestampValue(seconds)).toEqual(
+            new Date(seconds * 1000),
+        );
+    });
+
     it('falls back to `otherwise` for an engine with no explicit choice', () => {
         const client = new FixtureDatabaseClient([]);
         expect(

src/backend/clients/database/DatabaseClient.ts

@@ -17,13 +17,23 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+import { readdirSync, readFileSync } from 'fs';
+import { isAbsolute, resolve as resolvePath } from 'path';
 import type { IConfig } from '../../types';
+import { Span } from '../../util/span.js';
 import { PuterClient } from '../types';
+import { compareMigrationFilenames } from './migrationFilenames.js';
 
 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 {
@@ -33,6 +43,12 @@ export interface BatchEntry {
 
 type SqlJsonPath = readonly [string, ...string[]];
 
+/** The slice of a pooled connection that migrations need. */
+export interface MigrationConnection {
+    query(sql: string): Promise<unknown>;
+    release(): void;
+}
+
 /**
  * Base database client. Subclasses must override every method that throws here.
  *
@@ -104,39 +120,133 @@ export class AbstractDatabaseClient extends PuterClient {
         return this.write(sql, values);
     }
 
+    /** Whether `read()` goes to a separate replica rather than the primary. */
+    protected hasReadReplica(): boolean {
+        return false;
+    }
+
     /**
-     * Like `read()` but falls back to the primary when read-replicas are in
-     * use. Subclasses may override with replica-aware logic; the default
-     * delegates to `pread()`.
+     * The replica leg of `tryHardRead`. Override when `read()` falls back to
+     * the primary by itself, or a replica failure reads the primary twice.
      */
+    protected replicaRead(
+        query: string,
+        params: unknown[],
+    ): Promise<Record<string, unknown>[]> {
+        return this.read(query, params);
+    }
+
+    /**
+     * 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. 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[] = [],
     ): Promise<Record<string, unknown>[]> {
-        const primary = this.pread(query, params);
-        primary.catch(() => {});
+        if (!this.hasReadReplica()) return this.read(query, params);
 
+        const primary = settle(this.pread(query, params));
         try {
-            const rows = await this.read(query, params);
-            if (rows.length > 0) {
-                return rows;
-            }
+            const rows = await this.replicaRead(query, params);
+            if (rows.length > 0) return rows;
         } catch {
             // replica failed — fall through to primary
         }
-        return primary;
+        const result = await primary;
+        if ('error' in result) throw result.error;
+        return result.value;
     }
 
-    /** Like `tryHardRead()` but throws when the result set is empty. */
-    async requireRead(
-        query: string,
-        params: unknown[] = [],
-    ): Promise<Record<string, unknown>[]> {
-        const rows = await this.tryHardRead(query, params);
-        if (rows.length === 0) {
-            throw new Error(`required read returned no rows: ${query}`);
+    /**
+     * Apply the `.sql` files named `<engineName>*` in each configured migration
+     * directory, in filename order. Files must be idempotent: nothing records
+     * which ones already ran. A failure aborts startup. `transactional` wraps
+     * each file in BEGIN/COMMIT, for engines whose DDL can roll back.
+     */
+    protected async applyMigrationPaths(
+        connect: () => Promise<MigrationConnection>,
+        splitStatements: (contents: string) => string[],
+        { transactional }: { transactional: boolean },
+    ): Promise<void> {
+        const paths = this.config.database?.migrationPaths;
+        if (!paths || paths.length === 0) return;
+
+        const tag = `[${this.engineName}]`;
+        const conn = await connect();
+        try {
+            for (const rawPath of paths) {
+                const dir = isAbsolute(rawPath)
+                    ? rawPath
+                    : resolvePath(process.cwd(), rawPath);
+
+                let files: string[];
+                try {
+                    files = readdirSync(dir)
+                        .filter(
+                            (f) =>
+                                f.endsWith('.sql') &&
+                                f.startsWith(this.engineName),
+                        )
+                        .sort(compareMigrationFilenames);
+                } catch (e) {
+                    throw new Error(
+                        `${tag} migration path is unreadable: ${dir}`,
+                        {
+                            cause: e,
+                        },
+                    );
+                }
+
+                if (files.length === 0) {
+                    console.log(`${tag} no migrations in ${dir}`);
+                    continue;
+                }
+
+                console.log(
+                    `${tag} running migrations from ${dir}: ${files.length} file(s)`,
+                );
+
+                for (const file of files) {
+                    const contents = readFileSync(
+                        resolvePath(dir, file),
+                        'utf8',
+                    );
+                    const statements = splitStatements(contents);
+                    if (transactional) await conn.query('BEGIN');
+                    try {
+                        for (let i = 0; i < statements.length; i++) {
+                            try {
+                                await conn.query(statements[i]);
+                            } catch (e) {
+                                throw new Error(
+                                    `${tag} failed to apply ${file} at statement ${i}`,
+                                    { cause: e },
+                                );
+                            }
+                        }
+                        if (transactional) await conn.query('COMMIT');
+                    } catch (e) {
+                        if (transactional) {
+                            try {
+                                await conn.query('ROLLBACK');
+                            } catch {
+                                // the original failure is the one worth surfacing
+                            }
+                        }
+                        throw e;
+                    }
+                    console.log(
+                        `${tag} applied ${file} (${statements.length} statements)`,
+                    );
+                }
+            }
+        } finally {
+            conn.release();
         }
-        return rows;
     }
 
     /**
@@ -226,6 +336,30 @@ 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');
@@ -240,7 +374,43 @@ export class AbstractDatabaseClient extends PuterClient {
         });
     }
 
+    /**
+     * A timestamp column value from one bound parameter in unix seconds, stored
+     * the way `CURRENT_TIMESTAMP` would store that instant.
+     */
+    timestampFromUnixSql(): string {
+        return this.case({
+            sqlite: "datetime(?, 'unixepoch')",
+            postgres: 'to_timestamp(?)',
+            otherwise: 'FROM_UNIXTIME(?)',
+        });
+    }
+
+    /**
+     * 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
+     * zone (so this matches when node and the database session share one).
+     */
+    timestampValue(seconds: number): Date | string {
+        const date = new Date(seconds * 1000);
+        return this.case<Date | string>({
+            sqlite: date.toISOString().slice(0, 19).replace('T', ' '),
+            otherwise: date,
+        });
+    }
+
     protected sqlStringLiteral(value: string): string {
         return `'${value.replaceAll("'", "''")}'`;
     }
 }
+
+/** Await later without an unhandled rejection in the meantime. */
+const settle = async <T>(
+    promise: Promise<T>,
+): Promise<{ value: T } | { error: unknown }> => {
+    try {
+        return { value: await promise };
+    } catch (error) {
+        return { error };
+    }
+};

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

@@ -435,6 +435,105 @@ 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];
@@ -472,6 +571,23 @@ 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({});
@@ -619,6 +735,21 @@ describe('MySQLDatabaseClient — tryHardRead', () => {
             { from: 'primary' },
         ]);
     });
+
+    it('reads the primary once when the replica fails in a way read() fails over on', async () => {
+        const replica = {
+            execute: vi.fn().mockRejectedValue(codedError('dbBatchFailed')),
+        };
+        const primary = {
+            execute: vi.fn().mockResolvedValue([[{ from: 'primary' }]]),
+        };
+        const client = makeClient({ replica, primary });
+
+        await expect(client.tryHardRead('SELECT 1')).resolves.toEqual([
+            { from: 'primary' },
+        ]);
+        expect(primary.execute).toHaveBeenCalledTimes(1);
+    });
 });
 
 describe('MySQLDatabaseClient — migrations', () => {
@@ -696,46 +827,6 @@ describe('MySQLDatabaseClient — migrations', () => {
 });
 
 describe('MySQLDatabaseClient — pool lifecycle', () => {
-    it('replaces and closes the previous primary pool on reinit', async () => {
-        const client = await startClient();
-        const original = createdPools[0];
-
-        client.reinitPrimary();
-
-        expect(createdPools).toHaveLength(2);
-        expect(original.ended).toBe(true);
-        // Single-node: the replica batcher must follow the new primary.
-        createdPools[1].respond = () => rowSets([{ from: 'new-primary' }]);
-        await expect(client.read('SELECT 1')).resolves.toEqual([
-            { from: 'new-primary' },
-        ]);
-    });
-
-    it('replaces only the replica pool on replica reinit', async () => {
-        const client = await startClient({ replica: { host: 'replica' } });
-        const [primary, originalReplica] = createdPools;
-
-        client.reinitReplica();
-
-        expect(createdPools).toHaveLength(3);
-        expect(originalReplica.ended).toBe(true);
-        expect(primary.ended).toBe(false);
-    });
-
-    it('ignores a replica reinit when no replica is configured', async () => {
-        const client = await startClient();
-        client.reinitReplica();
-        expect(createdPools).toHaveLength(1);
-    });
-
-    it('ignores reinit once shutdown has started', async () => {
-        const client = await startClient();
-        await client.onServerPrepareShutdown();
-        client.reinitPrimary();
-        expect(createdPools).toHaveLength(1);
-        await client.onServerShutdown();
-    });
-
     it('closes both pools on shutdown when a replica is configured', async () => {
         const client = await startClient({ replica: { host: 'replica' } });
         await client.onServerShutdown();
@@ -779,108 +870,3 @@ describe('MySQLDatabaseClient — pool lifecycle', () => {
         await expect(client.onServerShutdown()).rejects.toThrow('end exploded');
     });
 });
-
-describe('MySQLDatabaseClient.readWithRetry', () => {
-    const codedFailure = (code: string) => {
-        const err = new Error(code) as Error & { code: string };
-        err.code = code;
-        return err;
-    };
-
-    it('classifies transient connection failures as retriable', () => {
-        expect(
-            MySQLDatabaseClient.isRetriableError(codedFailure('ECONNRESET')),
-        ).toBe(true);
-        expect(
-            MySQLDatabaseClient.isRetriableError(codedFailure('ER_DUP_ENTRY')),
-        ).toBe(false);
-        expect(
-            MySQLDatabaseClient.isRetriableError(new Error('Connection lost')),
-        ).toBe(true);
-    });
-
-    it('retries a transient failure and returns the eventual result', async () => {
-        const client = await startClient();
-        let attempts = 0;
-        const operation = vi.fn(async () => {
-            attempts += 1;
-            if (attempts < 3) throw codedFailure('PROTOCOL_CONNECTION_LOST');
-            return [{ ok: 1 }];
-        });
-
-        await expect(
-            client.readWithRetry('health', operation, { baseBackoffMs: 0 }),
-        ).resolves.toEqual([{ ok: 1 }]);
-        expect(operation).toHaveBeenCalledTimes(3);
-    });
-
-    it('gives up after the attempt budget is spent', async () => {
-        const client = await startClient();
-        const operation = vi.fn(async () => {
-            throw codedFailure('ETIMEDOUT');
-        });
-
-        await expect(
-            client.readWithRetry('health', operation, {
-                maxAttempts: 2,
-                baseBackoffMs: 0,
-            }),
-        ).rejects.toMatchObject({ code: 'ETIMEDOUT' });
-        expect(operation).toHaveBeenCalledTimes(2);
-    });
-
-    it('never retries a deterministic SQL error', async () => {
-        const client = await startClient();
-        const operation = vi.fn(async () => {
-            throw codedFailure('ER_PARSE_ERROR');
-        });
-
-        await expect(
-            client.readWithRetry('health', operation, { baseBackoffMs: 0 }),
-        ).rejects.toMatchObject({ code: 'ER_PARSE_ERROR' });
-        expect(operation).toHaveBeenCalledTimes(1);
-    });
-
-    it('stops retrying once shutdown has started', async () => {
-        const client = await startClient();
-        await client.onServerPrepareShutdown();
-        const operation = vi.fn(async () => {
-            throw codedFailure('ECONNRESET');
-        });
-
-        await expect(
-            client.readWithRetry('health', operation, { baseBackoffMs: 0 }),
-        ).rejects.toMatchObject({ code: 'ECONNRESET' });
-        expect(operation).toHaveBeenCalledTimes(1);
-        await client.onServerShutdown();
-    });
-
-    it('applies jittered exponential backoff capped at maxBackoffMs', async () => {
-        const client = await startClient();
-        const delays: number[] = [];
-        const realSetTimeout = globalThis.setTimeout;
-        const timeoutSpy = vi
-            .spyOn(globalThis, 'setTimeout')
-            .mockImplementation(((fn: () => void, ms?: number) => {
-                delays.push(ms ?? 0);
-                return realSetTimeout(fn, 0);
-            }) as typeof setTimeout);
-
-        try {
-            const operation = vi.fn(async () => {
-                throw codedFailure('ECONNRESET');
-            });
-            await expect(
-                client.readWithRetry('health', operation, {
-                    maxAttempts: 4,
-                    baseBackoffMs: 100,
-                    maxBackoffMs: 150,
-                    jitterRatio: 0,
-                }),
-            ).rejects.toMatchObject({ code: 'ECONNRESET' });
-            expect(delays).toEqual([100, 150, 150]);
-        } finally {
-            timeoutSpy.mockRestore();
-        }
-    });
-});

src/backend/clients/database/MySQLDatabaseClient.ts

@@ -17,8 +17,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { readdirSync, readFileSync } from 'fs';
-import { isAbsolute, resolve as resolvePath } from 'path';
 import { metrics } from '@opentelemetry/api';
 import { createPool, ExecuteValues, type Pool } from 'mysql2';
 import { Span } from '../../util/span.js';
@@ -26,7 +24,6 @@ import { AbstractDatabaseClient, type WriteResult } from './DatabaseClient';
 import { SQLBatcher } from './SQLBatcher.js';
 import { isRetriableError } from './retriableErrors.js';
 import { splitMysqlStatements } from './splitMysqlStatements.js';
-import { compareMigrationFilenames } from './migrationFilenames.js';
 import type { IConfig } from '../../types';
 
 const DEFAULT_SELECT_TIMEOUT_MS = 30_000;
@@ -40,7 +37,7 @@ const replicaFailoverCounter = metrics
             'Reads that failed on the replica batcher and were retried on the primary',
     });
 
-export { compareMigrationFilenames };
+export { compareMigrationFilenames } from './migrationFilenames.js';
 
 type PoolConfig = Parameters<typeof createPool>[0];
 
@@ -81,8 +78,13 @@ 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);
+        this.dbPrimaryRead = this.createPrimaryReadBatcher(
+            this.primaryPool,
+            primaryReadFlushes,
+        );
 
         if (dbConf.replica) {
             this.replicaPool = this.createPool(dbConf.replica);
@@ -93,17 +95,26 @@ export class MySQLDatabaseClient extends AbstractDatabaseClient {
             this.configuration = Configuration.SINGLE;
         }
 
-        this.dbReplica = this.createReplicaBatcher(this.replicaPool);
+        this.dbReplica = this.createReplicaBatcher(
+            this.replicaPool,
+            this.configuration === Configuration.SINGLE
+                ? primaryReadFlushes
+                : { count: 0 },
+        );
 
-        await this.runMigrations();
+        await this.applyMigrationPaths(
+            () => this.primaryPool.promise().getConnection(),
+            splitMysqlStatements,
+            { transactional: false },
+        );
     }
 
     override async onServerPrepareShutdown(): Promise<void> {
         if (this.shutdownStarted) return;
         this.shutdownStarted = true;
 
-        // Blocks reinitPrimary/reinitReplica from here on. Pools stay open;
-        // onServerShutdown closes them after the layers above have drained.
+        // Pools stay open; onServerShutdown closes them after the layers
+        // above have drained.
         console.log('[mysql] entering drain mode');
     }
 
@@ -163,12 +174,14 @@ 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,
         };
     }
 
@@ -200,101 +213,18 @@ export class MySQLDatabaseClient extends AbstractDatabaseClient {
         }
     }
 
-    @Span('db.tryHardRead', (query: string) => ({ 'db.statement': query }))
-    override async tryHardRead(
-        query: string,
-        params: unknown[] = [],
-    ): Promise<Record<string, unknown>[]> {
-        if (this.configuration === Configuration.SINGLE) {
-            return this.read(query, params);
-        }
-
-        // Run both reads in parallel — prefer replica when it returns rows,
-        // otherwise fall back to primary to handle replication lag.
-        const primaryPromise = this.dbPrimaryRead.execute(query, params);
-        try {
-            const replicaResult = await this.dbReplica.execute(query, params);
-            if (
-                Array.isArray(replicaResult?.[0]) &&
-                (replicaResult[0] as unknown[]).length > 0
-            ) {
-                primaryPromise.catch(() => {}); // suppress unhandled rejection
-                return replicaResult[0] as Record<string, unknown>[];
-            }
-        } catch {
-            // fall through to primary
-        }
-
-        const primaryResult = await primaryPromise;
-        return (primaryResult?.[0] as Record<string, unknown>[]) ?? [];
+    protected override hasReadReplica(): boolean {
+        return this.configuration === Configuration.REPLICA;
     }
 
-    // ------------------------------------------------------------------
-    // Migrations
-    // ------------------------------------------------------------------
-
-    /**
-     * Apply `.sql` files from each configured migration directory in order.
-     * Files within a directory are sorted lexically. Files MUST be idempotent —
-     * there is no per-file applied-state tracking. Failures abort startup so
-     * operators see schema problems loud.
-     */
-    private async runMigrations(): Promise<void> {
-        const paths = this.config.database?.migrationPaths;
-        if (!paths || paths.length === 0) return;
-
-        const conn = await this.primaryPool.promise().getConnection();
-        try {
-            for (const rawPath of paths) {
-                const dir = isAbsolute(rawPath)
-                    ? rawPath
-                    : resolvePath(process.cwd(), rawPath);
-
-                let files: string[];
-                try {
-                    files = readdirSync(dir)
-                        .filter(
-                            (f) => f.endsWith('.sql') && f.startsWith('mysql'),
-                        )
-                        .sort(compareMigrationFilenames);
-                } catch (e) {
-                    throw new Error(
-                        `[mysql] migration path is unreadable: ${dir}`,
-                        { cause: e },
-                    );
-                }
-
-                if (files.length === 0) {
-                    console.log(`[mysql] no migrations in ${dir}`);
-                    continue;
-                }
-
-                console.log(
-                    `[mysql] running migrations from ${dir}: ${files.length} file(s)`,
-                );
-
-                for (const file of files) {
-                    const filePath = resolvePath(dir, file);
-                    const contents = readFileSync(filePath, 'utf8');
-                    const statements = splitMysqlStatements(contents);
-                    for (let i = 0; i < statements.length; i++) {
-                        try {
-                            await conn.query(statements[i]);
-                        } catch (e) {
-                            throw new Error(
-                                `[mysql] failed to apply ${file} at statement ${i}`,
-                                { cause: e },
-                            );
-                        }
-                    }
-                    console.log(
-                        `[mysql] applied ${file} (${statements.length} statements)`,
-                    );
-                }
-            }
-        } finally {
-            conn.release();
-        }
+    // No failover: `tryHardRead` already has a primary read in flight.
+    protected override async replicaRead(
+        query: string,
+        params: unknown[],
+    ): Promise<Record<string, unknown>[]> {
+        const result = await this.dbReplica.execute(query, params);
+        if (!result) return [];
+        return (result[0] as Record<string, unknown>[]) ?? [];
     }
 
     // ------------------------------------------------------------------
@@ -356,9 +286,14 @@ export class MySQLDatabaseClient extends AbstractDatabaseClient {
     }
 
     /** Reads that must see the primary, still coalesced. */
-    private createPrimaryReadBatcher(pool: Pool): SQLBatcher {
+    private createPrimaryReadBatcher(
+        pool: Pool,
+        inFlight: { count: number },
+    ): SQLBatcher {
         return new SQLBatcher(pool, {
             maxTimeInQueue: 30,
+            maxInFlightImmediate: 8,
+            inFlight,
             maxBatchSize: 5,
             poolLabel: 'primary',
             readOnly: true,
@@ -366,9 +301,14 @@ export class MySQLDatabaseClient extends AbstractDatabaseClient {
         });
     }
 
-    private createReplicaBatcher(pool: Pool): SQLBatcher {
+    private createReplicaBatcher(
+        pool: Pool,
+        inFlight: { count: number },
+    ): SQLBatcher {
         return new SQLBatcher(pool, {
             maxTimeInQueue: 10,
+            maxInFlightImmediate: 8,
+            inFlight,
             maxBatchSize: 5,
             poolLabel: 'replica',
             readOnly: true,
@@ -376,57 +316,6 @@ export class MySQLDatabaseClient extends AbstractDatabaseClient {
         });
     }
 
-    /** Reinitialize the primary pool (e.g. after a health-check failure). */
-    reinitPrimary(): void {
-        if (this.shutdownStarted) return;
-
-        const dbConf = this.config.database!;
-        const previous = this.primaryPool;
-        this.primaryPool = this.createPool({
-            host: dbConf.host ?? '127.0.0.1',
-            port: dbConf.port ?? 3306,
-            user: dbConf.user ?? 'root',
-            password: dbConf.password ?? '',
-            database: dbConf.database ?? 'puter',
-        });
-        this.db = this.createPrimaryBatcher(this.primaryPool);
-        this.dbPrimaryRead = this.createPrimaryReadBatcher(this.primaryPool);
-
-        if (this.configuration === Configuration.SINGLE) {
-            this.replicaPool = this.primaryPool;
-            this.dbReplica = this.createReplicaBatcher(this.primaryPool);
-        }
-
-        if (previous && previous !== this.primaryPool) {
-            this.closePool(previous, 'reinit:primary').catch(() => {});
-        }
-    }
-
-    /** Reinitialize the replica pool. */
-    reinitReplica(): void {
-        if (this.shutdownStarted || !this.config.database?.replica) return;
-
-        const previous = this.replicaPool;
-        this.replicaPool = this.createPool(this.config.database.replica);
-        this.dbReplica = this.createReplicaBatcher(this.replicaPool);
-
-        if (
-            previous &&
-            previous !== this.replicaPool &&
-            previous !== this.primaryPool
-        ) {
-            this.closePool(previous, 'reinit:replica').catch(() => {});
-        }
-    }
-
-    // ------------------------------------------------------------------
-    // Retry helpers (for health checks or resilient reads)
-    // ------------------------------------------------------------------
-
-    static isRetriableError(error: unknown): boolean {
-        return isRetriableError(error);
-    }
-
     /**
      * Replica failures worth retrying on the primary: batcher load-shed or
      * transient connection errors — never deterministic SQL errors.
@@ -436,52 +325,6 @@ export class MySQLDatabaseClient extends AbstractDatabaseClient {
         return code === 'dbBatchFailed' || isRetriableError(error);
     }
 
-    async readWithRetry(
-        label: string,
-        operation: () => Promise<unknown[]>,
-        opts?: {
-            maxAttempts?: number;
-            baseBackoffMs?: number;
-            maxBackoffMs?: number;
-            jitterRatio?: number;
-        },
-    ): Promise<unknown[]> {
-        const maxAttempts = opts?.maxAttempts ?? 3;
-        const baseBackoffMs = opts?.baseBackoffMs ?? 100;
-        const maxBackoffMs = opts?.maxBackoffMs ?? 500;
-        const jitterRatio = opts?.jitterRatio ?? 0.2;
-
-        let attempt = 1;
-
-        while (true) {
-            try {
-                return await operation();
-            } catch (error) {
-                if (this.shutdownStarted) throw error;
-                if (
-                    attempt >= maxAttempts ||
-                    !MySQLDatabaseClient.isRetriableError(error)
-                )
-                    throw error;
-
-                const raw = baseBackoffMs * 2 ** (attempt - 1);
-                const capped = Math.min(maxBackoffMs, raw);
-                const window = Math.round(capped * jitterRatio);
-                const jitter =
-                    window === 0
-                        ? 0
-                        : Math.floor(Math.random() * (window * 2 + 1)) - window;
-                const delay = Math.max(0, capped + jitter);
-
-                console.warn(
-                    `[${label}] transient mysql error (${(error as { code?: string })?.code ?? 'unknown'}); retry ${attempt + 1}/${maxAttempts} in ${delay}ms`,
-                );
-                await new Promise((r) => setTimeout(r, delay));
-                attempt++;
-            }
-        }
-    }
-
     // ------------------------------------------------------------------
     // Internal pool lifecycle
     // ------------------------------------------------------------------

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

@@ -28,6 +28,20 @@ import {
     type PostgresPoolClient,
 } from './PostgresDatabaseClient.js';
 
+// Pass-through spy: the rewrite is pure, so its call count shows the memo.
+const { rewriteSpy } = vi.hoisted(() => ({ rewriteSpy: vi.fn() }));
+vi.mock('./preparePostgresSql.js', async (importOriginal) => {
+    const actual =
+        await importOriginal<typeof import('./preparePostgresSql.js')>();
+    return {
+        ...actual,
+        preparePostgresSql: (sql: string) => {
+            rewriteSpy(sql);
+            return actual.preparePostgresSql(sql);
+        },
+    };
+});
+
 type QueryCall = {
     text: string;
     values?: unknown[];
@@ -167,6 +181,23 @@ describe('PostgresDatabaseClient', () => {
         });
     });
 
+    it('rewrites a repeated query once', async () => {
+        const pool = new RecordingPool();
+        const client = new PostgresDatabaseClient(postgresConfig(), () => pool);
+        await client.onServerStart();
+        const query = 'SELECT `name` FROM `apps` WHERE `id` = ?';
+        rewriteSpy.mockClear();
+
+        await client.read(query, [1]);
+        await client.pread(query, [2]);
+        await client.write(query, [3]);
+
+        expect(rewriteSpy).toHaveBeenCalledTimes(1);
+        expect(pool.calls.slice(-3).map((c) => c.text)).toEqual(
+            Array(3).fill('SELECT "name" FROM "apps" WHERE "id" = $1'),
+        );
+    });
+
     it('normalizes int8 fields on read and primary read rows', async () => {
         const pool = new RecordingPool(
             new RecordingPoolClient(),

src/backend/clients/database/PostgresDatabaseClient.ts

@@ -17,16 +17,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { readdirSync, readFileSync } from 'fs';
-import { isAbsolute, resolve as resolvePath } from 'path';
 import { Pool, type PoolConfig, type QueryResult } from 'pg';
+import { BoundedTtlMap } from '../../util/boundedTtlMap.js';
 import { Span } from '../../util/span.js';
 import {
     AbstractDatabaseClient,
     type BatchEntry,
     type WriteResult,
 } from './DatabaseClient';
-import { compareMigrationFilenames } from './migrationFilenames.js';
 import { preparePostgresSql } from './preparePostgresSql.js';
 import { splitPostgresStatements } from './splitPostgresStatements.js';
 import type { IConfig } from '../../types';
@@ -62,6 +60,7 @@ enum Configuration {
 }
 
 const POSTGRES_INT8_OID = 20;
+const PREPARED_SQL_CACHE_SIZE = 1000;
 const INTEGER_TEXT_PATTERN = /^-?\d+$/u;
 
 const normalizePostgresInt8 = (
@@ -138,6 +137,10 @@ export class PostgresDatabaseClient extends AbstractDatabaseClient {
     private replicaPool!: PostgresPool;
     private configuration = Configuration.SINGLE;
     private shutdownStarted = false;
+    /** Query text as written → its Postgres rewrite, which is pure. */
+    private readonly preparedSql = new BoundedTtlMap<string, string>({
+        maxEntries: PREPARED_SQL_CACHE_SIZE,
+    });
 
     constructor(
         config: IConfig,
@@ -164,7 +167,11 @@ export class PostgresDatabaseClient extends AbstractDatabaseClient {
             this.configuration = Configuration.SINGLE;
         }
 
-        await this.runMigrations();
+        await this.applyMigrationPaths(
+            () => this.primaryPool.connect(),
+            splitPostgresStatements,
+            { transactional: true },
+        );
     }
 
     override async onServerPrepareShutdown(): Promise<void> {
@@ -248,98 +255,8 @@ export class PostgresDatabaseClient extends AbstractDatabaseClient {
         }
     }
 
-    @Span('db.tryHardRead', (query: string) => ({ 'db.statement': query }))
-    override async tryHardRead(
-        query: string,
-        params: unknown[] = [],
-    ): Promise<Record<string, unknown>[]> {
-        if (this.configuration === Configuration.SINGLE) {
-            return this.read(query, params);
-        }
-
-        const primaryPromise = this.query(this.primaryPool, query, params);
-        try {
-            const replicaResult = await this.query(
-                this.replicaPool,
-                query,
-                params,
-            );
-            if (replicaResult.rows.length > 0) {
-                primaryPromise.catch(() => {});
-                return normalizePostgresRows(replicaResult);
-            }
-        } catch {
-            // fall through to primary
-        }
-
-        const primaryResult = await primaryPromise;
-        return normalizePostgresRows(primaryResult);
-    }
-
-    private async runMigrations(): Promise<void> {
-        const paths = this.config.database?.migrationPaths;
-        if (!paths || paths.length === 0) return;
-
-        const conn = await this.primaryPool.connect();
-        try {
-            for (const rawPath of paths) {
-                const dir = isAbsolute(rawPath)
-                    ? rawPath
-                    : resolvePath(process.cwd(), rawPath);
-
-                let files: string[];
-                try {
-                    files = readdirSync(dir)
-                        .filter(
-                            (f) =>
-                                f.endsWith('.sql') && f.startsWith('postgres'),
-                        )
-                        .sort(compareMigrationFilenames);
-                } catch (e) {
-                    throw new Error(
-                        `[postgres] migration path is unreadable: ${dir}`,
-                        { cause: e },
-                    );
-                }
-
-                if (files.length === 0) {
-                    console.log(`[postgres] no migrations in ${dir}`);
-                    continue;
-                }
-
-                console.log(
-                    `[postgres] running migrations from ${dir}: ${files.length} file(s)`,
-                );
-
-                for (const file of files) {
-                    const filePath = resolvePath(dir, file);
-                    const contents = readFileSync(filePath, 'utf8');
-                    const statements = splitPostgresStatements(contents);
-                    await conn.query('BEGIN');
-                    try {
-                        for (let i = 0; i < statements.length; i++) {
-                            try {
-                                await conn.query(statements[i]);
-                            } catch (e) {
-                                throw new Error(
-                                    `[postgres] failed to apply ${file} at statement ${i}`,
-                                    { cause: e },
-                                );
-                            }
-                        }
-                        await conn.query('COMMIT');
-                    } catch (e) {
-                        await conn.query('ROLLBACK').catch(() => {});
-                        throw e;
-                    }
-                    console.log(
-                        `[postgres] applied ${file} (${statements.length} statements)`,
-                    );
-                }
-            }
-        } finally {
-            conn.release();
-        }
+    protected override hasReadReplica(): boolean {
+        return this.configuration === Configuration.REPLICA;
     }
 
     private createPool(dbConf: PostgresEndpointConfig): PostgresPool {
@@ -366,8 +283,12 @@ export class PostgresDatabaseClient extends AbstractDatabaseClient {
         query: string,
         params: unknown[] = [],
     ): Promise<QueryResult> {
-        const prepared = preparePostgresSql(query);
-        return target.query(prepared.text, params);
+        let text = this.preparedSql.get(query);
+        if (text === undefined) {
+            text = preparePostgresSql(query).text;
+            this.preparedSql.set(query, text);
+        }
+        return target.query(text, params);
     }
 
     private async closeCurrentPools(): Promise<void> {

src/backend/clients/database/SQLBatcher.js

@@ -76,6 +76,7 @@ const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 export class SQLBatcher {
     dbPool;
     maxTimeInQueue;
+    maxInFlightImmediate;
     maxBatchSize;
     maxQueueSize;
     failureThreshold;
@@ -84,7 +85,9 @@ export class SQLBatcher {
     readOnly;
     acquireTimeoutMs;
     queue = [];
-    timeouts = [];
+    #flushTimer = null;
+    #flushTimerIsImmediate = false;
+    #inFlight;
     #consecutiveFailures = 0;
     #lastFailureAt = 0;
     #metricAttrs;
@@ -93,6 +96,11 @@ 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
@@ -111,6 +119,8 @@ export class SQLBatcher {
         dbPool,
         {
             maxTimeInQueue = 20,
+            maxInFlightImmediate = 0,
+            inFlight = { count: 0 },
             maxBatchSize = 50,
             maxQueueSize = DEFAULT_MAX_QUEUE_SIZE,
             failureThreshold = DEFAULT_FAILURE_THRESHOLD,
@@ -122,6 +132,8 @@ export class SQLBatcher {
     ) {
         this.dbPool = dbPool;
         this.maxTimeInQueue = maxTimeInQueue;
+        this.maxInFlightImmediate = maxInFlightImmediate;
+        this.#inFlight = inFlight;
         this.maxBatchSize = maxBatchSize;
         this.maxQueueSize = maxQueueSize;
         this.failureThreshold = failureThreshold;
@@ -185,17 +197,34 @@ export class SQLBatcher {
 
         if (this.queue.length >= this.maxBatchSize) {
             this.flush(this.queue.splice(0, this.maxBatchSize));
-        } else if (this.queue.length === 1) {
-            this.timeouts.push(
-                setTimeout(() => {
-                    this.flush(this.queue.splice(0, this.queue.length));
-                }, this.maxTimeInQueue),
-            );
+        } else if (this.#flushTimer === null) {
+            this.#armFlushTimer();
         }
 
         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.
@@ -252,12 +281,18 @@ export class SQLBatcher {
     }
 
     async flush(batch) {
-        const timeout = this.timeouts.shift();
-        if (timeout && !timeout._destroyed) {
-            clearTimeout(timeout);
-        }
+        this.#clearFlushTimer();
         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,6 +69,356 @@ 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 = 86;
+const CURRENT_SCHEMA_VERSION = 90;
 
 /**
  * These suites migrate real files on disk. Idle they finish in well under a
@@ -930,6 +930,7 @@ describe('SqliteDatabaseClient — query interface', () => {
             affectedRows: 1,
             anyRowsAffected: true,
         });
+        expect(inserted).not.toHaveProperty('warningStatus');
 
         const missed = await client.write(
             'UPDATE `widget` SET `name` = ? WHERE `id` = ?',
@@ -1038,8 +1039,7 @@ describe('SqliteDatabaseClient — query interface', () => {
 });
 
 // Single-node engines have no replica to race, so `tryHardRead` must not
-// issue the query twice — the base-class default fires `pread()` and
-// `read()` in parallel, which on sqlite is the same connection.
+// issue the query twice on the one connection.
 describe('SqliteDatabaseClient — tryHardRead', () => {
     let client: SqliteDatabaseClient;
 
@@ -1078,20 +1078,50 @@ describe('SqliteDatabaseClient — tryHardRead', () => {
         expect(readSpy).toHaveBeenCalledTimes(1);
         expect(preadSpy).not.toHaveBeenCalled();
     });
+});
 
-    it('throws from requireRead when nothing matches', async () => {
-        await expect(
-            client.requireRead(
-                'SELECT `name` FROM `widget` WHERE `id` = ?',
-                [42],
-            ),
-        ).rejects.toThrow('required read returned no rows');
+describe('SqliteDatabaseClient — prepared statements', () => {
+    let client: SqliteDatabaseClient;
+    let prepare: ReturnType<typeof vi.spyOn>;
+
+    beforeEach(async () => {
+        client = await bootClient();
+        await client.write(
+            'CREATE TABLE `widget` (`id` INTEGER PRIMARY KEY, `name` TEXT)',
+        );
+        // better-sqlite3 is the driver boundary; count compilations there.
+        const db = (client as unknown as { db: Database.Database }).db;
+        prepare = vi.spyOn(db, 'prepare');
     });
 
-    it('returns the rows from requireRead when something matches', async () => {
-        await client.write('INSERT INTO `widget` (`name`) VALUES (?)', ['ok']);
-        await expect(
-            client.requireRead('SELECT `name` FROM `widget`'),
-        ).resolves.toEqual([{ name: 'ok' }]);
+    afterEach(() => {
+        client.onServerShutdown();
+    });
+
+    it('compiles a repeated query once', async () => {
+        const insert = 'INSERT INTO `widget` (`name`) VALUES (?)';
+        await client.write(insert, ['a']);
+        await client.write(insert, ['b']);
+        await client.batchWrite([{ statement: insert, values: ['c'] }]);
+        const select = 'SELECT `name` FROM `widget` ORDER BY `id`';
+        await client.read(select);
+
+        await expect(client.read(select)).resolves.toEqual([
+            { name: 'a' },
+            { name: 'b' },
+            { name: 'c' },
+        ]);
+        expect(prepare).toHaveBeenCalledTimes(2);
+    });
+
+    it('keeps serving a cached query after the schema changes', async () => {
+        const select = 'SELECT * FROM `widget`';
+        await client.write('INSERT INTO `widget` (`name`) VALUES (?)', ['a']);
+        await client.read(select);
+        await client.write('ALTER TABLE `widget` ADD COLUMN `size` INTEGER');
+
+        await expect(client.read(select)).resolves.toEqual([
+            { id: 1, name: 'a', size: null },
+        ]);
     });
 });

src/backend/clients/database/SqliteDatabaseClient.ts

@@ -21,10 +21,15 @@ import { existsSync, mkdirSync, readFileSync } from 'fs';
 import { basename, dirname, extname, join, resolve } from 'path';
 import { createContext, runInContext } from 'vm';
 import type { IConfig } from '../../types';
+import { BoundedTtlMap } from '../../util/boundedTtlMap.js';
 import { Span } from '../../util/span.js';
 import { AbstractDatabaseClient, type WriteResult } from './DatabaseClient';
 
 const MIGRATIONS_DIR = resolve(__dirname, './migrations/sqlite');
+const STATEMENT_CACHE_SIZE = 1000;
+
+type SqliteDatabase = InstanceType<typeof import('better-sqlite3')>;
+type SqliteStatement = import('better-sqlite3').Statement<unknown[]>;
 
 /**
  * Ordered list of [threshold_version, files[]] pairs. A database whose
@@ -120,13 +125,21 @@ const AVAILABLE_MIGRATIONS: [number, string[]][] = [
     [83, ['0088_apps-index-url.sql']],
     [84, ['0089_team-require-2fa.sql']],
     [85, ['0090_user-app-permission-index.sql']],
+    [86, ['0091_icloud-dot-significance.sql']],
+    [87, ['0092_share-entry-owner.sql']],
+    [88, ['0093_fsentries-parent-uid-index.sql']],
+    [89, ['0094_deleted-apps.sql']],
 ];
 
 export class SqliteDatabaseClient extends AbstractDatabaseClient {
     override readonly engineName = 'sqlite';
 
     // better-sqlite3 instance — set during onServerStart
-    private db!: InstanceType<typeof import('better-sqlite3')>;
+    private db!: SqliteDatabase;
+    /** Prepared statements by query text; SQLite re-prepares on schema change. */
+    private readonly statements = new BoundedTtlMap<string, SqliteStatement>({
+        maxEntries: STATEMENT_CACHE_SIZE,
+    });
 
     constructor(config: IConfig) {
         super(config);
@@ -148,12 +161,14 @@ export class SqliteDatabaseClient extends AbstractDatabaseClient {
             mkdirSync(dirname(dbPath), { recursive: true });
         }
 
+        this.statements.clear();
         this.db = new Database(dbPath);
 
         await this.runMigrations(isNew);
     }
 
     override onServerShutdown(): void {
+        this.statements.clear();
         if (this.db) {
             this.db.close();
         }
@@ -168,12 +183,9 @@ export class SqliteDatabaseClient extends AbstractDatabaseClient {
         query: string,
         params: unknown[] = [],
     ): Promise<Record<string, unknown>[]> {
-        query = this.transformQuery(query);
-        params = this.transformParams(params);
-        return this.db.prepare(query).all(...params) as Record<
-            string,
-            unknown
-        >[];
+        return this.prepare(query).all(
+            ...this.transformParams(params),
+        ) as Record<string, unknown>[];
     }
 
     override async pread(
@@ -184,30 +196,20 @@ export class SqliteDatabaseClient extends AbstractDatabaseClient {
         return this.read(query, params);
     }
 
-    override async tryHardRead(
-        query: string,
-        params: unknown[] = [],
-    ): Promise<Record<string, unknown>[]> {
-        // No replica to race, so the base class's parallel
-        // primary-plus-replica read would run the same statement twice on
-        // the one connection.
-        return this.read(query, params);
-    }
-
     @Span('db.write', (query: string) => ({ 'db.statement': query }))
     override async write(
         query: string,
         params: unknown[] = [],
     ): Promise<WriteResult> {
-        query = this.transformQuery(query);
-        params = this.transformParams(params);
-
-        const info = this.db.prepare(query).run(...params);
+        const info = this.prepare(query).run(...this.transformParams(params));
 
         return {
             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.
         };
     }
 
@@ -218,10 +220,8 @@ export class SqliteDatabaseClient extends AbstractDatabaseClient {
         entries: { statement: string; values: unknown[] }[],
     ): Promise<void> {
         this.db.transaction(() => {
-            for (let { statement, values } of entries) {
-                statement = this.transformQuery(statement);
-                values = this.transformParams(values);
-                this.db.prepare(statement).run(...values);
+            for (const { statement, values } of entries) {
+                this.prepare(statement).run(...this.transformParams(values));
             }
         })();
     }
@@ -230,6 +230,15 @@ export class SqliteDatabaseClient extends AbstractDatabaseClient {
     // SQLite-specific transforms
     // ------------------------------------------------------------------
 
+    private prepare(query: string): SqliteStatement {
+        let statement = this.statements.get(query);
+        if (!statement) {
+            statement = this.db.prepare(this.transformQuery(query));
+            this.statements.set(query, statement);
+        }
+        return statement;
+    }
+
     private transformQuery(query: string): string {
         return query.replace(/now\(\)/gi, "datetime('now')");
     }

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

@@ -0,0 +1,49 @@
+-- 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/>.
+
+-- Recompute `clean_email` for Apple's domains: dots are significant there, so
+-- rows written while they were stripped still collapse two mailboxes into one.
+-- Only rows still holding exactly what the old rule produced, so a NULL or a
+-- legacy un-lowercased value is left alone -- rewriting those would fold `+tag`
+-- or case into a key another row already owns. Restores dots and nothing else.
+
+UPDATE `user`
+SET `clean_email` = CONCAT(SUBSTRING_INDEX(SUBSTRING_INDEX(LOWER(`email`), '@', 1), '+', 1), '@', SUBSTRING_INDEX(LOWER(`email`), '@', -1))
+WHERE `email` IS NOT NULL
+  AND LOCATE('@', `email`) > 1
+  AND (
+        LOWER(`email`) LIKE '%@icloud.com'
+     OR LOWER(`email`) LIKE '%@me.com'
+     OR LOWER(`email`) LIKE '%@mac.com'
+  )
+  AND `clean_email` = CONCAT(REPLACE(SUBSTRING_INDEX(SUBSTRING_INDEX(LOWER(`email`), '@', 1), '+', 1), '.', ''), '@', SUBSTRING_INDEX(LOWER(`email`), '@', -1))
+  AND `clean_email` <> CONCAT(SUBSTRING_INDEX(SUBSTRING_INDEX(LOWER(`email`), '@', 1), '+', 1), '@', SUBSTRING_INDEX(LOWER(`email`), '@', -1));
+
+-- The same collapse decided who a pending invite belongs to, so the holder
+-- of the undotted address claims invites addressed to the dotted one. The
+-- typed address rides along as `invitedAddress` whenever it differed.
+UPDATE `share`
+SET `recipient_email` = CONCAT(SUBSTRING_INDEX(SUBSTRING_INDEX(LOWER(JSON_UNQUOTE(JSON_EXTRACT(`data`, '$.invitedAddress'))), '@', 1), '+', 1), '@', SUBSTRING_INDEX(LOWER(JSON_UNQUOTE(JSON_EXTRACT(`data`, '$.invitedAddress'))), '@', -1))
+WHERE JSON_UNQUOTE(JSON_EXTRACT(`data`, '$.invitedAddress')) IS NOT NULL
+  AND LOCATE('@', JSON_UNQUOTE(JSON_EXTRACT(`data`, '$.invitedAddress'))) > 1
+  AND (
+        LOWER(`recipient_email`) LIKE '%@icloud.com'
+     OR LOWER(`recipient_email`) LIKE '%@me.com'
+     OR LOWER(`recipient_email`) LIKE '%@mac.com'
+  )
+  AND `recipient_email` = CONCAT(REPLACE(SUBSTRING_INDEX(SUBSTRING_INDEX(LOWER(JSON_UNQUOTE(JSON_EXTRACT(`data`, '$.invitedAddress'))), '@', 1), '+', 1), '.', ''), '@', SUBSTRING_INDEX(LOWER(JSON_UNQUOTE(JSON_EXTRACT(`data`, '$.invitedAddress'))), '@', -1))
+  AND `recipient_email` <> CONCAT(SUBSTRING_INDEX(SUBSTRING_INDEX(LOWER(JSON_UNQUOTE(JSON_EXTRACT(`data`, '$.invitedAddress'))), '@', 1), '+', 1), '@', SUBSTRING_INDEX(LOWER(JSON_UNQUOTE(JSON_EXTRACT(`data`, '$.invitedAddress'))), '@', -1));

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

@@ -0,0 +1,52 @@
+-- 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 owner of the shared entry, recorded on the share row. Mirrors SQLite
+-- migration 0092. Guarded like mysql_mig_45, because there is no per-file
+-- applied-state tracking and a replay must do nothing.
+
+DROP PROCEDURE IF EXISTS _puter_add_share_entry_owner;
+DELIMITER //
+CREATE PROCEDURE _puter_add_share_entry_owner()
+BEGIN
+  IF NOT EXISTS (
+    SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'share'
+      AND COLUMN_NAME = 'entry_owner_user_id'
+  ) THEN
+    ALTER TABLE `share` ADD COLUMN `entry_owner_user_id` BIGINT DEFAULT NULL;
+  END IF;
+  IF NOT EXISTS (
+    SELECT 1 FROM INFORMATION_SCHEMA.STATISTICS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'share'
+      AND INDEX_NAME = 'idx_share_entry_owner'
+  ) THEN
+    ALTER TABLE `share` ADD INDEX `idx_share_entry_owner` (`entry_owner_user_id`, `id`);
+  END IF;
+END//
+DELIMITER ;
+
+CALL _puter_add_share_entry_owner();
+
+DROP PROCEDURE IF EXISTS _puter_add_share_entry_owner;
+
+UPDATE `share` JOIN `fsentries` ON `fsentries`.`id` = `share`.`fsentry_id`
+SET `share`.`entry_owner_user_id` = `fsentries`.`user_id`
+WHERE `share`.`fsentry_id` IS NOT NULL
+  AND `share`.`entry_owner_user_id` IS NULL;

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

@@ -0,0 +1,26 @@
+-- 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/postgres/postgres_mig_35.sql

@@ -0,0 +1,49 @@
+-- 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/>.
+
+-- Recompute `clean_email` for Apple's domains: dots are significant there, so
+-- rows written while they were stripped still collapse two mailboxes into one.
+-- Only rows still holding exactly what the old rule produced, so a NULL or a
+-- legacy un-lowercased value is left alone -- rewriting those would fold `+tag`
+-- or case into a key another row already owns. Restores dots and nothing else.
+
+UPDATE "user"
+SET clean_email = (split_part(split_part(lower(email), '@', 1), '+', 1) || '@' || split_part(lower(email), '@', 2))
+WHERE email IS NOT NULL
+  AND position('@' in email) > 1
+  AND (
+        lower(email) LIKE '%@icloud.com'
+     OR lower(email) LIKE '%@me.com'
+     OR lower(email) LIKE '%@mac.com'
+  )
+  AND clean_email = (replace(split_part(split_part(lower(email), '@', 1), '+', 1), '.', '') || '@' || split_part(lower(email), '@', 2))
+  AND clean_email IS DISTINCT FROM (split_part(split_part(lower(email), '@', 1), '+', 1) || '@' || split_part(lower(email), '@', 2));
+
+-- The same collapse decided who a pending invite belongs to, so the holder
+-- of the undotted address claims invites addressed to the dotted one. The
+-- typed address rides along as `invitedAddress` whenever it differed.
+UPDATE "share"
+SET recipient_email = (split_part(split_part(lower((data->>'invitedAddress')), '@', 1), '+', 1) || '@' || split_part(lower((data->>'invitedAddress')), '@', 2))
+WHERE (data->>'invitedAddress') IS NOT NULL
+  AND position('@' in (data->>'invitedAddress')) > 1
+  AND (
+        lower(recipient_email) LIKE '%@icloud.com'
+     OR lower(recipient_email) LIKE '%@me.com'
+     OR lower(recipient_email) LIKE '%@mac.com'
+  )
+  AND recipient_email = (replace(split_part(split_part(lower((data->>'invitedAddress')), '@', 1), '+', 1), '.', '') || '@' || split_part(lower((data->>'invitedAddress')), '@', 2))
+  AND recipient_email IS DISTINCT FROM (split_part(split_part(lower((data->>'invitedAddress')), '@', 1), '+', 1) || '@' || split_part(lower((data->>'invitedAddress')), '@', 2));

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

@@ -0,0 +1,32 @@
+-- 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 owner of the shared entry, recorded on the share row. Mirrors SQLite
+-- migration 0092. Guarded like mysql_mig_45, because there is no per-file
+-- applied-state tracking and a replay must do nothing.
+
+ALTER TABLE "share" ADD COLUMN IF NOT EXISTS entry_owner_user_id BIGINT DEFAULT NULL;
+
+CREATE INDEX IF NOT EXISTS idx_share_entry_owner
+    ON "share" (entry_owner_user_id, id);
+
+UPDATE "share"
+SET entry_owner_user_id = f.user_id
+FROM fsentries f
+WHERE f.id = "share".fsentry_id
+  AND "share".fsentry_id IS NOT NULL
+  AND "share".entry_owner_user_id IS NULL;

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

@@ -0,0 +1,26 @@
+-- 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/sqlite/0091_icloud-dot-significance.sql

@@ -0,0 +1,73 @@
+-- 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/>.
+
+-- Recompute `clean_email` for Apple's domains: dots are significant there, so
+-- rows written while they were stripped still collapse two mailboxes into one.
+-- Only rows still holding exactly what the old rule produced, so a NULL or a
+-- legacy un-lowercased value is left alone -- rewriting those would fold `+tag`
+-- or case into a key another row already owns. Restores dots and nothing else.
+
+UPDATE `user`
+SET `clean_email` = (CASE WHEN instr(substr(lower(`email`), 1, instr(`email`, '@') - 1), '+') > 0
+             THEN substr(substr(lower(`email`), 1, instr(`email`, '@') - 1), 1,
+                         instr(substr(lower(`email`), 1, instr(`email`, '@') - 1), '+') - 1)
+             ELSE substr(lower(`email`), 1, instr(`email`, '@') - 1)
+        END || substr(lower(`email`), instr(`email`, '@')))
+WHERE `email` IS NOT NULL
+  AND instr(`email`, '@') > 1
+  AND (
+        lower(`email`) LIKE '%@icloud.com'
+     OR lower(`email`) LIKE '%@me.com'
+     OR lower(`email`) LIKE '%@mac.com'
+  )
+  AND `clean_email` = (replace(CASE WHEN instr(substr(lower(`email`), 1, instr(`email`, '@') - 1), '+') > 0
+             THEN substr(substr(lower(`email`), 1, instr(`email`, '@') - 1), 1,
+                         instr(substr(lower(`email`), 1, instr(`email`, '@') - 1), '+') - 1)
+             ELSE substr(lower(`email`), 1, instr(`email`, '@') - 1)
+        END, '.', '') || substr(lower(`email`), instr(`email`, '@')))
+  AND `clean_email` <> (CASE WHEN instr(substr(lower(`email`), 1, instr(`email`, '@') - 1), '+') > 0
+             THEN substr(substr(lower(`email`), 1, instr(`email`, '@') - 1), 1,
+                         instr(substr(lower(`email`), 1, instr(`email`, '@') - 1), '+') - 1)
+             ELSE substr(lower(`email`), 1, instr(`email`, '@') - 1)
+        END || substr(lower(`email`), instr(`email`, '@')));
+
+-- The same collapse decided who a pending invite belongs to, so the holder
+-- of the undotted address claims invites addressed to the dotted one. The
+-- typed address rides along as `invitedAddress` whenever it differed.
+UPDATE `share`
+SET `recipient_email` = (CASE WHEN instr(substr(lower(json_extract(`data`, '$.invitedAddress')), 1, instr(json_extract(`data`, '$.invitedAddress'), '@') - 1), '+') > 0
+             THEN substr(substr(lower(json_extract(`data`, '$.invitedAddress')), 1, instr(json_extract(`data`, '$.invitedAddress'), '@') - 1), 1,
+                         instr(substr(lower(json_extract(`data`, '$.invitedAddress')), 1, instr(json_extract(`data`, '$.invitedAddress'), '@') - 1), '+') - 1)
+             ELSE substr(lower(json_extract(`data`, '$.invitedAddress')), 1, instr(json_extract(`data`, '$.invitedAddress'), '@') - 1)
+        END || substr(lower(json_extract(`data`, '$.invitedAddress')), instr(json_extract(`data`, '$.invitedAddress'), '@')))
+WHERE json_extract(`data`, '$.invitedAddress') IS NOT NULL
+  AND instr(json_extract(`data`, '$.invitedAddress'), '@') > 1
+  AND (
+        lower(`recipient_email`) LIKE '%@icloud.com'
+     OR lower(`recipient_email`) LIKE '%@me.com'
+     OR lower(`recipient_email`) LIKE '%@mac.com'
+  )
+  AND `recipient_email` = (replace(CASE WHEN instr(substr(lower(json_extract(`data`, '$.invitedAddress')), 1, instr(json_extract(`data`, '$.invitedAddress'), '@') - 1), '+') > 0
+             THEN substr(substr(lower(json_extract(`data`, '$.invitedAddress')), 1, instr(json_extract(`data`, '$.invitedAddress'), '@') - 1), 1,
+                         instr(substr(lower(json_extract(`data`, '$.invitedAddress')), 1, instr(json_extract(`data`, '$.invitedAddress'), '@') - 1), '+') - 1)
+             ELSE substr(lower(json_extract(`data`, '$.invitedAddress')), 1, instr(json_extract(`data`, '$.invitedAddress'), '@') - 1)
+        END, '.', '') || substr(lower(json_extract(`data`, '$.invitedAddress')), instr(json_extract(`data`, '$.invitedAddress'), '@')))
+  AND `recipient_email` <> (CASE WHEN instr(substr(lower(json_extract(`data`, '$.invitedAddress')), 1, instr(json_extract(`data`, '$.invitedAddress'), '@') - 1), '+') > 0
+             THEN substr(substr(lower(json_extract(`data`, '$.invitedAddress')), 1, instr(json_extract(`data`, '$.invitedAddress'), '@') - 1), 1,
+                         instr(substr(lower(json_extract(`data`, '$.invitedAddress')), 1, instr(json_extract(`data`, '$.invitedAddress'), '@') - 1), '+') - 1)
+             ELSE substr(lower(json_extract(`data`, '$.invitedAddress')), 1, instr(json_extract(`data`, '$.invitedAddress'), '@') - 1)
+        END || substr(lower(json_extract(`data`, '$.invitedAddress')), instr(json_extract(`data`, '$.invitedAddress'), '@')));

src/backend/clients/database/migrations/sqlite/0092_share-entry-owner.sql

@@ -0,0 +1,40 @@
+-- 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 owner of the shared entry, recorded on the share row.
+--
+-- The outbound listings answer "shares on things I own that someone else
+-- issued" by joining `share` to `fsentries` and filtering on the owner there.
+-- Neither side of that join bounds the work: driven from `fsentries` it walks
+-- every file the user owns, driven from `share` it walks every share until it
+-- has a page. `#outboundAppsSql` has no LIMIT at all.
+--
+-- Written with the row, and re-pointed when a move re-owns the subtree it
+-- names; `FSService.move` does that whenever the destination is someone
+-- else's tree.
+
+ALTER TABLE `share` ADD COLUMN `entry_owner_user_id` INTEGER DEFAULT NULL;
+
+CREATE INDEX IF NOT EXISTS `idx_share_entry_owner`
+    ON `share` (`entry_owner_user_id`, `id`);
+
+UPDATE `share`
+SET `entry_owner_user_id` = (
+        SELECT `user_id` FROM `fsentries` WHERE `fsentries`.`id` = `share`.`fsentry_id`
+    )
+WHERE `fsentry_id` IS NOT NULL
+  AND `entry_owner_user_id` IS NULL;

src/backend/clients/database/migrations/sqlite/0093_fsentries-parent-uid-index.sql

@@ -0,0 +1,22 @@
+-- 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/>.
+
+-- Directory listings and subtree walks (delete, copy) find children by
+-- `parent_uid`, the one link every row carries; with no index each lookup
+-- scans the table. MySQL and Postgres already index it.
+CREATE INDEX IF NOT EXISTS `idx_fsentries_parent_uid`
+    ON `fsentries` (`parent_uid`);

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

@@ -0,0 +1,25 @@
+-- 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/dynamodb/DDBClient.test.ts

@@ -20,7 +20,17 @@
 
 import { createServer, type Server } from 'node:http';
 import type { AddressInfo } from 'node:net';
-import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
+import {
+    afterAll,
+    afterEach,
+    beforeAll,
+    beforeEach,
+    describe,
+    expect,
+    it,
+    type MockInstance,
+    vi,
+} from 'vitest';
 import type { IConfig } from '../../types';
 import { DDBClient } from './DDBClient';
 
@@ -491,6 +501,19 @@ 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({
@@ -763,3 +786,391 @@ describe('DDBClient — unprocessed batch keys', () => {
         ).resolves.toEqual({ Responses: {}, ConsumedCapacity: [] });
     });
 });
+
+// Answers by operation (X-Amz-Target) and records how many requests overlap, so
+// chunk concurrency and the TTL sweep's retries can be asserted.
+describe('DDBClient — batch write chunks and TTL sweep', () => {
+    let server: Server;
+    let endpoint: string;
+    let handlers: Record<string, (body: Record<string, unknown>) => unknown>;
+    let calls: string[];
+    let inFlight = 0;
+    let peakInFlight = 0;
+
+    beforeAll(async () => {
+        server = createServer((req, res) => {
+            let body = '';
+            req.on('data', (chunk) => {
+                body += chunk;
+            });
+            req.on('end', () => {
+                const op = String(req.headers['x-amz-target']).split('.')[1];
+                calls.push(op);
+                inFlight += 1;
+                peakInFlight = Math.max(peakInFlight, inFlight);
+                setTimeout(() => {
+                    inFlight -= 1;
+                    const reply = handlers[op]?.(JSON.parse(body)) ?? {};
+                    const { status = 200, ...payload } = reply as {
+                        status?: number;
+                    };
+                    res.writeHead(status, {
+                        'content-type': 'application/x-amz-json-1.0',
+                    });
+                    res.end(JSON.stringify(payload));
+                }, 20);
+            });
+        });
+        await new Promise<void>((resolve) =>
+            server.listen(0, '127.0.0.1', resolve),
+        );
+        endpoint = `http://127.0.0.1:${(server.address() as AddressInfo).port}`;
+    });
+
+    afterAll(async () => {
+        await new Promise<void>((resolve) => server.close(() => resolve()));
+    });
+
+    beforeEach(() => {
+        calls = [];
+        inFlight = 0;
+        peakInFlight = 0;
+    });
+
+    const stubClient = (extra: Record<string, unknown> = {}) =>
+        new DDBClient({
+            port: 0,
+            extensions: [],
+            dynamo: {
+                aws: { access_key: 'a', secret_key: 'b', region: 'us-west-2' },
+                endpoint,
+                ...extra,
+            },
+        } as unknown as IConfig);
+
+    it('writes chunks concurrently, a bounded number at a time', async () => {
+        handlers = { BatchWriteItem: () => ({ UnprocessedItems: {} }) };
+
+        await stubClient().batchPut(
+            Array.from({ length: 200 }, (_, i) => ({
+                table: TABLE,
+                item: { pk: `item-${i}` },
+            })),
+        );
+
+        expect(calls).toHaveLength(8);
+        expect(peakInFlight).toBeGreaterThan(1);
+        expect(peakInFlight).toBeLessThanOrEqual(4);
+    });
+
+    it('stops starting chunks once one fails', async () => {
+        handlers = {
+            BatchWriteItem: () => ({
+                status: 400,
+                __type: 'com.amazon.coral.validate#ValidationException',
+                message: 'bad item',
+            }),
+        };
+
+        await expect(
+            stubClient().batchPut(
+                Array.from({ length: 250 }, (_, i) => ({
+                    table: TABLE,
+                    item: { pk: `item-${i}` },
+                })),
+            ),
+        ).rejects.toThrow('bad item');
+        // The first wave fails; none of the six chunks queued behind it run.
+        expect(calls.length).toBeLessThanOrEqual(4);
+    });
+
+    it('lets chunks already in flight finish before rejecting', async () => {
+        let replies = 0;
+        handlers = {
+            BatchWriteItem: (body) => {
+                replies += 1;
+                if (replies === 1) {
+                    return {
+                        status: 400,
+                        __type: 'com.amazon.coral.validate#ValidationException',
+                        message: 'bad item',
+                    };
+                }
+                // The rest need one retry, so they are still writing when the
+                // failure comes back.
+                return replies <= 4
+                    ? { UnprocessedItems: body.RequestItems }
+                    : { UnprocessedItems: {} };
+            },
+        };
+
+        await expect(
+            stubClient().batchPut(
+                Array.from({ length: 100 }, (_, i) => ({
+                    table: TABLE,
+                    item: { pk: `item-${i}` },
+                })),
+            ),
+        ).rejects.toThrow('bad item');
+        const sentBeforeReject = calls.length;
+        await new Promise((resolve) => setTimeout(resolve, 200));
+
+        // Nothing is written after the caller has seen the error.
+        expect(calls.length).toBe(sentBeforeReject);
+        expect(inFlight).toBe(0);
+    });
+
+    it('retries the unprocessed deletes of the TTL sweep', async () => {
+        const expired = [{ pk: { S: 'old' } }];
+        let batchWrites = 0;
+        handlers = {
+            CreateTable: () => ({
+                status: 400,
+                __type: 'com.amazonaws.dynamodb.v20120810#ResourceInUseException',
+                message: 'Table already exists',
+            }),
+            Scan: () => ({ Items: expired }),
+            BatchWriteItem: (body) => {
+                batchWrites += 1;
+                return batchWrites === 1
+                    ? { UnprocessedItems: body.RequestItems }
+                    : { UnprocessedItems: {} };
+            },
+        };
+
+        await stubClient({ bootstrapTables: true }).createTableIfNotExists(
+            {
+                TableName: TABLE,
+                KeySchema: [{ AttributeName: 'pk', KeyType: 'HASH' }],
+                AttributeDefinitions: [
+                    { AttributeName: 'pk', AttributeType: 'S' },
+                ],
+                BillingMode: 'PAY_PER_REQUEST',
+            },
+            'ttl',
+        );
+
+        expect(calls).toEqual([
+            'CreateTable',
+            'Scan',
+            'BatchWriteItem',
+            'BatchWriteItem',
+        ]);
+    });
+});
+
+// Throttles are a service-side signal the emulator never produces, so these
+// drive the client against a stub answering in DynamoDB's error shape.
+describe('DDBClient — throttle logging', () => {
+    let server: Server;
+    let endpoint: string;
+    let responses: { status: number; body: unknown }[];
+    let warn: MockInstance<typeof console.warn>;
+
+    beforeAll(async () => {
+        server = createServer((req, res) => {
+            req.resume();
+            req.on('end', () => {
+                const next = responses.shift() ?? { status: 200, body: {} };
+                res.writeHead(next.status, {
+                    'content-type': 'application/x-amz-json-1.0',
+                });
+                res.end(JSON.stringify(next.body));
+            });
+        });
+        await new Promise<void>((resolve) =>
+            server.listen(0, '127.0.0.1', resolve),
+        );
+        endpoint = `http://127.0.0.1:${(server.address() as AddressInfo).port}`;
+    });
+
+    afterAll(async () => {
+        await new Promise<void>((resolve) => server.close(() => resolve()));
+    });
+
+    beforeEach(() => {
+        warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+    });
+
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+
+    const stubClient = () =>
+        new DDBClient({
+            port: 0,
+            extensions: [],
+            dynamo: {
+                aws: {
+                    access_key: 'a',
+                    secret_key: 'b',
+                    region: 'eu-central-1',
+                },
+                endpoint,
+            },
+        } as unknown as IConfig);
+
+    const throttled = (reason = 'TableWriteKeyRangeThroughputExceeded') => ({
+        status: 400,
+        body: {
+            __type: 'com.amazonaws.dynamodb.v20120810#ProvisionedThroughputExceededException',
+            message:
+                'The level of configured provisioned throughput for the table was exceeded.',
+            ThrottlingReasons: [
+                {
+                    reason,
+                    resource: `arn:aws:dynamodb:eu-central-1:0:table/${TABLE}`,
+                },
+            ],
+        },
+    });
+    const ok = (body: unknown = {}) => ({ status: 200, body });
+
+    const ddbWarnings = () =>
+        warn.mock.calls
+            .map(([line]) => String(line))
+            .filter((line) => line.startsWith('[ddb] '));
+
+    it('logs the key of a throttled update that succeeds on retry', async () => {
+        responses = [
+            throttled(),
+            ok({
+                Attributes: {
+                    pk: { S: 'hot' },
+                    sk: { S: 'counter' },
+                    v: { N: '1' },
+                },
+            }),
+        ];
+
+        const result = await stubClient().update(
+            TABLE,
+            { pk: 'hot', sk: 'counter' },
+            'SET v = :v',
+            { ':v': 1 },
+        );
+
+        expect(result.Attributes?.v).toBe(1);
+        expect(ddbWarnings()).toEqual([
+            '[ddb] throttled UpdateItem kv-items pk=hot sk=counter in eu-central-1: TableWriteKeyRangeThroughputExceeded',
+        ]);
+    }, 15_000);
+
+    it('logs only the key attributes of a throttled put', async () => {
+        const client = stubClient();
+        // On a managed deployment this creates nothing but learns the key schema.
+        await client.createTableIfNotExists(tableSchema);
+        responses = [throttled(), ok()];
+
+        await client.put(TABLE, {
+            pk: 'user-1',
+            sk: 'settings',
+            secret: 'do-not-log',
+        });
+
+        expect(ddbWarnings()).toEqual([
+            '[ddb] throttled PutItem kv-items pk=user-1 sk=settings in eu-central-1: TableWriteKeyRangeThroughputExceeded',
+        ]);
+        expect(warn.mock.calls.flat().join('\n')).not.toContain('do-not-log');
+    }, 15_000);
+
+    it('logs a hot key once a minute and counts the throttles in between', async () => {
+        const now = vi.spyOn(Date, 'now').mockReturnValue(1_000_000);
+        const client = stubClient();
+        const read = 'TableReadKeyRangeThroughputExceeded';
+
+        responses = [throttled(read), ok(), throttled(read), ok()];
+        await client.get(TABLE, { pk: 'burst', sk: 'a' });
+        await client.get(TABLE, { pk: 'burst', sk: 'a' });
+
+        now.mockReturnValue(1_000_000 + 61_000);
+        responses = [throttled(read), ok()];
+        await client.get(TABLE, { pk: 'burst', sk: 'a' });
+
+        expect(ddbWarnings()).toEqual([
+            `[ddb] throttled GetItem kv-items pk=burst sk=a in eu-central-1: ${read}`,
+            `[ddb] throttled GetItem kv-items pk=burst sk=a in eu-central-1: ${read} (+1 since last logged)`,
+        ]);
+    }, 15_000);
+
+    it('names the partition a throttled query read', async () => {
+        responses = [throttled('IndexReadKeyRangeThroughputExceeded'), ok()];
+
+        await stubClient().query(TABLE, { kind: 'note' }, 0, undefined, GSI);
+
+        expect(ddbWarnings()).toEqual([
+            '[ddb] throttled Query kv-items index=by-kind kind=note in eu-central-1: IndexReadKeyRangeThroughputExceeded',
+        ]);
+    }, 15_000);
+
+    it('names up to five keys of a throttled batch', async () => {
+        responses = [
+            throttled('TableReadKeyRangeThroughputExceeded'),
+            ok({ Responses: {}, UnprocessedKeys: {} }),
+        ];
+
+        await stubClient().batchGet(
+            Array.from({ length: 7 }, (_, index) => ({
+                table: TABLE,
+                items: { pk: `batch-${index}`, sk: 's' },
+            })),
+        );
+
+        expect(ddbWarnings()).toEqual([
+            '[ddb] throttled BatchGetItem kv-items pk=batch-0 sk=s, pk=batch-1 sk=s, pk=batch-2 sk=s, pk=batch-3 sk=s, pk=batch-4 sk=s (+2 more) in eu-central-1: TableReadKeyRangeThroughputExceeded',
+        ]);
+    }, 15_000);
+
+    it('logs batch items DynamoDB hands back unprocessed', async () => {
+        const client = stubClient();
+        await client.createTableIfNotExists(tableSchema);
+        responses = [
+            ok({
+                UnprocessedItems: {
+                    [TABLE]: [
+                        {
+                            PutRequest: {
+                                Item: {
+                                    pk: { S: 'left' },
+                                    sk: { S: 'over' },
+                                    v: { N: '1' },
+                                },
+                            },
+                        },
+                    ],
+                },
+            }),
+            ok({ UnprocessedItems: {} }),
+        ];
+
+        await client.batchPut([
+            { table: TABLE, item: { pk: 'left', sk: 'over', v: 1 } },
+            { table: TABLE, item: { pk: 'done', sk: 'fine', v: 2 } },
+        ]);
+
+        expect(ddbWarnings()).toEqual([
+            '[ddb] unprocessed BatchWriteItem kv-items pk=left sk=over in eu-central-1',
+        ]);
+    });
+
+    it('does not log errors that are not throttles', async () => {
+        responses = [
+            {
+                status: 400,
+                body: {
+                    __type: 'com.amazonaws.dynamodb.v20120810#ConditionalCheckFailedException',
+                    message: 'The conditional request failed',
+                },
+            },
+        ];
+
+        await expect(
+            stubClient().del(
+                TABLE,
+                { pk: 'guarded', sk: 'a' },
+                { condition: { expression: 'attribute_exists(pk)' } },
+            ),
+        ).rejects.toMatchObject({ name: 'ConditionalCheckFailedException' });
+        expect(ddbWarnings()).toEqual([]);
+    });
+});

src/backend/clients/dynamodb/DDBClient.ts

@@ -43,6 +43,12 @@ 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';
 import { PuterClient } from '../types';
 import {
@@ -50,14 +56,15 @@ import {
     isRepairableMarshallError,
     repairForMarshall,
 } from './marshallRepair.js';
+import { attachThrottleLogging } from './throttleLog.js';
 
 const LOCAL_DYNAMO_MEMORY_PREFIX = ':memory:';
 const localDynaliteEndpointPromises = new Map<string, Promise<string>>();
 const MAX_BATCH_WRITE_ITEMS = 25;
-const MAX_BATCH_WRITE_RETRIES = 8;
-const BATCH_WRITE_RETRY_BASE_MS = 25;
-const MAX_BATCH_GET_RETRIES = 8;
-const BATCH_GET_RETRY_BASE_MS = 25;
+// Chunks of one batch write in flight at once.
+const BATCH_WRITE_CONCURRENCY = 4;
+const MAX_BATCH_RETRIES = 8;
+const BATCH_RETRY_BASE_MS = 25;
 
 // In-memory mode gives each DDBClient its own unique key, which keys
 // into a fresh dynalite server. This is what test parallelism needs:
@@ -117,21 +124,45 @@ const chunkValues = <T>(values: T[], size: number): T[][] => {
     return chunks;
 };
 
+type BatchWriteItems = NonNullable<BatchWriteCommandInput['RequestItems']>;
+type WriteRequest = BatchWriteItems[string][number];
+
+/** Consumed capacity summed per table across the requests of one batch. */
+class ConsumedCapacityTally {
+    #byTable = new Map<string, number>();
+
+    add(entries: { TableName?: string; CapacityUnits?: number }[] = []) {
+        for (const { TableName, CapacityUnits } of entries) {
+            if (!TableName) continue;
+            this.#byTable.set(
+                TableName,
+                (this.#byTable.get(TableName) ?? 0) +
+                    Number(CapacityUnits ?? 0),
+            );
+        }
+    }
+
+    entries() {
+        return Array.from(this.#byTable, ([TableName, CapacityUnits]) => ({
+            TableName,
+            CapacityUnits,
+        }));
+    }
+}
+
 const sleep = async (ms: number) => {
     await new Promise((resolve) => setTimeout(resolve, ms));
 };
 
 // One caller writing an out-of-range number usually keeps doing it, so the
 // warning is per-target and throttled rather than one line per write.
-const REPAIR_WARNING_INTERVAL_MS = 60_000;
-const lastRepairWarningAt = new Map<string, number>();
+const repairWarnings = new BoundedTtlMap<string, true>({
+    maxEntries: 1_000,
+    ttlMs: 60_000,
+});
 
 const warnRepaired = (target: string, message: string): void => {
-    const now = Date.now();
-    const lastWarnedAt = lastRepairWarningAt.get(target) ?? 0;
-    if (now - lastWarnedAt < REPAIR_WARNING_INTERVAL_MS) return;
-
-    lastRepairWarningAt.set(target, now);
+    if (!repairWarnings.shouldEmit(target)) return;
     console.warn(
         `[ddb] clamped an out-of-range value in ${target}: ${message}`,
     );
@@ -172,6 +203,7 @@ export class DDBClient extends PuterClient {
     // key per instance so parallel clients don't share state, but
     // `recreateClient()` reuses this same key and so reuses the server.
     #localPathKey: string;
+    #keyNamesByTable = new Map<string, string[]>();
 
     constructor(config: IConfig) {
         super(config);
@@ -255,9 +287,7 @@ export class DDBClient extends PuterClient {
             {} as Record<string, Record<string, unknown>[]>,
         );
 
-        let requestItems: BatchGetCommandInput['RequestItems'] = Object.entries(
-            allRequestItemsPerTable,
-        ).reduce(
+        const requestItems = Object.entries(allRequestItemsPerTable).reduce(
             (acc, [table, keyList]) => {
                 acc[table] = {
                     Keys: keyList,
@@ -270,53 +300,30 @@ export class DDBClient extends PuterClient {
 
         const client = await this.#getDocumentClient();
         const responsesByTable = new Map<string, Record<string, unknown>[]>();
-        const consumedCapacityByTable = new Map<string, number>();
+        const capacity = new ConsumedCapacityTally();
 
-        for (let attempt = 0; attempt <= MAX_BATCH_GET_RETRIES; attempt++) {
-            if (Object.keys(requestItems).length === 0) break;
-
-            const response = await client.send(
-                new BatchGetCommand({
-                    RequestItems: requestItems,
-                    ReturnConsumedCapacity: 'TOTAL',
-                }),
-            );
-
-            for (const [table, items] of Object.entries(
-                response.Responses ?? {},
-            )) {
-                const existing = responsesByTable.get(table) ?? [];
-                existing.push(...items);
-                responsesByTable.set(table, existing);
-            }
-            for (const entry of response.ConsumedCapacity ?? []) {
-                if (!entry.TableName) continue;
-                consumedCapacityByTable.set(
-                    entry.TableName,
-                    (consumedCapacityByTable.get(entry.TableName) ?? 0) +
-                        Number(entry.CapacityUnits ?? 0),
+        const drained = await this.#sendWithUnprocessedRetry(
+            requestItems,
+            async (pending) => {
+                const response = await client.send(
+                    new BatchGetCommand({
+                        RequestItems: pending,
+                        ReturnConsumedCapacity: 'TOTAL',
+                    }),
                 );
-            }
+                for (const [table, items] of Object.entries(
+                    response.Responses ?? {},
+                )) {
+                    const existing = responsesByTable.get(table) ?? [];
+                    existing.push(...items);
+                    responsesByTable.set(table, existing);
+                }
+                capacity.add(response.ConsumedCapacity);
+                return response.UnprocessedKeys as typeof pending | undefined;
+            },
+        );
 
-            const unprocessedKeys = response.UnprocessedKeys ?? {};
-            if (Object.keys(unprocessedKeys).length === 0) {
-                requestItems = {};
-                break;
-            }
-
-            requestItems = unprocessedKeys as NonNullable<
-                BatchGetCommandInput['RequestItems']
-            >;
-            if (attempt < MAX_BATCH_GET_RETRIES) {
-                const delayMs = Math.min(
-                    1000,
-                    BATCH_GET_RETRY_BASE_MS * 2 ** attempt,
-                );
-                await sleep(delayMs);
-            }
-        }
-
-        if (Object.keys(requestItems).length > 0) {
+        if (!drained) {
             throw new HttpError(
                 400,
                 'Failed to batch get all items from DynamoDB',
@@ -326,12 +333,7 @@ export class DDBClient extends PuterClient {
 
         return {
             Responses: Object.fromEntries(responsesByTable),
-            ConsumedCapacity: Array.from(consumedCapacityByTable.entries()).map(
-                ([TableName, CapacityUnits]) => ({
-                    TableName,
-                    CapacityUnits,
-                }),
-            ),
+            ConsumedCapacity: capacity.entries(),
         };
     }
 
@@ -359,122 +361,95 @@ export class DDBClient extends PuterClient {
         );
     }
 
-    // Shared BatchWriteItem plumbing for batchPut/batchDel: 25-item chunks,
-    // UnprocessedItems retried with capped exponential backoff, consumed
-    // capacity accumulated per table across every request.
-    async #batchWrite(
-        params: {
-            table: string;
-            request: NonNullable<
-                BatchWriteCommandInput['RequestItems']
-            >[string][number];
-        }[],
-    ) {
-        const consumedCapacityByTable = new Map<string, number>();
+    // Shared BatchWriteItem plumbing for batchPut/batchDel and the TTL sweep:
+    // 25-item chunks a few at a time, UnprocessedItems retried, consumed
+    // capacity summed per table across every request.
+    async #batchWrite(params: { table: string; request: WriteRequest }[]) {
         if (params.length === 0) {
             return { ConsumedCapacity: [] };
         }
 
-        const accumulateConsumedCapacity = (
-            consumedCapacityEntries:
-                | Array<{ TableName?: string; CapacityUnits?: number }>
-                | undefined,
-        ) => {
-            if (!consumedCapacityEntries) {
-                return;
-            }
-
-            for (const consumedCapacityEntry of consumedCapacityEntries) {
-                const table = consumedCapacityEntry.TableName;
-                if (!table) {
-                    continue;
-                }
-
-                const existingUsage = consumedCapacityByTable.get(table) ?? 0;
-                consumedCapacityByTable.set(
-                    table,
-                    existingUsage +
-                        Number(consumedCapacityEntry.CapacityUnits ?? 0),
-                );
-            }
-        };
-
         const client = await this.#getDocumentClient();
-        const chunks = chunkValues(params, MAX_BATCH_WRITE_ITEMS);
+        const capacity = new ConsumedCapacityTally();
+        // Once a chunk fails, the rest aren't started. Those in flight settle
+        // before the error is thrown, so no write lands after the caller's
+        // cleanup.
+        let failed = false;
 
-        for (const chunk of chunks) {
-            let requestItems = chunk.reduce(
-                (acc, curr) => {
-                    const tableRequests = acc[curr.table] ?? [];
-                    tableRequests.push(curr.request);
-                    acc[curr.table] = tableRequests;
-                    return acc;
-                },
-                {} as NonNullable<BatchWriteCommandInput['RequestItems']>,
-            );
-
-            for (
-                let attempt = 0;
-                attempt <= MAX_BATCH_WRITE_RETRIES;
-                attempt++
-            ) {
-                if (Object.keys(requestItems).length === 0) {
-                    break;
+        const outcomes = await runWithConcurrencyLimitSettled(
+            chunkValues(params, MAX_BATCH_WRITE_ITEMS),
+            BATCH_WRITE_CONCURRENCY,
+            async (chunk) => {
+                if (failed) return;
+                const requestItems: BatchWriteItems = {};
+                for (const { table, request } of chunk) {
+                    (requestItems[table] ??= []).push(request);
                 }
-
-                const response = await sendRepairingValues(
-                    requestItems,
-                    (itemsToWrite) =>
-                        client.send(
-                            new BatchWriteCommand({
-                                RequestItems: itemsToWrite,
-                                ReturnConsumedCapacity: 'TOTAL',
-                            }),
-                        ),
-                    () =>
-                        `a batch write to ${Object.keys(requestItems).join(', ')}`,
-                );
-                accumulateConsumedCapacity(
-                    response.ConsumedCapacity as
-                        | Array<{ TableName?: string; CapacityUnits?: number }>
-                        | undefined,
-                );
-
-                const unprocessedItems = response.UnprocessedItems ?? {};
-                if (Object.keys(unprocessedItems).length === 0) {
-                    requestItems = {};
-                    break;
-                }
-
-                requestItems = unprocessedItems as NonNullable<
-                    BatchWriteCommandInput['RequestItems']
-                >;
-                if (attempt < MAX_BATCH_WRITE_RETRIES) {
-                    const delayMs = Math.min(
-                        1000,
-                        BATCH_WRITE_RETRY_BASE_MS * 2 ** attempt,
+                try {
+                    const drained = await this.#sendWithUnprocessedRetry(
+                        requestItems,
+                        async (pending) => {
+                            const response = await sendRepairingValues(
+                                pending,
+                                (itemsToWrite) =>
+                                    client.send(
+                                        new BatchWriteCommand({
+                                            RequestItems: itemsToWrite,
+                                            ReturnConsumedCapacity: 'TOTAL',
+                                        }),
+                                    ),
+                                () =>
+                                    `a batch write to ${Object.keys(pending).join(', ')}`,
+                            );
+                            capacity.add(response.ConsumedCapacity);
+                            return response.UnprocessedItems as
+                                BatchWriteItems | undefined;
+                        },
                     );
-                    await sleep(delayMs);
+                    if (!drained) {
+                        throw new HttpError(
+                            400,
+                            'Failed to batch write all items to DynamoDB',
+                            { legacyCode: 'bad_request' },
+                        );
+                    }
+                } catch (error) {
+                    failed = true;
+                    throw error;
                 }
-            }
+            },
+        );
+        const rejected = outcomes.find(
+            (outcome): outcome is PromiseRejectedResult =>
+                outcome.status === 'rejected',
+        );
+        if (rejected) throw rejected.reason;
 
-            if (Object.keys(requestItems).length > 0) {
-                throw new HttpError(
-                    400,
-                    'Failed to batch write all items to DynamoDB',
-                    { legacyCode: 'bad_request' },
-                );
+        return { ConsumedCapacity: capacity.entries() };
+    }
+
+    /**
+     * Send a batch request and resend whatever comes back unprocessed, with
+     * capped exponential backoff. `send` returns the unprocessed remainder.
+     * Resolves false when items are still left after the last retry.
+     */
+    async #sendWithUnprocessedRetry<TItems extends object>(
+        requestItems: TItems,
+        send: (pending: TItems) => Promise<TItems | undefined>,
+    ): Promise<boolean> {
+        let pending: TItems | undefined = requestItems;
+        for (let attempt = 0; attempt <= MAX_BATCH_RETRIES; attempt++) {
+            if (!pending || Object.keys(pending).length === 0) return true;
+            pending = await send(pending);
+            if (
+                attempt < MAX_BATCH_RETRIES &&
+                pending &&
+                Object.keys(pending).length > 0
+            ) {
+                await sleep(Math.min(1000, BATCH_RETRY_BASE_MS * 2 ** attempt));
             }
         }
-
-        return {
-            ConsumedCapacity: Array.from(consumedCapacityByTable.entries()).map(
-                ([TableName, CapacityUnits]) => ({
-                    TableName,
-                    CapacityUnits,
-                }),
-            ),
-        };
+        return !pending || Object.keys(pending).length === 0;
     }
 
     @Span('ddb.del', (table: string) => ({ 'db.table': table }))
@@ -633,10 +608,25 @@ export class DDBClient extends PuterClient {
         );
     }
 
+    /** Lets throttle logs name a put's key without logging the item. */
+    registerKeySchema(
+        table: string,
+        keySchema: NonNullable<CreateTableCommandInput['KeySchema']>,
+    ) {
+        this.#keyNamesByTable.set(
+            table,
+            keySchema.map((key) => key.AttributeName!),
+        );
+    }
+
     async createTableIfNotExists(
         params: CreateTableCommandInput,
         ttlAttribute?: string,
     ) {
+        if (params.TableName && params.KeySchema) {
+            this.registerKeySchema(params.TableName, params.KeySchema);
+        }
+
         // Real-AWS deployments provision tables externally (Terraform / IaC),
         // so we no-op there by default. Self-hosters pointing at
         // dynamodb-local opt in via `dynamo.bootstrapTables: true`.
@@ -702,39 +692,17 @@ export class DDBClient extends PuterClient {
     }
 
     #bindAwsClient() {
-        const accessKeyId = this.#ddbConfig.aws?.access_key;
-        const secretAccessKey = this.#ddbConfig.aws?.secret_key;
-
-        if (!accessKeyId || !secretAccessKey) {
+        const credentials = awsCredentialsFrom(this.#ddbConfig.aws);
+        if (!credentials) {
             throw new Error(
-                'DynamoDB aws config requires both `access_key` and `secret_key`',
+                'DynamoDB aws config requires both `access_key` and `secret_key`, or `useCredentialChain`',
             );
         }
 
-        const ddbClient = new DynamoDBClient({
-            credentials: {
-                accessKeyId,
-                secretAccessKey,
-            },
-            maxAttempts: 3,
-            requestHandler: new NodeHttpHandler({
-                connectionTimeout: 5000,
-                requestTimeout: 5000,
-                httpsAgent: new httpsAgent({ keepAlive: true }),
-            }),
-            ...(this.#ddbConfig.endpoint
-                ? { endpoint: this.#ddbConfig.endpoint }
-                : {}),
+        this.#bindClient({
+            credentials,
             region: this.#ddbConfig.aws?.region || 'us-west-2',
-        });
-
-        this.#documentClient = DynamoDBDocumentClient.from(ddbClient, {
-            marshallOptions: {
-                removeUndefinedValues: true,
-            },
-            unmarshallOptions: {
-                wrapNumbers: clampStoredNumber,
-            },
+            endpoint: this.#ddbConfig.endpoint,
         });
     }
 
@@ -742,21 +710,36 @@ export class DDBClient extends PuterClient {
         const endpoint = await getOrCreateLocalDynaliteEndpoint(
             this.#localPathKey,
         );
+        this.#bindClient({
+            credentials: { accessKeyId: 'fake', secretAccessKey: 'fake' },
+            region: 'us-west-2',
+            endpoint,
+        });
+    }
 
+    #bindClient({
+        credentials,
+        region,
+        endpoint,
+    }: {
+        credentials: AwsCredentials;
+        region: string;
+        endpoint?: string;
+    }) {
         const ddbClient = new DynamoDBClient({
-            credentials: {
-                accessKeyId: 'fake',
-                secretAccessKey: 'fake',
-            },
+            credentials,
             maxAttempts: 3,
             requestHandler: new NodeHttpHandler({
                 connectionTimeout: 5000,
                 requestTimeout: 5000,
                 httpsAgent: new httpsAgent({ keepAlive: true }),
             }),
-            endpoint,
-            region: 'us-west-2',
+            ...(endpoint ? { endpoint } : {}),
+            region,
         });
+        attachThrottleLogging(ddbClient, region, (table) =>
+            this.#keyNamesByTable.get(table),
+        );
 
         this.#documentClient = DynamoDBDocumentClient.from(ddbClient, {
             marshallOptions: {
@@ -806,22 +789,18 @@ export class DDBClient extends PuterClient {
             const items = scan.Items;
             if (!items || items.length === 0) continue;
 
-            const chunks = chunkValues(items, MAX_BATCH_WRITE_ITEMS);
-            for (const chunk of chunks) {
-                await client.send(
-                    new BatchWriteCommand({
-                        RequestItems: {
-                            [table]: chunk.map((item) => ({
-                                DeleteRequest: {
-                                    Key: Object.fromEntries(
-                                        keyNames.map((key) => [key, item[key]]),
-                                    ),
-                                },
-                            })),
+            await this.#batchWrite(
+                items.map((item) => ({
+                    table,
+                    request: {
+                        DeleteRequest: {
+                            Key: Object.fromEntries(
+                                keyNames.map((key) => [key, item[key]]),
+                            ),
                         },
-                    }),
-                );
-            }
+                    },
+                })),
+            );
         } while (lastEvaluatedKey);
     }
 }

src/backend/clients/dynamodb/throttleLog.ts

@@ -0,0 +1,245 @@
+/*
+ * 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 { DynamoDBClient } from '@aws-sdk/client-dynamodb';
+import { BoundedTtlMap } from '../../util/boundedTtlMap.js';
+
+const THROTTLE_ERROR_NAMES = new Set([
+    'ProvisionedThroughputExceededException',
+    'ThrottlingException',
+    'RequestLimitExceeded',
+]);
+
+// A hot key throttles in bursts, so each target logs at most once a minute and
+// the next line says how many were folded into it.
+const LOG_INTERVAL_MS = 60_000;
+const MAX_TRACKED_TARGETS = 1_000;
+const MAX_KEYS_PER_LINE = 5;
+const MAX_VALUE_LENGTH = 120;
+
+type AnyRecord = Record<string, unknown>;
+type KeyNamesFor = (table: string) => string[] | undefined;
+interface Target {
+    table: string;
+    keys: string;
+}
+
+// No TTL: an entry past its interval still carries the count to report.
+const lastLogged = new BoundedTtlMap<string, { at: number; folded: number }>({
+    maxEntries: MAX_TRACKED_TARGETS,
+});
+
+const logOnce = (target: string, detail?: string): void => {
+    const now = Date.now();
+    const previous = lastLogged.get(target);
+    if (previous && now - previous.at < LOG_INTERVAL_MS) {
+        previous.folded += 1;
+        return;
+    }
+    lastLogged.set(target, { at: now, folded: 0 });
+
+    const folded = previous?.folded
+        ? ` (+${previous.folded} since last logged)`
+        : '';
+    console.warn(`[ddb] ${target}${detail ? `: ${detail}` : ''}${folded}`);
+};
+
+// Inputs reach this middleware marshalled and outputs arrive unmarshalled, so
+// a key value can be either shape.
+const formatValue = (value: unknown): string => {
+    let text: string;
+    if (value && typeof value === 'object') {
+        const attr = value as { S?: string; N?: string; B?: unknown };
+        text =
+            attr.S ??
+            attr.N ??
+            (attr.B !== undefined ? '<binary>' : JSON.stringify(value));
+    } else {
+        text = String(value);
+    }
+    return text.length > MAX_VALUE_LENGTH
+        ? `${text.slice(0, MAX_VALUE_LENGTH)}...`
+        : text;
+};
+
+const formatKey = (key: unknown, names?: string[]): string => {
+    if (!key || typeof key !== 'object') return '<no key>';
+    const record = key as AnyRecord;
+    const parts = (names ?? Object.keys(record))
+        .filter((name) => name in record)
+        .map((name) => `${name}=${formatValue(record[name])}`);
+    return parts.length > 0 ? parts.join(' ') : '<no key>';
+};
+
+// A put carries the whole item; only its key attributes are logged, never values.
+const formatItemKey = (
+    table: string,
+    item: unknown,
+    keyNamesFor: KeyNamesFor,
+): string => {
+    const names = keyNamesFor(table);
+    return names ? formatKey(item, names) : '<key schema unknown>';
+};
+
+const formatList = (keys: string[]): string => {
+    const shown = keys.slice(0, MAX_KEYS_PER_LINE).join(', ');
+    const hidden = keys.length - MAX_KEYS_PER_LINE;
+    return hidden > 0 ? `${shown} (+${hidden} more)` : shown;
+};
+
+const formatQueryKey = (input: AnyRecord): string => {
+    const values = (input.ExpressionAttributeValues ?? {}) as AnyRecord;
+    const placeholders =
+        String(input.KeyConditionExpression ?? '').match(/:[\w-]+/g) ?? [];
+    const parts = placeholders.map(
+        (placeholder) =>
+            `${placeholder.slice(1)}=${formatValue(values[placeholder])}`,
+    );
+    const index = input.IndexName ? `index=${input.IndexName} ` : '';
+    return index + (parts.length > 0 ? parts.join(' ') : '<no key>');
+};
+
+const describeBatchWrite = (
+    requestItems: unknown,
+    keyNamesFor: KeyNamesFor,
+): Target[] =>
+    Object.entries((requestItems ?? {}) as AnyRecord).map(
+        ([table, requests]) => ({
+            table,
+            keys: formatList(
+                ((requests ?? []) as AnyRecord[]).map((request) => {
+                    const put = request.PutRequest as AnyRecord | undefined;
+                    if (put) return formatItemKey(table, put.Item, keyNamesFor);
+                    const del = request.DeleteRequest as AnyRecord | undefined;
+                    return formatKey(del?.Key);
+                }),
+            ),
+        }),
+    );
+
+const describeBatchGet = (requestItems: unknown): Target[] =>
+    Object.entries((requestItems ?? {}) as AnyRecord).map(([table, entry]) => ({
+        table,
+        keys: formatList(
+            ((entry as { Keys?: unknown[] })?.Keys ?? []).map((key) =>
+                formatKey(key),
+            ),
+        ),
+    }));
+
+const describeRequest = (
+    commandName: string,
+    input: AnyRecord,
+    keyNamesFor: KeyNamesFor,
+): Target[] => {
+    const table = String(input.TableName ?? '');
+    switch (commandName) {
+        case 'GetItemCommand':
+        case 'UpdateItemCommand':
+        case 'DeleteItemCommand':
+            return [{ table, keys: formatKey(input.Key) }];
+        case 'PutItemCommand':
+            return [
+                { table, keys: formatItemKey(table, input.Item, keyNamesFor) },
+            ];
+        case 'QueryCommand':
+            return [{ table, keys: formatQueryKey(input) }];
+        case 'BatchWriteItemCommand':
+            return describeBatchWrite(input.RequestItems, keyNamesFor);
+        case 'BatchGetItemCommand':
+            return describeBatchGet(input.RequestItems);
+        default:
+            return [{ table, keys: '<no key>' }];
+    }
+};
+
+const throttleReasons = (error: unknown): string => {
+    const err = error as {
+        name?: string;
+        ThrottlingReasons?: { reason?: string }[];
+        throttlingReasons?: { reason?: string }[];
+    };
+    const reasons = (err.ThrottlingReasons ?? err.throttlingReasons ?? [])
+        .map((entry) => entry.reason)
+        .filter(Boolean);
+    return reasons.length > 0 ? reasons.join(', ') : String(err.name);
+};
+
+/**
+ * Log the table and key of every throttled attempt, including the ones the SDK
+ * retries through, plus batch items DynamoDB hands back unprocessed. Sits
+ * inside the retry loop because the CloudWatch throttle metrics count attempts,
+ * and most throttled attempts succeed on retry.
+ */
+export const attachThrottleLogging = (
+    client: DynamoDBClient,
+    region: string,
+    keyNamesFor: KeyNamesFor,
+): void => {
+    client.middlewareStack.addRelativeTo(
+        <TArgs extends { input: unknown }, TResult extends { output: unknown }>(
+            next: (args: TArgs) => Promise<TResult>,
+            context: { commandName?: string },
+        ) =>
+            async (args: TArgs): Promise<TResult> => {
+                const commandName = context.commandName ?? '';
+                const operation = commandName.replace(/Command$/, '');
+                try {
+                    const result = await next(args);
+                    const output = result.output as {
+                        UnprocessedItems?: unknown;
+                        UnprocessedKeys?: unknown;
+                    };
+                    const leftovers = [
+                        ...describeBatchWrite(
+                            output?.UnprocessedItems,
+                            keyNamesFor,
+                        ),
+                        ...describeBatchGet(output?.UnprocessedKeys),
+                    ];
+                    for (const { table, keys } of leftovers) {
+                        logOnce(
+                            `unprocessed ${operation} ${table} ${keys} in ${region}`,
+                        );
+                    }
+                    return result;
+                } catch (error) {
+                    if (THROTTLE_ERROR_NAMES.has((error as Error)?.name)) {
+                        const targets = describeRequest(
+                            commandName,
+                            args.input as AnyRecord,
+                            keyNamesFor,
+                        );
+                        for (const { table, keys } of targets) {
+                            logOnce(
+                                `throttled ${operation} ${table} ${keys} in ${region}`,
+                                throttleReasons(error),
+                            );
+                        }
+                    }
+                    throw error;
+                }
+            },
+        {
+            name: 'throttleKeyLogger',
+            relation: 'after',
+            toMiddleware: 'retryMiddleware',
+        },
+    );
+};

src/backend/clients/email/EmailClient.test.ts

@@ -425,86 +425,3 @@ describe('EmailClient — share notification templates', () => {
         expect(html).toContain('href="https://puter.test"');
     });
 });
-
-describe('EmailClient.clean', () => {
-    const clean = (email: string) => startClient().clean(email);
-
-    it('strips subaddressing on ordinary domains', () => {
-        expect(clean('[email protected]')).toBe('[email protected]');
-    });
-
-    it('ignores dots and subaddressing for gmail', () => {
-        expect(clean('[email protected]')).toBe('[email protected]');
-    });
-
-    it('canonicalizes googlemail onto gmail', () => {
-        expect(clean('[email protected]')).toBe('[email protected]');
-    });
-
-    it('keeps yahoo subaddressing, which yahoo treats as distinct', () => {
-        expect(clean('[email protected]')).toBe('[email protected]');
-    });
-
-    it('ignores dots for icloud aliases', () => {
-        expect(clean('[email protected]')).toBe('[email protected]');
-    });
-
-    it('returns anything that is not an address unchanged', () => {
-        expect(clean('not-an-email')).toBe('not-an-email');
-        expect(clean('@nolocal.test')).toBe('@nolocal.test');
-    });
-});
-
-describe('EmailClient.validate', () => {
-    it('waves everything through in a dev environment', async () => {
-        const client = startClient({ env: 'dev' } as Partial<IConfig>);
-        await expect(client.validate('[email protected]')).resolves.toBe(
-            true,
-        );
-    });
-
-    it('rejects a blocked domain suffix', async () => {
-        const client = startClient({
-            blockedEmailDomains: ['blocked.test'],
-        } as unknown as Partial<IConfig>);
-
-        await expect(client.validate('[email protected]')).resolves.toBe(
-            false,
-        );
-        await expect(client.validate('[email protected]')).resolves.toBe(
-            true,
-        );
-    });
-
-    it('matches the blocklist against the cleaned address', async () => {
-        const client = startClient({
-            blockedEmailDomains: ['@gmail.com'],
-        } as unknown as Partial<IConfig>);
-        await expect(
-            client.validate('[email protected]'),
-        ).resolves.toBe(false);
-    });
-
-    it('lets a registered validator veto an address', async () => {
-        const client = startClient();
-        const seen: string[] = [];
-        client.addValidator((email) => {
-            seen.push(email);
-            return !email.startsWith('spam');
-        });
-
-        await expect(client.validate('[email protected]')).resolves.toBe(
-            false,
-        );
-        await expect(client.validate('[email protected]')).resolves.toBe(true);
-        // Validators always see the canonical form.
-        expect(seen).toEqual(['[email protected]', '[email protected]']);
-    });
-
-    it('supports asynchronous validators', async () => {
-        const client = startClient();
-        client.addValidator(async (email) => email !== '[email protected]');
-        await expect(client.validate('[email protected]')).resolves.toBe(false);
-        await expect(client.validate('[email protected]')).resolves.toBe(true);
-    });
-});

src/backend/clients/email/EmailClient.ts

@@ -71,54 +71,12 @@ export interface SendMailOptions {
     headers?: Record<string, string>;
 }
 
-export type EmailValidator = (email: string) => Promise<boolean> | boolean;
-
 interface CompiledTemplate {
     subject: ReturnType<typeof template>;
     html: ReturnType<typeof template>;
     text?: ReturnType<typeof template>;
 }
 
-// -- Clean-email rules ------------------------------------------------
-
-type CleanRule = (parts: { local: string; domain: string }) => {
-    local: string;
-    domain: string;
-};
-
-const CLEAN_RULES: Record<string, CleanRule> = {
-    dots_dont_matter: ({ local, domain }) => ({
-        local: local.replace(/\./g, ''),
-        domain,
-    }),
-    remove_subaddressing: ({ local, domain }) => ({
-        local: local.split('+')[0],
-        domain,
-    }),
-};
-
-const PROVIDER_RULES: Record<string, { apply: string[]; skip: string[] }> = {
-    gmail: { apply: ['dots_dont_matter'], skip: [] },
-    icloud: { apply: ['dots_dont_matter'], skip: [] },
-    yahoo: { apply: [], skip: ['remove_subaddressing'] },
-};
-
-const DOMAIN_TO_PROVIDER: Record<string, string> = {
-    'gmail.com': 'gmail',
-    'googlemail.com': 'gmail',
-    'yahoo.com': 'yahoo',
-    'yahoo.co.uk': 'yahoo',
-    'yahoo.ca': 'yahoo',
-    'yahoo.com.au': 'yahoo',
-    'icloud.com': 'icloud',
-    'me.com': 'icloud',
-    'mac.com': 'icloud',
-};
-
-const DOMAIN_ALIASES: Record<string, string> = {
-    'googlemail.com': 'gmail.com',
-};
-
 // -- EmailClient ------------------------------------------------------
 
 /**
@@ -126,8 +84,8 @@ const DOMAIN_ALIASES: Record<string, string> = {
  *
  * - Template-based outbound mail (via `send`)
  * - Raw nodemailer passthrough (via `sendRaw`)
- * - Canonical-form normalization for dedup (via `clean`)
- * - Policy + extensible validation (via `validate`)
+ *
+ * Address normalization and the domain blocklist live in `util/email.ts`.
  */
 export class EmailClient extends PuterClient {
     private transport: ReturnType<typeof nodemailer.createTransport> | null =
@@ -135,7 +93,6 @@ export class EmailClient extends PuterClient {
     private compiledTemplates: Partial<
         Record<EmailTemplateName, CompiledTemplate>
     > = {};
-    private validators: EmailValidator[] = [];
 
     constructor(config: IConfig) {
         super(config);
@@ -218,72 +175,6 @@ export class EmailClient extends PuterClient {
         });
     }
 
-    // -- Public API: clean / validate ---------------------------------
-
-    /**
-     * Normalize an email to its canonical form for dedup comparisons. Applies
-     * provider-specific rules (e.g. Gmail ignores dots in the local part) plus
-     * generic subaddressing removal.
-     */
-    clean(email: string): string {
-        let [local, domain] = email.split('@');
-        if (!local || !domain) return email;
-
-        if (DOMAIN_ALIASES[domain]) {
-            domain = DOMAIN_ALIASES[domain];
-        }
-
-        // Default: strip subaddressing on everything unless provider skips it
-        const ruleNames = new Set<string>(['remove_subaddressing']);
-        const provider = DOMAIN_TO_PROVIDER[domain];
-        const rules = provider ? PROVIDER_RULES[provider] : undefined;
-
-        if (rules) {
-            rules.apply.forEach((r) => ruleNames.add(r));
-            rules.skip.forEach((r) => ruleNames.delete(r));
-        }
-
-        let parts = { local, domain };
-        for (const name of ruleNames) {
-            parts = CLEAN_RULES[name](parts);
-        }
-
-        return `${parts.local}@${parts.domain}`;
-    }
-
-    /**
-     * Check whether an email is allowed to be used. Checks domain blocklist
-     * plus any registered validators (services can call `addValidator()` to
-     * register custom policy hooks).
-     */
-    async validate(email: string): Promise<boolean> {
-        if (this.config.env === 'dev') return true;
-
-        const cleaned = this.clean(email);
-
-        const blocked = this.config.blockedEmailDomains;
-        if (Array.isArray(blocked)) {
-            for (const suffix of blocked) {
-                if (cleaned.endsWith(suffix)) return false;
-            }
-        }
-
-        for (const validator of this.validators) {
-            const ok = await validator(cleaned);
-            if (!ok) return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Register a custom validation hook. Services can call this during their
-     * startup to veto specific emails (e.g. a disposable-email service).
-     */
-    addValidator(fn: EmailValidator): void {
-        this.validators.push(fn);
-    }
-
     // -- Internals ----------------------------------------------------
 
     private defaultFrom(): string {

src/backend/clients/email/templates.ts

@@ -352,10 +352,10 @@ [email protected] immediately.
         html: `
 <p>Hi there,</p>
 <p>{{team_name}} has created a Puter account for you.</p>
-<p>Username: <b>{{username}}</b><br>
-Temporary password: <b>{{temporary_password}}</b></p>
-<p>You will be asked to choose your own password the first time you sign in.
-This temporary one stops working then, and it expires on its own if unused.</p>
+<p>Username: <b>{{username}}</b></p>
+<p>{{team_name}} will give you a temporary password. You will be asked to choose
+your own the first time you sign in. The temporary one stops working then, and it
+expires on its own if unused.</p>
 <p>What this means:</p>
 <ul>
 <li>This account belongs to {{team_name}}. They pay for it and can close it.</li>
@@ -364,6 +364,21 @@ This temporary one stops working then, and it expires on its own if unused.</p>
 as you. Choose your own password promptly.</li>
 </ul>
 <p>Sincerely,</p>
+<p>Puter</p>
+        `,
+    },
+    team_account_reissued: {
+        subject: 'A new temporary password for your {{team_name}} account',
+        html: `
+<p>Hi there,</p>
+<p>{{team_name}} has issued a new temporary password for your Puter account
+<b>{{username}}</b>. Any temporary password you were given before this one has
+stopped working.</p>
+<p>{{team_name}} will give you the new one. You will be asked to choose your own
+password the first time you sign in; the temporary one stops working then, and
+it expires on its own if unused.</p>
+<p>If you were not expecting this, ask {{team_name}} -- only they can issue it.</p>
+<p>Sincerely,</p>
 <p>Puter</p>
         `,
     },

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

@@ -1,3 +1,9 @@
+import { trace } from '@opentelemetry/api';
+import {
+    BasicTracerProvider,
+    InMemorySpanExporter,
+    SimpleSpanProcessor,
+} from '@opentelemetry/sdk-trace-base';
 import {
     afterAll,
     afterEach,
@@ -136,6 +142,30 @@ describe('EventClient', () => {
         });
     });
 
+    describe('repeat emits', () => {
+        it('reaches listeners added after the key was first emitted', () => {
+            target.emit(`${key}.a.b`, {}, {});
+            const wildcard = vi.fn();
+            const exact = vi.fn();
+            target.on(`${key}.a.*`, wildcard);
+            target.on(`${key}.a.b`, exact);
+            target.emit(`${key}.a.b`, {}, {});
+            expect(wildcard).toHaveBeenCalledTimes(1);
+            expect(exact).toHaveBeenCalledTimes(1);
+            expect(target.hasListeners(`${key}.a.b`)).toBe(true);
+        });
+
+        it('does not skip a listener when an earlier one unsubscribes mid-dispatch', () => {
+            const second = vi.fn();
+            const first = vi.fn(() => target.off(key, first));
+            target.on(key, first);
+            target.on(key, second);
+            target.emit(key, {}, {});
+            expect(first).toHaveBeenCalledTimes(1);
+            expect(second).toHaveBeenCalledTimes(1);
+        });
+    });
+
     describe('emitAndWait', () => {
         it('awaits async listeners before resolving', async () => {
             let resolved = false;
@@ -183,6 +213,122 @@ 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

@@ -18,6 +18,7 @@
  */
 
 import { extensionStore } from '../../extensions';
+import { BoundedTtlMap } from '../../util/boundedTtlMap.js';
 import { withSpan } from '../../util/span.js';
 import { PuterClient } from '../types';
 import {
@@ -28,8 +29,13 @@ import {
     MatchingEvents,
 } from './types';
 
+const NO_LISTENERS: readonly EventListener[] = [];
+
 export class EventClient extends PuterClient {
     #eventListeners: Partial<Record<ListenKey, EventListener[]>> = {};
+    #matchKeyMemo = new BoundedTtlMap<string, readonly ListenKey[]>({
+        maxEntries: 1024,
+    });
 
     onServerStart() {
         this.emit('serverStart', {}, {});
@@ -63,19 +69,8 @@ export class EventClient extends PuterClient {
         data: EventMap[T],
         meta: EventMetadata,
     ) {
-        const parts = key.split('.');
-        for (let i = 0; i < parts.length; i++) {
-            const matchKey = (
-                i === parts.length - 1
-                    ? key
-                    : `${parts.slice(0, i + 1).join('.')}.*`
-            ) as ListenKey;
-            const extensionListeners = extensionStore.events[matchKey];
-            const listeners = (this.#eventListeners[matchKey] || []).concat(
-                extensionListeners || [],
-            );
-            if (!listeners) continue;
-            for (const listener of listeners) {
+        for (const matchKey of this.#matchKeys(key)) {
+            for (const listener of this.#listenersFor(matchKey)) {
                 this.#emitEvent(listener, key, data, meta);
             }
         }
@@ -92,32 +87,27 @@ export class EventClient extends PuterClient {
      *
      * Listeners run sequentially in the order they're registered so an earlier
      * handler's mutation is visible to later ones. A listener that throws is
-     * logged (same as `emit`) and the chain continues.
+     * logged and the chain continues, with `meta.listener_failed` set.
      */
     async emitAndWait<T extends keyof EventMap>(
         key: T,
         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 () => {
-            const parts = key.split('.');
-            for (let i = 0; i < parts.length; i++) {
-                const matchKey = (
-                    i === parts.length - 1
-                        ? key
-                        : `${parts.slice(0, i + 1).join('.')}.*`
-                ) as ListenKey;
-                const extensionListeners = extensionStore.events[matchKey];
-                const listeners = (this.#eventListeners[matchKey] || []).concat(
-                    extensionListeners || [],
-                );
-                if (!listeners) continue;
-                for (const listener of listeners) {
+            for (const matchKey of this.#matchKeys(key)) {
+                // A wildcard listener observes the event; it does not implement it.
+                const isExact = matchKey === key;
+                for (const listener of this.#listenersFor(matchKey)) {
                     try {
                         await listener(key, data, meta);
                     } catch (e) {
+                        // The chain continues, but the caller is told: a hook
+                        // that could not run is not a hook that approved.
+                        if (isExact) meta.listener_failed = true;
                         console.error(
                             'Error in event listener for event',
                             key,
@@ -129,6 +119,43 @@ 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.
      *
@@ -137,13 +164,7 @@ export class EventClient extends PuterClient {
      * otherwise perfectly cheap and doesn't need this.
      */
     hasListeners<T extends keyof EventMap>(key: T): boolean {
-        const parts = key.split('.');
-        for (let i = 0; i < parts.length; i++) {
-            const matchKey = (
-                i === parts.length - 1
-                    ? key
-                    : `${parts.slice(0, i + 1).join('.')}.*`
-            ) as ListenKey;
+        for (const matchKey of this.#matchKeys(key)) {
             if (this.#eventListeners[matchKey]?.length) return true;
             if (extensionStore.events[matchKey]?.length) return true;
         }
@@ -186,6 +207,34 @@ export class EventClient extends PuterClient {
         const idx = listeners.indexOf(callback as EventListener);
         if (idx !== -1) listeners.splice(idx, 1);
     }
+    /**
+     * The keys a listener can be registered under to hear `key`: each
+     * `<prefix>.*` shorter than the key, then the key itself. Memoized, since
+     * the same few keys are emitted on every request.
+     */
+    #matchKeys(key: string): readonly ListenKey[] {
+        const cached = this.#matchKeyMemo.get(key);
+        if (cached) return cached;
+        const parts = key.split('.');
+        const matchKeys = parts.map(
+            (_, i) =>
+                (i === parts.length - 1
+                    ? key
+                    : `${parts.slice(0, i + 1).join('.')}.*`) as ListenKey,
+        );
+        this.#matchKeyMemo.set(key, matchKeys);
+        return matchKeys;
+    }
+
+    #listenersFor(matchKey: ListenKey): readonly EventListener[] {
+        const own = this.#eventListeners[matchKey];
+        const fromExtensions = extensionStore.events[matchKey];
+        if (!own?.length && !fromExtensions?.length) return NO_LISTENERS;
+        // A copy, so a listener that unsubscribes mid-dispatch can't make the
+        // loop skip its neighbour.
+        return (own ?? []).concat(fromExtensions ?? []);
+    }
+
     async #emitEvent<T extends keyof EventMap>(
         listener: EventListener,
         key: T,

src/backend/clients/event/types.ts

@@ -175,6 +175,7 @@ export type EventMap = {
             index_url?: string | null;
             owner_user_id?: number | null;
             name?: string | null;
+            godmode?: boolean;
         };
     };
 
@@ -304,6 +305,9 @@ export type EventMap = {
         device_fingerprint: string | null;
         allowed: boolean;
         reason: string | null;
+        // With `allowed` false, offer the card fallback in place of SMS. Only
+        // honored while the fallback is on; otherwise the send proceeds.
+        card_fallback_instead?: boolean;
         [key: string]: unknown;
     };
     // Fire-and-forget signal that a code was actually sent — the abuse
@@ -314,6 +318,9 @@ export type EventMap = {
         user_uid: string;
         phone: string;
         device_fingerprint: string | null;
+        // Browser-signals dispatch id the client sent with this request, or
+        // null when it sent none.
+        dispatch_id: string | null;
     };
     'user.phone-verified': {
         user_id: number;
@@ -333,6 +340,9 @@ export type EventMap = {
         // the abuse extension cap card-verification setups per device (across
         // accounts) before any Stripe SetupIntent is created.
         device_fingerprint: string | null;
+        // 'trial' when the card is being added for a free trial; null for the
+        // verification gates.
+        purpose?: string | null;
         enabled: boolean | null;
         // Set false by the extension to refuse this setup (e.g. the per-device
         // setup-velocity cap); `reason` carries the opaque code. Stays true
@@ -449,7 +459,11 @@ export type EventMap = {
             [key: string]: unknown;
         };
     };
-    'storage.quota.bonus': { userId: number; extra: number };
+    /**
+     * 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 };
 
     // ---- Key-value ----
     /**
@@ -623,6 +637,12 @@ export type EventMap = {
         userId: number;
         generation: number;
     };
+    /**
+     * Someone's entry was just shared, so every process must drop its cached
+     * "this owner has nothing shared" answer. `outer.pubsub.*` for the same
+     * reason as the events generation bump: a per-process cache.
+     */
+    'outer.pubsub.share.ownerShared': { ownerUserId: number };
     'outer.fs.write-hash': { hash: string; uuid: string };
     /**
      * Cache keys the KV read cache must stop serving, because the entries
@@ -659,6 +679,10 @@ 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.
@@ -696,8 +720,19 @@ export type EventMap = {
      * Sessions were revoked for a user. Anything holding one of them open — a
      * live socket, say — should drop it: `revoked_at` is otherwise only read on
      * the next handshake.
+     *
+     * `outer.*` rather than `outer.pubsub.*` on purpose: the eviction runs
+     * through the socket.io Redis adapter a cluster shares, so one node
+     * disconnecting covers every node in it — fanning out to siblings would
+     * just have each of them repeat the same cluster-wide disconnect.
      */
-    'auth.sessions.revoked': { user_id: number; session_uids: string[] };
+    'outer.auth.sessions.revoked': {
+        user_id: number;
+        session_uids: 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
@@ -764,6 +799,12 @@ export type EventMap = {
     // `ai.cost.factor.<driverName>.<provider>:<model>`. Emitted once per model
     // per batch; the last listener to set `factor` wins.
     [K in `ai.cost.factor.${string}`]: AiCostFactorEvent;
+} & {
+    // A plan gate is about to refuse a caller. Keyed per surface the way the
+    // lifecycles above are: `subscription.gate.route.<method>.<path>`,
+    // `subscription.gate.driver.<iface>.<method>`. Emitted via `emitAndWait`;
+    // a listener that sets `allow` waives the plan requirement for that call.
+    [K in `subscription.gate.${string}`]: SubscriptionGateEvent;
 } & {
     [K in `pubsub.login.${string}`]: { authtoken: string };
 } & {
@@ -784,6 +825,18 @@ export type EventMap = {
     'outer.pubsub.metering.credits-changed': { userUuid: string };
 } & IExtensionEventMap;
 
+/** Payload for `subscription.gate.<surface>` events. */
+export type SubscriptionGateEvent = {
+    actor: Actor;
+    /** The key after `subscription.gate.`, e.g. `driver.puter-kvstore.get`. */
+    surface: string;
+    /** What the gate asked for: any paid plan (`true`) or these policy ids. */
+    requirement: boolean | readonly string[];
+    /** The request being gated, when there is one. */
+    req?: ExpressRequest;
+    allow: boolean;
+};
+
 /** Payload for `ai.cost.factor.<driver>.<model>` events. */
 export type AiCostFactorEvent = {
     /** Driver doing the pricing, e.g. `ai-chat`. */
@@ -887,7 +940,11 @@ export type MatchingEvents<P extends ListenKey> = P extends `${infer Prefix}.*`
     ? Extract<EventKey, `${Prefix}.${string}`>
     : P & EventKey;
 
-export type EventMetadata = { from_outside?: boolean };
+export type EventMetadata = {
+    from_outside?: boolean;
+    /** Set by `emitAndWait` when a listener threw, so a verdict hook can refuse. */
+    listener_failed?: boolean;
+};
 export type EventListener<K extends EventKey = EventKey> = (
     key: K,
     data: EventMap[K],

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

@@ -3,18 +3,19 @@
  *
  * 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/>.
+ * along with this program. If not, see
+ * [https://www.gnu.org/licenses/](https://www.gnu.org/licenses/).
  */
 
 import { GetObjectCommand } from '@aws-sdk/client-s3';
@@ -24,7 +25,7 @@ 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 } from './S3Client';
+import { S3Client, withPresignHeadroom } from './S3Client';
 
 const LOCAL_BUCKET = 'puter-local';
 
@@ -487,3 +488,54 @@ 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,6 +43,43 @@ 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 {
@@ -83,7 +120,9 @@ export class S3Client extends PuterClient {
 
             if (useCredentialChain) {
                 this.useProviderChain = true;
-                this.awsConfig = { credentials: fromNodeProviderChain() };
+                this.awsConfig = {
+                    credentials: withPresignHeadroom(fromNodeProviderChain()),
+                };
                 this.partSize = 64 * 1024 * 1024;
                 this.maxSingleUploadSize = 128 * 1024 * 1024;
             } else {

src/backend/controllers/apps/AppController.js

@@ -17,25 +17,21 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { isAccessTokenActor, isAppActor } from '../../core/actor.js';
+import {
+    isAccessTokenActor,
+    isAccountContext,
+    isAppActor,
+} from '../../core/actor.js';
 import { HttpError } from '../../core/http/HttpError.js';
-import { driversContainers } from '../../exports.js';
 import {
     APP_ICON_SIZES,
     ICON_DATA_URL_MIME_ALLOWLIST,
     isTrustedIconHost,
 } from '../../util/appIcon.js';
-import { resolvePrivateLaunchAccess } from '../../util/privateLaunchAccess.js';
+import { toAppReadView } from '../../util/appView.js';
 import { PuterController } from '../types.js';
 import DEFAULT_APP_ICON from './default-app-icon.js';
 
-/**
- * REST endpoints for app management.
- *
- * Delegates to AppDriver for the actual CRUD + permission logic — these routes
- * are just thin shape adapters that translate REST conventions into driver
- * calls.
- */
 /**
  * Desktop boot reads the app list and individual app records repeatedly, so the
  * ceiling is set well above normal boot traffic and exists to catch a runaway
@@ -74,11 +70,14 @@ const APP_ICON_LIMIT = {
 const APP_LOOKUP_MAX_ENTRIES = 200;
 const APP_LOOKUP_MAX_SELECTOR_LEN = 200;
 
-export class AppController extends PuterController {
-    get appStore() {
-        return this.stores.app;
-    }
+/** What `/apps/:name` reports for an app no launch gate applies to. */
+const PUBLIC_APP_ACCESS = { hasAccess: true, checkedBy: 'core/public-app' };
 
+/**
+ * REST endpoints for app management. CRUD goes through the apps driver; the
+ * read routes use AppService for visibility and views, as the driver does.
+ */
+export class AppController extends PuterController {
     // In-flight background app-open writes. Tracked only so tests and
     // shutdown can wait for them — the request path never does.
     #pendingOpenWrites = new Set();
@@ -130,15 +129,6 @@ export class AppController extends PuterController {
         await Promise.allSettled([...this.#pendingOpenWrites]);
     }
 
-    get appDriver() {
-        // Drivers are wired into the shared driversContainers export by
-        // PuterServer at boot. Controllers get them lazily via this getter
-        // since they're instantiated before drivers in the boot order.
-        const d = driversContainers.apps;
-        if (!d) throw new Error('AppDriver not registered yet');
-        return d;
-    }
-
     registerRoutes(
         /** @type {import('../../core/http/PuterRouter').PuterRouter} */ router,
     ) {
@@ -152,7 +142,7 @@ export class AppController extends PuterController {
                 rateLimit: APP_READ_LIMIT,
             },
             async (req, res) => {
-                const apps = await this.appDriver.select({
+                const apps = await this.drivers.apps.select({
                     predicate: ['user-can-edit'],
                 });
                 res.json(apps);
@@ -184,7 +174,7 @@ export class AppController extends PuterController {
                         { legacyCode: 'bad_request' },
                     );
                 }
-                const available = await this.appDriver.isNameAvailable(name);
+                const available = await this.drivers.apps.isNameAvailable(name);
                 res.json({ name, available });
             },
         );
@@ -195,10 +185,10 @@ export class AppController extends PuterController {
         // before 400-ing for a missing body field.
         //
         // Authorization: only two callers are trusted to report opens —
-        //   1. a root user actor (plain session, no `.app` and no access
+        //   1. the account acting as itself (plain session or full-access
         //      token), e.g. the GUI launching apps on behalf of the user;
         //   2. the app-under-user actor for the app being reported.
-        // Everything else — access tokens (regardless of issuer), asset
+        // Everything else — scoped and app-issued access tokens, asset
         // tokens, app actors reporting for a *different* app — is denied,
         // otherwise any authenticated party could inflate another app's
         // open count.
@@ -223,14 +213,11 @@ export class AppController extends PuterController {
                     });
                 }
 
-                // Access tokens (and any other non-user/non-app identity,
-                // e.g. asset tokens) are not allowed to report opens —
-                // they're shared / scoped credentials and shouldn't drive
-                // analytics counters.
-                if (isAccessTokenActor(actor)) {
+                // Shared credentials shouldn't drive analytics counters.
+                if (isAccessTokenActor(actor) && !isAccountContext(actor)) {
                     throw new HttpError(
                         403,
-                        'Access tokens cannot report app opens',
+                        'This token cannot report app opens',
                         { legacyCode: 'forbidden' },
                     );
                 }
@@ -243,7 +230,7 @@ export class AppController extends PuterController {
                     );
                 }
 
-                const app = await this.appStore.getByUid(app_uid);
+                const app = await this.stores.app.getByUid(app_uid);
                 if (!app)
                     throw new HttpError(404, 'App not found', {
                         legacyCode: 'not_found',
@@ -279,39 +266,32 @@ export class AppController extends PuterController {
                     );
                 }
 
-                const userUid = req.actor?.user?.uuid ?? null;
-
-                const results = await Promise.all(
-                    names.map(async (name) => {
-                        if (name.length > APP_LOOKUP_MAX_SELECTOR_LEN) {
-                            return null;
-                        }
-                        const app = await this.appStore.getByName(name);
-                        if (!app) return null;
-                        let shaped;
-                        try {
-                            shaped = await this.appDriver.read({
-                                uid: app.uid,
-                            });
-                        } catch {
-                            return null;
-                        }
-                        const privateAccess = await resolvePrivateLaunchAccess({
-                            app: shaped,
-                            eventClient: this.clients.event,
-                            userUid,
-                            source: 'appsRoute',
-                            args: req.query ?? {},
+                const actor = req.actor;
+                const appsByName = await this.stores.app.getByNames(
+                    names.filter(
+                        (name) => name.length <= APP_LOOKUP_MAX_SELECTOR_LEN,
+                    ),
+                );
+                const readable = await this.services.app.filterReadable(
+                    [...new Set(appsByName.values())],
+                    actor,
+                );
+                const views = await this.services.app.views(readable, actor, {
+                    source: 'appsRoute',
+                });
+                const shapedByUid = new Map(
+                    readable.map((app, i) => {
+                        const shaped = toAppReadView(app, views[i], {
+                            viewer: actor.user,
                         });
-                        return {
-                            ...shaped,
-                            privateAccess:
-                                shaped.privateAccess?.hasAccess === false
-                                    ? shaped.privateAccess
-                                    : privateAccess,
-                        };
+                        shaped.privateAccess ??= PUBLIC_APP_ACCESS;
+                        return [app.uid, shaped];
                     }),
                 );
+                const results = names.map(
+                    (name) =>
+                        shapedByUid.get(appsByName.get(name)?.uid) ?? null,
+                );
 
                 // Single-name requests return the app directly; batch returns an array
                 if (names.length === 1) {
@@ -331,8 +311,8 @@ export class AppController extends PuterController {
         //
         // Access rules: only apps the caller has a legitimate reason to
         // see are returned — public (`approved_for_listing`), owned by
-        // the caller, or explicitly accessible via AppDriver.read (for
-        // protected apps with a granted permission). Everything else is
+        // the caller, or readable per `AppService.filterReadable` (for
+        // protected apps, a granted permission). Everything else is
         // silently skipped so the endpoint can't be used to enumerate
         // existence of private / unapproved apps by guessing names.
         //
@@ -359,63 +339,54 @@ export class AppController extends PuterController {
                     );
                 }
 
-                const actorUserId = req.actor?.user?.id ?? null;
-                const results = [];
+                const actor = req.actor;
+                const selectors = appList.filter(
+                    (selector) =>
+                        typeof selector === 'string' &&
+                        selector.length > 0 &&
+                        selector.length <= APP_LOOKUP_MAX_SELECTOR_LEN,
+                );
+                const isUid = (selector) => selector.startsWith('app-');
+                const [byUid, byName] = await Promise.all([
+                    this.stores.app.getByUids(selectors.filter(isUid)),
+                    this.stores.app.getByNames(
+                        selectors.filter((s) => !isUid(s)),
+                    ),
+                ]);
+                const found = selectors
+                    .map((s) => (isUid(s) ? byUid.get(s) : byName.get(s)))
+                    .filter(Boolean);
 
-                for (const selector of appList) {
-                    if (
-                        typeof selector !== 'string' ||
-                        selector.length === 0 ||
-                        selector.length > APP_LOOKUP_MAX_SELECTOR_LEN
-                    ) {
-                        continue;
-                    }
-                    const isUid = selector.startsWith('app-');
-                    const app = isUid
-                        ? await this.appStore.getByUid(selector)
-                        : await this.appStore.getByName(selector);
-                    if (!app) continue;
-
-                    const isOwner =
-                        actorUserId !== null &&
-                        app.owner_user_id === actorUserId;
-                    const isApproved = Boolean(app.approved_for_listing);
-
-                    if (!isOwner && !isApproved) {
-                        // Unapproved, non-owned — only surface if the
-                        // caller has an explicit grant (purchased /
-                        // permissioned). AppDriver.read enforces that
-                        // via #canReadApp; a thrown 403 means "not
-                        // accessible" and we treat it as "not found".
-                        try {
-                            const shaped = await this.appDriver.read({
-                                uid: app.uid,
-                            });
-                            if (!shaped) continue;
-                        } catch {
-                            continue;
-                        }
-                    }
-
-                    const assocRows = await this.clients.db.read(
-                        'SELECT `type` FROM `app_filetype_association` WHERE `app_id` = ?',
-                        [app.id],
+                // Unapproved apps the caller doesn't own surface only when
+                // the caller may read them (one batched grant check).
+                const isListed = (app) =>
+                    app.owner_user_id === actor.user?.id ||
+                    Boolean(app.approved_for_listing);
+                const readable = new Set(
+                    await this.services.app.filterReadable(
+                        [...new Set(found.filter((app) => !isListed(app)))],
+                        actor,
+                    ),
+                );
+                const visible = found.filter(
+                    (app) => isListed(app) || readable.has(app),
+                );
+                const filetypesByAppId =
+                    await this.stores.app.getFiletypeAssociationsByIds(
+                        visible.map((app) => app.id),
                     );
 
-                    results.push({
-                        uuid: app.uid,
-                        name: app.name,
-                        title: app.title,
-                        description: app.description,
-                        metadata: app.metadata,
-                        tags:
-                            typeof app.tags === 'string'
-                                ? app.tags.split(',')
-                                : [],
-                        created: app.timestamp,
-                        associations: assocRows.map((r) => r.type),
-                    });
-                }
+                const results = visible.map((app) => ({
+                    uuid: app.uid,
+                    name: app.name,
+                    title: app.title,
+                    description: app.description,
+                    metadata: app.metadata,
+                    tags:
+                        typeof app.tags === 'string' ? app.tags.split(',') : [],
+                    created: app.timestamp,
+                    associations: filetypesByAppId.get(app.id) ?? [],
+                }));
 
                 res.json(results);
             },
@@ -473,7 +444,7 @@ export class AppController extends PuterController {
             }
             if (!appUid.startsWith('app-')) appUid = `app-${appUid}`;
 
-            const app = await this.appStore.getByUid(appUid);
+            const app = await this.stores.app.getByUid(appUid);
             const icon = app?.icon;
 
             // If the icon isn't an inline data URL, try to serve it from the

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

@@ -338,6 +338,42 @@ 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
@@ -618,6 +654,48 @@ describe('AppController GET /apps/:name', () => {
         expect(body.index_url).toBeUndefined();
         expect(body.privateAccess).toMatchObject({ hasAccess: false });
     });
+
+    it('asks the private-access hook once per private app and withholds its index_url', async () => {
+        const owner = await makeUser();
+        const stranger = await makeUser();
+        const app = await createApp(owner.actor, { name: uniqueName('priv') });
+        const other = await createApp(owner.actor, { name: uniqueName('pub') });
+        await server.clients.db.write(
+            'UPDATE `apps` SET `is_private` = 1 WHERE `uid` = ?',
+            [app.uid],
+        );
+        await server.stores.app.invalidateByUid(app.uid as string);
+        const emit = vi.spyOn(server.clients.event, 'emitAndWait');
+
+        try {
+            const { res, captured } = makeRes();
+            await withActor(stranger.actor, () =>
+                callRoute(
+                    'get',
+                    '/apps/:name',
+                    makeReq({
+                        params: { name: `${app.name}|${other.name}` },
+                        actor: stranger.actor,
+                    }),
+                    res,
+                ),
+            );
+            const [priv, pub] = captured.body as Array<Record<string, unknown>>;
+            expect(priv!.index_url).toBeUndefined();
+            expect(priv!.privateAccess).toMatchObject({ hasAccess: false });
+            expect(pub!.privateAccess).toEqual({
+                hasAccess: true,
+                checkedBy: 'core/public-app',
+            });
+            expect(
+                emit.mock.calls.filter(
+                    (call) => call[0] === 'app.privateAccess.resolveLaunch',
+                ),
+            ).toHaveLength(1);
+        } finally {
+            emit.mockRestore();
+        }
+    });
 });
 
 // ── POST /query/app ─────────────────────────────────────────────────
@@ -792,6 +870,61 @@ describe('AppController POST /query/app', () => {
         expect(body).toHaveLength(1);
         expect(body[0]?.name).toBe(app.name);
     });
+
+    it('resolves every selector with batched lookups, not one per selector', async () => {
+        const owner = await makeUser();
+        const apps = await Promise.all(
+            [0, 1, 2].map(() =>
+                createApp(owner.actor, {
+                    name: uniqueName('batch'),
+                    filetype_associations: ['.batchq'],
+                }),
+            ),
+        );
+        const appStore = server.stores.app;
+        const spies = {
+            getByName: vi.spyOn(appStore, 'getByName'),
+            getByUid: vi.spyOn(appStore, 'getByUid'),
+            getFiletypeAssociations: vi.spyOn(
+                appStore,
+                'getFiletypeAssociations',
+            ),
+            getByNames: vi.spyOn(appStore, 'getByNames'),
+            getByUids: vi.spyOn(appStore, 'getByUids'),
+            getFiletypeAssociationsByIds: vi.spyOn(
+                appStore,
+                'getFiletypeAssociationsByIds',
+            ),
+        };
+
+        try {
+            const { res, captured } = makeRes();
+            await withActor(owner.actor, () =>
+                callRoute(
+                    'post',
+                    '/query/app',
+                    makeReq({
+                        body: [apps[0]!.name, apps[1]!.name, apps[2]!.uid],
+                        actor: owner.actor,
+                    }),
+                    res,
+                ),
+            );
+            const body = captured.body as Array<Record<string, unknown>>;
+            expect(body.map((item) => item.uuid)).toEqual(
+                apps.map((app) => app.uid),
+            );
+            expect(body[2]!.associations).toEqual(['batchq']);
+            expect(spies.getByName).not.toHaveBeenCalled();
+            expect(spies.getByUid).not.toHaveBeenCalled();
+            expect(spies.getFiletypeAssociations).not.toHaveBeenCalled();
+            expect(spies.getByNames).toHaveBeenCalledTimes(1);
+            expect(spies.getByUids).toHaveBeenCalledTimes(1);
+            expect(spies.getFiletypeAssociationsByIds).toHaveBeenCalledTimes(1);
+        } finally {
+            for (const spy of Object.values(spies)) spy.mockRestore();
+        }
+    });
 });
 
 // ── GET /app-icon/:app_uid(/:size) ──────────────────────────────────
@@ -948,6 +1081,68 @@ describe('AppController POST /rao actor gating', () => {
         ).rejects.toMatchObject({ statusCode: 403, legacyCode: 'forbidden' });
     });
 
+    it('records an open for a full-access token — the account itself', async () => {
+        const owner = await makeUser();
+        const app = await createApp(owner.actor);
+        const patActor = makeActor({
+            user: owner.actor.user,
+            accessToken: {
+                uid: uuidv4(),
+                issuer: owner.actor,
+                authorized: null,
+                fullAccess: true,
+            },
+        });
+
+        const { res, captured } = makeRes();
+        await withActor(patActor, () =>
+            callRoute(
+                'post',
+                '/rao',
+                makeReq({ body: { app_uid: app.uid }, actor: patActor }),
+                res,
+            ),
+        );
+        expect(captured.body).toEqual({});
+
+        await server.controllers.apps.drainPendingAppOpens();
+        const rows = (await server.clients.db.read(
+            'SELECT `app_uid` FROM `app_opens` WHERE `app_uid` = ? AND `user_id` = ?',
+            [app.uid, owner.userId],
+        )) as unknown[];
+        expect(rows).toHaveLength(1);
+    });
+
+    it('refuses a full-access claim on an app-issued token', async () => {
+        const { actor } = await makeUser();
+        const app = await createApp(actor);
+        const issuer = makeActor({ ...actor, app: { uid: app.uid as string } });
+        const tokenActor = makeActor({
+            user: actor.user,
+            accessToken: {
+                uid: uuidv4(),
+                issuer,
+                authorized: null,
+                fullAccess: true,
+            },
+        });
+
+        const { res } = makeRes();
+        await expect(
+            withActor(tokenActor, () =>
+                callRoute(
+                    'post',
+                    '/rao',
+                    makeReq({
+                        body: { app_uid: app.uid },
+                        actor: tokenActor,
+                    }),
+                    res,
+                ),
+            ),
+        ).rejects.toMatchObject({ statusCode: 403, legacyCode: 'forbidden' });
+    });
+
     it("refuses to let an app actor record another app's open", async () => {
         const { actor } = await makeUser();
         const own = await createApp(actor);

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

@@ -18,7 +18,7 @@
  */
 
 import { TOTP } from 'otpauth';
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
+import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
 import { makeActor } from '../../core/actor.js';
 import { runWithContext } from '../../core/context.js';
 import { createSecret as otpCreateSecret } from '../../services/auth/OTPUtil.js';
@@ -28,7 +28,6 @@ import {
     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 +423,7 @@ describe('2FA enrollment over HTTP', () => {
     let env: PuterTestEnv;
 
     beforeAll(async () => {
-        env = await setupPuterTestEnv({ teams_enabled: true } as IConfig);
+        env = await setupPuterTestEnv();
     }, 120_000);
 
     afterAll(async () => {
@@ -561,54 +560,158 @@ 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);
+/**
+ * A temp account re-attaches through `/signup` only from a session that ran
+ * out, not from one that was revoked.
+ */
+describe('temp-account reauth over HTTP', () => {
+    let env: PuterTestEnv;
 
-        const held = await fetch(new URL('/teams', env.apiOrigin), {
+    beforeAll(async () => {
+        env = await setupPuterTestEnv();
+    }, 120_000);
+
+    afterAll(async () => {
+        await env?.shutdown();
+    }, 120_000);
+
+    const signup = (body: Record<string, unknown>) =>
+        fetch(new URL('/signup', env.origin), {
+            method: 'POST',
+            headers: { 'content-type': 'application/json' },
+            body: JSON.stringify(body),
+        });
+
+    it('a revoked temp session cannot be revived with its reauth_token', async () => {
+        const first = await signup({ is_temp: true });
+        expect(first.status).toBe(200);
+        const { token } = (await first.json()) as { token: string };
+
+        const decoded = env.server.services.token.verify('auth', token) as {
+            session_uid: string;
+        };
+        await env.server.services.auth.revokeSession(decoded.session_uid);
+
+        const who = await fetch(new URL('/whoami', env.apiOrigin), {
             headers: { authorization: `Bearer ${token}` },
         });
-        expect(held.status).toBe(403);
-        expect(await held.text()).toContain('two_factor_required');
+        expect(who.status).toBe(401);
+        const { reauth_token } = (await who.json()) as {
+            reauth_token?: string;
+        };
+        expect(typeof reauth_token).toBe('string');
 
-        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 revive = await signup({ is_temp: true, reauth_token });
+        expect(revive.status).toBe(401);
+    });
 
-        const released = await fetch(new URL('/teams', env.apiOrigin), {
-            headers: { authorization: `Bearer ${token}` },
+    it('an expired temp session re-attaches to the same account', async () => {
+        const first = await signup({ is_temp: true });
+        expect(first.status).toBe(200);
+        const { user } = (await first.json()) as { user: { uuid: string } };
+
+        const reauth_token = env.server.services.auth.signReauthToken(
+            user.uuid,
+            'session_expired',
+        );
+        const again = await signup({ is_temp: true, reauth_token });
+        expect(again.status).toBe(200);
+        const body = (await again.json()) as {
+            token: string;
+            user: { uuid: string };
+        };
+        expect(body.user.uuid).toBe(user.uuid);
+        const who = await fetch(new URL('/whoami', env.apiOrigin), {
+            headers: { authorization: `Bearer ${body.token}` },
         });
-        expect(released.status).toBe(200);
+        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=',
+        );
     });
 });

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

@@ -0,0 +1,371 @@
+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/godmodeAppTokens.http.test.ts

@@ -0,0 +1,426 @@
+/*
+ * 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 { isAccountContext } from '../../core/actor.js';
+import type { AccessTokenPayload } from '../../services/auth/types.js';
+import { setupPuterTestEnv, type PuterTestEnv } from '../../testUtil.js';
+
+// Seeded with godmode on.
+const DEV_CENTER = 'app-0b37f054-07d4-4627-8765-11bd23e889d4';
+const TWELVE_HOURS = 12 * 60 * 60;
+
+/**
+ * A godmode app launched from the desktop runs on a full-access token of its
+ * own: tied to the desktop session that asked for it, carrying the app for
+ * attribution, and expiring unless the desktop asks again.
+ */
+describe('godmode app tokens', () => {
+    let env: PuterTestEnv;
+    let userId = 0;
+
+    beforeAll(async () => {
+        env = await setupPuterTestEnv();
+        const row = await env.server.stores.user.getByUsername(
+            env.users.user.username,
+        );
+        userId = row!.id;
+    }, 120_000);
+
+    afterAll(async () => {
+        await env?.shutdown();
+    });
+
+    const call = (
+        method: string,
+        path: string,
+        token: string,
+        body?: unknown,
+    ) =>
+        fetch(new URL(path, env.apiOrigin), {
+            method,
+            headers: {
+                'content-type': 'application/json',
+                authorization: `Bearer ${token}`,
+            },
+            ...(body === undefined ? {} : { body: JSON.stringify(body) }),
+        });
+
+    const mint = async (sessionToken: string, appUid = DEV_CENTER) => {
+        const res = await call(
+            'POST',
+            '/auth/get-user-app-token',
+            sessionToken,
+            { app_uid: appUid },
+        );
+        expect(res.status).toBe(200);
+        return (await res.json()) as {
+            token: string | null;
+            app_uid: string;
+            godmode?: boolean;
+            expires_at?: number;
+        };
+    };
+
+    const decode = (token: string) =>
+        env.server.services.token.verify<AccessTokenPayload>('auth', token);
+
+    const live = async (token: string) =>
+        (await env.server.services.auth.authenticate(token)).actor !== undefined;
+
+    /** A read token minted the way `getReadURL()` does, by `minter`. */
+    const mintScoped = async (minter: string) => {
+        const res = await call('POST', '/auth/create-access-token', minter, {
+            permissions: ['service:foo:ii:read'],
+            expiresIn: '7d',
+        });
+        expect(res.status).toBe(200);
+        return ((await res.json()) as { token: string }).token;
+    };
+
+    /** Rewrite a session row in place, as time passing would. */
+    const setRow = async (uuid: string, fields: Record<string, number>) => {
+        const cols = Object.keys(fields);
+        await env.server.clients.db.write(
+            `UPDATE \`sessions\` SET ${cols.map((c) => `\`${c}\` = ?`).join(', ')} WHERE \`uuid\` = ?`,
+            [...cols.map((c) => fields[c]), uuid],
+        );
+        await env.server.stores.session.publishCacheKeys({
+            keys: [`sessions:v2:uuid:${uuid}`],
+        });
+    };
+
+    /** A desktop session of its own, so revoking it leaves the shared one up. */
+    const newDesktopSession = async () => {
+        const user = await env.server.stores.user.getById(userId);
+        return env.server.services.auth.createSessionToken(user!);
+    };
+
+    /** An app row of its own, so demoting it disturbs nothing else. */
+    const makeApp = async ({
+        name = `gm-${crypto.randomUUID().slice(0, 8)}`,
+        godmode = true,
+    } = {}) => {
+        const uid = `app-${crypto.randomUUID()}`;
+        await env.server.clients.db.write(
+            'INSERT INTO `apps` (`uid`, `owner_user_id`, `name`, `title`, `index_url`, `godmode`, `timestamp`) VALUES (?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP)',
+            [uid, userId, name, 'Test App', `https://${name}.test/`, godmode ? 1 : 0],
+        );
+        return { uid, name };
+    };
+
+    it('issues a full-access token that carries the app', async () => {
+        const before = Math.floor(Date.now() / 1000);
+        const body = await mint(env.users.user.token);
+
+        expect(body).toMatchObject({ app_uid: DEV_CENTER, godmode: true });
+        expect(body.expires_at).toBeGreaterThanOrEqual(before + TWELVE_HOURS);
+
+        const claims = decode(body.token!);
+        expect(claims).toMatchObject({
+            type: 'access-token',
+            full_access: true,
+            godmode_app_uid: DEV_CENTER,
+        });
+        expect(claims.app_uid).toBeUndefined();
+        // The row's expiry is what lapses; the JWT itself never does.
+        expect(claims.exp).toBeUndefined();
+
+        const { actor } = await env.server.services.auth.authenticate(
+            body.token!,
+        );
+        expect(actor).toBeDefined();
+        expect(isAccountContext(actor!)).toBe(true);
+        expect(actor!.effectiveApp).toBeNull();
+        expect(actor!.accessToken).toMatchObject({
+            fullAccess: true,
+            godmodeApp: { uid: DEV_CENTER },
+        });
+    });
+
+    it('reaches the account surface but not account management', async () => {
+        const { token } = await mint(env.users.user.token);
+
+        expect((await call('GET', '/whoami', token!)).status).toBe(200);
+        expect((await call('GET', '/get-dev-profile', token!)).status).toBe(
+            200,
+        );
+        expect((await call('GET', '/auth/list-sessions', token!)).status).toBe(
+            403,
+        );
+        // It can't mint its own replacement; only the desktop can.
+        const self = await call('POST', '/auth/get-user-app-token', token!, {
+            app_uid: DEV_CENTER,
+        });
+        expect(self.status).toBe(403);
+    });
+
+    it('keeps one token per desktop session across renewals', async () => {
+        const desktop = await newDesktopSession();
+        const first = await mint(desktop.gui_token);
+        const second = await mint(desktop.gui_token);
+
+        expect(decode(second.token!).token_uid).toBe(
+            decode(first.token!).token_uid,
+        );
+        // Asked again within the hour: the row keeps the expiry it has.
+        expect(second.expires_at).toBe(first.expires_at);
+        // A copy taken at launch keeps working after the desktop renews.
+        expect(await live(first.token!)).toBe(true);
+
+        const row = await env.server.stores.session.getByUuidAny(
+            decode(second.token!).session_uid!,
+        );
+        expect(row).toMatchObject({
+            kind: 'access_token',
+            app_uid: DEV_CENTER,
+            expires_at: second.expires_at,
+        });
+    });
+
+    it('is extended once the desktop asks with under eleven hours left', async () => {
+        const desktop = await newDesktopSession();
+        const first = await mint(desktop.gui_token);
+        const sessionUid = decode(first.token!).session_uid!;
+        await setRow(sessionUid, {
+            expires_at: Math.floor(Date.now() / 1000) + 2 * 60 * 60,
+        });
+
+        const before = Math.floor(Date.now() / 1000);
+        const renewed = await mint(desktop.gui_token);
+        expect(decode(renewed.token!).token_uid).toBe(
+            decode(first.token!).token_uid,
+        );
+        expect(renewed.expires_at).toBeGreaterThanOrEqual(
+            before + TWELVE_HOURS,
+        );
+        const row = await env.server.stores.session.getByUuidAny(sessionUid);
+        expect(row?.expires_at).toBe(renewed.expires_at);
+    });
+
+    it('is never extended by being used', async () => {
+        const desktop = await newDesktopSession();
+        const { token, expires_at } = await mint(desktop.gui_token);
+        expect((await call('GET', '/whoami', token!)).status).toBe(200);
+        const row = await env.server.stores.session.getByUuidAny(
+            decode(token!).session_uid!,
+        );
+        expect(row?.expires_at).toBe(expires_at);
+    });
+
+    it('lists the token under its app for the account', async () => {
+        await mint(env.users.user.token);
+        const res = await call(
+            'GET',
+            '/auth/list-sessions',
+            env.users.user.token,
+        );
+        const sessions = (await res.json()) as Array<{
+            kind: string;
+            app_uid: string | null;
+            app: { name?: string } | null;
+        }>;
+        const row = sessions.find(
+            (s) => s.kind === 'access_token' && s.app_uid === DEV_CENTER,
+        );
+        expect(row?.app?.name).toBe('dev-center');
+    });
+
+    it('installs the app like any other launch, and uninstalls the same way', async () => {
+        const { uid } = await makeApp();
+        const app = await env.server.stores.app.getByUid(uid);
+        const installed = () =>
+            env.server.stores.permission.hasUserAppPerm(
+                userId,
+                app!.id,
+                'flag:app-is-authenticated',
+            );
+
+        const { token } = await mint(env.users.user.token, uid);
+        expect(await installed()).toBe(true);
+        expect(
+            await env.server.stores.fsEntry.getEntryByPath(
+                `/${env.users.user.username}/AppData/${uid}`,
+            ),
+        ).toBeTruthy();
+
+        // What the desktop's uninstall does: drop the grants, then the app's sessions.
+        const revoked = await call(
+            'POST',
+            '/auth/revoke-user-app',
+            env.users.user.token,
+            { app_uid: uid, permission: '*' },
+        );
+        expect(revoked.status).toBe(200);
+        expect(await installed()).toBe(false);
+
+        await env.server.services.auth.revokeSession(decode(token!).session_uid!);
+        expect(await live(token!)).toBe(false);
+    });
+
+    it('dies with the desktop session that minted it', async () => {
+        const desktop = await newDesktopSession();
+        const { token } = await mint(desktop.gui_token);
+        expect((await call('GET', '/whoami', token!)).status).toBe(200);
+
+        await env.server.services.auth.revokeSession(
+            desktop.session.uuid as string,
+        );
+
+        const res = await call('GET', '/whoami', token!);
+        expect(res.status).toBe(401);
+    });
+
+    it('stops working once its app is no longer godmode', async () => {
+        const app = await makeApp();
+        const { token } = await mint(env.users.user.token, app.uid);
+        expect((await call('GET', '/whoami', token!)).status).toBe(200);
+
+        const row = await env.server.stores.app.getByUid(app.uid);
+        await env.server.clients.db.write(
+            'UPDATE `apps` SET `godmode` = 0 WHERE `uid` = ?',
+            [app.uid],
+        );
+        await env.server.stores.app.invalidate(row);
+
+        expect((await call('GET', '/whoami', token!)).status).toBe(401);
+    });
+
+    it('still gives an ordinary app an ordinary app token', async () => {
+        const app = await makeApp({ godmode: false });
+        const body = await mint(env.users.user.token, app.uid);
+        expect(body.godmode).toBeUndefined();
+        expect(decode(body.token!).type).toBe('app-under-user');
+    });
+
+    it('mints scoped tokens that are revoked along with it', async () => {
+        const { token } = await mint(env.users.user.token);
+        const child = await call(
+            'POST',
+            '/auth/create-access-token',
+            token!,
+            { permissions: ['service:foo:ii:read'], expiresIn: '1h' },
+        );
+        expect(child.status).toBe(200);
+        const childToken = ((await child.json()) as { token: string }).token;
+        expect(
+            (await env.server.services.auth.authenticate(childToken)).actor,
+        ).toBeDefined();
+
+        const full = await call('POST', '/auth/create-access-token', token!, {
+            permissions: ['full-api-access'],
+        });
+        expect(full.status).toBe(403);
+
+        const { actor } = await env.server.services.auth.authenticate(
+            env.users.user.token,
+        );
+        await env.server.services.auth.revokeAccessToken(actor!, token!);
+
+        expect(
+            (await env.server.services.auth.authenticate(childToken)).actor,
+        ).toBeUndefined();
+    });
+
+    it('stays dead once it lapses; the desktop asking again gets a new one', async () => {
+        const desktop = await newDesktopSession();
+        const { token } = await mint(desktop.gui_token);
+        const child = await mintScoped(token!);
+        expect(await live(child)).toBe(true);
+
+        // The desktop stopped renewing it: its row's expiry passes.
+        await setRow(decode(token!).session_uid!, {
+            expires_at: Math.floor(Date.now() / 1000) - 1,
+        });
+        expect(await live(token!)).toBe(false);
+        expect(await live(child)).toBe(false);
+
+        const next = await mint(desktop.gui_token);
+        expect(decode(next.token!).token_uid).not.toBe(decode(token!).token_uid);
+        expect(await live(next.token!)).toBe(true);
+        expect(await live(token!)).toBe(false);
+        expect(await live(child)).toBe(false);
+    });
+
+    it('is replaced and revoked once past its max age, however often renewed', async () => {
+        const desktop = await newDesktopSession();
+        const { token } = await mint(desktop.gui_token);
+        const child = await mintScoped(token!);
+        await setRow(decode(token!).session_uid!, {
+            created_at: Math.floor(Date.now() / 1000) - 8 * 24 * 60 * 60,
+        });
+
+        const next = await mint(desktop.gui_token);
+        expect(decode(next.token!).token_uid).not.toBe(decode(token!).token_uid);
+        expect(await live(next.token!)).toBe(true);
+        expect(await live(token!)).toBe(false);
+        expect(await live(child)).toBe(false);
+    });
+
+    it('lets the tokens it minted die with the desktop session', async () => {
+        const desktop = await newDesktopSession();
+        const { token } = await mint(desktop.gui_token);
+        const child = await mintScoped(token!);
+        expect(await live(child)).toBe(true);
+
+        await env.server.services.auth.revokeSession(
+            desktop.session.uuid as string,
+        );
+
+        expect(await live(token!)).toBe(false);
+        expect(await live(child)).toBe(false);
+    });
+
+    it('reaches the AI wire routes, where a gate listener may waive the plan', async () => {
+        const { token } = await mint(env.users.user.token);
+        const route = '/puterai/openai/v1/chat/completions';
+        const send = (bearer: string) =>
+            fetch(new URL(route, env.apiOrigin), {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    Authorization: `Bearer ${bearer}`,
+                },
+                body: JSON.stringify({
+                    model: 'fake',
+                    provider: 'fake-chat',
+                    messages: [{ role: 'user', content: 'hi' }],
+                    max_tokens: 16,
+                }),
+            });
+
+        // Past the credential gates, stopped only by the plan.
+        expect((await send(token!)).status).toBe(402);
+
+        env.server.clients.event.on(
+            'subscription.gate.route.post.puterai.openai.v1.chat.completions',
+            (_key, event) => {
+                const gate = event as {
+                    actor: { accessToken?: { godmodeApp?: { uid: string } } };
+                    allow: boolean;
+                };
+                if (gate.actor.accessToken?.godmodeApp?.uid === DEV_CENTER) {
+                    gate.allow = true;
+                }
+            },
+        );
+        expect((await send(token!)).status).not.toBe(402);
+        expect((await send(env.users.user.apiToken)).status).toBe(402);
+    });
+});

src/backend/controllers/auth/oidcLoginReturn.ts

@@ -0,0 +1,96 @@
+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;
+    switchedToLogin: boolean;
+}
+
+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' ||
+        typeof data.switchedToLogin !== '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,
+            ),
+        );
+    }
+    if (data.switchedToLogin) append('oidc_switched', 'login');
+    return target;
+}

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

@@ -0,0 +1,139 @@
+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/webSession.test.ts

@@ -0,0 +1,82 @@
+/*
+ * 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 { Request, Response } from 'express';
+import { v4 as uuidv4 } from 'uuid';
+import { afterAll, beforeAll, describe, expect, it } from 'vitest';
+import { configContainer } from '../../exports.js';
+import { PuterServer } from '../../server.js';
+import { setupTestServer } from '../../testUtil.js';
+import type { IConfig } from '../../types.js';
+import { startWebSession } from './webSession.js';
+
+let server: PuterServer;
+
+beforeAll(async () => {
+    server = await setupTestServer();
+});
+
+afterAll(async () => {
+    await server?.shutdown();
+});
+
+describe('startWebSession', () => {
+    it('records the request on the session, sets the HTTP-only cookie and returns a GUI token', async () => {
+        const username = `ws_${Math.random().toString(36).slice(2, 10)}`;
+        const user = await server.stores.user.create({
+            username,
+            uuid: uuidv4(),
+            password: null,
+            email: `${username}@test.local`,
+        });
+        const cookies: Array<{ name: string; value: string; opts: unknown }> =
+            [];
+        const res = {
+            cookie: (name: string, value: string, opts: unknown) => {
+                cookies.push({ name, value, opts });
+            },
+        } as unknown as Response;
+        const req = {
+            ip: '192.0.2.10',
+            headers: { 'user-agent': 'ws-agent', origin: 'https://gui.test' },
+        } as unknown as Request;
+        const config = configContainer as IConfig;
+
+        const guiToken = await startWebSession(req, res, user, {
+            config,
+            auth: server.services.auth,
+        });
+
+        expect(typeof guiToken).toBe('string');
+        expect(cookies).toHaveLength(1);
+        expect(cookies[0]!.name).toBe(config.cookie_name ?? 'puter_token');
+        expect(cookies[0]!.value).not.toBe(guiToken);
+        expect(cookies[0]!.opts).toMatchObject({ httpOnly: true });
+
+        const sessions = (await server.stores.session.getByUserId(
+            user.id,
+        )) as Array<Record<string, unknown>>;
+        expect(sessions).toHaveLength(1);
+        expect(sessions[0]).toMatchObject({
+            kind: 'web',
+            last_ip: '192.0.2.10',
+            last_user_agent: 'ws-agent',
+        });
+    });
+});

src/backend/controllers/auth/webSession.ts

@@ -0,0 +1,48 @@
+/*
+ * 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 { Request, Response } from 'express';
+import type { AuthService } from '../../services/auth/AuthService.js';
+import type { UserRow } from '../../stores/user/UserStore.js';
+import type { IConfig } from '../../types.js';
+import { sessionCookieFlags } from '../../util/cookieFlags.js';
+
+/**
+ * Open a web session for a sign-in this request completed, recording where it
+ * came from, and set its HTTP-only cookie. Returns the GUI token, the only
+ * credential the client sees.
+ */
+export async function startWebSession(
+    req: Request,
+    res: Response,
+    user: UserRow,
+    deps: { config: IConfig; auth: AuthService },
+): Promise<string> {
+    const { token, gui_token } = await deps.auth.createSessionToken(user, {
+        ip: req.ip || req.socket?.remoteAddress,
+        user_agent: req.headers?.['user-agent'],
+        origin: req.headers?.origin,
+        host: req.headers?.host,
+    });
+    res.cookie(deps.config.cookie_name ?? 'puter_token', token, {
+        ...sessionCookieFlags(deps.config),
+        httpOnly: true,
+    });
+    return gui_token;
+}

src/backend/controllers/broadcast/BroadcastController.ts

@@ -73,8 +73,8 @@ export class BroadcastController extends PuterController {
     /**
      * Event deliveries one region addressed at this one, on the same signed
      * channel as the webhook above but carrying socket traffic rather than bus
-     * events. The answer names the pairs this region holds no socket for, which
-     * is what lets the sender correct its presence row.
+     * events. The answer names the anchor tokens this region holds no session
+     * row for, which is what lets the sender prune its remote-watch index.
      */
     @Post('/events', { subdomain: '*' })
     async events(req: Request, res: Response): Promise<void> {

src/backend/controllers/desktop/DesktopController.js

@@ -46,17 +46,6 @@ const PREFERENCE_WRITE_LIMIT = {
 };
 
 export class DesktopController extends PuterController {
-    constructor(config, clients, stores, services) {
-        super(config, clients, stores, services);
-    }
-
-    get userStore() {
-        return this.stores.user;
-    }
-    get db() {
-        return this.clients.db;
-    }
-
     registerRoutes(router) {
         // -- Desktop background --------------------------------------
 
@@ -109,7 +98,7 @@ export class DesktopController extends PuterController {
                     });
                 }
 
-                await this.userStore.update(req.actor.user.id, patch);
+                await this.stores.user.update(req.actor.user.id, patch);
                 res.json({});
             },
         );
@@ -134,7 +123,7 @@ export class DesktopController extends PuterController {
                     );
                 }
 
-                await this.userStore.update(req.actor.user.id, {
+                await this.stores.user.update(req.actor.user.id, {
                     taskbar_items: JSON.stringify(items),
                 });
                 res.json({});
@@ -250,7 +239,7 @@ export class DesktopController extends PuterController {
         const setClause = keys.map((k) => `\`${k}\` = ?`).join(', ');
         const values = keys.map((k) => patch[k]);
 
-        await this.db.write(
+        await this.clients.db.write(
             `UPDATE \`fsentries\` SET ${setClause} WHERE \`id\` = ?`,
             [...values, entry.id],
         );

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

@@ -262,6 +262,22 @@ describe('DriverController — concurrent acquire/release', () => {
         expect(res2.body).toMatchObject({ success: true, result: 'pong' });
     });
 
+    it('releases a slot acquired after the client has disconnected', async () => {
+        const handler = captureCallHandler(buildController(makeSyntheticDriver()));
+        const res1 = new StubRes();
+        Object.assign(res1, { destroyed: true });
+        await callInScope(handler,
+            makeReq({ interface: 'test-iface', method: 'ping' }, 'already-aborted'),
+            res1 as unknown as Response);
+        await new Promise((resolve) => setImmediate(resolve));
+        const res2 = new StubRes();
+        await callInScope(handler,
+            makeReq({ interface: 'test-iface', method: 'ping' }, 'already-aborted'),
+            res2 as unknown as Response);
+        res2.emit('finish');
+        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.errors.test.ts

@@ -40,6 +40,10 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 import type { DriverMethodLifecycleEvent } from '../../clients/event/types.js';
 import { Context, runWithContext } from '../../core/context.js';
 import { configureRateLimit } from '../../core/http/middleware/rateLimit.js';
+import {
+    UpstreamResponseError,
+    upstreamBodyStream,
+} from '../../drivers/util/upstreamErrors.js';
 import { DriverController } from './DriverController.js';
 
 // -- Harness ---------------------------------------------------------
@@ -266,6 +270,35 @@ describe('DriverController upstream error translation', () => {
         });
     });
 
+    // `fields` become the alarm's details, so this is what names the vendor.
+    it.each([
+        [
+            'a provider API response',
+            new UpstreamResponseError('Invalid API key', 401, 'xai'),
+            500,
+            'upstream_auth_failed',
+        ],
+        [
+            'a provider error carrying its status',
+            Object.assign(new Error('insufficient credits'), {
+                status: 402,
+                provider: 'byteplus',
+            }),
+            503,
+            'upstream_credits_exhausted',
+        ],
+    ])(
+        'names the provider behind %s in the error fields',
+        async (_shape, raw, statusCode, legacyCode) => {
+            const { err } = await callWith(throwing(raw));
+            expect(err).toMatchObject({
+                statusCode,
+                legacyCode,
+                fields: { provider: raw.provider, upstreamStatus: raw.status },
+            });
+        },
+    );
+
     it('prefers the nested error.message and error.code over the top-level ones', async () => {
         const { err } = await callWith(
             throwing({
@@ -449,6 +482,51 @@ describe('DriverController stream responses', () => {
         expect(res.headers['content-type']).toBe('audio/mpeg');
         expect('transfer-encoding' in res.headers).toBe(false);
     });
+
+    it('destroys the response, without crashing, when the source fails after the first chunk', async () => {
+        let upstream!: ReadableStreamDefaultController<Uint8Array>;
+        const body = new ReadableStream<Uint8Array>({
+            start(controller) {
+                upstream = controller;
+            },
+        });
+        const { handler } = build({
+            run: () => ({
+                dataType: 'stream',
+                content_type: 'audio/mpeg',
+                chunked: true,
+                stream: upstreamBodyStream(new Response(body)),
+            }),
+        });
+        const res = new MockRes();
+        const uncaught = vi.fn();
+        process.on('uncaughtException', uncaught);
+        const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+        try {
+            await runWithContext({}, () =>
+                handler(
+                    makeReq({ interface: 'test-iface', method: 'run' }),
+                    res as unknown as Response,
+                    () => {},
+                ),
+            );
+            upstream.enqueue(Buffer.from('first'));
+            await vi.waitFor(() => expect(res.chunks).toHaveLength(1));
+
+            const closed = new Promise((resolve) => res.once('close', resolve));
+            upstream.error(new Error('connection reset'));
+            await closed;
+
+            expect(Buffer.concat(res.chunks).toString()).toBe('first');
+            expect(res.destroyed).toBe(true);
+            expect(res.writableFinished).toBe(false);
+            expect(warn).toHaveBeenCalledTimes(1);
+            expect(uncaught).not.toHaveBeenCalled();
+        } finally {
+            process.off('uncaughtException', uncaught);
+            warn.mockRestore();
+        }
+    });
 });
 
 // -- Rate limiting ---------------------------------------------------

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

@@ -21,6 +21,7 @@
 import { EventEmitter } from 'node:events';
 import type { Request, RequestHandler, Response } from 'express';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { EventClient } from '../../clients/event/EventClient.js';
 import { runWithContext } from '../../core/context.js';
 import { isHttpError } from '../../core/http/HttpError.js';
 import { configureRateLimit } from '../../core/http/middleware/rateLimit.js';
@@ -97,8 +98,8 @@ const syntheticDriver = {
     premium: async () => 'premium-ok',
 };
 
-const buildController = (plan: string | null) => {
-    const clients = { alarm: { create: () => {} } };
+const buildController = (plan: string | null, events?: EventClient) => {
+    const clients = { alarm: { create: () => {} }, ...(events ? { event: events } : {}) };
     const services = plan
         ? {
               metering: {
@@ -115,8 +116,13 @@ const buildController = (plan: string | null) => {
     );
 };
 
-const call = (plan: string | null, method: string, tag: string) => {
-    const handler = captureCallHandler(buildController(plan));
+const call = (
+    plan: string | null,
+    method: string,
+    tag: string,
+    events?: EventClient,
+) => {
+    const handler = captureCallHandler(buildController(plan, events));
     const res = new StubRes();
     return runWithContext({}, () =>
         handler(makeReq(method, tag), res as unknown as Response, () => {}),
@@ -157,6 +163,17 @@ describe('DriverController — per-method subscription requirement', () => {
         expect(res.body).toMatchObject({ success: true, result: 'premium-ok' });
     });
 
+    it('lets a subscription.gate listener waive one method for a free account', async () => {
+        const events = new EventClient({} as any);
+        events.on('subscription.gate.driver.test-iface.paid', (_key, event) => {
+            (event as { allow: boolean }).allow = true;
+        });
+
+        const res = await call('user_free', 'paid', 'waived', events);
+        expect(res.body).toMatchObject({ success: true, result: 'paid-ok' });
+        await expect402(call('user_free', 'premium', 'not-waived', events));
+    });
+
     it('enforces nothing on a deployment with no metering service', async () => {
         const res = await call(null, 'paid', 'no-metering');
         expect(res.body).toMatchObject({ success: true, result: 'paid-ok' });

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

@@ -823,9 +823,10 @@ describe('DriverController.#handleCall tracing', () => {
             'driver.method': 'set',
             'driver.name': 'puter-kvstore',
         });
-        // 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');
+        // 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');
         expect(names.some((n) => n.startsWith('ddb.'))).toBe(true);
     });
 });

src/backend/controllers/drivers/DriverController.ts

@@ -41,11 +41,9 @@ import {
     isDriverStreamResult,
     resolveCallableMethods,
     resolveDriverMeta,
-    resolveDriverMethodConcurrent,
-    resolveDriverMethodRateLimit,
-    resolveDriverMethodRequireReputation,
-    resolveDriverMethodRequireSubscription,
+    resolvePerMethod,
 } from '../../drivers/meta.js';
+import { pipeStreamResult } from '../../drivers/util/pipeStreamResult.js';
 import { assertActorHasSubscription } from '../../services/metering/enforcement.js';
 import type { PermissionService } from '../../services/permission/PermissionService.js';
 import { PermissionUtil } from '../../services/permission/permissionUtil.js';
@@ -111,7 +109,8 @@ const extractUpstreamStatus = (e: {
     return undefined;
 };
 
-const translateProviderError = (err: unknown): unknown => {
+/** Maps a provider failure onto the error the `/drivers/call` caller sees. */
+export const translateProviderError = (err: unknown): unknown => {
     if (isHttpError(err)) return err;
     if (!err || typeof err !== 'object') return err;
     const e = err as {
@@ -123,13 +122,16 @@ const translateProviderError = (err: unknown): unknown => {
         error?: { code?: string; type?: string; message?: string };
         code?: string;
         cause?: unknown;
+        provider?: unknown;
     };
     const status = extractUpstreamStatus(e);
     const msg = sanitizeUpstreamMessage(
         e.error?.message ?? e.message ?? 'Upstream provider error',
     );
     const upstreamCode = e.error?.code ?? e.code;
-    const fields = { upstreamStatus: status, upstreamCode };
+    // Provider-raised errors name their vendor so the alarm says which one.
+    const provider = typeof e.provider === 'string' ? e.provider : undefined;
+    const fields = { provider, upstreamStatus: status, upstreamCode };
 
     if (isCreditExhaustion(status, upstreamCode, msg)) {
         return new HttpError(503, 'AI provider out of credits', {
@@ -301,16 +303,10 @@ export class DriverController extends PuterController {
         }
         const fn = driver[method];
 
-        // Resolve the concrete driver name for permission keys, falling
-        // back through prototype metadata → instance field → requested name.
-        const resolvedDriverName =
-            (driver as Record<string, unknown>).driverName ??
-            (Object.getPrototypeOf(driver) as Record<string, unknown>)
-                .__driverName ??
-            requestedDriver ??
-            'unknown';
-
         const driverMeta = this.#meta.get(driver);
+        // The concrete driver name, not an alias, keys the permission check.
+        const resolvedDriverName =
+            driverMeta?.driverName ?? requestedDriver ?? 'unknown';
 
         // Drivers flagged `noUserSession` refuse the bare
         // account-session ("root") token: callers must present an app or
@@ -326,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
@@ -356,13 +351,13 @@ export class DriverController extends PuterController {
         }
 
         // Methods that ask for a trusted-enough account. Declared per-driver
-        // (`@Driver({ requireReputation })`) for the same reason the
+        // (`requireReputation`) for the same reason the
         // subscription block is. Checked ahead of the plan and rate-limit
         // gates, matching the route chain: whether this account should be
         // reaching the method at all is settled before what it pays for or how
         // often it may ask. Inert unless the running config gives the named
         // tier a score.
-        const reputationRequirement = resolveDriverMethodRequireReputation(
+        const reputationRequirement = resolvePerMethod(
             driverMeta?.requireReputation,
             method,
         );
@@ -374,13 +369,13 @@ export class DriverController extends PuterController {
             );
         }
 
-        // Subscriber-only methods. Declared per-driver
-        // (`@Driver({ requireSubscription })`) because `/drivers/call` is a
-        // single route and a route option would apply to every driver at once.
+        // Subscriber-only methods. Declared per-driver (`requireSubscription`)
+        // because `/drivers/call` is a single route and a route option would
+        // apply to every driver at once.
         // Checked before the rate limit — the same order the route chain uses
         // — so a caller whose plan never included the method is told that
         // rather than spending a bucket on it.
-        const subscriptionRequirement = resolveDriverMethodRequireSubscription(
+        const subscriptionRequirement = resolvePerMethod(
             driverMeta?.requireSubscription,
             method,
         );
@@ -390,20 +385,21 @@ export class DriverController extends PuterController {
                 req.actor,
                 subscriptionRequirement,
                 this.config,
+                {
+                    events: this.clients.event,
+                    surface: `driver.${ifaceName}.${method}`,
+                    req,
+                },
             );
         }
 
         // Per-method rate-limit and concurrent specs both live on the
-        // driver's resolved meta (set by `@Driver({ rateLimit, concurrent })`
-        // or imperative fields). Rate-limit is single-shot; concurrent
+        // driver's resolved meta. Rate-limit is single-shot; concurrent
         // 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 = resolveDriverMethodRateLimit(
-            driverMeta?.rateLimit,
-            method,
-        );
+        const rateLimitSpec = resolvePerMethod(driverMeta?.rateLimit, method);
         if (
             !(await checkDriverRateLimit(req, ifaceName, method, rateLimitSpec))
         ) {
@@ -414,10 +410,7 @@ export class DriverController extends PuterController {
             });
         }
 
-        const concurrentSpec = resolveDriverMethodConcurrent(
-            driverMeta?.concurrent,
-            method,
-        );
+        const concurrentSpec = resolvePerMethod(driverMeta?.concurrent, method);
         // Only acquire (and attach release listeners) when the driver
         // actually declared a concurrency cap. Skipping in the unbounded
         // case keeps the hot path free of needless event-listener churn
@@ -448,6 +441,7 @@ export class DriverController extends PuterController {
             // 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
@@ -579,7 +573,7 @@ export class DriverController extends PuterController {
             if (result.chunked) {
                 res.setHeader('Transfer-Encoding', 'chunked');
             }
-            result.stream.pipe(res);
+            pipeStreamResult(result.stream, res, `${ifaceName}.${method}`);
             return;
         }
 

src/backend/controllers/events/EventsController.ts

@@ -17,11 +17,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { timingSafeEqual } from 'node:crypto';
 import type { Request, Response } from 'express';
 import type { Actor } from '../../core/actor.js';
 import { Controller, Delete, Get, Post } from '../../core/http/decorators.js';
 import { HttpError } from '../../core/http/HttpError.js';
+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';
@@ -75,7 +75,7 @@ export class EventsController extends PuterController {
         const actor = this.#requireActor(req);
         const { sub } = await this.services.events.subscribeDurable(
             actor,
-            this.#body(req),
+            bodyRecord(req),
         );
         res.json(sub);
     }
@@ -108,7 +108,8 @@ export class EventsController extends PuterController {
      * 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 `after`.
+     * cursor comes back to the caller and goes out again as `cursor` (or
+     * `after`, the name it first shipped under).
      */
     @Get('/fetch', {
         subdomain: 'api',
@@ -122,6 +123,7 @@ export class EventsController extends PuterController {
 
         const page = await this.services.events.fetchMissed(actor, {
             subject: typeof query.subject === 'string' ? query.subject : '',
+            cursor: typeof query.cursor === 'string' ? query.cursor : undefined,
             after: typeof query.after === 'string' ? query.after : undefined,
             limit: normalizeLimit(query.limit, {
                 cap: EVENTS_FETCH_LIMIT_CAP,
@@ -145,7 +147,7 @@ export class EventsController extends PuterController {
     })
     async unsubscribe(req: Request, res: Response): Promise<void> {
         const actor = this.#requireActor(req);
-        await this.services.events.unsubscribeDurable(actor, this.#body(req));
+        await this.services.events.unsubscribeDurable(actor, bodyRecord(req));
         res.json({});
     }
 
@@ -169,7 +171,7 @@ export class EventsController extends PuterController {
     async mintKvHandle(req: Request, res: Response): Promise<void> {
         const actor = this.#requireActor(req);
         res.json(
-            await this.services.events.mintKvHandle(actor, this.#body(req)),
+            await this.services.events.mintKvHandle(actor, bodyRecord(req)),
         );
     }
 
@@ -234,7 +236,7 @@ export class EventsController extends PuterController {
     async publishHandler(req: Request, res: Response): Promise<void> {
         const actor = this.#requireActor(req);
         res.json(
-            await this.services.events.publishHandler(actor, this.#body(req)),
+            await this.services.events.publishHandler(actor, bodyRecord(req)),
         );
     }
 
@@ -249,7 +251,7 @@ export class EventsController extends PuterController {
         res.json({
             handlers: await this.services.events.publishHandlers(
                 actor,
-                this.#body(req),
+                bodyRecord(req),
             ),
         });
     }
@@ -281,7 +283,7 @@ export class EventsController extends PuterController {
     async removeHandler(req: Request, res: Response): Promise<void> {
         const actor = this.#requireActor(req);
         res.json(
-            await this.services.events.removeHandler(actor, this.#body(req)),
+            await this.services.events.removeHandler(actor, bodyRecord(req)),
         );
     }
 
@@ -333,7 +335,7 @@ export class EventsController extends PuterController {
         res.json(
             await this.services.events.destroyEventsWorker(
                 actor,
-                this.#body(req),
+                bodyRecord(req),
             ),
         );
     }
@@ -346,6 +348,7 @@ export class EventsController extends PuterController {
      */
     @Post('/worker/rehydrate', {
         subdomain: 'api',
+        internalAuth: (config) => config.events?.internalSecret,
         // The shared secret is what gates this route, so the limit is only a
         // guessing-rate bound — hence per-IP and deliberately high. The caller
         // fans in from every edge location behind a small set of egress
@@ -358,8 +361,7 @@ export class EventsController extends PuterController {
         },
     })
     async rehydrateWorker(req: Request, res: Response): Promise<void> {
-        this.#requireInternalAuth(req);
-        const body = this.#body(req);
+        const body = bodyRecord(req);
         const script = String(body.script ?? '');
         const appUid = String(body.appUid ?? '');
         if (!EVENTS_SCRIPT_REGEX.test(script) || !APP_UID_REGEX.test(appUid))
@@ -426,25 +428,6 @@ export class EventsController extends PuterController {
         return this.#deployer;
     }
 
-    /**
-     * Constant-time, so the secret cannot be recovered a byte at a time.
-     * Compares Buffer byte lengths, not string lengths — a string length
-     * compares UTF-16 code units, which can differ from the byte length
-     * `timingSafeEqual` actually requires to match.
-     */
-    #requireInternalAuth(req: Request): void {
-        const expected = Buffer.from(this.config.events?.internalSecret ?? '');
-        const offered = Buffer.from(
-            String(req.headers['x-puter-internal-auth'] ?? ''),
-        );
-        const ok =
-            expected.length > 0 &&
-            expected.length === offered.length &&
-            timingSafeEqual(expected, offered);
-        if (!ok)
-            throw new HttpError(403, 'Forbidden', { legacyCode: 'forbidden' });
-    }
-
     #requireActor(req: Request): Actor {
         const actor = req.actor;
         if (!actor?.user)
@@ -453,13 +436,4 @@ export class EventsController extends PuterController {
             });
         return actor;
     }
-
-    #body(req: Request): Record<string, unknown> {
-        const body = req.body;
-        if (!body || typeof body !== 'object' || Array.isArray(body))
-            throw new HttpError(400, 'body must be an object', {
-                legacyCode: 'bad_request',
-            });
-        return body as Record<string, unknown>;
-    }
 }

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

@@ -17,7 +17,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
+import { GetObjectCommand } from '@aws-sdk/client-s3';
+import { Readable } from 'node:stream';
+import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
 import { setupPuterTestEnv, type PuterTestEnv } from '../../testUtil.js';
 
 /**
@@ -549,3 +551,111 @@ 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.test.ts

@@ -29,6 +29,7 @@ import { setupTestServer } from '../../testUtil.js';
 import { generateDefaultFsentries } from '../../util/userProvisioning.js';
 import { SHARE_LIST_LIMIT } from '../share/limits.js';
 import type { FSController } from './FSController.js';
+import type { LegacyFSController } from './LegacyFSController.js';
 import type {
     ClientSignedWriteResponse,
     CompleteWriteRequest,
@@ -456,6 +457,7 @@ describe('FSController.completeBatchWrites', () => {
         );
         const [secondResponse] = secondStart.captured
             .body as ClientSignedWriteResponse[];
+        await fetch(secondResponse!.url!, { method: 'PUT', body: 'yy' });
 
         const secondComplete = makeRes();
         await withActor(actor, () =>
@@ -593,6 +595,7 @@ describe('FSController.completeBatchWrites', () => {
         );
         const [secondResponse] = secondStart.captured
             .body as ClientSignedWriteResponse[];
+        await fetch(secondResponse!.url!, { method: 'PUT', body: 'yy' });
 
         const emitSpy = vi.spyOn(server.clients.event, 'emit');
         let updatedCall: (typeof emitSpy.mock.calls)[number] | undefined;
@@ -815,7 +818,10 @@ describe('FSController.statEntry', () => {
         const username = actor.user!.username!;
         const path = `/${username}/Documents/share-budget`;
         await withActor(actor, () =>
-            controller.mkdirEntry(makeReq({ body: { path }, actor }), makeRes().res),
+            controller.mkdirEntry(
+                makeReq({ body: { path }, actor }),
+                makeRes().res,
+            ),
         );
 
         // Spend the whole share:list bucket, as /share/shares' gate would.
@@ -1514,6 +1520,330 @@ describe('FSController.copyEntry', () => {
     });
 });
 
+// ── outer.gui.item.* events ─────────────────────────────────────────
+//
+// The desktop renders these, so the v2 routes must send what the legacy routes
+// send for the same operation.
+
+describe('FSController GUI item events', () => {
+    type GuiResponse = Record<string, unknown>;
+
+    // The v2 routes don't await their emits, so wait for each expected event
+    // about `uid` to land. They must also land in the order given.
+    const captureGuiEvents = async (
+        expected: Array<[eventName: string, uid: string]>,
+        run: () => Promise<unknown>,
+    ): Promise<GuiResponse[]> => {
+        const emitSpy = vi.spyOn(server.clients.event, 'emit');
+        const indexOf = ([eventName, uid]: [string, string]) =>
+            emitSpy.mock.calls.findIndex(
+                ([name, data]) =>
+                    name === eventName &&
+                    (data as { response: GuiResponse }).response.uuid === uid,
+            );
+        try {
+            await run();
+            await vi.waitFor(() => {
+                for (const event of expected)
+                    expect(indexOf(event)).toBeGreaterThanOrEqual(0);
+            });
+            const order = expected.map(indexOf);
+            expect(order).toEqual([...order].sort((a, b) => a - b));
+            return order.map(
+                (i) =>
+                    (emitSpy.mock.calls[i]![1] as { response: GuiResponse })
+                        .response,
+            );
+        } finally {
+            emitSpy.mockRestore();
+        }
+    };
+
+    const legacyController = () =>
+        server.controllers.legacyFs as unknown as LegacyFSController;
+
+    const mkdir = async (actor: Actor, path: string) => {
+        await withActor(actor, () =>
+            controller.mkdirEntry(
+                makeReq({ body: { path }, actor }),
+                makeRes().res,
+            ),
+        );
+        return (await server.stores.fsEntry.getEntryByPath(path))!;
+    };
+
+    const touch = async (actor: Actor, path: string) => {
+        await withActor(actor, () =>
+            controller.touchEntry(
+                makeReq({ body: { path }, actor }),
+                makeRes().res,
+            ),
+        );
+        return (await server.stores.fsEntry.getEntryByPath(path))!;
+    };
+
+    it('sends item.moved in the same shape as the legacy /move, with old_path', async () => {
+        const { actor } = await makeUser();
+        const username = actor.user!.username!;
+        const viaLegacy = await mkdir(actor, `/${username}/Documents/a`);
+        const viaV2 = await mkdir(actor, `/${username}/Documents/b`);
+
+        const [legacyMoved] = await captureGuiEvents(
+            [['outer.gui.item.moved', viaLegacy.uuid]],
+            () =>
+                withActor(actor, () =>
+                    legacyController().move(
+                        makeReq({
+                            body: {
+                                source: viaLegacy.path,
+                                destination: `/${username}/Pictures`,
+                            },
+                            actor,
+                        }),
+                        makeRes().res,
+                    ),
+                ),
+        );
+        const [v2Moved] = await captureGuiEvents(
+            [['outer.gui.item.moved', viaV2.uuid]],
+            () =>
+                withActor(actor, () =>
+                    controller.moveEntry(
+                        makeReq({
+                            body: {
+                                source: { path: viaV2.path },
+                                destination: { path: `/${username}/Pictures` },
+                            },
+                            actor,
+                        }),
+                        makeRes().res,
+                    ),
+                ),
+        );
+
+        expect(Object.keys(v2Moved!).sort()).toEqual(
+            Object.keys(legacyMoved!).sort(),
+        );
+        expect(v2Moved).toMatchObject({
+            uid: viaV2.uuid,
+            path: `/${username}/Pictures/b`,
+            old_path: `/${username}/Documents/b`,
+            is_dir: true,
+        });
+    });
+
+    it('sends item.removed in the same shape as the legacy /delete', async () => {
+        const { actor } = await makeUser();
+        const username = actor.user!.username!;
+        const viaLegacy = await mkdir(actor, `/${username}/Documents/a`);
+        const viaV2 = await mkdir(actor, `/${username}/Documents/b`);
+
+        const [legacyRemoved] = await captureGuiEvents(
+            [['outer.gui.item.removed', viaLegacy.uuid]],
+            () =>
+                withActor(actor, () =>
+                    legacyController().delete(
+                        makeReq({ body: { path: viaLegacy.path }, actor }),
+                        makeRes().res,
+                    ),
+                ),
+        );
+        const [v2Removed] = await captureGuiEvents(
+            [['outer.gui.item.removed', viaV2.uuid]],
+            () =>
+                withActor(actor, () =>
+                    controller.deleteEntry(
+                        makeReq({
+                            body: { path: viaV2.path, recursive: true },
+                            actor,
+                        }),
+                        makeRes().res,
+                    ),
+                ),
+        );
+
+        expect(Object.keys(v2Removed!).sort()).toEqual(
+            Object.keys(legacyRemoved!).sort(),
+        );
+        expect(v2Removed).toMatchObject({
+            path: viaV2.path,
+            descendants_only: false,
+        });
+    });
+
+    it('sends item.removed for the entry an overwriting move replaces', async () => {
+        const { actor } = await makeUser();
+        const username = actor.user!.username!;
+        const source = await touch(actor, `/${username}/Documents/clash.txt`);
+        const replaced = await touch(actor, `/${username}/Pictures/clash.txt`);
+
+        // Removal first: the desktop hides rows by path.
+        const [removed] = await captureGuiEvents(
+            [
+                ['outer.gui.item.removed', replaced.uuid],
+                ['outer.gui.item.moved', source.uuid],
+            ],
+            () =>
+                withActor(actor, () =>
+                    controller.moveEntry(
+                        makeReq({
+                            body: {
+                                source: { path: source.path },
+                                destination: { path: `/${username}/Pictures` },
+                                overwrite: true,
+                            },
+                            actor,
+                        }),
+                        makeRes().res,
+                    ),
+                ),
+        );
+        expect(removed!.path).toBe(replaced.path);
+    });
+
+    it("sends no item.removed for an owner's Trash entry an overwriting move renamed around", async () => {
+        const owner = await makeUser();
+        const holder = await makeUser();
+        const ownerName = owner.actor.user!.username!;
+        const shared = await mkdir(
+            owner.actor,
+            `/${ownerName}/Documents/shared`,
+        );
+        const source = await touch(owner.actor, `${shared.path}/note.txt`);
+        const occupant = await touch(
+            owner.actor,
+            `/${ownerName}/Trash/note.txt`,
+        );
+        await server.services.acl.setUserUser(
+            owner.actor,
+            holder.actor,
+            {
+                path: shared.path,
+                resolveAncestors: () =>
+                    server.services.fs.getAncestorChain(shared.path),
+            },
+            'write',
+        );
+
+        const emitSpy = vi.spyOn(server.clients.event, 'emit');
+        const announced = (eventName: string, uid: string) =>
+            emitSpy.mock.calls.some(
+                ([name, data]) =>
+                    name === eventName &&
+                    (data as { response: GuiResponse }).response.uuid === uid,
+            );
+        try {
+            await withActor(holder.actor, () =>
+                controller.moveEntry(
+                    makeReq({
+                        body: {
+                            source: { path: source.path },
+                            destination: { path: `/${ownerName}/Trash` },
+                            overwrite: true,
+                        },
+                        actor: holder.actor,
+                    }),
+                    makeRes().res,
+                ),
+            );
+            // A replaced entry's removal goes out before the move's own event.
+            await vi.waitFor(() =>
+                expect(announced('outer.gui.item.moved', source.uuid)).toBe(
+                    true,
+                ),
+            );
+            expect(announced('outer.gui.item.removed', occupant.uuid)).toBe(
+                false,
+            );
+        } finally {
+            emitSpy.mockRestore();
+        }
+        expect(
+            await server.stores.fsEntry.getEntryByUuid(occupant.uuid),
+        ).not.toBeNull();
+    });
+
+    it('sends item.removed for the entry an overwriting copy replaces, first', async () => {
+        const { actor } = await makeUser();
+        const username = actor.user!.username!;
+        const source = await touch(actor, `/${username}/Documents/dup.txt`);
+        const replaced = await touch(actor, `/${username}/Pictures/dup.txt`);
+
+        const emitSpy = vi.spyOn(server.clients.event, 'emit');
+        // GUI item events about the destination path, in emit order.
+        const atPath = () =>
+            emitSpy.mock.calls.flatMap(([name, data]) => {
+                const response = (data as { response?: GuiResponse })?.response;
+                return String(name).startsWith('outer.gui.item.') &&
+                    response?.path === replaced.path
+                    ? [[name, response.uuid]]
+                    : [];
+            });
+        try {
+            await withActor(actor, () =>
+                controller.copyEntry(
+                    makeReq({
+                        body: {
+                            source: { path: source.path },
+                            destination: { path: `/${username}/Pictures` },
+                            overwrite: true,
+                        },
+                        actor,
+                    }),
+                    makeRes().res,
+                ),
+            );
+            await vi.waitFor(() => expect(atPath()).toHaveLength(2));
+            // Removal first: the desktop hides rows by path.
+            expect(atPath()[0]).toEqual([
+                'outer.gui.item.removed',
+                replaced.uuid,
+            ]);
+            expect(atPath()[1]?.[0]).toBe('outer.gui.item.added');
+        } finally {
+            emitSpy.mockRestore();
+        }
+    });
+
+    it('applies new_metadata on move, as trashing does', async () => {
+        const { actor } = await makeUser();
+        const username = actor.user!.username!;
+        const source = await mkdir(actor, `/${username}/Documents/trashed`);
+        const trashMetadata = {
+            original_name: 'trashed',
+            original_path: source.path,
+            trashed_ts: 1700000000,
+        };
+
+        const [moved] = await captureGuiEvents(
+            [['outer.gui.item.moved', source.uuid]],
+            () =>
+                withActor(actor, () =>
+                    controller.moveEntry(
+                        makeReq({
+                            body: {
+                                source: { path: source.path },
+                                destination: { path: `/${username}/Trash` },
+                                new_name: source.uuid,
+                                new_metadata: trashMetadata,
+                            },
+                            actor,
+                        }),
+                        makeRes().res,
+                    ),
+                ),
+        );
+
+        const stored = await server.stores.fsEntry.getEntryByUuidFromPrimary(
+            source.uuid,
+        );
+        expect(JSON.parse(stored!.metadata!)).toMatchObject(trashMetadata);
+        expect(JSON.parse(String(moved!.metadata))).toMatchObject(
+            trashMetadata,
+        );
+    });
+});
+
 // ── /read (readEntry, full read) ────────────────────────────────────
 
 describe('FSController.readEntry (file streaming)', () => {
@@ -1618,6 +1948,27 @@ 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!;
@@ -2536,6 +2887,64 @@ describe('FSController.statEntry additional branches', () => {
     });
 });
 
+describe('FSController.statEntry return_size disclosure', () => {
+    it('answers the owner-wide size only to a caller who could list it', async () => {
+        const { actor: owner, userId } = await makeUser();
+        const username = owner.user!.username!;
+        const dir = `/${username}/Documents/shared-sized`;
+        await withActor(owner, () =>
+            controller.mkdirEntry(
+                makeReq({ body: { path: dir }, actor: owner }),
+                makeRes().res,
+            ),
+        );
+        const body = Buffer.from('1234567890');
+        await server.services.fs.write(userId, {
+            fileMetadata: {
+                path: `${dir}/secret.txt`,
+                size: body.byteLength,
+                contentType: 'text/plain',
+            },
+            fileContent: body,
+        });
+
+        const { actor: viewer } = await makeUser();
+        const viewerName = viewer.user!.username!;
+        const statAsViewer = async () => {
+            const { res, captured } = makeRes();
+            await withActor(viewer, () =>
+                controller.statEntry(
+                    makeReq({
+                        body: { path: dir, return_size: true },
+                        actor: viewer,
+                    }),
+                    res,
+                ),
+            );
+            return captured.body as { size?: number };
+        };
+
+        // `see` is the weakest level: the folder is visible, its contents are not.
+        await server.services.permission.grantUserUserPermission(
+            owner,
+            viewerName,
+            `fs:${dir}:see`,
+        );
+        // The directory row's own size, never the sum of what is under it.
+        expect((await statAsViewer()).size).toBe(0);
+
+        // `list` is where the contents become enumerable, so the sum may go out.
+        await server.services.permission.grantUserUserPermission(
+            owner,
+            viewerName,
+            `fs:${dir}:list`,
+        );
+        expect((await statAsViewer()).size).toBeGreaterThanOrEqual(
+            body.byteLength,
+        );
+    });
+});
+
 // ── #getReportedCosts ───────────────────────────────────────────────
 
 describe('FSController.getReportedCosts', () => {

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

@@ -26,6 +26,7 @@ import type { Actor } from '../../core/actor.js';
 import { runWithContext } from '../../core/context.js';
 import { PuterServer } from '../../server.js';
 import { setupTestServer } from '../../testUtil.js';
+import { toPendingUploadSessionKey } from '../../stores/fs/pendingUploadSessionHelpers.js';
 import { generateDefaultFsentries } from '../../util/userProvisioning.js';
 import type { FSController } from './FSController.js';
 import { FS_BATCH_WRITE_MAX_ITEMS, FS_MULTIPART_MAX_PARTS } from './limits.js';
@@ -1256,8 +1257,271 @@ describe('FSController.completeWrite', () => {
             ),
         ).rejects.toMatchObject({ statusCode: 404 });
     });
+
+    // One read for the access check and one for the status decision; the
+    // completion is recorded from the second without reading it back.
+    it('reads the session twice and records the completion from the second copy', async () => {
+        const { actor, username } = await makeUser();
+        const target = `/${username}/Documents/complete-once.txt`;
+        const started = await startSignedWrite(actor, target, 4);
+        await fetch(started.url!, { method: 'PUT', body: 'wxyz' });
+        const before = (await server.stores.fsEntry.getPendingEntryBySessionId(
+            started.sessionId,
+        ))!;
+
+        const reads = countSessionReads();
+        try {
+            await withActor(actor, () =>
+                controller.completeWrite(
+                    makeReq<CompleteWriteRequest>({
+                        body: { uploadId: started.sessionId },
+                        actor,
+                    }),
+                    makeRes().res,
+                ),
+            );
+            expect(reads.of(started.sessionId)).toBe(2);
+        } finally {
+            reads.restore();
+        }
+
+        const after = (await server.stores.fsEntry.getPendingEntryBySessionId(
+            started.sessionId,
+        ))!;
+        expect(after).toEqual({
+            ...before,
+            status: 'completed',
+            failureReason: null,
+            updatedAt: after.completedAt,
+            consumedAt: after.completedAt,
+            completedAt: expect.any(Number),
+        });
+    });
+
+    it('reads each session of a batch completion twice', async () => {
+        const { actor, username } = await makeUser();
+        const started = [];
+        for (const name of ['batch-once-a.txt', 'batch-once-b.txt']) {
+            const session = await startSignedWrite(
+                actor,
+                `/${username}/Documents/${name}`,
+                2,
+            );
+            await fetch(session.url!, { method: 'PUT', body: 'ab' });
+            started.push(session);
+        }
+
+        const reads = countSessionReads();
+        try {
+            const { res, captured } = makeRes();
+            await withActor(actor, () =>
+                controller.completeBatchWrites(
+                    makeReq<CompleteWriteRequest[]>({
+                        body: started.map((session) => ({
+                            uploadId: session.sessionId,
+                        })),
+                        actor,
+                    }),
+                    res,
+                ),
+            );
+            expect(
+                (captured.body as Array<{ fsEntry: { path: string } }>).map(
+                    (item) => item.fsEntry.path,
+                ),
+            ).toEqual([
+                `/${username}/Documents/batch-once-a.txt`,
+                `/${username}/Documents/batch-once-b.txt`,
+            ]);
+            for (const session of started) {
+                expect(reads.of(session.sessionId)).toBe(2);
+            }
+        } finally {
+            reads.restore();
+        }
+        for (const session of started) {
+            await expect(
+                server.stores.fsEntry.getPendingEntryBySessionId(
+                    session.sessionId,
+                ),
+            ).resolves.toMatchObject({ status: 'completed' });
+        }
+    });
+
+    it('leaves a malformed id in a batch to the service', async () => {
+        const { actor, username } = await makeUser();
+        const started = await startSignedWrite(
+            actor,
+            `/${username}/Documents/batch-malformed.txt`,
+            2,
+        );
+        await expect(
+            withActor(actor, () =>
+                controller.completeBatchWrites(
+                    makeReq<CompleteWriteRequest[]>({
+                        body: [
+                            { uploadId: started.sessionId },
+                            { uploadId: '' },
+                        ],
+                        actor,
+                    }),
+                    makeRes().res,
+                ),
+            ),
+        ).rejects.toMatchObject({ statusCode: 404 });
+    });
+
+    // The access check reads the session before the status decision; another
+    // request that settles it in between must still turn this one away.
+    const settleDuringAccessCheck = (settle: () => Promise<void>) => {
+        const fs = server.services.fs;
+        const read = fs.getUploadSessions.bind(fs);
+        return vi
+            .spyOn(fs, 'getUploadSessions')
+            .mockImplementationOnce(async (userId, uploadIds) => {
+                const sessions = await read(userId, uploadIds);
+                await settle();
+                return sessions;
+            });
+    };
+
+    it('turns away a completion whose session another one finished during the access check', async () => {
+        const { actor, userId, username } = await makeUser();
+        const target = `/${username}/Documents/raced-complete.txt`;
+        const started = await startSignedWrite(actor, target, 4);
+        await fetch(started.url!, { method: 'PUT', body: 'wxyz' });
+
+        const spy = settleDuringAccessCheck(async () => {
+            await server.services.fs.completeUrlWrite(userId, {
+                uploadId: started.sessionId,
+            });
+        });
+        try {
+            await expect(
+                withActor(actor, () =>
+                    controller.completeWrite(
+                        makeReq<CompleteWriteRequest>({
+                            body: { uploadId: started.sessionId },
+                            actor,
+                        }),
+                        makeRes().res,
+                    ),
+                ),
+            ).rejects.toMatchObject({
+                statusCode: 409,
+                message: expect.stringContaining('not pending'),
+            });
+        } finally {
+            spy.mockRestore();
+        }
+
+        await expect(
+            server.stores.fsEntry.getPendingEntryBySessionId(started.sessionId),
+        ).resolves.toMatchObject({ status: 'completed' });
+        // A completed session's object backs the live file; a late abort must
+        // leave it alone.
+        await server.services.fs.abortUrlWrite(userId, started.sessionId);
+        const entry = (await server.stores.fsEntry.getEntryByPath(target))!;
+        const { body } = await server.services.fs.readContent(entry);
+        expect(await readAll(body)).toBe('wxyz');
+    });
+
+    it('turns away a completion whose session was aborted during the access check', async () => {
+        const { actor, userId, username } = await makeUser();
+        const target = `/${username}/Documents/raced-abort.txt`;
+        const started = await startSignedWrite(actor, target, 4);
+        await fetch(started.url!, { method: 'PUT', body: 'wxyz' });
+
+        const spy = settleDuringAccessCheck(() =>
+            server.services.fs.abortUrlWrite(userId, started.sessionId),
+        );
+        try {
+            await expect(
+                withActor(actor, () =>
+                    controller.completeWrite(
+                        makeReq<CompleteWriteRequest>({
+                            body: { uploadId: started.sessionId },
+                            actor,
+                        }),
+                        makeRes().res,
+                    ),
+                ),
+            ).rejects.toMatchObject({
+                statusCode: 409,
+                message: expect.stringContaining('not pending'),
+            });
+        } finally {
+            spy.mockRestore();
+        }
+
+        await expect(
+            server.stores.fsEntry.getPendingEntryBySessionId(started.sessionId),
+        ).resolves.toMatchObject({
+            status: 'aborted',
+            failureReason: 'Upload aborted by caller',
+        });
+        await expect(
+            server.stores.fsEntry.getEntryByPath(target),
+        ).resolves.toBeNull();
+    });
+
+    it('turns away a batch completion whose session another one finished during the access check', async () => {
+        const { actor, userId, username } = await makeUser();
+        const target = `/${username}/Documents/raced-batch.txt`;
+        const started = await startSignedWrite(actor, target, 2);
+        await fetch(started.url!, { method: 'PUT', body: 'ab' });
+
+        const spy = settleDuringAccessCheck(async () => {
+            await server.services.fs.batchCompleteUrlWrite(userId, [
+                { uploadId: started.sessionId },
+            ]);
+        });
+        try {
+            await expect(
+                withActor(actor, () =>
+                    controller.completeBatchWrites(
+                        makeReq<CompleteWriteRequest[]>({
+                            body: [{ uploadId: started.sessionId }],
+                            actor,
+                        }),
+                        makeRes().res,
+                    ),
+                ),
+            ).rejects.toMatchObject({
+                statusCode: 409,
+                message: expect.stringContaining('not pending'),
+            });
+        } finally {
+            spy.mockRestore();
+        }
+
+        await expect(
+            server.stores.fsEntry.getPendingEntryBySessionId(started.sessionId),
+        ).resolves.toMatchObject({ status: 'completed' });
+    });
 });
 
+const readAll = async (body: Readable): Promise<string> => {
+    const chunks: Buffer[] = [];
+    for await (const chunk of body) chunks.push(Buffer.from(chunk));
+    return Buffer.concat(chunks).toString('utf8');
+};
+
+/** Counts system KV reads of each upload session's key. */
+const countSessionReads = () => {
+    const get = vi.spyOn(server.stores.kv, 'get');
+    return {
+        of: (sessionId: string) =>
+            get.mock.calls
+                .flatMap(([params]) =>
+                    [(params as { key: unknown }).key].flat(),
+                )
+                .filter((key) => key === toPendingUploadSessionKey(sessionId))
+                .length,
+        restore: () => get.mockRestore(),
+    };
+};
+
 describe('FSController.abortWrite', () => {
     it('rejects a request with no uploadId', async () => {
         const { actor } = await makeUser();
@@ -1381,6 +1645,48 @@ describe('FSController.signMultipartParts', () => {
         ).rejects.toMatchObject({ statusCode: 404 });
     });
 
+    it('reads the session once to sign more parts', async () => {
+        const { actor, username } = await makeUser();
+        const { res: startRes, captured: startCaptured } = makeRes();
+        await withActor(actor, () =>
+            controller.startWrite(
+                makeReq<SignedWriteRequest>({
+                    body: {
+                        fileMetadata: {
+                            path: `/${username}/Documents/sign-once.bin`,
+                            size: 8,
+                        },
+                        uploadMode: 'multipart',
+                    },
+                    actor,
+                }),
+                startRes,
+            ),
+        );
+        const started = startCaptured.body as ClientSignedWriteResponse;
+
+        const reads = countSessionReads();
+        try {
+            const { res, captured } = makeRes();
+            await withActor(actor, () =>
+                controller.signMultipartParts(
+                    makeReq<SignMultipartPartsRequest>({
+                        body: { uploadId: started.sessionId, partNumbers: [1] },
+                        actor,
+                    }),
+                    res,
+                ),
+            );
+            expect(captured.body).toMatchObject({
+                uploadId: started.sessionId,
+                multipartPartUrls: [expect.anything()],
+            });
+            expect(reads.of(started.sessionId)).toBe(1);
+        } finally {
+            reads.restore();
+        }
+    });
+
     // The session is unknown, so reaching the lookup would answer 404.
     it.each([
         [FS_MULTIPART_MAX_PARTS + 1, 400],
@@ -1447,6 +1753,66 @@ describe('FSController.batchWrites (json)', () => {
         }
     });
 
+    it('stores a batch of thumbnails in one update and announces each with its thumbnail', async () => {
+        const { actor, username } = await makeUser();
+        const names = ['th-a.png', 'th-b.png', 'th-c.png', 'th-none.png'];
+        const thumbnailFor = (name: string) =>
+            name === 'th-none.png'
+                ? undefined
+                : `data:image/png;base64,${Buffer.from(name).toString('base64')}`;
+        const writeSpy = vi.spyOn(server.clients.db, 'write');
+        const announced: Array<{ response: Record<string, unknown> }> = [];
+        const listener = (_key: string, data: unknown) => {
+            announced.push(data as { response: Record<string, unknown> });
+        };
+        server.clients.event.on('outer.gui.item.added', listener as never);
+        const { res, captured } = makeRes();
+        let statements: string[];
+        try {
+            await withActor(actor, () =>
+                controller.batchWrites(
+                    makeReq<WriteRequest[]>({
+                        body: names.map((name) => ({
+                            fileMetadata: {
+                                path: `/${username}/Documents/${name}`,
+                                size: 1,
+                            },
+                            fileContent: 'x',
+                            thumbnailData: thumbnailFor(name),
+                        })) as WriteRequest[],
+                        actor,
+                    }),
+                    res,
+                ),
+            );
+        } finally {
+            statements = writeSpy.mock.calls.map(([sql]) => String(sql));
+            writeSpy.mockRestore();
+            server.clients.event.off('outer.gui.item.added', listener as never);
+        }
+
+        expect(
+            statements.filter((sql) => sql.includes('SET thumbnail')),
+        ).toHaveLength(1);
+        const body = captured.body as Array<{
+            fsEntry: { path: string; thumbnail?: string | null };
+        }>;
+        expect(body.map((item) => item.fsEntry.path)).toEqual(
+            names.map((name) => `/${username}/Documents/${name}`),
+        );
+        for (const name of names) {
+            const path = `/${username}/Documents/${name}`;
+            const expected = thumbnailFor(name) ?? null;
+            await expect(
+                server.stores.fsEntry.getEntryByUuidFromPrimary(
+                    (await server.stores.fsEntry.getEntryByPath(path))!.uuid,
+                ),
+            ).resolves.toMatchObject({ thumbnail: expected });
+            const event = announced.find((data) => data.response.path === path);
+            expect(event?.response.thumbnail ?? null).toBe(expected);
+        }
+    });
+
     it('returns [] for a non-array body', async () => {
         const { actor } = await makeUser();
         const { res, captured } = makeRes();

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

@@ -0,0 +1,304 @@
+/*
+ * 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 { GetObjectCommand } from '@aws-sdk/client-s3';
+import { randomBytes } from 'node:crypto';
+import { Readable } from 'node:stream';
+import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
+import { setupPuterTestEnv, type PuterTestEnv } from '../../testUtil.js';
+
+/**
+ * The v1 download routes over real HTTP: what reaches the client, and what
+ * happens to the storage stream when the client goes away mid-download.
+ */
+describe('legacy file downloads over HTTP', () => {
+    let env: PuterTestEnv;
+
+    beforeAll(async () => {
+        env = await setupPuterTestEnv();
+    }, 120_000);
+
+    afterAll(async () => {
+        await env?.shutdown();
+    });
+
+    const writeFile = async (name: string, content: Buffer) => {
+        const { username } = env.users.user;
+        const user = await env.server.stores.user.getByUsername(username);
+        const path = `/${username}/Documents/${name}`;
+        const { fsEntry } = await env.server.services.fs.write(user!.id, {
+            fileMetadata: {
+                path,
+                size: content.byteLength,
+                contentType: 'application/octet-stream',
+            },
+            fileContent: content,
+        });
+        return { path, uuid: fsEntry.uuid };
+    };
+
+    const signedReadUrl = async (path: string): Promise<URL> => {
+        const signed = await fetch(new URL('/sign', env.apiOrigin), {
+            method: 'POST',
+            headers: {
+                Authorization: `Bearer ${env.users.user.token}`,
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({ items: [{ path, action: 'read' }] }),
+        });
+        expect(signed.status).toBe(200);
+        const readUrl = new URL(
+            (await signed.json()).signatures[0].read_url as string,
+        );
+        return new URL(`${readUrl.pathname}${readUrl.search}`, env.apiOrigin);
+    };
+
+    const accessTokenFor = async (uuid: string): Promise<string> => {
+        const user = await env.server.stores.user.getByUsername(
+            env.users.user.username,
+        );
+        return env.server.services.auth.createAccessToken(
+            { user } as never,
+            [[`fs:${uuid}:read`]],
+            { label: 'legacy-download-http' },
+        );
+    };
+
+    type Route = '/read' | '/token-read' | '/file' | '/down';
+    const routes: Route[] = ['/read', '/token-read', '/file', '/down'];
+
+    const requestFor = async (
+        route: Route,
+        file: { path: string; uuid: string },
+        init: RequestInit & { headers?: Record<string, string> } = {},
+    ): Promise<Response> => {
+        const { token, apiToken } = env.users.user;
+        let url: URL;
+        let base: RequestInit & { headers?: Record<string, string> } = {};
+        if (route === '/read') {
+            url = new URL('/read', env.apiOrigin);
+            url.searchParams.set('file', file.path);
+            base = { headers: { Authorization: `Bearer ${token}` } };
+        } else if (route === '/token-read') {
+            url = new URL('/token-read', env.apiOrigin);
+            url.searchParams.set('uid', file.uuid);
+            url.searchParams.set('token', await accessTokenFor(file.uuid));
+        } else if (route === '/file') {
+            url = await signedReadUrl(file.path);
+        } else {
+            url = new URL('/down', env.origin);
+            url.searchParams.set('path', file.path);
+            base = {
+                method: 'POST',
+                headers: { Authorization: `Bearer ${apiToken}` },
+            };
+        }
+        return fetch(url, {
+            ...base,
+            ...init,
+            headers: { ...base.headers, ...init.headers },
+        });
+    };
+
+    it.each(routes)(
+        'GET %s returns the stored bytes and headers unchanged',
+        async (route) => {
+            const content = randomBytes(256 * 1024 + 7);
+            const name = `bytes-${route.replace(/\W/g, '')}.bin`;
+            const file = await writeFile(name, content);
+
+            const raw = await requestFor(route, file, {
+                headers: { 'Accept-Encoding': 'identity' },
+            });
+            expect(raw.status).toBe(200);
+            expect(raw.headers.get('content-length')).toBe(
+                String(content.byteLength),
+            );
+            expect(raw.headers.get('content-type')).toBe(
+                'application/octet-stream',
+            );
+            expect(raw.headers.get('content-disposition')).toBe(
+                `${route === '/down' ? 'attachment' : 'inline'}; filename="${name}"`,
+            );
+            expect(raw.headers.get('etag')).toEqual(expect.any(String));
+            expect(raw.headers.get('last-modified')).toEqual(
+                expect.any(String),
+            );
+            expect(Buffer.from(await raw.arrayBuffer()).equals(content)).toBe(
+                true,
+            );
+
+            // Compressed on the wire by default; the bytes still match.
+            const compressed = await requestFor(route, file);
+            expect(compressed.headers.get('content-encoding')).toBe('gzip');
+            expect(
+                Buffer.from(await compressed.arrayBuffer()).equals(content),
+            ).toBe(true);
+        },
+    );
+
+    // Storage hands over one chunk and then goes quiet, as a large object
+    // does while the client is still reading.
+    const stallReadsOf = (objectKey: string) => {
+        const s3 = env.server.stores.s3Object;
+        const client = env.server.clients.s3.get(s3.resolveRegion(null));
+        const send = client.send.bind(client);
+        const bodies: Readable[] = [];
+        const spy = vi.spyOn(client, 'send').mockImplementation(((
+            command: unknown,
+        ) => {
+            if (
+                !(command instanceof GetObjectCommand) ||
+                command.input.Key !== objectKey
+            ) {
+                return send(command as never);
+            }
+            let pushed = false;
+            const body = new Readable({
+                read() {
+                    if (!pushed) {
+                        pushed = true;
+                        this.push(Buffer.alloc(16 * 1024, 1));
+                    }
+                },
+            });
+            bodies.push(body);
+            return Promise.resolve({
+                Body: body,
+                ContentLength: 1024 * 1024,
+                ContentType: 'application/octet-stream',
+            });
+        }) as never);
+        return { spy, bodies };
+    };
+
+    it.each(routes)(
+        'GET %s releases the storage stream when the client aborts',
+        async (route) => {
+            const file = await writeFile(
+                `abort-${route.replace(/\W/g, '')}.bin`,
+                Buffer.alloc(1024 * 1024, 1),
+            );
+            const { spy, bodies } = stallReadsOf(file.uuid);
+            try {
+                const abort = new AbortController();
+                // Uncompressed, so the first chunk reaches the client as-is.
+                const response = await requestFor(route, file, {
+                    signal: abort.signal,
+                    headers: { 'Accept-Encoding': 'identity' },
+                });
+                expect(response.status).toBe(200);
+                const reader = response.body!.getReader();
+                await reader.read();
+                abort.abort();
+
+                expect(bodies).toHaveLength(1);
+                await vi.waitFor(() => expect(bodies[0]!.destroyed).toBe(true));
+            } finally {
+                spy.mockRestore();
+            }
+
+            // The server keeps serving after the aborted transfer.
+            const healthy = await writeFile(
+                `after-abort-${route.replace(/\W/g, '')}.txt`,
+                Buffer.from('still fine'),
+            );
+            const next = await requestFor(route, healthy);
+            expect(next.status).toBe(200);
+            expect(await next.text()).toBe('still fine');
+        },
+    );
+
+    // Storage fails, either before its first byte or after one chunk.
+    const failReadsOf = (objectKey: string, sendFirst: boolean) => {
+        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++;
+                    if (sendFirst && reads === 1) {
+                        this.push(Buffer.alloc(16 * 1024, 1));
+                        return;
+                    }
+                    setImmediate(() =>
+                        this.destroy(new Error('storage socket reset')),
+                    );
+                },
+            });
+            return Promise.resolve({
+                Body: body,
+                ContentLength: 1024 * 1024,
+                ContentType: 'application/octet-stream',
+            });
+        }) as never);
+    };
+
+    it.each(
+        routes.flatMap((route) => [
+            [route, true] as const,
+            [route, false] as const,
+        ]),
+    )(
+        'GET %s drops the connection when storage fails (bytes sent first: %s)',
+        async (route, sendFirst) => {
+            const file = await writeFile(
+                `fail-${sendFirst ? 'mid' : 'start'}-${route.replace(/\W/g, '')}.bin`,
+                Buffer.alloc(1024 * 1024, 1),
+            );
+            const spy = failReadsOf(file.uuid, sendFirst);
+            try {
+                // No error body after a partial one: the client sees the
+                // transfer cut off, either at the headers or mid-body.
+                const outcome = await (async () => {
+                    try {
+                        const response = await requestFor(route, file, {
+                            headers: { 'Accept-Encoding': 'identity' },
+                        });
+                        await response.arrayBuffer();
+                        return `completed ${response.status}`;
+                    } catch {
+                        return 'cut off';
+                    }
+                })();
+                expect(outcome).toBe('cut off');
+            } finally {
+                spy.mockRestore();
+            }
+
+            const healthy = await writeFile(
+                `after-fail-${sendFirst ? 'mid' : 'start'}-${route.replace(/\W/g, '')}.txt`,
+                Buffer.from('still fine'),
+            );
+            const next = await requestFor(route, healthy);
+            expect(next.status).toBe(200);
+            expect(await next.text()).toBe('still fine');
+        },
+    );
+});

src/backend/controllers/fs/LegacyFSController.routes.test.ts

@@ -535,6 +535,60 @@ describe('LegacyFSController.updateFsentryThumbnail', () => {
         expect(row?.thumbnail).toBe(thumbnail);
     });
 
+    it('serves the new thumbnail from the entry cache on the next read', async () => {
+        const { actor, username } = await makeUser();
+        const path = `/${username}/Documents/cached-thumb.txt`;
+        const { uuid } = await writeFileEntry(actor, path, 'body');
+        const before = await server.stores.fsEntry.getEntryByUuid(uuid);
+        expect(before?.thumbnail ?? null).toBeNull();
+
+        const thumbnail = 'data:image/png;base64,aGVsbG8=';
+        const { res } = makeRes();
+        await withActor(actor, () =>
+            controller.updateFsentryThumbnail(
+                makeReq({ body: { uid: uuid, thumbnail }, actor }),
+                res,
+            ),
+        );
+
+        expect(
+            (await server.stores.fsEntry.getEntryByUuid(uuid))?.thumbnail,
+        ).toBe(thumbnail);
+        expect(
+            (await server.stores.fsEntry.getEntryByPath(path))?.thumbnail,
+        ).toBe(thumbnail);
+    });
+
+    it('lets a caller with write access to a shared file set its thumbnail', async () => {
+        const owner = await makeUser();
+        const writer = await makeUser();
+        const path = `/${owner.username}/Documents/shared-thumb.txt`;
+        const { uuid } = await writeFileEntry(owner.actor, path, 'body');
+        await server.services.permission.grantUserUserPermission(
+            owner.actor,
+            writer.username,
+            `fs:${uuid}:write`,
+            {},
+        );
+
+        const thumbnail = 'data:image/png;base64,aGVsbG8=';
+        const { res, captured } = makeRes();
+        await withActor(writer.actor, () =>
+            controller.updateFsentryThumbnail(
+                makeReq({
+                    body: { uid: uuid, thumbnail },
+                    actor: writer.actor,
+                }),
+                res,
+            ),
+        );
+
+        expect(captured.body).toEqual({ thumbnail });
+        expect(
+            (await server.stores.fsEntry.getEntryByUuid(uuid))?.thumbnail,
+        ).toBe(thumbnail);
+    });
+
     it('tells thumbnail listeners which entry the thumbnail is for', async () => {
         const { actor, username } = await makeUser();
         const path = `/${username}/Documents/bound-thumb.txt`;

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

@@ -34,7 +34,11 @@ import { signFile } from '../../util/fileSigning.js';
 import { generateDefaultFsentries } from '../../util/userProvisioning.js';
 import { SHARE_LIST_LIMIT } from '../share/limits.js';
 import type { LegacyFSController } from './LegacyFSController.js';
-import { FS_MUTATE_LIMIT, FS_SIGN_MAX_ITEMS } from './limits.js';
+import {
+    FS_BATCH_WRITE_MAX_ITEMS,
+    FS_MUTATE_LIMIT,
+    FS_SIGN_MAX_ITEMS,
+} from './limits.js';
 
 // ── Test harness ────────────────────────────────────────────────────
 //
@@ -463,6 +467,88 @@ describe('LegacyFSController.stat', () => {
         expect(body.size).toBe(0);
     });
 
+    it('reports is_empty from the same children a listing returns', async () => {
+        const { actor, userId } = await makeUser();
+        const username = actor.user!.username!;
+        const emptyPath = `/${username}/Documents/probe-empty`;
+        const fullPath = `/${username}/Documents/probe-full`;
+        for (const path of [emptyPath, fullPath]) {
+            await withActor(actor, () =>
+                controller.mkdir(
+                    makeReq({ body: { path }, actor }),
+                    makeRes().res,
+                ),
+            );
+        }
+        await server.services.fs.write(userId, {
+            fileMetadata: {
+                path: `${fullPath}/inner.txt`,
+                size: 5,
+                contentType: 'text/plain',
+            },
+            fileContent: 'hello',
+        } as never);
+
+        for (const path of [emptyPath, fullPath]) {
+            const entry = (await server.stores.fsEntry.getEntryByPath(path))!;
+            const listed = await server.stores.fsEntry.listChildren(
+                entry.uuid,
+                { limit: 1 },
+            );
+            const { res, captured } = makeRes();
+            await withActor(actor, () =>
+                controller.stat(
+                    makeReq({ body: { path, return_size: true }, actor }),
+                    res,
+                ),
+            );
+            const body = captured.body as Record<string, unknown>;
+            expect(body.is_empty).toBe(listed.length === 0);
+            expect(body.size).toBe(path === fullPath ? 5 : 0);
+            expect(body.owner).toEqual({ username });
+        }
+    });
+
+    it('surfaces an earlier failure ahead of a failed subtree size, with nothing left unhandled', async () => {
+        const { actor } = await makeUser();
+        const username = actor.user!.username!;
+        const path = `/${username}/Documents/size-order`;
+        await withActor(actor, () =>
+            controller.mkdir(makeReq({ body: { path }, actor }), makeRes().res),
+        );
+        const flagsFailure = new Error('share flags failed');
+        const sizeFailure = new Error('subtree size failed');
+        const flags = vi
+            .spyOn(server.services.share, 'shareFlags')
+            .mockRejectedValueOnce(flagsFailure);
+        const size = vi
+            .spyOn(server.services.fs, 'getSubtreeSize')
+            .mockRejectedValue(sizeFailure);
+        try {
+            await expect(
+                withActor(actor, () =>
+                    controller.stat(
+                        makeReq({ body: { path, return_size: true }, actor }),
+                        makeRes().res,
+                    ),
+                ),
+            ).rejects.toBe(flagsFailure);
+
+            // On its own, the size failure is what the caller sees.
+            await expect(
+                withActor(actor, () =>
+                    controller.stat(
+                        makeReq({ body: { path, return_size: true }, actor }),
+                        makeRes().res,
+                    ),
+                ),
+            ).rejects.toBe(sizeFailure);
+        } finally {
+            flags.mockRestore();
+            size.mockRestore();
+        }
+    });
+
     it('reports the share flag, and the recipients when asked', async () => {
         const { actor } = await makeUser();
         const recipient = await makeUser();
@@ -693,6 +779,36 @@ describe('LegacyFSController.delete', () => {
         expect(await server.stores.fsEntry.getEntryByPath(a)).toBeNull();
         expect(await server.stores.fsEntry.getEntryByPath(b)).toBeNull();
     });
+
+    it('refuses more `paths` than one batch may hold, before deleting any', async () => {
+        const { actor } = await makeUser();
+        const username = actor.user!.username!;
+        const keep = `/${username}/Documents/keep`;
+        await withActor(actor, () =>
+            controller.mkdir(
+                makeReq({ body: { path: keep }, actor }),
+                makeRes().res,
+            ),
+        );
+
+        await expect(
+            withActor(actor, () =>
+                controller.delete(
+                    makeReq({
+                        body: {
+                            paths: [
+                                keep,
+                                ...Array(FS_BATCH_WRITE_MAX_ITEMS).fill(keep),
+                            ],
+                        },
+                        actor,
+                    }),
+                    makeRes().res,
+                ),
+            ),
+        ).rejects.toMatchObject({ statusCode: 400 });
+        expect(await server.stores.fsEntry.getEntryByPath(keep)).not.toBeNull();
+    });
 });
 
 describe('LegacyFSController.rename', () => {
@@ -1057,8 +1173,7 @@ describe('LegacyFSController.batch (per-op mutation budget)', () => {
         const freeLimit =
             (
                 FS_MUTATE_LIMIT[0]!.bySubscription as
-                    | Record<string, number>
-                    | undefined
+                    Record<string, number> | undefined
             )?.[DEFAULT_FREE_SUBSCRIPTION] ?? FS_MUTATE_LIMIT[0]!.limit;
         const chargeReq = makeReq({ body: {}, actor });
         for (let i = 0; i < freeLimit; i++) {
@@ -1808,7 +1923,8 @@ describe('LegacyFSController.move', () => {
                 makeRes().res,
             ),
         );
-        const shared = (await server.stores.fsEntry.getEntryByPath(sharedPath))!;
+        const shared =
+            (await server.stores.fsEntry.getEntryByPath(sharedPath))!;
         await server.services.acl.setUserUser(
             owner.actor,
             holder.actor,
@@ -1837,13 +1953,82 @@ describe('LegacyFSController.move', () => {
         // The move landed in the owner's trash, but the recipient is told so
         // in masked form — the owner's real layout stays theirs.
         const body = captured.body as { moved: { uid: string; path: string } };
+        const suffix = ` (${body.moved.uid.slice(0, 8)})`;
+        // Always renamed in, so the name cannot report on the Trash.
         expect(body.moved.path).toBe(
-            `/${ownerName}/${body.moved.uid}/note.txt`,
+            `/${ownerName}/${body.moved.uid}/note${suffix}.txt`,
         );
         const moved = await server.stores.fsEntry.getEntryByUuid(
             body.moved.uid,
         );
-        expect(moved!.path).toBe(`/${ownerName}/Trash/note.txt`);
+        expect(moved!.path).toBe(`/${ownerName}/Trash/note${suffix}.txt`);
+    });
+
+    it("neither reports nor announces replacing an owner's Trash entry an overwriting move renamed around", async () => {
+        const owner = await makeUser();
+        const holder = await makeUser();
+        const ownerName = owner.actor.user!.username!;
+        const sharedPath = `/${ownerName}/Documents/Overwrites`;
+        const occupantPath = `/${ownerName}/Trash/note.txt`;
+        await withActor(owner.actor, () =>
+            controller.mkdir(
+                makeReq({ body: { path: sharedPath }, actor: owner.actor }),
+                makeRes().res,
+            ),
+        );
+        for (const path of [`${sharedPath}/note.txt`, occupantPath]) {
+            await withActor(owner.actor, () =>
+                controller.touch(
+                    makeReq({ body: { path }, actor: owner.actor }),
+                    makeRes().res,
+                ),
+            );
+        }
+        const occupant =
+            (await server.stores.fsEntry.getEntryByPath(occupantPath))!;
+        await server.services.acl.setUserUser(
+            owner.actor,
+            holder.actor,
+            {
+                path: sharedPath,
+                resolveAncestors: () =>
+                    server.services.fs.getAncestorChain(sharedPath),
+            },
+            'write',
+        );
+
+        const emitSpy = vi.spyOn(server.clients.event, 'emit');
+        const { res, captured } = makeRes();
+        let removedOccupant: boolean;
+        try {
+            await withActor(holder.actor, () =>
+                controller.move(
+                    makeReq({
+                        body: {
+                            source: `${sharedPath}/note.txt`,
+                            destination: `/${ownerName}/Trash`,
+                            overwrite: true,
+                        },
+                        actor: holder.actor,
+                    }),
+                    res,
+                ),
+            );
+            removedOccupant = emitSpy.mock.calls.some(
+                ([eventName, data]) =>
+                    eventName === 'outer.gui.item.removed' &&
+                    (data as { response: { uuid?: string } }).response.uuid ===
+                        occupant.uuid,
+            );
+        } finally {
+            emitSpy.mockRestore();
+        }
+
+        expect(removedOccupant).toBe(false);
+        expect(captured.body).not.toHaveProperty('overwritten');
+        expect(
+            await server.stores.fsEntry.getEntryByUuid(occupant.uuid),
+        ).not.toBeNull();
     });
 
     it('refuses a share recipient moving an item into their own trash', async () => {
@@ -1868,7 +2053,8 @@ describe('LegacyFSController.move', () => {
                 makeRes().res,
             ),
         );
-        const shared = (await server.stores.fsEntry.getEntryByPath(sharedPath))!;
+        const shared =
+            (await server.stores.fsEntry.getEntryByPath(sharedPath))!;
         await server.services.acl.setUserUser(
             owner.actor,
             holder.actor,
@@ -2544,10 +2730,58 @@ describe('LegacyFSController.openItem (grant scope)', () => {
         const route = router.routes.find(
             (r) => r.method === 'post' && r.path === '/open_item',
         );
-        expect(route?.options).toMatchObject({
-            requireUserActor: true,
-            allowFullAccessToken: true,
+        expect(route?.options).toMatchObject({ requireUserActor: true });
+        expect(route?.options).not.toHaveProperty('allowFullAccessToken');
+    });
+
+    it('rejects a full-access token, leaving no grant behind', async () => {
+        const { actor: userActor, userId } = await makeUser();
+        const target = `/${userActor.user!.username}/Documents/token-opened.txt`;
+        await withActor(userActor, () =>
+            controller.touch(
+                makeReq({ body: { path: target }, actor: userActor }),
+                makeRes().res,
+            ),
+        );
+        const entry = await server.stores.fsEntry.getEntryByPath(target);
+        const app = await makeApp(userId);
+        const tokenActor = makeActor({
+            user: userActor.user,
+            accessToken: {
+                uid: `tok-${uuidv4()}`,
+                issuer: userActor,
+                fullAccess: true,
+            },
         });
+
+        const spy = vi
+            .spyOn(server.services.suggestedApps, 'getSuggestedApps')
+            .mockResolvedValue([{ uuid: app.uid }] as never);
+        try {
+            await expect(
+                withActor(tokenActor, () =>
+                    controller.openItem(
+                        makeReq({
+                            body: { uid: entry!.uuid },
+                            actor: tokenActor,
+                        }),
+                        makeRes().res,
+                    ),
+                ),
+            ).rejects.toMatchObject({ statusCode: 403 });
+        } finally {
+            spy.mockRestore();
+        }
+
+        for (const mode of ['read', 'write']) {
+            expect(
+                await server.stores.permission.hasUserAppPerm(
+                    userId,
+                    app.id,
+                    `fs:${entry!.uuid}:${mode}`,
+                ),
+            ).toBe(false);
+        }
     });
 
     it('rejects an app actor, leaving no grant behind', async () => {
@@ -3498,6 +3732,63 @@ describe('LegacyFSController.read file streaming', () => {
         );
         expect(captured.headers['Content-Type']).toMatch(/text\/html/);
     });
+
+    it('honors offset and byte_count query params on /read', async () => {
+        const { actor, userId } = await makeUser();
+        const username = actor.user!.username!;
+        const body = Buffer.from('0123456789abcdef');
+        const target = `/${username}/Documents/range-test.txt`;
+        await server.services.fs.write(userId, {
+            fileMetadata: {
+                path: target,
+                size: body.byteLength,
+                contentType: 'text/plain',
+            },
+            fileContent: body,
+        });
+
+        const { res, captured } = makeStreamingRes();
+        await withActor(actor, () =>
+            controller.read(
+                makeReq({
+                    query: { file: target, offset: '4', byte_count: '6' },
+                    actor,
+                }),
+                res,
+            ),
+        );
+        await new Promise<void>((resolve) => setImmediate(resolve));
+        expect(captured.statusCode).toBe(206);
+        expect(Buffer.concat(captured.bodyChunks).toString()).toBe('456789');
+    });
+
+    it('rejects invalid offset query param with 400', async () => {
+        const { actor, userId } = await makeUser();
+        const username = actor.user!.username!;
+        const body = Buffer.from('test');
+        const target = `/${username}/Documents/invalid-offset.txt`;
+        await server.services.fs.write(userId, {
+            fileMetadata: {
+                path: target,
+                size: body.byteLength,
+                contentType: 'text/plain',
+            },
+            fileContent: body,
+        });
+
+        const { res } = makeStreamingRes();
+        await expect(
+            withActor(actor, () =>
+                controller.read(
+                    makeReq({
+                        query: { file: target, offset: '-1' },
+                        actor,
+                    }),
+                    res,
+                ),
+            ),
+        ).rejects.toMatchObject({ statusCode: 400 });
+    });
 });
 
 // ── /file directory listing ─────────────────────────────────────────
@@ -4666,6 +4957,33 @@ describe('LegacyFSController.readdirSubdomains', () => {
         const rows = captured.body as Array<{ subdomain: string }>;
         expect(rows.some((r) => r.subdomain === sd)).toBe(true);
     });
+
+    it('returns every site past one store page, with only the listing columns', async () => {
+        const { actor, userId } = await makeUser();
+        const names = Array.from(
+            { length: 501 },
+            (_, i) => `sdp-${i}-${uuidv4().slice(0, 8)}`,
+        );
+        for (const name of names) {
+            await server.clients.db.write(
+                'INSERT INTO `subdomains` (`uuid`, `subdomain`, `user_id`) VALUES (?, ?, ?)',
+                [uuidv4(), name, userId],
+            );
+        }
+
+        const { res, captured } = makeRes();
+        await withActor(actor, () =>
+            controller.readdirSubdomains(makeReq({ body: {}, actor }), res),
+        );
+        const rows = captured.body as Array<Record<string, unknown>>;
+        expect(rows.map((r) => r.subdomain)).toEqual(names);
+        expect(Object.keys(rows[0]!).sort()).toEqual([
+            'root_dir_id',
+            'subdomain',
+            'ts',
+            'uuid',
+        ]);
+    });
 });
 
 // ── updateFsentryThumbnail ──────────────────────────────────────────
@@ -4924,7 +5242,7 @@ describe('LegacyFSController GET /get-launch-apps', () => {
         await recordOpen(userId, app.uid);
 
         const spy = vi
-            .spyOn(server.stores.subdomain, 'getBySubdomain')
+            .spyOn(server.stores.subdomain, 'getBySubdomains')
             .mockRejectedValue(new Error('db down'));
         try {
             const entry = (await fetchRecent(actor)).find(

src/backend/controllers/fs/LegacyFSController.ts

@@ -17,6 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+import type { Team2faLookup } from '../../core/http/middleware/gates.js';
 import Busboy from 'busboy';
 import type { NextFunction, Request, RequestHandler, Response } from 'express';
 import { contentType as contentTypeFromMime } from 'mime-types';
@@ -30,6 +31,7 @@ import {
 import { Context } from '../../core/context.js';
 import { HttpError } from '../../core/http/HttpError.js';
 import { RouteOptions } from '../../core/http/index.js';
+import { pipeToResponse } from '../../core/http/pipeToResponse.js';
 import {
     assertNotSuspended,
     assertTeam2fa,
@@ -49,7 +51,9 @@ import {
     parseSignedQuery,
     verifySignature,
 } from '../../util/fileSigning.js';
-import { APP_ICON_SIZES, getAppIconCdnUrl } from '../../util/appIcon.js';
+import { APP_ICON_SIZES } from '../../util/appIcon.js';
+import { toAppSummary } from '../../util/appView.js';
+import { awaitLater } from '../../util/concurrency.js';
 import {
     joinChildPath,
     normalizeAbsolutePath,
@@ -59,7 +63,7 @@ import { maskEntryPath } from '../../services/fs/sharePathMask.js';
 import { clientParentUid } from '../../services/fs/rootListing.js';
 import {
     buildHostedBackingDenial,
-    hostedIndexUrlBackingIsUnavailable,
+    hostedIndexUrlBackingsAreUnavailable,
 } from '../../util/hostedAppBacking.js';
 import { applyInlineContentSecurity } from '../../util/inlineContentSecurity.js';
 import { listClientShares } from '../share/clientShare.js';
@@ -69,6 +73,7 @@ import { PuterController } from '../types.js';
 import {
     FS_BATCH_CONCURRENT,
     FS_BATCH_LIMIT,
+    FS_BATCH_WRITE_MAX_ITEMS,
     FS_DF_LIMIT,
     FS_HELPER_LIMIT,
     FS_MUTATE_LIMIT,
@@ -90,10 +95,15 @@ import {
     assertAccess,
     assertCanCreate,
     assertCanMoveInto,
+    emitGuiItemEvent,
     expandClientPath,
+    findOverwriteTarget,
     getBoolean,
     getString,
+    type GuiItemEventName,
     loadLegacyAssociatedApps,
+    replacedByMove,
+    resolveReadRange,
     resolveV1Selector,
     signEntry,
     signingConfigFromAppConfig,
@@ -123,6 +133,9 @@ const BATCH_MAX_FIELD_SIZE = 1 * 1024 * 1024; // 1 MiB per operation/fileinfo JS
 const BATCH_MAX_OPS = BATCH_MAX_PARTS;
 const BATCH_MUTATING_OPS = new Set(['mkdir', 'shortcut', 'move', 'delete']);
 
+/** Rows per `readdir-subdomains` read; the response pages until done. */
+const SUBDOMAIN_PAGE_SIZE = 500;
+
 // An op's `as` names the path it produced; later ops in the same batch refer
 // to it as `$name` or `$name/rest`, since a deduped mkdir can land elsewhere.
 function resolveBatchRef(raw: string, refs: Map<string, string>): string {
@@ -200,12 +213,19 @@ export class LegacyFSController extends PuterController {
         // Limits come from `./limits` and carry an explicit `scope`, so these
         // draw from the same per-user budget as their v2 counterparts rather
         // than handing a caller a second allowance for the same operation.
-        const mutate = { ...apiOptions, rateLimit: FS_MUTATE_LIMIT };
-        // Read-side routes admit scoped access tokens: the ACL check each
-        // handler runs already intersects a token's grant with its issuer's,
-        // so the token reaches exactly what it was minted for. That is what a
-        // background events handler acts through — its `user` is a token
-        // scoped to the subscription's grant.
+        //
+        // The entry routes — reads and writes alike — admit scoped access
+        // tokens: the ACL check each handler runs already intersects a token's
+        // grant with its issuer's, so the token reaches exactly what it was
+        // minted for. That is what a background events handler acts through —
+        // its `user` is a token scoped to the subscription's grant — and it
+        // matches what WebDAV admits. Routes reaching past a single entry
+        // (search, df, sign, the app helpers) stay closed to them.
+        const mutate = {
+            ...apiOptions,
+            allowAccessToken: true,
+            rateLimit: FS_MUTATE_LIMIT,
+        } as RouteOptions;
         const reads = { ...apiOptions, allowAccessToken: true } as RouteOptions;
         router.post('/stat', { ...reads, rateLimit: FS_STAT_LIMIT }, this.stat);
         router.post(
@@ -255,6 +275,8 @@ export class LegacyFSController extends PuterController {
             '/batch',
             {
                 ...spends,
+                // Every op authorizes its own target.
+                allowAccessToken: true,
                 rateLimit: FS_BATCH_LIMIT,
                 concurrent: FS_BATCH_CONCURRENT,
             },
@@ -296,8 +318,8 @@ export class LegacyFSController extends PuterController {
                 // Opening an item grants an app access to a file on the user's
                 // behalf, so only the user's own credential may drive it — an
                 // app calling it for itself would be widening its own ACL.
+                // Session-only: the user-app token it returns is a session mint.
                 requireUserActor: true,
-                allowFullAccessToken: true,
                 rateLimit: FS_HELPER_LIMIT,
             },
             this.openItem,
@@ -346,13 +368,8 @@ export class LegacyFSController extends PuterController {
             '/get-launch-apps',
             { ...apiOptions, rateLimit: FS_HELPER_LIMIT },
             async (req, res) => {
-                const recommendedSvc = this.services
-                    .recommendedApps as unknown as
-                    | { getRecommendedApps?: () => Promise<unknown[]> }
-                    | undefined;
-                const recommended = recommendedSvc?.getRecommendedApps
-                    ? await recommendedSvc.getRecommendedApps()
-                    : [];
+                const recommended =
+                    await this.services.recommendedApps.getRecommendedApps();
 
                 // The direct icon URL names a size; honour the one the
                 // caller asked for so the client isn't handed a 256px PNG for
@@ -365,32 +382,18 @@ export class LegacyFSController extends PuterController {
                 let recent: unknown[] = [];
                 const userId = req.actor?.user?.id;
                 if (userId) {
-                    const recentUids =
-                        (await (
-                            this.stores.app as unknown as {
-                                getRecentAppOpens?: (
-                                    id: number,
-                                    opts?: { limit?: number },
-                                ) => Promise<string[]>;
-                            }
-                        ).getRecentAppOpens?.(userId, { limit: 10 })) ?? [];
-                    // One batched read for the rows, then the backing checks
-                    // concurrently. Serially awaiting a lookup per uid put ~2
-                    // round trips of latency on every desktop boot.
-                    const appsByUid = await (
-                        this.stores.app as unknown as {
-                            getByUids: (
-                                uids: string[],
-                            ) => Promise<Map<string, Record<string, unknown>>>;
-                        }
-                    ).getByUids(recentUids);
+                    const recentUids = await this.stores.app.getRecentAppOpens(
+                        userId,
+                        { limit: 10 },
+                    );
+                    const appsByUid =
+                        await this.stores.app.getByUids(recentUids);
 
                     // `recentUids` is ordered most-recent-first; preserve it.
-                    const orderedApps = recentUids
-                        .map((uid) => appsByUid.get(uid))
-                        .filter((app): app is Record<string, unknown> =>
-                            Boolean(app),
-                        );
+                    const orderedApps: Array<Record<string, unknown>> =
+                        recentUids
+                            .map((uid: string) => appsByUid.get(uid))
+                            .filter(Boolean);
 
                     // Don't hand out an index_url whose puter-hosted backing is
                     // gone or reclaimed. The taskbar launches recents by name (so
@@ -398,41 +401,30 @@ export class LegacyFSController extends PuterController {
                     // launch-metadata producer like any other — a future consumer
                     // reading index_url straight off it shouldn't inherit a stale
                     // origin.
-                    const backingGoneFlags = await Promise.all(
-                        orderedApps.map((app) =>
-                            hostedIndexUrlBackingIsUnavailable({
-                                app,
+                    let backingGoneFlags: boolean[];
+                    try {
+                        backingGoneFlags =
+                            await hostedIndexUrlBackingsAreUnavailable({
+                                apps: orderedApps,
                                 subdomainStore: this.stores.subdomain,
                                 config: this.config,
-                            }).catch(() => true),
-                        ),
-                    );
+                            });
+                    } catch {
+                        backingGoneFlags = orderedApps.map(() => true);
+                    }
 
                     recent = orderedApps.map((app, index) => {
                         const backingGone = backingGoneFlags[index];
                         return {
-                            uuid: app.uid,
-                            name: app.name,
-                            title: app.title,
-                            icon: app.icon ?? null,
-                            // Direct subdomain URL for the client to try
-                            // before `icon`.
-                            iconCdnUrl: getAppIconCdnUrl(
-                                app,
-                                this.config,
+                            ...toAppSummary(app, {
+                                config: this.config,
                                 iconSize,
-                            ),
-                            godmode: Boolean(app.godmode),
-                            maximize_on_start: Boolean(app.maximize_on_start),
+                            }),
+                            icon: app.icon ?? null,
                             index_url: backingGone ? null : app.index_url,
                             ...(backingGone
                                 ? { privateAccess: buildHostedBackingDenial() }
                                 : {}),
-                            // An app with no owner isn't owned by a Puter user —
-                            // it's an "external" (origin-bootstrapped) app.
-                            external:
-                                app.owner_user_id == null ||
-                                app.owner_user_id === '',
                         };
                     });
                 }
@@ -515,6 +507,16 @@ export class LegacyFSController extends PuterController {
             'see',
         );
 
+        // Started early but awaited where it used to run, so its error still
+        // surfaces after the ones below. awaitLater covers the early exits
+        // that never reach that await.
+        const subtreeSize =
+            entry.isDir && getBoolean(body, 'return_size')
+                ? awaitLater(
+                      this.services.fs.getSubtreeSize(userId, entry.path),
+                  )
+                : null;
+
         const [suggestedApps, appsById, shareFlags, parentUid] =
             await Promise.all([
                 this.services.suggestedApps.getSuggestedApps(entry),
@@ -542,12 +544,7 @@ export class LegacyFSController extends PuterController {
         });
 
         // Optional hydrations:
-        if (entry.isDir && getBoolean(body, 'return_size')) {
-            shaped.size = await this.services.fs.getSubtreeSize(
-                userId,
-                entry.path,
-            );
-        }
+        if (subtreeSize) shaped.size = await subtreeSize;
         // `return_versions` has no parity yet; the empty array keeps `forEach`
         // callers working. `return_owner` is a no-op — `owner` is always set.
         if (getBoolean(body, 'return_versions')) shaped.versions = [];
@@ -828,16 +825,13 @@ export class LegacyFSController extends PuterController {
         // (`overwritten`) so clients can drop its stale row/icon. The copy
         // deletes that entry, so resolve it beforehand.
         const overwriteRequested = getBoolean(body, 'overwrite') ?? false;
-        let overwrittenEntry = null;
-        if (overwriteRequested) {
-            const targetName = getString(body, 'new_name') ?? source.name;
-            const targetPath =
-                destinationParent.path === '/'
-                    ? `/${targetName}`
-                    : `${destinationParent.path}/${targetName}`;
-            overwrittenEntry =
-                await this.stores.fsEntry.getEntryByPath(targetPath);
-        }
+        const overwrittenEntry = overwriteRequested
+            ? await findOverwriteTarget(
+                  this.stores.fsEntry,
+                  destinationParent,
+                  getString(body, 'new_name') ?? source.name,
+              )
+            : null;
 
         const copy = await this.services.fs.copy(userId, {
             source,
@@ -846,15 +840,14 @@ export class LegacyFSController extends PuterController {
             overwrite: overwriteRequested,
             dedupeName: getBoolean(body, 'dedupe_name', 'change_name') ?? false,
         });
-        await this.#emitGuiEvent('outer.gui.item.added', copy);
-        // Without this, every other client keeps a ghost row for the
-        // replaced entry until the directory is re-listed.
-        if (overwrittenEntry) {
-            await this.#emitGuiEvent(
-                'outer.gui.item.removed',
-                overwrittenEntry,
-            );
-        }
+        // Announcing the replaced entry's removal keeps other clients from
+        // showing a ghost row for it until the directory is re-listed.
+        await this.#emitGuiEvent(
+            'outer.gui.item.added',
+            copy,
+            undefined,
+            overwrittenEntry,
+        );
 
         // Legacy response shape: `[{copied: fsentry, overwritten?}]`.
         // Array is historical — originally supported bulk copy.
@@ -914,18 +907,17 @@ export class LegacyFSController extends PuterController {
         // (`overwritten`) so clients can drop its stale row/icon. The move
         // deletes that entry, so resolve it beforehand.
         const overwriteRequested = getBoolean(body, 'overwrite') ?? false;
-        let overwrittenEntry = null;
+        const name = getString(body, 'new_name') ?? source.name;
+        let overwriteTarget = null;
         if (overwriteRequested) {
-            const targetName = getString(body, 'new_name') ?? source.name;
-            const targetPath =
-                destinationParent.path === '/'
-                    ? `/${targetName}`
-                    : `${destinationParent.path}/${targetName}`;
-            const existing =
-                await this.stores.fsEntry.getEntryByPath(targetPath);
+            const existing = await findOverwriteTarget(
+                this.stores.fsEntry,
+                destinationParent,
+                name,
+            );
             // Moving an entry onto its own path is not an overwrite.
             if (existing && existing.uuid !== source.uuid) {
-                overwrittenEntry = existing;
+                overwriteTarget = existing;
             }
         }
 
@@ -940,20 +932,20 @@ export class LegacyFSController extends PuterController {
             // Trash, and `null`/`{}` when restoring. See
             // `src/gui/src/helpers.js` → `window.move_items`.
             newMetadata: (body.new_metadata ?? undefined) as
-                Record<string, unknown> | null | undefined,
+                | Record<string, unknown>
+                | null
+                | undefined,
         });
+        const overwrittenEntry = replacedByMove(overwriteTarget, moved, name);
         const oldPath = source.path;
-        await this.#emitGuiEvent('outer.gui.item.moved', moved, {
-            old_path: oldPath,
-        });
-        // Without this, every other client keeps a ghost row for the
-        // replaced entry until the directory is re-listed.
-        if (overwrittenEntry) {
-            await this.#emitGuiEvent(
-                'outer.gui.item.removed',
-                overwrittenEntry,
-            );
-        }
+        // Announcing the replaced entry's removal keeps other clients from
+        // showing a ghost row for it until the directory is re-listed.
+        await this.#emitGuiEvent(
+            'outer.gui.item.moved',
+            moved,
+            { old_path: oldPath },
+            overwrittenEntry,
+        );
 
         // Legacy response shape: `{moved: fsentry, old_path, overwritten?}`.
         const legacyEntryOpts = {
@@ -992,6 +984,13 @@ export class LegacyFSController extends PuterController {
         const descendantsOnly = getBoolean(body, 'descendants_only') ?? false;
         const pathsArray = Array.isArray(body.paths) ? body.paths : null;
         if (pathsArray) {
+            if (pathsArray.length > FS_BATCH_WRITE_MAX_ITEMS) {
+                throw new HttpError(
+                    400,
+                    `Too many items in one request (max ${FS_BATCH_WRITE_MAX_ITEMS})`,
+                    { legacyCode: 'bad_request' },
+                );
+            }
             const removedEntries: unknown[] = [];
             for (const raw of pathsArray) {
                 const entry = await resolveV1Selector(this.stores.fsEntry, raw);
@@ -1154,11 +1153,25 @@ export class LegacyFSController extends PuterController {
             return;
         }
         const userId = this.#getActorUserId(req);
-        const rows = await this.clients.db.read(
-            'SELECT `subdomain`, `root_dir_id`, `uuid`, `ts` FROM `subdomains` WHERE `user_id` = ?',
-            [userId],
-        );
-        res.json(rows);
+        const sites: Array<Record<string, unknown>> = [];
+        let afterId: number | undefined;
+        for (;;) {
+            const page = (await this.stores.subdomain.listByUserId(userId, {
+                afterId,
+                limit: SUBDOMAIN_PAGE_SIZE,
+            })) as Array<Record<string, unknown>>;
+            for (const row of page) {
+                sites.push({
+                    subdomain: row.subdomain,
+                    root_dir_id: row.root_dir_id,
+                    uuid: row.uuid,
+                    ts: row.ts,
+                });
+            }
+            if (page.length < SUBDOMAIN_PAGE_SIZE) break;
+            afterId = Number(page[page.length - 1]!.id);
+        }
+        res.json(sites);
     };
 
     updateFsentryThumbnail = async (
@@ -1206,9 +1219,10 @@ export class LegacyFSController extends PuterController {
         const event = { url: thumbnail, uuid: entry.uuid };
         await this.clients.event.emitAndWait('thumbnail.created', event, {});
 
-        await this.clients.db.write(
-            'UPDATE `fsentries` SET `thumbnail` = ? WHERE `uuid` = ?',
-            [event.url, uid],
+        // Not the owner-scoped update: a shared writer passed the check above.
+        await this.stores.fsEntry.updateEntryThumbnailByUuid(
+            entry.uuid,
+            event.url,
         );
         res.json({ thumbnail: event.url });
     };
@@ -1275,10 +1289,7 @@ export class LegacyFSController extends PuterController {
             });
         }
 
-        const range =
-            typeof req.headers.range === 'string'
-                ? req.headers.range
-                : undefined;
+        const range = resolveReadRange(req.headers.range, query);
         const download = await this.services.fs.readContent(entry, {
             range,
         });
@@ -1311,10 +1322,7 @@ export class LegacyFSController extends PuterController {
         );
         res.status(range ? 206 : 200);
 
-        download.body.on('error', (err) => {
-            res.destroy(err);
-        });
-        download.body.pipe(res);
+        void pipeToResponse(download.body, res);
     };
 
     tokenRead = async (req: Request, res: Response): Promise<void> => {
@@ -1339,7 +1347,7 @@ export class LegacyFSController extends PuterController {
         // that guard every other authenticated FS route have to run here.
         assertNotSuspended(actor!.user);
         assertVerifiedAccount(actor!.user);
-        await assertTeam2fa(actor!.user, this.stores.team);
+        await assertTeam2fa(actor!.user, this.stores.team as Team2faLookup);
 
         req.actor = assertResolvedActor(actor!);
         Context.set('actor', actor);
@@ -1397,7 +1405,8 @@ export class LegacyFSController extends PuterController {
         }
 
         type SignedOrEmpty =
-            (SignedFile & { path?: string }) | Record<string, never>;
+            | (SignedFile & { path?: string })
+            | Record<string, never>;
         const result: { signatures: SignedOrEmpty[]; token?: string } = {
             signatures: [],
         };
@@ -1445,11 +1454,13 @@ export class LegacyFSController extends PuterController {
                 }
 
                 // ACL: always require read; downgrade write→read silently.
+                // One descriptor for both modes reads the chain at most once.
+                const descriptor = this.services.acl.fsDescriptor(entry.path);
                 await assertAccess(
                     this.services.acl,
                     this.services.fs,
                     actor,
-                    entry.path,
+                    descriptor,
                     'read',
                 );
                 let finalAction: 'read' | 'write' = 'read';
@@ -1461,11 +1472,7 @@ export class LegacyFSController extends PuterController {
                     // publishes the descriptor, so there is nothing to hide.
                     const writeOk = await this.services.acl.check(
                         actor,
-                        {
-                            path: entry.path,
-                            resolveAncestors: () =>
-                                this.services.fs.getAncestorChain(entry.path),
-                        },
+                        descriptor,
                         'write',
                     );
                     finalAction = writeOk ? 'write' : 'read';
@@ -1795,10 +1802,7 @@ export class LegacyFSController extends PuterController {
         }
 
         // File: stream bytes with Range support.
-        const range =
-            typeof req.headers.range === 'string'
-                ? req.headers.range
-                : undefined;
+        const range = resolveReadRange(req.headers.range, query);
         const download = await this.services.fs.readContent(entry, {
             range,
         });
@@ -1829,10 +1833,7 @@ export class LegacyFSController extends PuterController {
         );
         res.status(range ? 206 : 200);
 
-        download.body.on('error', (err) => {
-            res.destroy(err);
-        });
-        download.body.pipe(res);
+        void pipeToResponse(download.body, res);
     };
 
     /** GET|POST /df — user storage allowance. */
@@ -1860,7 +1861,8 @@ export class LegacyFSController extends PuterController {
      */
     openItem = async (req: Request, res: Response): Promise<void> => {
         const actor = this.#requireActor(req);
-        if (actor.effectiveApp) {
+        // Refused before the grant, so a token never leaves an orphaned ACL row.
+        if (actor.effectiveApp || actor.accessToken) {
             throw new HttpError(
                 403,
                 'This endpoint is only available to user sessions',
@@ -1885,11 +1887,7 @@ export class LegacyFSController extends PuterController {
         // Real path — see the note on the other `acl.check` above.
         const writeOk = await this.services.acl.check(
             actor,
-            {
-                path: entry.path,
-                resolveAncestors: () =>
-                    this.services.fs.getAncestorChain(entry.path),
-            },
+            this.services.acl.fsDescriptor(entry.path),
             'write',
         );
 
@@ -1958,10 +1956,12 @@ export class LegacyFSController extends PuterController {
         // claiming a root dir is the app itself asking, and a token is not it.
         const callerApp = isAppActor(actor) ? actor.effectiveApp : null;
         if (callerApp?.uid !== appUid) {
+            // `reason` separates this from a refusal a grant could lift, so a
+            // client does not spend a consent prompt on a grant that cannot work.
             throw new HttpError(
                 403,
                 'Only the app itself may request its root dir',
-                { legacyCode: 'forbidden' },
+                { legacyCode: 'forbidden', fields: { reason: 'app_mismatch' } },
             );
         }
         const userId = this.#getActorUserId(req);
@@ -1997,7 +1997,10 @@ export class LegacyFSController extends PuterController {
         const subjectRef = body.subject;
         const appRef = body.app;
         const mode = (getString(body, 'mode') ?? 'read') as
-            'see' | 'list' | 'read' | 'write';
+            | 'see'
+            | 'list'
+            | 'read'
+            | 'write';
         if (!subjectRef || !appRef)
             throw new HttpError(400, '`subject` and `app` are required', {
                 legacyCode: 'bad_request',
@@ -2012,14 +2015,8 @@ export class LegacyFSController extends PuterController {
             if (!(err instanceof HttpError && err.statusCode === 404))
                 throw err;
         }
-        let ancestors: Promise<Array<{ uid: string; path: string }>> | null =
-            null;
-        const descriptor = subject && {
-            path: subject.path,
-            resolveAncestors: () =>
-                (ancestors ??= this.services.fs.getAncestorChain(subject.path)),
-        };
         const acl = this.services.acl as ACLService;
+        const descriptor = subject && acl.fsDescriptor(subject.path);
         if (!descriptor || !(await acl.check(actor, descriptor, 'see')))
             throw new HttpError(404, 'Subject does not exist', {
                 legacyCode: 'subject_does_not_exist',
@@ -2083,6 +2080,10 @@ export class LegacyFSController extends PuterController {
             'read',
         );
 
+        // The GUI calls this on the root origin, which egress metering skips
+        // by default, so opt in by naming the downloader as who pays.
+        req.egressActor = actor;
+
         const range =
             typeof req.headers.range === 'string'
                 ? req.headers.range
@@ -2105,42 +2106,22 @@ export class LegacyFSController extends PuterController {
         );
         res.status(range ? 206 : 200);
 
-        download.body.on('error', (err) => {
-            res.destroy(err);
-        });
-        download.body.pipe(res);
+        void pipeToResponse(download.body, res);
     };
 
     async #emitGuiEvent(
-        eventName:
-            | 'outer.gui.item.added'
-            | 'outer.gui.item.updated'
-            | 'outer.gui.item.removed'
-            | 'outer.gui.item.moved',
+        eventName: GuiItemEventName,
         entry: import('../../stores/fs/FSEntry.js').FSEntry,
         extra?: Record<string, unknown>,
+        replaced?: import('../../stores/fs/FSEntry.js').FSEntry | null,
     ): Promise<void> {
-        // GUI consumes snake_case fields (`user_id`, `parent_uid`, `is_dir`,
-        // …) — spreading the raw FSEntry ships camelCase, which the client
-        // silently ignores. Run the entry through `toLegacyEntry` first so
-        // the event payload matches what /stat et al. return, then overlay
-        // per-op extras (e.g. `old_path` for moves).
-        // `forOwner` — the audience is the owner, who can't read the actor's mask.
         try {
-            const response = {
-                ...(await toLegacyEntry(this.clients.event, entry, {
-                    forOwner: true,
-                })),
-                ...extra,
-                from_new_service: true,
-            };
-            await this.clients.event.emit(
+            await emitGuiItemEvent(
+                this.clients.event,
                 eventName,
-                {
-                    user_id_list: [entry.userId],
-                    response,
-                },
-                {},
+                entry,
+                extra,
+                replaced,
             );
         } catch {
             // Non-critical — GUI event failure must never break the HTTP response.

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

@@ -17,13 +17,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { describe, expect, it } from 'vitest';
+import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
+import type { PuterServer } from '../../server.js';
+import { createTestUser, setupTestServer } from '../../testUtil.js';
 import {
     asRecord,
     fsEntryMimeType,
     getBoolean,
     getString,
     loadLegacyAssociatedApps,
+    resolveReadRange,
     signEntry,
     signEntryThumbnail,
     signingConfigFromAppConfig,
@@ -360,7 +363,7 @@ describe('toLegacyEntry', () => {
 
     it('probes for children to set is_empty on a directory', async () => {
         const fsEntryStore = {
-            listChildren: async () => [{ uuid: 'child' }],
+            hasChildrenByParentUid: async () => true,
         } as never;
         const shaped = await toLegacyEntry(
             undefined,
@@ -373,7 +376,7 @@ describe('toLegacyEntry', () => {
 
     it('treats a failed child probe as non-empty rather than throwing', async () => {
         const fsEntryStore = {
-            listChildren: async () => {
+            hasChildrenByParentUid: async () => {
                 throw new Error('db down');
             },
         } as never;
@@ -385,6 +388,61 @@ describe('toLegacyEntry', () => {
         expect(shaped.is_empty).toBe(false);
     });
 
+    it('leaves is_empty unset for a directory with no store to ask', async () => {
+        const shaped = await toLegacyEntry(
+            undefined,
+            baseEntry({ isDir: true }),
+        );
+        expect(shaped).not.toHaveProperty('is_empty');
+    });
+
+    it('runs the child probe, owner and thumbnail lookups together, keeping key order', async () => {
+        const started: string[] = [];
+        let release!: () => void;
+        const gate = new Promise<void>((resolve) => {
+            release = resolve;
+        });
+        const fsEntryStore = {
+            hasChildrenByParentUid: async () => {
+                started.push('children');
+                await gate;
+                return false;
+            },
+        } as never;
+        const userStore = {
+            getById: async () => {
+                started.push('owner');
+                await gate;
+                return { username: 'alice' };
+            },
+        };
+        const eventClient = {
+            emitAndWait: async (_key: string, data: { thumbnail: string }) => {
+                started.push('thumbnail');
+                await gate;
+                data.thumbnail = 'https://signed.example/t.png';
+            },
+        } as never;
+
+        const pending = toLegacyEntry(
+            eventClient,
+            baseEntry({ isDir: true, thumbnail: 's3://bucket/t.png' }),
+            { fsEntryStore, userStore },
+        );
+        await vi.waitFor(() => expect(started).toHaveLength(3));
+        release();
+        const shaped = await pending;
+
+        expect(shaped).toMatchObject({
+            is_empty: true,
+            owner: { username: 'alice' },
+            thumbnail: 'https://signed.example/t.png',
+        });
+        const keys = Object.keys(shaped);
+        expect(keys.slice(-2)).toEqual(['is_empty', 'owner']);
+        expect(keys.indexOf('thumbnail')).toBe(keys.indexOf('is_public') + 1);
+    });
+
     it('hydrates the owner as a username-only object', async () => {
         const userStore = {
             getById: async () => ({ username: 'alice', email: '[email protected]' }),
@@ -522,3 +580,128 @@ describe('signEntry', () => {
         expect(inSeconds(signed.expires)).toBeLessThanOrEqual(30);
     });
 });
+
+describe('toLegacyEntry is_empty against stored children', () => {
+    let server: PuterServer;
+
+    beforeAll(async () => {
+        server = await setupTestServer();
+    }, 60_000);
+
+    afterAll(async () => {
+        await server?.shutdown();
+    });
+
+    it('reports an empty directory as empty, and one with a child as not', async () => {
+        const username = `lfh${Math.random().toString(36).slice(2, 10)}`;
+        await createTestUser(server, { username, password: 'lfh-password' });
+        const fsEntryStore = server.stores.fsEntry;
+        const dir = await fsEntryStore.createNonFileEntry({
+            parent: (await fsEntryStore.getEntryByPath(
+                `/${username}/Documents`,
+            ))!,
+            name: 'maybe-empty',
+            kind: 'directory',
+        });
+        const shape = async () =>
+            toLegacyEntry(
+                undefined,
+                (await fsEntryStore.getEntryByUuid(dir.uuid))!,
+                { fsEntryStore },
+            );
+
+        expect((await shape()).is_empty).toBe(true);
+        await fsEntryStore.createNonFileEntry({
+            parent: dir,
+            name: 'child',
+            kind: 'directory',
+        });
+        expect((await shape()).is_empty).toBe(false);
+    });
+});
+
+describe('resolveReadRange', () => {
+    it('returns the explicit headersRange when provided', () => {
+        expect(
+            resolveReadRange('bytes=10-20', { offset: 0, byte_count: 5 }),
+        ).toBe('bytes=10-20');
+    });
+
+    it('returns undefined when neither headersRange nor range query params are present', () => {
+        expect(resolveReadRange(undefined, {})).toBeUndefined();
+        expect(resolveReadRange('', {})).toBeUndefined();
+    });
+
+    it('derives a byte range from offset and byte_count', () => {
+        expect(resolveReadRange(undefined, { offset: 0, byte_count: 5 })).toBe(
+            'bytes=0-4',
+        );
+        expect(
+            resolveReadRange(undefined, { offset: 10, byte_count: 20 }),
+        ).toBe('bytes=10-29');
+        expect(
+            resolveReadRange(undefined, { offset: '4', byte_count: '6' }),
+        ).toBe('bytes=4-9');
+    });
+
+    it('derives an open range when only offset is provided', () => {
+        expect(resolveReadRange(undefined, { offset: 10 })).toBe('bytes=10-');
+        expect(resolveReadRange(undefined, { offset: '0' })).toBe('bytes=0-');
+    });
+
+    it('derives a prefix range when only byte_count is provided', () => {
+        expect(resolveReadRange(undefined, { byte_count: 15 })).toBe(
+            'bytes=0-14',
+        );
+        expect(resolveReadRange(undefined, { byte_count: '1' })).toBe(
+            'bytes=0-0',
+        );
+    });
+
+    it('throws 400 on invalid or negative offset', () => {
+        expect(() =>
+            resolveReadRange(undefined, { offset: -1, byte_count: 10 }),
+        ).toThrow('Invalid offset');
+        expect(() =>
+            resolveReadRange(undefined, { offset: 1.5, byte_count: 10 }),
+        ).toThrow('Invalid offset');
+        expect(() =>
+            resolveReadRange(undefined, { offset: 'abc', byte_count: 10 }),
+        ).toThrow('Invalid offset');
+    });
+
+    it('throws 400 on non-decimal or unsafe numeric strings', () => {
+        for (const offset of [
+            '1e3',
+            '0x10',
+            ' 4',
+            '1e21',
+            '9007199254740993',
+        ]) {
+            expect(() => resolveReadRange(undefined, { offset })).toThrow(
+                'Invalid offset',
+            );
+        }
+        expect(() =>
+            resolveReadRange(undefined, {
+                offset: String(Number.MAX_SAFE_INTEGER),
+                byte_count: '3',
+            }),
+        ).toThrow('Invalid byte_count');
+    });
+
+    it('throws 400 on non-positive or invalid byte_count', () => {
+        expect(() =>
+            resolveReadRange(undefined, { offset: 0, byte_count: 0 }),
+        ).toThrow('Invalid byte_count');
+        expect(() =>
+            resolveReadRange(undefined, { offset: 0, byte_count: -5 }),
+        ).toThrow('Invalid byte_count');
+        expect(() =>
+            resolveReadRange(undefined, { offset: 0, byte_count: 2.5 }),
+        ).toThrow('Invalid byte_count');
+        expect(() =>
+            resolveReadRange(undefined, { offset: 0, byte_count: 'xyz' }),
+        ).toThrow('Invalid byte_count');
+    });
+});

src/backend/controllers/fs/legacyFsHelpers.ts

@@ -23,8 +23,14 @@ import type { FSEntry } from '../../stores/fs/FSEntry.js';
 import type { FSEntryStore } from '../../stores/fs/FSEntryStore.js';
 import type { FSService } from '../../services/fs/FSService.js';
 import type { NodeRef } from '../../services/fs/resolveNode.js';
-import type { ACLService, AclMode } from '../../services/acl/ACLService.js';
-import { isAppActor, type Actor } from '../../core/actor.js';
+import {
+    FS_ROUTE_REFUSAL,
+    type ACLService,
+    type AclMode,
+    type AclRefusalOptions,
+    type ResourceDescriptor,
+} from '../../services/acl/ACLService.js';
+import type { Actor } from '../../core/actor.js';
 import { Context } from '../../core/context.js';
 import type { EventClient } from '../../clients/event/EventClient.js';
 import { HttpError } from '../../core/http/HttpError.js';
@@ -93,6 +99,57 @@ export function getBoolean(
     return undefined;
 }
 
+// Non-negative safe integer from a number or a plain digit string; anything
+// else (exponents, hex, whitespace) is rejected.
+function parseByteParam(raw: unknown, name: string, min: number): number {
+    const value =
+        typeof raw === 'number'
+            ? raw
+            : typeof raw === 'string' && /^\d+$/.test(raw)
+              ? Number(raw)
+              : NaN;
+    if (!Number.isSafeInteger(value) || value < min) {
+        throw new HttpError(400, `Invalid ${name}`, {
+            legacyCode: 'bad_request',
+        });
+    }
+    return value;
+}
+
+/**
+ * Resolves an HTTP Range header string from explicit `headersRange` or fallback
+ * `offset` / `byte_count` query parameters.
+ */
+export function resolveReadRange(
+    headersRange: unknown,
+    query: Record<string, unknown>,
+): string | undefined {
+    if (typeof headersRange === 'string' && headersRange.length > 0) {
+        return headersRange;
+    }
+    const isSet = (v: unknown) => v !== undefined && v !== null && v !== '';
+    const offset = isSet(query.offset)
+        ? parseByteParam(query.offset, 'offset', 0)
+        : undefined;
+    const byteCount = isSet(query.byte_count)
+        ? parseByteParam(query.byte_count, 'byte_count', 1)
+        : undefined;
+
+    if (byteCount !== undefined) {
+        const last = (offset ?? 0) + byteCount - 1;
+        if (!Number.isSafeInteger(last)) {
+            throw new HttpError(400, 'Invalid byte_count', {
+                legacyCode: 'bad_request',
+            });
+        }
+        return `bytes=${offset ?? 0}-${last}`;
+    }
+    if (offset !== undefined) {
+        return `bytes=${offset}-`;
+    }
+    return undefined;
+}
+
 // Accepts either `{ path }` or `{ uid }` or `{ id }` or `{ parent, name }`
 // from a legacy body field. Returns a resolved entry (throwing 404 if not
 // found or 400 if no usable ref is present).
@@ -124,7 +181,7 @@ const MAX_SELECTOR_DEPTH = 4;
  * Resolve `ref`, reporting any miss as the same 404 an unreadable entry gets,
  * so a lookup never echoes a resolved path or tells missing from hidden.
  */
-async function resolveOrNotFound(
+export async function resolveOrNotFound(
     fsEntryStore: FSEntryStore,
     ref: NodeRef,
 ): Promise<FSEntry> {
@@ -209,103 +266,35 @@ export async function resolveV1Selector(
 
 // -- ACL --------------------------------------------------------------
 
+/**
+ * The filesystem refusal, except that an app is told a path it can't reach
+ * doesn't exist, so a sibling user's or another app's files don't show up as
+ * merely forbidden.
+ */
+const LEGACY_REFUSAL: AclRefusalOptions = {
+    ...FS_ROUTE_REFUSAL,
+    hideFromApps: true,
+};
+
+/** `_fsService` is unused; the call sites still pass it. */
 export async function assertAccess(
     aclService: ACLService,
-    fsService: FSService,
+    _fsService: FSService,
     actor: Actor,
-    path: string,
+    path: string | ResourceDescriptor,
     mode: AclMode,
 ): Promise<void> {
-    let ancestors: Promise<Array<{ uid: string; path: string }>> | null = null;
-    const descriptor = {
-        path,
-        resolveAncestors() {
-            if (!ancestors) {
-                ancestors = fsService.getAncestorChain(path);
-            }
-            return ancestors;
-        },
-    };
-    const allowed = await aclService.check(actor, descriptor, mode);
-    if (allowed) return;
-    const safe = (await aclService.getSafeAclError(
-        actor,
-        descriptor,
-        mode,
-    )) as {
-        status?: unknown;
-        message?: unknown;
-        fields?: { code?: unknown };
-    };
-    const status = Number(safe?.status);
-    const message =
-        typeof safe?.message === 'string' && safe.message.length > 0
-            ? safe.message
-            : 'Access denied';
-    const code =
-        typeof safe?.fields?.code === 'string' ? safe.fields.code : undefined;
-    const legacyCode = code === 'forbidden' ? 'access_denied' : code;
-
-    // App-under-user actors see denials as 404 "subject_does_not_exist"
-    // so existence of a sibling user's / other-app's files isn't leaked
-    // through the error code. User-actor denials keep the real 403.
-
-    if (isAppActor(actor)) {
-        throw new HttpError(404, 'Subject does not exist', {
-            legacyCode: 'subject_does_not_exist',
-        });
-    }
-
-    if (status === 404) {
-        throw new HttpError(404, message, {
-            ...(legacyCode ? { legacyCode } : {}),
-        });
-    }
-    throw new HttpError(403, message, {
-        legacyCode: legacyCode ?? 'access_denied',
-    });
+    await aclService.assertFsAccess(actor, path, mode, LEGACY_REFUSAL);
 }
 
-/**
- * Authorize creation of a new entry at `targetPath`. The standard rule is write
- * on the parent, but we also allow it when the actor has explicit write on the
- * target itself — this covers an app creating its own
- * `/<user>/AppData/<app_uid>` folder (parent `AppData` is off-limits, but the
- * target is the app's own subtree per ACLService's short-circuit) and shares
- * granted directly on a not-yet-created path.
- *
- * On failure, delegates to `assertAccess` on the parent so the error shape
- * stays identical to the previous parent-only check.
- */
+/** `ACLService.assertFsCreate`, refused the legacy way. */
 export async function assertCanCreate(
     aclService: ACLService,
-    fsService: FSService,
+    _fsService: FSService,
     actor: Actor,
     targetPath: string,
 ): Promise<void> {
-    const parent = pathPosix.dirname(targetPath);
-    const parentForCheck = parent === '/' ? targetPath : parent;
-
-    const makeDescriptor = (path: string) => {
-        let cache: Promise<Array<{ uid: string; path: string }>> | null = null;
-        return {
-            path,
-            resolveAncestors() {
-                if (!cache) cache = fsService.getAncestorChain(path);
-                return cache;
-            },
-        };
-    };
-
-    if (
-        await aclService.check(actor, makeDescriptor(parentForCheck), 'write')
-    ) {
-        return;
-    }
-    if (await aclService.check(actor, makeDescriptor(targetPath), 'write')) {
-        return;
-    }
-    await assertAccess(aclService, fsService, actor, parentForCheck, 'write');
+    await aclService.assertFsCreate(actor, targetPath, LEGACY_REFUSAL);
 }
 
 /** `write` on the destination parent, unless it is the entry's own Trash. */
@@ -537,43 +526,115 @@ export async function toLegacyEntry(
         ...(opts.isShared === undefined ? {} : { is_shared: opts.isShared }),
     };
 
-    // `is_empty` — only meaningful for directories. Single-row probe so we
-    // don't pay for listing every child.
-    if (entry.isDir && opts.fsEntryStore) {
-        try {
-            const children = await opts.fsEntryStore.listChildren(entry.uuid, {
-                limit: 1,
-            });
-            response.is_empty = children.length === 0;
-        } catch {
-            response.is_empty = false;
-        }
-    } else if (!entry.isDir) {
-        response.is_empty = false;
-    }
+    const { fsEntryStore, userStore } = opts;
+    const [isEmpty, ownerUsername, thumbnail] = await Promise.all([
+        // `is_empty` — only meaningful for directories.
+        entry.isDir && fsEntryStore
+            ? (async () => {
+                  try {
+                      return !(await fsEntryStore.hasChildrenByParentUid(
+                          entry.uuid,
+                      ));
+                  } catch {
+                      return false;
+                  }
+              })()
+            : undefined,
+        // `owner` — username-only. Matches the legacy safe-entry contract.
+        userStore
+            ? (async () => {
+                  try {
+                      const owner = await userStore.getById(entry.userId);
+                      return owner && typeof owner.username === 'string'
+                          ? owner.username
+                          : undefined;
+                  } catch {
+                      return undefined; // best-effort
+                  }
+              })()
+            : undefined,
+        // Let the thumbnail extension swap an s3:// key for a signed URL.
+        signEntryThumbnail(
+            eventClient,
+            entry.uuid,
+            response.thumbnail as string | null,
+        ),
+    ]);
 
-    // `owner` — username-only. Matches the legacy safe-entry contract.
-    if (opts.userStore) {
-        try {
-            const owner = await opts.userStore.getById(entry.userId);
-            if (owner && typeof owner.username === 'string') {
-                response.owner = { username: owner.username };
-            }
-        } catch {
-            /* best-effort */
-        }
-    }
-
-    // Let the thumbnail extension swap an s3:// key for a signed URL.
-    response.thumbnail = await signEntryThumbnail(
-        eventClient,
-        entry.uuid,
-        response.thumbnail as string | null,
-    );
+    if (isEmpty !== undefined) response.is_empty = isEmpty;
+    else if (!entry.isDir) response.is_empty = false;
+    if (ownerUsername !== undefined)
+        response.owner = { username: ownerUsername };
+    response.thumbnail = thumbnail;
 
     return response;
 }
 
+// -- GUI item events --------------------------------------------------
+
+export type GuiItemEventName =
+    | 'outer.gui.item.added'
+    | 'outer.gui.item.updated'
+    | 'outer.gui.item.moved'
+    | 'outer.gui.item.removed';
+
+/**
+ * Tell the entry's owner's open clients about a change. The desktop reads the
+ * legacy entry shape plus per-event `extra` fields: `old_path` on moves,
+ * `descendants_only` on removes.
+ *
+ * `replaced` is what an overwriting copy or move took the place of. Its
+ * `removed` goes out first: the desktop hides rows by path, so arriving second
+ * it would hide the new row too.
+ */
+export async function emitGuiItemEvent(
+    eventClient: EventClient,
+    eventName: GuiItemEventName,
+    entry: FSEntry,
+    extra?: Record<string, unknown>,
+    replaced?: FSEntry | null,
+): Promise<void> {
+    // Moving an entry onto its own path replaces nothing.
+    if (replaced && replaced.uuid !== entry.uuid) {
+        await emitGuiItemEvent(eventClient, 'outer.gui.item.removed', replaced);
+    }
+    // `forOwner`: the audience is the owner, who can't read the actor's mask.
+    const response = {
+        ...(await toLegacyEntry(eventClient, entry, { forOwner: true })),
+        ...extra,
+        from_new_service: true,
+    };
+    eventClient.emit(eventName, { user_id_list: [entry.userId], response }, {});
+}
+
+/**
+ * The entry at `name` under `destinationParent`. An overwriting copy or move
+ * deletes it, so callers look it up first to announce its removal.
+ */
+export async function findOverwriteTarget(
+    fsEntryStore: FSEntryStore,
+    destinationParent: FSEntry,
+    name: string,
+): Promise<FSEntry | null> {
+    return fsEntryStore.getEntryByPath(
+        destinationParent.path === '/'
+            ? `/${name}`
+            : `${destinationParent.path}/${name}`,
+    );
+}
+
+/**
+ * `target` if the overwriting move kept the name it was looked up by, so took
+ * its place. A move into someone else's Trash renames instead and leaves it.
+ */
+export function replacedByMove(
+    target: FSEntry | null,
+    moved: FSEntry,
+    name: string,
+): FSEntry | null {
+    return target && moved.name === name ? target : null;
+}
+
 export { normalizeAbsolutePath };
 
 // -- Signing ---------------------------------------------------------

src/backend/controllers/fs/limits.ts

@@ -192,8 +192,8 @@ export const FS_POLL_LIMIT = userWindow('fs:poll', 240, 240, 120);
 // also a pending session and presigned URLs. Checked before any per-item work.
 
 /**
- * `startBatchWrite` / `completeBatchWrite` / `batchWrite`. Puter.js chunks
- * uploads at this size.
+ * `startBatchWrite` / `completeBatchWrite` / `batchWrite`, and the `paths` of
+ * one legacy `/delete`. Puter.js chunks uploads at this size.
  */
 export const FS_BATCH_WRITE_MAX_ITEMS = 500;
 

src/backend/controllers/fs/requestTypes.ts

@@ -56,6 +56,8 @@ export interface SignedWriteResponse {
     sessionId: string;
     uploadMode: UploadMode;
     objectKey: string;
+    /** The uid the entry will carry, which an overwrite already has. */
+    entryUid: string;
     bucket: string;
     bucketRegion: string;
     contentType: string;

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

@@ -0,0 +1,354 @@
+/*
+ * 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 {
+    createTestUser,
+    setupPuterTestEnv,
+    type PuterTestEnv,
+} from '../../testUtil.js';
+
+// A scoped access token writes through the `/fs` routes wherever its grant
+// reaches — the reach it already has over WebDAV — and nowhere else. The ACL
+// each handler runs intersects the token's grant with its issuer's, so these
+// check both edges of that, plus the routes that stay closed to tokens.
+describe('scoped access tokens on the /fs write routes', () => {
+    let env: PuterTestEnv;
+
+    beforeAll(async () => {
+        env = await setupPuterTestEnv();
+    }, 180_000);
+
+    afterAll(async () => {
+        await env?.shutdown();
+    });
+
+    const post = async (route: string, token: string, body: unknown) => {
+        const res = await fetch(new URL(route, env.apiOrigin), {
+            method: 'POST',
+            headers: {
+                'content-type': 'application/json',
+                authorization: `Bearer ${token}`,
+            },
+            body: JSON.stringify(body),
+        });
+        const text = await res.text();
+        let json: Record<string, unknown> | null = null;
+        try {
+            json = text ? (JSON.parse(text) as Record<string, unknown>) : null;
+        } catch {
+            // Some refusals are plain text.
+        }
+        return { status: res.status, json, text };
+    };
+
+    /** A user, a token granted `mode` on their Documents, and some fixtures. */
+    const setup = async (mode: 'read' | 'write') => {
+        const user = await createTestUser(env.server, {
+            username: `stw${Math.random().toString(36).slice(2, 9)}`,
+            password: 'puter-test-user-password',
+        });
+        const home = `/${user.username}`;
+        const documents = await post('/stat', user.token, {
+            path: `${home}/Documents`,
+        });
+        await post('/touch', user.token, { path: `${home}/Desktop/kept.txt` });
+        await post('/touch', user.token, { path: `${home}/Documents/in.txt` });
+        const minted = await post('/auth/create-access-token', user.token, {
+            permissions: [`fs:${documents.json!.uid}:${mode}`],
+        });
+        expect(minted.status).toBe(200);
+        return {
+            user,
+            home,
+            token: minted.json!.token as string,
+            exists: async (path: string) =>
+                (await post('/stat', user.token, { path })).status === 200,
+        };
+    };
+
+    it('writes inside its grant on the legacy routes', async () => {
+        const { home, token, exists } = await setup('write');
+        const docs = `${home}/Documents`;
+
+        expect(
+            (await post('/mkdir', token, { path: `${docs}/d` })).status,
+        ).toBe(200);
+        expect(
+            (await post('/touch', token, { path: `${docs}/d/t.txt` })).status,
+        ).toBe(200);
+        const t = await post('/stat', token, { path: `${docs}/d/t.txt` });
+        expect(
+            (
+                await post('/rename', token, {
+                    uid: t.json!.uid,
+                    new_name: 'r.txt',
+                })
+            ).status,
+        ).toBe(200);
+        expect(
+            (
+                await post('/copy', token, {
+                    source: `${docs}/d/r.txt`,
+                    destination: docs,
+                })
+            ).status,
+        ).toBe(200);
+        expect(
+            (
+                await post('/move', token, {
+                    source: `${docs}/r.txt`,
+                    destination: `${docs}/d`,
+                    new_name: 'm.txt',
+                })
+            ).status,
+        ).toBe(200);
+        expect(
+            (await post('/delete', token, { paths: [`${docs}/d/m.txt`] }))
+                .status,
+        ).toBe(200);
+        const batch = await post('/batch', token, {
+            operations: [
+                { op: 'mkdir', path: `${docs}/b` },
+                { op: 'delete', path: `${docs}/d/r.txt` },
+            ],
+        });
+        expect(batch.status, batch.text).toBe(200);
+
+        expect(await exists(`${docs}/b`)).toBe(true);
+        expect(await exists(`${docs}/d/r.txt`)).toBe(false);
+        expect(await exists(`${docs}/d/m.txt`)).toBe(false);
+    }, 180_000);
+
+    it('writes inside its grant on the v2 routes', async () => {
+        const { home, token, exists } = await setup('write');
+        const docs = `${home}/Documents`;
+
+        expect(
+            (await post('/fs/mkdir', token, { path: `${docs}/v` })).status,
+        ).toBe(200);
+        expect(
+            (await post('/fs/touch', token, { path: `${docs}/v/t.txt` }))
+                .status,
+        ).toBe(200);
+        const written = await post('/fs/write', token, {
+            fileMetadata: {
+                path: `${docs}/v/w.txt`,
+                size: 3,
+                contentType: 'text/plain',
+            },
+            fileContent: 'abc',
+        });
+        expect(written.status, written.text).toBe(200);
+        expect(
+            (
+                await post('/fs/rename', token, {
+                    path: `${docs}/v/t.txt`,
+                    new_name: 'r.txt',
+                })
+            ).status,
+        ).toBe(200);
+        expect(
+            (
+                await post('/fs/copy', token, {
+                    source: `${docs}/v/r.txt`,
+                    destination: docs,
+                })
+            ).status,
+        ).toBe(200);
+        expect(
+            (
+                await post('/fs/move', token, {
+                    source: `${docs}/r.txt`,
+                    destination: `${docs}/v`,
+                    new_name: 'm.txt',
+                })
+            ).status,
+        ).toBe(200);
+        expect(
+            (
+                await post('/fs/mkshortcut', token, {
+                    parent: docs,
+                    target: `${docs}/v/w.txt`,
+                    name: 'w-link',
+                })
+            ).status,
+        ).toBe(200);
+        expect(
+            (await post('/fs/delete', token, { path: `${docs}/v/m.txt` }))
+                .status,
+        ).toBe(200);
+        const started = await post('/fs/startWrite', token, {
+            fileMetadata: { path: `${docs}/v/up.bin`, size: 4 },
+        });
+        expect(started.status, started.text).toBe(200);
+        expect(
+            (
+                await post('/fs/abortWrite', token, {
+                    uploadId: started.json!.sessionId,
+                })
+            ).status,
+        ).toBe(200);
+
+        expect(await exists(`${docs}/v/w.txt`)).toBe(true);
+        expect(await exists(`${docs}/w-link`)).toBe(true);
+        expect(await exists(`${docs}/v/m.txt`)).toBe(false);
+    }, 180_000);
+
+    it('is refused everywhere outside its grant', async () => {
+        const { home, token, exists } = await setup('write');
+        const docs = `${home}/Documents`;
+        const desktop = `${home}/Desktop`;
+
+        const attempts = [
+            ['/mkdir', { path: `${desktop}/x` }],
+            ['/touch', { path: `${desktop}/x.txt` }],
+            ['/move', { source: `${docs}/in.txt`, destination: desktop }],
+            ['/copy', { source: `${desktop}/kept.txt`, destination: docs }],
+            ['/delete', { paths: [`${desktop}/kept.txt`] }],
+            ['/delete', { paths: [home] }],
+            ['/fs/mkdir', { path: `${desktop}/x` }],
+            [
+                '/fs/write',
+                {
+                    fileMetadata: {
+                        path: `${desktop}/kept.txt`,
+                        size: 1,
+                        overwrite: true,
+                    },
+                    fileContent: 'x',
+                },
+            ],
+            ['/fs/move', { source: `${docs}/in.txt`, destination: desktop }],
+            ['/fs/copy', { source: `${desktop}/kept.txt`, destination: docs }],
+            ['/fs/rename', { path: `${desktop}/kept.txt`, new_name: 'y.txt' }],
+            ['/fs/delete', { path: `${desktop}/kept.txt` }],
+            ['/fs/delete', { path: home }],
+        ] as const;
+        for (const [route, body] of attempts) {
+            const res = await post(route, token, body);
+            expect(
+                [403, 404],
+                `${route} ${JSON.stringify(body)} → ${res.status}`,
+            ).toContain(res.status);
+        }
+
+        const batch = await post('/batch', token, {
+            operations: [{ op: 'mkdir', path: `${desktop}/b` }],
+        });
+        expect(batch.status).not.toBe(200);
+
+        expect(await exists(`${desktop}/kept.txt`)).toBe(true);
+        expect(await exists(`${desktop}/x`)).toBe(false);
+        expect(await exists(`${desktop}/b`)).toBe(false);
+        expect(await exists(`${docs}/in.txt`)).toBe(true);
+        expect(await exists(`${docs}/kept.txt`)).toBe(false);
+    }, 180_000);
+
+    it('refuses every write to a read-only token', async () => {
+        const { home, token, exists } = await setup('read');
+        const docs = `${home}/Documents`;
+
+        const attempts = [
+            ['/mkdir', { path: `${docs}/x` }],
+            ['/touch', { path: `${docs}/x.txt` }],
+            ['/delete', { paths: [`${docs}/in.txt`] }],
+            ['/fs/mkdir', { path: `${docs}/x` }],
+            [
+                '/fs/write',
+                {
+                    fileMetadata: { path: `${docs}/x.txt`, size: 1 },
+                    fileContent: 'x',
+                },
+            ],
+            [
+                '/fs/startWrite',
+                { fileMetadata: { path: `${docs}/x.bin`, size: 1 } },
+            ],
+            ['/fs/rename', { path: `${docs}/in.txt`, new_name: 'y.txt' }],
+            ['/fs/delete', { path: `${docs}/in.txt` }],
+        ] as const;
+        for (const [route, body] of attempts) {
+            const res = await post(route, token, body);
+            expect(res.status, `${route} → ${res.status}`).toBe(403);
+        }
+        expect(await exists(`${docs}/in.txt`)).toBe(true);
+        expect(await exists(`${docs}/x`)).toBe(false);
+    }, 180_000);
+
+    // An upload session belongs to the account, not to the credential that
+    // opened it, so each later step re-checks the target against the caller.
+    it('cannot touch an upload the session opened outside its grant', async () => {
+        const { user, home, token } = await setup('write');
+        const started = await post('/fs/startWrite', user.token, {
+            fileMetadata: { path: `${home}/Desktop/up.bin`, size: 4 },
+        });
+        expect(started.status).toBe(200);
+        const uploadId = started.json!.sessionId as string;
+
+        for (const [route, body] of [
+            ['/fs/abortWrite', { uploadId }],
+            ['/fs/completeWrite', { uploadId }],
+            ['/fs/signMultipartParts', { uploadId, partNumbers: [1] }],
+        ] as const) {
+            const res = await post(route, token, body);
+            expect(
+                [403, 404],
+                `${route} → ${res.status} ${res.text}`,
+            ).toContain(res.status);
+        }
+
+        // Still open: the session's own abort finds it to abort.
+        const sessions = await env.server.services.fs.getUploadSessions(
+            (await env.server.stores.user.getByUsername(user.username))!.id,
+            [uploadId],
+        );
+        expect(sessions[0]?.status).not.toBe('aborted');
+        expect(
+            (await post('/fs/abortWrite', user.token, { uploadId })).status,
+        ).toBe(200);
+    }, 180_000);
+
+    it('aborting an unknown upload stays a no-op', async () => {
+        const { token } = await setup('write');
+        const res = await post('/fs/abortWrite', token, {
+            uploadId: 'no-such-upload',
+        });
+        expect(res.status).toBe(200);
+    }, 180_000);
+
+    it('keeps the routes that reach past one entry closed', async () => {
+        const { home, token } = await setup('write');
+        const docs = `${home}/Documents`;
+
+        for (const [route, body] of [
+            ['/sign', { items: [{ path: `${docs}/in.txt`, action: 'read' }] }],
+            ['/search', { text: 'in' }],
+            ['/fs/search', { query: 'in' }],
+            ['/df', {}],
+            ['/readdir-subdomains', {}],
+        ] as const) {
+            const res = await post(route, token, body);
+            expect(res.status, `${route} → ${res.status}`).toBe(403);
+            expect(res.json?.message ?? res.text).toMatch(
+                /Access tokens are not allowed/,
+            );
+        }
+    }, 180_000);
+});

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

@@ -194,4 +194,87 @@ describe('writes inside a folder shared with write', () => {
             (moved.json!.moved as { path: string }).path,
         ).toBe(`${s.maskedDir}/renamed.txt`);
     }, 180_000);
+
+    // The thumbnail update is scoped to the writer's own rows, so a file the
+    // owner ends up owning keeps none, while the writer's own file in the same
+    // batch gets its thumbnail.
+    it('batchWrite stores thumbnails on the writer’s own files only', async () => {
+        const s = await shareAFolder();
+        const png =
+            'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==';
+        const ownPath = `/${s.recipient.username}/Documents/own.png`;
+        const written = await post('/fs/batchWrite', s.recipient.token, [
+            {
+                fileMetadata: { path: `${s.maskedDir}/shared.png`, size: 1 },
+                fileContent: 'a',
+                thumbnailData: png,
+            },
+            {
+                fileMetadata: { path: ownPath, size: 1 },
+                fileContent: 'b',
+                thumbnailData: png,
+            },
+        ]);
+        expect(written.status).toBe(200);
+
+        const stored = async (path: string) =>
+            env.server.stores.fsEntry.getEntryByUuidFromPrimary(
+                (await env.server.stores.fsEntry.getEntryByPath(path))!.uuid,
+            );
+        expect((await stored(`${s.realDir}/shared.png`))?.thumbnail).toBeNull();
+        expect((await stored(ownPath))?.thumbnail).toMatch(/^s3:\/\//);
+    }, 180_000);
+
+    // The recipient only knows the masked path, so refusals name entries the
+    // way the recipient addressed them.
+    it('keeps the owner’s real path out of error messages', async () => {
+        const s = await shareAFolder();
+        await post('/touch', s.owner.token, {
+            path: `${s.realDir}/other.txt`,
+        });
+
+        const cases = [
+            {
+                res: await post('/fs/stat', s.recipient.token, {
+                    path: `${s.maskedDir}/missing.txt`,
+                }),
+                status: 404,
+                message: 'Subject does not exist',
+            },
+            {
+                res: await post('/fs/mkdir', s.recipient.token, {
+                    path: `${s.maskedDir}/note.txt`,
+                }),
+                status: 409,
+                message: 'An entry named `note.txt` already exists',
+            },
+            {
+                res: await post('/fs/mkdir', s.recipient.token, {
+                    path: `${s.maskedDir}/missing/child`,
+                }),
+                status: 404,
+                message: 'Parent path does not exist: missing',
+            },
+            {
+                res: await post('/fs/rename', s.recipient.token, {
+                    uid: s.noteUid,
+                    new_name: 'other.txt',
+                }),
+                status: 409,
+                message: 'An entry named `other.txt` already exists',
+            },
+            {
+                res: await post('/mkdir', s.recipient.token, {
+                    path: `${s.maskedDir}/note.txt`,
+                }),
+                status: 409,
+                message: 'An entry named `note.txt` already exists',
+            },
+        ];
+        for (const { res, status, message } of cases) {
+            expect(res.status).toBe(status);
+            expect(res.json!.message).toBe(message);
+            expect(JSON.stringify(res.json)).not.toContain(s.realDir);
+        }
+    }, 180_000);
 });

src/backend/controllers/hosting/HostingController.js

@@ -32,14 +32,6 @@ import {
  * exposed it as a top-level POST.
  */
 export class HostingController extends PuterController {
-    constructor(config, clients, stores, services) {
-        super(config, clients, stores, services);
-    }
-
-    get subdomainStore() {
-        return this.stores.subdomain;
-    }
-
     registerRoutes(router) {
         // -- Delete site ---------------------------------------------
 
@@ -71,7 +63,8 @@ export class HostingController extends PuterController {
                     });
                 }
 
-                const row = await this.subdomainStore.getByUuid(site_uuid, {
+                // Owner-scoped, so another user's site reads as missing.
+                const row = await this.stores.subdomain.getByUuid(site_uuid, {
                     userId: req.actor.user.id,
                 });
                 if (!row) {
@@ -81,33 +74,7 @@ export class HostingController extends PuterController {
                         { legacyCode: 'not_found' },
                     );
                 }
-                if (row.protected) {
-                    throw new HttpError(
-                        403,
-                        'Cannot delete a protected subdomain',
-                        { legacyCode: 'forbidden' },
-                    );
-                }
-
-                await this.subdomainStore.deleteByUuid(site_uuid, {
-                    userId: req.actor.user.id,
-                });
-
-                // Same event the `puter-subdomains` driver fires on delete —
-                // listeners (CDN purge, abuse tracking, worker cleanup)
-                // depend on it.
-                try {
-                    this.clients.event.emit(
-                        'subdomain.delete',
-                        {
-                            subdomain: row.subdomain,
-                            uid: String(row.uuid),
-                        },
-                        {},
-                    );
-                } catch {
-                    // Non-critical.
-                }
+                await this.drivers.subdomains.delete({ uid: site_uuid });
 
                 res.json({});
             },

src/backend/controllers/hosting/HostingController.test.js

@@ -19,6 +19,7 @@
 
 import { v4 as uuidv4 } from 'uuid';
 import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
+import { runWithContext } from '../../core/context.js';
 import { PuterRouter } from '../../core/http/PuterRouter.js';
 import { setupTestServer } from '../../testUtil.js';
 
@@ -34,9 +35,12 @@ beforeAll(async () => {
     server = await setupTestServer();
     const router = new PuterRouter();
     server.controllers.hosting.registerRoutes(router);
-    deleteSite = router.routes.find(
+    const handler = router.routes.find(
         (route) => route.path === '/delete-site',
     ).handler;
+    // Handlers run inside the request context, which carries the actor.
+    deleteSite = (req, res) =>
+        runWithContext({ actor: req.actor }, () => handler(req, res));
 });
 
 afterAll(async () => {

src/backend/controllers/index.ts

@@ -32,7 +32,6 @@ import { NotificationController } from './notification/NotificationController.js
 import { OIDCController } from './oidc/OIDCController.js';
 import { PuterAIController } from './puterai/PuterAIController.js';
 import { ShareController } from './share/ShareController.js';
-import { TeamController } from './team/TeamController.js';
 import { StaticAssetsController } from './static/StaticAssetsController.js';
 import { StaticPagesController } from './static/StaticPagesController.js';
 import { SystemController } from './system/SystemController.js';
@@ -60,7 +59,6 @@ export const puterControllers = {
     notification: NotificationController,
     events: EventsController,
     share: ShareController,
-    team: TeamController,
     webdav: WebDAVController,
     oidc: OIDCController,
     wisp: WispController,

src/backend/controllers/oidc/OIDCController.test.ts

@@ -17,6 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+import { installSeatStub } from '../../testFixtures/seatStub.js';
 import type { Request, RequestHandler, Response } from 'express';
 import {
     afterAll,
@@ -233,20 +234,14 @@ const callRoute = async (
     );
 };
 
-const oidc = (): OIDCService =>
-    server.services.oidc as unknown as OIDCService;
+const oidc = (): OIDCService => server.services.oidc as unknown as OIDCService;
 
 // ── GET /auth/oidc/providers ────────────────────────────────────────
 
 describe('OIDCController GET /auth/oidc/providers', () => {
     it('lists every provider whose config validates', async () => {
         const { res, captured } = makeRes();
-        await callRoute(
-            'get',
-            '/auth/oidc/providers',
-            makeReq({}),
-            res,
-        );
+        await callRoute('get', '/auth/oidc/providers', makeReq({}), res);
         // We configured a single `custom` provider; the live service
         // walks the config and returns its id.
         expect(captured.body).toEqual({ providers: ['custom'] });
@@ -417,9 +412,9 @@ describe('OIDCController GET /auth/oidc/:provider/start', () => {
                 }),
                 res,
             );
-            const state = new URL(
-                captured.redirectUrl ?? '',
-            ).searchParams.get('state');
+            const state = new URL(captured.redirectUrl ?? '').searchParams.get(
+                'state',
+            );
             const decoded = oidc().verifyState(state!);
             expect(String(decoded?.redirect_uri)).toBe(TEST_ORIGIN);
         }
@@ -624,14 +619,45 @@ describe('OIDCController login callback', () => {
 
         // The real OIDCService linked the new user — verify via the
         // live store.
-        const linkedUser = await oidc().findUserByProviderSub(
-            'custom',
-            sub,
-        );
+        const linkedUser = await oidc().findUserByProviderSub('custom', sub);
         expect(linkedUser).not.toBeNull();
         expect(linkedUser?.email).toBe(email);
     });
 
+    it('records where the sign-in came from on its session, as password login does', async () => {
+        const state = oidc().signState({
+            provider: 'custom',
+            redirect_uri: 'http://test.local/',
+        });
+        const sub = `sub-${Math.random().toString(36).slice(2, 8)}`;
+        vi.spyOn(oidc(), 'exchangeCodeForTokens').mockResolvedValue({
+            access_token: 'access',
+        } as never);
+        vi.spyOn(oidc(), 'getUserInfo').mockResolvedValue({
+            sub,
+            email: `${sub}@test.local`,
+            email_verified: true,
+        } as never);
+
+        const req = makeReq({
+            query: { code: 'authcode', state },
+            headers: { 'user-agent': 'oidc-agent', host: 'test.local' },
+        });
+        Object.assign(req, { ip: '192.0.2.44' });
+        const { res } = makeRes();
+        await callRoute('get', '/auth/oidc/callback/login', req, res);
+
+        const user = await oidc().findUserByProviderSub('custom', sub);
+        const sessions = (await server.stores.session.getByUserId(
+            user!.id,
+        )) as Array<Record<string, unknown>>;
+        expect(sessions).toHaveLength(1);
+        expect(sessions[0]).toMatchObject({
+            last_ip: '192.0.2.44',
+            last_user_agent: 'oidc-agent',
+        });
+    });
+
     it('clamps redirect_uri to the configured origin (rejects external)', async () => {
         const state = oidc().signState({
             provider: 'custom',
@@ -757,14 +783,12 @@ describe('OIDCController login callback', () => {
         // Seed by running the linked-sub path first via createUserFromOIDC.
         const sub = `sub-${Math.random().toString(36).slice(2, 8)}`;
         const email = `oidc-${Math.random().toString(36).slice(2, 8)}@test.local`;
-        const created = await runWithContext(
-            { req: makeReq({}) },
-            () =>
-                oidc().createUserFromOIDC('custom', {
-                    sub,
-                    email,
-                    email_verified: true,
-                }),
+        const created = await runWithContext({ req: makeReq({}) }, () =>
+            oidc().createUserFromOIDC('custom', {
+                sub,
+                email,
+                email_verified: true,
+            }),
         );
         expect(created.success).toBe(true);
         const firstUserId = created.user!.id;
@@ -804,14 +828,12 @@ describe('OIDCController login callback', () => {
     it('redirects with auth_error when the user is suspended', async () => {
         const sub = `sub-${Math.random().toString(36).slice(2, 8)}`;
         const email = `sus-${Math.random().toString(36).slice(2, 8)}@test.local`;
-        const created = await runWithContext(
-            { req: makeReq({}) },
-            () =>
-                oidc().createUserFromOIDC('custom', {
-                    sub,
-                    email,
-                    email_verified: true,
-                }),
+        const created = await runWithContext({ req: makeReq({}) }, () =>
+            oidc().createUserFromOIDC('custom', {
+                sub,
+                email,
+                email_verified: true,
+            }),
         );
         expect(created.success).toBe(true);
         // Flip the suspended bit on the existing row.
@@ -946,14 +968,12 @@ describe('OIDCController login callback', () => {
     it('keeps an /app/<name> landing in the error redirect (suspended user)', async () => {
         const sub = `sub-${Math.random().toString(36).slice(2, 8)}`;
         const email = `sus-app-${Math.random().toString(36).slice(2, 8)}@test.local`;
-        const created = await runWithContext(
-            { req: makeReq({}) },
-            () =>
-                oidc().createUserFromOIDC('custom', {
-                    sub,
-                    email,
-                    email_verified: true,
-                }),
+        const created = await runWithContext({ req: makeReq({}) }, () =>
+            oidc().createUserFromOIDC('custom', {
+                sub,
+                email,
+                email_verified: true,
+            }),
         );
         expect(created.success).toBe(true);
         await server.stores.user.update(created.user!.id, { suspended: 1 });
@@ -1041,14 +1061,12 @@ describe('OIDCController login callback', () => {
     it('uses popup-style error URL (msg_id + opener_origin) when the popup-state user is suspended', async () => {
         const sub = `sub-${Math.random().toString(36).slice(2, 8)}`;
         const email = `pop-sus-${Math.random().toString(36).slice(2, 8)}@test.local`;
-        const created = await runWithContext(
-            { req: makeReq({}) },
-            () =>
-                oidc().createUserFromOIDC('custom', {
-                    sub,
-                    email,
-                    email_verified: true,
-                }),
+        const created = await runWithContext({ req: makeReq({}) }, () =>
+            oidc().createUserFromOIDC('custom', {
+                sub,
+                email,
+                email_verified: true,
+            }),
         );
         expect(created.success).toBe(true);
         await server.stores.user.update(created.user!.id, { suspended: 1 });
@@ -1180,6 +1198,91 @@ describe('OIDCController login callback', () => {
         expect(captured.redirectStatus).toBe(302);
         expect(captured.redirectUrl).toContain('auth_error=1');
     });
+
+    /** A team seat holding `email` unconfirmed, as provisioning leaves it. */
+    const seatHolding = async (email: string) => {
+        const tag = Math.random().toString(36).slice(2, 8);
+        const owner = await server.stores.user.create({
+            username: `owner-${tag}`,
+            uuid: uuidv4(),
+            password: 'hashed',
+            email: `owner-${tag}@test.local`,
+            free_storage: 100 * 1024 * 1024,
+        });
+        const seat = await server.stores.user.create({
+            username: `seat-${tag}`,
+            uuid: uuidv4(),
+            password: null,
+            email,
+            free_storage: 100 * 1024 * 1024,
+        });
+        installSeatStub(server as never, [seat.id]);
+        // Provisioning issues a temporary password once the seat exists.
+        await server.stores.user.update(seat.id, { password: 'hashed' });
+        return seat;
+    };
+
+    const callbackWith = async (
+        sub: string,
+        claims: Record<string, unknown>,
+    ) => {
+        const state = oidc().signState({
+            provider: 'custom',
+            redirect_uri: 'http://test.local/',
+        });
+        vi.spyOn(oidc(), 'exchangeCodeForTokens').mockResolvedValue({
+            access_token: 'access',
+            id_token: 'id',
+        } as never);
+        vi.spyOn(oidc(), 'getUserInfo').mockResolvedValue({
+            sub,
+            ...claims,
+        } as never);
+        const { res, captured } = makeRes();
+        await callRoute(
+            'get',
+            '/auth/oidc/callback/login',
+            makeReq({ query: { code: 'c', state } }),
+            res,
+        );
+        return captured;
+    };
+
+    it("signs up a provider-verified inbox a seat holds unconfirmed, taking the seat's address", async () => {
+        const email = `seat-${Math.random().toString(36).slice(2, 8)}@test.local`;
+        const seat = await seatHolding(email);
+        const sub = `sub-${Math.random().toString(36).slice(2, 8)}`;
+
+        const captured = await callbackWith(sub, {
+            email,
+            email_verified: true,
+        });
+
+        expect(captured.cookies).toHaveLength(1);
+        const created = await oidc().findUserByProviderSub('custom', sub);
+        expect(created?.id).not.toBe(seat.id);
+        expect(created?.email).toBe(email);
+        const after = await server.stores.user.getById(seat.id, {
+            force: true,
+        });
+        expect(after?.email ?? null).toBeNull();
+    });
+
+    it('leaves the seat its address when the provider did not verify the email', async () => {
+        const email = `seat-${Math.random().toString(36).slice(2, 8)}@test.local`;
+        const seat = await seatHolding(email);
+
+        const captured = await callbackWith(
+            `sub-${Math.random().toString(36).slice(2, 8)}`,
+            { email },
+        );
+
+        expect(captured.redirectUrl).toContain('auth_error=1');
+        const after = await server.stores.user.getById(seat.id, {
+            force: true,
+        });
+        expect(after?.email).toBe(email);
+    });
 });
 
 // -- Browser binding / login-CSRF --------------------------------------
@@ -1209,14 +1312,12 @@ describe('OIDCController signup veto (abuse harness)', () => {
         const email = `veto-${Math.random().toString(36).slice(2, 8)}@test.local`;
         vetoWithTrail(email, 'trail-svc-1');
 
-        const created = await runWithContext(
-            { req: makeReq({}) },
-            () =>
-                oidc().createUserFromOIDC('custom', {
-                    sub: `sub-${Math.random().toString(36).slice(2, 8)}`,
-                    email,
-                    email_verified: true,
-                }),
+        const created = await runWithContext({ req: makeReq({}) }, () =>
+            oidc().createUserFromOIDC('custom', {
+                sub: `sub-${Math.random().toString(36).slice(2, 8)}`,
+                email,
+                email_verified: true,
+            }),
         );
         expect(created.success).toBe(false);
         expect(created.code).toBe('signup_blocked');
@@ -1551,14 +1652,12 @@ describe('OIDCController signup callback', () => {
         // resolves to `linked-sub` rather than creating a new user.
         const sub = `sub-${Math.random().toString(36).slice(2, 8)}`;
         const email = `existing-${Math.random().toString(36).slice(2, 8)}@test.local`;
-        const created = await runWithContext(
-            { req: makeReq({}) },
-            () =>
-                oidc().createUserFromOIDC('custom', {
-                    sub,
-                    email,
-                    email_verified: true,
-                }),
+        const created = await runWithContext({ req: makeReq({}) }, () =>
+            oidc().createUserFromOIDC('custom', {
+                sub,
+                email,
+                email_verified: true,
+            }),
         );
         expect(created.success).toBe(true);
 
@@ -1630,14 +1729,12 @@ describe('OIDCController signup callback', () => {
     it('redirects suspended users to action=signup with message=account_suspended', async () => {
         const sub = `sub-${Math.random().toString(36).slice(2, 8)}`;
         const email = `sus-${Math.random().toString(36).slice(2, 8)}@test.local`;
-        const created = await runWithContext(
-            { req: makeReq({}) },
-            () =>
-                oidc().createUserFromOIDC('custom', {
-                    sub,
-                    email,
-                    email_verified: true,
-                }),
+        const created = await runWithContext({ req: makeReq({}) }, () =>
+            oidc().createUserFromOIDC('custom', {
+                sub,
+                email,
+                email_verified: true,
+            }),
         );
         expect(created.success).toBe(true);
         await server.stores.user.update(created.user!.id, { suspended: 1 });
@@ -1774,14 +1871,12 @@ describe('OIDCController revalidate callback', () => {
         // The linked account exists, but state.user_uuid points at someone else.
         const sub = `sub-${Math.random().toString(36).slice(2, 8)}`;
         const email = `reval-${Math.random().toString(36).slice(2, 8)}@test.local`;
-        const created = await runWithContext(
-            { req: makeReq({}) },
-            () =>
-                oidc().createUserFromOIDC('custom', {
-                    sub,
-                    email,
-                    email_verified: true,
-                }),
+        const created = await runWithContext({ req: makeReq({}) }, () =>
+            oidc().createUserFromOIDC('custom', {
+                sub,
+                email,
+                email_verified: true,
+            }),
         );
         expect(created.success).toBe(true);
 
@@ -1813,14 +1908,12 @@ describe('OIDCController revalidate callback', () => {
     it('happy path: sets the revalidation cookie and redirects to redirect-done', async () => {
         const sub = `sub-${Math.random().toString(36).slice(2, 8)}`;
         const email = `reval-${Math.random().toString(36).slice(2, 8)}@test.local`;
-        const created = await runWithContext(
-            { req: makeReq({}) },
-            () =>
-                oidc().createUserFromOIDC('custom', {
-                    sub,
-                    email,
-                    email_verified: true,
-                }),
+        const created = await runWithContext({ req: makeReq({}) }, () =>
+            oidc().createUserFromOIDC('custom', {
+                sub,
+                email,
+                email_verified: true,
+            }),
         );
         expect(created.success).toBe(true);
         const userUuid = created.user!.uuid;
@@ -1867,14 +1960,12 @@ describe('OIDCController revalidate callback', () => {
     it('falls back to /auth/revalidate-done when state.redirect_uri is cross-origin', async () => {
         const sub = `sub-${Math.random().toString(36).slice(2, 8)}`;
         const email = `reval-${Math.random().toString(36).slice(2, 8)}@test.local`;
-        const created = await runWithContext(
-            { req: makeReq({}) },
-            () =>
-                oidc().createUserFromOIDC('custom', {
-                    sub,
-                    email,
-                    email_verified: true,
-                }),
+        const created = await runWithContext({ req: makeReq({}) }, () =>
+            oidc().createUserFromOIDC('custom', {
+                sub,
+                email,
+                email_verified: true,
+            }),
         );
         expect(created.success).toBe(true);
         const userUuid = created.user!.uuid;
@@ -1913,12 +2004,7 @@ describe('OIDCController revalidate callback', () => {
 describe('OIDCController GET /auth/revalidate-done', () => {
     it('renders the postMessage HTML body with the configured origin', async () => {
         const { res, captured } = makeRes();
-        await callRoute(
-            'get',
-            '/auth/revalidate-done',
-            makeReq({}),
-            res,
-        );
+        await callRoute('get', '/auth/revalidate-done', makeReq({}), res);
         expect(captured.contentType).toContain('text/html');
         const body = String(captured.body);
         expect(body).toContain('puter-revalidate-done');
@@ -1932,9 +2018,9 @@ describe('OIDCController GET /auth/revalidate-done', () => {
 /**
  * The proof exists because the popup return leg states two things the popup
  * cannot check — the opener's origin and that a login completed — and a URL
- * built from a verified `state` is byte-identical to one anybody can type.
- * The opener's origin picks the app a token is minted for, so it has to be
- * attested rather than read.
+ * built from a verified `state` is byte-identical to one anybody can type. The
+ * opener's origin picks the app a token is minted for, so it has to be attested
+ * rather than read.
  */
 describe('OIDCController POST /auth/oidc/verify-popup-return', () => {
     const NONCE = 'binding-nonce';

src/backend/controllers/oidc/OIDCController.ts

@@ -23,6 +23,14 @@ import type { Request, Response } from 'express';
 import { HttpError } from '../../core/http/HttpError.js';
 import type { PuterRouter } from '../../core/http/PuterRouter.js';
 import { PuterController } from '../types.js';
+import { startWebSession } from '../auth/webSession.js';
+import {
+    completeOidcLoginReturn,
+    mintOidcPopupReturn,
+    OIDC_POPUP_RETURN_COOKIE_NAME,
+    type OidcLoginContinuation,
+} from '../auth/oidcLoginReturn.js';
+import type { UserRow } from '../../stores/user/UserStore.js';
 import { sessionCookieFlags } from '../../util/cookieFlags.js';
 import { normalizeBonusCode } from '../../util/signupBonus.js';
 import { parseMaskedSharePath } from '../../services/fs/sharePathMask.js';
@@ -41,11 +49,6 @@ const REVALIDATION_EXPIRY_SEC = 300;
 const OIDC_NONCE_COOKIE_NAME = 'puter_oidc_nonce';
 const OIDC_NONCE_EXPIRY_SEC = 600;
 
-// Single-use, and binds a popup-return proof to the browser that earned it.
-// Expiry mirrors POPUP_RETURN_EXPIRY_SEC in OIDCService.
-const OIDC_POPUP_RETURN_COOKIE_NAME = 'puter_oidc_popup_return';
-const OIDC_POPUP_RETURN_EXPIRY_SEC = 300;
-
 // The popup branch below hard-codes this return target.
 const POPUP_RETURN_ACTION = 'sign-in';
 
@@ -282,11 +285,6 @@ function buildErrorRedirectUrl(
     return `${base}${pagePath}?${params.toString()}`;
 }
 
-function appendQueryParam(url: string, key: string, value: string): string {
-    const sep = url.includes('?') ? '&' : '?';
-    return `${url}${sep}${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
-}
-
 /** Length-safe constant-time string compare (never throws on mismatch). */
 function constantTimeEqual(a: string, b: string): boolean {
     const ba = Buffer.from(a);
@@ -623,7 +621,7 @@ export class OIDCController extends PuterController {
                 );
             }
 
-            await this.#finishLogin(res, user, stateDecoded);
+            await this.#finishLogin(req, res, user, stateDecoded);
         };
         router.get('/auth/oidc/callback/login', cbOpts, loginCb);
         router.post('/auth/oidc/callback/login', cbOpts, loginCb);
@@ -694,7 +692,7 @@ export class OIDCController extends PuterController {
                 resolved.origin === 'created'
                     ? undefined
                     : { oidc_switched: 'login' };
-            await this.#finishLogin(res, user, stateDecoded, extra);
+            await this.#finishLogin(req, res, user, stateDecoded, extra);
         };
         router.get('/auth/oidc/callback/signup', cbOpts, signupCb);
         router.post('/auth/oidc/callback/signup', cbOpts, signupCb);
@@ -801,18 +799,9 @@ if (window.opener) {
 
     /** Sign a popup-return proof, bound to this browser and this popup. */
     #mintPopupReturn(res: Response, payload: Record<string, unknown>): string {
-        const nonce = crypto.randomBytes(32).toString('base64url');
-        res.cookie(OIDC_POPUP_RETURN_COOKIE_NAME, nonce, {
-            // Redeemed same-origin.
-            ...sessionCookieFlags(this.config, { crossSite: false }),
-            httpOnly: true,
-            maxAge: OIDC_POPUP_RETURN_EXPIRY_SEC * 1000,
-            path: '/',
-        });
-        return this.services.oidc.signPopupReturn({
-            action: POPUP_RETURN_ACTION,
-            ...payload,
-            nonce,
+        return mintOidcPopupReturn(res, payload, {
+            config: this.config,
+            oidc: this.services.oidc,
         });
     }
 
@@ -824,7 +813,9 @@ if (window.opener) {
      *    (provider, sub) to that user.
      * 3. Email matches an account whose email is UNCONFIRMED → refuse. We don't
      *    know who owns an unconfirmed address, so linking would let whoever
-     *    controls the OIDC identity hijack a pending signup.
+     *    controls the OIDC identity hijack a pending signup. The exception is a
+     *    team seat's address with a provider-verified email: the seat gives it
+     *    up and step 4 runs.
      * 4. Otherwise create a new user and link.
      *
      * Step 2 also requires `email_verified !== false` on the OIDC side,
@@ -862,7 +853,16 @@ if (window.opener) {
                 claimedEmail,
                 { force: attempt > 0 },
             );
-            if (byEmail) {
+            // A seat's unconfirmed address was typed by its team; an inbox the
+            // provider verified takes it back and signs up fresh.
+            const releasedFromSeat =
+                byEmail !== null &&
+                !byEmail.email_confirmed &&
+                userinfo.email_verified === true &&
+                (await this.services.team?.releaseUnconfirmedSeatEmail(
+                    byEmail.id,
+                ));
+            if (byEmail && !releasedFromSeat) {
                 if (!byEmail.email_confirmed) {
                     return {
                         error: 'An account with this email exists but the email is not yet confirmed. Please sign in with your password to confirm it first.',
@@ -993,66 +993,77 @@ if (window.opener) {
     }
 
     async #finishLogin(
+        req: Request,
         res: Response,
-        user: {
-            id: number;
-            uuid: string;
-            username: string;
-            email?: string | null;
-            [k: string]: unknown;
-        },
+        user: UserRow,
         stateDecoded: Record<string, unknown>,
         extraQueryParams?: Record<string, string>,
     ): Promise<void> {
-        const { token: sessionToken } =
-            await this.services.auth.createSessionToken(
-                user as import('../../stores/user/UserStore.js').UserRow,
-            );
-
-        const cookieName = this.config.cookie_name ?? 'puter_token';
-        res.cookie(cookieName, sessionToken, {
-            ...sessionCookieFlags(this.config),
-            httpOnly: true,
-        });
-
         const origin = (this.config.origin ?? '').replace(/\/$/, '');
-        let target = (stateDecoded.redirect_uri as string) || origin || '/';
-        if (!isSameOrigin(target, origin)) {
-            target = origin || '/';
-        }
-
-        if (stateDecoded.embedded_in_popup) {
-            target = appendQueryParam(target, 'oidc_login', 'true');
-            // `opener_origin` and `oidc_login` reach the popup as bare query
-            // parameters, which say nothing about where they came from: the
-            // URL a verified state produces is byte-identical to one anybody
-            // can type. The popup treats the opener's origin as the app
-            // identity to mint a token for, so it needs the integrity this
-            // state already carries — re-signed here, at the one point where
-            // the round trip is known to have actually happened.
-            //
-            // `user_uuid` binds the proof to the account that just completed
-            // OIDC. Without it a proof from one login could be replayed in
-            // another signed-in browser to skip its account picker; the popup
-            // only honors `oidc_login` when this matches its current user.
-            target = appendQueryParam(
-                target,
-                'opener_state',
-                this.#mintPopupReturn(res, {
-                    opener_origin: stateDecoded.opener_origin ?? null,
-                    msg_id: stateDecoded.msg_id ?? null,
-                    oidc_login: true,
-                    user_uuid: user.uuid,
-                }),
+        const continuation: OidcLoginContinuation = {
+            userUuid: user.uuid,
+            redirectUri:
+                typeof stateDecoded.redirect_uri === 'string'
+                    ? stateDecoded.redirect_uri
+                    : origin || '/',
+            embeddedInPopup: stateDecoded.embedded_in_popup === true,
+            openerOrigin:
+                typeof stateDecoded.opener_origin === 'string'
+                    ? stateDecoded.opener_origin
+                    : null,
+            messageId:
+                stateDecoded.msg_id == null
+                    ? null
+                    : String(stateDecoded.msg_id),
+            switchedToLogin: extraQueryParams?.oidc_switched === 'login',
+        };
+        if (user.otp_enabled) {
+            const challenge = this.services.token.sign(
+                'otp',
+                {
+                    purpose: 'otp-login',
+                    user_uid: user.uuid,
+                    jti: crypto.randomUUID(),
+                    oidcContinuation: continuation,
+                },
+                { expiresIn: '5m' },
             );
-        }
-
-        if (extraQueryParams) {
-            for (const [k, v] of Object.entries(extraQueryParams)) {
-                if (v != null) target = appendQueryParam(target, k, v);
+            res.set('Cache-Control', 'no-store');
+            res.set('Referrer-Policy', 'no-referrer');
+            let retryUrl = `${origin}/action/login`;
+            if (continuation.embeddedInPopup) {
+                const retry = new URL(
+                    buildErrorRedirectUrl(
+                        origin,
+                        'login',
+                        'other',
+                        'unauthorized',
+                        stateDecoded,
+                        undefined,
+                        (payload) => this.#mintPopupReturn(res, payload),
+                    ),
+                );
+                retry.searchParams.delete('auth_error');
+                retry.searchParams.delete('message');
+                retryUrl = retry.href;
             }
+            const fragment = new URLSearchParams({
+                token: challenge,
+                retryUrl,
+            });
+            res.redirect(302, `${origin}/action/oidc-2fa#${fragment}`);
+            return;
         }
-
-        res.redirect(302, target);
+        await startWebSession(req, res, user, {
+            config: this.config,
+            auth: this.services.auth,
+        });
+        res.redirect(
+            302,
+            completeOidcLoginReturn(res, user, continuation, {
+                config: this.config,
+                oidc: this.services.oidc,
+            }),
+        );
     }
 }