@monoes/monomindcli 2.10.10 → 2.10.14

package/dist/src/orgrt/role-slot.js

@@ -0,0 +1,133 @@
+/** Fold only the SUPPLIED override fields onto `current`; every omitted
+ *  field keeps its current effective value (including across repeated
+ *  replacements — `current` is always the slot's effectiveRole, never the
+ *  original org-definition role, so this naturally persists overrides
+ *  through however many replacements have already happened). */
+export function mergeEffectiveRoleConfig(current, overrides) {
+    const merged = {
+        ...current,
+        ...(overrides.runtime !== undefined ? { runtime: overrides.runtime } : {}),
+    };
+    if (overrides.model !== undefined || overrides.providerName !== undefined) {
+        merged.adapter_config = {
+            ...current.adapter_config,
+            ...(overrides.model !== undefined ? { model: overrides.model } : {}),
+            ...(overrides.providerName !== undefined ? { provider: overrides.providerName } : {}),
+        };
+    }
+    return merged;
+}
+/** The role's per-incarnation token ceiling when org_respawn_role omits
+ *  `budgetTokens`: reuse the SAME allocator startup uses (daemon.ts's
+ *  perRoleBudget computation), not the older even-split-only
+ *  roleTokenBudget() helper. A role with its own budget_tokens override
+ *  always gets that value; otherwise the remaining org budget (after
+ *  subtracting every override) is split evenly across every role WITHOUT
+ *  an override. */
+export function computeReplacementBudget(def, roleId) {
+    const role = def.roles.find((r) => r.id === roleId);
+    if (!role)
+        throw new Error(`computeReplacementBudget: unknown role "${roleId}"`);
+    if (role.budget_tokens != null)
+        return role.budget_tokens;
+    const orgBudgetTokens = def.run_config.budget_tokens ?? 1_000_000;
+    const overriddenTokenSum = def.roles.reduce((sum, r) => sum + (r.budget_tokens ?? 0), 0);
+    const unoverriddenRoleCount = def.roles.filter((r) => r.budget_tokens == null).length;
+    return unoverriddenRoleCount > 0
+        ? Math.max(0, Math.floor((orgBudgetTokens - overriddenTokenSum) / unoverriddenRoleCount))
+        : 0;
+}
+const RUNTIME_KINDS = new Set([
+    'claude',
+    'kimicode',
+    'opencode',
+    'vercel',
+    'codex',
+    'antigravity',
+    'grok',
+    'qwen',
+    'crush',
+    'copilot',
+    'pi',
+    'pi-rpc',
+    'qwen-rpc',
+]);
+function boundedString(value, max) {
+    if (typeof value !== 'string')
+        return null;
+    const trimmed = value.trim();
+    if (!trimmed || trimmed.length > max)
+        return null;
+    return trimmed;
+}
+/** Validate and bound every field of an org_respawn_role call before any
+ *  state change or preflight is attempted. See the design doc's "Validation
+ *  rules" — limits chosen there: roleId 128, reason 1000, briefing 20000. */
+export function validateRespawnInput(input) {
+    const raw = (input ?? {});
+    const roleId = boundedString(raw.roleId, 128);
+    if (!roleId)
+        return { ok: false, error: 'roleId is required (1-128 characters)' };
+    const reason = boundedString(raw.reason, 1000);
+    if (!reason)
+        return { ok: false, error: 'reason is required (1-1000 characters)' };
+    const briefing = boundedString(raw.briefing, 20_000);
+    if (!briefing)
+        return { ok: false, error: 'briefing is required (1-20000 characters)' };
+    let runtime;
+    if (raw.runtime !== undefined) {
+        if (typeof raw.runtime !== 'string' || !RUNTIME_KINDS.has(raw.runtime)) {
+            return { ok: false, error: `runtime must be one of: ${[...RUNTIME_KINDS].join(', ')}` };
+        }
+        runtime = raw.runtime;
+    }
+    let model;
+    if (raw.model !== undefined) {
+        const m = boundedString(raw.model, 256);
+        if (!m)
+            return { ok: false, error: 'model must be a non-empty string (max 256 characters)' };
+        model = m;
+    }
+    let providerName;
+    if (raw.providerName !== undefined) {
+        const p = boundedString(raw.providerName, 128);
+        if (!p)
+            return { ok: false, error: 'providerName must be a non-empty string (max 128 characters)' };
+        providerName = p;
+    }
+    let budgetTokens;
+    if (raw.budgetTokens !== undefined) {
+        const b = raw.budgetTokens;
+        if (typeof b !== 'number' || !Number.isSafeInteger(b) || b <= 0) {
+            return { ok: false, error: 'budgetTokens must be a positive integer' };
+        }
+        budgetTokens = b;
+    }
+    return {
+        ok: true,
+        value: { roleId, reason, briefing, runtime, model, providerName, budgetTokens },
+    };
+}
+/** Audit/status-safe view of a role's runtime config — never includes
+ *  role.provider (which may carry apiKey/authToken/baseUrl). */
+export function redactRoleConfig(role) {
+    const out = {};
+    if (role.runtime)
+        out.runtime = role.runtime;
+    if (role.adapter_config?.model)
+        out.model = role.adapter_config.model;
+    if (role.adapter_config?.provider)
+        out.providerName = role.adapter_config.provider;
+    return out;
+}
+export function buildRespawnReceipt(slot, maxRespawns, success, extra = {}) {
+    return {
+        success,
+        roleId: '',
+        generation: slot.generation,
+        respawnCount: slot.respawnCount,
+        respawnsRemaining: Math.max(0, maxRespawns - slot.respawnCount),
+        ...extra,
+    };
+}
+//# sourceMappingURL=role-slot.js.map

