From 48f1eb43702d3f429fefa380bee3fc81034a475c Mon Sep 17 00:00:00 2001
From: Day Dreamer <87640074+HugoXK@users.noreply.github.com>
Date: Sat, 21 Nov 2026 11:26:49 +0800
Subject: [PATCH] Mask cookie, session and PAT values an echoed error repeats
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The security read at 57bdaa6a found two gaps in #3275's mask. A `Cookie`
or session header is a whole credential and was not matched by name; `pat`
was missing entirely, though only as a whole segment so `X-Patch-Id` and
`X-Path-Id` keep their values. And the replacement ran in entry order, so
`{'X-Api-Key': 'abc123', Authorization: 'Bearer abc123XYZ'}` stored
`Bearer [hidden]XYZ` while the same pair written the other way masked both
— one credential can contain another, so the values are now replaced
longest first, the way `secrets.js` sorts its own.
The name list, the whole-segment `pat` rule and the ordering are written in
the `core-host.md` prompt row and the changelog fragment as well.
---
changelog.d/3275.fixed.md | 1 +
core/src/host/capabilities.js | 26 ++++-
core/test/capabilities.test.js | 131 +++++++++++++++++++++
docs/subsystems/core-host.md | 2 +-
patches/ds-bot/0001-core-fixes.patch | 28 ++++-
patches/ds-bot/0014-flybot-branding.patch | 133 +++++++++++++++++++++-
6 files changed, 316 insertions(+), 5 deletions(-)
create mode 100644 changelog.d/3275.fixed.md
diff --git a/changelog.d/3275.fixed.md b/changelog.d/3275.fixed.md
new file mode 100644
index 000000000..a53fedc4e
--- /dev/null
+++ b/changelog.d/3275.fixed.md
@@ -0,0 +1 @@
+A capability's stored failure reason no longer repeats a credential the user typed into the capability itself: when a server echoes a request header or an environment value back in its own error body, the value of a name that promises a credential (`key`, `token`, `secret`, `auth`, `password`, `passwd`, `credential`, `signature`, `cookie`, `session`, `bearer`, and `pat` as a whole segment — `X-Github-Pat` yes, `X-Patch-Id` no) is masked before the reason is stored, longest value first so one credential is never left as a surviving tail, so it can no longer be printed into the Bot's system prompt every turn ([#3275](https://github.com/ThinkFlowLab/FlyBot/issues/3275)).
diff --git a/core/src/host/capabilities.js b/core/src/host/capabilities.js
index 4e13a5d7d..a2bdae672 100644
--- a/core/src/host/capabilities.js
+++ b/core/src/host/capabilities.js
@@ -41,6 +41,30 @@ export function expandCapabilityNames(capabilities, library) {
// system prompt every turn, so userinfo is dropped before the sentence is stored.
const withoutUserinfo = text => text.replace(/([a-z][a-z0-9+.-]*:\/\/)[^/\s@]+@/gi, '$1')
+// #3275: a failing transport builds its error from the server's own response body, so a server that
+// echoes a request header writes a value the user configured into the stored reason the system
+// prompt prints every turn. `redactSecrets` replaces saved key values only, so a header or
+// environment name that promises a credential masks its own value wherever the body repeats it. A
+// value under six characters is left alone: replacing it everywhere would eat the words around it.
+// The literal is not refused at input instead — it is legal today, an entry saved before this exists
+// in the field, and what such a value may be kept at rest is the separate open question in #3276.
+// `pat` counts as a whole segment: `X-Github-Pat` is a credential while `X-Patch-Id` and `X-Path-Id`
+// are ordinary names that merely begin with the same three letters.
+const CREDENTIAL_NAME = /(key|token|secret|auth|password|passwd|credential|signature|cookie|session|bearer)|(? {
+ // Longest value first, the way `secrets.js` sorts its own before it builds one pattern: one
+ // credential can contain another (`Bearer abc123XYZ` carries the `abc123` of the key beside it),
+ // and replacing the short one first would leave the longer one's tail in the stored sentence.
+ // Sorting makes the answer the same whichever order the two entries were written in.
+ const values = Object.entries({ ...config?.headers, ...config?.env })
+ .filter(([name, value]) => CREDENTIAL_NAME.test(name) && typeof value === 'string' && value.length >= 6)
+ .map(([, value]) => value)
+ .sort((a, b) => b.length - a.length)
+ let out = text
+ for (const value of values) out = out.split(value).join('[hidden]')
+ return out
+}
+
const same = (a, b) => JSON.stringify(a) === JSON.stringify(b)
const strings = value => {
if (value === undefined) return []
@@ -318,7 +342,7 @@ export function install(rt) {
} catch (error) {
await drop()
const joined = [error, error?.cause].filter(Boolean).map(part => String(part?.message ?? part)).join(': ') || 'Connection failed'
- const message = withoutUserinfo(rt.redactSecrets(joined)).slice(0, 300)
+ const message = withoutCredentialValues(withoutUserinfo(rt.redactSecrets(joined)), config).slice(0, 300)
statusSet(bot.id, name, sessionId, { state: 'error', error: message })
}
}
diff --git a/core/test/capabilities.test.js b/core/test/capabilities.test.js
index 3e17153d6..16ff2940c 100644
--- a/core/test/capabilities.test.js
+++ b/core/test/capabilities.test.js
@@ -517,3 +517,134 @@ test('a plain HTTPS URL still saves', async t => {
assert.equal(saved.url, 'https://host/mcp')
assert.equal(env.rt.state.capabilities.items.plain.url, 'https://host/mcp')
})
+
+// #3275: a `streamable-http` transport builds its error from the server's own response body
+// (`Error POSTing to endpoint:
`), and a server that echoes a request header writes a value
+// the user configured into a stored reason that the system prompt prints on every turn.
+// `redactSecrets` replaces saved keys only, so a literal header value is masked by the name that
+// promises a credential — and only that name, so an ordinary header in the same body survives.
+const quoting = (name, headers) => ({
+ items: {
+ [name]: {
+ name, kind: 'mcp', description: 'Echo service', transport: 'streamable-http',
+ url: 'https://host/mcp', headers, approved: true, createdBy: 'worker', createdAt: 1, updatedAt: 1,
+ },
+ },
+})
+
+test('an error that echoes a configured header value stores it masked', async t => {
+ const state = team()
+ state.capabilities = quoting('echo', { 'X-Tenant-Key': 'abc123', Accept: 'application/json' })
+ const env = await setup({ state })
+ t.after(() => env.dispose())
+ const { ctx, rt, mounts, skills } = env
+ await rt.changeCapabilityAttachment('attach', { name: 'echo' }, 'worker')
+ const quoted = 'Error POSTing to endpoint: {"error":"unauthorized","echoed":"X-Tenant-Key: abc123","accept":"application/json"}'
+ ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error(quoted) } }) })
+ await rt.scheduleCapabilitiesReconcile()
+ const status = rt.capabilityStatusesView().worker.echo
+ assert.equal(status.state, 'error')
+ assert.equal(status.error, 'Error POSTing to endpoint: {"error":"unauthorized","echoed":"X-Tenant-Key: [hidden]","accept":"application/json"}', 'the exact stored sentence: the header name and an ordinary header survive, the credential value is gone')
+ assert.equal(JSON.stringify(rt.capabilityStatusesView()).includes('abc123'), false)
+})
+
+test('an error that echoes a configured environment value stores it masked', async t => {
+ const state = team()
+ state.capabilities = {
+ items: {
+ stdio: {
+ name: 'stdio', kind: 'mcp', description: 'Local server', transport: 'stdio', command: 'node', args: [],
+ env: { SERVICE_TOKEN: 'tok-abcdef', PATH_KEEP: '/usr/bin' }, approved: true, createdBy: 'worker', createdAt: 1, updatedAt: 1,
+ },
+ },
+ }
+ const env = await setup({ state })
+ t.after(() => env.dispose())
+ const { ctx, rt, mounts, skills } = env
+ await rt.changeCapabilityAttachment('attach', { name: 'stdio' }, 'worker')
+ const quoted = 'server exited with SERVICE_TOKEN=tok-abcdef'
+ ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error(quoted) } }) })
+ await rt.scheduleCapabilitiesReconcile()
+ const status = rt.capabilityStatusesView().worker.stdio
+ assert.equal(status.state, 'error')
+ assert.equal(status.error, 'server exited with SERVICE_TOKEN=[hidden]', 'the exact stored sentence')
+ assert.equal(JSON.stringify(rt.capabilityStatusesView()).includes('tok-abcdef'), false)
+})
+
+// #3275, from the security read at `57bdaa6a`: a cookie is a whole session credential, and the names
+// that promise one have to say so — a server that echoes `Cookie: sid=…` otherwise writes the session
+// into the prompt every turn.
+test('an error that echoes a cookie value stores the whole session credential masked', async t => {
+ const state = team()
+ state.capabilities = quoting('cookie-echo', { Cookie: 'sid=supersecretsession42', Accept: 'application/json' })
+ const env = await setup({ state })
+ t.after(() => env.dispose())
+ const { ctx, rt, mounts, skills } = env
+ await rt.changeCapabilityAttachment('attach', { name: 'cookie-echo' }, 'worker')
+ const quoted = 'Error POSTing to endpoint: {"error":"unauthorized","echoed":"Cookie: sid=supersecretsession42","accept":"application/json"}'
+ ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error(quoted) } }) })
+ await rt.scheduleCapabilitiesReconcile()
+ const status = rt.capabilityStatusesView().worker['cookie-echo']
+ assert.equal(status.state, 'error')
+ assert.equal(status.error, 'Error POSTing to endpoint: {"error":"unauthorized","echoed":"Cookie: [hidden]","accept":"application/json"}', 'the whole cookie value is gone and the ordinary header survives')
+ assert.equal(JSON.stringify(rt.capabilityStatusesView()).includes('supersecretsession42'), false)
+})
+
+// #3275, same read: `X-Github-Pat` is a credential while `X-Patch-Id` and `X-Path-Id` are ordinary
+// names that merely begin with those three letters — so `pat` counts as a whole segment, never as a
+// prefix.
+test('a PAT header name is masked while "patch" and "path" names are not', async t => {
+ const state = team()
+ state.capabilities = quoting('pat-echo', {
+ 'X-Github-Pat': 'ghp-abcdef123456', 'X-Patch-Id': 'patch-9000', 'X-Path-Id': 'path-9000', Accept: 'application/json',
+ })
+ const env = await setup({ state })
+ t.after(() => env.dispose())
+ const { ctx, rt, mounts, skills } = env
+ await rt.changeCapabilityAttachment('attach', { name: 'pat-echo' }, 'worker')
+ const quoted = 'Error POSTing to endpoint: {"pat":"X-Github-Pat: ghp-abcdef123456","patch":"X-Patch-Id: patch-9000","path":"X-Path-Id: path-9000","accept":"application/json"}'
+ ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error(quoted) } }) })
+ await rt.scheduleCapabilitiesReconcile()
+ const status = rt.capabilityStatusesView().worker['pat-echo']
+ assert.equal(status.state, 'error')
+ assert.equal(status.error, 'Error POSTing to endpoint: {"pat":"X-Github-Pat: [hidden]","patch":"X-Patch-Id: patch-9000","path":"X-Path-Id: path-9000","accept":"application/json"}', 'only the PAT value is masked; the two lookalike names keep their values')
+ assert.equal(JSON.stringify(rt.capabilityStatusesView()).includes('ghp-abcdef123456'), false)
+})
+
+// #3275, same read: one value can contain another (`Bearer abc123XYZ` carries the `abc123` of the key
+// beside it), so the values are replaced longest first — the way `secrets.js` sorts its own — and the
+// answer does not depend on the order the two entries were written in.
+for (const [label, headers] of [
+ ['the key first', { 'X-Api-Key': 'abc123', Authorization: 'Bearer abc123XYZ' }],
+ ['the authorization first', { Authorization: 'Bearer abc123XYZ', 'X-Api-Key': 'abc123' }],
+]) {
+ test(`an error that echoes two credential values masks the longer one whole, ${label}`, async t => {
+ const state = team()
+ state.capabilities = quoting('pair-echo', headers)
+ const env = await setup({ state })
+ t.after(() => env.dispose())
+ const { ctx, rt, mounts, skills } = env
+ await rt.changeCapabilityAttachment('attach', { name: 'pair-echo' }, 'worker')
+ const quoted = 'Error POSTing to endpoint: {"auth":"Bearer abc123XYZ"}'
+ ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error(quoted) } }) })
+ await rt.scheduleCapabilitiesReconcile()
+ const status = rt.capabilityStatusesView().worker['pair-echo']
+ assert.equal(status.state, 'error')
+ assert.equal(status.error, 'Error POSTing to endpoint: {"auth":"[hidden]"}', 'the longer value is replaced whole, so no tail of it survives')
+ assert.equal(JSON.stringify(rt.capabilityStatusesView()).includes('XYZ'), false)
+ })
+}
+
+test('a plain reason is stored exactly as the transport gave it', async t => {
+ const state = team()
+ state.capabilities = quoting('plain-error', {})
+ const env = await setup({ state })
+ t.after(() => env.dispose())
+ const { ctx, rt, mounts, skills } = env
+ await rt.changeCapabilityAttachment('attach', { name: 'plain-error' }, 'worker')
+ ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error('401 bad credentials') } }) })
+ await rt.scheduleCapabilitiesReconcile()
+ const status = rt.capabilityStatusesView().worker['plain-error']
+ assert.equal(status.state, 'error')
+ assert.equal(status.error, '401 bad credentials')
+})
diff --git a/docs/subsystems/core-host.md b/docs/subsystems/core-host.md
index 4606a64e9..1bdba1b7d 100644
--- a/docs/subsystems/core-host.md
+++ b/docs/subsystems/core-host.md
@@ -40,7 +40,7 @@ The server side of the patched `ds-bot` core (`core/`): the part of [ds-bot-core
| `core/src/host/` | Host-side helpers (non-hooks). |
| `core/src/host/plugins.js` | The five feature plugins' catalogue and the owner's switch for each (#2564): `FEATURE_PLUGINS` (id, name, package, purpose) and `pluginSwitches(state, bundles)` answer the rows Settings shows — `enabled` on unless `state.json` says off. `installed` is a second fact, read from the profile's `dsh.profile.bundles` through `profileBundles(profileDir)` (#2868): a switch can be on for a package this profile never got, and then the domain really is absent from the process, so the row says `installed: false` and the reader looks at that first. A host with no profile (`profileBundles` answers `undefined`) keeps the old row shape instead of claiming a plugin is missing, and an unreadable profile does the same. `setPluginSwitch` writes one known id, and flips apply at the next start (`pluginEnabledAtStart`, which reads through the same snapshot). `pluginSwitchesAtStart` reads all five from the file once at install and `pluginSwitchesPending` compares each switch with it, so `plugins/list` and `plugins/set` answer `pendingRestart` from the difference — turning a switch back to the value this start loaded clears it, since the next start would load exactly what this one did. Tests: `core/test/plugin-switches.test.js`, `core/test/plugins-list-installed.test.js`. |
| `core/src/host/text.js` | The pure text helpers the host modules share: message text, names, model refs, cutting and estimating text, and the clock format of chat anchors. Since #1895 `codePoints(text)` (a step per code point, no array built since #1898) is how the host counts a limit — one character costs one whatever its UTF-16 width — and the bounds this change puts through it are: a memory entry of 300 and a `MEMORY.md` of 4,000 or a topic of 16,000 (the refusal and the size note print the code-point number), a scheduled task's name of 120, a message of 20,000, and the Project memory entry of 600 in both writers, so an emoji is never charged twice. Both cuts land on a code point boundary: `clip` and `excerpt` move back rather than keep half of a surrogate pair, so a clipped emoji reaches a UTF-8 encoder as the character and not as U+FFFD ([#1907](https://github.com/ThinkFlowLab/FlyBot/issues/1907)). Since #1912 that rule is one exported helper rather than a private detail: `cut(text, max)` answers `{ text, cut }` with the longest prefix that stops before a split pair, and the archive writers that used to `slice(0, max)` go through it — the `oneLine` of `decisions.js` and `meetings.js` (into `decisions.jsonl` and `decisions/-.md`), `claimLine` in `groups.js`, the report cap in `diagnostics.js`, `cleanLabel` in `flybot-feed.js` and `clean` in `browser.js` — so a decision or a meeting record holds the whole character instead of U+FFFD. Since #1916 the boundary rule itself lives in `core/src/shared/text-boundary.js` (`codePointStart`, `codePointEnd`, `cut`), and `host/text.js` builds its `cut` on it so a shared module can bound text too; the eight remaining `slice(0, max)` writers follow it — the claim cue's fallback reference (60), the task lead's name in a member prompt (80), a failed group Session's error text (300), `read_own_chat`'s `query` (80) and `around` (40), the open-page address and title (2000/300), the diagnostics browser-log line and its code (500/40), and `cleanPeerName` in `shared/remote-label.js` (60) — each keeping the longest prefix that stops before a split pair, `length <= max` and a byte prefix of the input. Since #1918 the memory review's own two bounds go through the same rule: its 800-character context `clip` cuts through `cut`, and its 3,000-character two-ended `ends` spends the budget in characters at both ends — `charIndex` steps whole code points to find the head's end and the tail's start, so the head is the rendered line's first 2,000 characters and the tail its last 1,000, and the text is flattened with `toWellFormed()` first as `cut` did — so the prompt and the log hold whole characters within the same character budget: a line of 3,500 emoji keeps 3,000 characters where unit arithmetic kept 1,503 ([#2553](https://github.com/ThinkFlowLab/FlyBot/issues/2553)); the exported `clip`'s reason is optional there too, so a two-argument call reads `… (cut)` instead of `… (cut; undefined)` while a call with a reason is unchanged. Since #1923 the four bounds whose text crosses an owner boundary go through the same `cut` — `cleanPublishedName` in `hooks.js` (60, into `state.flybot.remote`), the group member line's `displayName` 60 and `ownerName` 40 in `tools.js`, `label` in `reach.js` (60, the `othersInRoom` labels), and the local `clip` in `shared/room-share.js` (its per-field caps included) — so a published, listed or relayed name keeps whole characters and never reaches a UTF-8 encoder as U+FFFD ([#1923](https://github.com/ThinkFlowLab/FlyBot/issues/1923)). The same rule now covers the host's own line bounds: the busy ack's 600-unit task and 1,500-unit message text in `busy-ack.js`, the group line's notice (100), a Bot's job line (120), the group answer echo (300) and the rework line's note (200) in `tools.js`, and `cleanName`'s 60-unit peer name in `delivery.js`, which lands in `fenceUntrusted`'s `from="…"` attribute — so none of them can end in half a surrogate pair. The five bounds `turns.js` keeps go through `cut` as well: a failure's 500-unit message and the 200-unit message of its line (`turnFailure`, `failureLine`), the 79-unit step a running call shows (the `…` is appended only when `cut` dropped something, never by a length guess), an approval card's 2,000-unit description and 4,000-unit command (the card stores the command "Allow once" runs rather than a preview of it, and one that still had to be cut ends with `…` inside that bound, so the card says what it abridged and never drops the fact, [#1992](https://github.com/ThinkFlowLab/FlyBot/issues/1992)), and the 160-unit reason a failed turn leaves for the inbox. Since #1963 `cut` also flattens its input before it bounds — `String(text).toWellFormed()` first, `codePointEnd` on the flat string — so a title, a note or a name that arrives already carrying an unpaired surrogate is stored as U+FFFD instead of the lone surrogate, and U+FFFD is one UTF-16 unit for the one it replaces, so a well-formed input keeps its exact prefix and its `cut` flag ([#1963](https://github.com/ThinkFlowLab/FlyBot/issues/1963)). Since #1979 the six remaining bounds on text another home or another person supplied go through it too — a connector item name (80, `connectors.js`), a role label another home set on a face-room seat (80, `face-lead.js`), a cross-home group name (200, `project-team.js`), a capability description from a peer server (2,000, `capabilities.js`), the remote home's own error text (157, `remote-chat.js`) and an abbreviated remote reply (80, same file) — so each keeps the longest prefix that stops before a split pair, is well formed and is a code-point prefix of the input, while `remote-chat.js`'s `…` and trailing-period strip still apply to the cut value ([#1979](https://github.com/ThinkFlowLab/FlyBot/issues/1979)). The two bounds on a friend's Bot's own name in that file — the name its chat is created with (40) and the name a refresh writes (40) — go through `cut` as well, so a refresh cannot store a lone high surrogate and a create no longer hands `roster.createBot` half a pair to flatten into U+FFFD; the budget stays 40 and a shorter name is stored word for word. Since #1993 the last five bounds in `core/src/host/` go through it too — the quoted first line of a checkpoint's kept tail (80, `steward.js`), an approval record's `reason` (500, `approvals.js`), a mention receipt's reason line (240, `hooks.js`), the title given to a DSH Agent's Session (80, `AGENT_SESSION_TITLE_MAX` in `agents.js`) and a schedule run's failure `reason` (200, `schedules.js`) — so each keeps the longest prefix that stops before a split pair, is well formed and is a code-point prefix of the input, and none of the five maxima changes ([#1993](https://github.com/ThinkFlowLab/FlyBot/issues/1993)). Since #2002 the connector's own error text goes through it too: the `reason` in `core/src/host/connectors.js` — the text an MCP server's failure leaves on the owner's connector card — keeps the longest prefix that stops before a split pair, so it is well formed and a code-point prefix of what the server sent; since #2016 that prefix is 2,000 units rather than 300, and one that had to be cut ends with `…` inside the bound, so the card says what it abridged ([#2002](https://github.com/ThinkFlowLab/FlyBot/issues/2002), [#2016](https://github.com/ThinkFlowLab/FlyBot/issues/2016)). Since #2005 the five bounds the Project panels read go through it as well — the assistant card's 77-unit title in `project-assistant.js`, the board's 200-unit one-line value and a decision title's 200 in `project-board.js`, and `capped`'s name, role, persona, model and color caps plus the dossier's 4,000-unit memory head in `project-team.js`, whose head is bounded where `memoryDigest` reads it (`memory.js`), because a cut at the dossier alone could only turn half a pair into U+FFFD and never drop the character whole — so a dossier row or a board card keeps whole characters ([#2005](https://github.com/ThinkFlowLab/FlyBot/issues/2005)). Since [#2321](https://github.com/ThinkFlowLab/FlyBot/issues/2321) a bound also judges in code points, not only counts in them: `fits(text, max)` in `core/src/shared/text-boundary.js` is the one predicate — a character outside the BMP spends one of the budget and not two — and `clip` and `excerpt` judge with it while their cuts keep going through `codePointEnd`/`cut`, so a 300-character text is no longer cut by a 400-character limit on its way to `read_own_chat` and the search rows. Since [#2339](https://github.com/ThinkFlowLab/FlyBot/issues/2339) the two bounds in `core/src/host/` that still judged with `text.length` use it as well — the memory review's 3,000-character two-ended `ends` in `memory.js` and `room-context.js`'s `oneLine` (40/80/24/60) — so a user line or a board line of characters outside the BMP stays whole inside its own limit instead of being cut at half of it; both maxima are unchanged and a board line's cut stays on `cut`, so an ASCII text judges exactly as `length <= max` did. The memory review's own third `clip` is the exported one now, so its cut reads `… (cut)`, and a bound added later that judges with `text.length` fails `core/test/text-bounds.test.js` at its own `file:line`. Both render paths of the memory review flatten before they bound as well: the `fits()` answer of `ends` and the labelled Bot line on its way to `clip` pass through `toWellFormed()` first, so an unpaired surrogate that arrives in a message reaches the review prompt as U+FFFD, whole and in place, instead of as half a pair ([#2556](https://github.com/ThinkFlowLab/FlyBot/issues/2556)). Since [#2691](https://github.com/ThinkFlowLab/FlyBot/issues/2691) `normalize` is the one identity key for a name: it NFC-normalizes, drops the Unicode format characters (`\p{Cf}` — zero-width space / non-joiner / joiner, the byte-order mark, soft hyphen, the bidi controls) that `trim()` keeps, trims, lowercases and NFC-normalizes again, so either canonical spelling of one visible name is one key; `findBot` and `findRooms` compare with it, the duplicate guards in `roster.js` ask those same finds, and `createBot`, `updateBot` and `cleanRoomName` store the visible form (the format characters stripped before the 40 / `ROOM_NAME_MAX` cut) while `shared/mentions.js` `nameProblem` refuses a name that is only invisible characters. A name already in `state.json` is never rewritten: the key is computed from what is stored, so an old NFD name still resolves. Since [#2692](https://github.com/ThinkFlowLab/FlyBot/issues/2692) that one key is `nameKey` in `core/src/shared/identity.js` (`normalize` in `host/text.js` is it, so the host, a shared module and the browser bundle cannot drift apart), and three identity sites that used their own `trim().toLowerCase()` compare with it: `shared/task-board.js` `sameRole` — a member's role label and a queued card's `queueRole`, so a card reaches the carrier whose label spells the same role the other way instead of staying in the pool — and `memory.js`'s topic, where the key is also the file stem: `cleanTopic` answers the key, a topic file already on disk keeps the spelling it was written with (the key is computed from the name, so a file `가.md` is still topic `[[가]]` and remember appends to that same file), the file already in key form wins when both spellings exist, and the `## Index` link check and the link a delete removes both compare by key rather than by the text that was written. A decomposed Latin topic, refused while U+0301 was not a `\p{L}`, is accepted as its NFC form. `plugins/tree` keeps its own copy of the same function (`src/identity.js`) because it ships as its own package, and `plugins/tree/test/identity.test.js` holds the two to the same answers. Since [#2935](https://github.com/ThinkFlowLab/FlyBot/issues/2935) a name also has a drawn form: `drawnKey` in the same `shared/identity.js` is `nameKey` with the characters `shared/mentions.js` exports as `NOT_DRAWN` removed — an explicit list of the code points with no glyph of their own (the combining grapheme joiner, the Hangul fillers, the braille blank, the Mongolian free variation selectors and the variation selectors), never the whole `\p{Mn}` class, because a combining mark is drawn by the letter under it and `กิ`/`กี` are two names — so `Dev` written with a trailing U+034F has the drawn form `dev` while its key stays `dev\u034f`. `roster.js` compares it in `createBot` and `updateBot` beside the key, so a second row that reads `Dev` and that no `@Dev` can reach is refused, from either side, with the sentences already in use (`A Bot named … already exists` / `Name … is not available`). Since [#2986](https://github.com/ThinkFlowLab/FlyBot/issues/2986) the stored name also folds a run of whitespace to one plain space — `foldSpaces` in `host/text.js`, used by `createBot` and `updateBot` before the 40-character cut and by the store when a saved team is loaded, the way `cleanRoomName` folds a group's name — because every name row draws with `white-space: nowrap`, so `Dev Ops` and `Dev Ops` are one row on screen while `nameKey` keeps them apart and `@Dev Ops` reaches only the single-space Bot. `Dev Ops` is therefore stored as `Dev Ops`, and the existing sentences refuse it while that name exists (`A Bot named … already exists` / `Name … is not available`); a line break is not folded, because `nameProblem` refuses it by name. A team saved before that fold kept its run, so `load()` folds `bots[].name` once, before the room names derived from the roster are rebuilt: when the folded name is one another Bot already holds, it is left as it was saved and one warning line names that Bot, because renaming a Bot the user can see is worse than the twin; the drawn-form guard `drawnClash` folds both sides too, so no new twin can be created beside a saved one. Nothing is stripped from the stored name and a drawn form nobody holds is still a name, so `#2879`'s guard and a blank beside drawn characters are unchanged. Tests: `core/test/name-identity.test.js`, `core/test/memory.test.js`, `core/test/bot-tasks.test.js`. |
-| `core/src/host/prompt.js` | The Bot system prompt; a Main Bot's section is headed `You are the Main Bot` and uses that one term, the one the UI shows (#276). The team rules state the idle default (#699): a Bot does nothing until the user addresses it, it is @-mentioned in a group, its parent gives it a task, or unfinished tasks it was already given are still on its board. It does not invent work. A coordinator acts on a user task rather than on its own initiative — an addressed Bot answers as before. A second section (`order: 700`) tells the Bot which of its own attached capabilities cannot be used right now: one `- (): — tell the user before acting.` line for each capability in state `error` or `needs-approval`, built from `capabilityStatusesView()`, and an empty string while every capability is ready, so a healthy Bot's cached prompt prefix does not move (#3273). The identity section stays byte-stable: capability state never goes into it. A reason is one line: whitespace folded, and an empty one reads `not connected` (#3273). Because that line is printed every turn, a URL carrying userinfo is refused on save in `capabilities.js` (`Enter the URL without a username or password…`, says the credential belongs in a secret referenced by a header) and a stored transport error of a capability saved before that refusal has its userinfo masked before the 300-character cut, so neither half of the credential reaches the prompt (#3273). |
+| `core/src/host/prompt.js` | The Bot system prompt; a Main Bot's section is headed `You are the Main Bot` and uses that one term, the one the UI shows (#276). The team rules state the idle default (#699): a Bot does nothing until the user addresses it, it is @-mentioned in a group, its parent gives it a task, or unfinished tasks it was already given are still on its board. It does not invent work. A coordinator acts on a user task rather than on its own initiative — an addressed Bot answers as before. A second section (`order: 700`) tells the Bot which of its own attached capabilities cannot be used right now: one `- (): — tell the user before acting.` line for each capability in state `error` or `needs-approval`, built from `capabilityStatusesView()`, and an empty string while every capability is ready, so a healthy Bot's cached prompt prefix does not move (#3273). The identity section stays byte-stable: capability state never goes into it. A reason is one line: whitespace folded, and an empty one reads `not connected` (#3273). Because that line is printed every turn, a URL carrying userinfo is refused on save in `capabilities.js` (`Enter the URL without a username or password…`, says the credential belongs in a secret referenced by a header) and a stored transport error of a capability saved before that refusal has its userinfo masked before the 300-character cut, so neither half of the credential reaches the prompt (#3273). A transport builds its error from the server's own response body, so a server that echoes a request header or an environment value writes that literal into the stored reason; a configured name that promises a credential (`key`, `token`, `secret`, `auth`, `password`, `passwd`, `credential`, `signature`, `cookie`, `session`, `bearer`, and `pat` as a whole segment, so `X-Github-Pat` counts and `X-Patch-Id` does not) masks its own value wherever the body repeats it before that same cut, longest value first so one credential ends whole and never merely its head, and a value under six characters is left alone rather than replace ordinary words (#3275). |
| `core/src/host/health.js` | `GET /api/health` (#2128, P-392): the one answer this instance gives without a session, and exactly four fields — `ok` (always `true`), `version` (`core/package.json`), `commit` (`git rev-parse HEAD` of the clone `core/` sits in, `null` for a package or path install with no `.git`) and `startedAt` (this process's start, from `process.uptime()`, stable until a restart). It is an **exact** WebServer route, which the web server matches before the `/api` prefix whose admission is the sign-in wall, so no cookie is needed and no other `/api` route changes; outside the Web composition there is no `webServer` and the route does not exist. A method other than `GET` answers 405. Tests: `core/test/health.test.js`. |
| `core/src/host/models.js` | The model surface: the provider catalog with its short caches (#409), a Bot's desired model and thinking level, the Session rebinding a group needs, and the connection test (`rt.testModel`). Every model call crosses the `llm/stream` listener installed here, which clamps an outbound output cap to 12288 (#3132) on the DashScope route alone — the `opencsitool` DSH route key whose proxy refused more (#3198), so every other provider takes the caller's request or its row's declared cap untouched: a model row may declare more than a provider endpoint accepts, and a request above that ceiling is refused whole by DashScope with a 400 (`max_completion_tokens … expected a value <= 12288`), so the step loses an answer it would otherwise give. A cap at or under the ceiling, a model that declares none, and a caller with no cap are passed through untouched — the clamp lowers a cap and never raises or invents one — and the request is re-entered with a copy rather than written to, because DSH compares a prepared call's config (`INVALID_PREPARED_CALL`). Tests: `core/test/llm-output-cap.test.js`, `core/test/install.test.js`. |
| `core/src/host/room-membership.js` | Typed room participants (human / local bot / granted remote), authorship, membership-window history (#50); rooms with friends' Bots or other owners take granted local Bots only and evict a Bot that stops qualifying (#90). Face-to-face rooms (#83) reuse this model (`origin: 'face-to-face'`, room-only remotes without a person-grant, `upsertFaceRoom` / `syncFaceParticipants` / `applyFaceRoomLine`); a face-room local Bot is `viaCode` (brought by number), `evictUnshared` skips face rooms (membership is the server's), and a Bot that returns to the member list drops the empty local `left` line (#236). Refusing an ungranted local Bot next to a friend's Bot throws `ungrantedRefusal`: a message that names the Bot, the friend and the two ways out, plus `error.details` `{ reason: 'ungranted-local', bots, remotes }`; `channel.js` `fail` forwards a plain-object `details` (empty otherwise) and `client/api.js` puts it on the thrown error, where `client/new-chat.js` draws a card (**Copy invite link for {Bot}** via `__flybot__.social.createInvite`, **Leave {Bot} out**) read through `ungrantedLocalFix` in `shared/remote-label.js`; the same file's `copiedToClipboard` reports whether the invite link really reached the clipboard (none, or a refused write, is `false`), and the card then shows the link to copy by hand instead of saying it was copied. |
diff --git a/patches/ds-bot/0001-core-fixes.patch b/patches/ds-bot/0001-core-fixes.patch
index ce5fabf66..4915ccecb 100644
--- a/patches/ds-bot/0001-core-fixes.patch
+++ b/patches/ds-bot/0001-core-fixes.patch
@@ -4544,7 +4544,7 @@ diff --git a/src/host/capabilities.js b/src/host/capabilities.js
}
return name
}
-@@ -33,6 +33,11 @@ export function expandCapabilityNames(capabilities, library) {
+@@ -33,6 +33,35 @@ export function expandCapabilityNames(capabilities, library) {
return expanded
}
@@ -4552,6 +4552,30 @@ diff --git a/src/host/capabilities.js b/src/host/capabilities.js
+// cannot know. A transport error quotes that URL back verbatim, and the status line reaches the
+// system prompt every turn, so userinfo is dropped before the sentence is stored.
+const withoutUserinfo = text => text.replace(/([a-z][a-z0-9+.-]*:\/\/)[^/\s@]+@/gi, '$1')
++
++// #3275: a failing transport builds its error from the server's own response body, so a server that
++// echoes a request header writes a value the user configured into the stored reason the system
++// prompt prints every turn. `redactSecrets` replaces saved key values only, so a header or
++// environment name that promises a credential masks its own value wherever the body repeats it. A
++// value under six characters is left alone: replacing it everywhere would eat the words around it.
++// The literal is not refused at input instead — it is legal today, an entry saved before this exists
++// in the field, and what such a value may be kept at rest is the separate open question in #3276.
++// `pat` counts as a whole segment: `X-Github-Pat` is a credential while `X-Patch-Id` and `X-Path-Id`
++// are ordinary names that merely begin with the same three letters.
++const CREDENTIAL_NAME = /(key|token|secret|auth|password|passwd|credential|signature|cookie|session|bearer)|(? {
++ // Longest value first, the way `secrets.js` sorts its own before it builds one pattern: one
++ // credential can contain another (`Bearer abc123XYZ` carries the `abc123` of the key beside it),
++ // and replacing the short one first would leave the longer one's tail in the stored sentence.
++ // Sorting makes the answer the same whichever order the two entries were written in.
++ const values = Object.entries({ ...config?.headers, ...config?.env })
++ .filter(([name, value]) => CREDENTIAL_NAME.test(name) && typeof value === 'string' && value.length >= 6)
++ .map(([, value]) => value)
++ .sort((a, b) => b.length - a.length)
++ let out = text
++ for (const value of values) out = out.split(value).join('[hidden]')
++ return out
++}
+
const same = (a, b) => JSON.stringify(a) === JSON.stringify(b)
const strings = value => {
@@ -4617,7 +4641,7 @@ diff --git a/src/host/capabilities.js b/src/host/capabilities.js
await drop()
- const message = rt.redactSecrets([error, error?.cause].filter(Boolean).map(part => String(part?.message ?? part)).join(': ') || 'Connection failed').slice(0, 300)
+ const joined = [error, error?.cause].filter(Boolean).map(part => String(part?.message ?? part)).join(': ') || 'Connection failed'
-+ const message = withoutUserinfo(rt.redactSecrets(joined)).slice(0, 300)
++ const message = withoutCredentialValues(withoutUserinfo(rt.redactSecrets(joined)), config).slice(0, 300)
statusSet(bot.id, name, sessionId, { state: 'error', error: message })
}
}
diff --git a/patches/ds-bot/0014-flybot-branding.patch b/patches/ds-bot/0014-flybot-branding.patch
index 614b00ae4..f2d32c7cc 100644
--- a/patches/ds-bot/0014-flybot-branding.patch
+++ b/patches/ds-bot/0014-flybot-branding.patch
@@ -2047,7 +2047,7 @@ diff --git a/test/capabilities.test.js b/test/capabilities.test.js
})
test('read-only secret reload does not requeue capability reconciliation', async t => {
-@@ -425,3 +425,90 @@ test('mounts agent-only MCP and skills, remounts changed config, resolves scoped
+@@ -425,3 +425,221 @@ test('mounts agent-only MCP and skills, remounts changed config, resolves scoped
assert.equal(mounts.findLast(mount => mount.sessionId === 'chief' && mount.plugin.inject?.includes('skills')).disposed, true)
assert.equal(rt.capabilityStatusesView().chief.team, undefined)
})
@@ -2138,6 +2138,137 @@ diff --git a/test/capabilities.test.js b/test/capabilities.test.js
+ assert.equal(saved.url, 'https://host/mcp')
+ assert.equal(env.rt.state.capabilities.items.plain.url, 'https://host/mcp')
+})
++
++// #3275: a `streamable-http` transport builds its error from the server's own response body
++// (`Error POSTing to endpoint: `), and a server that echoes a request header writes a value
++// the user configured into a stored reason that the system prompt prints on every turn.
++// `redactSecrets` replaces saved keys only, so a literal header value is masked by the name that
++// promises a credential — and only that name, so an ordinary header in the same body survives.
++const quoting = (name, headers) => ({
++ items: {
++ [name]: {
++ name, kind: 'mcp', description: 'Echo service', transport: 'streamable-http',
++ url: 'https://host/mcp', headers, approved: true, createdBy: 'worker', createdAt: 1, updatedAt: 1,
++ },
++ },
++})
++
++test('an error that echoes a configured header value stores it masked', async t => {
++ const state = team()
++ state.capabilities = quoting('echo', { 'X-Tenant-Key': 'abc123', Accept: 'application/json' })
++ const env = await setup({ state })
++ t.after(() => env.dispose())
++ const { ctx, rt, mounts, skills } = env
++ await rt.changeCapabilityAttachment('attach', { name: 'echo' }, 'worker')
++ const quoted = 'Error POSTing to endpoint: {"error":"unauthorized","echoed":"X-Tenant-Key: abc123","accept":"application/json"}'
++ ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error(quoted) } }) })
++ await rt.scheduleCapabilitiesReconcile()
++ const status = rt.capabilityStatusesView().worker.echo
++ assert.equal(status.state, 'error')
++ assert.equal(status.error, 'Error POSTing to endpoint: {"error":"unauthorized","echoed":"X-Tenant-Key: [hidden]","accept":"application/json"}', 'the exact stored sentence: the header name and an ordinary header survive, the credential value is gone')
++ assert.equal(JSON.stringify(rt.capabilityStatusesView()).includes('abc123'), false)
++})
++
++test('an error that echoes a configured environment value stores it masked', async t => {
++ const state = team()
++ state.capabilities = {
++ items: {
++ stdio: {
++ name: 'stdio', kind: 'mcp', description: 'Local server', transport: 'stdio', command: 'node', args: [],
++ env: { SERVICE_TOKEN: 'tok-abcdef', PATH_KEEP: '/usr/bin' }, approved: true, createdBy: 'worker', createdAt: 1, updatedAt: 1,
++ },
++ },
++ }
++ const env = await setup({ state })
++ t.after(() => env.dispose())
++ const { ctx, rt, mounts, skills } = env
++ await rt.changeCapabilityAttachment('attach', { name: 'stdio' }, 'worker')
++ const quoted = 'server exited with SERVICE_TOKEN=tok-abcdef'
++ ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error(quoted) } }) })
++ await rt.scheduleCapabilitiesReconcile()
++ const status = rt.capabilityStatusesView().worker.stdio
++ assert.equal(status.state, 'error')
++ assert.equal(status.error, 'server exited with SERVICE_TOKEN=[hidden]', 'the exact stored sentence')
++ assert.equal(JSON.stringify(rt.capabilityStatusesView()).includes('tok-abcdef'), false)
++})
++
++// #3275, from the security read at `57bdaa6a`: a cookie is a whole session credential, and the names
++// that promise one have to say so — a server that echoes `Cookie: sid=…` otherwise writes the session
++// into the prompt every turn.
++test('an error that echoes a cookie value stores the whole session credential masked', async t => {
++ const state = team()
++ state.capabilities = quoting('cookie-echo', { Cookie: 'sid=supersecretsession42', Accept: 'application/json' })
++ const env = await setup({ state })
++ t.after(() => env.dispose())
++ const { ctx, rt, mounts, skills } = env
++ await rt.changeCapabilityAttachment('attach', { name: 'cookie-echo' }, 'worker')
++ const quoted = 'Error POSTing to endpoint: {"error":"unauthorized","echoed":"Cookie: sid=supersecretsession42","accept":"application/json"}'
++ ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error(quoted) } }) })
++ await rt.scheduleCapabilitiesReconcile()
++ const status = rt.capabilityStatusesView().worker['cookie-echo']
++ assert.equal(status.state, 'error')
++ assert.equal(status.error, 'Error POSTing to endpoint: {"error":"unauthorized","echoed":"Cookie: [hidden]","accept":"application/json"}', 'the whole cookie value is gone and the ordinary header survives')
++ assert.equal(JSON.stringify(rt.capabilityStatusesView()).includes('supersecretsession42'), false)
++})
++
++// #3275, same read: `X-Github-Pat` is a credential while `X-Patch-Id` and `X-Path-Id` are ordinary
++// names that merely begin with those three letters — so `pat` counts as a whole segment, never as a
++// prefix.
++test('a PAT header name is masked while "patch" and "path" names are not', async t => {
++ const state = team()
++ state.capabilities = quoting('pat-echo', {
++ 'X-Github-Pat': 'ghp-abcdef123456', 'X-Patch-Id': 'patch-9000', 'X-Path-Id': 'path-9000', Accept: 'application/json',
++ })
++ const env = await setup({ state })
++ t.after(() => env.dispose())
++ const { ctx, rt, mounts, skills } = env
++ await rt.changeCapabilityAttachment('attach', { name: 'pat-echo' }, 'worker')
++ const quoted = 'Error POSTing to endpoint: {"pat":"X-Github-Pat: ghp-abcdef123456","patch":"X-Patch-Id: patch-9000","path":"X-Path-Id: path-9000","accept":"application/json"}'
++ ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error(quoted) } }) })
++ await rt.scheduleCapabilitiesReconcile()
++ const status = rt.capabilityStatusesView().worker['pat-echo']
++ assert.equal(status.state, 'error')
++ assert.equal(status.error, 'Error POSTing to endpoint: {"pat":"X-Github-Pat: [hidden]","patch":"X-Patch-Id: patch-9000","path":"X-Path-Id: path-9000","accept":"application/json"}', 'only the PAT value is masked; the two lookalike names keep their values')
++ assert.equal(JSON.stringify(rt.capabilityStatusesView()).includes('ghp-abcdef123456'), false)
++})
++
++// #3275, same read: one value can contain another (`Bearer abc123XYZ` carries the `abc123` of the key
++// beside it), so the values are replaced longest first — the way `secrets.js` sorts its own — and the
++// answer does not depend on the order the two entries were written in.
++for (const [label, headers] of [
++ ['the key first', { 'X-Api-Key': 'abc123', Authorization: 'Bearer abc123XYZ' }],
++ ['the authorization first', { Authorization: 'Bearer abc123XYZ', 'X-Api-Key': 'abc123' }],
++]) {
++ test(`an error that echoes two credential values masks the longer one whole, ${label}`, async t => {
++ const state = team()
++ state.capabilities = quoting('pair-echo', headers)
++ const env = await setup({ state })
++ t.after(() => env.dispose())
++ const { ctx, rt, mounts, skills } = env
++ await rt.changeCapabilityAttachment('attach', { name: 'pair-echo' }, 'worker')
++ const quoted = 'Error POSTing to endpoint: {"auth":"Bearer abc123XYZ"}'
++ ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error(quoted) } }) })
++ await rt.scheduleCapabilitiesReconcile()
++ const status = rt.capabilityStatusesView().worker['pair-echo']
++ assert.equal(status.state, 'error')
++ assert.equal(status.error, 'Error POSTing to endpoint: {"auth":"[hidden]"}', 'the longer value is replaced whole, so no tail of it survives')
++ assert.equal(JSON.stringify(rt.capabilityStatusesView()).includes('XYZ'), false)
++ })
++}
++
++test('a plain reason is stored exactly as the transport gave it', async t => {
++ const state = team()
++ state.capabilities = quoting('plain-error', {})
++ const env = await setup({ state })
++ t.after(() => env.dispose())
++ const { ctx, rt, mounts, skills } = env
++ await rt.changeCapabilityAttachment('attach', { name: 'plain-error' }, 'worker')
++ ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error('401 bad credentials') } }) })
++ await rt.scheduleCapabilitiesReconcile()
++ const status = rt.capabilityStatusesView().worker['plain-error']
++ assert.equal(status.state, 'error')
++ assert.equal(status.error, '401 bad credentials')
++})
diff --git a/test/dsh-update.test.js b/test/dsh-update.test.js
--- a/test/dsh-update.test.js
+++ b/test/dsh-update.test.js