@monoes/monomindcli 2.13.0 → 2.14.0

package/dist/src/orgrt/idle-deadline.d.ts

@@ -2,12 +2,81 @@ export declare const IDLE_WATCHDOG_FILE = "idle-watchdog.json";
 /** Why there is no deadline right now. Every value except `disabled` is a
  *  legitimate wait the watchdog will not nudge or stop through. */
 export type IdleHold = 'disabled' | 'restarting' | 'pending-gate' | 'pending-question' | 'pending-approval' | 'endpoint-reply-due' | 'task-blocked';
+/** Every hold reason except `disabled` describes a *wait*: the run is alive
+ *  and legitimately not progressing yet. `disabled` is the operator having
+ *  switched the watchdog off (`run_config.idle_minutes: 0`), which is not a
+ *  wait and not a stall. */
+export type WaitHold = Exclude<IdleHold, 'disabled'>;
+/** ADR-O001 D4 — "every hold carries a deadline". The shape makes a hold
+ *  with no expiry unrepresentable: a wait hold MUST name the instant it stops
+ *  suppressing the idle clock. A `hold` used to be a bare reason string and a
+ *  `null` deadline, which disabled the idle stop for as long as the reason
+ *  held — measured live at 8.3 hours on `{"hold":"pending-question"}`, with
+ *  the first turn after the gap costing $17.33 because the prompt cache had
+ *  long since expired. */
+export type IdleHoldState = {
+    reason: 'disabled';
+    until: null;
+} | {
+    reason: WaitHold;
+    until: string;
+};
+/** How long any single wait may suppress the idle watchdog before the run
+ *  goes back on the normal nudge-then-stop path. Deliberately generous — a
+ *  human answering a question, approving a tool call or resolving a gate has
+ *  an hour — and deliberately finite, because the alternative measured 8.3
+ *  hours. An expired hold does not stop the run by itself: it hands the run
+ *  back to the idle clock, which nudges the boss first. */
+export declare const HOLD_TTL_MS: number;
+/** One watchdog tick's view of the current hold. `since` anchors the deadline
+ *  to when the reason FIRST appeared — recomputing it per tick is exactly how
+ *  a hold lives forever. `alarmed` keeps the expiry audit event to one per
+ *  spell (same "once, not every tick" rule as `resolvedIdleNudgeCount`). */
+export interface HoldTrack {
+    reason: WaitHold;
+    since: number;
+    alarmed: boolean;
+}
+/** Advance the hold tracker one watchdog tick.
+ *  - `hold` is the hold still in force, or null once it has expired (or when
+ *    nothing is holding) — null means the caller runs its normal idle checks.
+ *  - `expired` names the reason on the single tick the deadline passes, so
+ *    the caller can say so loudly once instead of every 30 seconds.
+ *
+ *  A wait that knows its own end (a task blocked until a stated real-world
+ *  time) passes that instant as `until` and keeps it; everything else — the
+ *  waits on a human or a remote peer, which are the ones that can wait
+ *  forever — gets `ttlMs` from when the reason first appeared. A changed
+ *  reason is a new wait and gets a fresh deadline. */
+export declare function advanceHold(prev: HoldTrack | null, wait: WaitHold | {
+    reason: WaitHold;
+    until: number;
+} | null, now: number, ttlMs?: number): {
+    track: HoldTrack | null;
+    hold: IdleHoldState | null;
+    expired: WaitHold | null;
+};
+/** ADR-O001 D4 — the no-progress detector, Gas Town's "30 minutes hooked
+ *  without progress" alarm. The idle clock is org-wide and says nothing at
+ *  all while a hold is in force, so a role that is nominally working while
+ *  producing no bus activity has to be surfaced on its own. A role that has
+ *  ended or crashed is silent for a good reason and is not reported. */
+export declare const NO_PROGRESS_MS: number;
+export declare function noProgressRoles(roles: ReadonlyArray<{
+    id: string;
+    working: boolean;
+    lastActivity: number;
+    alarmed: boolean;
+}>, now: number, thresholdMs?: number): Array<{
+    id: string;
+    silentMs: number;
+}>;
 export interface IdleWatchdogRecord {
     run: string;
     idle_minutes: number;
     /** ISO time the watchdog stops the run if nothing happens before then. */
     idle_stop_at: string | null;
-    hold: IdleHold | null;
+    hold: IdleHoldState | null;
 }
 /** When the watchdog stops the run, assuming no further activity. The stop
  *  lands on the first check at or after this time (checks run every
@@ -32,5 +101,9 @@ export declare function readIdleStatus(root: string, name: string, run: string |
     idle_stop_at: string | null;
     idle_stop_in_seconds: number | null;
     idle_hold: IdleHold | 'unknown' | null;
+    /** ISO time the hold expires and the idle clock resumes (ADR-O001 D4).
+     *  `null` for `disabled`, and for a record written by a pre-D4 daemon whose
+     *  holds had no deadline at all. */
+    idle_hold_until?: string | null;
 };
 //# sourceMappingURL=idle-deadline.d.ts.map

