Provider-neutral context management

2026-06-28 22:31:06 +01:00
19 changed files with 143 additions and 284 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:

      # Toolchain version + components come from rust-toolchain.toml. rustflags is
      # cleared so plain builds don't fail on warnings; the clippy hook still does.
-      - uses: actions-rust-lang/setup-rust-toolchain@v2
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
        with:
          rustflags: ''

@@ -42,63 +42,3 @@ jobs:

      - name: Unit tests
        run: just test
-
-  # The prek job never builds a container image, so a bump of the Dockerfile's
-  # base image reaches main unvalidated and fails later, in Publish, after
-  # ghcr.io/etkecc/baibot:latest has already been attempted. These two jobs close
-  # that gap: decide whether a Dockerfile changed, and if so build the image the
-  # way Publish does - but without pushing anything.
-  #
-  # The build is gated rather than unconditional because it is a full Rust
-  # release build; running it on every push would turn a ~1 minute pipeline into
-  # a ~10 minute one for changes that cannot affect the image.
-  docker-gate:
-    name: Decide whether the image needs building
-    runs-on: ubuntu-latest
-    outputs:
-      build: ${{ steps.decide.outputs.build }}
-    steps:
-      - uses: actions/checkout@v7
-        with:
-          fetch-depth: 0
-
-      - name: Look for Dockerfile changes against main
-        id: decide
-        run: |
-          if [ "${{ github.event_name }}" = 'workflow_dispatch' ]; then
-            echo 'Forced via workflow_dispatch.'
-            echo 'build=true' >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-
-          # Publish builds and pushes from main, so a main-side build here would
-          # be redundant. This gate exists for branches, before they merge.
-          if [ "${{ github.ref_name }}" = 'main' ]; then
-            echo 'On main; Publish covers this.'
-            echo 'build=false' >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-
-          git fetch --no-tags origin main
-          if git diff --name-only origin/main HEAD -- Dockerfile | grep -q .; then
-            echo 'A Dockerfile changed; the image will be built.'
-            echo 'build=true' >> "$GITHUB_OUTPUT"
-          else
-            echo 'No Dockerfile changed.'
-            echo 'build=false' >> "$GITHUB_OUTPUT"
-          fi
-
-  docker-build:
-    name: Build the container image (without publishing it)
-    needs: docker-gate
-    if: needs.docker-gate.outputs.build == 'true'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v7
-
-      # No build cache on purpose: a bump of the base image is exactly the case
-      # where a cold build is the honest test.
-      - name: Build
-        uses: docker/build-push-action@v7
-        with:
-          push: false
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,10 +5,6 @@ repos:
      - id: trailing-whitespace
      - id: end-of-file-fixer
      - id: check-yaml