package/dist/src/orgrt/role-slot.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"role-slot.js","sourceRoot":"","sources":["../../../src/orgrt/role-slot.ts"],"names":[],"mappings":"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"}

package/dist/src/orgrt/runtime-options.d.ts

@@ -0,0 +1,17 @@
+export interface RuntimeOption {
+    id: string;
+    available: boolean;
+    binary?: string;
+    version?: string;
+    installHint?: string;
+}
+export interface NamedProviderOption {
+    name: string;
+    defaultModel?: string;
+}
+export interface RuntimeOptionsReceipt {
+    runtimes: RuntimeOption[];
+    namedProviders: NamedProviderOption[];
+}
+export declare function buildRuntimeOptions(searchFrom?: string): Promise<RuntimeOptionsReceipt>;
+//# sourceMappingURL=runtime-options.d.ts.map

package/dist/src/orgrt/runtime-options.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtime-options.d.ts","sourceRoot":"","sources":["../../../src/orgrt/runtime-options.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,cAAc,EAAE,mBAAmB,EAAE,CAAC;CACvC;AAED,wBAAsB,mBAAmB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAsB7F"}

package/dist/src/orgrt/runtime-options.js

@@ -0,0 +1,32 @@
+// packages/@monomind/cli/src/orgrt/runtime-options.ts
+/** Data source for the org_list_runtime_options tool. Read-only: wraps
+ *  runner-registry.ts's install/version detection and provider.ts's named
+ *  provider config, applying the in-process-runtime correction and
+ *  credential redaction the design calls for. See
+ *  docs/mastermind/specs/2026-09-07-org-runtime-role-respawn-design.md. */
+import { listConfiguredProviders } from './provider.js';
+import { RUNNER_SPECS, scanInstalled } from './runner-registry.js';
+export async function buildRuntimeOptions(searchFrom) {
+    const scan = await scanInstalled();
+    const specById = new Map(RUNNER_SPECS.map((s) => [s.id, s]));
+    const runtimes = scan.agents.map((entry) => {
+        const spec = specById.get(entry.id);
+        // In-process runtimes (spec.binary === null, e.g. vercel) have nothing to
+        // find on PATH — scanInstalled's installed:false for them is a false
+        // negative ("not installed"), not a real unavailability signal.
+        const available = spec?.binary === null ? true : entry.installed;
+        return {
+            id: entry.id,
+            available,
+            ...(entry.binary ? { binary: entry.binary } : {}),
+            ...(entry.version ? { version: entry.version } : {}),
+            ...(entry.install_hint ? { installHint: entry.install_hint } : {}),
+        };
+    });
+    const namedProviders = listConfiguredProviders(searchFrom).map((p) => ({
+        name: p.name,
+        ...(p.model ? { defaultModel: p.model } : {}),
+    }));
+    return { runtimes, namedProviders };
+}
+//# sourceMappingURL=runtime-options.js.map

package/dist/src/orgrt/runtime-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtime-options.js","sourceRoot":"","sources":["../../../src/orgrt/runtime-options.ts"],"names":[],"mappings":"AAAA,sDAAsD;AACtD;;;;2EAI2E;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAoBnE,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,UAAmB;IAC3D,MAAM,IAAI,GAAG,MAAM,aAAa,EAAE,CAAC;IACnC,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,MAAM,QAAQ,GAAoB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC1D,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAyC,CAAC,CAAC;QAC3E,0EAA0E;QAC1E,qEAAqE;QACrE,gEAAgE;QAChE,MAAM,SAAS,GAAG,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC;QACjE,OAAO;YACL,EAAE,EAAE,KAAK,CAAC,EAAE;YACZ,SAAS;YACT,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACjD,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACpD,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACnE,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,MAAM,cAAc,GAA0B,uBAAuB,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5F,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9C,CAAC,CAAC,CAAC;IACJ,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC;AACtC,CAAC"}

package/dist/src/orgrt/scheduler-integration.d.ts

@@ -16,4 +16,15 @@ export declare function scheduleBossRestart(daemon: OrgDaemon, name: string): vo
  *  before capacity returns; `running` is compared by identity, not `name`,
  *  so a stale retry can never spawn into a different run. */
 export declare function scheduleDeferredSpawn(daemon: OrgDaemon, name: string, running: RunningOrg, role: OrgRole, spawnRole: (role: OrgRole) => void): void;