package/dist/src/orgrt/idle-deadline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"idle-deadline.d.ts","sourceRoot":"","sources":["../../../src/orgrt/idle-deadline.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AAEvD;mEACmE;AACnE,MAAM,MAAM,QAAQ,GAChB,UAAU,GACV,YAAY,GACZ,cAAc,GACd,kBAAkB,GAClB,kBAAkB,GAClB,oBAAoB,GACpB,cAAc,CAAC;AAEnB,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,0EAA0E;IAC1E,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;CACvB;AAED;;;;;4EAK4E;AAC5E,wBAAgB,eAAe,CAAC,CAAC,EAAE;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,OAAO,CAAC;CACxB,GAAG,MAAM,CAIT;AAMD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,kBAAkB,GAAG,IAAI,CAEzF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAEhE;AAED;;kDAEkD;AAClD,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,GAAG,SAAa,GACf;IACD,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,SAAS,EAAE,QAAQ,GAAG,SAAS,GAAG,IAAI,CAAC;CACxC,CAkBA"}
+{"version":3,"file":"idle-deadline.d.ts","sourceRoot":"","sources":["../../../src/orgrt/idle-deadline.ts"],"names":[],"mappings":"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"}

package/dist/src/orgrt/idle-deadline.js

@@ -13,6 +13,45 @@ import { join } from 'node:path';
 import { writeJsonFileAtomic } from '../utils/json-file.js';
 import { ORG_DIR } from './types.js';
 export const IDLE_WATCHDOG_FILE = 'idle-watchdog.json';
