@ours.network/fleet 2.3.0 → 2.3.2

package/dist/web/server.js

@@ -7,15 +7,13 @@ import { registerConversationStream } from './conversation-stream.js';
 import { conversationHasAttachment } from '../application/conversation-history.js';
 import { readDeliveredFile } from '../file-delivery/store.js';
 import { WorkspaceDeviceAuthError } from './workspace-devices.js';
-import { readFileSync } from 'node:fs';
-import { packagedPresetRoot } from '../preset-bootstrap.js';
-import { validateCatalog } from '../init-wizard.js';
+import { PURPOSE_BRAINS, PurposeBrainConflictError } from '../init-wizard.js';
+import { harnessCapabilities, validateBrainChoice } from '../application/harness-capabilities.js';
 import { getAdapter } from '../harness/registry.js';
 import { storeAgentAttachment, attachmentPrompt, MAX_ATTACHMENT_BODY, readAgentAttachment, prepareAttachmentPresentation, presentAttachmentEvent } from './agent-attachments.js';
 import { readChatIdle } from '../temp-idle.js';
 import { agentDir } from '../paths.js';
 import { SupervisorOursTools } from '../application/supervisor-ours-tools.js';
-import { join } from 'node:path';
 import Fastify from 'fastify';
 import fastifyWebsocket from '@fastify/websocket';
 import { createHmac, randomBytes } from 'node:crypto';
@@ -215,12 +213,12 @@ export async function buildWebServer(services, boundary, options = {}) {
                 return { harness, ok: false, checks: [{ name: 'availability', ok: false, detail: 'Harness checks unavailable' }] };
             }
         }));
