@openrig/cli 0.1.12 → 0.3.0

package/daemon/dist/domain/classifier-lease-manager.js

@@ -0,0 +1,285 @@
+import { ulid } from "ulid";
+/**
+ * Classifier lease manager (PL-004 Phase B).
+ *
+ * Daemon-enforced single-writer lease for the project (classifier) primitive.
+ * Per PRD § L2 hard rule + slice IMPL § Guard Checkpoint Focus item 2:
+ *
+ * - Single-writer: at most one lease in `state='active'` at any time, enforced
+ *   via partial UNIQUE index `idx_classifier_leases_active_singleton`.
+ * - TTL-based expiry: every lease has an `expires_at` (acquired_at + ttlMs).
+ * - Heartbeat: `last_heartbeat` is updated by the lease holder. Stale heartbeat
+ *   past TTL signals deadness.
+ * - Deadness detection: caller of `evaluateDeadness` is the project verb path
+ *   OR a watchdog. The manager itself does NOT auto-reclaim — only marks
+ *   `expired` when heartbeat is stale.
+ * - Reclaim is OPERATOR-VERB ONLY: `rig project --reclaim-classifier
+ *   [--if-dead]`. Daemon does NOT auto-reclaim. The reclaim path takes the
+ *   active lease away from the previous holder and emits classifier.reclaimed.
+ *
+ * Pattern mirrors Phase A's hot-potato-enforcer.ts shape: pure validation +
+ * lifecycle methods, no Hono. Routes import this; this does not import routes.
+ */
+export const LEASE_STATES = ["active", "expired", "reclaimed"];
+export class ClassifierLeaseError extends Error {
+    code;
+    meta;
+    constructor(code, message, meta) {
+        super(message);
+        this.code = code;
+        this.meta = meta;
+    }
+}
+/**
+ * Default lease TTL: 15 minutes. Per PRD: "TTL-based"; concrete value is
+ * implementation choice. 15 min is the operator-friendly midpoint between
+ * stale-detection latency (longer = slower deadness signal) and unnecessary
+ * heartbeat traffic (shorter = more wake-ups). Configurable via constructor
+ * option for tests + future tuning.
+ */
+const DEFAULT_LEASE_TTL_MS = 15 * 60 * 1000;
+export class ClassifierLeaseManager {
+    db;
+    eventBus;
+    ttlMs;
+    now;
+    isAlive;
+    constructor(db, eventBus, opts) {
+        this.db = db;
+        this.eventBus = eventBus;
+        this.ttlMs = opts?.ttlMs ?? DEFAULT_LEASE_TTL_MS;
+        this.now = opts?.now ?? (() => new Date());
+        this.isAlive = opts?.isAlive ?? (() => true);
+    }
+    /**
+     * Wire post-construction liveness check (used by startup.ts when
+     * whoami-service is constructed later in the dep graph).
+     */
+    attachIsAlive(check) {
+        this.isAlive = check;
+    }
+    /**
+     * Acquire the active lease for a classifier session. Fails with
+     * `lease_held` (409) if another session currently holds an active lease
+     * AND that session is alive. If the held lease is by a dead session, the
+     * caller should first invoke `evaluateDeadness` (which marks it expired)
+     * or use the operator reclaim path.
+     *
+     * Idempotent for the SAME classifier_session: re-calling acquire on the
+     * lease holder's behalf returns the existing lease unchanged (heartbeat
+     * is updated separately via `heartbeat`).
+     */
+    acquire(classifierSession) {
+        const active = this.getActiveLease();
+        if (active) {
+            if (active.classifierSession === classifierSession) {
+                // Idempotent re-acquire by current holder.
+                return active;
+            }
+            throw new ClassifierLeaseError("lease_held", `classifier lease is held by ${active.classifierSession} until ${active.expiresAt}; reclaim via 'rig project --reclaim-classifier' if needed`, { holder: active.classifierSession, expiresAt: active.expiresAt });
+        }
+        const leaseId = ulid();
+        const acquiredAt = this.now().toISOString();
+        const expiresAt = new Date(this.now().getTime() + this.ttlMs).toISOString();
+        const txn = this.db.transaction(() => {
+            this.db
+                .prepare(`INSERT INTO classifier_leases (
+            lease_id, classifier_session, acquired_at, expires_at,
+            last_heartbeat, state
+          ) VALUES (?, ?, ?, ?, ?, 'active')`)
+                .run(leaseId, classifierSession, acquiredAt, expiresAt, acquiredAt);
+            return this.eventBus.persistWithinTransaction({
+                type: "classifier.lease_acquired",
+                leaseId,
+                classifierSession,
+                acquiredAt,
+                expiresAt,
+            });
+        });
+        const persisted = txn();
+        this.eventBus.notifySubscribers(persisted);
+        return this.getByIdOrThrow(leaseId);
+    }
+    /**
+     * Heartbeat from the lease holder. Updates `last_heartbeat` and extends
+     * `expires_at` by the TTL (sliding-window TTL semantics).
+     */
+    heartbeat(leaseId, classifierSession) {
+        const lease = this.getById(leaseId);
+        if (!lease) {
+            throw new ClassifierLeaseError("lease_not_found", `lease ${leaseId} not found`);
+        }
+        if (lease.classifierSession !== classifierSession) {
+            throw new ClassifierLeaseError("lease_session_mismatch", `lease ${leaseId} is held by ${lease.classifierSession}, not ${classifierSession}`);
+        }
+        if (lease.state !== "active") {
+            throw new ClassifierLeaseError("lease_not_active", `lease ${leaseId} is in state ${lease.state}; cannot heartbeat`);
+        }
+        const now = this.now();
+        const lastHeartbeat = now.toISOString();
+        const expiresAt = new Date(now.getTime() + this.ttlMs).toISOString();
+        this.db
+            .prepare(`UPDATE classifier_leases
+           SET last_heartbeat = ?, expires_at = ?
+         WHERE lease_id = ?`)
+            .run(lastHeartbeat, expiresAt, leaseId);
+        return this.getByIdOrThrow(leaseId);
+    }
+    /**
+     * Evaluate deadness for the currently-active lease. If the lease's
+     * heartbeat is stale (now > expires_at) OR the holder is reported dead
+     * by `isAlive`, mark the lease expired and emit classifier.lease_expired
+     * + classifier.dead. Returns the (now-expired) lease, or null if no
+     * active lease exists or it remains alive.
+     *
+     * Called by: project verb path (before acquire, to clear dead leases),
+     * watchdog (periodic sweep), or operator-driven check.
+     *
+     * Per PRD: this method does NOT reclaim — it only marks expired. The
+     * next `acquire` call by ANY session can then succeed (since the partial
+     * UNIQUE on state='active' is now empty).
+     */
+    evaluateDeadness() {
+        const active = this.getActiveLease();
+        if (!active)
+            return null;
+        const nowIso = this.now().toISOString();
+        const ttlPassed = nowIso > active.expiresAt;
+        const sessionDead = !this.isAlive(active.classifierSession);
+        if (!ttlPassed && !sessionDead)
+            return null;
+        const events = [];
+        const txn = this.db.transaction(() => {
+            this.db
+                .prepare(`UPDATE classifier_leases SET state = 'expired' WHERE lease_id = ? AND state = 'active'`)
+                .run(active.leaseId);
+            events.push(this.eventBus.persistWithinTransaction({
+                type: "classifier.lease_expired",
+                leaseId: active.leaseId,
+                classifierSession: active.classifierSession,
+                expiredAt: nowIso,
+            }));
+            if (sessionDead) {
+                events.push(this.eventBus.persistWithinTransaction({
+                    type: "classifier.dead",
+                    leaseId: active.leaseId,
+                    classifierSession: active.classifierSession,
+                    lastHeartbeat: active.lastHeartbeat,
+                    detectedAt: nowIso,
+                }));
+            }
+        });
+        txn();
+        for (const e of events)
+            this.eventBus.notifySubscribers(e);
+        return this.getByIdOrThrow(active.leaseId);
+    }
+    /**
+     * Operator-verb reclaim. Per PRD § L2 hard rule: ONLY this path may take
+     * an active lease away from its holder. Daemon does NOT auto-reclaim.
+     *
+     * - If `ifDead`: only succeed when isAlive(holder) returns false. If the
+     *   holder is alive, refuse with `lease_still_active`.
+     * - If `!ifDead`: take the lease unconditionally.
+     *
+     * Marks the active lease state='reclaimed', records reclaimed_by_session
+     * + reclaim_reason, and emits classifier.reclaimed. The next acquire
+     * (by ANY session) can then succeed.
+     */
+    reclaim(byClassifierSession, opts) {
+        const active = this.getActiveLease();
+        if (!active) {
+            throw new ClassifierLeaseError("no_active_lease", "no active classifier lease to reclaim");
+        }
+        if (opts?.ifDead === true && this.isAlive(active.classifierSession)) {
+            throw new ClassifierLeaseError("lease_still_active", `classifier lease holder ${active.classifierSession} is still alive; --if-dead refuses to reclaim`, { holder: active.classifierSession });
+        }
+        const reason = opts?.reason ?? (opts?.ifDead ? "operator-reclaim --if-dead" : "operator-reclaim");
+        const reclaimedAt = this.now().toISOString();
+        const txn = this.db.transaction(() => {
+            this.db
+                .prepare(`UPDATE classifier_leases
+             SET state = 'reclaimed',
+                 reclaimed_by_session = ?,
+                 reclaim_reason = ?
+           WHERE lease_id = ? AND state = 'active'`)
+                .run(byClassifierSession, reason, active.leaseId);
+            return this.eventBus.persistWithinTransaction({
+                type: "classifier.reclaimed",
+                leaseId: active.leaseId,
+                previousClassifierSession: active.classifierSession,
+                reclaimedBySession: byClassifierSession,
+                reason,
+                reclaimedAt,
+            });
+        });
+        const persisted = txn();
+        this.eventBus.notifySubscribers(persisted);
+        return this.getByIdOrThrow(active.leaseId);
+    }
+    /**
+     * Validation hook used by project-classifier: returns the active lease
+     * iff the supplied session holds it, else throws. Centralizes the
+     * "must hold the lease to project" check.
+     */
+    requireActiveHolder(classifierSession) {
+        const active = this.getActiveLease();
+        if (!active) {
+            throw new ClassifierLeaseError("no_active_lease", "no active classifier lease; call acquire first");
+        }
+        if (active.classifierSession !== classifierSession) {
+            throw new ClassifierLeaseError("lease_held", `classifier lease is held by ${active.classifierSession}, not ${classifierSession}`, { holder: active.classifierSession });
+        }
+        if (active.expiresAt < this.now().toISOString()) {
+            throw new ClassifierLeaseError("lease_expired", `classifier lease for ${classifierSession} expired at ${active.expiresAt}`);
+        }
+        return active;
+    }
+    getActiveLease() {
+        const row = this.db
+            .prepare(`SELECT * FROM classifier_leases WHERE state = 'active' LIMIT 1`)
+            .get();
+        return row ? this.rowToLease(row) : null;
+    }
+    getById(leaseId) {
+        const row = this.db
+            .prepare(`SELECT * FROM classifier_leases WHERE lease_id = ?`)
+            .get(leaseId);
+        return row ? this.rowToLease(row) : null;
+    }
+    list(opts) {
+        const limit = opts?.limit ?? 100;
+        const conditions = [];
+        const params = [];
+        if (opts?.classifierSession) {
+            conditions.push("classifier_session = ?");
+            params.push(opts.classifierSession);
+        }
+        const where = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+        params.push(limit);
+        const rows = this.db
+            .prepare(`SELECT * FROM classifier_leases ${where} ORDER BY acquired_at DESC LIMIT ?`)
+            .all(...params);
+        return rows.map((r) => this.rowToLease(r));
+    }
+    getByIdOrThrow(leaseId) {
+        const lease = this.getById(leaseId);
+        if (!lease) {
+            throw new ClassifierLeaseError("lease_not_found", `lease ${leaseId} not found after write`);
+        }
+        return lease;
+    }
+    rowToLease(row) {
+        return {
+            leaseId: row.lease_id,
+            classifierSession: row.classifier_session,
+            acquiredAt: row.acquired_at,
+            expiresAt: row.expires_at,
+            lastHeartbeat: row.last_heartbeat,
+            state: row.state,
+            reclaimedBySession: row.reclaimed_by_session,
+            reclaimReason: row.reclaim_reason,
+        };
+    }
+}
+//# sourceMappingURL=classifier-lease-manager.js.map