+/** How long any single wait may suppress the idle watchdog before the run
+ *  goes back on the normal nudge-then-stop path. Deliberately generous — a
+ *  human answering a question, approving a tool call or resolving a gate has
+ *  an hour — and deliberately finite, because the alternative measured 8.3
+ *  hours. An expired hold does not stop the run by itself: it hands the run
+ *  back to the idle clock, which nudges the boss first. */
+export const HOLD_TTL_MS = 60 * 60_000;
+/** Advance the hold tracker one watchdog tick.
+ *  - `hold` is the hold still in force, or null once it has expired (or when
+ *    nothing is holding) — null means the caller runs its normal idle checks.
+ *  - `expired` names the reason on the single tick the deadline passes, so
+ *    the caller can say so loudly once instead of every 30 seconds.
+ *
+ *  A wait that knows its own end (a task blocked until a stated real-world
+ *  time) passes that instant as `until` and keeps it; everything else — the
+ *  waits on a human or a remote peer, which are the ones that can wait
+ *  forever — gets `ttlMs` from when the reason first appeared. A changed
+ *  reason is a new wait and gets a fresh deadline. */
+export function advanceHold(prev, wait, now, ttlMs = HOLD_TTL_MS) {
+    if (!wait)
+        return { track: null, hold: null, expired: null };
+    const reason = typeof wait === 'string' ? wait : wait.reason;
+    const track = prev && prev.reason === reason ? prev : { reason, since: now, alarmed: false };
+    const until = typeof wait === 'string' ? track.since + ttlMs : wait.until;
+    if (now < until)
+        return { track, hold: { reason, until: new Date(until).toISOString() }, expired: null };
+    return { track: { ...track, alarmed: true }, hold: null, expired: track.alarmed ? null : reason };
+}
+/** ADR-O001 D4 — the no-progress detector, Gas Town's "30 minutes hooked
+ *  without progress" alarm. The idle clock is org-wide and says nothing at
+ *  all while a hold is in force, so a role that is nominally working while
+ *  producing no bus activity has to be surfaced on its own. A role that has
+ *  ended or crashed is silent for a good reason and is not reported. */
+export const NO_PROGRESS_MS = 30 * 60_000;
+export function noProgressRoles(roles, now, thresholdMs = NO_PROGRESS_MS) {
+    return roles
+        .filter((r) => r.working && !r.alarmed && now - r.lastActivity >= thresholdMs)
+        .map((r) => ({ id: r.id, silentMs: now - r.lastActivity }));
+}
 /** When the watchdog stops the run, assuming no further activity. The stop
  *  lands on the first check at or after this time (checks run every
  *  min(idle/2, 30s)), so treat it as the earliest stop, not an exact one.
@@ -52,12 +91,23 @@ export function readIdleStatus(root, name, run, now = Date.now()) {
     }
     if (rec.run !== run)
         return unknown;
-    if (!rec.idle_stop_at)
-        return { idle_stop_at: null, idle_stop_in_seconds: null, idle_hold: rec.hold };
+    if (!rec.idle_stop_at) {
+        // A pre-D4 daemon wrote the reason as a bare string with no deadline.
+        const hold = rec.hold;
+        return typeof hold === 'string'
+            ? { idle_stop_at: null, idle_stop_in_seconds: null, idle_hold: hold, idle_hold_until: null }
+            : {
+                idle_stop_at: null,
+                idle_stop_in_seconds: null,
+                idle_hold: hold?.reason ?? null,
+                idle_hold_until: hold?.until ?? null,
+            };
+    }
     return {
         idle_stop_at: rec.idle_stop_at,
         idle_stop_in_seconds: Math.max(0, Math.round((Date.parse(rec.idle_stop_at) - now) / 1000)),
         idle_hold: null,
+        idle_hold_until: null,
     };
 }
 //# sourceMappingURL=idle-deadline.js.map

package/dist/src/orgrt/idle-deadline.js.map

@@ -1 +1 @@
-{"version":3,"file":"idle-deadline.js","sourceRoot":"","sources":["../../../src/orgrt/idle-deadline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,MAAM,CAAC,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAqBvD;;;;;4EAK4E;AAC5E,MAAM,UAAU,eAAe,CAAC,CAO/B;IACC,IAAI,CAAC,CAAC,QAAQ,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC;IACnD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,CAAC,aAAa;QAAE,OAAO,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IAClF,OAAO,CAAC,CAAC,YAAY,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;AACvC,CAAC;AAED,SAAS,UAAU,CAAC,IAAY,EAAE,IAAY;IAC5C,OAAO,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,IAAY,EAAE,GAAuB;IACjF,mBAAmB,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,IAAY;IACxD,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAClD,CAAC;AAED;;kDAEkD;AAClD,MAAM,UAAU,cAAc,CAC5B,IAAY,EACZ,IAAY,EACZ,GAAuB,EACvB,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IAMhB,MAAM,OAAO,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,SAAS,EAAE,SAAkB,EAAE,CAAC;IAClG,MAAM,CAAC,GAAG,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACjC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QAAE,OAAO,OAAO,CAAC;IAC3C,IAAI,GAAuB,CAAC;IAC5B,IAAI,CAAC;QACH,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,CAAuB,CAAC;IAClE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,IAAI,GAAG,CAAC,GAAG,KAAK,GAAG;QAAE,OAAO,OAAO,CAAC;IACpC,IAAI,CAAC,GAAG,CAAC,YAAY;QACnB,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC;IACjF,OAAO;QACL,YAAY,EAAE,GAAG,CAAC,YAAY;QAC9B,oBAAoB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;QAC1F,SAAS,EAAE,IAAI;KAChB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"idle-deadline.js","sourceRoot":"","sources":["../../../src/orgrt/idle-deadline.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,38 @@
+import type { OrgTask, TaskDag } from './task-dag.js';
+import type { OrgDef } from './types.js';
+export declare const MAX_LOADOUTS = 15;
+export declare const TARGET_MIN_LOADOUTS = 5;
+/** What the boss sees to select by (org_task's description). */
+export interface LoadoutSummary {
+    name: string;
+    description?: string;
+}
+/** A loadout ready to go into a session's system prompt. Plain data, resolved
+ *  once when the session is built, so nothing can change it mid-session. */
+export interface ResolvedLoadout {
+    name: string;
+    guidance: string;
+}
+/** Errors fail `org validate` and `org run`; warnings are printed only. */
+export declare function validateLoadouts(def: Pick<OrgDef, 'loadouts'>, root: string): {
+    errors: string[];
+    warnings: string[];
+};
+/** The catalog as the boss's tools present it, or undefined when the org has
+ *  none — the signal that keeps every tool byte-identical for such orgs. */
+export declare function loadoutCatalog(def: Pick<OrgDef, 'loadouts'> | undefined): LoadoutSummary[] | undefined;
+/** Build the system-prompt text for a loadout: header, prompt, skills in the
+ *  declared order, then the instructions file. Deterministic for a given
+ *  config, which is what makes two sessions of the same kind byte-identical. */
+export declare function resolveLoadout(def: Pick<OrgDef, 'loadouts'>, name: string, root: string): ResolvedLoadout;
+/** Why a selection is refused, or null when it is fine (or absent). */
+export declare function checkLoadoutSelection(def: Pick<OrgDef, 'loadouts'>, loadout: string | undefined): string | null;
+/** The loadout a NEW session for `roleId` is built with: that of the role's
+ *  first ready task in DAG order. Deterministic, and it is exactly the task
+ *  the lazy spawn is happening for when dispatch spawns the role. */
+export declare function sessionLoadoutFor(dag: TaskDag | undefined, roleId: string): string | undefined;
+/** The task reference that opens every dispatch/re-dispatch message. The
+ *  loadout rides in the MESSAGE (layer 2), never the prompt, and only when one
+ *  was selected — so an org without a catalog sends exactly what it did. */
+export declare function taskTag(task: Pick<OrgTask, 'id' | 'loadout'>): string;
+//# sourceMappingURL=loadouts.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"loadouts.d.ts","sourceRoot":"","sources":["../../../src/orgrt/loadouts.ts"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,eAAO,MAAM,YAAY,KAAK,CAAC;AAC/B,eAAO,MAAM,mBAAmB,IAAI,CAAC;AAGrC,gEAAgE;AAChE,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;4EAC4E;AAC5E,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAQD,2EAA2E;AAC3E,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,EAC7B,IAAI,EAAE,MAAM,GACX;IAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAsC1C;AAED;4EAC4E;AAC5E,wBAAgB,cAAc,CAC5B,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,SAAS,GACxC,cAAc,EAAE,GAAG,SAAS,CAM9B;AAED;;gFAEgF;AAChF,wBAAgB,cAAc,CAC5B,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,EAC7B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,eAAe,CAejB;AAED,uEAAuE;AACvE,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,EAC7B,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,MAAM,GAAG,IAAI,CAOf;AAED;;qEAEqE;AACrE,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE9F;AAED;;4EAE4E;AAC5E,wBAAgB,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,GAAG,SAAS,CAAC,GAAG,MAAM,CAErE"}

