From 5fe7bbeffb493dd1f1b9c29a0eeeee501bfefd5b Mon Sep 17 00:00:00 2001 From: Shaun Loo Date: Tue, 27 Jan 2026 16:36:07 -0800 Subject: [PATCH 01/24] docs: update exe.dev install instructions Signed-off-by: Shaun Loo --- docs/platforms/exe-dev.md | 180 +++++++++++++------------------------- 1 file changed, 59 insertions(+), 121 deletions(-) diff --git a/docs/platforms/exe-dev.md b/docs/platforms/exe-dev.md index 2e58d5dcd..69f3c9acf 100644 --- a/docs/platforms/exe-dev.md +++ b/docs/platforms/exe-dev.md @@ -7,40 +7,47 @@ read_when: # exe.dev -Goal: Moltbot Gateway running on an exe.dev VM, reachable from your laptop via: -- **exe.dev HTTPS proxy** (easy, no tunnel) or -- **SSH tunnel** (most secure; loopback-only Gateway) +Goal: Moltbot Gateway running on an exe.dev VM, reachable from your laptop via: `https://.exe.xyz` -This page assumes **Ubuntu/Debian**. If you picked a different distro, map packages accordingly. - -If you’re on any other Linux VPS, the same steps apply — you just won’t use the exe.dev proxy commands. +This page assumes exe.dev's default **exeuntu** image. If you picked a different distro, map packages accordingly. ## Beginner quick path -1) Create VM → install Node 22 → install Moltbot -2) Run `moltbot onboard --install-daemon` -3) Tunnel from laptop (`ssh -N -L 18789:127.0.0.1:18789 …`) -4) Open `http://127.0.0.1:18789/` and paste your token +1) [https://exe.new/moltbot](https://exe.new/moltbot) +2) Fill in your auth key/token as needed +3) Click on "Agent" next to your VM, and wait... +4) ??? +5) Profit ## What you need -- exe.dev account + `ssh exe.dev` working on your laptop -- SSH keys set up (your laptop → exe.dev) -- Model auth (OAuth or API key) you want to use -- Provider credentials (optional): WhatsApp QR scan, Telegram bot token, Discord bot token, … +- exe.dev account +- `ssh exe.dev` access to [exe.dev](https://exe.dev) virtual machines (optional) + + +## Automated Install with Shelley + +Shelley, [exe.dev](https://exe.dev)'s agent, can install Moltbot instantly with our +prompt. The prompt used is as below: + +``` +Set up Moltbot (https://docs.molt.bot/install) on this VM. Use the non-interactive and accept-risk flags for moltbot onboarding. Add the supplied auth or token as needed. Configure nginx to forward from the default port 18789 to the root location on the default enabled site config, making sure to enable Websocket support. Pairing is done by "moltbot devices list" and "moltbot device approve ". Make sure the dashboard shows that Moltbot's health is OK. exe.dev handles forwarding from port 8000 to port 80/443 and HTTPS for us, so the final "reachable" should be .exe.xyz, without port specification. +``` + +## Manual installation ## 1) Create the VM -From your laptop: +From your device: ```bash -ssh exe.dev new --name=moltbot +ssh exe.dev new ``` Then connect: ```bash -ssh moltbot.exe.xyz +ssh .exe.xyz ``` Tip: keep this VM **stateful**. Moltbot stores state under `~/.clawdbot/` and `~/clawd/`. @@ -52,130 +59,61 @@ sudo apt-get update sudo apt-get install -y git curl jq ca-certificates openssl ``` -### Node 22 - -Install Node **>= 22.12** (any method is fine). Quick check: - -```bash -node -v -``` - -If you don’t already have Node 22 on the VM, use your preferred Node manager (nvm/mise/asdf) or a distro package source that provides Node 22+. - -Common Ubuntu/Debian option (NodeSource): - -```bash -curl -fsSL https://deb.nodesource.com/setup_22.x | sudo -E bash - -sudo apt-get install -y nodejs -``` - ## 3) Install Moltbot -Recommended on servers: npm global install. +Run the Moltbot install script: ```bash -npm i -g moltbot@latest -moltbot --version +curl -fsSL https://molt.bot/install.sh | bash ``` -If native deps fail to install (rare; usually `sharp`), add build tools: +## 4) Setup nginx to proxy Moltbot to port 8000 + +Edit `/etc/nginx/sites-enabled/default` with -```bash -sudo apt-get install -y build-essential python3 ``` +server { + listen 80 default_server; + listen [::]:80 default_server; + listen 8000; + listen [::]:8000; -## 4) First-time setup (wizard) + server_name _; -Run the onboarding wizard on the VM: + location / { + proxy_pass http://127.0.0.1:18789; + proxy_http_version 1.1; -```bash -moltbot onboard --install-daemon -``` + # WebSocket support + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; -It can set up: -- `~/clawd` workspace bootstrap -- `~/.clawdbot/moltbot.json` config -- model auth profiles -- model provider config/login -- Linux systemd **user** service (service) + # Standard proxy headers + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; -If you’re doing OAuth on a headless VM: do OAuth on a normal machine first, then copy the auth profile to the VM (see [Help](/help)). - -## 5) Remote access options - -### Option A (recommended): SSH tunnel (loopback-only) - -Keep Gateway on loopback (default) and tunnel it from your laptop: - -```bash -ssh -N -L 18789:127.0.0.1:18789 moltbot.exe.xyz -``` - -Open locally: -- `http://127.0.0.1:18789/` (Control UI) - -Runbook: [Remote access](/gateway/remote) - -### Option B: exe.dev HTTPS proxy (no tunnel) - -To let exe.dev proxy traffic to the VM, bind the Gateway to the LAN interface and set a token: - -```bash -export CLAWDBOT_GATEWAY_TOKEN="$(openssl rand -hex 32)" -moltbot gateway --bind lan --port 8080 --token "$CLAWDBOT_GATEWAY_TOKEN" -``` - -For service runs, persist it in `~/.clawdbot/moltbot.json`: - -```json5 -{ - gateway: { - mode: "local", - port: 8080, - bind: "lan", - auth: { mode: "token", token: "YOUR_TOKEN" } - } + # Timeout settings for long-lived connections + proxy_read_timeout 86400s; + proxy_send_timeout 86400s; + } } ``` -Notes: -- Non-loopback binds require `gateway.auth.token` (or `CLAWDBOT_GATEWAY_TOKEN`). -- `gateway.remote.token` is only for remote CLI calls; it does not enable local auth. +## 5) Access Moltbot and grant privileges -Then point exe.dev’s proxy at `8080` (or whatever port you chose) and open your VM’s HTTPS URL: +Access `https//.exe.xyz/?token=YOUR-TOKEN-FROM-TERMINAL`. Approve +devices with `clawdbot device list` and `clawdbot device accept`. When in doubt, +use Shelley from your browser! -```bash -ssh exe.dev share port moltbot 8080 -``` +## Remote Access -Open: -- `https://moltbot.exe.xyz/` +Remote access is handled by [exe.dev](https://exe.dev)'s authentication. By +default, HTTP traffic from port 8000 is forwarded to `https://.exe.xyz` +with email auth. -In the Control UI, paste the token (UI → Settings → token). The UI sends it as `connect.params.auth.token`. - -Notes: -- Prefer a **non-default** port (like `8080`) if your proxy expects an app port. -- Treat the token like a password. - -Control UI details: [Control UI](/web/control-ui) - -## 6) Keep it running (service) - -On Linux, Moltbot uses a systemd **user** service. After `--install-daemon`, verify: - -```bash -systemctl --user status moltbot-gateway[-].service -``` - -If the service dies after logout, enable lingering: - -```bash -sudo loginctl enable-linger "$USER" -``` - -More: [Linux](/platforms/linux) - -## 7) Updates +## Updating ```bash npm i -g moltbot@latest From 4647309c4ccbacdc747c04a4128c550b3002e67d Mon Sep 17 00:00:00 2001 From: Shadow Date: Tue, 27 Jan 2026 18:53:54 -0600 Subject: [PATCH 02/24] fix: update exe.dev install docs (#https://github.com/moltbot/moltbot/pull/3047) (thanks @zackerthescar) --- CHANGELOG.md | 1 + docs/platforms/exe-dev.md | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd1468f5a..d7dd92c68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,7 @@ Status: beta. - Telegram: support plugin sendPayload channelData (media/buttons) and validate plugin commands. (#1917) Thanks @JoshuaLelon. - Telegram: avoid block replies when streaming is disabled. (#1885) Thanks @ivancasco. - Docs: keep docs header sticky so navbar stays visible while scrolling. (#2445) Thanks @chenyuan99. +- Docs: update exe.dev install instructions. (#https://github.com/moltbot/moltbot/pull/3047) Thanks @zackerthescar. - Security: use Windows ACLs for permission audits and fixes on Windows. (#1957) - Auth: show copyable Google auth URL after ASCII prompt. (#1787) Thanks @robbyczgw-cla. - Routing: precompile session key regexes. (#1697) Thanks @Ray0907. diff --git a/docs/platforms/exe-dev.md b/docs/platforms/exe-dev.md index 69f3c9acf..796ddc374 100644 --- a/docs/platforms/exe-dev.md +++ b/docs/platforms/exe-dev.md @@ -103,8 +103,8 @@ server { ## 5) Access Moltbot and grant privileges -Access `https//.exe.xyz/?token=YOUR-TOKEN-FROM-TERMINAL`. Approve -devices with `clawdbot device list` and `clawdbot device accept`. When in doubt, +Access `https://.exe.xyz/?token=YOUR-TOKEN-FROM-TERMINAL`. Approve +devices with `moltbot devices list` and `moltbot device approve`. When in doubt, use Shelley from your browser! ## Remote Access From f6d0d4dbc26b9ce63efcc5e5da78a195dcb8be46 Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Wed, 28 Jan 2026 01:08:26 +0000 Subject: [PATCH 03/24] fix: honor state dir override in config resolution --- src/config/paths.test.ts | 18 ++++++++++++++++++ src/config/paths.ts | 2 ++ 2 files changed, 20 insertions(+) diff --git a/src/config/paths.test.ts b/src/config/paths.test.ts index e029a6a47..3f86e4a53 100644 --- a/src/config/paths.test.ts +++ b/src/config/paths.test.ts @@ -5,6 +5,7 @@ import { describe, expect, it, vi } from "vitest"; import { resolveDefaultConfigCandidates, + resolveConfigPath, resolveOAuthDir, resolveOAuthPath, resolveStateDir, @@ -106,4 +107,21 @@ describe("state + config path candidates", () => { vi.resetModules(); } }); + + it("respects state dir overrides when config is missing", async () => { + const root = await fs.mkdtemp(path.join(os.tmpdir(), "moltbot-config-override-")); + try { + const legacyDir = path.join(root, ".clawdbot"); + await fs.mkdir(legacyDir, { recursive: true }); + const legacyConfig = path.join(legacyDir, "moltbot.json"); + await fs.writeFile(legacyConfig, "{}", "utf-8"); + + const overrideDir = path.join(root, "override"); + const env = { MOLTBOT_STATE_DIR: overrideDir } as NodeJS.ProcessEnv; + const resolved = resolveConfigPath(env, overrideDir, () => root); + expect(resolved).toBe(path.join(overrideDir, "moltbot.json")); + } finally { + await fs.rm(root, { recursive: true, force: true }); + } + }); }); diff --git a/src/config/paths.ts b/src/config/paths.ts index df62ddec3..f6e451596 100644 --- a/src/config/paths.ts +++ b/src/config/paths.ts @@ -113,6 +113,7 @@ export function resolveConfigPath( ): string { const override = env.MOLTBOT_CONFIG_PATH?.trim() || env.CLAWDBOT_CONFIG_PATH?.trim(); if (override) return resolveUserPath(override); + const stateOverride = env.MOLTBOT_STATE_DIR?.trim() || env.CLAWDBOT_STATE_DIR?.trim(); const candidates = [ path.join(stateDir, CONFIG_FILENAME), path.join(stateDir, LEGACY_CONFIG_FILENAME), @@ -125,6 +126,7 @@ export function resolveConfigPath( } }); if (existing) return existing; + if (stateOverride) return path.join(stateDir, CONFIG_FILENAME); const defaultStateDir = resolveStateDir(env, homedir); if (path.resolve(stateDir) === path.resolve(defaultStateDir)) { return resolveConfigPathCandidate(env, homedir); From 72a304654119965ce271114b34d3a74416fa2d6e Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Wed, 28 Jan 2026 01:09:38 +0000 Subject: [PATCH 04/24] test: honor windows homedir env for legacy config --- src/config/paths.test.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/config/paths.test.ts b/src/config/paths.test.ts index 3f86e4a53..806d29f92 100644 --- a/src/config/paths.test.ts +++ b/src/config/paths.test.ts @@ -70,6 +70,9 @@ describe("state + config path candidates", () => { it("CONFIG_PATH prefers existing legacy filename when present", async () => { const root = await fs.mkdtemp(path.join(os.tmpdir(), "moltbot-config-")); const previousHome = process.env.HOME; + const previousUserProfile = process.env.USERPROFILE; + const previousHomeDrive = process.env.HOMEDRIVE; + const previousHomePath = process.env.HOMEPATH; const previousMoltbotConfig = process.env.MOLTBOT_CONFIG_PATH; const previousClawdbotConfig = process.env.CLAWDBOT_CONFIG_PATH; const previousMoltbotState = process.env.MOLTBOT_STATE_DIR; @@ -81,6 +84,12 @@ describe("state + config path candidates", () => { await fs.writeFile(legacyPath, "{}", "utf-8"); process.env.HOME = root; + if (process.platform === "win32") { + process.env.USERPROFILE = root; + const parsed = path.win32.parse(root); + process.env.HOMEDRIVE = parsed.root.replace(/\\$/, ""); + process.env.HOMEPATH = root.slice(parsed.root.length - 1); + } delete process.env.MOLTBOT_CONFIG_PATH; delete process.env.CLAWDBOT_CONFIG_PATH; delete process.env.MOLTBOT_STATE_DIR; @@ -95,6 +104,12 @@ describe("state + config path candidates", () => { } else { process.env.HOME = previousHome; } + if (previousUserProfile === undefined) delete process.env.USERPROFILE; + else process.env.USERPROFILE = previousUserProfile; + if (previousHomeDrive === undefined) delete process.env.HOMEDRIVE; + else process.env.HOMEDRIVE = previousHomeDrive; + if (previousHomePath === undefined) delete process.env.HOMEPATH; + else process.env.HOMEPATH = previousHomePath; if (previousMoltbotConfig === undefined) delete process.env.MOLTBOT_CONFIG_PATH; else process.env.MOLTBOT_CONFIG_PATH = previousMoltbotConfig; if (previousClawdbotConfig === undefined) delete process.env.CLAWDBOT_CONFIG_PATH; From 64be96c88cf86a51d9776fb9ace2c317e6395d00 Mon Sep 17 00:00:00 2001 From: Mariano Belinky Date: Mon, 26 Jan 2026 08:43:27 +0100 Subject: [PATCH 05/24] Add bitwarden skill --- skills/bitwarden/SKILL.md | 101 ++++++++++++++++++++ skills/bitwarden/references/templates.md | 116 +++++++++++++++++++++++ skills/bitwarden/scripts/bw-session.sh | 33 +++++++ 3 files changed, 250 insertions(+) create mode 100644 skills/bitwarden/SKILL.md create mode 100644 skills/bitwarden/references/templates.md create mode 100755 skills/bitwarden/scripts/bw-session.sh diff --git a/skills/bitwarden/SKILL.md b/skills/bitwarden/SKILL.md new file mode 100644 index 000000000..3e384597a --- /dev/null +++ b/skills/bitwarden/SKILL.md @@ -0,0 +1,101 @@ +--- +name: bitwarden +description: Manage passwords and credentials via Bitwarden CLI (bw). Use for storing, retrieving, creating, or updating logins, credit cards, secure notes, and identities. Trigger when automating authentication, filling payment forms, or managing secrets programmatically. +--- + +# Bitwarden CLI + +Full read/write vault access via `bw` command. + +## Prerequisites + +```bash +brew install bitwarden-cli +bw login # one-time, prompts for master password +``` + +## Session Management + +Bitwarden requires an unlocked session. Use the helper script: + +```bash +source scripts/bw-session.sh +# Sets BW_SESSION env var +``` + +Or manually: +```bash +export BW_SESSION=$(echo '' | bw unlock --raw) +bw sync # always sync after unlock +``` + +## Common Operations + +### Retrieve credentials +```bash +bw get password "Site Name" +bw get username "Site Name" +bw get item "Site Name" --pretty | jq '.login' +``` + +### Create login +```bash +bw get template item | jq ' + .type = 1 | + .name = "Site Name" | + .login.username = "user@email.com" | + .login.password = "secret123" | + .login.uris = [{uri: "https://example.com"}] +' | bw encode | bw create item +``` + +### Create credit card +```bash +bw get template item | jq ' + .type = 3 | + .name = "Card Name" | + .card.cardholderName = "John Doe" | + .card.brand = "Visa" | + .card.number = "4111111111111111" | + .card.expMonth = "12" | + .card.expYear = "2030" | + .card.code = "123" +' | bw encode | bw create item +``` + +### Get card for payment automation +```bash +bw get item "Card Name" | jq -r '.card | "\(.number) \(.expMonth)/\(.expYear) \(.code)"' +``` + +### List items +```bash +bw list items | jq -r '.[] | "\(.type)|\(.name)"' +# Types: 1=login, 2=note, 3=card, 4=identity +``` + +### Search +```bash +bw list items --search "vilaviniteca" | jq '.[0]' +``` + +## Item Types + +| Type | Value | Use | +|------|-------|-----| +| Login | 1 | Website credentials | +| Secure Note | 2 | Freeform text | +| Card | 3 | Credit/debit cards | +| Identity | 4 | Personal info | + +## References + +- [templates.md](references/templates.md) — Full jq templates for all item types +- [Bitwarden CLI docs](https://bitwarden.com/help/cli/) + +## Tips + +1. **Always sync** after creating/editing items: `bw sync` +2. **Session expires** — re-unlock if you get auth errors +3. **Delete sensitive messages** after receiving credentials +4. **Card numbers** may not import from other managers (security restriction) diff --git a/skills/bitwarden/references/templates.md b/skills/bitwarden/references/templates.md new file mode 100644 index 000000000..a14e011e4 --- /dev/null +++ b/skills/bitwarden/references/templates.md @@ -0,0 +1,116 @@ +# Bitwarden Item Templates + +jq patterns for creating vault items via CLI. + +## Login (type=1) + +```bash +bw get template item | jq ' + .type = 1 | + .name = "Example Site" | + .notes = "Optional notes" | + .favorite = false | + .login.username = "user@example.com" | + .login.password = "secretPassword123" | + .login.totp = "otpauth://totp/..." | + .login.uris = [ + {uri: "https://example.com", match: null}, + {uri: "https://app.example.com", match: null} + ] +' | bw encode | bw create item +``` + +## Credit Card (type=3) + +```bash +bw get template item | jq ' + .type = 3 | + .name = "Visa ending 1234" | + .notes = "Primary card" | + .card.cardholderName = "JOHN DOE" | + .card.brand = "Visa" | + .card.number = "4111111111111111" | + .card.expMonth = "12" | + .card.expYear = "2030" | + .card.code = "123" +' | bw encode | bw create item +``` + +**Brands:** Visa, Mastercard, Amex, Discover, Diners Club, JCB, Maestro, UnionPay, Other + +## Secure Note (type=2) + +```bash +bw get template item | jq ' + .type = 2 | + .name = "API Keys" | + .notes = "OPENAI_KEY=sk-xxx\nANTHROPIC_KEY=sk-ant-xxx" | + .secureNote.type = 0 +' | bw encode | bw create item +``` + +## Identity (type=4) + +```bash +bw get template item | jq ' + .type = 4 | + .name = "Personal Info" | + .identity.title = "Mr" | + .identity.firstName = "John" | + .identity.lastName = "Doe" | + .identity.email = "john@example.com" | + .identity.phone = "+34612345678" | + .identity.address1 = "123 Main St" | + .identity.city = "Barcelona" | + .identity.state = "Catalunya" | + .identity.postalCode = "08001" | + .identity.country = "ES" +' | bw encode | bw create item +``` + +## Edit Existing Item + +```bash +# Get item, modify, update +bw get item | jq '.login.password = "newPassword"' | bw encode | bw edit item +``` + +## Custom Fields + +```bash +bw get template item | jq ' + .type = 1 | + .name = "With Custom Fields" | + .fields = [ + {name: "Security Question", value: "Pet name", type: 0}, + {name: "PIN", value: "1234", type: 1} + ] +' | bw encode | bw create item +``` + +**Field types:** 0=text, 1=hidden, 2=boolean + +## Retrieve Patterns + +```bash +# Password only +bw get password "Site Name" + +# Username only +bw get username "Site Name" + +# Full login object +bw get item "Site Name" | jq '.login' + +# Card number +bw get item "Card Name" | jq -r '.card.number' + +# All card fields for form filling +bw get item "Card Name" | jq -r '.card | [.number, .expMonth, .expYear, .code] | @tsv' + +# Search by URL +bw list items --url "example.com" | jq '.[0].login' + +# List all cards +bw list items | jq '.[] | select(.type == 3) | .name' +``` diff --git a/skills/bitwarden/scripts/bw-session.sh b/skills/bitwarden/scripts/bw-session.sh new file mode 100755 index 000000000..1b353583e --- /dev/null +++ b/skills/bitwarden/scripts/bw-session.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# Unlock Bitwarden vault and export session key +# Usage: source bw-session.sh +# Or: source bw-session.sh (prompts for password) + +set -e + +if [ -n "$1" ]; then + MASTER_PW="$1" +else + read -sp "Bitwarden master password: " MASTER_PW + echo +fi + +# Check if already logged in +if ! bw login --check &>/dev/null; then + echo "Not logged in. Run: bw login " + return 1 +fi + +# Unlock and get session +export BW_SESSION=$(echo "$MASTER_PW" | bw unlock --raw 2>/dev/null) + +if [ -z "$BW_SESSION" ]; then + echo "Failed to unlock vault" + return 1 +fi + +# Sync to get latest +bw sync &>/dev/null + +echo "✓ Vault unlocked and synced" +echo "Session valid for this shell" From 4287c21e773e34edc56911de6155ac8cd05886fa Mon Sep 17 00:00:00 2001 From: Mariano Belinky Date: Tue, 27 Jan 2026 17:28:37 +0100 Subject: [PATCH 06/24] fix: guard channel-tools listActions against plugin crashes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Wraps plugin.actions.listActions() in a try/catch so a single broken channel plugin cannot crash the entire agent boot sequence. Errors are logged once per plugin+message (deduped) via defaultRuntime.error() and the call gracefully returns an empty array instead of propagating the exception. Fixes: 'Cannot read properties of undefined (reading listActions)' after the clawdbot→moltbot rename left some plugin state undefined. --- src/agents/channel-tools.ts | 43 ++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/src/agents/channel-tools.ts b/src/agents/channel-tools.ts index 437d326cb..27af3c5f9 100644 --- a/src/agents/channel-tools.ts +++ b/src/agents/channel-tools.ts @@ -1,8 +1,13 @@ import { getChannelDock } from "../channels/dock.js"; import { getChannelPlugin, listChannelPlugins } from "../channels/plugins/index.js"; import { normalizeAnyChannelId } from "../channels/registry.js"; -import type { ChannelAgentTool, ChannelMessageActionName } from "../channels/plugins/types.js"; +import type { + ChannelAgentTool, + ChannelMessageActionName, + ChannelPlugin, +} from "../channels/plugins/types.js"; import type { MoltbotConfig } from "../config/config.js"; +import { defaultRuntime } from "../runtime.js"; /** * Get the list of supported message actions for a specific channel. @@ -16,7 +21,7 @@ export function listChannelSupportedActions(params: { const plugin = getChannelPlugin(params.channel as Parameters[0]); if (!plugin?.actions?.listActions) return []; const cfg = params.cfg ?? ({} as MoltbotConfig); - return plugin.actions.listActions({ cfg }); + return runPluginListActions(plugin, cfg); } /** @@ -29,7 +34,7 @@ export function listAllChannelSupportedActions(params: { for (const plugin of listChannelPlugins()) { if (!plugin.actions?.listActions) continue; const cfg = params.cfg ?? ({} as MoltbotConfig); - const channelActions = plugin.actions.listActions({ cfg }); + const channelActions = runPluginListActions(plugin, cfg); for (const action of channelActions) { actions.add(action); } @@ -64,3 +69,35 @@ export function resolveChannelMessageToolHints(params: { .map((entry) => entry.trim()) .filter(Boolean); } + +const loggedListActionErrors = new Set(); + +function runPluginListActions( + plugin: ChannelPlugin, + cfg: MoltbotConfig, +): ChannelMessageActionName[] { + if (!plugin.actions?.listActions) return []; + try { + const listed = plugin.actions.listActions({ cfg }); + return Array.isArray(listed) ? listed : []; + } catch (err) { + logListActionsError(plugin.id, err); + return []; + } +} + +function logListActionsError(pluginId: string, err: unknown) { + const message = err instanceof Error ? err.message : String(err); + const key = `${pluginId}:${message}`; + if (loggedListActionErrors.has(key)) return; + loggedListActionErrors.add(key); + const stack = err instanceof Error && err.stack ? err.stack : null; + const details = stack ?? message; + defaultRuntime.error?.(`[channel-tools] ${pluginId}.actions.listActions failed: ${details}`); +} + +export const __testing = { + resetLoggedListActionErrors() { + loggedListActionErrors.clear(); + }, +}; From 34653e4bafea73df995ad3776e5e34810e6303a4 Mon Sep 17 00:00:00 2001 From: Shadow Date: Tue, 27 Jan 2026 19:25:14 -0600 Subject: [PATCH 07/24] fix: guard channel tool listActions (#2859) (thanks @mbelinky) --- CHANGELOG.md | 1 + src/agents/channel-tools.test.ts | 53 ++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 src/agents/channel-tools.test.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index d7dd92c68..e7ec0a747 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -77,6 +77,7 @@ Status: beta. - macOS: auto-scroll to bottom when sending a new message while scrolled up. (#2471) Thanks @kennyklee. - Web UI: auto-expand the chat compose textarea while typing (with sensible max height). (#2950) Thanks @shivamraut101. - Gateway: prevent crashes on transient network errors (fetch failures, timeouts, DNS). Added fatal error detection to only exit on truly critical errors. Fixes #2895, #2879, #2873. (#2980) Thanks @elliotsecops. +- Agents: guard channel tool listActions to avoid plugin crashes. (#2859) Thanks @mbelinky. - Gateway: suppress AbortError and transient network errors in unhandled rejections. (#2451) Thanks @Glucksberg. - TTS: keep /tts status replies on text-only commands and avoid duplicate block-stream audio. (#2451) Thanks @Glucksberg. - Security: pin npm overrides to keep tar@7.5.4 for install toolchains. diff --git a/src/agents/channel-tools.test.ts b/src/agents/channel-tools.test.ts new file mode 100644 index 000000000..05ec460a7 --- /dev/null +++ b/src/agents/channel-tools.test.ts @@ -0,0 +1,53 @@ +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; + +import type { MoltbotConfig } from "../config/config.js"; +import type { ChannelPlugin } from "../channels/plugins/types.js"; +import { setActivePluginRegistry } from "../plugins/runtime.js"; +import { createTestRegistry } from "../test-utils/channel-plugins.js"; +import { defaultRuntime } from "../runtime.js"; +import { __testing, listAllChannelSupportedActions } from "./channel-tools.js"; + +describe("channel tools", () => { + const errorSpy = vi.spyOn(defaultRuntime, "error").mockImplementation(() => undefined); + + beforeEach(() => { + const plugin: ChannelPlugin = { + id: "test", + meta: { + id: "test", + label: "Test", + selectionLabel: "Test", + docsPath: "/channels/test", + blurb: "test plugin", + }, + capabilities: { chatTypes: ["direct"] }, + config: { + listAccountIds: () => [], + resolveAccount: () => ({}), + }, + actions: { + listActions: () => { + throw new Error("boom"); + }, + }, + }; + + __testing.resetLoggedListActionErrors(); + errorSpy.mockClear(); + setActivePluginRegistry(createTestRegistry([{ pluginId: "test", source: "test", plugin }])); + }); + + afterEach(() => { + setActivePluginRegistry(createTestRegistry([])); + errorSpy.mockClear(); + }); + + it("skips crashing plugins and logs once", () => { + const cfg = {} as MoltbotConfig; + expect(listAllChannelSupportedActions({ cfg })).toEqual([]); + expect(errorSpy).toHaveBeenCalledTimes(1); + + expect(listAllChannelSupportedActions({ cfg })).toEqual([]); + expect(errorSpy).toHaveBeenCalledTimes(1); + }); +}); From 24960568862882cafed97c23d055028e2e0a8dba Mon Sep 17 00:00:00 2001 From: hlbbbbbbb Date: Wed, 28 Jan 2026 09:24:40 +0800 Subject: [PATCH 08/24] fix(minimax): use correct API endpoint and format MiniMax has updated their API. The previous configuration used an incorrect endpoint (api.minimax.io/anthropic) with anthropic-messages format, which no longer works. Changes: - Update MINIMAX_API_BASE_URL to https://api.minimax.chat/v1 - Change API format from anthropic-messages to openai-completions - Remove minimax from isAnthropicApi check in transcript-policy This fixes the issue where MiniMax API calls return no results. --- src/agents/models-config.providers.ts | 4 ++-- src/agents/transcript-policy.ts | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/agents/models-config.providers.ts b/src/agents/models-config.providers.ts index 76f1c3acd..cb556aced 100644 --- a/src/agents/models-config.providers.ts +++ b/src/agents/models-config.providers.ts @@ -17,7 +17,7 @@ import { discoverVeniceModels, VENICE_BASE_URL } from "./venice-models.js"; type ModelsConfig = NonNullable; export type ProviderConfig = NonNullable[string]; -const MINIMAX_API_BASE_URL = "https://api.minimax.io/anthropic"; +const MINIMAX_API_BASE_URL = "https://api.minimax.chat/v1"; const MINIMAX_DEFAULT_MODEL_ID = "MiniMax-M2.1"; const MINIMAX_DEFAULT_VISION_MODEL_ID = "MiniMax-VL-01"; const MINIMAX_DEFAULT_CONTEXT_WINDOW = 200000; @@ -244,7 +244,7 @@ export function normalizeProviders(params: { function buildMinimaxProvider(): ProviderConfig { return { baseUrl: MINIMAX_API_BASE_URL, - api: "anthropic-messages", + api: "openai-completions", models: [ { id: MINIMAX_DEFAULT_MODEL_ID, diff --git a/src/agents/transcript-policy.ts b/src/agents/transcript-policy.ts index 3ea06ce88..9ae14d38f 100644 --- a/src/agents/transcript-policy.ts +++ b/src/agents/transcript-policy.ts @@ -51,7 +51,8 @@ function isOpenAiProvider(provider?: string | null): boolean { function isAnthropicApi(modelApi?: string | null, provider?: string | null): boolean { if (modelApi === "anthropic-messages") return true; const normalized = normalizeProviderId(provider ?? ""); - return normalized === "anthropic" || normalized === "minimax"; + // MiniMax now uses openai-completions API, not anthropic-messages + return normalized === "anthropic"; } function isMistralModel(params: { provider?: string | null; modelId?: string | null }): boolean { From eb50314d7d30450775249e15a874dafd681428eb Mon Sep 17 00:00:00 2001 From: Shadow Date: Tue, 27 Jan 2026 19:47:21 -0600 Subject: [PATCH 09/24] fix: update MiniMax provider config (#3064) (thanks @hlbbbbbbb) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7ec0a747..37c3c17d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -78,6 +78,7 @@ Status: beta. - Web UI: auto-expand the chat compose textarea while typing (with sensible max height). (#2950) Thanks @shivamraut101. - Gateway: prevent crashes on transient network errors (fetch failures, timeouts, DNS). Added fatal error detection to only exit on truly critical errors. Fixes #2895, #2879, #2873. (#2980) Thanks @elliotsecops. - Agents: guard channel tool listActions to avoid plugin crashes. (#2859) Thanks @mbelinky. +- Providers: update MiniMax API endpoint and compatibility mode. (#3064) Thanks @hlbbbbbbb. - Gateway: suppress AbortError and transient network errors in unhandled rejections. (#2451) Thanks @Glucksberg. - TTS: keep /tts status replies on text-only commands and avoid duplicate block-stream audio. (#2451) Thanks @Glucksberg. - Security: pin npm overrides to keep tar@7.5.4 for install toolchains. From 558b64f5fa07f35fefdd893776ab9202c66fec51 Mon Sep 17 00:00:00 2001 From: ryan <39743613+ryancontent@users.noreply.github.com> Date: Wed, 28 Jan 2026 11:33:51 +1300 Subject: [PATCH 10/24] fix: handle Telegram network errors gracefully to prevent gateway crashes - Expand recoverable error codes (ECONNABORTED, ERR_NETWORK) - Add message patterns for 'typeerror: fetch failed' and 'undici' errors - Add isNetworkRelatedError() helper for broad network failure detection - Retry on all network-related errors instead of crashing gateway - Remove unnecessary 'void' from fire-and-forget patterns - Add tests for new error patterns Fixes #3005 --- src/telegram/bot-native-commands.ts | 4 ++-- src/telegram/monitor.ts | 20 +++++++++++++++++++- src/telegram/network-errors.test.ts | 12 ++++++++++++ src/telegram/network-errors.ts | 4 ++++ 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/src/telegram/bot-native-commands.ts b/src/telegram/bot-native-commands.ts index 4cca71d14..0dd372c3e 100644 --- a/src/telegram/bot-native-commands.ts +++ b/src/telegram/bot-native-commands.ts @@ -322,7 +322,7 @@ export const registerTelegramNativeCommands = ({ ]; if (allCommands.length > 0) { - void withTelegramApiErrorLogging({ + withTelegramApiErrorLogging({ operation: "setMyCommands", runtime, fn: () => bot.api.setMyCommands(allCommands), @@ -576,7 +576,7 @@ export const registerTelegramNativeCommands = ({ } } } else if (nativeDisabledExplicit) { - void withTelegramApiErrorLogging({ + withTelegramApiErrorLogging({ operation: "setMyCommands", runtime, fn: () => bot.api.setMyCommands([]), diff --git a/src/telegram/monitor.ts b/src/telegram/monitor.ts index 59df7098d..c3b3a5a2f 100644 --- a/src/telegram/monitor.ts +++ b/src/telegram/monitor.ts @@ -74,6 +74,23 @@ const isGetUpdatesConflict = (err: unknown) => { return haystack.includes("getupdates"); }; +const NETWORK_ERROR_SNIPPETS = [ + "fetch failed", + "network", + "timeout", + "socket", + "econnreset", + "econnrefused", + "undici", +]; + +const isNetworkRelatedError = (err: unknown) => { + if (!err) return false; + const message = formatErrorMessage(err).toLowerCase(); + if (!message) return false; + return NETWORK_ERROR_SNIPPETS.some((snippet) => message.includes(snippet)); +}; + export async function monitorTelegramProvider(opts: MonitorTelegramOpts = {}) { const cfg = opts.config ?? loadConfig(); const account = resolveTelegramAccount({ @@ -158,7 +175,8 @@ export async function monitorTelegramProvider(opts: MonitorTelegramOpts = {}) { } const isConflict = isGetUpdatesConflict(err); const isRecoverable = isRecoverableTelegramNetworkError(err, { context: "polling" }); - if (!isConflict && !isRecoverable) { + const isNetworkError = isNetworkRelatedError(err); + if (!isConflict && !isRecoverable && !isNetworkError) { throw err; } restartAttempts += 1; diff --git a/src/telegram/network-errors.test.ts b/src/telegram/network-errors.test.ts index ae42cbb97..db582355f 100644 --- a/src/telegram/network-errors.test.ts +++ b/src/telegram/network-errors.test.ts @@ -8,6 +8,13 @@ describe("isRecoverableTelegramNetworkError", () => { expect(isRecoverableTelegramNetworkError(err)).toBe(true); }); + it("detects additional recoverable error codes", () => { + const aborted = Object.assign(new Error("aborted"), { code: "ECONNABORTED" }); + const network = Object.assign(new Error("network"), { code: "ERR_NETWORK" }); + expect(isRecoverableTelegramNetworkError(aborted)).toBe(true); + expect(isRecoverableTelegramNetworkError(network)).toBe(true); + }); + it("detects AbortError names", () => { const err = Object.assign(new Error("The operation was aborted"), { name: "AbortError" }); expect(isRecoverableTelegramNetworkError(err)).toBe(true); @@ -19,6 +26,11 @@ describe("isRecoverableTelegramNetworkError", () => { expect(isRecoverableTelegramNetworkError(err)).toBe(true); }); + it("detects expanded message patterns", () => { + expect(isRecoverableTelegramNetworkError(new Error("TypeError: fetch failed"))).toBe(true); + expect(isRecoverableTelegramNetworkError(new Error("Undici: socket failure"))).toBe(true); + }); + it("skips message matches for send context", () => { const err = new TypeError("fetch failed"); expect(isRecoverableTelegramNetworkError(err, { context: "send" })).toBe(false); diff --git a/src/telegram/network-errors.ts b/src/telegram/network-errors.ts index 70cd81994..bb3432432 100644 --- a/src/telegram/network-errors.ts +++ b/src/telegram/network-errors.ts @@ -15,6 +15,8 @@ const RECOVERABLE_ERROR_CODES = new Set([ "UND_ERR_BODY_TIMEOUT", "UND_ERR_SOCKET", "UND_ERR_ABORTED", + "ECONNABORTED", + "ERR_NETWORK", ]); const RECOVERABLE_ERROR_NAMES = new Set([ @@ -27,6 +29,8 @@ const RECOVERABLE_ERROR_NAMES = new Set([ const RECOVERABLE_MESSAGE_SNIPPETS = [ "fetch failed", + "typeerror: fetch failed", + "undici", "network error", "network request", "client network socket disconnected", From 57d9c09f6efa567fc1822ba6e5075fc32686b325 Mon Sep 17 00:00:00 2001 From: Shadow Date: Tue, 27 Jan 2026 19:55:39 -0600 Subject: [PATCH 11/24] fix: expand Telegram polling network recovery (#3013) (thanks @ryancontent) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37c3c17d3..9e503882d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -79,6 +79,7 @@ Status: beta. - Gateway: prevent crashes on transient network errors (fetch failures, timeouts, DNS). Added fatal error detection to only exit on truly critical errors. Fixes #2895, #2879, #2873. (#2980) Thanks @elliotsecops. - Agents: guard channel tool listActions to avoid plugin crashes. (#2859) Thanks @mbelinky. - Providers: update MiniMax API endpoint and compatibility mode. (#3064) Thanks @hlbbbbbbb. +- Telegram: treat more network errors as recoverable in polling. (#3013) Thanks @ryancontent. - Gateway: suppress AbortError and transient network errors in unhandled rejections. (#2451) Thanks @Glucksberg. - TTS: keep /tts status replies on text-only commands and avoid duplicate block-stream audio. (#2451) Thanks @Glucksberg. - Security: pin npm overrides to keep tar@7.5.4 for install toolchains. From 7958ead91a724c18fda084776173504492ad813b Mon Sep 17 00:00:00 2001 From: "nonggia.liang" Date: Tue, 27 Jan 2026 15:55:53 +0800 Subject: [PATCH 12/24] fix: resolve Discord usernames to user IDs for outbound messages When sending Discord messages via cron jobs or the message tool, usernames like "john.doe" were incorrectly treated as channel names, causing silent delivery failures. This fix adds a resolveDiscordTarget() function that: - Queries Discord directory to resolve usernames to user IDs - Falls back to standard parsing for known formats - Enables sending DMs by username without requiring explicit user:ID format Changes: - Added resolveDiscordTarget() in targets.ts with directory lookup - Added parseAndResolveRecipient() in send.shared.ts - Updated all outbound send functions to use username resolution Fixes #2627 --- src/discord/send.outbound.ts | 8 ++--- src/discord/send.shared.ts | 40 ++++++++++++++++++++++- src/discord/targets.ts | 62 ++++++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+), 5 deletions(-) diff --git a/src/discord/send.outbound.ts b/src/discord/send.outbound.ts index a47d0f4f1..22b402ae3 100644 --- a/src/discord/send.outbound.ts +++ b/src/discord/send.outbound.ts @@ -13,7 +13,7 @@ import { createDiscordClient, normalizeDiscordPollInput, normalizeStickerIds, - parseRecipient, + parseAndResolveRecipient, resolveChannelId, sendDiscordMedia, sendDiscordText, @@ -49,7 +49,7 @@ export async function sendMessageDiscord( const chunkMode = resolveChunkMode(cfg, "discord", accountInfo.accountId); const textWithTables = convertMarkdownTables(text ?? "", tableMode); const { token, rest, request } = createDiscordClient(opts, cfg); - const recipient = parseRecipient(to); + const recipient = await parseAndResolveRecipient(to, opts.accountId); const { channelId } = await resolveChannelId(rest, recipient, request); let result: { id: string; channel_id: string } | { id: string | null; channel_id: string }; try { @@ -104,7 +104,7 @@ export async function sendStickerDiscord( ): Promise { const cfg = loadConfig(); const { rest, request } = createDiscordClient(opts, cfg); - const recipient = parseRecipient(to); + const recipient = await parseAndResolveRecipient(to, opts.accountId); const { channelId } = await resolveChannelId(rest, recipient, request); const content = opts.content?.trim(); const stickers = normalizeStickerIds(stickerIds); @@ -131,7 +131,7 @@ export async function sendPollDiscord( ): Promise { const cfg = loadConfig(); const { rest, request } = createDiscordClient(opts, cfg); - const recipient = parseRecipient(to); + const recipient = await parseAndResolveRecipient(to, opts.accountId); const { channelId } = await resolveChannelId(rest, recipient, request); const content = opts.content?.trim(); const payload = normalizeDiscordPollInput(poll); diff --git a/src/discord/send.shared.ts b/src/discord/send.shared.ts index 4919be29d..1cf2a93a9 100644 --- a/src/discord/send.shared.ts +++ b/src/discord/send.shared.ts @@ -13,7 +13,7 @@ import type { ChunkMode } from "../auto-reply/chunk.js"; import { chunkDiscordTextWithMode } from "./chunk.js"; import { fetchChannelPermissionsDiscord, isThreadChannelType } from "./send.permissions.js"; import { DiscordSendError } from "./send.types.js"; -import { parseDiscordTarget } from "./targets.js"; +import { parseDiscordTarget, resolveDiscordTarget } from "./targets.js"; import { normalizeDiscordToken } from "./token.js"; const DISCORD_TEXT_LIMIT = 2000; @@ -101,6 +101,44 @@ function parseRecipient(raw: string): DiscordRecipient { return { kind: target.kind, id: target.id }; } +/** + * Parse and resolve Discord recipient, including username lookup. + * This enables sending DMs by username (e.g., "john.doe") by querying + * the Discord directory to resolve usernames to user IDs. + * + * @param raw - The recipient string (username, ID, or known format) + * @param accountId - Discord account ID to use for directory lookup + * @returns Parsed DiscordRecipient with resolved user ID if applicable + */ +export async function parseAndResolveRecipient( + raw: string, + accountId?: string, +): Promise { + const cfg = loadConfig(); + const accountInfo = resolveDiscordAccount({ cfg, accountId }); + + // First try to resolve using directory lookup (handles usernames) + const resolved = await resolveDiscordTarget(raw, { + cfg, + accountId: accountInfo.accountId, + }); + + if (resolved) { + return { kind: resolved.kind, id: resolved.id }; + } + + // Fallback to standard parsing (for channels, etc.) + const parsed = parseDiscordTarget(raw, { + ambiguousMessage: `Ambiguous Discord recipient "${raw.trim()}". Use "user:${raw.trim()}" for DMs or "channel:${raw.trim()}" for channel messages.`, + }); + + if (!parsed) { + throw new Error("Recipient is required for Discord sends"); + } + + return { kind: parsed.kind, id: parsed.id }; +} + function normalizeStickerIds(raw: string[]) { const ids = raw.map((entry) => entry.trim()).filter(Boolean); if (ids.length === 0) { diff --git a/src/discord/targets.ts b/src/discord/targets.ts index 3a3c93ec8..311955182 100644 --- a/src/discord/targets.ts +++ b/src/discord/targets.ts @@ -5,8 +5,13 @@ import { type MessagingTarget, type MessagingTargetKind, type MessagingTargetParseOptions, + type DirectoryConfigParams, + type ChannelDirectoryEntry, } from "../channels/targets.js"; +import { listDiscordDirectoryPeersLive } from "./directory-live.js"; +import { resolveDiscordAccount } from "./accounts.js"; + export type DiscordTargetKind = MessagingTargetKind; export type DiscordTarget = MessagingTarget; @@ -60,3 +65,60 @@ export function resolveDiscordChannelId(raw: string): string { const target = parseDiscordTarget(raw, { defaultKind: "channel" }); return requireTargetKind({ platform: "Discord", target, kind: "channel" }); } + +/** + * Resolve a Discord username to user ID using the directory lookup. + * This enables sending DMs by username instead of requiring explicit user IDs. + * + * @param raw - The username or raw target string (e.g., "john.doe") + * @param options - Directory configuration params (cfg, accountId, limit) + * @returns Parsed MessagingTarget with user ID, or undefined if not found + */ +export async function resolveDiscordTarget( + raw: string, + options: DirectoryConfigParams, +): Promise { + const trimmed = raw.trim(); + if (!trimmed) return undefined; + + // If already a known format, parse directly + const directParse = parseDiscordTarget(trimmed, options); + if (directParse && directParse.kind !== "channel" && !isLikelyUsername(trimmed)) { + return directParse; + } + + // Try to resolve as a username via directory lookup + try { + const directoryEntries = await listDiscordDirectoryPeersLive({ + ...options, + query: trimmed, + limit: 1, + }); + + const match = directoryEntries[0]; + if (match && match.kind === "user") { + // Extract user ID from the directory entry (format: "user:") + const userId = match.id.replace(/^user:/, ""); + return buildMessagingTarget("user", userId, trimmed); + } + } catch (error) { + // Directory lookup failed - fall through to parse as-is + // This preserves existing behavior for channel names + } + + // Fallback to original parsing (for channels, etc.) + return parseDiscordTarget(trimmed, options); +} + +/** + * Check if a string looks like a Discord username (not a mention, prefix, or ID). + * Usernames typically don't start with special characters except underscore. + */ +function isLikelyUsername(input: string): boolean { + // Skip if it's already a known format + if (/^(user:|channel:|discord:|@|<@!?)|[\d]+$/.test(input)) { + return false; + } + // Likely a username if it doesn't match known patterns + return true; +} From cf827f03e8999189d34101f03a87414e4902da70 Mon Sep 17 00:00:00 2001 From: Shadow Date: Tue, 27 Jan 2026 20:31:51 -0600 Subject: [PATCH 13/24] tests: cover Discord username resolution --- src/discord/targets.test.ts | 42 +++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/src/discord/targets.test.ts b/src/discord/targets.test.ts index 3eee1eb1e..7ac39450b 100644 --- a/src/discord/targets.test.ts +++ b/src/discord/targets.test.ts @@ -1,7 +1,13 @@ -import { describe, expect, it } from "vitest"; +import { beforeEach, describe, expect, it, vi } from "vitest"; +import type { ClawdbotConfig } from "../config/config.js"; import { normalizeDiscordMessagingTarget } from "../channels/plugins/normalize/discord.js"; -import { parseDiscordTarget, resolveDiscordChannelId } from "./targets.js"; +import { listDiscordDirectoryPeersLive } from "./directory-live.js"; +import { parseDiscordTarget, resolveDiscordChannelId, resolveDiscordTarget } from "./targets.js"; + +vi.mock("./directory-live.js", () => ({ + listDiscordDirectoryPeersLive: vi.fn(), +})); describe("parseDiscordTarget", () => { it("parses user mention and prefixes", () => { @@ -68,6 +74,38 @@ describe("resolveDiscordChannelId", () => { }); }); +describe("resolveDiscordTarget", () => { + const cfg = { channels: { discord: {} } } as ClawdbotConfig; + const listPeers = vi.mocked(listDiscordDirectoryPeersLive); + + beforeEach(() => { + listPeers.mockReset(); + }); + + it("returns a resolved user for usernames", async () => { + listPeers.mockResolvedValueOnce([{ kind: "user", id: "user:999", name: "Jane" } as const]); + + await expect( + resolveDiscordTarget("jane", { cfg, accountId: "default" }), + ).resolves.toMatchObject({ kind: "user", id: "999", normalized: "user:999" }); + }); + + it("falls back to parsing when lookup misses", async () => { + listPeers.mockResolvedValueOnce([]); + await expect( + resolveDiscordTarget("general", { cfg, accountId: "default" }), + ).resolves.toMatchObject({ kind: "channel", id: "general" }); + }); + + it("does not call directory lookup for explicit user ids", async () => { + listPeers.mockResolvedValueOnce([]); + await expect( + resolveDiscordTarget("user:123", { cfg, accountId: "default" }), + ).resolves.toMatchObject({ kind: "user", id: "123" }); + expect(listPeers).not.toHaveBeenCalled(); + }); +}); + describe("normalizeDiscordMessagingTarget", () => { it("defaults raw numeric ids to channels", () => { expect(normalizeDiscordMessagingTarget("123")).toBe("channel:123"); From 7bfe6ab2d64e5fe635a775d8805847843e28b487 Mon Sep 17 00:00:00 2001 From: Shadow Date: Tue, 27 Jan 2026 21:04:38 -0600 Subject: [PATCH 14/24] fix: resolve Discord usernames for outbound sends (#2649) (thanks @nonggialiang) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e503882d..79bca9908 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -80,6 +80,7 @@ Status: beta. - Agents: guard channel tool listActions to avoid plugin crashes. (#2859) Thanks @mbelinky. - Providers: update MiniMax API endpoint and compatibility mode. (#3064) Thanks @hlbbbbbbb. - Telegram: treat more network errors as recoverable in polling. (#3013) Thanks @ryancontent. +- Discord: resolve usernames to user IDs for outbound messages. (#2649) Thanks @nonggialiang. - Gateway: suppress AbortError and transient network errors in unhandled rejections. (#2451) Thanks @Glucksberg. - TTS: keep /tts status replies on text-only commands and avoid duplicate block-stream audio. (#2451) Thanks @Glucksberg. - Security: pin npm overrides to keep tar@7.5.4 for install toolchains. From 394308076aefadefb3a718a4cddce46004d8dffe Mon Sep 17 00:00:00 2001 From: Boran Cui Date: Tue, 27 Jan 2026 21:10:09 +0800 Subject: [PATCH 15/24] Update Moonshot Kimi model references from kimi-k2-0905-preview to the latest kimi-k2.5 --- docs/concepts/model-providers.md | 7 ++++--- docs/gateway/configuration.md | 10 +++++----- docs/providers/moonshot.md | 15 +++++++++++++-- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/docs/concepts/model-providers.md b/docs/concepts/model-providers.md index ef27fc9e3..9dbb984fc 100644 --- a/docs/concepts/model-providers.md +++ b/docs/concepts/model-providers.md @@ -130,9 +130,10 @@ Moonshot uses OpenAI-compatible endpoints, so configure it as a custom provider: - Provider: `moonshot` - Auth: `MOONSHOT_API_KEY` -- Example model: `moonshot/kimi-k2-0905-preview` +- Example model: `moonshot/kimi-k2.5` - Kimi K2 model IDs: {/* moonshot-kimi-k2-model-refs:start */} + - `moonshot/kimi-k2.5` - `moonshot/kimi-k2-0905-preview` - `moonshot/kimi-k2-turbo-preview` - `moonshot/kimi-k2-thinking` @@ -141,7 +142,7 @@ Moonshot uses OpenAI-compatible endpoints, so configure it as a custom provider: ```json5 { agents: { - defaults: { model: { primary: "moonshot/kimi-k2-0905-preview" } } + defaults: { model: { primary: "moonshot/kimi-k2.5" } } }, models: { mode: "merge", @@ -150,7 +151,7 @@ Moonshot uses OpenAI-compatible endpoints, so configure it as a custom provider: baseUrl: "https://api.moonshot.ai/v1", apiKey: "${MOONSHOT_API_KEY}", api: "openai-completions", - models: [{ id: "kimi-k2-0905-preview", name: "Kimi K2 0905 Preview" }] + models: [{ id: "kimi-k2.5", name: "Kimi K2.5" }] } } } diff --git a/docs/gateway/configuration.md b/docs/gateway/configuration.md index f5438fb46..15261c809 100644 --- a/docs/gateway/configuration.md +++ b/docs/gateway/configuration.md @@ -2396,8 +2396,8 @@ Use Moonshot's OpenAI-compatible endpoint: env: { MOONSHOT_API_KEY: "sk-..." }, agents: { defaults: { - model: { primary: "moonshot/kimi-k2-0905-preview" }, - models: { "moonshot/kimi-k2-0905-preview": { alias: "Kimi K2" } } + model: { primary: "moonshot/kimi-k2.5" }, + models: { "moonshot/kimi-k2.5": { alias: "Kimi K2.5" } } } }, models: { @@ -2409,8 +2409,8 @@ Use Moonshot's OpenAI-compatible endpoint: api: "openai-completions", models: [ { - id: "kimi-k2-0905-preview", - name: "Kimi K2 0905 Preview", + id: "kimi-k2.5", + name: "Kimi K2.5", reasoning: false, input: ["text"], cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }, @@ -2426,7 +2426,7 @@ Use Moonshot's OpenAI-compatible endpoint: Notes: - Set `MOONSHOT_API_KEY` in the environment or use `moltbot onboard --auth-choice moonshot-api-key`. -- Model ref: `moonshot/kimi-k2-0905-preview`. +- Model ref: `moonshot/kimi-k2.5`. - Use `https://api.moonshot.cn/v1` if you need the China endpoint. ### Kimi Code diff --git a/docs/providers/moonshot.md b/docs/providers/moonshot.md index 7e0723f7e..a1f2d18ad 100644 --- a/docs/providers/moonshot.md +++ b/docs/providers/moonshot.md @@ -9,11 +9,12 @@ read_when: # Moonshot AI (Kimi) Moonshot provides the Kimi API with OpenAI-compatible endpoints. Configure the -provider and set the default model to `moonshot/kimi-k2-0905-preview`, or use +provider and set the default model to `moonshot/kimi-k2.5`, or use Kimi Code with `kimi-code/kimi-for-coding`. Current Kimi K2 model IDs: {/* moonshot-kimi-k2-ids:start */} +- `kimi-k2.5` - `kimi-k2-0905-preview` - `kimi-k2-turbo-preview` - `kimi-k2-thinking` @@ -39,9 +40,10 @@ Note: Moonshot and Kimi Code are separate providers. Keys are not interchangeabl env: { MOONSHOT_API_KEY: "sk-..." }, agents: { defaults: { - model: { primary: "moonshot/kimi-k2-0905-preview" }, + model: { primary: "moonshot/kimi-k2.5" }, models: { // moonshot-kimi-k2-aliases:start + "moonshot/kimi-k2.5": { alias: "Kimi K2.5" }, "moonshot/kimi-k2-0905-preview": { alias: "Kimi K2" }, "moonshot/kimi-k2-turbo-preview": { alias: "Kimi K2 Turbo" }, "moonshot/kimi-k2-thinking": { alias: "Kimi K2 Thinking" }, @@ -59,6 +61,15 @@ Note: Moonshot and Kimi Code are separate providers. Keys are not interchangeabl api: "openai-completions", models: [ // moonshot-kimi-k2-models:start + { + id: "kimi-k2.5", + name: "Kimi K2.5", + reasoning: false, + input: ["text"], + cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }, + contextWindow: 256000, + maxTokens: 8192 + }, { id: "kimi-k2-0905-preview", name: "Kimi K2 0905 Preview", From b8aa041dcc469d77a5016b28f4e6c8a485a1bc41 Mon Sep 17 00:00:00 2001 From: Boran Cui Date: Tue, 27 Jan 2026 21:15:57 +0800 Subject: [PATCH 16/24] Update Moonshot Kimi model references to kimi-k2.5 --- src/agents/models-config.providers.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/agents/models-config.providers.ts b/src/agents/models-config.providers.ts index cb556aced..a176dac8a 100644 --- a/src/agents/models-config.providers.ts +++ b/src/agents/models-config.providers.ts @@ -31,7 +31,7 @@ const MINIMAX_API_COST = { }; const MOONSHOT_BASE_URL = "https://api.moonshot.ai/v1"; -const MOONSHOT_DEFAULT_MODEL_ID = "kimi-k2-0905-preview"; +const MOONSHOT_DEFAULT_MODEL_ID = "kimi-k2.5"; const MOONSHOT_DEFAULT_CONTEXT_WINDOW = 256000; const MOONSHOT_DEFAULT_MAX_TOKENS = 8192; const MOONSHOT_DEFAULT_COST = { @@ -275,7 +275,7 @@ function buildMoonshotProvider(): ProviderConfig { models: [ { id: MOONSHOT_DEFAULT_MODEL_ID, - name: "Kimi K2 0905 Preview", + name: "Kimi K2.5", reasoning: false, input: ["text"], cost: MOONSHOT_DEFAULT_COST, From d0ef4d3b85bb2df98925169d50e38042fe28f161 Mon Sep 17 00:00:00 2001 From: Shadow Date: Tue, 27 Jan 2026 21:09:48 -0600 Subject: [PATCH 17/24] fix: update Moonshot Kimi model references (#2762) (thanks @MarvinCui) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79bca9908..6a68c3769 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -81,6 +81,7 @@ Status: beta. - Providers: update MiniMax API endpoint and compatibility mode. (#3064) Thanks @hlbbbbbbb. - Telegram: treat more network errors as recoverable in polling. (#3013) Thanks @ryancontent. - Discord: resolve usernames to user IDs for outbound messages. (#2649) Thanks @nonggialiang. +- Providers: update Moonshot Kimi model references to kimi-k2.5. (#2762) Thanks @MarvinCui. - Gateway: suppress AbortError and transient network errors in unhandled rejections. (#2451) Thanks @Glucksberg. - TTS: keep /tts status replies on text-only commands and avoid duplicate block-stream audio. (#2451) Thanks @Glucksberg. - Security: pin npm overrides to keep tar@7.5.4 for install toolchains. From c5effb78f319ffde927474adc32e8caf3b8acc10 Mon Sep 17 00:00:00 2001 From: Gustavo Madeira Santana Date: Tue, 27 Jan 2026 22:29:09 -0500 Subject: [PATCH 18/24] Modify CLI banner ASCII art Updated the ASCII art for the CLI banner. --- src/cli/banner.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cli/banner.ts b/src/cli/banner.ts index 0d9c435c8..6ca7d4cbc 100644 --- a/src/cli/banner.ts +++ b/src/cli/banner.ts @@ -65,12 +65,12 @@ export function formatCliBannerLine(version: string, options: BannerOptions = {} } const LOBSTER_ASCII = [ - "░████░█░░░░░█████░█░░░█░███░░████░░████░░▀█▀", - "█░░░░░█░░░░░█░░░█░█░█░█░█░░█░█░░░█░█░░░█░░█░", - "█░░░░░█░░░░░█████░█░█░█░█░░█░████░░█░░░█░░█░", - "█░░░░░█░░░░░█░░░█░█░█░█░█░░█░█░░█░░█░░░█░░█░", - "░████░█████░█░░░█░░█░█░░███░░████░░░███░░░█░", - " 🦞 FRESH DAILY 🦞", + "▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄", + "██░▄▀▄░██░▄▄▄░██░████▄▄░▄▄██░▄▄▀██░▄▄▄░█▄▄░▄▄██", + "██░█░█░██░███░██░██████░████░▄▄▀██░███░███░████", + "██░███░██░▀▀▀░██░▀▀░███░████░▀▀░██░▀▀▀░███░████", + "▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀", + " 🦞 FRESH DAILY 🦞 ", ]; export function formatCliBannerArt(options: BannerOptions = {}): string { From 8f452dbc08d52c432f4d32ff7bceb2ecf1aac043 Mon Sep 17 00:00:00 2001 From: Gustavo Madeira Santana Date: Tue, 27 Jan 2026 22:30:38 -0500 Subject: [PATCH 19/24] Update wizard header with new ASCII art --- src/commands/onboard-helpers.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/commands/onboard-helpers.ts b/src/commands/onboard-helpers.ts index 03fe77a27..165365bb6 100644 --- a/src/commands/onboard-helpers.ts +++ b/src/commands/onboard-helpers.ts @@ -64,12 +64,12 @@ export function randomToken(): string { export function printWizardHeader(runtime: RuntimeEnv) { const header = [ - "░████░█░░░░░█████░█░░░█░███░░████░░████░░▀█▀", - "█░░░░░█░░░░░█░░░█░█░█░█░█░░█░█░░░█░█░░░█░░█░", - "█░░░░░█░░░░░█████░█░█░█░█░░█░████░░█░░░█░░█░", - "█░░░░░█░░░░░█░░░█░█░█░█░█░░█░█░░█░░█░░░█░░█░", - "░████░█████░█░░░█░░█░█░░███░░████░░░███░░░█░", - " 🦞 FRESH DAILY 🦞", + "▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄", + "██░▄▀▄░██░▄▄▄░██░████▄▄░▄▄██░▄▄▀██░▄▄▄░█▄▄░▄▄██", + "██░█░█░██░███░██░██████░████░▄▄▀██░███░███░████", + "██░███░██░▀▀▀░██░▀▀░███░████░▀▀░██░▀▀▀░███░████", + "▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀", + " 🦞 FRESH DAILY 🦞 ", ].join("\n"); runtime.log(header); } From 915497114e3a96f98ee92d4d53dc911552195868 Mon Sep 17 00:00:00 2001 From: Dylan Neve Date: Tue, 27 Jan 2026 11:17:31 +0000 Subject: [PATCH 20/24] fix(telegram): ignore message_thread_id for non-forum group sessions Regular Telegram groups (without Topics/Forums enabled) can send message_thread_id when users reply to messages. This was incorrectly being used to create separate session keys like '-123:topic:42', causing each reply chain to get its own conversation context. Now resolveTelegramForumThreadId only returns a thread ID when the chat is actually a forum (is_forum=true). For regular groups, the thread ID is ignored, ensuring all messages share the same session. DMs continue to use messageThreadId for thread sessions as before. --- .../bot-message-context.dm-threads.test.ts | 99 +++++++++++++++++++ src/telegram/bot-message-context.ts | 6 +- src/telegram/bot-native-commands.ts | 3 +- src/telegram/bot.ts | 3 +- src/telegram/bot/helpers.test.ts | 22 +++++ src/telegram/bot/helpers.ts | 15 ++- 6 files changed, 142 insertions(+), 6 deletions(-) diff --git a/src/telegram/bot-message-context.dm-threads.test.ts b/src/telegram/bot-message-context.dm-threads.test.ts index ff6a8a837..d710e0b1b 100644 --- a/src/telegram/bot-message-context.dm-threads.test.ts +++ b/src/telegram/bot-message-context.dm-threads.test.ts @@ -70,3 +70,102 @@ describe("buildTelegramMessageContext dm thread sessions", () => { expect(ctx?.ctxPayload?.SessionKey).toBe("agent:main:main"); }); }); + +describe("buildTelegramMessageContext group sessions without forum", () => { + const baseConfig = { + agents: { defaults: { model: "anthropic/claude-opus-4-5", workspace: "/tmp/clawd" } }, + channels: { telegram: {} }, + messages: { groupChat: { mentionPatterns: [] } }, + } as never; + + const buildContext = async (message: Record) => + await buildTelegramMessageContext({ + primaryCtx: { + message, + me: { id: 7, username: "bot" }, + } as never, + allMedia: [], + storeAllowFrom: [], + options: { forceWasMentioned: true }, + bot: { + api: { + sendChatAction: vi.fn(), + setMessageReaction: vi.fn(), + }, + } as never, + cfg: baseConfig, + account: { accountId: "default" } as never, + historyLimit: 0, + groupHistories: new Map(), + dmPolicy: "open", + allowFrom: [], + groupAllowFrom: [], + ackReactionScope: "off", + logger: { info: vi.fn() }, + resolveGroupActivation: () => true, + resolveGroupRequireMention: () => false, + resolveTelegramGroupConfig: () => ({ + groupConfig: { requireMention: false }, + topicConfig: undefined, + }), + }); + + it("ignores message_thread_id for regular groups (not forums)", async () => { + // When someone replies to a message in a non-forum group, Telegram sends + // message_thread_id but this should NOT create a separate session + const ctx = await buildContext({ + message_id: 1, + chat: { id: -1001234567890, type: "supergroup", title: "Test Group" }, + date: 1700000000, + text: "@bot hello", + message_thread_id: 42, // This is a reply thread, NOT a forum topic + from: { id: 42, first_name: "Alice" }, + }); + + expect(ctx).not.toBeNull(); + // Session key should NOT include :topic:42 + expect(ctx?.ctxPayload?.SessionKey).toBe("agent:main:telegram:group:-1001234567890"); + // MessageThreadId should be undefined (not a forum) + expect(ctx?.ctxPayload?.MessageThreadId).toBeUndefined(); + }); + + it("keeps same session for regular group with and without message_thread_id", async () => { + const ctxWithThread = await buildContext({ + message_id: 1, + chat: { id: -1001234567890, type: "supergroup", title: "Test Group" }, + date: 1700000000, + text: "@bot hello", + message_thread_id: 42, + from: { id: 42, first_name: "Alice" }, + }); + + const ctxWithoutThread = await buildContext({ + message_id: 2, + chat: { id: -1001234567890, type: "supergroup", title: "Test Group" }, + date: 1700000001, + text: "@bot world", + from: { id: 42, first_name: "Alice" }, + }); + + expect(ctxWithThread).not.toBeNull(); + expect(ctxWithoutThread).not.toBeNull(); + // Both messages should use the same session key + expect(ctxWithThread?.ctxPayload?.SessionKey).toBe(ctxWithoutThread?.ctxPayload?.SessionKey); + }); + + it("uses topic session for forum groups with message_thread_id", async () => { + const ctx = await buildContext({ + message_id: 1, + chat: { id: -1001234567890, type: "supergroup", title: "Test Forum", is_forum: true }, + date: 1700000000, + text: "@bot hello", + message_thread_id: 99, + from: { id: 42, first_name: "Alice" }, + }); + + expect(ctx).not.toBeNull(); + // Session key SHOULD include :topic:99 for forums + expect(ctx?.ctxPayload?.SessionKey).toBe("agent:main:telegram:group:-1001234567890:topic:99"); + expect(ctx?.ctxPayload?.MessageThreadId).toBe(99); + }); +}); diff --git a/src/telegram/bot-message-context.ts b/src/telegram/bot-message-context.ts index aa6dcd88b..832a4413d 100644 --- a/src/telegram/bot-message-context.ts +++ b/src/telegram/bot-message-context.ts @@ -173,7 +173,8 @@ export const buildTelegramMessageContext = async ({ }, }); const baseSessionKey = route.sessionKey; - const dmThreadId = !isGroup ? resolvedThreadId : undefined; + // DMs: use raw messageThreadId for thread sessions (not resolvedThreadId which is for forums) + const dmThreadId = !isGroup ? messageThreadId : undefined; const threadKeys = dmThreadId != null ? resolveThreadSessionKeys({ baseSessionKey, threadId: String(dmThreadId) }) @@ -601,7 +602,8 @@ export const buildTelegramMessageContext = async ({ Sticker: allMedia[0]?.stickerMetadata, ...(locationData ? toLocationContext(locationData) : undefined), CommandAuthorized: commandAuthorized, - MessageThreadId: resolvedThreadId, + // For groups: use resolvedThreadId (forum topics only); for DMs: use raw messageThreadId + MessageThreadId: isGroup ? resolvedThreadId : messageThreadId, IsForum: isForum, // Originating channel for reply routing. OriginatingChannel: "telegram" as const, diff --git a/src/telegram/bot-native-commands.ts b/src/telegram/bot-native-commands.ts index 0dd372c3e..6b8bfba01 100644 --- a/src/telegram/bot-native-commands.ts +++ b/src/telegram/bot-native-commands.ts @@ -421,7 +421,8 @@ export const registerTelegramNativeCommands = ({ }, }); const baseSessionKey = route.sessionKey; - const dmThreadId = !isGroup ? resolvedThreadId : undefined; + // DMs: use raw messageThreadId for thread sessions (not resolvedThreadId which is for forums) + const dmThreadId = !isGroup ? messageThreadId : undefined; const threadKeys = dmThreadId != null ? resolveThreadSessionKeys({ baseSessionKey, threadId: String(dmThreadId) }) diff --git a/src/telegram/bot.ts b/src/telegram/bot.ts index 655e1b427..c41abb34b 100644 --- a/src/telegram/bot.ts +++ b/src/telegram/bot.ts @@ -427,7 +427,8 @@ export function createTelegramBot(opts: TelegramBotOptions) { peer: { kind: isGroup ? "group" : "dm", id: peerId }, }); const baseSessionKey = route.sessionKey; - const dmThreadId = !isGroup ? resolvedThreadId : undefined; + // DMs: use raw messageThreadId for thread sessions (not resolvedThreadId which is for forums) + const dmThreadId = !isGroup ? messageThreadId : undefined; const threadKeys = dmThreadId != null ? resolveThreadSessionKeys({ baseSessionKey, threadId: String(dmThreadId) }) diff --git a/src/telegram/bot/helpers.test.ts b/src/telegram/bot/helpers.test.ts index 60fbba0dc..6b363933d 100644 --- a/src/telegram/bot/helpers.test.ts +++ b/src/telegram/bot/helpers.test.ts @@ -3,8 +3,30 @@ import { buildTelegramThreadParams, buildTypingThreadParams, normalizeForwardedContext, + resolveTelegramForumThreadId, } from "./helpers.js"; +describe("resolveTelegramForumThreadId", () => { + it("returns undefined for non-forum groups even with messageThreadId", () => { + // Reply threads in regular groups should not create separate sessions + expect(resolveTelegramForumThreadId({ isForum: false, messageThreadId: 42 })).toBeUndefined(); + }); + + it("returns undefined for non-forum groups without messageThreadId", () => { + expect(resolveTelegramForumThreadId({ isForum: false, messageThreadId: undefined })).toBeUndefined(); + expect(resolveTelegramForumThreadId({ isForum: undefined, messageThreadId: 99 })).toBeUndefined(); + }); + + it("returns General topic (1) for forum groups without messageThreadId", () => { + expect(resolveTelegramForumThreadId({ isForum: true, messageThreadId: undefined })).toBe(1); + expect(resolveTelegramForumThreadId({ isForum: true, messageThreadId: null })).toBe(1); + }); + + it("returns the topic id for forum groups with messageThreadId", () => { + expect(resolveTelegramForumThreadId({ isForum: true, messageThreadId: 99 })).toBe(99); + }); +}); + describe("buildTelegramThreadParams", () => { it("omits General topic thread id for message sends", () => { expect(buildTelegramThreadParams(1)).toBeUndefined(); diff --git a/src/telegram/bot/helpers.ts b/src/telegram/bot/helpers.ts index 19b8e76c0..cd57392c0 100644 --- a/src/telegram/bot/helpers.ts +++ b/src/telegram/bot/helpers.ts @@ -13,14 +13,25 @@ import type { const TELEGRAM_GENERAL_TOPIC_ID = 1; +/** + * Resolve the thread ID for Telegram forum topics. + * For non-forum groups, returns undefined even if messageThreadId is present + * (reply threads in regular groups should not create separate sessions). + * For forum groups, returns the topic ID (or General topic ID=1 if unspecified). + */ export function resolveTelegramForumThreadId(params: { isForum?: boolean; messageThreadId?: number | null; }) { - if (params.isForum && params.messageThreadId == null) { + // Non-forum groups: ignore message_thread_id (reply threads are not real topics) + if (!params.isForum) { + return undefined; + } + // Forum groups: use the topic ID, defaulting to General topic + if (params.messageThreadId == null) { return TELEGRAM_GENERAL_TOPIC_ID; } - return params.messageThreadId ?? undefined; + return params.messageThreadId; } /** From 14e4b88bf0650ab1cf8a967974c8086935f50001 Mon Sep 17 00:00:00 2001 From: Ayaan Zaidi Date: Wed, 28 Jan 2026 09:31:04 +0530 Subject: [PATCH 21/24] fix: keep telegram dm thread sessions (#2731) (thanks @dylanneve1) --- CHANGELOG.md | 1 + src/telegram/bot-native-commands.ts | 14 +++++++++----- ...-telegram-bot.installs-grammy-throttler.test.ts | 9 +++++++-- src/telegram/bot.test.ts | 9 +++++++-- src/telegram/bot.ts | 9 +++++---- 5 files changed, 29 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a68c3769..c6819e29a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -95,6 +95,7 @@ Status: beta. - Agents: release session locks on process termination and cover more signals. (#2483) Thanks @janeexai. - Agents: skip cooldowned providers during model failover. (#2143) Thanks @YiWang24. - Telegram: harden polling + retry behavior for transient network errors and Node 22 transport issues. (#2420) Thanks @techboss. +- Telegram: ignore non-forum group message_thread_id while preserving DM thread sessions. (#2731) Thanks @dylanneve1. - Telegram: wrap reasoning italics per line to avoid raw underscores. (#2181) Thanks @YuriNachos. - Telegram: centralize API error logging for delivery and bot calls. (#2492) Thanks @altryne. - Voice Call: enforce Twilio webhook signature verification for ngrok URLs; disable ngrok free tier bypass by default. diff --git a/src/telegram/bot-native-commands.ts b/src/telegram/bot-native-commands.ts index 6b8bfba01..3415ea927 100644 --- a/src/telegram/bot-native-commands.ts +++ b/src/telegram/bot-native-commands.ts @@ -360,6 +360,8 @@ export const registerTelegramNativeCommands = ({ topicConfig, commandAuthorized, } = auth; + const messageThreadId = (msg as { message_thread_id?: number }).message_thread_id; + const threadIdForSend = isGroup ? resolvedThreadId : messageThreadId; const commandDefinition = findCommandByNativeName(command.name, "telegram"); const rawText = ctx.match?.trim() ?? ""; @@ -406,7 +408,7 @@ export const registerTelegramNativeCommands = ({ fn: () => bot.api.sendMessage(chatId, title, { ...(replyMarkup ? { reply_markup: replyMarkup } : {}), - ...(resolvedThreadId != null ? { message_thread_id: resolvedThreadId } : {}), + ...(threadIdForSend != null ? { message_thread_id: threadIdForSend } : {}), }), }); return; @@ -467,7 +469,7 @@ export const registerTelegramNativeCommands = ({ CommandSource: "native" as const, SessionKey: `telegram:slash:${senderId || chatId}`, CommandTargetSessionKey: sessionKey, - MessageThreadId: resolvedThreadId, + MessageThreadId: threadIdForSend, IsForum: isForum, // Originating context for sub-agent announce routing OriginatingChannel: "telegram" as const, @@ -494,7 +496,7 @@ export const registerTelegramNativeCommands = ({ bot, replyToMode, textLimit, - messageThreadId: resolvedThreadId, + messageThreadId: threadIdForSend, tableMode, chunkMode, linkPreview: telegramCfg.linkPreview, @@ -542,7 +544,9 @@ export const registerTelegramNativeCommands = ({ requireAuth: match.command.requireAuth !== false, }); if (!auth) return; - const { resolvedThreadId, senderId, commandAuthorized } = auth; + const { resolvedThreadId, senderId, commandAuthorized, isGroup } = auth; + const messageThreadId = (msg as { message_thread_id?: number }).message_thread_id; + const threadIdForSend = isGroup ? resolvedThreadId : messageThreadId; const result = await executePluginCommand({ command: match.command, @@ -568,7 +572,7 @@ export const registerTelegramNativeCommands = ({ bot, replyToMode, textLimit, - messageThreadId: resolvedThreadId, + messageThreadId: threadIdForSend, tableMode, chunkMode, linkPreview: telegramCfg.linkPreview, diff --git a/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts b/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts index bf94e4f6f..c3844ac88 100644 --- a/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts +++ b/src/telegram/bot.create-telegram-bot.installs-grammy-throttler.test.ts @@ -238,12 +238,17 @@ describe("createTelegramBot", () => { expect(getTelegramSequentialKey({ message: { chat: { id: 123 } } })).toBe("telegram:123"); expect( getTelegramSequentialKey({ - message: { chat: { id: 123 }, message_thread_id: 9 }, + message: { chat: { id: 123, type: "private" }, message_thread_id: 9 }, }), ).toBe("telegram:123:topic:9"); expect( getTelegramSequentialKey({ - message: { chat: { id: 123, is_forum: true } }, + message: { chat: { id: 123, type: "supergroup" }, message_thread_id: 9 }, + }), + ).toBe("telegram:123"); + expect( + getTelegramSequentialKey({ + message: { chat: { id: 123, type: "supergroup", is_forum: true } }, }), ).toBe("telegram:123:topic:1"); expect( diff --git a/src/telegram/bot.test.ts b/src/telegram/bot.test.ts index 75dd32faf..c075174fb 100644 --- a/src/telegram/bot.test.ts +++ b/src/telegram/bot.test.ts @@ -340,12 +340,17 @@ describe("createTelegramBot", () => { expect(getTelegramSequentialKey({ message: { chat: { id: 123 } } })).toBe("telegram:123"); expect( getTelegramSequentialKey({ - message: { chat: { id: 123 }, message_thread_id: 9 }, + message: { chat: { id: 123, type: "private" }, message_thread_id: 9 }, }), ).toBe("telegram:123:topic:9"); expect( getTelegramSequentialKey({ - message: { chat: { id: 123, is_forum: true } }, + message: { chat: { id: 123, type: "supergroup" }, message_thread_id: 9 }, + }), + ).toBe("telegram:123"); + expect( + getTelegramSequentialKey({ + message: { chat: { id: 123, type: "supergroup", is_forum: true } }, }), ).toBe("telegram:123:topic:1"); expect( diff --git a/src/telegram/bot.ts b/src/telegram/bot.ts index c41abb34b..ae21d10da 100644 --- a/src/telegram/bot.ts +++ b/src/telegram/bot.ts @@ -94,11 +94,12 @@ export function getTelegramSequentialKey(ctx: { if (typeof chatId === "number") return `telegram:${chatId}:control`; return "telegram:control"; } + const isGroup = msg?.chat?.type === "group" || msg?.chat?.type === "supergroup"; + const messageThreadId = msg?.message_thread_id; const isForum = (msg?.chat as { is_forum?: boolean } | undefined)?.is_forum; - const threadId = resolveTelegramForumThreadId({ - isForum, - messageThreadId: msg?.message_thread_id, - }); + const threadId = isGroup + ? resolveTelegramForumThreadId({ isForum, messageThreadId }) + : messageThreadId; if (typeof chatId === "number") { return threadId != null ? `telegram:${chatId}:topic:${threadId}` : `telegram:${chatId}`; } From b01612c2622460b9cad02e934a1ba2c65a77abe5 Mon Sep 17 00:00:00 2001 From: Shadow Date: Tue, 27 Jan 2026 22:47:17 -0600 Subject: [PATCH 22/24] Discord: gate username lookups --- CHANGELOG.md | 1 + src/discord/targets.ts | 43 +++++++++++++++++++++++++++++------------- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6819e29a..3e11f1ef7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -78,6 +78,7 @@ Status: beta. - Web UI: auto-expand the chat compose textarea while typing (with sensible max height). (#2950) Thanks @shivamraut101. - Gateway: prevent crashes on transient network errors (fetch failures, timeouts, DNS). Added fatal error detection to only exit on truly critical errors. Fixes #2895, #2879, #2873. (#2980) Thanks @elliotsecops. - Agents: guard channel tool listActions to avoid plugin crashes. (#2859) Thanks @mbelinky. +- Discord: avoid resolving bare channel names to user DMs when a username matches. Thanks @thewilloftheshadow. - Providers: update MiniMax API endpoint and compatibility mode. (#3064) Thanks @hlbbbbbbb. - Telegram: treat more network errors as recoverable in polling. (#3013) Thanks @ryancontent. - Discord: resolve usernames to user IDs for outbound messages. (#2649) Thanks @nonggialiang. diff --git a/src/discord/targets.ts b/src/discord/targets.ts index 311955182..00514a0ff 100644 --- a/src/discord/targets.ts +++ b/src/discord/targets.ts @@ -81,11 +81,14 @@ export async function resolveDiscordTarget( const trimmed = raw.trim(); if (!trimmed) return undefined; - // If already a known format, parse directly - const directParse = parseDiscordTarget(trimmed, options); - if (directParse && directParse.kind !== "channel" && !isLikelyUsername(trimmed)) { + const shouldLookup = isExplicitUserLookup(trimmed, options); + const directParse = safeParseDiscordTarget(trimmed, options); + if (directParse && directParse.kind !== "channel") { return directParse; } + if (!shouldLookup) { + return directParse ?? parseDiscordTarget(trimmed, options); + } // Try to resolve as a username via directory lookup try { @@ -110,15 +113,29 @@ export async function resolveDiscordTarget( return parseDiscordTarget(trimmed, options); } -/** - * Check if a string looks like a Discord username (not a mention, prefix, or ID). - * Usernames typically don't start with special characters except underscore. - */ -function isLikelyUsername(input: string): boolean { - // Skip if it's already a known format - if (/^(user:|channel:|discord:|@|<@!?)|[\d]+$/.test(input)) { - return false; +function safeParseDiscordTarget( + input: string, + options: DiscordTargetParseOptions, +): MessagingTarget | undefined { + try { + return parseDiscordTarget(input, options); + } catch { + return undefined; } - // Likely a username if it doesn't match known patterns - return true; +} + +function isExplicitUserLookup(input: string, options: DiscordTargetParseOptions): boolean { + if (/^<@!?(\d+)>$/.test(input)) { + return true; + } + if (/^(user:|discord:)/.test(input)) { + return true; + } + if (input.startsWith("@")) { + return true; + } + if (/^\d+$/.test(input)) { + return options.defaultKind === "user"; + } + return false; } From 61ab348dd3e0170a762f1563bb4d5f0c346670f9 Mon Sep 17 00:00:00 2001 From: Shadow Date: Tue, 27 Jan 2026 22:56:12 -0600 Subject: [PATCH 23/24] Discord: fix target type imports --- CHANGELOG.md | 1 + src/discord/targets.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e11f1ef7..ac2e62360 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -79,6 +79,7 @@ Status: beta. - Gateway: prevent crashes on transient network errors (fetch failures, timeouts, DNS). Added fatal error detection to only exit on truly critical errors. Fixes #2895, #2879, #2873. (#2980) Thanks @elliotsecops. - Agents: guard channel tool listActions to avoid plugin crashes. (#2859) Thanks @mbelinky. - Discord: avoid resolving bare channel names to user DMs when a username matches. Thanks @thewilloftheshadow. +- Discord: fix directory config type import for target resolution. Thanks @thewilloftheshadow. - Providers: update MiniMax API endpoint and compatibility mode. (#3064) Thanks @hlbbbbbbb. - Telegram: treat more network errors as recoverable in polling. (#3013) Thanks @ryancontent. - Discord: resolve usernames to user IDs for outbound messages. (#2649) Thanks @nonggialiang. diff --git a/src/discord/targets.ts b/src/discord/targets.ts index 00514a0ff..e8b1c3943 100644 --- a/src/discord/targets.ts +++ b/src/discord/targets.ts @@ -5,10 +5,10 @@ import { type MessagingTarget, type MessagingTargetKind, type MessagingTargetParseOptions, - type DirectoryConfigParams, - type ChannelDirectoryEntry, } from "../channels/targets.js"; +import type { DirectoryConfigParams } from "../channels/plugins/directory-config.js"; + import { listDiscordDirectoryPeersLive } from "./directory-live.js"; import { resolveDiscordAccount } from "./accounts.js"; From 6fc3ca4996c97f9ccc51583b30254a827bc2467a Mon Sep 17 00:00:00 2001 From: Shadow Date: Tue, 27 Jan 2026 23:17:22 -0600 Subject: [PATCH 24/24] CI: add auto-response labels --- .github/workflows/auto-response.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/auto-response.yml b/.github/workflows/auto-response.yml index b610e1718..6d9f55903 100644 --- a/.github/workflows/auto-response.yml +++ b/.github/workflows/auto-response.yml @@ -24,13 +24,26 @@ jobs: with: github-token: ${{ steps.app-token.outputs.token }} script: | + // Labels prefixed with "r:" are auto-response triggers. const rules = [ { - label: "skill-clawdhub", + label: "r: skill", close: true, message: "Thanks for the contribution! New skills should be published to Clawdhub for everyone to use. We’re keeping the core lean on skills, so I’m closing this out.", }, + { + label: "r: support", + close: true, + message: + "Please use our support server https://molt.bot/discord and ask in #help or #users-helping-users to resolve this, or follow the stuck FAQ at https://docs.molt.bot/help/faq#im-stuck-whats-the-fastest-way-to-get-unstuck.", + }, + { + label: "r: third-party-extension", + close: true, + message: + "This would be better made as a third-party extension with our SDK that you maintain yourself. Docs: https://docs.molt.bot/plugin.", + }, ]; const labelName = context.payload.label?.name;