package/daemon/dist/domain/classifier-lease-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"classifier-lease-manager.js","sourceRoot":"","sources":["../../src/domain/classifier-lease-manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI5B;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,WAAW,CAAU,CAAC;AAyBxE,MAAM,OAAO,oBAAqB,SAAQ,KAAK;IACpC,IAAI,CAAS;IACb,IAAI,CAAsC;IACnD,YAAY,IAAY,EAAE,OAAe,EAAE,IAA8B;QACvE,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AAED;;;;;;GAMG;AACH,MAAM,oBAAoB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAiB5C,MAAM,OAAO,sBAAsB;IACxB,EAAE,CAAoB;IACd,QAAQ,CAAW;IACnB,KAAK,CAAS;IACd,GAAG,CAAa;IACzB,OAAO,CAAyC;IAExD,YACE,EAAqB,EACrB,QAAkB,EAClB,IAAoC;QAEpC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,oBAAoB,CAAC;QACjD,IAAI,CAAC,GAAG,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QAC3C,IAAI,CAAC,OAAO,GAAG,IAAI,EAAE,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED;;;OAGG;IACH,aAAa,CAAC,KAA6C;QACzD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACvB,CAAC;IAED;;;;;;;;;;OAUG;IACH,OAAO,CAAC,iBAAyB;QAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,MAAM,CAAC,iBAAiB,KAAK,iBAAiB,EAAE,CAAC;gBACnD,2CAA2C;gBAC3C,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,MAAM,IAAI,oBAAoB,CAC5B,YAAY,EACZ,+BAA+B,MAAM,CAAC,iBAAiB,UAAU,MAAM,CAAC,SAAS,4DAA4D,EAC7I,EAAE,MAAM,EAAE,MAAM,CAAC,iBAAiB,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAClE,CAAC;QACJ,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,EAAE,CAAC;QACvB,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC;QAC5C,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QAE5E,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;YACnC,IAAI,CAAC,EAAE;iBACJ,OAAO,CACN;;;6CAGmC,CACpC;iBACA,GAAG,CAAC,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;YAEtE,OAAO,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC;gBAC5C,IAAI,EAAE,2BAA2B;gBACjC,OAAO;gBACP,iBAAiB;gBACjB,UAAU;gBACV,SAAS;aACV,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAC3C,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAED;;;OAGG;IACH,SAAS,CAAC,OAAe,EAAE,iBAAyB;QAClD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACpC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,oBAAoB,CAAC,iBAAiB,EAAE,SAAS,OAAO,YAAY,CAAC,CAAC;QAClF,CAAC;QACD,IAAI,KAAK,CAAC,iBAAiB,KAAK,iBAAiB,EAAE,CAAC;YAClD,MAAM,IAAI,oBAAoB,CAC5B,wBAAwB,EACxB,SAAS,OAAO,eAAe,KAAK,CAAC,iBAAiB,SAAS,iBAAiB,EAAE,CACnF,CAAC;QACJ,CAAC;QACD,IAAI,KAAK,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC7B,MAAM,IAAI,oBAAoB,CAC5B,kBAAkB,EAClB,SAAS,OAAO,gBAAgB,KAAK,CAAC,KAAK,oBAAoB,CAChE,CAAC;QACJ,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,aAAa,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QACxC,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QAErE,IAAI,CAAC,EAAE;aACJ,OAAO,CACN;;4BAEoB,CACrB;aACA,GAAG,CAAC,aAAa,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAE1C,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,gBAAgB;QACd,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC;QACxC,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC;QAC5C,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC5D,IAAI,CAAC,SAAS,IAAI,CAAC,WAAW;YAAE,OAAO,IAAI,CAAC;QAE5C,MAAM,MAAM,GAAqB,EAAE,CAAC;QACpC,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;YACnC,IAAI,CAAC,EAAE;iBACJ,OAAO,CACN,wFAAwF,CACzF;iBACA,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAEvB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC;gBACjD,IAAI,EAAE,0BAA0B;gBAChC,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;gBAC3C,SAAS,EAAE,MAAM;aAClB,CAAC,CAAC,CAAC;YAEJ,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC;oBACjD,IAAI,EAAE,iBAAiB;oBACvB,OAAO,EAAE,MAAM,CAAC,OAAO;oBACvB,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;oBAC3C,aAAa,EAAE,MAAM,CAAC,aAAa;oBACnC,UAAU,EAAE,MAAM;iBACnB,CAAC,CAAC,CAAC;YACN,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,GAAG,EAAE,CAAC;QACN,KAAK,MAAM,CAAC,IAAI,MAAM;YAAE,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,mBAA2B,EAAE,IAA4C;QAC/E,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,oBAAoB,CAC5B,iBAAiB,EACjB,uCAAuC,CACxC,CAAC;QACJ,CAAC;QACD,IAAI,IAAI,EAAE,MAAM,KAAK,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACpE,MAAM,IAAI,oBAAoB,CAC5B,oBAAoB,EACpB,2BAA2B,MAAM,CAAC,iBAAiB,+CAA+C,EAClG,EAAE,MAAM,EAAE,MAAM,CAAC,iBAAiB,EAAE,CACrC,CAAC;QACJ,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,EAAE,MAAM,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC;QAClG,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC;QAE7C,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;YACnC,IAAI,CAAC,EAAE;iBACJ,OAAO,CACN;;;;mDAIyC,CAC1C;iBACA,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;YAEpD,OAAO,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC;gBAC5C,IAAI,EAAE,sBAAsB;gBAC5B,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,yBAAyB,EAAE,MAAM,CAAC,iBAAiB;gBACnD,kBAAkB,EAAE,mBAAmB;gBACvC,MAAM;gBACN,WAAW;aACZ,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAC3C,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED;;;;OAIG;IACH,mBAAmB,CAAC,iBAAyB;QAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,oBAAoB,CAC5B,iBAAiB,EACjB,gDAAgD,CACjD,CAAC;QACJ,CAAC;QACD,IAAI,MAAM,CAAC,iBAAiB,KAAK,iBAAiB,EAAE,CAAC;YACnD,MAAM,IAAI,oBAAoB,CAC5B,YAAY,EACZ,+BAA+B,MAAM,CAAC,iBAAiB,SAAS,iBAAiB,EAAE,EACnF,EAAE,MAAM,EAAE,MAAM,CAAC,iBAAiB,EAAE,CACrC,CAAC;QACJ,CAAC;QACD,IAAI,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;YAChD,MAAM,IAAI,oBAAoB,CAC5B,eAAe,EACf,wBAAwB,iBAAiB,eAAe,MAAM,CAAC,SAAS,EAAE,CAC3E,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,cAAc;QACZ,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CAAC,gEAAgE,CAAC;aACzE,GAAG,EAAoC,CAAC;QAC3C,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3C,CAAC;IAED,OAAO,CAAC,OAAe;QACrB,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CAAC,oDAAoD,CAAC;aAC7D,GAAG,CAAC,OAAO,CAAmC,CAAC;QAClD,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3C,CAAC;IAED,IAAI,CAAC,IAAqD;QACxD,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,GAAG,CAAC;QACjC,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,MAAM,MAAM,GAAc,EAAE,CAAC;QAC7B,IAAI,IAAI,EAAE,iBAAiB,EAAE,CAAC;YAC5B,UAAU,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YAC1C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACtC,CAAC;QACD,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/E,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnB,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE;aACjB,OAAO,CAAC,mCAAmC,KAAK,oCAAoC,CAAC;aACrF,GAAG,CAAC,GAAG,MAAM,CAAyB,CAAC;QAC1C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC;IAEO,cAAc,CAAC,OAAe;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACpC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,oBAAoB,CAAC,iBAAiB,EAAE,SAAS,OAAO,wBAAwB,CAAC,CAAC;QAC9F,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,UAAU,CAAC,GAAuB;QACxC,OAAO;YACL,OAAO,EAAE,GAAG,CAAC,QAAQ;YACrB,iBAAiB,EAAE,GAAG,CAAC,kBAAkB;YACzC,UAAU,EAAE,GAAG,CAAC,WAAW;YAC3B,SAAS,EAAE,GAAG,CAAC,UAAU;YACzB,aAAa,EAAE,GAAG,CAAC,cAAc;YACjC,KAAK,EAAE,GAAG,CAAC,KAAmB;YAC9B,kBAAkB,EAAE,GAAG,CAAC,oBAAoB;YAC5C,aAAa,EAAE,GAAG,CAAC,cAAc;SAClC,CAAC;IACJ,CAAC;CACF"}

