diff --git a/.env.example b/.env.example
index 4d47b6b064c..eb7350a93e2 100644
--- a/.env.example
+++ b/.env.example
@@ -677,6 +677,9 @@ BAN_VIOLATIONS=true
 BAN_DURATION=1000 * 60 * 60 * 2
 BAN_INTERVAL=20
 
+# Violation scores expire after this long (in ms) without new violations; 0 = never expire
+VIOLATION_SCORE_TTL=1000 * 60 * 60
+
 LOGIN_VIOLATION_SCORE=1
 REGISTRATION_VIOLATION_SCORE=1
 CONCURRENT_VIOLATION_SCORE=1
diff --git a/.github/workflows/codegraph-e2e-votes.yml b/.github/workflows/codegraph-e2e-votes.yml
index fdcbe79626c..b3783e26588 100644
--- a/.github/workflows/codegraph-e2e-votes.yml
+++ b/.github/workflows/codegraph-e2e-votes.yml
@@ -1,15 +1,22 @@
 # Codegraph e2e VOTES — observe-only, post-merge, time-boxed.
 #
 # Playwright never runs on pushes to dev, so evidence for the e2e skip election would
-# otherwise wait on rare organic PR spec failures. This workflow runs EXACTLY the skippable
-# tier the merged PR's selection computed — every merge becomes a direct trial of "would
-# skipping these specs have missed a failure". A green run is a confirmation vote; a failing
-# spec here is a tier-miss vote counted AGAINST enabling skipping. The shadow evaluator on
-# the codegraph droplet harvests these runs and attributes them back to the merged PR.
+# otherwise wait on rare organic PR spec failures. This workflow runs the FULL mock suite on
+# every merge: each run is one graduation trial for every spec it executes, and doubles as
+# the post-merge safety net the jest workflows already have via their dev-push triggers.
 #
-# It cannot fail the branch: the tier lookup exits 0 on every path and the test step is
-# continue-on-error. The newest merge cancels older vote runs. The whole campaign switches
-# off by setting repo variable CODEGRAPH_E2E_VOTES=off once the election passes.
+# It previously ran only the merged PR's skippable tier, passing the tier as CLI path
+# filters. playwright.config.mock.ts scopes discovery to testDir specs/mock/, so tier
+# entries outside that directory matched nothing — and the covered-list log line still
+# claimed them, minting graduation trials for specs that never executed (run 32701691037:
+# a11y/keys/messages in the covered list, zero of their tests run). The covered list below
+# is therefore derived from the run's EXECUTED results — discovery is not enough either,
+# since env-gated suites self-skip under this job's default env — and the run takes no
+# path filters at all.
+#
+# It cannot fail the branch: the test step is continue-on-error. The newest merge cancels
+# older vote runs. The whole campaign switches off by setting repo variable
+# CODEGRAPH_E2E_VOTES=off once the election passes.
 name: Codegraph E2E Votes
 
 on:
@@ -20,6 +27,7 @@ on:
       - '**'
       - '!**.md'
       - '!.github/workflows/**'
+      - '.github/workflows/codegraph-e2e-votes.yml'
 
 permissions:
   contents: read
@@ -34,10 +42,10 @@ env:
 
 jobs:
   vote:
-    name: vote (skippable tier)
+    name: vote (full suite)
     if: vars.CODEGRAPH_E2E_VOTES != 'off'
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 45
     env:
       CI: 'true'
       E2E_CHROMIUM_CHANNEL: chrome
@@ -45,56 +53,12 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - name: Ask codegraph for this merge's skippable tier
-        id: tiers
-        env:
-          URL: ${{ secrets.CODEGRAPH_URL }}
-          TOKEN: ${{ secrets.CODEGRAPH_TOKEN }}
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          set +e
-          N=0
-          if [ -n "$URL" ] && [ -n "$TOKEN" ]; then
-            gh api "repos/${{ github.repository }}/commits/${{ github.sha }}" \
-              --jq '[.files[] | {path: .filename, status: .status}]' > files.json 2>/dev/null
-            if [ -s files.json ]; then
-              jq -c '{files: .}' files.json > body.json
-              RESP=$(curl -sS -m 45 -H "Authorization: Bearer $TOKEN" \
-                -H 'content-type: application/json' --data-binary @body.json "$URL/v1/select")
-              # fail_open reflects the JEST floors (root config, lockfile, stale graph); the
-              # e2e tiers come from the testid bridge and are valid whenever they computed at
-              # all. The old fail-open skip silently excused exactly the big backend merges
-              # whose trials matter most (LibreChat#14957's merge produced no vote because
-              # api/package.json tripped the jest floor). Tiers present => vote.
-              if ! echo "$RESP" | jq -e '.e2e.skippable' >/dev/null 2>&1; then
-                echo "codegraph unavailable or no tiers; skipping"
-              else
-                echo "$RESP" | jq -r '.e2e.skippable[]' | sed 's|^e2e/||' > skippable.txt
-                N=$(wc -l < skippable.txt | tr -d ' ')
-              fi
-            else
-              echo "could not read merge commit files; skipping"
-            fi
-          else
-            echo "no codegraph config; skipping"
-          fi
-          echo "codegraph-votes: running $N skippable specs"
-          # The exact list, one log line: the shadow's per-spec graduation ledger counts a clean
-          # trial for every spec a green vote run covered, and until this line existed it had to
-          # approximate coverage from the decision event's tier (drift: the tier is recomputed
-          # here at the merge commit against a possibly newer graph head).
-          if [ "$N" != "0" ]; then echo "codegraph-votes-specs: $(tr '\n' ' ' < skippable.txt)"; fi
-          echo "count=$N" >> "$GITHUB_OUTPUT"
-          exit 0
-
       - name: Use Node.js 24.16.0
-        if: steps.tiers.outputs.count != '0'
         uses: actions/setup-node@v5
         with:
           node-version: '24.16.0'
 
       - name: Restore node_modules cache
-        if: steps.tiers.outputs.count != '0'
         id: cache-node-modules
         uses: actions/cache@v5
         with:
@@ -109,11 +73,10 @@ jobs:
           key: node-modules-e2e-${{ runner.os }}-24.16.0-${{ hashFiles('package-lock.json') }}
 
       - name: Install dependencies
-        if: steps.tiers.outputs.count != '0' && steps.cache-node-modules.outputs.cache-hit != 'true'
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: npm ci
 
       - name: Restore data-provider build cache
-        if: steps.tiers.outputs.count != '0'
         id: cache-data-provider
         uses: actions/cache@v5
         with:
@@ -121,11 +84,10 @@ jobs:
           key: build-data-provider-${{ runner.os }}-${{ hashFiles('package.json', 'package-lock.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/tsdown.config.mjs', 'packages/data-provider/package.json') }}
 
       - name: Build data-provider
-        if: steps.tiers.outputs.count != '0' && steps.cache-data-provider.outputs.cache-hit != 'true'
+        if: steps.cache-data-provider.outputs.cache-hit != 'true'
         run: npm run build:data-provider
 
       - name: Restore data-schemas build cache
-        if: steps.tiers.outputs.count != '0'
         id: cache-data-schemas
         uses: actions/cache@v5
         with:
@@ -133,11 +95,10 @@ jobs:
           key: build-data-schemas-${{ runner.os }}-${{ hashFiles('package.json', 'package-lock.json', 'packages/data-schemas/src/**', 'packages/data-schemas/tsconfig*.json', 'packages/data-schemas/tsdown.config.mjs', 'packages/data-schemas/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/tsdown.config.mjs', 'packages/data-provider/package.json') }}
 
       - name: Build data-schemas
-        if: steps.tiers.outputs.count != '0' && steps.cache-data-schemas.outputs.cache-hit != 'true'
+        if: steps.cache-data-schemas.outputs.cache-hit != 'true'
         run: npm run build:data-schemas
 
       - name: Restore api build cache
-        if: steps.tiers.outputs.count != '0'
         id: cache-api
         uses: actions/cache@v5
         with:
@@ -145,11 +106,10 @@ jobs:
           key: build-api-${{ runner.os }}-${{ hashFiles('package.json', 'package-lock.json', 'packages/api/src/**', 'packages/api/tsconfig*.json', 'packages/api/tsdown.config.mjs', 'packages/api/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/tsdown.config.mjs', 'packages/data-provider/package.json', 'packages/data-schemas/src/**', 'packages/data-schemas/tsconfig*.json', 'packages/data-schemas/tsdown.config.mjs', 'packages/data-schemas/package.json') }}
 
       - name: Build api
-        if: steps.tiers.outputs.count != '0' && steps.cache-api.outputs.cache-hit != 'true'
+        if: steps.cache-api.outputs.cache-hit != 'true'
         run: npm run build:api
 
       - name: Restore client-package build cache
-        if: steps.tiers.outputs.count != '0'
         id: cache-client-package
         uses: actions/cache@v5
         with:
@@ -157,11 +117,10 @@ jobs:
           key: build-client-package-${{ runner.os }}-${{ hashFiles('package.json', 'package-lock.json', 'packages/client/src/**', 'packages/client/tsconfig*.json', 'packages/client/tsdown.config.mjs', 'packages/client/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/tsdown.config.mjs', 'packages/data-provider/package.json') }}
 
       - name: Build client-package
-        if: steps.tiers.outputs.count != '0' && steps.cache-client-package.outputs.cache-hit != 'true'
+        if: steps.cache-client-package.outputs.cache-hit != 'true'
         run: npm run build:client-package
 
       - name: Restore client app build cache
-        if: steps.tiers.outputs.count != '0'
         id: cache-client-app
         uses: actions/cache@v5
         with:
@@ -169,24 +128,21 @@ jobs:
           key: build-client-app-e2e-${{ runner.os }}-${{ hashFiles('package.json', 'package-lock.json', 'client/src/**', 'client/public/**', 'client/scripts/post-build.cjs', 'client/index.html', 'client/package.json', 'client/vite.config.*', 'client/tsconfig*.json', 'client/tailwind.config.*', 'client/postcss.config.*', 'packages/client/src/**', 'packages/client/tailwind.preset.cjs', 'packages/client/tsconfig*.json', 'packages/client/tsdown.config.mjs', 'packages/client/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/tsdown.config.mjs', 'packages/data-provider/package.json') }}
 
       - name: Build client app
-        if: steps.tiers.outputs.count != '0' && steps.cache-client-app.outputs.cache-hit != 'true'
+        if: steps.cache-client-app.outputs.cache-hit != 'true'
         run: npm run build:client
 
       - name: Verify Chrome is present
-        if: steps.tiers.outputs.count != '0'
         run: google-chrome --version
 
       # ffmpeg for retry video — see the note in playwright-mock.yml.
       - name: Resolve Playwright version
         id: playwright-version
-        if: steps.tiers.outputs.count != '0'
         run: |
           version=$(node -p "require('./package-lock.json').packages['node_modules/playwright-core'].version")
           echo "version=${version}" >> "$GITHUB_OUTPUT"
 
       - name: Restore Playwright ffmpeg cache
         id: cache-ffmpeg
-        if: steps.tiers.outputs.count != '0'
         uses: actions/cache/restore@v5
         with:
           path: ~/.cache/ms-playwright
@@ -194,7 +150,7 @@ jobs:
 
       - name: Install Playwright ffmpeg (best effort)
         id: install-ffmpeg
-        if: steps.tiers.outputs.count != '0' && steps.cache-ffmpeg.outputs.cache-hit != 'true'
+        if: steps.cache-ffmpeg.outputs.cache-hit != 'true'
         timeout-minutes: 3
         continue-on-error: true
         run: |
@@ -202,7 +158,7 @@ jobs:
           .github/scripts/verify-playwright-ffmpeg.sh
 
       - name: Save Playwright ffmpeg cache
-        if: steps.tiers.outputs.count != '0' && steps.install-ffmpeg.outcome == 'success'
+        if: steps.install-ffmpeg.outcome == 'success'
         continue-on-error: true
         uses: actions/cache/save@v5
         with:
@@ -211,15 +167,40 @@ jobs:
 
       # Optional fonts only — see the note in playwright-mock.yml.
       - name: Install optional Playwright font dependencies (best effort)
-        if: steps.tiers.outputs.count != '0'
         timeout-minutes: 4
         continue-on-error: true
         run: .github/scripts/install-playwright-fonts.sh
 
-      - name: Vote — run the skippable tier (cannot fail the branch)
-        if: steps.tiers.outputs.count != '0'
+      - name: Vote — run the full mock suite (cannot fail the branch)
         continue-on-error: true
-        run: npx playwright test --config=e2e/playwright.config.mock.ts $(tr '\n' ' ' < skippable.txt)
+        env:
+          # Absolute on purpose: Playwright resolves a relative PLAYWRIGHT_JSON_OUTPUT_NAME
+          # against the CONFIG directory (e2e/), not the working directory — the first live run
+          # wrote e2e/pw-results.json while the ledger looked in the repo root and logged zero
+          # trials (fail-safe, but a silent no-op).
+          PLAYWRIGHT_JSON_OUTPUT_NAME: ${{ github.workspace }}/pw-results.json
+        run: npx playwright test --config=e2e/playwright.config.mock.ts --reporter=line,json
+
+      - name: Ledger — log the specs that actually executed
+        run: |
+          set +e
+          # The shadow's per-spec graduation ledger counts a clean trial for every spec a green
+          # run covered, so the covered list must come from EXECUTED tests, not from discovery:
+          # env-gated suites (mcp-tool-list-changed needs E2E_MCP_LIST_CHANGED, enforced-model-
+          # specs needs E2E_MODEL_SPECS_ENFORCE) are discovered by --list yet skip every test
+          # under this job's default env — counting them as covered would mint phantom trials,
+          # the exact bug this workflow revision exists to kill (Codex P1 on #15162). A spec is
+          # covered iff at least one of its tests reached a non-skipped outcome.
+          if jq -e '.suites' "$GITHUB_WORKSPACE/pw-results.json" >/dev/null 2>&1; then
+            jq -r '[.suites[] | recurse(.suites[]?) | .specs[]? | select([.tests[]?.status] | any(. != "skipped")) | .file] | unique | .[]' "$GITHUB_WORKSPACE/pw-results.json" \
+              | sed 's|^|specs/mock/|' > covered.txt
+            N=$(wc -l < covered.txt | tr -d ' ')
+            echo "codegraph-votes: running $N specs (executed, full suite)"
+            if [ "$N" != "0" ]; then echo "codegraph-votes-specs: $(tr '\n' ' ' < covered.txt)"; fi
+          else
+            echo "codegraph-votes: no results json — run crashed before reporting; no trials logged"
+          fi
+          exit 0
 
       - name: Done
         if: always()
diff --git a/.github/workflows/playwright-mock.yml b/.github/workflows/playwright-mock.yml
index 9e489d320a3..25b6f1c8f7f 100644
--- a/.github/workflows/playwright-mock.yml
+++ b/.github/workflows/playwright-mock.yml
@@ -49,6 +49,7 @@ jobs:
       decided: ${{ steps.sel.outputs.decided }}
       e2e_include: ${{ steps.sel.outputs.e2e_include }}
       mcp_run: ${{ steps.sel.outputs.mcp_run }}
+      e2e_skip: ${{ steps.sel.outputs.e2e_skip }}
     steps:
       - name: Select matrix lanes, fail open on any doubt
         id: sel
@@ -61,6 +62,7 @@ jobs:
           BASE_SHA: ${{ github.event.pull_request.base.sha }}
           HEAD_SHA: ${{ github.event.pull_request.head.sha }}
           CHANGED: ${{ github.event.pull_request.changed_files }}
+          E2E_SKIP_ARMED: ${{ vars.CODEGRAPH_E2E_SKIP }}
           FULL_INCLUDE: '{"include":[{"name":"memory, shard 1/3","stream_store":"memory","redis_image":"","suite":"full","shard":"1/3","artifact":"memory-1-of-3"},{"name":"memory, shard 2/3","stream_store":"memory","redis_image":"","suite":"full","shard":"2/3","artifact":"memory-2-of-3"},{"name":"memory, shard 3/3","stream_store":"memory","redis_image":"","suite":"full","shard":"3/3","artifact":"memory-3-of-3"},{"name":"redis transport","stream_store":"redis","redis_image":"redis:7-alpine","suite":"transport","shard":"","artifact":"redis-transport"}]}'
         run: |
           set +e
@@ -115,6 +117,25 @@ jobs:
             exit 0
           fi
           echo "e2e_include=$INCLUDE" >> "$GITHUB_OUTPUT"
+          # Graduated per-spec skips are DARK until the operator arms repo variable
+          # CODEGRAPH_E2E_SKIP=on (the election switch — flipped only when the pre-registered
+          # resume condition holds). Even then, act only on a well-typed list from a non-fail-open
+          # decision: every entry must be a pool spec path, or nothing is skipped. The server
+          # already intersects with this PR's skippable tier and applies the streak bars
+          # (2x where history-coupled); see codegraph-poc service/graduate.ts.
+          SKIP=""
+          if [ "$E2E_SKIP_ARMED" = "on" ]; then
+            if echo "$RESP" | jq -e '(.e2e.fail_open != true) and (.e2e.graduated | type == "array" and all(.[]?; type == "string" and test("^e2e/specs/mock/[A-Za-z0-9._/-]+\\.spec\\.ts$") and (contains("..") | not)))' >/dev/null 2>&1; then
+              SKIP=$(echo "$RESP" | jq -r '[.e2e.graduated[] | sub("^e2e/"; "")] | join(" ")')
+            else
+              note "_graduated list absent or malformed; no specs skipped_"
+            fi
+          fi
+          echo "e2e_skip=$SKIP" >> "$GITHUB_OUTPUT"
+          if [ -n "$SKIP" ]; then
+            note "| graduated spec skips | $(echo "$SKIP" | wc -w | tr -d ' ') (armed) |"
+            echo "codegraph-e2e-graduated-skips: $SKIP"
+          fi
           echo "codegraph-select: redis_transport=$REDIS mcp_tool_list_changed=$MCP matrix_entries=$(echo "$INCLUDE" | jq '.include | length')"
           if [ "$MCP_SKIP" = 1 ]; then
             echo "mcp_run=false" >> "$GITHUB_OUTPUT"
@@ -305,9 +326,33 @@ jobs:
 
       - name: Run full mock-LLM Tier-1 e2e
         if: matrix.suite == 'full'
-        run: npx playwright test --config=e2e/playwright.config.mock.ts --shard=${{ matrix.shard }}
         env:
           CI: 'true'
+          E2E_SKIP: ${{ needs.codegraph_select.outputs.e2e_skip }}
+        run: |
+          set +e
+          # Graduated-spec skipping (dark until repo var CODEGRAPH_E2E_SKIP=on upstream): subtract
+          # the earned skips from a run list derived from the tree itself, so an unknown or stale
+          # name in the skip list simply matches nothing. If subtraction would drop everything —
+          # or drops nothing — run the full shard exactly as before. Skipped specs still execute
+          # post-merge in every full-suite vote run, which is the net that catches a wrong skip.
+          RUN_ARGS=""
+          if [ -n "$E2E_SKIP" ]; then
+            KEEP=""; DROP=0
+            for spec in $(git ls-files 'e2e/specs/mock/*.spec.ts' 'e2e/specs/mock/**/*.spec.ts' | sed 's|^e2e/||' | sort -u); do
+              case "$spec" in *" "*) KEEP="$KEEP $spec"; continue;; esac
+              case " $E2E_SKIP " in
+                *" $spec "*) DROP=$((DROP+1));;
+                *) KEEP="$KEEP $spec";;
+              esac
+            done
+            if [ "$DROP" -gt 0 ] && [ -n "$KEEP" ]; then
+              RUN_ARGS="$KEEP"
+              echo "codegraph-e2e-skip: dropped $DROP graduated specs from this shard's pool"
+            fi
+          fi
+          set -e
+          npx playwright test --config=e2e/playwright.config.mock.ts --shard=${{ matrix.shard }} $RUN_ARGS
 
       - name: Run Redis stream transport e2e
         if: matrix.suite == 'transport'
diff --git a/api/package.json b/api/package.json
index 396f6fe83ed..6f40e39b729 100644
--- a/api/package.json
+++ b/api/package.json
@@ -46,7 +46,7 @@
     "@azure/storage-blob": "^12.30.0",
     "@google/genai": "^2.8.0",
     "@keyv/redis": "5.1.6",
-    "@librechat/agents": "^3.6.16",
+    "@librechat/agents": "^3.7.1",
     "@librechat/api": "*",
     "@librechat/data-schemas": "*",
     "@microsoft/microsoft-graph-client": "^3.0.7",
diff --git a/api/server/controllers/agents/client.js b/api/server/controllers/agents/client.js
index 0332bdddc12..320abe0691d 100644
--- a/api/server/controllers/agents/client.js
+++ b/api/server/controllers/agents/client.js
@@ -1693,13 +1693,36 @@ class AgentClient extends BaseClient {
     let hasFileContext = false;
     let promptTokenTotal = 0;
     const encoding = this.getEncoding();
-    const formattedMessages = orderedMessages.map((message, i) => {
-      const formattedMessage = formatMessage({
+    /**
+     * Rebuilds the memory-side copy of one source row: the same formatting and
+     * per-message merges as the prompt copy, minus the fileContext prepend.
+     * Only materialized when something actually consumes it — the canonical
+     * recount of a fileContext row, or the memory payload once any row proves
+     * to carry fileContext — instead of unconditionally formatting every row
+     * twice per turn.
+     */
+    const buildMemoryFormattedMessage = (message) => {
+      const memoryFormattedMessage = formatMessage({
         message,
         userName: this.options?.name,
         assistantName: this.options?.modelLabel,
       });
-      const memoryFormattedMessage = formatMessage({
+      const sourceMessageId = message.messageId ?? message.id;
+      if (typeof sourceMessageId === 'string' && sourceMessageId.length > 0) {
+        memoryFormattedMessage.messageId = sourceMessageId;
+      }
+      if (Array.isArray(message.quotes) && message.quotes.length > 0) {
+        prependQuotes(memoryFormattedMessage, message.quotes);
+      }
+      const turnFiles = this.message_file_map?.[message.messageId] ?? message.files;
+      applyAttachmentOnlyText(memoryFormattedMessage, turnFiles);
+      return memoryFormattedMessage;
+    };
+    /** Memory copies built for canonical recounts, reused by the memory payload pass. */
+    const memoryFormattedMessages = [];
+
+    const formattedMessages = orderedMessages.map((message, i) => {
+      const formattedMessage = formatMessage({
         message,
         userName: this.options?.name,
         assistantName: this.options?.modelLabel,
@@ -1707,7 +1730,6 @@ class AgentClient extends BaseClient {
       const sourceMessageId = message.messageId ?? message.id;
       if (typeof sourceMessageId === 'string' && sourceMessageId.length > 0) {
         formattedMessage.messageId = sourceMessageId;
-        memoryFormattedMessage.messageId = sourceMessageId;
       }
 
       /**
@@ -1732,7 +1754,6 @@ class AgentClient extends BaseClient {
        */
       if (Array.isArray(message.quotes) && message.quotes.length > 0) {
         prependQuotes(formattedMessage, message.quotes);
-        prependQuotes(memoryFormattedMessage, message.quotes);
       }
 
       /**
@@ -1746,9 +1767,6 @@ class AgentClient extends BaseClient {
        */
       const turnFiles = this.message_file_map?.[message.messageId] ?? message.files;
       applyAttachmentOnlyText(formattedMessage, turnFiles);
-      applyAttachmentOnlyText(memoryFormattedMessage, turnFiles);
-
-      memoryPayload.push(memoryFormattedMessage);
 
       const dbTokenCount = Number(orderedMessages[i].tokenCount);
       const hasDbTokenCount = Number.isFinite(dbTokenCount) && dbTokenCount > 0;
@@ -1766,7 +1784,15 @@ class AgentClient extends BaseClient {
 
       let canonicalTokenCount = hasDbTokenCount ? dbTokenCount : 0;
       if (needsCanonicalTokenCount) {
-        canonicalTokenCount = countFormattedMessageTokens(memoryFormattedMessage, encoding);
+        /** Without fileContext the memory copy is content-identical to the
+         *  prompt copy, so the prompt copy is the counting surface; with it,
+         *  the canonical count must exclude the prepended context. */
+        let countSurface = formattedMessage;
+        if (message.fileContext) {
+          memoryFormattedMessages[i] = buildMemoryFormattedMessage(message);
+          countSurface = memoryFormattedMessages[i];
+        }
+        canonicalTokenCount = countFormattedMessageTokens(countSurface, encoding);
       }
 
       const promptMessageTokenCount = message.fileContext
@@ -1917,6 +1943,13 @@ class AgentClient extends BaseClient {
         }
       }
     }
+    if (hasFileContext) {
+      for (let i = 0; i < orderedMessages.length; i++) {
+        memoryPayload.push(
+          memoryFormattedMessages[i] ?? buildMemoryFormattedMessage(orderedMessages[i]),
+        );
+      }
+    }
     this.memoryPayload = hasFileContext ? memoryPayload : null;
     messages = orderedMessages;
     promptTokens = promptTokenTotal;
@@ -3288,13 +3321,15 @@ class AgentClient extends BaseClient {
         manualSkillPrimes,
         alwaysApplySkillPrimes,
       });
+      const useLegacyContent = this.options.agent?.useLegacyContent === true;
       const formatOptions =
-        needsReasoningContentFormat || freshSkillPrimeNames.size > 0
+        needsReasoningContentFormat || freshSkillPrimeNames.size > 0 || useLegacyContent
           ? {
               ...(needsReasoningContentFormat ? { preserveReasoningContent: true } : {}),
               ...(freshSkillPrimeNames.size > 0
                 ? { skipSkillBodyNames: freshSkillPrimeNames }
                 : {}),
+              ...(useLegacyContent ? { legacyContent: true } : {}),
             }
           : undefined;
       let {
diff --git a/api/server/controllers/agents/client.test.js b/api/server/controllers/agents/client.test.js
index 027feffe129..073daddbf0c 100644
--- a/api/server/controllers/agents/client.test.js
+++ b/api/server/controllers/agents/client.test.js
@@ -3783,6 +3783,44 @@ describe('AgentClient - titleConvo', () => {
       expect(client.memoryPayload[0].content).toBe('What is written here?');
     });
 
+    it('recounts a quote-bearing history row from quote-merged content and keeps the memory payload unbuilt without file context', async () => {
+      const { countFormattedMessageTokens } = require('@librechat/api');
+      countFormattedMessageTokens.mockImplementation(({ content }) => {
+        const text = Array.isArray(content)
+          ? content.map((part) => part.text ?? part[ContentTypes.TEXT] ?? '').join('\n')
+          : String(content ?? '');
+        return text.includes('quoted excerpt') ? 77 : 11;
+      });
+
+      const result = await client.buildMessages(
+        [
+          {
+            messageId: 'msg-1',
+            parentMessageId: null,
+            sender: 'User',
+            text: 'Discuss this.',
+            isCreatedByUser: true,
+            tokenCount: 5,
+            quotes: ['quoted excerpt'],
+          },
+          {
+            messageId: 'msg-2',
+            parentMessageId: 'msg-1',
+            sender: 'Assistant',
+            text: 'Sure.',
+            isCreatedByUser: false,
+            tokenCount: 3,
+          },
+        ],
+        'msg-2',
+        {},
+      );
+
+      expect(result.tokenCountMap['msg-1']).toBe(77);
+      expect(result.tokenCountMap['msg-2']).toBe(3);
+      expect(client.memoryPayload).toBeNull();
+    });
+
     it('does not duplicate a file that is both request context and scoped context', async () => {
       const sharedFile = makeTextFile('shared-file', 'shared.txt', 'Shared duplicate context');
 
diff --git a/api/server/routes/__test-utils__/convos-route-mocks.js b/api/server/routes/__test-utils__/convos-route-mocks.js
index 0cef2cbfee6..5ae8b2b636a 100644
--- a/api/server/routes/__test-utils__/convos-route-mocks.js
+++ b/api/server/routes/__test-utils__/convos-route-mocks.js
@@ -4,11 +4,22 @@ const generationJobManager = {
   abortJob: jest.fn().mockResolvedValue({ success: true }),
 };
 const subagentActivityHandlerInputs = [];
+const moderatedTexts = [];
+const moderateText = jest.fn((req, _res, next) => {
+  moderatedTexts.push(req.body?.text);
+  next();
+});
+const messageIpLimiter = jest.fn((_req, _res, next) => next());
+const messageUserLimiter = jest.fn((_req, _res, next) => next());
 
 module.exports = {
   archiveAllHandler,
   generationJobManager,
   subagentActivityHandlerInputs,
+  moderateText,
+  moderatedTexts,
+  messageIpLimiter,
+  messageUserLimiter,
 
   agents: () => ({ sleep: jest.fn() }),
 
@@ -40,6 +51,36 @@ module.exports = {
       return archiveAllHandler;
     }),
     createSubagentThreadViewHandler: jest.fn(() => (_req, res) => res.status(200).json({})),
+    createSubagentControlHandler: jest.fn(() => (_req, res) => res.status(200).json({})),
+    isValidSubagentControlRequest: jest.fn((body) => {
+      if (body == null || typeof body !== 'object') return false;
+      const commonKeys = ['taskId', 'invocationId', 'action'];
+      let allowedKeys = [...commonKeys, 'message'];
+      if (body.action === 'cancel_message') allowedKeys = [...commonKeys, 'controlId'];
+      if (body.action === 'cancel') allowedKeys = commonKeys;
+      if (Object.keys(body).some((key) => !allowedKeys.includes(key))) return false;
+      if (typeof body.taskId !== 'string' || body.taskId.length === 0 || body.taskId.length > 256) {
+        return false;
+      }
+      if (
+        typeof body.invocationId !== 'string' ||
+        body.invocationId.length === 0 ||
+        body.invocationId.length > 128
+      ) {
+        return false;
+      }
+      if (body.action === 'cancel') return true;
+      if (body.action === 'cancel_message') {
+        return typeof body.controlId === 'string' && body.controlId.length > 0;
+      }
+      return (
+        ['steer', 'queue', 'interrupt'].includes(body.action) &&
+        typeof body.message === 'string' &&
+        body.message.trim() !== '' &&
+        body.message.length <= 4 * 1024
+      );
+    }),
+    exemptAgentTriggerFromIpLimiter: jest.fn(() => false),
     createParentSubagentIndexHandler: jest.fn(
       () => (_req, res) => res.status(200).json({ threads: [] }),
     ),
@@ -116,6 +157,9 @@ module.exports = {
       forkUserLimiter: (req, res, next) => next(),
     })),
     configMiddleware: (req, res, next) => next(),
+    moderateText,
+    messageIpLimiter,
+    messageUserLimiter,
     validateConvoAccess: (req, res, next) => next(),
   }),
 
diff --git a/api/server/routes/__tests__/convos.spec.js b/api/server/routes/__tests__/convos.spec.js
index 635503a8ea2..45c7f4a4dc0 100644
--- a/api/server/routes/__tests__/convos.spec.js
+++ b/api/server/routes/__tests__/convos.spec.js
@@ -2,12 +2,32 @@ const express = require('express');
 const request = require('supertest');
 
 const MOCKS = '../__test-utils__/convos-route-mocks';
-const { archiveAllHandler, generationJobManager, subagentActivityHandlerInputs } = require(MOCKS);
+const {
+  archiveAllHandler,
+  generationJobManager,
+  moderateText,
+  moderatedTexts,
+  messageIpLimiter,
+  messageUserLimiter,
+  subagentActivityHandlerInputs,
+} = require(MOCKS);
+
+const priorLimitMessageIp = process.env.LIMIT_MESSAGE_IP;
+const priorLimitMessageUser = process.env.LIMIT_MESSAGE_USER;
+process.env.LIMIT_MESSAGE_IP = 'true';
+process.env.LIMIT_MESSAGE_USER = 'true';
 
 jest.mock('@librechat/agents', () => require(MOCKS).agents());
 jest.mock('@librechat/api', () =>
   require(MOCKS).api({
-    createContentFilter: jest.fn(() => (req, res, next) => next()),
+    createContentFilter: jest.fn((options) => (req, res, next) => {
+      const extracted = [...options.extract(req)];
+      if (JSON.stringify(extracted).includes('BLOCK-CONTROL')) {
+        return res.status(400).json({ error: 'content_filter_block' });
+      }
+      next();
+    }),
+    extractStoredMessageContent: jest.fn((input) => [input]),
     inspectContent: jest.fn(() => null),
     extractConversationTitleContent: jest.fn(() => []),
     contentFilterBlockResponse: jest.fn(),
@@ -77,8 +97,16 @@ describe('Convos Routes', () => {
     app.use('/api/convos', convosRouter);
   });
 
+  afterAll(() => {
+    if (priorLimitMessageIp == null) delete process.env.LIMIT_MESSAGE_IP;
+    else process.env.LIMIT_MESSAGE_IP = priorLimitMessageIp;
+    if (priorLimitMessageUser == null) delete process.env.LIMIT_MESSAGE_USER;
+    else process.env.LIMIT_MESSAGE_USER = priorLimitMessageUser;
+  });
+
   beforeEach(() => {
     jest.clearAllMocks();
+    moderatedTexts.length = 0;
     generationJobManager.getJob.mockResolvedValue(null);
     generationJobManager.abortJob.mockResolvedValue({ success: true });
   });
@@ -96,6 +124,71 @@ describe('Convos Routes', () => {
     );
   });
 
+  it('filters and moderates subagent guidance as ordinary user text before control handling', async () => {
+    const response = await request(app).post('/api/convos/parent/subagents/child/control').send({
+      taskId: 'task-1',
+      invocationId: 'invocation-1',
+      action: 'queue',
+      message: 'Guide the child.',
+    });
+
+    expect(response.status).toBe(200);
+    expect(messageIpLimiter).toHaveBeenCalledTimes(1);
+    expect(messageUserLimiter).toHaveBeenCalledTimes(1);
+    expect(moderateText).toHaveBeenCalledTimes(1);
+    expect(moderatedTexts).toEqual(['Guide the child.']);
+
+    moderateText.mockClear();
+    moderatedTexts.length = 0;
+    const blocked = await request(app).post('/api/convos/parent/subagents/child/control').send({
+      taskId: 'task-1',
+      invocationId: 'invocation-2',
+      action: 'interrupt',
+      message: 'BLOCK-CONTROL',
+    });
+
+    expect(blocked.status).toBe(400);
+    expect(blocked.body).toEqual({ error: 'content_filter_block' });
+    expect(moderateText).not.toHaveBeenCalled();
+
+    moderateText.mockClear();
+    const oversized = await request(app)
+      .post('/api/convos/parent/subagents/child/control')
+      .send({
+        taskId: 'task-1',
+        invocationId: 'invocation-3',
+        action: 'queue',
+        message: 'x'.repeat(4 * 1024 + 1),
+      });
+
+    expect(oversized.status).toBe(400);
+    expect(oversized.body).toEqual({ error: 'Invalid subagent control request' });
+    expect(moderateText).not.toHaveBeenCalled();
+
+    const cancelled = await request(app).post('/api/convos/parent/subagents/child/control').send({
+      taskId: 'task-1',
+      invocationId: 'invocation-4',
+      action: 'cancel',
+    });
+
+    expect(cancelled.status).toBe(200);
+    expect(moderateText).not.toHaveBeenCalled();
+
+    const crafted = await request(app)
+      .post('/api/convos/parent/subagents/child/control')
+      .send({
+        taskId: 'task-1',
+        invocationId: 'invocation-5',
+        action: 'queue',
+        message: 'Use only this bounded guidance.',
+        answers: ['This unrelated field must not reach moderation.'],
+      });
+
+    expect(crafted.status).toBe(400);
+    expect(crafted.body).toEqual({ error: 'Invalid subagent control request' });
+    expect(moderateText).not.toHaveBeenCalled();
+  });
+
   describe('GET /:conversationId', () => {
     it('returns an ordinary owned conversation', async () => {
       getConvo.mockResolvedValue({ conversationId: 'ordinary', title: 'Ordinary' });
diff --git a/api/server/routes/convos.js b/api/server/routes/convos.js
index 0750e4044a4..8e30299e2c3 100644
--- a/api/server/routes/convos.js
+++ b/api/server/routes/convos.js
@@ -6,6 +6,9 @@ const {
   deleteAgentCheckpoints,
   createArchiveAllHandler,
   createSubagentActivityStreamHandler,
+  createSubagentControlHandler,
+  isValidSubagentControlRequest,
+  exemptAgentTriggerFromIpLimiter,
   createParentSubagentIndexHandler,
   createSubagentThreadViewHandler,
   resolveImportMaxFileSize,
@@ -17,6 +20,7 @@ const {
   isContentFilterError,
   contentFilterBlockResponse,
   extractConversationTitleContent,
+  extractStoredMessageContent,
   GenerationJobManager,
   isStopConfirmed,
 } = require('@librechat/api');
@@ -27,6 +31,9 @@ const {
   validateConvoAccess,
   createForkLimiters,
   configMiddleware,
+  messageIpLimiter,
+  messageUserLimiter,
+  moderateText,
 } = require('~/server/middleware');
 const { forkConversation, duplicateConversation } = require('~/server/utils/import/fork');
 const { storage, importFileFilter } = require('~/server/routes/files/multer');
@@ -57,6 +64,60 @@ const filterConversationTitle = createContentFilter({
   getFilters: (req) => req.config?.filters,
   extract: (req) => extractConversationTitleContent(req.body),
 });
+const filterSubagentControlMessage = createContentFilter({
+  getFilters: (req) => req.config?.filters,
+  getLegacyPii: (req) => req.config?.messageFilter?.pii,
+  extract: (req) =>
+    ['steer', 'queue', 'interrupt'].includes(req.body?.action)
+      ? extractStoredMessageContent({ text: req.body?.message })
+      : [],
+});
+const unless = (isExempt, middleware) => (req, res, next) =>
+  isExempt(req) ? next() : middleware(req, res, next);
+const subagentControlLimiters = [];
+if (isEnabled(process.env.LIMIT_MESSAGE_IP)) {
+  subagentControlLimiters.push(unless(exemptAgentTriggerFromIpLimiter, messageIpLimiter));
+}
+if (isEnabled(process.env.LIMIT_MESSAGE_USER)) {
+  subagentControlLimiters.push(messageUserLimiter);
+}
+
+function validateSubagentControlRequest(req, res, next) {
+  if (!isValidSubagentControlRequest(req.body)) {
+    return res.status(400).json({ error: 'Invalid subagent control request' });
+  }
+  next();
+}
+
+/** Present guidance to the existing moderation middleware as ordinary user text.
+ * The controller continues to consume `message`; `text` is restored before it runs. */
+async function moderateSubagentControlMessage(req, res, next) {
+  const body = (req.body ??= {});
+  if (!['steer', 'queue', 'interrupt'].includes(body.action)) {
+    next();
+    return;
+  }
+  const hadText = Object.prototype.hasOwnProperty.call(body, 'text');
+  const originalText = body.text;
+  if (typeof body.message === 'string') {
+    body.text = body.message;
+  }
+  const restore = () => {
+    if (hadText) {
+      body.text = originalText;
+    } else {
+      delete body.text;
+    }
+  };
+  try {
+    await moderateText(req, res, (error) => {
+      restore();
+      next(error);
+    });
+  } finally {
+    restore();
+  }
+}
 const subagentActivityStreamHandler = createSubagentActivityStreamHandler(
   {
     getConvoOwnership: db.getConvoOwnership,
@@ -67,6 +128,13 @@ const subagentActivityStreamHandler = createSubagentActivityStreamHandler(
     subscribe: subagentThreadTaskStore.subscribeActivity.bind(subagentThreadTaskStore),
   },
 );
+const subagentControlHandler = createSubagentControlHandler({
+  getConvoOwnership: db.getConvoOwnership,
+  getSubagentThreadForParent: db.getSubagentThreadForParent,
+  getMessages: db.getMessages,
+  getSubagentTaskControlReceipt: db.getSubagentTaskControlReceipt,
+  store: subagentThreadTaskStore,
+});
 router.use(requireJwtAuth);
 
 const isValidProjectFilter = (projectId) =>
@@ -117,6 +185,15 @@ router.get(
   '/:parentConversationId/subagents/:threadId/tasks/:taskId/activity',
   subagentActivityStreamHandler,
 );
+router.post(
+  '/:parentConversationId/subagents/:threadId/control',
+  configMiddleware,
+  ...subagentControlLimiters,
+  validateSubagentControlRequest,
+  filterSubagentControlMessage,
+  moderateSubagentControlMessage,
+  subagentControlHandler,
+);
 router.get('/:parentConversationId/subagents', parentSubagentIndexHandler);
 router.get('/:parentConversationId/subagents/:threadId', subagentThreadViewHandler);
 
diff --git a/api/server/services/Endpoints/agents/subagentThreadStore.js b/api/server/services/Endpoints/agents/subagentThreadStore.js
index fd1f4061785..6ab0398f615 100644
--- a/api/server/services/Endpoints/agents/subagentThreadStore.js
+++ b/api/server/services/Endpoints/agents/subagentThreadStore.js
@@ -62,8 +62,10 @@ const subagentThreadTaskStore = createSubagentThreadTaskStore(
     deleteConvos: db.deleteConvos,
     deleteMessages: db.deleteMessages,
     getConvo: db.getConvo,
+    getSubagentTaskControlReplay: db.getSubagentTaskControlReplay,
     getMessages: db.getMessages,
     listActiveSubagentThreadLeases: db.listActiveSubagentThreadLeases,
+    recordSubagentTaskControlReceipt: db.recordSubagentTaskControlReceipt,
     releaseSubagentThreadLease: db.releaseSubagentThreadLease,
     reserveSubagentThread: db.reserveSubagentThread,
     renewSubagentThreadLease: db.renewSubagentThreadLease,
@@ -92,6 +94,20 @@ registerShutdownTask(
 );
 
 let taskRoutingConfigured = false;
+let disconnectTaskRouting = () => {};
+
+/** Store quiescence is required even without Redis. Optional transport cleanup
+ * is attached after configuration, but local child cancellation and the final
+ * durable receipt flush always participate in graceful shutdown. */
+registerShutdownTask(
+  'subagent task store',
+  async () => {
+    await subagentThreadTaskStore.destroyTaskControlTransport();
+    subagentThreadTaskStore.destroyActivityStream();
+    disconnectTaskRouting();
+  },
+  { priority: 90 },
+);
 
 /** Starts the optional Redis owner directory before HTTP admission opens. */
 async function configureSubagentTaskRouting() {
@@ -125,17 +141,11 @@ async function configureSubagentTaskRouting() {
     throw error;
   }
   taskRoutingConfigured = true;
-  registerShutdownTask(
-    'subagent task control transport',
-    async () => {
-      await subagentThreadTaskStore.destroyTaskControlTransport();
-      subagentThreadTaskStore.destroyActivityStream();
-      publisher.disconnect();
-      activitySubscriber.disconnect();
-      activityPublisher.disconnect();
-    },
-    { priority: 90 },
-  );
+  disconnectTaskRouting = () => {
+    publisher.disconnect();
+    activitySubscriber.disconnect();
+    activityPublisher.disconnect();
+  };
 }
 
 module.exports = subagentThreadTaskStore;
diff --git a/api/server/services/Endpoints/agents/subagentThreadStore.spec.js b/api/server/services/Endpoints/agents/subagentThreadStore.spec.js
index 615661dd52c..f829c2092c3 100644
--- a/api/server/services/Endpoints/agents/subagentThreadStore.spec.js
+++ b/api/server/services/Endpoints/agents/subagentThreadStore.spec.js
@@ -28,8 +28,10 @@ jest.mock('~/models', () => ({
   deleteConvos: jest.fn(),
   deleteMessages: jest.fn(),
   getConvo: jest.fn(),
+  getSubagentTaskControlReplay: jest.fn(),
   getMessages: jest.fn(),
   listActiveSubagentThreadLeases: jest.fn(),
+  recordSubagentTaskControlReceipt: jest.fn(),
   releaseSubagentThreadLease: jest.fn(),
   reserveSubagentThread: jest.fn(),
   renewSubagentThreadLease: jest.fn(),
@@ -55,11 +57,23 @@ const {
 const subagentThreadTaskStore = require('./subagentThreadStore');
 const { configureSubagentTaskRouting } = subagentThreadTaskStore;
 const taskStoreOptions = createSubagentThreadTaskStore.mock.calls[0][1];
+const taskStoreMethods = createSubagentThreadTaskStore.mock.calls[0][0];
+const db = require('~/models');
 const activityPrepareRegistration = registerShutdownTask.mock.calls.find(
   ([name]) => name === 'subagent activity streams prepare',
 );
+const taskStoreShutdownRegistration = registerShutdownTask.mock.calls.find(
+  ([name]) => name === 'subagent task store',
+);
 
 describe('subagent thread Redis lifecycle', () => {
+  it('wires durable control receipt persistence into the host store', () => {
+    expect(taskStoreMethods.recordSubagentTaskControlReceipt).toBe(
+      db.recordSubagentTaskControlReceipt,
+    );
+    expect(taskStoreMethods.getSubagentTaskControlReplay).toBe(db.getSubagentTaskControlReplay);
+  });
+
   it('reads completion wakeup rollout state at task preparation time', async () => {
     isEnabled.mockReturnValueOnce(false);
 
@@ -74,6 +88,14 @@ describe('subagent thread Redis lifecycle', () => {
     expect(subagentThreadTaskStore.completionWakeupsEnabled).toBe(false);
   });
 
+  it('registers local task-store quiescence independently of optional Redis setup', () => {
+    expect(taskStoreShutdownRegistration).toEqual([
+      'subagent task store',
+      expect.any(Function),
+      { priority: 90 },
+    ]);
+  });
+
   it('closes activity SSE before drain and disconnects its subscriber after drain', async () => {
     const taskSubscriber = { disconnect: jest.fn() };
     const activitySubscriber = { disconnect: jest.fn() };
@@ -93,18 +115,16 @@ describe('subagent thread Redis lifecycle', () => {
       expect.any(Function),
       { phase: 'pre-drain', priority: 100 },
     ]);
-    expect(registerShutdownTask).toHaveBeenCalledWith(
-      'subagent task control transport',
+    expect(taskStoreShutdownRegistration).toEqual([
+      'subagent task store',
       expect.any(Function),
       { priority: 90 },
-    );
+    ]);
     const prepare = activityPrepareRegistration[1];
     prepare();
     expect(mockTaskStore.prepareActivityForShutdown).toHaveBeenCalledTimes(1);
 
-    const shutdown = registerShutdownTask.mock.calls.find(
-      ([name]) => name === 'subagent task control transport',
-    )[1];
+    const shutdown = taskStoreShutdownRegistration[1];
     await shutdown();
 
     expect(mockTaskStore.destroyTaskControlTransport).toHaveBeenCalledTimes(1);
diff --git a/api/server/services/twoFactorService.js b/api/server/services/twoFactorService.js
index 313c5571339..081fa611bdf 100644
--- a/api/server/services/twoFactorService.js
+++ b/api/server/services/twoFactorService.js
@@ -1,4 +1,4 @@
-const { webcrypto } = require('node:crypto');
+const { webcrypto, timingSafeEqual } = require('node:crypto');
 const { hashBackupCode, decryptV3, decryptV2 } = require('@librechat/data-schemas');
 const { updateUser } = require('~/models');
 
@@ -102,6 +102,31 @@ const generateTOTP = async (secret, forTime = Date.now()) => {
   return code;
 };
 
+/**
+ * Constant-time comparison of a candidate 2FA code against the expected value.
+ * A plain `===` comparison short-circuits at the first differing character, so
+ * an attacker submitting codes to the 2FA verification endpoint could, in
+ * principle, learn how many leading digits are correct from the response time.
+ * Codes are of a fixed, public length, so returning early on a length mismatch
+ * (or a non-string input) leaks nothing secret while keeping the match path
+ * timing-independent. Mirrors the `crypto.timingSafeEqual(Buffer.from(...))`
+ * pattern already used for CSRF token checks in `packages/api`.
+ * @param {string} expected
+ * @param {string} candidate
+ * @returns {boolean}
+ */
+const constantTimeEqual = (expected, candidate) => {
+  if (typeof expected !== 'string' || typeof candidate !== 'string') {
+    return false;
+  }
+  const expectedBuffer = Buffer.from(expected, 'utf8');
+  const candidateBuffer = Buffer.from(candidate, 'utf8');
+  if (expectedBuffer.length !== candidateBuffer.length) {
+    return false;
+  }
+  return timingSafeEqual(expectedBuffer, candidateBuffer);
+};
+
 /**
  * Verifies a TOTP token by checking a ±1 time step window.
  * @param {string} secret
@@ -113,7 +138,7 @@ const verifyTOTP = async (secret, token) => {
   const currentTime = Date.now();
   for (let offset = -1; offset <= 1; offset++) {
     const expected = await generateTOTP(secret, currentTime + offset * timeStepMS);
-    if (expected === token) {
+    if (constantTimeEqual(expected, token)) {
       return true;
     }
   }
diff --git a/api/server/services/twoFactorService.spec.js b/api/server/services/twoFactorService.spec.js
new file mode 100644
index 00000000000..81cd03d152b
--- /dev/null
+++ b/api/server/services/twoFactorService.spec.js
@@ -0,0 +1,42 @@
+const crypto = require('node:crypto');
+
+jest.mock('node:crypto', () => {
+  const actual = jest.requireActual('node:crypto');
+  return {
+    ...actual,
+    timingSafeEqual: jest.fn((a, b) => actual.timingSafeEqual(a, b)),
+  };
+});
+
+jest.mock('@librechat/data-schemas', () => ({
+  hashBackupCode: jest.fn(),
+  decryptV3: jest.fn(),
+  decryptV2: jest.fn(),
+}));
+
+jest.mock('~/models', () => ({ updateUser: jest.fn() }));
+
+const { generateTOTP, verifyTOTP, generateTOTPSecret } = require('./twoFactorService');
+
+describe('verifyTOTP', () => {
+  it('accepts a valid current TOTP code', async () => {
+    const secret = generateTOTPSecret();
+    const code = await generateTOTP(secret);
+    await expect(verifyTOTP(secret, code)).resolves.toBe(true);
+  });
+
+  it('rejects an invalid code of the same length', async () => {
+    const secret = generateTOTPSecret();
+    const code = await generateTOTP(secret);
+    const wrong = code === '000000' ? '111111' : '000000';
+    await expect(verifyTOTP(secret, wrong)).resolves.toBe(false);
+  });
+
+  it('compares codes in constant time via crypto.timingSafeEqual', async () => {
+    const secret = generateTOTPSecret();
+    const code = await generateTOTP(secret);
+    crypto.timingSafeEqual.mockClear();
+    await verifyTOTP(secret, code);
+    expect(crypto.timingSafeEqual).toHaveBeenCalled();
+  });
+});
diff --git a/client/src/common/types.ts b/client/src/common/types.ts
index 28d2872217c..768386c50be 100644
--- a/client/src/common/types.ts
+++ b/client/src/common/types.ts
@@ -103,27 +103,6 @@ export enum IconContext {
   message = 'message',
 }
 
-export type IconMapProps = {
-  className?: string;
-  iconURL?: string;
-  context?: 'landing' | 'menu-item' | 'nav' | 'message';
-  endpoint?: string | null;
-  endpointType?: string;
-  assistantName?: string;
-  agentName?: string;
-  avatar?: string;
-  size?: number;
-};
-
-export type IconComponent = React.ComponentType<IconMapProps>;
-export type AgentIconComponent = React.ComponentType<AgentIconMapProps>;
-export type IconComponentTypes = IconComponent | AgentIconComponent;
-export type IconsRecord = {
-  [key in t.EModelEndpoint | 'unknown' | string]: IconComponentTypes | null | undefined;
-};
-
-export type AgentIconMapProps = IconMapProps & { agentName?: string };
-
 export type NavLink = {
   title: TranslationKeys;
   label?: string;
@@ -537,6 +516,7 @@ export type IconProps = Pick<t.TMessage, 'isCreatedByUser' | 'model'> &
     iconClassName?: string;
     endpoint?: t.EModelEndpoint | string | null;
     endpointType?: t.EModelEndpoint | null;
+    endpointsConfig?: t.TEndpointsConfig | null;
     assistantName?: string;
     agentName?: string;
     error?: boolean;
diff --git a/client/src/components/Agents/AgentGrid.tsx b/client/src/components/Agents/AgentGrid.tsx
index cb11012f15d..58517c60da6 100644
--- a/client/src/components/Agents/AgentGrid.tsx
+++ b/client/src/components/Agents/AgentGrid.tsx
@@ -225,7 +225,7 @@ const AgentGrid: React.FC<AgentGridProps> = ({
     </div>
   );
 
-  if (isLoading || (isFetching && !isFetchingNextPage)) {
+  if ((isLoading || (isFetching && !isFetchingNextPage)) && !hasData) {
     return loadingSpinner;
   }
   return mainContent;
diff --git a/client/src/components/Agents/SmartLoader.tsx b/client/src/components/Agents/SmartLoader.tsx
index 58e741b9367..b857dd1978c 100644
--- a/client/src/components/Agents/SmartLoader.tsx
+++ b/client/src/components/Agents/SmartLoader.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { AgentListResponse } from 'librechat-data-provider';
+import type { AgentListResponse } from 'librechat-data-provider';
 
 interface SmartLoaderProps {
   /** Whether the content is currently loading */
@@ -73,6 +73,12 @@ export const useHasData = (data: AgentListResponse | undefined): boolean => {
 
   // Type guard for object data
   if (typeof data === 'object' && data !== null) {
+    // Check for agent list data (AgentListResponse shape, e.g. marketplace pages)
+    const agents = data.data;
+    if (Array.isArray(agents)) {
+      return agents.length > 0;
+    }
+
     // Check for agent list data
     if ('agents' in data) {
       const agents = (data as any).agents;
diff --git a/client/src/components/Agents/VirtualizedAgentGrid.tsx b/client/src/components/Agents/VirtualizedAgentGrid.tsx
index d5f026cb132..165c6e9d0e4 100644
--- a/client/src/components/Agents/VirtualizedAgentGrid.tsx
+++ b/client/src/components/Agents/VirtualizedAgentGrid.tsx
@@ -225,7 +225,7 @@ const VirtualizedAgentGrid: React.FC<VirtualizedAgentGridProps> = ({
   }
 
   // Handle loading state
-  if (isLoading || (isFetching && !isFetchingNextPage)) {
+  if ((isLoading || (isFetching && !isFetchingNextPage)) && !hasData) {
     return loadingSpinner;
   }
 
diff --git a/client/src/components/Agents/tests/AgentGrid.integration.spec.tsx b/client/src/components/Agents/tests/AgentGrid.integration.spec.tsx
index a4d6282aa74..03043535a80 100644
--- a/client/src/components/Agents/tests/AgentGrid.integration.spec.tsx
+++ b/client/src/components/Agents/tests/AgentGrid.integration.spec.tsx
@@ -18,11 +18,6 @@ jest.mock('~/hooks/Agents', () => ({
   })),
 }));
 
-// Mock SmartLoader
-jest.mock('../SmartLoader', () => ({
-  useHasData: jest.fn(() => true),
-}));
-
 // Mock useLocalize hook
 jest.mock('~/hooks/useLocalize', () => () => (key: string, options?: any) => {
   const mockTranslations: Record<string, string> = {
@@ -362,6 +357,23 @@ describe('AgentGrid Integration with useGetMarketplaceAgentsQuery', () => {
       expect(spinner).toBeInTheDocument();
     });
 
+    it('should retain cached agents while refetching', () => {
+      mockUseMarketplaceAgentsInfiniteQuery.mockReturnValue({
+        ...defaultMockQueryResult,
+        isFetching: true,
+      });
+
+      const Wrapper = createWrapper();
+      render(
+        <Wrapper>
+          <AgentGrid category="finance" searchQuery="" onSelectAgent={mockOnSelectAgent} />
+        </Wrapper>,
+      );
+
+      expect(screen.getByTestId('agent-card-1')).toBeInTheDocument();
+      expect(screen.getByTestId('agent-card-2')).toBeInTheDocument();
+    });
+
     it('should show empty state when no agents are available', () => {
       mockUseMarketplaceAgentsInfiniteQuery.mockReturnValue({
         ...defaultMockQueryResult,
diff --git a/client/src/components/Agents/tests/SmartLoader.spec.tsx b/client/src/components/Agents/tests/SmartLoader.spec.tsx
index 766d5a27072..3d2609c94b6 100644
--- a/client/src/components/Agents/tests/SmartLoader.spec.tsx
+++ b/client/src/components/Agents/tests/SmartLoader.spec.tsx
@@ -313,6 +313,35 @@ describe('useHasData', () => {
     expect(screen.getByTestId('result')).toHaveTextContent('no-data');
   });
 
+  it('detects empty data array (AgentListResponse) as no data', () => {
+    render(
+      <TestComponent
+        data={{ object: 'list', data: [], first_id: '', last_id: '', has_more: false }}
+      />,
+    );
+    expect(screen.getByTestId('result')).toHaveTextContent('no-data');
+  });
+
+  it('detects non-empty data array (AgentListResponse) as has data', () => {
+    render(
+      <TestComponent
+        data={{
+          object: 'list',
+          data: [{ id: 'agent_1', name: 'Test Agent' }],
+          first_id: 'agent_1',
+          last_id: 'agent_1',
+          has_more: false,
+        }}
+      />,
+    );
+    expect(screen.getByTestId('result')).toHaveTextContent('has-data');
+  });
+
+  it('detects invalid data property as no data', () => {
+    render(<TestComponent data={{ data: 'not-array' }} />);
+    expect(screen.getByTestId('result')).toHaveTextContent('no-data');
+  });
+
   it('detects empty agents array as no data', () => {
     render(<TestComponent data={{ agents: [] }} />);
     expect(screen.getByTestId('result')).toHaveTextContent('no-data');
diff --git a/client/src/components/Agents/tests/VirtualizedAgentGrid.test.tsx b/client/src/components/Agents/tests/VirtualizedAgentGrid.test.tsx
index b756fb9add3..04425af54dc 100644
--- a/client/src/components/Agents/tests/VirtualizedAgentGrid.test.tsx
+++ b/client/src/components/Agents/tests/VirtualizedAgentGrid.test.tsx
@@ -160,10 +160,6 @@ jest.mock('~/hooks', () => ({
   },
 }));
 
-jest.mock('../SmartLoader', () => ({
-  useHasData: () => true,
-}));
-
 jest.mock('../AgentCard', () => {
   return function MockAgentCard({
     agent,
@@ -266,6 +262,21 @@ describe('VirtualizedAgentGrid', () => {
     expect(spinner).toHaveClass('h-8 w-8 text-text-primary');
   });
 
+  it('retains cached agents while refetching', () => {
+    const useMarketplaceAgentsInfiniteQuery = (
+      jest.requireMock('~/data-provider/Agents') as MarketplaceAgentsMock
+    ).useMarketplaceAgentsInfiniteQuery;
+    useMarketplaceAgentsInfiniteQuery.mockImplementation(() =>
+      createMockInfiniteQuery({ isFetching: true }),
+    );
+
+    renderComponent();
+
+    expect(screen.getByTestId('virtual-list')).toBeInTheDocument();
+    expect(screen.getByTestId('agent-card-1')).toBeInTheDocument();
+    expect(screen.getByTestId('agent-card-2')).toBeInTheDocument();
+  });
+
   it('has proper accessibility attributes', () => {
     renderComponent({ category: 'productivity' });
 
diff --git a/client/src/components/Chat/Menus/Endpoints/components/GroupIcon.tsx b/client/src/components/Chat/Menus/Endpoints/components/GroupIcon.tsx
index 67cc3d6bf20..41d393c3870 100644
--- a/client/src/components/Chat/Menus/Endpoints/components/GroupIcon.tsx
+++ b/client/src/components/Chat/Menus/Endpoints/components/GroupIcon.tsx
@@ -1,37 +1,36 @@
 import React, { memo, useState } from 'react';
 import { AlertCircle } from 'lucide-react';
-import type { IconMapProps } from '~/common';
-import { getKnownEndpointAsset, hasKnownEndpointIcon } from '~/hooks/Endpoint/UnknownIcon';
-import { icons } from '~/hooks/Endpoint/Icons';
+import { ProviderIcon } from '@librechat/client';
+import { resolveProviderId } from 'librechat-data-provider';
+import { EntityEndpointMark, isEntityEndpoint } from '~/components/Endpoints/EntityEndpointMark';
+import { isImageURL } from '~/utils/icons';
 
 interface GroupIconProps {
   iconURL: string;
   groupName: string;
 }
 
-type IconType = (props: IconMapProps) => React.JSX.Element;
-
 const GroupIcon: React.FC<GroupIconProps> = ({ iconURL, groupName }) => {
   const [imageError, setImageError] = useState(false);
+  const provider = resolveProviderId(iconURL);
 
   const handleImageError = () => {
     setImageError(true);
   };
 
-  // Check if the iconURL is a built-in icon key
-  if (iconURL in icons) {
-    const Icon: IconType = (icons[iconURL] ?? icons.unknown) as IconType;
-    return <Icon size={20} context="menu-item" className="icon-md shrink-0 text-text-primary" />;
+  if (isEntityEndpoint(iconURL)) {
+    return (
+      <div className="relative" style={{ width: 20, height: 20, margin: '2px' }} title={groupName}>
+        <EntityEndpointMark endpoint={iconURL} />
+      </div>
+    );
   }
 
-  if (imageError) {
-    const DefaultIcon: IconType = icons.unknown as IconType;
+  if (provider || !isImageURL(iconURL) || imageError) {
     return (
       <div className="relative" style={{ width: 20, height: 20, margin: '2px' }}>
-        <div className="icon-md shrink-0 overflow-hidden rounded-full">
-          <DefaultIcon context="menu-item" size={20} />
-        </div>
-        {imageError && iconURL && (
+        <ProviderIcon provider={provider} size={20} className="icon-md shrink-0" />
+        {imageError && (
           <div
             className="absolute flex items-center justify-center rounded-full bg-surface-destructive"
             style={{ width: '14px', height: '14px', top: 0, right: 0 }}
@@ -43,27 +42,13 @@ const GroupIcon: React.FC<GroupIconProps> = ({ iconURL, groupName }) => {
     );
   }
 
-  const resolvedIconURL = getKnownEndpointAsset(iconURL);
-
-  if (!resolvedIconURL && hasKnownEndpointIcon(iconURL)) {
-    const Icon: IconType = icons.unknown as IconType;
-    return (
-      <Icon
-        size={20}
-        endpoint={iconURL}
-        context="menu-item"
-        className="icon-md shrink-0 text-text-primary"
-      />
-    );
-  }
-
   return (
     <div
       className="icon-md shrink-0 overflow-hidden rounded-full"
       style={{ width: 20, height: 20 }}
     >
       <img
-        src={resolvedIconURL || iconURL}
+        src={iconURL}
         alt={groupName}
         className="h-full w-full object-cover"
         onError={handleImageError}
diff --git a/client/src/components/Chat/Menus/Endpoints/components/SpecIcon.tsx b/client/src/components/Chat/Menus/Endpoints/components/SpecIcon.tsx
index 8370808ee20..fc225e99df5 100644
--- a/client/src/components/Chat/Menus/Endpoints/components/SpecIcon.tsx
+++ b/client/src/components/Chat/Menus/Endpoints/components/SpecIcon.tsx
@@ -1,11 +1,10 @@
 import React, { memo } from 'react';
-import { getEndpointField } from 'librechat-data-provider';
+import { ProviderIcon } from '@librechat/client';
 import type { TModelSpec, TEndpointsConfig } from 'librechat-data-provider';
-import type { IconMapProps } from '~/common';
-import { getModelSpecIconURL, getIconKey } from '~/utils';
+import { EntityEndpointMark, isEntityEndpoint } from '~/components/Endpoints/EntityEndpointMark';
 import { URLIcon } from '~/components/Endpoints/URLIcon';
-import { icons } from '~/hooks/Endpoint/Icons';
-import { isImageURL } from '~/utils/icons';
+import { useProviderIcon } from '~/hooks/Endpoint';
+import { getModelSpecIconURL } from '~/utils';
 
 interface SpecIconProps {
   currentSpec: TModelSpec;
@@ -14,37 +13,34 @@ interface SpecIconProps {
   agentAvatarURL?: string;
 }
 
-type IconType = (props: IconMapProps) => React.JSX.Element;
-
 const SpecIcon: React.FC<SpecIconProps> = ({ currentSpec, endpointsConfig, agentAvatarURL }) => {
   const iconURL = getModelSpecIconURL(currentSpec, agentAvatarURL);
   const endpoint = currentSpec.preset?.endpoint;
-  const endpointIconURL = getEndpointField(endpointsConfig, endpoint, 'iconURL');
-  const iconKey = getIconKey({ endpoint, endpointsConfig, endpointIconURL });
-  const shouldRenderURLIcon = isImageURL(iconURL);
-  let Icon: IconType;
+  const { provider, imageURL } = useProviderIcon({ endpoint, endpointsConfig, iconURL });
+  const { provider: fallbackProvider } = useProviderIcon({ endpoint, endpointsConfig });
 
-  if (!shouldRenderURLIcon) {
-    Icon = (icons[iconURL] ?? icons[iconKey] ?? icons.unknown) as IconType;
-  } else {
+  if (imageURL) {
     return (
       <URLIcon
-        iconURL={iconURL}
+        iconURL={imageURL}
         altName={currentSpec.name}
         containerStyle={{ width: 20, height: 20 }}
         className="icon-md shrink-0 overflow-hidden rounded-full"
-        endpoint={endpoint || undefined}
+        provider={fallbackProvider}
       />
     );
   }
 
+  if (isEntityEndpoint(iconURL || endpoint)) {
+    return <EntityEndpointMark endpoint={iconURL || endpoint} />;
+  }
+
   return (
-    <Icon
+    <ProviderIcon
+      provider={provider}
+      model={currentSpec.preset?.model}
       size={20}
-      endpoint={endpoint}
-      context="menu-item"
-      iconURL={endpointIconURL}
-      className="icon-md shrink-0 text-text-primary"
+      className="icon-md shrink-0"
     />
   );
 };
diff --git a/client/src/components/Chat/Menus/Endpoints/components/__tests__/GroupIcon.test.tsx b/client/src/components/Chat/Menus/Endpoints/components/__tests__/GroupIcon.test.tsx
index ee8ba0f5f06..83f3b8163b2 100644
--- a/client/src/components/Chat/Menus/Endpoints/components/__tests__/GroupIcon.test.tsx
+++ b/client/src/components/Chat/Menus/Endpoints/components/__tests__/GroupIcon.test.tsx
@@ -1,56 +1,42 @@
 import { render, screen } from '@testing-library/react';
+import { EModelEndpoint } from 'librechat-data-provider';
 import GroupIcon from '../GroupIcon';
 
-jest.mock('~/hooks/Endpoint/Icons', () => {
-  const React = jest.requireActual<typeof import('react')>('react');
-  const createIcon =
-    (iconKey: string) =>
-    ({ className, endpoint }: { className?: string; endpoint?: string | null }) =>
-      React.createElement('span', {
-        className,
-        'data-testid': 'endpoint-icon',
-        'data-icon-key': iconKey,
-        'data-endpoint': endpoint ?? '',
-      });
-
-  return {
-    icons: {
-      openAI: createIcon('openAI'),
-      unknown: createIcon('unknown'),
-    },
-  };
-});
-
 describe('GroupIcon', () => {
   it('renders built-in endpoint icon keys', () => {
     render(<GroupIcon iconURL="openAI" groupName="OpenAI" />);
 
-    expect(screen.getByTestId('endpoint-icon')).toHaveAttribute('data-icon-key', 'openAI');
+    expect(screen.getByRole('img', { name: 'OpenAI' })).toBeInTheDocument();
+  });
+
+  it('keeps the agents mark for an agents group icon', () => {
+    const { container } = render(
+      <GroupIcon iconURL={EModelEndpoint.agents} groupName="My Agents" />,
+    );
+
+    expect(screen.queryByRole('img', { name: 'Custom' })).not.toBeInTheDocument();
+    expect(container.querySelector('svg')).toBeInTheDocument();
+    expect(screen.getByTitle('My Agents')).toBeInTheDocument();
   });
 
   it('resolves known endpoint asset aliases case-insensitively', () => {
     render(<GroupIcon iconURL="OpenRouter" groupName="OpenRouter" />);
 
-    expect(screen.getByRole('img', { name: 'OpenRouter' })).toHaveAttribute(
-      'src',
-      'assets/openrouter.png',
-    );
+    const src = screen.getByRole('img', { name: 'OpenRouter' }).getAttribute('src');
+    expect(src).toBeTruthy();
+    expect(src).not.toBe('');
   });
 
   it('resolves known endpoint asset aliases to shipped file paths', () => {
     render(<GroupIcon iconURL="Helicone" groupName="Helicone" />);
 
-    expect(screen.getByRole('img', { name: 'Helicone' })).toHaveAttribute(
-      'src',
-      'assets/helicone.svg',
-    );
+    expect(screen.getByRole('img', { name: 'Helicone' })).toHaveAttribute('alt', 'Helicone');
   });
 
   it('renders known endpoint aliases backed by components', () => {
     render(<GroupIcon iconURL="Moonshot" groupName="Moonshot" />);
 
-    expect(screen.getByTestId('endpoint-icon')).toHaveAttribute('data-icon-key', 'unknown');
-    expect(screen.getByTestId('endpoint-icon')).toHaveAttribute('data-endpoint', 'Moonshot');
+    expect(screen.getByRole('img', { name: 'Moonshot' })).toBeInTheDocument();
   });
 
   it('renders configured image URLs directly', () => {
diff --git a/client/src/components/Chat/Menus/Endpoints/components/__tests__/SpecIcon.test.tsx b/client/src/components/Chat/Menus/Endpoints/components/__tests__/SpecIcon.test.tsx
index 45b0f3f001e..0de9af574dd 100644
--- a/client/src/components/Chat/Menus/Endpoints/components/__tests__/SpecIcon.test.tsx
+++ b/client/src/components/Chat/Menus/Endpoints/components/__tests__/SpecIcon.test.tsx
@@ -1,37 +1,16 @@
 import { render, screen } from '@testing-library/react';
-import { EModelEndpoint } from 'librechat-data-provider';
+import { EModelEndpoint, ProviderId } from 'librechat-data-provider';
 import type { TModelSpec, TEndpointsConfig } from 'librechat-data-provider';
 import SpecIcon from '../SpecIcon';
 
-jest.mock('~/hooks/Endpoint/Icons', () => {
-  const React = jest.requireActual<typeof import('react')>('react');
-  const createIcon =
-    (iconKey: string) =>
-    ({ endpoint, iconURL }: { endpoint?: string | null; iconURL?: string }) =>
-      React.createElement('span', {
-        'data-testid': 'endpoint-icon',
-        'data-icon-key': iconKey,
-        'data-endpoint': endpoint ?? '',
-        'data-icon-url': iconURL ?? '',
-      });
-
-  return {
-    icons: {
-      google: createIcon('google'),
-      openAI: createIcon('openAI'),
-      unknown: createIcon('unknown'),
-    },
-  };
-});
-
 jest.mock('~/components/Endpoints/URLIcon', () => {
   const React = jest.requireActual<typeof import('react')>('react');
   return {
-    URLIcon: ({ iconURL, endpoint }: { iconURL: string; endpoint?: string }) =>
+    URLIcon: ({ iconURL, provider }: { iconURL: string; provider?: string | null }) =>
       React.createElement('span', {
         'data-testid': 'url-icon',
         'data-icon-url': iconURL,
-        'data-endpoint': endpoint ?? '',
+        'data-provider': provider ?? '',
       }),
   };
 });
@@ -48,11 +27,7 @@ describe('SpecIcon', () => {
 
     render(<SpecIcon currentSpec={currentSpec} endpointsConfig={endpointsConfig} />);
 
-    expect(screen.getByTestId('endpoint-icon')).toHaveAttribute(
-      'data-icon-key',
-      EModelEndpoint.google,
-    );
-    expect(screen.getByTestId('endpoint-icon')).toHaveAttribute('data-endpoint', '');
+    expect(screen.getByRole('img', { name: 'Google' })).toBeInTheDocument();
   });
 
   it('renders same-origin absolute spec icon URLs as images', () => {
@@ -71,13 +46,10 @@ describe('SpecIcon', () => {
       'data-icon-url',
       '/assets/clickhouse-logo.svg',
     );
-    expect(screen.getByTestId('url-icon')).toHaveAttribute(
-      'data-endpoint',
-      EModelEndpoint.anthropic,
-    );
+    expect(screen.getByTestId('url-icon')).toHaveAttribute('data-provider', ProviderId.anthropic);
   });
 
-  it('falls back to the unknown icon when runtime spec data has no icon or preset', () => {
+  it('falls back to the generic icon when runtime spec data has no icon or preset', () => {
     const currentSpec = {
       name: 'gemini-test',
       label: 'Gemini Test',
@@ -85,7 +57,7 @@ describe('SpecIcon', () => {
 
     render(<SpecIcon currentSpec={currentSpec} endpointsConfig={endpointsConfig} />);
 
-    expect(screen.getByTestId('endpoint-icon')).toHaveAttribute('data-icon-key', 'unknown');
+    expect(screen.getByRole('img', { name: 'Custom' })).toBeInTheDocument();
   });
 
   it("renders the agent's avatar when the spec defines no icon of its own", () => {
diff --git a/client/src/components/Chat/Menus/Presets/PresetItems.tsx b/client/src/components/Chat/Menus/Presets/PresetItems.tsx
index b7f426e1a0e..31362c9d911 100644
--- a/client/src/components/Chat/Menus/Presets/PresetItems.tsx
+++ b/client/src/components/Chat/Menus/Presets/PresetItems.tsx
@@ -3,7 +3,6 @@ import { useRecoilValue } from 'recoil';
 import * as Ariakit from '@ariakit/react';
 import { Close } from '@radix-ui/react-popover';
 import { Flipper, Flipped } from 'react-flip-toolkit';
-import { getEndpointField } from 'librechat-data-provider';
 import { BookCopy, FileUp, FileX2, Ellipsis } from 'lucide-react';
 import {
   Button,
@@ -25,9 +24,10 @@ import {
 import type { MenuItemProps } from '@librechat/client';
 import type { TPreset } from 'librechat-data-provider';
 import type { ChangeEvent, FC } from 'react';
+import { ResolvedProviderIcon } from '~/components/Endpoints/ResolvedProviderIcon';
+import { resolveProviderIcon } from '~/hooks/Endpoint';
 import { useGetEndpointsQuery } from '~/data-provider';
-import { getPresetTitle, getIconKey } from '~/utils';
-import { icons } from '~/hooks/Endpoint/Icons';
+import { getPresetTitle } from '~/utils';
 import { MenuSeparator } from '../UI';
 import { useLocalize } from '~/hooks';
 import { cn } from '~/utils';
@@ -226,8 +226,10 @@ const PresetItems: FC<{
               return null;
             }
 
-            const iconKey = getIconKey({ endpoint: preset.endpoint, endpointsConfig });
-            const Icon = icons[iconKey];
+            const { provider, imageURL } = resolveProviderIcon({
+              endpoint: preset.endpoint,
+              endpointsConfig,
+            });
             const presetTitle = getPresetTitle(preset);
 
             return (
@@ -243,14 +245,12 @@ const PresetItems: FC<{
                         aria-label={presetTitle}
                         data-testid={`preset-item-${presetId}`}
                       >
-                        {Icon != null && (
-                          <Icon
-                            context="menu-item"
-                            iconURL={getEndpointField(endpointsConfig, preset.endpoint, 'iconURL')}
-                            className="icon-md shrink-0"
-                            endpoint={preset.endpoint}
-                          />
-                        )}
+                        <ResolvedProviderIcon
+                          provider={provider}
+                          imageURL={imageURL}
+                          size={20}
+                          className="icon-md shrink-0"
+                        />
                         <span className="truncate">{presetTitle}</span>
                       </Button>
                       <div className="flex items-center justify-end gap-1">
diff --git a/client/src/components/Chat/Menus/Presets/__tests__/PresetItems.spec.tsx b/client/src/components/Chat/Menus/Presets/__tests__/PresetItems.spec.tsx
index 4f08c342c5e..0d548d2c5a6 100644
--- a/client/src/components/Chat/Menus/Presets/__tests__/PresetItems.spec.tsx
+++ b/client/src/components/Chat/Menus/Presets/__tests__/PresetItems.spec.tsx
@@ -11,11 +11,15 @@ jest.mock('~/hooks', () => ({
 }));
 
 jest.mock('~/data-provider', () => ({
-  useGetEndpointsQuery: () => ({ data: {} }),
-}));
-
-jest.mock('~/hooks/Endpoint/Icons', () => ({
-  icons: {},
+  useGetEndpointsQuery: () => ({
+    data: {
+      Branded: {
+        type: 'custom',
+        iconURL: 'https://cdn.example.com/x.png',
+        order: 0,
+      },
+    },
+  }),
 }));
 
 const preset = {
@@ -116,3 +120,25 @@ describe('PresetItems clear-all dialog', () => {
     });
   });
 });
+
+describe('PresetItems icons', () => {
+  it('renders a configured endpoint image instead of the generic mark', () => {
+    render(
+      <RecoilRoot>
+        <Popover.Root open={true}>
+          <PresetItems
+            presets={[{ presetId: 'branded', title: 'Branded', endpoint: 'Branded' } as TPreset]}
+            onSetDefaultPreset={jest.fn()}
+            onSelectPreset={jest.fn()}
+            onChangePreset={jest.fn()}
+            onDeletePreset={jest.fn()}
+            clearAllPresets={jest.fn()}
+            onFileSelected={jest.fn()}
+          />
+        </Popover.Root>
+      </RecoilRoot>,
+    );
+
+    expect(screen.getByRole('img')).toHaveAttribute('src', 'https://cdn.example.com/x.png');
+  });
+});
diff --git a/client/src/components/Chat/Messages/Content/ContentParts.tsx b/client/src/components/Chat/Messages/Content/ContentParts.tsx
index 6c4a45b5332..2324486d00e 100644
--- a/client/src/components/Chat/Messages/Content/ContentParts.tsx
+++ b/client/src/components/Chat/Messages/Content/ContentParts.tsx
@@ -10,7 +10,7 @@ import type { ReactNode, ReactElement } from 'react';
 import type { ToolCallGroupExpansionState } from './ToolCallGroup';
 import { mapAttachments, filterAttachmentsForPart, groupSequentialToolCalls } from '~/utils';
 import WorkspaceChanges, { partitionWorkspaceChanges } from './Parts/WorkspaceChanges';
-import { groupActivityPhases, lastVisibleContentIdx } from '~/utils/activityLabels';
+import { groupActivityPhases, lastCursorContentIdx } from '~/utils/activityLabels';
 import { ParallelContentRenderer, type PartWithIndex } from './ParallelContent';
 import MemoryArtifacts, { hasMemoryArtifacts } from './MemoryArtifacts';
 import { MessageContext, SearchContext } from '~/Providers';
@@ -497,7 +497,7 @@ const ContentPartsBody = memo(function ContentPartsBody({
   }
 
   if (phaseSegments != null) {
-    const relativeGlobalLastContentIdx = lastVisibleContentIdx(content ?? []);
+    const relativeGlobalLastContentIdx = lastCursorContentIdx(content ?? []);
     const globalLastContentIdx =
       relativeGlobalLastContentIdx < 0 ? -1 : absoluteIndexAt(relativeGlobalLastContentIdx);
     const renderSegment = (
@@ -586,10 +586,9 @@ const ContentPartsBody = memo(function ContentPartsBody({
    *  empty TEXT after real parts keeps its flush in-flow cursor. */
   const solitaryEmptyText = safeContent.length === 1 && isEmptyTextPart(safeContent[0]);
   const showEmptyCursor = (safeContent.length === 0 || solitaryEmptyText) && effectiveIsSubmitting;
-  /** Skips trailing BLANK label reservations — they render nothing, and
-   *  counting one as last would strip the streaming cursor from the last
-   *  VISIBLE part until the next delta. */
-  const relativeLastContentIdx = lastVisibleContentIdx(safeContent);
+  /** Skips trailing blank label reservations and empty provider placeholders,
+   * keeping the cursor attached to the last visible output. */
+  const relativeLastContentIdx = lastCursorContentIdx(safeContent);
   const lastContentIdx = relativeLastContentIdx < 0 ? -1 : absoluteIndexAt(relativeLastContentIdx);
 
   // Parallel content: use dedicated renderer with columns (TMessageContentParts includes ContentMetadata)
diff --git a/client/src/components/Chat/Messages/Content/ParallelContent.tsx b/client/src/components/Chat/Messages/Content/ParallelContent.tsx
index 6b3dbbbbf57..6348e258704 100644
--- a/client/src/components/Chat/Messages/Content/ParallelContent.tsx
+++ b/client/src/components/Chat/Messages/Content/ParallelContent.tsx
@@ -4,7 +4,7 @@ import type { TMessageContentParts, SearchResultData, TAttachment } from 'librec
 import {
   getActivityLabelPart,
   getActivityLabelText,
-  lastVisibleContentIdx,
+  lastCursorContentIdx,
 } from '~/utils/activityLabels';
 import MemoryArtifacts from './MemoryArtifacts';
 import Sources from '~/components/Web/Sources';
@@ -179,6 +179,7 @@ export const ParallelColumns = memo(function ParallelColumns({
             part?.type !== ContentTypes.ACTIVITY_LABEL ||
             getActivityLabelText(getActivityLabelPart(part)).length > 0,
         );
+        const lastColumnCursorIdx = lastParallelColumnCursorIdx(columnParts);
         // Show loading cursor if column has no content parts yet (empty array from placeholder)
         const showLoadingCursor = isSubmitting && columnParts.length === 0;
 
@@ -200,7 +201,7 @@ export const ParallelColumns = memo(function ParallelColumns({
               </Container>
             ) : (
               columnParts.map(({ part, idx }) => {
-                const isLastInColumn = idx === columnParts[columnParts.length - 1]?.idx;
+                const isLastInColumn = idx === lastColumnCursorIdx;
                 const isLastContent = idx === lastContentIdx;
                 return renderPart(part, idx, isLastInColumn && isLastContent);
               })
@@ -212,6 +213,13 @@ export const ParallelColumns = memo(function ParallelColumns({
   );
 });
 
+export function lastParallelColumnCursorIdx(
+  parts: ReadonlyArray<{ part: TMessageContentParts; idx: number }>,
+): number {
+  const relativeIdx = lastCursorContentIdx(parts.map(({ part }) => part));
+  return relativeIdx < 0 ? -1 : (parts[relativeIdx]?.idx ?? -1);
+}
+
 type ParallelContentRendererProps = {
   content?: Array<TMessageContentParts | undefined>;
   messageId: string;
@@ -261,7 +269,7 @@ export const ParallelContentRenderer = memo(function ParallelContentRenderer({
   /** Same walk-back as `ContentParts`: a trailing BLANK label reservation is
    *  filtered out of every lane, so counting it as last would leave NO
    *  rendered part with the last-part cursor until the label fills. */
-  const relativeLastContentIdx = lastVisibleContentIdx(content);
+  const relativeLastContentIdx = lastCursorContentIdx(content);
   const lastContentIdx =
     relativeLastContentIdx < 0
       ? -1
diff --git a/client/src/components/Chat/Messages/Content/__tests__/ContentParts.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/ContentParts.test.tsx
index f4e1fbc3bc1..33191b8ff99 100644
--- a/client/src/components/Chat/Messages/Content/__tests__/ContentParts.test.tsx
+++ b/client/src/components/Chat/Messages/Content/__tests__/ContentParts.test.tsx
@@ -115,8 +115,20 @@ jest.mock('../Container', () => ({
 
 jest.mock('../Part', () => ({
   __esModule: true,
-  default: ({ part, idx }: { part: TMessageContentParts; idx: number }) => (
-    <div data-testid={`real-part-${part.type}`} data-index={idx} />
+  default: ({
+    part,
+    idx,
+    showCursor,
+  }: {
+    part: TMessageContentParts;
+    idx: number;
+    showCursor?: boolean;
+  }) => (
+    <div
+      data-testid={`real-part-${part.type}`}
+      data-index={idx}
+      data-show-cursor={String(showCursor === true)}
+    />
   ),
 }));
 
@@ -453,6 +465,25 @@ describe('ContentParts — post-steer author re-attribution', () => {
 });
 
 describe('ContentParts — activity phase state', () => {
+  it('keeps a streaming cursor on visible text when a provider appends an empty placeholder', () => {
+    render(
+      <ContentParts
+        {...baseProps}
+        content={[
+          { type: ContentTypes.TEXT, text: 'Visible answer' } as TMessageContentParts,
+          { type: ContentTypes.TEXT, text: '' } as TMessageContentParts,
+        ]}
+        isLast
+        isSubmitting
+        isLatestMessage
+      />,
+    );
+
+    const textParts = screen.getAllByTestId(`real-part-${ContentTypes.TEXT}`);
+    expect(textParts[0]).toHaveAttribute('data-show-cursor', 'true');
+    expect(textParts[1]).toHaveAttribute('data-show-cursor', 'false');
+  });
+
   it('renders a completion-appended parent before the final root text', () => {
     const tool = {
       type: ContentTypes.TOOL_CALL,
diff --git a/client/src/components/Chat/Messages/Content/__tests__/ParallelContent.test.ts b/client/src/components/Chat/Messages/Content/__tests__/ParallelContent.test.ts
index 1633d7a55d1..ec1b821bfb7 100644
--- a/client/src/components/Chat/Messages/Content/__tests__/ParallelContent.test.ts
+++ b/client/src/components/Chat/Messages/Content/__tests__/ParallelContent.test.ts
@@ -1,6 +1,6 @@
 import { ContentTypes } from 'librechat-data-provider';
 import type { TMessageContentParts } from 'librechat-data-provider';
-import { groupParallelContent } from '../ParallelContent';
+import { groupParallelContent, lastParallelColumnCursorIdx } from '../ParallelContent';
 
 describe('groupParallelContent', () => {
   test('reports absolute indices for a dense phase segment', () => {
@@ -41,3 +41,27 @@ describe('groupParallelContent', () => {
     ]);
   });
 });
+
+describe('lastParallelColumnCursorIdx', () => {
+  test('keeps the lane cursor on visible output before an empty placeholder', () => {
+    const visible = {
+      type: ContentTypes.TEXT,
+      text: 'Visible answer',
+      groupId: 1,
+      agentId: 'agent-1',
+    } as unknown as TMessageContentParts;
+    const empty = {
+      type: ContentTypes.TEXT,
+      text: '',
+      groupId: 1,
+      agentId: 'agent-1',
+    } as unknown as TMessageContentParts;
+
+    expect(
+      lastParallelColumnCursorIdx([
+        { part: visible, idx: 7 },
+        { part: empty, idx: 8 },
+      ]),
+    ).toBe(7);
+  });
+});
diff --git a/client/src/components/Chat/Messages/Elapsed.tsx b/client/src/components/Chat/Messages/Elapsed.tsx
new file mode 100644
index 00000000000..913f75b81b0
--- /dev/null
+++ b/client/src/components/Chat/Messages/Elapsed.tsx
@@ -0,0 +1,72 @@
+import { memo, useEffect, useState } from 'react';
+import { useRecoilValue } from 'recoil';
+import { useTranslation } from 'react-i18next';
+import { getElapsedDurationLabels } from '~/utils';
+import { useLocalize } from '~/hooks';
+import store from '~/store';
+
+const elapsedSeconds = (start: number): number =>
+  Math.max(0, Math.floor((Date.now() - start) / 1000));
+
+type ElapsedVisibility = {
+  isSubmitting: boolean;
+  isLatestMessage: boolean;
+  isCreatedByUser?: boolean;
+  siblingIdx?: number;
+  siblingCount?: number;
+};
+
+/**
+ * Whether the elapsed indicator belongs under a row: the latest assistant row
+ * while its generation streams — but only at the newest sibling position.
+ * `latestMessageId` follows the SELECTED branch, so during a regeneration a
+ * settled older sibling the reader paged to mid-stream would otherwise satisfy
+ * the same latest+submitting gate the withheld hover actions use, and a
+ * counting timer under settled content misleads in a way hidden buttons don't.
+ */
+export const shouldShowElapsed = ({
+  isSubmitting,
+  isLatestMessage,
+  isCreatedByUser,
+  siblingIdx,
+  siblingCount,
+}: ElapsedVisibility): boolean =>
+  isSubmitting &&
+  isLatestMessage &&
+  isCreatedByUser !== true &&
+  (siblingIdx ?? 0) === (siblingCount ?? 1) - 1;
+
+/**
+ * Elapsed generation time under the actively streaming response, in the footer
+ * slot the hover actions occupy once the answer lands. The once-per-second tick
+ * is component-local state, so parents that re-render per streaming token never
+ * re-render on its account. The compact reading is hidden from assistive
+ * technology in favor of a spoken equivalent; neither is an `aria-live` region,
+ * so the tick never announces.
+ */
+const Elapsed = memo(function Elapsed({ index }: { index: number }) {
+  const localize = useLocalize();
+  const { i18n } = useTranslation();
+  const submissionStart = useRecoilValue(store.submissionStartFamily(index));
+  const [mountTime] = useState(() => Date.now());
+  const start = submissionStart ?? mountTime;
+  const [seconds, setSeconds] = useState(() => elapsedSeconds(start));
+
+  useEffect(() => {
+    setSeconds(elapsedSeconds(start));
+    const intervalId = setInterval(() => setSeconds(elapsedSeconds(start)), 1000);
+    return () => clearInterval(intervalId);
+  }, [start]);
+
+  const labels = getElapsedDurationLabels(seconds * 1000, i18n.language);
+  return (
+    <span className="flex items-center text-text-secondary">
+      <span aria-hidden="true" className="tabular-nums" data-testid="stream-elapsed">
+        {localize(labels.key, labels.values)}
+      </span>
+      <span className="sr-only">{localize(labels.announcedKey, labels.announcedValues)}</span>
+    </span>
+  );
+});
+
+export default Elapsed;
diff --git a/client/src/components/Chat/Messages/MessageIcon.tsx b/client/src/components/Chat/Messages/MessageIcon.tsx
index 7eabab3ebb0..a5a395473f6 100644
--- a/client/src/components/Chat/Messages/MessageIcon.tsx
+++ b/client/src/components/Chat/Messages/MessageIcon.tsx
@@ -73,7 +73,6 @@ const MessageIcon = memo(({ iconData, assistant, agent }: MessageIconProps) => {
         context="message"
         assistantAvatar={assistantAvatar}
         agentAvatar={agentAvatar}
-        endpointIconURL={endpointIconURL}
         assistantName={assistantName}
         agentName={agentName}
       />
@@ -85,6 +84,7 @@ const MessageIcon = memo(({ iconData, assistant, agent }: MessageIconProps) => {
       isCreatedByUser={iconData?.isCreatedByUser ?? false}
       endpoint={endpoint}
       iconURL={avatarURL || endpointIconURL}
+      endpointsConfig={endpointsConfig}
       model={iconData?.model}
       assistantName={assistantName}
       agentName={agentName}
diff --git a/client/src/components/Chat/Messages/MessageParts.tsx b/client/src/components/Chat/Messages/MessageParts.tsx
index 620e642ebae..1afd543e44f 100644
--- a/client/src/components/Chat/Messages/MessageParts.tsx
+++ b/client/src/components/Chat/Messages/MessageParts.tsx
@@ -14,6 +14,7 @@ import { getHeaderModelName } from '~/components/Chat/Messages/ui/HeaderLabel';
 import { revealOnRowHoverClasses, messageFooterClasses } from './styles';
 import MessageRow from '~/components/Chat/Messages/ui/MessageRow';
 import MessageIcon from '~/components/Chat/Messages/MessageIcon';
+import Elapsed, { shouldShowElapsed } from './Elapsed';
 import ContentParts from './Content/ContentParts';
 import SiblingSwitch from './SiblingSwitch';
 import HoverButtons from './HoverButtons';
@@ -134,6 +135,13 @@ function MessageParts(props: TMessageProps) {
                   isSubmitting && messageId === latestMessageId && revealOnRowHoverClasses,
                 )}
               />
+              {shouldShowElapsed({
+                isSubmitting,
+                isLatestMessage: messageId === latestMessageId,
+                isCreatedByUser,
+                siblingIdx,
+                siblingCount,
+              }) && <Elapsed index={index} />}
               <HoverButtons
                 index={index}
                 isEditing={edit}
diff --git a/client/src/components/Chat/Messages/MultiMessage.tsx b/client/src/components/Chat/Messages/MultiMessage.tsx
index 20525561e1c..5af59b7fa9a 100644
--- a/client/src/components/Chat/Messages/MultiMessage.tsx
+++ b/client/src/components/Chat/Messages/MultiMessage.tsx
@@ -185,6 +185,22 @@ function MultiMessage({
   } else {
     row = <Message {...sharedProps} />;
   }
+  /** Event children may be persisted against the user request that launched
+   * the Director. Once its assistant response exists, present that activity
+   * after the response instead of interrupting the turn between user and
+   * assistant rows. Exact assistant-owned children remain in the same group. */
+  let activityParentMessageIds: string[] = [];
+  if (message.isCreatedByUser) {
+    if (!message.children?.length) activityParentMessageIds = [message.messageId];
+  } else {
+    activityParentMessageIds = [message.messageId, message.parentMessageId].filter(
+      (id): id is string => typeof id === 'string' && id.length > 0,
+    );
+  }
+  const isEditingActivityAnchor =
+    typeof currentEditId === 'string' && activityParentMessageIds.includes(currentEditId);
+  const hasParallelContent =
+    !message.isCreatedByUser && message.content?.some((part) => part?.groupId != null) === true;
 
   /**
    * The child recursion is a sibling of the row (not rendered inside it), so a
@@ -196,14 +212,13 @@ function MultiMessage({
   return (
     <>
       {row}
-      {rowMounted && currentEditId !== message.messageId ? (
+      {rowMounted && !isEditingActivityAnchor && activityParentMessageIds.length > 0 ? (
         <div className="w-full border-0 bg-transparent">
-          <div className="m-auto justify-center px-4 sm:px-0">
-            <EventSubagentActivityGroup
-              conversationId={message.conversationId ?? ''}
-              parentMessageId={message.messageId}
-            />
-          </div>
+          <EventSubagentActivityGroup
+            conversationId={message.conversationId ?? ''}
+            parentMessageIds={activityParentMessageIds}
+            hasParallelContent={hasParallelContent}
+          />
         </div>
       ) : null}
       <MemoizedMultiMessage
diff --git a/client/src/components/Chat/Messages/__tests__/Elapsed.spec.tsx b/client/src/components/Chat/Messages/__tests__/Elapsed.spec.tsx
new file mode 100644
index 00000000000..dbc86e732eb
--- /dev/null
+++ b/client/src/components/Chat/Messages/__tests__/Elapsed.spec.tsx
@@ -0,0 +1,135 @@
+import React from 'react';
+import { RecoilRoot, type MutableSnapshot } from 'recoil';
+import { render, screen, act } from '@testing-library/react';
+import Elapsed, { shouldShowElapsed } from '~/components/Chat/Messages/Elapsed';
+import store from '~/store';
+
+function renderElapsed(initializeState?: (snapshot: MutableSnapshot) => void) {
+  return render(
+    <RecoilRoot initializeState={initializeState}>
+      <Elapsed index={0} />
+    </RecoilRoot>,
+  );
+}
+
+function advance(ms: number) {
+  act(() => {
+    jest.advanceTimersByTime(ms);
+  });
+}
+
+describe('Elapsed', () => {
+  beforeEach(() => {
+    jest.useFakeTimers();
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  it('renders seconds from the submission start anchor and rolls into minutes', () => {
+    const start = Date.now() - 5_000;
+    renderElapsed(({ set }) => set(store.submissionStartFamily(0), start));
+
+    expect(screen.getByTestId('stream-elapsed')).toHaveTextContent(/^5s$/);
+    expect(screen.getByTestId('stream-elapsed')).toHaveAttribute('aria-hidden', 'true');
+    expect(screen.getByText('5 seconds elapsed')).toHaveClass('sr-only');
+
+    advance(54_000);
+    expect(screen.getByTestId('stream-elapsed')).toHaveTextContent(/^59s$/);
+
+    advance(1_000);
+    expect(screen.getByTestId('stream-elapsed')).toHaveTextContent(/^1m 0s$/);
+    expect(screen.getByText('1 minute elapsed')).toHaveClass('sr-only');
+
+    advance(59_000);
+    expect(screen.getByTestId('stream-elapsed')).toHaveTextContent(/^1m 59s$/);
+
+    advance(1_000);
+    expect(screen.getByTestId('stream-elapsed')).toHaveTextContent(/^2m 0s$/);
+  });
+
+  it('counts from mount when no submission start is recorded', () => {
+    renderElapsed();
+
+    expect(screen.getByTestId('stream-elapsed')).toHaveTextContent(/^0s$/);
+
+    advance(3_000);
+    expect(screen.getByTestId('stream-elapsed')).toHaveTextContent(/^3s$/);
+  });
+
+  it('clamps a future anchor to zero instead of going negative', () => {
+    const start = Date.now() + 60_000;
+    renderElapsed(({ set }) => set(store.submissionStartFamily(0), start));
+
+    expect(screen.getByTestId('stream-elapsed')).toHaveTextContent(/^0s$/);
+
+    advance(61_000);
+    expect(screen.getByTestId('stream-elapsed')).toHaveTextContent(/^1s$/);
+  });
+
+  it('continues from the anchored start across an unmount and remount', () => {
+    const start = Date.now() - 30_000;
+    const view = render(
+      <RecoilRoot initializeState={({ set }) => set(store.submissionStartFamily(0), start)}>
+        <Elapsed index={0} />
+      </RecoilRoot>,
+    );
+
+    expect(screen.getByTestId('stream-elapsed')).toHaveTextContent(/^30s$/);
+
+    view.rerender(
+      <RecoilRoot initializeState={({ set }) => set(store.submissionStartFamily(0), start)}>
+        {null}
+      </RecoilRoot>,
+    );
+    expect(screen.queryByTestId('stream-elapsed')).toBeNull();
+
+    advance(5_000);
+    view.rerender(
+      <RecoilRoot initializeState={({ set }) => set(store.submissionStartFamily(0), start)}>
+        <Elapsed index={0} />
+      </RecoilRoot>,
+    );
+    expect(screen.getByTestId('stream-elapsed')).toHaveTextContent(/^35s$/);
+  });
+
+  it('clears its interval on unmount', () => {
+    const view = renderElapsed();
+    const timersWhileMounted = jest.getTimerCount();
+    expect(timersWhileMounted).toBeGreaterThanOrEqual(1);
+
+    view.rerender(<RecoilRoot>{null}</RecoilRoot>);
+    expect(jest.getTimerCount()).toBe(timersWhileMounted - 1);
+  });
+});
+
+describe('shouldShowElapsed', () => {
+  const streamingRow = {
+    isSubmitting: true,
+    isLatestMessage: true,
+    isCreatedByUser: false,
+    siblingIdx: 1,
+    siblingCount: 2,
+  };
+
+  it('shows under the newest sibling of the streaming latest assistant row', () => {
+    expect(shouldShowElapsed(streamingRow)).toBe(true);
+  });
+
+  it('shows when sibling metadata is absent (a lone response)', () => {
+    expect(
+      shouldShowElapsed({ isSubmitting: true, isLatestMessage: true, isCreatedByUser: false }),
+    ).toBe(true);
+  });
+
+  it('hides under an older sibling the reader paged to mid-stream', () => {
+    expect(shouldShowElapsed({ ...streamingRow, siblingIdx: 0 })).toBe(false);
+  });
+
+  it('hides for user rows, settled rows, and non-latest rows', () => {
+    expect(shouldShowElapsed({ ...streamingRow, isCreatedByUser: true })).toBe(false);
+    expect(shouldShowElapsed({ ...streamingRow, isSubmitting: false })).toBe(false);
+    expect(shouldShowElapsed({ ...streamingRow, isLatestMessage: false })).toBe(false);
+  });
+});
diff --git a/client/src/components/Chat/Messages/__tests__/HoverActions.streaming.spec.tsx b/client/src/components/Chat/Messages/__tests__/HoverActions.streaming.spec.tsx
index ed0bb121666..e0918057668 100644
--- a/client/src/components/Chat/Messages/__tests__/HoverActions.streaming.spec.tsx
+++ b/client/src/components/Chat/Messages/__tests__/HoverActions.streaming.spec.tsx
@@ -12,6 +12,7 @@ import Message from '~/components/Chat/Messages/Message';
 import store from '~/store';
 
 let mockHoverButtonsRenderCount = 0;
+let mockContentRenderCount = 0;
 
 jest.mock('~/components/Chat/Messages/HoverButtons', () => ({
   __esModule: true,
@@ -23,14 +24,18 @@ jest.mock('~/components/Chat/Messages/HoverButtons', () => ({
 
 jest.mock('~/components/Chat/Messages/Content/MessageContent', () => ({
   __esModule: true,
-  default: ({ text }: { text: string }) => <div data-testid="message-content">{text}</div>,
+  default: ({ text }: { text: string }) => {
+    mockContentRenderCount += 1;
+    return <div data-testid="message-content">{text}</div>;
+  },
 }));
 
 jest.mock('~/components/Chat/Messages/Content/ContentParts', () => ({
   __esModule: true,
-  default: ({ content }: { content?: TMessage['content'] }) => (
-    <div data-testid="structured-message-content">{JSON.stringify(content ?? [])}</div>
-  ),
+  default: ({ content }: { content?: TMessage['content'] }) => {
+    mockContentRenderCount += 1;
+    return <div data-testid="structured-message-content">{JSON.stringify(content ?? [])}</div>;
+  },
 }));
 
 jest.mock('~/components/Chat/Messages/Content/Parts/AuthorHeader', () => ({
@@ -135,7 +140,15 @@ function createQueryClient() {
   });
 }
 
-function DerivedStreamingRow({ structured = false }: { structured?: boolean }) {
+function DerivedStreamingRow({
+  structured = false,
+  submitting = true,
+  siblingIdx = 1,
+}: {
+  structured?: boolean;
+  submitting?: boolean;
+  siblingIdx?: number;
+}) {
   const queryClient = useQueryClient();
   const latestMessage = useLatestMessage(0);
   const latestMessageId = useLatestMessageId(0);
@@ -151,7 +164,7 @@ function DerivedStreamingRow({ structured = false }: { structured?: boolean }) {
         latestMessageId: latestMessageId ?? undefined,
         latestMessageDepth,
         handleContinue: jest.fn(),
-        isSubmitting: true,
+        isSubmitting: submitting,
         abortScroll: false,
         setAbortScroll: jest.fn(),
         getMessages: () =>
@@ -163,7 +176,7 @@ function DerivedStreamingRow({ structured = false }: { structured?: boolean }) {
           );
         },
       }) as unknown as ReturnType<typeof useChatContext>,
-    [latestMessageDepth, latestMessageId, queryClient],
+    [latestMessageDepth, latestMessageId, queryClient, submitting],
   );
 
   if (!latestMessage) {
@@ -178,7 +191,7 @@ function DerivedStreamingRow({ structured = false }: { structured?: boolean }) {
           message={latestMessage}
           currentEditId={null}
           setCurrentEditId={jest.fn()}
-          siblingIdx={0}
+          siblingIdx={siblingIdx}
           siblingCount={2}
           setSiblingIdx={jest.fn()}
         />
@@ -187,7 +200,7 @@ function DerivedStreamingRow({ structured = false }: { structured?: boolean }) {
   );
 }
 
-function renderStreamingRow(structured = false) {
+function renderStreamingRow(structured = false, submitting = true, siblingIdx = 1) {
   const queryClient = createQueryClient();
   queryClient.setQueryData<TMessage[]>(
     [QueryKeys.messages, conversation.conversationId],
@@ -196,14 +209,18 @@ function renderStreamingRow(structured = false) {
 
   const initializeState = ({ set }: MutableSnapshot) => {
     set(store.conversationByIndex(0), conversation);
-    set(store.isSubmittingFamily(0), true);
+    set(store.isSubmittingFamily(0), submitting);
   };
 
   render(
     <QueryClientProvider client={queryClient}>
       <RecoilRoot initializeState={initializeState}>
         <MemoryRouter initialEntries={[`/c/${conversation.conversationId}`]}>
-          <DerivedStreamingRow structured={structured} />
+          <DerivedStreamingRow
+            structured={structured}
+            submitting={submitting}
+            siblingIdx={siblingIdx}
+          />
         </MemoryRouter>
       </RecoilRoot>
     </QueryClientProvider>,
@@ -215,6 +232,7 @@ function renderStreamingRow(structured = false) {
 describe('streaming hover actions', () => {
   beforeEach(() => {
     mockHoverButtonsRenderCount = 0;
+    mockContentRenderCount = 0;
   });
 
   it('keeps actions mounted while an optimistic assistant row is replaced', async () => {
@@ -284,4 +302,61 @@ describe('streaming hover actions', () => {
 
     expect(screen.getByTestId('hover-buttons').parentElement).toHaveClass('min-h-[31px]');
   });
+
+  /**
+   * The elapsed-time indicator fills the footer slot the withheld actions leave
+   * empty, but only under the response that is actively generating.
+   */
+  it.each([
+    ['a plain text', false],
+    ['a structured', true],
+  ])('shows the elapsed timer under %s streaming response', (_label, structured) => {
+    renderStreamingRow(structured);
+
+    expect(screen.getByTestId('stream-elapsed')).toBeInTheDocument();
+  });
+
+  it('renders no elapsed timer once the row is not submitting', () => {
+    renderStreamingRow(false, false);
+
+    expect(screen.queryByTestId('stream-elapsed')).toBeNull();
+  });
+
+  /**
+   * `latestMessageId` follows the SELECTED branch, so a settled older sibling
+   * the reader paged to mid-regeneration satisfies the latest+submitting gate.
+   * The timer additionally requires the newest sibling position — a counting
+   * timer under settled content misleads in a way withheld buttons don't.
+   */
+  it('renders no elapsed timer under an older sibling selected mid-stream', () => {
+    renderStreamingRow(false, true, 0);
+
+    expect(screen.queryByTestId('stream-elapsed')).toBeNull();
+    expect(screen.getByTestId('hover-buttons')).toBeInTheDocument();
+  });
+
+  /**
+   * The timer's once-per-second tick is component-local state: advancing the
+   * clock must re-render nothing beyond the timer itself, or the indicator
+   * would tax every streaming frame's neighbors.
+   */
+  it('ticks the elapsed timer without re-rendering content or actions', () => {
+    jest.useFakeTimers();
+    try {
+      renderStreamingRow();
+
+      const hoverRenders = mockHoverButtonsRenderCount;
+      const contentRenders = mockContentRenderCount;
+
+      act(() => {
+        jest.advanceTimersByTime(5_000);
+      });
+
+      expect(screen.getByTestId('stream-elapsed')).toBeInTheDocument();
+      expect(mockHoverButtonsRenderCount).toBe(hoverRenders);
+      expect(mockContentRenderCount).toBe(contentRenders);
+    } finally {
+      jest.useRealTimers();
+    }
+  });
 });
diff --git a/client/src/components/Chat/Messages/__tests__/MultiMessage.spec.tsx b/client/src/components/Chat/Messages/__tests__/MultiMessage.spec.tsx
index 7a2146e1c96..7933482fd86 100644
--- a/client/src/components/Chat/Messages/__tests__/MultiMessage.spec.tsx
+++ b/client/src/components/Chat/Messages/__tests__/MultiMessage.spec.tsx
@@ -34,8 +34,18 @@ jest.mock('../MessageParts', () => ({ __esModule: true, default: createRowStub()
 jest.mock('../Message', () => ({ __esModule: true, default: createRowStub() }));
 jest.mock('~/components/Chat/Subagents/EventSubagentActivityGroup', () => ({
   __esModule: true,
-  default: ({ parentMessageId }: { parentMessageId: string }) => (
-    <div data-testid="event-subagent-activity" data-parent-message-id={parentMessageId} />
+  default: ({
+    parentMessageIds,
+    hasParallelContent,
+  }: {
+    parentMessageIds: string[];
+    hasParallelContent?: boolean;
+  }) => (
+    <div
+      data-testid="event-subagent-activity"
+      data-parent-message-ids={parentMessageIds.join(',')}
+      data-has-parallel-content={String(hasParallelContent)}
+    />
   ),
 }));
 
@@ -81,8 +91,8 @@ describe('MultiMessage sibling selection', () => {
     );
 
     expect(screen.getByTestId('event-subagent-activity')).toHaveAttribute(
-      'data-parent-message-id',
-      'structured',
+      'data-parent-message-ids',
+      'structured,parent-1',
     );
 
     view.rerender(
@@ -96,8 +106,111 @@ describe('MultiMessage sibling selection', () => {
       </RecoilRoot>,
     );
     expect(screen.getByTestId('event-subagent-activity')).toHaveAttribute(
-      'data-parent-message-id',
-      'legacy',
+      'data-parent-message-ids',
+      'legacy,parent-1',
+    );
+  });
+
+  it('places a user-anchored event group after the assistant response', () => {
+    const assistant = msg('assistant');
+    const user = {
+      ...msg('user'),
+      isCreatedByUser: true,
+      parentMessageId: 'root',
+      children: [assistant],
+    } as TMessage;
+    assistant.parentMessageId = 'user';
+
+    render(
+      <RecoilRoot>
+        <MultiMessage
+          messageId="root"
+          messagesTree={[user]}
+          currentEditId={null}
+          setCurrentEditId={jest.fn()}
+        />
+      </RecoilRoot>,
+    );
+
+    expect(screen.getAllByTestId('event-subagent-activity')).toHaveLength(1);
+    expect(screen.getByTestId('event-subagent-activity')).toHaveAttribute(
+      'data-parent-message-ids',
+      'assistant,user',
+    );
+    expect(
+      screen
+        .getByText('assistant')
+        .compareDocumentPosition(screen.getByTestId('event-subagent-activity')),
+    ).toBe(Node.DOCUMENT_POSITION_FOLLOWING);
+  });
+
+  it('hides merged event activity while its user anchor is being edited', () => {
+    const assistant = { ...msg('assistant'), parentMessageId: 'user' } as TMessage;
+    const user = {
+      ...msg('user'),
+      isCreatedByUser: true,
+      parentMessageId: 'root',
+      children: [assistant],
+    } as TMessage;
+
+    render(
+      <RecoilRoot>
+        <MultiMessage
+          messageId="root"
+          messagesTree={[user]}
+          currentEditId="user"
+          setCurrentEditId={jest.fn()}
+        />
+      </RecoilRoot>,
+    );
+
+    expect(screen.queryByTestId('event-subagent-activity')).not.toBeInTheDocument();
+  });
+
+  it('matches the wider layout of a parallel assistant response', () => {
+    const assistant = {
+      ...msg('assistant'),
+      content: [{ type: 'text', text: 'answer', groupId: 'parallel-group' }],
+    } as unknown as TMessage;
+
+    render(
+      <RecoilRoot>
+        <MultiMessage
+          messageId="parent-1"
+          messagesTree={[assistant]}
+          currentEditId={null}
+          setCurrentEditId={jest.fn()}
+        />
+      </RecoilRoot>,
+    );
+
+    expect(screen.getByTestId('event-subagent-activity')).toHaveAttribute(
+      'data-has-parallel-content',
+      'true',
+    );
+  });
+
+  it('renders assistant content containing an undefined streaming placeholder', () => {
+    const assistant = {
+      ...msg('assistant'),
+      content: [undefined, { type: 'text', text: 'answer' }],
+    } as unknown as TMessage;
+
+    render(
+      <RecoilRoot>
+        <MultiMessage
+          messageId="parent-1"
+          messagesTree={[assistant]}
+          currentEditId={null}
+          setCurrentEditId={jest.fn()}
+        />
+      </RecoilRoot>,
+    );
+
+    expect(screen.getByTestId('row')).toHaveTextContent('assistant');
+    expect(screen.getByTestId('event-subagent-activity')).toHaveAttribute(
+      'data-has-parallel-content',
+      'false',
     );
   });
 
diff --git a/client/src/components/Chat/Messages/ui/MessageRender.tsx b/client/src/components/Chat/Messages/ui/MessageRender.tsx
index 110dea397b7..355ae59c2c5 100644
--- a/client/src/components/Chat/Messages/ui/MessageRender.tsx
+++ b/client/src/components/Chat/Messages/ui/MessageRender.tsx
@@ -9,6 +9,7 @@ import {
   getMessageAriaLabel,
 } from '~/utils';
 import { revealOnRowHoverClasses, messageFooterClasses } from '~/components/Chat/Messages/styles';
+import Elapsed, { shouldShowElapsed } from '~/components/Chat/Messages/Elapsed';
 import MessageContent from '~/components/Chat/Messages/Content/MessageContent';
 import { getHeaderModelName } from '~/components/Chat/Messages/ui/HeaderLabel';
 import { useLocalize, useMessageActions, useContentMetadata } from '~/hooks';
@@ -180,6 +181,13 @@ const MessageRender = memo(function MessageRender({
               isSubmitting && isLatestMessage && revealOnRowHoverClasses,
             )}
           />
+          {shouldShowElapsed({
+            isSubmitting,
+            isLatestMessage,
+            isCreatedByUser: msg.isCreatedByUser,
+            siblingIdx,
+            siblingCount,
+          }) && <Elapsed index={index} />}
           <HoverButtons
             index={index}
             isEditing={edit}
diff --git a/client/src/components/Chat/Messages/ui/MessageRow.tsx b/client/src/components/Chat/Messages/ui/MessageRow.tsx
index ffa20b37da2..0aadb57df88 100644
--- a/client/src/components/Chat/Messages/ui/MessageRow.tsx
+++ b/client/src/components/Chat/Messages/ui/MessageRow.tsx
@@ -20,6 +20,18 @@ type MessageRowProps = {
   className?: string;
 };
 
+export function getMessageRowWidthClass({
+  fullWidth = false,
+  hasParallelContent = false,
+}: {
+  fullWidth?: boolean;
+  hasParallelContent?: boolean;
+} = {}) {
+  if (fullWidth) return 'w-full max-w-full sm:px-2';
+  if (hasParallelContent) return 'w-full sm:px-2 md:max-w-[58rem] xl:max-w-[70rem]';
+  return 'w-full sm:px-2 md:max-w-3xl xl:max-w-4xl';
+}
+
 export default function MessageRow({
   id,
   icon,
@@ -38,12 +50,7 @@ export default function MessageRow({
 }: MessageRowProps) {
   // Same column as ChatForm: max-width plus `sm:px-2`, so the body lines
   // up with the composer surface rather than the form's outer box.
-  let widthClass = 'w-full sm:px-2 md:max-w-3xl xl:max-w-4xl';
-  if (fullWidth) {
-    widthClass = 'w-full max-w-full sm:px-2';
-  } else if (hasParallelContent) {
-    widthClass = 'w-full sm:px-2 md:max-w-[58rem] xl:max-w-[70rem]';
-  }
+  const widthClass = getMessageRowWidthClass({ fullWidth, hasParallelContent });
 
   return (
     <div
diff --git a/client/src/components/Chat/Subagents/EventSubagentActivityGroup.test.tsx b/client/src/components/Chat/Subagents/EventSubagentActivityGroup.test.tsx
index 00282caac77..027c84df154 100644
--- a/client/src/components/Chat/Subagents/EventSubagentActivityGroup.test.tsx
+++ b/client/src/components/Chat/Subagents/EventSubagentActivityGroup.test.tsx
@@ -21,17 +21,31 @@ const mockChild: ParentSubagentSummary = {
   tasks: [{ taskId: 'task-1', status: 'running' }],
   tasksTruncated: false,
 };
+const mockCompletedChild: ParentSubagentSummary = {
+  ...mockChild,
+  threadId: 'event-thread-2',
+  parentMessageId: 'assistant-message',
+  agentId: 'agent-2',
+  actorId: 'actor-b',
+  status: 'completed',
+  latestTaskId: 'task-2',
+  tasks: [{ taskId: 'task-2', status: 'completed' }],
+};
+let mockChildrenByMessage = new Map<string, ParentSubagentSummary[]>();
 
 jest.mock('./ParentSubagentsProvider', () => ({
   useParentSubagents: () => ({
-    byMessageId: new Map([['parent-message', [mockChild]]]),
+    byMessageId: mockChildrenByMessage,
     byThreadId: new Map([['event-thread', mockChild]]),
     refresh: mockRefresh,
   }),
 }));
 
 jest.mock('~/Providers', () => ({
-  useAgentsMapContext: () => ({ 'agent-1': { id: 'agent-1', name: 'Visible Agent' } }),
+  useAgentsMapContext: () => ({
+    'agent-1': { id: 'agent-1', name: 'Visible Agent' },
+    'agent-2': { id: 'agent-2', name: 'Completed Agent' },
+  }),
 }));
 
 jest.mock('~/hooks', () => ({ useLocalize: () => (key: string) => key }));
@@ -40,11 +54,15 @@ jest.mock('~/utils', () => ({
   renderAgentAvatar: () => <span data-testid="agent-avatar" />,
 }));
 jest.mock('@librechat/client', () => ({
+  Button: ({ children, ...props }: React.ComponentProps<'button'>) => (
+    <button {...props}>{children}</button>
+  ),
   cn: (...values: Array<string | false | undefined>) => values.filter(Boolean).join(' '),
 }));
 jest.mock('lucide-react', () => ({
   AlertCircle: () => null,
   Bot: () => null,
+  ChevronDown: () => null,
   Check: () => null,
   CheckCircle2: () => null,
   CircleAlert: () => null,
@@ -57,6 +75,7 @@ jest.mock('lucide-react', () => ({
 describe('EventSubagentActivityGroup', () => {
   beforeEach(() => {
     mockRefresh.mockReset().mockResolvedValue(undefined);
+    mockChildrenByMessage = new Map([['parent-message', [mockChild]]]);
   });
 
   it('opens the durable event child under its owning parent message', () => {
@@ -70,11 +89,16 @@ describe('EventSubagentActivityGroup', () => {
         <Observer />
         <EventSubagentActivityGroup
           conversationId="parent-conversation"
-          parentMessageId="parent-message"
+          parentMessageIds={['parent-message']}
         />
       </RecoilRoot>,
     );
 
+    expect(
+      screen.getByRole('region', { name: 'com_ui_subagent_activity' }).parentElement,
+    ).toHaveClass('px-4', 'sm:px-0', 'md:max-w-3xl', 'xl:max-w-4xl');
+    expect(screen.queryByRole('button', { name: /Visible Agent/ })).not.toBeInTheDocument();
+    fireEvent.click(screen.getByRole('button', { name: /com_ui_subagent_activity/ }));
     fireEvent.click(screen.getByRole('button', { name: /Visible Agent/ }));
 
     expect(mockRefresh).toHaveBeenCalledTimes(1);
@@ -88,11 +112,99 @@ describe('EventSubagentActivityGroup', () => {
         event: {
           actorId: 'actor-a',
           progressKey: 'event-task:event-thread:task-1',
+          siblingParentMessageIds: ['parent-message'],
         },
       }),
     );
   });
 
+  it('matches the width of a parallel assistant response', () => {
+    render(
+      <RecoilRoot>
+        <EventSubagentActivityGroup
+          conversationId="parent-conversation"
+          parentMessageIds={['parent-message']}
+          hasParallelContent
+        />
+      </RecoilRoot>,
+    );
+
+    expect(
+      screen.getByRole('region', { name: 'com_ui_subagent_activity' }).parentElement,
+    ).toHaveClass('md:max-w-[58rem]', 'xl:max-w-[70rem]');
+  });
+
+  it('retains a merged anchor that has no children yet', () => {
+    let selection: ActiveSubagentPanel | null = null;
+    const Observer = () => {
+      selection = useRecoilValue(activeSubagentPanel);
+      return null;
+    };
+
+    render(
+      <RecoilRoot>
+        <Observer />
+        <EventSubagentActivityGroup
+          conversationId="parent-conversation"
+          parentMessageIds={['parent-message', 'empty-assistant-message']}
+        />
+      </RecoilRoot>,
+    );
+
+    fireEvent.click(screen.getByRole('button', { name: /com_ui_subagent_activity/ }));
+    fireEvent.click(screen.getByRole('button', { name: /Visible Agent/ }));
+
+    expect((selection as ActiveSubagentPanel | null)?.event?.siblingParentMessageIds).toEqual([
+      'parent-message',
+      'empty-assistant-message',
+    ]);
+  });
+
+  it('preserves every merged message anchor and uses explicit plural status labels', () => {
+    mockChildrenByMessage = new Map([
+      ['parent-message', [mockChild]],
+      [
+        'assistant-message',
+        [
+          mockCompletedChild,
+          {
+            ...mockCompletedChild,
+            threadId: 'event-thread-3',
+            actorId: 'actor-c',
+            agentId: undefined,
+            title: 'Third actor',
+          },
+        ],
+      ],
+    ]);
+    let selection: ActiveSubagentPanel | null = null;
+    const Observer = () => {
+      selection = useRecoilValue(activeSubagentPanel);
+      return null;
+    };
+
+    render(
+      <RecoilRoot>
+        <Observer />
+        <EventSubagentActivityGroup
+          conversationId="parent-conversation"
+          parentMessageIds={['parent-message', 'assistant-message']}
+        />
+      </RecoilRoot>,
+    );
+
+    const summary = screen.getByRole('button', { name: /com_ui_subagent_activity/ });
+    expect(summary).toHaveAccessibleName(/com_ui_subagent_count_running_one/);
+    expect(summary).toHaveAccessibleName(/com_ui_subagent_count_completed_other/);
+    fireEvent.click(summary);
+    fireEvent.click(screen.getByRole('button', { name: /Completed Agent/ }));
+
+    expect((selection as ActiveSubagentPanel | null)?.event?.siblingParentMessageIds).toEqual([
+      'parent-message',
+      'assistant-message',
+    ]);
+  });
+
   it('does not reopen a child after the user closes it while refresh is pending', async () => {
     let selection: ActiveSubagentPanel | null = null;
     let resolveRefresh!: (value: unknown) => void;
@@ -115,11 +227,12 @@ describe('EventSubagentActivityGroup', () => {
         <ClosePanel />
         <EventSubagentActivityGroup
           conversationId="parent-conversation"
-          parentMessageId="parent-message"
+          parentMessageIds={['parent-message']}
         />
       </RecoilRoot>,
     );
 
+    fireEvent.click(screen.getByRole('button', { name: /com_ui_subagent_activity/ }));
     fireEvent.click(screen.getByRole('button', { name: /Visible Agent/ }));
     expect(selection).toEqual(
       expect.objectContaining({ durable: expect.objectContaining({ taskId: 'task-1' }) }),
diff --git a/client/src/components/Chat/Subagents/EventSubagentActivityGroup.tsx b/client/src/components/Chat/Subagents/EventSubagentActivityGroup.tsx
index 40b1ded56e6..62e82344bbb 100644
--- a/client/src/components/Chat/Subagents/EventSubagentActivityGroup.tsx
+++ b/client/src/components/Chat/Subagents/EventSubagentActivityGroup.tsx
@@ -1,8 +1,9 @@
-import { useCallback } from 'react';
-import { Bot } from 'lucide-react';
-import { cn } from '@librechat/client';
-import { useResetRecoilState, useSetRecoilState } from 'recoil';
+import { useCallback, useId, useMemo, useState } from 'react';
+import { Button, cn } from '@librechat/client';
+import { Bot, ChevronDown } from 'lucide-react';
+import { useRecoilValue, useResetRecoilState, useSetRecoilState } from 'recoil';
 import type { ParentSubagentSummary } from 'librechat-data-provider';
+import { getMessageRowWidthClass } from '~/components/Chat/Messages/ui/MessageRow';
 import { subagentStatusIcon, subagentStatusLabelKey } from './status';
 import { useParentSubagents } from './ParentSubagentsProvider';
 import { eventSubagentSelection } from './eventSelection';
@@ -12,33 +13,83 @@ import { renderAgentAvatar } from '~/utils';
 import { useLocalize } from '~/hooks';
 import store from '~/store';
 
+const STATUS_COUNT_LABEL_KEYS = {
+  dispatched: {
+    one: 'com_ui_subagent_count_dispatched_one',
+    other: 'com_ui_subagent_count_dispatched_other',
+  },
+  running: {
+    one: 'com_ui_subagent_count_running_one',
+    other: 'com_ui_subagent_count_running_other',
+  },
+  completed: {
+    one: 'com_ui_subagent_count_completed_one',
+    other: 'com_ui_subagent_count_completed_other',
+  },
+  failed: {
+    one: 'com_ui_subagent_count_failed_one',
+    other: 'com_ui_subagent_count_failed_other',
+  },
+  interrupted: {
+    one: 'com_ui_subagent_count_interrupted_one',
+    other: 'com_ui_subagent_count_interrupted_other',
+  },
+  cancelled: {
+    one: 'com_ui_subagent_count_cancelled_one',
+    other: 'com_ui_subagent_count_cancelled_other',
+  },
+} as const;
+
 export default function EventSubagentActivityGroup({
   conversationId,
-  parentMessageId,
+  parentMessageIds,
+  hasParallelContent = false,
 }: {
   conversationId: string;
-  parentMessageId: string;
+  parentMessageIds: string[];
+  hasParallelContent?: boolean;
 }) {
   const { byMessageId } = useParentSubagents();
-  const children = byMessageId.get(parentMessageId) ?? [];
+  const children = useMemo(() => {
+    const seen = new Set<string>();
+    return parentMessageIds
+      .flatMap((messageId) => byMessageId.get(messageId) ?? [])
+      .filter((child) => {
+        if (seen.has(child.threadId)) return false;
+        seen.add(child.threadId);
+        return true;
+      });
+  }, [byMessageId, parentMessageIds]);
+  const fullWidth = useRecoilValue(store.maximizeChatSpace);
+  const siblingParentMessageIds = useMemo(
+    () => Array.from(new Set(parentMessageIds)),
+    [parentMessageIds],
+  );
   if (children.length === 0) return null;
   return (
-    <EventSubagentRows
-      conversationId={conversationId}
-      parentMessageId={parentMessageId}
-      eventChildren={children}
-    />
+    <div
+      className={cn(
+        'mx-auto min-w-0 flex-1 px-4 transition-[max-width] duration-theme-normal motion-reduce:transition-none sm:px-0',
+        getMessageRowWidthClass({ fullWidth, hasParallelContent }),
+      )}
+    >
+      <EventSubagentRows
+        conversationId={conversationId}
+        eventChildren={children}
+        siblingParentMessageIds={siblingParentMessageIds}
+      />
+    </div>
   );
 }
 
 function EventSubagentRows({
   conversationId,
-  parentMessageId,
   eventChildren,
+  siblingParentMessageIds,
 }: {
   conversationId: string;
-  parentMessageId: string;
   eventChildren: ParentSubagentSummary[];
+  siblingParentMessageIds: string[];
 }) {
   const localize = useLocalize();
   const agentsMap = useAgentsMapContext();
@@ -46,9 +97,27 @@ function EventSubagentRows({
   const setSelected = useSetRecoilState(activeSubagentPanel);
   const setArtifactsVisible = useSetRecoilState(store.artifactsVisibility);
   const resetCurrentArtifactId = useResetRecoilState(store.currentArtifactId);
+  const [expanded, setExpanded] = useState(false);
+  const panelId = useId();
+  const counts = useMemo(() => {
+    const result = new Map<ParentSubagentSummary['status'], number>();
+    eventChildren.forEach((child) => result.set(child.status, (result.get(child.status) ?? 0) + 1));
+    return result;
+  }, [eventChildren]);
+  const summary = [
+    localize(
+      eventChildren.length === 1 ? 'com_ui_subagent_agent_count' : 'com_ui_subagent_agents_count',
+      { 0: String(eventChildren.length) },
+    ),
+    ...Array.from(counts.entries()).map(([status, count]) =>
+      localize(STATUS_COUNT_LABEL_KEYS[status][count === 1 ? 'one' : 'other'], {
+        0: String(count),
+      }),
+    ),
+  ].join(' · ');
   const openChild = useCallback(
     (child: ParentSubagentSummary) => {
-      const selection = eventSubagentSelection(conversationId, child);
+      const selection = eventSubagentSelection(conversationId, child, siblingParentMessageIds);
       if (selection == null) return;
       resetCurrentArtifactId();
       setArtifactsVisible(false);
@@ -56,7 +125,11 @@ function EventSubagentRows({
       void refresh().then((index) => {
         const fresh = index?.children.find((candidate) => candidate.threadId === child.threadId);
         if (fresh == null || fresh.latestTaskId === child.latestTaskId) return;
-        const freshSelection = eventSubagentSelection(conversationId, fresh);
+        const freshSelection = eventSubagentSelection(
+          conversationId,
+          fresh,
+          siblingParentMessageIds,
+        );
         if (freshSelection != null) {
           setSelected((current) => {
             if (
@@ -70,18 +143,43 @@ function EventSubagentRows({
         }
       });
     },
-    [conversationId, refresh, resetCurrentArtifactId, setArtifactsVisible, setSelected],
+    [
+      conversationId,
+      refresh,
+      resetCurrentArtifactId,
+      setArtifactsVisible,
+      setSelected,
+      siblingParentMessageIds,
+    ],
   );
   return (
     <section
       aria-label={localize('com_ui_subagent_activity')}
-      className="my-2 overflow-hidden rounded-lg border border-border-light bg-surface-secondary"
-      data-event-subagent-group={parentMessageId}
+      className="my-2 overflow-hidden rounded-lg border border-border-light bg-surface-secondary/40"
+      data-event-subagent-group={eventChildren[0]?.parentMessageId}
     >
-      <div className="border-b border-border-light px-3 py-2 text-xs font-medium text-text-secondary">
-        {localize('com_ui_subagent_activity')}
-      </div>
-      <div className="divide-y divide-border-light">
+      <Button
+        variant="ghost"
+        type="button"
+        onClick={() => setExpanded((value) => !value)}
+        aria-expanded={expanded}
+        aria-controls={panelId}
+        aria-label={`${localize('com_ui_subagent_activity')}: ${summary}`}
+        className="flex h-auto min-h-10 w-full items-center justify-start gap-2 rounded-lg px-3 py-2 text-left text-text-secondary hover:bg-surface-hover hover:text-text-primary focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring-primary focus-visible:ring-offset-0"
+      >
+        <Bot size={15} className="shrink-0" aria-hidden="true" />
+        <span className="min-w-0 flex-1 truncate text-sm font-medium">{summary}</span>
+        <ChevronDown
+          size={16}
+          className={cn('shrink-0 transition-transform', expanded && 'rotate-180')}
+          aria-hidden="true"
+        />
+      </Button>
+      <div
+        id={panelId}
+        hidden={!expanded}
+        className="divide-y divide-border-light border-t border-border-light"
+      >
         {eventChildren.map((child) => {
           const StatusIcon = subagentStatusIcon(child.status);
           const agent = child.agentId == null ? undefined : agentsMap?.[child.agentId];
@@ -94,11 +192,11 @@ function EventSubagentRows({
               disabled={!canOpen}
               onClick={() => openChild(child)}
               data-subagent-tool-call={`event-thread:${child.threadId}`}
-              data-subagent-parent-message={parentMessageId}
+              data-subagent-parent-message={child.parentMessageId}
               data-subagent-part-index="0"
               className={cn(
-                'flex w-full items-center gap-2 px-3 py-2 text-left text-sm',
-                canOpen ? 'hover:bg-surface-tertiary' : 'cursor-default opacity-70',
+                'flex w-full items-center gap-2 px-3 py-2 text-left text-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring-primary',
+                canOpen ? 'hover:bg-surface-hover' : 'cursor-default opacity-70',
               )}
             >
               <span className="flex h-5 w-5 shrink-0 items-center justify-center overflow-hidden rounded-full">
diff --git a/client/src/components/Chat/Subagents/SubagentActivity.test.tsx b/client/src/components/Chat/Subagents/SubagentActivity.test.tsx
index c6b2a725459..bd9bfe078a4 100644
--- a/client/src/components/Chat/Subagents/SubagentActivity.test.tsx
+++ b/client/src/components/Chat/Subagents/SubagentActivity.test.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
-import { fireEvent, render, screen } from '@testing-library/react';
+import { act, fireEvent, render, screen } from '@testing-library/react';
 import type { Agents } from 'librechat-data-provider';
 import type { ChildActivity } from './adapters';
-import SubagentActivity from './SubagentActivity';
+import SubagentActivity, { SubagentActivityScrollSurface } from './SubagentActivity';
 
 jest.mock('~/hooks', () => ({
   useLocalize: () => (key: string) => key,
@@ -216,6 +216,12 @@ describe('SubagentActivity', () => {
     },
   );
 
+  it('reports when the durable control history is bounded', () => {
+    render(<SubagentActivity activity={{ ...base, controlsTruncated: true }} />);
+
+    expect(screen.getByText('com_ui_subagent_control_history_truncated')).toBeInTheDocument();
+  });
+
   it('preserves question input-validation failure for the regular renderer', () => {
     render(
       <SubagentActivity
@@ -326,6 +332,100 @@ describe('SubagentActivity', () => {
     expect(screen.getByText('Prepared the release')).toBeInTheDocument();
   });
 
+  it('renders command receipts separately from child status and allows an accepted withdrawal', () => {
+    const onCancelControl = jest.fn();
+    render(
+      <SubagentActivity
+        activity={{
+          ...base,
+          status: 'running',
+          controls: [
+            {
+              invocationId: 'submitted',
+              action: 'steer',
+              status: 'submitted',
+              createdAt: '2026-08-24T12:00:00.000Z',
+              updatedAt: '2026-08-24T12:00:00.000Z',
+              message: 'Check the source.',
+            },
+            {
+              invocationId: 'accepted',
+              controlId: 'control-1',
+              action: 'queue',
+              status: 'accepted',
+              createdAt: '2026-08-24T12:00:01.000Z',
+              updatedAt: '2026-08-24T12:00:01.000Z',
+              message: 'Add a citation.',
+              messageTruncated: true,
+            },
+            {
+              invocationId: 'applied',
+              action: 'interrupt',
+              status: 'applied',
+              createdAt: '2026-08-24T12:00:02.000Z',
+              updatedAt: '2026-08-24T12:00:03.000Z',
+              boundary: 'preempt',
+            },
+            {
+              invocationId: 'rejected',
+              action: 'steer',
+              status: 'rejected',
+              createdAt: '2026-08-24T12:00:04.000Z',
+              updatedAt: '2026-08-24T12:00:05.000Z',
+              reason: 'task_completed',
+            },
+          ],
+        }}
+        onCancelControl={onCancelControl}
+      />,
+    );
+
+    expect(screen.getByText('com_ui_subagent_thread_status_running')).toBeInTheDocument();
+    expect(screen.getByText('com_ui_subagent_control_status_submitted')).toBeInTheDocument();
+    expect(screen.getByText('com_ui_subagent_control_status_accepted')).toBeInTheDocument();
+    expect(screen.getByText('com_ui_subagent_control_status_applied')).toBeInTheDocument();
+    expect(screen.getByText('com_ui_subagent_control_status_rejected')).toBeInTheDocument();
+    expect(screen.getByText('com_ui_subagent_control_message_truncated')).toBeInTheDocument();
+    expect(screen.getByText('com_ui_subagent_control_reason_task_completed')).toBeInTheDocument();
+
+    fireEvent.click(screen.getByRole('button', { name: 'com_ui_subagent_control_withdraw' }));
+    expect(onCancelControl).toHaveBeenCalledWith('control-1');
+  });
+
+  it('renders storage-prioritized control receipts in chronological order', () => {
+    render(
+      <SubagentActivity
+        activity={{
+          ...base,
+          controls: [
+            {
+              invocationId: 'new-accepted',
+              controlId: 'control-2',
+              action: 'queue',
+              status: 'accepted',
+              createdAt: '2026-08-24T12:00:02.000Z',
+              updatedAt: '2026-08-24T12:00:02.000Z',
+            },
+            {
+              invocationId: 'old-applied',
+              controlId: 'control-1',
+              action: 'steer',
+              status: 'applied',
+              createdAt: '2026-08-24T12:00:01.000Z',
+              updatedAt: '2026-08-24T12:00:03.000Z',
+            },
+          ],
+        }}
+      />,
+    );
+
+    const applied = screen.getByText('com_ui_subagent_control_status_applied');
+    const accepted = screen.getByText('com_ui_subagent_control_status_accepted');
+    expect(
+      applied.compareDocumentPosition(accepted) & Node.DOCUMENT_POSITION_FOLLOWING,
+    ).toBeTruthy();
+  });
+
   it('scopes regular-chat renderer state to the selected child activity', () => {
     render(<SubagentActivity activity={base} activityId="parent:tool:child" />);
 
@@ -335,6 +435,44 @@ describe('SubagentActivity', () => {
     );
   });
 
+  it('renders an embedded turn without creating a nested scroll surface', () => {
+    const { container } = render(<SubagentActivity activity={base} embedded />);
+
+    expect(container.querySelector('[data-subagent-thread-turn]')).toBeInTheDocument();
+    expect(container.querySelector('.overflow-y-auto')).not.toBeInTheDocument();
+    expect(screen.getByText('Final answer.')).toBeInTheDocument();
+  });
+
+  it('keeps the shared scroll surface pinned when activity grows at the bottom', () => {
+    let resize!: ResizeObserverCallback;
+    const resizeObserver = window.ResizeObserver as unknown as jest.Mock;
+    const originalImplementation = resizeObserver.getMockImplementation();
+    resizeObserver.mockImplementation((callback: ResizeObserverCallback) => {
+      resize = callback;
+      return { observe: jest.fn(), disconnect: jest.fn(), unobserve: jest.fn() };
+    });
+
+    const { container, unmount } = render(
+      <SubagentActivityScrollSurface padded={false}>
+        {/* eslint-disable-next-line i18next/no-literal-string */}
+        <div>Growing timeline</div>
+      </SubagentActivityScrollSurface>,
+    );
+    const surface = container.querySelector<HTMLElement>('[data-subagent-activity-scroll-surface]');
+    expect(surface).not.toBeNull();
+    Object.defineProperty(surface, 'scrollHeight', { configurable: true, value: 640 });
+
+    act(() => resize([], {} as ResizeObserver));
+    expect(surface?.scrollTop).toBe(640);
+
+    unmount();
+    if (originalImplementation == null) {
+      resizeObserver.mockReset();
+    } else {
+      resizeObserver.mockImplementation(originalImplementation);
+    }
+  });
+
   it('renders a sanitized reasoning marker through regular ContentParts', () => {
     render(
       <SubagentActivity
@@ -382,11 +520,13 @@ describe('SubagentActivity', () => {
     expect(screen.queryByText('com_ui_subagent_waiting')).not.toBeInTheDocument();
   });
 
-  it.each([
-    ['error', 'com_ui_subagent_thread_load_error'],
-    ['ready', 'com_ui_subagent_empty_result'],
-  ] as const)('renders the %s state', (state, label) => {
-    render(<SubagentActivity activity={{ ...base, items: [] }} state={state} />);
-    expect(screen.getByText(label)).toBeInTheDocument();
+  it('renders the load error state', () => {
+    render(<SubagentActivity activity={{ ...base, items: [] }} state="error" />);
+    expect(screen.getByText('com_ui_subagent_thread_load_error')).toBeInTheDocument();
+  });
+
+  it('does not describe a completed tool-only child as missing a result', () => {
+    render(<SubagentActivity activity={{ ...base, status: 'completed', items: [] }} />);
+    expect(screen.queryByText('com_ui_subagent_empty_result')).not.toBeInTheDocument();
   });
 });
diff --git a/client/src/components/Chat/Subagents/SubagentActivity.tsx b/client/src/components/Chat/Subagents/SubagentActivity.tsx
index 4bb6ccb1b23..b3b552a18a7 100644
--- a/client/src/components/Chat/Subagents/SubagentActivity.tsx
+++ b/client/src/components/Chat/Subagents/SubagentActivity.tsx
@@ -1,9 +1,10 @@
 import { useCallback, useEffect, useId, useMemo, useRef, useState } from 'react';
 import { Button } from '@librechat/client';
 import { ContentTypes } from 'librechat-data-provider';
-import { ArrowDown, Maximize2, Minimize2 } from 'lucide-react';
+import { ArrowDown, CheckCircle2, Clock3, Maximize2, Minimize2, XCircle } from 'lucide-react';
 import type { TMessageContentParts } from 'librechat-data-provider';
 import type { ChildActivity, ChildActivityItem } from './adapters';
+import type { TranslationKeys } from '~/hooks';
 import MarkdownLite from '~/components/Chat/Messages/Content/MarkdownLite';
 import ContentParts from '~/components/Chat/Messages/Content/ContentParts';
 import { subagentStatusIcon, subagentStatusLabelKey } from './status';
@@ -13,6 +14,165 @@ import { useLocalize } from '~/hooks';
 import { cn } from '~/utils';
 
 const AT_BOTTOM_THRESHOLD_PX = 120;
+const CONTROL_ACTION_LABELS = {
+  steer: 'com_ui_subagent_control_steer',
+  queue: 'com_ui_subagent_control_queue',
+  interrupt: 'com_ui_subagent_control_interrupt',
+  cancel: 'com_ui_subagent_control_cancel',
+  cancel_message: 'com_ui_subagent_control_cancel_message',
+} as const satisfies Record<string, TranslationKeys>;
+const CONTROL_STATUS_LABELS = {
+  submitted: 'com_ui_subagent_control_status_submitted',
+  accepted: 'com_ui_subagent_control_status_accepted',
+  applied: 'com_ui_subagent_control_status_applied',
+  rejected: 'com_ui_subagent_control_status_rejected',
+  failed: 'com_ui_subagent_control_status_failed',
+} as const satisfies Record<string, TranslationKeys>;
+const CONTROL_REASON_LABELS: Record<string, TranslationKeys> = {
+  control_not_found: 'com_ui_subagent_control_reason_control_not_found',
+  invalid_command: 'com_ui_subagent_control_reason_invalid_command',
+  owner_unavailable: 'com_ui_subagent_control_reason_owner_unavailable',
+  task_inaccessible: 'com_ui_subagent_control_reason_task_inaccessible',
+  task_cancelled: 'com_ui_subagent_control_reason_task_cancelled',
+  task_completed: 'com_ui_subagent_control_reason_task_completed',
+  task_failed: 'com_ui_subagent_control_reason_task_failed',
+  task_not_running: 'com_ui_subagent_control_reason_task_not_running',
+  withdrawn: 'com_ui_subagent_control_reason_withdrawn',
+};
+
+function SubagentControlHistory({
+  controls,
+  onCancelControl,
+}: {
+  controls: NonNullable<ChildActivity['controls']>;
+  onCancelControl?: (controlId: string) => void;
+}) {
+  const localize = useLocalize();
+  if (controls.length === 0) return null;
+  /** Storage keeps actionable accepted receipts ahead of bounded terminal history.
+   * Presentation restores chronology without changing that retention priority. */
+  const chronologicalControls = controls
+    .map((control, index) => ({ control, index }))
+    .sort(
+      (left, right) =>
+        left.control.createdAt.localeCompare(right.control.createdAt) || left.index - right.index,
+    )
+    .map(({ control }) => control);
+  return (
+    <section aria-label={localize('com_ui_subagent_control_history')} className="mb-3 space-y-2">
+      {chronologicalControls.map((control) => {
+        const pending = control.status === 'submitted' || control.status === 'accepted';
+        let StatusIcon = XCircle;
+        if (pending) StatusIcon = Clock3;
+        if (control.status === 'applied') StatusIcon = CheckCircle2;
+        return (
+          <div
+            key={control.invocationId}
+            className="rounded-lg border border-border-light bg-surface-secondary px-3 py-2 text-sm"
+          >
+            <div className="flex items-center gap-2">
+              <StatusIcon size={14} aria-hidden className="shrink-0 text-text-secondary" />
+              <span className="font-medium">{localize(CONTROL_ACTION_LABELS[control.action])}</span>
+              <span className="ml-auto text-xs text-text-secondary" aria-live="polite">
+                {localize(CONTROL_STATUS_LABELS[control.status])}
+              </span>
+            </div>
+            {control.message != null && control.message !== '' && (
+              <div className="mt-1 break-words text-text-secondary">
+                {control.message}
+                {control.messageTruncated === true && (
+                  <span className="ml-1 text-xs italic">
+                    {localize('com_ui_subagent_control_message_truncated')}
+                  </span>
+                )}
+              </div>
+            )}
+            {control.reason != null && (
+              <div className="mt-1 text-xs text-status-error">
+                {localize(
+                  CONTROL_REASON_LABELS[control.reason] ??
+                    'com_ui_subagent_control_reason_invalid_command',
+                )}
+              </div>
+            )}
+            {control.status === 'accepted' &&
+              control.controlId != null &&
+              onCancelControl != null && (
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="sm"
+                  className="mt-1 h-7 px-2 text-xs"
+                  onClick={() => onCancelControl(control.controlId as string)}
+                >
+                  {localize('com_ui_subagent_control_withdraw')}
+                </Button>
+              )}
+          </div>
+        );
+      })}
+    </section>
+  );
+}
+
+export function SubagentActivityScrollSurface({
+  children,
+  padded = true,
+}: {
+  children: React.ReactNode;
+  padded?: boolean;
+}) {
+  const localize = useLocalize();
+  const scrollRef = useRef<HTMLDivElement>(null);
+  const contentRef = useRef<HTMLDivElement>(null);
+  const [isAtBottom, setIsAtBottom] = useState(true);
+
+  useEffect(() => {
+    const scroll = scrollRef.current;
+    const content = contentRef.current;
+    if (scroll == null || content == null || typeof ResizeObserver === 'undefined') return;
+    const observer = new ResizeObserver(() => {
+      if (isAtBottom) scroll.scrollTop = scroll.scrollHeight;
+    });
+    observer.observe(content);
+    return () => observer.disconnect();
+  }, [isAtBottom]);
+
+  const handleScroll = useCallback((event: React.UIEvent<HTMLDivElement>) => {
+    const element = event.currentTarget;
+    setIsAtBottom(
+      element.scrollHeight - element.scrollTop - element.clientHeight <= AT_BOTTOM_THRESHOLD_PX,
+    );
+  }, []);
+
+  return (
+    <div
+      ref={scrollRef}
+      onScroll={handleScroll}
+      className={cn('relative min-h-0 flex-1 overflow-y-auto', padded && 'px-4 py-4')}
+      data-subagent-activity-scroll-surface
+    >
+      {!isAtBottom && (
+        <Button
+          variant="ghost"
+          size="icon"
+          onClick={() => {
+            scrollRef.current?.scrollTo({
+              top: scrollRef.current.scrollHeight,
+              behavior: 'smooth',
+            });
+            setIsAtBottom(true);
+          }}
+          aria-label={localize('com_ui_subagent_scroll_to_bottom')}
+          className="sticky top-[calc(100%-2.75rem)] z-10 ml-auto h-8 w-8 rounded-full border border-border-light bg-surface-secondary text-text-secondary shadow-md"
+        >
+          <ArrowDown size={16} aria-hidden />
+        </Button>
+      )}
+      <div ref={contentRef}>{children}</div>
+    </div>
+  );
+}
 
 const toContentPart = (
   item: ChildActivityItem,
@@ -122,15 +282,16 @@ export default function SubagentActivity({
   activity,
   activityId,
   state = 'ready',
+  embedded = false,
+  onCancelControl,
 }: {
   activity: ChildActivity;
   activityId?: string;
   state?: 'ready' | 'loading' | 'error';
+  embedded?: boolean;
+  onCancelControl?: (controlId: string) => void;
 }) {
   const localize = useLocalize();
-  const scrollRef = useRef<HTMLDivElement>(null);
-  const contentRef = useRef<HTMLDivElement>(null);
-  const [isAtBottom, setIsAtBottom] = useState(true);
   const isSubmitting = activity.status === 'running' || activity.status === 'dispatched';
   const StatusIcon = subagentStatusIcon(activity.status);
   const reasoningMarkerLabel = localize('com_ui_subagent_ticker_reasoning');
@@ -146,24 +307,6 @@ export default function SubagentActivity({
         (item.type === 'tool' && (item.inputTruncated === true || item.outputTruncated === true)),
     );
 
-  useEffect(() => {
-    const scroll = scrollRef.current;
-    const content = contentRef.current;
-    if (scroll == null || content == null || typeof ResizeObserver === 'undefined') return;
-    const observer = new ResizeObserver(() => {
-      if (isAtBottom) scroll.scrollTop = scroll.scrollHeight;
-    });
-    observer.observe(content);
-    return () => observer.disconnect();
-  }, [isAtBottom]);
-
-  const handleScroll = useCallback((event: React.UIEvent<HTMLDivElement>) => {
-    const element = event.currentTarget;
-    setIsAtBottom(
-      element.scrollHeight - element.scrollTop - element.clientHeight <= AT_BOTTOM_THRESHOLD_PX,
-    );
-  }, []);
-
   let body: React.ReactNode;
   if (state === 'loading') {
     body = (
@@ -182,11 +325,7 @@ export default function SubagentActivity({
       <Container>
         <EmptyText />
       </Container>
-    ) : (
-      <div className="rounded-lg border border-border-light bg-surface-secondary p-3 text-sm text-text-secondary">
-        {localize('com_ui_subagent_empty_result')}
-      </div>
-    );
+    ) : null;
   } else {
     body = (
       <ContentParts
@@ -201,54 +340,56 @@ export default function SubagentActivity({
     );
   }
 
-  return (
-    <div className="flex min-h-0 flex-1 flex-col">
-      <div className="shrink-0 border-b border-border-light px-4 py-2">
-        <div
-          className={cn(
-            'flex items-center gap-1 text-xs text-text-secondary',
-            activity.status === 'failed' || activity.status === 'interrupted'
-              ? 'text-status-error'
-              : '',
-          )}
-          aria-live="polite"
-        >
-          <StatusIcon size={13} aria-hidden />
-          <span>{localize(subagentStatusLabelKey(activity.status))}</span>
-        </div>
-      </div>
+  const statusHeader = (
+    <div className="shrink-0 border-b border-border-light px-4 py-2">
       <div
-        ref={scrollRef}
-        onScroll={handleScroll}
-        className="relative min-h-0 flex-1 overflow-y-auto px-4 py-4"
-      >
-        {!isAtBottom && (
-          <Button
-            variant="ghost"
-            size="icon"
-            onClick={() => {
-              scrollRef.current?.scrollTo({
-                top: scrollRef.current.scrollHeight,
-                behavior: 'smooth',
-              });
-              setIsAtBottom(true);
-            }}
-            aria-label={localize('com_ui_subagent_scroll_to_bottom')}
-            className="sticky top-[calc(100%-2.75rem)] z-10 ml-auto h-8 w-8 rounded-full border border-border-light bg-surface-secondary text-text-secondary shadow-md"
-          >
-            <ArrowDown size={16} aria-hidden />
-          </Button>
+        className={cn(
+          'flex items-center gap-1 text-xs text-text-secondary',
+          activity.status === 'failed' || activity.status === 'interrupted'
+            ? 'text-status-error'
+            : '',
         )}
-        <div ref={contentRef} className="flex max-w-full flex-col gap-0">
-          {activity.prompt != null && <SubagentPrompt prompt={activity.prompt} />}
-          {activityTruncated && (
-            <div className="mb-3 text-xs italic text-text-secondary">
-              {localize('com_ui_subagent_thread_history_truncated')}
-            </div>
-          )}
-          {body}
-        </div>
+        aria-live="polite"
+      >
+        <StatusIcon size={13} aria-hidden />
+        <span>{localize(subagentStatusLabelKey(activity.status))}</span>
       </div>
     </div>
   );
+  const content = (
+    <div className="flex max-w-full flex-col gap-0">
+      {activity.prompt != null && <SubagentPrompt prompt={activity.prompt} />}
+      <SubagentControlHistory
+        controls={activity.controls ?? []}
+        onCancelControl={onCancelControl}
+      />
+      {activity.controlsTruncated === true && (
+        <div className="mb-3 text-xs italic text-text-secondary">
+          {localize('com_ui_subagent_control_history_truncated')}
+        </div>
+      )}
+      {activityTruncated && (
+        <div className="mb-3 text-xs italic text-text-secondary">
+          {localize('com_ui_subagent_thread_history_truncated')}
+        </div>
+      )}
+      {body}
+    </div>
+  );
+
+  if (embedded) {
+    return (
+      <section className="border-b border-border-light last:border-b-0" data-subagent-thread-turn>
+        {statusHeader}
+        <div className="px-4 py-4">{content}</div>
+      </section>
+    );
+  }
+
+  return (
+    <div className="flex min-h-0 flex-1 flex-col">
+      {statusHeader}
+      <SubagentActivityScrollSurface>{content}</SubagentActivityScrollSurface>
+    </div>
+  );
 }
diff --git a/client/src/components/Chat/Subagents/SubagentThreadPanel.test.tsx b/client/src/components/Chat/Subagents/SubagentThreadPanel.test.tsx
index 63e96f6ec92..4e429803fc0 100644
--- a/client/src/components/Chat/Subagents/SubagentThreadPanel.test.tsx
+++ b/client/src/components/Chat/Subagents/SubagentThreadPanel.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { RecoilRoot, useRecoilValue } from 'recoil';
 import { ContentTypes, ForkOptions } from 'librechat-data-provider';
+import { RecoilRoot, useRecoilValue, useSetRecoilState } from 'recoil';
 import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
 import type {
   ParentSubagentSummary,
@@ -19,6 +19,7 @@ import SubagentThreadPanel from './SubagentThreadPanel';
 const mockUseSubagentThreadQuery = jest.fn();
 const mockUseSubagentActivityStream = jest.fn();
 const mockForkMutate = jest.fn();
+const mockControlMutate = jest.fn();
 const mockNavigateToConvo = jest.fn();
 const mockShowToast = jest.fn();
 const mockApprovalProviderMounted = jest.fn();
@@ -43,6 +44,17 @@ jest.mock('~/data-provider', () => ({
     mutate: (payload: unknown) => mockForkMutate(payload, options),
     isLoading: false,
   }),
+  useSubagentControlMutation: (options: {
+    onSuccess: (result: unknown, variables: unknown) => void;
+    onError: (error: unknown, variables: unknown) => void;
+  }) => ({
+    mutate: (variables: unknown) =>
+      mockControlMutate(variables, {
+        onSuccess: (result: unknown) => options.onSuccess(result, variables),
+        onError: (error: unknown) => options.onError(error, variables),
+      }),
+    isLoading: false,
+  }),
 }));
 
 jest.mock('~/data-provider/Subagents/useSubagentActivityStream', () => ({
@@ -90,18 +102,46 @@ jest.mock('~/components/Chat/Messages/Content/MarkdownLite', () => ({
 
 jest.mock('./SubagentActivity', () => ({
   __esModule: true,
+  SubagentActivityScrollSurface: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="shared-scroll-surface">{children}</div>
+  ),
   default: ({
     activity,
+    activityId,
     state,
+    onCancelControl,
   }: {
-    activity: { status: string; prompt?: string; items: Array<{ type: string; text?: string }> };
+    activity: {
+      status: string;
+      prompt?: string;
+      items: Array<{ type: string; text?: string }>;
+      controls?: Array<{ invocationId: string; status: string }>;
+    };
+    activityId?: string;
     state: string;
+    onCancelControl?: (controlId: string) => void;
   }) => (
-    <div data-testid="shared-activity" data-state={state} data-status={activity.status}>
+    <div
+      data-testid="shared-activity"
+      data-activity-id={activityId}
+      data-state={state}
+      data-status={activity.status}
+      data-can-withdraw={onCancelControl != null ? 'true' : 'false'}
+    >
       {activity.prompt}
       {activity.items.map((item, index) => (
         <span key={index}>{item.text ?? item.type}</span>
       ))}
+      {activity.controls?.map((control) => (
+        <span key={control.invocationId}>{control.status}</span>
+      ))}
+      {onCancelControl != null && (
+        <button
+          type="button"
+          data-testid="withdraw-control"
+          onClick={() => onCancelControl('control-1')}
+        />
+      )}
     </div>
   ),
 }));
@@ -110,6 +150,11 @@ jest.mock('@librechat/client', () => {
   const mockReact = jest.requireActual<typeof import('react')>('react');
   const MockSelectContext = mockReact.createContext((_value: string): void => {});
   return {
+    Alert: ({ children, ...props }: React.ComponentProps<'div'>) => (
+      <div role="alert" {...props}>
+        {children}
+      </div>
+    ),
     Button: ({ children, ...props }: React.ComponentProps<'button'>) => (
       <button {...props}>{children}</button>
     ),
@@ -141,6 +186,7 @@ jest.mock('@librechat/client', () => {
         </button>
       );
     },
+    Textarea: (props: React.ComponentProps<'textarea'>) => <textarea {...props} />,
     useMediaQuery: () => mockIsMobile,
     useToastContext: () => ({ showToast: mockShowToast }),
   };
@@ -149,11 +195,15 @@ jest.mock('@librechat/client', () => {
 jest.mock('lucide-react', () => ({
   AlertCircle: () => null,
   Bot: () => null,
+  CornerDownRight: () => null,
   CheckCircle2: () => null,
   Clock3: () => null,
+  ListEnd: () => null,
   MessagesSquare: () => null,
+  OctagonX: () => null,
   X: () => null,
   XCircle: () => null,
+  Zap: () => null,
 }));
 
 const selection: ActiveSubagentPanel = {
@@ -200,10 +250,12 @@ const completedView: SubagentThreadView = {
 
 describe('SubagentThreadPanel', () => {
   beforeEach(() => {
+    window.sessionStorage.clear();
     mockIsMobile = false;
     mockApprovalProviderMounted.mockClear();
     mockApprovalProviderUnmounted.mockClear();
     mockForkMutate.mockClear();
+    mockControlMutate.mockClear();
     mockNavigateToConvo.mockClear();
     mockShowToast.mockClear();
     mockRefreshParentChildren.mockClear();
@@ -260,6 +312,499 @@ describe('SubagentThreadPanel', () => {
     );
   });
 
+  it('submits one command invocation, blocks duplicate clicks, and shows its receipt', async () => {
+    mockUseSubagentThreadQuery.mockReturnValue({
+      data: { ...completedView, status: 'running', controlReceipts: [] },
+      isLoading: false,
+      isError: false,
+      isReadinessPending: false,
+    });
+    render(
+      <RecoilRoot initializeState={({ set }) => set(activeSubagentPanel, selection)}>
+        <SubagentThreadPanel selection={selection} />
+      </RecoilRoot>,
+    );
+
+    fireEvent.change(screen.getByLabelText('com_ui_subagent_control_message'), {
+      target: { value: 'Check the primary source.' },
+    });
+    const queue = screen.getByRole('button', { name: 'com_ui_queue' });
+    fireEvent.click(queue);
+    fireEvent.click(queue);
+
+    expect(mockControlMutate).toHaveBeenCalledTimes(1);
+    const [variables, callbacks] = mockControlMutate.mock.calls[0] as [
+      {
+        parentConversationId: string;
+        threadId: string;
+        command: { taskId: string; invocationId: string; action: string; message: string };
+      },
+      { onSuccess: (value: unknown) => void },
+    ];
+    expect(variables).toEqual({
+      parentConversationId: 'parent-conversation',
+      threadId: 'child-thread',
+      submittedAt: expect.any(String),
+      command: {
+        taskId: 'task',
+        invocationId: expect.any(String),
+        action: 'queue',
+        message: 'Check the primary source.',
+      },
+    });
+    act(() => {
+      callbacks.onSuccess({
+        receipt: {
+          invocationId: variables.command.invocationId,
+          controlId: 'control-1',
+          action: 'queue',
+          status: 'accepted',
+          createdAt: '2026-08-24T12:00:00.000Z',
+          updatedAt: '2026-08-24T12:00:00.000Z',
+        },
+      });
+    });
+    expect(screen.getByText('accepted')).toBeInTheDocument();
+    expect(screen.getByTestId('shared-activity')).toHaveAttribute('data-can-withdraw', 'true');
+  });
+
+  it('retries an unavailable owner with the same authoritative invocation id', () => {
+    mockUseSubagentThreadQuery.mockReturnValue({
+      data: { ...completedView, status: 'running', controlReceipts: [] },
+      isLoading: false,
+      isError: false,
+      isReadinessPending: false,
+    });
+    render(
+      <RecoilRoot initializeState={({ set }) => set(activeSubagentPanel, selection)}>
+        <SubagentThreadPanel selection={selection} />
+      </RecoilRoot>,
+    );
+
+    fireEvent.change(screen.getByLabelText('com_ui_subagent_control_message'), {
+      target: { value: 'Use the primary source.' },
+    });
+    fireEvent.click(screen.getByRole('button', { name: 'com_ui_steer' }));
+    const firstCommand = mockControlMutate.mock.calls[0][0].command;
+    act(() => {
+      mockControlMutate.mock.calls[0][1].onError({ response: { status: 503 } });
+    });
+
+    expect(screen.getByLabelText('com_ui_subagent_control_message')).toBeDisabled();
+    expect(screen.getByRole('button', { name: 'com_ui_subagent_cancel_task' })).toBeDisabled();
+    expect(screen.getByTestId('shared-activity')).toHaveAttribute('data-can-withdraw', 'false');
+
+    fireEvent.click(screen.getByRole('button', { name: 'com_ui_retry' }));
+
+    expect(mockControlMutate).toHaveBeenCalledTimes(2);
+    expect(mockControlMutate.mock.calls[1][0].command).toEqual(firstCommand);
+  });
+
+  it('releases the composer after a definitive policy rejection', () => {
+    mockUseSubagentThreadQuery.mockReturnValue({
+      data: { ...completedView, status: 'running', controlReceipts: [] },
+      isLoading: false,
+      isError: false,
+      isReadinessPending: false,
+    });
+    render(
+      <RecoilRoot initializeState={({ set }) => set(activeSubagentPanel, selection)}>
+        <SubagentThreadPanel selection={selection} />
+      </RecoilRoot>,
+    );
+
+    fireEvent.change(screen.getByLabelText('com_ui_subagent_control_message'), {
+      target: { value: 'Blocked guidance.' },
+    });
+    fireEvent.click(screen.getByRole('button', { name: 'com_ui_steer' }));
+    act(() => {
+      mockControlMutate.mock.calls[0][1].onError({ response: { status: 400 } });
+    });
+
+    expect(screen.getByText('com_ui_subagent_control_reason_invalid_command')).toBeInTheDocument();
+    expect(screen.queryByRole('button', { name: 'com_ui_retry' })).not.toBeInTheDocument();
+    expect(screen.getByLabelText('com_ui_subagent_control_message')).toBeEnabled();
+    expect(screen.getByRole('button', { name: 'com_ui_subagent_cancel_task' })).toBeEnabled();
+  });
+
+  it('retains an ambiguous invocation across closing and reopening the panel', () => {
+    mockUseSubagentThreadQuery.mockReturnValue({
+      data: { ...completedView, status: 'running', controlReceipts: [] },
+      isLoading: false,
+      isError: false,
+      isReadinessPending: false,
+    });
+    const PanelHost = () => {
+      const current = useRecoilValue(activeSubagentPanel);
+      const setCurrent = useSetRecoilState(activeSubagentPanel);
+      return current == null ? (
+        <button type="button" onClick={() => setCurrent(selection)}>
+          {selection.subagentType}
+        </button>
+      ) : (
+        <SubagentThreadPanel selection={current} />
+      );
+    };
+    render(
+      <RecoilRoot initializeState={({ set }) => set(activeSubagentPanel, selection)}>
+        <PanelHost />
+      </RecoilRoot>,
+    );
+
+    fireEvent.change(screen.getByLabelText('com_ui_subagent_control_message'), {
+      target: { value: 'Use the primary source.' },
+    });
+    fireEvent.click(screen.getByRole('button', { name: 'com_ui_queue' }));
+    const firstCommand = mockControlMutate.mock.calls[0][0].command;
+    act(() => {
+      mockControlMutate.mock.calls[0][1].onError({ response: { status: 503 } });
+    });
+    fireEvent.click(screen.getByRole('button', { name: 'com_ui_close' }));
+    fireEvent.click(screen.getByRole('button', { name: selection.subagentType }));
+
+    expect(screen.getByRole('button', { name: 'com_ui_retry' })).toBeInTheDocument();
+    fireEvent.click(screen.getByRole('button', { name: 'com_ui_retry' }));
+    expect(mockControlMutate.mock.calls[1][0].command).toEqual(firstCommand);
+  });
+
+  it('retains an ambiguous invocation across a full page-state reload', () => {
+    mockUseSubagentThreadQuery.mockReturnValue({
+      data: { ...completedView, status: 'running', controlReceipts: [] },
+      isLoading: false,
+      isError: false,
+      isReadinessPending: false,
+    });
+    const first = render(
+      <RecoilRoot>
+        <SubagentThreadPanel selection={selection} />
+      </RecoilRoot>,
+    );
+
+    fireEvent.change(screen.getByLabelText('com_ui_subagent_control_message'), {
+      target: { value: 'Keep the same invocation.' },
+    });
+    fireEvent.click(screen.getByRole('button', { name: 'com_ui_queue' }));
+    const firstCommand = mockControlMutate.mock.calls[0][0].command;
+    act(() => {
+      mockControlMutate.mock.calls[0][1].onError({ response: { status: 503 } });
+    });
+    first.unmount();
+
+    render(
+      <RecoilRoot>
+        <SubagentThreadPanel selection={selection} />
+      </RecoilRoot>,
+    );
+    expect(screen.getByRole('button', { name: 'com_ui_retry' })).toBeInTheDocument();
+    fireEvent.click(screen.getByRole('button', { name: 'com_ui_retry' }));
+    expect(mockControlMutate.mock.calls[1][0].command).toEqual(firstCommand);
+  });
+
+  it('records an ambiguous result after the panel closes before the mutation settles', () => {
+    mockUseSubagentThreadQuery.mockReturnValue({
+      data: { ...completedView, status: 'running', controlReceipts: [] },
+      isLoading: false,
+      isError: false,
+      isReadinessPending: false,
+    });
+    const PanelHost = () => {
+      const current = useRecoilValue(activeSubagentPanel);
+      const setCurrent = useSetRecoilState(activeSubagentPanel);
+      return current == null ? (
+        <button type="button" onClick={() => setCurrent(selection)}>
+          {selection.subagentType}
+        </button>
+      ) : (
+        <SubagentThreadPanel selection={current} />
+      );
+    };
+    render(
+      <RecoilRoot initializeState={({ set }) => set(activeSubagentPanel, selection)}>
+        <PanelHost />
+      </RecoilRoot>,
+    );
+
+    fireEvent.change(screen.getByLabelText('com_ui_subagent_control_message'), {
+      target: { value: 'Retry after closing.' },
+    });
+    fireEvent.click(screen.getByRole('button', { name: 'com_ui_queue' }));
+    const firstCommand = mockControlMutate.mock.calls[0][0].command;
+    fireEvent.click(screen.getByRole('button', { name: 'com_ui_close' }));
+    act(() => {
+      mockControlMutate.mock.calls[0][1].onError({ response: { status: 503 } });
+    });
+    fireEvent.click(screen.getByRole('button', { name: selection.subagentType }));
+
+    expect(screen.getByRole('button', { name: 'com_ui_retry' })).toBeInTheDocument();
+    fireEvent.click(screen.getByRole('button', { name: 'com_ui_retry' }));
+    expect(mockControlMutate.mock.calls[1][0].command).toEqual(firstCommand);
+  });
+
+  it('keeps an unavailable-owner retry visible if the child settles before the receipt appears', () => {
+    mockUseSubagentThreadQuery.mockReturnValue({
+      data: { ...completedView, status: 'running', controlReceipts: [] },
+      isLoading: false,
+      isError: false,
+      isReadinessPending: false,
+    });
+    const { rerender } = render(
+      <RecoilRoot initializeState={({ set }) => set(activeSubagentPanel, selection)}>
+        <SubagentThreadPanel selection={selection} />
+      </RecoilRoot>,
+    );
+
+    fireEvent.change(screen.getByLabelText('com_ui_subagent_control_message'), {
+      target: { value: 'Use the primary source.' },
+    });
+    fireEvent.click(screen.getByRole('button', { name: 'com_ui_steer' }));
+    act(() => {
+      mockControlMutate.mock.calls[0][1].onError({ response: { status: 503 } });
+    });
+
+    mockUseSubagentThreadQuery.mockReturnValue({
+      data: completedView,
+      isLoading: false,
+      isError: false,
+      isReadinessPending: false,
+    });
+    rerender(
+      <RecoilRoot initializeState={({ set }) => set(activeSubagentPanel, selection)}>
+        <SubagentThreadPanel selection={selection} />
+      </RecoilRoot>,
+    );
+
+    expect(
+      screen.getByText('com_ui_subagent_control_reason_owner_unavailable'),
+    ).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'com_ui_retry' })).toBeInTheDocument();
+    expect(screen.queryByLabelText('com_ui_subagent_control_message')).not.toBeInTheDocument();
+  });
+
+  it('preserves drafted guidance when withdrawing an accepted control', () => {
+    mockUseSubagentThreadQuery.mockReturnValue({
+      data: {
+        ...completedView,
+        status: 'running',
+        controlReceipts: [
+          {
+            invocationId: 'accepted-control',
+            controlId: 'control-1',
+            action: 'queue',
+            status: 'accepted',
+            createdAt: '2026-08-24T12:00:00.000Z',
+            updatedAt: '2026-08-24T12:00:00.000Z',
+          },
+        ],
+      },
+      isLoading: false,
+      isError: false,
+      isReadinessPending: false,
+    });
+    render(
+      <RecoilRoot initializeState={({ set }) => set(activeSubagentPanel, selection)}>
+        <SubagentThreadPanel selection={selection} />
+      </RecoilRoot>,
+    );
+
+    const composer = screen.getByLabelText('com_ui_subagent_control_message');
+    fireEvent.change(composer, { target: { value: 'Keep this draft.' } });
+    fireEvent.click(screen.getByTestId('withdraw-control'));
+    const command = mockControlMutate.mock.calls[0][0].command;
+    act(() => {
+      mockControlMutate.mock.calls[0][1].onSuccess({
+        receipt: {
+          invocationId: command.invocationId,
+          controlId: 'control-1',
+          action: 'cancel_message',
+          status: 'applied',
+          createdAt: '2026-08-24T12:00:01.000Z',
+          updatedAt: '2026-08-24T12:00:01.000Z',
+        },
+      });
+    });
+
+    expect(composer).toHaveValue('Keep this draft.');
+  });
+
+  it('clears transient retry state when refresh returns the same durable invocation', () => {
+    mockUseSubagentThreadQuery.mockReturnValue({
+      data: { ...completedView, status: 'running', controlReceipts: [] },
+      isLoading: false,
+      isError: false,
+      isReadinessPending: false,
+    });
+    const { rerender } = render(
+      <RecoilRoot initializeState={({ set }) => set(activeSubagentPanel, selection)}>
+        <SubagentThreadPanel selection={selection} />
+      </RecoilRoot>,
+    );
+
+    fireEvent.change(screen.getByLabelText('com_ui_subagent_control_message'), {
+      target: { value: 'Use the primary source.' },
+    });
+    fireEvent.click(screen.getByRole('button', { name: 'com_ui_steer' }));
+    const command = mockControlMutate.mock.calls[0][0].command;
+    act(() => {
+      mockControlMutate.mock.calls[0][1].onError({ response: { status: 503 } });
+    });
+    expect(screen.getByRole('button', { name: 'com_ui_retry' })).toBeInTheDocument();
+    expect(window.sessionStorage.length).toBe(1);
+
+    mockUseSubagentThreadQuery.mockReturnValue({
+      data: {
+        ...completedView,
+        status: 'running',
+        controlReceipts: [
+          {
+            invocationId: command.invocationId,
+            action: 'steer',
+            status: 'applied',
+            createdAt: '2026-08-24T12:00:00.000Z',
+            updatedAt: '2026-08-24T12:00:01.000Z',
+          },
+        ],
+      },
+      isLoading: false,
+      isError: false,
+      isReadinessPending: false,
+    });
+    rerender(
+      <RecoilRoot initializeState={({ set }) => set(activeSubagentPanel, selection)}>
+        <SubagentThreadPanel selection={selection} />
+      </RecoilRoot>,
+    );
+
+    expect(screen.getByText('applied')).toBeInTheDocument();
+    expect(screen.queryByRole('button', { name: 'com_ui_retry' })).not.toBeInTheDocument();
+    expect(screen.getByLabelText('com_ui_subagent_control_message')).toHaveValue('');
+    expect(
+      screen.queryByText('com_ui_subagent_control_reason_owner_unavailable'),
+    ).not.toBeInTheDocument();
+    expect(window.sessionStorage.length).toBe(0);
+  });
+
+  it('closes stale running controls after task cancellation is applied', () => {
+    mockUseSubagentThreadQuery.mockReturnValue({
+      data: { ...completedView, status: 'running', controlReceipts: [] },
+      isLoading: false,
+      isError: false,
+      isReadinessPending: false,
+    });
+    render(
+      <RecoilRoot initializeState={({ set }) => set(activeSubagentPanel, selection)}>
+        <SubagentThreadPanel selection={selection} />
+      </RecoilRoot>,
+    );
+
+    fireEvent.click(screen.getByRole('button', { name: 'com_ui_subagent_cancel_task' }));
+    const command = mockControlMutate.mock.calls[0][0].command;
+    act(() => {
+      mockControlMutate.mock.calls[0][1].onSuccess({
+        receipt: {
+          invocationId: command.invocationId,
+          action: 'cancel',
+          status: 'applied',
+          createdAt: '2026-08-24T12:00:00.000Z',
+          updatedAt: '2026-08-24T12:00:01.000Z',
+        },
+      });
+    });
+
+    expect(screen.queryByLabelText('com_ui_subagent_control_message')).not.toBeInTheDocument();
+    expect(
+      screen.queryByRole('button', { name: 'com_ui_subagent_cancel_task' }),
+    ).not.toBeInTheDocument();
+    expect(screen.getByTestId('shared-activity')).toHaveAttribute('data-can-withdraw', 'false');
+  });
+
+  it('reports an inaccessible task without offering a misleading retry', () => {
+    mockUseSubagentThreadQuery.mockReturnValue({
+      data: { ...completedView, status: 'running', controlReceipts: [] },
+      isLoading: false,
+      isError: false,
+      isReadinessPending: false,
+    });
+    render(
+      <RecoilRoot initializeState={({ set }) => set(activeSubagentPanel, selection)}>
+        <SubagentThreadPanel selection={selection} />
+      </RecoilRoot>,
+    );
+
+    fireEvent.click(screen.getByRole('button', { name: 'com_ui_subagent_cancel_task' }));
+    act(() => {
+      mockControlMutate.mock.calls[0][1].onError({ response: { status: 404 } });
+    });
+
+    expect(
+      screen.getByText('com_ui_subagent_control_reason_task_inaccessible'),
+    ).toBeInTheDocument();
+    expect(screen.queryByRole('button', { name: 'com_ui_retry' })).not.toBeInTheDocument();
+    expect(screen.queryByLabelText('com_ui_subagent_control_message')).not.toBeInTheDocument();
+    expect(
+      screen.queryByRole('button', { name: 'com_ui_subagent_cancel_task' }),
+    ).not.toBeInTheDocument();
+    expect(screen.getByTestId('shared-activity')).toHaveAttribute('data-can-withdraw', 'false');
+  });
+
+  it('renders rejected and refreshed applied receipts independently from child status', () => {
+    mockUseSubagentThreadQuery.mockReturnValue({
+      data: {
+        ...completedView,
+        status: 'running',
+        controlReceipts: [
+          {
+            invocationId: 'persisted',
+            action: 'interrupt',
+            status: 'applied',
+            createdAt: '2026-08-24T12:00:00.000Z',
+            updatedAt: '2026-08-24T12:00:01.000Z',
+          },
+          {
+            invocationId: 'terminal-race',
+            action: 'steer',
+            status: 'rejected',
+            createdAt: '2026-08-24T12:00:02.000Z',
+            updatedAt: '2026-08-24T12:00:03.000Z',
+            reason: 'task_completed',
+          },
+        ],
+      },
+      isLoading: false,
+      isError: false,
+      isReadinessPending: false,
+    });
+
+    render(
+      <RecoilRoot initializeState={({ set }) => set(activeSubagentPanel, selection)}>
+        <SubagentThreadPanel selection={selection} />
+      </RecoilRoot>,
+    );
+
+    expect(screen.getByText('applied')).toBeInTheDocument();
+    expect(screen.getByText('rejected')).toBeInTheDocument();
+    expect(screen.getByTestId('shared-activity')).toHaveAttribute('data-status', 'running');
+    expect(screen.queryByLabelText('com_ui_subagent_control_message')).not.toBeInTheDocument();
+    expect(screen.getByTestId('shared-activity')).toHaveAttribute('data-can-withdraw', 'false');
+  });
+
+  it('does not expose task controls after the selected child is terminal', () => {
+    mockUseSubagentThreadQuery.mockReturnValue({
+      data: completedView,
+      isLoading: false,
+      isError: false,
+      isReadinessPending: false,
+    });
+
+    render(
+      <RecoilRoot initializeState={({ set }) => set(activeSubagentPanel, selection)}>
+        <SubagentThreadPanel selection={selection} />
+      </RecoilRoot>,
+    );
+
+    expect(screen.queryByLabelText('com_ui_subagent_control_message')).not.toBeInTheDocument();
+    expect(screen.getByTestId('shared-activity')).toHaveAttribute('data-can-withdraw', 'false');
+  });
+
   it('renders foreground persisted activity through the same shared panel without a durable read', () => {
     mockUseSubagentThreadQuery.mockReturnValue({
       data: undefined,
@@ -550,6 +1095,9 @@ describe('SubagentThreadPanel', () => {
       { refetchInterval: 2000 },
     );
     expect(mockUseSubagentActivityStream).toHaveBeenLastCalledWith(eventSelection, true);
+    expect(
+      screen.queryByRole('combobox', { name: 'com_ui_subagent_turn' }),
+    ).not.toBeInTheDocument();
     await waitFor(() => expect(refetch).toHaveBeenCalled());
   });
 
@@ -627,7 +1175,7 @@ describe('SubagentThreadPanel', () => {
     expect(screen.getByRole('dialog')).toHaveAttribute('aria-modal', 'true');
   });
 
-  it('navigates event actors and exact durable turns through the same panel', () => {
+  it('navigates event actors and renders exact durable turns as one chronological thread', () => {
     const first: ParentSubagentSummary = {
       threadId: 'child-thread',
       parentMessageId: 'parent-message',
@@ -656,7 +1204,10 @@ describe('SubagentThreadPanel', () => {
       tasks: [{ taskId: 'task-2', status: 'running' }],
       status: 'running',
     };
-    mockParentChildrenByMessage = new Map([['parent-message', [first, second]]]);
+    mockParentChildrenByMessage = new Map([
+      ['parent-message', [first]],
+      ['assistant-message', [second]],
+    ]);
     mockParentChildrenByThread = new Map([
       [first.threadId, first],
       [second.threadId, second],
@@ -669,7 +1220,11 @@ describe('SubagentThreadPanel', () => {
     });
     const eventSelection: ActiveSubagentPanel = {
       ...selection,
-      event: { actorId: 'actor-1', progressKey: 'event-task:child-thread:task' },
+      event: {
+        actorId: 'actor-1',
+        progressKey: 'event-task:child-thread:task',
+        siblingParentMessageIds: ['parent-message', 'assistant-message'],
+      },
     };
     let active: ActiveSubagentPanel | null = eventSelection;
     const Observer = () => {
@@ -684,9 +1239,19 @@ describe('SubagentThreadPanel', () => {
       </RecoilRoot>,
     );
 
-    fireEvent.click(screen.getByRole('option', { name: 'com_ui_subagent_earlier_turn' }));
-    expect(active?.durable).toEqual({ threadId: 'child-thread', taskId: 'task-earlier' });
-    expect(active?.event?.progressKey).toBe('event-task:child-thread:task-earlier');
+    expect(screen.queryByRole('button', { name: 'com_ui_subagent_turn' })).not.toBeInTheDocument();
+    const turns = screen.getAllByTestId('shared-activity');
+    expect(turns).toHaveLength(2);
+    expect(turns[0]).toHaveAttribute(
+      'data-activity-id',
+      'parent-message\u0000tool-call\u0000task-earlier',
+    );
+    expect(turns[1]).toHaveAttribute('data-activity-id', 'parent-message\u0000tool-call\u0000task');
+    expect(mockUseSubagentThreadQuery).toHaveBeenCalledWith(
+      'parent-conversation',
+      'child-thread',
+      'task-earlier',
+    );
 
     fireEvent.click(screen.getByRole('option', { name: /Analyst Two/ }));
     expect(active).toEqual(
@@ -695,10 +1260,115 @@ describe('SubagentThreadPanel', () => {
         event: {
           actorId: 'actor-2',
           progressKey: 'event-task:child-thread-2:task-2',
+          siblingParentMessageIds: ['parent-message', 'assistant-message'],
         },
         durable: { threadId: 'child-thread-2', taskId: 'task-2' },
       }),
     );
     expect(mockRefreshParentChildren).toHaveBeenCalled();
   });
+
+  it('follows a newly appended latest turn while preserving the continuous history', async () => {
+    const eventChild: ParentSubagentSummary = {
+      threadId: 'child-thread',
+      parentMessageId: 'parent-message',
+      subagentType: 'agent-1',
+      subagentKind: 'agent',
+      agentId: 'agent-1',
+      title: 'Actor',
+      origin: 'event',
+      actorId: 'actor-1',
+      status: 'running',
+      latestTaskId: 'task-new',
+      tasks: [
+        { taskId: 'task-new', status: 'running' },
+        { taskId: 'task-old', status: 'completed' },
+      ],
+      tasksTruncated: false,
+    };
+    mockParentChildrenByMessage = new Map([['parent-message', [eventChild]]]);
+    mockParentChildrenByThread = new Map([[eventChild.threadId, eventChild]]);
+    mockUseSubagentThreadQuery.mockReturnValue({
+      data: completedView,
+      isLoading: false,
+      isError: false,
+      isReadinessPending: false,
+    });
+    const staleSelection: ActiveSubagentPanel = {
+      ...selection,
+      durable: { threadId: 'child-thread', taskId: 'task-old' },
+      event: { actorId: 'actor-1', progressKey: 'event-task:child-thread:task-old' },
+    };
+    let active: ActiveSubagentPanel | null = staleSelection;
+    const Observer = () => {
+      active = useRecoilValue(activeSubagentPanel);
+      return null;
+    };
+
+    render(
+      <RecoilRoot initializeState={({ set }) => set(activeSubagentPanel, staleSelection)}>
+        <Observer />
+        <SubagentThreadPanel selection={staleSelection} />
+      </RecoilRoot>,
+    );
+
+    await waitFor(() =>
+      expect(active?.durable).toEqual({ threadId: 'child-thread', taskId: 'task-new' }),
+    );
+    expect(screen.getAllByTestId('shared-activity')).toHaveLength(2);
+  });
+
+  it('loads retained event history in bounded pages and marks an omitted beginning', () => {
+    const tasks = Array.from({ length: 5 }, (_, index) => ({
+      taskId: `task-${5 - index}`,
+      status: 'completed' as const,
+    }));
+    const eventChild: ParentSubagentSummary = {
+      threadId: 'child-thread',
+      parentMessageId: 'parent-message',
+      subagentType: 'agent-1',
+      subagentKind: 'agent',
+      agentId: 'agent-1',
+      title: 'Actor',
+      origin: 'event',
+      actorId: 'actor-1',
+      status: 'completed',
+      latestTaskId: 'task-5',
+      tasks,
+      tasksTruncated: true,
+    };
+    mockParentChildrenByMessage = new Map([['parent-message', [eventChild]]]);
+    mockParentChildrenByThread = new Map([[eventChild.threadId, eventChild]]);
+    mockUseSubagentThreadQuery.mockReturnValue({
+      data: completedView,
+      isLoading: false,
+      isError: false,
+      isReadinessPending: false,
+    });
+    const eventSelection: ActiveSubagentPanel = {
+      ...selection,
+      durable: { threadId: 'child-thread', taskId: 'task-5' },
+      event: { actorId: 'actor-1', progressKey: 'event-task:child-thread:task-5' },
+    };
+
+    render(
+      <RecoilRoot>
+        <SubagentThreadPanel selection={eventSelection} />
+      </RecoilRoot>,
+    );
+
+    expect(screen.getAllByTestId('shared-activity')).toHaveLength(3);
+    expect(new Set(mockUseSubagentThreadQuery.mock.calls.map((call) => call[2]))).toEqual(
+      new Set(['task-5', 'task-4', 'task-3']),
+    );
+    expect(screen.queryByText('com_ui_subagent_thread_history_truncated')).not.toBeInTheDocument();
+
+    fireEvent.click(screen.getByRole('button', { name: 'com_ui_load_more' }));
+
+    expect(screen.getAllByTestId('shared-activity')).toHaveLength(5);
+    expect(new Set(mockUseSubagentThreadQuery.mock.calls.map((call) => call[2]))).toEqual(
+      new Set(['task-5', 'task-4', 'task-3', 'task-2', 'task-1']),
+    );
+    expect(screen.getByText('com_ui_subagent_thread_history_truncated')).toBeInTheDocument();
+  });
 });
diff --git a/client/src/components/Chat/Subagents/SubagentThreadPanel.tsx b/client/src/components/Chat/Subagents/SubagentThreadPanel.tsx
index 90d01d13312..59b1ec8755b 100644
--- a/client/src/components/Chat/Subagents/SubagentThreadPanel.tsx
+++ b/client/src/components/Chat/Subagents/SubagentThreadPanel.tsx
@@ -1,38 +1,98 @@
-import { useCallback, useEffect, useMemo, useRef } from 'react';
-import { Bot, MessagesSquare, X } from 'lucide-react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { v4 } from 'uuid';
 import { ForkOptions } from 'librechat-data-provider';
-import { useRecoilValue, useResetRecoilState, useSetRecoilState } from 'recoil';
+import { Bot, CornerDownRight, ListEnd, MessagesSquare, OctagonX, X, Zap } from 'lucide-react';
+import {
+  useRecoilCallback,
+  useRecoilState,
+  useRecoilValue,
+  useResetRecoilState,
+  useSetRecoilState,
+} from 'recoil';
 import {
   Button,
+  Alert,
   Select,
   SelectContent,
   SelectItem,
   SelectTrigger,
   SelectValue,
+  Textarea,
   useMediaQuery,
   useToastContext,
 } from '@librechat/client';
-import type { ActiveSubagentPanel } from '~/store/subagents';
+import type {
+  ParentSubagentTaskSummary,
+  SubagentControlAction,
+  SubagentControlReceipt,
+  SubagentControlRequest,
+} from 'librechat-data-provider';
+import type { ReactNode } from 'react';
+import type { ActiveSubagentPanel, SubagentControlUiState } from '~/store/subagents';
 import {
   ACTIVE_THREAD_REFRESH_MS,
   subagentThreadHasTaskEvidence,
   useForkConvoMutation,
+  useSubagentControlMutation,
   useSubagentThreadQuery,
 } from '~/data-provider';
 import {
   activeSubagentPanel,
+  subagentControlStateByTask,
+  subagentControlStateKey,
   subagentProgressByToolCallId,
   subagentProgressKey,
 } from '~/store/subagents';
 import useSubagentActivityStream from '~/data-provider/Subagents/useSubagentActivityStream';
+import SubagentActivity, { SubagentActivityScrollSurface } from './SubagentActivity';
 import { adaptDurableThreadActivity, adaptLivePersistedActivity } from './adapters';
 import ApprovalProvider from '~/components/Chat/Messages/Content/ApprovalContext';
-import { eventSubagentSelection, eventTaskProgressKey } from './eventSelection';
 import { useFocusTrap, useLocalize, useNavigateToConvo } from '~/hooks';
 import { useParentSubagents } from './ParentSubagentsProvider';
-import SubagentActivity from './SubagentActivity';
+import { eventSubagentSelection } from './eventSelection';
 import { useAgentsMapContext } from '~/Providers';
 
+const EVENT_TASK_PAGE_SIZE = 3;
+const TERMINAL_CONTROL_REASONS = new Set([
+  'task_not_running',
+  'task_completed',
+  'task_cancelled',
+  'task_failed',
+]);
+
+const isTerminalControlReason = (reason?: string): boolean =>
+  reason != null && TERMINAL_CONTROL_REASONS.has(reason);
+
+const closesTaskControls = (receipt: SubagentControlReceipt): boolean =>
+  isTerminalControlReason(receipt.reason) ||
+  (receipt.action === 'cancel' && receipt.status === 'applied');
+
+const responseStatus = (error: unknown): number | undefined =>
+  typeof error === 'object' &&
+  error != null &&
+  'response' in error &&
+  typeof error.response === 'object' &&
+  error.response != null &&
+  'status' in error.response &&
+  typeof error.response.status === 'number'
+    ? error.response.status
+    : undefined;
+
+const failedControlReason = (
+  inaccessible: boolean,
+  retryable: boolean,
+): 'task_inaccessible' | 'owner_unavailable' | 'invalid_command' => {
+  if (inaccessible) return 'task_inaccessible';
+  if (retryable) return 'owner_unavailable';
+  return 'invalid_command';
+};
+
+const failedControlLocaleKey = (reason?: string) => {
+  if (reason === 'task_inaccessible') return 'com_ui_subagent_control_reason_task_inaccessible';
+  if (reason === 'owner_unavailable') return 'com_ui_subagent_control_reason_owner_unavailable';
+  return 'com_ui_subagent_control_reason_invalid_command';
+};
+
 export default function SubagentThreadPanel({ selection }: { selection: ActiveSubagentPanel }) {
   const localize = useLocalize();
   const { showToast } = useToastContext();
@@ -58,13 +118,60 @@ export default function SubagentThreadPanel({ selection }: { selection: ActiveSu
       : localize('com_ui_subagent_dialog_title', { 0: selection.subagentType });
   const threadId = selection.durable?.threadId ?? '';
   const taskId = selection.durable?.taskId ?? '';
+  const controlIdentity = subagentControlStateKey(selection.parentConversationId, threadId, taskId);
+  const [controlState, setControlState] = useRecoilState(
+    subagentControlStateByTask(controlIdentity),
+  );
+  const setControlStateForIdentity = useRecoilCallback(
+    ({ set }) =>
+      (identity: string, state: SubagentControlUiState | null) =>
+        set(subagentControlStateByTask(identity), state),
+    [],
+  );
+  const transientControl = controlState?.receipt ?? null;
+  const retryControl = controlState?.retry ?? null;
   const eventSummary = selection.event == null ? undefined : byThreadId.get(threadId);
+  const eventTaskCount = eventSummary?.tasks.length ?? 0;
+  const [eventTaskWindow, setEventTaskWindow] = useState(() => ({
+    threadId,
+    count: EVENT_TASK_PAGE_SIZE,
+    taskCount: eventSummary == null ? null : eventTaskCount,
+  }));
+  useEffect(() => {
+    setEventTaskWindow((current) => {
+      if (current.threadId !== threadId || current.taskCount == null) {
+        return { threadId, count: EVENT_TASK_PAGE_SIZE, taskCount: eventTaskCount };
+      }
+      const appended = Math.max(0, eventTaskCount - current.taskCount);
+      return {
+        threadId,
+        count: Math.min(eventTaskCount, current.count + appended),
+        taskCount: eventTaskCount,
+      };
+    });
+  }, [eventTaskCount, threadId]);
+  const visibleEventTaskCount = Math.min(
+    eventTaskCount,
+    eventTaskWindow.threadId === threadId ? eventTaskWindow.count : EVENT_TASK_PAGE_SIZE,
+  );
+  const visibleEventTasks = useMemo(
+    () => (eventSummary?.tasks ?? []).slice(0, visibleEventTaskCount).reverse(),
+    [eventSummary?.tasks, visibleEventTaskCount],
+  );
+  const hasEarlierRetainedTasks = visibleEventTaskCount < eventTaskCount;
   const eventTaskRunning =
     eventSummary?.tasks.find((task) => task.taskId === taskId)?.status === 'running';
-  const eventSiblings = useMemo(
-    () => (selection.event == null ? [] : (byMessageId.get(selection.parentMessageId) ?? [])),
-    [byMessageId, selection.event, selection.parentMessageId],
-  );
+  const eventSiblings = useMemo(() => {
+    if (selection.event == null) return [];
+    const seen = new Set<string>();
+    return (selection.event.siblingParentMessageIds ?? [selection.parentMessageId])
+      .flatMap((parentMessageId) => byMessageId.get(parentMessageId) ?? [])
+      .filter((child) => {
+        if (seen.has(child.threadId)) return false;
+        seen.add(child.threadId);
+        return true;
+      });
+  }, [byMessageId, selection.event, selection.parentMessageId]);
   const { data, isLoading, isError, isReadinessPending, refetch } = useSubagentThreadQuery(
     selection.parentConversationId,
     threadId,
@@ -99,6 +206,21 @@ export default function SubagentThreadPanel({ selection }: { selection: ActiveSu
     if (selection.event == null || !eventTaskRunning || !durableTerminal) return;
     void refetch();
   }, [durableTerminal, eventTaskRunning, refetch, selection.event]);
+  useEffect(() => {
+    if (
+      selection.event == null ||
+      eventSummary?.latestTaskId == null ||
+      eventSummary.latestTaskId === taskId
+    ) {
+      return;
+    }
+    const nextSelection = eventSubagentSelection(
+      selection.parentConversationId,
+      eventSummary,
+      selection.event.siblingParentMessageIds,
+    );
+    if (nextSelection != null) setSelection(nextSelection);
+  }, [eventSummary, selection, setSelection, taskId]);
   const detachedLiveSubmitting =
     selection.durable != null &&
     progress != null &&
@@ -114,6 +236,170 @@ export default function SubagentThreadPanel({ selection }: { selection: ActiveSu
       showToast({ message: localize('com_ui_continue_chat_error'), status: 'error' });
     },
   });
+  const [controlMessage, setControlMessage] = useState('');
+  const [controlInaccessible, setControlInaccessible] = useState(false);
+  const [controlsClosed, setControlsClosed] = useState(false);
+  const controlInFlightRef = useRef(false);
+  const controlSelectionRef = useRef(controlIdentity);
+  useEffect(() => {
+    controlSelectionRef.current = controlIdentity;
+    setControlMessage('');
+    setControlInaccessible(false);
+    setControlsClosed(false);
+    controlInFlightRef.current = false;
+    return () => {
+      controlSelectionRef.current = '';
+    };
+  }, [controlIdentity]);
+
+  const controlTask = useSubagentControlMutation({
+    onSuccess: ({ receipt }, variables) => {
+      const submittedSelection = subagentControlStateKey(
+        variables.parentConversationId,
+        variables.threadId,
+        variables.command.taskId,
+      );
+      setControlStateForIdentity(submittedSelection, { receipt });
+      if (controlSelectionRef.current !== submittedSelection) return;
+      controlInFlightRef.current = false;
+      if (closesTaskControls(receipt)) setControlsClosed(true);
+      if (
+        variables.command.action !== 'cancel_message' &&
+        (receipt.status === 'accepted' || receipt.status === 'applied')
+      ) {
+        setControlMessage('');
+      }
+    },
+    onError: (error, variables) => {
+      const status = responseStatus(error);
+      const inaccessible = status === 404;
+      const retryable = status == null || status >= 500;
+      const command = variables.command;
+      const submittedSelection = subagentControlStateKey(
+        variables.parentConversationId,
+        variables.threadId,
+        command.taskId,
+      );
+      setControlStateForIdentity(submittedSelection, {
+        receipt: {
+          invocationId: command.invocationId,
+          ...(command.controlId == null ? {} : { controlId: command.controlId }),
+          action: command.action,
+          status: 'failed',
+          createdAt: variables.submittedAt,
+          updatedAt: new Date().toISOString(),
+          ...(command.message == null ? {} : { message: command.message }),
+          reason: failedControlReason(inaccessible, retryable),
+        },
+        ...(retryable ? { retry: command } : {}),
+      });
+      if (controlSelectionRef.current !== submittedSelection) return;
+      controlInFlightRef.current = false;
+      if (inaccessible) {
+        setControlInaccessible(true);
+        setControlsClosed(true);
+      }
+    },
+  });
+
+  useEffect(() => {
+    if (transientControl == null) return;
+    const durableReceipt = data?.controlReceipts?.find(
+      (receipt) => receipt.invocationId === transientControl.invocationId,
+    );
+    if (durableReceipt == null) return;
+    /** The durable view is authoritative after refresh. Drop mutation-only state
+     * once the same invocation appears there so stale failure/retry UI cannot
+     * outlive a successfully persisted receipt. */
+    if (
+      retryControl != null &&
+      retryControl.action !== 'cancel' &&
+      retryControl.action !== 'cancel_message' &&
+      (durableReceipt.status === 'accepted' || durableReceipt.status === 'applied')
+    ) {
+      setControlMessage((current) => (current === retryControl.message ? '' : current));
+    }
+    if (closesTaskControls(durableReceipt)) setControlsClosed(true);
+    setControlState(null);
+  }, [data?.controlReceipts, retryControl, setControlState, transientControl]);
+
+  useEffect(() => {
+    if (data?.controlReceipts?.some(closesTaskControls)) {
+      setControlsClosed(true);
+    }
+  }, [data?.controlReceipts]);
+
+  const submitControl = useCallback(
+    (action: SubagentControlAction, controlId?: string, retry?: SubagentControlRequest) => {
+      if (
+        selection.durable == null ||
+        controlTask.isLoading ||
+        controlInFlightRef.current ||
+        (retryControl != null && retry == null)
+      ) {
+        return;
+      }
+      let command: SubagentControlRequest;
+      if (retry != null) {
+        command = retry;
+      } else if (action === 'cancel_message') {
+        command = {
+          taskId: selection.durable.taskId,
+          invocationId: v4(),
+          action,
+          controlId,
+        };
+      } else if (action === 'cancel') {
+        command = {
+          taskId: selection.durable.taskId,
+          invocationId: v4(),
+          action,
+        };
+      } else {
+        command = {
+          taskId: selection.durable.taskId,
+          invocationId: v4(),
+          action,
+          message: controlMessage.trim(),
+        };
+      }
+      if (
+        action !== 'cancel' &&
+        action !== 'cancel_message' &&
+        (command.message == null || command.message === '')
+      ) {
+        return;
+      }
+      const now = new Date().toISOString();
+      setControlState({
+        receipt: {
+          invocationId: command.invocationId,
+          ...(command.controlId == null ? {} : { controlId: command.controlId }),
+          action: command.action,
+          status: 'submitted',
+          createdAt: now,
+          updatedAt: now,
+          ...(command.message == null ? {} : { message: command.message }),
+        },
+        retry: command,
+      });
+      controlInFlightRef.current = true;
+      controlTask.mutate({
+        parentConversationId: selection.parentConversationId,
+        threadId: selection.durable.threadId,
+        command,
+        submittedAt: now,
+      });
+    },
+    [
+      controlMessage,
+      controlTask,
+      retryControl,
+      selection.durable,
+      selection.parentConversationId,
+      setControlState,
+    ],
+  );
 
   const close = useCallback(() => {
     resetSelection();
@@ -161,25 +447,40 @@ export default function SubagentThreadPanel({ selection }: { selection: ActiveSu
   const activity = useMemo(() => {
     if (selection.durable == null) return liveActivity;
     if (data == null) {
-      return progress == null ? { ...liveActivity, status: 'dispatched' as const } : liveActivity;
+      const activityWithoutData =
+        progress == null ? { ...liveActivity, status: 'dispatched' as const } : liveActivity;
+      return transientControl == null
+        ? activityWithoutData
+        : { ...activityWithoutData, controls: [transientControl] };
     }
     const durable = adaptDurableThreadActivity(data, selection.durable.taskId);
-    if (
+    const useLiveItems =
       (durable.status === 'running' || durable.status === 'dispatched') &&
-      liveActivity.items.length > 0
-    ) {
-      return {
-        ...durable,
-        prompt: durable.prompt ?? liveActivity.prompt,
-        items: liveActivity.items,
-      };
-    }
-    return {
+      liveActivity.items.length > 0;
+    const mergedItems =
+      !useLiveItems && durable.items.length > 0 ? durable.items : liveActivity.items;
+    const merged = {
       ...durable,
       prompt: durable.prompt ?? liveActivity.prompt,
-      items: durable.items.length > 0 ? durable.items : liveActivity.items,
+      items: mergedItems,
     };
-  }, [data, liveActivity, progress, selection.durable]);
+    if (
+      transientControl == null ||
+      (merged.controls ?? []).some(
+        (receipt) => receipt.invocationId === transientControl.invocationId,
+      )
+    ) {
+      return merged;
+    }
+    return { ...merged, controls: [...(merged.controls ?? []), transientControl] };
+  }, [data, liveActivity, progress, selection.durable, transientControl]);
+  const taskInaccessible = controlInaccessible || transientControl?.reason === 'task_inaccessible';
+  const controlAvailable =
+    selection.durable != null && data?.status === 'running' && !taskInaccessible && !controlsClosed;
+  const controlPending =
+    controlTask.isLoading || transientControl?.status === 'submitted' || retryControl != null;
+  const showControlFooter =
+    controlAvailable || retryControl != null || transientControl?.reason === 'task_inaccessible';
   const canContinueAsChat =
     selection.host === 'conversation' &&
     selection.durable != null &&
@@ -201,27 +502,19 @@ export default function SubagentThreadPanel({ selection }: { selection: ActiveSu
     (nextThreadId: string) => {
       const next = eventSiblings.find((child) => child.threadId === nextThreadId);
       if (next == null) return;
-      const nextSelection = eventSubagentSelection(selection.parentConversationId, next);
+      const nextSelection = eventSubagentSelection(
+        selection.parentConversationId,
+        next,
+        selection.event?.siblingParentMessageIds,
+      );
       if (nextSelection != null) setSelection(nextSelection);
     },
-    [eventSiblings, selection.parentConversationId, setSelection],
-  );
-  const selectTask = useCallback(
-    (nextTaskId: string) => {
-      if (selection.durable == null || selection.event == null) return;
-      const nextTask = eventSummary?.tasks.find((task) => task.taskId === nextTaskId);
-      setSelection({
-        ...selection,
-        durable: { ...selection.durable, taskId: nextTaskId },
-        event: {
-          ...selection.event,
-          progressKey: eventTaskProgressKey(selection.durable.threadId, nextTaskId),
-        },
-        initialProgress: nextTask?.status === 'completed' ? 1 : 0,
-        isSubmitting: nextTask?.status === 'running',
-      });
-    },
-    [eventSummary?.tasks, selection, setSelection],
+    [
+      eventSiblings,
+      selection.event?.siblingParentMessageIds,
+      selection.parentConversationId,
+      setSelection,
+    ],
   );
   let panelState: 'ready' | 'loading' | 'error' = 'ready';
   if (
@@ -233,6 +526,58 @@ export default function SubagentThreadPanel({ selection }: { selection: ActiveSu
   } else if (selection.durable != null && liveActivity.items.length === 0 && isError) {
     panelState = 'error';
   }
+  const renderEventTask = (task: ParentSubagentTaskSummary) => {
+    if (task.taskId === taskId) {
+      return (
+        <SubagentActivity
+          key={task.taskId}
+          activityId={`${selection.parentMessageId}\u0000${selection.toolCallId}\u0000${task.taskId}`}
+          activity={activity}
+          state={panelState}
+          embedded
+          onCancelControl={
+            controlAvailable && !controlPending
+              ? (controlId) => submitControl('cancel_message', controlId)
+              : undefined
+          }
+        />
+      );
+    }
+    return (
+      <HistoricalEventTaskActivity
+        key={task.taskId}
+        selection={selection}
+        task={task}
+        title={activity.title}
+      />
+    );
+  };
+  const loadEarlierEventTasks = () => {
+    setEventTaskWindow({
+      threadId,
+      count: Math.min(eventTaskCount, visibleEventTaskCount + EVENT_TASK_PAGE_SIZE),
+      taskCount: eventTaskCount,
+    });
+  };
+  let timelinePrefix: ReactNode = null;
+  if (hasEarlierRetainedTasks) {
+    timelinePrefix = (
+      <div className="flex justify-center border-b border-border-light px-4 py-2">
+        <Button type="button" variant="ghost" size="sm" onClick={loadEarlierEventTasks}>
+          {localize('com_ui_load_more')}
+        </Button>
+      </div>
+    );
+  } else if (eventSummary?.tasksTruncated) {
+    timelinePrefix = (
+      <div
+        role="note"
+        className="border-b border-border-light px-4 py-3 text-sm text-text-secondary"
+      >
+        {localize('com_ui_subagent_thread_history_truncated')}
+      </div>
+    );
+  }
 
   return (
     <aside
@@ -302,22 +647,6 @@ export default function SubagentThreadPanel({ selection }: { selection: ActiveSu
               </SelectContent>
             </Select>
           </div>
-          <div className="w-32">
-            <Select value={taskId} onValueChange={selectTask}>
-              <SelectTrigger className="h-8" aria-label={localize('com_ui_subagent_turn')}>
-                <SelectValue />
-              </SelectTrigger>
-              <SelectContent>
-                {(eventSummary?.tasks ?? []).map((task, index) => (
-                  <SelectItem key={task.taskId} value={task.taskId}>
-                    {index === 0
-                      ? localize('com_ui_subagent_latest_turn')
-                      : localize('com_ui_subagent_earlier_turn', { 0: String(index) })}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          </div>
         </div>
       )}
 
@@ -327,13 +656,146 @@ export default function SubagentThreadPanel({ selection }: { selection: ActiveSu
       <ApprovalProvider
         key={`${selection.parentMessageId}\u0000${selection.toolCallId}\u0000${selection.partIndex}`}
       >
-        <SubagentActivity
-          key={`${selection.parentMessageId}\u0000${selection.toolCallId}\u0000${selection.partIndex}`}
-          activityId={`${selection.parentMessageId}\u0000${selection.toolCallId}\u0000${selection.partIndex}`}
-          activity={activity}
-          state={panelState}
-        />
+        {selection.event != null && (eventSummary?.tasks.length ?? 0) > 1 ? (
+          <SubagentActivityScrollSurface padded={false}>
+            <div data-subagent-thread-timeline>
+              {timelinePrefix}
+              {visibleEventTasks.map(renderEventTask)}
+            </div>
+          </SubagentActivityScrollSurface>
+        ) : (
+          <SubagentActivity
+            key={`${selection.parentMessageId}\u0000${selection.toolCallId}\u0000${selection.partIndex}`}
+            activityId={`${selection.parentMessageId}\u0000${selection.toolCallId}\u0000${selection.partIndex}`}
+            activity={activity}
+            state={panelState}
+            onCancelControl={
+              controlAvailable && !controlPending
+                ? (controlId) => submitControl('cancel_message', controlId)
+                : undefined
+            }
+          />
+        )}
       </ApprovalProvider>
+      {showControlFooter && (
+        <div className="shrink-0 border-t border-border-light p-3">
+          {transientControl?.status === 'failed' && (
+            <Alert variant="error" className="mb-2 flex items-center gap-2">
+              <span className="min-w-0 flex-1">
+                {localize(failedControlLocaleKey(transientControl.reason))}
+              </span>
+              {retryControl != null && (
+                <Button
+                  type="button"
+                  size="sm"
+                  variant="outline"
+                  disabled={controlTask.isLoading}
+                  onClick={() =>
+                    submitControl(retryControl.action, retryControl.controlId, retryControl)
+                  }
+                >
+                  {localize('com_ui_retry')}
+                </Button>
+              )}
+            </Alert>
+          )}
+          {controlAvailable && (
+            <>
+              <Textarea
+                value={controlMessage}
+                onChange={(event) => setControlMessage(event.target.value)}
+                placeholder={localize('com_ui_subagent_control_placeholder')}
+                aria-label={localize('com_ui_subagent_control_message')}
+                maxLength={4 * 1024}
+                rows={2}
+                disabled={controlPending}
+              />
+              <div className="mt-2 flex flex-wrap gap-2">
+                <Button
+                  type="button"
+                  size="sm"
+                  variant="outline"
+                  disabled={controlPending || controlMessage.trim() === ''}
+                  onClick={() => submitControl('steer')}
+                >
+                  <CornerDownRight size={14} aria-hidden />
+                  {localize('com_ui_steer')}
+                </Button>
+                <Button
+                  type="button"
+                  size="sm"
+                  variant="outline"
+                  disabled={controlPending || controlMessage.trim() === ''}
+                  onClick={() => submitControl('queue')}
+                >
+                  <ListEnd size={14} aria-hidden />
+                  {localize('com_ui_queue')}
+                </Button>
+                <Button
+                  type="button"
+                  size="sm"
+                  variant="outline"
+                  disabled={controlPending || controlMessage.trim() === ''}
+                  onClick={() => submitControl('interrupt')}
+                >
+                  <Zap size={14} aria-hidden />
+                  {localize('com_ui_subagent_interrupt')}
+                </Button>
+                <Button
+                  type="button"
+                  size="sm"
+                  variant="ghost"
+                  disabled={controlPending}
+                  onClick={() => submitControl('cancel')}
+                  className="ml-auto text-status-error"
+                >
+                  <OctagonX size={14} aria-hidden />
+                  {localize('com_ui_subagent_cancel_task')}
+                </Button>
+              </div>
+            </>
+          )}
+        </div>
+      )}
     </aside>
   );
 }
+
+function HistoricalEventTaskActivity({
+  selection,
+  task,
+  title,
+}: {
+  selection: ActiveSubagentPanel;
+  task: ParentSubagentTaskSummary;
+  title: string;
+}) {
+  const threadId = selection.durable?.threadId ?? '';
+  const { data, isLoading, isError, isReadinessPending } = useSubagentThreadQuery(
+    selection.parentConversationId,
+    threadId,
+    task.taskId,
+  );
+  const activity = useMemo(
+    () =>
+      data == null
+        ? { title, status: task.status, items: [], controls: [] }
+        : adaptDurableThreadActivity(data, task.taskId),
+    [data, task.status, task.taskId, title],
+  );
+  let state: 'ready' | 'loading' | 'error' = 'ready';
+  if (isError) {
+    state = 'error';
+  } else if (isLoading || isReadinessPending) {
+    state = 'loading';
+  }
+
+  return (
+    <SubagentActivity
+      activityId={`${selection.parentMessageId}\u0000${selection.toolCallId}\u0000${task.taskId}`}
+      activity={activity}
+      state={state}
+      embedded
+    />
+  );
+}
diff --git a/client/src/components/Chat/Subagents/adapters.ts b/client/src/components/Chat/Subagents/adapters.ts
index 3f1bec25d31..846006359b7 100644
--- a/client/src/components/Chat/Subagents/adapters.ts
+++ b/client/src/components/Chat/Subagents/adapters.ts
@@ -3,6 +3,7 @@ import type {
   Agents,
   PartMetadata,
   SubagentActivityItem,
+  SubagentControlReceipt,
   SubagentThreadStatus,
   SubagentThreadView,
   TMessageContentParts,
@@ -51,7 +52,13 @@ export type ChildActivity = {
   prompt?: string;
   status: SubagentThreadStatus;
   items: ChildActivityItem[];
+  controls?: Array<
+    Omit<SubagentControlReceipt, 'status'> & {
+      status: SubagentControlReceipt['status'] | 'submitted';
+    }
+  >;
   activityTruncated?: boolean;
+  controlsTruncated?: boolean;
 };
 
 type ContentToolCall = {
@@ -283,6 +290,7 @@ export function adaptLivePersistedActivity(input: {
     ...(input.prompt == null ? {} : { prompt: input.prompt }),
     status: liveStatus(input),
     items,
+    controls: [],
   };
 }
 
@@ -313,6 +321,8 @@ export function adaptDurableThreadActivity(
     ...(prompt == null ? {} : { prompt }),
     status,
     items,
+    controls: view.controlReceipts ?? [],
+    controlsTruncated: view.controlReceiptsTruncated === true,
     activityTruncated:
       view.activityTruncated ||
       view.historyTruncated ||
diff --git a/client/src/components/Chat/Subagents/eventSelection.ts b/client/src/components/Chat/Subagents/eventSelection.ts
index ed372588863..fab305ec7e2 100644
--- a/client/src/components/Chat/Subagents/eventSelection.ts
+++ b/client/src/components/Chat/Subagents/eventSelection.ts
@@ -7,6 +7,7 @@ export const eventTaskProgressKey = (threadId: string, taskId: string) =>
 export const eventSubagentSelection = (
   parentConversationId: string,
   child: ParentSubagentSummary,
+  siblingParentMessageIds?: string[],
 ): ActiveSubagentPanel | null => {
   const taskId = child.latestTaskId;
   if (child.origin !== 'event' || child.actorId == null || taskId == null) return null;
@@ -20,6 +21,10 @@ export const eventSubagentSelection = (
     initialProgress: child.status === 'completed' ? 1 : 0,
     isSubmitting: child.status === 'running',
     durable: { threadId: child.threadId, taskId },
-    event: { actorId: child.actorId, progressKey: eventTaskProgressKey(child.threadId, taskId) },
+    event: {
+      actorId: child.actorId,
+      progressKey: eventTaskProgressKey(child.threadId, taskId),
+      ...(siblingParentMessageIds == null ? {} : { siblingParentMessageIds }),
+    },
   };
 };
diff --git a/client/src/components/Endpoints/ConvoIcon.tsx b/client/src/components/Endpoints/ConvoIcon.tsx
index 859f3b957b9..2a4596ba3bc 100644
--- a/client/src/components/Endpoints/ConvoIcon.tsx
+++ b/client/src/components/Endpoints/ConvoIcon.tsx
@@ -1,11 +1,71 @@
 import React, { useMemo } from 'react';
-import { getEndpointField } from 'librechat-data-provider';
+import { Feather } from 'lucide-react';
+import { ProviderId } from 'librechat-data-provider';
+import { Sparkles, AssistantIcon, ProviderIcon } from '@librechat/client';
 import type * as t from 'librechat-data-provider';
-import { getIconKey, getEntity, getIconEndpoint } from '~/utils';
 import ConvoIconURL from '~/components/Endpoints/ConvoIconURL';
-import { icons } from '~/hooks/Endpoint/Icons';
+import { cn, getEntity, getIconEndpoint } from '~/utils';
+import { useProviderIcon } from '~/hooks/Endpoint';
 import { isImageURL } from '~/utils/icons';
 
+/** Callers frame the mark at two thirds of the round container around it. */
+const artScale = 2 / 3;
+
+const entityAvatarClassName =
+  'bg-token-surface-secondary h-full w-full rounded-full object-cover dark:bg-surface-tertiary';
+
+function AgentAvatar({
+  avatar,
+  agentName,
+  className,
+  size,
+}: {
+  avatar: string;
+  agentName: string;
+  className: string;
+  size?: number;
+}) {
+  if (agentName && avatar) {
+    return (
+      <img src={avatar} className={entityAvatarClassName} alt={agentName} width="80" height="80" />
+    );
+  }
+
+  return <Feather className={cn(agentName === '' ? 'icon-2xl' : '', className)} size={size} />;
+}
+
+function AssistantAvatar({
+  avatar,
+  assistantName,
+  className,
+  context,
+  size,
+}: {
+  avatar: string;
+  assistantName: string;
+  className: string;
+  context?: 'message' | 'nav' | 'landing' | 'menu-item';
+  size?: number;
+}) {
+  if (assistantName && avatar) {
+    return (
+      <img
+        src={avatar}
+        className={entityAvatarClassName}
+        alt={assistantName}
+        width="80"
+        height="80"
+      />
+    );
+  }
+
+  if (assistantName) {
+    return <AssistantIcon className={cn('text-text-secondary', className)} size={size} />;
+  }
+
+  return <Sparkles className={cn(context === 'landing' ? 'icon-2xl' : '', className)} />;
+}
+
 export default function ConvoIcon({
   conversation,
   endpointsConfig,
@@ -29,7 +89,7 @@ export default function ConvoIcon({
   let endpoint = conversation?.endpoint;
   endpoint = getIconEndpoint({ endpointsConfig, iconURL, endpoint });
 
-  const { entity, isAgent } = useMemo(
+  const { entity, isAgent, isAssistant } = useMemo(
     () =>
       getEntity({
         endpoint,
@@ -46,39 +106,55 @@ export default function ConvoIcon({
     ? (entity as t.Agent | undefined)?.avatar?.filepath
     : ((entity as t.Assistant | undefined)?.metadata?.avatar as string);
 
-  const endpointIconURL = getEndpointField(endpointsConfig, endpoint, 'iconURL');
-  const iconKey = getIconKey({ endpoint, endpointsConfig, endpointIconURL });
-  const Icon = icons[iconKey] ?? null;
-
-  return (
-    <>
-      {isImageURL(iconURL) ? (
-        <ConvoIconURL
-          iconURL={iconURL}
-          modelLabel={conversation?.chatGptLabel ?? conversation?.modelLabel ?? ''}
-          endpointIconURL={endpointIconURL}
-          assistantAvatar={avatar}
+  const { provider, imageURL } = useProviderIcon({ endpoint, endpointsConfig, iconURL });
+
+  if (isImageURL(iconURL)) {
+    return (
+      <ConvoIconURL
+        iconURL={iconURL}
+        modelLabel={conversation?.chatGptLabel ?? conversation?.modelLabel ?? ''}
+        provider={provider}
+        assistantAvatar={avatar}
+        assistantName={name}
+        agentAvatar={avatar}
+        agentName={name}
+        context={context}
+      />
+    );
+  }
+
+  const renderArt = () => {
+    if (isAgent) {
+      return (
+        <AgentAvatar avatar={avatar ?? ''} agentName={name} className={className} size={size} />
+      );
+    }
+
+    if (isAssistant) {
+      return (
+        <AssistantAvatar
+          avatar={avatar ?? ''}
           assistantName={name}
-          agentAvatar={avatar}
-          agentName={name}
+          className={className}
           context={context}
+          size={size}
         />
-      ) : (
-        <div className={containerClassName}>
-          {endpoint && Icon != null && (
-            <Icon
-              size={size}
-              context={context}
-              endpoint={endpoint}
-              className={className}
-              iconURL={endpointIconURL}
-              assistantName={name}
-              agentName={name}
-              avatar={avatar}
-            />
-          )}
-        </div>
-      )}
-    </>
-  );
+      );
+    }
+
+    if (imageURL != null) {
+      return <img src={imageURL} alt={`${endpoint} Icon`} className={className} />;
+    }
+
+    return (
+      <ProviderIcon
+        provider={provider}
+        model={conversation?.model}
+        size={size != null ? Math.round(size * artScale) : undefined}
+        className={cn(className, context === 'landing' && provider === ProviderId.cohere && 'p-2')}
+      />
+    );
+  };
+
+  return <div className={containerClassName}>{endpoint !== '' && renderArt()}</div>;
 }
diff --git a/client/src/components/Endpoints/ConvoIconURL.tsx b/client/src/components/Endpoints/ConvoIconURL.tsx
index d4bdf534473..3e2f797b150 100644
--- a/client/src/components/Endpoints/ConvoIconURL.tsx
+++ b/client/src/components/Endpoints/ConvoIconURL.tsx
@@ -1,12 +1,13 @@
 import { memo, useMemo } from 'react';
+import { ProviderIcon } from '@librechat/client';
+import type { ProviderId } from 'librechat-data-provider';
 import { URLIcon } from '~/components/Endpoints/URLIcon';
-import { icons } from '~/hooks/Endpoint/Icons';
 import { isImageURL } from '~/utils/icons';
 
 interface ConvoIconURLProps {
   iconURL?: string;
   modelLabel?: string | null;
-  endpointIconURL?: string;
+  provider?: ProviderId | null;
   assistantName?: string;
   agentName?: string;
   context?: 'landing' | 'menu-item' | 'nav' | 'message';
@@ -32,14 +33,9 @@ const styleImageMap = {
 const ConvoIconURL: React.FC<ConvoIconURLProps> = ({
   iconURL = '',
   modelLabel = '',
-  endpointIconURL,
-  assistantAvatar,
-  assistantName,
-  agentAvatar,
-  agentName,
+  provider,
   context,
 }) => {
-  const Icon = useMemo(() => icons[iconURL] ?? icons.unknown, [iconURL]);
   const isURL = useMemo(() => isImageURL(iconURL), [iconURL]);
   if (isURL) {
     return (
@@ -55,17 +51,7 @@ const ConvoIconURL: React.FC<ConvoIconURLProps> = ({
 
   return (
     <div className="shadow-stroke relative flex h-full items-center justify-center rounded-full bg-surface-primary text-text-primary">
-      {Icon && (
-        <Icon
-          size={41}
-          context={context}
-          className="h-2/3 w-2/3"
-          agentName={agentName}
-          iconURL={endpointIconURL}
-          assistantName={assistantName}
-          avatar={assistantAvatar || agentAvatar}
-        />
-      )}
+      <ProviderIcon provider={provider} size={41} className="h-2/3 w-2/3" />
     </div>
   );
 };
diff --git a/client/src/components/Endpoints/EndpointIcon.tsx b/client/src/components/Endpoints/EndpointIcon.tsx
index c2add9ed7a4..753e72de6a1 100644
--- a/client/src/components/Endpoints/EndpointIcon.tsx
+++ b/client/src/components/Endpoints/EndpointIcon.tsx
@@ -1,4 +1,9 @@
-import { getEndpointField, isAssistantsEndpoint, isAgentsEndpoint } from 'librechat-data-provider';
+import {
+  getEndpointField,
+  isAssistantsEndpoint,
+  isAgentsEndpoint,
+  ProviderId,
+} from 'librechat-data-provider';
 import type {
   TPreset,
   TConversation,
@@ -6,9 +11,10 @@ import type {
   TAssistantsMap,
   TEndpointsConfig,
 } from 'librechat-data-provider';
+import { getAgentAvatarUrl, getIconEndpoint, cn } from '~/utils';
 import ConvoIconURL from '~/components/Endpoints/ConvoIconURL';
 import MinimalIcon from '~/components/Endpoints/MinimalIcon';
-import { getAgentAvatarUrl, getIconEndpoint } from '~/utils';
+import { resolveProviderIcon } from '~/hooks/Endpoint';
 import { isImageURL } from '~/utils/icons';
 
 const emptyEndpointsConfig = {} as TEndpointsConfig;
@@ -36,8 +42,8 @@ export default function EndpointIcon({
   let endpoint = originalEndpoint;
   endpoint = getIconEndpoint({ endpointsConfig, iconURL: convoIconURL, endpoint });
 
-  const endpointType = getEndpointField(endpointsConfig, endpoint, 'type');
   const endpointIconURL = getEndpointField(endpointsConfig, endpoint, 'iconURL');
+  const { provider } = resolveProviderIcon({ endpoint, endpointsConfig });
 
   const agent = isAgentsEndpoint(endpoint) ? agentsMap?.[conversation?.agent_id ?? ''] : null;
   const assistant = isAssistantsEndpoint(endpoint)
@@ -59,28 +65,28 @@ export default function EndpointIcon({
       <ConvoIconURL
         iconURL={iconURL}
         modelLabel={entityName || conversation?.chatGptLabel || conversation?.modelLabel || ''}
+        provider={provider}
         context={context}
-        endpointIconURL={endpointIconURL}
         assistantAvatar={assistantAvatar}
         assistantName={assistantName ?? ''}
         agentAvatar={agentAvatar}
         agentName={agentName}
       />
     );
-  } else {
-    return (
-      <MinimalIcon
-        iconURL={endpointIconURL}
-        endpoint={endpoint}
-        endpointType={endpointType}
-        model={conversation?.model}
-        error={false}
-        className={className}
-        size={size}
-        isCreatedByUser={false}
-        chatGptLabel={undefined}
-        modelLabel={undefined}
-      />
-    );
   }
+
+  return (
+    <MinimalIcon
+      iconURL={endpointIconURL}
+      endpoint={endpoint}
+      endpointsConfig={endpointsConfig}
+      model={conversation?.model}
+      error={false}
+      className={cn(className, context === 'landing' && provider === ProviderId.cohere && 'p-2')}
+      size={size}
+      isCreatedByUser={false}
+      chatGptLabel={undefined}
+      modelLabel={undefined}
+    />
+  );
 }
diff --git a/client/src/components/Endpoints/EntityEndpointMark.tsx b/client/src/components/Endpoints/EntityEndpointMark.tsx
new file mode 100644
index 00000000000..eae9d9d6744
--- /dev/null
+++ b/client/src/components/Endpoints/EntityEndpointMark.tsx
@@ -0,0 +1,29 @@
+import { Feather } from 'lucide-react';
+import { Sparkles } from '@librechat/client';
+import { EModelEndpoint } from 'librechat-data-provider';
+
+export function isEntityEndpoint(endpoint?: string | null): boolean {
+  return (
+    endpoint === EModelEndpoint.agents ||
+    endpoint === EModelEndpoint.assistants ||
+    endpoint === EModelEndpoint.azureAssistants
+  );
+}
+
+export function EntityEndpointMark({
+  endpoint,
+  className = 'icon-md shrink-0',
+}: {
+  endpoint?: string | null;
+  className?: string;
+}) {
+  if (endpoint === EModelEndpoint.agents) {
+    return <Feather className={className} aria-hidden="true" />;
+  }
+
+  if (endpoint === EModelEndpoint.assistants || endpoint === EModelEndpoint.azureAssistants) {
+    return <Sparkles className={className} aria-hidden="true" />;
+  }
+
+  return null;
+}
diff --git a/client/src/components/Endpoints/MessageEndpointIcon.spec.tsx b/client/src/components/Endpoints/MessageEndpointIcon.spec.tsx
index ea5f95e2fa4..fa2ae8a9a9c 100644
--- a/client/src/components/Endpoints/MessageEndpointIcon.spec.tsx
+++ b/client/src/components/Endpoints/MessageEndpointIcon.spec.tsx
@@ -1,5 +1,6 @@
-import { render } from '@testing-library/react';
-import { EModelEndpoint } from 'librechat-data-provider';
+import { render, screen } from '@testing-library/react';
+import { EModelEndpoint, ProviderId } from 'librechat-data-provider';
+import type { TEndpointsConfig } from 'librechat-data-provider';
 import MessageEndpointIcon from './MessageEndpointIcon';
 
 describe('MessageEndpointIcon', () => {
@@ -25,7 +26,117 @@ describe('MessageEndpointIcon', () => {
       />,
     );
 
-    expect(container.firstElementChild).toHaveClass('text-white');
+    expect(container.firstElementChild).toHaveStyle({
+      color: 'var(--provider-foreground, #ffffff)',
+    });
     expect(container.firstElementChild).not.toHaveClass('text-text-primary');
   });
+
+  it('renders the Gemini mark for a Gemini model', () => {
+    render(
+      <MessageEndpointIcon
+        endpoint={EModelEndpoint.google}
+        model="gemini-2.5-pro"
+        size={30}
+        isCreatedByUser={false}
+      />,
+    );
+
+    expect(screen.getByTitle('Gemini')).toBeInTheDocument();
+  });
+
+  it('renders the Google mark for a non-Gemini Google model', () => {
+    render(
+      <MessageEndpointIcon
+        endpoint={EModelEndpoint.google}
+        model="text-bison"
+        size={30}
+        isCreatedByUser={false}
+      />,
+    );
+
+    expect(screen.getByTitle('Google')).toBeInTheDocument();
+  });
+
+  it('paints the modern OpenAI tile black', () => {
+    const { container } = render(
+      <MessageEndpointIcon
+        endpoint={EModelEndpoint.openAI}
+        model="gpt-5.6"
+        size={30}
+        isCreatedByUser={false}
+      />,
+    );
+
+    expect(container.querySelector('[title="OpenAI"]')).toHaveStyle({
+      background: 'var(--provider-openai-reasoning, #000000)',
+    });
+  });
+
+  it('marks the tile when the message errored', () => {
+    const { container } = render(
+      <MessageEndpointIcon
+        endpoint={EModelEndpoint.openAI}
+        model="gpt-4"
+        size={30}
+        error={true}
+        isCreatedByUser={false}
+      />,
+    );
+
+    const badge = container.querySelector('[title="OpenAI"] > .bg-status-error');
+    expect(badge).toHaveTextContent('!');
+  });
+
+  it('keeps a configured endpoint image instead of the generic mark', () => {
+    render(
+      <MessageEndpointIcon
+        endpoint="My Gateway"
+        iconURL="https://cdn.example.com/logo.png"
+        model="some-model"
+        size={30}
+        isCreatedByUser={false}
+      />,
+    );
+
+    expect(screen.getByAltText('My Gateway Icon')).toHaveAttribute(
+      'src',
+      'https://cdn.example.com/logo.png',
+    );
+  });
+
+  it('uses the server providerId when the message has no iconURL', () => {
+    const endpointsConfig = {
+      'My OpenRouter': {
+        type: EModelEndpoint.custom,
+        providerId: ProviderId.openrouter,
+        order: 0,
+      },
+    } as TEndpointsConfig;
+
+    render(
+      <MessageEndpointIcon
+        endpoint="My OpenRouter"
+        endpointsConfig={endpointsConfig}
+        model="some-model"
+        size={30}
+        isCreatedByUser={false}
+      />,
+    );
+
+    expect(screen.getByRole('img', { name: 'OpenRouter' })).toBeInTheDocument();
+  });
+
+  it('labels a Gemma model as Gemma', () => {
+    render(
+      <MessageEndpointIcon
+        endpoint={EModelEndpoint.google}
+        model="gemma-3-27b"
+        size={30}
+        isCreatedByUser={false}
+      />,
+    );
+
+    expect(screen.getByTitle('Gemma')).toBeInTheDocument();
+  });
 });
diff --git a/client/src/components/Endpoints/MessageEndpointIcon.tsx b/client/src/components/Endpoints/MessageEndpointIcon.tsx
index bfd197d2819..09bf90fb8c6 100644
--- a/client/src/components/Endpoints/MessageEndpointIcon.tsx
+++ b/client/src/components/Endpoints/MessageEndpointIcon.tsx
@@ -1,64 +1,23 @@
 import { memo } from 'react';
 import { Feather } from 'lucide-react';
-import { EModelEndpoint, isAssistantsEndpoint, alternateName } from 'librechat-data-provider';
-import {
-  Plugin,
-  GPTIcon,
-  PaLMIcon,
-  CodeyIcon,
-  GeminiIcon,
-  BedrockIcon,
-  AssistantIcon,
-  AnthropicIcon,
-  TooltipAnchor,
-  AzureMinimalIcon,
-  CustomMinimalIcon,
-} from '@librechat/client';
-import UnknownIcon from '~/hooks/Endpoint/UnknownIcon';
-import { IconProps } from '~/common';
+import { EModelEndpoint, isAssistantsEndpoint } from 'librechat-data-provider';
+import { AssistantIcon, TooltipAnchor, ProviderAvatar } from '@librechat/client';
+import type { IconProps } from '~/common';
+import { useProviderIcon } from '~/hooks/Endpoint';
 import { cn } from '~/utils';
 
-type EndpointIcon = {
-  icon: React.ReactNode | React.JSX.Element;
-  bg?: string;
-  name?: string | null;
-};
-
-function getOpenAIColor(_model: string | null | undefined) {
-  const model = _model?.toLowerCase() ?? '';
-  if (model && (/\b(o\d)\b/i.test(model) || /\bgpt-[5-9](?:\.\d+)?\b/i.test(model))) {
-    return '#000000';
-  }
-  return model.includes('gpt-4') ? '#AB68FF' : '#19C37D';
-}
-
-function getGoogleIcon(model: string | null | undefined, size: number) {
-  if (model?.toLowerCase().includes('code') === true) {
-    return <CodeyIcon size={size * 0.75} />;
-  } else if (/gemini|learnlm|gemma/.test(model?.toLowerCase() ?? '')) {
-    return <GeminiIcon size={size * 0.7} />;
-  } else {
-    return <PaLMIcon size={size * 0.7} />;
-  }
-}
-
-function getGoogleModelName(model: string | null | undefined) {
-  if (model?.toLowerCase().includes('code') === true) {
-    return 'Codey';
-  } else if (
-    model?.toLowerCase().includes('gemini') === true ||
-    model?.toLowerCase().includes('learnlm') === true
-  ) {
-    return 'Gemini';
-  } else if (model?.toLowerCase().includes('gemma') === true) {
-    return 'Gemma';
-  } else {
-    return 'PaLM2';
-  }
-}
-
 const MessageEndpointIcon: React.FC<IconProps> = (props) => {
-  const { error, iconURL = '', endpoint, size = 30, model = '', assistantName, agentName } = props;
+  const {
+    error,
+    iconURL = '',
+    endpoint,
+    size = 30,
+    model = '',
+    assistantName,
+    agentName,
+    endpointsConfig,
+  } = props;
+  const { provider, imageURL } = useProviderIcon({ endpoint, iconURL, endpointsConfig });
 
   const assistantsIcon = {
     icon: iconURL ? (
@@ -118,94 +77,47 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {
     name: endpoint,
   };
 
-  const endpointIcons: {
-    [key: string]: EndpointIcon | undefined;
-  } = {
-    [EModelEndpoint.assistants]: assistantsIcon,
-    [EModelEndpoint.agents]: agentsIcon,
-    [EModelEndpoint.azureAssistants]: assistantsIcon,
-    [EModelEndpoint.azureOpenAI]: {
-      icon: <AzureMinimalIcon size={size * 0.5555555555555556} />,
-      bg: 'linear-gradient(0.375turn, #61bde2, #4389d0)',
-      name: 'ChatGPT',
-    },
-    [EModelEndpoint.openAI]: {
-      icon: <GPTIcon size={size * 0.5555555555555556} />,
-      bg: getOpenAIColor(model),
-      name: 'ChatGPT',
-    },
-    [EModelEndpoint.google]: {
-      icon: getGoogleIcon(model, size),
-      name: getGoogleModelName(model),
-    },
-    [EModelEndpoint.anthropic]: {
-      icon: <AnthropicIcon size={size * 0.5555555555555556} />,
-      bg: '#d09a74',
-      name: 'Claude',
-    },
-    [EModelEndpoint.bedrock]: {
-      icon: <BedrockIcon className="icon-xl text-white" />,
-      bg: '#268672',
-      name: alternateName[EModelEndpoint.bedrock],
-    },
-    [EModelEndpoint.custom]: {
-      icon: <CustomMinimalIcon size={size * 0.7} />,
-      name: 'Custom',
-    },
-    null: { icon: <GPTIcon size={size * 0.7} />, bg: 'grey', name: 'N/A' },
-    default: {
-      icon: (
-        <div className="h-6 w-6">
-          <div className="overflow-hidden rounded-full">
-            <UnknownIcon
-              iconURL={iconURL}
-              endpoint={endpoint ?? ''}
-              className="h-full w-full object-contain"
-              context="message"
-            />
-          </div>
-        </div>
-      ),
-      name: endpoint,
-    },
-  };
-
-  let { icon, bg, name } =
-    endpoint != null && endpoint && endpointIcons[endpoint]
-      ? (endpointIcons[endpoint] ?? {})
-      : (endpointIcons.default as EndpointIcon);
+  const errorBadge = error === true && (
+    <span className="absolute right-0 top-[20px] -mr-2 flex h-3 w-3 items-center justify-center rounded-full border border-white bg-status-error text-[10px] text-white">
+      !
+    </span>
+  );
 
-  if (iconURL && endpointIcons[iconURL]) {
-    ({ icon, bg, name } = endpointIcons[iconURL]);
+  if (isAssistantsEndpoint(endpoint)) {
+    return assistantsIcon.icon;
   }
 
-  if (isAssistantsEndpoint(endpoint)) {
-    return icon;
+  if (endpoint === EModelEndpoint.agents) {
+    return agentsIcon.icon;
   }
 
-  const hasBackground = typeof bg === 'string' && bg.length > 0;
+  if (imageURL != null) {
+    return (
+      <div
+        title={endpoint ?? ''}
+        style={{
+          width: size,
+          height: size,
+        }}
+        className={cn(
+          'relative flex h-9 w-9 items-center justify-center rounded-sm p-1 text-text-primary',
+          props.className ?? '',
+        )}
+      >
+        <div className="h-6 w-6">
+          <div className="overflow-hidden rounded-full">
+            <img className="h-full w-full object-contain" src={imageURL} alt={`${endpoint} Icon`} />
+          </div>
+        </div>
+        {errorBadge}
+      </div>
+    );
+  }
 
   return (
-    <div
-      title={name ?? ''}
-      style={{
-        background: bg != null ? bg || 'transparent' : 'transparent',
-        width: size,
-        height: size,
-      }}
-      className={cn(
-        'relative flex h-9 w-9 items-center justify-center rounded-sm p-1',
-        hasBackground ? 'text-white' : 'text-text-primary',
-        props.className ?? '',
-      )}
-    >
-      {icon}
-      {error === true && (
-        <span className="absolute right-0 top-[20px] -mr-2 flex h-3 w-3 items-center justify-center rounded-full border border-white bg-status-error text-[10px] text-white">
-          !
-        </span>
-      )}
-    </div>
+    <ProviderAvatar provider={provider} model={model} size={size} className={props.className}>
+      {errorBadge}
+    </ProviderAvatar>
   );
 };
 
diff --git a/client/src/components/Endpoints/MinimalIcon.tsx b/client/src/components/Endpoints/MinimalIcon.tsx
index 0bc861520e2..ee703f49ad1 100644
--- a/client/src/components/Endpoints/MinimalIcon.tsx
+++ b/client/src/components/Endpoints/MinimalIcon.tsx
@@ -1,67 +1,28 @@
 import { Feather } from 'lucide-react';
 import { EModelEndpoint, alternateName } from 'librechat-data-provider';
-import {
-  Sparkles,
-  BedrockIcon,
-  AnthropicIcon,
-  AzureMinimalIcon,
-  OpenAIMinimalIcon,
-  GoogleMinimalIcon,
-  CustomMinimalIcon,
-} from '@librechat/client';
-import UnknownIcon from '~/hooks/Endpoint/UnknownIcon';
-import { IconProps } from '~/common';
+import { Sparkles, ProviderIcon, getProviderIconDef } from '@librechat/client';
+import type { IconProps } from '~/common';
+import { useProviderIcon } from '~/hooks/Endpoint';
 import { cn } from '~/utils';
 
-const MinimalIcon: React.FC<IconProps> = (props) => {
-  const { size = 30, iconURL = '', iconClassName, error } = props;
-
-  let endpoint = 'default'; // Default value for endpoint
-
-  if (typeof props.endpoint === 'string') {
-    endpoint = props.endpoint;
-  }
+/** The art stays at `icon-sm` and never outgrows the wrapper it sits in. */
+const maxArtSize = 16;
 
-  const endpointIcons = {
-    [EModelEndpoint.azureOpenAI]: {
-      icon: <AzureMinimalIcon className={iconClassName} />,
-      name: props.chatGptLabel ?? 'ChatGPT',
-    },
-    [EModelEndpoint.openAI]: {
-      icon: <OpenAIMinimalIcon className={iconClassName} />,
-      name: props.chatGptLabel ?? 'ChatGPT',
-    },
-    [EModelEndpoint.google]: { icon: <GoogleMinimalIcon />, name: props.modelLabel ?? 'Google' },
-    [EModelEndpoint.anthropic]: {
-      icon: <AnthropicIcon className="icon-md shrink-0 dark:text-white" />,
-      name: props.modelLabel ?? 'Claude',
-    },
-    [EModelEndpoint.custom]: {
-      icon: <CustomMinimalIcon />,
-      name: 'Custom',
-    },
-    [EModelEndpoint.assistants]: { icon: <Sparkles className="icon-sm" />, name: 'Assistant' },
-    [EModelEndpoint.azureAssistants]: { icon: <Sparkles className="icon-sm" />, name: 'Assistant' },
-    [EModelEndpoint.agents]: {
-      icon: <Feather className="icon-sm" aria-hidden="true" />,
-      name: props.modelLabel ?? alternateName[EModelEndpoint.agents],
-    },
-    [EModelEndpoint.bedrock]: {
-      icon: <BedrockIcon className="icon-xl text-text-primary" />,
-      name: props.modelLabel ?? alternateName[EModelEndpoint.bedrock],
-    },
-    default: {
-      icon: <UnknownIcon iconURL={iconURL} endpoint={endpoint} className="icon-sm" context="nav" />,
-      name: endpoint,
-    },
-  };
-
-  let { icon, name } = endpointIcons[endpoint] ?? endpointIcons.default;
-  if (iconURL && endpointIcons[iconURL] != null) {
-    ({ icon, name } = endpointIcons[iconURL]);
-  }
+const MinimalIcon: React.FC<IconProps> = (props) => {
+  const {
+    size = 30,
+    iconURL = '',
+    iconClassName,
+    error,
+    model,
+    modelLabel,
+    chatGptLabel,
+    endpointsConfig,
+  } = props;
+  const endpoint = typeof props.endpoint === 'string' ? props.endpoint : '';
+  const { provider, imageURL } = useProviderIcon({ endpoint, iconURL, endpointsConfig });
 
-  return (
+  const renderWrapper = (icon: React.ReactNode, name: string) => (
     <div
       data-testid="convo-icon"
       title={name}
@@ -83,6 +44,37 @@ const MinimalIcon: React.FC<IconProps> = (props) => {
       )}
     </div>
   );
+
+  if (endpoint === EModelEndpoint.agents) {
+    return renderWrapper(
+      <Feather className="icon-sm" aria-hidden="true" />,
+      modelLabel ?? alternateName[EModelEndpoint.agents],
+    );
+  }
+
+  if (endpoint === EModelEndpoint.assistants || endpoint === EModelEndpoint.azureAssistants) {
+    return renderWrapper(<Sparkles className="icon-sm" />, 'Assistant');
+  }
+
+  const def = getProviderIconDef(provider, model);
+  const name = modelLabel ?? chatGptLabel ?? (provider != null ? def.label : endpoint || def.label);
+
+  if (imageURL != null) {
+    return renderWrapper(
+      <img className={cn('icon-sm', iconClassName)} src={imageURL} alt={`${endpoint} Icon`} />,
+      name,
+    );
+  }
+
+  return renderWrapper(
+    <ProviderIcon
+      provider={provider}
+      model={model}
+      size={Math.min(size, maxArtSize)}
+      className={iconClassName}
+    />,
+    name,
+  );
 };
 
 export default MinimalIcon;
diff --git a/client/src/components/Endpoints/ResolvedProviderIcon.tsx b/client/src/components/Endpoints/ResolvedProviderIcon.tsx
new file mode 100644
index 00000000000..e4eed33757e
--- /dev/null
+++ b/client/src/components/Endpoints/ResolvedProviderIcon.tsx
@@ -0,0 +1,33 @@
+import { ProviderIcon } from '@librechat/client';
+import type { ProviderId } from 'librechat-data-provider';
+import { cn } from '~/utils';
+
+export function ResolvedProviderIcon({
+  provider,
+  imageURL,
+  size = 20,
+  className,
+  model,
+  alt = '',
+}: {
+  provider?: ProviderId | null;
+  imageURL?: string | null;
+  size?: number;
+  className?: string;
+  model?: string | null;
+  alt?: string;
+}) {
+  if (imageURL) {
+    return (
+      <img
+        src={imageURL}
+        alt={alt}
+        width={size}
+        height={size}
+        className={cn('object-contain', className)}
+      />
+    );
+  }
+
+  return <ProviderIcon provider={provider} model={model} size={size} className={className} />;
+}
diff --git a/client/src/components/Endpoints/URLIcon.tsx b/client/src/components/Endpoints/URLIcon.tsx
index 23b6f14711f..3b78636b0f6 100644
--- a/client/src/components/Endpoints/URLIcon.tsx
+++ b/client/src/components/Endpoints/URLIcon.tsx
@@ -1,6 +1,7 @@
 import React, { memo, useState } from 'react';
 import { AlertCircle } from 'lucide-react';
-import { icons } from '~/hooks/Endpoint/Icons';
+import { ProviderIcon } from '@librechat/client';
+import type { ProviderId } from 'librechat-data-provider';
 
 export const URLIcon = memo(
   ({
@@ -9,14 +10,14 @@ export const URLIcon = memo(
     containerStyle = { width: 20, height: 20 },
     imageStyle = { width: '100%', height: '100%' },
     className = 'icon-md mr-1 shrink-0 overflow-hidden rounded-full',
-    endpoint,
+    provider,
   }: {
     iconURL: string;
     altName?: string | null;
     className?: string;
     containerStyle?: React.CSSProperties;
     imageStyle?: React.CSSProperties;
-    endpoint?: string;
+    provider?: ProviderId | null;
   }) => {
     const [imageError, setImageError] = useState(false);
 
@@ -24,14 +25,13 @@ export const URLIcon = memo(
       setImageError(true);
     };
 
-    const DefaultIcon: React.ElementType =
-      endpoint && icons[endpoint] ? icons[endpoint]! : icons.unknown!;
-
     if (imageError || !iconURL) {
+      const numericSize =
+        typeof containerStyle.width === 'number' ? containerStyle.width : undefined;
       return (
         <div className="relative" style={{ ...containerStyle, margin: '2px' }}>
           <div className={className}>
-            <DefaultIcon endpoint={endpoint} context="menu-item" size={containerStyle.width} />
+            <ProviderIcon provider={provider} size={numericSize} className="h-full w-full" />
           </div>
           {imageError && iconURL && (
             <div
diff --git a/client/src/components/Endpoints/__tests__/ConvoIcon.test.tsx b/client/src/components/Endpoints/__tests__/ConvoIcon.test.tsx
new file mode 100644
index 00000000000..5e1b0c20d40
--- /dev/null
+++ b/client/src/components/Endpoints/__tests__/ConvoIcon.test.tsx
@@ -0,0 +1,111 @@
+import React from 'react';
+import '@testing-library/jest-dom';
+import { render, screen } from '@testing-library/react';
+import { EModelEndpoint, ProviderId } from 'librechat-data-provider';
+import type {
+  Agent,
+  Assistant,
+  TConversation,
+  TAgentsMap,
+  TAssistantsMap,
+  TEndpointsConfig,
+} from 'librechat-data-provider';
+import ConvoIcon from '../ConvoIcon';
+
+const endpointsConfig = {
+  [EModelEndpoint.agents]: { order: 0 },
+  [EModelEndpoint.assistants]: { order: 1 },
+  [EModelEndpoint.anthropic]: { order: 2 },
+  [ProviderId.cohere]: { order: 3 },
+} as TEndpointsConfig;
+
+const agent = {
+  id: 'agent_123',
+  name: 'Research Agent',
+  avatar: { filepath: '/images/agents/agent_123/avatar.png', source: 'local' },
+} as Agent;
+
+const agentsMap = { [agent.id]: agent } as TAgentsMap;
+
+const assistant = {
+  id: 'asst_123',
+  name: 'Support Assistant',
+  metadata: { avatar: '/images/assistants/asst_123/avatar.png' },
+} as unknown as Assistant;
+
+const assistantMap = {
+  [EModelEndpoint.assistants]: { [assistant.id]: assistant },
+} as TAssistantsMap;
+
+const cohereConversation = { endpoint: ProviderId.cohere } as unknown as TConversation;
+
+const renderIcon = (conversation: TConversation) =>
+  render(
+    <ConvoIcon
+      conversation={conversation}
+      endpointsConfig={endpointsConfig}
+      assistantMap={assistantMap}
+      agentsMap={agentsMap}
+      className="h-2/3 w-2/3 text-text-primary"
+      context="landing"
+      size={41}
+    />,
+  );
+
+describe('ConvoIcon', () => {
+  it('renders the provider mark for a first-class endpoint', () => {
+    renderIcon({ endpoint: EModelEndpoint.anthropic } as TConversation);
+
+    expect(screen.getByRole('img', { name: 'Anthropic' })).toBeInTheDocument();
+  });
+
+  it('keeps the agent avatar rather than provider art', () => {
+    renderIcon({
+      endpoint: EModelEndpoint.agents,
+      agent_id: agent.id,
+    } as TConversation);
+
+    expect(screen.getByAltText('Research Agent')).toHaveAttribute(
+      'src',
+      '/images/agents/agent_123/avatar.png',
+    );
+  });
+
+  it('falls back to the agent mark when the agent has no avatar', () => {
+    renderIcon({
+      endpoint: EModelEndpoint.agents,
+      agent_id: 'missing_agent',
+    } as TConversation);
+
+    expect(screen.queryByRole('img')).not.toBeInTheDocument();
+  });
+
+  it('keeps the assistant avatar rather than provider art', () => {
+    renderIcon({
+      endpoint: EModelEndpoint.assistants,
+      assistant_id: assistant.id,
+    } as TConversation);
+
+    expect(screen.getByAltText('Support Assistant')).toHaveAttribute(
+      'src',
+      '/images/assistants/asst_123/avatar.png',
+    );
+  });
+
+  it('keeps Cohere landing padding off other contexts and on landing', () => {
+    const { container: landing } = renderIcon(cohereConversation);
+    expect(landing.querySelector('img')).toHaveClass('p-2');
+
+    const { container: nav } = render(
+      <ConvoIcon
+        conversation={cohereConversation}
+        endpointsConfig={endpointsConfig}
+        assistantMap={assistantMap}
+        agentsMap={agentsMap}
+        context="nav"
+        size={20}
+      />,
+    );
+    expect(nav.querySelector('img')).not.toHaveClass('p-2');
+  });
+});
diff --git a/client/src/components/Endpoints/__tests__/EndpointIcon.test.tsx b/client/src/components/Endpoints/__tests__/EndpointIcon.test.tsx
index 5dedc2ed4d9..a2e1f3ba538 100644
--- a/client/src/components/Endpoints/__tests__/EndpointIcon.test.tsx
+++ b/client/src/components/Endpoints/__tests__/EndpointIcon.test.tsx
@@ -92,4 +92,22 @@ describe('EndpointIcon', () => {
       EModelEndpoint.google,
     );
   });
+
+  it('resolves provider art when invoked as a plain function, as the mention list does', () => {
+    const conversation = { endpoint: EModelEndpoint.google } as TConversation;
+
+    const element = EndpointIcon({
+      conversation,
+      endpointsConfig,
+      context: 'menu-item',
+      size: 20,
+    });
+
+    render(element);
+
+    expect(screen.getByTestId('minimal-icon')).toHaveAttribute(
+      'data-endpoint',
+      EModelEndpoint.google,
+    );
+  });
 });
diff --git a/client/src/components/Endpoints/__tests__/MinimalIcon.test.tsx b/client/src/components/Endpoints/__tests__/MinimalIcon.test.tsx
new file mode 100644
index 00000000000..9e79fb3a412
--- /dev/null
+++ b/client/src/components/Endpoints/__tests__/MinimalIcon.test.tsx
@@ -0,0 +1,79 @@
+import React from 'react';
+import '@testing-library/jest-dom';
+import { render, screen } from '@testing-library/react';
+import { EModelEndpoint, ProviderId } from 'librechat-data-provider';
+import type { TEndpointsConfig } from 'librechat-data-provider';
+import MinimalIcon from '../MinimalIcon';
+
+describe('MinimalIcon', () => {
+  it('renders the provider mark for a first-class endpoint', () => {
+    render(<MinimalIcon endpoint={EModelEndpoint.openAI} isCreatedByUser={false} />);
+
+    expect(screen.getByRole('img', { name: 'OpenAI', hidden: true })).toBeInTheDocument();
+    expect(screen.getByTestId('convo-icon')).toHaveAttribute('title', 'OpenAI');
+  });
+  it('resolves a custom endpoint by name', () => {
+    render(<MinimalIcon endpoint="Ollama" isCreatedByUser={false} />);
+
+    const src = screen.getByRole('img', { name: 'Ollama', hidden: true }).getAttribute('src');
+    expect(src).toBeTruthy();
+    expect(src).not.toBe('');
+  });
+
+  it('keeps the agent art out of the provider registry', () => {
+    render(<MinimalIcon endpoint={EModelEndpoint.agents} isCreatedByUser={false} />);
+
+    expect(screen.queryByRole('img', { hidden: true })).not.toBeInTheDocument();
+    expect(screen.getByTestId('convo-icon')).toHaveAttribute('title', 'My Agents');
+  });
+
+  it('keeps the assistant art out of the provider registry', () => {
+    render(<MinimalIcon endpoint={EModelEndpoint.assistants} isCreatedByUser={false} />);
+
+    expect(screen.queryByRole('img', { hidden: true })).not.toBeInTheDocument();
+    expect(screen.getByTestId('convo-icon')).toHaveAttribute('title', 'Assistant');
+  });
+
+  it('renders a configured image iconURL instead of provider art', () => {
+    render(
+      <MinimalIcon
+        endpoint="Internal Gateway"
+        iconURL="https://cdn.example.com/logo.png"
+        isCreatedByUser={false}
+      />,
+    );
+
+    expect(screen.getByRole('img', { hidden: true })).toHaveAttribute(
+      'src',
+      'https://cdn.example.com/logo.png',
+    );
+  });
+
+  it('uses the server providerId when no iconURL is configured', () => {
+    const endpointsConfig = {
+      'My OpenRouter': {
+        type: EModelEndpoint.custom,
+        providerId: ProviderId.openrouter,
+        order: 0,
+      },
+    } as TEndpointsConfig;
+
+    render(
+      <MinimalIcon
+        endpoint="My OpenRouter"
+        endpointsConfig={endpointsConfig}
+        isCreatedByUser={false}
+      />,
+    );
+
+    expect(screen.getByRole('img', { name: 'OpenRouter', hidden: true })).toBeInTheDocument();
+  });
+
+  it('hides the decorative wrapper from assistive technology and flags errors', () => {
+    render(<MinimalIcon endpoint={EModelEndpoint.openAI} isCreatedByUser={false} error={true} />);
+
+    const wrapper = screen.getByTestId('convo-icon');
+    expect(wrapper).toHaveAttribute('aria-hidden', 'true');
+    expect(wrapper).toHaveTextContent('!');
+  });
+});
diff --git a/client/src/components/Messages/ContentRender.tsx b/client/src/components/Messages/ContentRender.tsx
index 0049a10d8cf..64161882869 100644
--- a/client/src/components/Messages/ContentRender.tsx
+++ b/client/src/components/Messages/ContentRender.tsx
@@ -11,6 +11,7 @@ import {
 import { revealOnRowHoverClasses, messageFooterClasses } from '~/components/Chat/Messages/styles';
 import { useAttachments, useLocalize, useMessageActions, useContentMetadata } from '~/hooks';
 import AuthorHeader from '~/components/Chat/Messages/Content/Parts/AuthorHeader';
+import Elapsed, { shouldShowElapsed } from '~/components/Chat/Messages/Elapsed';
 import { getHeaderModelName } from '~/components/Chat/Messages/ui/HeaderLabel';
 import ContentParts from '~/components/Chat/Messages/Content/ContentParts';
 import SiblingSwitch from '~/components/Chat/Messages/SiblingSwitch';
@@ -176,6 +177,13 @@ const ContentRender = memo(function ContentRender({
             setSiblingIdx={setSiblingIdx}
             className={cn(isSubmitting && isLatestMessage && revealOnRowHoverClasses)}
           />
+          {shouldShowElapsed({
+            isSubmitting,
+            isLatestMessage,
+            isCreatedByUser: msg.isCreatedByUser,
+            siblingIdx,
+            siblingCount,
+          }) && <Elapsed index={index} />}
           <HoverButtons
             index={index}
             message={msg}
diff --git a/client/src/components/Nav/SettingsTabs/ProviderKeys/ProviderKeyRow.tsx b/client/src/components/Nav/SettingsTabs/ProviderKeys/ProviderKeyRow.tsx
index 53827364718..d57868b79f9 100644
--- a/client/src/components/Nav/SettingsTabs/ProviderKeys/ProviderKeyRow.tsx
+++ b/client/src/components/Nav/SettingsTabs/ProviderKeys/ProviderKeyRow.tsx
@@ -1,12 +1,12 @@
-import React, { useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
 import { Button } from '@librechat/client';
 import { alternateName, getEndpointField } from 'librechat-data-provider';
 import type { TEndpointsConfig } from 'librechat-data-provider';
+import { ResolvedProviderIcon } from '~/components/Endpoints/ResolvedProviderIcon';
 import { formatKeyExpiryLabel } from '~/components/Input/SetKeyDialog/utils';
 import { useUserKey, useLocalize, useClockFormat } from '~/hooks';
 import { SetKeyDialog } from '~/components/Input/SetKeyDialog';
-import { icons } from '~/hooks/Endpoint/Icons';
-import { getIconKey } from '~/utils';
+import { useProviderIcon } from '~/hooks/Endpoint';
 
 interface ProviderKeyRowProps {
   endpoint: string;
@@ -19,9 +19,7 @@ export default function ProviderKeyRow({ endpoint, endpointsConfig }: ProviderKe
   const { getExpiry, checkExpiry } = useUserKey(endpoint);
 
   const endpointType = getEndpointField(endpointsConfig, endpoint, 'type');
-  const iconURL = getEndpointField(endpointsConfig, endpoint, 'iconURL');
-  const iconKey = getIconKey({ endpoint, endpointsConfig, endpointType });
-  const Icon = icons[iconKey];
+  const { provider, imageURL } = useProviderIcon({ endpoint, endpointsConfig });
 
   const label = useMemo(() => alternateName[endpoint] || endpoint, [endpoint]);
   const expiry = getExpiry();
@@ -41,16 +39,14 @@ export default function ProviderKeyRow({ endpoint, endpointsConfig }: ProviderKe
     <>
       <div className="flex items-center justify-between gap-3 py-2">
         <div className="flex min-w-0 items-center gap-3">
-          {Icon && (
-            <div className="flex shrink-0 items-center justify-center" aria-hidden="true">
-              {React.createElement(Icon, {
-                size: 20,
-                className: 'text-text-primary shrink-0 icon-md',
-                iconURL,
-                endpoint,
-              })}
-            </div>
-          )}
+          <div className="flex shrink-0 items-center justify-center" aria-hidden="true">
+            <ResolvedProviderIcon
+              provider={provider}
+              imageURL={imageURL}
+              size={20}
+              className="icon-md shrink-0"
+            />
+          </div>
           <div className="min-w-0">
             <div className="truncate font-medium text-text-primary">{label}</div>
             <div className="truncate text-xs text-text-secondary">{expiryLabel}</div>
diff --git a/client/src/components/Nav/SettingsTabs/ProviderKeys/__tests__/ProviderKeyRow.spec.tsx b/client/src/components/Nav/SettingsTabs/ProviderKeys/__tests__/ProviderKeyRow.spec.tsx
index 2ff75377950..96bdd7cbf4d 100644
--- a/client/src/components/Nav/SettingsTabs/ProviderKeys/__tests__/ProviderKeyRow.spec.tsx
+++ b/client/src/components/Nav/SettingsTabs/ProviderKeys/__tests__/ProviderKeyRow.spec.tsx
@@ -1,3 +1,4 @@
+import { EModelEndpoint } from 'librechat-data-provider';
 import type { TEndpointsConfig } from 'librechat-data-provider';
 import { changeLanguageSafely, initializeI18n } from '~/locales/i18n';
 import { render, screen } from 'test/layout-test-utils';
@@ -14,8 +15,6 @@ jest.mock('~/hooks', () => ({
   }),
 }));
 
-jest.mock('~/hooks/Endpoint/Icons', () => ({ icons: {} }));
-jest.mock('~/utils', () => ({ getIconKey: () => '' }));
 jest.mock('~/components/Input/SetKeyDialog', () => ({ SetKeyDialog: () => null }));
 
 describe('ProviderKeyRow', () => {
@@ -43,4 +42,23 @@ describe('ProviderKeyRow', () => {
 
     expect(screen.getByText(new RegExp(new Date(mockExpiry).toLocaleString()))).toBeInTheDocument();
   });
+
+  it('renders a configured endpoint image instead of the generic mark', () => {
+    const { container } = render(
+      <ProviderKeyRow
+        endpoint="Branded"
+        endpointsConfig={
+          {
+            Branded: {
+              type: EModelEndpoint.custom,
+              iconURL: 'https://cdn.example.com/x.png',
+              order: 0,
+            },
+          } as TEndpointsConfig
+        }
+      />,
+    );
+
+    expect(container.querySelector('img')).toHaveAttribute('src', 'https://cdn.example.com/x.png');
+  });
 });
diff --git a/client/src/components/Sharing/PublicSharingToggle.tsx b/client/src/components/Sharing/PublicSharingToggle.tsx
index 6bcf329894d..f7efcf54c19 100644
--- a/client/src/components/Sharing/PublicSharingToggle.tsx
+++ b/client/src/components/Sharing/PublicSharingToggle.tsx
@@ -85,7 +85,7 @@ export default function PublicSharingToggle({
         </div>
       </div>
 
-      <Collapse open={isPublic} className="pt-4">
+      <Collapse open={isPublic} overflowVisibleWhenOpen className="pt-4">
         <div className="flex items-center justify-between bg-transparent">
           <div className="flex items-center gap-3">
             <div className="text-status-info">
diff --git a/client/src/components/Sharing/__tests__/PublicSharingToggle.spec.tsx b/client/src/components/Sharing/__tests__/PublicSharingToggle.spec.tsx
index 440adb62b2a..0cb1f121344 100644
--- a/client/src/components/Sharing/__tests__/PublicSharingToggle.spec.tsx
+++ b/client/src/components/Sharing/__tests__/PublicSharingToggle.spec.tsx
@@ -26,6 +26,7 @@ describe('PublicSharingToggle', () => {
     const collapse = permissionLabel.closest('[aria-hidden="true"]');
 
     expect(collapse).toHaveClass('grid-rows-[0fr]');
+    expect(permissionLabel.closest('.overflow-hidden')).toBeInTheDocument();
 
     rerender(
       <PublicSharingToggle
@@ -39,4 +40,18 @@ describe('PublicSharingToggle', () => {
     expect(permissionLabel.closest('.bg-transparent')).not.toHaveClass('bg-surface-secondary/50');
     expect(permissionLabel.closest('.grid')).toHaveClass('grid-rows-[1fr]');
   });
+
+  it('does not clip the open permission row, so the inline role menu can escape the box', () => {
+    render(
+      <PublicSharingToggle
+        isPublic={true}
+        onPublicToggle={jest.fn()}
+        onPublicRoleChange={jest.fn()}
+      />,
+    );
+
+    const permissionLabel = screen.getByText('com_ui_everyone_permission_level');
+    expect(permissionLabel.closest('.overflow-hidden')).toBeNull();
+    expect(permissionLabel.closest('.overflow-visible')).toBeInTheDocument();
+  });
 });
diff --git a/client/src/components/SidePanel/Agents/Advanced/AgentSubagents.tsx b/client/src/components/SidePanel/Agents/Advanced/AgentSubagents.tsx
index f85ab7d732d..98c2331eb59 100644
--- a/client/src/components/SidePanel/Agents/Advanced/AgentSubagents.tsx
+++ b/client/src/components/SidePanel/Agents/Advanced/AgentSubagents.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { Switch } from '@librechat/client';
 import { Network, Users } from 'lucide-react';
 import type { ControllerRenderProps } from 'react-hook-form';
@@ -16,7 +16,6 @@ interface AgentSubagentsProps {
 
 const AgentSubagents: React.FC<AgentSubagentsProps> = ({ field, currentAgentId, maxSubagents }) => {
   const localize = useLocalize();
-  const [newAgentId, setNewAgentId] = useState('');
 
   const fieldValue = field.value;
   const value = useMemo(() => fieldValue ?? {}, [fieldValue]);
@@ -65,14 +64,19 @@ const AgentSubagents: React.FC<AgentSubagentsProps> = ({ field, currentAgentId,
     [field, value],
   );
 
-  useEffect(() => {
-    if (newAgentId && agentIds.length < maxSubagents && !agentIds.includes(newAgentId)) {
-      setAgentIds([...agentIds, newAgentId]);
-      setNewAgentId('');
-    } else if (newAgentId) {
-      setNewAgentId('');
-    }
-  }, [newAgentId, agentIds, maxSubagents, setAgentIds]);
+  const addAgent = useCallback(
+    (agentId: string) => {
+      if (!agentId || agentIds.length >= maxSubagents || agentIds.includes(agentId)) {
+        return;
+      }
+
+      /** Commit the selection directly to react-hook-form. Deferring this
+       * through component state and an effect allowed an immediate form submit
+       * to persist the enable toggles before the selected roster. */
+      setAgentIds([...agentIds, agentId]);
+    },
+    [agentIds, maxSubagents, setAgentIds],
+  );
 
   const removeAgentAt = (index: number) => {
     setAgentIds(agentIds.filter((_, i) => i !== index));
@@ -140,7 +144,7 @@ const AgentSubagents: React.FC<AgentSubagentsProps> = ({ field, currentAgentId,
             {agentIds.length < maxSubagents && (
               <AddAgentSelect
                 options={options}
-                onSelect={setNewAgentId}
+                onSelect={addAgent}
                 placeholder={localize('com_ui_agent_subagents_add')}
                 ariaLabel={localize('com_ui_agent_subagents_add')}
               />
diff --git a/client/src/components/SidePanel/Agents/Advanced/__tests__/AgentSubagents.spec.tsx b/client/src/components/SidePanel/Agents/Advanced/__tests__/AgentSubagents.spec.tsx
new file mode 100644
index 00000000000..8280fc2a642
--- /dev/null
+++ b/client/src/components/SidePanel/Agents/Advanced/__tests__/AgentSubagents.spec.tsx
@@ -0,0 +1,105 @@
+/**
+ * @jest-environment jsdom
+ */
+import { Controller, useForm } from 'react-hook-form';
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import type { UseFormReturn } from 'react-hook-form';
+import type { ReactNode } from 'react';
+import type { AgentForm } from '~/common';
+import AgentSubagents from '../AgentSubagents';
+
+let mockSelectAgent: ((agentId: string) => void) | undefined;
+let mockGetValues: UseFormReturn<AgentForm>['getValues'] | undefined;
+const mockSubmit = jest.fn();
+
+jest.mock('@librechat/client', () => ({
+  Switch: () => null,
+}));
+
+jest.mock('~/hooks', () => ({
+  useLocalize: () => (key: string) => key,
+}));
+
+jest.mock('../AgentList', () => ({
+  AddAgentSelect: ({ onSelect }: { onSelect: (agentId: string) => void }) => {
+    mockSelectAgent = onSelect;
+    return null;
+  },
+  ListMeta: () => null,
+  StaticAgentRow: () => null,
+  useSelectableAgents: () => ({ options: [], getAgent: () => undefined }),
+}));
+
+jest.mock('../OrchestrationPattern', () => ({
+  __esModule: true,
+  default: ({ children, trailing }: { children: ReactNode; trailing: ReactNode }) => (
+    <>
+      {trailing}
+      {children}
+    </>
+  ),
+}));
+
+jest.mock('../ui', () => ({
+  ToggleSetting: () => null,
+}));
+
+describe('AgentSubagents', () => {
+  beforeEach(() => {
+    mockSelectAgent = undefined;
+    mockGetValues = undefined;
+    mockSubmit.mockReset();
+  });
+
+  function Harness() {
+    const methods = useForm<AgentForm>({
+      defaultValues: {
+        subagents: {
+          enabled: true,
+          allowSelf: false,
+          agent_ids: [],
+        },
+      },
+    });
+    mockGetValues = methods.getValues;
+
+    return (
+      <form aria-label="agent form" onSubmit={methods.handleSubmit(mockSubmit)}>
+        <Controller
+          name="subagents"
+          control={methods.control}
+          render={({ field }) => (
+            <AgentSubagents field={field} currentAgentId="parent" maxSubagents={10} />
+          )}
+        />
+      </form>
+    );
+  }
+
+  it('commits a selected agent before an immediate form submit', async () => {
+    render(<Harness />);
+
+    act(() => {
+      mockSelectAgent?.('child');
+      fireEvent.submit(screen.getByRole('form', { name: 'agent form' }));
+    });
+
+    expect(mockGetValues?.('subagents')).toEqual({
+      enabled: true,
+      allowSelf: false,
+      agent_ids: ['child'],
+    });
+    await waitFor(() =>
+      expect(mockSubmit).toHaveBeenCalledWith(
+        expect.objectContaining({
+          subagents: {
+            enabled: true,
+            allowSelf: false,
+            agent_ids: ['child'],
+          },
+        }),
+        expect.anything(),
+      ),
+    );
+  });
+});
diff --git a/client/src/components/SidePanel/Agents/AgentConfig.tsx b/client/src/components/SidePanel/Agents/AgentConfig.tsx
index 796d4de4cc5..27e90387e65 100644
--- a/client/src/components/SidePanel/Agents/AgentConfig.tsx
+++ b/client/src/components/SidePanel/Agents/AgentConfig.tsx
@@ -1,14 +1,14 @@
 import { Input, Label } from '@librechat/client';
 import { Controller, useWatch, useFormContext } from 'react-hook-form';
-import { EModelEndpoint, getEndpointField } from 'librechat-data-provider';
-import type { AgentForm, IconComponentTypes } from '~/common';
+import type { AgentForm } from '~/common';
+import { ResolvedProviderIcon } from '~/components/Endpoints/ResolvedProviderIcon';
 import AgentCategorySelector from './AgentCategorySelector';
 import { useLocalize, useAgentCapabilities } from '~/hooks';
-import { validateEmail, getIconKey, cn } from '~/utils';
 import { useAgentFileEntries } from './Tools/hooks';
 import { useAgentPanelContext } from '~/Providers';
+import { useProviderIcon } from '~/hooks/Endpoint';
 import ToolsSection from './Tools/ToolsSection';
-import { icons } from '~/hooks/Endpoint/Icons';
+import { validateEmail, cn } from '~/utils';
 import Instructions from './Instructions';
 import FileContext from './FileContext';
 import AgentAvatar from './AgentAvatar';
@@ -33,22 +33,10 @@ export default function AgentConfig() {
   const { contextFiles } = useAgentFileEntries();
 
   const providerValue = typeof provider === 'string' ? provider : provider?.value;
-  let Icon: IconComponentTypes | null | undefined;
-  let endpointType: EModelEndpoint | undefined;
-  let endpointIconURL: string | undefined;
-  let iconKey: string | undefined;
-
-  if (providerValue !== undefined) {
-    endpointType = getEndpointField(endpointsConfig, providerValue as string, 'type');
-    endpointIconURL = getEndpointField(endpointsConfig, providerValue as string, 'iconURL');
-    iconKey = getIconKey({
-      endpoint: providerValue as string,
-      endpointsConfig,
-      endpointType,
-      endpointIconURL,
-    });
-    Icon = icons[iconKey];
-  }
+  const { provider: providerId, imageURL } = useProviderIcon({
+    endpoint: providerValue as string,
+    endpointsConfig,
+  });
 
   return (
     <div className="h-auto pt-1">
@@ -122,13 +110,13 @@ export default function AgentConfig() {
             )}
           >
             <div className="flex w-full min-w-0 items-center gap-2">
-              {Icon && (
+              {providerValue !== undefined && (
                 <div className="shadow-stroke relative flex h-6 w-6 flex-shrink-0 items-center justify-center rounded-full bg-white text-black dark:bg-white">
-                  <Icon
+                  <ResolvedProviderIcon
+                    provider={providerId}
+                    imageURL={imageURL}
+                    size={16}
                     className="h-2/3 w-2/3"
-                    endpoint={providerValue as string}
-                    endpointType={endpointType}
-                    iconURL={endpointIconURL}
                   />
                 </div>
               )}
diff --git a/client/src/components/ui/Collapse.tsx b/client/src/components/ui/Collapse.tsx
index 9ddcb691551..e5aced96dc7 100644
--- a/client/src/components/ui/Collapse.tsx
+++ b/client/src/components/ui/Collapse.tsx
@@ -5,6 +5,7 @@ interface CollapseProps {
   open: boolean;
   children: ReactNode;
   className?: string;
+  overflowVisibleWhenOpen?: boolean;
 }
 
 /**
@@ -14,8 +15,19 @@ interface CollapseProps {
  * cross-fade smoothly without a measuring wrapper fighting nested reveals.
  * Content fades to soften the swap; while closed it is `inert` (removed from tab
  * order and the a11y tree) so collapsed form fields can't be focused or read.
+ *
+ * `overflowVisibleWhenOpen` lifts the clip while open so non-portaled popovers
+ * anchored inside (e.g. dropdown menus, which must stay in-tree within modal
+ * dialogs to remain inside the focus trap) aren't sheared at the box edge; the
+ * closed state and the closing tween still clip, and the opacity fade masks the
+ * un-clipped opening tween.
  */
-export default function Collapse({ open, children, className }: CollapseProps) {
+export default function Collapse({
+  open,
+  children,
+  className,
+  overflowVisibleWhenOpen = false,
+}: CollapseProps) {
   return (
     <div
       aria-hidden={!open || undefined}
@@ -25,7 +37,12 @@ export default function Collapse({ open, children, className }: CollapseProps) {
         open ? 'grid-rows-[1fr]' : 'grid-rows-[0fr]',
       )}
     >
-      <div className="min-h-0 overflow-hidden">
+      <div
+        className={cn(
+          'min-h-0',
+          open && overflowVisibleWhenOpen ? 'overflow-visible' : 'overflow-hidden',
+        )}
+      >
         <div
           className={cn(
             'transition-opacity duration-200 ease-out motion-reduce:transition-none',
diff --git a/client/src/components/ui/__tests__/Collapse.spec.tsx b/client/src/components/ui/__tests__/Collapse.spec.tsx
index 59144e6048f..dae901e6545 100644
--- a/client/src/components/ui/__tests__/Collapse.spec.tsx
+++ b/client/src/components/ui/__tests__/Collapse.spec.tsx
@@ -25,4 +25,33 @@ describe('Collapse', () => {
     expect(root).toHaveClass('grid-rows-[0fr]');
     expect(root).toHaveAttribute('aria-hidden', 'true');
   });
+
+  test('clips content while open by default', () => {
+    const { container } = render(
+      <Collapse open={true}>
+        <span data-testid="child" />
+      </Collapse>,
+    );
+    const clipWrapper = (container.firstChild as HTMLElement).firstElementChild as HTMLElement;
+    expect(clipWrapper).toHaveClass('overflow-hidden');
+  });
+
+  test('lifts the clip while open for popover-hosting content, restoring it when closed', () => {
+    const { container, rerender } = render(
+      <Collapse open={true} overflowVisibleWhenOpen>
+        <span data-testid="child" />
+      </Collapse>,
+    );
+    const clipWrapper = (container.firstChild as HTMLElement).firstElementChild as HTMLElement;
+    expect(clipWrapper).toHaveClass('overflow-visible');
+    expect(clipWrapper).not.toHaveClass('overflow-hidden');
+
+    rerender(
+      <Collapse open={false} overflowVisibleWhenOpen>
+        <span data-testid="child" />
+      </Collapse>,
+    );
+    expect(clipWrapper).toHaveClass('overflow-hidden');
+    expect(clipWrapper).not.toHaveClass('overflow-visible');
+  });
 });
diff --git a/client/src/data-provider/Subagents/queries.test.ts b/client/src/data-provider/Subagents/queries.test.ts
index d1683d7c5aa..ddfc1ba5561 100644
--- a/client/src/data-provider/Subagents/queries.test.ts
+++ b/client/src/data-provider/Subagents/queries.test.ts
@@ -3,6 +3,7 @@ import type { ParentSubagentIndex, SubagentThreadView } from 'librechat-data-pro
 import {
   isSubagentReadinessPending,
   parentSubagentsRefetchInterval,
+  reconcileSubagentControlReceipts,
   subagentThreadHasTaskEvidence,
   subagentThreadRefetchInterval,
   useParentSubagentsQuery,
@@ -19,6 +20,23 @@ const view = (status: SubagentThreadView['status']): SubagentThreadView =>
   ({ status }) as SubagentThreadView;
 
 describe('subagent thread refresh policy', () => {
+  it('does not downgrade a refreshed terminal control receipt to accepted', () => {
+    const applied = {
+      invocationId: 'invocation-1',
+      action: 'queue',
+      status: 'applied',
+      createdAt: '2026-08-24T12:00:00.000Z',
+      updatedAt: '2026-08-24T12:00:02.000Z',
+    } as const;
+    const accepted = {
+      ...applied,
+      status: 'accepted',
+      updatedAt: '2026-08-24T12:00:01.000Z',
+    } as const;
+
+    expect(reconcileSubagentControlReceipts([applied], accepted)).toEqual([applied]);
+  });
+
   it('bounds child-readiness retries and keeps active work fresh', () => {
     expect(subagentThreadRefetchInterval(undefined, 1_000, 500)).toBe(2_000);
     expect(subagentThreadRefetchInterval(view('dispatched'), 1_000, 500)).toBe(2_000);
diff --git a/client/src/data-provider/Subagents/queries.ts b/client/src/data-provider/Subagents/queries.ts
index bac18486d40..c74b080fe34 100644
--- a/client/src/data-provider/Subagents/queries.ts
+++ b/client/src/data-provider/Subagents/queries.ts
@@ -1,7 +1,13 @@
 import { useMemo } from 'react';
-import { useQuery } from '@tanstack/react-query';
-import { Constants, QueryKeys, dataService } from 'librechat-data-provider';
-import type { ParentSubagentIndex, SubagentThreadView } from 'librechat-data-provider';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { Constants, MutationKeys, QueryKeys, dataService } from 'librechat-data-provider';
+import type {
+  ParentSubagentIndex,
+  SubagentControlReceipt,
+  SubagentControlRequest,
+  SubagentControlResponse,
+  SubagentThreadView,
+} from 'librechat-data-provider';
 import type { UseQueryOptions, QueryObserverResult } from '@tanstack/react-query';
 
 export const ACTIVE_THREAD_REFRESH_MS = 2_000;
@@ -118,3 +124,70 @@ export const useSubagentThreadQuery = (
     isReadinessPending: isSubagentReadinessPending(query.error, readiness.deadline),
   };
 };
+
+export type SubagentControlVariables = {
+  parentConversationId: string;
+  threadId: string;
+  command: SubagentControlRequest;
+  /** Client-only timestamp retained across retries; never sent to the API. */
+  submittedAt: string;
+};
+
+type SubagentControlMutationOptions = {
+  onSuccess?: (data: SubagentControlResponse, variables: SubagentControlVariables) => void;
+  onError?: (error: Error, variables: SubagentControlVariables) => void;
+};
+
+const isTerminalControlReceipt = (receipt: SubagentControlReceipt): boolean =>
+  receipt.status === 'applied' || receipt.status === 'rejected' || receipt.status === 'failed';
+
+/** Reconciles a mutation response without allowing an older accepted projection
+ * to replace a terminal receipt delivered by the concurrent activity refresh. */
+export const reconcileSubagentControlReceipts = (
+  receipts: SubagentControlReceipt[],
+  incoming: SubagentControlReceipt,
+): SubagentControlReceipt[] => {
+  const index = receipts.findIndex((candidate) => candidate.invocationId === incoming.invocationId);
+  if (index === -1) return [...receipts, incoming];
+  const current = receipts[index];
+  const currentUpdatedAt = Date.parse(current.updatedAt);
+  const incomingUpdatedAt = Date.parse(incoming.updatedAt);
+  if (
+    (isTerminalControlReceipt(current) && !isTerminalControlReceipt(incoming)) ||
+    (Number.isFinite(currentUpdatedAt) &&
+      Number.isFinite(incomingUpdatedAt) &&
+      currentUpdatedAt > incomingUpdatedAt)
+  ) {
+    return receipts;
+  }
+  return receipts.map((candidate, candidateIndex) =>
+    candidateIndex === index ? incoming : candidate,
+  );
+};
+
+export const useSubagentControlMutation = (options: SubagentControlMutationOptions = {}) => {
+  const queryClient = useQueryClient();
+  return useMutation<SubagentControlResponse, Error, SubagentControlVariables>(
+    ({ parentConversationId, threadId, command }) =>
+      dataService.controlSubagentTask(parentConversationId, threadId, command),
+    {
+      mutationKey: [MutationKeys.subagentControl],
+      onSuccess: ({ receipt }, { parentConversationId, threadId, command, submittedAt }) => {
+        const key = [QueryKeys.subagentThread, parentConversationId, threadId, command.taskId];
+        queryClient.setQueryData<SubagentThreadView | undefined>(key, (current) => {
+          if (current == null) return current;
+          return {
+            ...current,
+            controlReceipts: reconcileSubagentControlReceipts(
+              current.controlReceipts ?? [],
+              receipt,
+            ),
+          };
+        });
+        void queryClient.invalidateQueries(key);
+        options.onSuccess?.({ receipt }, { parentConversationId, threadId, command, submittedAt });
+      },
+      onError: (error, variables) => options.onError?.(error, variables),
+    },
+  );
+};
diff --git a/client/src/hooks/Chat/__tests__/useChatFunctions.regenerate.spec.tsx b/client/src/hooks/Chat/__tests__/useChatFunctions.regenerate.spec.tsx
index 76a3273d01a..d395b03b71f 100644
--- a/client/src/hooks/Chat/__tests__/useChatFunctions.regenerate.spec.tsx
+++ b/client/src/hooks/Chat/__tests__/useChatFunctions.regenerate.spec.tsx
@@ -49,6 +49,7 @@ jest.mock('~/store', () => ({
   default: {
     isTemporary: 'isTemporary',
     isSubmittingFamily: () => 'isSubmitting',
+    submissionStartFamily: () => 'submissionStart',
     showStopButtonByIndex: () => 'showStopButton',
     pendingManualSkillsByConvoId: () => 'pendingManualSkills',
     pendingQuotesByConvoId: () => 'pendingQuotes',
diff --git a/client/src/hooks/Chat/useChatFunctions.ts b/client/src/hooks/Chat/useChatFunctions.ts
index b34058bb766..195d23a5576 100644
--- a/client/src/hooks/Chat/useChatFunctions.ts
+++ b/client/src/hooks/Chat/useChatFunctions.ts
@@ -219,6 +219,7 @@ export default function useChatFunctions({
   const isTemporary = useRecoilValue(store.isTemporary);
   const { getExpiry } = useUserKey(immutableConversation?.endpoint ?? '');
   const setIsSubmitting = useSetRecoilState(store.isSubmittingFamily(index));
+  const setSubmissionStart = useSetRecoilState(store.submissionStartFamily(index));
   const setShowStopButton = useSetRecoilState(store.showStopButtonByIndex(index));
   const focusRegeneratedResponse = useFocusRegeneratedResponse();
 
@@ -712,6 +713,7 @@ export default function useChatFunctions({
       setMessages([...submissionMessages, currentMsg, initialResponse]);
     }
 
+    setSubmissionStart(Date.now());
     setSubmission(submission);
     logger.dir('message_stream', submission, { depth: null });
   };
diff --git a/client/src/hooks/Endpoint/Icons.tsx b/client/src/hooks/Endpoint/Icons.tsx
deleted file mode 100644
index b6ec86ba5b7..00000000000
--- a/client/src/hooks/Endpoint/Icons.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import { Feather } from 'lucide-react';
-import { EModelEndpoint } from 'librechat-data-provider';
-import {
-  GPTIcon,
-  Sparkles,
-  BedrockIcon,
-  AssistantIcon,
-  AnthropicIcon,
-  AzureMinimalIcon,
-  GoogleMinimalIcon,
-  CustomMinimalIcon,
-} from '@librechat/client';
-import type { IconMapProps, AgentIconMapProps, IconsRecord } from '~/common';
-import UnknownIcon from './UnknownIcon';
-import { cn } from '~/utils';
-
-const AssistantAvatar = ({
-  className = '',
-  assistantName = '',
-  avatar = '',
-  context,
-  size,
-}: IconMapProps) => {
-  if (assistantName && avatar) {
-    return (
-      <img
-        src={avatar}
-        className="bg-token-surface-secondary h-full w-full rounded-full object-cover dark:bg-surface-tertiary"
-        alt={assistantName}
-        width="80"
-        height="80"
-      />
-    );
-  } else if (assistantName) {
-    return <AssistantIcon className={cn('text-text-secondary', className)} size={size} />;
-  }
-
-  return <Sparkles className={cn(context === 'landing' ? 'icon-2xl' : '', className)} />;
-};
-
-const AgentAvatar = ({ className = '', avatar = '', agentName, size }: AgentIconMapProps) => {
-  if (agentName != null && agentName && avatar) {
-    return (
-      <img
-        src={avatar}
-        className="bg-token-surface-secondary h-full w-full rounded-full object-cover dark:bg-surface-tertiary"
-        alt={agentName}
-        width="80"
-        height="80"
-      />
-    );
-  }
-
-  return <Feather className={cn(agentName === '' ? 'icon-2xl' : '', className)} size={size} />;
-};
-
-const Bedrock = ({ className = '' }: IconMapProps) => {
-  return <BedrockIcon className={cn(className, 'h-full w-full')} />;
-};
-
-export const icons: IconsRecord = {
-  [EModelEndpoint.azureOpenAI]: AzureMinimalIcon,
-  [EModelEndpoint.openAI]: GPTIcon,
-  [EModelEndpoint.anthropic]: AnthropicIcon,
-  [EModelEndpoint.google]: GoogleMinimalIcon,
-  [EModelEndpoint.custom]: CustomMinimalIcon,
-  [EModelEndpoint.assistants]: AssistantAvatar,
-  [EModelEndpoint.azureAssistants]: AssistantAvatar,
-  [EModelEndpoint.agents]: AgentAvatar,
-  [EModelEndpoint.bedrock]: Bedrock,
-  unknown: UnknownIcon,
-};
diff --git a/client/src/hooks/Endpoint/UnknownIcon.tsx b/client/src/hooks/Endpoint/UnknownIcon.tsx
deleted file mode 100644
index 03f8874614e..00000000000
--- a/client/src/hooks/Endpoint/UnknownIcon.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import { memo } from 'react';
-import { EModelEndpoint, KnownEndpoints } from 'librechat-data-provider';
-import { CustomMinimalIcon, XAIcon, MoonshotIcon } from '@librechat/client';
-import { IconContext } from '~/common';
-import { cn } from '~/utils';
-
-const knownEndpointAssets: Record<string, string> = {
-  [KnownEndpoints.anyscale]: 'assets/anyscale.png',
-  [KnownEndpoints.apipie]: 'assets/apipie.png',
-  [KnownEndpoints.cohere]: 'assets/cohere.png',
-  [KnownEndpoints.deepseek]: 'assets/deepseek.svg',
-  [KnownEndpoints.fireworks]: 'assets/fireworks.png',
-  google: 'assets/google.svg',
-  [KnownEndpoints.groq]: 'assets/groq.png',
-  [KnownEndpoints.helicone]: 'assets/helicone.svg',
-  [KnownEndpoints.huggingface]: 'assets/huggingface.svg',
-  [KnownEndpoints.mistral]: 'assets/mistral.png',
-  [KnownEndpoints.mlx]: 'assets/mlx.png',
-  [KnownEndpoints.ollama]: 'assets/ollama.png',
-  openai: 'assets/openai.svg',
-  [KnownEndpoints.openrouter]: 'assets/openrouter.png',
-  [KnownEndpoints.perplexity]: 'assets/perplexity.png',
-  qwen: 'assets/qwen.svg',
-  [KnownEndpoints.shuttleai]: 'assets/shuttleai.png',
-  [KnownEndpoints['together.ai']]: 'assets/together.png',
-  [KnownEndpoints.unify]: 'assets/unify.webp',
-};
-
-const knownEndpointComponents = new Set<string>([KnownEndpoints.moonshot, KnownEndpoints.xai]);
-
-export function getKnownEndpointAsset(endpoint?: string | null): string {
-  if (!endpoint) {
-    return '';
-  }
-
-  return knownEndpointAssets[endpoint.toLowerCase()] ?? '';
-}
-
-export function hasKnownEndpointIcon(endpoint?: string | null): boolean {
-  if (!endpoint) {
-    return false;
-  }
-
-  const currentEndpoint = endpoint.toLowerCase();
-  return (
-    getKnownEndpointAsset(currentEndpoint) !== '' || knownEndpointComponents.has(currentEndpoint)
-  );
-}
-
-const knownEndpointClasses = {
-  [KnownEndpoints.cohere]: {
-    [IconContext.landing]: 'p-2',
-  },
-};
-
-const getKnownClass = ({
-  currentEndpoint,
-  context = '',
-  className,
-}: {
-  currentEndpoint: string;
-  context?: string;
-  className: string;
-}) => {
-  if (currentEndpoint === KnownEndpoints.openrouter) {
-    return className;
-  }
-
-  const match = knownEndpointClasses[currentEndpoint]?.[context] ?? '';
-  const defaultClass = context === IconContext.landing ? '' : className;
-
-  return cn(match, defaultClass);
-};
-
-function UnknownIcon({
-  className = '',
-  endpoint: _endpoint,
-  iconURL = '',
-  context,
-}: {
-  iconURL?: string;
-  className?: string;
-  endpoint?: EModelEndpoint | string | null;
-  context?: 'landing' | 'menu-item' | 'nav' | 'message';
-}) {
-  const endpoint = _endpoint ?? '';
-  if (!endpoint) {
-    return <CustomMinimalIcon className={className} />;
-  }
-
-  const currentEndpoint = endpoint.toLowerCase();
-
-  if (currentEndpoint === KnownEndpoints.xai) {
-    return <XAIcon className={cn(className, 'text-text-primary')} />;
-  }
-
-  if (currentEndpoint === KnownEndpoints.moonshot) {
-    return <MoonshotIcon className={cn(className, 'text-text-primary')} />;
-  }
-
-  if (iconURL) {
-    return <img className={className} src={iconURL} alt={`${endpoint} Icon`} />;
-  }
-
-  const assetPath = getKnownEndpointAsset(currentEndpoint);
-
-  if (!assetPath) {
-    return <CustomMinimalIcon className={className} />;
-  }
-
-  return (
-    <img
-      className={getKnownClass({
-        currentEndpoint,
-        context: context,
-        className,
-      })}
-      src={assetPath}
-      alt={`${currentEndpoint} Icon`}
-    />
-  );
-}
-
-export default memo(UnknownIcon);
diff --git a/client/src/hooks/Endpoint/__tests__/useProviderIcon.spec.ts b/client/src/hooks/Endpoint/__tests__/useProviderIcon.spec.ts
new file mode 100644
index 00000000000..b07e7f172c1
--- /dev/null
+++ b/client/src/hooks/Endpoint/__tests__/useProviderIcon.spec.ts
@@ -0,0 +1,57 @@
+import { renderHook } from '@testing-library/react';
+import { EModelEndpoint, ProviderId } from 'librechat-data-provider';
+import type { TEndpointsConfig } from 'librechat-data-provider';
+import { useProviderIcon } from '../useProviderIcon';
+
+const config: TEndpointsConfig = {
+  'My OpenRouter': { type: EModelEndpoint.custom, providerId: ProviderId.openrouter, order: 0 },
+  Branded: { type: EModelEndpoint.custom, iconURL: 'https://cdn.example.com/x.png', order: 1 },
+  Declared: { type: EModelEndpoint.custom, iconURL: 'mistral', order: 2 },
+  Ollama: { type: EModelEndpoint.custom, order: 3 },
+};
+
+const run = (endpoint: string, iconURL?: string) =>
+  renderHook(() => useProviderIcon({ endpoint, endpointsConfig: config, iconURL })).result.current;
+
+describe('useProviderIcon', () => {
+  it('rule 1: an image iconURL wins and suppresses provider art', () => {
+    expect(run('Branded')).toEqual({
+      provider: null,
+      imageURL: 'https://cdn.example.com/x.png',
+    });
+  });
+
+  it('treats a relative asset path as an image', () => {
+    expect(run('Custom', 'assets/company.png')).toEqual({
+      provider: null,
+      imageURL: 'assets/company.png',
+    });
+  });
+
+  it('rule 2: an iconURL naming a provider resolves to that provider', () => {
+    expect(run('Declared')).toEqual({ provider: ProviderId.mistral, imageURL: null });
+  });
+
+  it('rule 3: the server resolved providerId is used when no iconURL applies', () => {
+    expect(run('My OpenRouter')).toEqual({ provider: ProviderId.openrouter, imageURL: null });
+  });
+
+  it('rule 4: a first-class endpoint maps through endpointToProvider', () => {
+    expect(run(EModelEndpoint.anthropic)).toEqual({
+      provider: ProviderId.anthropic,
+      imageURL: null,
+    });
+  });
+
+  it('rule 5: an unconfigured endpoint still matches on its name', () => {
+    expect(run('Ollama')).toEqual({ provider: ProviderId.ollama, imageURL: null });
+  });
+
+  it('rule 6: nothing resolves to no provider and no image', () => {
+    expect(run('Totally Unknown')).toEqual({ provider: null, imageURL: null });
+  });
+
+  it('entity endpoints resolve to no provider, so avatars win', () => {
+    expect(run(EModelEndpoint.agents)).toEqual({ provider: null, imageURL: null });
+  });
+});
diff --git a/client/src/hooks/Endpoint/index.ts b/client/src/hooks/Endpoint/index.ts
index 4fe85d43923..851ff4d3fa5 100644
--- a/client/src/hooks/Endpoint/index.ts
+++ b/client/src/hooks/Endpoint/index.ts
@@ -1,3 +1,4 @@
 export { default as useKeyDialog } from './useKeyDialog';
 export { default as useEndpoints } from './useEndpoints';
 export { default as useSelectorEffects } from './useSelectorEffects';
+export { useProviderIcon, resolveProviderIcon } from './useProviderIcon';
diff --git a/client/src/hooks/Endpoint/useEndpoints.ts b/client/src/hooks/Endpoint/useEndpoints.ts
index 6cec38dc2fe..c8810ed8696 100644
--- a/client/src/hooks/Endpoint/useEndpoints.ts
+++ b/client/src/hooks/Endpoint/useEndpoints.ts
@@ -1,4 +1,6 @@
 import React, { useMemo, useCallback } from 'react';
+import { Feather } from 'lucide-react';
+import { Sparkles, ProviderIcon } from '@librechat/client';
 import { useGetModelsQuery } from 'librechat-data-provider/react-query';
 import {
   Permissions,
@@ -15,14 +17,46 @@ import type {
   Assistant,
   Agent,
 } from 'librechat-data-provider';
+import type { ProviderIconResolution } from './useProviderIcon';
 import type { Endpoint } from '~/common';
 import { useHasAccess, useShowMarketplace } from '~/hooks';
+import { resolveProviderIcon } from './useProviderIcon';
 import { useGetEndpointsQuery } from '~/data-provider';
-import { mapEndpoints, getIconKey } from '~/utils';
-import { icons } from './Icons';
+import { mapEndpoints } from '~/utils';
 
 const defaultInterface = getConfigDefaults().interface;
 
+const artSize = 20;
+const artClassName = 'text-text-primary shrink-0 icon-md';
+const providerArtClassName = 'icon-md shrink-0';
+
+const createEndpointIcon = (
+  endpoint: string,
+  { provider, imageURL }: ProviderIconResolution,
+): React.ReactNode => {
+  if (endpoint === EModelEndpoint.agents) {
+    return React.createElement(Feather, { size: artSize, className: artClassName });
+  }
+
+  if (endpoint === EModelEndpoint.assistants || endpoint === EModelEndpoint.azureAssistants) {
+    return React.createElement(Sparkles, { className: artClassName });
+  }
+
+  if (imageURL != null) {
+    return React.createElement('img', {
+      src: imageURL,
+      alt: `${endpoint} Icon`,
+      className: artClassName,
+    });
+  }
+
+  return React.createElement(ProviderIcon, {
+    provider,
+    size: artSize,
+    className: providerArtClassName,
+  });
+};
+
 export const useEndpoints = ({
   agents,
   assistantsMap,
@@ -85,10 +119,6 @@ export const useEndpoints = ({
 
   const mappedEndpoints: Endpoint[] = useMemo(() => {
     return filteredEndpoints.reduce<Endpoint[]>((acc, ep) => {
-      const endpointType = getEndpointField(endpointsConfig, ep, 'type');
-      const iconKey = getIconKey({ endpoint: ep, endpointsConfig, endpointType });
-      const Icon = icons[iconKey];
-      const endpointIconURL = getEndpointField(endpointsConfig, ep, 'iconURL');
       const hasModels =
         (ep === EModelEndpoint.agents && ((agents?.length ?? 0) > 0 || showAgentMarketplace)) ||
         (ep === EModelEndpoint.assistants && assistants?.length > 0) ||
@@ -105,14 +135,7 @@ export const useEndpoints = ({
         value: ep,
         label: alternateName[ep] || ep,
         hasModels,
-        icon: Icon
-          ? React.createElement(Icon, {
-              size: 20,
-              className: 'text-text-primary shrink-0 icon-md',
-              iconURL: endpointIconURL,
-              endpoint: ep,
-            })
-          : null,
+        icon: createEndpointIcon(ep, resolveProviderIcon({ endpoint: ep, endpointsConfig })),
       };
 
       if (ep === EModelEndpoint.agents && showAgentMarketplace) {
diff --git a/client/src/hooks/Endpoint/useProviderIcon.ts b/client/src/hooks/Endpoint/useProviderIcon.ts
new file mode 100644
index 00000000000..48808d6fe72
--- /dev/null
+++ b/client/src/hooks/Endpoint/useProviderIcon.ts
@@ -0,0 +1,62 @@
+import { useMemo } from 'react';
+import { getEndpointField, resolveProviderId, endpointToProvider } from 'librechat-data-provider';
+import type { TEndpointsConfig, EModelEndpoint, ProviderId } from 'librechat-data-provider';
+import { isImageURL } from '~/utils/icons';
+
+export interface ProviderIconResolution {
+  provider: ProviderId | null;
+  imageURL: string | null;
+}
+
+export interface ProviderIconParams {
+  endpoint?: string | null;
+  endpointsConfig?: TEndpointsConfig | null;
+  iconURL?: string | null;
+}
+
+/**
+ * Single source of truth for which art a given endpoint renders. Precedence, highest
+ * first: an image iconURL, an iconURL naming a provider, the server resolved
+ * providerId, the first-class endpoint mapping, then the endpoint name.
+ */
+export function resolveProviderIcon({
+  endpoint,
+  endpointsConfig,
+  iconURL,
+}: ProviderIconParams): ProviderIconResolution {
+  const configured = getEndpointField(endpointsConfig, endpoint, 'iconURL');
+  const candidate = iconURL || configured;
+
+  if (isImageURL(candidate)) {
+    return { provider: null, imageURL: candidate };
+  }
+
+  const declared = resolveProviderId(candidate);
+  if (declared) {
+    return { provider: declared, imageURL: null };
+  }
+
+  const served = getEndpointField(endpointsConfig, endpoint, 'providerId');
+  if (served) {
+    return { provider: served, imageURL: null };
+  }
+
+  const firstClass = endpoint ? endpointToProvider[endpoint as EModelEndpoint] : undefined;
+  if (firstClass) {
+    return { provider: firstClass, imageURL: null };
+  }
+
+  return { provider: resolveProviderId(endpoint), imageURL: null };
+}
+
+/** Memoized form of {@link resolveProviderIcon}, for use outside render callbacks. */
+export function useProviderIcon({
+  endpoint,
+  endpointsConfig,
+  iconURL,
+}: ProviderIconParams): ProviderIconResolution {
+  return useMemo(
+    () => resolveProviderIcon({ endpoint, endpointsConfig, iconURL }),
+    [endpoint, endpointsConfig, iconURL],
+  );
+}
diff --git a/client/src/hooks/SSE/useEventHandlers.ts b/client/src/hooks/SSE/useEventHandlers.ts
index d1b7d4f247c..1550c24e06f 100644
--- a/client/src/hooks/SSE/useEventHandlers.ts
+++ b/client/src/hooks/SSE/useEventHandlers.ts
@@ -342,6 +342,11 @@ export default function useEventHandlers({
   const { announcePolite } = useLiveAnnouncer();
   const applyAgentTemplate = useApplyAgentTemplate();
   const setAbortScroll = useSetRecoilState(store.abortScroll);
+  /** Cleared on every terminal path below: the elapsed anchor must not outlive
+   *  its generation, or a later externally-started run attached at this index
+   *  would inherit a stale baseline. Navigation teardown deliberately does not
+   *  clear it — a reattach to a still-live run keeps its original start. */
+  const setSubmissionStart = useSetRecoilState(store.submissionStartFamily(runIndex));
   const navigate = useNavigate();
   const location = useLocation();
 
@@ -734,6 +739,7 @@ export default function useEventHandlers({
         isTemporary: _isTemporary = false,
       } = submission;
       const serverConversation = conversation as TConversation;
+      setSubmissionStart(null);
 
       try {
         // Handle early abort - aborted before any response message was saved.
@@ -975,6 +981,7 @@ export default function useEventHandlers({
       location.pathname,
       applyAgentTemplate,
       attachmentHandler,
+      setSubmissionStart,
       restorePendingQuotes,
     ],
   );
@@ -983,6 +990,7 @@ export default function useEventHandlers({
     ({ data, submission }: { data?: TResData; submission: EventSubmission }) => {
       const { userMessage, initialResponse } = submission;
       setCompleted((prev) => new Set(prev.add(initialResponse.messageId)));
+      setSubmissionStart(null);
 
       const conversationId =
         userMessage.conversationId ?? submission.conversation?.conversationId ?? '';
@@ -1075,6 +1083,7 @@ export default function useEventHandlers({
       paramId,
       newConversation,
       setIsSubmitting,
+      setSubmissionStart,
       getMessages,
       queryClient,
     ],
@@ -1122,6 +1131,7 @@ export default function useEventHandlers({
           console.error('Error in finalHandler during abort:', error);
           setShowStopButton(false);
           setIsSubmitting(false);
+          setSubmissionStart(null);
         }
         return;
       } else if (!isAssistantsEndpoint(endpoint)) {
@@ -1198,6 +1208,7 @@ export default function useEventHandlers({
       newConversation,
       setIsSubmitting,
       setShowStopButton,
+      setSubmissionStart,
     ],
   );
 
diff --git a/client/src/hooks/SSE/useResumeOnLoad.ts b/client/src/hooks/SSE/useResumeOnLoad.ts
index f0b0f7653fe..f68baee9348 100644
--- a/client/src/hooks/SSE/useResumeOnLoad.ts
+++ b/client/src/hooks/SSE/useResumeOnLoad.ts
@@ -246,6 +246,7 @@ export default function useResumeOnLoad(
 ) {
   const queryClient = useQueryClient();
   const setSubmission = useSetRecoilState(store.submissionByIndex(runIndex));
+  const setSubmissionStart = useSetRecoilState(store.submissionStartFamily(runIndex));
   const currentSubmission = useRecoilValue(store.submissionByIndex(runIndex));
   const currentConversation = useRecoilValue(store.conversationByIndex(runIndex));
   const endpoint = currentConversation?.endpoint;
@@ -589,6 +590,11 @@ export default function useResumeOnLoad(
     });
 
     const messages = getMessages() || [];
+    /** Fill the elapsed baseline only when none survives: a reattach to the run
+     *  this session already anchored keeps its original start (the atom outlives
+     *  the submission), while a run it never anchored — another client's, or any
+     *  attach after the previous run's terminal clear — counts from attach. */
+    setSubmissionStart((prev) => prev ?? Date.now());
 
     // Build submission from resume state if available
     if (streamStatus.resumeState) {
@@ -658,6 +664,7 @@ export default function useResumeOnLoad(
     streamStatus,
     getMessages,
     setSubmission,
+    setSubmissionStart,
     restoreResumeBranch,
     restoreSteerChips,
     settleAppliedSteerParts,
diff --git a/client/src/hooks/SSE/useStepHandler.ts b/client/src/hooks/SSE/useStepHandler.ts
index 934fad74a0d..d7b91f855dd 100644
--- a/client/src/hooks/SSE/useStepHandler.ts
+++ b/client/src/hooks/SSE/useStepHandler.ts
@@ -954,7 +954,7 @@ export default function useStepHandler({
         // Store tool call IDs if present
         if (runStep.stepDetails.type === StepTypes.TOOL_CALLS) {
           let updatedResponse = { ...response };
-          (runStep.stepDetails.tool_calls as Agents.ToolCall[]).forEach((toolCall) => {
+          ((runStep.stepDetails.tool_calls ?? []) as Agents.ToolCall[]).forEach((toolCall) => {
             const toolCallId = toolCall.id ?? '';
             if ('id' in toolCall && toolCallId) {
               toolCallIdMap.current.set(runStep.id, toolCallId);
diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
index ba75173c968..8350bc740a1 100644
--- a/client/src/locales/en/translation.json
+++ b/client/src/locales/en/translation.json
@@ -1223,6 +1223,10 @@
   "com_ui_edited_file": "Edited {{0}}",
   "com_ui_editing_file": "Editing {{0}}",
   "com_ui_editor_instructions": "Drag the image to reposition • Use zoom slider or buttons to adjust size",
+  "com_ui_elapsed_announced_minutes": "{{count}} minutes elapsed",
+  "com_ui_elapsed_announced_minutes_one": "{{count}} minute elapsed",
+  "com_ui_elapsed_announced_seconds": "{{count}} seconds elapsed",
+  "com_ui_elapsed_announced_seconds_one": "{{count}} second elapsed",
   "com_ui_empty_category": "-",
   "com_ui_enabled": "Enabled",
   "com_ui_endpoint": "Endpoint",
@@ -2179,15 +2183,54 @@
   "com_ui_storage_filter_sort": "Filter and Sort by Storage",
   "com_ui_subagent_back_to_parent": "Back to parent chat",
   "com_ui_subagent_activity": "Agent activity",
+  "com_ui_subagent_agent_count": "{{0}} agent",
+  "com_ui_subagent_agents_count": "{{0}} agents",
+  "com_ui_subagent_count_dispatched_one": "{{0}} dispatched",
+  "com_ui_subagent_count_dispatched_other": "{{0}} dispatched",
+  "com_ui_subagent_count_running_one": "{{0}} running",
+  "com_ui_subagent_count_running_other": "{{0}} running",
+  "com_ui_subagent_count_completed_one": "{{0}} completed",
+  "com_ui_subagent_count_completed_other": "{{0}} completed",
+  "com_ui_subagent_count_failed_one": "{{0}} failed",
+  "com_ui_subagent_count_failed_other": "{{0}} failed",
+  "com_ui_subagent_count_interrupted_one": "{{0}} interrupted",
+  "com_ui_subagent_count_interrupted_other": "{{0}} interrupted",
+  "com_ui_subagent_count_cancelled_one": "{{0}} cancelled",
+  "com_ui_subagent_count_cancelled_other": "{{0}} cancelled",
   "com_ui_subagent_actor": "Agent",
   "com_ui_subagent_cancelled": "Cancelled agent",
   "com_ui_subagent_complete": "Ran agent",
   "com_ui_subagent_dialog_title": "\"{{0}}\" agent",
   "com_ui_subagent_dialog_title_self": "Agent",
-  "com_ui_subagent_earlier_turn": "Earlier turn {{0}}",
+  "com_ui_subagent_cancel_task": "Cancel task",
+  "com_ui_subagent_control_cancel": "Cancel task",
+  "com_ui_subagent_control_cancel_message": "Withdraw message",
+  "com_ui_subagent_control_history": "Control history",
+  "com_ui_subagent_control_history_truncated": "Earlier control activity is not shown.",
+  "com_ui_subagent_control_interrupt": "Interrupt",
+  "com_ui_subagent_control_message": "Message to subagent",
+  "com_ui_subagent_control_message_truncated": "Message shortened for display.",
+  "com_ui_subagent_control_placeholder": "Add guidance for this subagent",
+  "com_ui_subagent_control_queue": "Queued guidance",
+  "com_ui_subagent_control_reason_control_not_found": "That queued message is no longer available.",
+  "com_ui_subagent_control_reason_invalid_command": "The command was not accepted.",
+  "com_ui_subagent_control_reason_owner_unavailable": "The running subagent is temporarily unavailable. Retry with the same command.",
+  "com_ui_subagent_control_reason_task_inaccessible": "This subagent task is no longer accessible.",
+  "com_ui_subagent_control_reason_task_cancelled": "The task was cancelled before this command applied.",
+  "com_ui_subagent_control_reason_task_completed": "The task completed before this command applied.",
+  "com_ui_subagent_control_reason_task_failed": "The task failed before this command applied.",
+  "com_ui_subagent_control_reason_task_not_running": "This task is no longer running.",
+  "com_ui_subagent_control_reason_withdrawn": "This queued message was withdrawn.",
+  "com_ui_subagent_control_status_accepted": "Waiting",
+  "com_ui_subagent_control_status_applied": "Applied",
+  "com_ui_subagent_control_status_failed": "Failed",
+  "com_ui_subagent_control_status_rejected": "Not applied",
+  "com_ui_subagent_control_status_submitted": "Sending",
+  "com_ui_subagent_control_steer": "Steering guidance",
+  "com_ui_subagent_control_withdraw": "Withdraw",
+  "com_ui_subagent_interrupt": "Interrupt",
   "com_ui_subagent_empty_result": "No text returned.",
   "com_ui_subagent_errored": "Agent errored",
-  "com_ui_subagent_latest_turn": "Latest turn",
   "com_ui_subagent_no_result_yet": "Still running — no final result yet.",
   "com_ui_subagent_thread_history_truncated": "Earlier activity is not shown.",
   "com_ui_subagent_thread_load_error": "The agent activity could not be loaded.",
diff --git a/client/src/store/families.ts b/client/src/store/families.ts
index 122db2c160d..53a9e1522ec 100644
--- a/client/src/store/families.ts
+++ b/client/src/store/families.ts
@@ -38,6 +38,22 @@ const submissionByIndex = atomFamily<TSubmission | null, string | number>({
   default: null,
 });
 
+/**
+ * Epoch ms baseline for the streaming elapsed indicator at this chat index.
+ * Stamped when this session submits a generation (every path through `ask`),
+ * cleared by the terminal handlers when that generation ends, and only FILLED
+ * — never overwritten — when resume-on-load attaches a run. The reading
+ * therefore survives mid-stream remounts (new-conversation id hydration,
+ * navigating away from a still-live run and back) without a later,
+ * externally-started generation inheriting a stale baseline. Known residual:
+ * a run whose end this pane never observed (left mid-stream, finished
+ * elsewhere) leaves its stamp for the next attach at this index to inherit.
+ */
+const submissionStartFamily = atomFamily<number | null, string | number>({
+  key: 'submissionStartByIndex',
+  default: null,
+});
+
 const submissionKeysSelector = selector<(string | number)[]>({
   key: 'submissionKeysSelector',
   get: ({ get }) => {
@@ -683,6 +699,7 @@ export default {
   filesByIndex,
   presetByIndex,
   submissionByIndex,
+  submissionStartFamily,
   textByIndex,
   showStopButtonByIndex,
   abortScrollFamily,
diff --git a/client/src/store/subagents.ts b/client/src/store/subagents.ts
index d41bd15d27c..fd1e417bb0a 100644
--- a/client/src/store/subagents.ts
+++ b/client/src/store/subagents.ts
@@ -2,10 +2,13 @@ import { atom, atomFamily } from 'recoil';
 import { ContentTypes } from 'librechat-data-provider';
 import type {
   PartMetadata,
+  SubagentControlReceipt,
+  SubagentControlRequest,
   SubagentUpdatePhase,
   TMessageContentParts,
   SubagentUpdateEvent,
 } from 'librechat-data-provider';
+import type { AtomEffect } from 'recoil';
 import type {
   SubagentAggregatorState,
   SubagentContentPart,
@@ -271,6 +274,8 @@ export type ActiveSubagentPanel = {
     actorId: string;
     /** Task-specific live activity identity; the actor thread is reused across turns. */
     progressKey: string;
+    /** Message anchors merged into the same parent-owned activity group. */
+    siblingParentMessageIds?: string[];
   };
 };
 
@@ -279,6 +284,122 @@ export const activeSubagentPanel = atom<ActiveSubagentPanel | null>({
   default: null,
 });
 
+export type SubagentControlUiReceipt = Omit<SubagentControlReceipt, 'status'> & {
+  status: SubagentControlReceipt['status'] | 'submitted';
+};
+
+export type SubagentControlUiState = {
+  receipt: SubagentControlUiReceipt;
+  /** Present only while the same invocation must be retried to resolve an
+   * ambiguous delivery. It is never replaced with a fresh invocation id. */
+  retry?: SubagentControlRequest;
+};
+
+export const subagentControlStateKey = (
+  parentConversationId: string,
+  threadId: string,
+  taskId: string,
+): string => `${parentConversationId}\u0000${threadId}\u0000${taskId}`;
+
+const SUBAGENT_CONTROL_STORAGE_PREFIX = 'librechat.subagent-control:';
+const CONTROL_ACTIONS = new Set(['steer', 'queue', 'interrupt', 'cancel', 'cancel_message']);
+const storedControlState = (value: unknown): SubagentControlUiState | null => {
+  if (value == null || typeof value !== 'object') return null;
+  const candidate = value as Partial<SubagentControlUiState>;
+  const receipt = candidate.receipt as Partial<SubagentControlUiReceipt> | undefined;
+  const retry = candidate.retry as Partial<SubagentControlRequest> | undefined;
+  if (
+    receipt == null ||
+    typeof receipt.invocationId !== 'string' ||
+    !CONTROL_ACTIONS.has(receipt.action ?? '') ||
+    (receipt.status !== 'submitted' && receipt.status !== 'failed') ||
+    typeof receipt.createdAt !== 'string' ||
+    typeof receipt.updatedAt !== 'string' ||
+    retry == null ||
+    typeof retry.taskId !== 'string' ||
+    retry.taskId === '' ||
+    retry.invocationId !== receipt.invocationId ||
+    retry.action !== receipt.action ||
+    !CONTROL_ACTIONS.has(retry.action ?? '')
+  ) {
+    return null;
+  }
+  const action = retry.action as SubagentControlRequest['action'];
+  if (
+    (action === 'cancel' && (retry.message != null || retry.controlId != null)) ||
+    (action === 'cancel_message' &&
+      (typeof retry.controlId !== 'string' || retry.controlId === '' || retry.message != null)) ||
+    (action !== 'cancel' &&
+      action !== 'cancel_message' &&
+      (typeof retry.message !== 'string' || retry.message.trim() === '' || retry.controlId != null))
+  ) {
+    return null;
+  }
+  const now = new Date().toISOString();
+  const sanitizedRetry = {
+    taskId: retry.taskId,
+    invocationId: retry.invocationId,
+    action,
+    ...(action === 'cancel_message' ? { controlId: retry.controlId as string } : {}),
+    ...(action !== 'cancel' && action !== 'cancel_message'
+      ? { message: retry.message as string }
+      : {}),
+  } as SubagentControlRequest;
+  return {
+    receipt: {
+      invocationId: receipt.invocationId,
+      action,
+      status: 'failed',
+      createdAt: receipt.createdAt,
+      updatedAt: now,
+      ...(action === 'cancel_message' ? { controlId: retry.controlId as string } : {}),
+      ...(action !== 'cancel' && action !== 'cancel_message'
+        ? { message: retry.message as string }
+        : {}),
+      reason: 'owner_unavailable',
+    },
+    retry: sanitizedRetry,
+  };
+};
+
+const subagentControlStorageEffect =
+  (identity: string): AtomEffect<SubagentControlUiState | null> =>
+  ({ setSelf, onSet }) => {
+    if (typeof window === 'undefined') return;
+    const storageKey = `${SUBAGENT_CONTROL_STORAGE_PREFIX}${encodeURIComponent(identity)}`;
+    try {
+      const raw = window.sessionStorage.getItem(storageKey);
+      if (raw != null) {
+        const restored = storedControlState(JSON.parse(raw));
+        if (restored == null) window.sessionStorage.removeItem(storageKey);
+        else setSelf(restored);
+      }
+    } catch {
+      try {
+        window.sessionStorage.removeItem(storageKey);
+      } catch {
+        // Some privacy modes deny session storage entirely.
+      }
+    }
+    onSet((next, _previous, isReset) => {
+      try {
+        if (isReset || next?.retry == null) window.sessionStorage.removeItem(storageKey);
+        else window.sessionStorage.setItem(storageKey, JSON.stringify(next));
+      } catch {
+        // Storage is best-effort; the in-memory receipt still protects this mounted session.
+      }
+    });
+  };
+
+/** Parent-owned control state survives closing the activity panel or selecting
+ * another child. Ambiguous retries also survive a full page reload in this tab;
+ * durable receipts clear both copies after authoritative reconciliation. */
+export const subagentControlStateByTask = atomFamily<SubagentControlUiState | null, string>({
+  key: 'subagentControlStateByTask',
+  default: null,
+  effects_UNSTABLE: (identity) => [subagentControlStorageEffect(identity)],
+});
+
 /** Stable identity for one subagent invocation in the parent conversation. */
 export const subagentProgressKey = (
   parentMessageId: string,
diff --git a/client/src/style.css b/client/src/style.css
index 92b6cf60f3d..5212a03f19e 100644
--- a/client/src/style.css
+++ b/client/src/style.css
@@ -244,6 +244,13 @@ html {
   --theme-motion-fast: 150ms;
   --theme-motion-normal: 200ms;
   --switch-unchecked: 0 0% 58%;
+  --provider-openai: #19c37d;
+  --provider-openai-gpt4: #ab68ff;
+  --provider-openai-reasoning: #000000;
+  --provider-anthropic: #d09a74;
+  --provider-azure: linear-gradient(0.375turn, #61bde2, #4389d0);
+  --provider-bedrock: #268672;
+  --provider-foreground: #ffffff;
 }
 .dark {
   --brand-purple: 171 104 255;
@@ -326,6 +333,13 @@ html {
   --surface-fixed-hover: var(--gray-100);
   --text-fixed: var(--gray-800);
   --switch-unchecked: 0 0% 40%;
+  --provider-openai: #19c37d;
+  --provider-openai-gpt4: #ab68ff;
+  --provider-openai-reasoning: #000000;
+  --provider-anthropic: #d09a74;
+  --provider-azure: linear-gradient(0.375turn, #61bde2, #4389d0);
+  --provider-bedrock: #268672;
+  --provider-foreground: #ffffff;
 }
 .gizmo {
   --text-primary: var(--gizmo-gray-950);
diff --git a/client/src/utils/__tests__/activityLabels.spec.ts b/client/src/utils/__tests__/activityLabels.spec.ts
index b7f21102adf..0a4c75e25b8 100644
--- a/client/src/utils/__tests__/activityLabels.spec.ts
+++ b/client/src/utils/__tests__/activityLabels.spec.ts
@@ -3,6 +3,7 @@ import type { TActivityLabelEvent, TMessage, TMessageContentParts } from 'librec
 import {
   applyActivityLabelPart,
   groupActivityPhases,
+  lastCursorContentIdx,
   lastVisibleContentIdx,
   offsetActivityPhaseBoundary,
 } from '../activityLabels';
@@ -177,6 +178,27 @@ describe('lastVisibleContentIdx', () => {
   });
 });
 
+describe('lastCursorContentIdx', () => {
+  it('keeps the cursor on visible output before a trailing empty provider placeholder', () => {
+    const text = { type: ContentTypes.TEXT, text: 'Visible answer' } as TMessageContentParts;
+    const emptyText = { type: ContentTypes.TEXT, text: '' } as TMessageContentParts;
+
+    expect(lastCursorContentIdx([text, emptyText])).toBe(0);
+  });
+
+  it('retains a solitary empty placeholder for the initial waiting state', () => {
+    const emptyText = { type: ContentTypes.TEXT, text: '' } as TMessageContentParts;
+
+    expect(lastCursorContentIdx([emptyText])).toBe(0);
+  });
+
+  it('retains a sparse empty placeholder when no visible output precedes it', () => {
+    const emptyText = { type: ContentTypes.TEXT, text: '' } as TMessageContentParts;
+
+    expect(lastCursorContentIdx([undefined, emptyText])).toBe(1);
+  });
+});
+
 describe('offsetActivityPhaseBoundary', () => {
   it('folds only boundaries covered by the merged first completion part', () => {
     expect(offsetActivityPhaseBoundary(0, 5, true)).toBe(4);
diff --git a/client/src/utils/__tests__/icons.test.ts b/client/src/utils/__tests__/icons.test.ts
index 490b968f689..ce5687fa085 100644
--- a/client/src/utils/__tests__/icons.test.ts
+++ b/client/src/utils/__tests__/icons.test.ts
@@ -1,14 +1,24 @@
 import { isImageURL } from '../icons';
 
 describe('isImageURL', () => {
-  it.each(['https://example.com/icon.png', 'http://example.com/icon.png', '/assets/icon.svg'])(
-    'accepts image URL %s',
-    (iconURL) => {
-      expect(isImageURL(iconURL)).toBe(true);
-    },
-  );
+  it.each([
+    'https://example.com/icon.png',
+    'http://example.com/icon.png',
+    '//cdn.example.com/provider.png',
+    '/assets/icon.svg',
+    'assets/company.png',
+    'assets/icon.svg',
+    'assets/company.svg#mark',
+    'assets/provider.avif',
+    'assets/provider.apng',
+    'assets/provider.bmp',
+    'assets/provider.jfif',
+    'data:image/png;base64,iVBORw0KGgo=',
+  ])('accepts image URL %s', (iconURL) => {
+    expect(isImageURL(iconURL)).toBe(true);
+  });
 
-  it.each(['openAI', 'anthropic', 'assets/icon.svg', '//example.com/icon.png', '', null])(
+  it.each(['openAI', 'anthropic', '//', '///icon.png', '', null])(
     'rejects non-image URL %s',
     (iconURL) => {
       expect(isImageURL(iconURL)).toBe(false);
diff --git a/client/src/utils/__tests__/runStepDuration.spec.ts b/client/src/utils/__tests__/runStepDuration.spec.ts
index c4af8e3c5f6..1288048ec5f 100644
--- a/client/src/utils/__tests__/runStepDuration.spec.ts
+++ b/client/src/utils/__tests__/runStepDuration.spec.ts
@@ -1,4 +1,4 @@
-import { getRunStepDurationLabels } from '../runStepDuration';
+import { getRunStepDurationLabels, getElapsedDurationLabels } from '../runStepDuration';
 
 describe('getRunStepDurationLabels', () => {
   describe('under ten seconds', () => {
@@ -82,3 +82,39 @@ describe('getRunStepDurationLabels', () => {
     });
   });
 });
+
+describe('getElapsedDurationLabels', () => {
+  it('keeps the run-step visible form and rephrases the spoken form as elapsed', () => {
+    expect(getElapsedDurationLabels(5_000, 'en')).toEqual({
+      key: 'com_ui_duration_seconds',
+      values: { 0: '5' },
+      announcedKey: 'com_ui_elapsed_announced_seconds',
+      announcedValues: { count: '5' },
+    });
+  });
+
+  it('announces the singular form only for exactly one unit', () => {
+    expect(getElapsedDurationLabels(1_000).announcedKey).toBe(
+      'com_ui_elapsed_announced_seconds_one',
+    );
+    expect(getElapsedDurationLabels(60_000).announcedKey).toBe(
+      'com_ui_elapsed_announced_minutes_one',
+    );
+  });
+
+  it('rounds the spoken form to whole minutes past a minute', () => {
+    expect(getElapsedDurationLabels(90_000, 'en')).toMatchObject({
+      key: 'com_ui_duration_minutes',
+      values: { 0: '1', 1: '30' },
+      announcedKey: 'com_ui_elapsed_announced_minutes',
+      announcedValues: { count: '2' },
+    });
+  });
+
+  it('formats every interpolated number for the active locale', () => {
+    expect(getElapsedDurationLabels(65_000, 'ar-EG')).toMatchObject({
+      values: { 0: '١', 1: '٥' },
+      announcedValues: { count: '١' },
+    });
+  });
+});
diff --git a/client/src/utils/activityLabels.ts b/client/src/utils/activityLabels.ts
index 19193fd749c..73d22793007 100644
--- a/client/src/utils/activityLabels.ts
+++ b/client/src/utils/activityLabels.ts
@@ -359,6 +359,32 @@ export function lastVisibleContentIdx(
   return -1;
 }
 
+function isEmptyTextContentPart(part: TMessageContentParts | undefined): boolean {
+  if (part == null || part.type !== ContentTypes.TEXT) {
+    return false;
+  }
+  const text = typeof part.text === 'string' ? part.text : part.text?.value;
+  return (text ?? '').length === 0;
+}
+
+/**
+ * Last content index that should own the streaming cursor. A provider may
+ * append an empty TEXT placeholder after already-visible output; that
+ * placeholder must remain available for the initial waiting state without
+ * moving the cursor away from the visible part in either renderer.
+ */
+export function lastCursorContentIdx(
+  content: ReadonlyArray<TMessageContentParts | undefined> | undefined,
+): number {
+  const parts = content ?? [];
+  const lastIdx = lastVisibleContentIdx(parts);
+  if (lastIdx > 0 && isEmptyTextContentPart(parts[lastIdx])) {
+    const precedingIdx = lastVisibleContentIdx(parts.slice(0, lastIdx));
+    return precedingIdx >= 0 ? precedingIdx : lastIdx;
+  }
+  return lastIdx;
+}
+
 /**
  * Resolves the assistant response message an activity-label event targets.
  * Exact-id assistant match when `responseMessageId` is present (a miss
diff --git a/client/src/utils/endpoints.ts b/client/src/utils/endpoints.ts
index f0827df078b..b39fbdf23f5 100644
--- a/client/src/utils/endpoints.ts
+++ b/client/src/utils/endpoints.ts
@@ -11,7 +11,7 @@ import {
   resolveModelSpecEndpoint,
 } from 'librechat-data-provider';
 import type * as t from 'librechat-data-provider';
-import type { LocalizeFunction, IconsRecord } from '~/common';
+import type { LocalizeFunction } from '~/common';
 import { getTimestampedValue } from './timestamps';
 import { getAgentAvatarUrl } from './agents';
 
@@ -664,26 +664,6 @@ export function getIconEndpoint({
   return (endpointsConfig?.[iconURL ?? ''] ? (iconURL ?? endpoint) : endpoint) ?? '';
 }
 
-/** Gets the key to use for the default endpoint iconURL, as defined by the custom config */
-export function getIconKey({
-  endpoint,
-  endpointType: _eType,
-  endpointsConfig,
-  endpointIconURL: iconURL,
-}: {
-  endpoint?: string | null;
-  endpointsConfig?: t.TEndpointsConfig | null;
-  endpointType?: string | null;
-  endpointIconURL?: string;
-}): keyof IconsRecord {
-  const endpointType = _eType ?? getEndpointField(endpointsConfig, endpoint, 'type') ?? '';
-  const endpointIconURL = iconURL ?? getEndpointField(endpointsConfig, endpoint, 'iconURL') ?? '';
-  if (endpointIconURL && EModelEndpoint[endpointIconURL] != null) {
-    return endpointIconURL;
-  }
-  return endpointType ? 'unknown' : (endpoint ?? 'unknown');
-}
-
 export const getEntity = ({
   endpoint,
   assistant_id,
diff --git a/client/src/utils/icons.ts b/client/src/utils/icons.ts
index a518ba52f32..d24c14826b0 100644
--- a/client/src/utils/icons.ts
+++ b/client/src/utils/icons.ts
@@ -1,7 +1,19 @@
+/** Every image format browsers render, so a configured path is never mistaken for a provider name. */
+const IMAGE_EXTENSION =
+  /\.(apng|avif|bmp|cur|gif|ico|jfif|jpe?g|pjp|pjpeg|png|svg|webp)(?:[?#].*)?$/i;
+
 export function isImageURL(iconURL?: string | null): iconURL is string {
   if (!iconURL) {
     return false;
   }
 
-  return /^https?:\/\//i.test(iconURL) || (iconURL.startsWith('/') && !iconURL.startsWith('//'));
+  if (/^https?:\/\//i.test(iconURL) || /^data:image\/[a-z0-9.+-]+/i.test(iconURL)) {
+    return true;
+  }
+
+  if (iconURL.startsWith('//')) {
+    return /^\/\/[^/]/.test(iconURL);
+  }
+
+  return iconURL.startsWith('/') || IMAGE_EXTENSION.test(iconURL);
 }
diff --git a/client/src/utils/runStepDuration.ts b/client/src/utils/runStepDuration.ts
index 964fff1c852..35d314fe102 100644
--- a/client/src/utils/runStepDuration.ts
+++ b/client/src/utils/runStepDuration.ts
@@ -96,3 +96,40 @@ export function getRunStepDurationLabels(
     announcedValues: { count: formatDurationValue(announcedMinutes, language) },
   };
 }
+
+/**
+ * The streaming elapsed indicator's variant of the duration labels: the same
+ * locale-formatted visible form, with the spoken form phrased for a run still
+ * in progress ("5 seconds elapsed") rather than a settled one ("took 5
+ * seconds"). Produced here, beside `getRunStepDurationLabels`, so both forms
+ * keep sharing one per-locale number formatter.
+ */
+export function getElapsedDurationLabels(
+  durationMs: number,
+  language?: string,
+): RunStepDurationLabels {
+  const { key, values } = getRunStepDurationLabels(durationMs, language);
+  const totalSeconds = durationMs / MS_PER_SECOND;
+
+  if (Math.round(totalSeconds) < SECONDS_PER_MINUTE) {
+    const seconds = Math.round(totalSeconds);
+    return {
+      key,
+      values,
+      announcedKey:
+        seconds === 1 ? 'com_ui_elapsed_announced_seconds_one' : 'com_ui_elapsed_announced_seconds',
+      announcedValues: { count: formatDurationValue(seconds, language) },
+    };
+  }
+
+  const announcedMinutes = Math.round(totalSeconds / SECONDS_PER_MINUTE);
+  return {
+    key,
+    values,
+    announcedKey:
+      announcedMinutes === 1
+        ? 'com_ui_elapsed_announced_minutes_one'
+        : 'com_ui_elapsed_announced_minutes',
+    announcedValues: { count: formatDurationValue(announcedMinutes, language) },
+  };
+}
diff --git a/e2e/specs/mock/hover-actions.spec.ts b/e2e/specs/mock/hover-actions.spec.ts
index 4a53bd51d8d..98ef71e0a82 100644
--- a/e2e/specs/mock/hover-actions.spec.ts
+++ b/e2e/specs/mock/hover-actions.spec.ts
@@ -64,6 +64,13 @@ test.describe('message hover actions', () => {
     await expect(streamingEdit).toHaveCount(0);
     await expect(streamingFork).toHaveCount(0);
 
+    /** What the withheld actions leave behind is the elapsed-time indicator,
+     *  ticking once per second in the slot they reclaim when the answer lands. */
+    const streamingElapsed = streaming.getByTestId('stream-elapsed');
+    await expect(streamingElapsed).toHaveText(/^\d+s$/);
+    const firstReading = (await streamingElapsed.textContent()) ?? '';
+    await expect(streamingElapsed).not.toHaveText(firstReading, { timeout: 5000 });
+
     /** The settled turn above carries the positive control: the toolbar system is
      *  mounted and working, so the absences above read as "withheld" rather than
      *  "nothing rendered yet". */
@@ -71,6 +78,7 @@ test.describe('message hover actions', () => {
 
     /** ...and the response earns them back, or "withheld" would just be "gone". */
     await expect(stopButton(page)).toBeHidden({ timeout: 60000 });
+    await expect(streamingElapsed).toHaveCount(0);
     await expect(streamingCopy).toBeEnabled();
     await expect(streamingEdit).toBeEnabled();
     await expect(streamingFork).toBeEnabled();
diff --git a/package-lock.json b/package-lock.json
index 248b0948b1c..1d14c5da1c2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -63,7 +63,7 @@
         "@azure/storage-blob": "^12.30.0",
         "@google/genai": "^2.8.0",
         "@keyv/redis": "5.1.6",
-        "@librechat/agents": "^3.6.16",
+        "@librechat/agents": "^3.7.1",
         "@librechat/api": "*",
         "@librechat/data-schemas": "*",
         "@microsoft/microsoft-graph-client": "^3.0.7",
@@ -10630,9 +10630,9 @@
       }
     },
     "node_modules/@librechat/agents": {
-      "version": "3.6.16",
-      "resolved": "https://registry.npmjs.org/@librechat/agents/-/agents-3.6.16.tgz",
-      "integrity": "sha512-V8WQTC4gwoUdej9Xg5slaw2QgypVhTkosNp8UL/ANh9OlS7zSKgyu5/iDz8ZXQBywKNdt7y6k7+cO9W+I6kezA==",
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/@librechat/agents/-/agents-3.7.1.tgz",
+      "integrity": "sha512-nOuWNuuFeWefS7PqCT/fVYMBQ6WGePKs8nz4yLqWyeMyBPZSv6htotKH/ipVxxqSfMvYzNiTcfE+s18sKHCyMA==",
       "license": "MIT",
       "dependencies": {
         "@anthropic-ai/sdk": "^0.115.0",
@@ -42822,7 +42822,7 @@
         "@azure/storage-blob": "^12.30.0",
         "@google/genai": "^2.8.0",
         "@keyv/redis": "5.1.6",
-        "@librechat/agents": "^3.6.16",
+        "@librechat/agents": "^3.7.1",
         "@librechat/data-schemas": "*",
         "@modelcontextprotocol/sdk": "^1.30.0",
         "@opentelemetry/api": "^1.9.0",
diff --git a/packages/api/package.json b/packages/api/package.json
index 5fe51278139..990268d677a 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -113,7 +113,7 @@
     "@azure/storage-blob": "^12.30.0",
     "@google/genai": "^2.8.0",
     "@keyv/redis": "5.1.6",
-    "@librechat/agents": "^3.6.16",
+    "@librechat/agents": "^3.7.1",
     "@librechat/data-schemas": "*",
     "@modelcontextprotocol/sdk": "^1.30.0",
     "@opentelemetry/api": "^1.9.0",
diff --git a/packages/api/src/agents/__tests__/graph-subagent.e2e.test.ts b/packages/api/src/agents/__tests__/graph-subagent.e2e.test.ts
index ebe067a743c..d66f8c0a0f9 100644
--- a/packages/api/src/agents/__tests__/graph-subagent.e2e.test.ts
+++ b/packages/api/src/agents/__tests__/graph-subagent.e2e.test.ts
@@ -139,7 +139,6 @@ liveDescribe('Graph subagent E2E (LibreChat)', () => {
         {
           configurable: { thread_id: runId },
           recursionLimit: 100,
-          streamMode: 'values',
           version: 'v2',
         },
       );
diff --git a/packages/api/src/agents/__tests__/summarization.e2e.test.ts b/packages/api/src/agents/__tests__/summarization.e2e.test.ts
index 03ef2ca6d4c..0a52354060d 100644
--- a/packages/api/src/agents/__tests__/summarization.e2e.test.ts
+++ b/packages/api/src/agents/__tests__/summarization.e2e.test.ts
@@ -212,7 +212,11 @@ async function runFullTurn({
     initialSummary,
     runId: `e2e-${Date.now()}`,
     signal: abortController.signal,
-    customHandlers: buildHandlers(collectedUsage, aggregateContent, spies) as never,
+    customHandlers: buildHandlers(
+      collectedUsage,
+      aggregateContent as (params: { event: string; data: unknown }) => void,
+      spies,
+    ) as never,
     summarizationConfig,
     tokenCounter,
   });
diff --git a/packages/api/src/agents/activityPhases/runtime.spec.ts b/packages/api/src/agents/activityPhases/runtime.spec.ts
index f9291240d98..44a451c6068 100644
--- a/packages/api/src/agents/activityPhases/runtime.spec.ts
+++ b/packages/api/src/agents/activityPhases/runtime.spec.ts
@@ -100,7 +100,7 @@ describe('createActivityPhaseWiring', () => {
             phase: 'final_answer',
           },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -112,7 +112,7 @@ describe('createActivityPhaseWiring', () => {
         delta: {
           content: { type: ContentTypes.TEXT, text: 'A'.repeat(SUBSTANTIAL_TEXT_CHARS + 1) },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -185,13 +185,13 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: id, content_type: 'text', ...(phase && { phase }) },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
       handlers?.[GraphEvents.ON_MESSAGE_DELTA]?.handle(
         GraphEvents.ON_MESSAGE_DELTA,
-        { id, delta: { content: { type: ContentTypes.TEXT, text } } },
+        { id, delta: { content: { type: ContentTypes.TEXT, text } } } as never,
         undefined,
         undefined,
       );
@@ -274,13 +274,16 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
     handlers?.[GraphEvents.ON_MESSAGE_DELTA]?.handle(
       GraphEvents.ON_MESSAGE_DELTA,
-      { id: 'interleaved-text', delta: { content: { type: ContentTypes.TEXT, text: 'prefix' } } },
+      {
+        id: 'interleaved-text',
+        delta: { content: { type: ContentTypes.TEXT, text: 'prefix' } },
+      } as never,
       undefined,
       undefined,
     );
@@ -291,7 +294,7 @@ describe('createActivityPhaseWiring', () => {
       {
         id: 'interleaved-text',
         delta: { content: { type: ContentTypes.TEXT, text: 'x'.repeat(SUBSTANTIAL_TEXT_CHARS) } },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -348,7 +351,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -360,7 +363,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'think' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -370,7 +373,7 @@ describe('createActivityPhaseWiring', () => {
       {
         id: 'later-reasoning',
         delta: { content: { type: ContentTypes.THINK, think: 'Investigating the later tool.' } },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -379,7 +382,7 @@ describe('createActivityPhaseWiring', () => {
       {
         id: 'boundary-text',
         delta: { content: { type: ContentTypes.TEXT, text: substantialText('Boundary result.') } },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -547,14 +550,14 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'text' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
     const emitTextDelta = (id: string, text: string) =>
       handlers?.[GraphEvents.ON_MESSAGE_DELTA]?.handle(
         GraphEvents.ON_MESSAGE_DELTA,
-        { id, delta: { content: { type: ContentTypes.TEXT, text } } },
+        { id, delta: { content: { type: ContentTypes.TEXT, text } } } as never,
         undefined,
         undefined,
       );
@@ -572,7 +575,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text', phase: 'final_answer' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -626,7 +629,7 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'text', phase: 'final_answer' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -678,7 +681,7 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'text', phase: 'final_answer' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -736,7 +739,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'think' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -746,7 +749,7 @@ describe('createActivityPhaseWiring', () => {
       {
         id: 'missing-tool-reasoning',
         delta: { content: { type: ContentTypes.THINK, think: repeatedReasoning } },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -766,7 +769,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'think' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -776,7 +779,7 @@ describe('createActivityPhaseWiring', () => {
       {
         id: 'current-reasoning',
         delta: { content: { type: ContentTypes.THINK, think: repeatedReasoning } },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -789,7 +792,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text', phase: 'final_answer' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -826,7 +829,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text', phase: 'final_answer' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -858,7 +861,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'think' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -867,7 +870,7 @@ describe('createActivityPhaseWiring', () => {
       {
         id: 'reasoning-step',
         delta: { content: { type: ContentTypes.THINK, think: 'Compared both auth paths.' } },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -880,7 +883,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text', phase: 'commentary' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -907,7 +910,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text', phase: 'final_answer' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -948,7 +951,7 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'text', phase: 'final_answer' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -985,7 +988,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'think' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -994,7 +997,7 @@ describe('createActivityPhaseWiring', () => {
       {
         id: 'lane-reasoning',
         delta: { content: { type: ContentTypes.THINK, think: 'Checked the lane input.' } },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -1009,7 +1012,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -1039,7 +1042,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -1083,7 +1086,7 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'think' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -1093,7 +1096,7 @@ describe('createActivityPhaseWiring', () => {
         {
           id,
           delta: { content: { type: ContentTypes.THINK, think: text } },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -1115,7 +1118,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text', phase: 'final_answer' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -1173,7 +1176,7 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'text', phase: 'final_answer' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -1254,7 +1257,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'think' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -1266,7 +1269,7 @@ describe('createActivityPhaseWiring', () => {
         delta: {
           content: { type: ContentTypes.THINK, think: 'Verified one more edge case.' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -1823,7 +1826,7 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'text' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -1874,7 +1877,7 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'text' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -1924,7 +1927,7 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'text' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -1979,7 +1982,7 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'text' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -2035,7 +2038,7 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'text' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -2090,7 +2093,7 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'text' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -2147,7 +2150,7 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'text' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -2216,7 +2219,7 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'text' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -2332,7 +2335,7 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'text' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -2408,7 +2411,7 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'text' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -2448,7 +2451,7 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'think' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -2485,13 +2488,13 @@ describe('createActivityPhaseWiring', () => {
         message_creation: { message_id: 'm', content_type: 'text', phase: 'final_answer' },
       },
     };
-    handler?.handle(GraphEvents.ON_RUN_STEP, finalStep, undefined, undefined);
+    handler?.handle(GraphEvents.ON_RUN_STEP, finalStep as never, undefined, undefined);
     await flushDetached();
     expect(generatePhase).not.toHaveBeenCalled();
 
     handler?.handle(
       GraphEvents.ON_RUN_STEP,
-      { ...finalStep, id: 'root-final', groupId: undefined },
+      { ...finalStep, id: 'root-final', groupId: undefined } as never,
       undefined,
       undefined,
     );
@@ -2526,13 +2529,13 @@ describe('createActivityPhaseWiring', () => {
         message_creation: { message_id: 'm', content_type: 'text' },
       },
     };
-    handler?.handle(GraphEvents.ON_RUN_STEP, textStep, undefined, undefined);
+    handler?.handle(GraphEvents.ON_RUN_STEP, textStep as never, undefined, undefined);
     await flushDetached();
     expect(generatePhase).not.toHaveBeenCalled();
 
     handler?.handle(
       GraphEvents.ON_RUN_STEP,
-      { ...textStep, id: 'root-text', groupId: undefined },
+      { ...textStep, id: 'root-text', groupId: undefined } as never,
       undefined,
       undefined,
     );
@@ -2579,7 +2582,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text', phase: 'commentary' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -2624,7 +2627,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -2639,7 +2642,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text', phase: 'commentary' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -2760,7 +2763,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -2778,7 +2781,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -2826,7 +2829,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -2880,7 +2883,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -2934,7 +2937,7 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'text', phase: 'final_answer' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -2972,7 +2975,7 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'text', phase: 'final_answer' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -3018,7 +3021,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -3027,7 +3030,7 @@ describe('createActivityPhaseWiring', () => {
       {
         id: 'boundary',
         delta: { content: { type: ContentTypes.TEXT, text: substantialText('Boundary result.') } },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -3123,7 +3126,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text', phase: 'final_answer' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -3132,7 +3135,7 @@ describe('createActivityPhaseWiring', () => {
       {
         id: 'final-step',
         delta: { content: { type: ContentTypes.TEXT, text: 'Done.' } },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -3194,7 +3197,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -3203,7 +3206,7 @@ describe('createActivityPhaseWiring', () => {
       {
         id: 'early-text',
         delta: { content: { type: ContentTypes.TEXT, text: 'Context for the earlier work.' } },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -3305,7 +3308,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -3319,7 +3322,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -3328,7 +3331,7 @@ describe('createActivityPhaseWiring', () => {
       {
         id: 'parallel-text',
         delta: { content: { type: ContentTypes.TEXT, text: 'Context for the later work.' } },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -3337,7 +3340,7 @@ describe('createActivityPhaseWiring', () => {
       {
         id: 'boundary',
         delta: { content: { type: ContentTypes.TEXT, text: substantialText('Boundary result.') } },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -3402,7 +3405,7 @@ describe('createActivityPhaseWiring', () => {
             type: StepTypes.MESSAGE_CREATION,
             message_creation: { message_id: 'm', content_type: 'text' },
           },
-        },
+        } as never,
         undefined,
         undefined,
       );
@@ -3412,7 +3415,7 @@ describe('createActivityPhaseWiring', () => {
       {
         id: 'parallel-text',
         delta: { content: { type: ContentTypes.TEXT, text: 'Context for the later work.' } },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -3421,7 +3424,7 @@ describe('createActivityPhaseWiring', () => {
       {
         id: 'boundary',
         delta: { content: { type: ContentTypes.TEXT, text: substantialText('Boundary result.') } },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -3484,7 +3487,7 @@ describe('createActivityPhaseWiring', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', content_type: 'text' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -3493,7 +3496,7 @@ describe('createActivityPhaseWiring', () => {
       {
         id: 'boundary',
         delta: { content: { type: ContentTypes.TEXT, text: substantialText('Boundary result.') } },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -3528,7 +3531,7 @@ describe('createAssistantPhaseStampingHandlers', () => {
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { message_id: 'm', phase: 'commentary' },
         },
-      },
+      } as never,
       undefined,
       undefined,
     );
@@ -3537,7 +3540,7 @@ describe('createAssistantPhaseStampingHandlers', () => {
       {
         id: 'commentary-step',
         delta: { content: { type: ContentTypes.TEXT, text: 'I will compare both paths.' } },
-      },
+      } as never,
       undefined,
       undefined,
     );
diff --git a/packages/api/src/agents/activityPhases/runtime.ts b/packages/api/src/agents/activityPhases/runtime.ts
index c542d7c258e..1d0228f828e 100644
--- a/packages/api/src/agents/activityPhases/runtime.ts
+++ b/packages/api/src/agents/activityPhases/runtime.ts
@@ -415,13 +415,12 @@ export function createAssistantPhaseStampingHandlers(
           (part as { type?: string } | null)?.type === ContentTypes.TEXT
             ? { ...(part as Record<string, unknown>), phase }
             : part;
-        const forwarded = {
-          ...(data as Record<string, unknown>),
+        const forwarded = Object.assign({}, data, {
           delta: {
             ...delta,
             content: Array.isArray(raw) ? raw.map(stamp) : stamp(raw),
           },
-        };
+        });
         return messageHandler.handle(event, forwarded, metadata, graph);
       },
     };
diff --git a/packages/api/src/agents/control.spec.ts b/packages/api/src/agents/control.spec.ts
new file mode 100644
index 00000000000..c9e4ec626b5
--- /dev/null
+++ b/packages/api/src/agents/control.spec.ts
@@ -0,0 +1,577 @@
+import type { IConversation } from '@librechat/data-schemas';
+import type { Response } from 'express';
+import type { ServerRequest } from '~/types';
+import { controlFingerprint, SubagentTaskOwnerUnavailableError } from './subagentTaskRouting';
+import { createSubagentControlHandler, isValidSubagentControlRequest } from './control';
+
+const parentConversationId = 'parent-conversation';
+const threadId = 'child-thread';
+const taskId = 'task-1';
+const parent = {
+  conversationId: parentConversationId,
+  user: 'user-1',
+  tenantId: 'tenant-1',
+} as IConversation;
+const child = {
+  conversationId: threadId,
+  user: 'user-1',
+  tenantId: 'tenant-1',
+  subagentThread: {
+    rootConversationId: parentConversationId,
+    parentConversationId,
+    parentMessageId: 'parent-message',
+    parentToolCallId: 'parent-tool-call',
+    parentAgentId: 'parent-agent',
+    subagentType: 'researcher',
+    subagentKind: 'agent',
+    depth: 1,
+  },
+  subagentThreadLease: {
+    token: 'lease-token',
+    taskId,
+    expiresAt: new Date('2099-08-24T12:00:00.000Z'),
+  },
+} as IConversation;
+
+const response = () => {
+  const json = jest.fn();
+  const status = jest.fn(() => ({ json }));
+  return { value: { status } as unknown as Response, status, json };
+};
+
+const request = (body: Record<string, unknown>): ServerRequest =>
+  ({
+    params: { parentConversationId, threadId },
+    body,
+    user: { id: 'user-1', tenantId: 'tenant-1' },
+  }) as ServerRequest;
+
+const dependencies = (controlTask = jest.fn()) => ({
+  getConvoOwnership: jest.fn().mockResolvedValue(parent),
+  getSubagentThreadForParent: jest.fn().mockResolvedValue(child),
+  getMessages: jest
+    .fn()
+    .mockResolvedValue([{ messageId: `${taskId}:user`, subagentTask: { status: 'running' } }]),
+  getSubagentTaskControlReceipt: jest.fn().mockResolvedValue(null),
+  recordSubagentTaskControlReceipt: jest.fn().mockResolvedValue(true),
+  store: { controlTask },
+});
+
+describe('subagent control handler', () => {
+  it('rejects fields outside the action-specific public control contract', () => {
+    expect(
+      isValidSubagentControlRequest({
+        taskId,
+        invocationId: 'invocation-1',
+        action: 'queue',
+        message: 'Check the primary source.',
+      }),
+    ).toBe(true);
+    expect(
+      isValidSubagentControlRequest({
+        taskId,
+        invocationId: 'invocation-1',
+        action: 'queue',
+        message: 'Check the primary source.',
+        answers: ['unrelated moderation input'],
+      }),
+    ).toBe(false);
+    expect(
+      isValidSubagentControlRequest({
+        taskId,
+        invocationId: 'invocation-1',
+        action: 'cancel',
+        message: 'unused',
+      }),
+    ).toBe(false);
+  });
+
+  it('returns one bounded public accepted receipt from the authorized live owner', async () => {
+    const controlTask = jest.fn().mockResolvedValue({
+      status: 'accepted',
+      controlId: 'control-1',
+      task: { taskId, threadId, status: 'running' },
+    });
+    const deps = dependencies(controlTask);
+    const handler = createSubagentControlHandler(deps);
+    const res = response();
+
+    await handler(
+      request({
+        taskId,
+        invocationId: 'invocation-1',
+        action: 'queue',
+        message: 'Check the primary source.',
+      }),
+      res.value,
+    );
+
+    expect(controlTask).toHaveBeenCalledWith(
+      JSON.stringify({
+        version: 1,
+        userId: 'user-1',
+        parentConversationId,
+        tenantId: 'tenant-1',
+      }),
+      taskId,
+      { action: 'queue', message: 'Check the primary source.' },
+      'invocation-1',
+    );
+    expect(res.status).toHaveBeenCalledWith(200);
+    expect(res.json).toHaveBeenCalledWith({
+      receipt: expect.objectContaining({
+        invocationId: 'invocation-1',
+        controlId: 'control-1',
+        action: 'queue',
+        status: 'accepted',
+      }),
+    });
+    expect(JSON.stringify(res.json.mock.calls[0][0])).not.toContain('task');
+    expect(deps.getMessages).toHaveBeenCalledWith(
+      {
+        user: 'user-1',
+        tenantId: 'tenant-1',
+        conversationId: threadId,
+        messageId: `${taskId}:user`,
+      },
+      '+subagentTask',
+    );
+  });
+
+  it('returns the durable applied receipt when settlement races the owner response', async () => {
+    const command = { action: 'queue' as const, message: 'Check the primary source.' };
+    const controlTask = jest.fn().mockResolvedValue({
+      status: 'accepted',
+      controlId: 'control-1',
+      task: { taskId, threadId, status: 'running' },
+    });
+    const deps = dependencies(controlTask);
+    deps.getSubagentTaskControlReceipt.mockResolvedValueOnce(null).mockResolvedValueOnce({
+      invocationId: 'invocation-race',
+      fingerprint: controlFingerprint(command),
+      controlId: 'control-1',
+      action: 'queue',
+      status: 'applied',
+      boundary: 'turn',
+      createdAt: new Date('2026-08-24T12:00:00.000Z'),
+      updatedAt: new Date('2026-08-24T12:00:01.000Z'),
+    });
+    const handler = createSubagentControlHandler(deps);
+    const res = response();
+
+    await handler(request({ taskId, invocationId: 'invocation-race', ...command }), res.value);
+
+    expect(res.status).toHaveBeenCalledWith(200);
+    expect(res.json).toHaveBeenCalledWith({
+      receipt: expect.objectContaining({
+        invocationId: 'invocation-race',
+        status: 'applied',
+        boundary: 'turn',
+      }),
+    });
+    expect(deps.getSubagentTaskControlReceipt).toHaveBeenCalledTimes(2);
+  });
+
+  it('fails parent authorization closed without contacting a task owner', async () => {
+    const deps = dependencies();
+    deps.getConvoOwnership.mockResolvedValue(null);
+    const handler = createSubagentControlHandler(deps);
+    const res = response();
+
+    await handler(
+      request({
+        taskId,
+        invocationId: 'invocation-1',
+        action: 'cancel_message',
+        controlId: 'queued-control',
+      }),
+      res.value,
+    );
+
+    expect(deps.store.controlTask).not.toHaveBeenCalled();
+    expect(res.status).toHaveBeenCalledWith(404);
+  });
+
+  it('reads a tenantless task seed only from tenantless rows', async () => {
+    const controlTask = jest.fn().mockResolvedValue({
+      status: 'accepted',
+      controlId: 'control-1',
+      task: { taskId, threadId, status: 'running' },
+    });
+    const deps = dependencies(controlTask);
+    deps.getConvoOwnership.mockResolvedValue({ ...parent, tenantId: undefined });
+    deps.getSubagentThreadForParent.mockResolvedValue({ ...child, tenantId: undefined });
+    const req = request({
+      taskId,
+      invocationId: 'invocation-1',
+      action: 'queue',
+      message: 'Check the primary source.',
+    });
+    req.user = { id: 'user-1' } as ServerRequest['user'];
+    const handler = createSubagentControlHandler(deps);
+    const res = response();
+
+    await handler(req, res.value);
+
+    expect(deps.getMessages).toHaveBeenCalledWith(
+      expect.objectContaining({
+        user: 'user-1',
+        conversationId: threadId,
+        messageId: `${taskId}:user`,
+        tenantId: { $exists: false },
+      }),
+      '+subagentTask',
+    );
+    expect(controlTask).toHaveBeenCalledTimes(1);
+  });
+
+  it('returns an authoritative rejection when the selected task is no longer live', async () => {
+    const deps = dependencies(
+      jest.fn().mockResolvedValue({
+        status: 'not_running',
+        task: { taskId, threadId, status: 'completed' },
+      }),
+    );
+    deps.getSubagentThreadForParent.mockResolvedValue({
+      ...child,
+      subagentThreadLease: undefined,
+    });
+    const handler = createSubagentControlHandler(deps);
+    const res = response();
+
+    await handler(
+      request({
+        taskId,
+        invocationId: 'invocation-1',
+        action: 'cancel_message',
+        controlId: 'queued-control',
+      }),
+      res.value,
+    );
+
+    expect(deps.store.controlTask).toHaveBeenCalledWith(
+      expect.any(String),
+      taskId,
+      { action: 'cancel_message', controlId: 'queued-control' },
+      'invocation-1',
+    );
+    expect(res.status).toHaveBeenCalledWith(200);
+    expect(res.json).toHaveBeenCalledWith({
+      receipt: expect.objectContaining({
+        controlId: 'queued-control',
+        action: 'cancel_message',
+        status: 'rejected',
+        reason: 'task_not_running',
+      }),
+    });
+  });
+
+  it('replays the durable authoritative receipt before rejecting an expired lease', async () => {
+    const deps = dependencies();
+    deps.getSubagentThreadForParent.mockResolvedValue({
+      ...child,
+      subagentThreadLease: undefined,
+    });
+    deps.getSubagentTaskControlReceipt.mockResolvedValue({
+      invocationId: 'invocation-1',
+      fingerprint: controlFingerprint({ action: 'queue', message: 'Check the primary source.' }),
+      controlId: 'control-1',
+      action: 'queue',
+      status: 'applied',
+      createdAt: new Date('2026-08-24T12:00:00.000Z'),
+      updatedAt: new Date('2026-08-24T12:00:01.000Z'),
+      boundary: 'turn',
+      message: 'Check the primary source.',
+    });
+    const handler = createSubagentControlHandler(deps);
+    const res = response();
+
+    await handler(
+      request({
+        taskId,
+        invocationId: 'invocation-1',
+        action: 'queue',
+        message: 'Check the primary source.',
+      }),
+      res.value,
+    );
+
+    expect(deps.store.controlTask).not.toHaveBeenCalled();
+    expect(deps.recordSubagentTaskControlReceipt).not.toHaveBeenCalled();
+    expect(res.json).toHaveBeenCalledWith({
+      receipt: expect.objectContaining({
+        invocationId: 'invocation-1',
+        status: 'applied',
+        boundary: 'turn',
+      }),
+    });
+    expect(JSON.stringify(res.json.mock.calls[0][0])).not.toContain('fingerprint');
+  });
+
+  it('never exposes a private reservation as an accepted public receipt', async () => {
+    const controlTask = jest.fn().mockRejectedValue(new SubagentTaskOwnerUnavailableError());
+    const deps = dependencies(controlTask);
+    deps.getSubagentTaskControlReceipt.mockResolvedValue({
+      invocationId: 'invocation-1',
+      fingerprint: controlFingerprint({ action: 'queue', message: 'Check the primary source.' }),
+      action: 'queue',
+      status: 'reserved',
+      createdAt: new Date('2026-08-24T12:00:00.000Z'),
+      updatedAt: new Date('2026-08-24T12:00:00.000Z'),
+      message: 'Check the primary source.',
+    });
+    const handler = createSubagentControlHandler(deps);
+    const res = response();
+
+    await handler(
+      request({
+        taskId,
+        invocationId: 'invocation-1',
+        action: 'queue',
+        message: 'Check the primary source.',
+      }),
+      res.value,
+    );
+
+    expect(controlTask).toHaveBeenCalledTimes(1);
+    expect(res.status).toHaveBeenCalledWith(503);
+    expect(res.json).toHaveBeenCalledWith({
+      receipt: expect.objectContaining({
+        invocationId: 'invocation-1',
+        status: 'failed',
+        reason: 'owner_unavailable',
+      }),
+    });
+    expect(JSON.stringify(res.json.mock.calls[0][0])).not.toContain('reserved');
+  });
+
+  it('rejects invocation-id reuse with different command content', async () => {
+    const deps = dependencies();
+    deps.getSubagentTaskControlReceipt.mockResolvedValue({
+      invocationId: 'invocation-1',
+      fingerprint: controlFingerprint({ action: 'queue', message: 'Original command.' }),
+      controlId: 'control-1',
+      action: 'queue',
+      status: 'accepted',
+      createdAt: new Date('2026-08-24T12:00:00.000Z'),
+      updatedAt: new Date('2026-08-24T12:00:00.000Z'),
+      message: 'Original command.',
+    });
+    const handler = createSubagentControlHandler(deps);
+    const res = response();
+
+    await handler(
+      request({
+        taskId,
+        invocationId: 'invocation-1',
+        action: 'queue',
+        message: 'Different command.',
+      }),
+      res.value,
+    );
+
+    expect(deps.store.controlTask).not.toHaveBeenCalled();
+    expect(deps.recordSubagentTaskControlReceipt).not.toHaveBeenCalled();
+    expect(res.json).toHaveBeenCalledWith({
+      receipt: expect.objectContaining({
+        invocationId: 'invocation-1',
+        status: 'rejected',
+        reason: 'invalid_command',
+      }),
+    });
+  });
+
+  it('preserves a missing cancel_message target in the authoritative rejection', async () => {
+    const deps = dependencies(
+      jest.fn().mockResolvedValue({
+        status: 'control_not_found',
+        task: { taskId, threadId, status: 'running' },
+      }),
+    );
+    const handler = createSubagentControlHandler(deps);
+    const res = response();
+
+    await handler(
+      request({
+        taskId,
+        invocationId: 'invocation-1',
+        action: 'cancel_message',
+        controlId: 'missing-control',
+      }),
+      res.value,
+    );
+
+    expect(res.json).toHaveBeenCalledWith({
+      receipt: expect.objectContaining({
+        controlId: 'missing-control',
+        action: 'cancel_message',
+        status: 'rejected',
+        reason: 'control_not_found',
+      }),
+    });
+  });
+
+  it('makes owner unavailability explicit so the same invocation can be retried', async () => {
+    const deps = dependencies(jest.fn().mockRejectedValue(new SubagentTaskOwnerUnavailableError()));
+    const handler = createSubagentControlHandler(deps);
+    const res = response();
+
+    await handler(
+      request({ taskId, invocationId: 'invocation-1', action: 'interrupt', message: 'Stop.' }),
+      res.value,
+    );
+
+    expect(res.status).toHaveBeenCalledWith(503);
+    expect(res.json).toHaveBeenCalledWith({
+      receipt: expect.objectContaining({
+        invocationId: 'invocation-1',
+        status: 'failed',
+        reason: 'owner_unavailable',
+      }),
+    });
+  });
+
+  it('returns a retryable failure when routing cannot resolve a live owner', async () => {
+    const deps = dependencies(
+      jest.fn().mockResolvedValue({
+        status: 'not_found',
+        task: { taskId, threadId, status: 'running' },
+      }),
+    );
+    const handler = createSubagentControlHandler(deps);
+    const res = response();
+
+    await handler(
+      request({ taskId, invocationId: 'invocation-1', action: 'queue', message: 'Continue.' }),
+      res.value,
+    );
+
+    expect(res.status).toHaveBeenCalledWith(503);
+    expect(res.json).toHaveBeenCalledWith({
+      receipt: expect.objectContaining({
+        invocationId: 'invocation-1',
+        status: 'failed',
+        reason: 'owner_unavailable',
+      }),
+    });
+  });
+
+  it('rejects a task result owned by a sibling child thread', async () => {
+    const deps = dependencies(
+      jest.fn().mockResolvedValue({
+        status: 'accepted',
+        controlId: 'control-1',
+        task: { taskId, threadId: 'sibling-thread', status: 'running' },
+      }),
+    );
+    const handler = createSubagentControlHandler(deps);
+    const res = response();
+    deps.getSubagentThreadForParent.mockResolvedValue({
+      ...child,
+      subagentThreadLease: undefined,
+    });
+    deps.getMessages.mockResolvedValue([]);
+
+    await handler(
+      request({ taskId, invocationId: 'invocation-1', action: 'queue', message: 'Continue.' }),
+      res.value,
+    );
+
+    expect(res.status).toHaveBeenCalledWith(404);
+    expect(res.json).toHaveBeenCalledWith({ error: 'Conversation not found' });
+    expect(deps.store.controlTask).not.toHaveBeenCalled();
+  });
+
+  it('keeps a live pre-seed control retryable without applying it', async () => {
+    const deps = dependencies();
+    deps.getMessages.mockResolvedValue([]);
+    const handler = createSubagentControlHandler(deps);
+    const res = response();
+
+    await handler(
+      request({ taskId, invocationId: 'invocation-1', action: 'queue', message: 'Continue.' }),
+      res.value,
+    );
+
+    expect(deps.store.controlTask).not.toHaveBeenCalled();
+    expect(res.status).toHaveBeenCalledWith(503);
+    expect(res.json).toHaveBeenCalledWith({
+      receipt: expect.objectContaining({
+        invocationId: 'invocation-1',
+        status: 'failed',
+        reason: 'owner_unavailable',
+      }),
+    });
+  });
+
+  it('rejects malformed controls before authorization or routing', async () => {
+    const deps = dependencies();
+    const handler = createSubagentControlHandler(deps);
+    const res = response();
+
+    await handler(
+      request({ taskId, invocationId: 'invocation-1', action: 'steer', message: ' ' }),
+      res.value,
+    );
+
+    expect(deps.getConvoOwnership).not.toHaveBeenCalled();
+    expect(res.status).toHaveBeenCalledWith(400);
+  });
+
+  it('rejects task ids beyond the durable storage bound before authorization', async () => {
+    const deps = dependencies();
+    const handler = createSubagentControlHandler(deps);
+    const res = response();
+
+    await handler(
+      request({
+        taskId: 't'.repeat(257),
+        invocationId: 'invocation-1',
+        action: 'cancel',
+      }),
+      res.value,
+    );
+
+    expect(deps.getConvoOwnership).not.toHaveBeenCalled();
+    expect(res.status).toHaveBeenCalledWith(400);
+  });
+
+  it.each(['parentConversationId', 'threadId'] as const)(
+    'rejects %s beyond the downstream storage bound before authorization',
+    async (field) => {
+      const deps = dependencies();
+      const handler = createSubagentControlHandler(deps);
+      const req = request({
+        taskId,
+        invocationId: 'invocation-1',
+        action: 'cancel',
+      });
+      (req.params as Record<string, string>)[field] = 'c'.repeat(257);
+      const res = response();
+
+      await handler(req, res.value);
+
+      expect(deps.getConvoOwnership).not.toHaveBeenCalled();
+      expect(res.status).toHaveBeenCalledWith(400);
+    },
+  );
+
+  it('rejects control ids beyond the durable receipt bound before authorization', async () => {
+    const deps = dependencies();
+    const handler = createSubagentControlHandler(deps);
+    const res = response();
+
+    await handler(
+      request({
+        taskId,
+        invocationId: 'invocation-1',
+        action: 'cancel_message',
+        controlId: 'c'.repeat(257),
+      }),
+      res.value,
+    );
+
+    expect(deps.getConvoOwnership).not.toHaveBeenCalled();
+    expect(res.status).toHaveBeenCalledWith(400);
+  });
+});
diff --git a/packages/api/src/agents/control.ts b/packages/api/src/agents/control.ts
new file mode 100644
index 00000000000..f69efb3a140
--- /dev/null
+++ b/packages/api/src/agents/control.ts
@@ -0,0 +1,279 @@
+import type {
+  SubagentControlAction,
+  SubagentControlReceipt,
+  SubagentControlRequest,
+  SubagentControlResponse,
+} from 'librechat-data-provider';
+import type {
+  ConversationMethods,
+  ISubagentTaskControlReceipt,
+  MessageMethods,
+} from '@librechat/data-schemas';
+import type { SubagentTaskControlCommand, SubagentTaskControlResult } from '@librechat/agents';
+import type { Response } from 'express';
+import type { ServerRequest } from '~/types';
+import { controlFingerprint, SubagentTaskOwnerUnavailableError } from './subagentTaskRouting';
+import { createSubagentThreadScopeId } from './subagentThreads';
+
+const MAX_THREAD_ID_BYTES = 256;
+const MAX_TASK_ID_BYTES = 256;
+const MAX_INVOCATION_ID_BYTES = 128;
+const MAX_CONTROL_MESSAGE_CHARS = 4 * 1024;
+
+type ControlStore = {
+  controlTask(
+    scopeId: string,
+    taskId: string,
+    command: SubagentTaskControlCommand,
+    invocationId: string,
+  ): Promise<SubagentTaskControlResult>;
+};
+
+type Dependencies = Pick<ConversationMethods, 'getConvoOwnership' | 'getSubagentThreadForParent'> &
+  Pick<MessageMethods, 'getMessages' | 'getSubagentTaskControlReceipt'> & {
+    store: ControlStore;
+  };
+
+type Params = {
+  parentConversationId?: string;
+  threadId?: string;
+};
+
+const validId = (value: unknown, byteLimit = MAX_THREAD_ID_BYTES): value is string =>
+  typeof value === 'string' && value.trim() !== '' && Buffer.byteLength(value, 'utf8') <= byteLimit;
+
+const validAction = (value: unknown): value is SubagentControlAction =>
+  value === 'steer' ||
+  value === 'queue' ||
+  value === 'interrupt' ||
+  value === 'cancel' ||
+  value === 'cancel_message';
+
+const requestKeysForAction = (action: SubagentControlAction): Set<string> => {
+  const keys = new Set(['taskId', 'invocationId', 'action']);
+  if (action === 'cancel_message') keys.add('controlId');
+  else if (action !== 'cancel') keys.add('message');
+  return keys;
+};
+
+const commandFromRequest = (
+  body: SubagentControlRequest,
+): SubagentTaskControlCommand | undefined => {
+  if (!validAction(body.action)) return undefined;
+  if (body.action === 'cancel') return { action: 'cancel' };
+  if (body.action === 'cancel_message') {
+    return validId(body.controlId, MAX_TASK_ID_BYTES)
+      ? { action: 'cancel_message', controlId: body.controlId }
+      : undefined;
+  }
+  if (
+    typeof body.message !== 'string' ||
+    body.message.trim() === '' ||
+    body.message.length > MAX_CONTROL_MESSAGE_CHARS
+  ) {
+    return undefined;
+  }
+  return { action: body.action, message: body.message };
+};
+
+/** Cheap structural admission shared by the Express route and authoritative
+ * handler. It must run before filters, moderation, or owner routing. */
+export const isValidSubagentControlRequest = (value: unknown): value is SubagentControlRequest => {
+  if (value == null || typeof value !== 'object') return false;
+  const body = value as Partial<SubagentControlRequest>;
+  if (!validAction(body.action)) return false;
+  const allowedKeys = requestKeysForAction(body.action);
+  return (
+    Object.keys(body).every((key) => allowedKeys.has(key)) &&
+    validId(body.taskId, MAX_TASK_ID_BYTES) &&
+    validId(body.invocationId, MAX_INVOCATION_ID_BYTES) &&
+    commandFromRequest(body as SubagentControlRequest) != null
+  );
+};
+
+const commandReceiptFields = (command: SubagentTaskControlCommand) => ({
+  ...(command.action === 'cancel_message' ? { controlId: command.controlId } : {}),
+  ...('message' in command ? { message: command.message } : {}),
+});
+
+const responseReceipt = (
+  invocationId: string,
+  command: SubagentTaskControlCommand,
+  result: SubagentTaskControlResult,
+): SubagentControlReceipt => {
+  const now = new Date().toISOString();
+  let status: SubagentControlReceipt['status'] = 'rejected';
+  let reason: string | undefined;
+  if (result.status === 'accepted')
+    status = command.action === 'cancel_message' ? 'applied' : 'accepted';
+  if (result.status === 'cancelled') status = 'applied';
+  if (result.status === 'not_running') reason = 'task_not_running';
+  if (result.status === 'control_not_found') reason = 'control_not_found';
+  if (result.status === 'invalid') reason = 'invalid_command';
+  if (result.status === 'not_found') {
+    status = 'failed';
+    reason = 'owner_unavailable';
+  }
+  return {
+    invocationId,
+    ...commandReceiptFields(command),
+    ...(command.action !== 'cancel_message' &&
+    result.status === 'accepted' &&
+    result.controlId != null
+      ? { controlId: result.controlId }
+      : {}),
+    action: command.action,
+    status,
+    createdAt: now,
+    updatedAt: now,
+    ...(reason == null ? {} : { reason }),
+  };
+};
+
+const publicStoredReceipt = ({
+  fingerprint: _fingerprint,
+  createdAt,
+  updatedAt,
+  status,
+  ...receipt
+}: ISubagentTaskControlReceipt): SubagentControlReceipt => {
+  if (status === 'reserved') {
+    throw new SubagentTaskOwnerUnavailableError();
+  }
+  return {
+    ...receipt,
+    status,
+    createdAt: createdAt.toISOString(),
+    updatedAt: updatedAt.toISOString(),
+  };
+};
+
+/** Applies one parent-authorized control to the live owner and returns only its public receipt. */
+export function createSubagentControlHandler(deps: Dependencies) {
+  return async (req: ServerRequest, res: Response): Promise<void> => {
+    const userId = req.user?.id;
+    const tenantId = req.user?.tenantId || undefined;
+    const { parentConversationId, threadId } = req.params as Params;
+    const body = (req.body ?? {}) as Partial<SubagentControlRequest>;
+    const command = commandFromRequest(body as SubagentControlRequest);
+    if (
+      !userId ||
+      !validId(parentConversationId, MAX_THREAD_ID_BYTES) ||
+      !validId(threadId, MAX_THREAD_ID_BYTES) ||
+      parentConversationId === threadId ||
+      !isValidSubagentControlRequest(body) ||
+      command == null
+    ) {
+      res.status(400).json({ error: 'Invalid subagent control request' });
+      return;
+    }
+
+    try {
+      const [parent, child] = await Promise.all([
+        deps.getConvoOwnership(userId, parentConversationId, tenantId ?? null),
+        deps.getSubagentThreadForParent({
+          user: userId,
+          parentConversationId,
+          conversationId: threadId,
+          ...(tenantId == null ? {} : { tenantId }),
+        }),
+      ]);
+      if (
+        parent == null ||
+        child?.subagentThread?.parentConversationId !== parentConversationId ||
+        parent.tenantId !== tenantId ||
+        child.tenantId !== tenantId
+      ) {
+        res.status(404).json({ error: 'Conversation not found' });
+        return;
+      }
+      const fingerprint = controlFingerprint(command);
+      const existing = await deps.getSubagentTaskControlReceipt({
+        userId,
+        conversationId: threadId,
+        taskId: body.taskId,
+        invocationId: body.invocationId,
+        ...(tenantId == null ? {} : { tenantId }),
+      });
+      /** `reserved` is a server-private at-most-once fence, not an authoritative
+       * public receipt. Re-enter the task store so it can return owner-unavailable
+       * without exposing false acceptance or reapplying the command. */
+      if (existing != null && existing.status !== 'reserved') {
+        const receipt =
+          existing.fingerprint === fingerprint
+            ? publicStoredReceipt(existing)
+            : responseReceipt(body.invocationId, command, {
+                status: 'invalid',
+                message: 'This control invocation id was already used for a different command.',
+              });
+        res.status(200).json({ receipt } satisfies SubagentControlResponse);
+        return;
+      }
+      const [taskInput] = await deps.getMessages(
+        {
+          user: userId,
+          conversationId: threadId,
+          messageId: `${body.taskId}:user`,
+          ...(tenantId == null ? { tenantId: { $exists: false } } : { tenantId }),
+        },
+        '+subagentTask',
+      );
+      if (taskInput?.subagentTask == null) {
+        if (
+          child.subagentThreadLease?.taskId === body.taskId &&
+          child.subagentThreadLease.expiresAt.getTime() > Date.now()
+        ) {
+          throw new SubagentTaskOwnerUnavailableError();
+        }
+        res.status(404).json({ error: 'Conversation not found' });
+        return;
+      }
+      const scopeId = createSubagentThreadScopeId({
+        userId,
+        parentConversationId,
+        ...(tenantId == null ? {} : { tenantId }),
+      });
+      /** Retry identity and durable settlement belong to the task store. Route
+       * through that ledger even when the visible lease is stale instead of
+       * synthesizing a rejection that can race the owner's delayed receipt. */
+      const result = await deps.store.controlTask(scopeId, body.taskId, command, body.invocationId);
+      if (result.status === 'not_found') {
+        throw new SubagentTaskOwnerUnavailableError();
+      }
+      if ('task' in result && result.task.threadId !== threadId) {
+        res.status(404).json({ error: 'Conversation not found' });
+        return;
+      }
+      /** Routing returns the SDK task result, whose legacy `accepted` shape cannot
+       * distinguish an accepted command from one that became applied during the
+       * call. The durable ledger is authoritative after the store returns. */
+      const settledReceipt = await deps.getSubagentTaskControlReceipt({
+        userId,
+        conversationId: threadId,
+        taskId: body.taskId,
+        invocationId: body.invocationId,
+        ...(tenantId == null ? {} : { tenantId }),
+      });
+      const receipt =
+        settledReceipt != null && settledReceipt.fingerprint === fingerprint
+          ? publicStoredReceipt(settledReceipt)
+          : responseReceipt(body.invocationId, command, result);
+      res.status(200).json({ receipt } satisfies SubagentControlResponse);
+    } catch (error) {
+      if (error instanceof SubagentTaskOwnerUnavailableError) {
+        const receipt: SubagentControlReceipt = {
+          invocationId: body.invocationId,
+          ...commandReceiptFields(command),
+          action: command.action,
+          status: 'failed',
+          createdAt: new Date().toISOString(),
+          updatedAt: new Date().toISOString(),
+          reason: 'owner_unavailable',
+        };
+        res.status(503).json({ receipt } satisfies SubagentControlResponse);
+        return;
+      }
+      res.status(500).json({ error: 'Failed to control subagent task' });
+    }
+  };
+}
diff --git a/packages/api/src/agents/guard.spec.ts b/packages/api/src/agents/guard.spec.ts
index 07cf516ea35..c59366b396b 100644
--- a/packages/api/src/agents/guard.spec.ts
+++ b/packages/api/src/agents/guard.spec.ts
@@ -37,8 +37,10 @@ function makeStore(): SubagentThreadTaskStore {
     deleteConvos: unused as AllMethods['deleteConvos'],
     deleteMessages: unused as AllMethods['deleteMessages'],
     getConvo: unused as AllMethods['getConvo'],
+    getSubagentTaskControlReplay: unused as AllMethods['getSubagentTaskControlReplay'],
     getMessages: unused as AllMethods['getMessages'],
     listActiveSubagentThreadLeases: unused as AllMethods['listActiveSubagentThreadLeases'],
+    recordSubagentTaskControlReceipt: unused as AllMethods['recordSubagentTaskControlReceipt'],
     releaseSubagentThreadLease: unused as AllMethods['releaseSubagentThreadLease'],
     reserveSubagentThread: unused as AllMethods['reserveSubagentThread'],
     renewSubagentThreadLease: unused as AllMethods['renewSubagentThreadLease'],
diff --git a/packages/api/src/agents/hitl/resume.ts b/packages/api/src/agents/hitl/resume.ts
index 36575f0c34a..833ace36f56 100644
--- a/packages/api/src/agents/hitl/resume.ts
+++ b/packages/api/src/agents/hitl/resume.ts
@@ -324,7 +324,7 @@ type ResumableRunStep = {
 
 export function normalizeResumeRunStepIndices<T extends ResumableRunStep>(
   runSteps: readonly T[],
-  seedContent: readonly { type?: string; tool_call?: { id?: string } }[] = [],
+  seedContent: readonly ({ type?: string; tool_call?: { id?: string } } | undefined)[] = [],
 ): T[] {
   const toolCallIndices = new Map<string, number>();
   seedContent.forEach((part, index) => {
@@ -361,7 +361,7 @@ export function hydrateResumeRunSteps(
   runSteps: readonly RunStep[],
   stepMap: Map<string, RunStep | undefined> | undefined,
   graph: { toolCallStepIds?: Map<string, string> } | null | undefined,
-  seedContent: readonly { type?: string; tool_call?: { id?: string } }[] = [],
+  seedContent: readonly ({ type?: string; tool_call?: { id?: string } } | undefined)[] = [],
 ): void {
   for (const runStep of normalizeResumeRunStepIndices(runSteps, seedContent)) {
     if (!runStep?.id) {
diff --git a/packages/api/src/agents/index.ts b/packages/api/src/agents/index.ts
index 9444d41bc2b..b0220b38486 100644
--- a/packages/api/src/agents/index.ts
+++ b/packages/api/src/agents/index.ts
@@ -7,6 +7,7 @@ export * from './config';
 export * from './checkpointer';
 export * from './contact';
 export * from './context';
+export * from './control';
 export * from './conversation';
 export * from './discovery';
 export * from './edges';
diff --git a/packages/api/src/agents/memory.spec.ts b/packages/api/src/agents/memory.spec.ts
index 79d1c94f54a..6ecd579422b 100644
--- a/packages/api/src/agents/memory.spec.ts
+++ b/packages/api/src/agents/memory.spec.ts
@@ -3,6 +3,7 @@ import { Run, Providers, GraphEvents } from '@librechat/agents';
 import { AIMessage, HumanMessage } from '@librechat/agents/langchain/messages';
 import { Tools, MemoryScope, EModelEndpoint, AgentCapabilities } from 'librechat-data-provider';
 import type { FiltersConfig } from 'librechat-data-provider';
+import type { RuntimeProviderName } from '@librechat/agents';
 import type { IUser } from '@librechat/data-schemas';
 import type { Response } from 'express';
 import type { ServerRequest } from '~/types';
@@ -223,7 +224,7 @@ describe('Memory Agent Header Resolution', () => {
 
   it('should resolve environment variables in custom endpoint headers', async () => {
     const llmConfig = {
-      provider: 'custom',
+      provider: 'custom' as RuntimeProviderName,
       model: 'gpt-4o-mini',
       configuration: {
         defaultHeaders: {
@@ -258,7 +259,7 @@ describe('Memory Agent Header Resolution', () => {
 
   it('should resolve user placeholders in custom endpoint headers', async () => {
     const llmConfig = {
-      provider: 'custom',
+      provider: 'custom' as RuntimeProviderName,
       model: 'gpt-4o-mini',
       configuration: {
         defaultHeaders: {
@@ -293,7 +294,7 @@ describe('Memory Agent Header Resolution', () => {
 
   it('should handle mixed environment variables and user placeholders', async () => {
     const llmConfig = {
-      provider: 'custom',
+      provider: 'custom' as RuntimeProviderName,
       model: 'gpt-4o-mini',
       configuration: {
         defaultHeaders: {
@@ -330,7 +331,7 @@ describe('Memory Agent Header Resolution', () => {
 
   it('should resolve env vars when user is undefined', async () => {
     const llmConfig = {
-      provider: 'custom',
+      provider: 'custom' as RuntimeProviderName,
       model: 'gpt-4o-mini',
       configuration: {
         defaultHeaders: {
diff --git a/packages/api/src/agents/reasoningLabels/runtime.spec.ts b/packages/api/src/agents/reasoningLabels/runtime.spec.ts
index c09ddfdb1f1..20aea85c126 100644
--- a/packages/api/src/agents/reasoningLabels/runtime.spec.ts
+++ b/packages/api/src/agents/reasoningLabels/runtime.spec.ts
@@ -91,21 +91,21 @@ function createHarness(
           type: StepTypes.MESSAGE_CREATION,
           message_creation: { content_type: ContentTypes.THINK },
         },
-      },
+      } as never,
       metadata,
     );
   };
   const append = async (text: string, id = 'reasoning-1') => {
     await wrapped[GraphEvents.ON_REASONING_DELTA].handle(
       GraphEvents.ON_REASONING_DELTA,
-      reasoningDelta(id, text),
+      reasoningDelta(id, text) as never,
     );
   };
   const close = async (id = 'reasoning-1') => {
     await wrapped[GraphEvents.ON_RUN_STEP_CLOSED].handle(GraphEvents.ON_RUN_STEP_CLOSED, {
       id,
       status: 'completed',
-    });
+    } as never);
   };
   const settle = async () => {
     for (let i = 0; i < 5; i += 1) {
diff --git a/packages/api/src/agents/run.ts b/packages/api/src/agents/run.ts
index 341a83df6d2..13b2725986b 100644
--- a/packages/api/src/agents/run.ts
+++ b/packages/api/src/agents/run.ts
@@ -1,3 +1,4 @@
+import { randomUUID } from 'crypto';
 import { logger } from '@librechat/data-schemas';
 import { ensureHandler } from '@langchain/core/callbacks/manager';
 import { Run, Providers, Constants, HookRegistry } from '@librechat/agents';
@@ -1883,6 +1884,7 @@ export async function createRun({
   }
 
   const streamLimits = resolveStreamLimits(agentsEndpointConfig);
+  const resolvedRunId = runId ?? randomUUID();
 
   /**
    * Built as a variable (not an inline literal) so the extra
@@ -1892,7 +1894,7 @@ export async function createRun({
    * the field at the call site once the dependency is bumped.
    */
   const runConfig = {
-    runId,
+    runId: resolvedRunId,
     graphConfig,
     tokenCounter,
     customHandlers,
@@ -1959,7 +1961,7 @@ export async function createRun({
     // tracing is enabled. Requires @librechat/agents >= 3.2.21.
     langfuse: buildLangfuseConfig({
       appConfig,
-      runId,
+      runId: resolvedRunId,
       tenantId: tenantId ?? user?.tenantId,
       centralTraceExportEnabled,
     }),
diff --git a/packages/api/src/agents/steering/__tests__/offset.spec.ts b/packages/api/src/agents/steering/__tests__/offset.spec.ts
index f572f99b0cd..321b90086c7 100644
--- a/packages/api/src/agents/steering/__tests__/offset.spec.ts
+++ b/packages/api/src/agents/steering/__tests__/offset.spec.ts
@@ -27,11 +27,26 @@ describe('createSteerIndexOffsetHandlers', () => {
     );
 
     const handler = wrapped![GraphEvents.ON_RUN_STEP];
-    handler.handle(GraphEvents.ON_RUN_STEP, { id: 'step-1', index: 0 }, undefined, undefined);
+    handler.handle(
+      GraphEvents.ON_RUN_STEP,
+      { id: 'step-1', index: 0 } as never,
+      undefined,
+      undefined,
+    );
     state.offset = 1;
-    handler.handle(GraphEvents.ON_RUN_STEP, { id: 'step-2', index: 1 }, undefined, undefined);
+    handler.handle(
+      GraphEvents.ON_RUN_STEP,
+      { id: 'step-2', index: 1 } as never,
+      undefined,
+      undefined,
+    );
     state.offset = 2;
-    handler.handle(GraphEvents.ON_RUN_STEP, { id: 'step-3', index: 2 }, undefined, undefined);
+    handler.handle(
+      GraphEvents.ON_RUN_STEP,
+      { id: 'step-3', index: 2 } as never,
+      undefined,
+      undefined,
+    );
 
     expect(calls.map((c) => (c.data as { index: number }).index)).toEqual([0, 2, 4]);
   });
@@ -47,14 +62,14 @@ describe('createSteerIndexOffsetHandlers', () => {
     const handler = wrapped![GraphEvents.ON_AGENT_UPDATE];
     handler.handle(
       GraphEvents.ON_AGENT_UPDATE,
-      { agent_update: { index: 3, runId: 'run-1' } },
+      { agent_update: { index: 3, runId: 'run-1' } } as never,
       undefined,
       undefined,
     );
     state.offset = 2;
     handler.handle(
       GraphEvents.ON_AGENT_UPDATE,
-      { agent_update: { index: 4, runId: 'run-1' } },
+      { agent_update: { index: 4, runId: 'run-1' } } as never,
       undefined,
       undefined,
     );
@@ -79,7 +94,7 @@ describe('createSteerIndexOffsetHandlers', () => {
     expect(wrapped![GraphEvents.ON_MESSAGE_DELTA]).toBe(passthrough);
     wrapped![GraphEvents.ON_RUN_STEP].handle(
       GraphEvents.ON_RUN_STEP,
-      { id: 'step-x' },
+      { id: 'step-x' } as never,
       undefined,
       undefined,
     );
@@ -99,9 +114,19 @@ describe('createSteerIndexOffsetHandlers', () => {
     );
 
     const handler = wrapped![GraphEvents.ON_RUN_STEP];
-    handler.handle(GraphEvents.ON_RUN_STEP, { id: 'step-1', index: 0 }, undefined, undefined);
+    handler.handle(
+      GraphEvents.ON_RUN_STEP,
+      { id: 'step-1', index: 0 } as never,
+      undefined,
+      undefined,
+    );
     state.offset = 1;
-    handler.handle(GraphEvents.ON_RUN_STEP, { id: 'step-2', index: 1 }, undefined, undefined);
+    handler.handle(
+      GraphEvents.ON_RUN_STEP,
+      { id: 'step-2', index: 1 } as never,
+      undefined,
+      undefined,
+    );
 
     // seed offset (2) applies inside; steer offset applies on top
     expect(calls.map((c) => (c.data as { index: number }).index)).toEqual([2, 4]);
diff --git a/packages/api/src/agents/steering/__tests__/runtime.spec.ts b/packages/api/src/agents/steering/__tests__/runtime.spec.ts
index f4c471cb58c..f35d2908f81 100644
--- a/packages/api/src/agents/steering/__tests__/runtime.spec.ts
+++ b/packages/api/src/agents/steering/__tests__/runtime.spec.ts
@@ -98,7 +98,7 @@ describe('createSteerDrainHook', () => {
       },
     });
 
-    const output: SteerDrainOutput = await hook(batchInput(), abortSignal);
+    const output = (await hook(batchInput(), abortSignal)) as SteerDrainOutput;
     expect(applied).toEqual(['first', 'second']);
     expect(output.injectedMessages).toEqual([
       { role: 'user', content: 'first', source: 'steer' },
@@ -156,7 +156,7 @@ describe('createSteerDrainHook', () => {
       },
     });
 
-    const output: SteerDrainOutput = await hook(batchInput(), abortSignal);
+    const output = (await hook(batchInput(), abortSignal)) as SteerDrainOutput;
     expect(output).toEqual({});
     expect((await GenerationJobManager.steering.peek(streamId)).map((item) => item.text)).toEqual([
       'survives',
@@ -194,7 +194,7 @@ describe('createSteerDrainHook', () => {
       buildMedia,
     });
 
-    const output: SteerDrainOutput = await hook(batchInput(), abortSignal);
+    const output = (await hook(batchInput(), abortSignal)) as SteerDrainOutput;
     // buildMedia is consulted only for items that carry files.
     expect(buildMedia).toHaveBeenCalledTimes(1);
     expect(calls).toEqual(['apply:s1', 'apply:s2', 'media:s1']);
@@ -227,7 +227,7 @@ describe('createSteerDrainHook', () => {
       },
     });
 
-    const output: SteerDrainOutput = await hook(batchInput(), abortSignal);
+    const output = (await hook(batchInput(), abortSignal)) as SteerDrainOutput;
     expect(appliedBeforeEncode).toBe(true);
     expect(output.injectedMessages).toEqual([
       { role: 'user', content: 'must land first', source: 'steer' },
@@ -251,7 +251,7 @@ describe('createSteerDrainHook', () => {
       },
     });
 
-    const output: SteerDrainOutput = await hook(batchInput(), abortSignal);
+    const output = (await hook(batchInput(), abortSignal)) as SteerDrainOutput;
     expect(output.injectedMessages).toEqual([
       { role: 'user', content: 'words survive', source: 'steer' },
     ]);
@@ -300,7 +300,7 @@ describe('createSteerPreemptBoundaryHook', () => {
       },
     });
 
-    const output: SteerDrainOutput = await hook(boundaryInput(), abortSignal);
+    const output = (await hook(boundaryInput(), abortSignal)) as SteerDrainOutput;
     expect(applied).toEqual(['first', 'second']);
     expect(output.injectedMessages).toEqual([
       { role: 'user', content: 'first', source: 'steer' },
@@ -436,7 +436,7 @@ describe('createSteerPreemptBoundaryHook', () => {
       jobCreatedAt: job.createdAt,
       applySteer: jest.fn(),
     });
-    const output: SteerDrainOutput = await hook(boundaryInput(), abortSignal);
+    const output = (await hook(boundaryInput(), abortSignal)) as SteerDrainOutput;
 
     expect(output.injectedMessages).toHaveLength(1);
     /** Both the drained id and the stale snapshot id are spent. */
@@ -485,7 +485,7 @@ describe('createSteerPreemptBoundaryHook', () => {
       },
     });
 
-    const output: SteerDrainOutput = await hook(boundaryInput(), abortSignal);
+    const output = (await hook(boundaryInput(), abortSignal)) as SteerDrainOutput;
     expect(output).toEqual({});
     expect((await GenerationJobManager.steering.peek(streamId)).map((item) => item.text)).toEqual([
       'still injected',
diff --git a/packages/api/src/agents/subagentTaskRouting.spec.ts b/packages/api/src/agents/subagentTaskRouting.spec.ts
index 044dec0e233..21981e21e49 100644
--- a/packages/api/src/agents/subagentTaskRouting.spec.ts
+++ b/packages/api/src/agents/subagentTaskRouting.spec.ts
@@ -177,6 +177,7 @@ function taskHandler(
     claim: () => ({ status: 'not_found' }),
     control: () => ({ status: 'not_found' }),
     list: () => [],
+    retainsTaskOwnership: () => false,
     cancelScope: () => 0,
     ...overrides,
   };
@@ -475,6 +476,49 @@ describe('RedisSubagentTaskControlTransport', () => {
     await Promise.all([owner.destroy(), requester.destroy()]);
   });
 
+  it('keeps a receipt-only owner registered until deletion cleanup can reach it', async () => {
+    const bus = new FakeRedisBus();
+    const owner = new RedisSubagentTaskControlTransport(
+      asRedis(bus.createClient()),
+      asRedis(bus.createClient()),
+      { namespace: 'test', instanceId: 'owner', registrationHeartbeatMs: 5 },
+    );
+    const requester = new RedisSubagentTaskControlTransport(
+      asRedis(bus.createClient()),
+      asRedis(bus.createClient()),
+      { namespace: 'test', instanceId: 'requester', requestTimeoutMs: 100, retryDelayMs: 5 },
+    );
+    let receiptPending = true;
+    const cancelScope = jest.fn(() => 0);
+    await owner.bind(
+      taskHandler({
+        retainsTaskOwnership: (_scopeId, taskId) => receiptPending && taskId === 'task-1',
+        cancelScope,
+      }),
+    );
+    await requester.bind(taskHandler());
+    await owner.registerTask('scope-1', 'task-1', 60_000);
+
+    /** Model the SDK task/result buckets dropping the task and Redis losing the
+     * directory entry before the next owner heartbeat. Pending receipt work is
+     * the only remaining reason this process can still handle deletion cleanup. */
+    bus.hashes.clear();
+    for (let attempt = 0; attempt < 100 && !(await requester.hasTasks('scope-1')); attempt += 1) {
+      await new Promise<void>((resolve) => setTimeout(resolve, 5));
+    }
+    await expect(requester.hasTasks('scope-1')).resolves.toBe(true);
+    await expect(requester.cancelScope('scope-1', null, ['deleted-child-thread'])).resolves.toBe(0);
+    expect(cancelScope).toHaveBeenCalledWith('scope-1', null, ['deleted-child-thread']);
+
+    receiptPending = false;
+    bus.hashes.clear();
+    for (let attempt = 0; attempt < 100 && (await requester.hasTasks('scope-1')); attempt += 1) {
+      await new Promise<void>((resolve) => setTimeout(resolve, 5));
+    }
+    await expect(requester.hasTasks('scope-1')).resolves.toBe(false);
+    await Promise.all([owner.destroy(), requester.destroy()]);
+  });
+
   it('expires a dead owner independently while another owner keeps the scope active', async () => {
     const bus = new FakeRedisBus();
     const deadOwner = new RedisSubagentTaskControlTransport(
diff --git a/packages/api/src/agents/subagentTaskRouting.ts b/packages/api/src/agents/subagentTaskRouting.ts
index d4488776669..e1147db53a0 100644
--- a/packages/api/src/agents/subagentTaskRouting.ts
+++ b/packages/api/src/agents/subagentTaskRouting.ts
@@ -36,6 +36,7 @@ const MAX_PROGRESS_LABEL_CHARS = 1_024;
 /** Bounds the model-facing task list, per owner reply and across the merged result. */
 export const MAX_TASK_SNAPSHOTS = 200;
 const MAX_CANCEL_THREAD_IDS = 200;
+const MAX_REMOVED_CONVERSATION_IDS = MAX_CANCEL_THREAD_IDS + 1;
 /** Matches the deletion drain so bounded fan-out stays well inside the lease TTL. */
 const ROUTING_FANOUT_CONCURRENCY = 32;
 /** Contains every bounded response even when JSON escapes each retained character. */
@@ -97,7 +98,13 @@ type RoutedRequest = RoutedRequestBase &
         invocationId: string;
       }
     | { operation: 'list' }
-    | { operation: 'cancel'; threadIds: string[] | null }
+    | {
+        operation: 'cancel';
+        threadIds: string[] | null;
+        /** Rows already committed as deleted by the requester. Owners must drop
+         * receipt retry work for these exact conversations after cancellation. */
+        removedConversationIds?: string[];
+      }
   );
 
 type RoutedRequestPayload =
@@ -110,7 +117,12 @@ type RoutedRequestPayload =
       invocationId: string;
     }
   | { operation: 'list'; scopeId: string }
-  | { operation: 'cancel'; scopeId: string; threadIds: string[] | null };
+  | {
+      operation: 'cancel';
+      scopeId: string;
+      threadIds: string[] | null;
+      removedConversationIds?: string[];
+    };
 
 interface RoutedResponse {
   version: typeof PROTOCOL_VERSION;
@@ -172,9 +184,16 @@ export interface SubagentTaskControlHandler {
     taskId: string,
     command: SubagentTaskControlCommand,
     invocationId: string,
-  ): SubagentTaskControlResult;
+  ): Promise<SubagentTaskControlResult> | SubagentTaskControlResult;
   list(scopeId: string): SubagentTaskSnapshot[];
-  cancelScope(scopeId: string, threadIds: string[] | null): number;
+  /** Receipt retry work can outlive the SDK task/result buckets. Keep its owner
+   * addressable so deletion can revoke work whose durable target was removed. */
+  retainsTaskOwnership(scopeId: string, taskId: string): boolean;
+  cancelScope(
+    scopeId: string,
+    threadIds: string[] | null,
+    removedConversationIds?: string[],
+  ): number;
 }
 
 /** Optional host transport for reaching the process that owns a live child task. */
@@ -190,7 +209,11 @@ export interface SubagentTaskControlTransport {
     invocationId: string,
   ): Promise<SubagentTaskControlResult | undefined>;
   list(scopeId: string): Promise<SubagentTaskSnapshot[]>;
-  cancelScope(scopeId: string, threadIds: string[] | null): Promise<number>;
+  cancelScope(
+    scopeId: string,
+    threadIds: string[] | null,
+    removedConversationIds?: string[],
+  ): Promise<number>;
   destroy(): Promise<void>;
 }
 
@@ -547,6 +570,7 @@ function parseRequest(value: unknown): RoutedRequest | undefined {
     taskId?: unknown;
     command?: unknown;
     threadIds?: unknown;
+    removedConversationIds?: unknown;
     invocationId?: unknown;
     expiresAt?: unknown;
   };
@@ -579,6 +603,14 @@ function parseRequest(value: unknown): RoutedRequest | undefined {
     if (candidate.threadIds !== null && !isCancelThreadIds(candidate.threadIds)) {
       return undefined;
     }
+    if (
+      candidate.removedConversationIds !== undefined &&
+      (!Array.isArray(candidate.removedConversationIds) ||
+        candidate.removedConversationIds.length > MAX_REMOVED_CONVERSATION_IDS ||
+        !candidate.removedConversationIds.every((id) => isBoundedString(id, MAX_THREAD_ID_CHARS)))
+    ) {
+      return undefined;
+    }
     return {
       version: PROTOCOL_VERSION,
       kind: 'request',
@@ -588,6 +620,9 @@ function parseRequest(value: unknown): RoutedRequest | undefined {
       operation: 'cancel',
       scopeId: candidate.scopeId,
       threadIds: candidate.threadIds,
+      ...(candidate.removedConversationIds === undefined
+        ? {}
+        : { removedConversationIds: candidate.removedConversationIds }),
     };
   }
   if (!isBoundedString(candidate.taskId, MAX_TASK_ID_CHARS)) {
@@ -852,7 +887,11 @@ export class RedisSubagentTaskControlTransport implements SubagentTaskControlTra
    * predicate to its complete local task set, so deletion never depends on the
    * bounded model-facing list and cannot miss a task beyond that cap.
    */
-  async cancelScope(scopeId: string, threadIds: string[] | null): Promise<number> {
+  async cancelScope(
+    scopeId: string,
+    threadIds: string[] | null,
+    removedConversationIds: string[] = [],
+  ): Promise<number> {
     this.assertScope(scopeId);
     if (threadIds != null && threadIds.length === 0) {
       return 0;
@@ -880,11 +919,24 @@ export class RedisSubagentTaskControlTransport implements SubagentTaskControlTra
     }
     const cancelSlot = createConcurrencyLimiter(ROUTING_FANOUT_CONCURRENCY);
     const requests: Array<Promise<unknown>> = [];
+    const allTargetThreadIds = threadIds == null ? null : new Set(threadIds);
     for (const ownerId of owners) {
       for (const batch of batches) {
+        const batchThreadIds = batch == null ? null : new Set(batch);
+        const removedForBatch = removedConversationIds.filter(
+          (conversationId) =>
+            allTargetThreadIds == null ||
+            !allTargetThreadIds.has(conversationId) ||
+            batchThreadIds?.has(conversationId) === true,
+        );
         requests.push(
           cancelSlot(() =>
-            this.sendRequest(ownerId, { operation: 'cancel', scopeId, threadIds: batch }),
+            this.sendRequest(ownerId, {
+              operation: 'cancel',
+              scopeId,
+              threadIds: batch,
+              ...(removedForBatch.length === 0 ? {} : { removedConversationIds: removedForBatch }),
+            }),
           ),
         );
       }
@@ -1014,14 +1066,25 @@ export class RedisSubagentTaskControlTransport implements SubagentTaskControlTra
           truncated: tasks.length > bounded.length,
         };
       } else if (request.operation === 'cancel') {
-        result = { cancelled: handler.cancelScope(request.scopeId, request.threadIds) };
+        result = {
+          cancelled: handler.cancelScope(
+            request.scopeId,
+            request.threadIds,
+            request.removedConversationIds,
+          ),
+        };
       } else if (request.operation === 'claim') {
         const claim = boundedClaim(handler.claim(request.scopeId, request.taskId));
         replayable = consumesResult(claim);
         result = claim;
       } else {
         result = boundedControlResult(
-          handler.control(request.scopeId, request.taskId, request.command, request.invocationId),
+          await handler.control(
+            request.scopeId,
+            request.taskId,
+            request.command,
+            request.invocationId,
+          ),
         );
       }
       const serializedResult = JSON.stringify(result);
@@ -1281,7 +1344,8 @@ export class RedisSubagentTaskControlTransport implements SubagentTaskControlTra
        * address outlives the task itself until the result is acknowledged. */
       if (
         localTaskIds.has(taskId) ||
-        this.claimReplays.entries.has(this.claimReplayKey(scopeId, taskId))
+        this.claimReplays.entries.has(this.claimReplayKey(scopeId, taskId)) ||
+        handler.retainsTaskOwnership(scopeId, taskId)
       ) {
         retained.push(registration);
         continue;
diff --git a/packages/api/src/agents/subagentThreads.spec.ts b/packages/api/src/agents/subagentThreads.spec.ts
index 47b62429bbc..f1f8c383e06 100644
--- a/packages/api/src/agents/subagentThreads.spec.ts
+++ b/packages/api/src/agents/subagentThreads.spec.ts
@@ -35,7 +35,7 @@ import {
   createSubagentThreadTaskStore,
   SubagentThreadTaskStore,
 } from './subagentThreads';
-import { SubagentTaskOwnerUnavailableError } from './subagentTaskRouting';
+import { controlFingerprint, SubagentTaskOwnerUnavailableError } from './subagentTaskRouting';
 import { SUBAGENT_COMPLETION_DELIVERY } from './subagentDelivery';
 import { createSubagentAttemptKey } from './subagentThreadIds';
 import { SubagentActivityStream } from './subagentActivity';
@@ -53,6 +53,24 @@ class TestTaskRoutingHub {
   }
 }
 
+class ReceiptTestSubagentThreadTaskStore extends SubagentThreadTaskStore {
+  emitControlReceiptForTest(
+    scopeId: string,
+    taskId: string,
+    receipt: {
+      controlId: string;
+      action: 'steer' | 'queue' | 'interrupt';
+      status: 'accepted' | 'applied' | 'rejected' | 'failed';
+      createdAt: number;
+      updatedAt: number;
+      boundary?: 'preempt' | 'tool' | 'turn';
+      reason?: 'withdrawn' | 'task_completed' | 'task_cancelled' | 'task_failed';
+    },
+  ): void {
+    this.onControlReceipt(scopeId, taskId, receipt);
+  }
+}
+
 class TestTaskControlTransport implements SubagentTaskControlTransport {
   private handler?: SubagentTaskControlHandler;
   readonly registrations: Array<{ scopeId: string; taskId: string; ttlMs: number }> = [];
@@ -92,10 +110,14 @@ class TestTaskControlTransport implements SubagentTaskControlTransport {
     return [...this.remoteOwners(scopeId)].flatMap((owner) => owner.handler?.list(scopeId) ?? []);
   }
 
-  async cancelScope(scopeId: string, threadIds: string[] | null): Promise<number> {
+  async cancelScope(
+    scopeId: string,
+    threadIds: string[] | null,
+    removedConversationIds?: string[],
+  ): Promise<number> {
     let cancelled = 0;
     for (const owner of this.remoteOwners(scopeId)) {
-      cancelled += owner.handler?.cancelScope(scopeId, threadIds) ?? 0;
+      cancelled += owner.handler?.cancelScope(scopeId, threadIds, removedConversationIds) ?? 0;
     }
     return cancelled;
   }
@@ -177,7 +199,10 @@ async function waitForSettled(
   started: SubagentTaskStartResult,
 ): Promise<void> {
   const accepted = requireAccepted(started);
-  for (let attempt = 0; attempt < 200; attempt += 1) {
+  /** Coverage shards can briefly starve this polling loop while Mongo-backed
+   * suites build indexes in parallel. Keep the assertion bounded without
+   * treating two seconds of runner contention as a task-lifecycle failure. */
+  for (let attempt = 0; attempt < 1000; attempt += 1) {
     const task = store.get(scopeId, accepted.task.taskId);
     if (task != null && task.status !== 'running') {
       return;
@@ -187,9 +212,12 @@ async function waitForSettled(
   throw new Error('Timed out waiting for the subagent task.');
 }
 
-async function waitUntil(condition: () => boolean, description: string): Promise<void> {
+async function waitUntil(
+  condition: () => boolean | Promise<boolean>,
+  description: string,
+): Promise<void> {
   for (let attempt = 0; attempt < 400; attempt += 1) {
-    if (condition()) {
+    if (await condition()) {
       return;
     }
     await new Promise<void>((resolve) => setTimeout(resolve, 10));
@@ -1964,6 +1992,20 @@ describe('SubagentThreadTaskStore', () => {
     await expect(requesterStore.listTasks(config.scopeId)).resolves.toEqual([
       expect.objectContaining({ taskId, status: 'running' }),
     ]);
+    await waitUntil(
+      async () =>
+        (
+          await methods.getMessages(
+            {
+              user: userId,
+              conversationId: requireThreadId(started),
+              messageId: `${taskId}:user`,
+            },
+            '+subagentTask',
+          )
+        ).length === 1,
+      'the durable control receipt target',
+    );
     await expect(
       requesterStore.controlTask(config.scopeId, taskId, {
         action: 'queue',
@@ -2000,18 +2042,46 @@ describe('SubagentThreadTaskStore', () => {
     const result = new Promise<{ content: string }>((resolve) => {
       finish = resolve;
     });
+    let runtime: SubagentTaskRuntime | undefined;
     const started = ownerStore.start(
       taskRequest(config.scopeId, {
-        run: async () => result,
+        run: async (taskRuntime) => {
+          runtime = taskRuntime;
+          return result;
+        },
       }),
     );
     const taskId = requireAccepted(started).task.taskId;
-    await Promise.resolve();
+    const threadId = requireThreadId(started);
+    let durableInput: IMessage | undefined;
+    for (let attempt = 0; attempt < 200; attempt += 1) {
+      [durableInput] = await methods.getMessages(
+        { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+        '+subagentTask',
+      );
+      if (durableInput != null) break;
+      await new Promise<void>((resolve) => setTimeout(resolve, 10));
+    }
+    expect(durableInput).toBeDefined();
+    await waitUntil(() => runtime != null, 'the controlled child runtime');
 
     const steer = { action: 'queue' as const, message: 'Verify the primary source too.' };
     const routed = await requesterStore.controlTask(config.scopeId, taskId, steer, 'invocation-1');
     expect(routed).toMatchObject({ status: 'accepted' });
 
+    [durableInput] = await methods.getMessages(
+      { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+      '+subagentTask',
+    );
+    expect(durableInput?.subagentTask?.controlReceipts).toEqual([
+      expect.objectContaining({
+        invocationId: 'invocation-1',
+        action: 'queue',
+        status: 'accepted',
+        message: steer.message,
+      }),
+    ]);
+
     /** The same invocation reaching the owner directly replays that result rather than
      * queueing a second steer, so local and routed callers agree. */
     await expect(
@@ -2019,6 +2089,51 @@ describe('SubagentThreadTaskStore', () => {
     ).resolves.toEqual(routed);
     expect(ownerStore.get(config.scopeId, taskId)?.pendingControls).toBe(1);
 
+    const acceptedControlId =
+      routed.status === 'accepted' && routed.controlId != null ? routed.controlId : undefined;
+    expect(acceptedControlId).toBeDefined();
+    const receiptIndex = (
+      ownerStore as unknown as { controlInvocationByReceipt: Map<string, unknown> }
+    ).controlInvocationByReceipt;
+    expect(receiptIndex.size).toBe(1);
+    expect(runtime?.drain('turn')).toEqual([
+      expect.objectContaining({ content: steer.message, source: 'steer' }),
+    ]);
+    expect(receiptIndex.size).toBe(0);
+    await waitUntil(
+      () => ownerStore.get(config.scopeId, taskId) != null,
+      'the owner task to remain available',
+    );
+    for (let attempt = 0; attempt < 200; attempt += 1) {
+      [durableInput] = await methods.getMessages(
+        { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+        '+subagentTask',
+      );
+      if (durableInput?.subagentTask?.controlReceipts?.[0]?.status === 'applied') break;
+      await new Promise<void>((resolve) => setTimeout(resolve, 10));
+    }
+    expect(durableInput?.subagentTask?.controlReceipts).toEqual([
+      expect.objectContaining({
+        invocationId: 'invocation-1',
+        status: 'applied',
+        boundary: 'turn',
+      }),
+    ]);
+
+    /** A delayed retry reflects the applied authoritative transition and cannot
+     * downgrade the durable receipt to the original accepted snapshot. */
+    await expect(
+      ownerStore.controlTask(config.scopeId, taskId, steer, 'invocation-1'),
+    ).resolves.toMatchObject({
+      status: 'accepted',
+      task: { pendingControls: 0 },
+    });
+    [durableInput] = await methods.getMessages(
+      { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+      '+subagentTask',
+    );
+    expect(durableInput?.subagentTask?.controlReceipts?.[0]?.status).toBe('applied');
+
     /** Reusing one invocation id for different content is a caller error, not a retry. */
     await expect(
       requesterStore.controlTask(
@@ -2028,7 +2143,7 @@ describe('SubagentThreadTaskStore', () => {
         'invocation-1',
       ),
     ).resolves.toMatchObject({ status: 'invalid' });
-    expect(ownerStore.get(config.scopeId, taskId)?.pendingControls).toBe(1);
+    expect(ownerStore.get(config.scopeId, taskId)?.pendingControls).toBe(0);
 
     finish({ content: 'Cross-replica result.' });
     await waitForSettled(ownerStore, config.scopeId, started);
@@ -2038,163 +2153,1367 @@ describe('SubagentThreadTaskStore', () => {
     ]);
   });
 
-  it('fails a child closed when its owner address cannot be published', async () => {
-    const userId = 'unregistered-user';
+  it('replays a durable control after owner loss and rejects fingerprint reuse', async () => {
+    const userId = 'durable-control-replay-user';
     const parentConversationId = randomUUID();
     await saveParent(userId, parentConversationId);
-    const hub = new TestTaskRoutingHub();
-    const transport = new TestTaskControlTransport(hub);
-    transport.registerTask = async () => {
-      throw new Error('registration failed');
+    const ownerStore = new SubagentThreadTaskStore(methods);
+    const config = buildSubagentThreadTaskConfig(ownerStore, { userId, parentConversationId });
+    let finish = (_value: { content: string }): void => undefined;
+    const result = new Promise<{ content: string }>((resolve) => {
+      finish = resolve;
+    });
+    const started = ownerStore.start(taskRequest(config.scopeId, { run: async () => result }));
+    const taskId = requireAccepted(started).task.taskId;
+    const threadId = requireThreadId(started);
+    await waitUntil(
+      async () =>
+        (
+          await methods.getMessages(
+            { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+            '+subagentTask',
+          )
+        ).length === 1,
+      'the durable task input',
+    );
+    const command = { action: 'queue' as const, message: 'Keep the citation.' };
+    await expect(
+      ownerStore.controlTask(config.scopeId, taskId, command, 'durable-invocation'),
+    ).resolves.toMatchObject({ status: 'accepted' });
+    finish({ content: 'Done.' });
+    await waitForSettled(ownerStore, config.scopeId, started);
+    /** Owner shutdown is the production durability boundary. Awaiting it is both
+     * stronger and less load-sensitive than polling Mongo while the async receipt
+     * tail is still settling under Jest coverage instrumentation. */
+    await ownerStore.destroyTaskControlTransport();
+    const [settledInput] = await methods.getMessages(
+      { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+      '+subagentTask',
+    );
+    expect(settledInput?.subagentTask?.controlReceipts).toContainEqual(
+      expect.objectContaining({
+        invocationId: 'durable-invocation',
+        status: 'rejected',
+        reason: 'task_completed',
+      }),
+    );
+
+    const restartedStore = new SubagentThreadTaskStore(methods);
+    (
+      restartedStore as unknown as {
+        taskControlTransport: {
+          control: () => Promise<never>;
+          destroy: () => Promise<void>;
+        };
+      }
+    ).taskControlTransport = {
+      control: async () => {
+        throw new SubagentTaskOwnerUnavailableError();
+      },
+      destroy: async () => undefined,
     };
+    await expect(
+      restartedStore.controlTask(config.scopeId, taskId, command, 'durable-invocation'),
+    ).resolves.toMatchObject({ status: 'not_running' });
+    await expect(
+      restartedStore.controlTask(
+        config.scopeId,
+        taskId,
+        { action: 'queue', message: 'Different command.' },
+        'durable-invocation',
+      ),
+    ).resolves.toMatchObject({ status: 'invalid' });
+    await restartedStore.destroyTaskControlTransport();
+  });
+
+  it('replays the task-wide durable pending-control count after owner loss', async () => {
     const store = new SubagentThreadTaskStore(methods);
-    await store.configureTaskControlTransport(transport);
-    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
-    const run = jest.fn(async () => ({ content: 'never reached' }));
-    const started = store.start(taskRequest(config.scopeId, { run }));
-    await waitForSettled(store, config.scopeId, started);
+    const { scopeId } = buildSubagentThreadTaskConfig(store, {
+      userId: 'durable-pending-count-user',
+      parentConversationId: randomUUID(),
+    });
+    const command = { action: 'queue' as const, message: 'Keep both queued instructions.' };
+    const now = new Date('2026-08-24T12:00:00.000Z');
+    const replay = jest.spyOn(methods, 'getSubagentTaskControlReplay').mockResolvedValue({
+      receipt: {
+        invocationId: 'pending-count-invocation',
+        fingerprint: controlFingerprint(command),
+        controlId: 'pending-count-control',
+        action: 'queue',
+        status: 'accepted',
+        createdAt: now,
+        updatedAt: now,
+      },
+      task: {
+        taskId: 'pending-count-task',
+        threadId: randomUUID(),
+        subagentType: 'researcher',
+        status: 'running',
+        resultAvailable: false,
+        resultClaimed: false,
+        pendingControls: 2,
+        createdAt: now,
+        updatedAt: now,
+      },
+    });
 
-    /** An unaddressable child cannot be polled, controlled, or cancelled, so no
-     * provider work may start behind a failed registration. */
-    expect(run).not.toHaveBeenCalled();
-    expect(store.get(config.scopeId, requireAccepted(started).task.taskId)).toMatchObject({
-      status: 'error',
+    await expect(
+      store.controlTask(scopeId, 'pending-count-task', command, 'pending-count-invocation'),
+    ).resolves.toMatchObject({
+      status: 'accepted',
+      task: { pendingControls: 2 },
     });
+
+    replay.mockRestore();
     await store.destroyTaskControlTransport();
   });
 
-  it('returns a lost result to the same poll invocation and refuses a different one', async () => {
-    const userId = 'durable-claim-user';
+  it('waits for a raced authoritative receipt generation before acknowledging control', async () => {
+    const userId = 'receipt-generation-race-user';
     const parentConversationId = randomUUID();
     await saveParent(userId, parentConversationId);
-    const hub = new TestTaskRoutingHub();
-    const ownerStore = new SubagentThreadTaskStore(methods);
-    const requesterStore = new SubagentThreadTaskStore(methods);
-    await ownerStore.configureTaskControlTransport(new TestTaskControlTransport(hub));
-    await requesterStore.configureTaskControlTransport(new TestTaskControlTransport(hub));
-    const config = buildSubagentThreadTaskConfig(ownerStore, { userId, parentConversationId });
-    const started = ownerStore.start(
+    const store = new SubagentThreadTaskStore(methods);
+    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    let finish = (_value: { content: string }): void => undefined;
+    const result = new Promise<{ content: string }>((resolve) => (finish = resolve));
+    let runtime: SubagentTaskRuntime | undefined;
+    const started = store.start(
       taskRequest(config.scopeId, {
-        run: async () => ({ content: 'Cross-replica result.' }),
+        run: async (taskRuntime) => {
+          runtime = taskRuntime;
+          return result;
+        },
       }),
     );
     const taskId = requireAccepted(started).task.taskId;
-    await waitForSettled(ownerStore, config.scopeId, started);
-
-    await expect(requesterStore.claimTask(config.scopeId, taskId, 'poll-1')).resolves.toMatchObject(
-      { status: 'completed', result: 'Cross-replica result.' },
+    const threadId = requireThreadId(started);
+    await waitUntil(
+      async () =>
+        (
+          await methods.getMessages(
+            { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+            '+subagentTask',
+          )
+        ).length === 1,
+      'the generation-race task seed',
     );
+    await waitUntil(() => runtime != null, 'the generation-race child runtime');
+
+    const originalRecord = methods.recordSubagentTaskControlReceipt.bind(methods);
+    let releaseAccepted!: () => void;
+    let releaseApplied!: () => void;
+    let acceptedEntered!: () => void;
+    let appliedEntered!: () => void;
+    const acceptedGate = new Promise<void>((resolve) => (releaseAccepted = resolve));
+    const appliedGate = new Promise<void>((resolve) => (releaseApplied = resolve));
+    const sawAccepted = new Promise<void>((resolve) => (acceptedEntered = resolve));
+    const sawApplied = new Promise<void>((resolve) => (appliedEntered = resolve));
+    const persistence = jest
+      .spyOn(methods, 'recordSubagentTaskControlReceipt')
+      .mockImplementation(async (args) => {
+        if (args.receipt.status === 'accepted') {
+          acceptedEntered();
+          await acceptedGate;
+        } else if (args.receipt.status === 'applied') {
+          appliedEntered();
+          await appliedGate;
+        }
+        return originalRecord(args);
+      });
 
-    /** The owner's one-shot result is gone, but the child's durable thread still holds
-     * it, so the invocation that already collected it recovers its own result. */
-    await expect(requesterStore.claimTask(config.scopeId, taskId, 'poll-1')).resolves.toMatchObject(
-      { status: 'completed', result: 'Cross-replica result.' },
+    const control = store.controlTask(
+      config.scopeId,
+      taskId,
+      { action: 'queue', message: 'Apply at the next boundary.' },
+      'generation-race-invocation',
     );
+    await sawAccepted;
+    expect(runtime?.drain('turn')).toHaveLength(1);
+    releaseAccepted();
+    await sawApplied;
+    let acknowledged = false;
+    void control.then(() => (acknowledged = true));
+    await Promise.resolve();
+    expect(acknowledged).toBe(false);
 
-    /** A different invocation is told it was collected rather than handed a copy. */
-    await expect(requesterStore.claimTask(config.scopeId, taskId, 'poll-2')).resolves.toMatchObject(
-      { status: 'claimed' },
-    );
+    releaseApplied();
+    await expect(control).resolves.toMatchObject({
+      status: 'accepted',
+      task: { pendingControls: 0 },
+    });
 
-    await Promise.all([
-      ownerStore.destroyTaskControlTransport(),
-      requesterStore.destroyTaskControlTransport(),
-    ]);
+    persistence.mockRestore();
+    finish({ content: 'Done.' });
+    await waitForSettled(store, config.scopeId, started);
+    await store.destroyTaskControlTransport();
   });
 
-  it('bounds a result recovered from its durable child message', async () => {
-    const userId = 'large-result-user';
+  it('refreshes retained cancellation result flags after durable collection', async () => {
+    const userId = 'retained-control-claim-user';
     const parentConversationId = randomUUID();
     await saveParent(userId, parentConversationId);
     const store = new SubagentThreadTaskStore(methods);
     const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
     const started = store.start(
       taskRequest(config.scopeId, {
-        run: async () => ({ content: 'x'.repeat(150_000) }),
+        run: async (runtime) =>
+          new Promise((_resolve, reject) => {
+            runtime.signal.addEventListener('abort', () => reject(runtime.signal.reason), {
+              once: true,
+            });
+          }),
       }),
     );
     const taskId = requireAccepted(started).task.taskId;
+    const threadId = requireThreadId(started);
+    await waitUntil(
+      async () =>
+        (
+          await methods.getMessages(
+            { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+            '+subagentTask',
+          )
+        ).length === 1,
+      'the cancellation replay task seed',
+    );
+
+    await expect(
+      store.controlTask(config.scopeId, taskId, { action: 'cancel' }, 'cancel-invocation'),
+    ).resolves.toMatchObject({ status: 'cancelled' });
     await waitForSettled(store, config.scopeId, started);
+    await waitUntil(
+      async () =>
+        (
+          await methods.getMessages({
+            user: userId,
+            conversationId: threadId,
+            messageId: `${taskId}:assistant`,
+          })
+        ).length === 1,
+      'the durable cancelled result',
+    );
+    await expect(store.claimTask(config.scopeId, taskId, 'poll-invocation')).resolves.toMatchObject(
+      {
+        status: 'cancelled',
+        task: { resultClaimed: true },
+      },
+    );
 
-    await expect(store.claimTask(config.scopeId, taskId, 'poll-1')).resolves.toMatchObject({
-      status: 'completed',
+    await expect(
+      store.controlTask(config.scopeId, taskId, { action: 'cancel' }, 'cancel-invocation'),
+    ).resolves.toMatchObject({
+      status: 'cancelled',
+      task: { resultAvailable: false, resultClaimed: true },
     });
 
-    /** The durable message keeps the child's untruncated output, so recovering it
-     * must apply the same bound a routed response would have. */
-    const recovered = await store.claimTask(config.scopeId, taskId, 'poll-1');
-    expect(recovered.status).toBe('completed');
-    if (recovered.status === 'completed') {
-      expect(recovered.result.length).toBeLessThanOrEqual(100_000);
-    }
+    await store.destroyTaskControlTransport();
   });
 
-  it('recovers a durable result after the owning process and registration are gone', async () => {
-    const userId = 'restarted-owner-user';
+  it('normalizes terminal replay storage failures at the owner boundary', async () => {
+    const userId = 'terminal-replay-storage-user';
     const parentConversationId = randomUUID();
     await saveParent(userId, parentConversationId);
-    const ownerStore = new SubagentThreadTaskStore(methods);
-    const config = buildSubagentThreadTaskConfig(ownerStore, { userId, parentConversationId });
-    const started = ownerStore.start(
-      taskRequest(config.scopeId, {
-        run: async () => ({ content: 'Recovered without owner memory.' }),
-      }),
-    );
+    const store = new SubagentThreadTaskStore(methods);
+    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    const started = store.start(taskRequest(config.scopeId));
     const taskId = requireAccepted(started).task.taskId;
-    await waitForSettled(ownerStore, config.scopeId, started);
-
-    /** A fresh store has neither the in-memory task nor a Redis owner registration. */
-    const restartedStore = new SubagentThreadTaskStore(methods);
-    const unrelatedParentConversationId = randomUUID();
-    await saveParent(userId, unrelatedParentConversationId);
-    const unrelatedConfig = buildSubagentThreadTaskConfig(restartedStore, {
-      userId,
-      parentConversationId: unrelatedParentConversationId,
-    });
-    await expect(
-      restartedStore.claimTask(unrelatedConfig.scopeId, taskId, 'wrong-parent-poll'),
-    ).resolves.toEqual({ status: 'not_found' });
-
-    await expect(restartedStore.claimTask(config.scopeId, taskId, 'poll-1')).resolves.toMatchObject(
-      {
-        status: 'completed',
-        result: 'Recovered without owner memory.',
-      },
-    );
-    await expect(restartedStore.claimTask(config.scopeId, taskId, 'poll-1')).resolves.toMatchObject(
-      {
-        status: 'completed',
-        result: 'Recovered without owner memory.',
-      },
-    );
-    await expect(restartedStore.claimTask(config.scopeId, taskId, 'poll-2')).resolves.toMatchObject(
-      {
-        status: 'claimed',
-      },
-    );
+    await waitForSettled(store, config.scopeId, started);
+    const replay = jest
+      .spyOn(methods, 'getSubagentTaskControlReplay')
+      .mockRejectedValue(new Error('database unavailable'));
+    try {
+      await expect(
+        store.controlTask(config.scopeId, taskId, { action: 'cancel' }, 'storage-invocation'),
+      ).rejects.toBeInstanceOf(SubagentTaskOwnerUnavailableError);
+    } finally {
+      replay.mockRestore();
+      await store.destroyTaskControlTransport();
+    }
   });
 
-  it('tells a second invocation a retained result was already collected', async () => {
-    const userId = 'duplicate-claim-user';
+  it('reserves one durable fingerprint before concurrent owners can apply controls', async () => {
+    const userId = 'concurrent-control-reservation-user';
     const parentConversationId = randomUUID();
     await saveParent(userId, parentConversationId);
     const store = new SubagentThreadTaskStore(methods);
     const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    let runtime: SubagentTaskRuntime | undefined;
+    let finish = (_value: { content: string }): void => undefined;
+    const result = new Promise<{ content: string }>((resolve) => {
+      finish = resolve;
+    });
     const started = store.start(
       taskRequest(config.scopeId, {
-        run: async () => ({ content: 'Only one caller may hold this.' }),
+        run: async (taskRuntime) => {
+          runtime = taskRuntime;
+          return result;
+        },
       }),
     );
     const taskId = requireAccepted(started).task.taskId;
+    await waitUntil(() => runtime != null, 'the concurrent-control child runtime');
+
+    const results = await Promise.all([
+      store.controlTask(config.scopeId, taskId, { action: 'cancel' }, 'shared-invocation'),
+      store.controlTask(
+        config.scopeId,
+        taskId,
+        { action: 'queue', message: 'Only apply if this fingerprint wins.' },
+        'shared-invocation',
+      ),
+    ]);
+    expect(results.filter((candidate) => candidate.status === 'invalid')).toHaveLength(1);
+    const winner = results.find((candidate) => candidate.status !== 'invalid');
+    expect(winner?.status === 'cancelled' || winner?.status === 'accepted').toBe(true);
+    if (winner?.status === 'accepted') {
+      expect(runtime?.signal.aborted).toBe(false);
+      expect(store.get(config.scopeId, taskId)?.pendingControls).toBe(1);
+    } else {
+      expect(runtime?.signal.aborted).toBe(true);
+    }
+
+    finish({ content: 'Done.' });
     await waitForSettled(store, config.scopeId, started);
-    const threadId = requireThreadId(started);
+    await store.destroyTaskControlTransport();
+  });
 
-    await expect(store.claimTask(config.scopeId, taskId, 'poll-1')).resolves.toMatchObject({
-      status: 'completed',
-      result: 'Only one caller may hold this.',
+  it('bounds concurrent durable reservation writers below the storage CAS retry limit', async () => {
+    const userId = 'bounded-control-reservation-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const store = new SubagentThreadTaskStore(methods, { maxControlsPerTask: 100 });
+    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    let finish = (_value: { content: string }): void => undefined;
+    const result = new Promise<{ content: string }>((resolve) => {
+      finish = resolve;
     });
+    const started = store.start(taskRequest(config.scopeId, { run: async () => result }));
+    const taskId = requireAccepted(started).task.taskId;
+    await waitUntil(() => store.get(config.scopeId, taskId)?.status === 'running', 'running task');
 
-    /** An owner replaying a retained response would hand the same terminal result to
+    let activeReservations = 0;
+    let maxActiveReservations = 0;
+    let releaseReservations = (): void => undefined;
+    const reservationGate = new Promise<void>((resolve) => {
+      releaseReservations = resolve;
+    });
+    const persist = jest
+      .spyOn(methods, 'recordSubagentTaskControlReceipt')
+      .mockImplementation(async ({ receipt }) => {
+        if (receipt.status !== 'reserved') return true;
+        activeReservations += 1;
+        maxActiveReservations = Math.max(maxActiveReservations, activeReservations);
+        await reservationGate;
+        activeReservations -= 1;
+        return true;
+      });
+    try {
+      const controls = Array.from({ length: 65 }, (_, index) =>
+        store.controlTask(
+          config.scopeId,
+          taskId,
+          { action: 'queue', message: `Control ${index}` },
+          `bounded-reservation-${index}`,
+        ),
+      );
+      await waitUntil(() => activeReservations === 32, 'the reservation writer bound');
+      expect(maxActiveReservations).toBe(32);
+      releaseReservations();
+      await expect(Promise.all(controls)).resolves.toHaveLength(65);
+      expect(maxActiveReservations).toBe(32);
+    } finally {
+      releaseReservations();
+      persist.mockRestore();
+      finish({ content: 'Done.' });
+      await waitForSettled(store, config.scopeId, started);
+      await store.destroyTaskControlTransport();
+    }
+  });
+
+  it('bounds retained terminal control invocations while persisting their receipts', async () => {
+    const userId = 'terminal-control-window-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const store = new SubagentThreadTaskStore(methods);
+    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    const started = store.start(
+      taskRequest(config.scopeId, { run: async () => ({ content: 'Done.' }) }),
+    );
+    const taskId = requireAccepted(started).task.taskId;
+    await waitForSettled(store, config.scopeId, started);
+    for (let index = 0; index < 65; index += 1) {
+      await expect(
+        store.controlTask(config.scopeId, taskId, { action: 'cancel' }, `terminal-${index}`),
+      ).resolves.toMatchObject({ status: 'not_running' });
+    }
+    const retained = (store as unknown as { terminalControlInvocations: Map<string, unknown> })
+      .terminalControlInvocations;
+    expect(retained.size).toBe(64);
+    const replayLookup = jest
+      .spyOn(methods, 'getSubagentTaskControlReplay')
+      .mockRejectedValue(new Error('database unavailable'));
+    await expect(
+      store.controlTask(config.scopeId, taskId, { action: 'cancel' }, 'terminal-64'),
+    ).resolves.toMatchObject({ status: 'not_running' });
+    expect(replayLookup).not.toHaveBeenCalled();
+    replayLookup.mockRestore();
+    await store.destroyTaskControlTransport();
+  });
+
+  it('refuses to evict an unpersisted terminal invocation', async () => {
+    const userId = 'terminal-control-admission-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const store = new SubagentThreadTaskStore(methods);
+    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    const started = store.start(
+      taskRequest(config.scopeId, { run: async () => ({ content: 'Done.' }) }),
+    );
+    const taskId = requireAccepted(started).task.taskId;
+    await waitForSettled(store, config.scopeId, started);
+
+    for (let index = 0; index < 64; index += 1) {
+      expect(
+        store.controlInvocation(config.scopeId, taskId, { action: 'cancel' }, `pending-${index}`),
+      ).toMatchObject({ status: 'not_running' });
+    }
+    expect(
+      store.controlInvocation(config.scopeId, taskId, { action: 'cancel' }, 'pending-64'),
+    ).toMatchObject({ status: 'invalid' });
+    const retained = (store as unknown as { terminalControlInvocations: Map<string, unknown> })
+      .terminalControlInvocations;
+    expect(retained.size).toBe(64);
+    await store.destroyTaskControlTransport();
+  });
+
+  it('fails acceptance closed when the durable receipt target is not ready', async () => {
+    const userId = 'receipt-target-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const store = new SubagentThreadTaskStore(methods, { controlReceiptRetryMs: 60_000 });
+    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    let finish = (_value: { content: string }): void => undefined;
+    const result = new Promise<{ content: string }>((resolve) => {
+      finish = resolve;
+    });
+    const started = store.start(taskRequest(config.scopeId, { run: async () => result }));
+    const taskId = requireAccepted(started).task.taskId;
+    const threadId = requireThreadId(started);
+    await waitUntil(
+      async () =>
+        (
+          await methods.getMessages(
+            { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+            '+subagentTask',
+          )
+        ).length === 1,
+      'the durable task input',
+    );
+
+    const persistence = jest
+      .spyOn(methods, 'recordSubagentTaskControlReceipt')
+      .mockRejectedValue(new Error('database unavailable'));
+    const command = { action: 'queue' as const, message: 'Check the source.' };
+    try {
+      await expect(
+        store.controlTask(config.scopeId, taskId, command, 'not-ready-invocation'),
+      ).rejects.toBeInstanceOf(SubagentTaskOwnerUnavailableError);
+      expect(store.get(config.scopeId, taskId)?.pendingControls).toBe(0);
+
+      await expect(
+        store.controlTask(config.scopeId, taskId, command, 'not-ready-invocation'),
+      ).rejects.toBeInstanceOf(SubagentTaskOwnerUnavailableError);
+      expect(store.get(config.scopeId, taskId)?.pendingControls).toBe(0);
+      persistence.mockRestore();
+
+      await expect(
+        store.controlTask(config.scopeId, taskId, command, 'not-ready-invocation'),
+      ).resolves.toMatchObject({ status: 'accepted' });
+      expect(store.get(config.scopeId, taskId)?.pendingControls).toBe(1);
+    } finally {
+      if (jest.isMockFunction(methods.recordSubagentTaskControlReceipt)) persistence.mockRestore();
+      finish({ content: 'Done.' });
+      await waitForSettled(store, config.scopeId, started);
+      await store.destroyTaskControlTransport();
+    }
+  });
+
+  it('drops a permanent receipt conflict and rolls back its queued control', async () => {
+    const userId = 'receipt-conflict-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const store = new SubagentThreadTaskStore(methods);
+    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    let finish = (_value: { content: string }): void => undefined;
+    const result = new Promise<{ content: string }>((resolve) => {
+      finish = resolve;
+    });
+    const started = store.start(taskRequest(config.scopeId, { run: async () => result }));
+    const taskId = requireAccepted(started).task.taskId;
+    await waitUntil(
+      () => store.get(config.scopeId, taskId)?.threadId != null,
+      'thread preparation',
+    );
+    const persistence = jest
+      .spyOn(methods, 'recordSubagentTaskControlReceipt')
+      .mockResolvedValue('conflict');
+    const command = { action: 'queue' as const, message: 'Check the source.' };
+    try {
+      await expect(
+        store.controlTask(config.scopeId, taskId, command, 'conflicting-invocation'),
+      ).resolves.toMatchObject({ status: 'invalid' });
+      expect(store.get(config.scopeId, taskId)?.pendingControls).toBe(0);
+      await expect(
+        store.controlTask(config.scopeId, taskId, command, 'conflicting-invocation'),
+      ).resolves.toMatchObject({ status: 'invalid' });
+      expect(persistence).toHaveBeenCalledTimes(2);
+    } finally {
+      persistence.mockRestore();
+      finish({ content: 'Done.' });
+      await waitForSettled(store, config.scopeId, started);
+      await store.destroyTaskControlTransport();
+    }
+  });
+
+  it('rejects a durable fingerprint conflict before applying task cancellation', async () => {
+    const userId = 'receipt-preflight-conflict-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const store = new SubagentThreadTaskStore(methods);
+    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    let runtime: SubagentTaskRuntime | undefined;
+    let finish = (_value: { content: string }): void => undefined;
+    const result = new Promise<{ content: string }>((resolve) => {
+      finish = resolve;
+    });
+    const started = store.start(
+      taskRequest(config.scopeId, {
+        run: async (taskRuntime) => {
+          runtime = taskRuntime;
+          return result;
+        },
+      }),
+    );
+    const taskId = requireAccepted(started).task.taskId;
+    const threadId = requireThreadId(started);
+    await waitUntil(() => runtime != null, 'the child runtime to start');
+    await waitUntil(
+      async () =>
+        (
+          await methods.getMessages(
+            { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+            '+subagentTask',
+          )
+        ).length === 1,
+      'the durable task input',
+    );
+    await expect(
+      methods.recordSubagentTaskControlReceipt({
+        userId,
+        conversationId: threadId,
+        taskId,
+        receipt: {
+          invocationId: 'conflicting-cancel',
+          fingerprint: controlFingerprint({ action: 'queue', message: 'Original.' }),
+          action: 'queue',
+          status: 'rejected',
+          reason: 'withdrawn',
+          createdAt: new Date(),
+          updatedAt: new Date(),
+        },
+      }),
+    ).resolves.toBe(true);
+
+    await expect(
+      store.controlTask(config.scopeId, taskId, { action: 'cancel' }, 'conflicting-cancel'),
+    ).resolves.toMatchObject({ status: 'invalid' });
+    expect(runtime?.signal.aborted).toBe(false);
+    expect(store.get(config.scopeId, taskId)?.status).toBe('running');
+
+    finish({ content: 'Done.' });
+    await waitForSettled(store, config.scopeId, started);
+    await store.destroyTaskControlTransport();
+  });
+
+  it('does not replay a control whose prior owner only reserved its invocation', async () => {
+    const userId = 'abandoned-control-reservation-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const store = new SubagentThreadTaskStore(methods);
+    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    let runtime: SubagentTaskRuntime | undefined;
+    let finish = (_value: { content: string }): void => undefined;
+    const result = new Promise<{ content: string }>((resolve) => {
+      finish = resolve;
+    });
+    const started = store.start(
+      taskRequest(config.scopeId, {
+        run: async (taskRuntime) => {
+          runtime = taskRuntime;
+          return result;
+        },
+      }),
+    );
+    const taskId = requireAccepted(started).task.taskId;
+    const threadId = requireThreadId(started);
+    await waitUntil(() => runtime != null, 'the child runtime to start');
+    await waitUntil(
+      async () =>
+        (
+          await methods.getMessages(
+            { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+            '+subagentTask',
+          )
+        ).length === 1,
+      'the durable task input',
+    );
+    const command = { action: 'queue' as const, message: 'Apply this once.' };
+    await expect(
+      methods.recordSubagentTaskControlReceipt({
+        userId,
+        conversationId: threadId,
+        taskId,
+        receipt: {
+          invocationId: 'abandoned-reservation',
+          fingerprint: controlFingerprint(command),
+          action: 'queue',
+          status: 'reserved',
+          message: command.message,
+          createdAt: new Date(),
+          updatedAt: new Date(),
+        },
+      }),
+    ).resolves.toBe(true);
+
+    /** The reservation proves a prior owner may have crossed the side-effect
+     * boundary. A retry must neither apply it again nor report false acceptance. */
+    await expect(
+      store.controlTask(config.scopeId, taskId, command, 'abandoned-reservation'),
+    ).rejects.toBeInstanceOf(SubagentTaskOwnerUnavailableError);
+    expect(store.get(config.scopeId, taskId)?.pendingControls).toBe(0);
+
+    finish({ content: 'Done.' });
+    await waitForSettled(store, config.scopeId, started);
+    await store.destroyTaskControlTransport();
+  });
+
+  it('retains only the bounded public projection of a control payload', async () => {
+    const userId = 'bounded-control-payload-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const store = new SubagentThreadTaskStore(methods);
+    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    let finish = (_value: { content: string }): void => undefined;
+    const result = new Promise<{ content: string }>((resolve) => {
+      finish = resolve;
+    });
+    const started = store.start(taskRequest(config.scopeId, { run: async () => result }));
+    const taskId = requireAccepted(started).task.taskId;
+    const threadId = requireThreadId(started);
+    await waitUntil(
+      async () =>
+        (
+          await methods.getMessages(
+            { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+            '+subagentTask',
+          )
+        ).length === 1,
+      'the durable task input',
+    );
+
+    await expect(
+      store.controlTask(
+        config.scopeId,
+        taskId,
+        { action: 'queue', message: 'x'.repeat(64 * 1024) },
+        'bounded-payload-invocation',
+      ),
+    ).resolves.toMatchObject({ status: 'accepted' });
+    const invocations = (
+      store as unknown as {
+        controlInvocations: Map<string, { command: SubagentTaskControlCommand }>;
+      }
+    ).controlInvocations;
+    expect(invocations.values().next().value?.command).toEqual({
+      action: 'queue',
+      message: 'x'.repeat(4 * 1024),
+    });
+    await waitUntil(async () => {
+      const [input] = await methods.getMessages(
+        { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+        '+subagentTask',
+      );
+      return input?.subagentTask?.controlReceipts?.[0]?.messageTruncated === true;
+    }, 'the bounded receipt truncation marker');
+    await expect(
+      store.controlTask(
+        config.scopeId,
+        taskId,
+        { action: 'queue', message: `${'x'.repeat(64 * 1024 - 1)}y` },
+        'bounded-payload-invocation',
+      ),
+    ).resolves.toMatchObject({ status: 'invalid' });
+
+    finish({ content: 'Done.' });
+    await waitForSettled(store, config.scopeId, started);
+    await store.destroyTaskControlTransport();
+  });
+
+  it('restores tenant context for a routed control receipt write', async () => {
+    const userId = 'routed-receipt-tenant-user';
+    const tenantId = 'routed-receipt-tenant';
+    const parentConversationId = randomUUID();
+    await tenantStorage.run({ tenantId, userId }, async () =>
+      saveParent(userId, parentConversationId, { tenantId }),
+    );
+    const hub = new TestTaskRoutingHub();
+    const ownerStore = new SubagentThreadTaskStore(methods);
+    const requesterStore = new SubagentThreadTaskStore(methods);
+    await ownerStore.configureTaskControlTransport(new TestTaskControlTransport(hub));
+    await requesterStore.configureTaskControlTransport(new TestTaskControlTransport(hub));
+    const config = buildSubagentThreadTaskConfig(ownerStore, {
+      userId,
+      tenantId,
+      parentConversationId,
+    });
+    let finish = (_value: { content: string }): void => undefined;
+    const result = new Promise<{ content: string }>((resolve) => {
+      finish = resolve;
+    });
+    const started = ownerStore.start(taskRequest(config.scopeId, { run: async () => result }));
+    const taskId = requireAccepted(started).task.taskId;
+    const threadId = requireThreadId(started);
+    await waitUntil(
+      () =>
+        tenantStorage.run({ tenantId, userId }, async () =>
+          Boolean(
+            (
+              await methods.getMessages(
+                { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+                '+subagentTask',
+              )
+            )[0],
+          ),
+        ),
+      'the tenant-scoped task input',
+    );
+
+    const contexts: Array<{ tenantId?: string; userId?: string }> = [];
+    const persistReceipt = methods.recordSubagentTaskControlReceipt;
+    const persistence = jest
+      .spyOn(methods, 'recordSubagentTaskControlReceipt')
+      .mockImplementation((input) => {
+        contexts.push({ tenantId: getTenantId(), userId: getUserId() });
+        return persistReceipt(input);
+      });
+    try {
+      await expect(
+        requesterStore.controlTask(
+          config.scopeId,
+          taskId,
+          { action: 'queue', message: 'Check the tenant source.' },
+          'tenant-invocation',
+        ),
+      ).resolves.toMatchObject({ status: 'accepted' });
+      expect(contexts).toEqual([
+        { tenantId, userId },
+        { tenantId, userId },
+      ]);
+    } finally {
+      persistence.mockRestore();
+      finish({ content: 'Done.' });
+      await waitForSettled(ownerStore, config.scopeId, started);
+      await Promise.all([
+        ownerStore.destroyTaskControlTransport(),
+        requesterStore.destroyTaskControlTransport(),
+      ]);
+    }
+  });
+
+  it('persists the target control id for cancel_message receipts', async () => {
+    const userId = 'cancel-message-receipt-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const store = new SubagentThreadTaskStore(methods);
+    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    let finish = (_value: { content: string }): void => undefined;
+    const result = new Promise<{ content: string }>((resolve) => {
+      finish = resolve;
+    });
+    const started = store.start(taskRequest(config.scopeId, { run: async () => result }));
+    const taskId = requireAccepted(started).task.taskId;
+    const threadId = requireThreadId(started);
+    await waitUntil(
+      async () =>
+        (
+          await methods.getMessages(
+            { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+            '+subagentTask',
+          )
+        ).length === 1,
+      'the durable task input',
+    );
+
+    const queued = await store.controlTask(
+      config.scopeId,
+      taskId,
+      { action: 'queue', message: 'Withdraw me.' },
+      'queued-invocation',
+    );
+    expect(queued).toMatchObject({ status: 'accepted' });
+    const targetControlId = queued.status === 'accepted' ? queued.controlId : undefined;
+    expect(targetControlId).toBeDefined();
+    await expect(
+      store.controlTask(
+        config.scopeId,
+        taskId,
+        { action: 'cancel_message', controlId: targetControlId as string },
+        'cancel-message-invocation',
+      ),
+    ).resolves.toMatchObject({ status: 'accepted' });
+    await expect(
+      store.controlTask(
+        config.scopeId,
+        taskId,
+        { action: 'cancel_message', controlId: 'missing-control' },
+        'missing-cancel-message-invocation',
+      ),
+    ).resolves.toMatchObject({ status: 'control_not_found' });
+
+    await waitUntil(async () => {
+      const [input] = await methods.getMessages(
+        { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+        '+subagentTask',
+      );
+      return (
+        input?.subagentTask?.controlReceipts?.some(
+          (receipt) => receipt.invocationId === 'cancel-message-invocation',
+        ) === true
+      );
+    }, 'the cancel_message receipt');
+    const [input] = await methods.getMessages(
+      { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+      '+subagentTask',
+    );
+    expect(input?.subagentTask?.controlReceipts).toContainEqual(
+      expect.objectContaining({
+        invocationId: 'cancel-message-invocation',
+        controlId: targetControlId,
+        action: 'cancel_message',
+        status: 'applied',
+      }),
+    );
+    expect(input?.subagentTask?.controlReceipts).toContainEqual(
+      expect.objectContaining({
+        invocationId: 'missing-cancel-message-invocation',
+        controlId: 'missing-control',
+        action: 'cancel_message',
+        status: 'rejected',
+        reason: 'control_not_found',
+      }),
+    );
+
+    finish({ content: 'Done.' });
+    await waitForSettled(store, config.scopeId, started);
+    await store.destroyTaskControlTransport();
+  });
+
+  it('retries a terminal control receipt after settlement when storage recovers', async () => {
+    const userId = 'receipt-retry-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const store = new ReceiptTestSubagentThreadTaskStore(methods, {
+      controlReceiptRetryMs: 10,
+    });
+    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    let finish = (_value: { content: string }): void => undefined;
+    const result = new Promise<{ content: string }>((resolve) => {
+      finish = resolve;
+    });
+    const started = store.start(
+      taskRequest(config.scopeId, {
+        run: async () => result,
+      }),
+    );
+    const taskId = requireAccepted(started).task.taskId;
+    const threadId = requireThreadId(started);
+    await waitUntil(
+      async () =>
+        (
+          await methods.getMessages(
+            { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+            '+subagentTask',
+          )
+        ).length === 1,
+      'the durable task input',
+    );
+    const command = { action: 'queue' as const, message: 'Verify the source.' };
+    const accepted = await store.controlTask(config.scopeId, taskId, command, 'retry-invocation');
+    expect(accepted).toMatchObject({ status: 'accepted' });
+    const controlId = accepted.status === 'accepted' ? accepted.controlId : undefined;
+    expect(controlId).toBeDefined();
+
+    const persistReceipt = methods.recordSubagentTaskControlReceipt;
+    const persistence = jest
+      .spyOn(methods, 'recordSubagentTaskControlReceipt')
+      .mockRejectedValueOnce(new Error('database temporarily unavailable'))
+      .mockResolvedValueOnce(false)
+      .mockImplementation(persistReceipt);
+    try {
+      const appliedAt = Date.now();
+      store.emitControlReceiptForTest(config.scopeId, taskId, {
+        controlId: controlId as string,
+        action: 'queue',
+        status: 'applied',
+        createdAt: appliedAt - 1,
+        updatedAt: appliedAt,
+        boundary: 'turn',
+      });
+      await waitUntil(
+        () => persistence.mock.calls.length >= 1,
+        'the applied transition persistence attempt',
+      );
+      finish({ content: 'Done.' });
+      await waitForSettled(store, config.scopeId, started);
+
+      await waitUntil(
+        () => persistence.mock.calls.length >= 3,
+        'the post-settlement receipt retry',
+      );
+      await waitUntil(async () => {
+        const [input] = await methods.getMessages(
+          { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+          '+subagentTask',
+        );
+        return input?.subagentTask?.controlReceipts?.[0]?.status === 'applied';
+      }, 'the receipt retry to converge after terminal settlement');
+      expect(persistence.mock.calls.length).toBeGreaterThanOrEqual(3);
+    } finally {
+      persistence.mockRestore();
+      finish({ content: 'Done.' });
+      await store.destroyTaskControlTransport();
+    }
+  });
+
+  it('retries a terminal receipt after result collection removes the local task', async () => {
+    const userId = 'receipt-after-claim-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const store = new SubagentThreadTaskStore(methods, { controlReceiptRetryMs: 5 });
+    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    let finish = (_value: { content: string }): void => undefined;
+    const result = new Promise<{ content: string }>((resolve) => {
+      finish = resolve;
+    });
+    const started = store.start(taskRequest(config.scopeId, { run: async () => result }));
+    const taskId = requireAccepted(started).task.taskId;
+    const threadId = requireThreadId(started);
+    await waitUntil(
+      async () =>
+        (
+          await methods.getMessages(
+            { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+            '+subagentTask',
+          )
+        ).length === 1,
+      'the claim-race durable task input',
+    );
+    await store.controlTask(
+      config.scopeId,
+      taskId,
+      { action: 'queue', message: 'Persist the terminal transition after collection.' },
+      'claim-race-invocation',
+    );
+
+    const persistReceipt = methods.recordSubagentTaskControlReceipt;
+    const persistence = jest
+      .spyOn(methods, 'recordSubagentTaskControlReceipt')
+      .mockRejectedValueOnce(new Error('database temporarily unavailable'))
+      .mockImplementation(persistReceipt);
+    try {
+      finish({ content: 'Done.' });
+      await waitForSettled(store, config.scopeId, started);
+      expect(store.claim(config.scopeId, taskId)).toMatchObject({ status: 'completed' });
+      await waitUntil(
+        () => persistence.mock.calls.length >= 1,
+        'the terminal receipt persistence failure',
+      );
+      /** Model the SDK retention timer expiring the claimed result before the
+       * storage retry fires. Pending durability must not depend on this bucket. */
+      const bucket = (
+        store as unknown as {
+          buckets: Map<string, { tasks: Map<string, unknown> }>;
+        }
+      ).buckets.get(config.scopeId);
+      bucket?.tasks.delete(taskId);
+      expect(store.get(config.scopeId, taskId)).toBeUndefined();
+      await waitUntil(async () => {
+        const [input] = await methods.getMessages(
+          { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+          '+subagentTask',
+        );
+        return input?.subagentTask?.controlReceipts?.[0]?.reason === 'task_completed';
+      }, 'the post-collection terminal receipt retry');
+    } finally {
+      persistence.mockRestore();
+      await store.destroyTaskControlTransport();
+    }
+  });
+
+  it('quiesces receipt producers and flushes their final transition during shutdown', async () => {
+    const userId = 'receipt-shutdown-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const store = new ReceiptTestSubagentThreadTaskStore(methods, {
+      controlReceiptRetryMs: 60_000,
+      shutdownControlReceiptBackoffMs: 1,
+    });
+    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    let runtime: SubagentTaskRuntime | undefined;
+    const started = store.start(
+      taskRequest(config.scopeId, {
+        run: async (taskRuntime) => {
+          runtime = taskRuntime;
+          return await new Promise<{ content: string }>((_resolve, reject) => {
+            taskRuntime.signal.addEventListener(
+              'abort',
+              () => reject(new Error('provider stopped after task cancellation')),
+              { once: true },
+            );
+          });
+        },
+      }),
+    );
+    const taskId = requireAccepted(started).task.taskId;
+    const threadId = requireThreadId(started);
+    await waitUntil(() => runtime != null, 'the child runtime to start');
+    const accepted = await store.controlTask(
+      config.scopeId,
+      taskId,
+      { action: 'queue', message: 'Persist before shutdown.' },
+      'shutdown-invocation',
+    );
+    expect(accepted).toMatchObject({ status: 'accepted' });
+
+    const persistReceipt = methods.recordSubagentTaskControlReceipt;
+    const persistence = jest
+      .spyOn(methods, 'recordSubagentTaskControlReceipt')
+      .mockRejectedValueOnce(new Error('database temporarily unavailable'))
+      .mockImplementation(persistReceipt);
+    const saveMessage = methods.saveMessage;
+    let releaseCancellation = (): void => undefined;
+    const cancellationGate = new Promise<void>((resolve) => {
+      releaseCancellation = resolve;
+    });
+    let cancellationSaveStarted = false;
+    const settlement = jest.spyOn(methods, 'saveMessage').mockImplementation(async (...args) => {
+      const message = args[1] as IMessage;
+      if (
+        message.messageId === `${taskId}:assistant` &&
+        message.subagentTask?.status === 'cancelled'
+      ) {
+        cancellationSaveStarted = true;
+        await cancellationGate;
+      }
+      return saveMessage(...args);
+    });
+
+    const shutdown = store.destroyTaskControlTransport();
+    await waitUntil(() => cancellationSaveStarted, 'the cancellation settlement to start');
+    let shutdownResolved = false;
+    void shutdown.then(() => {
+      shutdownResolved = true;
+    });
+    await Promise.resolve();
+    expect(shutdownResolved).toBe(false);
+    releaseCancellation();
+    await shutdown;
+    expect(runtime?.signal.aborted).toBe(true);
+    const [input] = await methods.getMessages(
+      { user: userId, conversationId: threadId, messageId: `${taskId}:user` },
+      '+subagentTask',
+    );
+    expect(input?.subagentTask?.controlReceipts).toContainEqual(
+      expect.objectContaining({
+        invocationId: 'shutdown-invocation',
+        status: 'rejected',
+        reason: 'task_cancelled',
+      }),
+    );
+    expect(persistence).toHaveBeenCalledTimes(2);
+
+    persistence.mockRestore();
+    settlement.mockRestore();
+    expect(store.get(config.scopeId, taskId)?.status).toBe('cancelled');
+  });
+
+  it('fails graceful shutdown when terminal receipts remain unavailable', async () => {
+    const userId = 'receipt-shutdown-failure-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const store = new ReceiptTestSubagentThreadTaskStore(methods, {
+      shutdownControlReceiptBackoffMs: 1,
+    });
+    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    let runtime: SubagentTaskRuntime | undefined;
+    const started = store.start(
+      taskRequest(config.scopeId, {
+        run: async (taskRuntime) => {
+          runtime = taskRuntime;
+          return await new Promise<{ content: string }>((_resolve, reject) => {
+            taskRuntime.signal.addEventListener('abort', () => reject(new Error('stopped')), {
+              once: true,
+            });
+          });
+        },
+      }),
+    );
+    const taskId = requireAccepted(started).task.taskId;
+    await waitUntil(() => runtime != null, 'the child runtime to start');
+    await store.controlTask(
+      config.scopeId,
+      taskId,
+      { action: 'queue', message: 'Persist me.' },
+      'shutdown-failure-invocation',
+    );
+    const persistence = jest
+      .spyOn(methods, 'recordSubagentTaskControlReceipt')
+      .mockRejectedValue(new Error('database unavailable'));
+
+    await expect(store.destroyTaskControlTransport()).rejects.toBeInstanceOf(
+      SubagentTaskOwnerUnavailableError,
+    );
+    expect(persistence.mock.calls.length).toBeGreaterThanOrEqual(4);
+    persistence.mockRestore();
+    await store.destroyTaskControlTransport();
+    await waitForSettled(store, config.scopeId, started);
+  });
+
+  it('drops permanently unwritable control receipt work after its conversations are deleted', async () => {
+    const userId = 'deleted-control-receipt-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const store = new ReceiptTestSubagentThreadTaskStore(methods, {
+      controlReceiptRetryMs: 60_000,
+      shutdownControlReceiptBackoffMs: 1,
+    });
+    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    let runtime: SubagentTaskRuntime | undefined;
+    const started = store.start(
+      taskRequest(config.scopeId, {
+        run: async (taskRuntime) => {
+          runtime = taskRuntime;
+          return await new Promise<{ content: string }>((_resolve, reject) => {
+            taskRuntime.signal.addEventListener('abort', () => reject(new Error('deleted')), {
+              once: true,
+            });
+          });
+        },
+      }),
+    );
+    const taskId = requireAccepted(started).task.taskId;
+    const threadId = requireThreadId(started);
+    await waitUntil(() => runtime != null, 'the child runtime to start');
+    const accepted = await store.controlTask(
+      config.scopeId,
+      taskId,
+      { action: 'queue', message: 'This receipt target will be deleted.' },
+      'deleted-receipt-invocation',
+    );
+    expect(accepted).toMatchObject({ status: 'accepted' });
+    const controlId = accepted.status === 'accepted' ? accepted.controlId : undefined;
+    expect(controlId).toBeDefined();
+
+    const persistence = jest
+      .spyOn(methods, 'recordSubagentTaskControlReceipt')
+      .mockRejectedValue(new Error('receipt target deleted'));
+    try {
+      const appliedAt = Date.now();
+      store.emitControlReceiptForTest(config.scopeId, taskId, {
+        controlId: controlId as string,
+        action: 'queue',
+        status: 'applied',
+        createdAt: appliedAt - 1,
+        updatedAt: appliedAt,
+        boundary: 'turn',
+      });
+      await waitUntil(
+        () => persistence.mock.calls.length >= 1,
+        'the permanently unwritable receipt',
+      );
+
+      const plan = await store.planCancellationForConversations(userId, [parentConversationId]);
+      await methods.deleteConvos(userId, { conversationId: parentConversationId });
+      await expect(
+        store.cancelPlan(plan, [parentConversationId, threadId]),
+      ).resolves.toBeGreaterThanOrEqual(1);
+      await waitForSettled(store, config.scopeId, started);
+    } finally {
+      persistence.mockRestore();
+    }
+
+    /** Deletion is a terminal storage outcome, so shutdown must not keep retrying
+     * receipt rows whose authorized parent or child no longer exists. */
+    await expect(store.destroyTaskControlTransport()).resolves.toBeUndefined();
+  });
+
+  it('fails a child closed when its owner address cannot be published', async () => {
+    const userId = 'unregistered-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const hub = new TestTaskRoutingHub();
+    const transport = new TestTaskControlTransport(hub);
+    transport.registerTask = async () => {
+      throw new Error('registration failed');
+    };
+    const store = new SubagentThreadTaskStore(methods);
+    await store.configureTaskControlTransport(transport);
+    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    const run = jest.fn(async () => ({ content: 'never reached' }));
+    const started = store.start(taskRequest(config.scopeId, { run }));
+    await waitForSettled(store, config.scopeId, started);
+
+    /** An unaddressable child cannot be polled, controlled, or cancelled, so no
+     * provider work may start behind a failed registration. */
+    expect(run).not.toHaveBeenCalled();
+    expect(store.get(config.scopeId, requireAccepted(started).task.taskId)).toMatchObject({
+      status: 'error',
+    });
+    await store.destroyTaskControlTransport();
+  });
+
+  it('returns a lost result to the same poll invocation and refuses a different one', async () => {
+    const userId = 'durable-claim-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const hub = new TestTaskRoutingHub();
+    const ownerStore = new SubagentThreadTaskStore(methods);
+    const requesterStore = new SubagentThreadTaskStore(methods);
+    await ownerStore.configureTaskControlTransport(new TestTaskControlTransport(hub));
+    await requesterStore.configureTaskControlTransport(new TestTaskControlTransport(hub));
+    const config = buildSubagentThreadTaskConfig(ownerStore, { userId, parentConversationId });
+    const started = ownerStore.start(
+      taskRequest(config.scopeId, {
+        run: async () => ({ content: 'Cross-replica result.' }),
+      }),
+    );
+    const taskId = requireAccepted(started).task.taskId;
+    await waitForSettled(ownerStore, config.scopeId, started);
+
+    await expect(requesterStore.claimTask(config.scopeId, taskId, 'poll-1')).resolves.toMatchObject(
+      { status: 'completed', result: 'Cross-replica result.' },
+    );
+
+    /** The owner's one-shot result is gone, but the child's durable thread still holds
+     * it, so the invocation that already collected it recovers its own result. */
+    await expect(requesterStore.claimTask(config.scopeId, taskId, 'poll-1')).resolves.toMatchObject(
+      { status: 'completed', result: 'Cross-replica result.' },
+    );
+
+    /** A different invocation is told it was collected rather than handed a copy. */
+    await expect(requesterStore.claimTask(config.scopeId, taskId, 'poll-2')).resolves.toMatchObject(
+      { status: 'claimed' },
+    );
+
+    await Promise.all([
+      ownerStore.destroyTaskControlTransport(),
+      requesterStore.destroyTaskControlTransport(),
+    ]);
+  });
+
+  it('bounds a result recovered from its durable child message', async () => {
+    const userId = 'large-result-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const store = new SubagentThreadTaskStore(methods);
+    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    const started = store.start(
+      taskRequest(config.scopeId, {
+        run: async () => ({ content: 'x'.repeat(150_000) }),
+      }),
+    );
+    const taskId = requireAccepted(started).task.taskId;
+    await waitForSettled(store, config.scopeId, started);
+
+    await expect(store.claimTask(config.scopeId, taskId, 'poll-1')).resolves.toMatchObject({
+      status: 'completed',
+    });
+
+    /** The durable message keeps the child's untruncated output, so recovering it
+     * must apply the same bound a routed response would have. */
+    const recovered = await store.claimTask(config.scopeId, taskId, 'poll-1');
+    expect(recovered.status).toBe('completed');
+    if (recovered.status === 'completed') {
+      expect(recovered.result.length).toBeLessThanOrEqual(100_000);
+    }
+  });
+
+  it('recovers a durable result after the owning process and registration are gone', async () => {
+    const userId = 'restarted-owner-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const ownerStore = new SubagentThreadTaskStore(methods);
+    const config = buildSubagentThreadTaskConfig(ownerStore, { userId, parentConversationId });
+    const started = ownerStore.start(
+      taskRequest(config.scopeId, {
+        run: async () => ({ content: 'Recovered without owner memory.' }),
+      }),
+    );
+    const taskId = requireAccepted(started).task.taskId;
+    await waitForSettled(ownerStore, config.scopeId, started);
+
+    /** A fresh store has neither the in-memory task nor a Redis owner registration. */
+    const restartedStore = new SubagentThreadTaskStore(methods);
+    const unrelatedParentConversationId = randomUUID();
+    await saveParent(userId, unrelatedParentConversationId);
+    const unrelatedConfig = buildSubagentThreadTaskConfig(restartedStore, {
+      userId,
+      parentConversationId: unrelatedParentConversationId,
+    });
+    await expect(
+      restartedStore.claimTask(unrelatedConfig.scopeId, taskId, 'wrong-parent-poll'),
+    ).resolves.toEqual({ status: 'not_found' });
+
+    await expect(restartedStore.claimTask(config.scopeId, taskId, 'poll-1')).resolves.toMatchObject(
+      {
+        status: 'completed',
+        result: 'Recovered without owner memory.',
+      },
+    );
+    await expect(restartedStore.claimTask(config.scopeId, taskId, 'poll-1')).resolves.toMatchObject(
+      {
+        status: 'completed',
+        result: 'Recovered without owner memory.',
+      },
+    );
+    await expect(restartedStore.claimTask(config.scopeId, taskId, 'poll-2')).resolves.toMatchObject(
+      {
+        status: 'claimed',
+      },
+    );
+  });
+
+  it('tells a second invocation a retained result was already collected', async () => {
+    const userId = 'duplicate-claim-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const store = new SubagentThreadTaskStore(methods);
+    const config = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    const started = store.start(
+      taskRequest(config.scopeId, {
+        run: async () => ({ content: 'Only one caller may hold this.' }),
+      }),
+    );
+    const taskId = requireAccepted(started).task.taskId;
+    await waitForSettled(store, config.scopeId, started);
+    const threadId = requireThreadId(started);
+
+    await expect(store.claimTask(config.scopeId, taskId, 'poll-1')).resolves.toMatchObject({
+      status: 'completed',
+      result: 'Only one caller may hold this.',
+    });
+
+    /** An owner replaying a retained response would hand the same terminal result to
      * another invocation; the durable record decides, so that one is told it was
      * already collected rather than being given a second copy. */
     const replayingStore = new SubagentThreadTaskStore(methods);
@@ -2399,7 +3718,7 @@ describe('SubagentThreadTaskStore', () => {
     });
   });
 
-  it('keeps a live task’s control invocation when settled tasks fill the window', async () => {
+  it('does not spend live replay slots on controls rejected by settled tasks', async () => {
     const userId = 'invocation-eviction-user';
     const parentConversationId = randomUUID();
     await saveParent(userId, parentConversationId);
@@ -2423,7 +3742,16 @@ describe('SubagentThreadTaskStore', () => {
     const steer = { action: 'queue' as const, message: 'Verify the primary source too.' };
     const applied = store.controlInvocation(config.scopeId, liveTaskId, steer, 'invocation-live');
     expect(applied).toMatchObject({ status: 'accepted' });
-    store.controlInvocation(config.scopeId, settledTaskId, steer, 'invocation-settled');
+    expect(
+      store.controlInvocation(config.scopeId, settledTaskId, steer, 'invocation-settled'),
+    ).toMatchObject({ status: 'not_running' });
+    expect(
+      (
+        store as unknown as {
+          controlInvocations: Map<string, unknown>;
+        }
+      ).controlInvocations.size,
+    ).toBe(1);
 
     for (let attempt = 0; attempt < 100; attempt += 1) {
       if (store.get(config.scopeId, settledTaskId) == null) {
@@ -2433,9 +3761,8 @@ describe('SubagentThreadTaskStore', () => {
     }
     expect(store.get(config.scopeId, settledTaskId)).toBeUndefined();
 
-    /** The window is full, so admitting another invocation sweeps the records of tasks
-     * this store no longer holds. The live task's record survives, so a caller
-     * retrying it replays instead of steering that child a second time. */
+    /** A second live invocation fills the window. The first live record survives, so
+     * a caller retrying it replays instead of steering that child a second time. */
     store.controlInvocation(config.scopeId, liveTaskId, steer, 'invocation-later');
     expect(store.controlInvocation(config.scopeId, liveTaskId, steer, 'invocation-live')).toEqual(
       applied,
@@ -2452,6 +3779,7 @@ describe('SubagentThreadTaskStore', () => {
 
     finish({ content: 'done' });
     await waitForSettled(store, config.scopeId, live);
+    await store.destroyTaskControlTransport();
   });
 
   it('caps the merged local and remote task list the poll tool reads', async () => {
@@ -2513,9 +3841,11 @@ describe('SubagentThreadTaskStore', () => {
     expect(store.controlInvocation(config.scopeId, liveTaskId, steer, 'local-1')).toMatchObject({
       status: 'accepted',
     });
+    const replayLookup = jest.spyOn(methods, 'getSubagentTaskControlReplay');
 
     /** The window holds a live task's record and cannot be swept, but a task this
-     * replica never owned is the remote owner's to refuse or apply. */
+     * replica never owned is the remote owner's to refuse or apply. Only that owner
+     * performs the durable preflight; the requester does not repeat the Mongo read. */
     await expect(
       store.controlTask(config.scopeId, 'remote-task', { action: 'cancel' }, 'remote-1'),
     ).resolves.toEqual(remoteResult);
@@ -2525,12 +3855,39 @@ describe('SubagentThreadTaskStore', () => {
       { action: 'cancel' },
       'remote-1',
     );
+    expect(replayLookup).not.toHaveBeenCalled();
+    replayLookup.mockRestore();
 
     finish({ content: 'done' });
     await waitForSettled(store, config.scopeId, live);
     await store.destroyTaskControlTransport();
   });
 
+  it('normalizes a storage outage after routed owner loss', async () => {
+    const userId = 'remote-fallback-outage-user';
+    const parentConversationId = randomUUID();
+    await saveParent(userId, parentConversationId);
+    const store = new SubagentThreadTaskStore(methods);
+    const { scopeId } = buildSubagentThreadTaskConfig(store, { userId, parentConversationId });
+    await store.configureTaskControlTransport({
+      ...replayTransport({ status: 'not_found' }),
+      control: async () => {
+        throw new SubagentTaskOwnerUnavailableError();
+      },
+    });
+    const replayLookup = jest
+      .spyOn(methods, 'getSubagentTaskControlReplay')
+      .mockRejectedValue(new Error('database unavailable'));
+
+    await expect(
+      store.controlTask(scopeId, 'remote-task', { action: 'cancel' }, 'remote-outage'),
+    ).rejects.toBeInstanceOf(SubagentTaskOwnerUnavailableError);
+    expect(replayLookup).toHaveBeenCalledTimes(1);
+
+    replayLookup.mockRestore();
+    await store.destroyTaskControlTransport();
+  });
+
   it('fails a deletion closed when the admission fence cannot be held', async () => {
     const userId = 'fence-lapse-user';
     const parentConversationId = randomUUID();
@@ -2798,7 +4155,10 @@ describe('SubagentThreadTaskStore', () => {
     const parentConversationId = randomUUID();
     await saveParent(userId, parentConversationId);
     const hub = new TestTaskRoutingHub();
-    const ownerStore = new SubagentThreadTaskStore(methods);
+    const ownerStore = new ReceiptTestSubagentThreadTaskStore(methods, {
+      controlReceiptRetryMs: 60_000,
+      shutdownControlReceiptBackoffMs: 1,
+    });
     const deletingStore = new SubagentThreadTaskStore(methods);
     await ownerStore.configureTaskControlTransport(new TestTaskControlTransport(hub));
     await deletingStore.configureTaskControlTransport(new TestTaskControlTransport(hub));
@@ -2823,16 +4183,37 @@ describe('SubagentThreadTaskStore', () => {
     }
     expect(await methods.getConvo(userId, threadId)).not.toBeNull();
 
+    const accepted = await ownerStore.controlTask(
+      config.scopeId,
+      taskId,
+      { action: 'queue', message: 'Persist this before the child is deleted.' },
+      'remote-deleted-receipt',
+    );
+    const controlId = accepted.status === 'accepted' ? accepted.controlId : undefined;
+    expect(controlId).toBeDefined();
+    const persistence = jest
+      .spyOn(methods, 'recordSubagentTaskControlReceipt')
+      .mockRejectedValue(new Error('receipt target deleted'));
+    ownerStore.emitControlReceiptForTest(config.scopeId, taskId, {
+      controlId: controlId as string,
+      action: 'queue',
+      status: 'applied',
+      createdAt: Date.now() - 1,
+      updatedAt: Date.now(),
+      boundary: 'turn',
+    });
+    await waitUntil(() => persistence.mock.calls.length > 0, 'the remote receipt write to fail');
+
     /** The parent survives this deletion, so the child's own thread is the only target. */
     const plan = await deletingStore.planCancellationForConversations(userId, [threadId]);
-    await expect(deletingStore.cancelPlan(plan)).resolves.toBe(1);
+    await methods.deleteConvos(userId, { conversationId: threadId });
+    await expect(deletingStore.cancelPlan(plan, [threadId])).resolves.toBe(1);
     await waitForSettled(ownerStore, config.scopeId, started);
     expect(ownerStore.get(config.scopeId, taskId)).toMatchObject({ status: 'cancelled' });
+    persistence.mockRestore();
 
-    await Promise.all([
-      ownerStore.destroyTaskControlTransport(),
-      deletingStore.destroyTaskControlTransport(),
-    ]);
+    await expect(ownerStore.destroyTaskControlTransport()).resolves.toBeUndefined();
+    await deletingStore.destroyTaskControlTransport();
   });
 
   it('cancels a child admitted after the deletion snapshot from its durable lease', async () => {
diff --git a/packages/api/src/agents/subagentThreads.ts b/packages/api/src/agents/subagentThreads.ts
index e32854f4590..c118799d942 100644
--- a/packages/api/src/agents/subagentThreads.ts
+++ b/packages/api/src/agents/subagentThreads.ts
@@ -21,6 +21,7 @@ import type {
   AllMethods,
   IActiveSubagentThreadLease,
   IConversation,
+  ISubagentTaskControlReceipt,
   IMessage,
   MessageMethods,
   ConversationMethods,
@@ -62,6 +63,16 @@ const DEFAULT_OWNER_DRAIN_POLL_MS = 100;
 const DELETION_CANCEL_CONCURRENCY = 32;
 /** Bounds retained control invocations; one entry per applied command. */
 const MAX_CONTROL_INVOCATIONS = 4_096;
+/** Terminal controls are side-effect free, but retaining one bounded window
+ * prevents duplicate storage writers while preserving recent retry replay. */
+const MAX_TERMINAL_CONTROL_INVOCATIONS = 64;
+/** Keep same-task durable reservations below the storage CAS retry bound. Receipt
+ * finalization is serialized per task separately, leaving ample collision headroom. */
+const CONTROL_RESERVATION_CONCURRENCY = 32;
+const MAX_DURABLE_CONTROL_MESSAGE_CHARS = 4 * 1024;
+const DEFAULT_CONTROL_RECEIPT_RETRY_MS = 5_000;
+const SHUTDOWN_CONTROL_RECEIPT_FLUSH_ATTEMPTS = 4;
+const DEFAULT_SHUTDOWN_CONTROL_RECEIPT_BACKOFF_MS = 1_000;
 /** Bounds retained live-only updates while an event transport is unavailable. */
 const MAX_PENDING_ACTIVITY_EVENTS = 32;
 /** Live activity must never delay terminal notification indefinitely. */
@@ -86,6 +97,7 @@ const DURABLE_RESULT_SELECT =
 
 class SubagentThreadPublicError extends Error {}
 class SubagentThreadDeletedError extends SubagentThreadPublicError {}
+class SubagentControlReceiptConflictError extends Error {}
 
 type SubagentThreadMethods = Pick<
   AllMethods,
@@ -95,10 +107,12 @@ type SubagentThreadMethods = Pick<
   | 'deleteConvos'
   | 'deleteMessages'
   | 'getConvo'
+  | 'getSubagentTaskControlReplay'
   | 'getMessages'
   | 'listActiveSubagentThreadLeases'
   | 'reserveSubagentThread'
   | 'releaseSubagentThreadLease'
+  | 'recordSubagentTaskControlReceipt'
   | 'renewSubagentThreadLease'
   | 'saveConvo'
   | 'saveMessage'
@@ -132,11 +146,51 @@ type ThreadMessage = Pick<
   'messageId' | 'parentMessageId' | 'text' | 'createdAt' | 'subagentTranscript' | 'subagentTask'
 >;
 
+type SdkControlReceipt = {
+  controlId: string;
+  action: 'steer' | 'queue' | 'interrupt';
+  status: 'accepted' | 'applied' | 'rejected' | 'failed';
+  createdAt: number;
+  updatedAt: number;
+  boundary?: 'preempt' | 'tool' | 'turn';
+  reason?: 'withdrawn' | 'task_completed' | 'task_cancelled' | 'task_failed';
+};
+
+type SnapshotWithControlReceipts = SubagentTaskSnapshot & {
+  controlReceipts?: SdkControlReceipt[];
+};
+
+type ControlInvocationRecord = {
+  scopeId: string;
+  taskId: string;
+  invocationId: string;
+  fingerprint: string;
+  command: SubagentTaskControlCommand;
+  commandMessageTruncated: boolean;
+  result: SubagentTaskControlResult;
+  createdAt: number;
+  /** Last authoritative SDK transition, retained for idempotent retries even
+   * after the bounded SDK snapshot evicts older receipt history. */
+  receipt?: ISubagentTaskControlReceipt;
+  /** True only after this invocation's current receipt is durable and therefore
+   * safe to evict from the bounded process-local replay window. */
+  receiptPersisted?: boolean;
+  /** The current durable write, shared by same-invocation retries so a caller
+   * cannot observe success before the authoritative receipt is committed. */
+  receiptPersistence?: Promise<void>;
+};
+
+const hasDurableControlReceipt = (invocation: ControlInvocationRecord): boolean =>
+  invocation.receiptPersisted === true;
+
 interface TaskThreadLease {
+  scopeId: string;
   idempotencyKey: string;
   taskId: string;
   running: boolean;
   settling: boolean;
+  /** Resolves only after child persistence and lease cleanup finish. */
+  execution?: Promise<void>;
   /** Ordered observational tail; canonical child settlement never awaits it. */
   activityTail?: Promise<void>;
   activityPending?: number;
@@ -188,6 +242,8 @@ export interface SubagentThreadTaskStoreOptions extends InMemorySubagentTaskStor
   taskRoutingTtlMs?: number;
   isOwnerActive?: (userId: string) => Promise<boolean>;
   maxControlInvocations?: number;
+  controlReceiptRetryMs?: number;
+  shutdownControlReceiptBackoffMs?: number;
   ownerFenceGraceMs?: number;
   fenceOwnerAdmission?: (userId: string, token: string, fencedUntil: Date) => Promise<void>;
   renewOwnerAdmission?: (userId: string, token: string, fencedUntil: Date) => Promise<boolean>;
@@ -259,6 +315,11 @@ function serializeScope(scope: Omit<SubagentThreadScope, 'version'>): string {
   return JSON.stringify({ version: SCOPE_VERSION, ...scope });
 }
 
+/** Builds the trusted live-owner routing scope after parent authorization. */
+export function createSubagentThreadScopeId(scope: Omit<SubagentThreadScope, 'version'>): string {
+  return serializeScope(scope);
+}
+
 function matchesTenant(actual: string | undefined, expected: string | undefined): boolean {
   return actual === expected;
 }
@@ -431,6 +492,48 @@ function drainKey(parentConversationId: string, taskId: string): string {
   return `${parentConversationId}\u0000${taskId}`;
 }
 
+function controlTaskKey(scopeId: string, taskId: string): string {
+  return `${scopeId}\u0000${taskId}`;
+}
+
+function parseControlTaskKey(key: string): { scopeId: string; taskId: string } | undefined {
+  const separator = key.lastIndexOf('\u0000');
+  if (separator < 0 || separator === key.length - 1) return undefined;
+  return { scopeId: key.slice(0, separator), taskId: key.slice(separator + 1) };
+}
+
+function controlReceiptKey(scopeId: string, taskId: string, controlId: string): string {
+  return `${scopeId}\u0000${taskId}\u0000${controlId}`;
+}
+
+function boundedControlMessage(
+  command: SubagentTaskControlCommand,
+  alreadyTruncated = false,
+): {
+  message?: string;
+  messageTruncated?: boolean;
+} {
+  if (!('message' in command)) return {};
+  if (command.message.length <= MAX_DURABLE_CONTROL_MESSAGE_CHARS) {
+    return {
+      message: command.message,
+      ...(alreadyTruncated ? { messageTruncated: true } : {}),
+    };
+  }
+  return {
+    message: command.message.slice(0, MAX_DURABLE_CONTROL_MESSAGE_CHARS),
+    messageTruncated: true,
+  };
+}
+
+function boundedControlCommand(command: SubagentTaskControlCommand): SubagentTaskControlCommand {
+  if (!('message' in command)) return command;
+  return {
+    action: command.action,
+    message: command.message.slice(0, MAX_DURABLE_CONTROL_MESSAGE_CHARS),
+  };
+}
+
 function safeErrorMessage(error: unknown): string {
   return `Subagent task failed: ${publicFailureDetail(error).slice(0, 2_000)}`;
 }
@@ -453,11 +556,24 @@ async function observeSlowPreparation<T>(
 export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {
   readonly supportsThreadContinuation = true;
   private readonly activeThreads = new Map<string, TaskThreadLease>();
-  private readonly controlInvocations = new Map<
+  private readonly controlInvocations = new Map<string, ControlInvocationRecord>();
+  private readonly terminalControlInvocations = new Map<string, ControlInvocationRecord>();
+
+  private readonly controlInvocationByReceipt = new Map<string, ControlInvocationRecord>();
+  private readonly pendingControlReceipts = new Map<
     string,
-    { scopeId: string; taskId: string; fingerprint: string; result: SubagentTaskControlResult }
+    Map<string, { threadId: string; receipt: ISubagentTaskControlReceipt }>
   >();
 
+  private readonly controlPersistenceTails = new Map<string, Promise<void>>();
+  private readonly controlPersistenceRetryTimers = new Map<string, ReturnType<typeof setTimeout>>();
+  private readonly controlReservationSlot = createConcurrencyLimiter(
+    CONTROL_RESERVATION_CONCURRENCY,
+  );
+
+  private controlPersistenceStopping = false;
+  private controlCommandAdmissionClosed = false;
+
   private readonly parentPersistence = new Map<string, Promise<unknown>>();
   private readonly maxThreadDepth: number;
   private readonly leaseTtlMs: number;
@@ -466,6 +582,8 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {
   private readonly ownerDrainPollMs: number;
   private readonly taskRoutingTtlMs: number;
   private readonly maxControlInvocations: number;
+  private readonly controlReceiptRetryMs: number;
+  private readonly shutdownControlReceiptBackoffMs: number;
   private readonly ownerFenceGraceMs: number;
   private readonly isOwnerActive: (userId: string) => Promise<boolean>;
   private readonly fenceOwnerAdmission?: (
@@ -510,6 +628,14 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {
       options.maxControlInvocations,
       MAX_CONTROL_INVOCATIONS,
     );
+    this.controlReceiptRetryMs = positiveInteger(
+      options.controlReceiptRetryMs,
+      DEFAULT_CONTROL_RECEIPT_RETRY_MS,
+    );
+    this.shutdownControlReceiptBackoffMs = positiveInteger(
+      options.shutdownControlReceiptBackoffMs,
+      DEFAULT_SHUTDOWN_CONTROL_RECEIPT_BACKOFF_MS,
+    );
     this.ownerFenceGraceMs = positiveInteger(options.ownerFenceGraceMs, OWNER_FENCE_GRACE_MS);
     this.isOwnerActive = options.isOwnerActive ?? (async () => true);
     this.fenceOwnerAdmission = options.fenceOwnerAdmission;
@@ -519,6 +645,385 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {
     this.onTaskPrepared = options.onTaskPrepared;
   }
 
+  /** Receives payload-free authoritative transitions from the SDK task store. */
+  protected onControlReceipt(scopeId: string, taskId: string, receipt: SdkControlReceipt): void {
+    const persistence = this.queueAuthoritativeControlReceipt(scopeId, taskId, receipt);
+    void persistence?.catch((error) => {
+      logger.warn('[subagentThreads] Failed to persist a child control transition', error);
+    });
+  }
+
+  private queueAuthoritativeControlReceipt(
+    scopeId: string,
+    taskId: string,
+    receipt: SdkControlReceipt,
+  ): Promise<void> | undefined {
+    const invocation = this.controlInvocationByReceipt.get(
+      controlReceiptKey(scopeId, taskId, receipt.controlId),
+    );
+    const threadId = this.get(scopeId, taskId)?.threadId;
+    if (invocation == null || threadId == null) return undefined;
+    const durable = this.durableReceipt(invocation, receipt);
+    invocation.receipt = durable;
+    invocation.result = this.controlResultFromReceipt(
+      invocation,
+      durable,
+      this.get(scopeId, taskId)?.pendingControls,
+    );
+    if (receipt.status !== 'accepted') {
+      this.controlInvocationByReceipt.delete(controlReceiptKey(scopeId, taskId, receipt.controlId));
+    }
+    invocation.receiptPersisted = false;
+    const persistence = this.queueControlReceipt(scopeId, taskId, threadId, durable).then(() => {
+      if (invocation.receipt === durable) invocation.receiptPersisted = true;
+    });
+    const tracked = persistence.finally(() => {
+      if (invocation.receiptPersistence === tracked) invocation.receiptPersistence = undefined;
+    });
+    invocation.receiptPersistence = tracked;
+    return tracked;
+  }
+
+  /** Keeps same-process retries aligned with the durable receipt ledger. The SDK
+   * can replace an accepted control with a terminal transition after the child
+   * settles, so the originally returned result is no longer authoritative. */
+  private controlResultFromReceipt(
+    invocation: ControlInvocationRecord,
+    receipt: ISubagentTaskControlReceipt,
+    pendingControls?: number,
+  ): SubagentTaskControlResult {
+    const current = invocation.result;
+    if (!('task' in current)) return current;
+    let terminalStatus = current.task.status;
+    if (
+      (receipt.action === 'cancel' && receipt.status === 'applied') ||
+      receipt.reason === 'task_cancelled'
+    ) {
+      terminalStatus = 'cancelled';
+    } else if (receipt.reason === 'task_completed') {
+      terminalStatus = 'completed';
+    } else if (receipt.reason === 'task_failed') {
+      terminalStatus = 'error';
+    }
+    const task: SubagentTaskSnapshot = {
+      ...current.task,
+      status: terminalStatus,
+      updatedAt: receipt.updatedAt.getTime(),
+      /** A receipt can make cancellation authoritative before the assistant row
+       * exists. Preserve actual result materialization rather than inferring it. */
+      resultAvailable: current.task.resultAvailable,
+      pendingControls: pendingControls ?? current.task.pendingControls,
+    };
+    if (receipt.status === 'accepted') {
+      return {
+        status: 'accepted',
+        task,
+        ...(receipt.controlId == null ? {} : { controlId: receipt.controlId }),
+      };
+    }
+    if (receipt.status === 'applied') {
+      return receipt.action === 'cancel'
+        ? { status: 'cancelled', task }
+        : {
+            status: 'accepted',
+            task,
+            ...(receipt.controlId == null ? {} : { controlId: receipt.controlId }),
+          };
+    }
+    if (
+      receipt.reason === 'task_not_running' ||
+      receipt.reason === 'task_completed' ||
+      receipt.reason === 'task_cancelled' ||
+      receipt.reason === 'task_failed'
+    ) {
+      return { status: 'not_running', task };
+    }
+    if (receipt.reason === 'control_not_found' || receipt.reason === 'withdrawn') {
+      return { status: 'control_not_found', task };
+    }
+    return {
+      status: 'invalid',
+      message:
+        receipt.status === 'failed'
+          ? 'The prior control invocation failed.'
+          : 'The prior control invocation was rejected.',
+    };
+  }
+
+  private durableReceipt(
+    invocation: ControlInvocationRecord,
+    receipt: SdkControlReceipt,
+  ): ISubagentTaskControlReceipt {
+    return {
+      invocationId: invocation.invocationId,
+      fingerprint: invocation.fingerprint,
+      controlId: receipt.controlId,
+      action: receipt.action,
+      status: receipt.status,
+      createdAt: new Date(receipt.createdAt),
+      updatedAt: new Date(receipt.updatedAt),
+      ...(receipt.boundary == null ? {} : { boundary: receipt.boundary }),
+      ...(receipt.reason == null ? {} : { reason: receipt.reason }),
+      ...boundedControlMessage(invocation.command, invocation.commandMessageTruncated),
+    };
+  }
+
+  private controlResultReceipt(
+    invocation: ControlInvocationRecord,
+  ): ISubagentTaskControlReceipt | undefined {
+    const { command, result } = invocation;
+    if (result.status === 'not_found' || result.status === 'invalid') return undefined;
+    if (invocation.receipt != null) return invocation.receipt;
+    const snapshot = result.task as SnapshotWithControlReceipts;
+    if (
+      result.status === 'accepted' &&
+      result.controlId != null &&
+      (command.action === 'steer' || command.action === 'queue' || command.action === 'interrupt')
+    ) {
+      const sdkReceipt = snapshot.controlReceipts?.find(
+        (receipt) => receipt.controlId === result.controlId,
+      );
+      if (sdkReceipt != null) return this.durableReceipt(invocation, sdkReceipt);
+      return {
+        invocationId: invocation.invocationId,
+        fingerprint: invocation.fingerprint,
+        controlId: result.controlId,
+        action: command.action,
+        status: 'accepted',
+        createdAt: new Date(invocation.createdAt),
+        updatedAt: new Date(invocation.createdAt),
+        ...boundedControlMessage(command, invocation.commandMessageTruncated),
+      };
+    }
+    const now = new Date();
+    let reason: string | undefined;
+    if (result.status === 'not_running') {
+      reason = 'task_not_running';
+    } else if (result.status === 'control_not_found') {
+      reason = 'control_not_found';
+    }
+    let targetControlId: string | undefined;
+    if (command.action === 'cancel_message') {
+      targetControlId = command.controlId;
+    } else if (result.status === 'accepted') {
+      targetControlId = result.controlId;
+    }
+    return {
+      invocationId: invocation.invocationId,
+      fingerprint: invocation.fingerprint,
+      ...(targetControlId == null ? {} : { controlId: targetControlId }),
+      action: command.action,
+      status:
+        result.status === 'accepted' || result.status === 'cancelled' ? 'applied' : 'rejected',
+      createdAt: new Date(invocation.createdAt),
+      updatedAt: now,
+      ...(reason == null ? {} : { reason }),
+      ...boundedControlMessage(command, invocation.commandMessageTruncated),
+    };
+  }
+
+  private async replayDurableControl(
+    scopeId: string,
+    taskId: string,
+    command: SubagentTaskControlCommand,
+    invocationId: string,
+  ): Promise<SubagentTaskControlResult | undefined> {
+    const scope = parseScope(scopeId);
+    const replay = await this.runWithOwnerContext(scope, () =>
+      this.methods.getSubagentTaskControlReplay({
+        userId: scope.userId,
+        parentConversationId: scope.parentConversationId,
+        taskId,
+        invocationId,
+        ...(scope.tenantId == null ? {} : { tenantId: scope.tenantId }),
+      }),
+    );
+    if (replay == null) return undefined;
+    if (replay.receipt.fingerprint !== controlFingerprint(command)) {
+      return {
+        status: 'invalid',
+        message: 'This control invocation id was already used for a different command.',
+      };
+    }
+    const { receipt, task: durableTask } = replay;
+    if (receipt.status === 'reserved') {
+      /** The prior owner fenced this invocation but did not durably prove the
+       * side effect. Reapplying could duplicate it; reporting acceptance would lie. */
+      throw new SubagentTaskOwnerUnavailableError();
+    }
+    const task: SubagentTaskSnapshot = {
+      taskId,
+      threadId: durableTask.threadId,
+      subagentType: durableTask.subagentType,
+      status: durableTask.status,
+      createdAt: durableTask.createdAt.getTime(),
+      updatedAt: durableTask.updatedAt.getTime(),
+      resultAvailable: durableTask.resultAvailable,
+      resultClaimed: durableTask.resultClaimed,
+      pendingControls: durableTask.pendingControls,
+      ...(receipt.controlId != null &&
+      (receipt.action === 'steer' || receipt.action === 'queue' || receipt.action === 'interrupt')
+        ? {
+            controlReceipts: [
+              {
+                controlId: receipt.controlId,
+                action: receipt.action,
+                status: receipt.status,
+                createdAt: receipt.createdAt.getTime(),
+                updatedAt: receipt.updatedAt.getTime(),
+                ...(receipt.boundary == null ? {} : { boundary: receipt.boundary }),
+                ...(receipt.reason === 'withdrawn' ||
+                receipt.reason === 'task_completed' ||
+                receipt.reason === 'task_cancelled' ||
+                receipt.reason === 'task_failed'
+                  ? { reason: receipt.reason }
+                  : {}),
+              },
+            ],
+          }
+        : {}),
+    };
+    if (receipt.status === 'accepted') {
+      return {
+        status: 'accepted',
+        task,
+        ...(receipt.controlId == null ? {} : { controlId: receipt.controlId }),
+      };
+    }
+    if (receipt.status === 'applied') {
+      return command.action === 'cancel'
+        ? { status: 'cancelled', task }
+        : {
+            status: 'accepted',
+            task,
+            ...(receipt.controlId == null ? {} : { controlId: receipt.controlId }),
+          };
+    }
+    if (
+      receipt.reason === 'task_not_running' ||
+      receipt.reason === 'task_completed' ||
+      receipt.reason === 'task_cancelled' ||
+      receipt.reason === 'task_failed'
+    ) {
+      return { status: 'not_running', task };
+    }
+    if (receipt.reason === 'control_not_found' || receipt.reason === 'withdrawn') {
+      return { status: 'control_not_found', task };
+    }
+    return {
+      status: 'invalid',
+      message:
+        receipt.status === 'failed'
+          ? 'The prior control invocation failed.'
+          : 'The prior control invocation was rejected.',
+    };
+  }
+
+  private queueControlReceipt(
+    scopeId: string,
+    taskId: string,
+    threadId: string,
+    receipt: ISubagentTaskControlReceipt,
+  ): Promise<void> {
+    const key = controlTaskKey(scopeId, taskId);
+    const pending = this.pendingControlReceipts.get(key) ?? new Map();
+    pending.set(receipt.invocationId, { threadId, receipt });
+    this.pendingControlReceipts.set(key, pending);
+    return this.flushControlReceipts(scopeId, taskId);
+  }
+
+  private flushControlReceipts(scopeId: string, taskId: string): Promise<void> {
+    const key = controlTaskKey(scopeId, taskId);
+    const prior = this.controlPersistenceTails.get(key) ?? Promise.resolve();
+    const operation = prior
+      .catch(() => undefined)
+      .then(async () => {
+        const pending = this.pendingControlReceipts.get(key);
+        if (pending == null) return;
+        const scope = parseScope(scopeId);
+        for (const [invocationId, candidate] of [...pending]) {
+          const current = pending.get(invocationId);
+          if (current !== candidate) continue;
+          const persisted = await this.runWithOwnerContext(scope, () =>
+            this.methods.recordSubagentTaskControlReceipt({
+              userId: scope.userId,
+              conversationId: candidate.threadId,
+              taskId,
+              ...(scope.tenantId == null ? {} : { tenantId: scope.tenantId }),
+              receipt: candidate.receipt,
+            }),
+          );
+          if (persisted === 'conflict') {
+            if (pending.get(invocationId) === candidate) pending.delete(invocationId);
+            if (pending.size === 0) this.pendingControlReceipts.delete(key);
+            throw new SubagentControlReceiptConflictError();
+          }
+          if (!persisted) {
+            throw new Error('The child control receipt target is not ready.');
+          }
+          const invocation = this.retainedControlInvocation(scopeId, taskId, invocationId);
+          if (invocation?.receipt === candidate.receipt) {
+            invocation.receiptPersisted = true;
+          }
+          if (pending.get(invocationId) === candidate) {
+            pending.delete(invocationId);
+          }
+        }
+        if (pending.size === 0) {
+          this.pendingControlReceipts.delete(key);
+          const retry = this.controlPersistenceRetryTimers.get(key);
+          if (retry != null) clearTimeout(retry);
+          this.controlPersistenceRetryTimers.delete(key);
+        }
+      });
+    this.controlPersistenceTails.set(key, operation);
+    void operation.then(
+      () => {
+        if (this.controlPersistenceTails.get(key) === operation) {
+          this.controlPersistenceTails.delete(key);
+        }
+        this.scheduleControlReceiptRetry(scopeId, taskId);
+      },
+      () => {
+        if (this.controlPersistenceTails.get(key) === operation) {
+          this.controlPersistenceTails.delete(key);
+        }
+        this.scheduleControlReceiptRetry(scopeId, taskId);
+      },
+    );
+    return operation;
+  }
+
+  /** A terminal child may have no later caller to retrigger persistence. Keep a
+   * single bounded retry timer per task so transient storage failures converge
+   * even after result collection expires its in-memory task; restart durability
+   * remains AI-1737. */
+  private scheduleControlReceiptRetry(scopeId: string, taskId: string): void {
+    const key = controlTaskKey(scopeId, taskId);
+    if (
+      this.controlPersistenceStopping ||
+      this.controlPersistenceRetryTimers.has(key) ||
+      !this.pendingControlReceipts.has(key)
+    ) {
+      return;
+    }
+    const timer = setTimeout(() => {
+      this.controlPersistenceRetryTimers.delete(key);
+      void this.flushControlReceipts(scopeId, taskId).catch((error) => {
+        logger.warn('[subagentThreads] Failed to retry child control receipts', error);
+      });
+    }, this.controlReceiptRetryMs);
+    this.controlPersistenceRetryTimers.set(key, timer);
+  }
+
+  private async flushControlReceiptsForSettlement(scopeId: string, taskId: string): Promise<void> {
+    try {
+      await this.flushControlReceipts(scopeId, taskId);
+    } catch (error) {
+      logger.warn('[subagentThreads] Failed to flush child control receipts', error);
+    }
+  }
+
   /** Enables optional cross-replica lookup after the host's Redis service is ready. */
   async configureTaskControlTransport(transport: SubagentTaskControlTransport): Promise<void> {
     if (this.taskControlTransport != null) {
@@ -527,17 +1032,107 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {
     await transport.bind({
       claim: (scopeId, taskId) => super.claim(scopeId, taskId),
       control: (scopeId, taskId, command, invocationId) =>
-        this.controlInvocation(scopeId, taskId, command, invocationId),
+        this.controlInvocationAndPersist(scopeId, taskId, command, invocationId),
       list: (scopeId) => super.list(scopeId),
-      cancelScope: (scopeId, threadIds) => this.cancelForScope(scopeId, threadIds),
+      cancelScope: (scopeId, threadIds, removedConversationIds = []) => {
+        const cancelled = this.cancelForScope(scopeId, threadIds);
+        if (removedConversationIds.length > 0) {
+          const scope = parseScope(scopeId);
+          this.dropDeletedControlReceiptWork(
+            scope.userId,
+            new Set(removedConversationIds),
+            scope.tenantId,
+          );
+        }
+        return cancelled;
+      },
+      retainsTaskOwnership: (scopeId, taskId) =>
+        this.pendingControlReceipts.has(controlTaskKey(scopeId, taskId)),
     });
     this.taskControlTransport = transport;
   }
 
   async destroyTaskControlTransport(): Promise<void> {
+    /** Close command admission and synchronously cancel every locally-owned child
+     * before the first await. The SDK emits all pending-control transitions while
+     * cancelling, so no receipt producer can race the final persistence snapshot. */
+    this.controlCommandAdmissionClosed = true;
+    const cancellationFlushes: Promise<void>[] = [];
+    for (const lease of this.activeThreads.values()) {
+      if (lease.taskId !== '' && this.get(lease.scopeId, lease.taskId)?.status === 'running') {
+        const cancellation = super.control(lease.scopeId, lease.taskId, { action: 'cancel' });
+        if (cancellation.status === 'cancelled') {
+          /** The SDK hook above is synchronous, but retain direct promises for the
+           * authoritative terminal snapshot as well. This makes shutdown await the
+           * transition even when its first storage attempt fails under load. */
+          const snapshot = cancellation.task as SnapshotWithControlReceipts;
+          for (const receipt of snapshot.controlReceipts ?? []) {
+            const persistence = this.queueAuthoritativeControlReceipt(
+              lease.scopeId,
+              lease.taskId,
+              receipt,
+            );
+            if (persistence != null) cancellationFlushes.push(persistence);
+          }
+        }
+      }
+    }
+    const childSettlements = [...this.activeThreads.values()]
+      .map((lease) => lease.execution)
+      .filter((execution): execution is Promise<void> => execution != null);
+    let childSettlementTimedOut = false;
+    if (childSettlements.length > 0) {
+      let timeout: ReturnType<typeof setTimeout> | undefined;
+      try {
+        await Promise.race([
+          Promise.allSettled(childSettlements),
+          new Promise<void>((_, reject) => {
+            timeout = setTimeout(
+              () => reject(new SubagentTaskOwnerUnavailableError()),
+              this.ownerDrainTimeoutMs,
+            );
+          }),
+        ]);
+      } catch {
+        childSettlementTimedOut = true;
+      } finally {
+        if (timeout != null) clearTimeout(timeout);
+      }
+    }
+    this.controlPersistenceStopping = true;
+    for (const timer of this.controlPersistenceRetryTimers.values()) clearTimeout(timer);
+    this.controlPersistenceRetryTimers.clear();
+    await Promise.allSettled(cancellationFlushes);
+    /** Cancellation can enqueue its terminal transition behind an already-failing
+     * acceptance write. Re-snapshot both maps after each round so work admitted
+     * synchronously before shutdown cannot appear just after the final snapshot. */
+    for (let attempt = 0; attempt < SHUTDOWN_CONTROL_RECEIPT_FLUSH_ATTEMPTS; attempt += 1) {
+      const pendingTasks = [...this.pendingControlReceipts.keys()]
+        .map(parseControlTaskKey)
+        .filter((task): task is { scopeId: string; taskId: string } => task != null);
+      await Promise.allSettled(
+        pendingTasks.map(({ scopeId, taskId }) => this.flushControlReceipts(scopeId, taskId)),
+      );
+      await Promise.allSettled([...this.controlPersistenceTails.values()]);
+      if (this.pendingControlReceipts.size === 0 && this.controlPersistenceTails.size === 0) {
+        break;
+      }
+      if (attempt + 1 < SHUTDOWN_CONTROL_RECEIPT_FLUSH_ATTEMPTS) {
+        await new Promise<void>((resolve) => {
+          setTimeout(resolve, this.shutdownControlReceiptBackoffMs * 2 ** attempt);
+        });
+      }
+    }
     const transport = this.taskControlTransport;
     this.taskControlTransport = undefined;
     await transport?.destroy();
+    if (
+      childSettlementTimedOut ||
+      this.pendingControlReceipts.size > 0 ||
+      this.controlPersistenceTails.size > 0
+    ) {
+      throw new SubagentTaskOwnerUnavailableError();
+    }
   }
 
   /** Replaces the process-local activity bus after the host's Redis service is ready. */
@@ -659,6 +1254,7 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {
     }
 
     const lease: TaskThreadLease = active ?? {
+      scopeId: request.scopeId,
       idempotencyKey,
       taskId: '',
       running: false,
@@ -674,8 +1270,8 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {
       started = super.start({
         ...request,
         threadId,
-        run: (runtime: SubagentTaskRuntime) =>
-          this.runWithOwnerContext(scope, async () => {
+        run: (runtime: SubagentTaskRuntime) => {
+          const execution = this.runWithOwnerContext(scope, async () => {
             lease.taskId = runtime.taskId;
             lease.running = true;
             const detachedUsage: UsageMetadata[] = [];
@@ -827,7 +1423,14 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {
                 this.activeThreads.delete(lockKey);
               }
             }
-          }),
+          });
+          const settlement = execution.then(
+            () => undefined,
+            () => undefined,
+          );
+          lease.execution = settlement;
+          return execution;
+        },
       });
     } catch (error) {
       if (ownsLease && this.activeThreads.get(lockKey) === lease) {
@@ -1039,15 +1642,157 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {
     command: SubagentTaskControlCommand,
     invocationId: string = randomUUID(),
   ): Promise<SubagentTaskControlResult> {
-    const local = this.controlInvocation(scopeId, taskId, command, invocationId);
+    /** A requester that has neither the task nor a retained invocation cannot be
+     * authoritative. Route first so a remote control pays only the owner's durable
+     * preflight instead of repeating the same Mongo read on both replicas. */
+    const hasLocalAuthority =
+      this.get(scopeId, taskId) != null ||
+      this.retainedControlInvocation(scopeId, taskId, invocationId) != null;
+    const local = hasLocalAuthority
+      ? await this.controlInvocationAndPersist(scopeId, taskId, command, invocationId)
+      : ({ status: 'not_found' } as const);
     if (local.status !== 'not_found') {
       return local;
     }
+    let routed: SubagentTaskControlResult | undefined;
+    try {
+      routed = await this.taskControlTransport?.control(scopeId, taskId, command, invocationId);
+    } catch (error) {
+      if (error instanceof SubagentTaskOwnerUnavailableError) {
+        const replay = await this.replayDurableControlAtBoundary(
+          scopeId,
+          taskId,
+          command,
+          invocationId,
+        );
+        if (replay != null) return replay;
+      }
+      throw error;
+    }
+    if (routed != null && routed.status !== 'not_found') return routed;
     return (
-      (await this.taskControlTransport?.control(scopeId, taskId, command, invocationId)) ?? local
+      (await this.replayDurableControlAtBoundary(scopeId, taskId, command, invocationId)) ??
+      routed ??
+      local
     );
   }
 
+  /** Durable receipt reads are part of the owner boundary. Storage ambiguity must
+   * remain retryable instead of escaping as an unrelated tool execution failure. */
+  private async replayDurableControlAtBoundary(
+    scopeId: string,
+    taskId: string,
+    command: SubagentTaskControlCommand,
+    invocationId: string,
+  ): Promise<SubagentTaskControlResult | undefined> {
+    try {
+      return await this.replayDurableControl(scopeId, taskId, command, invocationId);
+    } catch (error) {
+      if (error instanceof SubagentTaskOwnerUnavailableError) throw error;
+      throw new SubagentTaskOwnerUnavailableError();
+    }
+  }
+
+  private retainedControlInvocation(
+    scopeId: string,
+    taskId: string,
+    invocationId: string,
+  ): ControlInvocationRecord | undefined {
+    const key = `${scopeId}\u0000${taskId}\u0000${invocationId}`;
+    return this.controlInvocations.get(key) ?? this.terminalControlInvocations.get(key);
+  }
+
+  private async replayRetainedControl(
+    scopeId: string,
+    taskId: string,
+    command: SubagentTaskControlCommand,
+    invocationId: string,
+  ): Promise<SubagentTaskControlResult | undefined> {
+    const retained = this.retainedControlInvocation(scopeId, taskId, invocationId);
+    if (retained == null) return undefined;
+    if (retained.fingerprint !== controlFingerprint(command)) {
+      return {
+        status: 'invalid',
+        message: 'This control invocation id was already used for a different command.',
+      };
+    }
+    if (hasDurableControlReceipt(retained)) {
+      /** Terminal materialization and one-shot collection can change after the
+       * receipt becomes durable. Refresh those flags from the exact durable row so
+       * same-owner replay agrees with replay after owner loss. */
+      if ('task' in retained.result && retained.result.task.status !== 'running') {
+        const current = this.get(scopeId, taskId);
+        if (current != null) {
+          retained.result = {
+            ...retained.result,
+            task: {
+              ...retained.result.task,
+              status: current.status,
+              updatedAt: current.updatedAt,
+              resultAvailable: current.resultAvailable,
+              resultClaimed: current.resultClaimed,
+            },
+          };
+        } else {
+          const durable = await this.replayDurableControlAtBoundary(
+            scopeId,
+            taskId,
+            command,
+            invocationId,
+          );
+          if (durable != null) retained.result = durable;
+        }
+      }
+      return retained.result;
+    }
+    let persistenceFailed = false;
+    try {
+      await (retained.receiptPersistence ?? this.flushControlReceipts(scopeId, taskId));
+    } catch {
+      persistenceFailed = true;
+      // The durable replay below distinguishes a committed result or conflict
+      // from a genuinely retryable storage failure.
+    }
+    if (hasDurableControlReceipt(retained)) return retained.result;
+    if (persistenceFailed) {
+      try {
+        const retry = this.flushControlReceipts(scopeId, taskId);
+        retained.receiptPersistence = retry;
+        await retry;
+      } catch {
+        // Durable replay below remains the authoritative discriminator.
+      }
+    }
+    try {
+      const durable = await this.replayDurableControl(scopeId, taskId, command, invocationId);
+      if (durable != null) {
+        retained.result = durable;
+        retained.receiptPersisted = true;
+        retained.receiptPersistence = undefined;
+        return durable;
+      }
+    } catch {
+      // Normalize storage outages at the owner boundary.
+    }
+    throw new SubagentTaskOwnerUnavailableError();
+  }
+
+  private retainedControlResult(
+    scopeId: string,
+    taskId: string,
+    command: SubagentTaskControlCommand,
+    invocationId: string,
+  ): SubagentTaskControlResult | undefined {
+    const retained = this.retainedControlInvocation(scopeId, taskId, invocationId);
+    if (retained == null) return undefined;
+    return retained.fingerprint === controlFingerprint(command)
+      ? retained.result
+      : {
+          status: 'invalid',
+          message: 'This control invocation id was already used for a different command.',
+        };
+  }
+
   /**
    * Applies one logical control exactly once for its owning task. Idempotency lives
    * here rather than in the transport so a local and a routed caller of the same
@@ -1060,25 +1805,49 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {
     command: SubagentTaskControlCommand,
     invocationId: string,
   ): SubagentTaskControlResult {
+    if (this.controlCommandAdmissionClosed) {
+      return { status: 'invalid', message: 'Subagent task controls are shutting down.' };
+    }
     const key = `${scopeId}\u0000${taskId}\u0000${invocationId}`;
     const fingerprint = controlFingerprint(command);
-    const applied = this.controlInvocations.get(key);
-    if (applied != null) {
-      /** One invocation is one command; reusing its id for different content is a
-       * caller error rather than a retry, so it is refused instead of applied. */
-      return applied.fingerprint === fingerprint
-        ? applied.result
-        : {
-            status: 'invalid',
-            message: 'This control invocation id was already used for a different command.',
-          };
-    }
-    if (this.get(scopeId, taskId) == null) {
+    const applied = this.retainedControlResult(scopeId, taskId, command, invocationId);
+    if (applied != null) return applied;
+    const localTask = this.get(scopeId, taskId);
+    if (localTask == null) {
       /** Not this replica's task. Refusing here would keep the command from ever
        * reaching its owner, so local load cannot veto a remote cancellation: the
        * owner applies its own window to the routed request. */
       return this.control(scopeId, taskId, command);
     }
+    if (localTask.status !== 'running') {
+      const result = this.control(scopeId, taskId, command);
+      if (result.status === 'not_found' || result.status === 'invalid') return result;
+      if (this.terminalControlInvocations.size >= MAX_TERMINAL_CONTROL_INVOCATIONS) {
+        const oldestPersisted = [...this.terminalControlInvocations].find(
+          ([, invocation]) => invocation.receiptPersisted === true,
+        )?.[0];
+        if (oldestPersisted == null) {
+          return {
+            status: 'invalid',
+            message:
+              'Too many terminal control invocations are awaiting persistence; retry shortly.',
+          };
+        }
+        this.terminalControlInvocations.delete(oldestPersisted);
+      }
+      this.terminalControlInvocations.set(key, {
+        scopeId,
+        taskId,
+        invocationId,
+        fingerprint,
+        command: boundedControlCommand(command),
+        commandMessageTruncated:
+          'message' in command && command.message.length > MAX_DURABLE_CONTROL_MESSAGE_CHARS,
+        result,
+        createdAt: Date.now(),
+      });
+      return result;
+    }
     if (!this.makeRoomForInvocation()) {
       /** Every tracked invocation belongs to a task this store still holds. Applying
        * this command without room to record it would let a caller retry apply it a
@@ -1090,13 +1859,196 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {
       };
     }
     const result = this.control(scopeId, taskId, command);
-    if (result.status === 'not_found') {
+    if (result.status === 'not_found' || result.status === 'invalid') {
+      return result;
+    }
+    if (result.status !== 'accepted' && result.status !== 'cancelled') {
       return result;
     }
-    this.controlInvocations.set(key, { scopeId, taskId, fingerprint, result });
+    const invocation: ControlInvocationRecord = {
+      scopeId,
+      taskId,
+      invocationId,
+      fingerprint,
+      command: boundedControlCommand(command),
+      commandMessageTruncated:
+        'message' in command && command.message.length > MAX_DURABLE_CONTROL_MESSAGE_CHARS,
+      result,
+      createdAt: Date.now(),
+    };
+    this.controlInvocations.set(key, invocation);
+    if (
+      result.status === 'accepted' &&
+      result.controlId != null &&
+      (command.action === 'steer' || command.action === 'queue' || command.action === 'interrupt')
+    ) {
+      this.controlInvocationByReceipt.set(
+        controlReceiptKey(scopeId, taskId, result.controlId),
+        invocation,
+      );
+    }
     return result;
   }
 
+  private async controlInvocationAndPersist(
+    scopeId: string,
+    taskId: string,
+    command: SubagentTaskControlCommand,
+    invocationId: string,
+  ): Promise<SubagentTaskControlResult> {
+    const retained = await this.replayRetainedControl(scopeId, taskId, command, invocationId);
+    if (retained != null) return retained;
+    try {
+      const durable = await this.replayDurableControl(scopeId, taskId, command, invocationId);
+      if (durable != null) return durable;
+    } catch (error) {
+      logger.warn('[subagentThreads] Failed to preflight a child control receipt', error);
+      throw new SubagentTaskOwnerUnavailableError();
+    }
+    const localTask = this.get(scopeId, taskId);
+    if (localTask?.status === 'running') {
+      if (localTask.threadId == null || localTask.threadId === '') {
+        throw new SubagentTaskOwnerUnavailableError();
+      }
+      const scope = parseScope(scopeId);
+      const now = new Date();
+      const reservation: ISubagentTaskControlReceipt = {
+        invocationId,
+        fingerprint: controlFingerprint(command),
+        action: command.action,
+        status: 'reserved',
+        createdAt: now,
+        updatedAt: now,
+        ...boundedControlMessage(
+          boundedControlCommand(command),
+          'message' in command && command.message.length > MAX_DURABLE_CONTROL_MESSAGE_CHARS,
+        ),
+      };
+      let reserved: boolean | 'unchanged' | 'conflict';
+      try {
+        reserved = (await this.controlReservationSlot(() =>
+          this.runWithOwnerContext(scope, () =>
+            this.methods.recordSubagentTaskControlReceipt({
+              userId: scope.userId,
+              conversationId: localTask.threadId as string,
+              taskId,
+              ...(scope.tenantId == null ? {} : { tenantId: scope.tenantId }),
+              receipt: reservation,
+            }),
+          ),
+        )) as boolean | 'unchanged' | 'conflict';
+      } catch (error) {
+        logger.warn('[subagentThreads] Failed to reserve a child control invocation', error);
+        throw new SubagentTaskOwnerUnavailableError();
+      }
+      if (reserved === 'conflict') {
+        return {
+          status: 'invalid',
+          message: 'This control invocation id was already used for a different command.',
+        };
+      }
+      if (reserved === 'unchanged') {
+        try {
+          const replay = await this.replayDurableControl(scopeId, taskId, command, invocationId);
+          if (replay != null) return replay;
+        } catch {
+          // Normalize storage ambiguity at the owner boundary below.
+        }
+        throw new SubagentTaskOwnerUnavailableError();
+      }
+      if (!reserved) throw new SubagentTaskOwnerUnavailableError();
+    }
+    const invocationKey = `${scopeId}\u0000${taskId}\u0000${invocationId}`;
+    const result = this.controlInvocation(scopeId, taskId, command, invocationId);
+    const retainedInvocation =
+      this.controlInvocations.get(invocationKey) ??
+      this.terminalControlInvocations.get(invocationKey);
+    const invocation: ControlInvocationRecord | undefined =
+      retainedInvocation ??
+      (result.status === 'not_found' || result.status === 'invalid'
+        ? undefined
+        : {
+            scopeId,
+            taskId,
+            invocationId,
+            fingerprint: controlFingerprint(command),
+            command: boundedControlCommand(command),
+            commandMessageTruncated:
+              'message' in command && command.message.length > MAX_DURABLE_CONTROL_MESSAGE_CHARS,
+            result,
+            createdAt: Date.now(),
+          });
+    const threadId = 'task' in result ? result.task.threadId : undefined;
+    if (invocation == null || threadId == null) return result;
+    const receipt = this.controlResultReceipt(invocation);
+    let persistedReceipt: ISubagentTaskControlReceipt | undefined;
+    let persistence: Promise<void> | undefined;
+    try {
+      if (receipt != null) {
+        persistedReceipt = receipt;
+        invocation.receipt = persistedReceipt;
+        invocation.receiptPersisted = false;
+        persistence = this.queueControlReceipt(scopeId, taskId, threadId, persistedReceipt);
+        invocation.receiptPersistence = persistence;
+        await persistence;
+        /** A terminal SDK transition can replace the accepted projection while its
+         * older write is awaiting Mongo. Mark only the exact generation awaited. */
+        if (invocation.receipt === persistedReceipt) invocation.receiptPersisted = true;
+        /** Do not acknowledge an older generation while a newer authoritative SDK
+         * transition is still queued. There is no async gap after this loop, so the
+         * generation proven durable is the one returned to the caller. */
+        await this.awaitCurrentControlReceipt(scopeId, taskId, invocation);
+      }
+    } catch (error) {
+      if (error instanceof SubagentControlReceiptConflictError) {
+        const invalid: SubagentTaskControlResult = {
+          status: 'invalid',
+          message: 'This control invocation id was already used for a different command.',
+        };
+        invocation.result = invalid;
+        invocation.receiptPersisted = true;
+        if (result.status === 'accepted' && result.controlId != null) {
+          this.controlInvocationByReceipt.delete(
+            controlReceiptKey(scopeId, taskId, result.controlId),
+          );
+          super.control(scopeId, taskId, {
+            action: 'cancel_message',
+            controlId: result.controlId,
+          });
+        }
+        return invalid;
+      }
+      logger.warn('[subagentThreads] Failed to durably accept a child control', error);
+      throw new SubagentTaskOwnerUnavailableError();
+    } finally {
+      if (
+        persistence != null &&
+        persistedReceipt != null &&
+        invocation.receiptPersistence === persistence &&
+        invocation.receipt === persistedReceipt &&
+        invocation.receiptPersisted === true
+      ) {
+        invocation.receiptPersistence = undefined;
+      }
+    }
+    return invocation.result;
+  }
+
+  private async awaitCurrentControlReceipt(
+    scopeId: string,
+    taskId: string,
+    invocation: ControlInvocationRecord,
+  ): Promise<void> {
+    while (invocation.receipt != null && invocation.receiptPersisted !== true) {
+      const receipt = invocation.receipt;
+      const persistence =
+        invocation.receiptPersistence ?? this.flushControlReceipts(scopeId, taskId);
+      invocation.receiptPersistence = persistence;
+      await persistence;
+      if (invocation.receipt === receipt && hasDurableControlReceipt(invocation)) return;
+    }
+  }
+
   /**
    * Frees invocation slots by dropping records whose task the store no longer holds:
    * a settled task cannot be controlled again, so its record is worthless, while a
@@ -1111,6 +2063,12 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {
     for (const [key, invocation] of this.controlInvocations) {
       if (this.get(invocation.scopeId, invocation.taskId) == null) {
         this.controlInvocations.delete(key);
+        const result = invocation.result;
+        if (result.status === 'accepted' && result.controlId != null) {
+          this.controlInvocationByReceipt.delete(
+            controlReceiptKey(invocation.scopeId, invocation.taskId, result.controlId),
+          );
+        }
       }
     }
     return this.controlInvocations.size < this.maxControlInvocations;
@@ -1146,7 +2104,7 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {
     const snapshot = this.get(scopeId, taskId);
     const lockKey = snapshot?.threadId == null ? undefined : `${scopeId}\u0000${snapshot.threadId}`;
     const lease = lockKey == null ? undefined : this.activeThreads.get(lockKey);
-    if (lease?.taskId === taskId && lease.settling) {
+    if (snapshot != null && lease?.taskId === taskId && lease.settling) {
       return { status: 'not_running', task: snapshot };
     }
     const result = super.control(scopeId, taskId, command);
@@ -1277,6 +2235,9 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {
     let cancelled = this.cancelForConversations(userId, targets, tenantId);
     const transport = this.taskControlTransport;
     if (transport == null) {
+      if (removed.size > 0) {
+        this.dropDeletedControlReceiptWork(userId, removed, tenantId);
+      }
       return cancelled;
     }
     const cancelSlot = createConcurrencyLimiter(DELETION_CANCEL_CONCURRENCY);
@@ -1290,35 +2251,114 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {
         }),
         threadIds: null,
       }));
-    const scopeCancellations = [...plan.scopes, ...cascadeScopes].map((scope) =>
-      cancelSlot(() => transport.cancelScope(scope.scopeId, scope.threadIds)),
-    );
+    const scopeCancellations = [...plan.scopes, ...cascadeScopes].map((scope) => {
+      const parsed = parseScope(scope.scopeId);
+      const removedForScope = [
+        ...(removed.has(parsed.parentConversationId) ? [parsed.parentConversationId] : []),
+        ...(scope.threadIds ?? []).filter((threadId) => removed.has(threadId)),
+      ];
+      return cancelSlot(() =>
+        transport.cancelScope(scope.scopeId, scope.threadIds, removedForScope),
+      );
+    });
     const leaseCancellations = plan.leases
       .filter(
         (lease) => removed.has(lease.parentConversationId) || removed.has(lease.conversationId),
       )
       .map((lease) =>
-        cancelSlot(() =>
-          this.controlTask(
-            serializeScope({
-              userId,
-              parentConversationId: lease.parentConversationId,
-              ...(tenantId ? { tenantId } : {}),
-            }),
-            lease.taskId,
-            { action: 'cancel' },
-          ),
-        ),
+        cancelSlot(async () => {
+          const scopeId = serializeScope({
+            userId,
+            parentConversationId: lease.parentConversationId,
+            ...(tenantId ? { tenantId } : {}),
+          });
+          const removedForLease = [lease.parentConversationId, lease.conversationId].filter((id) =>
+            removed.has(id),
+          );
+          const stopped = await transport.cancelScope(
+            scopeId,
+            [lease.conversationId],
+            removedForLease,
+          );
+          if (stopped > 0 || this.cancelUnroutedTask == null) return stopped;
+          return (await this.cancelUnroutedTask({
+            userId,
+            parentConversationId: lease.parentConversationId,
+            taskId: lease.taskId,
+            ...(tenantId ? { tenantId } : {}),
+          }))
+            ? 1
+            : 0;
+        }),
       );
-    for (const count of await Promise.all(scopeCancellations)) {
-      cancelled += count;
+    try {
+      for (const count of await Promise.all(scopeCancellations)) {
+        cancelled += count;
+      }
+      for (const count of await Promise.all(leaseCancellations)) {
+        cancelled += count;
+      }
+      return cancelled;
+    } finally {
+      /** Delivery may fail after the deletion committed. Receipt persistence for
+       * removed rows is still terminal and must not poison graceful shutdown. */
+      if (removed.size > 0) {
+        this.dropDeletedControlReceiptWork(userId, removed, tenantId);
+      }
     }
-    for (const result of await Promise.all(leaseCancellations)) {
-      if (result.status === 'cancelled') {
-        cancelled += 1;
+  }
+
+  /** A successful deletion makes false receipt writes permanent, not retryable.
+   * Remove only work whose authorized parent or child was actually deleted. */
+  private dropDeletedControlReceiptWork(
+    userId: string,
+    removedConversationIds: ReadonlySet<string>,
+    tenantId?: string,
+  ): void {
+    const matchesDeletedScope = (scopeId: string): boolean => {
+      const scope = parseScope(scopeId);
+      return (
+        scope.userId === userId &&
+        matchesTenant(scope.tenantId, tenantId) &&
+        removedConversationIds.has(scope.parentConversationId)
+      );
+    };
+    for (const [key, pending] of this.pendingControlReceipts) {
+      const task = parseControlTaskKey(key);
+      if (task == null) continue;
+      const deleteWholeTask = matchesDeletedScope(task.scopeId);
+      for (const [invocationId, candidate] of pending) {
+        if (deleteWholeTask || removedConversationIds.has(candidate.threadId)) {
+          pending.delete(invocationId);
+        }
+      }
+      if (pending.size === 0) {
+        this.pendingControlReceipts.delete(key);
+        const retry = this.controlPersistenceRetryTimers.get(key);
+        if (retry != null) clearTimeout(retry);
+        this.controlPersistenceRetryTimers.delete(key);
       }
     }
-    return cancelled;
+    const dropInvocation = (key: string, invocation: ControlInvocationRecord): void => {
+      const resultThreadId =
+        'task' in invocation.result ? invocation.result.task.threadId : undefined;
+      if (
+        !matchesDeletedScope(invocation.scopeId) &&
+        (resultThreadId == null || !removedConversationIds.has(resultThreadId))
+      ) {
+        return;
+      }
+      this.controlInvocations.delete(key);
+      this.terminalControlInvocations.delete(key);
+      if (invocation.result.status === 'accepted' && invocation.result.controlId != null) {
+        this.controlInvocationByReceipt.delete(
+          controlReceiptKey(invocation.scopeId, invocation.taskId, invocation.result.controlId),
+        );
+      }
+    };
+    for (const [key, invocation] of this.controlInvocations) dropInvocation(key, invocation);
+    for (const [key, invocation] of this.terminalControlInvocations)
+      dropInvocation(key, invocation);
   }
 
   /** Cancels this process's live children for one scope, optionally narrowed to threads. */
@@ -1943,6 +2983,7 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {
       if (savedUserMessage == null) {
         throw new Error('Unable to persist the child-thread input.');
       }
+      await this.flushControlReceiptsForSettlement(scopeId, taskId);
       const currentParent = await this.methods.getConvo(scope.userId, scope.parentConversationId);
       if (currentParent == null || !matchesTenant(currentParent.tenantId, scope.tenantId)) {
         throw new SubagentThreadPublicError('Parent thread is unavailable.');
@@ -2013,6 +3054,7 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {
     if (prepared.userMessageId == null) {
       throw new Error('The child-thread input was not prepared.');
     }
+    await this.flushControlReceiptsForSettlement(request.scopeId, taskId);
     const subagentTranscript = serializeTranscript(
       taskId,
       prepared.initialStoredMessages,
@@ -2063,6 +3105,7 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {
     error: unknown,
     detachedUsage: UsageMetadata[],
   ): Promise<void> {
+    await this.flushControlReceiptsForSettlement(request.scopeId, taskId);
     const conversation = await this.currentConversation(scope, request, threadId);
     if (conversation == null || !(await this.taskInputExists(scope, threadId, taskId))) {
       return;
@@ -2128,6 +3171,7 @@ export class SubagentThreadTaskStore extends InMemorySubagentTaskStore {
     taskId: string,
     detachedUsage: UsageMetadata[],
   ): Promise<void> {
+    await this.flushControlReceiptsForSettlement(request.scopeId, taskId);
     const conversation = await this.currentConversation(scope, request, threadId);
     if (conversation == null || !(await this.taskInputExists(scope, threadId, taskId))) {
       return;
@@ -2306,8 +3350,10 @@ const REQUIRED_THREAD_METHODS = [
   'deleteConvos',
   'deleteMessages',
   'getConvo',
+  'getSubagentTaskControlReplay',
   'getMessages',
   'listActiveSubagentThreadLeases',
+  'recordSubagentTaskControlReceipt',
   'releaseSubagentThreadLease',
   'renewSubagentThreadLease',
   'reserveSubagentThread',
@@ -2330,7 +3376,12 @@ export function createSubagentThreadTaskStore(
   > &
     Pick<
       MessageMethods,
-      'claimSubagentTaskResult' | 'deleteMessages' | 'getMessages' | 'saveMessage'
+      | 'claimSubagentTaskResult'
+      | 'deleteMessages'
+      | 'getSubagentTaskControlReplay'
+      | 'getMessages'
+      | 'recordSubagentTaskControlReceipt'
+      | 'saveMessage'
     >,
   options?: SubagentThreadTaskStoreOptions,
 ): SubagentThreadTaskStore {
diff --git a/packages/api/src/agents/view.spec.ts b/packages/api/src/agents/view.spec.ts
index 8bee7350d91..1e99c99c709 100644
--- a/packages/api/src/agents/view.spec.ts
+++ b/packages/api/src/agents/view.spec.ts
@@ -127,6 +127,7 @@ describe('subagent thread parent-scoped view', () => {
       status: 'completed',
       activity: [],
       activityTruncated: false,
+      controlReceipts: [],
       messages: [
         expect.objectContaining({ messageId: 'task-1:user', role: 'user' }),
         expect.objectContaining({
@@ -203,6 +204,72 @@ describe('subagent thread parent-scoped view', () => {
     expect(view.messages[0]).not.toHaveProperty('subagentTranscript');
   });
 
+  it('returns bounded authoritative control receipts without private fingerprints', async () => {
+    const input = message('task-1:user', 'running', true);
+    input.subagentTask!.controlReceipts = [
+      {
+        invocationId: 'private-reservation',
+        fingerprint: 'private-reservation-fingerprint',
+        action: 'queue' as const,
+        status: 'reserved' as const,
+        createdAt: new Date('2026-08-21T09:59:59.000Z'),
+        updatedAt: new Date('2026-08-21T09:59:59.000Z'),
+      },
+      ...Array.from({ length: 32 }, (_, index) => ({
+        invocationId: `earlier-${index}`,
+        fingerprint: `private-${index}`,
+        action: 'queue' as const,
+        status: 'applied' as const,
+        createdAt: new Date(`2026-08-21T10:00:${String(index).padStart(2, '0')}.000Z`),
+        updatedAt: new Date(`2026-08-21T10:00:${String(index).padStart(2, '0')}.000Z`),
+      })),
+      {
+        invocationId: 'invocation-1',
+        fingerprint: 'private-fingerprint',
+        controlId: 'control-1',
+        action: 'steer',
+        status: 'applied',
+        createdAt: new Date('2026-08-21T11:00:01.000Z'),
+        updatedAt: new Date('2026-08-21T11:00:02.000Z'),
+        boundary: 'tool',
+        message: 'x'.repeat(1_000),
+      },
+    ];
+    const handler = createSubagentThreadViewHandler({
+      getConvoOwnership: jest.fn().mockResolvedValue(parent),
+      getSubagentThreadForParent: jest.fn().mockResolvedValue(child),
+      getMessagesForSubagentThreadView: jest
+        .fn()
+        .mockResolvedValue([message('task-1:assistant', 'completed'), input]),
+    });
+    const { response, json } = createResponse();
+
+    await handler(createRequest({}, { taskId: 'task-1' }), response);
+
+    const view = json.mock.calls[0][0];
+    expect(view.controlReceipts).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          invocationId: 'invocation-1',
+          controlId: 'control-1',
+          action: 'steer',
+          status: 'applied',
+          boundary: 'tool',
+          messageTruncated: true,
+        }),
+      ]),
+    );
+    const projected = view.controlReceipts.find(
+      (receipt: { invocationId: string }) => receipt.invocationId === 'invocation-1',
+    );
+    expect(projected).toBeDefined();
+    expect(Buffer.byteLength(projected?.message ?? '', 'utf8')).toBeLessThanOrEqual(512);
+    expect(view.controlReceipts).toHaveLength(32);
+    expect(view.controlReceiptsTruncated).toBe(true);
+    expect(JSON.stringify(view)).not.toContain('private-reservation');
+    expect(JSON.stringify(view)).not.toContain('private-fingerprint');
+  });
+
   it('fences replacement activity to the exact selected task input', async () => {
     const selected = {
       ...message('task-1:assistant', 'completed'),
diff --git a/packages/api/src/agents/view.ts b/packages/api/src/agents/view.ts
index ad9393c3a08..b52ab0f35c8 100644
--- a/packages/api/src/agents/view.ts
+++ b/packages/api/src/agents/view.ts
@@ -3,6 +3,7 @@ import type {
   ParentSubagentIndex,
   ParentSubagentSummary,
   ParentSubagentTaskSummary,
+  SubagentControlReceipt,
   SubagentThreadMessage,
   SubagentThreadStatus,
   SubagentThreadView,
@@ -30,6 +31,8 @@ const MAX_TITLE_BYTES = 1024;
 const MAX_PARENT_CHILDREN = 64;
 const MAX_PARENT_TASKS_PER_CHILD = 20;
 const MAX_PARENT_INDEX_BYTES = 96 * 1024;
+const MAX_PUBLIC_CONTROL_RECEIPTS = 32;
+const MAX_PUBLIC_CONTROL_MESSAGE_BYTES = 512;
 type SubagentThreadViewDependencies = Pick<
   ConversationMethods,
   'getConvoOwnership' | 'getSubagentThreadForParent'
@@ -116,6 +119,53 @@ const publicMessage = (
   };
 };
 
+const publicControlReceipts = (
+  messages: SubagentThreadViewMessageRecord[],
+  taskId: string,
+): { receipts: SubagentControlReceipt[]; truncated: boolean } => {
+  const input = messages.find((message) => message.messageId === `${taskId}:user`);
+  const stored = input?.subagentTask?.controlReceipts ?? [];
+  /** A reservation only fences at-most-once application; it does not claim that
+   * guidance was accepted and must never appear in the public activity view. */
+  const visible = stored.filter(
+    (
+      receipt,
+    ): receipt is typeof receipt & {
+      status: 'accepted' | 'applied' | 'rejected' | 'failed';
+    } => receipt.status !== 'reserved',
+  );
+  const accepted = visible.filter((receipt) => receipt.status === 'accepted');
+  const terminal = visible.filter((receipt) => receipt.status !== 'accepted');
+  const terminalLimit = Math.max(0, MAX_PUBLIC_CONTROL_RECEIPTS - accepted.length);
+  const retained = [...accepted, ...(terminalLimit === 0 ? [] : terminal.slice(-terminalLimit))]
+    .slice(0, MAX_PUBLIC_CONTROL_RECEIPTS)
+    .map((receipt) => {
+      const message =
+        receipt.message == null
+          ? undefined
+          : truncateUtf8(receipt.message, MAX_PUBLIC_CONTROL_MESSAGE_BYTES);
+      return {
+        invocationId: truncateUtf8(receipt.invocationId, MAX_PUBLIC_ID_BYTES).text,
+        ...(receipt.controlId == null
+          ? {}
+          : { controlId: truncateUtf8(receipt.controlId, MAX_PUBLIC_ID_BYTES).text }),
+        action: receipt.action,
+        status: receipt.status,
+        createdAt: isoDate(receipt.createdAt) ?? new Date(0).toISOString(),
+        updatedAt: isoDate(receipt.updatedAt) ?? new Date(0).toISOString(),
+        ...(receipt.boundary == null ? {} : { boundary: receipt.boundary }),
+        ...(receipt.reason == null
+          ? {}
+          : { reason: truncateUtf8(receipt.reason, MAX_PUBLIC_ID_BYTES).text }),
+        ...(message == null ? {} : { message: message.text }),
+        ...(receipt.messageTruncated === true || message?.truncated === true
+          ? { messageTruncated: true }
+          : {}),
+      };
+    });
+  return { receipts: retained, truncated: retained.length < visible.length };
+};
+
 const publicStatus = (
   messages: SubagentThreadViewMessageRecord[],
   activeLeaseTaskId: string | undefined,
@@ -444,6 +494,10 @@ export function createSubagentThreadViewHandler(deps: SubagentThreadViewDependen
         projectedNewestFirst.push(projected.message);
         remainingTextBytes -= projected.bytes;
       }
+      const projectedControls =
+        requestedTaskId == null
+          ? { receipts: [], truncated: false }
+          : publicControlReceipts(newestFirst, requestedTaskId);
       const view: SubagentThreadView = {
         threadId,
         parentConversationId,
@@ -461,6 +515,8 @@ export function createSubagentThreadViewHandler(deps: SubagentThreadViewDependen
         status: publicStatus(newestFirst, activeLeaseTaskId, requestedTaskId),
         activity: projectedActivity.activity,
         activityTruncated: projectedActivity.truncated,
+        controlReceipts: projectedControls.receipts,
+        ...(projectedControls.truncated ? { controlReceiptsTruncated: true } : {}),
         messages: projectedNewestFirst.reverse(),
         historyTruncated: historyTruncated || projectedNewestFirst.length < newestFirst.length,
         ...(isoDate(child.updatedAt) == null ? {} : { updatedAt: isoDate(child.updatedAt) }),
diff --git a/packages/api/src/app/shutdown.spec.ts b/packages/api/src/app/shutdown.spec.ts
index 9e0e76f1999..3b1a4631e9f 100644
--- a/packages/api/src/app/shutdown.spec.ts
+++ b/packages/api/src/app/shutdown.spec.ts
@@ -301,7 +301,7 @@ describe('setupGracefulShutdown', () => {
     expect(order).toEqual(['generation streams', 'default-first', 'default-second', 'telemetry']);
   });
 
-  it('continues subsequent tasks and still exits if one task throws', async () => {
+  it('continues subsequent tasks and exits nonzero if one task throws', async () => {
     const calls: string[] = [];
     jest.spyOn(server, 'close').mockImplementation((cb?: (err?: Error) => void) => {
       if (cb) {
@@ -324,7 +324,7 @@ describe('setupGracefulShutdown', () => {
     await flush();
     await flush();
     expect(calls).toEqual(['ok-before', 'throws', 'ok-after']);
-    expect(exitSpy).toHaveBeenCalledWith(0);
+    expect(exitSpy).toHaveBeenCalledWith(1);
   });
 
   it('awaits async tasks before exiting', async () => {
diff --git a/packages/api/src/app/shutdown.ts b/packages/api/src/app/shutdown.ts
index 656936af3fe..ef101893840 100644
--- a/packages/api/src/app/shutdown.ts
+++ b/packages/api/src/app/shutdown.ts
@@ -81,7 +81,7 @@ export function __resetShutdownStateForTests(): void {
   clearForceExitTimer();
 }
 
-async function runShutdownTasks(phase: ShutdownPhase): Promise<void> {
+async function runShutdownTasks(phase: ShutdownPhase): Promise<boolean> {
   const orderedTasks = tasks
     .filter((task) => task.phase === phase)
     .sort(
@@ -89,14 +89,17 @@ async function runShutdownTasks(phase: ShutdownPhase): Promise<void> {
         right.priority - left.priority || left.registrationOrder - right.registrationOrder,
     );
 
+  let failed = false;
   for (const task of orderedTasks) {
     try {
       logger.info(`Running ${phase} shutdown task: ${task.name}`);
       await task.fn();
     } catch (err) {
+      failed = true;
       logger.error(`Shutdown task "${task.name}" failed:`, err);
     }
   }
+  return failed;
 }
 
 function clearForceExitTimer(): void {
@@ -130,9 +133,9 @@ async function shutdown(signal: NodeJS.Signals): Promise<void> {
       exitCode = 1;
     });
 
-    await runShutdownTasks('pre-drain');
+    if (await runShutdownTasks('pre-drain')) exitCode = 1;
     await serverClosePromise;
-    await runShutdownTasks('post-drain');
+    if (await runShutdownTasks('post-drain')) exitCode = 1;
   } finally {
     clearTimeout(forceExit);
     if (forceExitTimer === forceExit) {
diff --git a/packages/api/src/cache/__tests__/cacheConfig.spec.ts b/packages/api/src/cache/__tests__/cacheConfig.spec.ts
index 820815b5f51..0ef09a2710e 100644
--- a/packages/api/src/cache/__tests__/cacheConfig.spec.ts
+++ b/packages/api/src/cache/__tests__/cacheConfig.spec.ts
@@ -15,6 +15,7 @@ describe('cacheConfig', () => {
     delete process.env.REDIS_CLUSTER_SAFE_DELETE;
     delete process.env.REDIS_PING_INTERVAL;
     delete process.env.FORCED_IN_MEMORY_CACHE_NAMESPACES;
+    delete process.env.VIOLATION_SCORE_TTL;
 
     // Clear module cache
     jest.resetModules();
@@ -263,4 +264,39 @@ describe('cacheConfig', () => {
       expect(cacheConfig.FORCED_IN_MEMORY_CACHE_NAMESPACES).toEqual(['CONFIG_STORE', 'APP_CONFIG']);
     });
   });
+
+  describe('VIOLATION_SCORE_TTL configuration', () => {
+    test('should default to one hour when not set', async () => {
+      const { cacheConfig } = await import('../cacheConfig');
+      expect(cacheConfig.VIOLATION_SCORE_TTL).toBe(3600000);
+    });
+
+    test('should evaluate math expressions from the environment', async () => {
+      process.env.VIOLATION_SCORE_TTL = '1000 * 60 * 60 * 24';
+
+      const { cacheConfig } = await import('../cacheConfig');
+      expect(cacheConfig.VIOLATION_SCORE_TTL).toBe(86400000);
+    });
+
+    test('should disable expiry when set to 0', async () => {
+      process.env.VIOLATION_SCORE_TTL = '0';
+
+      const { cacheConfig } = await import('../cacheConfig');
+      expect(cacheConfig.VIOLATION_SCORE_TTL).toBeUndefined();
+    });
+
+    test('should disable expiry for negative values', async () => {
+      process.env.VIOLATION_SCORE_TTL = '-1000';
+
+      const { cacheConfig } = await import('../cacheConfig');
+      expect(cacheConfig.VIOLATION_SCORE_TTL).toBeUndefined();
+    });
+
+    test('should fall back to the default on invalid input', async () => {
+      process.env.VIOLATION_SCORE_TTL = 'not-a-duration';
+
+      const { cacheConfig } = await import('../cacheConfig');
+      expect(cacheConfig.VIOLATION_SCORE_TTL).toBe(3600000);
+    });
+  });
 });
diff --git a/packages/api/src/cache/__tests__/cacheFactory/violationCache.spec.ts b/packages/api/src/cache/__tests__/cacheFactory/violationCache.spec.ts
new file mode 100644
index 00000000000..cc6382e2ff5
--- /dev/null
+++ b/packages/api/src/cache/__tests__/cacheFactory/violationCache.spec.ts
@@ -0,0 +1,56 @@
+describe('violationCache TTL defaults', () => {
+  let originalEnv: NodeJS.ProcessEnv;
+
+  beforeEach(() => {
+    originalEnv = { ...process.env };
+    delete process.env.USE_REDIS;
+    delete process.env.REDIS_URI;
+    delete process.env.VIOLATION_SCORE_TTL;
+    jest.resetModules();
+  });
+
+  afterEach(() => {
+    process.env = originalEnv;
+    jest.resetModules();
+  });
+
+  test('applies the default violation score TTL when none is given', async () => {
+    const { violationCache } = await import('../../cacheFactory');
+    const cache = violationCache('logins');
+
+    expect(cache.opts.ttl).toBe(3600000);
+    expect(cache.opts.namespace).toBe('violations:logins');
+  });
+
+  test('an explicit TTL overrides the default', async () => {
+    const { violationCache } = await import('../../cacheFactory');
+    const cache = violationCache('logins', 60000);
+
+    expect(cache.opts.ttl).toBe(60000);
+  });
+
+  test('honors VIOLATION_SCORE_TTL from the environment', async () => {
+    process.env.VIOLATION_SCORE_TTL = '1000 * 60 * 5';
+
+    const { violationCache } = await import('../../cacheFactory');
+    expect(violationCache('concurrent').opts.ttl).toBe(300000);
+  });
+
+  test('VIOLATION_SCORE_TTL=0 disables expiry', async () => {
+    process.env.VIOLATION_SCORE_TTL = '0';
+
+    const { violationCache } = await import('../../cacheFactory');
+    expect(violationCache('concurrent').opts.ttl).toBeUndefined();
+  });
+
+  test('expires violation entries once the TTL elapses', async () => {
+    const { violationCache } = await import('../../cacheFactory');
+    const cache = violationCache('expiry-check', 500);
+
+    await cache.set('user-1', 3);
+    await expect(cache.get('user-1')).resolves.toBe(3);
+
+    await new Promise((resolve) => setTimeout(resolve, 800));
+    await expect(cache.get('user-1')).resolves.toBeUndefined();
+  });
+});
diff --git a/packages/api/src/cache/cacheConfig.ts b/packages/api/src/cache/cacheConfig.ts
index 21fe1e7d034..303fb968c8f 100644
--- a/packages/api/src/cache/cacheConfig.ts
+++ b/packages/api/src/cache/cacheConfig.ts
@@ -1,6 +1,6 @@
 import { readFileSync, existsSync } from 'fs';
 import { logger } from '@librechat/data-schemas';
-import { CacheKeys } from 'librechat-data-provider';
+import { Time, CacheKeys } from 'librechat-data-provider';
 import { math, isEnabled } from '~/utils';
 
 // To ensure that different deployments do not interfere with each other's cache, we use a prefix for the Redis keys.
@@ -48,6 +48,12 @@ if (FORCED_IN_MEMORY_CACHE_NAMESPACES.length > 0) {
   }
 }
 
+// Violation scores expire after this long without new violations; every violation write
+// restarts the countdown. Non-positive values disable expiry, restoring the legacy
+// accumulate-forever behavior.
+const VIOLATION_SCORE_TTL_MS = math(process.env.VIOLATION_SCORE_TTL, Time.ONE_HOUR);
+const VIOLATION_SCORE_TTL = VIOLATION_SCORE_TTL_MS > 0 ? VIOLATION_SCORE_TTL_MS : undefined;
+
 /** Helper function to safely read Redis CA certificate from file
  * @returns {string|null} The contents of the CA certificate file, or null if not set or on error
  */
@@ -105,6 +111,13 @@ const cacheConfig: {
   CI: boolean;
   DEBUG_MEMORY_CACHE: boolean;
   BAN_DURATION: number; // 2 hours
+  /**
+   * TTL in ms for violation scores: a score expires after this long without new violations
+   * (each violation write restarts the countdown). `undefined` — from a non-positive
+   * setting — disables expiry so scores accumulate forever.
+   * @default 3600000 (1 hour)
+   */
+  VIOLATION_SCORE_TTL: number | undefined;
   /**
    * Number of keys to delete in each batch during Redis DEL operations.
    * In cluster mode, keys are deleted individually in parallel chunks to avoid CROSSSLOT errors.
@@ -176,6 +189,7 @@ const cacheConfig: {
   DEBUG_MEMORY_CACHE: isEnabled(process.env.DEBUG_MEMORY_CACHE),
 
   BAN_DURATION: math(process.env.BAN_DURATION, 7200000), // 2 hours
+  VIOLATION_SCORE_TTL,
 
   /**
    * Number of keys to delete in each batch during Redis DEL operations.
diff --git a/packages/api/src/cache/cacheFactory.ts b/packages/api/src/cache/cacheFactory.ts
index d61986d62a3..4e760058e82 100644
--- a/packages/api/src/cache/cacheFactory.ts
+++ b/packages/api/src/cache/cacheFactory.ts
@@ -116,10 +116,14 @@ export const tokenConfigCache = (): Keyv =>
  * Creates a cache instance for storing violation data.
  * Uses a file-based fallback store if Redis is not enabled.
  * @param namespace - The cache namespace for violations.
- * @param ttl - Time to live for cache entries.
+ * @param ttl - Time to live for cache entries. Defaults to `cacheConfig.VIOLATION_SCORE_TTL`
+ * so violation scores decay instead of accumulating forever; each write restarts the countdown.
  * @returns Cache instance for violations.
  */
-export const violationCache = (namespace: string, ttl?: number): Keyv => {
+export const violationCache = (
+  namespace: string,
+  ttl: number | undefined = cacheConfig.VIOLATION_SCORE_TTL,
+): Keyv => {
   return standardCache(`violations:${namespace}`, ttl, violationFile);
 };
 
diff --git a/packages/api/src/endpoints/custom/config.ts b/packages/api/src/endpoints/custom/config.ts
index fdf829ad7ca..2ebc495086c 100644
--- a/packages/api/src/endpoints/custom/config.ts
+++ b/packages/api/src/endpoints/custom/config.ts
@@ -1,6 +1,7 @@
 import { EModelEndpoint, extractEnvVariable, normalizeEndpointName } from 'librechat-data-provider';
 import type { TCustomEndpoints, TEndpoint } from 'librechat-data-provider';
 import type { TCustomEndpointsConfig } from '~/types/endpoints';
+import { resolveEndpointProviderId } from './providers';
 import { isUserProvided } from '~/utils';
 
 /**
@@ -63,6 +64,12 @@ export function loadCustomEndpointsConfig(
         customParams: resolvedCustomParams,
         modelDisplayLabel,
         iconURL,
+        providerId: resolveEndpointProviderId({
+          name,
+          baseURL: resolvedBaseURL,
+          iconURL,
+          provider,
+        }),
       };
     }
   }
diff --git a/packages/api/src/endpoints/custom/providers.spec.ts b/packages/api/src/endpoints/custom/providers.spec.ts
new file mode 100644
index 00000000000..7d0d15be15a
--- /dev/null
+++ b/packages/api/src/endpoints/custom/providers.spec.ts
@@ -0,0 +1,111 @@
+import { ProviderId } from 'librechat-data-provider';
+import { providerHosts, resolveEndpointProviderId } from './providers';
+
+describe('resolveEndpointProviderId', () => {
+  it('prefers an iconURL that names a provider', () => {
+    expect(
+      resolveEndpointProviderId({
+        name: 'Internal Gateway',
+        baseURL: 'https://gateway.internal/v1',
+        iconURL: 'openrouter',
+      }),
+    ).toBe(ProviderId.openrouter);
+  });
+
+  it('ignores an iconURL that is an image address', () => {
+    expect(
+      resolveEndpointProviderId({
+        name: 'OpenRouter',
+        baseURL: 'https://openrouter.ai/api/v1',
+        iconURL: 'https://example.com/logo.png',
+      }),
+    ).toBe(ProviderId.openrouter);
+  });
+
+  it('resolves a renamed endpoint from its baseURL host', () => {
+    expect(
+      resolveEndpointProviderId({
+        name: 'My OpenRouter',
+        baseURL: 'https://openrouter.ai/api/v1',
+      }),
+    ).toBe(ProviderId.openrouter);
+  });
+
+  it('matches a host on a subdomain', () => {
+    expect(
+      resolveEndpointProviderId({
+        name: 'Groq Proxy',
+        baseURL: 'https://eu.api.groq.com/openai/v1',
+      }),
+    ).toBe(ProviderId.groq);
+  });
+
+  it('resolves the Helicone gateway host documented in librechat.example.yaml', () => {
+    expect(
+      resolveEndpointProviderId({
+        name: 'Team Gateway',
+        baseURL: 'https://ai-gateway.helicone.ai',
+      }),
+    ).toBe(ProviderId.helicone);
+  });
+
+  it('recognizes the supported Cohere API host', () => {
+    expect(
+      resolveEndpointProviderId({
+        name: 'My Cohere',
+        baseURL: 'https://api.cohere.ai/v1',
+      }),
+    ).toBe(ProviderId.cohere);
+  });
+
+  it('honors an explicit native provider when the host is unknown', () => {
+    expect(
+      resolveEndpointProviderId({
+        name: 'My Claude Proxy',
+        baseURL: 'https://gateway.internal/v1',
+        provider: 'anthropic',
+      }),
+    ).toBe(ProviderId.anthropic);
+  });
+
+  it('falls back to the endpoint name', () => {
+    expect(resolveEndpointProviderId({ name: 'Mistral' })).toBe(ProviderId.mistral);
+  });
+
+  it('returns undefined for a self-hosted gateway with no signal', () => {
+    expect(
+      resolveEndpointProviderId({
+        name: 'LiteLLM',
+        baseURL: 'http://localhost:4000/v1',
+      }),
+    ).toBeUndefined();
+  });
+
+  it('survives a malformed baseURL', () => {
+    expect(resolveEndpointProviderId({ name: 'Cohere', baseURL: 'not a url' })).toBe(
+      ProviderId.cohere,
+    );
+  });
+  it.each([
+    ['https://team.openai.azure.com/openai/v1', ProviderId.azure],
+    ['https://team.cognitiveservices.azure.com/openai/v1', ProviderId.azure],
+    ['https://generativelanguage.googleapis.com/v1beta', ProviderId.google],
+    ['https://aiplatform.googleapis.com/v1', ProviderId.google],
+  ])('brands %s from its host alone', (baseURL, expected) => {
+    expect(resolveEndpointProviderId({ name: 'Team Gateway', baseURL })).toBe(expected);
+  });
+
+  it('carries a host for every provider that one can identify', () => {
+    /** Host-unresolvable by nature: bedrock is region-scoped under a shared AWS suffix,
+     *  and mlx and ollama are served from the operator's own machine. Anything else added
+     *  to ProviderId without a host silently falls through to the generic mark. */
+    const hostUnresolvable: ProviderId[] = [ProviderId.bedrock, ProviderId.mlx, ProviderId.ollama];
+    const covered = new Set(providerHosts.map(([, provider]) => provider));
+
+    const missing = Object.values(ProviderId).filter(
+      (provider) => !covered.has(provider) && !hostUnresolvable.includes(provider),
+    );
+
+    expect(missing).toEqual([]);
+  });
+});
diff --git a/packages/api/src/endpoints/custom/providers.ts b/packages/api/src/endpoints/custom/providers.ts
new file mode 100644
index 00000000000..607a3fe1298
--- /dev/null
+++ b/packages/api/src/endpoints/custom/providers.ts
@@ -0,0 +1,82 @@
+import { ProviderId, resolveProviderId } from 'librechat-data-provider';
+
+export const providerHosts: ReadonlyArray<readonly [string, ProviderId]> = [
+  ['openrouter.ai', ProviderId.openrouter],
+  ['api.openai.com', ProviderId.openai],
+  ['api.anthropic.com', ProviderId.anthropic],
+  ['api.deepseek.com', ProviderId.deepseek],
+  ['api.groq.com', ProviderId.groq],
+  ['api.mistral.ai', ProviderId.mistral],
+  ['api.perplexity.ai', ProviderId.perplexity],
+  ['api.together.xyz', ProviderId.together],
+  ['api.x.ai', ProviderId.xai],
+  ['api.moonshot.cn', ProviderId.moonshot],
+  ['api.moonshot.ai', ProviderId.moonshot],
+  ['api.cohere.com', ProviderId.cohere],
+  ['api.cohere.ai', ProviderId.cohere],
+  ['api.fireworks.ai', ProviderId.fireworks],
+  ['api-inference.huggingface.co', ProviderId.huggingface],
+  ['api.endpoints.anyscale.com', ProviderId.anyscale],
+  ['apipie.ai', ProviderId.apipie],
+  ['api.shuttleai.app', ProviderId.shuttleai],
+  ['api.unify.ai', ProviderId.unify],
+  ['helicone.ai', ProviderId.helicone],
+  ['ai-gateway.vercel.sh', ProviderId.vercel],
+  ['dashscope.aliyuncs.com', ProviderId.qwen],
+  ['openai.azure.com', ProviderId.azure],
+  ['cognitiveservices.azure.com', ProviderId.azure],
+  ['generativelanguage.googleapis.com', ProviderId.google],
+  ['aiplatform.googleapis.com', ProviderId.google],
+];
+
+/**
+ * The remaining providers cannot be identified by host: bedrock's runtime hostname
+ * carries a region segment under the shared `amazonaws.com` suffix, and mlx and ollama
+ * are served from the operator's own machine. They resolve by iconURL, provider or name.
+ */
+
+function providerFromBaseURL(baseURL?: string): ProviderId | undefined {
+  if (!baseURL) {
+    return undefined;
+  }
+
+  let host = '';
+  try {
+    host = new URL(baseURL).hostname.toLowerCase();
+  } catch {
+    return undefined;
+  }
+
+  for (const [candidate, provider] of providerHosts) {
+    if (host === candidate || host.endsWith(`.${candidate}`)) {
+      return provider;
+    }
+  }
+
+  return undefined;
+}
+
+/**
+ * Resolves a custom endpoint's brand identity once at config load, where `baseURL`
+ * is available. `endpointType` is not consulted: every custom endpoint is typed
+ * `custom`, so it carries no brand signal.
+ */
+export function resolveEndpointProviderId({
+  name,
+  baseURL,
+  iconURL,
+  provider,
+}: {
+  name: string;
+  baseURL?: string;
+  iconURL?: string;
+  provider?: string;
+}): ProviderId | undefined {
+  return (
+    resolveProviderId(iconURL) ??
+    providerFromBaseURL(baseURL) ??
+    resolveProviderId(provider) ??
+    resolveProviderId(name) ??
+    undefined
+  );
+}
diff --git a/packages/api/src/stream/implementations/InMemoryJobStore.ts b/packages/api/src/stream/implementations/InMemoryJobStore.ts
index 2ae4ad2d182..7718af55729 100644
--- a/packages/api/src/stream/implementations/InMemoryJobStore.ts
+++ b/packages/api/src/stream/implementations/InMemoryJobStore.ts
@@ -31,6 +31,7 @@ import {
   PAUSE_PERSISTENCE_TIMEOUT_ERROR,
   PAUSE_PERSISTENCE_TIMEOUT_MS,
   isPendingActionStale,
+  toWireRunSteps,
 } from '~/stream/interfaces/IJobStore';
 import {
   isRecoveredSteerPayload,
@@ -1466,7 +1467,7 @@ export class InMemoryJobStore implements IJobStoreV2 {
 
     // Dereference WeakRef - may return undefined if GC'd
     const graph = state.graphRef.deref();
-    return graph?.contentData ?? [];
+    return toWireRunSteps(graph?.contentData ?? []);
   }
 
   /**
diff --git a/packages/api/src/stream/implementations/RedisJobStore.ts b/packages/api/src/stream/implementations/RedisJobStore.ts
index fd794c58540..56addef3465 100644
--- a/packages/api/src/stream/implementations/RedisJobStore.ts
+++ b/packages/api/src/stream/implementations/RedisJobStore.ts
@@ -34,6 +34,7 @@ import {
   PAUSE_PERSISTENCE_TIMEOUT_ERROR,
   PAUSE_PERSISTENCE_TIMEOUT_MS,
   isPendingActionStale,
+  toWireRunSteps,
 } from '~/stream/interfaces/IJobStore';
 import {
   MAX_COALESCED_BYTES,
@@ -3661,7 +3662,7 @@ export class RedisJobStore implements IJobStoreV2 {
           g.getRunSteps(),
         );
         if (localSteps && localSteps.length > 0) {
-          return localSteps;
+          return toWireRunSteps(localSteps);
         }
       }
       // Note: Don't delete from cache here - graph may still be valid
diff --git a/packages/api/src/stream/interfaces/IJobStore.ts b/packages/api/src/stream/interfaces/IJobStore.ts
index 8e469d08578..ed1d5f44ca6 100644
--- a/packages/api/src/stream/interfaces/IJobStore.ts
+++ b/packages/api/src/stream/interfaces/IJobStore.ts
@@ -4,12 +4,63 @@ import type {
   TPendingSteer,
   UserSubmittedMessageFieldPath,
 } from 'librechat-data-provider';
-import type { StandardGraph } from '@librechat/agents';
+import type { RunStep, StandardGraph } from '@librechat/agents';
 import type { ActivityPhaseSnapshot } from '~/agents/activityPhases/runtime';
 import type { ResolvedAskUserQuestion } from '~/agents/hitl/resume';
 import type { RecoveredSteerPayload } from '../SteerRecovery';
 import type { MCPRuntimeRequestBody } from '~/mcp/types';
 
+/**
+ * Rewrites string-enum members to their literal values, recursively. The SDK and
+ * data-provider declare nominally distinct enums (`ContentTypes`, `StepTypes`, ...)
+ * with identical string values; erasing that nominality is what lets the two run-step
+ * contracts be compared structurally.
+ */
+type WireShape<T> = T extends string
+  ? `${T}`
+  : T extends readonly (infer U)[]
+    ? WireShape<U>[]
+    : T extends object
+      ? { [K in keyof T]: WireShape<T[K]> }
+      : T;
+
+type StaticAssert<T extends true> = T;
+
+/**
+ * Compile-time proof that the SDK run step and the wire contract (`Agents.RunStep`)
+ * agree structurally once enum nominality is erased: any added, removed, retyped, or
+ * newly optional SDK field fails these assertions, so drift cannot silently enter
+ * resume state through `toWireRunSteps`.
+ *
+ * `summary.content` is the one deliberately unchecked field: the SDK reuses its full
+ * `MessageContentComplex` union there, while the wire contract narrows it to the plain
+ * text blocks summarization actually emits. That narrowing is the single semantic
+ * judgment this conversion vouches for.
+ */
+type _WireRunStepContractHolds = StaticAssert<
+  WireShape<Omit<RunStep, 'summary'>> extends WireShape<Omit<Agents.RunStep, 'summary'>>
+    ? true
+    : false
+>;
+
+type _WireSummaryContractHolds = StaticAssert<
+  WireShape<Omit<NonNullable<RunStep['summary']>, 'content'>> extends WireShape<
+    Omit<NonNullable<Agents.RunStep['summary']>, 'content'>
+  >
+    ? true
+    : false
+>;
+
+/**
+ * Run steps living on the SDK graph serialize to exactly the wire shape
+ * `Agents.RunStep` describes; the assertion is safe because
+ * `_WireRunStepContractHolds` above proves the contracts identical modulo the
+ * nominally-split enums, which share their string values at runtime.
+ */
+export function toWireRunSteps(steps: readonly RunStep[]): Agents.RunStep[] {
+  return steps as Agents.RunStep[];
+}
+
 /**
  * A pause owner has this long to durably persist the interrupted turn before
  * the barrier is considered abandoned. An abandoned barrier must fail closed:
diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json
index f3e4a5bb0aa..10246b7aa5c 100644
--- a/packages/api/tsconfig.json
+++ b/packages/api/tsconfig.json
@@ -19,7 +19,11 @@
     "noEmit": true,
     "sourceMap": true,
     "paths": {
-      "~/*": ["./src/*"]
+      "~/*": ["./src/*"],
+      // @librechat/agents ships declaration files that import its internal "@/" alias, which
+      // package exports cannot map; resolve them into its published types until the SDK
+      // rewrites the aliases at build time.
+      "@/*": ["../../node_modules/@librechat/agents/dist/types/*"]
     }
   },
   "ts-node": {
diff --git a/packages/client/src/icons/provider/Avatar.spec.tsx b/packages/client/src/icons/provider/Avatar.spec.tsx
new file mode 100644
index 00000000000..0d67789180e
--- /dev/null
+++ b/packages/client/src/icons/provider/Avatar.spec.tsx
@@ -0,0 +1,48 @@
+import '@testing-library/jest-dom';
+import { ProviderId } from 'librechat-data-provider';
+import { render, screen } from '@testing-library/react';
+import { ProviderAvatar } from './Avatar';
+
+describe('ProviderAvatar', () => {
+  it('paints the brand background and switches art to white on it', () => {
+    const { container } = render(<ProviderAvatar provider={ProviderId.anthropic} />);
+    const tile = container.firstChild as HTMLElement;
+    expect(tile).toHaveStyle({ background: 'var(--provider-anthropic, #d09a74)' });
+    expect(tile).toHaveStyle({ color: 'var(--provider-foreground, #ffffff)' });
+  });
+
+  it('keeps monochrome art white on a branded tile', () => {
+    const { container } = render(<ProviderAvatar provider={ProviderId.anthropic} />);
+    const icon = container.querySelector('[role="img"]');
+    expect(icon).toHaveClass('[color:inherit]');
+    expect(icon).not.toHaveClass('text-text-primary');
+  });
+
+  it('uses a theme token when the provider has no brand background', () => {
+    const { container } = render(<ProviderAvatar provider={ProviderId.google} />);
+    expect(container.firstChild).toHaveClass('text-text-primary');
+  });
+
+  it('varies the OpenAI background by model generation', () => {
+    const { container: four } = render(
+      <ProviderAvatar provider={ProviderId.openai} model="gpt-4o" />,
+    );
+    const { container: five } = render(
+      <ProviderAvatar provider={ProviderId.openai} model="gpt-5.6" />,
+    );
+    expect(four.firstChild).toHaveStyle({ background: 'var(--provider-openai-gpt4, #AB68FF)' });
+    expect(five.firstChild).toHaveStyle({
+      background: 'var(--provider-openai-reasoning, #000000)',
+    });
+  });
+
+  it('labels the tile with the provider name', () => {
+    render(<ProviderAvatar provider={ProviderId.bedrock} />);
+    expect(screen.getByTitle('AWS Bedrock')).toBeInTheDocument();
+  });
+
+  it('exposes the provider name once, so the tile does not double label its art', () => {
+    render(<ProviderAvatar provider={ProviderId.bedrock} />);
+    expect(screen.getAllByRole('img', { name: 'AWS Bedrock' })).toHaveLength(1);
+  });
+});
diff --git a/packages/client/src/icons/provider/Avatar.tsx b/packages/client/src/icons/provider/Avatar.tsx
new file mode 100644
index 00000000000..eac14d4e531
--- /dev/null
+++ b/packages/client/src/icons/provider/Avatar.tsx
@@ -0,0 +1,57 @@
+import { memo } from 'react';
+import type { NamedExoticComponent, ReactNode } from 'react';
+import type { ProviderId } from 'librechat-data-provider';
+import type { JSX } from 'react/jsx-runtime';
+import { getProviderIconDef } from './registry';
+import { ProviderIcon } from './Icon';
+import { cn } from '../../utils';
+
+export interface ProviderAvatarProps {
+  provider?: ProviderId | null;
+  model?: string | null;
+  size?: number;
+  className?: string;
+  /** Overlay content positioned against the tile, such as an error badge. */
+  children?: ReactNode;
+}
+
+const artScale = 5 / 9;
+
+function ProviderAvatarComponent({
+  provider,
+  model,
+  size = 30,
+  className,
+  children,
+}: ProviderAvatarProps): JSX.Element {
+  const def = getProviderIconDef(provider, model);
+  const hasBrand = typeof def.brandColor === 'string' && def.brandColor.length > 0;
+
+  return (
+    <span
+      title={def.label}
+      style={{
+        background: hasBrand ? def.brandColor : 'transparent',
+        width: size,
+        height: size,
+        color: hasBrand ? 'var(--provider-foreground, #ffffff)' : undefined,
+      }}
+      className={cn(
+        'relative flex items-center justify-center rounded-sm p-1',
+        hasBrand ? undefined : 'text-text-primary',
+        className,
+      )}
+    >
+      <ProviderIcon
+        provider={provider}
+        model={model}
+        size={size * artScale}
+        className={hasBrand ? '[color:inherit]' : undefined}
+      />
+      {children}
+    </span>
+  );
+}
+
+export const ProviderAvatar: NamedExoticComponent<ProviderAvatarProps> =
+  memo(ProviderAvatarComponent);
diff --git a/packages/client/src/icons/provider/Icon.spec.tsx b/packages/client/src/icons/provider/Icon.spec.tsx
new file mode 100644
index 00000000000..095aeb8f560
--- /dev/null
+++ b/packages/client/src/icons/provider/Icon.spec.tsx
@@ -0,0 +1,55 @@
+import '@testing-library/jest-dom';
+import { ProviderId } from 'librechat-data-provider';
+import { render, screen } from '@testing-library/react';
+import { ProviderIcon } from './Icon';
+
+describe('ProviderIcon', () => {
+  it('renders component art with an accessible label', () => {
+    render(<ProviderIcon provider={ProviderId.openai} />);
+    expect(screen.getByRole('img', { name: 'OpenAI' })).toBeInTheDocument();
+  });
+
+  it('renders asset art as an image from the packaged module', () => {
+    render(<ProviderIcon provider={ProviderId.ollama} />);
+    expect(screen.getByRole('img', { name: 'Ollama' })).toHaveAttribute('src', 'assets/ollama.png');
+  });
+
+  it('gives monochrome art a theme token so it follows light and dark', () => {
+    const { container } = render(<ProviderIcon provider={ProviderId.xai} />);
+    expect(container.firstChild).toHaveClass('text-text-primary');
+  });
+
+  it('does not shrink Cohere art with landing-only padding', () => {
+    const { container } = render(<ProviderIcon provider={ProviderId.cohere} />);
+    expect(container.firstChild).not.toHaveClass('p-2');
+  });
+
+  it('applies the model refinement, so Gemini and Gemma keep distinct labels', () => {
+    render(<ProviderIcon provider={ProviderId.google} model="gemini-2.5-pro" />);
+    expect(screen.getByRole('img', { name: 'Gemini' })).toBeInTheDocument();
+    render(<ProviderIcon provider={ProviderId.google} model="gemma-3-27b" />);
+    expect(screen.getByRole('img', { name: 'Gemma' })).toBeInTheDocument();
+  });
+
+  it('falls back to the generic mark for an unknown provider', () => {
+    render(<ProviderIcon provider={null} />);
+    expect(screen.getByRole('img', { name: 'Custom' })).toBeInTheDocument();
+  });
+  it('lets the sized span, not a caller size class, govern nested component art', () => {
+    const { container } = render(
+      <ProviderIcon provider={ProviderId.openai} size={27} className="h-2/3 w-2/3" />,
+    );
+
+    const svg = container.querySelector('svg');
+    expect(svg).toHaveClass('h-full', 'w-full');
+    expect(svg).not.toHaveClass('h-2/3', 'w-2/3');
+  });
+
+  it('still forwards a caller color onto nested component art', () => {
+    const { container } = render(
+      <ProviderIcon provider={ProviderId.anthropic} className="[color:inherit]" />,
+    );
+
+    expect(container.querySelector('svg')).toHaveClass('[color:inherit]');
+  });
+});
diff --git a/packages/client/src/icons/provider/Icon.tsx b/packages/client/src/icons/provider/Icon.tsx
new file mode 100644
index 00000000000..c230f63e5c5
--- /dev/null
+++ b/packages/client/src/icons/provider/Icon.tsx
@@ -0,0 +1,53 @@
+import { memo } from 'react';
+import type { ProviderId } from 'librechat-data-provider';
+import type { NamedExoticComponent } from 'react';
+import type { JSX } from 'react/jsx-runtime';
+import { getProviderIconDef } from './registry';
+import { cn } from '../../utils';
+
+export interface ProviderIconProps {
+  provider?: ProviderId | null;
+  model?: string | null;
+  size?: number;
+  className?: string;
+}
+
+function ProviderIconComponent({
+  provider,
+  model,
+  size = 20,
+  className,
+}: ProviderIconProps): JSX.Element {
+  const def = getProviderIconDef(provider, model);
+  const classes = cn(
+    def.mono === true && className == null ? 'text-text-primary' : '',
+    def.className,
+    className,
+  );
+
+  if (def.art.kind === 'component') {
+    const { Component } = def.art;
+    return (
+      <span
+        role="img"
+        aria-label={def.label}
+        style={{ width: size, height: size }}
+        className={cn('inline-flex items-center justify-center', classes)}
+      >
+        <Component size={size} className={cn(classes, 'h-full w-full')} />
+      </span>
+    );
+  }
+
+  return (
+    <img
+      src={def.art.src}
+      alt={def.label}
+      width={size}
+      height={size}
+      className={cn('object-contain', classes)}
+    />
+  );
+}
+
+export const ProviderIcon: NamedExoticComponent<ProviderIconProps> = memo(ProviderIconComponent);
diff --git a/packages/client/src/icons/provider/assets/anyscale.png b/packages/client/src/icons/provider/assets/anyscale.png
new file mode 100644
index 00000000000..d86830c76dd
Binary files /dev/null and b/packages/client/src/icons/provider/assets/anyscale.png differ
diff --git a/packages/client/src/icons/provider/assets/apipie.png b/packages/client/src/icons/provider/assets/apipie.png
new file mode 100644
index 00000000000..f133c466106
Binary files /dev/null and b/packages/client/src/icons/provider/assets/apipie.png differ
diff --git a/packages/client/src/icons/provider/assets/cohere.png b/packages/client/src/icons/provider/assets/cohere.png
new file mode 100644
index 00000000000..3da0b837371
Binary files /dev/null and b/packages/client/src/icons/provider/assets/cohere.png differ
diff --git a/packages/client/src/icons/provider/assets/deepseek.svg b/packages/client/src/icons/provider/assets/deepseek.svg
new file mode 100644
index 00000000000..2e4650aee9f
--- /dev/null
+++ b/packages/client/src/icons/provider/assets/deepseek.svg
@@ -0,0 +1 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 71.69 52.76"><defs><style>.cls-1{fill:#4d6bfe;}</style></defs><path id="path" class="cls-1" d="M523.77,276.34c-.76-.38-1.08.33-1.53.69a4,4,0,0,0-.41.41,5.07,5.07,0,0,1-4.1,1.87,8,8,0,0,0-6.46,2.53,5.82,5.82,0,0,0-3.72-4.62,6.39,6.39,0,0,1-2.85-1.94,7.76,7.76,0,0,1-.92-2.31c-.16-.48-.32-1-.87-1.05s-.83.41-1.07.82a11,11,0,0,0-1.26,5.5,11.9,11.9,0,0,0,5.49,10.14.75.75,0,0,1,.39,1c-.25.84-.54,1.65-.79,2.49-.17.53-.41.65-1,.42a16.63,16.63,0,0,1-5.18-3.52c-2.56-2.48-4.88-5.21-7.76-7.35-.68-.5-1.36-1-2.06-1.41-2.94-2.86.39-5.2,1.16-5.48s.28-1.29-2.33-1.28-5,.88-8,2a8.23,8.23,0,0,1-1.39.41,28.67,28.67,0,0,0-8.61-.3,18.57,18.57,0,0,0-13.44,7.83c-4,5.47-4.91,11.67-3.76,18.15a27.68,27.68,0,0,0,10,16.88,26.8,26.8,0,0,0,19.23,6.39c4.43-.25,9.36-.84,14.92-5.55a13.84,13.84,0,0,0,5.32,1.18,17.24,17.24,0,0,0,5.09-.38c2.2-.46,2.05-2.5,1.25-2.87-6.43-3-5-1.78-6.3-2.77,3.27-3.87,8.2-7.89,10.13-20.92a12.44,12.44,0,0,0,0-2.52c0-.51.1-.71.68-.76a12.55,12.55,0,0,0,4.62-1.42c4.17-2.28,5.85-6,6.25-10.51A1.57,1.57,0,0,0,523.77,276.34Zm-36.34,40.37c-6.24-4.9-9.27-6.52-10.52-6.45s-1,1.41-.7,2.28a8.49,8.49,0,0,0,1.11,2.21,1.14,1.14,0,0,1-.34,1.8c-2,1.24-5.5-.42-5.66-.5a26.08,26.08,0,0,1-9.87-9.88,30.15,30.15,0,0,1-3.87-13.39c-.06-1.15.28-1.56,1.42-1.77a14.31,14.31,0,0,1,4.57-.11,28.56,28.56,0,0,1,16.33,8.29,54.06,54.06,0,0,1,6.58,8.63,41.46,41.46,0,0,0,7.41,8.71,24.36,24.36,0,0,0,2.66,2C494.16,318.82,490.16,318.87,487.43,316.71Zm3-19.23a.92.92,0,0,1,.92-.92.83.83,0,0,1,.32.06.8.8,0,0,1,.34.22.9.9,0,0,1,.25.64.92.92,0,0,1-1.83,0Zm9.29,4.76a5.27,5.27,0,0,1-1.77.48,3.75,3.75,0,0,1-2.38-.76,3.57,3.57,0,0,1-1.65-2.26,5.16,5.16,0,0,1,0-1.76,2,2,0,0,0-.71-2.17,3.1,3.1,0,0,0-2.06-.59,1.63,1.63,0,0,1-.76-.24.75.75,0,0,1-.34-1.07,3.47,3.47,0,0,1,.57-.62,3.9,3.9,0,0,1,3.43,0,10,10,0,0,1,3,2.34,18.62,18.62,0,0,1,2,2.73,10.9,10.9,0,0,1,1.33,2.53C500.65,301.47,500.4,302,499.71,302.24Z" transform="translate(-452.83 -271.91)"/></svg>
\ No newline at end of file
diff --git a/packages/client/src/icons/provider/assets/fireworks.png b/packages/client/src/icons/provider/assets/fireworks.png
new file mode 100644
index 00000000000..4011e358cff
Binary files /dev/null and b/packages/client/src/icons/provider/assets/fireworks.png differ
diff --git a/packages/client/src/icons/provider/assets/groq.png b/packages/client/src/icons/provider/assets/groq.png
new file mode 100644
index 00000000000..83ea028f95a
Binary files /dev/null and b/packages/client/src/icons/provider/assets/groq.png differ
diff --git a/packages/client/src/icons/provider/assets/helicone.svg b/packages/client/src/icons/provider/assets/helicone.svg
new file mode 100644
index 00000000000..d982533200e
--- /dev/null
+++ b/packages/client/src/icons/provider/assets/helicone.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="552" height="538">
+<path d="M0 0 C5.92897669 2.7307735 11.90801464 5.34870675 17.88308716 7.97671509 C20.10999312 8.95620908 22.33619509 9.93728803 24.56225586 10.91870117 C35.66834946 15.81297039 46.79320214 20.6632726 57.92871094 25.49023438 C61.38738585 26.99189596 64.84144707 28.50400454 68.29492188 30.01757812 C74.31116669 32.65317882 80.33330425 35.27502568 86.35742188 37.89257812 C88.34571773 38.75712786 90.33399802 39.62171342 92.32226562 40.48632812 C96.01986159 42.09421472 99.71779193 43.70132325 103.41650391 45.30664062 C123.73157437 54.12484992 144.00435414 63.03213736 164.23208618 72.04901123 C177.52308329 77.97303428 190.83715156 83.83627005 204.21508789 89.56152344 C207.24903326 90.86430507 210.27494432 92.18278142 213.29492188 93.51757812 C214.5254126 94.05511719 214.5254126 94.05511719 215.78076172 94.60351562 C219.66160704 96.39587739 221.79983124 97.47668821 223.29492188 101.51757812 C223.54677087 103.79642427 223.54677087 103.79642427 223.54939747 106.35025597 C223.55522966 107.32638733 223.56106186 108.3025187 223.56707078 109.3082298 C223.56329146 110.37806029 223.55951213 111.44789078 223.55561829 112.55014038 C223.55944383 113.68863579 223.56326938 114.82713121 223.56721085 116.00012648 C223.57756062 119.8293951 223.5735449 123.65851434 223.56958008 127.48779297 C223.57283094 130.22738582 223.57904328 132.96697026 223.58506775 135.70655823 C223.59782756 142.38430889 223.59960682 149.06201937 223.59726749 155.73978017 C223.59548549 161.16726996 223.59723143 166.59474754 223.60149193 172.02223587 C223.60208712 172.79428736 223.60268231 173.56633885 223.60329553 174.36178584 C223.60450727 175.93014832 223.6057214 177.49851079 223.60693791 179.06687327 C223.61781853 193.7806598 223.61564857 208.49442343 223.60955306 223.20821126 C223.60438425 236.67047381 223.61563746 250.13266398 223.63465128 263.59491222 C223.65402115 277.41512634 223.66228713 291.23530621 223.65852803 305.05553401 C223.65661458 312.81564567 223.6591174 320.57569575 223.67324257 328.33579636 C223.68514656 334.94256175 223.68657239 341.54922766 223.6744524 348.1559944 C223.66855649 351.52691555 223.66910579 354.89750519 223.6794548 358.26843834 C223.68986646 361.92281177 223.68186591 365.57669317 223.66914368 369.23104858 C223.67651796 370.29641763 223.68389225 371.36178668 223.69148999 372.45943964 C223.64522165 378.76000477 223.04195085 383.29280498 218.80688477 388.2644043 C214.15733225 392.20812626 209.36868765 394.56879007 203.73242188 396.83007812 C202.37334717 397.3942041 202.37334717 397.3942041 200.98681641 397.96972656 C198.09497879 399.16617784 195.19581032 400.34325997 192.29492188 401.51757812 C189.36345006 402.71436498 186.43276757 403.91306811 183.50219727 405.11206055 C181.67616341 405.85704962 179.84863021 406.59837931 178.01928711 407.33520508 C172.65052933 409.50642007 167.37474102 411.82991286 162.11181641 414.24560547 C157.29944256 416.41863959 152.42294718 418.43479792 147.54492188 420.45507812 C146.49796143 420.89037842 145.45100098 421.32567871 144.37231445 421.77416992 C137.54311241 424.60681744 130.69486847 427.3825436 123.80664062 430.06835938 C120.88736922 431.27308651 118.02702382 432.54350714 115.15820312 433.86132812 C109.09965456 436.63386686 102.95951481 439.17898885 96.79492188 441.70507812 C94.21095111 442.76863836 91.62787005 443.83434965 89.04492188 444.90039062 C88.35523315 445.18493607 87.66554443 445.46948151 86.95495605 445.76264954 C77.88948781 449.50605651 68.84200274 453.29249839 59.79492188 457.08007812 C58.4505304 457.6427388 58.4505304 457.6427388 57.07897949 458.21676636 C46.39837737 462.687968 35.72506856 467.17612072 25.06054688 471.68554688 C23.54690552 472.32545311 23.54690552 472.32545311 22.00268555 472.97828674 C17.14402619 475.03274977 12.28619525 477.08913765 7.4296875 479.14868164 C3.1631863 480.95714277 -1.1089367 482.75175972 -5.3840332 484.53979492 C-7.61100853 485.47794956 -9.82923398 486.4345654 -12.046875 487.39453125 C-13.36496707 487.95180455 -14.68330972 488.50848569 -16.00195312 489.06445312 C-17.67016113 489.78133301 -17.67016113 489.78133301 -19.37207031 490.51269531 C-25.3199472 492.30594621 -30.48449374 492.04246221 -36.24804688 489.56054688 C-37.29750488 489.11759277 -38.34696289 488.67463867 -39.42822266 488.21826172 C-40.57145996 487.71891113 -41.71469727 487.21956055 -42.89257812 486.70507812 C-44.14572001 486.17062496 -45.39948763 485.63763709 -46.65380859 485.10595703 C-49.45413762 483.91651876 -52.25079738 482.7189187 -55.04541016 481.51611328 C-60.05651504 479.36233829 -65.08109012 477.24099709 -70.10742188 475.12304688 C-71.0127919 474.7414743 -71.91816193 474.35990173 -72.85096741 473.96676636 C-74.72280387 473.17788154 -76.59465569 472.38903318 -78.46652222 471.60021973 C-82.33759354 469.9676807 -86.20697619 468.33115898 -90.07643127 466.6947937 C-102.15038893 461.58949362 -114.23641301 456.51349945 -126.33007812 451.45507812 C-127.21280396 451.08581207 -128.09552979 450.71654602 -129.00500488 450.33609009 C-135.2379367 447.72890032 -141.47143326 445.12306248 -147.70507812 442.51757812 C-154.83047753 439.539366 -161.95561762 436.56053568 -169.08007812 433.58007812 C-170.3998465 433.02797668 -170.3998465 433.02797668 -171.74627686 432.46472168 C-187.72077959 425.78044084 -203.67871458 419.05716165 -219.62451172 412.3046875 C-228.15373763 408.69441831 -236.6882073 405.09997552 -245.25195312 401.57226562 C-246.7074067 400.97057975 -248.16281197 400.368777 -249.61816406 399.7668457 C-252.25330454 398.67705289 -254.89231485 397.59754027 -257.53417969 396.52416992 C-258.68370117 396.04890869 -259.83322266 395.57364746 -261.01757812 395.08398438 C-262.00371094 394.68123291 -262.98984375 394.27848145 -264.00585938 393.86352539 C-271.00342145 390.37423815 -274.00939109 385.72051104 -276.70507812 378.51757812 C-277.36530746 374.6205739 -277.37814394 370.82325839 -277.33326721 366.87738037 C-277.3403616 365.74600907 -277.34745599 364.61463776 -277.35476536 363.44898248 C-277.37228752 359.67950401 -277.35426869 355.9110645 -277.33618164 352.14160156 C-277.33856529 349.43066609 -277.34841697 346.71976892 -277.35786438 344.0088501 C-277.37619321 337.42407278 -277.36776178 330.83959321 -277.34977616 324.25482532 C-277.33572537 318.90326323 -277.33186266 313.55178172 -277.33521843 308.20020294 C-277.33569587 307.43729048 -277.33617331 306.67437801 -277.33666522 305.88834698 C-277.33769159 304.33834469 -277.33874695 302.78834242 -277.33983099 301.23834017 C-277.34838781 287.54978452 -277.33175362 273.86137231 -277.30200195 260.17285156 C-277.27314433 246.89544659 -277.26609301 233.61824806 -277.28149414 220.34082031 C-277.29825661 205.87001555 -277.30229183 191.39930868 -277.28478378 176.92850137 C-277.28293944 175.38556434 -277.28110471 173.8426273 -277.27927971 172.29969025 C-277.27836762 171.54058996 -277.27745553 170.78148968 -277.2765158 169.99938636 C-277.27091242 164.65303428 -277.27421551 159.30673004 -277.28082466 153.96038055 C-277.28855714 147.44703635 -277.2818078 140.93389531 -277.25664962 134.42059204 C-277.24415473 131.09816607 -277.2401561 127.77631998 -277.24919128 124.45384216 C-277.25785839 120.85217429 -277.24197474 117.25143169 -277.21974182 113.64984131 C-277.22798259 112.60023782 -277.23622336 111.55063434 -277.24471384 110.46922469 C-277.17664818 104.51025209 -276.67854886 101.0580222 -272.70507812 96.51757812 C-270.70751953 95.12475586 -270.70751953 95.12475586 -268.55664062 94.20117188 C-267.73260742 93.83677002 -266.90857422 93.47236816 -266.05957031 93.09692383 C-265.15883789 92.72011475 -264.25810547 92.34330566 -263.33007812 91.95507812 C-262.3674707 91.53508545 -261.40486328 91.11509277 -260.41308594 90.68237305 C-257.18392125 89.27771191 -253.94460276 87.89815883 -250.70507812 86.51757812 C-248.39434759 85.51689922 -246.0844717 84.51424481 -243.77539062 83.50976562 C-240.05653613 81.89317872 -236.33714061 80.27803046 -232.61376953 78.671875 C-223.28874972 74.64894031 -213.99177455 70.56561228 -204.70507812 66.45507812 C-191.20809732 60.48315791 -177.68107747 54.58222022 -164.14257812 48.70507812 C-149.38007358 42.29585987 -134.62679632 35.86658028 -119.89257812 29.39257812 C-119.06143494 29.02747131 -118.23029175 28.6623645 -117.3739624 28.28619385 C-108.79934282 24.51919218 -100.22672369 20.74766406 -91.6558075 16.97224426 C-58.6649914 2.44180325 -58.6649914 2.44180325 -43.45507812 -4.04492188 C-41.89382202 -4.71575806 -41.89382202 -4.71575806 -40.30102539 -5.40014648 C-39.35670654 -5.79983643 -38.4123877 -6.19952637 -37.43945312 -6.61132812 C-36.23627441 -7.12288452 -36.23627441 -7.12288452 -35.00878906 -7.64477539 C-22.5082641 -12.19005953 -11.15645054 -5.21128554 0 0 Z " fill="#202122" transform="translate(298.705078125,24.482421875)"/>
+<path d="M0 0 C2.02615589 1.02075278 4.0472409 2.05164891 6.0625 3.09375 C10.11948652 5.18945237 14.27053438 6.91675927 18.546875 8.51171875 C25.25968834 11.02504697 31.64832976 13.82523305 38.02734375 17.09375 C42.10403618 19.17146992 46.26127166 20.91330453 50.546875 22.51171875 C57.25968834 25.02504697 63.64832976 27.82523305 70.02734375 31.09375 C74.10403618 33.17146992 78.26127166 34.91330453 82.546875 36.51171875 C89.25968834 39.02504697 95.64832976 41.82523305 102.02734375 45.09375 C106.10403618 47.17146992 110.26127166 48.91330453 114.546875 50.51171875 C121.25968834 53.02504697 127.64832976 55.82523305 134.02734375 59.09375 C138.10403618 61.17146992 142.26127166 62.91330453 146.546875 64.51171875 C153.25968834 67.02504697 159.64832976 69.82523305 166.02734375 73.09375 C170.10403618 75.17146992 174.26127166 76.91330453 178.546875 78.51171875 C186.18358828 81.37096211 193.43420976 84.64690238 200.65625 88.43359375 C198.59037552 90.68785685 196.7834817 92.02620383 193.98730469 93.24853516 C193.25095795 93.57451187 192.51461121 93.90048859 191.75595093 94.23634338 C190.55417709 94.75550575 190.55417709 94.75550575 189.328125 95.28515625 C188.48448395 95.6561998 187.6408429 96.02724335 186.77163696 96.40953064 C183.98607457 97.63262616 181.1962342 98.8456227 178.40625 100.05859375 C176.45107367 100.91468744 174.49616157 101.77138484 172.54150391 102.62866211 C167.53769394 104.82108476 162.53024313 107.00504279 157.5213623 109.18585205 C154.01117823 110.71451919 150.50232229 112.24621724 146.99353027 113.77807617 C141.40619274 116.21724131 135.81796448 118.65434552 130.22753906 121.08642578 C118.52609373 126.17720284 106.83837511 131.29864978 95.15625 136.43359375 C81.83271659 142.28957138 68.50015461 148.12418549 55.15625 153.93359375 C41.18794024 160.01510399 27.23045833 166.1208925 13.28125 172.24609375 C11.9660437 172.82351318 11.9660437 172.82351318 10.62426758 173.41259766 C8.12697923 174.50912933 5.6298527 175.60602838 3.1328125 176.703125 C2.40635529 177.02219315 1.67989807 177.34126129 0.931427 177.66999817 C-0.11236618 178.12882637 -0.11236618 178.12882637 -1.17724609 178.59692383 C-1.85760925 178.8916861 -2.53797241 179.18644836 -3.23895264 179.49014282 C-4.7276515 180.15743477 -6.20028714 180.86111748 -7.65997314 181.58969116 C-12.32244224 183.86166374 -15.19375471 185.11723785 -20.34375 183.43359375 C-23.09715498 182.39962289 -25.7757957 181.23912289 -28.45703125 180.03125 C-29.24656693 179.68230682 -30.0361026 179.33336365 -30.8495636 178.97384644 C-33.45462626 177.8208717 -36.05534326 176.65840924 -38.65625 175.49609375 C-40.49560586 174.68033748 -42.33529268 173.86532708 -44.17529297 173.05102539 C-48.00016653 171.35757986 -51.82359283 169.66092777 -55.64599609 167.96191406 C-63.56361189 164.44517459 -71.4967463 160.96390151 -79.43075562 157.48434448 C-81.98776137 156.36275472 -84.54434073 155.24019792 -87.10083008 154.11743164 C-99.47791743 148.68290797 -111.8673398 143.27700575 -124.2612915 137.881073 C-135.93941619 132.7963696 -147.60773382 127.68981544 -159.26843262 122.5652771 C-166.08930962 119.56794831 -172.91137422 116.57332289 -179.73364258 113.5791626 C-181.49719954 112.80514238 -183.26070741 112.03101028 -185.02416992 111.2567749 C-190.36619501 108.91166297 -195.70961624 106.56978068 -201.05493164 104.23217773 C-202.71797949 103.50436441 -204.38059407 102.77556009 -206.04272461 102.0456543 C-208.35541226 101.03027587 -210.66934646 100.01784171 -212.984375 99.0078125 C-213.70334961 98.69407684 -214.42232422 98.38034119 -215.16308594 98.05709839 C-220.71624464 95.65602032 -226.33117172 93.49696952 -232.02636719 91.45239258 C-234.34375 90.43359375 -234.34375 90.43359375 -235.34375 88.43359375 C-234.56588135 88.09739014 -233.7880127 87.76118652 -232.98657227 87.41479492 C-215.41155036 79.81593591 -197.86098844 72.16495004 -180.34375 64.43359375 C-166.39100468 58.27545155 -152.42174202 52.15798286 -138.42388916 46.10314941 C-125.7063652 40.60120453 -113.02058521 35.02860405 -100.34375 29.43359375 C-86.39844434 23.2787351 -72.43775592 17.16180466 -58.44604492 11.11322021 C-48.26683767 6.71251177 -38.10908157 2.26568892 -27.97070312 -2.22851562 C-27.00712891 -2.65455078 -26.04355469 -3.08058594 -25.05078125 -3.51953125 C-24.2100708 -3.89239258 -23.36936035 -4.26525391 -22.50317383 -4.64941406 C-14.88261902 -7.88545746 -7.15614287 -3.35235198 0 0 Z " fill="#0CA4E8" transform="translate(289.34375,40.56640625)"/>
+<path d="M0 0 C0 72.27 0 144.54 0 219 C-5.881401 217.039533 -11.56873091 215.04004668 -17.265625 212.65625 C-18.03979767 212.33515762 -18.81397034 212.01406525 -19.61160278 211.6832428 C-22.15910758 210.62542869 -24.70459605 209.56285838 -27.25 208.5 C-29.06846708 207.74327589 -30.88699045 206.98668702 -32.70556641 206.23022461 C-47.84235111 199.92697279 -62.9481853 193.55044553 -78.04931641 187.16235352 C-90.89700238 181.72791845 -103.75569932 176.32054631 -116.625 170.9375 C-117.49751404 170.57243347 -118.37002808 170.20736694 -119.26898193 169.83123779 C-128.46870291 165.98213808 -137.67014474 162.13717676 -146.87338257 158.29649353 C-150.80356589 156.6560293 -154.73320788 155.01427082 -158.66278076 153.37234497 C-161.41868907 152.22145608 -164.17539384 151.07249077 -166.93212891 149.92358398 C-175.34864823 146.40995923 -183.73866601 142.86927689 -192 139 C-192 138.34 -192 137.68 -192 137 C-189.5772109 135.1445729 -187.14377181 133.40465769 -184.625 131.6875 C-183.05790647 130.60125126 -181.49152309 129.51397743 -179.92578125 128.42578125 C-179.11189941 127.86197754 -178.29801758 127.29817383 -177.45947266 126.71728516 C-173.5434501 123.98298868 -169.67794211 121.18013275 -165.8125 118.375 C-159.99694336 114.16315724 -154.16901002 109.97007111 -148.32080078 105.80371094 C-143.59388603 102.43255698 -138.8901856 99.02984051 -134.1875 95.625 C-128.31868597 91.37757019 -122.42575593 87.16760248 -116.5 83 C-108.37807304 77.28641731 -100.32506235 71.48052385 -92.28369141 65.65429688 C-88.44120888 62.87081798 -84.5959003 60.09125401 -80.75 57.3125 C-79.99726807 56.76859619 -79.24453613 56.22469238 -78.46899414 55.66430664 C-73.43156592 52.02698958 -68.38092946 48.40877094 -63.32055664 44.8034668 C-58.59364258 41.4325072 -53.89009337 38.02977374 -49.1875 34.625 C-43.31868697 30.37757091 -37.42580553 26.16753122 -31.5 22 C-25.36640529 17.68614417 -19.26576612 13.3289981 -13.1875 8.9375 C-12.42824219 8.38900391 -11.66898438 7.84050781 -10.88671875 7.27539062 C-6.82894883 4.34199922 -6.82894883 4.34199922 -2.8293457 1.33032227 C-1 0 -1 0 0 0 Z " fill="#F6FBFD" transform="translate(264,275)"/>
+<path d="M0 0 C2.38256709 44.46542204 2.38256709 44.46542204 -9.1796875 58.3203125 C-12 61 -12 61 -14 61 C-14.33 62.65 -14.66 64.3 -15 66 C-15.66 66 -16.32 66 -17 66 C-17 66.99 -17 67.98 -17 69 C-17.66 69 -18.32 69 -19 69 C-19.33 70.65 -19.66 72.3 -20 74 C-20.66 74 -21.32 74 -22 74 C-22 74.99 -22 75.98 -22 77 C-22.66 77 -23.32 77 -24 77 C-24.08894531 77.98033203 -24.08894531 77.98033203 -24.1796875 78.98046875 C-25.35263834 83.29804494 -27.68586689 86.59329863 -30.125 90.3125 C-31.20784595 91.99426738 -32.28983358 93.67658764 -33.37109375 95.359375 C-33.9522998 96.25978516 -34.53350586 97.16019531 -35.13232422 98.08789062 C-38.52921583 103.38437731 -41.85531965 108.72515989 -45.1875 114.0625 C-45.8470166 115.11542236 -46.5065332 116.16834473 -47.18603516 117.25317383 C-48.10521729 118.72306763 -48.10521729 118.72306763 -49.04296875 120.22265625 C-49.58977295 121.09672119 -50.13657715 121.97078613 -50.69995117 122.87133789 C-52.00833477 124.94623033 -52.00833477 124.94623033 -53 127 C-53.66 127 -54.32 127 -55 127 C-55 127.99 -55 128.98 -55 130 C-55.66 130 -56.32 130 -57 130 C-57.09410156 130.70511719 -57.18820312 131.41023437 -57.28515625 132.13671875 C-58.13093037 135.52443697 -59.55013993 137.88140234 -61.4375 140.8125 C-62.05496094 141.78832031 -62.67242187 142.76414062 -63.30859375 143.76953125 C-63.86675781 144.50558594 -64.42492187 145.24164063 -65 146 C-65.66 146 -66.32 146 -67 146 C-67.185625 147.1446875 -67.185625 147.1446875 -67.375 148.3125 C-68 151 -68 151 -70 154 C-70.66 154 -71.32 154 -72 154 C-72.33 155.65 -72.66 157.3 -73 159 C-73.66 159 -74.32 159 -75 159 C-75 159.99 -75 160.98 -75 162 C-75.66 162 -76.32 162 -77 162 C-77.06832031 162.67289063 -77.13664063 163.34578125 -77.20703125 164.0390625 C-78.26873624 168.00345849 -80.40887117 171.02201853 -82.6875 174.375 C-87.31143529 181.34211971 -91.73625622 188.40680894 -96.0625 195.5625 C-97.2459829 197.51308809 -98.42957519 199.46360982 -99.61328125 201.4140625 C-101.26456106 204.13706169 -102.91546472 206.86027794 -104.56396484 209.58496094 C-105.95211136 211.87363828 -107.34949798 214.15636941 -108.75 216.4375 C-109.15613525 217.11176025 -109.56227051 217.78602051 -109.98071289 218.48071289 C-110.93254687 220.02221862 -111.9586094 221.51752454 -113 223 C-113.66 223 -114.32 223 -115 223 C-115.09796875 223.72703125 -115.1959375 224.4540625 -115.296875 225.203125 C-116.09324731 228.37091708 -117.29482212 230.14876334 -119.25 232.75 C-122.5759379 237.3171642 -125.379324 242.00018495 -128 247 C-128.66 247 -129.32 247 -130 247 C-130.185625 248.1446875 -130.185625 248.1446875 -130.375 249.3125 C-131 252 -131 252 -133 255 C-133.66 255 -134.32 255 -135 255 C-135.33 256.65 -135.66 258.3 -136 260 C-136.66 260 -137.32 260 -138 260 C-138.1131958 260.56823486 -138.2263916 261.13646973 -138.34301758 261.72192383 C-139.07741097 264.26842132 -140.14106278 266.18226293 -141.51171875 268.44921875 C-142.02283203 269.29806641 -142.53394531 270.14691406 -143.06054688 271.02148438 C-143.59744141 271.90126953 -144.13433594 272.78105469 -144.6875 273.6875 C-145.20505859 274.54794922 -145.72261719 275.40839844 -146.25585938 276.29492188 C-148.76407078 280.43987397 -151.32740872 284.52919638 -154.03515625 288.546875 C-157.1144347 293.11922847 -159.94193257 297.82019447 -162.75 302.5625 C-166.68022286 309.14213073 -170.61271993 315.71999185 -174.625 322.25 C-175.0384668 322.93521729 -175.45193359 323.62043457 -175.87792969 324.32641602 C-176.86365776 325.91962284 -177.92447354 327.46598219 -179 329 C-179.66 329 -180.32 329 -181 329 C-181 329.99 -181 330.98 -181 332 C-181.66 332 -182.32 332 -183 332 C-183 332.99 -183 333.98 -183 335 C-188.37324605 337.28319312 -193.74843075 339.56173514 -199.12548828 341.8359375 C-200.95546008 342.61069381 -202.78488988 343.38673159 -204.61376953 344.1640625 C-207.23850252 345.27939619 -209.86513278 346.39014798 -212.4921875 347.5 C-213.31306854 347.84998047 -214.13394958 348.19996094 -214.97970581 348.56054688 C-220.77225659 351 -220.77225659 351 -223 351 C-223.13954323 342.68061837 -223.24589278 334.36173251 -223.31087303 326.04146671 C-223.34207416 322.17720516 -223.38433622 318.31374918 -223.45263672 314.44995117 C-223.51823773 310.71512982 -223.55379024 306.98107902 -223.56926346 303.24572563 C-223.58027767 301.82679565 -223.6017857 300.40790382 -223.63438034 298.9893055 C-223.8138395 290.84874956 -223.49133735 285.05868296 -218.48721313 278.43797302 C-217 277 -217 277 -215 277 C-214.87705566 276.41226807 -214.75411133 275.82453613 -214.62744141 275.21899414 C-213.9964281 272.98736769 -213.20179684 271.44350089 -211.9609375 269.49609375 C-211.3421875 268.51576172 -211.3421875 268.51576172 -210.7109375 267.515625 C-210.27007812 266.82984375 -209.82921875 266.1440625 -209.375 265.4375 C-208.92640625 264.73238281 -208.4778125 264.02726562 -208.015625 263.30078125 C-207.10828758 261.8749653 -206.19912316 260.45031025 -205.28808594 259.02685547 C-204.12464858 257.1961396 -202.98264665 255.35472221 -201.8515625 253.50390625 C-201.24054688 252.51261719 -200.62953125 251.52132812 -200 250.5 C-199.46375 249.6234375 -198.9275 248.746875 -198.375 247.84375 C-197.92125 247.2353125 -197.4675 246.626875 -197 246 C-196.34 246 -195.68 246 -195 246 C-194.90630127 245.45649902 -194.81260254 244.91299805 -194.71606445 244.35302734 C-193.78978372 241.3092177 -192.27188598 239.02279297 -190.54296875 236.3515625 C-189.84236328 235.26359375 -189.14175781 234.175625 -188.41992188 233.0546875 C-187.67587015 231.91140047 -186.93172881 230.76817176 -186.1875 229.625 C-185.45457976 228.48990497 -184.72215286 227.35449123 -183.99023438 226.21875 C-182.00165263 223.14035997 -180.00748319 220.06609582 -178 217 C-177.30173096 215.88802246 -176.60346191 214.77604492 -175.8840332 213.63037109 C-175.26230225 212.76234863 -174.64057129 211.89432617 -174 211 C-173.34 211 -172.68 211 -172 211 C-171.87633057 210.41154297 -171.75266113 209.82308594 -171.62524414 209.21679688 C-171.00081701 207.00289671 -170.22106193 205.46595435 -168.99609375 203.53125 C-168.5889917 202.88349609 -168.18188965 202.23574219 -167.76245117 201.56835938 C-167.32521729 200.88580078 -166.8879834 200.20324219 -166.4375 199.5 C-165.98930908 198.79166016 -165.54111816 198.08332031 -165.0793457 197.35351562 C-161.71712008 192.06175303 -158.26594394 186.83418376 -154.75390625 181.640625 C-153.14126031 179.212677 -151.62366895 176.74923801 -150.125 174.25 C-149.42375 173.1775 -148.7225 172.105 -148 171 C-147.34 171 -146.68 171 -146 171 C-145.87431641 170.21882813 -145.87431641 170.21882813 -145.74609375 169.421875 C-144.70826677 166.05301257 -142.90854286 163.22327257 -141.0625 160.25 C-140.52206055 159.34701172 -140.52206055 159.34701172 -139.97070312 158.42578125 C-139.03920867 156.91274606 -138.02538164 155.45105131 -137 154 C-136.34 154 -135.68 154 -135 154 C-134.89365234 153.43716309 -134.78730469 152.87432617 -134.67773438 152.29443359 C-133.88195713 149.60037214 -132.67998118 147.64915904 -131.15625 145.2890625 C-130.57327148 144.37979004 -129.99029297 143.47051758 -129.38964844 142.53369141 C-128.45427246 141.09388916 -128.45427246 141.09388916 -127.5 139.625 C-126.86868164 138.6457959 -126.23736328 137.6665918 -125.58691406 136.65771484 C-124.31818935 134.68992993 -123.04770301 132.72327963 -121.77539062 130.7578125 C-120.21166583 128.32879224 -118.66928872 125.88867134 -117.140625 123.4375 C-116.73005859 122.78313965 -116.31949219 122.1287793 -115.89648438 121.45458984 C-114.81867166 119.73458803 -113.74512674 118.01191397 -112.671875 116.2890625 C-112.12015625 115.53367187 -111.5684375 114.77828125 -111 114 C-110.34 114 -109.68 114 -109 114 C-109 113.01 -109 112.02 -109 111 C-108.34 111 -107.68 111 -107 111 C-106.896875 110.443125 -106.79375 109.88625 -106.6875 109.3125 C-105.85821592 106.5230899 -104.65700944 104.3860936 -103 102 C-102.34 102 -101.68 102 -101 102 C-100.92265625 101.484375 -100.8453125 100.96875 -100.765625 100.4375 C-99.66890336 96.94589642 -97.71170256 94.05759195 -95.75 91 C-95.1003125 89.97712891 -95.1003125 89.97712891 -94.4375 88.93359375 C-93.4852283 87.43831319 -92.53000241 85.94491104 -91.57226562 84.453125 C-89.87703893 81.80815017 -88.19663429 79.15403011 -86.515625 76.5 C-85.34456914 74.66614333 -84.17270514 72.83280244 -83 71 C-82.43635742 70.10925781 -81.87271484 69.21851563 -81.29199219 68.30078125 C-80.49776855 67.06908203 -80.49776855 67.06908203 -79.6875 65.8125 C-79.21699219 65.07644531 -78.74648438 64.34039062 -78.26171875 63.58203125 C-77.84535156 63.05996094 -77.42898438 62.53789062 -77 62 C-76.34 62 -75.68 62 -75 62 C-74.87923096 61.41589355 -74.75846191 60.83178711 -74.6340332 60.22998047 C-73.9816934 57.93561323 -73.13034944 56.32721122 -71.85546875 54.3203125 C-71.21061523 53.29744141 -71.21061523 53.29744141 -70.55273438 52.25390625 C-70.10220703 51.55136719 -69.65167969 50.84882813 -69.1875 50.125 C-68.74857422 49.43019531 -68.30964844 48.73539063 -67.85742188 48.01953125 C-66.99153674 46.65315679 -66.12039696 45.29009597 -65.24365234 43.93066406 C-64.43711248 42.6785798 -63.63993382 41.42039625 -62.85400391 40.15527344 C-61.95497853 38.73567193 -60.98413016 37.36198491 -60 36 C-59.34 36 -58.68 36 -58 36 C-57.88785156 35.43152344 -57.77570313 34.86304688 -57.66015625 34.27734375 C-56.91586772 31.70976854 -55.87176497 29.81746154 -54.4375 27.5625 C-53.98246094 26.82128906 -53.52742187 26.08007812 -53.05859375 25.31640625 C-48.27736532 19.9363902 -41.34752281 17.06282361 -34.80859375 14.3359375 C-34.05965347 14.01718658 -33.3107132 13.69843567 -32.53907776 13.37002563 C-30.17451645 12.36533398 -27.80615893 11.36998677 -25.4375 10.375 C-23.84674082 9.70114462 -22.25624376 9.02667014 -20.66601562 8.3515625 C-17.08831529 6.83383787 -13.50800352 5.32246652 -9.92550659 3.81610107 C-7.96469747 2.98503748 -6.01192956 2.13661132 -4.05883789 1.28759766 C-1 0 -1 0 0 0 Z " fill="#BFFAF4" transform="translate(504,143)"/>
+<path d="M0 0 C4.67059196 1.75147198 9.08096196 3.41618499 13.5625 5.5 C14.50480469 5.933125 15.44710937 6.36625 16.41796875 6.8125 C17.27003906 7.204375 18.12210938 7.59625 19 8 C23.34546929 9.93131969 27.73485144 11.64869894 32.1875 13.3125 C37.77324245 15.4400958 43.05504473 17.93628759 48.37109375 20.66015625 C52.44778618 22.73787617 56.60502166 24.47971078 60.890625 26.078125 C67.60343834 28.59145322 73.99207976 31.3916393 80.37109375 34.66015625 C84.44778618 36.73787617 88.60502166 38.47971078 92.890625 40.078125 C99.60343834 42.59145322 105.99207976 45.3916393 112.37109375 48.66015625 C116.44778618 50.73787617 120.60502166 52.47971078 124.890625 54.078125 C131.59397756 56.58791103 137.9755372 59.38053883 144.34375 62.6484375 C149.41627977 65.22946 154.56978556 67.27822469 160 69 C160 69.66 160 70.32 160 71 C158.07463743 72.52605104 156.14827147 73.92579092 154.125 75.3125 C152.83024578 76.21805926 151.53599912 77.12434453 150.2421875 78.03125 C149.55092773 78.51335937 148.85966797 78.99546875 148.14746094 79.4921875 C144.48803284 82.0616086 140.87070634 84.6889369 137.25 87.3125 C135.71235088 88.42463307 134.17458932 89.53661068 132.63671875 90.6484375 C131.48502197 91.48133301 131.48502197 91.48133301 130.31005859 92.33105469 C128.04819171 93.96518299 125.78423692 95.5963713 123.51953125 97.2265625 C115.73015904 102.83648065 107.9702303 108.48272122 100.25 114.1875 C93.73277127 119.00286929 87.17886685 123.75864473 80.57421875 128.453125 C74.12474489 133.03990213 67.72292607 137.69333353 61.31005859 142.33105469 C59.04819171 143.96518299 56.78423692 145.5963713 54.51953125 147.2265625 C46.81468668 152.77550306 39.13743715 158.35856927 31.5 164 C25.03610271 168.77106729 18.5626451 173.52839623 12.0625 178.25 C11.31097656 178.79914063 10.55945312 179.34828125 9.78515625 179.9140625 C9.08390625 180.42195312 8.38265625 180.92984375 7.66015625 181.453125 C7.04793213 181.89817383 6.43570801 182.34322266 5.80493164 182.80175781 C4 184 4 184 0 186 C0 124.62 0 63.24 0 0 Z " fill="#0CA4E8" transform="translate(41,143)"/>
+<path d="M0 0 C0.33 0 0.66 0 1 0 C1 60.72 1 121.44 1 184 C-19.47170998 192.77358999 -39.93640801 201.52367314 -60.5078125 210.0546875 C-69.89395974 213.95163438 -79.27085431 217.8705695 -88.64550781 221.79507446 C-91.35715161 222.93002958 -94.0691827 224.06405538 -96.78125 225.19799805 C-105.88791967 229.00771176 -114.98555536 232.8375267 -124.0703125 236.69921875 C-126.70346035 237.8163077 -129.33673781 238.93309065 -131.97003174 240.04983521 C-134.45226567 241.10471426 -136.93195353 242.16542385 -139.41162109 243.22631836 C-140.90971133 243.86209783 -142.40791442 244.49761146 -143.90625 245.1328125 C-144.92490646 245.57200264 -144.92490646 245.57200264 -145.96414185 246.02006531 C-148.82294181 247.22574276 -150.86159774 248 -154 248 C-152.622517 244.27848962 -150.92153949 241.03832616 -148.83203125 237.66796875 C-148.19386475 236.63462402 -147.55569824 235.6012793 -146.89819336 234.53662109 C-146.20991455 233.43141113 -145.52163574 232.32620117 -144.8125 231.1875 C-144.09028625 230.02182671 -143.36836697 228.85597093 -142.64672852 227.68994141 C-140.43706098 224.12293941 -138.21935646 220.56097925 -136 217 C-135.34676758 215.95118652 -134.69353516 214.90237305 -134.02050781 213.82177734 C-130.30815517 207.86530464 -126.58562242 201.91525536 -122.85888672 195.96777344 C-119.73535596 190.98095443 -116.61800825 185.99027306 -113.5 181 C-112.25002926 178.99998172 -111.00002926 176.99998171 -109.75 175 C-109.13125 174.01 -108.5125 173.02 -107.875 172 C-102.25 163 -102.25 163 -100.37524414 160.00048828 C-99.12431331 157.99893381 -97.87349965 155.99730611 -96.62280273 153.99560547 C-93.51299731 149.01878404 -90.40121669 144.04322032 -87.28515625 139.0703125 C-80.75014935 128.63608768 -74.25404372 118.17972182 -67.8125 107.6875 C-62.76239371 99.4627995 -57.67294414 91.26653639 -52.50488281 83.11547852 C-43.74612422 69.30052747 -35.1015428 55.41328423 -26.5 41.5 C-21.67664101 33.70212365 -16.8463862 25.90858996 -12 18.125 C-11.37673828 17.12017578 -10.75347656 16.11535156 -10.11132812 15.08007812 C-6.89853174 9.92774343 -3.6685094 4.84189292 0 0 Z " fill="#F6FBFD" transform="translate(503,217)"/>
+<path d="M0 0 C4.09941776 1.22857168 7.94631597 2.91681405 11.85839844 4.64257812 C12.71459778 5.01612427 13.57079712 5.38967041 14.45294189 5.77453613 C16.25595007 6.56235201 18.05791246 7.35256509 19.85888672 8.14501953 C22.62581007 9.36211402 25.39609026 10.57129163 28.16699219 11.77929688 C29.91849627 12.54576252 31.66980531 13.31267405 33.42089844 14.08007812 C34.25312927 14.44363403 35.08536011 14.80718994 35.94281006 15.1817627 C41.75784788 17.74515257 41.75784788 17.74515257 42.87402344 18.86132812 C43.73536228 24.38138661 44.63164756 30.40149533 41.24121094 35.14648438 C38.56558861 37.28244728 35.78520258 39.05785092 32.87402344 40.86132812 C30.90312579 42.229473 28.95463836 43.62657587 27.00488281 45.0246582 C24.82442014 46.58430858 22.63034621 48.12299663 20.43261719 49.65820312 C15.90393966 52.83070434 11.41537291 56.05648282 6.93652344 59.29882812 C6.19152588 59.83781738 5.44652832 60.37680664 4.67895508 60.93212891 C2.41009139 62.57443321 0.14193148 64.21770444 -2.12597656 65.86132812 C-11.62364458 72.7445843 -21.14029689 79.59516895 -30.73388672 86.34423828 C-38.91783728 92.10947337 -47.02026757 97.98686806 -55.12597656 103.86132812 C-64.62364458 110.7445843 -74.14029689 117.59516895 -83.73388672 124.34423828 C-91.14944714 129.56817614 -98.49690838 134.88507401 -105.84228516 140.20703125 C-109.68476768 142.99051014 -113.53007627 145.77007412 -117.37597656 148.54882812 C-118.1287085 149.09273193 -118.88144043 149.63663574 -119.65698242 150.19702148 C-124.68977581 153.83099193 -129.73422612 157.44809147 -134.79223633 161.046875 C-138.86558858 163.9487942 -142.91177926 166.88648926 -146.9519043 169.83447266 C-149.26617708 171.51449162 -151.5928459 173.17587917 -153.92285156 174.83398438 C-156.4501102 176.63361346 -158.91564289 178.47089008 -161.32910156 180.41992188 C-163.98371265 182.4260494 -165.9767713 183.80764136 -169.12597656 184.86132812 C-172.02661133 183.99951172 -172.02661133 183.99951172 -174.94238281 182.50976562 C-175.91763916 182.02427246 -176.89289551 181.5387793 -177.89770508 181.03857422 C-179.00069946 180.4558374 -179.00069946 180.4558374 -180.12597656 179.86132812 C-180.58608962 172.8387787 -180.89895654 165.82014844 -181.11474609 158.78588867 C-181.20474425 156.39964729 -181.32721264 154.01438446 -181.48388672 151.6315918 C-182.71405905 132.42723485 -182.71405905 132.42723485 -178.45825195 126.56350708 C-174.25584046 122.52606679 -169.43806201 119.70760287 -164.29559326 117.02371216 C-161.55717775 115.55659105 -159.15140677 113.78835468 -156.70410156 111.88085938 C-155.97698975 111.34259521 -155.24987793 110.80433105 -154.50073242 110.24975586 C-153.79956299 109.72969971 -153.09839355 109.20964355 -152.37597656 108.67382812 C-145.85814752 103.85624438 -139.30147538 99.10108571 -132.69628906 94.40429688 C-122.18372334 86.92704942 -111.75129442 79.34013944 -101.37597656 71.67382812 C-94.85873358 66.85847756 -88.30484382 62.10268368 -81.70019531 57.40820312 C-75.25072145 52.821426 -68.84890263 48.1679946 -62.43603516 43.53027344 C-60.17416827 41.89614513 -57.91021348 40.26495683 -55.64550781 38.63476562 C-47.14711552 32.51432111 -38.69027594 26.34161719 -30.2668457 20.1184082 C-24.57562351 15.91815079 -18.86006204 11.75287002 -13.12597656 7.61132812 C-12.36607422 7.0621875 -11.60617188 6.51304687 -10.82324219 5.94726562 C-2.36048971 -0.15396855 -2.36048971 -0.15396855 0 0 Z " fill="#F6FBFD" transform="translate(221.1259765625,221.138671875)"/>
+<path d="M0 0 C0.99 0.495 0.99 0.495 2 1 C1.37798706 1.87072144 1.37798706 1.87072144 0.7434082 2.7590332 C-3.9865125 9.44039984 -8.43148739 16.27368959 -12.8125 23.1875 C-17.83401907 31.08336569 -22.87973757 38.95283849 -28.16918945 46.67260742 C-29.83206904 49.12168212 -31.0567528 51.1702584 -32 54 C-32.66 54 -33.32 54 -34 54 C-34.35771484 55.02867187 -34.35771484 55.02867187 -34.72265625 56.078125 C-36.25441077 59.5819549 -38.28152655 62.61222557 -40.4375 65.75 C-41.34999534 67.09825707 -42.26141592 68.44724203 -43.171875 69.796875 C-43.64173828 70.49232422 -44.11160156 71.18777344 -44.59570312 71.90429688 C-46.83330054 75.24357647 -49.0113061 78.62050363 -51.1875 82 C-55.56275136 88.78435399 -59.96239359 95.55238025 -64.375 102.3125 C-69.09021021 109.53721749 -73.80048273 116.76506416 -78.5 124 C-86.2889066 135.9895577 -94.10324139 147.96251114 -101.91601562 159.93652344 C-108.53332977 170.07879093 -115.14854352 180.22240161 -121.75 190.375 C-122.27658203 191.18404785 -122.80316406 191.9930957 -123.34570312 192.82666016 C-125.96095754 196.84806163 -128.56455574 200.8763269 -131.1484375 204.91796875 C-131.90108887 206.09190186 -131.90108887 206.09190186 -132.66894531 207.28955078 C-133.61163268 208.76111674 -134.55128887 210.23463073 -135.48730469 211.71044922 C-137.48189057 214.82037808 -139.37212341 217.37212341 -142 220 C-142 167.86 -142 115.72 -142 62 C-128.47 56.06 -114.94 50.12 -101 44 C-92.8988698 40.440435 -92.8988698 40.440435 -84.79785156 36.88061523 C-65.66582148 28.47435195 -46.52320777 20.09254321 -27.35606384 11.76661682 C-22.88677729 9.8242441 -18.42388127 7.86812795 -13.96484375 5.90234375 C-12.03913511 5.05972986 -10.11336134 4.21726481 -8.1875 3.375 C-6.93404785 2.81607056 -6.93404785 2.81607056 -5.65527344 2.24584961 C-3.79508147 1.43734409 -1.90066844 0.70813476 0 0 Z " fill="#0CA4E7" transform="translate(423,178)"/>
+<path d="M0 0 C5.92897669 2.7307735 11.90801464 5.34870675 17.88308716 7.97671509 C20.10999312 8.95620908 22.33619509 9.93728803 24.56225586 10.91870117 C35.66834946 15.81297039 46.79320214 20.6632726 57.92871094 25.49023438 C61.38738585 26.99189596 64.84144707 28.50400454 68.29492188 30.01757812 C74.31116669 32.65317882 80.33330425 35.27502568 86.35742188 37.89257812 C88.34571773 38.75712786 90.33399802 39.62171342 92.32226562 40.48632812 C96.01986159 42.09421472 99.71779193 43.70132325 103.41650391 45.30664062 C123.73157437 54.12484992 144.00435414 63.03213736 164.23208618 72.04901123 C177.52308329 77.97303428 190.83715156 83.83627005 204.21508789 89.56152344 C207.24903326 90.86430507 210.27494432 92.18278142 213.29492188 93.51757812 C214.5254126 94.05511719 214.5254126 94.05511719 215.78076172 94.60351562 C220.94582506 96.98899129 220.94582506 96.98899129 222.48814201 99.32429886 C223.4217779 101.86244381 223.54113408 103.81299109 223.53543091 106.51629639 C223.5395549 108.02647087 223.5395549 108.02647087 223.54376221 109.56715393 C223.53657166 110.66551071 223.5293811 111.76386749 223.52197266 112.89550781 C223.52226471 114.05676682 223.52255676 115.21802582 223.52285767 116.41447449 C223.52146335 120.25620981 223.50589707 124.09775165 223.49023438 127.93945312 C223.48650461 130.60174895 223.48355909 133.26403403 223.48165894 135.92633057 C223.47544466 142.21964813 223.45903458 148.51289615 223.43895996 154.8061831 C223.4165993 161.97178873 223.40560711 169.1373977 223.39556909 176.30302954 C223.37466829 191.04124796 223.33949334 205.77941183 223.29492188 220.51757812 C222.96492188 220.51757812 222.63492187 220.51757812 222.29492188 220.51757812 C222.29437711 219.91404668 222.29383234 219.31051523 222.29327106 218.68869495 C222.27829975 203.99924119 222.23583886 189.31004452 222.16283131 174.62077045 C222.12818708 167.51708357 222.10282656 160.41359062 222.09936523 153.30981445 C222.09599964 146.4561389 222.06670468 139.60296669 222.0214901 132.74944115 C222.00848559 130.13277208 222.00421778 127.51604473 222.00876808 124.89934731 C222.01365267 121.23810577 221.98767308 117.5783014 221.9543457 113.91723633 C221.96297134 112.83182556 221.97159698 111.74641479 221.98048401 110.62811279 C221.91102459 104.58471537 221.91102459 104.58471537 218.97227478 99.42025757 C215.72294786 97.11110082 212.38046429 95.46169152 208.71679688 93.94335938 C207.97014771 93.62222672 207.22349854 93.30109406 206.45422363 92.9702301 C203.98897284 91.91257685 201.51703833 90.87156999 199.04492188 89.83007812 C197.29792981 89.08353298 195.55152044 88.33562298 193.80566406 87.58642578 C191.07694917 86.41580839 188.3478236 85.24624514 185.61676025 84.08111572 C176.74772694 80.29686275 167.92336586 76.41407564 159.10189819 72.52053833 C139.89243822 64.04665992 120.61117907 55.74470244 101.29492188 47.51757812 C101.29492188 46.85757813 101.29492188 46.19757813 101.29492188 45.51757812 C100.42262939 45.40019287 99.55033691 45.28280762 98.65161133 45.16186523 C95.3308129 44.52446709 92.67537145 43.56896152 89.58789062 42.20898438 C88.46584229 41.71881836 87.34379395 41.22865234 86.18774414 40.72363281 C84.95259492 40.17587549 83.71748903 39.62802047 82.48242188 39.08007812 C81.16490414 38.50165873 79.84710596 37.92387779 78.52905273 37.34667969 C75.65533756 36.0867302 72.78353583 34.82254646 69.91308594 33.55517578 C65.13465496 31.44561856 60.35183506 29.34613518 55.56835938 27.24804688 C50.43533321 24.99620164 45.30253053 22.74385758 40.17114258 20.48828125 C27.67983324 14.99795321 15.17847832 9.53099404 2.66992188 4.08007812 C1.83695587 3.71700562 1.00398987 3.35393311 0.14578247 2.9798584 C-2.21321744 1.95174275 -4.57238295 0.92400837 -6.93164062 -0.10351562 C-7.61836349 -0.40271408 -8.30508636 -0.70191254 -9.01261902 -1.01017761 C-10.29479852 -1.56827661 -11.57761067 -2.12492512 -12.86114502 -2.67990112 C-14.11574955 -3.22593295 -15.36692213 -3.77990374 -16.6149292 -4.34085083 C-22.23057346 -6.83528216 -26.43037964 -7.54539348 -32.27734375 -5.64746094 C-41.58800778 -2.03074425 -50.70866365 1.97461025 -59.82989502 6.04153442 C-64.6029267 8.1693729 -69.38084387 10.28619695 -74.15820312 12.40429688 C-75.13016632 12.83552353 -76.10212952 13.26675018 -77.10354614 13.71104431 C-86.49476829 17.87468838 -95.90927261 21.98390773 -105.33007812 26.08007812 C-118.63317988 31.86674294 -131.92427066 37.67992431 -145.20507812 43.51757812 C-158.5286117 49.37355583 -171.86119248 55.20812613 -185.20507812 61.01757812 C-195.26985027 65.39971278 -205.33186345 69.78795554 -215.38476562 74.19726562 C-216.27338287 74.58701065 -217.16200012 74.97675568 -218.07754517 75.37831116 C-222.47667611 77.30864315 -226.87445341 79.24198349 -231.27001953 81.18041992 C-238.74002639 84.47302393 -246.21384556 87.74878763 -253.73632812 90.91992188 C-254.91146973 91.42023926 -256.08661133 91.92055664 -257.29736328 92.43603516 C-259.40613604 93.33154999 -261.5200534 94.21509752 -263.64013672 95.08349609 C-264.54586426 95.47037598 -265.4515918 95.85725586 -266.38476562 96.25585938 C-267.15546387 96.57594971 -267.92616211 96.89604004 -268.72021484 97.22583008 C-271.53034685 99.05466261 -272.30839323 100.41697097 -273.70507812 103.51757812 C-274.1550271 107.19119524 -274.11384243 110.84585447 -274.09275818 114.54304504 C-274.09814372 115.66873309 -274.10352925 116.79442114 -274.10907799 117.95422095 C-274.12340989 121.73432096 -274.11624069 125.51407338 -274.10913086 129.29418945 C-274.11318752 132.00113333 -274.12169407 134.70805933 -274.12992859 137.41499329 C-274.14712933 144.0097405 -274.14795383 150.60439249 -274.14271569 157.19915632 C-274.13867445 162.56034406 -274.14011699 167.92150365 -274.14546394 173.28269005 C-274.14621237 174.04570252 -274.14696079 174.80871499 -274.14773189 175.59484905 C-274.14926337 177.14492753 -274.15080172 178.69500601 -274.15234686 180.24508449 C-274.16607697 194.78392745 -274.16063104 209.32271661 -274.14916164 223.86155834 C-274.13923279 237.15753443 -274.15216297 250.45337129 -274.17609584 263.74932591 C-274.20049006 277.40460717 -274.21009367 291.0598236 -274.20344311 304.71512622 C-274.19995108 312.38028841 -274.20218165 320.04534357 -274.21969414 327.71048927 C-274.23442035 334.23705331 -274.2350464 340.76343499 -274.21762323 347.28999547 C-274.2091132 350.61872345 -274.20913257 353.94685842 -274.22227478 357.27561188 C-274.23544703 360.8877692 -274.22396887 364.49904114 -274.20628357 368.11116028 C-274.21588858 369.15834868 -274.22549358 370.20553708 -274.23538965 371.28445846 C-274.17312447 377.46550667 -273.41171955 382.42353075 -269.70507812 387.51757812 C-266.56879025 390.00047269 -263.33019738 391.84444616 -259.70507812 393.51757812 C-262.70507813 394.51757812 -262.70507813 394.51757812 -264.79101562 393.65429688 C-265.54640625 393.17605469 -266.30179687 392.6978125 -267.08007812 392.20507812 C-267.8303125 391.75519531 -268.58054687 391.3053125 -269.35351562 390.84179688 C-275.20851197 385.05488188 -277.26666096 378.09562022 -277.36913306 370.03095794 C-277.35729733 368.99027734 -277.3454616 367.94959674 -277.33326721 366.87738037 C-277.3403616 365.74600907 -277.34745599 364.61463776 -277.35476536 363.44898248 C-277.37228752 359.67950401 -277.35426869 355.9110645 -277.33618164 352.14160156 C-277.33856529 349.43066609 -277.34841697 346.71976892 -277.35786438 344.0088501 C-277.37619321 337.42407278 -277.36776178 330.83959321 -277.34977616 324.25482532 C-277.33572537 318.90326323 -277.33186266 313.55178172 -277.33521843 308.20020294 C-277.33569587 307.43729048 -277.33617331 306.67437801 -277.33666522 305.88834698 C-277.33769159 304.33834469 -277.33874695 302.78834242 -277.33983099 301.23834017 C-277.34838781 287.54978452 -277.33175362 273.86137231 -277.30200195 260.17285156 C-277.27314433 246.89544659 -277.26609301 233.61824806 -277.28149414 220.34082031 C-277.29825661 205.87001555 -277.30229183 191.39930868 -277.28478378 176.92850137 C-277.28293944 175.38556434 -277.28110471 173.8426273 -277.27927971 172.29969025 C-277.27836762 171.54058996 -277.27745553 170.78148968 -277.2765158 169.99938636 C-277.27091242 164.65303428 -277.27421551 159.30673004 -277.28082466 153.96038055 C-277.28855714 147.44703635 -277.2818078 140.93389531 -277.25664962 134.42059204 C-277.24415473 131.09816607 -277.2401561 127.77631998 -277.24919128 124.45384216 C-277.25785839 120.85217429 -277.24197474 117.25143169 -277.21974182 113.64984131 C-277.22798259 112.60023782 -277.23622336 111.55063434 -277.24471384 110.46922469 C-277.17664818 104.51025209 -276.67854886 101.0580222 -272.70507812 96.51757812 C-270.70751953 95.12475586 -270.70751953 95.12475586 -268.55664062 94.20117188 C-267.73260742 93.83677002 -266.90857422 93.47236816 -266.05957031 93.09692383 C-265.15883789 92.72011475 -264.25810547 92.34330566 -263.33007812 91.95507812 C-262.3674707 91.53508545 -261.40486328 91.11509277 -260.41308594 90.68237305 C-257.18392125 89.27771191 -253.94460276 87.89815883 -250.70507812 86.51757812 C-248.39434759 85.51689922 -246.0844717 84.51424481 -243.77539062 83.50976562 C-240.05653613 81.89317872 -236.33714061 80.27803046 -232.61376953 78.671875 C-223.28874972 74.64894031 -213.99177455 70.56561228 -204.70507812 66.45507812 C-191.20809732 60.48315791 -177.68107747 54.58222022 -164.14257812 48.70507812 C-149.38007358 42.29585987 -134.62679632 35.86658028 -119.89257812 29.39257812 C-119.06143494 29.02747131 -118.23029175 28.6623645 -117.3739624 28.28619385 C-108.79934282 24.51919218 -100.22672369 20.74766406 -91.6558075 16.97224426 C-58.6649914 2.44180325 -58.6649914 2.44180325 -43.45507812 -4.04492188 C-41.89382202 -4.71575806 -41.89382202 -4.71575806 -40.30102539 -5.40014648 C-39.35670654 -5.79983643 -38.4123877 -6.19952637 -37.43945312 -6.61132812 C-36.23627441 -7.12288452 -36.23627441 -7.12288452 -35.00878906 -7.64477539 C-22.5082641 -12.19005953 -11.15645054 -5.21128554 0 0 Z " fill="#F6FCFD" transform="translate(298.705078125,24.482421875)"/>
+<path d="M0 0 C7.06526353 2.21884309 13.74497574 4.97458991 20.5 8 C22.72652209 8.98837229 24.95308577 9.97665089 27.1796875 10.96484375 C28.31116211 11.46870605 29.44263672 11.97256836 30.60839844 12.49169922 C35.94088399 14.86314291 41.28275773 17.21313755 46.625 19.5625 C47.65359131 20.0152832 48.68218262 20.46806641 49.74194336 20.93457031 C58.74463491 24.89487704 67.76331931 28.81792472 76.78515625 32.734375 C81.19357392 34.64837826 85.59810855 36.57104291 90 38.5 C96.01626102 41.13556389 102.03838223 43.7574475 108.0625 46.375 C110.05079586 47.23954973 112.03907614 48.10413529 114.02734375 48.96875 C117.72493972 50.5766366 121.42287005 52.18374513 125.12158203 53.7890625 C145.4366525 62.60727179 165.70943227 71.51455923 185.93716431 80.53143311 C199.22816142 86.45545616 212.54222968 92.31869192 225.92016602 98.04394531 C228.95411139 99.34672695 231.98002245 100.66520329 235 102 C236.23049072 102.53753906 236.23049072 102.53753906 237.48583984 103.0859375 C242.65090318 105.47141316 242.65090318 105.47141316 244.19322014 107.80672073 C245.12685602 110.34486568 245.24621221 112.29541297 245.24050903 114.99871826 C245.24463303 116.50889275 245.24463303 116.50889275 245.24884033 118.04957581 C245.2380545 119.69711098 245.2380545 119.69711098 245.22705078 121.37792969 C245.22734283 122.53918869 245.22763489 123.70044769 245.22793579 124.89689636 C245.22654148 128.73863168 245.2109752 132.58017352 245.1953125 136.421875 C245.19158273 139.08417082 245.18863722 141.7464559 245.18673706 144.40875244 C245.18052279 150.70207001 245.1641127 156.99531802 245.14403808 163.28860497 C245.12167743 170.45421061 245.11068524 177.61981957 245.10064721 184.78545141 C245.07974642 199.52366983 245.04457147 214.2618337 245 229 C244.67 229 244.34 229 244 229 C243.99945523 228.39646855 243.99891047 227.79293711 243.99834919 227.17111683 C243.98337787 212.48166306 243.94091699 197.79246639 243.86790943 183.10319233 C243.8332652 175.99950545 243.80790469 168.89601249 243.80444336 161.79223633 C243.80107777 154.93856077 243.77178281 148.08538856 243.72656822 141.23186302 C243.71356371 138.61519395 243.70929591 135.99846661 243.71384621 133.38176918 C243.7187308 129.72052764 243.6927512 126.06072328 243.65942383 122.3996582 C243.66804947 121.31424744 243.67667511 120.22883667 243.68556213 119.11053467 C243.61610272 113.06713725 243.61610272 113.06713725 240.67735291 107.90267944 C237.42802598 105.59352269 234.08554241 103.94411339 230.421875 102.42578125 C229.67522583 102.10464859 228.92857666 101.78351593 228.15930176 101.45265198 C225.69405097 100.39499872 223.22211646 99.35399186 220.75 98.3125 C219.00300794 97.56595485 217.25659856 96.81804485 215.51074219 96.06884766 C212.78202729 94.89823027 210.05290173 93.72866701 207.32183838 92.5635376 C198.45280506 88.77928462 189.62844398 84.89649751 180.80697632 81.00296021 C161.59751635 72.5290818 142.31625719 64.22712431 123 56 C123 55.34 123 54.68 123 54 C121.69156128 53.82392212 121.69156128 53.82392212 120.35668945 53.64428711 C117.03589102 53.00688897 114.38044958 52.05138339 111.29296875 50.69140625 C110.17092041 50.20124023 109.04887207 49.71107422 107.89282227 49.20605469 C106.65767305 48.65829737 105.42256715 48.11044234 104.1875 47.5625 C102.86998227 46.98408061 101.55218409 46.40629967 100.23413086 45.82910156 C97.36041569 44.56915208 94.48861395 43.30496834 91.61816406 42.03759766 C86.83973309 39.92804044 82.05691319 37.82855705 77.2734375 35.73046875 C72.14041133 33.47862352 67.00760865 31.22627946 61.8762207 28.97070312 C49.38491137 23.48037508 36.88355644 18.01341591 24.375 12.5625 C23.542034 12.19942749 22.70906799 11.83635498 21.8508606 11.46228027 C19.49186068 10.43416462 17.13269518 9.40643024 14.7734375 8.37890625 C14.08671463 8.07970779 13.39999176 7.78050934 12.69245911 7.47224426 C8.46788104 5.63339659 4.23640671 3.81143618 0 2 C0 1.34 0 0.68 0 0 Z " fill="#D1D6D7" transform="translate(277,16)"/>
+<path d="M0 0 C0 0.33 0 0.66 0 1 C-0.67699951 1.06243896 -1.35399902 1.12487793 -2.05151367 1.18920898 C-10.78195291 2.29024712 -18.16583347 5.35059073 -26.05673218 9.01507568 C-29.19538376 10.47245084 -32.34834925 11.89769387 -35.5002594 13.32611084 C-37.16071763 14.07919869 -38.82040905 14.8339794 -40.47935486 15.59039307 C-48.53743853 19.26215382 -56.6490788 22.80558507 -64.77328491 26.32809448 C-68.85437811 28.09782867 -72.93300288 29.87323271 -77.01171875 31.6484375 C-77.83011734 32.00451584 -78.64851593 32.36059418 -79.49171448 32.72746277 C-88.83760915 36.79598701 -98.16871792 40.89810205 -107.5 45 C-121.62793649 51.20964519 -135.76738024 57.39216251 -149.91699219 63.55224609 C-159.01243032 67.512452 -168.10451172 71.48005951 -177.1875 75.46875 C-178.03786331 75.84216522 -178.88822662 76.21558044 -179.76435852 76.60031128 C-184.03811771 78.47762879 -188.31098393 80.35695223 -192.58276367 82.23876953 C-201.40920774 86.1242854 -210.24933043 89.97419886 -219.11328125 93.7734375 C-221.81094532 94.93386082 -224.5083037 96.09499176 -227.20556641 97.25634766 C-228.92818552 97.99553484 -230.65228698 98.73127811 -232.37792969 99.46337891 C-234.7621747 100.47497599 -237.14121224 101.4980021 -239.51953125 102.5234375 C-240.22169266 102.81745453 -240.92385406 103.11147156 -241.64729309 103.41439819 C-245.50969014 105.0945653 -248.2370011 106.81587487 -251 110 C-252 111 -253 112 -254 113 C-254.33 112.34 -254.66 111.68 -255 111 C-251.80009745 104.85654068 -247.88029666 103.05431775 -241.625 100.4375 C-240.66239258 100.01750732 -239.69978516 99.59751465 -238.70800781 99.16479492 C-235.47884312 97.76013379 -232.23952464 96.38058071 -229 95 C-226.68926947 93.99932109 -224.37939358 92.99666669 -222.0703125 91.9921875 C-218.351458 90.37560059 -214.63206248 88.76045234 -210.90869141 87.15429688 C-201.58367159 83.13136219 -192.28669643 79.04803416 -183 74.9375 C-169.50301919 68.96557978 -155.97599935 63.0646421 -142.4375 57.1875 C-127.67499546 50.77828174 -112.9217182 44.34900215 -98.1875 37.875 C-97.35635681 37.50989319 -96.52521362 37.14478638 -95.66888428 36.76861572 C-87.0942647 33.00161406 -78.52164556 29.23008593 -69.95072937 25.45466614 C-36.95991327 10.92422512 -36.95991327 10.92422512 -21.75 4.4375 C-20.1887439 3.76666382 -20.1887439 3.76666382 -18.59594727 3.08227539 C-17.65162842 2.68258545 -16.70730957 2.28289551 -15.734375 1.87109375 C-14.53119629 1.35953735 -14.53119629 1.35953735 -13.30371094 0.83764648 C-8.49789817 -0.90978289 -5.01336343 -1.04930863 0 0 Z " fill="#E9EFF0" transform="translate(277,16)"/>
+<path d="M0 0 C8.91 3.96 8.91 3.96 18 8 C18 8.66 18 9.32 18 10 C13.42111848 8.54884678 9.02350565 6.79418096 4.625 4.875 C3.98433594 4.59785156 3.34367187 4.32070313 2.68359375 4.03515625 C1.12143075 3.35899615 -0.43942315 2.67981293 -2 2 C-1.34 1.34 -0.68 0.68 0 0 Z " fill="#D0D4D5" transform="translate(304,27)"/>
+<path d="M0 0 C1 3 1 3 0.25 5.125 C-1 7 -1 7 -4 8 C-2.25 2.25 -2.25 2.25 0 0 Z " fill="#DBE0E1" transform="translate(26,121)"/>
+</svg>
diff --git a/packages/client/src/icons/provider/assets/huggingface.svg b/packages/client/src/icons/provider/assets/huggingface.svg
new file mode 100644
index 00000000000..ab959d165fa
--- /dev/null
+++ b/packages/client/src/icons/provider/assets/huggingface.svg
@@ -0,0 +1,8 @@
+<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M230.721 172.7C230.183 170.673 229.313 168.75 228.146 167.008C228.396 166.091 228.587 165.159 228.714 164.217C229.543 158.241 227.471 152.77 223.567 148.537C221.452 146.225 219.185 144.698 216.784 143.761C218.36 137.018 219.157 130.117 219.161 123.193C219.161 120.03 218.982 116.932 218.682 113.88C218.526 112.356 218.337 110.836 218.115 109.32C217.428 104.847 216.408 100.431 215.064 96.11C214.183 93.2707 213.164 90.476 212.01 87.736C210.281 83.6782 208.262 79.75 205.969 75.982C204.465 73.475 202.827 71.0508 201.062 68.72C200.197 67.543 199.296 66.3938 198.358 65.274C195.58 61.898 192.561 58.7277 189.325 55.788C188.25 54.7997 187.145 53.8453 186.01 52.926C184.893 51.9943 183.751 51.0927 182.586 50.222C180.241 48.4766 177.818 46.8392 175.324 45.315C161.543 36.945 145.382 32.145 128.109 32.145C77.817 32.145 37.057 72.907 37.057 123.196C37.055 130.208 37.867 137.196 39.477 144.02C37.317 144.958 35.247 146.42 33.327 148.535C29.424 152.766 27.351 158.217 28.18 164.193C28.306 165.142 28.495 166.082 28.747 167.006C27.5811 168.749 26.7117 170.673 26.174 172.7C24.974 177.261 25.369 181.374 26.894 184.978C25.236 189.688 25.65 194.704 27.809 199.065C29.379 202.25 31.626 204.714 34.396 206.916C37.689 209.534 41.811 211.758 46.783 213.892C52.715 216.422 59.956 218.799 63.249 219.671C71.755 221.873 79.911 223.269 88.177 223.337C99.954 223.446 110.096 220.677 117.357 213.59C120.924 214.027 124.515 214.246 128.109 214.244C131.906 214.236 135.699 213.997 139.467 213.529C146.711 220.661 156.892 223.455 168.712 223.343C176.977 223.277 185.133 221.881 193.617 219.676C196.932 218.804 204.17 216.427 210.105 213.897C215.077 211.76 219.199 209.536 222.514 206.922C225.263 204.719 227.508 202.256 229.079 199.071C231.26 194.709 231.652 189.693 230.017 184.983C231.527 181.379 231.92 177.257 230.721 172.7ZM222.281 184.673C223.952 187.844 224.059 191.427 222.585 194.764C220.349 199.821 214.795 203.805 204.008 208.082C197.3 210.742 191.158 212.443 191.104 212.458C182.232 214.759 174.208 215.928 167.262 215.928C155.76 215.928 147.201 212.754 141.773 206.486C132.594 208.05 123.222 208.103 114.026 206.644C108.591 212.808 100.081 215.928 88.676 215.928C81.729 215.928 73.706 214.759 64.833 212.458C64.779 212.443 58.639 210.742 51.929 208.082C41.143 203.805 35.587 199.824 33.352 194.764C31.878 191.427 31.985 187.844 33.656 184.673C33.81 184.378 33.976 184.091 34.153 183.813C33.1516 182.309 32.4799 180.61 32.182 178.827C31.8842 177.045 31.967 175.22 32.425 173.472C33.089 170.949 34.46 168.851 36.322 167.344C35.425 165.87 34.8365 164.23 34.592 162.522C34.056 158.808 35.289 155.1 38.062 152.076C40.222 149.723 43.275 148.428 46.655 148.428H46.745C44.1965 140.259 42.9044 131.75 42.913 123.193C42.913 76.522 80.749 38.683 127.427 38.683C174.104 38.683 211.94 76.518 211.94 123.193C211.947 131.773 210.646 140.304 208.081 148.492C208.489 148.452 208.889 148.432 209.282 148.431C212.662 148.431 215.716 149.726 217.874 152.079C220.647 155.1 221.881 158.811 221.344 162.525C221.1 164.233 220.511 165.873 219.615 167.347C221.477 168.854 222.849 170.952 223.512 173.475C223.97 175.223 224.053 177.048 223.755 178.831C223.458 180.613 222.786 182.312 221.784 183.816C221.961 184.091 222.129 184.378 222.281 184.673Z" fill="white"/>
+<path d="M221.784 183.816C222.786 182.312 223.458 180.613 223.756 178.831C224.053 177.048 223.97 175.223 223.512 173.475C222.848 170.952 221.476 168.854 219.615 167.347C220.512 165.873 221.1 164.233 221.344 162.525C221.881 158.811 220.648 155.103 217.874 152.079C215.716 149.726 212.662 148.431 209.282 148.431C208.889 148.431 208.489 148.452 208.081 148.492C210.643 140.304 211.942 131.774 211.933 123.195C211.933 76.5231 174.097 38.6851 127.424 38.6851C80.75 38.6851 42.9099 76.5191 42.9099 123.195C42.9015 131.752 44.1936 140.261 46.742 148.43H46.6519C43.2719 148.43 40.219 149.724 38.06 152.077C35.287 155.098 34.0529 158.81 34.5899 162.523C34.8346 164.231 35.4231 165.872 36.3199 167.346C34.4579 168.852 33.086 170.95 32.422 173.473C31.9642 175.222 31.8817 177.047 32.1799 178.83C32.4781 180.612 33.1501 182.312 34.1519 183.816C33.9739 184.094 33.8099 184.381 33.6549 184.676C31.9849 187.847 31.877 191.43 33.352 194.767C35.588 199.824 41.1419 203.808 51.9289 208.085C58.6359 210.745 64.779 212.446 64.833 212.461C73.705 214.762 81.729 215.931 88.675 215.931C100.081 215.931 108.591 212.811 114.026 206.647C123.222 208.106 132.594 208.052 141.773 206.489C147.201 212.757 155.76 215.931 167.262 215.931C174.208 215.931 182.232 214.762 191.103 212.461C191.158 212.446 197.298 210.745 204.008 208.085C214.795 203.808 220.35 199.824 222.585 194.767C224.059 191.43 223.952 187.847 222.281 184.676C222.129 184.379 221.961 184.091 221.784 183.816ZM110.137 196.997C109.669 197.815 109.168 198.614 108.635 199.391C107.23 201.448 105.382 203.02 103.237 204.188C99.1369 206.424 93.947 207.205 88.675 207.205C80.346 207.205 71.808 205.256 67.023 204.015C66.787 203.954 37.689 195.735 41.373 188.739C41.993 187.562 43.0129 187.092 44.2979 187.092C49.4849 187.092 58.9299 194.816 62.9889 194.816C63.8959 194.816 64.5359 194.43 64.7969 193.488C66.5269 187.284 38.5039 184.676 40.8639 175.692C41.2799 174.102 42.41 173.456 43.998 173.456C50.856 173.455 66.248 185.516 69.467 185.516C69.714 185.516 69.8909 185.443 69.9869 185.291C70.0009 185.268 70.015 185.246 70.028 185.222C71.539 182.727 70.6719 180.913 60.3209 174.573L59.3269 173.968C47.9359 167.074 39.9409 162.925 44.4879 157.975C45.0109 157.404 45.7529 157.151 46.6539 157.151C47.7219 157.151 49.0149 157.508 50.4389 158.108C56.4549 160.645 64.793 167.564 68.276 170.581C68.8239 171.057 69.3683 171.538 69.9089 172.022C69.9089 172.022 74.319 176.608 76.985 176.608C77.599 176.608 78.1199 176.366 78.4729 175.768C80.364 172.58 60.9099 157.838 59.8129 151.755C59.0689 147.634 60.3349 145.546 62.6749 145.546C63.7879 145.546 65.1459 146.02 66.6449 146.971C71.2949 149.922 80.2729 165.35 83.5599 171.352C84.6619 173.363 86.5429 174.213 88.2379 174.213C91.6009 174.213 94.2299 170.87 88.5459 166.622C80.0029 160.23 83.001 149.782 87.078 149.139C87.252 149.111 87.4279 149.097 87.6029 149.097C91.3109 149.097 92.9459 155.486 92.9459 155.486C92.9459 155.486 97.7399 167.524 105.975 175.753C113.447 183.222 114.491 189.351 110.137 196.997ZM136.766 198.407L136.339 198.458L135.611 198.541C135.228 198.581 134.844 198.619 134.459 198.654L134.084 198.688L133.741 198.717L133.255 198.756L132.718 198.795L132.182 198.83L132.063 198.838C131.923 198.846 131.783 198.855 131.641 198.862L131.462 198.872C131.296 198.881 131.13 198.889 130.962 198.896L130.381 198.921L129.854 198.939L129.502 198.949H129.323C129.213 198.949 129.104 198.955 128.994 198.956H128.82C128.71 198.956 128.601 198.956 128.491 198.961L128.043 198.967H127.418C126.927 198.967 126.437 198.962 125.949 198.952L125.553 198.943C125.44 198.943 125.327 198.938 125.216 198.934L124.796 198.922L124.275 198.902L123.805 198.881L123.684 198.876L123.237 198.853C123.112 198.846 122.989 198.84 122.865 198.831L122.576 198.814C122.213 198.791 121.85 198.766 121.487 198.738L121.107 198.707C120.947 198.695 120.787 198.68 120.628 198.666C120.441 198.65 120.254 198.632 120.067 198.614C119.754 198.585 119.441 198.553 119.128 198.519H119.113C123.683 188.324 121.372 178.802 112.137 169.575C106.08 163.526 102.051 154.594 101.215 152.633C99.5229 146.828 95.045 140.375 87.608 140.375C86.979 140.375 86.351 140.425 85.73 140.523C82.472 141.036 79.624 142.911 77.592 145.733C75.396 143.002 73.262 140.831 71.332 139.605C68.422 137.76 65.5179 136.824 62.6889 136.824C59.1579 136.824 56.0019 138.274 53.8019 140.904L53.7459 140.971C53.7039 140.798 53.6639 140.625 53.6229 140.451L53.6179 140.428C53.1992 138.638 52.8477 136.833 52.5639 135.016C52.5639 135.004 52.5639 134.992 52.5579 134.98C52.5359 134.843 52.5159 134.705 52.4949 134.568C52.4334 134.162 52.3757 133.755 52.3219 133.348C52.2979 133.163 52.2719 132.978 52.2489 132.793L52.1809 132.238C52.1589 132.053 52.1409 131.885 52.1209 131.709L52.115 131.665C52.0351 130.945 51.9651 130.225 51.9049 129.503L51.8829 129.226L51.8479 128.754C51.8379 128.625 51.8279 128.495 51.8209 128.365C51.8209 128.334 51.8159 128.304 51.8149 128.275C51.7895 127.913 51.7678 127.55 51.7499 127.187C51.7399 126.998 51.7299 126.81 51.7219 126.62L51.7019 126.124L51.6969 125.974L51.6809 125.517L51.6709 125.128C51.6709 124.973 51.6629 124.818 51.6609 124.663C51.6579 124.508 51.6539 124.338 51.6529 124.174C51.6509 124.01 51.6529 123.848 51.6479 123.685C51.6439 123.521 51.6479 123.358 51.6479 123.195C51.6479 81.3421 85.5789 47.4111 127.436 47.4111C169.292 47.4111 203.222 81.3411 203.222 123.195V124.174C203.222 124.337 203.217 124.501 203.214 124.663C203.214 124.798 203.208 124.931 203.204 125.068C203.204 125.188 203.199 125.309 203.195 125.425C203.195 125.578 203.186 125.731 203.181 125.884V125.896L203.16 126.427C203.153 126.582 203.147 126.738 203.139 126.893L203.134 127.003L203.107 127.499C203.048 128.562 202.967 129.623 202.866 130.683V130.696C202.849 130.87 202.832 131.044 202.813 131.218L202.768 131.629L202.679 132.433L202.628 132.84L202.565 133.319C202.542 133.493 202.519 133.668 202.493 133.841C202.467 134.036 202.438 134.23 202.409 134.424L202.34 134.883L202.258 135.403C202.23 135.576 202.2 135.748 202.168 135.92C202.135 136.093 202.109 136.265 202.079 136.437C202.019 136.781 201.956 137.125 201.89 137.468C201.789 137.981 201.686 138.493 201.58 139.005L201.47 139.512C201.434 139.681 201.395 139.851 201.357 140.02C199.224 137.947 196.399 136.818 193.284 136.818C190.457 136.818 187.55 137.753 184.641 139.598C182.711 140.824 180.578 142.996 178.381 145.726C176.346 142.904 173.498 141.029 170.242 140.516C169.621 140.418 168.993 140.368 168.364 140.368C160.925 140.368 156.45 146.821 154.757 152.626C153.917 154.587 149.887 163.519 143.825 169.577C134.596 178.775 132.268 188.254 136.766 198.407ZM215.007 177.998L214.977 178.087C214.901 178.288 214.813 178.484 214.714 178.674C214.639 178.814 214.558 178.95 214.47 179.082C214.303 179.331 214.12 179.569 213.921 179.793C213.875 179.845 213.831 179.897 213.779 179.948C213.707 180.025 213.634 180.101 213.559 180.175C212.213 181.509 210.161 182.679 207.841 183.752C207.578 183.871 207.311 183.99 207.042 184.11L206.774 184.229C206.595 184.308 206.416 184.386 206.228 184.463C206.049 184.541 205.863 184.619 205.677 184.695L205.119 184.925C203.814 185.462 202.477 185.974 201.173 186.479L200.615 186.696L200.064 186.912C199.697 187.055 199.335 187.198 198.979 187.341L198.448 187.555L197.926 187.768L197.67 187.876C197.499 187.947 197.332 188.018 197.165 188.089C193.328 189.736 190.567 191.411 191.147 193.489C191.163 193.548 191.181 193.604 191.201 193.659C191.253 193.813 191.324 193.958 191.413 194.095C191.465 194.176 191.525 194.253 191.592 194.323C192.274 195.032 193.515 194.92 195.08 194.357C195.3 194.276 195.519 194.192 195.736 194.104L195.872 194.048C196.23 193.896 196.609 193.726 196.996 193.542C197.093 193.496 197.191 193.452 197.289 193.401C199.203 192.465 201.372 191.205 203.524 190.058C204.385 189.593 205.258 189.152 206.142 188.733C208.18 187.774 210.096 187.094 211.636 187.094C212.359 187.094 212.997 187.242 213.529 187.582L213.618 187.641C213.952 187.876 214.232 188.178 214.441 188.528C214.482 188.595 214.522 188.666 214.561 188.739C215.322 190.184 214.685 191.68 213.194 193.147C211.763 194.556 209.537 195.937 207.007 197.215C206.819 197.31 206.631 197.405 206.44 197.498C198.91 201.196 189.049 203.981 188.912 204.016C186.284 204.697 182.526 205.591 178.292 206.26L177.666 206.358L177.563 206.373C177.089 206.445 176.614 206.512 176.138 206.574C175.655 206.639 175.167 206.698 174.676 206.753L174.586 206.763C172.806 206.968 171.019 207.104 169.228 207.169H169.202C168.554 207.192 167.907 207.204 167.259 207.204H166.512C165.524 207.191 164.538 207.146 163.553 207.07C163.53 207.07 163.505 207.07 163.482 207.064C163.129 207.037 162.777 207.004 162.425 206.965C162.06 206.926 161.696 206.882 161.333 206.833C161.094 206.801 160.856 206.765 160.618 206.726C160.376 206.687 160.134 206.647 159.893 206.605L159.564 206.543L159.539 206.538C159.192 206.472 158.847 206.399 158.503 206.319C158.303 206.274 158.104 206.23 157.907 206.176L157.788 206.146C157.69 206.122 157.595 206.096 157.498 206.07L157.445 206.056L157.137 205.966C157.025 205.935 156.913 205.901 156.801 205.868L156.762 205.857L156.471 205.768C156.361 205.734 156.251 205.698 156.142 205.662L155.874 205.573L155.677 205.504C155.487 205.437 155.298 205.368 155.111 205.296L154.933 205.226L154.786 205.168C154.502 205.054 154.22 204.935 153.941 204.81L153.756 204.72L153.725 204.706C153.659 204.675 153.594 204.644 153.528 204.617C153.399 204.555 153.271 204.491 153.144 204.426L153.105 204.407L152.921 204.31C152.594 204.139 152.274 203.957 151.96 203.764L151.788 203.658C151.702 203.605 151.616 203.55 151.532 203.494L151.308 203.346L151.067 203.18L150.923 203.077C150.771 202.969 150.622 202.857 150.476 202.742L150.243 202.563C150.15 202.488 150.058 202.412 149.967 202.335C149.89 202.272 149.815 202.206 149.74 202.14L149.734 202.135C149.653 202.064 149.574 201.993 149.495 201.92C149.417 201.849 149.339 201.777 149.263 201.704L149.254 201.695C149.174 201.619 149.096 201.542 149.019 201.463C148.942 201.385 148.863 201.307 148.788 201.227C148.713 201.148 148.636 201.067 148.562 200.984C148.488 200.902 148.42 200.827 148.35 200.746L148.327 200.719C148.259 200.641 148.192 200.562 148.126 200.481C147.983 200.31 147.844 200.135 147.71 199.956C147.575 199.776 147.443 199.592 147.314 199.405L147.191 199.221C147.027 198.981 146.867 198.739 146.712 198.493C146.596 198.316 146.483 198.138 146.373 197.957C146.302 197.844 146.234 197.73 146.166 197.618L146.138 197.572C146.073 197.462 146.009 197.354 145.947 197.245C145.911 197.186 145.877 197.127 145.845 197.066C145.812 197.004 145.774 196.941 145.739 196.878L145.682 196.779L145.647 196.715C145.58 196.595 145.514 196.474 145.45 196.352C145.42 196.298 145.391 196.244 145.36 196.192L145.271 196.019L145.181 195.848C144.956 195.398 144.743 194.942 144.543 194.48L144.472 194.311C144.426 194.198 144.383 194.086 144.337 193.975C144.315 193.921 144.293 193.868 144.274 193.814C144.167 193.537 144.067 193.257 143.975 192.975C143.942 192.874 143.91 192.775 143.88 192.675C143.808 192.448 143.743 192.219 143.685 191.988C143.614 191.719 143.551 191.448 143.498 191.175C143.487 191.12 143.476 191.065 143.467 191.012C143.415 190.745 143.373 190.476 143.34 190.206C143.332 190.153 143.326 190.1 143.32 190.047L143.303 189.885C143.281 189.673 143.264 189.46 143.254 189.247C143.254 189.193 143.249 189.139 143.247 189.087C143.242 188.981 143.24 188.875 143.239 188.769C143.183 184.496 145.345 180.388 149.968 175.767C158.203 167.54 162.997 155.501 162.997 155.501C162.997 155.501 163.126 154.996 163.394 154.269C163.431 154.168 163.47 154.064 163.514 153.955C163.67 153.548 163.846 153.148 164.041 152.758L164.08 152.683C164.246 152.351 164.428 152.027 164.624 151.712C164.67 151.639 164.714 151.567 164.765 151.494C164.912 151.277 165.067 151.065 165.23 150.86C165.319 150.749 165.416 150.639 165.513 150.532C165.552 150.49 165.59 150.448 165.631 150.408C166.108 149.915 166.653 149.513 167.27 149.299L167.348 149.273C167.4 149.256 167.452 149.24 167.505 149.225C167.566 149.209 167.627 149.195 167.69 149.182L167.719 149.176C167.849 149.15 167.981 149.133 168.114 149.124H168.125C168.194 149.124 168.264 149.117 168.335 149.117C168.424 149.117 168.507 149.117 168.594 149.126C168.684 149.134 168.773 149.144 168.863 149.158C169.605 149.276 170.311 149.718 170.919 150.4C171.15 150.66 171.358 150.94 171.54 151.236C171.66 151.428 171.773 151.631 171.88 151.845C171.923 151.934 171.964 152.016 172.004 152.104C172.108 152.33 172.202 152.56 172.284 152.795C172.479 153.345 172.626 153.911 172.723 154.487C172.807 154.992 172.857 155.502 172.873 156.013C172.881 156.286 172.881 156.563 172.873 156.842C172.819 158.14 172.553 159.421 172.086 160.634C172.044 160.745 171.997 160.857 171.952 160.969C171.86 161.195 171.759 161.417 171.65 161.634C171.569 161.799 171.484 161.965 171.392 162.13C171.332 162.24 171.269 162.35 171.206 162.46C171.045 162.734 170.871 163.006 170.684 163.277L170.571 163.439C170.129 164.055 169.637 164.633 169.099 165.167C168.569 165.698 168.001 166.189 167.4 166.637C166.798 167.083 166.233 167.577 165.711 168.114C164.208 169.691 163.858 171.083 164.196 172.138C164.25 172.304 164.321 172.465 164.407 172.617C164.508 172.791 164.628 172.951 164.764 173.097L164.817 173.152L164.871 173.206C164.925 173.258 164.982 173.309 165.043 173.359L165.103 173.407C165.248 173.519 165.402 173.619 165.563 173.707C165.61 173.732 165.652 173.757 165.705 173.781C165.879 173.866 166.058 173.939 166.242 173.998C166.293 174.015 166.344 174.03 166.396 174.046L166.461 174.063L166.551 174.087L166.628 174.106L166.712 174.124L166.795 174.141L166.874 174.154C166.932 174.164 166.992 174.174 167.052 174.181L167.109 174.19L167.213 174.2L167.277 174.207L167.382 174.214H167.444L167.554 174.22H167.9L167.999 174.214L168.113 174.207L168.252 174.194L168.382 174.179C168.412 174.179 168.442 174.171 168.472 174.165C168.872 174.107 169.264 174.001 169.639 173.849L169.798 173.782C169.887 173.743 169.977 173.702 170.059 173.658C170.235 173.57 170.406 173.47 170.57 173.361C170.799 173.211 171.015 173.043 171.217 172.858C171.265 172.815 171.312 172.769 171.358 172.725C171.381 172.703 171.403 172.682 171.425 172.658C171.469 172.613 171.514 172.569 171.558 172.52C171.878 172.168 172.155 171.78 172.383 171.363C174.34 167.804 176.391 164.298 178.534 160.849L178.828 160.378L179.125 159.907C179.273 159.668 179.423 159.433 179.572 159.199L179.722 158.965C180.22 158.185 180.726 157.41 181.241 156.641L181.546 156.185C182.158 155.278 182.768 154.396 183.373 153.558L183.674 153.143C184.332 152.236 185.017 151.348 185.728 150.482L186.01 150.144C186.057 150.088 186.1 150.032 186.151 149.978C186.244 149.868 186.337 149.761 186.428 149.657C186.474 149.604 186.517 149.552 186.566 149.5L186.834 149.198L186.968 149.051C187.103 148.906 187.235 148.767 187.365 148.634C187.455 148.544 187.538 148.455 187.624 148.371C188.131 147.853 188.69 147.388 189.293 146.985L189.433 146.895C189.567 146.805 189.706 146.721 189.848 146.645C192.212 145.303 194.169 145.204 195.296 146.331C195.978 147.013 196.356 148.144 196.335 149.718C196.335 149.787 196.335 149.857 196.33 149.929V150.006C196.33 150.078 196.324 150.15 196.318 150.223C196.318 150.313 196.308 150.402 196.299 150.492C196.29 150.581 196.285 150.649 196.276 150.729C196.276 150.751 196.272 150.774 196.268 150.798C196.262 150.867 196.253 150.938 196.243 151.009C196.243 151.03 196.243 151.052 196.235 151.074C196.224 151.169 196.21 151.263 196.194 151.357C196.183 151.447 196.168 151.531 196.152 151.619L196.126 151.768C196.1 151.91 196.067 152.05 196.026 152.188C195.948 152.447 195.854 152.7 195.743 152.946C195.588 153.284 195.417 153.613 195.229 153.933C195.125 154.111 195.018 154.286 194.907 154.459C194.793 154.638 194.673 154.819 194.549 155.002C194.233 155.454 193.905 155.897 193.564 156.33L193.408 156.527C192.852 157.22 192.278 157.899 191.686 158.562L191.499 158.772C191.247 159.053 190.991 159.336 190.729 159.62L190.532 159.834C190.401 159.977 190.264 160.12 190.132 160.264C190.001 160.407 189.864 160.552 189.726 160.697L189.315 161.13L188.898 161.566L188.478 162.002C188.196 162.294 187.913 162.586 187.628 162.878C183.573 167.037 179.301 171.182 177.855 173.766C177.758 173.934 177.671 174.108 177.593 174.285C177.387 174.755 177.301 175.157 177.36 175.482C177.379 175.589 177.416 175.691 177.471 175.785C177.552 175.926 177.651 176.056 177.766 176.172C177.819 176.224 177.875 176.272 177.934 176.316C178.232 176.528 178.591 176.637 178.957 176.627H179.071L179.188 176.618L179.305 176.605L179.402 176.591C179.415 176.589 179.429 176.587 179.442 176.583L179.531 176.566L179.554 176.561L179.653 176.54L179.688 176.531C179.723 176.522 179.757 176.513 179.792 176.503C179.827 176.493 179.875 176.48 179.917 176.466C180.093 176.413 180.265 176.35 180.434 176.278C180.523 176.242 180.61 176.203 180.696 176.161C180.741 176.141 180.786 176.12 180.828 176.098L180.962 176.032C181.282 175.866 181.594 175.685 181.898 175.491L182.031 175.401C182.076 175.373 182.121 175.344 182.164 175.312L182.297 175.223L182.368 175.174L182.56 175.039C182.739 174.916 182.906 174.789 183.075 174.66L183.09 174.648L183.359 174.44C183.726 174.15 184.074 173.858 184.39 173.583L184.6 173.399L184.619 173.381L184.729 173.284C184.987 173.052 185.217 172.836 185.408 172.658L185.487 172.581C185.556 172.516 185.619 172.455 185.676 172.403L185.788 172.292L185.828 172.253L185.839 172.242L185.956 172.125L186.03 172.048L186.039 172.041L186.074 172.009L186.118 171.969L186.132 171.956L186.169 171.922L186.373 171.743L186.487 171.641C186.548 171.588 186.607 171.534 186.666 171.479L186.802 171.358C186.827 171.338 186.851 171.316 186.876 171.294L187.019 171.169L187.229 170.984L187.341 170.887C187.776 170.509 188.305 170.052 188.913 169.537L189.162 169.326L189.573 168.981L189.994 168.63C190.544 168.173 191.136 167.688 191.762 167.185L192.173 166.855C192.523 166.576 192.882 166.292 193.246 166.006C193.393 165.891 193.542 165.776 193.694 165.662C194.066 165.373 194.44 165.086 194.817 164.803C195.675 164.155 196.56 163.506 197.456 162.874L197.84 162.606C198.109 162.421 198.377 162.235 198.645 162.054L198.888 161.89C199.367 161.565 199.853 161.248 200.343 160.939L200.586 160.786L200.827 160.636C201.069 160.486 201.309 160.339 201.548 160.196L201.787 160.053L202.265 159.775L202.734 159.506L202.829 159.454L203.2 159.25C203.355 159.166 203.509 159.085 203.663 159.006L203.892 158.888L204.115 158.776C204.193 158.739 204.27 158.7 204.346 158.663C204.848 158.415 205.36 158.187 205.88 157.979C206.021 157.919 206.161 157.865 206.3 157.818L206.71 157.674C206.833 157.633 206.953 157.594 207.068 157.559L207.108 157.547C207.17 157.527 207.232 157.509 207.293 157.493L207.311 157.488C207.439 157.451 207.566 157.419 207.691 157.389H207.7C208.054 157.304 208.414 157.243 208.777 157.206C208.944 157.189 209.111 157.18 209.279 157.181H209.363C209.475 157.181 209.583 157.188 209.69 157.199C209.739 157.199 209.788 157.209 209.836 157.215H209.856C209.904 157.221 209.952 157.228 210 157.239C210.047 157.248 210.095 157.256 210.141 157.267H210.156C210.203 157.277 210.245 157.289 210.294 157.303C210.548 157.374 210.79 157.484 211.012 157.628C211.121 157.699 211.223 157.779 211.317 157.868L211.344 157.894C211.362 157.91 211.379 157.927 211.395 157.944L211.444 157.997C211.846 158.418 212.178 158.901 212.428 159.427L212.466 159.517C212.551 159.717 212.618 159.924 212.666 160.135C212.808 160.781 212.753 161.455 212.508 162.07C212.415 162.318 212.302 162.557 212.169 162.785C211.858 163.309 211.489 163.796 211.07 164.237L210.981 164.332C210.848 164.472 210.71 164.612 210.565 164.752C210.501 164.815 210.434 164.877 210.367 164.94L210.162 165.129L210.055 165.224C209.797 165.454 209.532 165.677 209.263 165.893C209.1 166.025 208.936 166.154 208.77 166.281C208.184 166.729 207.587 167.161 206.979 167.578C206.612 167.83 206.242 168.077 205.869 168.321C204.95 168.924 204.021 169.512 203.083 170.084C201.115 171.294 198.934 172.588 196.609 173.995L196.007 174.36C195.348 174.762 194.726 175.146 194.14 175.512L193.845 175.697L193.287 176.055C192.917 176.292 192.548 176.531 192.179 176.77L191.882 176.966C191.737 177.06 191.593 177.156 191.449 177.252L191.308 177.342L190.876 177.633L190.647 177.79L190.379 177.976L190.13 178.149C189.713 178.444 189.325 178.725 188.968 178.992L188.834 179.094C188.624 179.253 188.416 179.415 188.211 179.58C187.902 179.829 187.62 180.067 187.367 180.296L187.243 180.409C187.172 180.474 187.102 180.539 187.035 180.603C186.989 180.648 186.946 180.693 186.898 180.736L186.834 180.8C186.691 180.944 186.551 181.091 186.416 181.242L186.35 181.318C186.203 181.488 186.075 181.651 185.963 181.81L185.913 181.881C185.825 182.009 185.744 182.141 185.671 182.277C185.652 182.311 185.635 182.345 185.618 182.379L185.569 182.481L185.536 182.555L185.515 182.605L185.498 182.65L185.475 182.711C185.413 182.88 185.37 183.056 185.345 183.234L185.337 183.296L185.331 183.354V183.669C185.331 183.695 185.331 183.721 185.338 183.749L185.343 183.797C185.343 183.823 185.349 183.848 185.353 183.876C185.357 183.902 185.364 183.949 185.372 183.986V183.991C185.379 184.026 185.386 184.06 185.395 184.095C185.404 184.13 185.413 184.17 185.424 184.206C185.443 184.277 185.467 184.347 185.492 184.417C185.508 184.459 185.523 184.5 185.54 184.541C185.54 184.549 185.546 184.558 185.55 184.566L185.586 184.647L185.636 184.758C185.69 184.873 185.749 184.985 185.813 185.094L185.879 185.208L185.947 185.322C185.959 185.341 185.973 185.359 185.988 185.376L186.01 185.399L186.035 185.422L186.061 185.442C186.099 185.469 186.14 185.49 186.183 185.505C186.206 185.513 186.23 185.519 186.254 185.525C186.831 185.655 188.017 185.178 189.593 184.346C189.682 184.298 189.78 184.248 189.875 184.196L190.355 183.934L190.589 183.804C190.756 183.715 190.926 183.614 191.1 183.515L191.417 183.336C193.5 182.137 195.988 180.597 198.56 179.093C198.801 178.952 199.043 178.811 199.285 178.672L199.771 178.361C200.335 178.038 200.902 177.719 201.471 177.404C202.188 177.01 202.91 176.626 203.639 176.254L204.115 176.013C204.431 175.857 204.744 175.705 205.053 175.557C205.651 175.273 206.256 175.003 206.868 174.748L207.203 174.612L207.243 174.596C209.018 173.893 210.627 173.459 211.929 173.459C212.21 173.456 212.492 173.48 212.769 173.528H212.778C212.867 173.544 212.948 173.562 213.031 173.582H213.046C213.259 173.636 213.466 173.713 213.662 173.812C213.937 173.954 214.184 174.143 214.393 174.371C214.489 174.477 214.574 174.592 214.649 174.714C214.789 174.929 214.899 175.162 214.978 175.406C215.01 175.501 215.038 175.594 215.067 175.693C215.278 176.45 215.257 177.253 215.007 177.998Z" fill="#FF9D00"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M203.21 123.685V123.194C203.21 81.34 169.292 47.411 127.435 47.411C85.5791 47.411 51.648 81.342 51.648 123.194V123.358C51.646 123.467 51.645 123.576 51.648 123.685C51.6529 123.848 51.6546 124.011 51.653 124.174L51.6581 124.534L51.661 124.663C51.661 124.723 51.6631 124.782 51.6651 124.842C51.6681 124.937 51.67 125.033 51.67 125.128L51.681 125.517L51.697 125.974L51.702 126.124L51.722 126.597V126.62C51.73 126.805 51.7401 126.989 51.7491 127.173L51.75 127.187C51.76 127.375 51.7701 127.564 51.7821 127.753C51.7921 127.927 51.802 128.101 51.815 128.275L51.8171 128.306C51.8258 128.455 51.8358 128.605 51.847 128.754L51.85 128.794L51.883 129.226L51.8861 129.254C51.8921 129.338 51.898 129.422 51.906 129.503C51.9658 130.224 52.0355 130.945 52.1151 131.664L52.12 131.709L52.181 132.238L52.2491 132.793L52.299 133.17L52.322 133.347C52.3753 133.755 52.433 134.162 52.495 134.568L52.4991 134.595L52.558 134.979C52.8435 136.808 53.1971 138.626 53.618 140.429L53.6231 140.451L53.655 140.586L53.746 140.971L53.802 140.904C56.002 138.274 59.158 136.824 62.689 136.824C65.519 136.824 68.4221 137.76 71.3321 139.605C73.2621 140.831 75.3961 143.002 77.5921 145.733C79.6241 142.911 82.4721 141.035 85.7301 140.523C86.3513 140.425 86.9792 140.376 87.6081 140.375C95.0441 140.375 99.523 146.828 101.215 152.633C102.051 154.594 106.08 163.526 112.156 169.568C121.392 178.795 123.703 188.316 119.132 198.511H119.148C119.459 198.546 119.772 198.578 120.087 198.607C120.274 198.625 120.46 198.643 120.648 198.659L120.714 198.665L121.127 198.7L121.507 198.73C121.869 198.758 122.232 198.784 122.596 198.807L122.885 198.824L123.114 198.838L123.256 198.846L123.703 198.869L123.825 198.874L124.294 198.895L124.816 198.915L125.235 198.927L125.305 198.929C125.394 198.933 125.483 198.936 125.572 198.936L125.668 198.939C126.258 198.953 126.847 198.96 127.437 198.959H128.063L128.51 198.954C128.62 198.949 128.729 198.949 128.84 198.949H129.014L129.165 198.945C129.224 198.943 129.283 198.941 129.343 198.941H129.522L129.873 198.932L130.401 198.914L130.982 198.888C131.15 198.882 131.316 198.873 131.482 198.865L131.661 198.854L131.927 198.84L132.083 198.831L132.201 198.823L132.738 198.788L133.274 198.749L133.761 198.71L134.103 198.681L134.479 198.647C135.107 198.591 135.733 198.525 136.359 198.45L136.786 198.399C132.287 188.247 134.616 178.767 143.813 169.577C149.876 163.519 153.905 154.587 154.745 152.625C156.438 146.821 160.914 140.368 168.352 140.368C168.981 140.368 169.61 140.418 170.231 140.516C173.486 141.028 176.334 142.904 178.369 145.726C180.566 142.996 182.699 140.823 184.63 139.597C187.539 137.753 190.445 136.817 193.272 136.817C196.388 136.817 199.212 137.947 201.345 140.02C201.384 139.851 201.422 139.682 201.459 139.512L201.568 139.006C201.607 138.821 201.646 138.636 201.683 138.451C201.749 138.124 201.815 137.797 201.878 137.467C201.944 137.125 202.007 136.781 202.067 136.437L202.098 136.251C202.117 136.141 202.135 136.031 202.156 135.92C202.19 135.748 202.218 135.576 202.246 135.402L202.257 135.336L202.328 134.883L202.398 134.424V134.42C202.449 134.081 202.497 133.742 202.542 133.403L202.553 133.319L202.616 132.841L202.667 132.433L202.757 131.629L202.792 131.306L202.801 131.218C202.82 131.044 202.838 130.87 202.854 130.696V130.682C202.867 130.544 202.881 130.405 202.893 130.266C202.964 129.478 203.024 128.686 203.072 127.891C203.081 127.761 203.088 127.63 203.096 127.499V127.493L203.122 127.002L203.128 126.892C203.144 126.56 203.158 126.228 203.169 125.896V125.884L203.174 125.754C203.179 125.645 203.183 125.535 203.183 125.425L203.185 125.381C203.189 125.278 203.193 125.172 203.193 125.067L203.196 124.977C203.199 124.872 203.202 124.768 203.202 124.663L203.204 124.574C203.207 124.441 203.21 124.307 203.21 124.174V123.685ZM108.638 199.391C114.64 190.59 114.214 183.984 105.98 175.754C97.7441 167.523 92.951 155.487 92.951 155.487C92.951 155.487 91.1621 148.496 87.0821 149.138C83.0021 149.78 80.0091 160.227 88.5521 166.622C97.0941 173.017 86.8521 177.353 83.5641 171.352C80.2761 165.35 71.299 149.923 66.645 146.972C61.991 144.021 58.718 145.675 59.815 151.757C60.36 154.776 65.4281 159.929 70.1631 164.743C74.9671 169.627 79.428 174.163 78.474 175.768C76.581 178.955 69.9141 172.023 69.9141 172.023C69.9141 172.023 49.038 153.025 44.494 157.976C40.304 162.539 46.765 166.418 56.7211 172.397C57.5671 172.905 58.4391 173.429 59.3321 173.969C70.7231 180.865 71.609 182.684 69.992 185.293C69.395 186.257 65.582 183.968 60.892 181.153C52.897 176.352 42.3551 170.023 40.8661 175.688C39.5781 180.591 47.334 183.595 54.368 186.32C60.228 188.59 65.5881 190.666 64.7991 193.484C63.9821 196.406 59.5531 193.969 54.7121 191.305C49.2771 188.314 43.3221 185.038 41.3731 188.735C37.6901 195.725 66.7831 203.954 67.0231 204.015C76.4231 206.453 100.295 211.619 108.638 199.391ZM147.303 199.391C141.301 190.59 141.727 183.984 149.962 175.754C158.197 167.523 162.99 155.487 162.99 155.487C162.99 155.487 164.779 148.496 168.859 149.138C172.939 149.78 175.932 160.227 167.39 166.622C158.847 173.017 169.089 177.353 172.377 171.352C175.666 165.35 184.637 149.923 189.291 146.972C193.945 144.021 197.22 145.675 196.122 151.757C195.578 154.776 190.509 159.929 185.774 164.744C180.97 169.628 176.509 174.163 177.462 175.768C179.355 178.955 186.027 172.019 186.027 172.019C186.027 172.019 206.902 153.022 211.448 157.973C215.637 162.535 209.176 166.415 199.219 172.394C198.348 172.917 197.478 173.441 196.609 173.966C185.218 180.862 184.332 182.681 185.948 185.289C186.546 186.254 190.359 183.964 195.048 181.149C203.044 176.349 213.586 170.019 215.075 175.685C216.364 180.588 208.607 183.592 201.573 186.317C195.713 188.587 190.353 190.663 191.141 193.481C191.957 196.402 196.385 193.965 201.225 191.301C206.66 188.31 212.616 185.032 214.564 188.732C218.248 195.726 189.15 203.947 188.915 204.007C179.515 206.453 155.643 211.619 147.303 199.391Z" fill="#FFD21E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M152.047 102.567C153.229 102.985 154.108 104.257 154.944 105.468C156.074 107.104 157.126 108.627 158.74 107.769C160.644 106.756 162.205 105.202 163.225 103.302C164.246 101.402 164.681 99.2427 164.475 97.096C164.321 95.4908 163.813 93.9398 162.987 92.5548C162.161 91.1697 161.038 89.985 159.7 89.0862C158.361 88.1874 156.839 87.5968 155.245 87.3569C153.65 87.117 152.022 87.2339 150.478 87.699C148.934 88.1639 147.513 88.9653 146.316 90.0455C145.119 91.1257 144.176 92.4578 143.556 93.946C142.936 95.4342 142.653 97.0415 142.728 98.652C142.804 100.263 143.235 101.836 143.992 103.26C144.74 104.667 146.4 104.003 148.152 103.302C149.525 102.753 150.956 102.181 152.047 102.567ZM100.672 102.567C99.49 102.985 98.611 104.258 97.775 105.468C96.645 107.105 95.592 108.627 93.979 107.769C91.5845 106.501 89.7482 104.386 88.8278 101.838C87.9075 99.2895 87.9692 96.4896 89.0008 93.9841C90.0324 91.4786 91.9601 89.4471 94.408 88.2855C96.856 87.1239 99.6488 86.9156 102.242 87.701C104.307 88.3228 106.141 89.5427 107.513 91.2065C108.885 92.8704 109.732 94.9035 109.949 97.049C110.165 99.1945 109.74 101.356 108.728 103.26C107.979 104.667 106.319 104.003 104.567 103.303C103.193 102.753 101.764 102.181 100.672 102.567ZM144.099 149.318C152.242 142.903 155.233 132.429 155.233 125.977C155.233 120.877 151.802 122.482 146.309 125.202L145.999 125.355C140.957 127.852 134.245 131.177 126.877 131.177C119.508 131.177 112.796 127.852 107.755 125.354C102.084 122.545 98.527 120.783 98.527 125.978C98.527 132.634 101.709 143.563 110.443 149.912C111.596 147.573 113.219 145.497 115.211 143.813C117.202 142.129 119.52 140.874 122.018 140.126C122.89 139.866 123.788 141.367 124.707 142.904C125.594 144.386 126.501 145.902 127.423 145.902C128.406 145.902 129.371 144.408 130.314 142.95C131.299 141.425 132.26 139.94 133.189 140.237C137.864 141.738 141.775 144.993 144.099 149.318Z" fill="#32343D"/>
+<path d="M144.097 149.317C139.856 152.659 134.219 154.9 126.878 154.9C119.981 154.9 114.587 152.922 110.443 149.911C111.596 147.572 113.219 145.495 115.211 143.812C117.202 142.128 119.52 140.873 122.018 140.125C123.73 139.614 125.545 145.901 127.423 145.901C129.433 145.901 131.37 139.655 133.189 140.236C137.863 141.738 141.773 144.993 144.097 149.317Z" fill="#FF323D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M81.2 111.64C80.2312 112.288 79.1173 112.687 77.9572 112.801C76.7971 112.916 75.6267 112.742 74.55 112.295C73.6893 111.94 72.9072 111.418 72.2488 110.759C71.5903 110.101 71.0684 109.319 70.713 108.458C70.267 107.381 70.0935 106.211 70.2082 105.051C70.3228 103.891 70.7219 102.777 71.37 101.808C72.1488 100.642 73.2558 99.7333 74.5512 99.1967C75.8466 98.6601 77.272 98.5197 78.6471 98.7935C80.0223 99.0672 81.2853 99.7427 82.2764 100.734C83.2675 101.726 83.9422 102.99 84.215 104.365C84.4883 105.74 84.3477 107.165 83.8113 108.46C83.2748 109.755 82.3654 110.861 81.2 111.64ZM182.613 111.64C181.644 112.288 180.53 112.687 179.37 112.801C178.209 112.916 177.039 112.742 175.962 112.295C175.101 111.939 174.319 111.418 173.661 110.759C173.003 110.101 172.481 109.319 172.125 108.458C171.68 107.381 171.507 106.211 171.621 105.051C171.736 103.891 172.135 102.777 172.782 101.808C173.364 100.936 174.133 100.205 175.032 99.6658C175.931 99.1269 176.938 98.7942 177.981 98.6917C179.025 98.5891 180.078 98.7193 181.064 99.0728C182.051 99.4264 182.947 99.9944 183.688 100.736C184.68 101.727 185.355 102.99 185.628 104.365C185.902 105.74 185.761 107.165 185.224 108.46C184.687 109.755 183.779 110.861 182.613 111.64Z" fill="#FFAD03"/>
+</svg>
diff --git a/packages/client/src/icons/provider/assets/mistral.png b/packages/client/src/icons/provider/assets/mistral.png
new file mode 100644
index 00000000000..beaffab92cc
Binary files /dev/null and b/packages/client/src/icons/provider/assets/mistral.png differ
diff --git a/packages/client/src/icons/provider/assets/mlx.png b/packages/client/src/icons/provider/assets/mlx.png
new file mode 100644
index 00000000000..06a77c9b6c1
Binary files /dev/null and b/packages/client/src/icons/provider/assets/mlx.png differ
diff --git a/packages/client/src/icons/provider/assets/ollama.png b/packages/client/src/icons/provider/assets/ollama.png
new file mode 100644
index 00000000000..53979f88708
Binary files /dev/null and b/packages/client/src/icons/provider/assets/ollama.png differ
diff --git a/packages/client/src/icons/provider/assets/openrouter.png b/packages/client/src/icons/provider/assets/openrouter.png
new file mode 100644
index 00000000000..5d47b23fc64
Binary files /dev/null and b/packages/client/src/icons/provider/assets/openrouter.png differ
diff --git a/packages/client/src/icons/provider/assets/perplexity.png b/packages/client/src/icons/provider/assets/perplexity.png
new file mode 100644
index 00000000000..e3edc716d2a
Binary files /dev/null and b/packages/client/src/icons/provider/assets/perplexity.png differ
diff --git a/packages/client/src/icons/provider/assets/qwen.svg b/packages/client/src/icons/provider/assets/qwen.svg
new file mode 100644
index 00000000000..ed17f7c072a
--- /dev/null
+++ b/packages/client/src/icons/provider/assets/qwen.svg
@@ -0,0 +1 @@
+<svg height="56" style="flex: 0 0 auto; line-height: 1;" viewBox="0 0 24 24" width="56" xmlns="http://www.w3.org/2000/svg"><title>Qwen</title><defs><linearGradient id="lobe-icons-qwen-fill" x1="0%" x2="100%" y1="0%" y2="0%"><stop offset="0%" stop-color="#00055F" stop-opacity=".84"></stop><stop offset="100%" stop-color="#6F69F7" stop-opacity=".84"></stop></linearGradient></defs><path d="M12.604 1.34c.393.69.784 1.382 1.174 2.075a.18.18 0 00.157.091h5.552c.174 0 .322.11.446.327l1.454 2.57c.19.337.24.478.024.837-.26.43-.513.864-.76 1.3l-.367.658c-.106.196-.223.28-.04.512l2.652 4.637c.172.301.111.494-.043.77-.437.785-.882 1.564-1.335 2.34-.159.272-.352.375-.68.37-.777-.016-1.552-.01-2.327.016a.099.099 0 00-.081.05 575.097 575.097 0 01-2.705 4.74c-.169.293-.38.363-.725.364-.997.003-2.002.004-3.017.002a.537.537 0 01-.465-.271l-1.335-2.323a.09.09 0 00-.083-.049H4.982c-.285.03-.553-.001-.805-.092l-1.603-2.77a.543.543 0 01-.002-.54l1.207-2.12a.198.198 0 000-.197 550.951 550.951 0 01-1.875-3.272l-.79-1.395c-.16-.31-.173-.496.095-.965.465-.813.927-1.625 1.387-2.436.132-.234.304-.334.584-.335a338.3 338.3 0 012.589-.001.124.124 0 00.107-.063l2.806-4.895a.488.488 0 01.422-.246c.524-.001 1.053 0 1.583-.006L11.704 1c.341-.003.724.032.9.34zm-3.432.403a.06.06 0 00-.052.03L6.254 6.788a.157.157 0 01-.135.078H3.253c-.056 0-.07.025-.041.074l5.81 10.156c.025.042.013.062-.034.063l-2.795.015a.218.218 0 00-.2.116l-1.32 2.31c-.044.078-.021.118.068.118l5.716.008c.046 0 .08.02.104.061l1.403 2.454c.046.081.092.082.139 0l5.006-8.76.783-1.382a.055.055 0 01.096 0l1.424 2.53a.122.122 0 00.107.062l2.763-.02a.04.04 0 00.035-.02.041.041 0 000-.04l-2.9-5.086a.108.108 0 010-.113l.293-.507 1.12-1.977c.024-.041.012-.062-.035-.062H9.2c-.059 0-.073-.026-.043-.077l1.434-2.505a.107.107 0 000-.114L9.225 1.774a.06.06 0 00-.053-.031zm6.29 8.02c.046 0 .058.02.034.06l-.832 1.465-2.613 4.585a.056.056 0 01-.05.029.058.058 0 01-.05-.029L8.498 9.841c-.02-.034-.01-.052.028-.054l.216-.012 6.722-.012z" fill="url(#lobe-icons-qwen-fill)" fill-rule="nonzero"></path></svg>
\ No newline at end of file
diff --git a/packages/client/src/icons/provider/assets/shuttleai.png b/packages/client/src/icons/provider/assets/shuttleai.png
new file mode 100644
index 00000000000..411b5ad3400
Binary files /dev/null and b/packages/client/src/icons/provider/assets/shuttleai.png differ
diff --git a/packages/client/src/icons/provider/assets/together.png b/packages/client/src/icons/provider/assets/together.png
new file mode 100644
index 00000000000..0401507937e
Binary files /dev/null and b/packages/client/src/icons/provider/assets/together.png differ
diff --git a/packages/client/src/icons/provider/assets/unify.webp b/packages/client/src/icons/provider/assets/unify.webp
new file mode 100644
index 00000000000..dbb233a2fd0
Binary files /dev/null and b/packages/client/src/icons/provider/assets/unify.webp differ
diff --git a/packages/client/src/icons/provider/index.ts b/packages/client/src/icons/provider/index.ts
new file mode 100644
index 00000000000..ab904ffefb9
--- /dev/null
+++ b/packages/client/src/icons/provider/index.ts
@@ -0,0 +1,6 @@
+export { ProviderIcon } from './Icon';
+export { ProviderAvatar } from './Avatar';
+export { providerIcons, getProviderIconDef } from './registry';
+export type { ProviderArt, ProviderIconDef } from './registry';
+export type { ProviderIconProps } from './Icon';
+export type { ProviderAvatarProps } from './Avatar';
diff --git a/packages/client/src/icons/provider/registry.spec.ts b/packages/client/src/icons/provider/registry.spec.ts
new file mode 100644
index 00000000000..85403322639
--- /dev/null
+++ b/packages/client/src/icons/provider/registry.spec.ts
@@ -0,0 +1,71 @@
+import fs from 'fs';
+import path from 'path';
+import { ProviderId } from 'librechat-data-provider';
+import { getProviderIconDef, providerIcons } from './registry';
+
+const packageAssets = path.resolve(__dirname, 'assets');
+
+const packagedAssetFiles = [
+  'anyscale.png',
+  'apipie.png',
+  'cohere.png',
+  'deepseek.svg',
+  'fireworks.png',
+  'groq.png',
+  'helicone.svg',
+  'huggingface.svg',
+  'mistral.png',
+  'mlx.png',
+  'ollama.png',
+  'openrouter.png',
+  'perplexity.png',
+  'qwen.svg',
+  'shuttleai.png',
+  'together.png',
+  'unify.webp',
+];
+
+describe('providerIcons', () => {
+  it('has an entry for every ProviderId', () => {
+    for (const id of Object.values(ProviderId)) {
+      expect(providerIcons[id]).toBeDefined();
+      expect(providerIcons[id].label).toBeTruthy();
+    }
+  });
+
+  it('points every asset entry at a file shipped with the package', () => {
+    for (const fileName of packagedAssetFiles) {
+      expect(fs.existsSync(path.join(packageAssets, fileName))).toBe(true);
+    }
+    for (const def of Object.values(providerIcons)) {
+      if (def.art.kind === 'asset') {
+        expect(def.art.src).toBeTruthy();
+      }
+    }
+  });
+
+  it('marks raster art as not monochrome', () => {
+    for (const def of Object.values(providerIcons)) {
+      if (def.art.kind === 'asset') {
+        expect(def.mono).not.toBe(true);
+      }
+    }
+  });
+
+  it('does not attach landing padding to every Cohere icon', () => {
+    expect(providerIcons[ProviderId.cohere].className).toBeUndefined();
+  });
+
+  it('refines Google by model so Gemini and Gemma keep distinct labels', () => {
+    expect(getProviderIconDef(ProviderId.google, 'gemini-2.5-pro').label).toBe('Gemini');
+    expect(getProviderIconDef(ProviderId.google, 'gemma-3-27b').label).toBe('Gemma');
+    expect(getProviderIconDef(ProviderId.google, 'some-other-model').label).toBe('Google');
+  });
+
+  it('varies the OpenAI tile color by model generation', () => {
+    const gpt4 = getProviderIconDef(ProviderId.openai, 'gpt-4o');
+    const gpt5 = getProviderIconDef(ProviderId.openai, 'gpt-5.6');
+    expect(gpt4.brandColor).toBe('var(--provider-openai-gpt4, #AB68FF)');
+    expect(gpt5.brandColor).toBe('var(--provider-openai-reasoning, #000000)');
+  });
+});
diff --git a/packages/client/src/icons/provider/registry.ts b/packages/client/src/icons/provider/registry.ts
new file mode 100644
index 00000000000..3f327332b2d
--- /dev/null
+++ b/packages/client/src/icons/provider/registry.ts
@@ -0,0 +1,132 @@
+import { ProviderId } from 'librechat-data-provider';
+import type { ComponentType, SVGProps } from 'react';
+import GoogleMinimalIcon from '../../svgs/GoogleMinimalIcon';
+import CustomMinimalIcon from '../../svgs/CustomMinimalIcon';
+import AzureMinimalIcon from '../../svgs/AzureMinimalIcon';
+import AnthropicIcon from '../../svgs/AnthropicIcon';
+import MoonshotIcon from '../../svgs/MoonshotIcon';
+import BedrockIcon from '../../svgs/BedrockIcon';
+import GeminiIcon from '../../svgs/GeminiIcon';
+import GPTIcon from '../../svgs/GPTIcon';
+import XAIcon from '../../svgs/XAIcon';
+
+type ProviderArtComponent = ComponentType<SVGProps<SVGSVGElement> & { size?: number }>;
+
+export type ProviderArt =
+  | { kind: 'component'; Component: ProviderArtComponent }
+  | { kind: 'asset'; src: string };
+
+export interface ProviderIconDef {
+  art: ProviderArt;
+  label: string;
+  /** Avatar tile background. Absent means the tile renders with no background. */
+  brandColor?: string;
+  /** Art inherits currentColor and follows the active theme. */
+  mono?: boolean;
+  /** Per provider layout correction, replacing the old knownEndpointClasses map. */
+  className?: string;
+  /** Model level refinement merged over the base definition. */
+  byModel?: (model: string) => Partial<ProviderIconDef> | undefined;
+}
+
+const asset = (src: string): ProviderArt => ({ kind: 'asset', src });
+
+const component = (Component: ProviderArtComponent): ProviderArt => ({
+  kind: 'component',
+  Component,
+});
+
+const openAIBrandColor = (model: string): string => {
+  const value = model.toLowerCase();
+  if (/\b(o\d)\b/.test(value) || /\bgpt-[5-9](?:\.\d+)?\b/.test(value)) {
+    return 'var(--provider-openai-reasoning, #000000)';
+  }
+  return value.includes('gpt-4')
+    ? 'var(--provider-openai-gpt4, #AB68FF)'
+    : 'var(--provider-openai, #19C37D)';
+};
+
+const googleByModel = (model: string): Partial<ProviderIconDef> | undefined => {
+  const value = model.toLowerCase();
+  if (/gemini|learnlm/.test(value)) {
+    return { art: component(GeminiIcon), mono: false, label: 'Gemini' };
+  }
+  if (value.includes('gemma')) {
+    return { art: component(GeminiIcon), mono: false, label: 'Gemma' };
+  }
+  return undefined;
+};
+
+export const providerIcons: Record<ProviderId, ProviderIconDef> = {
+  [ProviderId.openai]: {
+    art: component(GPTIcon),
+    label: 'OpenAI',
+    mono: true,
+    brandColor: 'var(--provider-openai, #19C37D)',
+    byModel: (model) => ({ brandColor: openAIBrandColor(model) }),
+  },
+  [ProviderId.anthropic]: {
+    art: component(AnthropicIcon),
+    label: 'Anthropic',
+    mono: true,
+    brandColor: 'var(--provider-anthropic, #d09a74)',
+  },
+  [ProviderId.google]: {
+    art: component(GoogleMinimalIcon),
+    label: 'Google',
+    mono: true,
+    byModel: googleByModel,
+  },
+  [ProviderId.azure]: {
+    art: component(AzureMinimalIcon),
+    label: 'Azure OpenAI',
+    mono: true,
+    brandColor: 'var(--provider-azure, linear-gradient(0.375turn, #61bde2, #4389d0))',
+  },
+  [ProviderId.bedrock]: {
+    art: component(BedrockIcon),
+    label: 'AWS Bedrock',
+    mono: true,
+    brandColor: 'var(--provider-bedrock, #268672)',
+  },
+  [ProviderId.xai]: { art: component(XAIcon), label: 'xAI', mono: true },
+  [ProviderId.moonshot]: { art: component(MoonshotIcon), label: 'Moonshot', mono: true },
+  [ProviderId.anyscale]: { art: asset('assets/anyscale.png'), label: 'Anyscale' },
+  [ProviderId.apipie]: { art: asset('assets/apipie.png'), label: 'APIpie' },
+  [ProviderId.cohere]: {
+    art: asset('assets/cohere.png'),
+    label: 'Cohere',
+  },
+  [ProviderId.deepseek]: { art: asset('assets/deepseek.svg'), label: 'DeepSeek' },
+  [ProviderId.fireworks]: { art: asset('assets/fireworks.png'), label: 'Fireworks' },
+  [ProviderId.groq]: { art: asset('assets/groq.png'), label: 'Groq' },
+  [ProviderId.helicone]: { art: asset('assets/helicone.svg'), label: 'Helicone' },
+  [ProviderId.huggingface]: { art: asset('assets/huggingface.svg'), label: 'Hugging Face' },
+  [ProviderId.mistral]: { art: asset('assets/mistral.png'), label: 'Mistral' },
+  [ProviderId.mlx]: { art: asset('assets/mlx.png'), label: 'MLX' },
+  [ProviderId.ollama]: { art: asset('assets/ollama.png'), label: 'Ollama' },
+  [ProviderId.openrouter]: { art: asset('assets/openrouter.png'), label: 'OpenRouter' },
+  [ProviderId.perplexity]: { art: asset('assets/perplexity.png'), label: 'Perplexity' },
+  [ProviderId.qwen]: { art: asset('assets/qwen.svg'), label: 'Qwen' },
+  [ProviderId.shuttleai]: { art: asset('assets/shuttleai.png'), label: 'ShuttleAI' },
+  [ProviderId.together]: { art: asset('assets/together.png'), label: 'Together AI' },
+  [ProviderId.unify]: { art: asset('assets/unify.webp'), label: 'Unify' },
+  [ProviderId.vercel]: {
+    art: component(CustomMinimalIcon),
+    label: 'Vercel',
+    mono: true,
+  },
+};
+
+/** Merges any model level refinement over the base definition for a provider. */
+export function getProviderIconDef(
+  provider?: ProviderId | null,
+  model?: string | null,
+): ProviderIconDef {
+  const base = provider ? providerIcons[provider] : undefined;
+  if (!base) {
+    return { art: component(CustomMinimalIcon), label: 'Custom', mono: true };
+  }
+  const refinement = model ? base.byModel?.(model) : undefined;
+  return refinement ? { ...base, ...refinement } : base;
+}
diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
index 709697c99f2..551eec05c4a 100644
--- a/packages/client/src/index.ts
+++ b/packages/client/src/index.ts
@@ -14,6 +14,9 @@ export * from './store';
 // SVGs
 export * from './svgs';
 
+// Provider icons
+export * from './icons/provider';
+
 // Utils
 export * from './utils';
 
diff --git a/packages/client/src/svgs/AnthropicIcon.tsx b/packages/client/src/svgs/AnthropicIcon.tsx
index fee9b793334..6ce5bc9897b 100644
--- a/packages/client/src/svgs/AnthropicIcon.tsx
+++ b/packages/client/src/svgs/AnthropicIcon.tsx
@@ -13,7 +13,7 @@ export default function AnthropicIcon({
       overflow="visible"
       width={size}
       height={size}
-      className={cn('fill-current text-black', className)}
+      className={cn('fill-current', className)}
       aria-hidden="true"
     >
       <g
diff --git a/packages/client/src/svgs/BedrockIcon.tsx b/packages/client/src/svgs/BedrockIcon.tsx
index bb6efd63d94..1a462e66e30 100644
--- a/packages/client/src/svgs/BedrockIcon.tsx
+++ b/packages/client/src/svgs/BedrockIcon.tsx
@@ -14,7 +14,7 @@ export default function BedrockIcon({
       height={size}
       viewBox="0 0 24 24"
       xmlns="http://www.w3.org/2000/svg"
-      className={cn('fill-current text-black', className)}
+      className={cn('fill-current', className)}
       aria-hidden="true"
     >
       <g fill="currentColor">
diff --git a/packages/client/src/theme/README.md b/packages/client/src/theme/README.md
index 64f171e0d8c..46e74e41130 100644
--- a/packages/client/src/theme/README.md
+++ b/packages/client/src/theme/README.md
@@ -545,6 +545,11 @@ function App() {
 remain synchronized when they change. Only pass theme props when the parent should control those
 values; otherwise use the context setters and allow stored preferences to remain authoritative.
 
+Set `persistThemeDefinition={false}` when a parent controls a deployment or embedded theme that
+must not replace the user's stored theme definition, legacy colors, name, or source. Appearance
+mode changes remain independently persisted through `color-theme`; leave `initialTheme` undefined
+when the stored light, dark, or system preference should remain authoritative.
+
 ## Contributing
 
 When adding new theme colors:
diff --git a/packages/client/src/theme/context/ThemeProvider.spec.tsx b/packages/client/src/theme/context/ThemeProvider.spec.tsx
index 10b06603020..48991884b5c 100644
--- a/packages/client/src/theme/context/ThemeProvider.spec.tsx
+++ b/packages/client/src/theme/context/ThemeProvider.spec.tsx
@@ -106,6 +106,74 @@ describe('ThemeProvider', () => {
     expect(localStorage.getItem('theme-source')).toBe('definition');
   });
 
+  it('applies a controlled definition without replacing stored theme preferences', async () => {
+    const storedDefinition = {
+      version: 1 as const,
+      name: 'stored',
+      modes: { light: { colors: { 'rgb-accent-primary': '1 2 3' } } },
+    };
+    const storedColors = { 'rgb-accent-primary': '1 2 3' };
+    localStorage.setItem('theme-definition', JSON.stringify(storedDefinition));
+    localStorage.setItem('theme-colors', JSON.stringify(storedColors));
+    localStorage.setItem('theme-name', 'stored');
+    localStorage.setItem('theme-source', 'legacy');
+
+    const { rerender, unmount } = render(
+      <ThemeProvider
+        initialTheme="light"
+        persistThemeDefinition={false}
+        themeDefinition={{
+          version: 1,
+          name: 'deployment',
+          modes: { light: { colors: { 'rgb-accent-primary': '4 5 6' } } },
+        }}
+      >
+        <Controls />
+      </ThemeProvider>,
+    );
+
+    await waitFor(() => {
+      expect(document.documentElement.dataset.theme).toBe('deployment');
+    });
+    expect(document.documentElement.style.getPropertyValue('--accent-primary')).toBe('4 5 6');
+    expect(JSON.parse(localStorage.getItem('theme-definition') ?? '{}')).toEqual(storedDefinition);
+    expect(JSON.parse(localStorage.getItem('theme-colors') ?? '{}')).toEqual(storedColors);
+    expect(localStorage.getItem('theme-name')).toBe('stored');
+    expect(localStorage.getItem('theme-source')).toBe('legacy');
+
+    rerender(
+      <ThemeProvider
+        initialTheme="light"
+        persistThemeDefinition={false}
+        themeDefinition={{
+          version: 1,
+          name: 'deployment-next',
+          modes: { light: { colors: { 'rgb-accent-primary': '7 8 9' } } },
+        }}
+      >
+        <Controls />
+      </ThemeProvider>,
+    );
+
+    await waitFor(() => {
+      expect(document.documentElement.dataset.theme).toBe('deployment-next');
+    });
+    expect(document.documentElement.style.getPropertyValue('--accent-primary')).toBe('7 8 9');
+    expect(JSON.parse(localStorage.getItem('theme-definition') ?? '{}')).toEqual(storedDefinition);
+
+    unmount();
+    render(
+      <ThemeProvider initialTheme="light">
+        <Controls />
+      </ThemeProvider>,
+    );
+
+    await waitFor(() => {
+      expect(document.documentElement.dataset.theme).toBe('stored');
+    });
+    expect(document.documentElement.style.getPropertyValue('--accent-primary')).toBe('1 2 3');
+  });
+
   it('keeps valid legacy overrides when another token is malformed', async () => {
     render(
       <ThemeProvider
diff --git a/packages/client/src/theme/context/ThemeProvider.tsx b/packages/client/src/theme/context/ThemeProvider.tsx
index 1e6a748e708..c0cfc7a565b 100644
--- a/packages/client/src/theme/context/ThemeProvider.tsx
+++ b/packages/client/src/theme/context/ThemeProvider.tsx
@@ -66,6 +66,8 @@ export interface ThemeProviderProps {
   children: React.ReactNode;
   themeRGB?: IThemeRGB;
   themeDefinition?: ThemeDefinition;
+  /** Whether theme definition, color, name, and source changes should be persisted. */
+  persistThemeDefinition?: boolean;
   themeName?: string;
   initialTheme?: string;
 }
@@ -222,6 +224,7 @@ export function ThemeProvider({
   children,
   themeRGB: propThemeRGB,
   themeDefinition: propThemeDefinition,
+  persistThemeDefinition = true,
   themeName: propThemeName,
   initialTheme,
 }: ThemeProviderProps): JSX.Element {
@@ -285,6 +288,16 @@ export function ThemeProvider({
   const themeDOMSnapshot = useRef<ThemeDOMSnapshot | undefined>(undefined);
   const themeClassSnapshot = useRef<ThemeClassSnapshot | undefined>(undefined);
 
+  const writeThemeStorage = useCallback(
+    (key: string, value?: string) => {
+      if (!persistThemeDefinition) {
+        return;
+      }
+      writeStorage(key, value);
+    },
+    [persistThemeDefinition],
+  );
+
   const restoreAppliedTheme = useCallback((root = window.document.documentElement) => {
     if (!themeDOMSnapshot.current) {
       return;
@@ -326,19 +339,19 @@ export function ThemeProvider({
     const definition = validPropDefinition ?? legacyDefinition;
     if (!definition) {
       if (propThemeName !== undefined && themeDefinition) {
-        writeStorage(THEME_DEFINITION_KEY, JSON.stringify(themeDefinition));
-        writeStorage(THEME_NAME_KEY, themeDefinition.name);
-        writeStorage(THEME_SOURCE_KEY, legacyThemeRGB ? 'legacy' : 'definition');
+        writeThemeStorage(THEME_DEFINITION_KEY, JSON.stringify(themeDefinition));
+        writeThemeStorage(THEME_NAME_KEY, themeDefinition.name);
+        writeThemeStorage(THEME_SOURCE_KEY, legacyThemeRGB ? 'legacy' : 'definition');
       } else if (propThemeName && !themeDefinition) {
-        writeStorage(THEME_NAME_KEY, propThemeName);
+        writeThemeStorage(THEME_NAME_KEY, propThemeName);
       }
       return;
     }
 
-    writeStorage(THEME_DEFINITION_KEY, JSON.stringify(definition));
-    writeStorage(THEME_NAME_KEY, definition.name);
-    writeStorage(THEME_SOURCE_KEY, legacyDefinition ? 'legacy' : 'definition');
-    writeStorage(
+    writeThemeStorage(THEME_DEFINITION_KEY, JSON.stringify(definition));
+    writeThemeStorage(THEME_NAME_KEY, definition.name);
+    writeThemeStorage(THEME_SOURCE_KEY, legacyDefinition ? 'legacy' : 'definition');
+    writeThemeStorage(
       THEME_COLORS_KEY,
       !propThemeDefinition && legacyDefinition
         ? JSON.stringify(legacyDefinition.modes.light?.colors ?? {})
@@ -351,6 +364,7 @@ export function ThemeProvider({
     propThemeName,
     propThemeRGB,
     themeDefinition,
+    writeThemeStorage,
   ]);
 
   const setTheme = useCallback((newTheme: string) => {
@@ -361,57 +375,66 @@ export function ThemeProvider({
     writeStorage(THEME_KEY, newTheme);
   }, []);
 
-  const setThemeDefinition = useCallback((definition?: ThemeDefinition) => {
-    const errors = definition ? validateThemeDefinition(definition) : [];
-    if (errors.length > 0) {
-      throw new TypeError(errors.join('\n'));
-    }
-    themeDefinitionRef.current = definition;
-    setThemeDefinitionState(definition);
-    legacyThemeRGBRef.current = undefined;
-    setLegacyThemeRGB(undefined);
-    writeStorage(THEME_DEFINITION_KEY, definition ? JSON.stringify(definition) : undefined);
-    writeStorage(THEME_COLORS_KEY);
-    writeStorage(THEME_SOURCE_KEY, definition ? 'definition' : undefined);
-    setThemeNameState(definition?.name);
-    themeNameRef.current = definition?.name;
-    writeStorage(THEME_NAME_KEY, definition?.name);
-  }, []);
+  const setThemeDefinition = useCallback(
+    (definition?: ThemeDefinition) => {
+      const errors = definition ? validateThemeDefinition(definition) : [];
+      if (errors.length > 0) {
+        throw new TypeError(errors.join('\n'));
+      }
+      themeDefinitionRef.current = definition;
+      setThemeDefinitionState(definition);
+      legacyThemeRGBRef.current = undefined;
+      setLegacyThemeRGB(undefined);
+      writeThemeStorage(THEME_DEFINITION_KEY, definition ? JSON.stringify(definition) : undefined);
+      writeThemeStorage(THEME_COLORS_KEY);
+      writeThemeStorage(THEME_SOURCE_KEY, definition ? 'definition' : undefined);
+      setThemeNameState(definition?.name);
+      themeNameRef.current = definition?.name;
+      writeThemeStorage(THEME_NAME_KEY, definition?.name);
+    },
+    [writeThemeStorage],
+  );
 
-  const setThemeRGB = useCallback((colors?: IThemeRGB) => {
-    const definition = colors
-      ? fromLegacyTheme(colors, themeDefinitionRef.current?.name ?? themeNameRef.current)
-      : undefined;
-    const legacyColors = definition?.modes.light?.colors;
-    themeDefinitionRef.current = definition;
-    setThemeDefinitionState(definition);
-    legacyThemeRGBRef.current = legacyColors;
-    setLegacyThemeRGB(legacyColors);
-    setThemeNameState(definition?.name);
-    themeNameRef.current = definition?.name;
-    writeStorage(THEME_DEFINITION_KEY, definition ? JSON.stringify(definition) : undefined);
-    writeStorage(THEME_NAME_KEY, definition?.name);
-    writeStorage(THEME_COLORS_KEY, legacyColors ? JSON.stringify(legacyColors) : undefined);
-    writeStorage(THEME_SOURCE_KEY, definition ? 'legacy' : undefined);
-  }, []);
+  const setThemeRGB = useCallback(
+    (colors?: IThemeRGB) => {
+      const definition = colors
+        ? fromLegacyTheme(colors, themeDefinitionRef.current?.name ?? themeNameRef.current)
+        : undefined;
+      const legacyColors = definition?.modes.light?.colors;
+      themeDefinitionRef.current = definition;
+      setThemeDefinitionState(definition);
+      legacyThemeRGBRef.current = legacyColors;
+      setLegacyThemeRGB(legacyColors);
+      setThemeNameState(definition?.name);
+      themeNameRef.current = definition?.name;
+      writeThemeStorage(THEME_DEFINITION_KEY, definition ? JSON.stringify(definition) : undefined);
+      writeThemeStorage(THEME_NAME_KEY, definition?.name);
+      writeThemeStorage(THEME_COLORS_KEY, legacyColors ? JSON.stringify(legacyColors) : undefined);
+      writeThemeStorage(THEME_SOURCE_KEY, definition ? 'legacy' : undefined);
+    },
+    [writeThemeStorage],
+  );
 
-  const setThemeName = useCallback((name?: string) => {
-    const currentDefinition = themeDefinitionRef.current;
-    const nextName = name?.trim() || (currentDefinition ? 'custom' : undefined);
-    setThemeNameState(nextName);
-    themeNameRef.current = nextName;
-    writeStorage(THEME_NAME_KEY, nextName);
+  const setThemeName = useCallback(
+    (name?: string) => {
+      const currentDefinition = themeDefinitionRef.current;
+      const nextName = name?.trim() || (currentDefinition ? 'custom' : undefined);
+      setThemeNameState(nextName);
+      themeNameRef.current = nextName;
+      writeThemeStorage(THEME_NAME_KEY, nextName);
 
-    if (!nextName || !currentDefinition) {
-      return;
-    }
+      if (!nextName || !currentDefinition) {
+        return;
+      }
 
-    const renamedDefinition = { ...currentDefinition, name: nextName };
-    themeDefinitionRef.current = renamedDefinition;
-    setThemeDefinitionState(renamedDefinition);
-    writeStorage(THEME_DEFINITION_KEY, JSON.stringify(renamedDefinition));
-    writeStorage(THEME_SOURCE_KEY, legacyThemeRGBRef.current ? 'legacy' : 'definition');
-  }, []);
+      const renamedDefinition = { ...currentDefinition, name: nextName };
+      themeDefinitionRef.current = renamedDefinition;
+      setThemeDefinitionState(renamedDefinition);
+      writeThemeStorage(THEME_DEFINITION_KEY, JSON.stringify(renamedDefinition));
+      writeThemeStorage(THEME_SOURCE_KEY, legacyThemeRGBRef.current ? 'legacy' : 'definition');
+    },
+    [writeThemeStorage],
+  );
 
   useEffect(() => {
     if (!synchronizedThemeProps.current) {
@@ -540,9 +563,9 @@ export function ThemeProvider({
   const resetTheme = useCallback(() => {
     setTheme('system');
     setThemeDefinition(undefined);
-    writeStorage(THEME_COLORS_KEY);
+    writeThemeStorage(THEME_COLORS_KEY);
     restoreAppliedTheme();
-  }, [restoreAppliedTheme, setTheme, setThemeDefinition]);
+  }, [restoreAppliedTheme, setTheme, setThemeDefinition, writeThemeStorage]);
 
   const themeRGB = legacyThemeRGB ?? themeDefinition?.modes.light?.colors;
   const value = useMemo(
diff --git a/packages/client/src/theme/index.ts b/packages/client/src/theme/index.ts
index b7177e09b43..ac4c5619847 100644
--- a/packages/client/src/theme/index.ts
+++ b/packages/client/src/theme/index.ts
@@ -15,10 +15,12 @@ export {
 export {
   THEME_VERSION,
   defaultAppearance,
+  defaultBrands,
   fromLegacyTheme,
   libreChatTheme,
   resolveTheme,
   themeAppearanceProperties,
+  themeBrandTokens,
   themeColorTokens,
   validateThemeDefinition,
 } from './registry';
diff --git a/packages/client/src/theme/registry.spec.ts b/packages/client/src/theme/registry.spec.ts
index bfc43ce67e9..6a11009c2b0 100644
--- a/packages/client/src/theme/registry.spec.ts
+++ b/packages/client/src/theme/registry.spec.ts
@@ -1,7 +1,9 @@
 import type { ThemeDefinition } from './types';
 import {
   defaultAppearance,
+  defaultBrands,
   fromLegacyTheme,
+  libreChatTheme,
   resolveTheme,
   themeColorTokens,
   validateThemeDefinition,
@@ -48,6 +50,68 @@ describe('theme registry', () => {
     expect(dark.appearance).toEqual(defaultAppearance);
   });
 
+  it('resolves provider brand tokens and lets a theme override them', () => {
+    const defaults = resolveTheme(libreChatTheme, 'light');
+    expect(defaults.brands['provider-anthropic']).toBe('#d09a74');
+    expect(defaults.brands['provider-openai']).toBe(defaultBrands['provider-openai']);
+
+    const custom = resolveTheme(
+      {
+        version: 1,
+        name: 'white-label',
+        modes: { light: {} },
+        brands: { 'provider-anthropic': '#ffffff' },
+      },
+      'light',
+    );
+    expect(custom.brands['provider-anthropic']).toBe('#ffffff');
+    expect(custom.brands['provider-openai']).toBe(defaultBrands['provider-openai']);
+  });
+
+  it('rejects CSS appended to a provider gradient', () => {
+    expect(
+      validateThemeDefinition({
+        version: 1,
+        name: 'invalid',
+        modes: {},
+        brands: {
+          'provider-azure': 'linear-gradient(#000,#000), url(https://example.com/pixel)',
+        },
+      }),
+    ).toContain(
+      'Invalid brand value for provider-azure: linear-gradient(#000,#000), url(https://example.com/pixel)',
+    );
+  });
+
+  it('rejects stacked CSS after a balanced gradient', () => {
+    expect(
+      validateThemeDefinition({
+        version: 1,
+        name: 'invalid',
+        modes: {},
+        brands: {
+          'provider-azure':
+            'linear-gradient(#000,#000), -webkit-image-set("https://example.com/pixel" 1x)',
+        },
+      }),
+    ).toEqual(
+      expect.arrayContaining([expect.stringContaining('Invalid brand value for provider-azure')]),
+    );
+  });
+
+  it('rejects a gradient for the provider foreground token', () => {
+    expect(
+      validateThemeDefinition({
+        version: 1,
+        name: 'invalid',
+        modes: {},
+        brands: {
+          'provider-foreground': 'linear-gradient(#fff,#fff)',
+        },
+      }),
+    ).toContain('Invalid brand value for provider-foreground: linear-gradient(#fff,#fff)');
+  });
+
   it('preserves hover overrides from themes created before the composer hover token', () => {
     const storedTheme: ThemeDefinition = {
       version: 1,
diff --git a/packages/client/src/theme/registry.ts b/packages/client/src/theme/registry.ts
index 87d9e2d4e72..479822469d8 100644
--- a/packages/client/src/theme/registry.ts
+++ b/packages/client/src/theme/registry.ts
@@ -1,5 +1,6 @@
 import type {
   IThemeAppearance,
+  IThemeBrands,
   IThemeColors,
   IThemeVariables,
   IThemeRGB,
@@ -9,7 +10,6 @@ import type {
 } from './types';
 import { defaultTheme } from './themes/default';
 import { darkTheme } from './themes/dark';
-
 export const THEME_VERSION = 1 as const;
 
 /**
@@ -61,6 +61,26 @@ export const defaultAppearance: IThemeAppearance = Object.freeze({
   motionNormal: '200ms',
 });
 
+export const themeBrandTokens: readonly (keyof IThemeBrands)[] = Object.freeze([
+  'provider-openai',
+  'provider-openai-gpt4',
+  'provider-openai-reasoning',
+  'provider-anthropic',
+  'provider-azure',
+  'provider-bedrock',
+  'provider-foreground',
+]);
+
+export const defaultBrands: IThemeBrands = Object.freeze({
+  'provider-openai': '#19C37D',
+  'provider-openai-gpt4': '#AB68FF',
+  'provider-openai-reasoning': '#000000',
+  'provider-anthropic': '#d09a74',
+  'provider-azure': 'linear-gradient(0.375turn, #61bde2, #4389d0)',
+  'provider-bedrock': '#268672',
+  'provider-foreground': '#ffffff',
+});
+
 export const libreChatTheme: ThemeDefinition = Object.freeze({
   version: THEME_VERSION,
   name: 'librechat',
@@ -68,11 +88,35 @@ export const libreChatTheme: ThemeDefinition = Object.freeze({
     light: { colors: defaultTheme },
     dark: { colors: darkTheme },
   },
+  brands: defaultBrands,
 });
 
 const rgbPattern = /^(\d{1,3})\s+(\d{1,3})\s+(\d{1,3})$/;
 const cssLengthPattern = /^(0|\d*\.?\d+(px|rem|em))$/;
 const cssDurationPattern = /^\d*\.?\d+(ms|s)$/;
+const hexColorPattern = /^#(?:[0-9a-fA-F]{3}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$/;
+
+function isLinearGradient(value: string): boolean {
+  if (!value.startsWith('linear-gradient(') || /url\s*\(|image-set/i.test(value)) {
+    return false;
+  }
+  let depth = 0;
+  for (let i = 0; i < value.length; i++) {
+    const char = value[i];
+    if (char === '(') {
+      depth += 1;
+    } else if (char === ')') {
+      depth -= 1;
+      if (depth === 0) {
+        return i === value.length - 1;
+      }
+      if (depth < 0) {
+        return false;
+      }
+    }
+  }
+  return false;
+}
 
 const isRGB = (value: unknown): value is string => {
   if (typeof value !== 'string') {
@@ -123,7 +167,7 @@ export function validateThemeDefinition(theme: ThemeDefinition): string[] {
   }
 
   Object.keys(theme).forEach((key) => {
-    if (key !== 'version' && key !== 'name' && key !== 'modes') {
+    if (key !== 'version' && key !== 'name' && key !== 'modes' && key !== 'brands') {
       errors.push(`Unknown theme field: ${key}`);
     }
   });
@@ -193,6 +237,26 @@ export function validateThemeDefinition(theme: ThemeDefinition): string[] {
     }
   });
 
+  if (theme.brands !== undefined && !isPlainRecord(theme.brands)) {
+    errors.push('Theme brands must be an object');
+  } else {
+    Object.entries(theme.brands ?? {}).forEach(([key, value]) => {
+      if (!themeBrandTokens.includes(key as keyof IThemeBrands)) {
+        errors.push(`Unknown brand token: ${key}`);
+        return;
+      }
+      const isColorOnly = key === 'provider-foreground';
+      const isValidBrand =
+        typeof value === 'string' &&
+        (isColorOnly
+          ? hexColorPattern.test(value)
+          : hexColorPattern.test(value) || isLinearGradient(value));
+      if (value !== undefined && !isValidBrand) {
+        errors.push(`Invalid brand value for ${key}: ${value}`);
+      }
+    });
+  }
+
   return errors;
 }
 
@@ -217,6 +281,7 @@ export function resolveTheme(theme: ThemeDefinition, mode: ThemeMode): ResolvedT
     mode,
     colors: { ...baseColors, ...customColors, ...composerHoverFallback } as Required<IThemeRGB>,
     appearance: { ...defaultAppearance, ...definition?.appearance },
+    brands: { ...defaultBrands, ...theme.brands },
   };
 }
 
diff --git a/packages/client/src/theme/types/index.ts b/packages/client/src/theme/types/index.ts
index b692da887b1..4a840cb38d9 100644
--- a/packages/client/src/theme/types/index.ts
+++ b/packages/client/src/theme/types/index.ts
@@ -304,11 +304,22 @@ export interface ThemeModeDefinition {
   appearance?: Partial<IThemeAppearance>;
 }
 
+export interface IThemeBrands {
+  'provider-openai': string;
+  'provider-openai-gpt4': string;
+  'provider-openai-reasoning': string;
+  'provider-anthropic': string;
+  'provider-azure': string;
+  'provider-bedrock': string;
+  'provider-foreground': string;
+}
+
 /** Versioned, data-only theme input. Missing values resolve against LibreChat defaults. */
 export interface ThemeDefinition {
   version: 1;
   name: string;
   modes: Partial<Record<ThemeMode, ThemeModeDefinition>>;
+  brands?: Partial<IThemeBrands>;
 }
 
 export interface ResolvedThemeDefinition {
@@ -317,4 +328,5 @@ export interface ResolvedThemeDefinition {
   mode: ThemeMode;
   colors: Required<IThemeRGB>;
   appearance: IThemeAppearance;
+  brands: IThemeBrands;
 }
diff --git a/packages/client/src/theme/utils/applyTheme.spec.ts b/packages/client/src/theme/utils/applyTheme.spec.ts
index 6c8eb3a8ed5..020907d9abc 100644
--- a/packages/client/src/theme/utils/applyTheme.spec.ts
+++ b/packages/client/src/theme/utils/applyTheme.spec.ts
@@ -143,4 +143,20 @@ describe('applyTheme', () => {
     expect(root.style.getPropertyValue('--markdown-font-size')).toBe('18px');
     root.style.removeProperty('--markdown-font-size');
   });
+
+  it('applies provider brand backgrounds from the theme', () => {
+    applyResolvedTheme(
+      resolveTheme(
+        {
+          version: 1,
+          name: 'white-label',
+          modes: { light: {} },
+          brands: { 'provider-openai': '#123456' },
+        },
+        'light',
+      ),
+    );
+
+    expect(document.documentElement.style.getPropertyValue('--provider-openai')).toBe('#123456');
+  });
 });
diff --git a/packages/client/src/theme/utils/applyTheme.ts b/packages/client/src/theme/utils/applyTheme.ts
index 6f600177dd7..38c941b5642 100644
--- a/packages/client/src/theme/utils/applyTheme.ts
+++ b/packages/client/src/theme/utils/applyTheme.ts
@@ -1,11 +1,13 @@
-import type { IThemeAppearance, IThemeRGB, ResolvedThemeDefinition } from '../types';
-import { themeAppearanceProperties, themeColorTokens } from '../registry';
+import type { IThemeAppearance, IThemeBrands, IThemeRGB, ResolvedThemeDefinition } from '../types';
+import { themeAppearanceProperties, themeBrandTokens, themeColorTokens } from '../registry';
 
 const colorProperty = (token: keyof IThemeRGB): `--${string}` => `--${token.slice(4)}`;
+const brandProperty = (token: keyof IThemeBrands): `--${string}` => `--${token}`;
 
 export const themeOwnedProperties: readonly string[] = Object.freeze([
   ...themeColorTokens.map(colorProperty),
   ...Object.values(themeAppearanceProperties),
+  ...themeBrandTokens.map(brandProperty),
 ]);
 
 const rgbPattern = /^(\d{1,3})\s+(\d{1,3})\s+(\d{1,3})$/;
@@ -50,7 +52,13 @@ export function applyResolvedTheme(
   theme: ResolvedThemeDefinition,
   root: HTMLElement = document.documentElement,
 ): void {
-  const variables = [...mapColors(theme.colors), ...mapAppearance(theme.appearance)];
+  const variables = [
+    ...mapColors(theme.colors),
+    ...mapAppearance(theme.appearance),
+    ...themeBrandTokens.map(
+      (token) => [brandProperty(token), theme.brands[token]] as [string, string],
+    ),
+  ];
 
   variables.forEach(([property, value]) => root.style.setProperty(property, value));
   root.dataset.theme = theme.name;
diff --git a/packages/client/tsdown.config.mjs b/packages/client/tsdown.config.mjs
index fcbb0802e68..cb5e1303563 100644
--- a/packages/client/tsdown.config.mjs
+++ b/packages/client/tsdown.config.mjs
@@ -23,6 +23,7 @@ export default defineConfig({
   // CommonJS (jest.config.js / babel.config.js are CJS) while still shipping dual ESM/CJS.
   fixedExtension: true,
   define,
+  copy: [{ from: 'src/icons/provider/assets', to: 'dist' }],
   // Extract all component CSS into a single `dist/style.css` (no import left in the JS, so the
   // CJS output stays valid CommonJS). Consumers import `@librechat/client/style.css` once.
   css: { inject: false },
diff --git a/packages/data-provider/specs/providers.spec.ts b/packages/data-provider/specs/providers.spec.ts
new file mode 100644
index 00000000000..b4233740ec4
--- /dev/null
+++ b/packages/data-provider/specs/providers.spec.ts
@@ -0,0 +1,80 @@
+import {
+  ProviderId,
+  resolveProviderId,
+  endpointToProvider,
+  knownEndpointToProvider,
+} from '../src/providers';
+import { EModelEndpoint } from '../src/schemas';
+import { KnownEndpoints } from '../src/config';
+
+describe('ProviderId', () => {
+  it('declares every value as its own lowercase key', () => {
+    for (const [key, value] of Object.entries(ProviderId)) {
+      expect(value).toBe(key);
+      expect(value).toBe(value.toLowerCase());
+    }
+  });
+
+  it('contains no dots, so together.ai is together', () => {
+    for (const value of Object.values(ProviderId)) {
+      expect(value).not.toContain('.');
+    }
+    expect(ProviderId.together).toBe('together');
+  });
+});
+
+describe('resolveProviderId', () => {
+  it('resolves an exact id', () => {
+    expect(resolveProviderId('openrouter')).toBe(ProviderId.openrouter);
+  });
+
+  it('is case insensitive', () => {
+    expect(resolveProviderId('OpenRouter')).toBe(ProviderId.openrouter);
+  });
+
+  it('ignores spaces, dots, dashes and underscores', () => {
+    expect(resolveProviderId('together.ai')).toBe(ProviderId.together);
+    expect(resolveProviderId('Together AI')).toBe(ProviderId.together);
+    expect(resolveProviderId('hugging-face')).toBe(ProviderId.huggingface);
+    expect(resolveProviderId('open_router')).toBe(ProviderId.openrouter);
+  });
+
+  it('resolves brand aliases to their provider', () => {
+    expect(resolveProviderId('claude')).toBe(ProviderId.anthropic);
+    expect(resolveProviderId('gemini')).toBe(ProviderId.google);
+    expect(resolveProviderId('vertexai')).toBe(ProviderId.google);
+    expect(resolveProviderId('grok')).toBe(ProviderId.xai);
+    expect(resolveProviderId('kimi')).toBe(ProviderId.moonshot);
+  });
+
+  it('returns null for empty and unknown input', () => {
+    expect(resolveProviderId('')).toBeNull();
+    expect(resolveProviderId(null)).toBeNull();
+    expect(resolveProviderId(undefined)).toBeNull();
+    expect(resolveProviderId('totally-unknown-vendor')).toBeNull();
+  });
+});
+
+describe('mapping tables', () => {
+  it('maps the five branded first-class endpoints', () => {
+    expect(endpointToProvider[EModelEndpoint.openAI]).toBe(ProviderId.openai);
+    expect(endpointToProvider[EModelEndpoint.azureOpenAI]).toBe(ProviderId.azure);
+    expect(endpointToProvider[EModelEndpoint.anthropic]).toBe(ProviderId.anthropic);
+    expect(endpointToProvider[EModelEndpoint.google]).toBe(ProviderId.google);
+    expect(endpointToProvider[EModelEndpoint.bedrock]).toBe(ProviderId.bedrock);
+  });
+
+  it('leaves entity endpoints unmapped, since they render entity avatars', () => {
+    expect(endpointToProvider[EModelEndpoint.agents]).toBeUndefined();
+    expect(endpointToProvider[EModelEndpoint.assistants]).toBeUndefined();
+    expect(endpointToProvider[EModelEndpoint.azureAssistants]).toBeUndefined();
+    expect(endpointToProvider[EModelEndpoint.custom]).toBeUndefined();
+  });
+
+  it('covers every KnownEndpoints value', () => {
+    for (const known of Object.values(KnownEndpoints)) {
+      expect(knownEndpointToProvider[known]).toBeDefined();
+    }
+    expect(knownEndpointToProvider[KnownEndpoints['together.ai']]).toBe(ProviderId.together);
+  });
+});
diff --git a/packages/data-provider/src/api-endpoints.ts b/packages/data-provider/src/api-endpoints.ts
index cb652d473f3..49c80fdcedf 100644
--- a/packages/data-provider/src/api-endpoints.ts
+++ b/packages/data-provider/src/api-endpoints.ts
@@ -124,6 +124,9 @@ export const subagentThread = (parentConversationId: string, threadId: string, t
   return taskId == null ? endpoint : `${endpoint}?taskId=${encodeURIComponent(taskId)}`;
 };
 
+export const subagentControl = (parentConversationId: string, threadId: string) =>
+  `${conversationsRoot}/${encodeURIComponent(parentConversationId)}/subagents/${encodeURIComponent(threadId)}/control`;
+
 export const genTitle = (conversationId: string) =>
   `${conversationsRoot}/gen_title/${encodeURIComponent(conversationId)}`;
 
diff --git a/packages/data-provider/src/data-service.ts b/packages/data-provider/src/data-service.ts
index bffed4c2350..4192c66900f 100644
--- a/packages/data-provider/src/data-service.ts
+++ b/packages/data-provider/src/data-service.ts
@@ -1014,6 +1014,14 @@ export function getSubagentThread(
   return request.get(endpoints.subagentThread(parentConversationId, threadId, taskId));
 }
 
+export function controlSubagentTask(
+  parentConversationId: string,
+  threadId: string,
+  body: t.SubagentControlRequest,
+): Promise<t.SubagentControlResponse> {
+  return request.post(endpoints.subagentControl(parentConversationId, threadId), body);
+}
+
 export function getPrompt(id: string): Promise<{ prompt: t.TPrompt }> {
   return request.get(endpoints.getPrompt(id));
 }
diff --git a/packages/data-provider/src/index.ts b/packages/data-provider/src/index.ts
index 2aaeeb8cb35..42c5336c6d0 100644
--- a/packages/data-provider/src/index.ts
+++ b/packages/data-provider/src/index.ts
@@ -53,6 +53,8 @@ export {
 export { default as request } from './request';
 export { dataService };
 import * as dataService from './data-service';
+/* provider identity */
+export * from './providers';
 /* general helpers */
 export * from './utils';
 export * from './actions';
diff --git a/packages/data-provider/src/keys.ts b/packages/data-provider/src/keys.ts
index d19d7bf918e..65e26d69dee 100644
--- a/packages/data-provider/src/keys.ts
+++ b/packages/data-provider/src/keys.ts
@@ -103,6 +103,7 @@ export const DynamicQueryKeys = {
 } as const;
 
 export enum MutationKeys {
+  subagentControl = 'subagentControl',
   updateLangfuseConnection = 'updateLangfuseConnection',
   testLangfuseConnection = 'testLangfuseConnection',
   createAgentApiKey = 'createAgentApiKey',
diff --git a/packages/data-provider/src/providers.ts b/packages/data-provider/src/providers.ts
new file mode 100644
index 00000000000..3a38ed7fa18
--- /dev/null
+++ b/packages/data-provider/src/providers.ts
@@ -0,0 +1,98 @@
+import { EModelEndpoint } from './schemas';
+import { KnownEndpoints } from './config';
+
+/** Canonical provider identity used for branding across client and server. */
+export enum ProviderId {
+  openai = 'openai',
+  anthropic = 'anthropic',
+  google = 'google',
+  azure = 'azure',
+  bedrock = 'bedrock',
+  xai = 'xai',
+  moonshot = 'moonshot',
+  anyscale = 'anyscale',
+  apipie = 'apipie',
+  cohere = 'cohere',
+  deepseek = 'deepseek',
+  fireworks = 'fireworks',
+  groq = 'groq',
+  helicone = 'helicone',
+  huggingface = 'huggingface',
+  mistral = 'mistral',
+  mlx = 'mlx',
+  ollama = 'ollama',
+  openrouter = 'openrouter',
+  perplexity = 'perplexity',
+  qwen = 'qwen',
+  shuttleai = 'shuttleai',
+  together = 'together',
+  unify = 'unify',
+  vercel = 'vercel',
+}
+
+export const endpointToProvider: Partial<Record<EModelEndpoint, ProviderId>> = {
+  [EModelEndpoint.openAI]: ProviderId.openai,
+  [EModelEndpoint.azureOpenAI]: ProviderId.azure,
+  [EModelEndpoint.anthropic]: ProviderId.anthropic,
+  [EModelEndpoint.google]: ProviderId.google,
+  [EModelEndpoint.bedrock]: ProviderId.bedrock,
+};
+
+export const knownEndpointToProvider: Record<KnownEndpoints, ProviderId> = {
+  [KnownEndpoints.anyscale]: ProviderId.anyscale,
+  [KnownEndpoints.apipie]: ProviderId.apipie,
+  [KnownEndpoints.cohere]: ProviderId.cohere,
+  [KnownEndpoints.fireworks]: ProviderId.fireworks,
+  [KnownEndpoints.deepseek]: ProviderId.deepseek,
+  [KnownEndpoints.moonshot]: ProviderId.moonshot,
+  [KnownEndpoints.groq]: ProviderId.groq,
+  [KnownEndpoints.helicone]: ProviderId.helicone,
+  [KnownEndpoints.huggingface]: ProviderId.huggingface,
+  [KnownEndpoints.mistral]: ProviderId.mistral,
+  [KnownEndpoints.mlx]: ProviderId.mlx,
+  [KnownEndpoints.ollama]: ProviderId.ollama,
+  [KnownEndpoints.openrouter]: ProviderId.openrouter,
+  [KnownEndpoints.perplexity]: ProviderId.perplexity,
+  [KnownEndpoints.shuttleai]: ProviderId.shuttleai,
+  [KnownEndpoints['together.ai']]: ProviderId.together,
+  [KnownEndpoints.unify]: ProviderId.unify,
+  [KnownEndpoints.vercel]: ProviderId.vercel,
+  [KnownEndpoints.xai]: ProviderId.xai,
+};
+
+const providerAliases: Record<string, ProviderId> = {
+  chatgpt: ProviderId.openai,
+  gpt: ProviderId.openai,
+  azureopenai: ProviderId.azure,
+  claude: ProviderId.anthropic,
+  gemini: ProviderId.google,
+  gemma: ProviderId.google,
+  vertex: ProviderId.google,
+  vertexai: ProviderId.google,
+  palm: ProviderId.google,
+  awsbedrock: ProviderId.bedrock,
+  grok: ProviderId.xai,
+  kimi: ProviderId.moonshot,
+  moonshotai: ProviderId.moonshot,
+  mistralai: ProviderId.mistral,
+  togetherai: ProviderId.together,
+};
+
+const normalize = (input: string): string => input.toLowerCase().replace(/[\s._-]/g, '');
+
+const providerByNormalizedId = Object.values(ProviderId).reduce<Record<string, ProviderId>>(
+  (acc, id) => {
+    acc[normalize(id)] = id;
+    return acc;
+  },
+  {},
+);
+
+/** Resolves free-form provider text to a canonical id, ignoring case and separators. */
+export function resolveProviderId(input?: string | null): ProviderId | null {
+  if (!input) {
+    return null;
+  }
+  const key = normalize(input);
+  return providerByNormalizedId[key] ?? providerAliases[key] ?? null;
+}
diff --git a/packages/data-provider/src/schemas.ts b/packages/data-provider/src/schemas.ts
index c24f1dfeec5..39d62751b4d 100644
--- a/packages/data-provider/src/schemas.ts
+++ b/packages/data-provider/src/schemas.ts
@@ -1,10 +1,5 @@
 import { z } from 'zod';
-import type {
-  TMessageContentParts,
-  AgentSubagentGraph,
-  FunctionToolCall,
-  FunctionTool,
-} from './types/assistants';
+import type { TMessageContentParts, AgentSubagentGraph, FunctionTool } from './types/assistants';
 import type { SearchResultData } from './types/web';
 import type { TFile } from './types/files';
 import { userSubmittedMessageFieldPathSchema } from './filters';
@@ -391,7 +386,9 @@ export const ImageVisionTool: FunctionTool = {
   },
 };
 
-export const isImageVisionTool = (tool: FunctionTool | FunctionToolCall) =>
+/** Structural on purpose: accepts assistants tools/tool calls and agents function tool
+ *  calls alike — the check only ever reads `type` and `function.name`. */
+export const isImageVisionTool = (tool: { type?: string; function?: { name?: string } }) =>
   tool.type === 'function' && tool.function?.name === ImageVisionTool.function?.name;
 
 export const openAISettings = {
diff --git a/packages/data-provider/src/types.ts b/packages/data-provider/src/types.ts
index e2bcf99eeca..22abe8bcf83 100644
--- a/packages/data-provider/src/types.ts
+++ b/packages/data-provider/src/types.ts
@@ -15,6 +15,7 @@ import type { RefillIntervalUnit } from './balance';
 import type { SettingDefinition } from './generate';
 import type { TMinimalFeedback } from './feedback';
 import type { ContentTypes } from './types/runs';
+import type { ProviderId } from './providers';
 
 export * from './schemas';
 export * from './types/subagents';
@@ -534,6 +535,8 @@ export type TConfig = {
   plugins?: Record<string, string>;
   name?: string;
   iconURL?: string;
+  /** Canonical provider identity resolved at config load, used for branding. */
+  providerId?: ProviderId;
   version?: string;
   modelDisplayLabel?: string;
   userProvide?: boolean | null;
diff --git a/packages/data-provider/src/types/agents.ts b/packages/data-provider/src/types/agents.ts
index 35d2e39c9f8..a51d2870d90 100644
--- a/packages/data-provider/src/types/agents.ts
+++ b/packages/data-provider/src/types/agents.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-namespace */
 import type { TTokenUsageEvent, TContextUsageEvent, TPendingSteer } from './runs';
-import type { FunctionToolCall, SummaryContentPart } from './assistants';
 import type { TAttachment, TPlugin } from 'src/schemas';
+import type { SummaryContentPart } from './assistants';
 import { StepTypes, ContentTypes, ToolCallTypes } from './runs';
 
 export namespace Agents {
@@ -67,8 +67,9 @@ export namespace Agents {
    * A call to a tool.
    */
   export type ToolCall = {
-    /** Type ("tool_call") according to Assistants Tool Call Structure */
-    type: ToolCallTypes.TOOL_CALL;
+    /** Type ("tool_call") according to Assistants Tool Call Structure; optional literal
+     *  form included to mirror langchain's ToolCall, whose `type` is optional. */
+    type?: ToolCallTypes.TOOL_CALL | 'tool_call';
     /** The name of the tool to be called */
     name: string;
 
@@ -203,7 +204,8 @@ export namespace Agents {
     groupId?: number; // #new
     stepDetails: StepDetails;
     summary?: SummaryContentPart;
-    usage: null | object;
+    /** Optional to mirror the agents SDK, which omits usage until a step reports it. */
+    usage?: null | object;
     /** Epoch ms the step was opened. Emitted by `@librechat/agents` >= 3.4.6. */
     created_at?: number;
     status?: RunStepStatus;
@@ -324,7 +326,7 @@ export namespace Agents {
   };
   export type ToolCallsDetails = {
     type: StepTypes.TOOL_CALLS;
-    tool_calls: AgentToolCall[];
+    tool_calls?: AgentToolCall[];
   };
   export type ToolCallDelta = {
     type: StepTypes.TOOL_CALLS | string;
@@ -338,7 +340,22 @@ export namespace Agents {
       description?: string;
     };
   };
-  export type AgentToolCall = FunctionToolCall | ToolCall;
+  /**
+   * Mirrors the agents SDK's function tool-call variant: `arguments` may arrive as a
+   * parsed object, and `output` is attached by LibreChat aggregation only once available
+   * (the legacy assistants `FunctionToolCall` requires both as string/present).
+   */
+  export type AgentFunctionToolCall = {
+    id: string;
+    type: 'function';
+    function: {
+      name: string;
+      arguments: string | object;
+      output?: string | null;
+    };
+  };
+
+  export type AgentToolCall = AgentFunctionToolCall | ToolCall;
 
   /**
    * Human-in-the-loop interrupt categories. The discriminator on
@@ -734,8 +751,20 @@ export type GraphEdge = {
    *
    * For handoff edges: Description for the input parameter that the handoff tool accepts,
    * allowing the supervisor to pass specific instructions/context to the transferred agent.
+   *
+   * The callback receives a minimal structural view of the run's messages (data-provider
+   * cannot depend on langchain's BaseMessage): every langchain message satisfies
+   * `{ content: unknown }`, and callbacks typed against richer structural message shapes
+   * remain assignable. The promise branch mirrors the agents SDK signature exactly —
+   * widening it (e.g. to `Promise<string | undefined>`) would break assignability of
+   * stored edges into the SDK's `GraphEdge`.
    */
-  prompt?: string | ((messages: BaseMessage[], runStartIndex: number) => string | undefined);
+  prompt?:
+    | string
+    | ((
+        messages: { content: unknown }[],
+        runStartIndex: number,
+      ) => string | Promise<string> | undefined);
   /**
    * When true, excludes messages from startIndex when adding prompt.
    * Automatically set to true when {results} variable is used in prompt.
diff --git a/packages/data-provider/src/types/subagents.ts b/packages/data-provider/src/types/subagents.ts
index c5b7695f636..f05fe857fc0 100644
--- a/packages/data-provider/src/types/subagents.ts
+++ b/packages/data-provider/src/types/subagents.ts
@@ -66,6 +66,33 @@ export type SubagentActivityItem =
       outputTruncated?: boolean;
     };
 
+export type SubagentControlAction = 'steer' | 'queue' | 'interrupt' | 'cancel' | 'cancel_message';
+
+export type SubagentControlReceipt = {
+  invocationId: string;
+  controlId?: string;
+  action: SubagentControlAction;
+  status: 'accepted' | 'applied' | 'rejected' | 'failed';
+  createdAt: string;
+  updatedAt: string;
+  boundary?: 'preempt' | 'tool' | 'turn';
+  reason?: string;
+  message?: string;
+  messageTruncated?: boolean;
+};
+
+export type SubagentControlRequest = {
+  taskId: string;
+  invocationId: string;
+  action: SubagentControlAction;
+  message?: string;
+  controlId?: string;
+};
+
+export type SubagentControlResponse = {
+  receipt: SubagentControlReceipt;
+};
+
 export type SubagentThreadMessage = {
   messageId: string;
   parentMessageId: string | null;
@@ -89,6 +116,10 @@ export type SubagentThreadView = {
   /** Activity for the exact task requested by the parent card, when retained. */
   activity: SubagentActivityItem[];
   activityTruncated: boolean;
+  /** Bounded authoritative parent-to-child command receipts for this task. */
+  controlReceipts?: SubagentControlReceipt[];
+  /** True when older authoritative command receipts were omitted from this view. */
+  controlReceiptsTruncated?: boolean;
   messages: SubagentThreadMessage[];
   historyTruncated: boolean;
   updatedAt?: string;
diff --git a/packages/data-schemas/src/methods/message.spec.ts b/packages/data-schemas/src/methods/message.spec.ts
index 1444ef51255..57e7940cf6e 100644
--- a/packages/data-schemas/src/methods/message.spec.ts
+++ b/packages/data-schemas/src/methods/message.spec.ts
@@ -1,7 +1,7 @@
 import mongoose from 'mongoose';
 import { v4 as uuidv4 } from 'uuid';
-import { RetentionMode } from 'librechat-data-provider';
 import { MongoMemoryServer } from 'mongodb-memory-server';
+import { Constants, RetentionMode } from 'librechat-data-provider';
 import type { IMessage } from '..';
 import {
   createMessageMethods,
@@ -39,6 +39,15 @@ let updateMessageText: ReturnType<typeof createMessageMethods>['updateMessageTex
 let deleteMessagesSince: ReturnType<typeof createMessageMethods>['deleteMessagesSince'];
 let recordMessage: ReturnType<typeof createMessageMethods>['recordMessage'];
 let claimSubagentTaskResult: ReturnType<typeof createMessageMethods>['claimSubagentTaskResult'];
+let recordSubagentTaskControlReceipt: ReturnType<
+  typeof createMessageMethods
+>['recordSubagentTaskControlReceipt'];
+let getSubagentTaskControlReceipt: ReturnType<
+  typeof createMessageMethods
+>['getSubagentTaskControlReceipt'];
+let getSubagentTaskControlReplay: ReturnType<
+  typeof createMessageMethods
+>['getSubagentTaskControlReplay'];
 let releaseSubagentTaskResultClaim: ReturnType<
   typeof createMessageMethods
 >['releaseSubagentTaskResultClaim'];
@@ -64,6 +73,9 @@ beforeAll(async () => {
   deleteMessagesSince = methods.deleteMessagesSince;
   recordMessage = methods.recordMessage;
   claimSubagentTaskResult = methods.claimSubagentTaskResult;
+  recordSubagentTaskControlReceipt = methods.recordSubagentTaskControlReceipt;
+  getSubagentTaskControlReceipt = methods.getSubagentTaskControlReceipt;
+  getSubagentTaskControlReplay = methods.getSubagentTaskControlReplay;
   releaseSubagentTaskResultClaim = methods.releaseSubagentTaskResultClaim;
 
   await mongoose.connect(mongoUri);
@@ -93,6 +105,7 @@ describe('Message Operations', () => {
 
     // Clear database
     await Message.deleteMany({});
+    await mongoose.models.Conversation.deleteMany({});
 
     mockCtx = {
       userId: 'user123',
@@ -2298,6 +2311,677 @@ describe('Message Operations', () => {
       expect((doc as Record<string, unknown> | null)?.unknownPipelineField).toBeUndefined();
     });
   });
+  describe('recordSubagentTaskControlReceipt', () => {
+    const createTaskInput = async (conversationId: string, taskId = 'task-1') => {
+      await Message.create({
+        user: 'user123',
+        conversationId,
+        messageId: `${taskId}:user`,
+        parentMessageId: Constants.NO_PARENT,
+        sender: 'User',
+        text: 'Do the work',
+        endpoint: 'agents',
+        isCreatedByUser: true,
+        subagentTask: {
+          attemptKey: `attempt-${taskId}`,
+          status: 'running',
+        },
+      });
+    };
+
+    it('advances one invocation monotonically and enforces ownership', async () => {
+      const conversationId = uuidv4();
+      await createTaskInput(conversationId);
+      const accepted = {
+        invocationId: 'invocation-1',
+        fingerprint: 'fingerprint-1',
+        controlId: 'control-1',
+        action: 'steer' as const,
+        status: 'accepted' as const,
+        createdAt: new Date('2026-08-24T12:00:00.000Z'),
+        updatedAt: new Date('2026-08-24T12:00:00.000Z'),
+        message: 'Use the primary source.',
+      };
+
+      await expect(
+        recordSubagentTaskControlReceipt({
+          userId: 'user123',
+          conversationId,
+          taskId: 'task-1',
+          receipt: { ...accepted, controlId: undefined, status: 'reserved' },
+        }),
+      ).resolves.toBe(true);
+      /** A reservation fences competing owners but is not public evidence that
+       * the command was accepted or applied. */
+      await expect(
+        getSubagentTaskControlReceipt({
+          userId: 'user123',
+          conversationId,
+          taskId: 'task-1',
+          invocationId: 'invocation-1',
+        }),
+      ).resolves.toBeNull();
+
+      await expect(
+        recordSubagentTaskControlReceipt({
+          userId: 'user123',
+          conversationId,
+          taskId: 'task-1',
+          receipt: accepted,
+        }),
+      ).resolves.toBe(true);
+      await expect(
+        recordSubagentTaskControlReceipt({
+          userId: 'user123',
+          conversationId,
+          taskId: 'task-1',
+          receipt: {
+            ...accepted,
+            status: 'applied',
+            boundary: 'tool',
+            updatedAt: new Date('2026-08-24T12:00:01.000Z'),
+          },
+        }),
+      ).resolves.toBe(true);
+      /** A delayed accepted replay cannot downgrade the durable terminal receipt. */
+      await expect(
+        recordSubagentTaskControlReceipt({
+          userId: 'user123',
+          conversationId,
+          taskId: 'task-1',
+          receipt: accepted,
+        }),
+      ).resolves.toBe('unchanged');
+      await expect(
+        recordSubagentTaskControlReceipt({
+          userId: 'another-user',
+          conversationId,
+          taskId: 'task-1',
+          receipt: accepted,
+        }),
+      ).resolves.toBe(false);
+
+      const stored = await Message.findOne({
+        user: 'user123',
+        conversationId,
+        messageId: 'task-1:user',
+      })
+        .select('+subagentTask')
+        .lean<IMessage>();
+      expect(stored).not.toBeNull();
+      if (stored == null) throw new Error('Expected the durable task input.');
+      expect(stored.subagentTask?.status).toBe('running');
+      expect(stored.subagentTask?.controlReceipts).toEqual([
+        expect.objectContaining({
+          invocationId: 'invocation-1',
+          action: 'steer',
+          status: 'applied',
+          boundary: 'tool',
+        }),
+      ]);
+    });
+
+    it('updates only the authorized tenant when message identities collide', async () => {
+      const conversationId = uuidv4();
+      const taskId = 'tenant-task';
+      await Promise.all(
+        ['tenant-a', 'tenant-b'].map((tenantId) =>
+          Message.create({
+            user: 'user123',
+            tenantId,
+            conversationId,
+            messageId: `${taskId}:user`,
+            parentMessageId: Constants.NO_PARENT,
+            sender: 'User',
+            text: 'Do the tenant work',
+            endpoint: 'agents',
+            isCreatedByUser: true,
+            subagentTask: { attemptKey: `attempt-${tenantId}`, status: 'running' },
+          }),
+        ),
+      );
+      const now = new Date('2026-08-24T12:00:00.000Z');
+
+      await expect(
+        recordSubagentTaskControlReceipt({
+          userId: 'user123',
+          tenantId: 'tenant-b',
+          conversationId,
+          taskId,
+          receipt: {
+            invocationId: 'tenant-invocation',
+            fingerprint: 'tenant-fingerprint',
+            controlId: 'tenant-control',
+            action: 'queue',
+            status: 'accepted',
+            createdAt: now,
+            updatedAt: now,
+          },
+        }),
+      ).resolves.toBe(true);
+
+      const [tenantA, tenantB] = await Promise.all(
+        ['tenant-a', 'tenant-b'].map((tenantId) =>
+          Message.findOne({
+            user: 'user123',
+            tenantId,
+            conversationId,
+            messageId: `${taskId}:user`,
+          })
+            .select('+subagentTask')
+            .lean<IMessage>(),
+        ),
+      );
+      expect(tenantA?.subagentTask?.controlReceipts).toBeUndefined();
+      expect(tenantB?.subagentTask?.controlReceipts).toEqual([
+        expect.objectContaining({ invocationId: 'tenant-invocation' }),
+      ]);
+    });
+
+    it('reads an exact authorized receipt and persists a new terminal rejection', async () => {
+      const conversationId = uuidv4();
+      await createTaskInput(conversationId);
+      await mongoose.models.Conversation.create({
+        user: 'user123',
+        conversationId,
+        title: 'Child thread',
+        endpoint: 'agents',
+        subagentThread: {
+          rootConversationId: 'parent-conversation',
+          parentConversationId: 'parent-conversation',
+          parentMessageId: 'parent-message',
+          parentToolCallId: 'parent-tool',
+          subagentType: 'researcher',
+          subagentKind: 'agent',
+          depth: 1,
+        },
+      });
+      await Message.create({
+        user: 'user123',
+        conversationId,
+        messageId: 'task-1:assistant',
+        parentMessageId: 'task-1:user',
+        sender: 'researcher',
+        text: 'Done.',
+        endpoint: 'agents',
+        isCreatedByUser: false,
+        subagentTask: {
+          attemptKey: 'task-1-attempt',
+          parentRunId: 'parent-message',
+          status: 'completed',
+          resultClaim: {
+            kind: 'manual',
+            claimId: 'poll-1',
+            claimedAt: new Date('2026-08-24T12:00:02.000Z'),
+          },
+        },
+      });
+      const now = new Date('2026-08-24T12:00:00.000Z');
+      await expect(
+        recordSubagentTaskControlReceipt({
+          userId: 'user123',
+          conversationId,
+          taskId: 'task-1',
+          receipt: {
+            invocationId: 'terminal-invocation',
+            fingerprint: 'terminal-fingerprint',
+            action: 'cancel',
+            status: 'rejected',
+            reason: 'task_not_running',
+            createdAt: now,
+            updatedAt: now,
+          },
+        }),
+      ).resolves.toBe(true);
+
+      await expect(
+        getSubagentTaskControlReceipt({
+          userId: 'user123',
+          conversationId,
+          taskId: 'task-1',
+          invocationId: 'terminal-invocation',
+        }),
+      ).resolves.toEqual(
+        expect.objectContaining({
+          invocationId: 'terminal-invocation',
+          fingerprint: 'terminal-fingerprint',
+          status: 'rejected',
+          reason: 'task_not_running',
+        }),
+      );
+      await expect(
+        getSubagentTaskControlReceipt({
+          userId: 'another-user',
+          conversationId,
+          taskId: 'task-1',
+          invocationId: 'terminal-invocation',
+        }),
+      ).resolves.toBeNull();
+      await expect(
+        getSubagentTaskControlReplay({
+          userId: 'user123',
+          parentConversationId: 'parent-conversation',
+          taskId: 'task-1',
+          invocationId: 'terminal-invocation',
+        }),
+      ).resolves.toEqual({
+        receipt: expect.objectContaining({ invocationId: 'terminal-invocation' }),
+        task: expect.objectContaining({
+          taskId: 'task-1',
+          threadId: conversationId,
+          subagentType: 'researcher',
+          status: 'completed',
+          resultAvailable: true,
+          resultClaimed: true,
+        }),
+      });
+      await expect(
+        getSubagentTaskControlReplay({
+          userId: 'user123',
+          parentConversationId: 'different-parent',
+          taskId: 'task-1',
+          invocationId: 'terminal-invocation',
+        }),
+      ).resolves.toBeNull();
+
+      const ordinaryConversationId = uuidv4();
+      await Message.create({
+        user: 'user123',
+        conversationId: ordinaryConversationId,
+        messageId: 'ordinary-task:user',
+        parentMessageId: Constants.NO_PARENT,
+        sender: 'User',
+        text: 'An ordinary message with a colliding id.',
+        endpoint: 'agents',
+        isCreatedByUser: true,
+      });
+      await expect(
+        recordSubagentTaskControlReceipt({
+          userId: 'user123',
+          conversationId: ordinaryConversationId,
+          taskId: 'ordinary-task',
+          receipt: {
+            invocationId: 'terminal-invocation',
+            fingerprint: 'terminal-fingerprint',
+            action: 'cancel',
+            status: 'rejected',
+            reason: 'task_not_running',
+            createdAt: now,
+            updatedAt: now,
+          },
+        }),
+      ).resolves.toBe(false);
+    });
+
+    it('replays an applied cancellation as cancelled before its terminal row exists', async () => {
+      const conversationId = uuidv4();
+      await createTaskInput(conversationId);
+      await mongoose.models.Conversation.create({
+        user: 'user123',
+        conversationId,
+        title: 'Cancelling child thread',
+        endpoint: 'agents',
+        subagentThread: {
+          rootConversationId: 'parent-conversation',
+          parentConversationId: 'parent-conversation',
+          parentMessageId: 'parent-message',
+          parentToolCallId: 'parent-tool',
+          subagentType: 'researcher',
+          subagentKind: 'agent',
+          depth: 1,
+        },
+      });
+      const now = new Date('2026-08-24T12:00:00.000Z');
+      await expect(
+        recordSubagentTaskControlReceipt({
+          userId: 'user123',
+          conversationId,
+          taskId: 'task-1',
+          receipt: {
+            invocationId: 'cancel-invocation',
+            fingerprint: 'cancel-fingerprint',
+            action: 'cancel',
+            status: 'applied',
+            createdAt: now,
+            updatedAt: now,
+          },
+        }),
+      ).resolves.toBe(true);
+
+      await expect(
+        getSubagentTaskControlReplay({
+          userId: 'user123',
+          parentConversationId: 'parent-conversation',
+          taskId: 'task-1',
+          invocationId: 'cancel-invocation',
+        }),
+      ).resolves.toEqual({
+        receipt: expect.objectContaining({ invocationId: 'cancel-invocation' }),
+        task: expect.objectContaining({
+          taskId: 'task-1',
+          threadId: conversationId,
+          status: 'cancelled',
+          resultAvailable: false,
+          resultClaimed: false,
+          updatedAt: now,
+        }),
+      });
+    });
+
+    it('reports every accepted control when replaying one durable invocation', async () => {
+      const conversationId = uuidv4();
+      await createTaskInput(conversationId);
+      await mongoose.models.Conversation.create({
+        user: 'user123',
+        conversationId,
+        title: 'Controlled child thread',
+        endpoint: 'agents',
+        subagentThread: {
+          rootConversationId: 'parent-conversation',
+          parentConversationId: 'parent-conversation',
+          parentMessageId: 'parent-message',
+          parentToolCallId: 'parent-tool',
+          subagentType: 'researcher',
+          subagentKind: 'agent',
+          depth: 1,
+        },
+      });
+      const now = new Date('2026-08-24T12:00:00.000Z');
+      for (const index of [1, 2]) {
+        await expect(
+          recordSubagentTaskControlReceipt({
+            userId: 'user123',
+            conversationId,
+            taskId: 'task-1',
+            receipt: {
+              invocationId: `pending-invocation-${index}`,
+              fingerprint: `pending-fingerprint-${index}`,
+              controlId: `pending-control-${index}`,
+              action: 'queue',
+              status: 'accepted',
+              createdAt: now,
+              updatedAt: now,
+            },
+          }),
+        ).resolves.toBe(true);
+      }
+
+      await expect(
+        getSubagentTaskControlReplay({
+          userId: 'user123',
+          parentConversationId: 'parent-conversation',
+          taskId: 'task-1',
+          invocationId: 'pending-invocation-1',
+        }),
+      ).resolves.toEqual({
+        receipt: expect.objectContaining({ invocationId: 'pending-invocation-1' }),
+        task: expect.objectContaining({ pendingControls: 2 }),
+      });
+    });
+
+    it('rejects an invocation fingerprint conflict without reporting persistence', async () => {
+      const conversationId = uuidv4();
+      await createTaskInput(conversationId);
+      const now = new Date('2026-08-24T12:00:00.000Z');
+      const receipt = {
+        invocationId: 'conflicting-invocation',
+        fingerprint: 'first-fingerprint',
+        controlId: 'first-control',
+        action: 'queue' as const,
+        status: 'accepted' as const,
+        createdAt: now,
+        updatedAt: now,
+      };
+      await expect(
+        recordSubagentTaskControlReceipt({
+          userId: 'user123',
+          conversationId,
+          taskId: 'task-1',
+          receipt,
+        }),
+      ).resolves.toBe(true);
+      await expect(
+        recordSubagentTaskControlReceipt({
+          userId: 'user123',
+          conversationId,
+          taskId: 'task-1',
+          receipt: { ...receipt, fingerprint: 'different-fingerprint' },
+        }),
+      ).resolves.toBe('conflict');
+    });
+
+    it('retains concurrent receipts without requiring an aggregation-pipeline update', async () => {
+      const conversationId = uuidv4();
+      await createTaskInput(conversationId);
+      const createdAt = new Date('2026-08-24T12:00:00.000Z');
+
+      const invocationIds = Array.from({ length: 32 }, (_, index) => `concurrent-${index}`);
+      await Promise.all(
+        invocationIds.map((invocationId, index) =>
+          recordSubagentTaskControlReceipt({
+            userId: 'user123',
+            conversationId,
+            taskId: 'task-1',
+            receipt: {
+              invocationId,
+              fingerprint: `${invocationId}-fingerprint`,
+              controlId: `${invocationId}-control`,
+              action: 'queue',
+              status: 'accepted',
+              createdAt: new Date(createdAt.getTime() + index),
+              updatedAt: new Date(createdAt.getTime() + index),
+            },
+          }),
+        ),
+      );
+
+      const stored = await Message.findOne({
+        user: 'user123',
+        conversationId,
+        messageId: 'task-1:user',
+      })
+        .select('+subagentTask')
+        .lean<IMessage>();
+      expect(stored?.subagentTask?.controlReceipts).toEqual(
+        expect.arrayContaining(
+          invocationIds.map((invocationId) => expect.objectContaining({ invocationId })),
+        ),
+      );
+    });
+
+    it('retains accepted commands while bounding terminal receipt history', async () => {
+      const conversationId = uuidv4();
+      await createTaskInput(conversationId);
+      const createdAt = new Date('2026-08-24T12:00:00.000Z');
+      await recordSubagentTaskControlReceipt({
+        userId: 'user123',
+        conversationId,
+        taskId: 'task-1',
+        receipt: {
+          invocationId: 'pending',
+          fingerprint: 'pending-fingerprint',
+          controlId: 'pending-control',
+          action: 'queue',
+          status: 'accepted',
+          createdAt,
+          updatedAt: createdAt,
+        },
+      });
+      for (let index = 0; index < 70; index += 1) {
+        await recordSubagentTaskControlReceipt({
+          userId: 'user123',
+          conversationId,
+          taskId: 'task-1',
+          receipt: {
+            invocationId: `terminal-${index}`,
+            fingerprint: `fingerprint-${index}`,
+            controlId: `control-${index}`,
+            action: 'steer',
+            status: 'applied',
+            createdAt: new Date(createdAt.getTime() + index + 1),
+            updatedAt: new Date(createdAt.getTime() + index + 1),
+            boundary: 'tool',
+          },
+        });
+      }
+
+      const stored = await Message.findOne({
+        user: 'user123',
+        conversationId,
+        messageId: 'task-1:user',
+      })
+        .select('+subagentTask')
+        .lean<IMessage>();
+      expect(stored).not.toBeNull();
+      if (stored == null) throw new Error('Expected the durable task input.');
+      expect(stored.subagentTask?.controlReceipts).toHaveLength(64);
+      expect(stored.subagentTask?.controlReceipts).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ invocationId: 'pending', status: 'accepted' }),
+          expect.objectContaining({ invocationId: 'terminal-69', status: 'applied' }),
+        ]),
+      );
+      expect(stored.subagentTask?.controlReceipts).not.toEqual(
+        expect.arrayContaining([expect.objectContaining({ invocationId: 'terminal-0' })]),
+      );
+
+      /** An old idempotent retry retains its original occurrence ordering and
+       * cannot evict newer terminal history merely by arriving again. */
+      await recordSubagentTaskControlReceipt({
+        userId: 'user123',
+        conversationId,
+        taskId: 'task-1',
+        receipt: {
+          invocationId: 'terminal-0',
+          fingerprint: 'fingerprint-0',
+          controlId: 'control-0',
+          action: 'steer',
+          status: 'applied',
+          createdAt: new Date(createdAt.getTime() + 1),
+          updatedAt: new Date(createdAt.getTime() + 1),
+          boundary: 'tool',
+        },
+      });
+      const afterReplay = await Message.findOne({
+        user: 'user123',
+        conversationId,
+        messageId: 'task-1:user',
+      })
+        .select('+subagentTask')
+        .lean<IMessage>();
+      expect(afterReplay?.subagentTask?.controlReceipts).toHaveLength(64);
+      expect(afterReplay?.subagentTask?.controlReceipts).toEqual(
+        expect.arrayContaining([expect.objectContaining({ invocationId: 'terminal-7' })]),
+      );
+      expect(afterReplay?.subagentTask?.controlReceipts).not.toEqual(
+        expect.arrayContaining([expect.objectContaining({ invocationId: 'terminal-0' })]),
+      );
+    });
+
+    it('refuses to evict active receipt fences at durable capacity', async () => {
+      const conversationId = uuidv4();
+      await createTaskInput(conversationId);
+      const createdAt = new Date('2026-08-24T12:00:00.000Z');
+      const results: Array<boolean | 'unchanged' | 'conflict'> = [];
+      for (let index = 0; index < 70; index += 1) {
+        results.push(
+          await recordSubagentTaskControlReceipt({
+            userId: 'user123',
+            conversationId,
+            taskId: 'task-1',
+            receipt: {
+              invocationId: `accepted-${index}`,
+              fingerprint: `fingerprint-${index}`,
+              controlId: `control-${index}`,
+              action: 'queue',
+              status: 'accepted',
+              createdAt: new Date(createdAt.getTime() + index),
+              updatedAt: new Date(createdAt.getTime() + index),
+            },
+          }),
+        );
+      }
+      expect(results.slice(0, 64)).toEqual(Array.from({ length: 64 }, () => true));
+      expect(results.slice(64)).toEqual(Array.from({ length: 6 }, () => false));
+
+      const stored = await Message.findOne({
+        user: 'user123',
+        conversationId,
+        messageId: 'task-1:user',
+      })
+        .select('+subagentTask')
+        .lean<IMessage>();
+      expect(stored?.subagentTask?.controlReceipts).toHaveLength(64);
+      expect(stored?.subagentTask?.controlReceipts?.[0]?.invocationId).toBe('accepted-0');
+      expect(stored?.subagentTask?.controlReceipts?.[63]?.invocationId).toBe('accepted-63');
+
+      await expect(
+        recordSubagentTaskControlReceipt({
+          userId: 'user123',
+          conversationId,
+          taskId: 'task-1',
+          receipt: {
+            invocationId: 'terminal-with-no-allowance',
+            fingerprint: 'terminal-fingerprint',
+            controlId: 'terminal-control',
+            action: 'queue',
+            status: 'applied',
+            createdAt: new Date(createdAt.getTime() + 100),
+            updatedAt: new Date(createdAt.getTime() + 100),
+            boundary: 'turn',
+          },
+        }),
+      ).resolves.toBe(false);
+      const afterTerminal = await Message.findOne({
+        user: 'user123',
+        conversationId,
+        messageId: 'task-1:user',
+      })
+        .select('+subagentTask')
+        .lean<IMessage>();
+      expect(afterTerminal?.subagentTask?.controlReceipts).toHaveLength(64);
+      expect(afterTerminal?.subagentTask?.controlReceipts).not.toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ invocationId: 'terminal-with-no-allowance' }),
+        ]),
+      );
+
+      /** Completing an existing active fence always frees its own slot and wins
+       * over terminal history, even though its occurrence timestamp is oldest. */
+      await expect(
+        recordSubagentTaskControlReceipt({
+          userId: 'user123',
+          conversationId,
+          taskId: 'task-1',
+          receipt: {
+            invocationId: 'accepted-0',
+            fingerprint: 'fingerprint-0',
+            controlId: 'control-0',
+            action: 'queue',
+            status: 'applied',
+            createdAt,
+            updatedAt: new Date(createdAt.getTime() + 101),
+            boundary: 'turn',
+          },
+        }),
+      ).resolves.toBe(true);
+      const afterTransition = await Message.findOne({
+        user: 'user123',
+        conversationId,
+        messageId: 'task-1:user',
+      })
+        .select('+subagentTask')
+        .lean<IMessage>();
+      expect(afterTransition?.subagentTask?.controlReceipts).toHaveLength(64);
+      expect(afterTransition?.subagentTask?.controlReceipts).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ invocationId: 'accepted-0', status: 'applied' }),
+          expect.objectContaining({ invocationId: 'accepted-63', status: 'accepted' }),
+        ]),
+      );
+    });
+  });
+
   describe('claimSubagentTaskResult', () => {
     const terminalResult = async (taskId: string, conversationId: string, status: string) =>
       saveMessage({ userId: 'user123' }, {
diff --git a/packages/data-schemas/src/methods/message.ts b/packages/data-schemas/src/methods/message.ts
index 798f9a93431..b3bd6e3d05e 100644
--- a/packages/data-schemas/src/methods/message.ts
+++ b/packages/data-schemas/src/methods/message.ts
@@ -1,9 +1,9 @@
 import { HITL_MESSAGE_FILTER_FIELDS, RetentionMode } from 'librechat-data-provider';
 import type { UserSubmittedMessageFieldPath } from 'librechat-data-provider';
 import type { DeleteResult, FilterQuery, Model, Types } from 'mongoose';
-import type { AppConfig, IMessage } from '~/types';
+import type { AppConfig, IConversation, IMessage } from '~/types';
+import { activeExpirationFilter, createFallbackRetentionDate } from '~/utils/retention';
 import { createTempChatExpirationDate } from '~/utils/tempChatRetention';
-import { createFallbackRetentionDate } from '~/utils/retention';
 import { tenantSafeBulkWrite } from '~/utils/tenantBulkWrite';
 import logger from '~/config/winston';
 
@@ -13,6 +13,11 @@ const MAX_STORED_USER_SUBMITTED_PATHS = 256;
 const MAX_NORMALIZED_USER_SUBMITTED_PATHS = MAX_STORED_USER_SUBMITTED_PATHS + 1;
 const MAX_STORED_USER_SUBMITTED_FIELD_PATHS = MAX_NORMALIZED_USER_SUBMITTED_PATHS;
 const MAX_USER_SUBMITTED_PATH_LENGTH = 2048;
+const MAX_SUBAGENT_CONTROL_RECEIPTS = 64;
+const MAX_SUBAGENT_CONTROL_MESSAGE_LENGTH = 4 * 1024;
+/** One owner admits at most 64 terminal control invocations. The optimistic
+ * writer therefore has enough rounds for every admitted receipt to converge. */
+const MAX_SUBAGENT_CONTROL_RECEIPT_CAS_ATTEMPTS = 64;
 const PROVENANCE_PATHS_UNION_FIELD = '__lcProvenancePathsUnion';
 const PROVENANCE_FIELD_PATHS_UNION_FIELD = '__lcProvenanceFieldPathsUnion';
 const HITL_MESSAGE_FILTER_FIELD_SET = new Set<string>(HITL_MESSAGE_FILTER_FIELDS);
@@ -117,6 +122,92 @@ function getStrictPipelineUpdate(Message: Model<IMessage>, update: Record<string
   return Message.castObject(candidate) as unknown as Record<string, unknown>;
 }
 
+type StoredSubagentControlReceipt = NonNullable<
+  NonNullable<IMessage['subagentTask']>['controlReceipts']
+>[number];
+
+const terminalControlReceipt = (receipt: StoredSubagentControlReceipt): boolean =>
+  receipt.status === 'applied' || receipt.status === 'rejected' || receipt.status === 'failed';
+
+function retainSubagentControlReceipts(
+  current: StoredSubagentControlReceipt[],
+  receipt: StoredSubagentControlReceipt,
+): {
+  status: 'updated' | 'unchanged' | 'conflict' | 'capacity';
+  receipts: StoredSubagentControlReceipt[];
+} {
+  const existingIndex = current.findIndex(
+    (candidate) => candidate.invocationId === receipt.invocationId,
+  );
+  let merged: StoredSubagentControlReceipt[];
+  if (existingIndex < 0) {
+    merged = [...current, receipt];
+  } else {
+    const existing = current[existingIndex];
+    if (existing.fingerprint !== receipt.fingerprint) {
+      return { status: 'conflict', receipts: current };
+    }
+    if (
+      terminalControlReceipt(existing) ||
+      existing.status === receipt.status ||
+      (existing.status === 'accepted' && receipt.status === 'reserved')
+    ) {
+      return { status: 'unchanged', receipts: current };
+    }
+    merged = current.map((candidate, index) => (index === existingIndex ? receipt : candidate));
+  }
+  const accepted = merged.filter(
+    (candidate) => candidate.status === 'reserved' || candidate.status === 'accepted',
+  );
+  /** Reserved and accepted receipts are idempotency fences for commands that can
+   * still take effect. Never evict one to admit another receipt: report capacity
+   * so the caller refuses the command before mutating the live task. */
+  if (accepted.length > MAX_SUBAGENT_CONTROL_RECEIPTS) {
+    return { status: 'capacity', receipts: current };
+  }
+  const terminalAllowance = Math.max(0, MAX_SUBAGENT_CONTROL_RECEIPTS - accepted.length);
+  let terminal =
+    terminalAllowance === 0
+      ? []
+      : merged
+          .filter((candidate) => candidate.status !== 'reserved' && candidate.status !== 'accepted')
+          .sort(
+            (left, right) =>
+              left.createdAt.getTime() - right.createdAt.getTime() ||
+              left.invocationId.localeCompare(right.invocationId),
+          )
+          .slice(-terminalAllowance);
+  const advancesActiveFence =
+    existingIndex >= 0 &&
+    !terminalControlReceipt(current[existingIndex]) &&
+    terminalControlReceipt(receipt);
+  if (
+    advancesActiveFence &&
+    !terminal.some((candidate) => candidate.invocationId === receipt.invocationId)
+  ) {
+    /** A terminal transition for an active fence must outrank unrelated terminal
+     * history even though it retains the command's older occurrence timestamp. */
+    const otherAllowance = Math.max(0, terminalAllowance - 1);
+    terminal = [
+      ...(otherAllowance === 0
+        ? []
+        : terminal
+            .filter((candidate) => candidate.invocationId !== receipt.invocationId)
+            .slice(-otherAllowance)),
+      receipt,
+    ].sort(
+      (left, right) =>
+        left.createdAt.getTime() - right.createdAt.getTime() ||
+        left.invocationId.localeCompare(right.invocationId),
+    );
+  }
+  const receipts = [...accepted, ...terminal];
+  if (!receipts.some((candidate) => candidate.invocationId === receipt.invocationId)) {
+    return { status: 'capacity', receipts: current };
+  }
+  return { status: 'updated', receipts };
+}
+
 /**
  * Builds one Mongo aggregation update that merges and caps both provenance
  * sets. Generic path overflow promotes the message to whole-message user
@@ -283,6 +374,40 @@ export interface MessageMethods {
     params: Partial<IMessage> & { newMessageId?: string },
     metadata?: { context?: string },
   ): Promise<IMessage | null | undefined>;
+  recordSubagentTaskControlReceipt(input: {
+    userId: string;
+    conversationId: string;
+    taskId: string;
+    tenantId?: string;
+    receipt: NonNullable<NonNullable<IMessage['subagentTask']>['controlReceipts']>[number];
+  }): Promise<boolean | 'unchanged' | 'conflict'>;
+  getSubagentTaskControlReceipt(input: {
+    userId: string;
+    conversationId: string;
+    taskId: string;
+    invocationId: string;
+    tenantId?: string;
+  }): Promise<NonNullable<NonNullable<IMessage['subagentTask']>['controlReceipts']>[number] | null>;
+  getSubagentTaskControlReplay(input: {
+    userId: string;
+    parentConversationId: string;
+    taskId: string;
+    invocationId: string;
+    tenantId?: string;
+  }): Promise<{
+    receipt: NonNullable<NonNullable<IMessage['subagentTask']>['controlReceipts']>[number];
+    task: {
+      taskId: string;
+      threadId: string;
+      subagentType: string;
+      status: NonNullable<IMessage['subagentTask']>['status'];
+      resultAvailable: boolean;
+      resultClaimed: boolean;
+      pendingControls: number;
+      createdAt: Date;
+      updatedAt: Date;
+    };
+  } | null>;
   bulkSaveMessages(
     messages: Array<Partial<IMessage>>,
     overrideTimestamp?: boolean,
@@ -866,6 +991,253 @@ export function createMessageMethods(mongoose: typeof import('mongoose')): Messa
     }
   }
 
+  /**
+   * Atomically records one bounded parent-to-child control receipt on the
+   * durable task input. Terminal receipt states are monotonic, and accepted
+   * receipts are retained ahead of older terminal history when the bound fills.
+   */
+  async function recordSubagentTaskControlReceipt({
+    userId,
+    conversationId,
+    taskId,
+    tenantId,
+    receipt,
+  }: {
+    userId: string;
+    conversationId: string;
+    taskId: string;
+    tenantId?: string;
+    receipt: NonNullable<NonNullable<IMessage['subagentTask']>['controlReceipts']>[number];
+  }): Promise<boolean | 'unchanged' | 'conflict'> {
+    const validActions = new Set(['steer', 'queue', 'interrupt', 'cancel', 'cancel_message']);
+    const validStatuses = new Set(['reserved', 'accepted', 'applied', 'rejected', 'failed']);
+    if (
+      userId.length === 0 ||
+      conversationId.length === 0 ||
+      conversationId.length > 256 ||
+      taskId.length === 0 ||
+      taskId.length > 256 ||
+      receipt.invocationId.length === 0 ||
+      receipt.invocationId.length > 128 ||
+      receipt.fingerprint.length === 0 ||
+      receipt.fingerprint.length > 128 ||
+      !validActions.has(receipt.action) ||
+      !validStatuses.has(receipt.status) ||
+      (receipt.controlId != null && receipt.controlId.length > 256) ||
+      (receipt.message != null && receipt.message.length > MAX_SUBAGENT_CONTROL_MESSAGE_LENGTH) ||
+      !Number.isFinite(receipt.createdAt.getTime()) ||
+      !Number.isFinite(receipt.updatedAt.getTime())
+    ) {
+      throw new TypeError('Invalid subagent task control receipt');
+    }
+    const Message = mongoose.models.Message as Model<IMessage>;
+    const recordsTerminalRejection =
+      receipt.status === 'rejected' && receipt.reason === 'task_not_running';
+    const identity = {
+      user: userId,
+      conversationId,
+      ...(tenantId == null ? { tenantId: { $exists: false } } : { tenantId }),
+      messageId: `${taskId}:user`,
+      /** A genuinely new command can arrive after its task settles or its final
+       * lease expires. Persist that authoritative rejection for retries; every
+       * command that could still be applied remains fenced to a running task. */
+      ...(recordsTerminalRejection
+        ? { 'subagentTask.status': { $in: ['running', 'completed', 'error', 'cancelled'] } }
+        : { 'subagentTask.status': 'running' }),
+    };
+    /** Amazon DocumentDB does not support aggregation-pipeline updates. Use a
+     * bounded optimistic compare-and-swap: the read is small, the write uses
+     * only plain operators, and concurrent writers retry rather than overwrite. */
+    for (let attempt = 0; attempt < MAX_SUBAGENT_CONTROL_RECEIPT_CAS_ATTEMPTS; attempt += 1) {
+      const currentMessage = await Message.findOne(identity)
+        .select({ 'subagentTask.controlReceipts': 1, _id: 0 })
+        .lean<Pick<IMessage, 'subagentTask'> | null>();
+      if (currentMessage == null) return false;
+      const current = currentMessage.subagentTask?.controlReceipts ?? [];
+      const retained = retainSubagentControlReceipts(current, receipt);
+      if (retained.status === 'conflict') return 'conflict';
+      if (retained.status === 'unchanged') return 'unchanged';
+      if (retained.status === 'capacity') return false;
+      const next = retained.receipts;
+      const currentFilter =
+        currentMessage.subagentTask?.controlReceipts == null
+          ? { 'subagentTask.controlReceipts': { $exists: false } }
+          : { 'subagentTask.controlReceipts': current };
+      const updated = await Message.findOneAndUpdate(
+        { ...identity, ...currentFilter },
+        { $set: { 'subagentTask.controlReceipts': next } },
+        { new: false, projection: { messageId: 1 } },
+      ).lean<{ messageId: string } | null>();
+      if (updated != null) return true;
+    }
+    throw new Error('Subagent control receipt write contention exceeded its retry bound.');
+  }
+
+  /** Reads one bounded authoritative receipt by its exact durable task identity.
+   * The stored projection is already capped, and no task/runtime metadata leaves
+   * this method. Authorization remains part of the Mongo identity. */
+  async function getSubagentTaskControlReceipt({
+    userId,
+    conversationId,
+    taskId,
+    invocationId,
+    tenantId,
+  }: {
+    userId: string;
+    conversationId: string;
+    taskId: string;
+    invocationId: string;
+    tenantId?: string;
+  }): Promise<StoredSubagentControlReceipt | null> {
+    if (
+      userId.length === 0 ||
+      conversationId.length === 0 ||
+      conversationId.length > 256 ||
+      taskId.length === 0 ||
+      taskId.length > 256 ||
+      invocationId.length === 0 ||
+      invocationId.length > 128
+    ) {
+      throw new TypeError('Invalid subagent task control receipt identity');
+    }
+    const Message = mongoose.models.Message as Model<IMessage>;
+    const input = await Message.findOne({
+      user: userId,
+      conversationId,
+      ...(tenantId == null ? { tenantId: { $exists: false } } : { tenantId }),
+      messageId: `${taskId}:user`,
+      'subagentTask.controlReceipts.invocationId': invocationId,
+    })
+      .select({ 'subagentTask.controlReceipts': 1, _id: 0 })
+      .lean<Pick<IMessage, 'subagentTask'> | null>();
+    const receipt = input?.subagentTask?.controlReceipts?.find(
+      (candidate) => candidate.invocationId === invocationId,
+    );
+    /** Reservations are a server-private at-most-once fence, not proof that a
+     * control was applied. Public HTTP callers retry through the owning store. */
+    return receipt?.status === 'reserved' ? null : (receipt ?? null);
+  }
+
+  /** Resolves one authoritative receipt after its live owner disappears. The
+   * child conversation must still belong to the caller's parent thread, so a
+   * task id learned in another chat cannot cross orchestration scopes. */
+  async function getSubagentTaskControlReplay({
+    userId,
+    parentConversationId,
+    taskId,
+    invocationId,
+    tenantId,
+  }: {
+    userId: string;
+    parentConversationId: string;
+    taskId: string;
+    invocationId: string;
+    tenantId?: string;
+  }): Promise<{
+    receipt: StoredSubagentControlReceipt;
+    task: {
+      taskId: string;
+      threadId: string;
+      subagentType: string;
+      status: 'running' | 'completed' | 'error' | 'cancelled';
+      resultAvailable: boolean;
+      resultClaimed: boolean;
+      pendingControls: number;
+      createdAt: Date;
+      updatedAt: Date;
+    };
+  } | null> {
+    if (
+      userId.length === 0 ||
+      parentConversationId.length === 0 ||
+      parentConversationId.length > 256 ||
+      taskId.length === 0 ||
+      taskId.length > 256 ||
+      invocationId.length === 0 ||
+      invocationId.length > 128
+    ) {
+      throw new TypeError('Invalid subagent task control replay identity');
+    }
+    const Message = mongoose.models.Message as Model<IMessage>;
+    const input = await Message.findOne({
+      user: userId,
+      ...(tenantId == null ? { tenantId: { $exists: false } } : { tenantId }),
+      messageId: `${taskId}:user`,
+      'subagentTask.controlReceipts.invocationId': invocationId,
+    })
+      .select({
+        conversationId: 1,
+        createdAt: 1,
+        updatedAt: 1,
+        'subagentTask.status': 1,
+        'subagentTask.controlReceipts': 1,
+        _id: 0,
+      })
+      .lean<Pick<IMessage, 'conversationId' | 'createdAt' | 'updatedAt' | 'subagentTask'> | null>();
+    const receipt = input?.subagentTask?.controlReceipts?.find(
+      (candidate) => candidate.invocationId === invocationId,
+    );
+    const status = input?.subagentTask?.status;
+    if (
+      input == null ||
+      receipt == null ||
+      status == null ||
+      input.createdAt == null ||
+      input.updatedAt == null
+    ) {
+      return null;
+    }
+    const Conversation = mongoose.models.Conversation as Model<IConversation>;
+    const conversationQuery = Conversation.findOne({
+      user: userId,
+      conversationId: input.conversationId,
+      ...(tenantId == null ? { tenantId: { $exists: false } } : { tenantId }),
+      'subagentThread.parentConversationId': parentConversationId,
+      ...activeExpirationFilter<IConversation>(),
+    })
+      .select({ 'subagentThread.subagentType': 1, _id: 0 })
+      .lean<Pick<IConversation, 'subagentThread'> | null>();
+    const terminalQuery = Message.findOne({
+      user: userId,
+      conversationId: input.conversationId,
+      ...(tenantId == null ? { tenantId: { $exists: false } } : { tenantId }),
+      messageId: `${taskId}:assistant`,
+      'subagentTask.status': { $in: ['completed', 'error', 'cancelled'] },
+    })
+      .select({ updatedAt: 1, 'subagentTask.status': 1, 'subagentTask.resultClaim': 1, _id: 0 })
+      .lean<Pick<IMessage, 'updatedAt' | 'subagentTask'> | null>();
+    const [conversation, terminal] = await Promise.all([conversationQuery, terminalQuery]);
+    const subagentType = conversation?.subagentThread?.subagentType;
+    if (subagentType == null || subagentType === '') return null;
+    /** A committed cancel receipt is itself the authoritative cancellation
+     * boundary. The terminal row is written asynchronously and may not exist if
+     * the owner exits between those two durable commits. */
+    const replayStatus =
+      terminal?.subagentTask?.status ??
+      (receipt.action === 'cancel' && receipt.status === 'applied' ? 'cancelled' : status);
+    return {
+      receipt,
+      task: {
+        taskId,
+        threadId: input.conversationId,
+        subagentType,
+        status: replayStatus,
+        resultAvailable: terminal != null,
+        resultClaimed: terminal?.subagentTask?.resultClaim != null,
+        pendingControls:
+          input.subagentTask?.controlReceipts?.filter(
+            (candidate) => candidate.status === 'accepted',
+          ).length ?? 0,
+        createdAt: input.createdAt,
+        updatedAt:
+          terminal?.updatedAt ??
+          (receipt.action === 'cancel' && receipt.status === 'applied'
+            ? receipt.updatedAt
+            : input.updatedAt),
+      },
+    };
+  }
+
   /** Atomically assigns one durable terminal child result to either its
    * explicit poller or one idempotent automatic wakeup delivery. */
   async function claimSubagentTaskResult({
@@ -1470,6 +1842,9 @@ export function createMessageMethods(mongoose: typeof import('mongoose')): Messa
     updateMessageText,
     updateToolCallResult,
     updateMessage,
+    recordSubagentTaskControlReceipt,
+    getSubagentTaskControlReceipt,
+    getSubagentTaskControlReplay,
     claimSubagentTaskResult,
     releaseSubagentTaskResultClaim,
     deleteMessagesSince,
diff --git a/packages/data-schemas/src/schema/message.ts b/packages/data-schemas/src/schema/message.ts
index 08dfeafaea7..b058fcb8e3e 100644
--- a/packages/data-schemas/src/schema/message.ts
+++ b/packages/data-schemas/src/schema/message.ts
@@ -175,6 +175,33 @@ const messageSchema: Schema<IMessage> = new Schema(
           _id: false,
           default: undefined,
         },
+        controlReceipts: {
+          type: [
+            {
+              invocationId: { type: String, required: true },
+              fingerprint: { type: String, required: true },
+              controlId: { type: String },
+              action: {
+                type: String,
+                enum: ['steer', 'queue', 'interrupt', 'cancel', 'cancel_message'],
+                required: true,
+              },
+              status: {
+                type: String,
+                enum: ['reserved', 'accepted', 'applied', 'rejected', 'failed'],
+                required: true,
+              },
+              createdAt: { type: Date, required: true },
+              updatedAt: { type: Date, required: true },
+              boundary: { type: String, enum: ['preempt', 'tool', 'turn'] },
+              reason: { type: String },
+              message: { type: String },
+              messageTruncated: { type: Boolean },
+              _id: false,
+            },
+          ],
+          default: undefined,
+        },
       },
       _id: false,
       select: false,
diff --git a/packages/data-schemas/src/types/message.ts b/packages/data-schemas/src/types/message.ts
index fffc14bdc31..7e3bacac61e 100644
--- a/packages/data-schemas/src/types/message.ts
+++ b/packages/data-schemas/src/types/message.ts
@@ -5,6 +5,35 @@ import type {
 } from 'librechat-data-provider';
 import type { Document } from 'mongoose';
 
+export type SubagentTaskControlAction =
+  | 'steer'
+  | 'queue'
+  | 'interrupt'
+  | 'cancel'
+  | 'cancel_message';
+
+export type SubagentTaskControlReceiptStatus =
+  | 'reserved'
+  | 'accepted'
+  | 'applied'
+  | 'rejected'
+  | 'failed';
+
+/** Server-private durable receipt for one parent-to-child control invocation. */
+export interface ISubagentTaskControlReceipt {
+  invocationId: string;
+  fingerprint: string;
+  controlId?: string;
+  action: SubagentTaskControlAction;
+  status: SubagentTaskControlReceiptStatus;
+  createdAt: Date;
+  updatedAt: Date;
+  boundary?: 'preempt' | 'tool' | 'turn';
+  reason?: string;
+  message?: string;
+  messageTruncated?: boolean;
+}
+
 // @ts-ignore
 export interface IMessage extends Document {
   messageId: string;
@@ -70,6 +99,7 @@ export interface IMessage extends Document {
       claimId: string;
       claimedAt: Date;
     };
+    controlReceipts?: ISubagentTaskControlReceipt[];
   };
   contextMeta?: {
     calibrationRatio?: number;