@openrig/cli 0.6.14 → 0.7.1

package/daemon/dist/domain/provider/subscription-move-report.js

@@ -0,0 +1,227 @@
+// Slice 18 — the report an agent files after it moves (or tries to move) a Codex home between subscriptions. The
+// agent decides and moves (`rig auth switch`, `rig seat restart --keep-conversation`, then `--verify` after a real
+// turn); this only checks and keeps what it reports. The report is a queue item to whoever asked, tagged
+// `subscription-move`, whose body carries the report as one fenced JSON block, so the agent (and the Fleet app, once its
+// page is connected) can read it back. It holds labels and references, never credentials, and it decides nothing: a refused report changes
+// nothing about the move, and nothing here switches or restarts anything.
+export const MOVE_REPORT_TAG = "subscription-move";
+export const MOVE_REPORT_FENCE = "openrig-subscription-move";
+// Recognized credential formats only. Ordinary labels, home paths and account names aren't credentials, so there is
+// no broad shape heuristic (such as long base64 runs) here.
+const CREDENTIAL_FORMATS = [
+    { kind: "API key", pattern: /\bsk-[A-Za-z0-9_-]{16,}/ },
+    { kind: "GitHub token", pattern: /\b(?:gh[pousr]_[A-Za-z0-9_]{20,}|github_pat_[A-Za-z0-9_]{20,})/ },
+    { kind: "Slack token", pattern: /\bxox[abeprs]-[A-Za-z0-9-]{10,}|\bxapp-[A-Za-z0-9-]{10,}/ },
+    { kind: "bearer token", pattern: /\bBearer\s+[A-Za-z0-9._~+/=-]{20,}/i },
+    { kind: "JWT", pattern: /\beyJ[A-Za-z0-9_-]{8,}\.eyJ[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}/ },
+];
+/** Where `value` has a recognized credential format, in a string or in an object key: the path to it and the format,
+ *  never the value. A key is checked before what it holds, so a path only ever names keys that passed. */
+export function findCredential(value, path = "report") {
+    const format = (text) => CREDENTIAL_FORMATS.find((candidate) => candidate.pattern.test(text));
+    if (typeof value === "string") {
+        const hit = format(value);
+        return hit ? { path, kind: hit.kind, inKey: false } : null;
+    }
+    if (Array.isArray(value)) {
+        for (const [index, item] of value.entries()) {
+            const hit = findCredential(item, `${path}[${index}]`);
+            if (hit)
+                return hit;
+        }
+        return null;
+    }
+    if (value && typeof value === "object") {
+        for (const [key, item] of Object.entries(value)) {
+            const named = format(key);
+            if (named)
+                return { path, kind: named.kind, inKey: true };
+            const hit = findCredential(item, `${path}.${key}`);
+            if (hit)
+                return hit;
+        }
+    }
+    return null;
+}
+/** The refusal for a credential `findCredential` found, saying where and which format without repeating it. */
+export function credentialRefusal(hit) {
+    return `${hit.path} ${hit.inKey ? "has a key that looks like" : "holds what looks like"} a ${hit.kind}; a report holds labels and references only, never credentials`;
+}
+const isObject = (value) => !!value && typeof value === "object" && !Array.isArray(value);
+const text = (value) => typeof value === "string" && value.trim() !== "";
+const isoTime = (value) => typeof value === "string" && !Number.isNaN(Date.parse(value));
+/** Check a report's shape. It checks what the report claims, not whether the move was authorized or happened. */
+export function checkMoveReport(raw) {
+    const credential = findCredential(raw);
+    if (credential)
+        return { ok: false, errors: [credentialRefusal(credential)] };
+    if (!isObject(raw))
+        return { ok: false, errors: ["the report must be a JSON object"] };
+    const errors = [];
+    if (raw.version !== 1)
+        errors.push("version must be 1");
+    for (const field of ["host", "home", "from", "to", "reason"]) {
+        if (!text(raw[field]))
+            errors.push(`${field} must be a non-empty string`);
+    }
+    if (raw.policy !== undefined) {
+        const policy = raw.policy;
+        const named = isObject(policy) && text(policy.ref) && text(policy.version);
+        const none = isObject(policy) && policy.none === true;
+        if (!named && !none)
+            errors.push('policy must be { "ref": "<pack>", "version": "<version>" } or { "none": true }');
+    }
+    if (!Array.isArray(raw.readings) || raw.readings.length === 0) {
+        errors.push("readings must list at least one reading the move acted on (an unavailable one counts, with basis unavailable)");
+    }
+    else {
+        raw.readings.forEach((reading, index) => {
+            const at = `readings[${index}]`;
+            if (!isObject(reading)) {
+                errors.push(`${at} must be an object`);
+                return;
+            }
+            if (!text(reading.subject))
+                errors.push(`${at}.subject must be a non-empty string`);
+            if (!text(reading.summary))
+                errors.push(`${at}.summary must be a non-empty string`);
+            if (reading.observedAt !== undefined && !isoTime(reading.observedAt))
+                errors.push(`${at}.observedAt must be an ISO 8601 time`);
+            if (reading.basis === "observed") {
+                if (reading.observedAt === undefined)
+                    errors.push(`${at}: an observed reading needs observedAt, when it was observed`);
+            }
+            else if (reading.basis === "expected") {
+                if (!isoTime(reading.expectedFullSince))
+                    errors.push(`${at}: an expected reading needs expectedFullSince, the reset it rests on`);
+            }
+            else if (reading.basis !== "unavailable") {
+                errors.push(`${at}.basis must be observed, expected or unavailable`);
+            }
+        });
+    }
+    if (!Array.isArray(raw.seats)) {
+        errors.push("seats must be a list (empty when every seat on the home is a peer)");
+    }
+    else {
+        raw.seats.forEach((seat, index) => {
+            const at = `seats[${index}]`;
+            if (!isObject(seat)) {
+                errors.push(`${at} must be an object`);
+                return;
+            }
+            if (!text(seat.seat))
+                errors.push(`${at}.seat must be a non-empty string`);
+            for (const key of ["accountEvidence", "toolTurn"]) {
+                const evidence = seat[key];
+                if (evidence === undefined)
+                    continue;
+                if (!isObject(evidence) || !text(evidence.state))
+                    errors.push(`${at}.${key} must be an object with a state`);
+                else if (evidence.at !== undefined && !isoTime(evidence.at))
+                    errors.push(`${at}.${key}.at must be an ISO 8601 time`);
+            }
+            if (seat.result === "moved") {
+                const account = isObject(seat.accountEvidence) ? seat.accountEvidence.state : undefined;
+                const turn = isObject(seat.toolTurn) ? seat.toolTurn.state : undefined;
+                if (account !== "matched" || turn !== "observed") {
+                    errors.push(`${at}: moved needs accountEvidence.state matched and toolTurn.state observed (from rig seat restart --verify); report it unconfirmed, with what's missing, until both are seen`);
+                }
+            }
+            else if (seat.result === "unconfirmed" || seat.result === "unknown") {
+                if (!text(seat.missing))
+                    errors.push(`${at}: ${seat.result} needs missing, what wasn't seen`);
+            }
+            else {
+                errors.push(`${at}.result must be moved, unconfirmed or unknown`);
+            }
+        });
+    }
+    if (raw.peers !== undefined) {
+        if (!Array.isArray(raw.peers))
+            errors.push("peers must be a list");
+        else
+            raw.peers.forEach((peer, index) => {
+                if (!isObject(peer) || !text(peer.seat) || !text(peer.note))
+                    errors.push(`peers[${index}] must have a seat and a note`);
+            });
+    }
+    if (raw.follows !== undefined && !text(raw.follows))
+        errors.push("follows must be the qitem id of the report this one follows up");
+    return errors.length > 0 ? { ok: false, errors } : { ok: true, report: raw };
+}
+function seatLine(seat) {
+    if (seat.result === "moved") {
+        const account = seat.accountEvidence;
+        return `- ${seat.seat}: moved (account ${account.state}${account.detail ? `: ${account.detail}` : ""}${account.at ? ` at ${account.at}` : ""}; tool turn ${seat.toolTurn.state}${seat.toolTurn.at ? ` at ${seat.toolTurn.at}` : ""})`;
+    }
+    return `- ${seat.seat}: ${seat.result}; missing: ${seat.missing}`;
+}
+function readingLine(reading) {
+    if (reading.basis === "expected") {
+        return `- ${reading.subject}: expected full since ${reading.expectedFullSince} (not measured${reading.observedAt ? `; last reading ${reading.observedAt}` : ""}): ${reading.summary}`;
+    }
+    if (reading.basis === "unavailable") {
+        return `- ${reading.subject}: unavailable${reading.observedAt ? ` (last reading ${reading.observedAt})` : ""}: ${reading.summary}`;
+    }
+    return `- ${reading.subject}: observed ${reading.observedAt}: ${reading.summary}`;
+}
+/** The queue item's summary and body: readable prose, then the report itself as one fenced block. */
+export function renderMoveReport(report) {
+    const count = (result) => report.seats.filter((seat) => seat.result === result).length;
+    const results = ["moved", "unconfirmed", "unknown"].filter((result) => count(result) > 0).map((result) => `${count(result)} ${result}`);
+    const peers = report.peers ?? [];
+    const summary = `Subscription move ${report.from} → ${report.to} on ${report.host}: ${[...results, `${peers.length} peer${peers.length === 1 ? "" : "s"}`].join(", ")}`;
+    const policy = report.policy === undefined ? "not stated"
+        : "none" in report.policy ? "no policy" : `${report.policy.ref}, version ${report.policy.version}`;
+    const lines = [
+        `# Subscription move on ${report.host}: ${report.home}, ${report.from} → ${report.to}`,
+        "",
+        `**Reason:** ${report.reason}`,
+        `**Policy:** ${policy}`,
+        ...(report.follows ? [`**Follows:** ${report.follows}`] : []),
+        "",
+        "**Seats:**",
+        ...(report.seats.length > 0 ? report.seats.map(seatLine) : ["- none restarted"]),
+        ...(peers.length > 0 ? ["", "**Peers:**", ...peers.map((peer) => `- ${peer.seat}: ${peer.note}`)] : []),
+        "",
+        "**Readings:**",
+        ...report.readings.map(readingLine),
+        "",
+        `\`\`\`${MOVE_REPORT_FENCE}`,
+        JSON.stringify(report, null, 2),
+        "```",
+        "",
+    ];
+    return { summary, body: lines.join("\n") };
+}
+const OPENING = `\`\`\`${MOVE_REPORT_FENCE}\n`;
+/** The report's block: the LAST opening fence at the start of a line, up to the next fence line. The block is written
+ *  last, after the prose, so a fence quoted in the prose (say a reason quoting an earlier report) comes before it;
+ *  inside the block, JSON escapes every newline, so no fence line can occur there. */
+function reportBlock(body) {
+    let at = body.lastIndexOf(OPENING);
+    while (at > 0 && body[at - 1] !== "\n")
+        at = body.lastIndexOf(OPENING, at - 1);
+    if (at < 0)
+        return undefined;
+    const start = at + OPENING.length;
+    const end = body.indexOf("\n```", start);
+    return end < 0 ? undefined : body.slice(start, end);
+}
+/** Read a report back from a queue item's body, with the same check as when it was filed. */
+export function readMoveReport(body) {
+    const block = reportBlock(body);
+    if (block === undefined)
+        return { ok: false, errors: [`no ${MOVE_REPORT_FENCE} block`] };
+    let raw;
+    try {
+        raw = JSON.parse(block);
+    }
+    catch {
+        // Not the parser's message: it quotes the input, which may be what a report must never repeat.
+        return { ok: false, errors: [`the ${MOVE_REPORT_FENCE} block isn't valid JSON`] };
+    }
+    return checkMoveReport(raw);
+}
+//# sourceMappingURL=subscription-move-report.js.map