package/daemon/dist/domain/conflict-detector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conflict-detector.d.ts","sourceRoot":"","sources":["../../src/domain/conflict-detector.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAgB,MAAM,sBAAsB,CAAC;AAExF,MAAM,WAAW,kBAAmB,SAAQ,WAAW;IACrD,KAAK,EAAE,gBAAgB,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAWD;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,WAAW,EACjB,EAAE,EAAE,KAAK,GACR,kBAAkB,CA6FpB;AAID,UAAU,eAAe;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;CAC/B;AAED;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,KAAK,EAAE,eAAe,GACrB,wBAAwB,CAyB1B"}
+{"version":3,"file":"conflict-detector.d.ts","sourceRoot":"","sources":["../../src/domain/conflict-detector.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAgB,MAAM,sBAAsB,CAAC;AAExF,MAAM,WAAW,kBAAmB,SAAQ,WAAW;IACrD,KAAK,EAAE,gBAAgB,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAWD;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,WAAW,EACjB,EAAE,EAAE,KAAK,GACR,kBAAkB,CAiGpB;AAID,UAAU,eAAe;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;CAC/B;AAED;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,KAAK,EAAE,eAAe,GACrB,wBAAwB,CAyB1B"}

package/daemon/dist/domain/conflict-detector.js

@@ -2,8 +2,8 @@ import { createHash } from "node:crypto";
 function hashContent(content) {
     return createHash("sha256").update(content).digest("hex");
 }
-const MANAGED_BLOCK_START = (packageName) => `<!-- BEGIN RIGGED MANAGED BLOCK: ${packageName} -->`;
-const MANAGED_BLOCK_END = (packageName) => `<!-- END RIGGED MANAGED BLOCK: ${packageName} -->`;
+const MANAGED_BLOCK_START = (packageName) => `<!-- BEGIN OpenRig MANAGED BLOCK: ${packageName} -->`;
+const MANAGED_BLOCK_END = (packageName) => `<!-- END OpenRig MANAGED BLOCK: ${packageName} -->`;
 /**
  * Refines an InstallPlan with content-aware conflict detection.
  * - Skills/agents: same content = no-op, different content = conflict with hashes
@@ -74,7 +74,10 @@ export function detectConflicts(plan, fs) {
                 const targetContent = fs.readFile(entry.targetPath);
                 const beginMarker = MANAGED_BLOCK_START(plan.packageName);
                 const endMarker = MANAGED_BLOCK_END(plan.packageName);
-                const hasExistingBlock = targetContent.includes(beginMarker) && targetContent.includes(endMarker);
+                const legacyBegin = `<!-- BEGIN RIGGED MANAGED BLOCK: ${plan.packageName} -->`;
+                const legacyEnd = `<!-- END RIGGED MANAGED BLOCK: ${plan.packageName} -->`;
+                const hasExistingBlock = (targetContent.includes(beginMarker) && targetContent.includes(endMarker)) ||
+                    (targetContent.includes(legacyBegin) && targetContent.includes(legacyEnd));
                 const refined = {
                     ...entry,
                     guidanceMeta: { hasExistingBlock },

package/daemon/dist/domain/conflict-detector.js.map

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

package/daemon/dist/domain/context-monitor.d.ts

@@ -11,9 +11,9 @@ interface ClaudeContextProvisioner {
     checkReady?(binding: NodeBinding): Promise<ReadinessResult>;
 }
 /**
- * Polls known managed Claude sidecar files and persists the latest
- * normalized context telemetry. Scheduler-only: no queries, no response
- * shaping, no in-memory truth.
+ * Polls known managed runtime context sources and persists the latest
+ * normalized telemetry. Scheduler-only: no queries, no response shaping,
+ * no in-memory truth.
  */
 export declare class ContextMonitor {
     private db;
@@ -27,8 +27,9 @@ export declare class ContextMonitor {
     start(intervalMs?: number): void;
     /** Stop polling. Safe to call before start or multiple times. */
     stop(): void;
-    /** Query for managed Claude sessions that are currently running. */
+    /** Query for managed runtime sessions with readable context sources. */
     private getEligibleSessions;
+    private readContextUsage;
     private normalizeStartupStatus;
 }
 export {};

package/daemon/dist/domain/context-monitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context-monitor.d.ts","sourceRoot":"","sources":["../../src/domain/context-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,eAAe,EACrB,MAAM,sBAAsB,CAAC;AAE9B,4CAA4C;AAC5C,eAAO,MAAM,wBAAwB,QAAS,CAAC;AAU/C,UAAU,wBAAwB;IAChC,sBAAsB,CAAC,OAAO,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IAC5F,UAAU,CAAC,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CAC7D;AAED;;;;GAIG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,EAAE,CAAoB;IAC9B,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,wBAAwB,CAAkC;IAClE,OAAO,CAAC,KAAK,CAA+C;gBAG1D,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,KAAK,EAAE,iBAAiB,EACxB,wBAAwB,CAAC,EAAE,wBAAwB;IAOrD,4EAA4E;IACtE,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB/B,uDAAuD;IACvD,KAAK,CAAC,UAAU,GAAE,MAAiC,GAAG,IAAI;IAW1D,iEAAiE;IACjE,IAAI,IAAI,IAAI;IAOZ,oEAAoE;IACpE,OAAO,CAAC,mBAAmB;YAmBb,sBAAsB;CAsCrC"}
+{"version":3,"file":"context-monitor.d.ts","sourceRoot":"","sources":["../../src/domain/context-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,eAAe,EACrB,MAAM,sBAAsB,CAAC;AAE9B,4CAA4C;AAC5C,eAAO,MAAM,wBAAwB,QAAS,CAAC;AAY/C,UAAU,wBAAwB;IAChC,sBAAsB,CAAC,OAAO,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IAC5F,UAAU,CAAC,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CAC7D;AAED;;;;GAIG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,EAAE,CAAoB;IAC9B,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,wBAAwB,CAAkC;IAClE,OAAO,CAAC,KAAK,CAA+C;gBAG1D,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,KAAK,EAAE,iBAAiB,EACxB,wBAAwB,CAAC,EAAE,wBAAwB;IAOrD,4EAA4E;IACtE,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB/B,uDAAuD;IACvD,KAAK,CAAC,UAAU,GAAE,MAAiC,GAAG,IAAI;IAW1D,iEAAiE;IACjE,IAAI,IAAI,IAAI;IAOZ,wEAAwE;IACxE,OAAO,CAAC,mBAAmB;IAuB3B,OAAO,CAAC,gBAAgB;YAeV,sBAAsB;CAuCrC"}

package/daemon/dist/domain/context-monitor.js

@@ -2,9 +2,9 @@ import { isAttentionRequiredReadinessCode, } from "./runtime-adapter.js";
 /** Default polling interval: 30 seconds. */
 export const DEFAULT_POLL_INTERVAL_MS = 30_000;
 /**
- * Polls known managed Claude sidecar files and persists the latest
- * normalized context telemetry. Scheduler-only: no queries, no response
- * shaping, no in-memory truth.
+ * Polls known managed runtime context sources and persists the latest
+ * normalized telemetry. Scheduler-only: no queries, no response shaping,
+ * no in-memory truth.
  */
 export class ContextMonitor {
     db;
@@ -21,11 +21,7 @@ export class ContextMonitor {
         const sessions = this.getEligibleSessions();
         for (const session of sessions) {
             try {
-                this.claudeContextProvisioner?.ensureContextCollector({
-                    cwd: session.cwd ?? undefined,
-                    tmuxSession: session.session_name,
-                });
-                const usage = this.store.readAndNormalize(session.session_name);
+                const usage = this.readContextUsage(session);
                 this.store.persist(session.node_id, usage);
             }
             catch {
@@ -57,26 +53,45 @@ export class ContextMonitor {
             this.timer = null;
         }
     }
-    /** Query for managed Claude sessions that are currently running. */
+    /** Query for managed runtime sessions with readable context sources. */
     getEligibleSessions() {
         return this.db.prepare(`
       SELECT
         n.id as node_id,
         s.id as session_id,
         s.session_name,
+        n.runtime,
+        s.resume_token,
         n.cwd,
         s.startup_status
       FROM nodes n
       JOIN sessions s ON s.node_id = n.id
         AND s.id = (SELECT s2.id FROM sessions s2 WHERE s2.node_id = n.id ORDER BY s2.id DESC LIMIT 1)
       LEFT JOIN bindings b ON b.node_id = n.id
-      WHERE n.runtime = 'claude-code'
-        AND s.status = 'running'
+      WHERE (
+          (n.runtime = 'claude-code' AND s.status = 'running')
+          OR (n.runtime = 'codex' AND s.resume_token IS NOT NULL)
+        )
         AND COALESCE(b.attachment_type, 'tmux') = 'tmux'
         AND COALESCE(b.tmux_session, s.session_name) IS NOT NULL
     `).all();
     }
+    readContextUsage(session) {
+        if (session.runtime === "codex") {
+            return this.store.readCodexAndNormalize({
+                threadId: session.resume_token,
+                sessionName: session.session_name,
+            });
+        }
+        this.claudeContextProvisioner?.ensureContextCollector({
+            cwd: session.cwd ?? undefined,
+            tmuxSession: session.session_name,
+        });
+        return this.store.readAndNormalize(session.session_name);
+    }
     async normalizeStartupStatus(session) {
+        if (session.runtime !== "claude-code")
+            return;
         if (!this.claudeContextProvisioner?.checkReady)
             return;
         if (session.startup_status !== "failed" && session.startup_status !== "attention_required")

package/daemon/dist/domain/context-monitor.js.map

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

package/daemon/dist/domain/context-packs/bundle-assembler.d.ts

@@ -0,0 +1,49 @@
+import { type ContextPackEntry } from "./context-pack-types.js";
+export interface AssembledBundle {
+    /** Concatenated bundle string ready for SessionTransport.send. */
+    text: string;
+    /** Total length in bytes of the assembled string (UTF-8 encoded). */
+    bytes: number;
+    /** Daemon-derived estimate (chars / 4 rounded). */
+    estimatedTokens: number;
+    /** Per-file metadata threaded through assembly for the dry-run preview. */
+    files: Array<{
+        path: string;
+        role: string;
+        bytes: number;
+        estimatedTokens: number;
+    }>;
+    /** Files that were referenced in the manifest but missing on disk;
+     *  surfaced as a warning in the preview rather than a hard fail so
+     *  operator can repair. */
+    missingFiles: Array<{
+        path: string;
+        role: string;
+    }>;
+}
+export interface AssembleOpts {
+    packEntry: ContextPackEntry;
+    /** Defaults to readFileSync; injected for tests. */
+    readFile?: (absPath: string) => string;
+}
+/**
+ * Assembles a context pack into a single paste-ready string.
+ *
+ * Frame:
+ *   # OpenRig Context Pack: <name> v<version>
+ *   <purpose, if any>
+ *
+ *   ## File: <path> (role: <role>)
+ *   <file contents>
+ *
+ *   ## File: <path> (role: <role>)
+ *   <file contents>
+ *
+ *   ...
+ *
+ * Each file is separated by a blank line so adjacent contents don't
+ * accidentally merge into a contiguous markdown block. Missing files
+ * are skipped (operator sees them in `missingFiles` for repair).
+ */
+export declare function assembleBundle(opts: AssembleOpts): AssembledBundle;
+//# sourceMappingURL=bundle-assembler.d.ts.map

package/daemon/dist/domain/context-packs/bundle-assembler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bundle-assembler.d.ts","sourceRoot":"","sources":["../../../src/domain/context-packs/bundle-assembler.ts"],"names":[],"mappings":"AAaA,OAAO,EAAoB,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAGlF,MAAM,WAAW,eAAe;IAC9B,kEAAkE;IAClE,IAAI,EAAE,MAAM,CAAC;IACb,qEAAqE;IACrE,KAAK,EAAE,MAAM,CAAC;IACd,mDAAmD;IACnD,eAAe,EAAE,MAAM,CAAC;IACxB,2EAA2E;IAC3E,KAAK,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACrF;;+BAE2B;IAC3B,YAAY,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACrD;AAED,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,gBAAgB,CAAC;IAC5B,oDAAoD;IACpD,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;CACxC;AAKD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,YAAY,GAAG,eAAe,CAmDlE"}

package/daemon/dist/domain/context-packs/bundle-assembler.js

@@ -0,0 +1,81 @@
+// Rig Context / Composable Context Injection v0 (PL-014) — bundle
+// assembler.
+//
+// Concatenates a context_pack's included files into a single coherent
+// paste-ready string. Each file gets a `## File: <path> (role: <role>)`
+// header so the destination seat can recognize the bundle structure.
+// The full bundle leads with a one-line manifest summary so the
+// destination has at-a-glance context.
+//
+// One coherent paste, NOT N separate sends — matches PRD § Item 5: "the
+// seat receives the pack as a single coherent priming injection."
+import { readFileSync } from "node:fs";
+import { ContextPackError } from "./context-pack-types.js";
+import { estimateTokensFromBytes } from "./context-pack-library-service.js";
+const PACK_HEADER_PREFIX = "# OpenRig Context Pack:";
+const FILE_HEADER_PREFIX = "## File:";
+/**
+ * Assembles a context pack into a single paste-ready string.
+ *
+ * Frame:
+ *   # OpenRig Context Pack: <name> v<version>
+ *   <purpose, if any>
+ *
+ *   ## File: <path> (role: <role>)
+ *   <file contents>
+ *
+ *   ## File: <path> (role: <role>)
+ *   <file contents>
+ *
+ *   ...
+ *
+ * Each file is separated by a blank line so adjacent contents don't
+ * accidentally merge into a contiguous markdown block. Missing files
+ * are skipped (operator sees them in `missingFiles` for repair).
+ */
+export function assembleBundle(opts) {
+    const { packEntry } = opts;
+    const reader = opts.readFile ?? ((p) => readFileSync(p, "utf-8"));
+    const sections = [];
+    sections.push(`${PACK_HEADER_PREFIX} ${packEntry.name} v${packEntry.version}`);
+    if (packEntry.purpose) {
+        sections.push(packEntry.purpose.trim());
+    }
+    const files = [];
+    const missingFiles = [];
+    for (const f of packEntry.files) {
+        if (f.absolutePath === null) {
+            missingFiles.push({ path: f.path, role: f.role });
+            continue;
+        }
+        let content;
+        try {
+            content = reader(f.absolutePath);
+        }
+        catch (err) {
+            throw new ContextPackError("file_read_failed", `failed to read pack file ${f.absolutePath}: ${err.message}`, { packId: packEntry.id, path: f.path });
+        }
+        const headerLine = f.summary
+            ? `${FILE_HEADER_PREFIX} ${f.path} (role: ${f.role}) — ${f.summary}`
+            : `${FILE_HEADER_PREFIX} ${f.path} (role: ${f.role})`;
+        sections.push(headerLine);
+        sections.push(content.trimEnd());
+        const bytes = Buffer.byteLength(content, "utf-8");
+        files.push({
+            path: f.path,
+            role: f.role,
+            bytes,
+            estimatedTokens: estimateTokensFromBytes(bytes),
+        });
+    }
+    const text = sections.join("\n\n") + "\n";
+    const bytes = Buffer.byteLength(text, "utf-8");
+    return {
+        text,
+        bytes,
+        estimatedTokens: estimateTokensFromBytes(bytes),
+        files,
+        missingFiles,
+    };
+}
+//# sourceMappingURL=bundle-assembler.js.map

package/daemon/dist/domain/context-packs/bundle-assembler.js.map

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