package/dist/src/orgrt/loadouts.js

@@ -0,0 +1,129 @@
+/**
+ * ADR-O001 D7 — specialisation via a small catalog of stable loadouts.
+ *
+ * `buildRolePrompt` runs once per session, so a role's system prompt is a
+ * stable cache prefix: one cache write, then 0.1x forever. Specialisation is
+ * therefore cheap and VARIETY is expensive — every distinct system prompt is
+ * its own cache namespace. A loadout is a named, stable bundle of role-prompt
+ * text + skills; the boss selects one by name when it creates a task and never
+ * composes prompt text. Everything per-task (which diff, which criteria, what
+ * failed last time) goes in the task MESSAGE instead.
+ *
+ * Catalog size: more than MAX_LOADOUTS is an error at `org validate` and at
+ * daemon start. Fewer than TARGET_MIN_LOADOUTS is ALLOWED with a warning — a
+ * small org with two kinds of work is not wrong, it just is not the shape the
+ * ADR tuned for. An empty `loadouts: {}` is an error (omit the field instead),
+ * because it would still switch on the tool argument with nothing to select.
+ *
+ * Today each role holds ONE long SDK session for its life (see session.ts), so
+ * a loadout can only take effect when a role's session is BUILT: the daemon
+ * picks it from the role's first ready task (`sessionLoadoutFor`), freezes it
+ * on the incarnation (`AgentRuntime.loadout`) and in the checkpoint, and never
+ * rewrites it. A later task that asked for a different loadout is delivered to
+ * the live session anyway and recorded as a `loadout-mismatch` event — honest,
+ * not silently applied. When D3 makes sessions task-keyed, the session for
+ * (role, taskKey) is built with `resolveLoadout(def, task.loadout, root)` via
+ * the same `SessionOpts.loadout` field, and the mismatch path disappears.
+ */
+import { existsSync, readFileSync } from 'node:fs';
+import { isAbsolute, join } from 'node:path';
+import { loadBuiltinRoleSkill } from './role-skills.js';
+export const MAX_LOADOUTS = 15;
+export const TARGET_MIN_LOADOUTS = 5;
+const NAME_RE = /^[a-z0-9][a-z0-9_-]{0,47}$/i;
+function filePath(file, root) {
+    return isAbsolute(file) ? file : join(root, file);
+}
+/** Errors fail `org validate` and `org run`; warnings are printed only. */
+export function validateLoadouts(def, root) {
+    const errors = [];
+    const warnings = [];
+    const cat = def.loadouts;
+    if (!cat)
+        return { errors, warnings };
+    const names = Object.keys(cat);
+    if (names.length === 0) {
+        errors.push('loadouts: the catalog is empty — omit the field instead');
+        return { errors, warnings };
+    }
+    if (names.length > MAX_LOADOUTS) {
+        errors.push(`loadouts: ${names.length} loadouts declared, at most ${MAX_LOADOUTS} allowed — each distinct system prompt is its own cache namespace (ADR-O001 D7); merge similar kinds of work`);
+    }
+    else if (names.length < TARGET_MIN_LOADOUTS) {
+        warnings.push(`loadouts: ${names.length} loadouts declared, below the ${TARGET_MIN_LOADOUTS}–${MAX_LOADOUTS} target (allowed)`);
+    }
+    for (const name of names) {
+        const l = cat[name];
+        if (!NAME_RE.test(name)) {
+            errors.push(`loadout "${name}": name must be letters, digits, "-" or "_" (max 48)`);
+        }
+        if (!l.prompt?.trim() && !l.skills?.length && !l.instructions_file) {
+            errors.push(`loadout "${name}": has no prompt, skills or instructions_file`);
+        }
+        for (const s of l.skills ?? []) {
+            // Name check first: a skill is a file lookup, so "../x" must never reach it.
+            if (!NAME_RE.test(s) || !loadBuiltinRoleSkill(s)) {
+                errors.push(`loadout "${name}": unknown skill "${s}"`);
+            }
+        }
+        if (l.instructions_file && !existsSync(filePath(l.instructions_file, root))) {
+            errors.push(`loadout "${name}": instructions_file not found: ${l.instructions_file}`);
+        }
+    }
+    return { errors, warnings };
+}
+/** The catalog as the boss's tools present it, or undefined when the org has
+ *  none — the signal that keeps every tool byte-identical for such orgs. */
+export function loadoutCatalog(def) {
+    const cat = def?.loadouts;
+    if (!cat || Object.keys(cat).length === 0)
+        return undefined;
+    return Object.entries(cat).map(([name, l]) => l.description ? { name, description: l.description } : { name });
+}
+/** Build the system-prompt text for a loadout: header, prompt, skills in the
+ *  declared order, then the instructions file. Deterministic for a given
+ *  config, which is what makes two sessions of the same kind byte-identical. */
+export function resolveLoadout(def, name, root) {
+    // hasOwn, not a bare lookup: "constructor" must not resolve via the prototype.
+    const l = def.loadouts && Object.hasOwn(def.loadouts, name) ? def.loadouts[name] : undefined;
+    if (!l)
+        throw new Error(`unknown loadout "${name}"`);
+    const parts = [`## Loadout: ${name}`];
+    if (l.prompt?.trim())
+        parts.push(l.prompt.trim());
+    for (const s of l.skills ?? []) {
+        const text = NAME_RE.test(s) ? loadBuiltinRoleSkill(s) : null;
+        if (text)
+            parts.push(text);
+    }
+    if (l.instructions_file) {
+        const text = readFileSync(filePath(l.instructions_file, root), 'utf-8').trim();
+        if (text)
+            parts.push(text);
+    }
+    return { name, guidance: parts.join('\n\n') };
+}
+/** Why a selection is refused, or null when it is fine (or absent). */
+export function checkLoadoutSelection(def, loadout) {
+    if (loadout === undefined)
+        return null;
+    if (!def.loadouts)
+        return `this org has no loadout catalog — omit "loadout"`;
+    if (!Object.hasOwn(def.loadouts, loadout)) {
+        return `unknown loadout "${loadout}" — one of: ${Object.keys(def.loadouts).join(', ')}`;
+    }
+    return null;
+}
+/** The loadout a NEW session for `roleId` is built with: that of the role's
+ *  first ready task in DAG order. Deterministic, and it is exactly the task
+ *  the lazy spawn is happening for when dispatch spawns the role. */
+export function sessionLoadoutFor(dag, roleId) {
+    return dag?.ready().find((t) => t.assignee === roleId)?.loadout;
+}
+/** The task reference that opens every dispatch/re-dispatch message. The
+ *  loadout rides in the MESSAGE (layer 2), never the prompt, and only when one
+ *  was selected — so an org without a catalog sends exactly what it did. */
+export function taskTag(task) {
+    return task.loadout ? `[task:${task.id}] [loadout:${task.loadout}]` : `[task:${task.id}]`;
+}
+//# sourceMappingURL=loadouts.js.map

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

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

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