+/** Bug 4: a role deferred because the org is already at its
+ *  run_config.max_concurrent_agents ceiling isn't abandoned either — poll
+ *  until a slot frees up (another role in this org ends, crashes, or is
+ *  stopped — activeRoleCount() recomputes live each check, so nothing here
+ *  needs to explicitly track "a slot freed") and spawn it then. Same shape as
+ *  scheduleDeferredSpawn's host-resource-pressure case, just gated on the
+ *  org's own concurrency cap instead of waitForCapacity(). Bails quietly if
+ *  the org is stopped (or restarted under the same name) before a slot
+ *  frees; `running` is compared by identity, not `name`, so a stale retry can
+ *  never spawn into a different run. */
+export declare function scheduleConcurrencyDeferredSpawn(daemon: OrgDaemon, name: string, running: RunningOrg, role: OrgRole, spawnRole: (role: OrgRole) => void): void;
 //# sourceMappingURL=scheduler-integration.d.ts.map

package/dist/src/orgrt/scheduler-integration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler-integration.d.ts","sourceRoot":"","sources":["../../../src/orgrt/scheduler-integration.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAE1C;6EAC6E;AAC7E,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAW9D;AAED;;;;qCAIqC;AACrC,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAuDzE;AAED;;;;;6DAK6D;AAC7D,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,UAAU,EACnB,IAAI,EAAE,OAAO,EACb,SAAS,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,GACjC,IAAI,CAgEN"}
+{"version":3,"file":"scheduler-integration.d.ts","sourceRoot":"","sources":["../../../src/orgrt/scheduler-integration.ts"],"names":[],"mappings":"AAKA,OAAO,EAAmB,SAAS,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAE1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAuC1C;6EAC6E;AAC7E,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAW9D;AAED;;;;qCAIqC;AACrC,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAuDzE;AAED;;;;;6DAK6D;AAC7D,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,UAAU,EACnB,IAAI,EAAE,OAAO,EACb,SAAS,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,GACjC,IAAI,CAyCN;AAED;;;;;;;;;wCASwC;AACxC,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,UAAU,EACnB,IAAI,EAAE,OAAO,EACb,SAAS,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,GACjC,IAAI,CA4CN"}

package/dist/src/orgrt/scheduler-integration.js

@@ -1,9 +1,30 @@
 // packages/@monomind/cli/src/orgrt/scheduler-integration.ts
 // Extracted from daemon.ts — auto-wake, boss restart, deferred role spawns.
 import { waitForCapacity } from '../utils/resource-governor.js';
-import { mailBody } from './cross-org.js';
-import { OrgDaemon } from './daemon.js';
+import { pushMessage } from './cross-org.js';
+import { activeRoleCount, OrgDaemon } from './daemon.js';
 import { drainInbox } from './inbox.js';
+/** Shared by scheduleDeferredSpawn and scheduleConcurrencyDeferredSpawn: spawn
+ *  the role now that its gate has cleared, then deliver any messages queued
+ *  for it while it was deferred (drained BEFORE spawning to avoid a race with
+ *  messages arriving during the spawn window). */
+async function spawnNowAndDrain(daemon, name, running, role, spawnRole) {
+    const queued = drainInbox(daemon.root, name);
+    spawnRole(role);
+    for (const msg of queued) {
+        const agent = running.agents.get(msg.toRole);
+        if (agent && !agent.mailbox.isClosed) {
+            running.bus.emit({
+                type: 'xorg',
+                from: msg.fromQualified,
+                to: `${name}:${msg.toRole}`,
+                subject: msg.subject,
+                msg: msg.body,
+            });
+            await pushMessage(daemon, name, running, msg.toRole, msg.fromQualified, msg.subject, msg.body, `inbox-${msg.ts}-${Math.random().toString(36).slice(2, 8)}`);
+        }
+    }
+}
 /** Start an offline org in the background so queued messages get drained.
  *  Fire-and-forget — errors are logged but don't propagate to the sender. */
 export function autoWake(daemon, name) {
@@ -95,21 +116,7 @@ export function scheduleDeferredSpawn(daemon, name, running, role, spawnRole) {
                 });
                 // Drain messages queued while the role was deferred BEFORE spawning
                 // to prevent race condition where messages arrive during spawn window
