@cotal-ai/manager 0.10.1 → 0.11.0

package/dist/manager.js

@@ -1,10 +1,12 @@
+import { execFile } from "node:child_process";
 import { existsSync, rmSync } from "node:fs";
 import { join, dirname, resolve } from "node:path";
-import { CotalEndpoint, DEFAULT_SERVER, MANAGER_LEASE_TTL_MS, agentFilePath, clearSpaceHistory, connectorServers, deprovisionAgent, firstFreeName, loadAgentFile, loadCotalConfig, mintCreds, mkSecretDir, newIdentity, parseShareSelection, provisionAgent, registry, saveAgentFile, writeSecretFile, subjectMatches, CONTROL_PRIVILEGED, CONTROL_SELF_SERVICE, CONTROL_ADMIN, } from "@cotal-ai/core";
-import { authDir, defaultAgentType, findCotalRoot, loadSpaceAuth, resolveOnPath } from "@cotal-ai/workspace";
+import { CotalEndpoint, DEFAULT_SERVER, DEV_OWNER, MANAGER_LEASE_TTL_MS, STANDING_RENEWABLE_TTL_SEC, agentFilePath, clearSpaceHistory, connectorServers, deprovisionAgent, firstFreeName, loadAgentFile, loadCotalConfig, mintCreds, mkSecretDir, newIdentity, parsePrincipalKey, parseShareSelection, principalKey, provisionAgent, provisionAgentDurables, registry, resolveAuthProvider, saveAgentFile, writeSecretFile, subjectMatches, CONTROL_PRIVILEGED, CONTROL_SELF_SERVICE, CONTROL_ADMIN, } from "@cotal-ai/core";
+import { agentAuthState, authDir, defaultAgentType, findCotalRoot, loadMeshes, loadSpaceAuth, mergeLaunchOptions, remintDaemonCreds, resolveOnPath, userAuthStateDir, writeRenewalRecord } from "@cotal-ai/workspace";
 import { createRuntime, } from "./runtime/index.js";
 import { AttachEndpoint } from "./attach-endpoint.js";
 import { launchSpecForRun, materializePersona, launchAgentToStartOpts } from "./launch.js";
+import { authorizeLaunch, authorizeNamedControl } from "./authorize.js";
 import { controlShutdown } from "./control-shutdown.js";
 /** Concurrency ceiling — the manager refuses to hold more than this many live + in-flight +
  *  cooling slots at once (P4a). Bounds a fork-bomb: spawn is a full agent process per call. */
@@ -27,6 +29,22 @@ export const READINESS_TIMEOUT_MS = 30_000;
  *  `.catch`. Generous over the helper's 5s connect timeout to allow the two consumer-deletes + ACL purge
  *  + drain on a healthy-but-slow broker. */
 const DEPROVISION_TIMEOUT_MS = 15_000;