-        # This is the stock Synapse sample homeserver.yaml (mostly commented-out
-        # docs). prek's stricter YAML parser (serde-saphyr, since v0.4.6) rejects
-        # its long runs of consecutive comment lines in several places.
-        exclude: '^etc/services/synapse/config/homeserver\.yaml$'
      - id: check-merge-conflict
      - id: check-added-large-files
        args: ['--maxkb=1024']
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# (2026-06-29) Version 1.25.0
+# (2026-06-28) Version 1.25.0

 - (**Feature**) [♻️ Context management](./docs/configuration/text-generation.md#️-context-management) now works with every provider, not only [OpenAI](./docs/providers.md#openai). Token counting previously went through [tiktoken-rs](https://github.com/zurawiki/tiktoken-rs), which is accurate only for OpenAI models and silently mis-counted everything else (worst of all for non-English text). OpenAI agents keep using tiktoken-rs; every other provider, including the recommended [Venice](./docs/providers.md#venice), now uses a provider-neutral approximation that needs no per-model tokenizer (ASCII counted at about four characters per token, other scripts such as Cyrillic and CJK at about two), landing within roughly 10-20% of the real count. See the [context management docs](./docs/configuration/text-generation.md#️-context-management).

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -95,9 +95,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.104"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
+checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3"

 [[package]]
 name = "anymap2"
@@ -184,9 +184,9 @@ checksum = "4288f83726785267c6f2ef073a3d83dc3f9b81464e9f99898240cced85fce35a"

 [[package]]
 name = "async-openai"
-version = "0.42.0"
+version = "0.41.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3540b785fcd10be9458fdd8db9a63ea5bcd4b191ef557eaf2730fe0c5881c3e8"
+checksum = "3007014661d5b98168b7b6f1014147bce8b1362a194783543eeb9f6117a20be9"
 dependencies = [
 "async-openai-macros",
 "base64 0.22.1",
@@ -196,7 +196,7 @@ dependencies = [
 "futures",
 "getrandom 0.3.4",
 "rand 0.9.4",
- "reqwest 0.13.5",
+ "reqwest 0.13.4",
 "secrecy",
 "serde",
 "serde_json",
@@ -320,7 +320,7 @@ dependencies = [
 "anthropic",
 "anyhow",
 "async-openai",
- "base64 0.23.1",
+ "base64 0.22.1",
 "chrono",
 "etke_openai_api_rust",
 "matrix-sdk",
@@ -329,7 +329,7 @@ dependencies = [
 "mxlink",
 "quick_cache 0.7.0",
 "regex",
- "reqwest 0.13.5",
+ "reqwest 0.13.4",
 "serde",
 "serde_json",
 "serde_yaml_ng",
@@ -353,12 +353,6 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"

-[[package]]
-name = "base64"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
-
 [[package]]
 name = "base64ct"
 version = "1.8.3"
@@ -2194,7 +2188,7 @@ dependencies = [
 "oauth2-reqwest",
 "percent-encoding",
 "pin-project-lite",
- "reqwest 0.13.5",
+ "reqwest 0.13.4",
 "ruma",
 "rustls",
 "rustls-native-certs 0.8.3",
@@ -2486,9 +2480,9 @@ dependencies = [

 [[package]]
 name = "mxidwc"
-version = "1.0.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45b5d51fcf414d2aa6bffc6cd9b037e62732734a944c5da4ace6b9895ec37b93"
+checksum = "5e253f96a03d24d1c0006c5661b1e20a13dc3861f509d76c33b6b44349d4ff3b"
 dependencies = [
 "regex",
 ]
@@ -2589,7 +2583,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234fb5c965bbce983ee5de636a7a51d6a3223da8067ea02f9ab2d2d78ac08be2"
 dependencies = [
 "oauth2",
- "reqwest 0.13.5",
+ "reqwest 0.13.4",
 ]

 [[package]]
@@ -3070,9 +3064,9 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.13.1"
+version = "1.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d"
+checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -3082,9 +3076,9 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.4.16"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fcfdb36bda0c880c5931cdc7a2bcdc8ba4556847b9d912bca70bc94708711ad"
+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -3140,11 +3134,11 @@ dependencies = [

 [[package]]
 name = "reqwest"
-version = "0.13.5"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16a1cfa75cc186dd73d5818e510e042e40927bccc9c236b061cea97e1eb08029"
+checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3"
 dependencies = [
- "base64 0.23.1",
+ "base64 0.22.1",
 "bytes",
 "futures-core",
 "futures-util",
@@ -3617,9 +3611,9 @@ checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"

 [[package]]
 name = "serde"
-version = "1.0.229"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
 "serde_core",
 "serde_derive",
@@ -3648,22 +3642,22 @@ dependencies = [

 [[package]]
 name = "serde_core"
-version = "1.0.229"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.229"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 3.0.0",
+ "syn 2.0.117",
 ]

 [[package]]
@@ -3681,9 +3675,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.151"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
 dependencies = [
 "itoa",
 "memchr",
@@ -3905,17 +3899,6 @@ dependencies = [
 "unicode-ident",
 ]

-[[package]]
-name = "syn"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2fac314a64dc9a36e61a9eb4261a5e9bbfbc922b27e518af97bc32b926cf967"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
 [[package]]
 name = "sync_wrapper"
 version = "1.0.2"
@@ -4081,9 +4064,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.53.1"
+version = "1.52.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "202caea871b69668250d242070849eb495be178ed697a3e98aebce5bc81a0bed"
+checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe"
 dependencies = [
 "bytes",
 "libc",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,8 +17,8 @@ path = "src/lib.rs"
 [dependencies]
 anthropic = { git = "https://github.com/etkecc/anthropic-rs.git", branch = "fix-content-block-image" }
 anyhow = "1.0.*"
-async-openai = { version = "0.42.0", features = ["audio", "chat-completion", "image", "responses"] }
-base64 = "0.23.*"
+async-openai = { version = "0.41.0", features = ["audio", "chat-completion", "image", "responses"] }
+base64 = "0.22.*"
 chrono = { version = "0.4.*", default-features = false, features = ["std", "now"] }
 # We'd rather not depend on this, but we cannot use the ruma-events EventContent macro without it.
 matrix-sdk = { version = "0.18.0", default-features = false }
@@ -27,7 +27,7 @@ mxidwc = "1.0.*"
 mxlink = ">=1.15.0"
 etke_openai_api_rust = "0.1.*"
 quick_cache = "0.7.*"
-regex = "1.13.*"
+regex = "1.12.*"
 # HTTP client for the native `venice` provider. rustls only (no extra TLS stack), matching the
 # reqwest copy async-openai/matrix-sdk/mxlink already use.
 reqwest = { version = "0.13.*", default-features = false, features = ["json", "multipart", "rustls"] }
@@ -36,7 +36,7 @@ serde_json = "1.0.*"
 serde_yaml_ng = "0.10.*"
 tempfile = "3.27.*"
 tiktoken-rs = { version = "0.12.*", default-features = false }
-tokio = { version = "1.53.*", features = ["rt", "rt-multi-thread", "macros"] }
+tokio = { version = "1.52.*", features = ["rt", "rt-multi-thread", "macros"] }
 tracing = "0.1.*"
 tracing-subscriber = { version = "0.3.*", features = ["env-filter"] }
 url = "2.5.*"
--- a/2
+++ b/2
@@ -4,7 +4,7 @@
 #                                     #
 #######################################

-FROM docker.io/rust:1.98.0-slim-trixie AS build
+FROM docker.io/rust:1.96.0-slim-trixie AS build

 RUN apt-get update && apt-get install -y build-essential pkg-config libssl-dev libsqlite3-dev

--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -0,0 +1,35 @@
+#######################################
+#                                     #
+# Stage 1: building                   #
+#                                     #
+#######################################
+
+FROM docker.io/rust:1.96.0-slim-trixie AS build
+
+RUN apt-get update && apt-get install -y build-essential pkg-config libssl-dev libsqlite3-dev
+
+WORKDIR /app
+
+COPY . /app
+
+RUN cargo build --release
+
+#######################################
+#                                     #
+# Stage 2: packaging                  #
+#                                     #
+#######################################
+
+FROM docker.io/debian:trixie-slim
+
+RUN apt-get update && apt-get install -y ca-certificates sqlite3 && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+COPY --from=build /app/target/release/baibot .
+
+ENTRYPOINT ["/bin/sh", "-c"]
+
+CMD ["/app/baibot"]
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -57,34 +57,6 @@ CONTAINER_IMAGE_NAME=ghcr.io/etkecc/baibot:v1.0.0
  $CONTAINER_IMAGE_NAME
 ```

-Alternatively, you can use [Docker Compose](https://docs.docker.com/compose/) with a `compose.yml` file like this:
-
-```yaml
-services:
-  baibot:
-    container_name: baibot
-    # Adjust the version tag to point to the latest available tagged version.
-    # If building your own container image name, adjust to something like `localhost/baibot:latest`.
-    image: ghcr.io/etkecc/baibot:v1.0.0
-    # Set `UID` and `GID` in a `.env` file next to `compose.yml` (e.g. `UID=1000`, `GID=1000`)
-    # or export them in your shell (`export UID GID="$(id -g)"`).
-    # These should match the user that owns the data directory.
-    user: "${UID:-1000}:${GID:-1000}"
-    environment:
-      # Other settings can also be set via environment variables.
-      # See the 🛠️ Configuration documentation (docs/configuration/README.md) for details.
-      BAIBOT_PERSISTENCE_DATA_DIR_PATH: /data
-    volumes:
-      - /path/to/config.yml:/app/config.yml:ro
-      - /path/to/data:/data
-    cap_drop:
-      - ALL
-    read_only: true
-    tmpfs:
-      - /tmp:rw,noexec,nosuid,size=1024m
-    restart: unless-stopped
-```
-
 💡 If you've defined the `persistence.data_dir_path` setting in the `config.yml` file, you can skip the `BAIBOT_PERSISTENCE_DATA_DIR_PATH` environment variable.


--- a/etc/services/continuwuity/compose.yml
+++ b/etc/services/continuwuity/compose.yml
@@ -1,14 +1,14 @@
 services:
  continuwuity:
-    image: forgejo.ellis.link/continuwuation/continuwuity:v26.8.1
+    image: forgejo.ellis.link/continuwuation/continuwuity:v0.5.10
    user: "${UID}:${GID}"
    restart: unless-stopped
    cap_drop:
      - ALL
    read_only: true
    environment:
-      CONTINUWUITY_CONFIG: /etc/continuwuity/continuwuity.toml
-      CONTINUWUITY_DATABASE_PATH: /var/lib/continuwuity
+      CONDUWUIT_CONFIG: /etc/continuwuity/continuwuity.toml
+      CONDUWUIT_DATABASE_PATH: /var/lib/continuwuity
    ports:
      - "${SERVICE_CONTINUWUITY_BIND_PORT_CLIENT_API}:6167"
    volumes:
--- a/etc/services/element-web/compose.yml
+++ b/etc/services/element-web/compose.yml
@@ -1,6 +1,6 @@
 services:
  element-web:
-    image: ghcr.io/element-hq/element-web:v1.12.27
+    image: ghcr.io/element-hq/element-web:v1.12.22
    user: "${UID}:${GID}"
    restart: unless-stopped
    environment:
--- a/etc/services/ollama/compose.yml
+++ b/etc/services/ollama/compose.yml
@@ -1,6 +1,6 @@
 services:
  ollama:
-    image: docker.io/ollama/ollama:0.33.3
+    image: docker.io/ollama/ollama:0.30.11
    restart: unless-stopped
    ports:
      - "${SERVICE_OLLAMA_BIND_PORT_HTTP}:11434"
--- a/etc/services/synapse/compose.yml
+++ b/etc/services/synapse/compose.yml
@@ -1,6 +1,6 @@
 services:
  postgres:
-    image: docker.io/postgres:18.6-alpine
+    image: docker.io/postgres:18.4-alpine
    user: ${UID}:${GID}
    restart: unless-stopped
    environment:
@@ -14,7 +14,7 @@ services:
    - /etc/passwd:/etc/passwd:ro

  synapse:
-    image: ghcr.io/element-hq/synapse:v1.160.0
+    image: ghcr.io/element-hq/synapse:v1.155.0
    user: "${UID}:${GID}"
    restart: unless-stopped
    entrypoint: python
--- a/24
+++ b/24
@@ -271,29 +271,7 @@ prek-run-on-all *args: _ensure_mise_tools_installed

 # Installs the git pre-commit hook (runs prek automatically before each commit)
 prek-install-git-pre-commit-hook: _ensure_mise_tools_installed
-	#!/usr/bin/env sh
-	set -eu
-	just --justfile {{ justfile() }} mise exec -- prek install
-	# The installed git hooks run later under Git, outside this just/mise environment,
-	# so they need to be told how to find their tooling:
-	#
-	# - MISE_DATA_DIR / MISE_TRUSTED_CONFIG_PATHS make mise resolve against this project's
-	#   own data directory. Without them mise falls back to the global one and silently
-	#   installs a second copy of the tool there.
-	# - prek bakes the full path of the currently installed version into the hook
-	#   (var/mise/installs/prek/<version>/...), which stops working as soon as the pinned
-	#   version changes or old versions are pruned. Pointing at mise's shim instead makes
-	#   the hook resolve whatever mise.toml pins, at the time it runs.
-	#
-	# Which hook files prek installs depends on `default_install_hook_types` in
-	# .pre-commit-config.yaml, so patch every hook file that prek generated.
-	for hook in "{{ justfile_directory() }}"/.git/hooks/*; do
-		[ -f "$hook" ] || continue
-		grep -q 'generated by prek' "$hook" || continue
-		grep -q '^export MISE_DATA_DIR=' "$hook" || sed -i '2iexport MISE_DATA_DIR="{{ mise_data_dir }}"' "$hook"
-		grep -q '^export MISE_TRUSTED_CONFIG_PATHS=' "$hook" || sed -i '3iexport MISE_TRUSTED_CONFIG_PATHS="{{ mise_trusted_config_paths }}"' "$hook"
-		sed -i 's#^PREK=".*"$#PREK="{{ mise_data_dir }}/shims/prek"#' "$hook"
-	done
+	@just --justfile {{ justfile() }} mise exec -- prek install

 # Internal - ensures var/mise directory exists
 _ensure_mise_data_directory:
--- a/mise.toml
+++ b/mise.toml
@@ -1,2 +1,6 @@
 [tools]
-prek = "0.5.2"
+prek = "0.4.5"
+
+[settings]
+# Disable automatic trust prompts - we trust this config
+yes = true
--- a/renovate.json
+++ b/renovate.json
@@ -5,62 +5,5 @@
 	],
 	"labels": [
 		"dependencies"
-	],
-	"packageRules": [
-		{
-			"description": "Cargo dependencies, the Rust toolchain pin, prek (via mise) and the workflows' own actions merge by pushing to main, without a pull request. ci.yml runs on `push: [\"**\"]`, so the Renovate branch itself is compiled, linted with `clippy -D warnings` and unit-tested first; a failure leaves the branch red and Renovate raises a pull request instead of merging.",
-			"matchManagers": [
-				"cargo",
-				"rust-toolchain",
-				"mise",
-				"github-actions"
-			],
-			"matchUpdateTypes": [
-				"minor",
-				"patch",
-				"digest"
-			],
-			"automerge": true,
-			"automergeType": "branch",
-			"platformAutomerge": false
-		},
-		{
-			"description": "The release image's base (Dockerfile). Gated by ci.yml's docker-build job, which builds the image exactly as Publish does but with `push: false`, and which only runs when the Dockerfile actually changed.",
-			"matchManagers": [
-				"dockerfile"
-			],
-			"matchUpdateTypes": [
-				"minor",
-				"patch",
-				"digest"
-			],
-			"automerge": true,
-			"automergeType": "branch",
-			"platformAutomerge": false
-		},
-		{
-			"description": "Local development service images under etc/services/** - the homeservers and LLM backends that `just services-start` brings up. They are never part of a shipped artifact and CI does not run them, so the justification here is blast radius rather than validation: the worst case is a broken local development stack, fixed by pinning back.",
-			"matchManagers": [
-				"docker-compose"
-			],
-			"matchFileNames": [
-				"etc/services/**"
-			],
-			"matchUpdateTypes": [
-				"minor",
-				"patch",
-				"digest"
-			],
-			"automerge": true,
-			"automergeType": "branch",
-			"platformAutomerge": false
-		},
-		{
-			"description": "Major updates always get a pull request and a human. This is deliberately the last rule so that it overrides the automerge rules above for every manager.",
-			"matchUpdateTypes": [
-				"major"
-			],
-			"automerge": false
-		}
 	]
 }
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.98.1"
+channel = "1.96.0"
 components = ["rustfmt", "clippy"]
 profile = "default"
--- a/src/controller/cfg/help.rs
+++ b/src/controller/cfg/help.rs
@@ -136,7 +136,7 @@ fn build_section_text_generation(command_prefix: &str, bot_username: &str) -> St
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_show(
+        &strings::help::cfg::current_setting_show(
            command_prefix,
            "text-generation prefix-requirement-type"
        )
@@ -144,7 +144,7 @@ fn build_section_text_generation(command_prefix: &str, bot_username: &str) -> St
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_set(
+        &strings::help::cfg::current_setting_set(
            command_prefix,
            "text-generation set-prefix-requirement-type VALUE"
        )
@@ -152,7 +152,7 @@ fn build_section_text_generation(command_prefix: &str, bot_username: &str) -> St
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_unset(
+        &strings::help::cfg::current_setting_unset(
            command_prefix,
            "text-generation set-prefix-requirement-type"
        )
@@ -176,12 +176,12 @@ fn build_section_text_generation(command_prefix: &str, bot_username: &str) -> St
    message.push_str("\n\n");
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_show(command_prefix, "text-generation auto-usage")
+        &strings::help::cfg::current_setting_show(command_prefix, "text-generation auto-usage")
    ));
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_set(
+        &strings::help::cfg::current_setting_set(
            command_prefix,
            "text-generation set-auto-usage VALUE"
        )
@@ -189,7 +189,10 @@ fn build_section_text_generation(command_prefix: &str, bot_username: &str) -> St
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_unset(command_prefix, "text-generation set-auto-usage")
+        &strings::help::cfg::current_setting_unset(
+            command_prefix,
+            "text-generation set-auto-usage"
+        )
    ));
    message.push_str("\n\n");

@@ -208,7 +211,7 @@ fn build_section_text_generation(command_prefix: &str, bot_username: &str) -> St
    message.push_str("\n\n");
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_show(
+        &strings::help::cfg::current_setting_show(
            command_prefix,
            "text-generation context-management-enabled"
        )
@@ -216,7 +219,7 @@ fn build_section_text_generation(command_prefix: &str, bot_username: &str) -> St
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_set(
+        &strings::help::cfg::current_setting_set(
            command_prefix,
            "text-generation set-context-management-enabled VALUE"
        )
@@ -224,7 +227,7 @@ fn build_section_text_generation(command_prefix: &str, bot_username: &str) -> St
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_unset(
+        &strings::help::cfg::current_setting_unset(
            command_prefix,
            "text-generation set-context-management-enabled"
        )
@@ -246,7 +249,7 @@ fn build_section_text_generation(command_prefix: &str, bot_username: &str) -> St
    message.push_str("\n\n");
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_show(
+        &strings::help::cfg::current_setting_show(
            command_prefix,
            "text-generation thinking-notice-enabled"
        )
@@ -254,7 +257,7 @@ fn build_section_text_generation(command_prefix: &str, bot_username: &str) -> St
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_set(
+        &strings::help::cfg::current_setting_set(
            command_prefix,
            "text-generation set-thinking-notice-enabled VALUE"
        )
@@ -262,7 +265,7 @@ fn build_section_text_generation(command_prefix: &str, bot_username: &str) -> St
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_unset(
+        &strings::help::cfg::current_setting_unset(
            command_prefix,
            "text-generation set-thinking-notice-enabled"
        )
@@ -286,7 +289,7 @@ fn build_section_text_generation(command_prefix: &str, bot_username: &str) -> St
    message.push_str("\n\n");
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_show(
+        &strings::help::cfg::current_setting_show(
            command_prefix,
            "text-generation sender-context-mode"
        )
@@ -294,7 +297,7 @@ fn build_section_text_generation(command_prefix: &str, bot_username: &str) -> St
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_set(
+        &strings::help::cfg::current_setting_set(
            command_prefix,
            "text-generation set-sender-context-mode VALUE"
        )
@@ -302,7 +305,7 @@ fn build_section_text_generation(command_prefix: &str, bot_username: &str) -> St
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_unset(
+        &strings::help::cfg::current_setting_unset(
            command_prefix,
            "text-generation set-sender-context-mode"
        )
@@ -320,12 +323,15 @@ fn build_section_text_generation(command_prefix: &str, bot_username: &str) -> St
    message.push_str("\n\n");
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_show(command_prefix, "text-generation prompt-override")
+        &strings::help::cfg::current_setting_show(
+            command_prefix,
+            "text-generation prompt-override"
+        )
    ));
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_set(
+        &strings::help::cfg::current_setting_set(
            command_prefix,
            "text-generation set-prompt-override VALUE"
        )
@@ -333,7 +339,7 @@ fn build_section_text_generation(command_prefix: &str, bot_username: &str) -> St
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_unset(
+        &strings::help::cfg::current_setting_unset(
            command_prefix,
            "text-generation set-prompt-override"
        )
@@ -351,7 +357,7 @@ fn build_section_text_generation(command_prefix: &str, bot_username: &str) -> St
    message.push_str("\n\n");
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_show(
+        &strings::help::cfg::current_setting_show(
            command_prefix,
            "text-generation temperature-override"
        )
@@ -359,7 +365,7 @@ fn build_section_text_generation(command_prefix: &str, bot_username: &str) -> St
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_set(
+        &strings::help::cfg::current_setting_set(
            command_prefix,
            "text-generation set-temperature-override VALUE"
        )
@@ -367,7 +373,7 @@ fn build_section_text_generation(command_prefix: &str, bot_username: &str) -> St
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_unset(
+        &strings::help::cfg::current_setting_unset(
            command_prefix,
            "text-generation set-temperature-override"
        )
@@ -404,12 +410,12 @@ fn build_section_speech_to_text(command_prefix: &str) -> String {
    message.push_str("\n\n");
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_show(command_prefix, "speech-to-text flow-type")
+        &strings::help::cfg::current_setting_show(command_prefix, "speech-to-text flow-type")
    ));
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_set(
+        &strings::help::cfg::current_setting_set(
            command_prefix,
            "speech-to-text set-flow-type VALUE"
        )
@@ -417,7 +423,7 @@ fn build_section_speech_to_text(command_prefix: &str) -> String {
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_unset(command_prefix, "speech-to-text set-flow-type")
+        &strings::help::cfg::current_setting_unset(command_prefix, "speech-to-text set-flow-type")
    ));
    message.push_str("\n\n");

@@ -438,7 +444,7 @@ fn build_section_speech_to_text(command_prefix: &str) -> String {
    message.push_str("\n\n");
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_show(
+        &strings::help::cfg::current_setting_show(
            command_prefix,
            "speech-to-text msg-type-for-non-threaded-only-transcribed-messages"
        )
@@ -446,7 +452,7 @@ fn build_section_speech_to_text(command_prefix: &str) -> String {
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_set(
+        &strings::help::cfg::current_setting_set(
            command_prefix,
            "speech-to-text set-msg-type-for-non-threaded-only-transcribed-messages VALUE"
        )
@@ -454,7 +460,7 @@ fn build_section_speech_to_text(command_prefix: &str) -> String {
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_unset(
+        &strings::help::cfg::current_setting_unset(
            command_prefix,
            "speech-to-text set-msg-type-for-non-threaded-only-transcribed-messages"
        )
@@ -472,12 +478,12 @@ fn build_section_speech_to_text(command_prefix: &str) -> String {
    message.push_str("\n\n");
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_show(command_prefix, "speech-to-text language")
+        &strings::help::cfg::current_setting_show(command_prefix, "speech-to-text language")
    ));
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_set(
+        &strings::help::cfg::current_setting_set(
            command_prefix,
            "speech-to-text set-language VALUE"
        )
@@ -485,7 +491,7 @@ fn build_section_speech_to_text(command_prefix: &str) -> String {
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_unset(command_prefix, "speech-to-text set-language")
+        &strings::help::cfg::current_setting_unset(command_prefix, "speech-to-text set-language")
    ));
    message.push_str("\n\n");

@@ -520,7 +526,7 @@ fn build_section_text_to_speech(command_prefix: &str) -> String {
    message.push_str("\n\n");
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_show(
+        &strings::help::cfg::current_setting_show(
            command_prefix,
            "text-to-speech bot-msgs-flow-type"
        )
@@ -528,7 +534,7 @@ fn build_section_text_to_speech(command_prefix: &str) -> String {
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_set(
+        &strings::help::cfg::current_setting_set(
            command_prefix,
            "text-to-speech set-bot-msgs-flow-type VALUE"
        )
@@ -536,7 +542,7 @@ fn build_section_text_to_speech(command_prefix: &str) -> String {
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_unset(
+        &strings::help::cfg::current_setting_unset(
            command_prefix,
            "text-to-speech set-bot-msgs-flow-type"
        )
@@ -560,7 +566,7 @@ fn build_section_text_to_speech(command_prefix: &str) -> String {
    message.push_str("\n\n");
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_show(
+        &strings::help::cfg::current_setting_show(
            command_prefix,
            "text-to-speech user-msgs-flow-type"
        )
@@ -568,7 +574,7 @@ fn build_section_text_to_speech(command_prefix: &str) -> String {
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_set(
+        &strings::help::cfg::current_setting_set(
            command_prefix,
            "text-to-speech set-user-msgs-flow-type VALUE"
        )
@@ -576,7 +582,7 @@ fn build_section_text_to_speech(command_prefix: &str) -> String {
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_unset(
+        &strings::help::cfg::current_setting_unset(
            command_prefix,
            "text-to-speech set-user-msgs-flow-type"
        )
@@ -594,12 +600,12 @@ fn build_section_text_to_speech(command_prefix: &str) -> String {
    message.push_str("\n\n");
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_show(command_prefix, "text-to-speech speed-override")
+        &strings::help::cfg::current_setting_show(command_prefix, "text-to-speech speed-override")
    ));
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_set(
+        &strings::help::cfg::current_setting_set(
            command_prefix,
            "text-to-speech set-speed-override VALUE"
        )
@@ -607,7 +613,7 @@ fn build_section_text_to_speech(command_prefix: &str) -> String {
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_unset(
+        &strings::help::cfg::current_setting_unset(
            command_prefix,
            "text-to-speech set-speed-override"
        )
@@ -625,12 +631,12 @@ fn build_section_text_to_speech(command_prefix: &str) -> String {
    message.push_str("\n\n");
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_show(command_prefix, "text-to-speech voice-override")
+        &strings::help::cfg::current_setting_show(command_prefix, "text-to-speech voice-override")
    ));
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_set(
+        &strings::help::cfg::current_setting_set(
            command_prefix,
            "text-to-speech set-voice-override VALUE"
        )
@@ -638,7 +644,7 @@ fn build_section_text_to_speech(command_prefix: &str) -> String {
    message.push('\n');
    message.push_str(&format!(
        "- {}",
-        strings::help::cfg::current_setting_unset(
+        &strings::help::cfg::current_setting_unset(
            command_prefix,
            "text-to-speech set-voice-override"
        )
--- a/src/controller/chat_completion/mod.rs
+++ b/src/controller/chat_completion/mod.rs
@@ -147,7 +147,9 @@ pub async fn handle(
        // Let's proceed below where we potentially handle text-generation.
    }

-    let text_to_speech_stage_params: Option<TextToSpeechParams> = if message_context
+    let text_to_speech_stage_params: Option<TextToSpeechParams>;
+
+    if message_context
        .room_config_context()
        .should_auto_text_generate(original_message_is_audio)
    {
@@ -208,7 +210,7 @@ pub async fn handle(
            return Ok(());
        };

-        match message_context
+        text_to_speech_stage_params = match message_context
            .room_config_context()
            .text_to_speech_bot_messages_flow_type()
        {
@@ -241,7 +243,7 @@ pub async fn handle(
                text_to_speech_eligible_payload,
                response_type,
            )),
-        }
+        };
    } else {
        tracing::debug!("Not generating text due to auto-usage configuration");

@@ -260,7 +262,7 @@ pub async fn handle(
            event_id: message_context.event_id().clone(),
        };

-        match message_context
+        text_to_speech_stage_params = match message_context
            .room_config_context()
            .text_to_speech_user_messages_flow_type()
        {
@@ -273,8 +275,8 @@ pub async fn handle(
                text_to_speech_eligible_payload,
                response_type,
            )),
-        }
-    };
+        };
+    }

    // We're potentially dealing with some text in text_to_speech_eligible_payload - either coming directly from the user or generated by an agent.

--- a/src/strings/agent.rs
+++ b/src/strings/agent.rs
@@ -101,13 +101,13 @@ pub fn post_creation_helpful_commands(
        for purpose in supported_purposes {
            message.push_str(&format!(
                "\n- {}",
-                set_as_purpose_handler_in_room(agent_identifier, purpose, command_prefix,)
+                &set_as_purpose_handler_in_room(agent_identifier, purpose, command_prefix,)
            ));

            if !is_room_local {
                message.push_str(&format!(
                    "\n- {}",
-                    set_as_purpose_handler_globally(agent_identifier, purpose, command_prefix,)
+                    &set_as_purpose_handler_globally(agent_identifier, purpose, command_prefix,)
                ));
            }
        }