@@ -9,6 +9,13 @@ export interface OrgUserMessage {
     session_id: string;
 }
 export declare function isRecoverableCloseReason(reason: string | undefined): boolean;
+/** ADR-O001 D3 — optional stream boundaries. Omitted = the pre-D3 stream. */
+export interface StreamOptions {
+    /** End the stream before yielding a message this rejects (not the first). */
+    stopBefore?: (next: string) => boolean;
+    /** End the stream after this long with an empty queue. */
+    idleExitMs?: number;
+}
 /**
  * Async message queue feeding one persistent SDK session.
  * push() from the daemon (deliveries from other agents / the user);
@@ -43,6 +50,7 @@ export declare class Mailbox {
      *  next one or parking on wake. Sticky for the life of this Mailbox
      *  instance — a draining mailbox is being retired, not reused. */
     private draining;
+    private lastStreamEndValue?;
     /** Number of real (non-continuation) messages consumed so far across all sessions. */
     get consumedRealCount(): number;
     push(text: string): void;
@@ -82,7 +90,15 @@ export declare class Mailbox {
      * the generator; redelivering would duplicate work and can livelock the
      * restart loop).
      */
-    stream(sessionId?: string): AsyncGenerator<OrgUserMessage>;
+    stream(sessionId?: string, opts?: StreamOptions): AsyncGenerator<OrgUserMessage>;
+    /** Why the most recent stream() returned early, if it did: 'boundary'
+     *  (stopBefore rejected the next message) or 'idle' (idleExitMs elapsed). */
+    get lastStreamEnd(): 'boundary' | 'idle' | undefined;
+    /** The next queued message, without consuming it. */
+    peek(): string | undefined;
+    /** Resolves true once a message is queued, false if the mailbox closes or
+     *  drains first. Used to keep a role's process down while it has no mail. */
+    waitForMessage(): Promise<boolean>;
     /** Called by the crash-retry path right after a session dies abnormally. If
      *  a message was mid-flight — shifted for the crashed generator's yield but
      *  never confirmed processed, because the generator was abandoned at that

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

@@ -1 +1 @@
-{"version":3,"file":"mailbox.d.ts","sourceRoot":"","sources":["../../../src/orgrt/mailbox.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3C,kBAAkB,EAAE,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB;AAcD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAE5E;AAED;;;;GAIG;AACH,qBAAa,OAAO;IAClB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAO;IACxC;;6EAEyE;IACzE,MAAM,CAAC,QAAQ,CAAC,eAAe,4BAA4B;IAC3D,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,IAAI,CAA6B;IACzC,OAAO,CAAC,MAAM,CAAS;IACvB;;gFAE4E;IAC5E,OAAO,CAAC,gBAAgB,CAAC,CAAS;IAClC,qFAAqF;IACrF,OAAO,CAAC,UAAU,CAAK;IACvB;uFACmF;IACnF,OAAO,CAAC,YAAY,CAAK;IACzB;;;;uDAImD;IACnD,OAAO,CAAC,QAAQ,CAAuB;IACvC;;;sEAGkE;IAClE,OAAO,CAAC,QAAQ,CAAS;IAEzB,sFAAsF;IACtF,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAQvB;IAED,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAc3B;IAED,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;yEACqE;IACrE,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;;;;;OAUG;IACH,MAAM,IAAI,IAAI,CAEb;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED;;;;;;;gFAO4E;IAC5E,UAAU,IAAI,MAAM,EAAE,CAOrB;IAED;;;;;;;;OAQG;IACI,MAAM,CAAC,SAAS,SAAK,GAAG,cAAc,CAAC,cAAc,CAAC,CAkC5D;IAED;;;;;;;2DAOuD;IACvD,eAAe,IAAI,IAAI,CAStB;IAED,gEAAgE;IAChE,SAAS,IAAI;QAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAO5F;IAED,4DAA4D;IAC5D,WAAW,CAAC,KAAK,EAAE;QACjB,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,MAAM,EAAE,OAAO,CAAC;QAChB,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,GAAG,IAAI,CAUP;CACF"}
+{"version":3,"file":"mailbox.d.ts","sourceRoot":"","sources":["../../../src/orgrt/mailbox.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3C,kBAAkB,EAAE,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB;AAcD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAE5E;AAED,6EAA6E;AAC7E,MAAM,WAAW,aAAa;IAC5B,6EAA6E;IAC7E,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACvC,0DAA0D;IAC1D,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;GAIG;AACH,qBAAa,OAAO;IAClB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAO;IACxC;;6EAEyE;IACzE,MAAM,CAAC,QAAQ,CAAC,eAAe,4BAA4B;IAC3D,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,IAAI,CAA6B;IACzC,OAAO,CAAC,MAAM,CAAS;IACvB;;gFAE4E;IAC5E,OAAO,CAAC,gBAAgB,CAAC,CAAS;IAClC,qFAAqF;IACrF,OAAO,CAAC,UAAU,CAAK;IACvB;uFACmF;IACnF,OAAO,CAAC,YAAY,CAAK;IACzB;;;;uDAImD;IACnD,OAAO,CAAC,QAAQ,CAAuB;IACvC;;;sEAGkE;IAClE,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,kBAAkB,CAAC,CAAsB;IAEjD,sFAAsF;IACtF,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAQvB;IAED,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAc3B;IAED,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;yEACqE;IACrE,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;;;;;OAUG;IACH,MAAM,IAAI,IAAI,CAEb;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED;;;;;;;gFAO4E;IAC5E,UAAU,IAAI,MAAM,EAAE,CAOrB;IAED;;;;;;;;OAQG;IACI,MAAM,CAAC,SAAS,SAAK,EAAE,IAAI,GAAE,aAAkB,GAAG,cAAc,CAAC,cAAc,CAAC,CAwDtF;IAED;iFAC6E;IAC7E,IAAI,aAAa,IAAI,UAAU,GAAG,MAAM,GAAG,SAAS,CAEnD;IAED,qDAAqD;IACrD,IAAI,IAAI,MAAM,GAAG,SAAS,CAEzB;IAED;iFAC6E;IACvE,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CASvC;IAED;;;;;;;2DAOuD;IACvD,eAAe,IAAI,IAAI,CAStB;IAED,gEAAgE;IAChE,SAAS,IAAI;QAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAO5F;IAED,4DAA4D;IAC5D,WAAW,CAAC,KAAK,EAAE;QACjB,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,MAAM,EAAE,OAAO,CAAC;QAChB,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,GAAG,IAAI,CAUP;CACF"}

package/dist/src/orgrt/mailbox.js

@@ -47,6 +47,7 @@ export class Mailbox {
      *  next one or parking on wake. Sticky for the life of this Mailbox
      *  instance — a draining mailbox is being retired, not reused. */
     draining = false;