-        const catalog = validateCatalog(JSON.parse(readFileSync(join(packagedPresetRoot(), 'brain-catalog.json'), 'utf8')));
-        // Codex models are offered only when the runtime itself listed them for the active account.
-        // When it could not be asked, none is offered and the reason is reported.
-        const codexModels = services.codexModels ? await services.codexModels() : undefined;
-        const offered = (model) => model.harness !== 'codex' || !codexModels || (codexModels.state === 'known' && codexModels.models.includes(model.model));
-        const payload = { harnesses, catalog: catalog.models.filter(offered), ...(codexModels ? { codexModels: codexModels.state === 'known' ? { state: 'known' } : codexModels } : {}), providers: services.subscriptions ? await services.subscriptions.list() : [], coordinator: 'FleetCoordinator', configured: onboardingConfigured() };
+        // The catalog is each adapter's maintained models, narrowed to what the active Codex account offers.
+        const capabilities = await harnessCapabilities({ harnesses: ['codex', 'claude-code'], codexModels: services.codexModels, checkReadiness: false });
+        const codex = capabilities.harnesses.find(item => item.harness === 'codex');
+        const catalog = capabilities.harnesses.flatMap(item => item.models.filter(model => model.available && model.efforts !== null)
+            .map(model => ({ harness: item.harness, session: 'acp', model: model.id, label: model.label, efforts: model.efforts })));
+        const payload = { harnesses, catalog, ...(codex?.discovery ? { codexModels: codex.discovery } : {}), providers: services.subscriptions ? await services.subscriptions.list() : [], coordinator: 'FleetCoordinator', configured: onboardingConfigured() };
         if (revision === services.configuration?.read().revision) {
             onboardingObserved = { owner: browser.id, revision, payload };
             events.publish('onboarding.changed', {});
@@ -245,15 +243,25 @@ export async function buildWebServer(services, boundary, options = {}) {
         if (!services.configuration || !services.onboardingSetup)
             throw new FleetError('capability_unavailable', 'first-time Fleet setup is unavailable');
         const requested = request.body?.models;
-        const codexModels = services.codexModels ? await services.codexModels() : undefined;
-        const supported = validateCatalog(JSON.parse(readFileSync(join(packagedPresetRoot(), 'brain-catalog.json'), 'utf8'))).models
-            .filter(model => model.harness !== 'codex' || !codexModels || (codexModels.state === 'known' && codexModels.models.includes(model.model)));
+        const capabilities = await harnessCapabilities({ harnesses: ['codex', 'claude-code'], codexModels: services.codexModels, checkReadiness: false });
         const models = {};
         for (const work of ONBOARDING_WORK) {
-            const matches = supported.filter(model => model.harness === requested?.[work]?.harness && model.model === requested?.[work]?.model);
-            if (matches.length !== 1)
-                throw new FleetError('invalid_request', `choose a supported model for ${work}`);
-            models[work] = matches[0];
+            const choice = requested?.[work];
+            const label = PURPOSE_BRAINS[work].label;
+            if (!choice || typeof choice !== 'object' || !('effort' in choice))
+                throw new FleetError('invalid_request', `choose a harness, model and effort for the ${label} Brain`);
+            const { harness, model, effort } = choice;
+            if (typeof harness !== 'string' || typeof model !== 'string' || (effort !== null && typeof effort !== 'string'))
+                throw new FleetError('invalid_request', `choose a harness, model and effort for the ${label} Brain`);
+            const check = validateBrainChoice(capabilities, { harness, session: 'acp', model, effort });
+            // Setup offers the adapters' maintained models only, each with an explicit effort when it has one.
+            if (!check.ok)
+                throw new FleetError('invalid_request', `${label} Brain: ${check.message}`);
+            if (!check.model || check.model.source !== 'adapter')
+                throw new FleetError('invalid_request', `${label} Brain: choose a supported model`);
+            if (check.model.efforts?.length && effort === null)
+                throw new FleetError('invalid_request', `${label} Brain: choose an effort for ${check.model.label} (${check.model.efforts.join(', ')})`);
+            models[work] = { harness: harness, session: 'acp', model, effort: effort };
         }
         const chosen = Object.values(models);
         const subscriptions = [...new Set(chosen.map(model => model.harness === 'codex' ? 'codex' : 'claude'))];
@@ -264,31 +272,49 @@ export async function buildWebServer(services, boundary, options = {}) {
             if (onboardingConfigured())
                 throw new FleetError('conflict', 'Fleet is already set up; change its models in the configuration');
             try {
-                await setup({ subscriptions, assignmentStrategy: oneModel ? 'one-model' : 'per-job', models, reasoning: 'balanced' });
+                await setup({ subscriptions, assignmentStrategy: oneModel ? 'one-model' : 'per-job', models });
             }
             catch (error) {
+                if (error instanceof PurposeBrainConflictError)
+                    throw new FleetError('conflict', error.message);
                 throw new FleetError('backend_failure', `Fleet setup did not complete: ${error.message}`);
             }
-            // Setup preserves files it finds, so confirm the published models are the ones this request chose.
-            // The prepared agents reference packaged Brain presets, so resolve what each of them now points at:
-            // a preserved file of a packaged name may hold another model, session or reasoning than its name says.
+            // Setup preserves files it finds, so confirm each prepared agent now resolves to exactly the chosen triple.
             const published = configuration.read(true).model, brains = published.brains ?? {};
             const brainOf = (holder) => brains[String(holder?.brain?.ref ?? '')];
             const assigned = { coordination: brainOf(published.agents.FleetCoordinator), development: brainOf(published.agent_templates?.Developer), review: brainOf(published.agent_templates?.Critic) };
             for (const work of ONBOARDING_WORK)
-                if (assigned[work]?.harness !== models[work].harness || assigned[work]?.model !== models[work].model || assigned[work]?.session !== models[work].session || assigned[work]?.effort !== 'medium')
+                if (assigned[work]?.harness !== models[work].harness || assigned[work]?.model !== models[work].model || assigned[work]?.session !== models[work].session || (assigned[work]?.effort ?? null) !== models[work].effort)
                     throw new FleetError('conflict', 'Fleet was set up with different models; review its configuration');
             return { configured: true };
         });
         onboardingSetupQueue = run.catch(() => { });
         return run;
     });
