@yalehwang/cloudpit 2.0.0 → 3.0.0

package/dist-server/server/modules/settings/tests/codex-provider-import.test.js

@@ -0,0 +1,475 @@
+/**
+ * Read-only import of the operator's own Codex providers (AC-466).
+ *
+ * The project settings file is the one writable surface for Codex upstream providers. The
+ * operator's `~/.codex` TOML files are compatibility input only: this criterion pins that the
+ * import (a) LISTS every `[model_providers.<id>]` block with `name` / `base_url` / `env_key` /
+ * `wire_api`, (b) never reads a secret — no `env_key` VALUE, no token file, no `auth.json` —
+ * (c) never writes back to the user's files or creates a project settings file as a side
+ * effect, and (d) reports unknown fields (Codex's own `api`) as warnings on the import view.
+ *
+ * Every fixture lives in a temp Codex home injected through `homeDir`/`env`, so this criterion
+ * never reads the host's real `~/.codex` (the task's DoD run against the real profile is a
+ * separate, read-only command whose output is recorded on the task, not an assertion here).
+ */
+import assert from 'node:assert/strict';
+import { once } from 'node:events';
+import { mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, writeFileSync, } from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import test from 'node:test';
+import express from 'express';
+import { AppError } from '../../../shared/utils.js';
+import { createCodexModelProvidersSource, readCodexUserProviderImports, } from '../codex-model-providers.settings.js';
+import { createSettingsRouter } from '../settings.routes.js';
+import { createSettingsService } from '../settings.service.js';
+const BOB_CONFIG = `
+model = "gpt-5.6-sol"
+
+[model_providers.bob]
+name = "BOB API"
+base_url = "https://bob-api.com/v1"
+env_key = "BOB_API_KEY"
+api = "openai-responses"
+`;
+function withCodexHome(files, run) {
+    const home = mkdtempSync(path.join(os.tmpdir(), 'codex-user-import-'));
+    const codexDir = path.join(home, '.codex');
+    mkdirSync(codexDir, { recursive: true });
+    for (const [name, text] of Object.entries(files)) {
+        writeFileSync(path.join(codexDir, name), text);
+    }
+    const fixture = {
+        home,
+        codexDir,
+        write: (name, text) => writeFileSync(path.join(codexDir, name), text),
+        snapshot: () => {
+            const result = {};
+            const walk = (dir) => {
+                for (const entry of readdirSync(dir, { withFileTypes: true })) {
+                    const full = path.join(dir, entry.name);
+                    if (entry.isDirectory())
+                        walk(full);
+                    else
+                        result[path.relative(home, full)] = readFileSync(full, 'utf8');
+                }
+            };
+            walk(home);
+            return result;
+        },
+    };
+    try {
+        run(fixture);
+    }
+    finally {
+        rmSync(home, { recursive: true, force: true });
+    }
+}
+function provider(reading, id) {
+    const found = reading.providers.find((entry) => entry.id === id);
+    assert.ok(found, `provider ${id} must be in the import view: ${JSON.stringify(reading.providers)}`);
+    return found;
+}
+test('AC-466 a user config.toml provider is listed with name/base_url/env_key/wire_api', () => {
+    withCodexHome({ 'config.toml': BOB_CONFIG }, ({ home, codexDir }) => {
+        const reading = readCodexUserProviderImports({ homeDir: home, env: {} });
+        assert.equal(reading.directory, codexDir);
+        assert.deepEqual(reading.files, [path.join(codexDir, 'config.toml')]);
+        assert.deepEqual(reading.warnings, []);
+        const bob = provider(reading, 'bob');
+        assert.equal(bob.name, 'BOB API');
+        assert.equal(bob.baseUrl, 'https://bob-api.com/v1');
+        assert.equal(bob.envKey, 'BOB_API_KEY');
+        // The block omits wire_api; this project imports with its one supported dialect.
+        assert.equal(bob.wireApi, 'responses');
+        assert.equal(bob.source, path.join(codexDir, 'config.toml'));
+        assert.equal(bob.bindable, true);
+        // The id is directly usable as a model entry's codexProviderId.
+        assert.deepEqual(reading.providers.filter((entry) => entry.bindable).map((entry) => entry.id), ['bob']);
+    });
+});
+test('AC-466 <name>.config.toml is scanned too, and its source is named', () => {
+    withCodexHome({
+        'config.toml': BOB_CONFIG,
+        'work.config.toml': `
+model = "gpt-5.6-sol"
+
+[model_providers.alice]
+name = "Alice"
+base_url = "https://alice.example/v1"
+env_key = "ALICE_API_KEY"
+wire_api = "responses"
+`,
+    }, ({ home, codexDir }) => {
+        const reading = readCodexUserProviderImports({ homeDir: home, env: {} });
+        assert.equal(reading.files.length, 2);
+        assert.deepEqual(provider(reading, 'alice').source, path.join(codexDir, 'work.config.toml'));
+        assert.equal(provider(reading, 'alice').bindable, true);
+    });
+});
+test('AC-466 the env_key VALUE is never read into the import view', () => {
+    withCodexHome({
+        'config.toml': BOB_CONFIG,
+        // A credential file that sits beside config.toml: the import must not open it.
+        'auth.json': JSON.stringify({ api_key: 'sk-codex-auth-sentinel' }),
+    }, ({ home, codexDir }) => {
+        const sentinel = 'sk-env-key-sentinel-must-not-leak';
+        const reading = readCodexUserProviderImports({
+            homeDir: home,
+            env: { CODEX_HOME: codexDir, BOB_API_KEY: sentinel },
+        });
+        // Only the variable NAME is surfaced; the value appears in no field of the view.
+        assert.equal(provider(reading, 'bob').envKey, 'BOB_API_KEY');
+        const serialized = JSON.stringify(reading);
+        assert.ok(!serialized.includes(sentinel), 'the env_key value must never enter the reading');
+        assert.ok(!serialized.includes('sk-codex-auth-sentinel'), 'auth.json must never be read');
+        assert.ok(!('token' in provider(reading, 'bob')), 'the import row carries no token field');
+        // auth.json is not a TOML config file, so it is not even opened as one.
+        assert.deepEqual(reading.files, [path.join(codexDir, 'config.toml')]);
+    });
+});
+test('AC-466 importing never writes to the user files and creates no project file', () => {
+    withCodexHome({ 'config.toml': BOB_CONFIG }, ({ home, snapshot }) => {
+        const before = snapshot();
+        readCodexUserProviderImports({ homeDir: home, env: {} });
+        assert.deepEqual(snapshot(), before, 'the import must leave every user file byte-identical');
+        // The project settings file is the only write target elsewhere; this read must not create one.
+        assert.ok(!readdirSync(home).includes('.config'), 'no project settings directory is created');
+    });
+});
+test('AC-466 an unknown field (api) is a visible import warning, not a silent drop', () => {
+    withCodexHome({ 'config.toml': BOB_CONFIG }, ({ home }) => {
+        const reading = readCodexUserProviderImports({ homeDir: home, env: {} });
+        const bob = provider(reading, 'bob');
+        assert.ok(bob.warnings.some((warning) => warning.includes('`api`')), `the unknown field must be reported: ${JSON.stringify(bob.warnings)}`);
+        // An unknown field does not make the provider unbindable: this project simply ignores it.
+        assert.equal(bob.bindable, true);
+    });
+});
+test('AC-466 a provider without unknown fields carries no unknown-field warning', () => {
+    withCodexHome({
+        'config.toml': `
+[model_providers.clean]
+name = "Clean"
+base_url = "https://clean.example/v1"
+env_key = "CLEAN_API_KEY"
+wire_api = "responses"
+`,
+    }, ({ home }) => {
+        const reading = readCodexUserProviderImports({ homeDir: home, env: {} });
+        assert.deepEqual(provider(reading, 'clean').warnings, []);
+    });
+});
+test('AC-466 a declared non-responses wire_api is listed but not bindable', () => {
+    withCodexHome({
+        'config.toml': `
+[model_providers.chatty]
+name = "Chatty"
+base_url = "https://chatty.example/v1"
+env_key = "CHATTY_API_KEY"
+wire_api = "chat"
+`,
+    }, ({ home }) => {
+        const reading = readCodexUserProviderImports({ homeDir: home, env: {} });
+        const chatty = provider(reading, 'chatty');
+        assert.equal(chatty.bindable, false);
+        assert.ok(chatty.warnings.some((warning) => warning.includes('responses')), JSON.stringify(chatty.warnings));
+    });
+});
+test('AC-466 a reserved id is listed but cannot be imported over Codex built-ins', () => {
+    withCodexHome({
+        'config.toml': `
+[model_providers.openai]
+name = "Shadow"
+base_url = "https://shadow.example/v1"
+env_key = "SHADOW_API_KEY"
+`,
+    }, ({ home }) => {
+        const reading = readCodexUserProviderImports({ homeDir: home, env: {} });
+        const openai = provider(reading, 'openai');
+        assert.equal(openai.bindable, false);
+        assert.ok(openai.warnings.some((warning) => warning.includes('reserved')), JSON.stringify(openai.warnings));
+    });
+});
+test('AC-466 a missing ~/.codex is an empty import view, not an error', () => {
+    const home = mkdtempSync(path.join(os.tmpdir(), 'codex-user-import-empty-'));
+    try {
+        const reading = readCodexUserProviderImports({ homeDir: home, env: {} });
+        assert.deepEqual(reading.providers, []);
+        assert.deepEqual(reading.files, []);
+        assert.deepEqual(reading.warnings, []);
+    }
+    finally {
+        rmSync(home, { recursive: true, force: true });
+    }
+});
+test('AC-466 a malformed profile file is warned about while the valid file still imports', () => {
+    withCodexHome({
+        'config.toml': BOB_CONFIG,
+        'broken.config.toml': '[model_providers\nname = "unterminated"',
+    }, ({ home }) => {
+        const reading = readCodexUserProviderImports({ homeDir: home, env: {} });
+        assert.equal(provider(reading, 'bob').bindable, true);
+        assert.ok(reading.warnings.some((warning) => warning.includes('broken.config.toml') && warning.includes('TOML')), JSON.stringify(reading.warnings));
+    });
+});
+/** Walks the user home so a post-import comparison is byte-for-byte, not "same file names". */
+function snapshotHome(home) {
+    const result = {};
+    const walk = (dir) => {
+        for (const entry of readdirSync(dir, { withFileTypes: true })) {
+            const full = path.join(dir, entry.name);
+            if (entry.isDirectory())
+                walk(full);
+            else
+                result[path.relative(home, full)] = readFileSync(full, 'utf8');
+        }
+    };
+    walk(home);
+    return result;
+}
+/**
+ * Serves the production settings router over a temp project file and a temp user Codex home.
+ *
+ * `options.env` is handed to the import reader as the environment an import could consult; the
+ * sentinel case uses it to prove an `env_key` VALUE never enters the reading.
+ */
+async function withImportHarness(files, run, options = {}) {
+    const home = mkdtempSync(path.join(os.tmpdir(), 'codex-import-http-'));
+    const codexDir = path.join(home, '.codex');
+    mkdirSync(codexDir, { recursive: true });
+    for (const [name, text] of Object.entries(files)) {
+        writeFileSync(path.join(codexDir, name), text);
+    }
+    const settingsDir = mkdtempSync(path.join(os.tmpdir(), 'codex-import-project-'));
+    const settingsPath = path.join(settingsDir, 'codex.settings.json');
+    if (options.settings !== undefined) {
+        writeFileSync(settingsPath, `${JSON.stringify(options.settings, null, 2)}\n`, { mode: 0o600 });
+    }
+    if (options.projectToken !== undefined) {
+        mkdirSync(path.join(settingsDir, 'codex.secrets'), { recursive: true });
+        writeFileSync(path.join(settingsDir, 'codex.secrets', 'bob.token'), options.projectToken, { mode: 0o600 });
+    }
+    const source = createCodexModelProvidersSource({ settingsPath, env: {}, homeDir: settingsDir });
+    const service = createSettingsService({
+        credentials: { list: () => [], create: () => ({}), remove: () => false, toggle: () => false },
+        notifications: {
+            getPreferences: () => undefined,
+            updatePreferences: () => ({}),
+            createEnabledEvent: () => ({}),
+            notifyUser: () => undefined,
+        },
+        pushSubscriptions: { save: () => undefined, remove: () => undefined },
+        getVapidPublicKey: () => null,
+        accessTokens: {
+            list: () => [],
+            findById: () => undefined,
+            issue: () => ({ ok: false, reason: 'unused' }),
+            revoke: () => false,
+        },
+        codexModelProviders: {
+            read: () => source.read(),
+            write: (input) => source.write(input),
+            readUserImports: () => readCodexUserProviderImports({ homeDir: home, env: options.env ?? {} }),
+        },
+    });
+    const app = express();
+    app.use(express.json());
+    app.use('/api/settings', createSettingsRouter(service));
+    app.use((error, _req, res, _next) => {
+        if (error instanceof AppError) {
+            res.status(error.statusCode).json({
+                success: false,
+                error: { code: error.code, message: error.message, details: error.details },
+            });
+            return;
+        }
+        res.status(500).json({ success: false, error: { code: 'INTERNAL_ERROR', message: 'Internal server error' } });
+    });
+    const server = app.listen(0, '127.0.0.1');
+    await once(server, 'listening');
+    const baseUrl = `http://127.0.0.1:${server.address().port}`;
+    const request = async (route, method, body, headers = {}) => {
+        const response = await fetch(`${baseUrl}/api/settings${route}`, {
+            method,
+            headers: {
+                ...headers,
+                ...(body === undefined ? {} : { 'content-type': 'application/json' }),
+            },
+            ...(body === undefined ? {} : { body: JSON.stringify(body) }),
+        });
+        const text = await response.text();
+        let parsed = {};
+        try {
+            parsed = JSON.parse(text);
+        }
+        catch {
+            parsed = {};
+        }
+        return { status: response.status, body: parsed, text };
+    };
+    const harness = {
+        home,
+        codexDir,
+        settingsPath,
+        settingsDir,
+        getImport: () => request('/codex/model-providers/import', 'GET'),
+        getRegistry: () => request('/codex/model-providers', 'GET'),
+        postImport: (body, headers) => request('/codex/model-providers/import', 'POST', body, headers),
+        fileText: () => {
+            try {
+                return readFileSync(settingsPath, 'utf8');
+            }
+            catch {
+                return null;
+            }
+        },
+        snapshot: () => snapshotHome(home),
+    };
+    try {
+        await run(harness);
+    }
+    finally {
+        server.close();
+        await once(server, 'close');
+        rmSync(home, { recursive: true, force: true });
+        rmSync(settingsDir, { recursive: true, force: true });
+    }
+}
+/** A two-provider user profile: `bob` (no wire_api) and a profile-file provider. */
+const TWO_PROVIDER_PROFILE = {
+    'config.toml': BOB_CONFIG,
+    'bob-gpt.config.toml': `
+[model_providers.bob-gpt]
+name = "Bob GPT"
+base_url = "https://bob-gpt.example/v1"
+env_key = "BOB_GPT_API_KEY"
+wire_api = "responses"
+`,
+};
+/** A profile holding rows this project must list but refuse to bind. */
+const UNBINDABLE_PROFILE = {
+    'config.toml': `
+[model_providers.openai]
+name = "Shadow"
+base_url = "https://shadow.example/v1"
+env_key = "SHADOW_API_KEY"
+
+[model_providers.chatty]
+name = "Chatty"
+base_url = "https://chatty.example/v1"
+env_key = "CHATTY_API_KEY"
+wire_api = "chat"
+`,
+};
+const importReading = (reply) => reply.body;
+const registryReading = (reply) => reply.body;
+test('AC-466 GET /codex/model-providers/import is the reachable read-only reading', async () => {
+    await withImportHarness(TWO_PROVIDER_PROFILE, async (harness) => {
+        const reply = await harness.getImport();
+        assert.equal(reply.status, 200, reply.text);
+        const reading = importReading(reply);
+        assert.equal(reading.directory, harness.codexDir);
+        assert.deepEqual(reading.files, [
+            path.join(harness.codexDir, 'config.toml'),
+            path.join(harness.codexDir, 'bob-gpt.config.toml'),
+        ]);
+        assert.deepEqual(reading.providers.map((entry) => entry.id), ['bob', 'bob-gpt']);
+        const bob = reading.providers[0];
+        // Every field the panel draws, including the dialect default for a block that omits it.
+        assert.equal(bob.name, 'BOB API');
+        assert.equal(bob.baseUrl, 'https://bob-api.com/v1');
+        assert.equal(bob.envKey, 'BOB_API_KEY');
+        assert.equal(bob.wireApi, 'responses');
+        assert.equal(bob.source, path.join(harness.codexDir, 'config.toml'));
+        assert.equal(bob.bindable, true);
+        assert.ok(Array.isArray(bob.warnings));
+        const bobGpt = reading.providers[1];
+        assert.equal(bobGpt.name, 'Bob GPT');
+        assert.equal(bobGpt.baseUrl, 'https://bob-gpt.example/v1');
+        assert.equal(bobGpt.envKey, 'BOB_GPT_API_KEY');
+        assert.equal(bobGpt.wireApi, 'responses');
+        assert.equal(bobGpt.source, path.join(harness.codexDir, 'bob-gpt.config.toml'));
+        assert.equal(bobGpt.bindable, true);
+    });
+});
+test('AC-466 POST /import writes the project file and leaves every user file byte-identical', async () => {
+    await withImportHarness(TWO_PROVIDER_PROFILE, async (harness) => {
+        const before = harness.snapshot();
+        assert.equal(harness.fileText(), null, 'the project file starts absent');
+        const reply = await harness.postImport({ ids: ['bob'], expectedVersion: 'missing' });
+        assert.equal(reply.status, 200, reply.text);
+        // (a) the PROJECT file is the write target and carries the imported row.
+        const document = JSON.parse(harness.fileText() ?? '{}');
+        assert.equal(document.modelProviders?.bob?.name, 'BOB API');
+        assert.equal(document.modelProviders?.bob?.baseUrl, 'https://bob-api.com/v1');
+        assert.equal(document.modelProviders?.bob?.envKey, 'BOB_API_KEY');
+        // (b) the operator's own Codex home did not move a byte.
+        assert.deepEqual(harness.snapshot(), before, 'the import must never write back to ~/.codex');
+        // The answer is the project registry, not the user reading; the secret is never carried.
+        const reading = registryReading(reply);
+        assert.equal(reading.path, harness.settingsPath);
+        assert.deepEqual(reading.providers.map((entry) => entry.id), ['bob']);
+        assert.equal(reading.providers[0].tokenSet, false);
+        assert.ok(!('token' in reading.providers[0]));
+    });
+});
+test('AC-466 a reserved id or a Chat Completions row is refused by name without a partial write', async () => {
+    const settings = {
+        modelProviders: {
+            keep: {
+                name: 'Keep',
+                baseUrl: 'https://keep.example/v1',
+                envKey: 'KEEP_API_KEY',
+            },
+        },
+    };
+    await withImportHarness(UNBINDABLE_PROFILE, async (harness) => {
+        const version = (await harness.getRegistry()).body.version;
+        assert.equal(typeof version, 'string');
+        const importReadingReply = await harness.getImport();
+        assert.equal(importReadingReply.status, 200, importReadingReply.text);
+        assert.deepEqual(importReading(importReadingReply).providers.map((entry) => [entry.id, entry.bindable]), [['openai', false], ['chatty', false]], 'both rows are visible, and both declare themselves unbindable');
+        const before = harness.fileText();
+        assert.ok(before !== null);
+        const reserved = await harness.postImport({ ids: ['openai'], expectedVersion: version });
+        assert.equal(reserved.status, 400, reserved.text);
+        assert.equal(reserved.body.error?.code, 'CODEX_IMPORT_PROVIDER_NOT_BINDABLE');
+        assert.match(String(reserved.body.error?.message), /openai/);
+        assert.match(String(reserved.body.error?.message), /reserved/);
+        assert.equal(harness.fileText(), before, 'a refused import must not write anything');
+        const chatty = await harness.postImport({ ids: ['chatty'], expectedVersion: version });
+        assert.equal(chatty.status, 400, chatty.text);
+        assert.match(String(chatty.body.error?.message), /chatty/);
+        assert.match(String(chatty.body.error?.message), /responses/);
+        assert.equal(harness.fileText(), before, 'a refused import must not write anything');
+    }, { settings });
+});
+test('AC-466 env_key VALUES and token sentinels never reach the import response or project file', async () => {
+    const envSentinel = 'sk-env-value-sentinel-must-not-leak';
+    const authSentinel = 'sk-auth-json-sentinel-must-not-leak';
+    const tokenSentinel = 'sk-project-token-sentinel-must-not-leak';
+    await withImportHarness({
+        'config.toml': BOB_CONFIG,
+        'auth.json': JSON.stringify({ api_key: authSentinel }),
+    }, async (harness) => {
+        const importReply = await harness.getImport();
+        assert.equal(importReply.status, 200, importReply.text);
+        for (const sentinel of [envSentinel, authSentinel, tokenSentinel]) {
+            assert.ok(!importReply.text.includes(sentinel), `the import reading leaked ${sentinel}`);
+        }
+        const reply = await harness.postImport({ ids: ['bob'], expectedVersion: 'missing' });
+        assert.equal(reply.status, 200, reply.text);
+        for (const sentinel of [envSentinel, authSentinel, tokenSentinel]) {
+            assert.ok(!reply.text.includes(sentinel), `the bind response leaked ${sentinel}`);
+        }
+        const project = harness.fileText() ?? '';
+        for (const sentinel of [envSentinel, authSentinel, tokenSentinel]) {
+            assert.ok(!project.includes(sentinel), `the project settings file leaked ${sentinel}`);
+        }
+        // A pre-existing project token file is reported as "stored", never as its value.
+        assert.equal(registryReading(reply).providers[0].tokenSet, true);
+        assert.ok(!('token' in registryReading(reply).providers[0]));
+    }, { env: { BOB_API_KEY: envSentinel }, projectToken: tokenSentinel });
+});
+//# sourceMappingURL=codex-provider-import.test.js.map