+    lastStreamEndValue;
     /** Number of real (non-continuation) messages consumed so far across all sessions. */
     get consumedRealCount() {
         return this.consumedReal;
@@ -127,8 +128,10 @@ export class Mailbox {
      * the generator; redelivering would duplicate work and can livelock the
      * restart loop).
      */
-    async *stream(sessionId = '') {
+    async *stream(sessionId = '', opts = {}) {
         const gen = ++this.generation;
+        this.lastStreamEndValue = undefined;
+        let yielded = false;
         // Drop (never resolve) any stale waker — see detach().
         this.wake = null;
         // A fresh generator starts with nothing in flight — any prior value
@@ -141,7 +144,16 @@ export class Mailbox {
                     return; // superseded — leave the queue for the live generator
                 if (this.draining)
                     return;
+                // D3: a message belonging to another model session ends this stream
+                // (so its query() ends and the process exits) and stays queued for
+                // the session that owns it. Never applied to the first message —
+                // the caller chose this session FOR that message.
+                if (yielded && opts.stopBefore?.(this.queue[0])) {
+                    this.lastStreamEndValue = 'boundary';
+                    return;
+                }
                 const content = this.queue.shift();
+                yielded = true;
                 if (!content.startsWith(Mailbox.CONTINUE_PREFIX))
                     this.consumedReal++;
                 this.inFlight = content;
@@ -162,11 +174,46 @@ export class Mailbox {
             }
             if (this.closed || gen !== this.generation || this.draining)
                 return;
-            await new Promise((r) => {
-                this.wake = r;
+            const woke = await new Promise((r) => {
+                this.wake = () => r(true);
+                if (opts.idleExitMs !== undefined) {
+                    const t = setTimeout(() => r(false), opts.idleExitMs);
+                    t.unref?.();
+                }
             });
             if (gen !== this.generation)
                 return;
+            if (!woke) {
+                // D3: idle long enough — end the stream so the role's process can
+                // exit; the next push waits in the queue for a resumed session.
+                this.wake = null;
+                this.lastStreamEndValue = 'idle';
+                return;
+            }
+        }
+    }
+    /** Why the most recent stream() returned early, if it did: 'boundary'
+     *  (stopBefore rejected the next message) or 'idle' (idleExitMs elapsed). */
+    get lastStreamEnd() {
+        return this.lastStreamEndValue;
+    }
+    /** The next queued message, without consuming it. */
+    peek() {
+        return this.queue[0];
+    }
+    /** Resolves true once a message is queued, false if the mailbox closes or
+     *  drains first. Used to keep a role's process down while it has no mail. */
+    async waitForMessage() {
+        while (true) {
+            if (this.draining)
+                return false;
+            if (this.queue.length > 0)
+                return true;
+            if (this.closed)
+                return false;
+            await new Promise((r) => {
+                this.wake = r;
+            });
         }
     }
     /** Called by the crash-retry path right after a session dies abnormally. If

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

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

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

@@ -7,6 +7,17 @@ export type Decision = {
     behavior: 'deny';
     message: string;
 };
+/** ADR-O001 D1: the four token quantities an Anthropic response bills for.
+ *  They are SIBLINGS, not subsets — `input` is the uncached remainder only,
+ *  while `cacheRead` (~0.1x input) and `cacheCreation` (~1.25x input) are
+ *  billed on top of it. Summing only `input + output`, as this engine used
+ *  to, reports ~0.3% of real consumption on a well-cached run. */
+export interface TokenUsage {
+    input: number;
+    output: number;
+    cacheRead: number;
+    cacheCreation: number;
+}
 export declare function redactSecrets(text: string): string;
 /** #289: the bounded, redacted slice of a tool's result body that goes on the
  *  bus. Redacts BEFORE truncating, so a cut-off credential can't leak the way
@@ -45,7 +56,8 @@ export declare class PolicyEngine {
      *  lists (file-roots.ts's `fileToolDenied()`) still apply inside every
      *  root, cwd included — see the deny pass below. */
     private roots;
-    private used;
+    /** ADR-O001 D1: the four billable quantities, tracked separately. */
+    private tokens;
     /** ORG-7: accumulated USD cost for this role, mirrors `used` (tokens). */
     private usedUsd;
     private toolContext;
@@ -62,10 +74,38 @@ export declare class PolicyEngine {
      *  daemon derived at spawn (maxTokens/maxUsd) are kept unless the new policy
      *  sets them itself. */
     updatePolicy(next: RolePolicy): void;
+    /** Legacy scalar accumulator. A caller with no breakdown to give (a
+     *  pre-ADR-O001 checkpoint, a runner that reports one number) lands on the
+     *  uncached `input` bucket — the basis such a number has always been on —
+     *  so it counts toward both `usage` and `budgetedUsage` and nothing that
+     *  used to bind stops binding. */
     addUsage(tokens: number): void;
+    /** ADR-O001 D1: add one turn's real usage, per quantity. */
+    addTokenUsage(u: Partial<TokenUsage>): void;
+    /** The honest meter: every billable token this role has consumed, cache
+     *  reads and cache writes included. Reporting, checkpoints and dashboards
+     *  read this. */
     get usage(): number;
-    /** Set usage counter directly for checkpoint/resume - Pattern 3 */
+    /** The four quantities, for per-role persistence (checkpoint.ts). */
+    get tokenUsage(): TokenUsage;
+    /** ADR-O001 D1: what `maxTokens` (role.budget_tokens / run_config.budget_tokens)
+     *  is compared against.
+     *
+     *  It deliberately is NOT `usage`. Counting cache tokens multiplies the
+     *  observed volume by ~100x on a well-cached run, so an existing
+     *  `budget_tokens` — including the schema's 1M default, which every org
+     *  gets whether or not it asked for one — would exhaust within a couple of
+     *  turns and close every mailbox. The meter therefore becomes honest while
+     *  the budget keeps the basis it was written against, unless a config opts
+     *  in via `run_config.budget_tokens_basis: 'billable'`. USD budgets
+     *  (`budget_usd`) are unaffected and are the control ADR-O001 recommends. */
+    get budgetedUsage(): number;
+    /** Set usage counter directly for checkpoint/resume - Pattern 3.
+     *  Scalar form: a pre-ADR-O001 checkpoint has no breakdown to restore, so
+     *  the value lands on the legacy (uncached) basis it was recorded on. */
     setUsage(tokens: number): void;
+    /** Restore a persisted breakdown (checkpoint.ts's `tokenUsage`). */
+    setTokenUsage(u: TokenUsage): void;
     get overBudget(): boolean;
     /** ORG-7: accumulate real USD cost (from 'usage' bus events' data.cost_usd). */
     addUsageUsd(costUsd: number): void;

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

@@ -1 +1 @@
-{"version":3,"file":"policy.d.ts","sourceRoot":"","sources":["../../../src/orgrt/policy.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGvC,OAAO,EAAE,KAAK,UAAU,EAAgC,MAAM,YAAY,CAAC;AAE3E,MAAM,MAAM,QAAQ,GAChB;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GAC5D;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAgD1C,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIlD;AAED;;;mFAGmF;AACnF,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CASA;AAID;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA6BjD;AAED,wEAAwE;AACxE,MAAM,WAAW,iBAAiB;IAChC;kFAC8E;IAC9E,gBAAgB,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;IAClC,sEAAsE;IACtE,KAAK,CAAC,EAAE,MAAM;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;CAC7D;AAID,qBAAa,YAAY;IAMrB,QAAQ,CAAC,IAAI,EAAE,MAAM;IACd,MAAM,EAAE,UAAU;IACzB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,GAAG;IACX;;;;wDAIoD;IACpD,OAAO,CAAC,KAAK;IAdf,OAAO,CAAC,IAAI,CAAK;IACjB,0EAA0E;IAC1E,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,WAAW,CAAyB;IAC5C,YACW,IAAI,EAAE,MAAM,EACd,MAAM,EAAE,UAAU,EACjB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM;IACnB;;;;wDAIoD;IAC5C,KAAK,GAAE,MAAM,EAAO,EAC1B;IAEJ,4DAA4D;IAC5D,cAAc,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAE3C;IAED;;4BAEwB;IACxB,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAMnC;IAED,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAE7B;IACD,IAAI,KAAK,IAAI,MAAM,CAElB;IACD,mEAAmE;IACnE,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAE7B;IACD,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,gFAAgF;IAChF,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAEjC;IACD,IAAI,QAAQ,IAAI,MAAM,CAErB;IACD,gFAAgF;IAChF,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAEjC;IACD;;wEAEoE;IACpE,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED;;;yEAGqE;IAC/D,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAqM7F;CACF;AAED;;2EAE2E;AAC3E,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAOvE;AAwCD;0CAC0C;AAC1C,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAE1F"}
+{"version":3,"file":"policy.d.ts","sourceRoot":"","sources":["../../../src/orgrt/policy.ts"],"names":[],"mappings":"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"}