+    app.get('/api/v1/harness-capabilities', async (request) => {
+        auth.authenticate(request);
+        return harnessCapabilities({ codexModels: services.codexModels });
+    });
     app.get('/api/v1/creation-capabilities', async (request) => {
         auth.authenticate(request);
         return services.creation.capabilities();
     });
+    // A new agent's own harness/model/effort must be one its adapter supports; saved Brains are used as they are.
+    const checkBrainChoice = async (brain) => {
+        if (!brain || typeof brain !== 'object')
+            return;
+        const value = brain;
+        const check = validateBrainChoice(await harnessCapabilities({ codexModels: services.codexModels, checkReadiness: false }), {
+            harness: String(value.harness), session: value.session,
+            model: value.model, effort: value.effort
+        });
+        if (!check.ok)
+            throw new FleetError('invalid_request', `Brain: ${check.message}`);
+    };
+    const checkInlineBrain = (creation) => checkBrainChoice(creation?.brain?.inline);
     app.post('/api/v1/roles/preview', async (request) => {
         auth.authenticate(request, true);
+        await checkInlineBrain(request.body);
         return services.creation.preview(request.body);
     });
     app.post('/api/v1/roles', async (request, reply) => {
@@ -297,7 +323,7 @@ export async function buildWebServer(services, boundary, options = {}) {
         const idempotencyKey = String(request.headers['idempotency-key'] ?? '');
         if (!body?.request || !body.previewHash)
             throw new FleetError('invalid_request', 'request and previewHash are required');
-        const action = await services.creation.create(body.request, body.previewHash, idempotencyKey, session.id);
+        const action = await services.creation.create(body.request, body.previewHash, idempotencyKey, session.id, checkInlineBrain);
         events.publish('creation.changed', action, action.roleId);
         reply.header('Location', `/api/v1/creation-actions/${encodeURIComponent(action.actionId)}`);
         reply.code(202);
@@ -398,6 +424,9 @@ export async function buildWebServer(services, boundary, options = {}) {
     const project = async (descriptor, signal, owner = '') => {
         signal.throwIfAborted();
         services.invalidateResourceCaches?.();
+        // Role projections load the configuration: fence this capture on its external inputs too.
+        if (['directory', 'roles', 'previews'].includes(descriptor.resource))
+            services.configuration?.observeValidationInputs();
         switch (descriptor.resource) {
             case 'task-layout':
                 try {
@@ -702,7 +731,12 @@ export async function buildWebServer(services, boundary, options = {}) {
         auth.authenticate(request, true);
         const body = request.body;
         try {
-            const result = await taskApi(() => requireTaskRooms().addMember(taskRef(request), body));
+            // A new manual harness/model/effort must be one the adapter supports; nothing is substituted.
+            // A retry of an accepted request returns its receipt even if the account's models changed since.
+            const result = await taskApi(() => requireTaskRooms().addMember(taskRef(request), body, async (member) => {
+                if (typeof member.brain === 'object')
+                    await checkBrainChoice(member.brain.inline);
+            }));
             reply.code(result.state === 'running' ? 202 : 200);
             return result;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/fleet",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "Harness-agnostic fleet of persistent, identity-bound AI agents. Declarative fleet.yaml, managed native/ACP sessions, supervision, and ours.network messaging.",
   "type": "module",
   "license": "FSL-1.1-Apache-2.0",

package/presets/README.md

@@ -1,26 +1,48 @@
-# Predefined Brains
+# Models, efforts and Brains
 
-`brain-catalog.json` is the source for generated `fleet/brains/*.yaml` files.
-Run `node scripts/generate-brain-presets.mjs` after changing it, and run the same
-command with `--check` to verify generated files. An empty `efforts` array generates
-one `-default` preset with no `effort` field. Bootstrap adds missing presets and
-preserves existing user files. Existing model presets remain available.
+`brain-catalog.json` is the model catalog maintained with the Claude Code and
+Codex harness adapters: each exact model ID, its label, and the efforts it
+supports (an empty `efforts` list means the model has no effort setting). The
+adapters expose it through `modelCapabilities()`, and Fleet serves it, narrowed
+to the models the active Codex account offers, at `GET /api/v1/harness-capabilities`.
+Onboarding, Settings and agent launch flows use that one source. Hermes models
+come from the provider configured in the role home, so Hermes lists none and
+sets no effort.
+
+Setup no longer installs a Brain per model and effort. It creates three
+editable purpose Brains from the choices made during setup:
+
+| Brain | Used by |
+| --- | --- |
+| `development` | Developer, Engineer |
+| `critic` | Critic |
+| `coordination` | LocalCoordinator, FleetCoordinator |
+
+Users change these or add more in Settings > Brains. An agent can also be
+launched with a one-off harness, model and effort; that choice is kept with the
+agent and saves no Brain.
+
+Existing installations keep every Brain file and reference. The values of the
+Brain presets earlier releases generated per model and effort are frozen in
+`legacy/generated-brains-rev4.json`; configuration provenance reports an
+untouched one as `legacy` and an edited one as `changed`. Nothing deletes them.
+`fleet/brains/claude-default.yaml` (the Claude Code default model) still ships
+for packaged templates and existing references; setup does not install it.
 
 ## GPT-6.1 Sol (added 2026-09-29)
 
-The Codex presets `codex-gpt-6-1-sol-{low,medium,high,xhigh,max,ultra}`
-use the exact model ID `gpt-6.1-sol` with ACP sessions. The init wizard offers
+The Codex catalog entry uses the exact model ID `gpt-6.1-sol` with ACP sessions. The init wizard offers
 GPT-6.1 Sol for development, review, and coordination.
 
 [Official OpenAI documentation](https://developers.openai.com/api/docs/models/gpt-6.1-sol)
 supports low, medium, high, xhigh, and max API reasoning efforts. The local
 Codex `models_cache.json` inspected on 2026-09-29 additionally advertises
-`ultra`, a Codex harness mode. These presets reflect that six-effort Codex
+`ultra`, a Codex harness mode. The catalog reflects that six-effort Codex
 catalog; no inference or ACP launch was performed for this addition.
 
 ## Current model additions (verified 2026-09-24)
 
-| Harness | Exact model ID | Preset efforts |
+| Harness | Exact model ID | Efforts |
 | --- | --- | --- |
 | Codex | `gpt-6-sol` | low, medium, high, xhigh, max, ultra |
 | Codex | `gpt-6-luna` | low, medium, high, xhigh, max |
@@ -29,23 +51,21 @@ catalog; no inference or ACP launch was performed for this addition.
 | Claude Code (retained) | `claude-sonnet-5` | low, medium, high, xhigh, max |
 | Claude Code | `claude-haiku-4-5-20251001` | default, with no effort setting |
 
-For example, select `codex-gpt-6-sol-ultra`, `claude-opus-5-5-max`, or
-`claude-haiku-4-5-20251001-default` as a Brain reference. The init wizard offers
-models supporting its Quick/Balanced/Thorough (low/medium/high) choices; use the
-named Brain directly for Haiku, which does not support effort.
+Setup asks for an effort only among the efforts a model supports; Haiku gets
+none.
 
 ### Runtime requirements and evidence
 
 Codex CLI **0.155.0** freshly queried through `app-server` `initialize` then
 `model/list` advertised the GPT rows above. A previously populated
 `~/.codex/models_cache.json` did not contain these models; refresh runtime discovery
-before concluding a model is unavailable. `ours-fleet doctor` compares presets to
+before concluding a model is unavailable. `ours-fleet doctor` compares configured Codex Brains to
 the local cache. The catalog is not an account entitlement guarantee.
 
 The [Sol](https://developers.openai.com/api/docs/models/gpt-6-sol) and
 [Luna](https://developers.openai.com/api/docs/models/gpt-6-luna) API model pages
 also support `none`, but the verified Codex runtime does not advertise it.
-Consequently there are no `none` presets. Sol's `ultra` is an advertised Codex
+Consequently the catalog lists no `none` effort. Sol's `ultra` is an advertised Codex
 harness mode, not an additional API reasoning level; Luna does not advertise it.
 
 Claude Code **2.1.281** was verified using the Agent SDK `supportedModels()`
@@ -56,13 +76,13 @@ not asserted minimum versions. Provider references:
 [model IDs](https://platform.claude.com/docs/en/models/overview) and
 [Claude Code effort support](https://code.claude.com/docs/en/model-config#adjust-effort-level).
 
-**Check the executable used by ACP before selecting the new Claude presets.**
+**Check the executable used by ACP before selecting the new Claude models.**
 The inspected `claude-agent-acp` **0.63.0** installation bundles Agent SDK
 **0.3.220**, whose default executable reports older models. To use the verified
 installed Claude CLI, set `CLAUDE_CODE_EXECUTABLE` to its absolute path in the
 launch environment (for example `/usr/bin/claude` on the verification host).
 Otherwise use a bundled SDK whose runtime advertises these models and efforts.
-The presets do not change your executable or restart agents. An older bundled
+The catalog does not change your executable or restart agents. An older bundled
 runtime alone is not evidence of support for the new models.
 
 No-prompt ACP startup and `session/set_config_option` probes also verified all

package/presets/brain-catalog.json

@@ -1,23 +1,23 @@
 {
-  "schema_version": 1,
-  "catalog_revision": 4,
+  "schema_version": 2,
+  "catalog_revision": 5,
   "models": [
-    { "harness": "codex", "session": "acp", "model": "gpt-6-astra", "efforts": ["low", "medium", "high", "xhigh", "max", "ultra"] },
-    { "harness": "codex", "session": "acp", "model": "gpt-5.6-sol", "efforts": ["low", "medium", "high", "xhigh", "max", "ultra"] },
-    { "harness": "codex", "session": "acp", "model": "gpt-5.6-terra", "efforts": ["low", "medium", "high", "xhigh", "max", "ultra"] },
-    { "harness": "codex", "session": "acp", "model": "gpt-5.6-luna", "efforts": ["low", "medium", "high", "xhigh", "max"] },
-    { "harness": "codex", "session": "acp", "model": "gpt-5.5", "efforts": ["low", "medium", "high", "xhigh"] },
-    { "harness": "codex", "session": "acp", "model": "gpt-5.4", "efforts": ["low", "medium", "high", "xhigh"] },
-    { "harness": "codex", "session": "acp", "model": "gpt-5.4-mini", "efforts": ["low", "medium", "high", "xhigh"] },
-    { "harness": "codex", "session": "acp", "model": "gpt-5.3-codex-spark", "efforts": ["low", "medium", "high", "xhigh"] },
-    { "harness": "claude-code", "session": "acp", "model": "claude-fable-5", "efforts": ["low", "medium", "high", "xhigh", "max"] },
-    { "harness": "claude-code", "session": "acp", "model": "claude-opus-5", "efforts": ["low", "medium", "high", "xhigh", "max"] },
-    { "harness": "claude-code", "session": "acp", "model": "claude-sonnet-5", "efforts": ["low", "medium", "high", "xhigh", "max"] },
-    { "harness": "codex", "session": "acp", "model": "gpt-6.1-sol", "efforts": ["low", "medium", "high", "xhigh", "max", "ultra"] },
-    { "harness": "codex", "session": "acp", "model": "gpt-6-sol", "efforts": ["low", "medium", "high", "xhigh", "max", "ultra"] },
-    { "harness": "codex", "session": "acp", "model": "gpt-6-luna", "efforts": ["low", "medium", "high", "xhigh", "max"] },
-    { "harness": "claude-code", "session": "acp", "model": "claude-fable-5-1", "efforts": ["low", "medium", "high", "xhigh", "max"] },
-    { "harness": "claude-code", "session": "acp", "model": "claude-opus-5-5", "efforts": ["low", "medium", "high", "xhigh", "max"] },
-    { "harness": "claude-code", "session": "acp", "model": "claude-haiku-4-5-20251001", "efforts": [] }
+    { "harness": "codex", "session": "acp", "model": "gpt-6-astra", "label": "GPT-6 Astra", "efforts": ["low", "medium", "high", "xhigh", "max", "ultra"] },
+    { "harness": "codex", "session": "acp", "model": "gpt-5.6-sol", "label": "GPT-5.6 Sol", "efforts": ["low", "medium", "high", "xhigh", "max", "ultra"] },
+    { "harness": "codex", "session": "acp", "model": "gpt-5.6-terra", "label": "GPT-5.6 Terra", "efforts": ["low", "medium", "high", "xhigh", "max", "ultra"] },
+    { "harness": "codex", "session": "acp", "model": "gpt-5.6-luna", "label": "GPT-5.6 Luna", "efforts": ["low", "medium", "high", "xhigh", "max"] },
+    { "harness": "codex", "session": "acp", "model": "gpt-5.5", "label": "GPT-5.5", "efforts": ["low", "medium", "high", "xhigh"] },
+    { "harness": "codex", "session": "acp", "model": "gpt-5.4", "label": "GPT-5.4", "efforts": ["low", "medium", "high", "xhigh"] },
+    { "harness": "codex", "session": "acp", "model": "gpt-5.4-mini", "label": "GPT-5.4 Mini", "efforts": ["low", "medium", "high", "xhigh"] },
+    { "harness": "codex", "session": "acp", "model": "gpt-5.3-codex-spark", "label": "GPT-5.3 Codex Spark", "efforts": ["low", "medium", "high", "xhigh"] },
+    { "harness": "claude-code", "session": "acp", "model": "claude-fable-5", "label": "Claude Fable 5", "efforts": ["low", "medium", "high", "xhigh", "max"] },
+    { "harness": "claude-code", "session": "acp", "model": "claude-opus-5", "label": "Claude Opus 5", "efforts": ["low", "medium", "high", "xhigh", "max"] },
+    { "harness": "claude-code", "session": "acp", "model": "claude-sonnet-5", "label": "Claude Sonnet 5", "efforts": ["low", "medium", "high", "xhigh", "max"] },
+    { "harness": "codex", "session": "acp", "model": "gpt-6.1-sol", "label": "GPT-6.1 Sol", "efforts": ["low", "medium", "high", "xhigh", "max", "ultra"] },
+    { "harness": "codex", "session": "acp", "model": "gpt-6-sol", "label": "GPT-6 Sol", "efforts": ["low", "medium", "high", "xhigh", "max", "ultra"] },
+    { "harness": "codex", "session": "acp", "model": "gpt-6-luna", "label": "GPT-6 Luna", "efforts": ["low", "medium", "high", "xhigh", "max"] },
+    { "harness": "claude-code", "session": "acp", "model": "claude-fable-5-1", "label": "Claude Fable 5.1", "efforts": ["low", "medium", "high", "xhigh", "max"] },
+    { "harness": "claude-code", "session": "acp", "model": "claude-opus-5-5", "label": "Claude Opus 5.5", "efforts": ["low", "medium", "high", "xhigh", "max"] },
+    { "harness": "claude-code", "session": "acp", "model": "claude-haiku-4-5-20251001", "label": "Claude Haiku 4.5", "efforts": [] }
   ]
 }