package/dist-server/server/modules/settings/tests/codex-provider-import.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-provider-import.test.js","sourceRoot":"","sources":["../../../../../server/modules/settings/tests/codex-provider-import.test.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/voice/tests/voice-lexicon.test.js

@@ -42,7 +42,7 @@ const REPO_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..
 const SHAPE_TABLE = [
     ['needs-human', true],
     ['AC-103', true],
-    ['CloudCLI', true],
+    ['CLOUDPIT-CLI', true],
     ['GOAL-013', true],
     ['provider_models', true],
     ['MCP', true],
@@ -102,7 +102,7 @@ const JWT_SENTINEL = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjEsInVzZ
  * summing is exercised rather than assumed.
  */
 const HISTORY_FIXTURE = [
-    { id: 'm1', projectKey: '/proj/a', text: 'Please fix needs-human and CloudCLI wiring, zebraquokka' },
+    { id: 'm1', projectKey: '/proj/a', text: 'Please fix needs-human and CLOUDPIT-CLI wiring, zebraquokka' },
     { id: 'm2', projectKey: '/proj/a', text: 'needs-human again: AC-103 blocked. zebraquokka' },
     // The same id a second time, with a body that would change the counts if it were counted.
     { id: 'm2', projectKey: '/proj/a', text: 'needs-human needs-human MCP in server.ts' },
@@ -139,7 +139,7 @@ const HISTORY_FIXTURE = [
 const EXPECTED_LIST = [
     { token: 'needs-human', count: 2 },
     { token: 'AC-103', count: 1 },
-    { token: 'CloudCLI', count: 1 },
+    { token: 'CLOUDPIT-CLI', count: 1 },
     { token: 'MCP', count: 1 },
     { token: 'provider_models', count: 1 },
 ];
@@ -204,7 +204,7 @@ test('a credential blob is refused by token while the words around it survive',
     // but the reference's `SECRET` refuses a credential by refusing the MESSAGE,
     // and conflating the two rules would make a long message lose its words.
     assert.deepEqual(extractSentIdentifiers(JWT_SENTINEL), [], 'a bare JWT is not vocabulary');
-    assert.deepEqual(extractSentIdentifiers(`deploy CloudCLI ${JWT_SENTINEL} now`), ['CloudCLI'], 'the words a message does contain are unaffected by the blob it also contains');
+    assert.deepEqual(extractSentIdentifiers(`deploy CLOUDPIT-CLI ${JWT_SENTINEL} now`), ['CLOUDPIT-CLI'], 'the words a message does contain are unaffected by the blob it also contains');
     // The reference pipeline itself is unchanged: `extractIdentifiers` is the
     // reference's `ids` and still sees the blob, which is what keeps the known-answer
     // table the reference's behaviour rather than a description of a modified one.
@@ -255,18 +255,18 @@ test('importing the same history twice leaves every count identical', async () =
 test('a sent message records only its identifier-shaped tokens', async () => {
     await withIsolatedDatabase(async () => {
         const service = createService([]);
-        service.observeSentText('deploy CloudCLI to prod now', '/proj/x');
+        service.observeSentText('deploy CLOUDPIT-CLI to prod now', '/proj/x');
         // Two plain words and one identifier, so the increment is attributable to
         // the identifier rather than to "the message was long enough".
         service.observeSentText('please check needs-human', '/proj/x');
         // A credential-style message and an injected prompt must each contribute
-        // nothing — CloudCLI stays at its one sighting from the first send.
+        // nothing — CLOUDPIT-CLI stays at its one sighting from the first send.
         service.observeSentText(`use ${CREDENTIAL_SENTINEL} here`, '/proj/x');
-        service.observeSentText('<system-reminder>CloudCLI</system-reminder>', '/proj/x');
+        service.observeSentText('<system-reminder>CLOUDPIT-CLI</system-reminder>', '/proj/x');
         // A second sighting, to show the count is a frequency and not a flag.
-        service.observeSentText('CloudCLI again', '/proj/x');
+        service.observeSentText('CLOUDPIT-CLI again', '/proj/x');
         assert.deepEqual(service.list(100).map((row) => ({ token: row.token, count: row.count })), [
-            { token: 'CloudCLI', count: 2 },
+            { token: 'CLOUDPIT-CLI', count: 2 },
             { token: 'needs-human', count: 1 },
         ], 'only the identifiers of the accepted sends may be counted');
     });