feat(fleet): inject persona contract at launch (A3b) (#664)
This commit was merged in pull request #664.
This commit is contained in:
@@ -164,4 +164,89 @@ describe('composeContract — overlay composer', () => {
|
||||
expect(composeContract('pi', fixture.home)).toContain('# pi runtime contract');
|
||||
expect(composeContract('codex', fixture.home)).not.toContain('# pi runtime contract');
|
||||
});
|
||||
|
||||
// ── Persona contract injection (A3b) ──────────────────────────────────────
|
||||
// composeContract reads MOSAIC_AGENT_CLASS and injects the resolved persona
|
||||
// (override-aware). Save/restore the env so these tests don't leak state.
|
||||
describe('persona contract (A3b)', () => {
|
||||
let prevClass: string | undefined;
|
||||
|
||||
beforeEach(() => {
|
||||
prevClass = process.env['MOSAIC_AGENT_CLASS'];
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
if (prevClass === undefined) delete process.env['MOSAIC_AGENT_CLASS'];
|
||||
else process.env['MOSAIC_AGENT_CLASS'] = prevClass;
|
||||
});
|
||||
|
||||
const seedBaseline = (klass: string, body: string): void => {
|
||||
mkdirSync(join(fixture.home, 'fleet', 'roles'), { recursive: true });
|
||||
writeFileSync(join(fixture.home, 'fleet', 'roles', `${klass}.md`), body);
|
||||
};
|
||||
const seedOverride = (klass: string, body: string): void => {
|
||||
mkdirSync(join(fixture.home, 'fleet', 'roles.local'), { recursive: true });
|
||||
writeFileSync(join(fixture.home, 'fleet', 'roles.local', `${klass}.md`), body);
|
||||
};
|
||||
|
||||
it('injects the baseline persona when MOSAIC_AGENT_CLASS is set and a role file exists', () => {
|
||||
seedBaseline('coder', '# Coder\n\n(`class: coder`)\n\nBASELINE-MANDATE: ship the lane.\n');
|
||||
process.env['MOSAIC_AGENT_CLASS'] = 'coder';
|
||||
const out = composeContract('claude', fixture.home);
|
||||
expect(out).toContain('# Persona Contract (coder)');
|
||||
expect(out).toContain('BASELINE-MANDATE');
|
||||
});
|
||||
|
||||
it('OVERRIDE WINS at launch: roles.local persona is injected over baseline (AC-NS-7)', () => {
|
||||
seedBaseline('coder', '# Coder\n\n(`class: coder`)\n\nBASELINE-MANDATE.\n');
|
||||
seedOverride('coder', '# Coder (override)\n\n(`class: coder`)\n\nOVERRIDE-MANDATE.\n');
|
||||
process.env['MOSAIC_AGENT_CLASS'] = 'coder';
|
||||
const out = composeContract('claude', fixture.home);
|
||||
expect(out).toContain('# Persona Contract (coder)');
|
||||
expect(out).toContain('OVERRIDE-MANDATE');
|
||||
expect(out).not.toContain('BASELINE-MANDATE');
|
||||
});
|
||||
|
||||
it('does NOT inject a persona when MOSAIC_AGENT_CLASS is unset', () => {
|
||||
seedBaseline('coder', '# Coder\n\n(`class: coder`)\n\nBASELINE-MANDATE.\n');
|
||||
delete process.env['MOSAIC_AGENT_CLASS'];
|
||||
const out = composeContract('claude', fixture.home);
|
||||
expect(out).not.toContain('# Persona Contract');
|
||||
});
|
||||
|
||||
it('does NOT inject (no throw) when MOSAIC_AGENT_CLASS names an unknown class', () => {
|
||||
seedBaseline('coder', '# Coder\n\n(`class: coder`)\n\nBASELINE-MANDATE.\n');
|
||||
process.env['MOSAIC_AGENT_CLASS'] = 'nonexistent';
|
||||
expect(() => composeContract('claude', fixture.home)).not.toThrow();
|
||||
expect(composeContract('claude', fixture.home)).not.toContain('# Persona Contract');
|
||||
});
|
||||
|
||||
it('places the persona contract BEFORE the fleet comms block (identity, then peers)', () => {
|
||||
seedBaseline('enhancer', '# Enhancer\n\n(`class: enhancer`)\n\nIMPROVE.\n');
|
||||
mkdirSync(join(fixture.home, 'fleet'), { recursive: true });
|
||||
writeFileSync(
|
||||
join(fixture.home, 'fleet', 'roster.yaml'),
|
||||
[
|
||||
'agents:',
|
||||
' - name: orchestrator',
|
||||
' class: orchestrator',
|
||||
' - name: enhancer',
|
||||
' class: enhancer',
|
||||
'',
|
||||
].join('\n'),
|
||||
);
|
||||
const prevName = process.env['MOSAIC_AGENT_NAME'];
|
||||
try {
|
||||
process.env['MOSAIC_AGENT_CLASS'] = 'enhancer';
|
||||
process.env['MOSAIC_AGENT_NAME'] = 'enhancer';
|
||||
const out = composeContract('claude', fixture.home);
|
||||
expect(out).toContain('# Persona Contract (enhancer)');
|
||||
expect(out).toContain('# Fleet Comms');
|
||||
expect(out.indexOf('# Persona Contract')).toBeLessThan(out.indexOf('# Fleet Comms'));
|
||||
} finally {
|
||||
if (prevName === undefined) delete process.env['MOSAIC_AGENT_NAME'];
|
||||
else process.env['MOSAIC_AGENT_NAME'] = prevName;
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
* can reference a customized or user-added persona.
|
||||
*/
|
||||
|
||||
import { readFileSync, readdirSync } from 'node:fs';
|
||||
import { readFile, readdir } from 'node:fs/promises';
|
||||
import { homedir } from 'node:os';
|
||||
import { basename, join } from 'node:path';
|
||||
@@ -88,13 +89,12 @@ export interface DirClasses {
|
||||
* classes still appear in `classes` for membership checks.
|
||||
*/
|
||||
export async function extractClassesFromDir(dir: string): Promise<DirClasses> {
|
||||
const classes = new Set<string>();
|
||||
const byClass = new Map<string, PersonaFile>();
|
||||
const acc: DirClasses = { classes: new Set<string>(), byClass: new Map<string, PersonaFile>() };
|
||||
let entries: string[];
|
||||
try {
|
||||
entries = await readdir(dir);
|
||||
} catch {
|
||||
return { classes, byClass };
|
||||
return acc;
|
||||
}
|
||||
|
||||
for (const entry of entries) {
|
||||
@@ -105,36 +105,75 @@ export async function extractClassesFromDir(dir: string): Promise<DirClasses> {
|
||||
} catch {
|
||||
continue;
|
||||
}
|
||||
if (entry === 'LIBRARY.md') {
|
||||
for (const m of text.matchAll(LIBRARY_ROW)) {
|
||||
const name = m[1];
|
||||
if (name && name !== 'persona') classes.add(name);
|
||||
}
|
||||
accumulateEntry(acc, dir, entry, text);
|
||||
}
|
||||
return acc;
|
||||
}
|
||||
|
||||
/**
|
||||
* Synchronous twin of {@link extractClassesFromDir}. Identical extraction
|
||||
* semantics (same markers, same union of marker/filename/LIBRARY sources) on
|
||||
* sync fs, for the synchronous launch-time prompt path (composeContract) which
|
||||
* cannot await. Missing dir / unreadable files degrade gracefully.
|
||||
*/
|
||||
export function extractClassesFromDirSync(dir: string): DirClasses {
|
||||
const acc: DirClasses = { classes: new Set<string>(), byClass: new Map<string, PersonaFile>() };
|
||||
let entries: string[];
|
||||
try {
|
||||
entries = readdirSync(dir);
|
||||
} catch {
|
||||
return acc;
|
||||
}
|
||||
|
||||
for (const entry of entries) {
|
||||
if (!entry.endsWith('.md')) continue;
|
||||
let text: string;
|
||||
try {
|
||||
text = readFileSync(join(dir, entry), 'utf8');
|
||||
} catch {
|
||||
continue;
|
||||
}
|
||||
// The filename stem is itself a valid class (covers marker-less alias docs).
|
||||
const stem = basename(entry, '.md');
|
||||
classes.add(stem);
|
||||
const domainMatch = DOMAIN_MARKER.exec(text);
|
||||
const domain = domainMatch?.[1];
|
||||
let markedClassForFile: string | undefined;
|
||||
for (const m of text.matchAll(CLASS_MARKER)) {
|
||||
const klass = m[1];
|
||||
if (!klass) continue;
|
||||
classes.add(klass);
|
||||
// Record the FIRST marker as the file's defining class (the prose names
|
||||
// the persona's own class up top; later mentions reference siblings).
|
||||
if (!markedClassForFile) {
|
||||
markedClassForFile = klass;
|
||||
byClass.set(klass, { klass, file: join(dir, entry), ...(domain ? { domain } : {}) });
|
||||
}
|
||||
accumulateEntry(acc, dir, entry, text);
|
||||
}
|
||||
return acc;
|
||||
}
|
||||
|
||||
/**
|
||||
* Apply the class-extraction rules for ONE role file's text into `acc`. Pure
|
||||
* over already-read content, so the async and sync directory scanners share a
|
||||
* single definition of "what classes a file contributes" (DRY — no semantic
|
||||
* drift between the launch-time and command-time paths).
|
||||
*/
|
||||
function accumulateEntry(acc: DirClasses, dir: string, entry: string, text: string): void {
|
||||
const { classes, byClass } = acc;
|
||||
if (entry === 'LIBRARY.md') {
|
||||
for (const m of text.matchAll(LIBRARY_ROW)) {
|
||||
const name = m[1];
|
||||
if (name && name !== 'persona') classes.add(name);
|
||||
}
|
||||
// A marker-less file still maps its stem to itself (no domain known).
|
||||
if (!markedClassForFile && !byClass.has(stem)) {
|
||||
byClass.set(stem, { klass: stem, file: join(dir, entry) });
|
||||
return;
|
||||
}
|
||||
// The filename stem is itself a valid class (covers marker-less alias docs).
|
||||
const stem = basename(entry, '.md');
|
||||
classes.add(stem);
|
||||
const domainMatch = DOMAIN_MARKER.exec(text);
|
||||
const domain = domainMatch?.[1];
|
||||
let markedClassForFile: string | undefined;
|
||||
for (const m of text.matchAll(CLASS_MARKER)) {
|
||||
const klass = m[1];
|
||||
if (!klass) continue;
|
||||
classes.add(klass);
|
||||
// Record the FIRST marker as the file's defining class (the prose names
|
||||
// the persona's own class up top; later mentions reference siblings).
|
||||
if (!markedClassForFile) {
|
||||
markedClassForFile = klass;
|
||||
byClass.set(klass, { klass, file: join(dir, entry), ...(domain ? { domain } : {}) });
|
||||
}
|
||||
}
|
||||
return { classes, byClass };
|
||||
// A marker-less file still maps its stem to itself (no domain known).
|
||||
if (!markedClassForFile && !byClass.has(stem)) {
|
||||
byClass.set(stem, { klass: stem, file: join(dir, entry) });
|
||||
}
|
||||
}
|
||||
|
||||
export interface PersonaDirs {
|
||||
@@ -229,6 +268,51 @@ export async function resolvePersona(
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Synchronous twin of {@link resolvePersona} — same override-wins precedence
|
||||
* (roles.local/ beats roles/, by marker first then filename stem), returning
|
||||
* null if neither layer defines the class. Exists for the synchronous launch
|
||||
* prompt path (composeContract → readPersonaContractBlock) which cannot await.
|
||||
* Keeping it here, beside the async resolver, keeps the resolution semantics in
|
||||
* one module so the launch-time and command-time resolutions never diverge.
|
||||
*/
|
||||
export function resolvePersonaSync(
|
||||
klass: string,
|
||||
opts: PersonaDirs = {},
|
||||
): PersonaResolution | null {
|
||||
const { rolesDir, overrideDir } = resolveDirs(opts);
|
||||
const base = extractClassesFromDirSync(rolesDir);
|
||||
const over = extractClassesFromDirSync(overrideDir);
|
||||
|
||||
const fromLayer = (
|
||||
dir: string,
|
||||
extracted: DirClasses,
|
||||
layer: PersonaLayer,
|
||||
): PersonaResolution | null => {
|
||||
// Prefer the marker-defined file; fall back to the filename stem.
|
||||
const pf = extracted.byClass.get(klass);
|
||||
if (!pf) {
|
||||
if (!extracted.classes.has(klass)) return null;
|
||||
const byName = join(dir, `${klass}.md`);
|
||||
try {
|
||||
const content = readFileSync(byName, 'utf8');
|
||||
const dm = DOMAIN_MARKER.exec(content);
|
||||
return { klass, layer, file: byName, content, ...(dm?.[1] ? { domain: dm[1] } : {}) };
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
try {
|
||||
const content = readFileSync(pf.file, 'utf8');
|
||||
return { klass, layer, file: pf.file, content, ...(pf.domain ? { domain: pf.domain } : {}) };
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
return fromLayer(overrideDir, over, 'override') ?? fromLayer(rolesDir, base, 'baseline');
|
||||
}
|
||||
|
||||
export interface PersonaStatusEntry {
|
||||
klass: string;
|
||||
status: PersonaStatus;
|
||||
|
||||
@@ -20,6 +20,7 @@ import { homedir } from 'node:os';
|
||||
import { join, dirname } from 'node:path';
|
||||
import type { Command } from 'commander';
|
||||
import { readFleetCommsBlock } from '../fleet/comms-onboarding.js';
|
||||
import { readPersonaContractBlock } from '../fleet/persona-contract.js';
|
||||
|
||||
const MOSAIC_HOME = process.env['MOSAIC_HOME'] ?? join(homedir(), '.config', 'mosaic');
|
||||
|
||||
@@ -384,6 +385,16 @@ For required push/merge/issue-close/release actions, execute without routine con
|
||||
// Runtime-specific contract
|
||||
parts.push('\n\n# Runtime-Specific Contract\n\n' + readFileSync(runtimeFile, 'utf-8'));
|
||||
|
||||
// Persona contract (A3b): when this agent was spawned with a class
|
||||
// (MOSAIC_AGENT_CLASS, exported into the pane env by A3a), inject its resolved
|
||||
// role contract so its identity (mandate + boundaries) is resident from the
|
||||
// first turn. Override-aware via the persona resolver: a user-customized
|
||||
// persona in fleet/roles.local/ wins over the baseline (AC-NS-7 launch proof).
|
||||
// Placed BEFORE fleet comms: identity first, then how-to-reach-peers. No-ops
|
||||
// silently when the class is unset/unknown (mirrors the comms block).
|
||||
const persona = readPersonaContractBlock(mosaicHome, process.env['MOSAIC_AGENT_CLASS']);
|
||||
if (persona) parts.push('\n\n' + persona);
|
||||
|
||||
// Fleet onboarding: when this is a spawned fleet agent (MOSAIC_AGENT_NAME set
|
||||
// and present in the roster), inject a comms cheat-sheet + peer roster so it
|
||||
// knows how to reach the orchestrator and its peers from its first turn.
|
||||
|
||||
Reference in New Issue
Block a user