@ours.network/fleet 0.6.0 → 0.7.1

package/README.md

@@ -62,7 +62,7 @@ The state dir contract:
 | `briefing.md` | generated | rewritten on every `up`/`restart`; never hand-edit |
 | `WORKLOG.md` | the agent | seeded empty, agent-appended; survives restarts |
 | `ROUTINES.md` | operator / agent | **optional** recurring-work instructions; re-read at the start of every wake, hot-editable **without a restart**; absence means "no routines" |
-| `.identity`, `.cwd`, `.session-id`, `.booted`, `.exit-status` | supervisor | dot-marker state — session resume and boot bookkeeping |
+| `.identity`, `.cwd`, `.session-id`, `.booted`, `.exit-status`, `.config-path` | supervisor | dot-marker state — session resume and boot bookkeeping |
 
 ## Prerequisites
 
@@ -122,6 +122,17 @@ From inside Claude Code: install the `ours-fleet` plugin (ships in this repo und
 temp-vs-permanent, co-drafts the bio and persona with you, spawns, and arms
 oversight.
 
+From inside Codex, install the native fleet plugin:
+
+```sh
+npm i -g @ours.network/fleet-codex
+ours-fleet-codex-install
+```
+
+Start a new Codex session and say **"spawn an ours agent …"**. The bundled skill
+walks through lifetime, model, sandbox, approval policy, profile, launcher, and
+mail-monitor consent, then verifies the real tmux session and offers oversight.
+
 ## Oversight ("keep an eye")
 
 Spawned agents are subagents; their spawner (or any assigned overseer) checks on
@@ -158,6 +169,11 @@ ours-fleet doctor [--harness H]
 ours-fleet init
 ```
 
+A permanent role brought up via `-c custom.yaml` remembers that file (`.config-path`
+in its state dir) across supervisor-triggered restarts — systemd/launchd re-invoke the
+agent process with no arguments, so without this the role would silently fall back to
+the default `~/fleet.yaml` on its very first crash-restart and fail to resolve.
+
 ## fleet.yaml reference
 
 ```yaml
@@ -213,11 +229,11 @@ and override individual keys per role.
 
 ## Codex roles
 
-Install Codex and the native ours plugin once on the fleet host:
+Install Codex, the native ours plugin, and the fleet skills once on the fleet host:
 
 ```sh
-npm i -g @ours.network/codex
-ours-codex-install
+npm i -g @ours.network/fleet-codex
+ours-fleet-codex-install
 ours-fleet doctor --harness codex
 ```
 
@@ -319,7 +335,8 @@ cleanly as long as each role has its own `cwd` (the common case); two roles
 sharing an identical `cwd` could have their resumes cross — give them distinct
 working directories if that matters. MCP and monitor wiring is provided by
 [`@ours.network/codex`](https://github.com/adapt-toolkit/ours-mcp/tree/main/packages/codex);
-`ours-fleet doctor --harness codex` verifies the CLI, plugin, and enhanced launcher/fallback.
+the native spawn/oversight skills are provided by `@ours.network/fleet-codex`.
+`ours-fleet doctor --harness codex` verifies the CLI, ours plugin, and enhanced launcher/fallback.
 
 ## Learn more
 

package/dist/cli.js

@@ -101,7 +101,7 @@ cOpt(program.command('config').description('validate + print the merged plan (no
 cOpt(program.command('up [names...]').description('create/start every role (or just the named ones)'))
     .action(async (names, opts) => {
     try {
-        await up(loadConfig(opts.configuration), names, deps());
+        await up(loadConfig(opts.configuration), names, deps(), opts.configuration);
     }
     catch (e) {
         die(e);
@@ -119,7 +119,7 @@ cOpt(program.command('down [names...]').description('stop roles'))
 cOpt(program.command('restart [names...]').description('re-sync config + bounce, RESUMING context'))
     .action(async (names, opts) => {
     try {
-        await restartRoles(loadConfig(opts.configuration), names, deps(), 'keep');
+        await restartRoles(loadConfig(opts.configuration), names, deps(), 'keep', opts.configuration);
     }
     catch (e) {
         die(e);
@@ -128,7 +128,7 @@ cOpt(program.command('restart [names...]').description('re-sync config + bounce,
 cOpt(program.command('force-restart [names...]').description('re-sync + bounce FRESH (context wiped)'))
     .action(async (names, opts) => {
     try {
-        await restartRoles(loadConfig(opts.configuration), names, deps(), 'fresh');
+        await restartRoles(loadConfig(opts.configuration), names, deps(), 'fresh', opts.configuration);
     }
     catch (e) {
         die(e);

package/dist/ops.d.ts

@@ -10,11 +10,12 @@ export interface OpsDeps {
 export declare function applyRole(role: ResolvedRole, opts?: {
     fresh?: boolean;
     temp?: boolean;
+    configPath?: string;
 }): string;
 /** Create/start roles declaratively. Idempotent; active roles keep their context. */
-export declare function up(cfg: FleetConfig, names: string[], deps: OpsDeps): Promise<void>;
+export declare function up(cfg: FleetConfig, names: string[], deps: OpsDeps, configPath?: string): Promise<void>;
 export declare function down(cfg: FleetConfig, names: string[], deps: OpsDeps): Promise<void>;
 /** Re-sync from config + bounce. mode 'keep' resumes context; 'fresh' wipes it. */
-export declare function restartRoles(cfg: FleetConfig, names: string[], deps: OpsDeps, mode: 'keep' | 'fresh'): Promise<void>;
+export declare function restartRoles(cfg: FleetConfig, names: string[], deps: OpsDeps, mode: 'keep' | 'fresh', configPath?: string): Promise<void>;
 /** Stop + forget a role: unit, state dir, and its fleet.d file when spawned. */
 export declare function rmRole(cfg: FleetConfig, name: string, deps: OpsDeps): Promise<void>;

package/dist/ops.js

@@ -14,6 +14,13 @@ export function applyRole(role, opts = {}) {
         throw new Error(`role '${role.name}': ` + errs.map(e => `${e.path}: ${e.message}`).join('; '));
     const dir = agentDir(role.name, opts.temp === true);
     mkdirSync(dir, { recursive: true });
+    // systemd's shared unit template invokes `_run <name>` on every restart with no
+    // -c (see supervisor/systemd.ts) — record which config this permanent role was
+    // brought up from so the supervised process can reload the SAME file instead of
+    // silently falling back to the default ~/fleet.yaml. Temp roles snapshot their
+    // whole resolved role into role.yaml instead and don't need this.
+    if (!opts.temp)
+        writeFileSync(join(dir, '.config-path'), (opts.configPath ?? '') + '\n');
     writeFileSync(join(dir, '.identity'), role.identity + '\n');
     if (role.cwd)
         writeFileSync(join(dir, '.cwd'), role.cwd + '\n');
@@ -35,13 +42,13 @@ function selectRoles(cfg, names) {
     return names.length ? names.map(n => findRole(cfg, n)) : cfg.roles;
 }
 /** Create/start roles declaratively. Idempotent; active roles keep their context. */
-export async function up(cfg, names, deps) {
+export async function up(cfg, names, deps, configPath) {
     let first = true;
     for (const role of selectRoles(cfg, names)) {
         if (!first)
             await deps.sleep(STAGGER_MS());
         first = false;
-        const dir = applyRole(role);
+        const dir = applyRole(role, { configPath });
         // If the role isn't running, boot fresh so it reads the briefing we just wrote.
         const status = await deps.backend.status(role.name).catch(() => '');
         if (!/running|active \(/.test(status))
@@ -62,13 +69,13 @@ export async function down(cfg, names, deps) {
     }
 }
 /** Re-sync from config + bounce. mode 'keep' resumes context; 'fresh' wipes it. */
-export async function restartRoles(cfg, names, deps, mode) {
+export async function restartRoles(cfg, names, deps, mode, configPath) {
     let first = true;
     for (const role of selectRoles(cfg, names)) {
         if (!first)
             await deps.sleep(STAGGER_MS());
         first = false;
-        applyRole(role, { fresh: mode === 'fresh' });
+        applyRole(role, { fresh: mode === 'fresh', configPath });
         await deps.backend.restart(role.name);
         deps.log(mode === 'fresh'
             ? `↻ ${role.name} — force-restarted (FRESH — context cleared, briefing reloaded)`

package/dist/runner.js

@@ -47,13 +47,31 @@ export function loadTempRole(name) {
     role.__temp = true;
     return role;
 }
+/**
+ * Fall back to the config path applyRole() recorded at the last up/restart/spawn
+ * for this role. systemd's shared unit template (`ours-fleet-agent@.service`)
+ * execs `_run <name>` with no -c on every restart, so a role brought up from a
+ * non-default config (`ours-fleet up -c custom.yaml`) would otherwise silently
+ * resolve against the default ~/fleet.yaml on its very first restart and fail
+ * with "no such role". An empty/missing marker means "use the default", same as
+ * no -c was ever given.
+ */
+function resolveConfigPath(dir, explicit) {
+    if (explicit)
+        return explicit;
+    const marker = join(dir, '.config-path');
+    if (!existsSync(marker))
+        return undefined;
+    return readFileSync(marker, 'utf8').trim() || undefined;
+}
 /** One supervised session lifecycle. The supervisor re-invokes us after we return. */
 export async function runOnce(name, opts = {}, partialDeps = {}) {
     const deps = { ...defaultDeps(), ...partialDeps };
     const temp = opts.temp === true;
-    const role = temp ? loadTempRole(name) : findRole(loadConfig(opts.configPath), name);
-    const adapter = getAdapter(role.harness);
     const dir = agentDir(name, temp);
+    const configPath = temp ? opts.configPath : resolveConfigPath(dir, opts.configPath);
+    const role = temp ? loadTempRole(name) : findRole(loadConfig(configPath), name);
+    const adapter = getAdapter(role.harness);
     mkdirSync(dir, { recursive: true });
     const sidFile = join(dir, '.session-id');
     if (!existsSync(sidFile))

package/dist/spawn.js

@@ -61,7 +61,7 @@ export async function spawnPermanent(o, deps) {
     writeFileSync(file, stringify({
         roles: { [o.name]: roleFromOpts(o, cfg.defaults.harness) },
     }));
-    await up(loadConfig(o.configPath), [o.name], deps);
+    await up(loadConfig(o.configPath), [o.name], deps, o.configPath);
     return file;
 }
 const detachedSupervisor = (binPath, args, dir) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/fleet",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "Harness-agnostic fleet of persistent, identity-bound AI agents. Declarative fleet.yaml, tmux consoles, systemd/launchd supervision, ours.network messaging.",
   "type": "module",
   "license": "FSL-1.1-Apache-2.0",