+/** Sentinel owner-filter value that matches NO agent's `userOwner` (owner tokens never contain a
+ *  dash) — what {@link Manager.psOwnerFilter} returns for an unparseable caller so a malformed
+ *  principal fail-closes to an empty `ps` instead of an unbounded one. */
+const NO_OWNER_MATCHES = "-no-owner-";
+/** Run the agent's bearer argv once, pre-launch — the end-to-end auth preflight (state dir, daemon,
+ *  ledger row, secret). Its stderr is the provider command's operator-exact sentence; surface it
+ *  verbatim as the spawn refusal. */
+function execBearerPreflight(argv) {
+    return new Promise((res, rej) => {
+        execFile(argv[0], argv.slice(1), { timeout: 30_000, maxBuffer: 64 * 1024 }, (err, _stdout, stderr) => {
+            if (err)
+                return rej(new Error(stderr.trim() || err.message));
+            res();
+        });
+    });
+}
 /** Reject `p` with `Error(msg)` if it hasn't settled within `ms`; clears the timer when `p` settles so it
  *  never keeps the loop alive. Used to bound the detached deprovision so its fail-loud log is guaranteed. */
 function withTimeout(p, ms, msg) {
@@ -64,9 +82,14 @@ export class Manager {
      *  field so a test can shorten it (the join/exit signals are event-driven; only the backstop is timed).
      *  Production leaves it at the constant. */
     readinessTimeoutMs = READINESS_TIMEOUT_MS;
+    /** True on a USER-AUTH space (the on-disk marker; cross-checked against the registry at start).
+     *  Gates the whole spawn path: user mode grants ledger actors + bearer plumbing, never static mints. */
+    userMode = false;
     leaseInfo;
     leaseRevision;
     leaseTimer;
+    /** The class-2 renewal owner's half-TTL schedule (D5 slice 5); armed only on auth meshes. */
+    credRenewTimer;
     constructor(opts) {
         this.space = opts.space;
         this.servers = opts.servers;
@@ -89,16 +112,34 @@ export class Manager {
         // In auth mode the manager is just another user in the space's account — it mints
         // itself creds from the same signing key it uses for the agents it spawns.
         this.auth = loadSpaceAuth(authDir(this.workspaceRoot));
+        // USER-MODE detection is FAIL-CLOSED on the on-disk marker (the space-scoped state dir), never
+        // on the mutable mesh registry alone — registry drift/tamper must not let a user-auth space
+        // take the static self-mint branch. A marker/registry disagreement is a refused start with the
+        // repair, not a guess.
+        this.userMode = existsSync(userAuthStateDir(this.workspaceRoot, this.space));
+        const recorded = loadMeshes().find((m) => m.space === this.space);
+        if (recorded && (recorded.mode === "user") !== this.userMode)
+            throw new Error(`mesh registry says space "${this.space}" is ${recorded.mode}-mode but the on-disk user-auth marker ${this.userMode ? "exists" : "is missing"} (${userAuthStateDir(this.workspaceRoot, this.space)}) - \`cotal down\` and re-\`cotal up\` this space to reconcile before running a manager`);
+        if (this.userMode && !recorded)
+            throw new Error(`space "${this.space}" has user-auth state on disk but no mesh registry entry - a user-mode manager needs the authoritative record (\`cotal up\` writes it before the control plane); \`cotal up --user-auth\` this space, or remove the stale ${userAuthStateDir(this.workspaceRoot, this.space)}`);
+        if (this.userMode && !this.auth)
+            throw new Error(`space "${this.space}" has user-auth state but no auth.json under ${authDir(this.workspaceRoot)} - the pre-flip manager still needs the space trust bundle; re-run \`cotal up --user-auth\` here`);
         let creds;
         let id;
         if (this.auth) {
             const identity = newIdentity();
+            const auth = this.auth;
             id = identity.id;
             // The long-lived SUPERVISOR cred (closure (ii), residual 2): serve the three control tiers, hold the
             // singleton lease (open-only), publish + watch presence — and nothing else. Provisioning runs on an
             // EPHEMERAL provisioner connection per spawn (withProvisioner); destructive purge mints a PURGER per
             // call. So the always-on daemon holds no DM/DLV read, no consumer-create, no stream-admin tamper.
-            creds = await mintCreds(this.auth, identity, "supervisor");
+            //
+            // STANDING RENEWAL (D5 slice 5, class 1): the manager holds the DATA signing seed, so it is its
+            // own renewal owner — the cred rides the endpoint's SOURCE seam and self-remints (same identity,
+            // pinned by the endpoint) ahead of each bounded supervisor JWT's expiry. A copied supervisor
+            // cred is broker-dead within the matrix TTL.
+            creds = () => mintCreds(auth, identity, "supervisor");
         }
         this.ep = new CotalEndpoint({
             space: this.space,
@@ -135,7 +176,7 @@ export class Manager {
             await this.ep.stop();
             await this.attach.stop();
             throw new Error(held
-                ? `a manager already serves space "${this.space}" (id ${held.holder}, ${held.runtime}, pid ${held.pid}, root ${held.root}) — stop it first; one manager per space`
+                ? `a manager already serves space "${this.space}" (id ${held.holder}, ${held.runtime}, pid ${held.pid}, root ${held.root}) - stop it first; one manager per space`
                 : `could not acquire the manager lease for space "${this.space}": ${e.message}`);
         }
         this.leaseTimer = setInterval(() => { void this.renewLease(); }, MANAGER_LEASE_TTL_MS / 2);
@@ -153,12 +194,53 @@ export class Manager {
         this.ep.serveControl(CONTROL_PRIVILEGED, (req) => this.handle(req, CONTROL_PRIVILEGED), { boundReply: true });
         this.ep.serveControl(CONTROL_SELF_SERVICE, (req) => this.handle(req, CONTROL_SELF_SERVICE), { boundReply: true });
         this.ep.serveControl(CONTROL_ADMIN, (req) => this.handle(req, CONTROL_ADMIN), { boundReply: true });
+        // D5 slice 5 class 2: the manager is the CLASS-2 RENEWAL OWNER — the one control-plane process
+        // that is resident in EVERY mesh mode (foreground `up`, `up --detach`, same-root refresh) and
+        // holds the signer. Ordered initial pass NOW (ensureControlPlane starts delivery BEFORE the
+        // manager, so the daemon's launch-time creds write always precedes this — no write race), then
+        // every half-TTL: re-sign the daemon creds files for their EXISTING nkeys, request the explicit
+        // `reloadCreds` adoption on the delivery-admin rail, and persist the audit record doctor renders.
+        if (this.auth) {
+            await this.renewDaemonCreds();
+            this.credRenewTimer = setInterval(() => { void this.renewDaemonCreds(); }, (STANDING_RENEWABLE_TTL_SEC / 2) * 1000);
+            this.credRenewTimer.unref?.();
+        }
         // Plane-3 (durable backstop) is NOT the manager's job — the manager only manages agent lifecycle.
         // The server-side delivery daemon hosts the fan-out writer + trusted reader, owns the durable
         // membership registry, and serves the runtime durable join/leave/list ops (on `ctl.delivery`). The
         // manager records each agent's read ACL at spawn (`commitAcl`, in provisionAgent) so the daemon can
         // re-authorize it; that is the only Plane-3 state the manager touches, and it rides minting.
     }
+    /** One class-2 renewal pass (D5 slice 5): re-sign `.cotal/delivery.creds` + `.cotal/membership-rw.creds`
+     *  for their existing nkeys, then request the delivery daemon's EXPLICIT `reloadCreds` adoption on the
+     *  delivery-admin rail and persist the audit record (`.cotal/renewal.json`) that `cotal doctor auth`
+     *  renders — so "file re-signed" and "daemon adopted" are distinguishable states. A missing daemon
+     *  (no responder) is recorded honestly: the daemon's 75% source re-read remains the adoption backstop.
+     *  Never throws — renewal failure must be LOUD (log + record), not fatal to the supervisor. */
+    async renewDaemonCreds() {
+        try {
+            const results = await remintDaemonCreds(this.workspaceRoot);
+            const resigned = results.filter((r) => r.ok);
+            let adoption;
+            if (resigned.length) {
+                try {
+                    const reply = await this.ep.requestDeliveryAdmin("reloadCreds", {});
+                    adoption = reply.ok ? { ok: true, detail: reply.data } : { ok: false, error: reply.error };
+                }
+                catch (e) {
+                    adoption = { ok: false, error: `no delivery-admin responder (${e.message}) - the daemon's 75% re-read backstop adopts the re-signed file` };
+                }
+            }
+            for (const r of results.filter((x) => !x.ok && !x.skipped))
+                console.error(`! credential renewal: could not re-sign ${r.file}: ${r.error} - the daemon dies loud at this cred's expiry unless it is reminted`);
+            if (adoption && !adoption.ok)
+                console.error(`! credential renewal: daemon adoption failed: ${adoption.error}`);
+            writeRenewalRecord(this.workspaceRoot, { ts: new Date().toISOString(), owner: "manager", results, adoption });
+        }
+        catch (e) {
+            console.error(`! credential renewal pass failed: ${e.message}`);
+        }
+    }
     /** Tear down every managed agent's footprint — the shared teardown for EVERY manager-exit path (#159
      *  B2): graceful {@link stop} AND the fail-closed lease-loss exit ({@link renewLease}). A manager exit is
      *  a mass agent-exit, and without this its agents' footprints (creds files + `dm_`/`dlv_` durables + ACL
@@ -182,6 +264,8 @@ export class Manager {
     async stop() {
         if (this.leaseTimer)
             clearInterval(this.leaseTimer);
+        if (this.credRenewTimer)
+            clearInterval(this.credRenewTimer);
         await this.teardownManagedAgents(); // reap agents BEFORE releasing the lease/endpoints (#159 B2)
         await this.ep.releaseManagerLease(this.leaseRevision);
         await this.ep.stop();
@@ -198,7 +282,7 @@ export class Manager {
             this.leaseRevision = await this.ep.renewManagerLease(this.leaseInfo, this.leaseRevision);
         }
         catch (e) {
-            console.error(`! manager lost its singleton lease for space "${this.space}" (${e.message}) — shutting down to avoid two managers serving it`);
+            console.error(`! manager lost its singleton lease for space "${this.space}" (${e.message}) - shutting down to avoid two managers serving it`);
             if (this.leaseTimer)
                 clearInterval(this.leaseTimer);
             // Tear down our managed agents' footprints too (#159 B2) — this exit path leaks them otherwise. Do
@@ -247,14 +331,17 @@ export class Manager {
                 // Spawn is a privileged-tier op; reaching it via admin is fine (admin ⊇ privileged powers).
                 return this.opStart(args, caller);
             case "launch":
-                // SECURITY: manifest launch is operator-only (admin tier). It is higher-power than `start`
-                // — it boots an operator-authored, coordinated policy set from a run spec and underpins the
-                // ownership ledger — so a merely spawn-capable agent (which CAN publish to the privileged
-                // subject) must not reach it. Gate at the handler like `purge`; the subject alone isn't a
-                // boundary because `spawn` grants privileged-subject publish and dispatch is by op here.
-                if (!admin)
+                // SECURITY: on a STATIC mesh, manifest launch is operator-only (admin tier). It is
+                // higher-power than `start` — it boots an operator-authored, coordinated policy set from a
+                // run spec and underpins the ownership ledger — so a merely spawn-capable agent (which CAN
+                // publish to the privileged subject) must not reach it. Gate at the handler like `purge`;
+                // the subject alone isn't a boundary because `spawn` grants privileged-subject publish and
+                // dispatch is by op here. On a USER mesh, a spawn-scoped operator deploys THEIR OWN team on
+                // the privileged tier: opLaunch enforces owner-equality (the spec's apply-time stamped
+                // owner === the subject-pinned caller's owner) BEFORE any side effect.
+                if (!admin && !this.userMode)
                     return { ok: false, error: "launch is admin-only; not allowed on the privileged subject" };
-                return this.opLaunch(args, caller);
+                return this.opLaunch(args, caller, admin);
             case "stop": {
                 if (!name)
                     return { ok: false, error: "self-stop not allowed on privileged subject; send it on the self-service subject" };
@@ -271,11 +358,16 @@ export class Manager {
             case "attach":
                 return this.opAttach(args, caller, admin);
             case "ps":
-                return { ok: true, data: this.list() };
+                // USER mesh, privileged tier: `ps` lists only the CALLER's own owner-domain (the admin tier
+                // OR a fresh ledger `admin` scope sees all) — cross-owner agent metadata (principals,
+                // personas, auth health) is operator-grade. Fail-closed: an unparseable caller sees nothing.
+                // Static meshes are unchanged.
+                return { ok: true, data: this.list(await this.psOwnerFilter(caller, admin)) };
             case "models":
                 return this.opModels(args);
             case "status": {
-                const a = this.list().find((x) => x.name === name);
+                // Same owner-domain bound as `ps`: a cross-owner target reads as absent, never as metadata.
+                const a = this.list(await this.psOwnerFilter(caller, admin)).find((x) => x.name === name);
                 return a ? { ok: true, data: a } : { ok: false, error: `no agent "${name}"` };
             }
             default:
@@ -284,15 +376,27 @@ export class Manager {
     }
     /** Collapsed despawn/attach authorization (P4b). The caller already reached the privileged or
      *  admin tier (cred-gated). On the admin tier any named target is allowed (operator). On the
-     *  privileged tier a named target is allowed ONLY if it's the caller's OWN child
-     *  (`spawner == caller`) — so a spawn-capable peer can tear down what it spawned, never a peer's.
-     *  Returns an error string when denied, `undefined` when allowed. */
+     *  privileged tier a named target is allowed if it's the caller's OWN child (`spawner ==
+     *  caller`) — and, on a user mesh, if it runs under the CALLER'S OWNER (owner-domain) or the
+     *  caller's ledger row holds `admin`, read fresh. The policy is the pure
+     *  {@link authorizeNamedControl}; this wrapper only binds the manager's state (the mode flag +
+     *  the provider-backed ledger read — a build with no provider authorizes nothing extra,
+     *  fail-closed via the policy's catch). Error string when denied, `undefined` when allowed. */
     authorizeNamed(target, caller, admin) {
-        if (admin)
-            return undefined;
-        if (target.spawner === caller)
-            return undefined;
-        return `not authorized: ${target.name} was not spawned by ${caller} (admin tier required)`;
+        return authorizeNamedControl({
+            target: { name: target.name, spawner: target.spawner, userOwner: target.userOwner },
+            caller,
+            admin,
+            userMode: this.userMode,
+            scopeOf: (owner, actor) => resolveAuthProvider().actorScope({ dir: userAuthStateDir(this.workspaceRoot, this.space), owner, actor }),
+        });
+    }
+    /** The wire PRINCIPAL dot-form a managed agent's presence/control identity carries: user-mode
+     *  entries already store it in `id`; static mints store the raw nkey there (the durable/teardown
+     *  key), so the wire form derives under DEV_OWNER. Every comparison against an AUTHENTICATED wire
+     *  id (presence card.id, control from.id) must go through this, never raw `a.id`. */
+    managedPrincipal(a) {
+        return a.userOwner ? a.id : principalKey(DEV_OWNER, a.id).key;
     }
     /** Self-despawn (P2b): stop the managed agent whose id == the authenticated caller. The
      *  no-name self-op can only ever resolve to the caller's OWN managed entry (ids are unique
@@ -300,7 +404,7 @@ export class Manager {
      *  hitting another agent. Non-managed callers (human CLI, the manager itself, observers) find
      *  no match and get a loud error, not a silent no-op. */
     opStopSelf(callerId, args) {
-        const target = [...this.agents.values()].find((a) => a.id === callerId);
+        const target = [...this.agents.values()].find((a) => this.managedPrincipal(a) === callerId);
         if (!target)
             return { ok: false, error: `self-stop: caller ${callerId} is not a managed agent` };
         const graceful = args.graceful !== false;
@@ -334,6 +438,97 @@ export class Manager {
             console.error(`stop ${a.name} (${a.id}): ${e.message}`);
         }
     }
+    /** USER-MODE spawn provisioning (the gate-1 counterpart to the static mint block): resolve the
+     *  OWNER (ctl caller's principal, or the manifest's stamped owner — never a payload field),
+     *  pre-create the principal-keyed durables + ACL row on the ephemeral provisioner, author the
+     *  ledger grant (the upsert ROTATES the per-agent secret on every start — a non-running agent
+     *  never holds a standing mint secret), materialize the 0600 secret/sentinel files, and
+     *  PREFLIGHT the bearer chain once — the spawned agent must never be the first to discover a
+     *  dead auth plane. Every failure is returned as the refusal sentence, with the grant + files
+     *  rolled back. */
+    async provisionUserAgent(name, opts) {
+        const spawnerPr = opts.spawner ? parsePrincipalKey(opts.spawner) : null;
+        const owner = opts.specOwner ?? (spawnerPr && spawnerPr.owner.startsWith("u_") ? spawnerPr.owner : undefined);
+        if (!owner)
+            return {
+                error: `user-auth space "${this.space}": no owner for this spawn - call it from a user-mode session (\`cotal login\` then \`cotal spawn\`), or apply a manifest as a logged-in operator`,
+            };
+        let provider;
+        try {
+            provider = resolveAuthProvider();
+        }
+        catch (e) {
+            return { error: e.message };
+        }
+        const dir = userAuthStateDir(this.workspaceRoot, this.space);
+        // The agent's capability scope rides its ledger row (act.scope in every bearer) — same
+        // vocabulary as static capabilities; the broker maps them to the ctl tiers. `role:<r>` tokens
+        // pass through too (a persona may hold delegable roles) — the ledger's envelope walk still
+        // attenuates every one of these against the spawner chain.
+        const scope = (opts.capabilities ?? []).filter((c) => c === "spawn" || c === "admin" || /^role:[A-Za-z0-9_-]+$/.test(c));
+        const credsDir = join(authDir(this.workspaceRoot), "creds");
+        const tokenPath = join(credsDir, `${name}.actor-token`);
+        const sentinelPath = join(credsDir, `${name}.sentinel.creds`);
+        const healthPath = join(credsDir, `${name}.auth-health.json`);
+        try {
+            // The GRANT first — it is the envelope-rule enforcement point (a delegation must sit within
+            // the spawner's own grant), so a refused delegation exits here having touched nothing beyond
+            // the ledger: no durables, no broker footprint, nothing for a corrected respawn to race.
+            const grant = await provider.grantAgent({
+                dir,
+                space: this.space,
+                owner,
+                actor: name,
+                scope,
+                allowSubscribe: opts.allowSubscribe,
+                allowPublish: opts.allowPublish ?? [],
+                role: opts.role,
+                parent: spawnerPr ? opts.spawner : undefined,
+                label: opts.label,
+            });
+            // Durables + ACL row, principal-keyed — the same onboarding as static agents minus the mint
+            // (a user agent's credential is its bearer, minted by the callout per connect).
+            await this.withProvisioner((prov) => provisionAgentDurables(prov, { owner, actor: name }, {
+                subscribe: opts.subscribe,
+                allowSubscribe: opts.allowSubscribe,
+                role: opts.role,
+            }));
+            mkSecretDir(credsDir);
+            writeSecretFile(tokenPath, grant.actorToken);
+            writeSecretFile(sentinelPath, grant.sentinelCreds);
+            rmSync(healthPath, { force: true }); // a fresh start opens a fresh health window
+            const bearerCmd = [
+                // The manager's own invocation prefix (node + loader flags + the cotal entry) — the agent
+                // process execs this argv for every bearer, so it must resolve from ANY cwd. Correct
+                // whenever the manager runs under a real `cotal` entry (supervise/up); a test constructing
+                // Manager directly never reaches this branch (user meshes boot through the CLI).
+                process.execPath,
+                ...process.execArgv,
+                process.argv[1],
+                provider.agentBearerCommand,
+                "--dir", dir,
+                "--space", this.space,
+                "--owner", owner,
+                "--actor", name,
+                "--token-file", tokenPath,
+                "--health-file", healthPath,
+            ];
+            await execBearerPreflight(bearerCmd);
+            return { owner, launch: { owner, actor: name, sentinelCredsPath: sentinelPath, bearerCmd } };
+        }
+        catch (e) {
+            // Roll back everything this attempt materialized — a refused spawn must leave no standing
+            // secret, no ledger row, no durable footprint — and AWAIT the broker teardown: the caller
+            // may respawn the moment it reads the refusal, and a detached teardown would race (and
+            // delete) that fresh spawn's just-provisioned durables.
+            await provider.revokeAgent({ dir, owner, actor: name }).catch(() => { });
+            rmSync(tokenPath, { force: true });
+            rmSync(sentinelPath, { force: true });
+            rmSync(healthPath, { force: true });
+            await this.deprovision({ id: principalKey(owner, name).key, name, userOwner: owner }).catch((err) => console.error(`rollback deprovision ${name}: ${err.message}`));
+            return { error: `agent auth preflight failed for "${name}": ${e.message}` };
+        }
+    }
     /** Drop a live agent's slot. When `floor` is set and the agent died young (lived less than
      *  MIN_LIFETIME), push a cooling stamp so the freed slot still counts toward the ceiling until it
      *  expires — flooring the RECYCLE, not the call, so both free paths (despawn + exit/reap) are
@@ -351,10 +546,10 @@ export class Manager {
         // makes this fire exactly once per agent across every free path (despawn / self-stop / reap / exit).
         void this.deprovision(a).catch((e) => console.error(`deprovision ${a.name} (${a.id}): ${e.message}`));
     }
-    /** Tear down a departed agent's minted footprint (#159 B2, auth mode): its id-keyed durables
-     *  (`dm_<id>`, `dlv_<id>`), its read-ACL row, and its creds file — everything the spawn's
+    /** Tear down a departed agent's minted footprint (#159 B2, auth mode): its local-principal durables
+     *  (`dm_local-<id>`, `dlv_local-<id>`), its read-ACL row, and its creds file — everything the spawn's
      *  `provisionAgent` + creds-write left behind. Mints an EPHEMERAL, TARGET-PINNED `deprovisioner` cred
-     *  (mirrors the ephemeral `provisioner`/`purger`): it can delete only THIS agent's id-keyed footprint,
+     *  (mirrors the ephemeral `provisioner`/`purger`): it can delete only THIS agent's local-principal footprint,
      *  never a peer's and never the role-shared `svc_<role>` (which its siblings still bind). Open mesh →
      *  no-op (nothing was minted). Idempotent at the broker (missing consumer / ACL row = no-op) and on
      *  disk (`force` tolerates an absent creds file, e.g. a ledgered deploy that wrote none).
@@ -370,6 +565,25 @@ export class Manager {
         // departed agent, so it must not survive even if the broker teardown below fails or times out. The
         // teardown mints its OWN deprovisioner cred (not this file), so removing it early is independent.
         rmSync(join(authDir(this.workspaceRoot), "creds", `${a.name}.creds`), { force: true });
+        if (a.userOwner) {
+            // USER MODE: this teardown IS revocation, not just footprint reduction — the ledger row is
+            // the agent's standing mint authority, so delete it (next exchange refused, next connect
+            // denied) and shred the secret/sentinel/health files. A copied actor token dies here; a
+            // still-LIVE connection ends at its bearer-bound JWT expiry (≤ the agent TTL).
+            const credsDir = join(authDir(this.workspaceRoot), "creds");
+            for (const f of [`${a.name}.actor-token`, `${a.name}.sentinel.creds`, `${a.name}.auth-health.json`])
+                rmSync(join(credsDir, f), { force: true });
+            try {
+                await resolveAuthProvider().revokeAgent({
+                    dir: userAuthStateDir(this.workspaceRoot, this.space),
+                    owner: a.userOwner,
+                    actor: a.name,
+                });
+            }
+            catch (e) {
+                console.error(`revoke agent grant ${a.name}: ${e.message}`);
+            }
+        }
         const creds = await mintCreds(this.auth, newIdentity(), "deprovisioner", { deprovisionTarget: a.id });
         // Bound the detached broker teardown so a wedged broker can't leave the deprovision promise pending
         // forever with no log — the timeout rejects into freeSlot's fail-loud `.catch` (paired with the
@@ -437,6 +651,10 @@ export class Manager {
             return Promise.resolve({ ok: false, error: "resume: session id must not be empty" });
         if (args.variant !== undefined && !String(args.variant).trim())
             return Promise.resolve({ ok: false, error: "variant: must not be empty" });
+        // Opaque launch options, when present, must be a mapping — a raw control message could send a
+        // scalar/array (the CLI never does). Core doesn't interpret the keys; the connector validates them.
+        if (args.launchOptions !== undefined && (typeof args.launchOptions !== "object" || args.launchOptions === null || Array.isArray(args.launchOptions)))
+            return Promise.resolve({ ok: false, error: "launchOptions: expected a key:value mapping" });
         // ACL overrides arrive as string arrays or not at all — a malformed value is a bad request,
         // not something to coerce (no fallbacks).
         const strList = (v, flag) => {
@@ -463,6 +681,7 @@ export class Manager {
             identity: args.identity ? String(args.identity) : undefined,
             model: args.model ? String(args.model) : undefined,
             variant: args.variant ? String(args.variant) : undefined,
+            launchOptions: args.launchOptions,
             resume: args.resume ? String(args.resume) : undefined,
             transcript: typeof args.transcript === "boolean" ? args.transcript : undefined,
             cwd: args.cwd ? String(args.cwd) : undefined,
@@ -487,7 +706,7 @@ export class Manager {
                     agent: connector.name,
                     supported: true,
                     models: [],
-                    error: `${connector.name} harness needs ${missing.join(", ")} on PATH — not found`,
+                    error: `${connector.name} harness needs ${missing.join(", ")} on PATH - not found`,
                 };
             try {
                 const catalog = await connector.listModels({ refresh });
@@ -510,6 +729,33 @@ export class Manager {
         }
         return { ok: true, data: await Promise.all(registry.all("connector").map(one)) };
     }
+    /** The owner-domain bound on `ps`/`status` metadata: on a USER mesh, a privileged-tier caller
+     *  sees only agents under its OWN subject-pinned owner. Two ways to see ALL owners: the admin
+     *  TIER (operator), or a fresh ledger `admin` SCOPE on the caller's row — the SAME authority that
+     *  lets `stop`/`attach` reach cross-owner agents ({@link authorizeNamedControl}). Without this the
+     *  two surfaces disagree: an admin operator could cross-owner stop an agent it could not list.
+     *  Read fresh so a revoked admin loses visibility on its next call; a read failure and an
+     *  unparseable caller both fall closed (own-owner / matches-nothing). Static meshes are unbounded. */
+    async psOwnerFilter(caller, admin) {
+        if (!this.userMode || admin)
+            return undefined;
+        const key = parsePrincipalKey(caller);
+        if (!key)
+            return NO_OWNER_MATCHES;
+        try {
+            const scope = await resolveAuthProvider().actorScope({
+                dir: userAuthStateDir(this.workspaceRoot, this.space),
+                owner: key.owner,
+                actor: key.actor,
+            });
+            if (scope?.includes("admin"))
+                return undefined;
+        }
+        catch {
+            /* unreadable ledger authorizes nothing extra: fall through to the own-owner bound */
+        }
+        return key.owner;
+    }
     /** Boot one resolved agent from a mesh-manifest launch spec, for `cotal spawn -f` onto a RUNNING
      *  manager. The request carries a `{ runId, name }`, NEVER a path: the manager derives + validates
      *  `.cotal/run/<runId>.json` itself ({@link launchSpecForRun} — token-safe id, no-follow,
@@ -517,8 +763,9 @@ export class Manager {
      *  agent's transient persona, and spawns via the same `startAgent({ resolved })` path as
      *  `supervise --launch`. The reply is enriched for the ownership ledger: the SPAWNED
      *  (collision-numbered) name + nkey id creds are filed under, plus the manifest `requested` name,
-     *  `runId`, and resolved `hash`. */
-    async opLaunch(args, caller) {
+     *  `runId`, and resolved `hash`. USER mesh: a privileged-tier launch is owner-equality-authorized
+     *  (spec owner === caller owner) before any side effect; the admin tier keeps operator behavior. */
+    async opLaunch(args, caller, admin) {
         const runId = String(args.runId ?? "").trim();
         const name = String(args.name ?? "").trim();
         if (!runId || !name)
@@ -533,6 +780,18 @@ export class Manager {
         const la = spec.agents.find((a) => a.name === name);
         if (!la)
             return { ok: false, error: `no agent "${name}" in launch spec for run ${runId}` };
+        // USER mesh: a manifest launch runs under the spec's apply-time owner, never the ctl caller —
+        // fail loud on a spec without one rather than guess (core `MeshLaunchSpec.owner`).
+        if (this.userMode && !spec.owner)
+            return { ok: false, error: `user-auth space "${this.space}": launch spec for run ${runId} carries no owner - re-apply the manifest as a logged-in operator` };
+        if (this.userMode) {
+            // Privileged-tier user-mode launch: owner-equality (spec owner === caller owner), decided by
+            // the pure policy BEFORE materializePersona or any other side effect, so a denied
+            // cross-owner launch writes nothing. Admin tier passes through it unchanged.
+            const denied = authorizeLaunch({ specOwner: spec.owner, caller, admin, runId });
+            if (denied)
+                return { ok: false, error: denied };
+        }
         let configPath;
         try {
             configPath = materializePersona(this.workspaceRoot, runId, la);
@@ -540,7 +799,7 @@ export class Manager {
         catch (e) {
             return { ok: false, error: e.message };
         }
-        const reply = await this.startAgent(launchAgentToStartOpts(la, configPath), caller);
+        const reply = await this.startAgent(launchAgentToStartOpts(la, configPath, spec.owner), caller);
         if (reply.ok)
             // `data.name` stays the spawned (numbered) identity — what creds are filed under and the ledger
             // keys on; `requested`/`runId`/`hash` give the CLI the manifest name + drift hash for the ledger.
@@ -590,7 +849,7 @@ export class Manager {
         else {
             configPath = agentFilePath(this.workspaceRoot, ref);
             if (!existsSync(configPath))
-                return { ok: false, error: `no persona "${ref}" — ${configPath} not found; create it or pass --config (see \`cotal personas list\`)` };
+                return { ok: false, error: `no persona "${ref}" - ${configPath} not found; create it or pass --config (see \`cotal personas list\`)` };
         }
         // Connector + harness preflight before reserving a slot or minting — a missing connector or a
         // missing `claude`/`opencode` binary fails here with a clear name, not obscurely at process
@@ -604,7 +863,7 @@ export class Manager {
         }
         const missing = (connector.requires ?? []).filter((bin) => !resolveOnPath(bin));
         if (missing.length)
-            return { ok: false, error: `${agent} harness needs ${missing.join(", ")} on PATH — not found` };
+            return { ok: false, error: `${agent} harness needs ${missing.join(", ")} on PATH - not found` };
         // Resume is a connector capability: reject an unsupported resume HERE, before the reserve/mint, so
         // it can never provision creds + durables and then throw at buildLaunch (mint-then-orphan). Same
         // reject-before-side-effects window as the harness preflight above; buildLaunch stays the backstop.
@@ -623,6 +882,7 @@ export class Manager {
         let capabilities;
         let model = opts.model;
         let variant = opts.variant;
+        let launchOptions = opts.launchOptions;
         if (opts.resolved) {
             // A manifest launch is the access + identity authority: imperative overrides arriving
             // alongside `resolved` are a caller contract error, not something to merge (no fallbacks).
@@ -637,6 +897,7 @@ export class Manager {
             capabilities = r.capabilities;
             model = opts.model ?? r.model;
             variant = opts.variant ?? r.variant;
+            launchOptions = mergeLaunchOptions(r.launchOptions, opts.launchOptions);
         }
         else {
             let def;
@@ -661,6 +922,7 @@ export class Manager {
             allowPublish = opts.allowPublish ?? def.allowPublish;
             capabilities = def.capabilities;
             variant = opts.variant ?? def.variant;
+            launchOptions = mergeLaunchOptions(def.launchOptions, opts.launchOptions);
         }
         const idErr = this.nameError(identityName);
         if (idErr)
@@ -687,6 +949,11 @@ export class Manager {
         // Set once the agent's creds + durables are minted; cleared the moment a live slot takes ownership
         // (`agents.set`, after which freeSlot deprovisions on exit). If it survives to `finally`, the spawn
         // threw AFTER minting (buildLaunch / runtime.spawn) — tear the orphan down so no footprint leaks (#159 B).
+        // Set once the agent's footprint (durables + creds, or the user-mode grant + secret files)
+        // exists; cleared when a live slot takes ownership. If it survives to `finally`, the spawn threw
+        // AFTER provisioning (buildLaunch / runtime.spawn) — the orphan-rollback tears it down. Carries
+        // `userOwner` for a user-mode spawn so that rollback runs the revoke+shred branch, not just the
+        // static durable teardown (the freelance found this window leaking the managed grant + files).
         let provisioned;
         try {
             // A stable nkey identity assigned at spawn: the public key is the agent's card.id (threaded via
@@ -696,7 +963,28 @@ export class Manager {
             // spawned session reads them (COTAL_CREDS path). Open mesh → no creds. Scope = the resolved
             // subscribe/allowSubscribe (read) + allowPublish (post, default-deny).
             let credsPath;
-            if (this.auth) {
+            let userLaunch;
+            let userOwner;
+            if (this.userMode) {
+                const prep = await this.provisionUserAgent(name, {
+                    spawner,
+                    specOwner: opts.owner,
+                    subscribe,
+                    allowSubscribe,
+                    allowPublish,
+                    role,
+                    capabilities,
+                    label: ref,
+                });
+                if ("error" in prep) {
+                    this.reserved.delete(name);
+                    return { ok: false, error: prep.error };
+                }
+                userLaunch = prep.launch;
+                userOwner = prep.owner;
+                provisioned = { id: principalKey(prep.owner, name).key, name, userOwner: prep.owner };
+            }
+            else if (this.auth) {
                 // Pre-create the agent's bind-only chat (+ DM + role TASK) durables and mint its scoped creds
                 // — the shared onboarding step (provisionAgent). It runs on a short-lived PROVISIONER connection
                 // (NOT the supervisor's long-lived endpoint), so the DM/DLV consumer-create surface exists only
@@ -725,12 +1013,16 @@ export class Manager {
                 space: this.space,
                 name,
                 role,
-                id: identity.id,
+                // User mode: the principal IS the identity (the endpoint derives card.id from owner+actor);
+                // no nkey id, no static creds.
+                id: userLaunch ? undefined : identity.id,
                 creds: credsPath,
+                userAuth: userLaunch,
                 servers: this.servers,
                 configPath,
                 model,
                 variant,
+                launchOptions,
                 // Fork an existing session into the mesh. Taken straight from `opts.resume` (the imperative
                 // control arg), never from `opts.resolved` — so the manifest launch path carries no resume by
                 // construction. An unsupported connector throws here before any process is spawned.
@@ -756,8 +1048,8 @@ export class Manager {
                 name,
                 role,
                 agent,
-                id: identity.id,
-                seed: identity.seed,
+                id: userLaunch ? principalKey(userLaunch.owner, name).key : identity.id,
+                ...(userLaunch ? { userOwner } : { seed: identity.seed }),
                 spawner: spawner ?? this.ep.ref().id,
                 startedAt: Date.now(),
                 handle,
@@ -779,7 +1071,10 @@ export class Manager {
             this.watchExit(managed);
             if (!readiness.ok)
                 return { ok: false, error: readiness.detail }; // uncertain — non-success, but kept
-            return { ok: true, data: { name, role, agent, id: identity.id, mode: handle.kind } };
+            // Reply with the id the slot actually carries (user-mode: the owner.actor principal —
+            // presence, ps, and the manifest ownership ledger all key on it; the throwaway static nkey
+            // would never match and down -f would treat the agent as foreign).
+            return { ok: true, data: { name, role, agent, id: managed.id, mode: handle.kind } };
         }
         catch (e) {
             // Failure after reserve (provision / launch threw): the slot was never live, so no cold-start
@@ -818,7 +1113,11 @@ export class Manager {
             /* tmux/cmux stream no exit — presence-or-backstop only */
         }
         const s = session;
-        const joined = () => this.ep.getRoster().some((p) => p.card.id === a.id && p.status !== "offline");
+        // Presence cards carry the wire PRINCIPAL dot-form (`<owner>.<actor>`), never a raw nkey — match
+        // through managedPrincipal or a static launch can never be seen joining (every static spawn would
+        // resolve "uncertain"; caught by the lifecycle e2e).
+        const wanted = this.managedPrincipal(a);
+        const joined = () => this.ep.getRoster().some((p) => p.card.id === wanted && p.status !== "offline");
         return await new Promise((resolve) => {
             let done = false;
             let timer;
@@ -846,13 +1145,13 @@ export class Manager {
                 void (async () => {
                     const tail = this.tail(await s.backlog());
                     this.onAgentExit(a);
-                    finish({ ok: false, detail: `${a.name} exited on launch${tail ? ` — last output: ${tail}` : ""}` });
+                    finish({ ok: false, detail: `${a.name} exited on launch${tail ? ` - last output: ${tail}` : ""}` });
                 })();
             };
             timer = setTimeout(() => finish({
                 ok: false,
                 uncertain: true,
-                detail: `${a.name} (${a.id}): launch status uncertain — no process exit and no mesh presence within ${Math.round(this.readinessTimeoutMs / 1000)}s; it may still be booting or stuck before connector startup. Inspect with \`cotal attach ${a.name}\` / \`cotal ps\`, or stop it to clean up.`,
+                detail: `${a.name} (${a.id}): launch status uncertain - no process exit and no mesh presence within ${Math.round(this.readinessTimeoutMs / 1000)}s; it may still be booting or stuck before connector startup. Inspect with \`cotal attach ${a.name}\` / \`cotal ps\`, or stop it to clean up.`,
             }), this.readinessTimeoutMs);
             unsubExit = s ? s.onExit(onExit) : () => { };
             this.ep.on("presence", onPresence);
@@ -905,12 +1204,12 @@ export class Manager {
         this.cooling = this.cooling.filter((stamp) => stamp > now);
         return this.cooling.length;
     }
-    opStop(args, caller, admin) {
+    async opStop(args, caller, admin) {
         const name = String(args.name ?? "").trim();
         const a = this.agents.get(name);
         if (!a)
             return { ok: false, error: `no agent "${name}"` };
-        const denied = this.authorizeNamed(a, caller, admin);
+        const denied = await this.authorizeNamed(a, caller, admin);
         if (denied)
             return { ok: false, error: denied };
         const graceful = args.graceful !== false;
@@ -998,7 +1297,7 @@ export class Manager {
                 return { ok: false, error: e.message };
             }
             if (!admin && def.owner !== caller) {
-                const owner = def.owner ? `owned by ${def.owner}` : "operator-owned (legacy file — no agent owner)";
+                const owner = def.owner ? `owned by ${def.owner}` : "operator-owned (legacy file - no agent owner)";
                 return { ok: false, error: `not authorized to redefine ${name}: ${owner}; only its owner or an operator can` };
             }
             // PATCH content: overwrite model only when provided, so a persona-only redefine can't wipe an existing model.
@@ -1019,14 +1318,14 @@ export class Manager {
         }
         return { ok: true, data: { name, path } };
     }
-    opAttach(args, caller, admin) {
+    async opAttach(args, caller, admin) {
         const name = String(args.name ?? "").trim();
         const a = this.agents.get(name);
         if (!a)
             return { ok: false, error: `no agent "${name}"` };
-        // attach grants terminal read+write — same own/admin scoping as despawn: own child on the
-        // privileged tier, any agent on admin.
-        const denied = this.authorizeNamed(a, caller, admin);
+        // attach grants terminal read+write — same scoping as despawn: own child (and, on a user
+        // mesh, the caller's owner-domain) on the privileged tier, any agent on admin.
+        const denied = await this.authorizeNamed(a, caller, admin);
         if (denied)
             return { ok: false, error: denied };
         // Only pty streams over the WS attach endpoint. tmux/cmux are watched natively, and
@@ -1043,21 +1342,34 @@ export class Manager {
         return { ok: true, data: { ws: this.attach.url(name) } };
     }
     /** Managed agents cross-referenced with live presence (the manager sees the roster). */
-    list() {
+    /** `ownerFilter`: restrict to agents whose spawn-time stored `userOwner` equals it (the ps/status
+     *  owner-domain bound); undefined = unbounded. {@link NO_OWNER_MATCHES} matches nothing. */
+    list(ownerFilter) {
         const roster = new Map(this.ep.getRoster().map((p) => [p.card.name, p]));
-        return [...this.agents.values()].map((a) => ({
-            name: a.name,
-            // The spawned agent's nkey — lets an operator tool (e.g. `cotal down -f`) match a ledger entry
-            // by name AND id before stopping, so it never stops a same-named foreign agent.
-            id: a.id,
-            role: a.role,
-            agent: a.agent,
-            space: this.space,
-            mode: a.handle.kind,
-            status: a.handle.status(),
-            uptimeMs: Date.now() - a.startedAt,
-            mesh: roster.get(a.name)?.status ?? "absent",
-        }));
+        return [...this.agents.values()].filter((a) => ownerFilter === undefined || a.userOwner === ownerFilter).map((a) => {
+            // USER MODE: a detached agent's bearer-refresh death is silent everywhere except here — its
+            // bearer command writes each attempt's outcome to the health file, and `ps` renders it
+            // FAIL-CLOSED: a failed record is the failure + repair sentence; a missing/malformed or
+            // stale record on a live agent is auth-unknown/auth-stale, NEVER silently healthy.
+            const health = a.userOwner
+                ? agentAuthState(join(authDir(this.workspaceRoot), "creds", `${a.name}.auth-health.json`))
+                : undefined;
+            return {
+                name: a.name,
+                // The spawned agent's id (nkey, or the user-mode principal) — lets an operator tool (e.g.
+                // `cotal down -f`) match a ledger entry by name AND id before stopping, so it never stops a
+                // same-named foreign agent.
+                id: a.id,
+                role: a.role,
+                agent: a.agent,
+                space: this.space,
+                mode: a.handle.kind,
+                status: a.handle.status(),
+                uptimeMs: Date.now() - a.startedAt,
+                mesh: roster.get(a.name)?.status ?? "absent",
+                ...(health && health.state !== "ok" ? { authHealth: health.state, authReason: health.reason } : {}),
+            };
+        });
     }
 }
 //# sourceMappingURL=manager.js.map