From 44eed15953086cf951128ffc5440c3b77dc731b1 Mon Sep 17 00:00:00 2001 From: Danyang Chen Date: Sat, 21 Nov 2026 15:16:06 +0800 Subject: [PATCH] Mask an inline capability command line and dash-prefixed credential values Read a command that contains whitespace as a command line with the same flag, inline and assignment rules as args, and take the token after a credential-looking flag as its value even when it begins with `-`. A single bare-token command stays unmasked and is documented as the same limit as a bare args token; the accepted over-mask (`--api-key --verbose` -> `--api-key [hidden]`) is recorded in the doc, the fragment and the pull request body. The stored reason is still one line of at most 300 characters, masked before the cut; the sig/hmac/pass list, the whole-segment pat/sig/pass match and longest-value-first order are unchanged. Fixes #3281 --- changelog.d/3281.fixed.md | 1 + core/src/host/capabilities.js | 13 ++- core/test/capabilities.test.js | 98 ++++++++++++++++++++- docs/subsystems/core-host.md | 2 +- patches/ds-bot/0001-core-fixes.patch | 15 +++- patches/ds-bot/0014-flybot-branding.patch | 100 +++++++++++++++++++++- 6 files changed, 216 insertions(+), 13 deletions(-) create mode 100644 changelog.d/3281.fixed.md diff --git a/changelog.d/3281.fixed.md b/changelog.d/3281.fixed.md new file mode 100644 index 000000000..b3e70e326 --- /dev/null +++ b/changelog.d/3281.fixed.md @@ -0,0 +1 @@ +A capability's stored failure reason no longer repeats a credential typed into a command line saved in the capability's own `command`, or a credential value that begins with `-`: a `command` containing a space or a tab is read as a command line and its tokens go through the same rules as `args` — the token after a credential-looking flag, the `--flag=value` form and a `NAME=value` token are masked with `[hidden]` — and the token after a credential-looking flag is its value even when it begins with `-`, so `--api-key --verbose` stores `--api-key [hidden]` and a second `--api-key` is masked as a value too. A `command` that is one bare token without whitespace stays unmasked, because it cannot be told from a program name, the same limit as a bare `args` token; the stored reason is still one line of at most 300 characters with the mask applied before the cut, longest value first and a value under six characters left alone, so a failed server's own error line can no longer print that credential into the Bot's system prompt every turn ([#3281](https://github.com/ThinkFlowLab/FlyBot/issues/3281)). diff --git a/core/src/host/capabilities.js b/core/src/host/capabilities.js index 112c42b3e..c8702506d 100644 --- a/core/src/host/capabilities.js +++ b/core/src/host/capabilities.js @@ -57,6 +57,11 @@ const withoutUserinfo = text => text.replace(/([a-z][a-z0-9+.-]*:\/\/)[^/\s@]+@/ // read as an assignment. A bare token is never a literal: `node` or `server.js` cannot be told from a // program name, but a literal that is also a header or environment value is masked wherever the // body repeats it, the command position included. +// #3281: a `command` holding a whole command line is split on whitespace and read the same way, while +// a `command` that is a single bare token stays unmasked, the same limit as a bare `args` token. After +// a credential-looking flag the next token is the value even when it begins with `-`, so +// `--api-key --verbose` stores `--api-key [hidden]` and a second `--api-key` is masked as a value; +// that over-mask is the accepted cost. const CREDENTIAL_NAME = /(key|token|secret|auth|password|passwd|credential|signature|cookie|session|bearer|hmac)|(? { if (typeof value === 'string' && value.length >= 6 && CREDENTIAL_NAME.test(name)) values.push(value) } for (const [name, value] of Object.entries({ ...config?.headers, ...config?.env })) collect(name, value) - const argv = [config?.command, ...(Array.isArray(config?.args) ? config.args : [])] + const command = config?.command + const commandTokens = typeof command === 'string' && /[ \t]/.test(command) + ? command.split(/[ \t]+/).filter(Boolean) + : [command] + const argv = [...commandTokens, ...(Array.isArray(config?.args) ? config.args : [])] for (let index = 0; index < argv.length; index += 1) { const token = argv[index] if (typeof token !== 'string') continue @@ -77,7 +86,7 @@ const withoutCredentialValues = (text, config) => { if (assignment) { collect(assignment[1], assignment[2]); continue } const flag = FLAG.exec(token) const next = argv[index + 1] - if (!flag || !CREDENTIAL_NAME.test(flag[1]) || typeof next !== 'string' || next.startsWith('-')) continue + if (!flag || !CREDENTIAL_NAME.test(flag[1]) || typeof next !== 'string') continue collect(flag[1], next) index += 1 } diff --git a/core/test/capabilities.test.js b/core/test/capabilities.test.js index 5f19860e2..eaa214eee 100644 --- a/core/test/capabilities.test.js +++ b/core/test/capabilities.test.js @@ -717,13 +717,16 @@ test('a sig, hmac or pass header name masks its value while assign, compass and // #3278: the two things #3275 fixed stay fixed — a value under six characters is left alone rather // than eating the words around it, and the mask still runs before the 300-character cut, so a literal // inside the kept part is gone and only the tail past the cut is dropped. +// #3281 test-quality item: the under-six value is pinned behind a credential-looking flag and is +// exactly five characters, so deleting `value.length >= 6` in `capabilities.js` turns this test red +// instead of passing because the flag name itself never matched a credential. test('an argv literal under six characters stays and an argv literal is masked before the three-hundred cut', async t => { const state = team() state.capabilities = { items: { long: { name: 'long', kind: 'mcp', description: 'Local server', transport: 'stdio', command: 'node', - args: ['server.js', '--pin', 'abcde', '--api-key', 'sk-live-abcdef123456'], + args: ['server.js', '--api-key', 'abcde', '--api-key', 'sk-live-abcdef123456'], env: {}, approved: true, createdBy: 'worker', createdAt: 1, updatedAt: 1, }, }, @@ -732,13 +735,13 @@ test('an argv literal under six characters stays and an argv literal is masked b t.after(() => env.dispose()) const { ctx, rt, mounts, skills } = env await rt.changeCapabilityAttachment('attach', { name: 'long' }, 'worker') - const quoted = `server exited: --pin abcde ${'x'.repeat(170)} --api-key sk-live-abcdef123456 ${'z'.repeat(200)}` + const quoted = `server exited: --api-key abcde ${'x'.repeat(170)} --api-key sk-live-abcdef123456 ${'z'.repeat(200)}` ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error(quoted) } }) }) await rt.scheduleCapabilitiesReconcile() const status = rt.capabilityStatusesView().worker.long assert.equal(status.state, 'error') assert.equal(status.error.length, 300, 'the stored reason is still cut at 300 characters') - assert.equal(status.error.startsWith('server exited: --pin abcde '), true, 'a five-character value is left alone') + assert.equal(status.error.startsWith('server exited: --api-key abcde '), true, 'a five-character value behind a credential flag is left alone') assert.equal(status.error.includes('--api-key [hidden]'), true, 'the mask ran before the cut') assert.equal(status.error.includes('sk-live-abcdef123456'), false) }) @@ -833,3 +836,92 @@ test('an http capability saved before this fix shows no header literal on any su assert.equal(surfaces.listed.includes(masked), true) assert.equal(surfaces.prompt.includes(masked), true) }) + +// #3281: a stdio entry can be saved from a pasted line, so `command` itself may hold a whole command +// line (`node server.js --api-key …`). When it contains whitespace it is split into tokens and read +// with the same rules as `args`, so the literal after a credential-looking flag is masked in the +// stored reason. A command that is a single bare token stays unmasked: it cannot be told from a +// program name, the same documented limit as a bare `args` token. +test('an error that quotes a stdio command line stored in `command` masks the credential literal', async t => { + const state = team() + state.capabilities = { + items: { + inline: { + name: 'inline', kind: 'mcp', description: 'Local server', transport: 'stdio', + command: 'node server.js --api-key sk-live-abcdef123456 --password=hunter2-secret -e SERVICE_TOKEN=tok-abcdef123', + args: [], env: {}, 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: 'inline' }, 'worker') + const quoted = 'spawn node server.js --api-key sk-live-abcdef123456 --password=hunter2-secret -e SERVICE_TOKEN=tok-abcdef123 ENOENT' + ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error(quoted) } }) }) + await rt.scheduleCapabilitiesReconcile() + const status = rt.capabilityStatusesView().worker.inline + assert.equal(status.state, 'error') + assert.equal( + status.error, + 'spawn node server.js --api-key [hidden] --password=[hidden] -e SERVICE_TOKEN=[hidden] ENOENT', + 'the inline command line is read with the same flag, inline and assignment rules as args', + ) + const stored = JSON.stringify(rt.capabilityStatusesView()) + assert.equal(stored.includes('sk-live-abcdef123456'), false) + assert.equal(stored.includes('hunter2-secret'), false) + assert.equal(stored.includes('tok-abcdef123'), false) +}) + +// #3281: a generated credential can begin with `-`, and the token after a credential-looking flag is +// that flag's value even then. The accepted cost is that `--api-key --verbose` stores `--api-key +// [hidden]`; it is recorded in `docs/subsystems/core-host.md`, the fragment and the pull request body. +test('a dash-prefixed credential value after a credential flag is masked', async t => { + const state = team() + state.capabilities = { + items: { + dash: { + name: 'dash', kind: 'mcp', description: 'Local server', transport: 'stdio', command: 'node', + args: ['server.js', '--api-key', '-s3cr3t-abcdef', '--verbose'], + env: {}, 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: 'dash' }, 'worker') + const quoted = 'spawn node ENOENT: node server.js --api-key -s3cr3t-abcdef --verbose' + ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error(quoted) } }) }) + await rt.scheduleCapabilitiesReconcile() + const status = rt.capabilityStatusesView().worker.dash + assert.equal(status.state, 'error') + assert.equal(status.error, 'spawn node ENOENT: node server.js --api-key [hidden] --verbose', 'a value beginning with - is still the flag value') + assert.equal(JSON.stringify(rt.capabilityStatusesView()).includes('s3cr3t-abcdef'), false) +}) + +// #3281 accepted cost: a following flag is taken as the value and masked, so `--api-key --verbose` +// reads `--api-key [hidden]`. The test pins the cost exactly; the doc, the fragment and the pull +// request body say the same sentence. +test('a flag directly after a credential flag is masked as its value', async t => { + const state = team() + state.capabilities = { + items: { + bare: { + name: 'bare', kind: 'mcp', description: 'Local server', transport: 'stdio', command: 'node', + args: ['server.js', '--api-key', '--verbose'], + env: {}, 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: 'bare' }, 'worker') + const quoted = 'server exited: node server.js --api-key --verbose' + ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error(quoted) } }) }) + await rt.scheduleCapabilitiesReconcile() + const status = rt.capabilityStatusesView().worker.bare + assert.equal(status.state, 'error') + assert.equal(status.error, 'server exited: node server.js --api-key [hidden]', 'the accepted cost: a following flag is masked') +}) diff --git a/docs/subsystems/core-host.md b/docs/subsystems/core-host.md index 1e1b68ff6..f15cfaee2 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). 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`, `hmac`, and `pat`, `sig` and `pass` as whole segments, so `X-Github-Pat`, `X-Sig` and `X-Pass` count while `X-Patch-Id`, `assign`, `compass` and `bypass` do 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). A stdio server is started with the literal on its argv, so the same mask reads `command` and `args` too: the token after a credential-looking flag, the `--flag=value` form and a `NAME=value` token are masked the same way, while an ordinary flag and a bare program name keep their text (#3278). | +| `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`, `hmac`, and `pat`, `sig` and `pass` as whole segments, so `X-Github-Pat`, `X-Sig` and `X-Pass` count while `X-Patch-Id`, `assign`, `compass` and `bypass` do 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). A stdio server is started with the literal on its argv, so the same mask reads `command` and `args` too: the token after a credential-looking flag, the `--flag=value` form and a `NAME=value` token are masked the same way, while an ordinary flag and a bare program name keep their text (#3278). Since #3281 a `command` that holds a whole command line — it contains a space or a tab — is split on that whitespace and its tokens go through the same flag, inline and assignment rules as `args`, while a `command` that is one bare token without whitespace stays unmasked: it cannot be told from a program name, the same limit as a bare `args` token. After a credential-looking flag the next token is that flag's value even when it begins with `-`, so the accepted text cost is that `--api-key --verbose` stores `--api-key [hidden]` and a second `--api-key` is masked as a value too ([#3281](https://github.com/ThinkFlowLab/FlyBot/issues/3281)). | | `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 3785cb28e..ad44cf34b 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,60 @@ export function expandCapabilityNames(capabilities, library) { +@@ -33,6 +33,69 @@ export function expandCapabilityNames(capabilities, library) { return expanded } @@ -4569,6 +4569,11 @@ diff --git a/src/host/capabilities.js b/src/host/capabilities.js +// read as an assignment. A bare token is never a literal: `node` or `server.js` cannot be told from a +// program name, but a literal that is also a header or environment value is masked wherever the +// body repeats it, the command position included. ++// #3281: a `command` holding a whole command line is split on whitespace and read the same way, while ++// a `command` that is a single bare token stays unmasked, the same limit as a bare `args` token. After ++// a credential-looking flag the next token is the value even when it begins with `-`, so ++// `--api-key --verbose` stores `--api-key [hidden]` and a second `--api-key` is masked as a value; ++// that over-mask is the accepted cost. +const CREDENTIAL_NAME = /(key|token|secret|auth|password|passwd|credential|signature|cookie|session|bearer|hmac)|(?= 6 && CREDENTIAL_NAME.test(name)) values.push(value) + } + for (const [name, value] of Object.entries({ ...config?.headers, ...config?.env })) collect(name, value) -+ const argv = [config?.command, ...(Array.isArray(config?.args) ? config.args : [])] ++ const command = config?.command ++ const commandTokens = typeof command === 'string' && /[ \t]/.test(command) ++ ? command.split(/[ \t]+/).filter(Boolean) ++ : [command] ++ const argv = [...commandTokens, ...(Array.isArray(config?.args) ? config.args : [])] + for (let index = 0; index < argv.length; index += 1) { + const token = argv[index] + if (typeof token !== 'string') continue @@ -4589,7 +4598,7 @@ diff --git a/src/host/capabilities.js b/src/host/capabilities.js + if (assignment) { collect(assignment[1], assignment[2]); continue } + const flag = FLAG.exec(token) + const next = argv[index + 1] -+ if (!flag || !CREDENTIAL_NAME.test(flag[1]) || typeof next !== 'string' || next.startsWith('-')) continue ++ if (!flag || !CREDENTIAL_NAME.test(flag[1]) || typeof next !== 'string') continue + collect(flag[1], next) + index += 1 + } diff --git a/patches/ds-bot/0014-flybot-branding.patch b/patches/ds-bot/0014-flybot-branding.patch index 5bec9402e..b78befb81 100644 --- a/patches/ds-bot/0014-flybot-branding.patch +++ b/patches/ds-bot/0014-flybot-branding.patch @@ -2054,7 +2054,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,406 @@ test('mounts agent-only MCP and skills, remounts changed config, resolves scoped +@@ -425,3 +425,498 @@ 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) }) @@ -2345,13 +2345,16 @@ diff --git a/test/capabilities.test.js b/test/capabilities.test.js +// #3278: the two things #3275 fixed stay fixed — a value under six characters is left alone rather +// than eating the words around it, and the mask still runs before the 300-character cut, so a literal +// inside the kept part is gone and only the tail past the cut is dropped. ++// #3281 test-quality item: the under-six value is pinned behind a credential-looking flag and is ++// exactly five characters, so deleting `value.length >= 6` in `capabilities.js` turns this test red ++// instead of passing because the flag name itself never matched a credential. +test('an argv literal under six characters stays and an argv literal is masked before the three-hundred cut', async t => { + const state = team() + state.capabilities = { + items: { + long: { + name: 'long', kind: 'mcp', description: 'Local server', transport: 'stdio', command: 'node', -+ args: ['server.js', '--pin', 'abcde', '--api-key', 'sk-live-abcdef123456'], ++ args: ['server.js', '--api-key', 'abcde', '--api-key', 'sk-live-abcdef123456'], + env: {}, approved: true, createdBy: 'worker', createdAt: 1, updatedAt: 1, + }, + }, @@ -2360,13 +2363,13 @@ diff --git a/test/capabilities.test.js b/test/capabilities.test.js + t.after(() => env.dispose()) + const { ctx, rt, mounts, skills } = env + await rt.changeCapabilityAttachment('attach', { name: 'long' }, 'worker') -+ const quoted = `server exited: --pin abcde ${'x'.repeat(170)} --api-key sk-live-abcdef123456 ${'z'.repeat(200)}` ++ const quoted = `server exited: --api-key abcde ${'x'.repeat(170)} --api-key sk-live-abcdef123456 ${'z'.repeat(200)}` + ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error(quoted) } }) }) + await rt.scheduleCapabilitiesReconcile() + const status = rt.capabilityStatusesView().worker.long + assert.equal(status.state, 'error') + assert.equal(status.error.length, 300, 'the stored reason is still cut at 300 characters') -+ assert.equal(status.error.startsWith('server exited: --pin abcde '), true, 'a five-character value is left alone') ++ assert.equal(status.error.startsWith('server exited: --api-key abcde '), true, 'a five-character value behind a credential flag is left alone') + assert.equal(status.error.includes('--api-key [hidden]'), true, 'the mask ran before the cut') + assert.equal(status.error.includes('sk-live-abcdef123456'), false) +}) @@ -2461,6 +2464,95 @@ diff --git a/test/capabilities.test.js b/test/capabilities.test.js + assert.equal(surfaces.listed.includes(masked), true) + assert.equal(surfaces.prompt.includes(masked), true) +}) ++ ++// #3281: a stdio entry can be saved from a pasted line, so `command` itself may hold a whole command ++// line (`node server.js --api-key …`). When it contains whitespace it is split into tokens and read ++// with the same rules as `args`, so the literal after a credential-looking flag is masked in the ++// stored reason. A command that is a single bare token stays unmasked: it cannot be told from a ++// program name, the same documented limit as a bare `args` token. ++test('an error that quotes a stdio command line stored in `command` masks the credential literal', async t => { ++ const state = team() ++ state.capabilities = { ++ items: { ++ inline: { ++ name: 'inline', kind: 'mcp', description: 'Local server', transport: 'stdio', ++ command: 'node server.js --api-key sk-live-abcdef123456 --password=hunter2-secret -e SERVICE_TOKEN=tok-abcdef123', ++ args: [], env: {}, 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: 'inline' }, 'worker') ++ const quoted = 'spawn node server.js --api-key sk-live-abcdef123456 --password=hunter2-secret -e SERVICE_TOKEN=tok-abcdef123 ENOENT' ++ ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error(quoted) } }) }) ++ await rt.scheduleCapabilitiesReconcile() ++ const status = rt.capabilityStatusesView().worker.inline ++ assert.equal(status.state, 'error') ++ assert.equal( ++ status.error, ++ 'spawn node server.js --api-key [hidden] --password=[hidden] -e SERVICE_TOKEN=[hidden] ENOENT', ++ 'the inline command line is read with the same flag, inline and assignment rules as args', ++ ) ++ const stored = JSON.stringify(rt.capabilityStatusesView()) ++ assert.equal(stored.includes('sk-live-abcdef123456'), false) ++ assert.equal(stored.includes('hunter2-secret'), false) ++ assert.equal(stored.includes('tok-abcdef123'), false) ++}) ++ ++// #3281: a generated credential can begin with `-`, and the token after a credential-looking flag is ++// that flag's value even then. The accepted cost is that `--api-key --verbose` stores `--api-key ++// [hidden]`; it is recorded in `docs/subsystems/core-host.md`, the fragment and the pull request body. ++test('a dash-prefixed credential value after a credential flag is masked', async t => { ++ const state = team() ++ state.capabilities = { ++ items: { ++ dash: { ++ name: 'dash', kind: 'mcp', description: 'Local server', transport: 'stdio', command: 'node', ++ args: ['server.js', '--api-key', '-s3cr3t-abcdef', '--verbose'], ++ env: {}, 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: 'dash' }, 'worker') ++ const quoted = 'spawn node ENOENT: node server.js --api-key -s3cr3t-abcdef --verbose' ++ ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error(quoted) } }) }) ++ await rt.scheduleCapabilitiesReconcile() ++ const status = rt.capabilityStatusesView().worker.dash ++ assert.equal(status.state, 'error') ++ assert.equal(status.error, 'spawn node ENOENT: node server.js --api-key [hidden] --verbose', 'a value beginning with - is still the flag value') ++ assert.equal(JSON.stringify(rt.capabilityStatusesView()).includes('s3cr3t-abcdef'), false) ++}) ++ ++// #3281 accepted cost: a following flag is taken as the value and masked, so `--api-key --verbose` ++// reads `--api-key [hidden]`. The test pins the cost exactly; the doc, the fragment and the pull ++// request body say the same sentence. ++test('a flag directly after a credential flag is masked as its value', async t => { ++ const state = team() ++ state.capabilities = { ++ items: { ++ bare: { ++ name: 'bare', kind: 'mcp', description: 'Local server', transport: 'stdio', command: 'node', ++ args: ['server.js', '--api-key', '--verbose'], ++ env: {}, 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: 'bare' }, 'worker') ++ const quoted = 'server exited: node server.js --api-key --verbose' ++ ctx.emit('agent/created', { agent: testAgent('worker', mounts, skills, { awaitMount: async () => { throw new Error(quoted) } }) }) ++ await rt.scheduleCapabilitiesReconcile() ++ const status = rt.capabilityStatusesView().worker.bare ++ assert.equal(status.state, 'error') ++ assert.equal(status.error, 'server exited: node server.js --api-key [hidden]', 'the accepted cost: a following flag is masked') ++}) 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