package/daemon/dist/domain/provider/subscription-move-report.js.map

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

package/daemon/dist/domain/ps-projection.d.ts

@@ -1,10 +1,10 @@
 import type Database from "better-sqlite3";
-import type { AgentActivity, NodeInventoryEntry, NodeLifecycleState, RigLifecycleState } from "./types.js";
+import type { NodeInventoryEntry, NodeLifecycleState, RigLifecycleState } from "./types.js";
 import { type AssignedWorkCounts } from "./node-inventory.js";
 import { type RigArchiveFilter } from "./rig-repository.js";
 import type { SeatActivityService } from "./seat-activity-service.js";
+import type { SeatStructuralActivityService } from "./seat-structural-activity-service.js";
 import type { AgentActivityStore } from "./agent-activity-store.js";
-import type { ArbitratedSeatState } from "./activity-taxonomy.js";
 export interface PsEntry {
     rigId: string;
     name: string;
@@ -59,39 +59,7 @@ export interface PsEntry {
      */
     attentionCount: number;
 }
-/**
- * OPR.0.4.4.21 — THE rig-rollup attention predicate (one predicate, one
- * count; mirrors + extends the CLI's per-node `needsAttention`). A seat
- * needs attention iff ANY of:
- *   - lifecycle `attention_required`
- *   - startup `attention_required`/`failed` — counted DIRECTLY from
- *     startupStatus; `latestError` may legitimately be null here
- *   - `needs_input`: the ARBITRATED seat state is the first answer when it has one
- *     (`arbitratedNeedsInput` — the same oracle the per-seat row renders, pane chrome
- *     included), and the hook store's live `needs_input` is the fallback when the
- *     arbitrated signal is `null` (stale hooks arrive as `unknown` and contribute
- *     nothing — never guessed). The rig total and the seat row must not disagree
- *     about the same seat.
- *   - a held seat (`heldReason` present)
- *   - a recorded startup error (`latestError` present)
- */
-export declare function seatNeedsAttention(entry: NodeInventoryEntry, activity: AgentActivity | null, arbitratedNeedsInput?: boolean | null): boolean;
-/**
- * #180 review — the arbitrated needs-input answer is TRI-STATE; collapsing it to
- * `needsInput.count > 0` treats `count: 0` as a definite "no" even when no source said
- * "no". `count: 0` is also the default when no authoritative rung reported needs-input:
- * a Codex seat (hooks at `trial`), a generic/Pi/OMP seat (sampling floor only), a seat
- * with no declaration, or a Claude seat whose declared rungs have not reported (after a
- * daemon restart, or once its hook rung is downgraded). A live `PermissionRequest` in
- * the hook store must still count there. Rules:
- *   - count > 0                                    → true  (the service only reports a
- *     positive count from an authoritative source)
- *   - count is 0 AND needs-input evidence from an authoritative rung supplied it → false
- *     (an observed clear legitimately supersedes a stale hook)
- *   - otherwise                                    → null (let the hook store decide).
- *     A declared rung is a capability, not an observation that the seat is clear.
- */
-export declare function arbitratedNeedsInputSignal(state: Pick<ArbitratedSeatState, "needsInput" | "needsInputEvidence"> | null): boolean | null;
+export { seatNeedsAttention, arbitratedNeedsInputSignal } from "./node-inventory.js";
 /**
  * Folds per-node lifecycle states into a rig-level lifecycle state.
  *
@@ -142,12 +110,15 @@ export declare class PsProjectionService {
      *  predicate's `needs_input` signal. Optional: absent → the signal
      *  contributes false (honest degrade), never a guess. */
     private readonly agentActivity;
+    /** The cached pane reading, so the count sees a prompt only the pane shows, as the seat row does. */
+    private readonly structuralActivity;
     private periodicSnapshotActive;
     private periodicSnapshotIntervalSeconds;
     constructor(deps: {
         db: Database.Database;
         seatActivity?: SeatActivityService;
         agentActivity?: AgentActivityStore;
+        structuralActivity?: Pick<SeatStructuralActivityService, "getStructuralActivity">;
     });
     setPeriodicSnapshotState(active: boolean, intervalSeconds: number): void;
     getEntries(filter?: RigArchiveFilter): PsEntry[];

package/daemon/dist/domain/ps-projection.d.ts.map

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

package/daemon/dist/domain/ps-projection.js

@@ -1,57 +1,7 @@
 import { identityVerdictConfirmsSessionMissing } from "./types.js";
-import { countAssignedWorkForEntry, getNodeInventoryForAllRigs, readAssignedWorkBySession, } from "./node-inventory.js";
+import { countAssignedWorkForEntry, seatNeedsAttention, arbitratedNeedsInputSignal, hookOrPaneActivity, getNodeInventoryForAllRigs, readAssignedWorkBySession, } from "./node-inventory.js";
 import { archiveWhereClause } from "./rig-repository.js";
-/** The rungs that can answer the needs-input signal (the ones `arbitrate` consults,
- *  chrome > hooks > self-report). Sampling carries no needs-input evidence. */
-const NEEDS_INPUT_RUNGS = ["needs-input-chrome", "lifecycle-hooks", "self-report"];
-/**
- * OPR.0.4.4.21 — THE rig-rollup attention predicate (one predicate, one
- * count; mirrors + extends the CLI's per-node `needsAttention`). A seat
- * needs attention iff ANY of:
- *   - lifecycle `attention_required`
- *   - startup `attention_required`/`failed` — counted DIRECTLY from
- *     startupStatus; `latestError` may legitimately be null here
- *   - `needs_input`: the ARBITRATED seat state is the first answer when it has one
- *     (`arbitratedNeedsInput` — the same oracle the per-seat row renders, pane chrome
- *     included), and the hook store's live `needs_input` is the fallback when the
- *     arbitrated signal is `null` (stale hooks arrive as `unknown` and contribute
- *     nothing — never guessed). The rig total and the seat row must not disagree
- *     about the same seat.
- *   - a held seat (`heldReason` present)
- *   - a recorded startup error (`latestError` present)
- */
-export function seatNeedsAttention(entry, activity, arbitratedNeedsInput = null) {
-    return entry.lifecycleState === "attention_required"
-        || entry.startupStatus === "attention_required"
-        || entry.startupStatus === "failed"
-        || (arbitratedNeedsInput ?? activity?.state === "needs_input")
-        || entry.heldReason != null
-        || entry.latestError != null;
-}
-/**
- * #180 review — the arbitrated needs-input answer is TRI-STATE; collapsing it to
- * `needsInput.count > 0` treats `count: 0` as a definite "no" even when no source said
- * "no". `count: 0` is also the default when no authoritative rung reported needs-input:
- * a Codex seat (hooks at `trial`), a generic/Pi/OMP seat (sampling floor only), a seat
- * with no declaration, or a Claude seat whose declared rungs have not reported (after a
- * daemon restart, or once its hook rung is downgraded). A live `PermissionRequest` in
- * the hook store must still count there. Rules:
- *   - count > 0                                    → true  (the service only reports a
- *     positive count from an authoritative source)
- *   - count is 0 AND needs-input evidence from an authoritative rung supplied it → false
- *     (an observed clear legitimately supersedes a stale hook)
- *   - otherwise                                    → null (let the hook store decide).
- *     A declared rung is a capability, not an observation that the seat is clear.
- */
-export function arbitratedNeedsInputSignal(state) {
-    if (!state)
-        return null;
-    if (state.needsInput.count > 0)
-        return true;
-    const observedClear = state.needsInputEvidence != null
-        && NEEDS_INPUT_RUNGS.includes(state.needsInputEvidence.rung);
-    return observedClear ? false : null;
-}
+export { seatNeedsAttention, arbitratedNeedsInputSignal } from "./node-inventory.js";
 /**
  * Folds per-node lifecycle states into a rig-level lifecycle state.
  *
@@ -124,12 +74,15 @@ export class PsProjectionService {
      *  predicate's `needs_input` signal. Optional: absent → the signal
      *  contributes false (honest degrade), never a guess. */
     agentActivity;
+    /** The cached pane reading, so the count sees a prompt only the pane shows, as the seat row does. */
+    structuralActivity;
     periodicSnapshotActive = false;
     periodicSnapshotIntervalSeconds = 0;
     constructor(deps) {
         this.db = deps.db;
         this.seatActivity = deps.seatActivity ?? null;
         this.agentActivity = deps.agentActivity ?? null;
+        this.structuralActivity = deps.structuralActivity ?? null;
     }
     setPeriodicSnapshotState(active, intervalSeconds) {
         this.periodicSnapshotActive = active;
@@ -221,8 +174,9 @@ export class PsProjectionService {
             // OPR.0.4.4.21 — attention fold, same inventory pass. `needs_input` is
             // read from the ARBITRATED seat state first — the same oracle the
             // per-seat row renders (`activityState` on node-inventory), which also
-            // sees pane chrome a hook-silent gated seat never reports. The hook
-            // store is the fallback when the arbitrated signal is `null` — service
+            // sees pane chrome a hook-silent gated seat never reports. The served
+            // activity (the hook store, else the cached pane reading, as the seat row
+            // reads it) is the fallback when the arbitrated signal is `null` — service
             // unwired, session not in the ladder, or a `count: 0` that no authoritative
             // needs-input evidence supplied (#180 review; discussion #879); `now` keeps its
             // staleness honest (stale hooks come back `unknown` and contribute
@@ -236,9 +190,14 @@ export class PsProjectionService {
                     && typeof this.seatActivity.getSeatStateBySession === "function"
                     ? this.seatActivity.getSeatStateBySession(session)
                     : null;
-                const activity = this.agentActivity && session
+                const hook = this.agentActivity && session
                     ? this.agentActivity.getLatestForNode({ sessionName: session, now: nowDate })
                     : null;
+                // The row's served activity: a live hook, else the cached pane reading. A confirmed-missing session serves
+                // neither, as on the row.
+                const structural = this.structuralActivity && session ? this.structuralActivity.getStructuralActivity(session) : null;
+                const activity = identityVerdictConfirmsSessionMissing(node.identityVerdict) ? null
+                    : hookOrPaneActivity(hook, structural)?.activity ?? hook;
                 if (seatNeedsAttention(node, activity, arbitratedNeedsInputSignal(arbitrated)))
                     attentionCount++;
             }

package/daemon/dist/domain/ps-projection.js.map

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

package/daemon/dist/domain/queue-destination-check.d.ts

@@ -0,0 +1,6 @@
+import type { LoadResult } from "./gateway/human-registry.js";
+export declare function makeTopologyDestinationCheck(deps: {
+    findRigsByName: (name: string) => unknown[];
+    loadHumanRegistry: () => LoadResult;
+}): (sessionRef: string) => boolean;
+//# sourceMappingURL=queue-destination-check.d.ts.map

package/daemon/dist/domain/queue-destination-check.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"queue-destination-check.d.ts","sourceRoot":"","sources":["../../src/domain/queue-destination-check.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAU9D,wBAAgB,4BAA4B,CAAC,IAAI,EAAE;IACjD,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,EAAE,CAAC;IAC5C,iBAAiB,EAAE,MAAM,UAAU,CAAC;CACrC,GAAG,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAkBlC"}

package/daemon/dist/domain/queue-destination-check.js

@@ -0,0 +1,35 @@
+// The queue's production destination check: which session refs a queue row may be addressed to. Startup wires it into
+// QueueRepository as validateRig; anything that must know whether a row would be accepted, without writing one, uses the
+// same check (QueueRepository.acceptsDestination).
+import { isHumanSeatSessionRef, parseSessionName } from "./session-name.js";
+import { resolveExternal } from "./gateway/external-admission.js";
+// PL-004 Phase A revision (R1): topology-backed validateRig.
+// Reject `<member>@<unknown-rig>` shapes against the rig registry.
+// Bare ids without `@` are also rejected
+// (no canonical rig binding).
+// OPR.0.4.6.MH1 FR-8: this gate is the ARCHETYPE consumer of the shared
+// parse contract — human-seat classification BEFORE parse, then the
+// greedy first-@ rig (so "member@rig@x" looks up rig "rig@x", misses,
+// and rejects with the same unknown_destination_rig as ever — BR-1).
+export function makeTopologyDestinationCheck(deps) {
+    return (sessionRef) => {
+        const parsed = parseSessionName(sessionRef);
+        // M1 A4b — @external entity-admission (checked BEFORE the human-CLASS bare-admit,
+        // which A2 also makes true for <local>@external): a queue row destinationed to
+        // <local>@external is admitted ONLY if the human is REGISTERED (or it is a literal
+        // scheme address); an unregistered entity is REFUSED (the 4b site carries the
+        // entity-level teaching via externalAdmissionTeaching). Admission is the gateway's
+        // job, never the classifier's (arch 8cd30094).
+        if (parsed.kind === "external") {
+            const reg = deps.loadHumanRegistry();
+            const entities = reg.ok ? reg.entities.map((e) => ({ entityId: e.entityId, address: e.address })) : [];
+            return resolveExternal(parsed.local, entities).kind !== "unregistered";
+        }
+        if (isHumanSeatSessionRef(sessionRef))
+            return true;
+        if (parsed.kind !== "canonical")
+            return false;
+        return deps.findRigsByName(parsed.rig).length > 0;
+    };
+}
+//# sourceMappingURL=queue-destination-check.js.map

package/daemon/dist/domain/queue-destination-check.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"queue-destination-check.js","sourceRoot":"","sources":["../../src/domain/queue-destination-check.ts"],"names":[],"mappings":"AAAA,sHAAsH;AACtH,yHAAyH;AACzH,mDAAmD;AACnD,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAGlE,6DAA6D;AAC7D,mEAAmE;AACnE,yCAAyC;AACzC,8BAA8B;AAC9B,wEAAwE;AACxE,oEAAoE;AACpE,sEAAsE;AACtE,qEAAqE;AACrE,MAAM,UAAU,4BAA4B,CAAC,IAG5C;IACC,OAAO,CAAC,UAAkB,EAAW,EAAE;QACrC,MAAM,MAAM,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC5C,kFAAkF;QAClF,+EAA+E;QAC/E,mFAAmF;QACnF,8EAA8E;QAC9E,mFAAmF;QACnF,+CAA+C;QAC/C,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACrC,MAAM,QAAQ,GAAG,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACvG,OAAO,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,IAAI,KAAK,cAAc,CAAC;QACzE,CAAC;QACD,IAAI,qBAAqB,CAAC,UAAU,CAAC;YAAE,OAAO,IAAI,CAAC;QACnD,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW;YAAE,OAAO,KAAK,CAAC;QAC9C,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IACpD,CAAC,CAAC;AACJ,CAAC"}

package/daemon/dist/domain/queue-owner.d.ts

@@ -11,8 +11,11 @@ export declare function resolveSessionNodeId(db: Database.Database, session: str
 export declare function defaultResolveOrchestrator(db: Database.Database, session: string): string | null;
 /** A rig's representative, the seat a person's message to "the rig" reaches: the rig's one
  *  delegation root, the node that delegates to others and that nothing delegates to, at its
- *  CURRENT canonical session binding. Null when the rig name is ambiguous or absent, when the rig
- *  has no such root or several, or when the root has no session; the caller falls back to its
- *  configured destination rather than guessing. */
+ *  CURRENT canonical session binding. The name matches active rigs only, as the CLI's rig handles
+ *  do, so an archived earlier generation of a relaunched rig doesn't make its name ambiguous. Null
+ *  when no active rig or several have the name, when the rig has no such root or several, or when
+ *  the root has no session; the caller falls back to its configured destination rather than guessing. */
 export declare function resolveRigRepresentative(db: Database.Database, rigName: string): string | null;
+/** The same delegation-root rule for a rig already known by id, so another rig with the same name doesn't matter. */
+export declare function resolveRigRepresentativeById(db: Database.Database, rigId: string): string | null;
 //# sourceMappingURL=queue-owner.d.ts.map

package/daemon/dist/domain/queue-owner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queue-owner.d.ts","sourceRoot":"","sources":["../../src/domain/queue-owner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C;;;sFAGsF;AACtF,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAK1F;AAED;;;yEAGyE;AACzE,wBAAgB,0BAA0B,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAahG;AAED;;;;mDAImD;AACnD,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAgB9F"}
+{"version":3,"file":"queue-owner.d.ts","sourceRoot":"","sources":["../../src/domain/queue-owner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C;;;sFAGsF;AACtF,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAK1F;AAED;;;yEAGyE;AACzE,wBAAgB,0BAA0B,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAahG;AAED;;;;;yGAKyG;AACzG,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI9F;AAED,qHAAqH;AACrH,wBAAgB,4BAA4B,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAchG"}

package/daemon/dist/domain/queue-owner.js

@@ -1,3 +1,4 @@
+import { resolveCurrentSessionAddress } from "./session-registry.js";
 /** The durable session→node binding (the session-registry precedent: latest sessions row
  *  for the canonical name). Canonical session names (dash form, `review-r2@rig`) and node
  *  logical ids (dotted form, `review.r2`) are INDEPENDENT identities — the live fleet has
@@ -6,7 +7,7 @@ export function resolveSessionNodeId(db, session) {
     const row = db
         .prepare("SELECT node_id FROM sessions WHERE session_name = ? ORDER BY id DESC LIMIT 1")
         .get(session);
-    return row?.node_id ?? null;
+    return row?.node_id ?? resolveCurrentSessionAddress(db, session)?.nodeId ?? null;
 }
 /** Default orchestrator derivation: the destination's BOUND node → the source of its
  *  delegates_to edge → that parent node's CURRENT canonical session binding. A session
@@ -27,19 +28,24 @@ export function defaultResolveOrchestrator(db, session) {
 }
 /** A rig's representative, the seat a person's message to "the rig" reaches: the rig's one
  *  delegation root, the node that delegates to others and that nothing delegates to, at its
- *  CURRENT canonical session binding. Null when the rig name is ambiguous or absent, when the rig
- *  has no such root or several, or when the root has no session; the caller falls back to its
- *  configured destination rather than guessing. */
+ *  CURRENT canonical session binding. The name matches active rigs only, as the CLI's rig handles
+ *  do, so an archived earlier generation of a relaunched rig doesn't make its name ambiguous. Null
+ *  when no active rig or several have the name, when the rig has no such root or several, or when
+ *  the root has no session; the caller falls back to its configured destination rather than guessing. */
 export function resolveRigRepresentative(db, rigName) {
-    const rigs = db.prepare("SELECT id FROM rigs WHERE name = ?").all(rigName);
+    const rigs = db.prepare("SELECT id FROM rigs WHERE name = ? AND archived_at IS NULL").all(rigName);
     if (rigs.length !== 1)
         return null;
+    return resolveRigRepresentativeById(db, rigs[0].id);
+}
+/** The same delegation-root rule for a rig already known by id, so another rig with the same name doesn't matter. */
+export function resolveRigRepresentativeById(db, rigId) {
     const roots = db
         .prepare(`SELECT n.id AS nodeId FROM nodes n
         WHERE n.rig_id = ?
           AND EXISTS (SELECT 1 FROM edges e WHERE e.source_id = n.id AND e.kind = 'delegates_to')
           AND NOT EXISTS (SELECT 1 FROM edges e WHERE e.target_id = n.id AND e.kind = 'delegates_to')`)
-        .all(rigs[0].id);
+        .all(rigId);
     if (roots.length !== 1)
         return null;
     const row = db

package/daemon/dist/domain/queue-owner.js.map

@@ -1 +1 @@
-{"version":3,"file":"queue-owner.js","sourceRoot":"","sources":["../../src/domain/queue-owner.ts"],"names":[],"mappings":"AAEA;;;sFAGsF;AACtF,MAAM,UAAU,oBAAoB,CAAC,EAAqB,EAAE,OAAe;IACzE,MAAM,GAAG,GAAG,EAAE;SACX,OAAO,CAAC,8EAA8E,CAAC;SACvF,GAAG,CAAC,OAAO,CAAoC,CAAC;IACnD,OAAO,GAAG,EAAE,OAAO,IAAI,IAAI,CAAC;AAC9B,CAAC;AAED;;;yEAGyE;AACzE,MAAM,UAAU,0BAA0B,CAAC,EAAqB,EAAE,OAAe;IAC/E,MAAM,MAAM,GAAG,oBAAoB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IACjD,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACzB,MAAM,GAAG,GAAG,EAAE;SACX,OAAO,CACN;;;;gBAIU,CACX;SACA,GAAG,CAAC,MAAM,CAA0C,CAAC;IACxD,OAAO,GAAG,EAAE,aAAa,IAAI,IAAI,CAAC;AACpC,CAAC;AAED;;;;mDAImD;AACnD,MAAM,UAAU,wBAAwB,CAAC,EAAqB,EAAE,OAAe;IAC7E,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,oCAAoC,CAAC,CAAC,GAAG,CAAC,OAAO,CAA0B,CAAC;IACpG,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACnC,MAAM,KAAK,GAAG,EAAE;SACb,OAAO,CACN;;;sGAGgG,CACjG;SACA,GAAG,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,EAAE,CAA8B,CAAC;IACjD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACpC,MAAM,GAAG,GAAG,EAAE;SACX,OAAO,CAAC,8EAA8E,CAAC;SACvF,GAAG,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,MAAM,CAAyC,CAAC;IACjE,OAAO,GAAG,EAAE,YAAY,IAAI,IAAI,CAAC;AACnC,CAAC"}
+{"version":3,"file":"queue-owner.js","sourceRoot":"","sources":["../../src/domain/queue-owner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAGrE;;;sFAGsF;AACtF,MAAM,UAAU,oBAAoB,CAAC,EAAqB,EAAE,OAAe;IACzE,MAAM,GAAG,GAAG,EAAE;SACX,OAAO,CAAC,8EAA8E,CAAC;SACvF,GAAG,CAAC,OAAO,CAAoC,CAAC;IACnD,OAAO,GAAG,EAAE,OAAO,IAAI,4BAA4B,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,MAAM,IAAI,IAAI,CAAC;AACnF,CAAC;AAED;;;yEAGyE;AACzE,MAAM,UAAU,0BAA0B,CAAC,EAAqB,EAAE,OAAe;IAC/E,MAAM,MAAM,GAAG,oBAAoB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IACjD,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACzB,MAAM,GAAG,GAAG,EAAE;SACX,OAAO,CACN;;;;gBAIU,CACX;SACA,GAAG,CAAC,MAAM,CAA0C,CAAC;IACxD,OAAO,GAAG,EAAE,aAAa,IAAI,IAAI,CAAC;AACpC,CAAC;AAED;;;;;yGAKyG;AACzG,MAAM,UAAU,wBAAwB,CAAC,EAAqB,EAAE,OAAe;IAC7E,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,4DAA4D,CAAC,CAAC,GAAG,CAAC,OAAO,CAA0B,CAAC;IAC5H,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACnC,OAAO,4BAA4B,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC,CAAC;AACvD,CAAC;AAED,qHAAqH;AACrH,MAAM,UAAU,4BAA4B,CAAC,EAAqB,EAAE,KAAa;IAC/E,MAAM,KAAK,GAAG,EAAE;SACb,OAAO,CACN;;;sGAGgG,CACjG;SACA,GAAG,CAAC,KAAK,CAA8B,CAAC;IAC3C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACpC,MAAM,GAAG,GAAG,EAAE;SACX,OAAO,CAAC,8EAA8E,CAAC;SACvF,GAAG,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,MAAM,CAAyC,CAAC;IACjE,OAAO,GAAG,EAAE,YAAY,IAAI,IAAI,CAAC;AACnC,CAAC"}