-                const queued = drainInbox(daemon.root, name);
-                spawnRole(role);
-                for (const msg of queued) {
-                    const agent = running.agents.get(msg.toRole);
-                    if (agent && !agent.mailbox.isClosed) {
-                        running.bus.emit({
-                            type: 'xorg',
-                            from: msg.fromQualified,
-                            to: `${name}:${msg.toRole}`,
-                            subject: msg.subject,
-                            msg: msg.body,
-                        });
-                        agent.mailbox.push(mailBody(daemon.root, name, running, `[message from ${msg.fromQualified}] subject: ${msg.subject}`, msg.body, `inbox-${msg.ts}-${Math.random().toString(36).slice(2, 8)}`));
-                    }
-                }
+                await spawnNowAndDrain(daemon, name, running, role, spawnRole);
                 return;
             }
             running.bus.emit({
@@ -131,4 +138,55 @@ export function scheduleDeferredSpawn(daemon, name, running, role, spawnRole) {
         });
     })().catch((err) => console.error(`org ${name}: deferred spawn of "${role.id}" failed:`, err instanceof Error ? err.message : err));
 }
+/** Bug 4: a role deferred because the org is already at its
+ *  run_config.max_concurrent_agents ceiling isn't abandoned either — poll
+ *  until a slot frees up (another role in this org ends, crashes, or is
+ *  stopped — activeRoleCount() recomputes live each check, so nothing here
+ *  needs to explicitly track "a slot freed") and spawn it then. Same shape as
+ *  scheduleDeferredSpawn's host-resource-pressure case, just gated on the
+ *  org's own concurrency cap instead of waitForCapacity(). Bails quietly if
+ *  the org is stopped (or restarted under the same name) before a slot
+ *  frees; `running` is compared by identity, not `name`, so a stale retry can
+ *  never spawn into a different run. */
+export function scheduleConcurrencyDeferredSpawn(daemon, name, running, role, spawnRole) {
+    const MAX_ATTEMPTS = 180; // ~15 min at 5s intervals before giving up loudly
+    const POLL_MS = 5_000;
+    (async () => {
+        for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
+            await new Promise((resolve) => {
+                const t = setTimeout(resolve, POLL_MS);
+                t.unref?.();
+            });
+            if (daemon.orgs.get(name) !== running)
+                return; // org stopped/restarted — abandon quietly
+            const limit = running.def.run_config.max_concurrent_agents;
+            if (limit == null || activeRoleCount(running) < limit) {
+                running.bus.emit({
+                    type: 'audit',
+                    from: role.id,
+                    reason: 'concurrency-recovered',
+                    msg: `a concurrency slot freed up after ${attempt} retr${attempt === 1 ? 'y' : 'ies'} — spawning deferred role "${role.id}"`,
+                });
+                await spawnNowAndDrain(daemon, name, running, role, spawnRole);
+                return;
+            }
+            running.bus.emit({
+                type: 'audit',
+                from: role.id,
+                reason: 'concurrency-limit',
+                msg: `still at the max_concurrent_agents ceiling (attempt ${attempt}/${MAX_ATTEMPTS}) — retrying "${role.id}" spawn`,
+            });
+        }
+        const missing = daemon.abandoned.get(name) ?? new Set();
+        missing.add(role.id);
+        daemon.abandoned.set(name, missing);
+        daemon.persistState(name, 'running', running.run);
+        running.bus.emit({
+            type: 'audit',
+            from: role.id,
+            reason: 'concurrency-abandoned',
+            msg: `giving up spawning "${role.id}" after ${MAX_ATTEMPTS} retries at the max_concurrent_agents ceiling — org will run without this role until manually restarted`,
+        });
+    })().catch((err) => console.error(`org ${name}: concurrency-deferred spawn of "${role.id}" failed:`, err instanceof Error ? err.message : err));
+}
 //# sourceMappingURL=scheduler-integration.js.map

