@ours.network/fleet 0.15.1 → 0.15.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +49 -13
- package/dist/application/fleet-query-service.js +3 -0
- package/dist/application/model-catalog.d.ts +20 -0
- package/dist/application/model-catalog.js +57 -0
- package/dist/application/role-creation-service.d.ts +7 -0
- package/dist/application/role-creation-service.js +21 -4
- package/dist/application/role-removal-service.d.ts +32 -0
- package/dist/application/role-removal-service.js +87 -0
- package/dist/application/role-repository.js +13 -1
- package/dist/application/session-control.d.ts +74 -0
- package/dist/application/session-control.js +66 -1
- package/dist/application/types.d.ts +18 -0
- package/dist/briefing.js +21 -1
- package/dist/cli.js +39 -7
- package/dist/config.d.ts +4 -1
- package/dist/config.js +3 -2
- package/dist/creation.d.ts +6 -3
- package/dist/creation.js +5 -1
- package/dist/docs.d.ts +1 -1
- package/dist/docs.js +47 -11
- package/dist/fleet-proxy.d.ts +25 -0
- package/dist/fleet-proxy.js +38 -0
- package/dist/harness/claude-code.js +20 -3
- package/dist/harness/codex.js +14 -2
- package/dist/harness/types.d.ts +6 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +1 -0
- package/dist/owner-channel/channel.d.ts +13 -0
- package/dist/owner-channel/channel.js +191 -9
- package/dist/owner-channel/state.d.ts +7 -1
- package/dist/owner-channel/state.js +41 -4
- package/dist/permissions.d.ts +5 -0
- package/dist/permissions.js +7 -0
- package/dist/runner.d.ts +2 -0
- package/dist/runner.js +86 -2
- package/dist/session/acp.d.ts +61 -1
- package/dist/session/acp.js +398 -20
- package/dist/session/arbiter.d.ts +10 -1
- package/dist/session/arbiter.js +24 -0
- package/dist/session/control.d.ts +33 -2
- package/dist/session/control.js +158 -5
- package/dist/session/conversation-normalizer.d.ts +34 -0
- package/dist/session/conversation-normalizer.js +356 -0
- package/dist/session/conversation-store.d.ts +88 -0
- package/dist/session/conversation-store.js +347 -0
- package/dist/session/conversation-types.d.ts +274 -0
- package/dist/session/conversation-types.js +1 -0
- package/dist/session/types.d.ts +40 -0
- package/dist/spawn.d.ts +6 -1
- package/dist/spawn.js +23 -16
- package/dist/web/auth.d.ts +1 -1
- package/dist/web/fleet-config-service.d.ts +47 -0
- package/dist/web/fleet-config-service.js +204 -0
- package/dist/web/runtime.js +14 -1
- package/dist/web/server.d.ts +6 -0
- package/dist/web/server.js +181 -9
- package/dist/web/topology.d.ts +31 -0
- package/dist/web/topology.js +61 -0
- package/dist/web-app/assets/{TerminalView-DMoT8udI.js → TerminalView-hZpyUFY_.js} +1 -1
- package/dist/web-app/assets/index-COg4Azq1.css +1 -0
- package/dist/web-app/assets/index-Cde9auW0.js +10 -0
- package/dist/web-app/index.html +2 -2
- package/package.json +1 -1
- package/dist/web-app/assets/index-B-jtLAkp.css +0 -1
- package/dist/web-app/assets/index-B6T8JLSd.js +0 -9
package/README.md
CHANGED
|
@@ -130,6 +130,16 @@ ours-fleet spawn Coder --harness codex --model gpt-5.4 \
|
|
|
130
130
|
# wake owner separately in fleet.yaml with monitor.mode: fleet|native.
|
|
131
131
|
```
|
|
132
132
|
|
|
133
|
+
Inside a managed ACP role, `ours-fleet spawn` is transparently routed through
|
|
134
|
+
that role's live supervisor. `ours-fleet spawn --role DeveloperX --temp` is the
|
|
135
|
+
minimal form: omitted harness, session, cwd, coordinator, neutral permissions,
|
|
136
|
+
fleet monitor policy, and same-harness model inherit from the caller. Explicit
|
|
137
|
+
flags win; changing harness without a model lets the selected harness/fleet
|
|
138
|
+
defaults choose one. After creation succeeds, fleet can deterministically notify
|
|
139
|
+
the caller's owner channel with the caller and spawned-role details. This is an
|
|
140
|
+
honest-actor convenience and attribution path, not a security boundary; tmux,
|
|
141
|
+
host shells, and deliberately bypassed absolute binaries retain direct behavior.
|
|
142
|
+
|
|
133
143
|
## Local web console
|
|
134
144
|
|
|
135
145
|
The interactive console is packaged with `@ours.network/fleet` and binds to
|
|
@@ -267,7 +277,7 @@ ours-fleet up|down|restart|force-restart [-c FILE] [Name...]
|
|
|
267
277
|
ours-fleet config [-c FILE] validate + print merged plan
|
|
268
278
|
ours-fleet ls | attach | peek | logs [-f] | status <Name>
|
|
269
279
|
ours-fleet send <Name> "text" | --key <K>
|
|
270
|
-
ours-fleet spawn [--temp] <Name> [--harness --session --mission --model --approval ...]
|
|
280
|
+
ours-fleet spawn [--temp] [<Name> | --role <Name>] [--harness --session --mission --model --approval ...]
|
|
271
281
|
ours-fleet loops validate|list|status
|
|
272
282
|
ours-fleet loops reload <Role>
|
|
273
283
|
ours-fleet loops run-now|disable|enable <Role> <Loop>
|
|
@@ -290,7 +300,7 @@ defaults:
|
|
|
290
300
|
harness: claude-code # for roles that don't set one
|
|
291
301
|
session: tmux # tmux (default) | acp
|
|
292
302
|
permissions: # common intent, translated by each harness/backend
|
|
293
|
-
approval: ask # ask |
|
|
303
|
+
approval: ask # ask | auto | allow (`deny` is a deprecated alias)
|
|
294
304
|
filesystem: workspace # read-only | workspace | unrestricted
|
|
295
305
|
unattended: deny # deny | wait
|
|
296
306
|
model: claude-fable-5 # default model for roles that don't set one (per-role model / --model wins)
|
|
@@ -457,15 +467,22 @@ native settings actually grant, against a fixed floor:
|
|
|
457
467
|
those requests with nobody to see it. With `unattended: wait` it **warns**,
|
|
458
468
|
since a human can still attach a console and answer.
|
|
459
469
|
|
|
460
|
-
**Security meaning.** `
|
|
461
|
-
|
|
470
|
+
**Security meaning.** `ask` maps to Codex `untrusted` / Claude `default`,
|
|
471
|
+
`auto` to Codex `on-request` / Claude `acceptEdits`, and `allow` to Codex
|
|
472
|
+
`never` / Claude `bypassPermissions`, the non-interactive modes that actually
|
|
473
|
+
permit the actions the role was authorized to take.
|
|
462
474
|
`dontAsk` suppresses only the *prompt*, not the denial, which is why an
|
|
463
|
-
`allow` role previously ran unable to do its job.
|
|
464
|
-
|
|
465
|
-
`plan
|
|
475
|
+
`allow` role previously ran unable to do its job. Legacy `deny` is accepted
|
|
476
|
+
only for compatibility and retains its conservative Codex `on-request` /
|
|
477
|
+
Claude `plan` translation. `allow` is a real grant — give it deliberately, and keep per-role
|
|
466
478
|
[`isolation:`](#agent-isolation) as the outer boundary, which no permission
|
|
467
479
|
mode can cross.
|
|
468
480
|
|
|
481
|
+
ACP exposes agent-specific session mode IDs and `session/set_mode`, but no
|
|
482
|
+
portable permission-policy capability. Fleet uses that primitive where an
|
|
483
|
+
adapter has a corresponding mode and otherwise translates at the adapter;
|
|
484
|
+
live session metadata reports both normalized and harness-native modes.
|
|
485
|
+
|
|
469
486
|
### Isolation at creation time
|
|
470
487
|
|
|
471
488
|
```sh
|
|
@@ -657,9 +674,14 @@ An owner request follows one ordered lifecycle on its authenticated source wire:
|
|
|
657
674
|
3. The agent may send any non-final message to the channel identity through its
|
|
658
675
|
ordinary ours MCP tool. CID authentication is the message gate; no task ID,
|
|
659
676
|
request ID, phase, reply reference, or routing command is used.
|
|
660
|
-
4.
|
|
661
|
-
|
|
662
|
-
|
|
677
|
+
4. The agent may send a caption and one or more files to the channel identity.
|
|
678
|
+
A reply reference selects the authenticated owner of that exact source wire;
|
|
679
|
+
an uncorrelated group uses the latest authenticated owner (or the sole-owner
|
|
680
|
+
fallback). Fleet resolves that route once, admits every file before emitting
|
|
681
|
+
any part, then sends the caption and files to the same owner on the same route.
|
|
682
|
+
5. Fleet independently emits exactly one final ACP response (or a sanitized
|
|
683
|
+
terminal outcome). Successful owner-request turns send regular files from the
|
|
684
|
+
request outbox afterward, correlated to the same source wire.
|
|
663
685
|
|
|
664
686
|
Fleet chooses the stored latest authenticated owner for every managed-agent
|
|
665
687
|
message; the model supplies only text and the channel contact. Relay audit logs
|
|
@@ -667,6 +689,16 @@ contain hashed wire prefixes and sizes, never bodies. A durable pre-send marker
|
|
|
667
689
|
prevents blind replay after an ambiguous transport outcome. `/interrupt` remains
|
|
668
690
|
an owner-only supervisor command and does not change the outbound relay contract.
|
|
669
691
|
|
|
692
|
+
Managed-agent caption/file groups have one admission and delivery boundary.
|
|
693
|
+
Fleet authenticates every group member, fixes one owner route before retrieval,
|
|
694
|
+
and validates all selected bytes before sending the caption or any file. A
|
|
695
|
+
correlated source wire never falls back to a different owner. Missing routes stay
|
|
696
|
+
queued without byte retrieval and produce at most one bounded correlated notice
|
|
697
|
+
per running bridge. Policy or admission rejection consumes the entire group and
|
|
698
|
+
sends one correlated NACK. Once outbound emission starts, any transport error is
|
|
699
|
+
recorded as terminal uncertain delivery: the whole group is consumed and never
|
|
700
|
+
blind-retried, because some parts may already have reached the owner.
|
|
701
|
+
|
|
670
702
|
Background work must not keep an ACP turn open. The agent can finalize, return to
|
|
671
703
|
idle, verify the later result on a future wake, and send the result to the same
|
|
672
704
|
channel identity with ordinary `send_message`. Fleet applies the same CID gate and
|
|
@@ -770,9 +802,13 @@ Request files are removed after final delivery and stale directories are removed
|
|
|
770
802
|
after `retention_ms`. A bounded mode-0600 recovery journal stores only owner CID
|
|
771
803
|
and wire routing metadata—never filenames, paths, captions, transcripts, or file
|
|
772
804
|
bytes. If ours-mcp already marked a selected file processed when fleet restarts,
|
|
773
|
-
fleet resumes only that journaled wire with `save_file`;
|
|
774
|
-
|
|
775
|
-
|
|
805
|
+
fleet resumes only that journaled wire with `save_file`; a deferred managed-agent
|
|
806
|
+
caption is replayed with its journaled processed files before the group is
|
|
807
|
+
admitted or relayed. Conversation route state migrates from v1 to a bounded v2
|
|
808
|
+
source-wire index so a correlated group keeps the authenticated owner selected by
|
|
809
|
+
its original request even after later owner traffic. Recovered voice is explicitly
|
|
810
|
+
marked transcript-unavailable. Corrupt recovery state disables attachment
|
|
811
|
+
admission. The host must run an ours-mcp version whose
|
|
776
812
|
`list_incoming_files`, selective `get_files`, and `save_file` schemas support
|
|
777
813
|
these guarantees; `ours-mcp voice-status --json` reports whether transcription
|
|
778
814
|
is currently configured.
|
|
@@ -150,6 +150,9 @@ export class FleetQueryService {
|
|
|
150
150
|
readiness: snapshot.readiness, evidence: 'authoritative',
|
|
151
151
|
sessionId: snapshot.sessionId, lastError: snapshot.lastError,
|
|
152
152
|
pendingPermissionId: snapshot.pendingPermissionId,
|
|
153
|
+
protocolVersion: snapshot.protocolVersion, features: snapshot.features,
|
|
154
|
+
runtimeModel: snapshot.runtimeModel, reasoningEffort: snapshot.reasoningEffort,
|
|
155
|
+
permissionMode: snapshot.permissionMode,
|
|
153
156
|
};
|
|
154
157
|
}
|
|
155
158
|
catch (error) {
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
export type ModelCatalogSource = 'codex-runtime-catalog' | 'claude-adapter-2.1' | 'fleet-config';
|
|
2
|
+
export interface HarnessModelOption {
|
|
3
|
+
id: string;
|
|
4
|
+
label: string;
|
|
5
|
+
reasoningEfforts: string[];
|
|
6
|
+
defaultReasoningEffort?: string;
|
|
7
|
+
source: ModelCatalogSource;
|
|
8
|
+
}
|
|
9
|
+
export interface HarnessModelCatalog {
|
|
10
|
+
models: HarnessModelOption[];
|
|
11
|
+
warnings: string[];
|
|
12
|
+
}
|
|
13
|
+
/** Read Codex's locally materialized `model/list` result; never invent fallback aliases. */
|
|
14
|
+
export declare function codexModelCatalog(path?: string): HarnessModelCatalog;
|
|
15
|
+
/**
|
|
16
|
+
* Claude Code 2.1 has no typed model-list endpoint. These exact IDs are the
|
|
17
|
+
* versioned adapter contract shipped by the installed 2.1 CLI, not aliases and
|
|
18
|
+
* not a claim about account entitlement (which Claude validates at launch).
|
|
19
|
+
*/
|
|
20
|
+
export declare function claudeModelCatalog(): HarnessModelCatalog;
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { readFileSync, statSync } from 'node:fs';
|
|
2
|
+
import { join } from 'node:path';
|
|
3
|
+
import { homedir } from 'node:os';
|
|
4
|
+
const validId = (value) => typeof value === 'string' && /^[A-Za-z0-9][A-Za-z0-9._[\]-]{0,127}$/.test(value);
|
|
5
|
+
/** Read Codex's locally materialized `model/list` result; never invent fallback aliases. */
|
|
6
|
+
export function codexModelCatalog(path = join(homedir(), '.codex', 'models_cache.json')) {
|
|
7
|
+
try {
|
|
8
|
+
if (statSync(path).size > 2_000_000)
|
|
9
|
+
throw new Error('catalog exceeds the 2 MB safety limit');
|
|
10
|
+
const parsed = JSON.parse(readFileSync(path, 'utf8'));
|
|
11
|
+
const models = (parsed.models ?? []).flatMap(raw => {
|
|
12
|
+
if (!raw || typeof raw !== 'object')
|
|
13
|
+
return [];
|
|
14
|
+
const model = raw;
|
|
15
|
+
if (model.visibility !== 'list' || !validId(model.slug))
|
|
16
|
+
return [];
|
|
17
|
+
const levels = Array.isArray(model.supported_reasoning_levels)
|
|
18
|
+
? model.supported_reasoning_levels.flatMap(level => {
|
|
19
|
+
const effort = level?.effort;
|
|
20
|
+
return validId(effort) ? [effort] : [];
|
|
21
|
+
}) : [];
|
|
22
|
+
return [{
|
|
23
|
+
id: model.slug,
|
|
24
|
+
label: typeof model.display_name === 'string' ? model.display_name : model.slug,
|
|
25
|
+
reasoningEfforts: [...new Set(levels)],
|
|
26
|
+
...(validId(model.default_reasoning_level)
|
|
27
|
+
? { defaultReasoningEffort: model.default_reasoning_level } : {}),
|
|
28
|
+
source: 'codex-runtime-catalog',
|
|
29
|
+
}];
|
|
30
|
+
});
|
|
31
|
+
if (!models.length)
|
|
32
|
+
throw new Error('catalog has no picker-visible models');
|
|
33
|
+
return { models, warnings: [] };
|
|
34
|
+
}
|
|
35
|
+
catch (error) {
|
|
36
|
+
return {
|
|
37
|
+
models: [],
|
|
38
|
+
warnings: [`Codex runtime model catalog unavailable: ${error.message}. Use Advanced to enter an exact ID.`],
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* Claude Code 2.1 has no typed model-list endpoint. These exact IDs are the
|
|
44
|
+
* versioned adapter contract shipped by the installed 2.1 CLI, not aliases and
|
|
45
|
+
* not a claim about account entitlement (which Claude validates at launch).
|
|
46
|
+
*/
|
|
47
|
+
export function claudeModelCatalog() {
|
|
48
|
+
const reasoningEfforts = ['low', 'medium', 'high', 'xhigh', 'max'];
|
|
49
|
+
return {
|
|
50
|
+
models: [
|
|
51
|
+
{ id: 'claude-fable-5', label: 'Claude Fable 5', reasoningEfforts, source: 'claude-adapter-2.1' },
|
|
52
|
+
{ id: 'claude-opus-5', label: 'Claude Opus 5', reasoningEfforts, source: 'claude-adapter-2.1' },
|
|
53
|
+
{ id: 'claude-sonnet-5', label: 'Claude Sonnet 5', reasoningEfforts, source: 'claude-adapter-2.1' },
|
|
54
|
+
],
|
|
55
|
+
warnings: ['Claude Code exposes no typed model-list endpoint; choices are exact 2.1 adapter IDs and entitlement is validated at launch.'],
|
|
56
|
+
};
|
|
57
|
+
}
|
|
@@ -3,11 +3,13 @@ import { type IdentityProvisioner } from '../creation.js';
|
|
|
3
3
|
import { type SupervisorLauncher } from '../spawn.js';
|
|
4
4
|
import type { OpsDeps } from '../ops.js';
|
|
5
5
|
import { FleetError } from './errors.js';
|
|
6
|
+
import { type HarnessModelCatalog, type HarnessModelOption } from './model-catalog.js';
|
|
6
7
|
export interface CreateRoleSessionRequest {
|
|
7
8
|
name: string;
|
|
8
9
|
harness: 'codex' | 'claude-code';
|
|
9
10
|
/** null means the selected harness's own default; web blank fields send null. */
|
|
10
11
|
model?: string | null;
|
|
12
|
+
reasoningEffort?: string | null;
|
|
11
13
|
session: 'acp' | 'tmux';
|
|
12
14
|
cwd?: string;
|
|
13
15
|
lifetime: 'permanent' | 'temporary';
|
|
@@ -40,6 +42,9 @@ export interface CreationCapabilities {
|
|
|
40
42
|
sessions: Array<'acp' | 'tmux'>;
|
|
41
43
|
defaultModel?: string;
|
|
42
44
|
models: string[];
|
|
45
|
+
modelOptions: HarnessModelOption[];
|
|
46
|
+
catalogSource: string;
|
|
47
|
+
customModelAllowed: true;
|
|
43
48
|
warnings: string[];
|
|
44
49
|
}>;
|
|
45
50
|
lifetimes: Array<'permanent' | 'temporary'>;
|
|
@@ -66,6 +71,7 @@ export interface CreationPreview {
|
|
|
66
71
|
harness: string;
|
|
67
72
|
session: 'acp' | 'tmux';
|
|
68
73
|
model?: string;
|
|
74
|
+
reasoningEffort?: string;
|
|
69
75
|
cwd?: string;
|
|
70
76
|
lifetime: 'permanent' | 'temporary';
|
|
71
77
|
permissions: CommonPermissions;
|
|
@@ -115,6 +121,7 @@ export interface RoleCreationServiceOptions {
|
|
|
115
121
|
journalDir?: string;
|
|
116
122
|
probeReady?: (name: string, session: 'acp' | 'tmux') => Promise<'ready' | 'attention' | 'unknown'>;
|
|
117
123
|
onProgress?: (action: CreationAction) => void;
|
|
124
|
+
modelCatalogs?: Partial<Record<'codex' | 'claude-code', () => HarnessModelCatalog>>;
|
|
118
125
|
}
|
|
119
126
|
export declare class RoleCreationService {
|
|
120
127
|
private readonly options;
|
|
@@ -7,6 +7,7 @@ import { replaceFileAtomically } from '../atomic-file.js';
|
|
|
7
7
|
import { stateRoot } from '../paths.js';
|
|
8
8
|
import { buildRoleConfig, spawnPermanent, spawnTemp, validateSpawnOpts, } from '../spawn.js';
|
|
9
9
|
import { FleetError, normalizeError } from './errors.js';
|
|
10
|
+
import { claudeModelCatalog, codexModelCatalog, } from './model-catalog.js';
|
|
10
11
|
const canonical = (value) => {
|
|
11
12
|
if (Array.isArray(value))
|
|
12
13
|
return `[${value.map(canonical).join(',')}]`;
|
|
@@ -48,13 +49,21 @@ export class RoleCreationService {
|
|
|
48
49
|
catch (error) {
|
|
49
50
|
reasons.push(`configuration is invalid: ${error.message}`);
|
|
50
51
|
}
|
|
51
|
-
const modelsFor = (harness,
|
|
52
|
+
const modelsFor = (harness, catalog) => {
|
|
52
53
|
const configured = roles.filter(role => role.harness === harness)
|
|
53
54
|
.flatMap(role => [role.model, ...(role.model_chain ?? [])])
|
|
54
55
|
.filter((model) => Boolean(model));
|
|
55
56
|
const inherited = resolveRoleModel(undefined, harness, defaults);
|
|
56
|
-
|
|
57
|
+
const configuredOptions = [...new Set([...(inherited ? [inherited] : []), ...configured])]
|
|
58
|
+
.filter(id => !catalog.models.some(model => model.id === id))
|
|
59
|
+
.map(id => ({ id, label: `${id} (configured)`, reasoningEfforts: [], source: 'fleet-config' }));
|
|
60
|
+
const modelOptions = [...configuredOptions, ...catalog.models];
|
|
61
|
+
return { modelOptions, models: modelOptions.map(model => model.id) };
|
|
57
62
|
};
|
|
63
|
+
const codexCatalog = this.options.modelCatalogs?.codex?.() ?? codexModelCatalog();
|
|
64
|
+
const claudeCatalog = this.options.modelCatalogs?.['claude-code']?.() ?? claudeModelCatalog();
|
|
65
|
+
const codexModels = modelsFor('codex', codexCatalog);
|
|
66
|
+
const claudeModels = modelsFor('claude-code', claudeCatalog);
|
|
58
67
|
return {
|
|
59
68
|
available: reasons.length === 0,
|
|
60
69
|
reasons,
|
|
@@ -62,12 +71,14 @@ export class RoleCreationService {
|
|
|
62
71
|
{
|
|
63
72
|
id: 'codex', available: true, sessions: ['acp', 'tmux'],
|
|
64
73
|
defaultModel: resolveRoleModel(undefined, 'codex', defaults),
|
|
65
|
-
|
|
74
|
+
...codexModels, catalogSource: 'codex-runtime-catalog', customModelAllowed: true,
|
|
75
|
+
warnings: codexCatalog.warnings,
|
|
66
76
|
},
|
|
67
77
|
{
|
|
68
78
|
id: 'claude-code', available: true, sessions: ['acp', 'tmux'],
|
|
69
79
|
defaultModel: resolveRoleModel(undefined, 'claude-code', defaults),
|
|
70
|
-
|
|
80
|
+
...claudeModels, catalogSource: 'claude-adapter-2.1', customModelAllowed: true,
|
|
81
|
+
warnings: claudeCatalog.warnings,
|
|
71
82
|
},
|
|
72
83
|
],
|
|
73
84
|
lifetimes: ['permanent', 'temporary'],
|
|
@@ -100,6 +111,7 @@ export class RoleCreationService {
|
|
|
100
111
|
harness: request.harness ?? defaults.harness ?? 'claude-code',
|
|
101
112
|
session: request.session ?? defaults.session ?? 'tmux',
|
|
102
113
|
model: resolveRoleModel(request.model, request.harness, defaults),
|
|
114
|
+
reasoningEffort: request.reasoningEffort ?? undefined,
|
|
103
115
|
cwd, lifetime: request.lifetime,
|
|
104
116
|
permissions: resolvePermissions(defaults.permissions, request.permissions),
|
|
105
117
|
monitor: resolveMonitorConfig(defaults.monitor, request.monitor),
|
|
@@ -252,6 +264,9 @@ export class RoleCreationService {
|
|
|
252
264
|
if (!['permanent', 'temporary'].includes(input.lifetime))
|
|
253
265
|
throw new FleetError('invalid_request', 'unsupported lifetime');
|
|
254
266
|
bounded(input.model ?? undefined, 'model', 128);
|
|
267
|
+
bounded(input.reasoningEffort ?? undefined, 'reasoning effort', 16);
|
|
268
|
+
if (input.reasoningEffort != null && !['low', 'medium', 'high', 'xhigh', 'max', 'ultra'].includes(input.reasoningEffort))
|
|
269
|
+
throw new FleetError('invalid_request', 'unsupported reasoning effort');
|
|
255
270
|
bounded(input.mission, 'mission', 4_096);
|
|
256
271
|
bounded(input.coordinator, 'coordinator', 128);
|
|
257
272
|
bounded(input.bio, 'bio', 8_192);
|
|
@@ -266,6 +281,7 @@ export class RoleCreationService {
|
|
|
266
281
|
}
|
|
267
282
|
return {
|
|
268
283
|
...input, model: input.model === null ? null : input.model?.trim() || undefined,
|
|
284
|
+
reasoningEffort: input.reasoningEffort === null ? null : input.reasoningEffort?.trim() || undefined,
|
|
269
285
|
mission: input.mission?.trim() || undefined, coordinator: input.coordinator?.trim() || undefined,
|
|
270
286
|
bio: input.bio?.trim() || undefined, persona: input.persona?.trim() || undefined,
|
|
271
287
|
monitor: input.monitor ? structuredClone(input.monitor) : undefined,
|
|
@@ -295,6 +311,7 @@ export class RoleCreationService {
|
|
|
295
311
|
return {
|
|
296
312
|
name: request.name, identity: request.name, harness: request.harness,
|
|
297
313
|
model: request.model, session: request.session, cwd: request.cwd,
|
|
314
|
+
reasoningEffort: request.reasoningEffort,
|
|
298
315
|
mission: request.mission, coordinator: request.coordinator,
|
|
299
316
|
approval: request.permissions.approval, filesystem: request.permissions.filesystem,
|
|
300
317
|
unattended: request.permissions.unattended, bio: request.bio, persona: request.persona,
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { type OpsDeps } from '../ops.js';
|
|
2
|
+
export interface RoleRemovalPreview {
|
|
3
|
+
role: string;
|
|
4
|
+
configured: boolean;
|
|
5
|
+
lifetime: 'permanent' | 'temporary' | 'orphan';
|
|
6
|
+
effects: string[];
|
|
7
|
+
confirmation: 'typed-role-name' | 'confirm';
|
|
8
|
+
coordinatorProtection: boolean;
|
|
9
|
+
selfProtected: boolean;
|
|
10
|
+
recovery: {
|
|
11
|
+
available: boolean;
|
|
12
|
+
detail: string;
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
export declare class RoleRemovalService {
|
|
16
|
+
private readonly options;
|
|
17
|
+
constructor(options: {
|
|
18
|
+
configPath?: string;
|
|
19
|
+
ops: OpsDeps;
|
|
20
|
+
currentControlRole?: string;
|
|
21
|
+
});
|
|
22
|
+
preview(requested: string): RoleRemovalPreview;
|
|
23
|
+
remove(input: {
|
|
24
|
+
role: string;
|
|
25
|
+
confirmation?: string;
|
|
26
|
+
confirmed?: boolean;
|
|
27
|
+
coordinatorAcknowledged?: boolean;
|
|
28
|
+
}): Promise<RoleRemovalPreview & {
|
|
29
|
+
removed: true;
|
|
30
|
+
recoveryPath: string;
|
|
31
|
+
}>;
|
|
32
|
+
}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
import { cpSync, existsSync, mkdirSync, readdirSync, renameSync } from 'node:fs';
|
|
2
|
+
import { basename, dirname, join } from 'node:path';
|
|
3
|
+
import { loadConfig, ROLE_NAME_RE } from '../config.js';
|
|
4
|
+
import { agentDir, stateRoot } from '../paths.js';
|
|
5
|
+
import { rmRole } from '../ops.js';
|
|
6
|
+
import { FleetError } from './errors.js';
|
|
7
|
+
export class RoleRemovalService {
|
|
8
|
+
options;
|
|
9
|
+
constructor(options) {
|
|
10
|
+
this.options = options;
|
|
11
|
+
}
|
|
12
|
+
preview(requested) {
|
|
13
|
+
if (!ROLE_NAME_RE.test(requested))
|
|
14
|
+
throw new FleetError('invalid_request', 'invalid role name');
|
|
15
|
+
const cfg = loadConfig(this.options.configPath);
|
|
16
|
+
const names = new Set(cfg.roles.map(role => role.name));
|
|
17
|
+
for (const root of [dirname(agentDir('_')), dirname(agentDir('_', true))]) {
|
|
18
|
+
try {
|
|
19
|
+
for (const entry of readdirSync(root, { withFileTypes: true }))
|
|
20
|
+
if (entry.isDirectory())
|
|
21
|
+
names.add(entry.name);
|
|
22
|
+
}
|
|
23
|
+
catch { /* missing state root */ }
|
|
24
|
+
}
|
|
25
|
+
const folded = [...names].filter(name => name.toLocaleLowerCase('en-US') === requested.toLocaleLowerCase('en-US'));
|
|
26
|
+
if (folded.length > 1)
|
|
27
|
+
throw new FleetError('conflict', `case-fold collision: ${folded.sort().join(', ')}; use the exact role name`);
|
|
28
|
+
if (!names.has(requested)) {
|
|
29
|
+
if (folded.length)
|
|
30
|
+
throw new FleetError('conflict', `role names are case-sensitive; use '${folded[0]}' exactly`);
|
|
31
|
+
throw new FleetError('role_not_found', `no such configured or state-backed role '${requested}'`);
|
|
32
|
+
}
|
|
33
|
+
const role = cfg.roles.find(item => item.name === requested);
|
|
34
|
+
const permanentState = agentDir(requested);
|
|
35
|
+
const temporaryState = agentDir(requested, true);
|
|
36
|
+
const lifetime = existsSync(temporaryState) && !existsSync(permanentState)
|
|
37
|
+
? 'temporary' : role ? 'permanent' : 'orphan';
|
|
38
|
+
const coordinatorProtection = cfg.roles.some(item => item.name !== requested && item.coordinator === requested);
|
|
39
|
+
const selfProtected = this.options.currentControlRole === requested;
|
|
40
|
+
const effects = [
|
|
41
|
+
`Stop and uninstall the exact backend registration for '${requested}'.`,
|
|
42
|
+
`Archive then remove ${lifetime === 'temporary' ? temporaryState : permanentState}.`,
|
|
43
|
+
];
|
|
44
|
+
if (role?.sourceFile.includes('/fleet.d/'))
|
|
45
|
+
effects.push(`Remove spawned configuration ${role.sourceFile}.`);
|
|
46
|
+
else if (role)
|
|
47
|
+
effects.push(`Keep hand-written configuration ${role.sourceFile}; the role can be recreated from it.`);
|
|
48
|
+
else
|
|
49
|
+
effects.push('Clean dangling unit/state left before configuration registration completed.');
|
|
50
|
+
return {
|
|
51
|
+
role: requested, configured: Boolean(role), lifetime, effects,
|
|
52
|
+
confirmation: lifetime === 'temporary' ? 'confirm' : 'typed-role-name',
|
|
53
|
+
coordinatorProtection, selfProtected,
|
|
54
|
+
recovery: { available: true, detail: 'State and spawned configuration are copied to the local removal archive before deletion.' },
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
async remove(input) {
|
|
58
|
+
const preview = this.preview(input.role);
|
|
59
|
+
if (preview.selfProtected)
|
|
60
|
+
throw new FleetError('forbidden', 'the current control role cannot remove itself from its own web session');
|
|
61
|
+
if (preview.coordinatorProtection && !input.coordinatorAcknowledged)
|
|
62
|
+
throw new FleetError('prerequisite_unavailable', 'this role coordinates other configured roles; acknowledge the impact explicitly');
|
|
63
|
+
if (preview.confirmation === 'typed-role-name' && input.confirmation !== preview.role)
|
|
64
|
+
throw new FleetError('invalid_request', `type '${preview.role}' exactly to confirm removal`);
|
|
65
|
+
if (preview.confirmation === 'confirm' && input.confirmed !== true)
|
|
66
|
+
throw new FleetError('invalid_request', 'explicit confirmation is required');
|
|
67
|
+
const cfg = loadConfig(this.options.configPath);
|
|
68
|
+
const role = cfg.roles.find(item => item.name === preview.role);
|
|
69
|
+
const sourceState = preview.lifetime === 'temporary' ? agentDir(preview.role, true) : agentDir(preview.role);
|
|
70
|
+
const stamp = new Date().toISOString().replaceAll(/[:.]/g, '-');
|
|
71
|
+
const recoveryPath = join(stateRoot(), 'recovery', 'removed', `${stamp}-${preview.role}`);
|
|
72
|
+
mkdirSync(recoveryPath, { recursive: true, mode: 0o700 });
|
|
73
|
+
if (existsSync(sourceState))
|
|
74
|
+
cpSync(sourceState, join(recoveryPath, 'state'), { recursive: true });
|
|
75
|
+
if (role?.sourceFile.includes('/fleet.d/') && existsSync(role.sourceFile))
|
|
76
|
+
cpSync(role.sourceFile, join(recoveryPath, basename(role.sourceFile)));
|
|
77
|
+
if (role)
|
|
78
|
+
await rmRole(cfg, preview.role, this.options.ops);
|
|
79
|
+
else {
|
|
80
|
+
await this.options.ops.backend.uninstall(preview.role);
|
|
81
|
+
if (existsSync(sourceState))
|
|
82
|
+
renameSync(sourceState, join(recoveryPath, 'orphan-state'));
|
|
83
|
+
this.options.ops.log(`removed orphaned backend/state '${preview.role}'`);
|
|
84
|
+
}
|
|
85
|
+
return { ...preview, removed: true, recoveryPath };
|
|
86
|
+
}
|
|
87
|
+
}
|
|
@@ -3,6 +3,7 @@ import { join, relative } from 'node:path';
|
|
|
3
3
|
import { parse } from 'yaml';
|
|
4
4
|
import { loadConfig, resolveMonitorConfig, resolvePermissions, ROLE_NAME_RE, } from '../config.js';
|
|
5
5
|
import { agentsRoot, tmpRoot } from '../paths.js';
|
|
6
|
+
import { readSpawnLineage } from '../web/topology.js';
|
|
6
7
|
const MAX_SNAPSHOT_BYTES = 256 * 1024;
|
|
7
8
|
function safeDirs(root) {
|
|
8
9
|
try {
|
|
@@ -15,11 +16,18 @@ function safeDirs(root) {
|
|
|
15
16
|
}
|
|
16
17
|
}
|
|
17
18
|
function view(role) {
|
|
19
|
+
const options = role.harness_options;
|
|
18
20
|
return {
|
|
19
21
|
name: role.name, harness: role.harness, session: role.session, identity: role.identity,
|
|
20
22
|
mission: role.mission, coordinator: role.coordinator, model: role.model,
|
|
21
23
|
cwd: role.cwd ? redactHome(role.cwd) : undefined,
|
|
22
24
|
permissions: role.permissions,
|
|
25
|
+
nativeRuntime: {
|
|
26
|
+
...(typeof options?.approval === 'string' ? { approval: options.approval } : {}),
|
|
27
|
+
...(typeof options?.permission_mode === 'string' ? { permissionMode: options.permission_mode } : {}),
|
|
28
|
+
...(typeof options?.sandbox === 'string' ? { sandbox: options.sandbox } : {}),
|
|
29
|
+
},
|
|
30
|
+
oversee: role.oversee,
|
|
23
31
|
};
|
|
24
32
|
}
|
|
25
33
|
function redactHome(path) {
|
|
@@ -112,17 +120,21 @@ export class RoleRepository {
|
|
|
112
120
|
code: 'backend_mismatch', severity: 'warning',
|
|
113
121
|
detail: `configured ${intended}, detected ${detected}`,
|
|
114
122
|
});
|
|
123
|
+
const stateRef = inTemporary ? { lifetime: 'temporary' }
|
|
124
|
+
: inPermanent ? { lifetime: 'permanent' } : undefined;
|
|
125
|
+
const tempStateDir = inTemporary ? join(temporaryRoot, name) : undefined;
|
|
115
126
|
return {
|
|
116
127
|
id: name,
|
|
117
128
|
lifetime: config ? 'permanent' : inTemporary ? 'temporary' : 'orphan',
|
|
118
129
|
configured: Boolean(config),
|
|
119
130
|
config: config ? view(config) : tempRole ? view(tempRole) : undefined,
|
|
120
|
-
stateRef
|
|
131
|
+
stateRef,
|
|
121
132
|
stateHealth,
|
|
122
133
|
configuredBackend: intended,
|
|
123
134
|
detectedBackend: detected,
|
|
124
135
|
compatibility: { compatible: true },
|
|
125
136
|
problems,
|
|
137
|
+
lineage: tempStateDir ? readSpawnLineage(tempStateDir) : undefined,
|
|
126
138
|
};
|
|
127
139
|
});
|
|
128
140
|
}
|
|
@@ -1,7 +1,18 @@
|
|
|
1
1
|
import { controlRequest } from '../session/control.js';
|
|
2
|
+
import type { ConversationEventV1, ConversationSnapshot, PromptReceipt } from '../session/conversation-types.js';
|
|
2
3
|
import type { SessionSnapshot } from '../session/types.js';
|
|
3
4
|
import { Tmux } from '../tmux.js';
|
|
4
5
|
import type { OutputPage, SendReceipt, SessionDescriptor } from './types.js';
|
|
6
|
+
export interface ConversationPageView {
|
|
7
|
+
events: ConversationEventV1[];
|
|
8
|
+
firstAvailableCursor?: string;
|
|
9
|
+
nextCursor?: string;
|
|
10
|
+
hasMore: boolean;
|
|
11
|
+
snapshot: ConversationSnapshot;
|
|
12
|
+
}
|
|
13
|
+
export interface ConversationFollowHandle {
|
|
14
|
+
close(): void;
|
|
15
|
+
}
|
|
5
16
|
export interface RoleSessionControl {
|
|
6
17
|
describe(): Promise<SessionDescriptor>;
|
|
7
18
|
snapshot(): Promise<SessionSnapshot>;
|
|
@@ -19,6 +30,40 @@ export interface RoleSessionControl {
|
|
|
19
30
|
}): Promise<{
|
|
20
31
|
accepted: true;
|
|
21
32
|
}>;
|
|
33
|
+
conversationPage?(request: {
|
|
34
|
+
after?: string;
|
|
35
|
+
limit?: number;
|
|
36
|
+
}): Promise<ConversationPageView>;
|
|
37
|
+
submitPromptV2?(request: {
|
|
38
|
+
commandId: string;
|
|
39
|
+
text: string;
|
|
40
|
+
actorBrowserSession: string;
|
|
41
|
+
source: 'owner_admin_console';
|
|
42
|
+
}): Promise<PromptReceipt>;
|
|
43
|
+
interruptV2?(commandId: string): Promise<{
|
|
44
|
+
accepted: true;
|
|
45
|
+
commandId: string;
|
|
46
|
+
}>;
|
|
47
|
+
respondPermissionV2?(request: {
|
|
48
|
+
commandId: string;
|
|
49
|
+
permissionId: string;
|
|
50
|
+
optionId: string;
|
|
51
|
+
sessionGeneration: string;
|
|
52
|
+
}): Promise<{
|
|
53
|
+
accepted: true;
|
|
54
|
+
commandId: string;
|
|
55
|
+
}>;
|
|
56
|
+
/**
|
|
57
|
+
* Open a live follow on the role's ledger. `onPage` receives the initial
|
|
58
|
+
* replay page; `onEvent` every subsequent durable event; `onClose` fires
|
|
59
|
+
* exactly once when the underlying control stream ends.
|
|
60
|
+
*/
|
|
61
|
+
followConversation?(request: {
|
|
62
|
+
after?: string;
|
|
63
|
+
onPage(page: ConversationPageView): void;
|
|
64
|
+
onEvent(event: ConversationEventV1): void;
|
|
65
|
+
onClose(reason?: string): void;
|
|
66
|
+
}): Promise<ConversationFollowHandle>;
|
|
22
67
|
}
|
|
23
68
|
export declare class AcpRoleSessionAdapter implements RoleSessionControl {
|
|
24
69
|
private readonly stateDir;
|
|
@@ -34,6 +79,35 @@ export declare class AcpRoleSessionAdapter implements RoleSessionControl {
|
|
|
34
79
|
interrupt(): Promise<{
|
|
35
80
|
accepted: true;
|
|
36
81
|
}>;
|
|
82
|
+
conversationPage(request?: {
|
|
83
|
+
after?: string;
|
|
84
|
+
limit?: number;
|
|
85
|
+
}): Promise<ConversationPageView>;
|
|
86
|
+
submitPromptV2(request: {
|
|
87
|
+
commandId: string;
|
|
88
|
+
text: string;
|
|
89
|
+
actorBrowserSession: string;
|
|
90
|
+
source: 'owner_admin_console';
|
|
91
|
+
}): Promise<PromptReceipt>;
|
|
92
|
+
interruptV2(commandId: string): Promise<{
|
|
93
|
+
accepted: true;
|
|
94
|
+
commandId: string;
|
|
95
|
+
}>;
|
|
96
|
+
respondPermissionV2(request: {
|
|
97
|
+
commandId: string;
|
|
98
|
+
permissionId: string;
|
|
99
|
+
optionId: string;
|
|
100
|
+
sessionGeneration: string;
|
|
101
|
+
}): Promise<{
|
|
102
|
+
accepted: true;
|
|
103
|
+
commandId: string;
|
|
104
|
+
}>;
|
|
105
|
+
followConversation(request: {
|
|
106
|
+
after?: string;
|
|
107
|
+
onPage(page: ConversationPageView): void;
|
|
108
|
+
onEvent(event: ConversationEventV1): void;
|
|
109
|
+
onClose(reason?: string): void;
|
|
110
|
+
}): Promise<ConversationFollowHandle>;
|
|
37
111
|
respondPermission(request: {
|
|
38
112
|
permissionId: string;
|
|
39
113
|
optionId: string;
|