package/dist/src/orgrt/scheduler-integration.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler-integration.js","sourceRoot":"","sources":["../../../src/orgrt/scheduler-integration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scheduler-integration.js","sourceRoot":"","sources":["../../../src/orgrt/scheduler-integration.ts"],"names":[],"mappings":"AAAA,4DAA4D;AAC5D,4EAA4E;AAE5E,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,SAAS,EAAmB,MAAM,aAAa,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAGxC;;;kDAGkD;AAClD,KAAK,UAAU,gBAAgB,CAC7B,MAAiB,EACjB,IAAY,EACZ,OAAmB,EACnB,IAAa,EACb,SAAkC;IAElC,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC7C,SAAS,CAAC,IAAI,CAAC,CAAC;IAChB,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC7C,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YACrC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,GAAG,CAAC,aAAa;gBACvB,EAAE,EAAE,GAAG,IAAI,IAAI,GAAG,CAAC,MAAM,EAAE;gBAC3B,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,GAAG,EAAE,GAAG,CAAC,IAAI;aACd,CAAC,CAAC;YACH,MAAM,WAAW,CACf,MAAM,EACN,IAAI,EACJ,OAAO,EACP,GAAG,CAAC,MAAM,EACV,GAAG,CAAC,aAAa,EACjB,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,IAAI,EACR,SAAS,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAC5D,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AAED;6EAC6E;AAC7E,MAAM,UAAU,QAAQ,CAAC,MAAiB,EAAE,IAAY;IACtD,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;QAAE,OAAO;IAC7D,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACxB,MAAM;SACH,QAAQ,CAAC,IAAI,CAAC;SACd,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,OAAO,CAAC,KAAK,CAAC,kBAAkB,IAAI,WAAW,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAC7F,CAAC,CAAC;SACD,OAAO,CAAC,GAAG,EAAE;QACZ,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACP,CAAC;AAED;;;;qCAIqC;AACrC,MAAM,UAAU,mBAAmB,CAAC,MAAiB,EAAE,IAAY;IACjE,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC;QAAE,OAAO;IACrE,MAAM,KAAK,GAAG,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC;IACvC,IAAI,KAAK,IAAI,SAAS,CAAC,iBAAiB,EAAE,CAAC;QACzC,GAAG,EAAE,IAAI,CAAC;YACR,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,wBAAwB;YAChC,GAAG,EAAE,4BAA4B,KAAK,uDAAuD;SAC9F,CAAC,CAAC;QACH,wEAAwE;QACxE,uEAAuE;QACvE,4DAA4D;QAC5D,sEAAsE;QACtE,oEAAoE;QACpE,4CAA4C;QAC5C,MAAM;aACH,OAAO,CAAC,IAAI,CAAC;aACb,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CACb,OAAO,CAAC,KAAK,CACX,OAAO,IAAI,8CAA8C,EACzD,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CACzC,CACF,CAAC;QACJ,OAAO;IACT,CAAC;IACD,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,IAAI,SAAS,CAAC,uBAAuB,CAAC;IAC9F,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IAC7E,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;IAC9C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC5B,GAAG,EAAE,IAAI,CAAC;QACR,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,cAAc;QACtB,GAAG,EAAE,6DAA6D,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,cAAc,KAAK,GAAG,CAAC,IAAI,SAAS,CAAC,iBAAiB,GAAG;KACtJ,CAAC,CAAC;IACH,MAAM,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE;QACxB,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9B,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC/B,OAAO;QACT,CAAC,CAAC,oBAAoB;QACtB,MAAM;aACH,OAAO,CAAC,IAAI,CAAC;aACb,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;aACtE,IAAI,CAAC,GAAG,EAAE;YACT,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC/B,OAAO,CAAC,KAAK,CACX,OAAO,IAAI,6BAA6B,EACxC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CACzC,CAAC;QACJ,CAAC,CAAC,CAAC;IACP,CAAC,EAAE,OAAO,CAAC,CAAC;IACX,CAA4B,CAAC,KAAK,EAAE,EAAE,CAAC;AAC1C,CAAC;AAED;;;;;6DAK6D;AAC7D,MAAM,UAAU,qBAAqB,CACnC,MAAiB,EACjB,IAAY,EACZ,OAAmB,EACnB,IAAa,EACb,SAAkC;IAElC,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,8CAA8C;IACtE,CAAC,KAAK,IAAI,EAAE;QACV,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,YAAY,EAAE,OAAO,EAAE,EAAE,CAAC;YACzD,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;YACjD,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,OAAO;gBAAE,OAAO,CAAC,0CAA0C;YACzF,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;gBACd,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;oBACf,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,IAAI,CAAC,EAAE;oBACb,MAAM,EAAE,oBAAoB;oBAC5B,GAAG,EAAE,6BAA6B,OAAO,QAAQ,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,8BAA8B,IAAI,CAAC,EAAE,GAAG;iBACrH,CAAC,CAAC;gBACH,oEAAoE;gBACpE,sEAAsE;gBACtE,MAAM,gBAAgB,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;gBAC/D,OAAO;YACT,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,IAAI,CAAC,EAAE;gBACb,MAAM,EAAE,mBAAmB;gBAC3B,GAAG,EAAE,iCAAiC,OAAO,IAAI,YAAY,iBAAiB,IAAI,CAAC,EAAE,YAAY,MAAM,CAAC,MAAM,EAAE;aACjH,CAAC,CAAC;QACL,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,EAAU,CAAC;QAChE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrB,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpC,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;YACf,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,IAAI,CAAC,EAAE;YACb,MAAM,EAAE,oBAAoB;YAC5B,GAAG,EAAE,uBAAuB,IAAI,CAAC,EAAE,WAAW,YAAY,oEAAoE;SAC/H,CAAC,CAAC;IACL,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CACjB,OAAO,CAAC,KAAK,CACX,OAAO,IAAI,wBAAwB,IAAI,CAAC,EAAE,WAAW,EACrD,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CACzC,CACF,CAAC;AACJ,CAAC;AAED;;;;;;;;;wCASwC;AACxC,MAAM,UAAU,gCAAgC,CAC9C,MAAiB,EACjB,IAAY,EACZ,OAAmB,EACnB,IAAa,EACb,SAAkC;IAElC,MAAM,YAAY,GAAG,GAAG,CAAC,CAAC,kDAAkD;IAC5E,MAAM,OAAO,GAAG,KAAK,CAAC;IACtB,CAAC,KAAK,IAAI,EAAE;QACV,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,YAAY,EAAE,OAAO,EAAE,EAAE,CAAC;YACzD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;gBAClC,MAAM,CAAC,GAAG,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACtC,CAA4B,CAAC,KAAK,EAAE,EAAE,CAAC;YAC1C,CAAC,CAAC,CAAC;YACH,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,OAAO;gBAAE,OAAO,CAAC,0CAA0C;YACzF,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,qBAAqB,CAAC;YAC3D,IAAI,KAAK,IAAI,IAAI,IAAI,eAAe,CAAC,OAAO,CAAC,GAAG,KAAK,EAAE,CAAC;gBACtD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;oBACf,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,IAAI,CAAC,EAAE;oBACb,MAAM,EAAE,uBAAuB;oBAC/B,GAAG,EAAE,qCAAqC,OAAO,QAAQ,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,8BAA8B,IAAI,CAAC,EAAE,GAAG;iBAC7H,CAAC,CAAC;gBACH,MAAM,gBAAgB,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;gBAC/D,OAAO;YACT,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,IAAI,CAAC,EAAE;gBACb,MAAM,EAAE,mBAAmB;gBAC3B,GAAG,EAAE,uDAAuD,OAAO,IAAI,YAAY,iBAAiB,IAAI,CAAC,EAAE,SAAS;aACrH,CAAC,CAAC;QACL,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,EAAU,CAAC;QAChE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrB,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpC,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;YACf,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,IAAI,CAAC,EAAE;YACb,MAAM,EAAE,uBAAuB;YAC/B,GAAG,EAAE,uBAAuB,IAAI,CAAC,EAAE,WAAW,YAAY,yGAAyG;SACpK,CAAC,CAAC;IACL,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CACjB,OAAO,CAAC,KAAK,CACX,OAAO,IAAI,oCAAoC,IAAI,CAAC,EAAE,WAAW,EACjE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CACzC,CACF,CAAC;AACJ,CAAC"}

package/dist/src/orgrt/scheduler.d.ts

@@ -4,6 +4,10 @@ export declare function parseSchedule(s: string | number | null | undefined): nu
 export declare class OrgScheduler {
     private runFn;
     private timers;
+    /** Current interval per org. A catch-up fired from an old run's `finally`
+     *  reads this rather than the intervalMs its closure captured, so an org
+     *  rescheduled mid-run gets its new interval, not the replaced one. */
+    private intervals;
     private running;
     /** Orgs whose tick arrived mid-run. A dropped tick meant an org that overruns
      *  its interval — a 200m cycle on a 2h schedule — idled until the *next*

package/dist/src/orgrt/scheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../../src/orgrt/scheduler.ts"],"names":[],"mappings":"AAEA,4EAA4E;AAC5E,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAOlF;AAED,+GAA+G;AAC/G,qBAAa,YAAY;IAUX,OAAO,CAAC,KAAK;IATzB,OAAO,CAAC,MAAM,CAAqD;IACnE,OAAO,CAAC,OAAO,CAAqB;IACpC;;;;oFAIgF;IAChF,OAAO,CAAC,OAAO,CAAqB;IAEpC,YAAoB,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,EAAI;IAElF;;;;;;8BAM0B;IAC1B,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,UAAQ,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAgDnF;IAED,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAKzB;IAED,IAAI,IAAI,IAAI,CAEX;CACF"}
+{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../../src/orgrt/scheduler.ts"],"names":[],"mappings":"AAEA,4EAA4E;AAC5E,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAOlF;AAED,+GAA+G;AAC/G,qBAAa,YAAY;IAcX,OAAO,CAAC,KAAK;IAbzB,OAAO,CAAC,MAAM,CAAqD;IACnE;;2EAEuE;IACvE,OAAO,CAAC,SAAS,CAA6B;IAC9C,OAAO,CAAC,OAAO,CAAqB;IACpC;;;;oFAIgF;IAChF,OAAO,CAAC,OAAO,CAAqB;IAEpC,YAAoB,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,EAAI;IAElF;;;;;;8BAM0B;IAC1B,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,UAAQ,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAiDnF;IAED,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAMzB;IAED,IAAI,IAAI,IAAI,CAEX;CACF"}

package/dist/src/orgrt/scheduler.js

@@ -15,6 +15,10 @@ export function parseSchedule(s) {
 export class OrgScheduler {
     runFn;
     timers = new Map();
+    /** Current interval per org. A catch-up fired from an old run's `finally`
+     *  reads this rather than the intervalMs its closure captured, so an org
+     *  rescheduled mid-run gets its new interval, not the replaced one. */
+    intervals = new Map();
     running = new Set();
     /** Orgs whose tick arrived mid-run. A dropped tick meant an org that overruns
      *  its interval — a 200m cycle on a 2h schedule — idled until the *next*
@@ -34,6 +38,7 @@ export class OrgScheduler {
      *  everything at once. */
     add(name, intervalMs, runNow = false, sinceLastRunMs) {
         this.remove(name);
+        this.intervals.set(name, intervalMs);
         const fire = async () => {
             if (this.running.has(name)) {
                 this.pending.add(name);
@@ -41,7 +46,7 @@ export class OrgScheduler {
             } // catch up when it ends
             this.running.add(name);
             try {
-                await this.runFn(name, intervalMs);
+                await this.runFn(name, this.intervals.get(name) ?? intervalMs);
             }
             catch (err) {
                 console.error(`[org-scheduler] ${name}: scheduled run failed:`, err);
@@ -88,6 +93,7 @@ export class OrgScheduler {
         if (t)
             clearInterval(t);
         this.timers.delete(name);
+        this.intervals.delete(name);
         this.pending.delete(name); // an unscheduled org has no tick to catch up on
     }
     stop() {

package/dist/src/orgrt/scheduler.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../../src/orgrt/scheduler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../../src/orgrt/scheduler.ts"],"names":[],"mappings":"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"}

package/dist/src/orgrt/server.d.ts

@@ -2,7 +2,10 @@ import type { OrgDaemon } from './daemon.js';
 export interface OrgServer {
     port: number;
     close: () => void;
-    credential: string;
+    /** Authorizes the human-decision routes (approvals, gates, answers, human
+     *  messages) and, as a superset, everything else. Never published to the
+     *  broker registry — see broker.ts's defaultOperatorDir(). */
+    operatorCredential: string;
 }
 export interface ServerOpts {
     /** Filter tool audit events by tool name or decision (allow|deny) */
@@ -13,6 +16,8 @@ export interface ServerOpts {
 }
 /** Minimal HTTP listener for cross-process org message delivery.
  *  Binds an ephemeral port (pass 0) so the daemon can register it with the broker.
- *  Requires an auth credential on all POST requests (generated at startup, shared via broker). */
-export declare function startOrgServer(daemon: OrgDaemon, port?: number, credential?: string): Promise<OrgServer>;
+ *  Two credentials gate requests: each hosted org's agent credential (published
+ *  via the broker; unlocks delivery/status routes) and the operator credential
+ *  (generated here unless supplied; unlocks OPERATOR_ROUTES as well). */
+export declare function startOrgServer(daemon: OrgDaemon, port?: number, operatorCredential?: string): Promise<OrgServer>;
 //# sourceMappingURL=server.d.ts.map

package/dist/src/orgrt/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/orgrt/server.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAGD,MAAM,WAAW,UAAU;IACzB,qEAAqE;IACrE,WAAW,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;KAAE,CAAC;CAC9D;AAwCD;;kGAEkG;AAClG,wBAAsB,cAAc,CAClC,MAAM,EAAE,SAAS,EACjB,IAAI,SAAI,EACR,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,SAAS,CAAC,CA4MpB"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/orgrt/server.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB;;kEAE8D;IAC9D,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAcD,MAAM,WAAW,UAAU;IACzB,qEAAqE;IACrE,WAAW,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;KAAE,CAAC;CAC9D;AAwCD;;;;yEAIyE;AACzE,wBAAsB,cAAc,CAClC,MAAM,EAAE,SAAS,EACjB,IAAI,SAAI,EACR,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,SAAS,CAAC,CAmOpB"}

package/dist/src/orgrt/server.js

@@ -2,6 +2,16 @@
 // monolean: stripped to xdeliver-only — live UI, WS fanout, and redundant REST
 // endpoints deleted; the control server at :4242 handles all of those.
 import http from 'node:http';
+/** Routes that act with HUMAN authority. Only the operator credential unlocks
+ *  them; a per-org agent credential (the one in the broker registry, readable
+ *  by every org process and agent subprocess on the machine) gets 403 so a role
+ *  can never approve its own gates. */
+const OPERATOR_ROUTES = new Set([
+    '/api/set-approval',
+    '/api/resolve-gate',
+    '/api/answer-question',
+    '/api/human-message',
+]);
 const MAX_BODY = 1_000_000; // 1MB — prevents OOM from oversized POSTs
 /** Parse a JSON POST body with a size guard. Rejects oversized or malformed bodies. */
 function parseBody(req) {
@@ -40,22 +50,34 @@ function json(res, status, data) {
 }
 /** Minimal HTTP listener for cross-process org message delivery.
  *  Binds an ephemeral port (pass 0) so the daemon can register it with the broker.
- *  Requires an auth credential on all POST requests (generated at startup, shared via broker). */
-export async function startOrgServer(daemon, port = 0, credential) {
+ *  Two credentials gate requests: each hosted org's agent credential (published
+ *  via the broker; unlocks delivery/status routes) and the operator credential
+ *  (generated here unless supplied; unlocks OPERATOR_ROUTES as well). */
+export async function startOrgServer(daemon, port = 0, operatorCredential) {
     const { randomUUID, timingSafeEqual } = await import('node:crypto');
-    const cred = credential ?? randomUUID();
+    const operatorCred = operatorCredential ?? randomUUID();
     // SEC-2: timing-safe credential comparison. The previous `!==` compared
     // header-supplied bytes against the secret byte-for-byte and short-circuited
     // on the first mismatched character — a remote attacker could time the
     // response to recover the secret one byte at a time. Buffer.from + length
     // gate + timingSafeEqual runs in constant time.
-    const safeCred = (supplied) => {
+    const safeEq = (supplied, expected) => {
         const a = Buffer.from(String(supplied ?? ''));
-        const b = Buffer.from(cred);
+        const b = Buffer.from(expected);
         if (a.length !== b.length)
             return false;
         return timingSafeEqual(a, b);
     };
+    const isOperator = (supplied) => safeEq(supplied, operatorCred);
+    /** Operator, or any org currently hosted by this daemon. */
+    const isAgentOrOperator = (supplied) => {
+        if (isOperator(supplied))
+            return true;
+        for (const org of daemon.orgs.values())
+            if (org.credential && safeEq(supplied, org.credential))
+                return true;
+        return false;
+    };
     // SEC-3: DNS-rebinding / cross-origin defence. Mirrors ui/server.mjs's
     // _allowedHosts + Origin allow-list. Default to loopback; override via env
     // for users running the daemon behind a port-forwarder or in a container.
@@ -89,7 +111,7 @@ export async function startOrgServer(daemon, port = 0, credential) {
         const corsOrigin = allowedOrigin(req.headers.origin);
         // SSE endpoint for live bus event streaming (dashboard integration)
         if (req.method === 'GET' && req.url === '/api/events') {
-            if (!safeCred(req.headers['x-monomind-cred'])) {
+            if (!isAgentOrOperator(req.headers['x-monomind-cred'])) {
                 json(res, 401, { ok: false, error: 'unauthorized' });
                 return;
             }
@@ -110,7 +132,7 @@ export async function startOrgServer(daemon, port = 0, credential) {
         }
         // GET endpoint for org status snapshot (dashboard initial load)
         if (req.method === 'GET' && req.url?.startsWith('/api/status')) {
-            if (!safeCred(req.headers['x-monomind-cred'])) {
+            if (!isAgentOrOperator(req.headers['x-monomind-cred'])) {
                 json(res, 401, { ok: false, error: 'unauthorized' });
                 return;
             }
@@ -123,20 +145,26 @@ export async function startOrgServer(daemon, port = 0, credential) {
             res.end('not found');
             return;
         }
-        // Auth gate — all POST endpoints require the daemon credential
-        if (!safeCred(req.headers['x-monomind-cred'])) {
+        // Auth gate — every POST needs a credential this daemon recognizes, and
+        // the human-decision routes need the operator credential specifically.
+        const supplied = req.headers['x-monomind-cred'];
+        if (!isAgentOrOperator(supplied)) {
             json(res, 401, { ok: false, error: 'unauthorized' });
             return;
         }
+        if (OPERATOR_ROUTES.has(req.url ?? '') && !isOperator(supplied)) {
+            json(res, 403, { ok: false, error: 'forbidden: operator credential required' });
+            return;
+        }
         (async () => {
             const payload = await parseBody(req);
             if (req.url === '/api/xdeliver') {
-                const { toOrg, toRole, fromOrg, fromRole, subject, body: b, } = payload;
+                const { toOrg, toRole, fromOrg, fromRole, fromCredential, subject, body: b, } = payload;
                 if (!toOrg || !toRole || !fromOrg || !fromRole) {
                     json(res, 400, { ok: false, error: 'toOrg, toRole, fromOrg, fromRole are required' });
                     return;
                 }
-                const result = daemon.receiveRemote(toOrg, toRole, `${fromOrg}:${fromRole}`, subject ?? '', b ?? '');
+                const result = await daemon.receiveRemote(toOrg, toRole, `${fromOrg}:${fromRole}`, subject ?? '', b ?? '', fromCredential);
                 json(res, result.ok ? 200 : 404, result);
             }
             else if (req.url === '/api/human-message') {
@@ -190,7 +218,14 @@ export async function startOrgServer(daemon, port = 0, credential) {
     // users running inside containers / port-forwarders that genuinely need
     // remote connections.
     const bindHost = process.env.MONOMIND_ORG_SERVER_HOST ?? '127.0.0.1';
-    await new Promise((r) => server.listen(port, bindHost, r));
+    await new Promise((resolve, reject) => {
+        const onError = (err) => reject(err);
+        server.once('error', onError);
+        server.listen(port, bindHost, () => {
+            server.removeListener('error', onError);
+            resolve();
+        });
+    });
     const actual = server.address().port;
     actualPort = actual;
     // Wire bus events from all running orgs to SSE clients
@@ -215,7 +250,7 @@ export async function startOrgServer(daemon, port = 0, credential) {
             sseClients.clear();
             server.close();
         },
-        credential: cred,
+        operatorCredential: operatorCred,
     };
 }
 //# sourceMappingURL=server.js.map