pi-radar 0.2.0 → 0.4.0

package/dist/extension/radar-publication.js

@@ -15,27 +15,6 @@ import {
 } from "node:fs";
 import { dirname, join, parse, resolve, sep } from "node:path";
 
-// extension/radar-session-marker.ts
-var RADAR_LAUNCH_MARKER_VERSION = 1;
-var RADAR_MAX_EXECUTION_GENERATION = 4294967295;
-var UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/iu;
-function decodeRadarLaunchMarker(value) {
-  if (typeof value !== "object" || value === null || Array.isArray(value)) return void 0;
-  const record = value;
-  if (Object.keys(record).sort().join(",") !== "execution_generation,launch_id,subject_id,version") {
-    return void 0;
-  }
-  if (record.version !== RADAR_LAUNCH_MARKER_VERSION || typeof record.subject_id !== "string" || !UUID.test(record.subject_id) || typeof record.launch_id !== "string" || !UUID.test(record.launch_id) || !Number.isSafeInteger(record.execution_generation) || record.execution_generation < 1 || record.execution_generation > RADAR_MAX_EXECUTION_GENERATION) {
-    return void 0;
-  }
-  return {
-    version: RADAR_LAUNCH_MARKER_VERSION,
-    subject_id: record.subject_id,
-    launch_id: record.launch_id,
-    execution_generation: record.execution_generation
-  };
-}
-
 // extension/radar-client.ts
 var RADAR_MAX_LINE_BYTES = 1024 * 1024;
 var wallClock = { setTimeout, clearTimeout, setInterval, clearInterval };
@@ -53,9 +32,9 @@ function bounded(text, bytes) {
     end -= 1;
   return text.slice(0, end);
 }
-var UUID2 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+var UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 function isUuid(value) {
-  return typeof value === "string" && UUID2.test(value);
+  return typeof value === "string" && UUID.test(value);
 }
 var RADAR_MAX_BACKGROUND_TASKS = 64;
 var RADAR_MAX_AWAITED = 64;
@@ -133,6 +112,7 @@ function boundedRadarSnapshot(snapshot) {
 }
 
 // extension/radar-publication.ts
+var DUPLICATE_SESSION_DIAGNOSTIC = "Radar rejected this session claim as a duplicate; reload or resume the session before retrying";
 var RADAR_PUBLICATION_VERSION = 1;
 var RADAR_LEASE_MS = 3e4;
 var RADAR_HEARTBEAT_MS = 15e3;
@@ -157,7 +137,7 @@ function readProcessBirth() {
     return void 0;
   }
 }
-var RECORD_NAME = /^(?:subjects|channels|context|bindings)\/[a-z0-9-]{1,64}\.json$/;
+var RECORD_NAME = /^(?:registrations|presence|subjects|channels|context|bindings)\/[a-z0-9-]{1,64}\.json$/;
 var MAX_RECORD_BYTES = 64 * 1024;
 var PRIVATE_MODE = 448;
 var RECORD_MODE = 384;
@@ -442,39 +422,6 @@ function pendingAt(value, keys = PENDING_KEYS, codec = executionCodec) {
     return void 0;
   return { sequence, snapshot, lease_ms: lease, observed_at: observed };
 }
-var CONTEXT_PENDING_KEYS = "lease_ms,observed_at,sequence,session";
-var CONTEXT_PENDING_MARKED_KEYS = "launch_identity,lease_ms,observed_at,sequence,session";
-var CONTEXT_ACCEPTED_KEYS = "lease_ms,observed_at,sent_at,sequence,session";
-var CONTEXT_ACCEPTED_MARKED_KEYS = "launch_identity,lease_ms,observed_at,sent_at,sequence,session";
-function sessionAt(value) {
-  if (typeof value !== "object" || value === null) return void 0;
-  const found = value.session;
-  if (found === null) return null;
-  return typeof found === "string" ? found : void 0;
-}
-function sameLaunchIdentity(a, b) {
-  return a === b || a !== void 0 && b !== void 0 && a.version === b.version && a.subject_id === b.subject_id && a.launch_id === b.launch_id && a.execution_generation === b.execution_generation;
-}
-function contextReportAt(value, keys, markedKeys) {
-  const marked = exactKeys(value, markedKeys);
-  if (!exactKeys(value, keys) && !marked) return void 0;
-  const sequence = numberAt(value, "sequence");
-  const lease = numberAt(value, "lease_ms");
-  const observed = textAt(value, "observed_at");
-  const session = sessionAt(value);
-  if (sequence === void 0 || sequence < 1) return void 0;
-  if (lease === void 0 || observed === void 0 || session === void 0)
-    return void 0;
-  const marker = marked ? decodeRadarLaunchMarker(value.launch_identity) : void 0;
-  if (marked && marker === void 0) return void 0;
-  return {
-    sequence,
-    session,
-    lease_ms: lease,
-    observed_at: observed,
-    ...marker !== void 0 ? { launch_identity: marker } : {}
-  };
-}
 function createChannelWriter(input) {
   const { store, client, scheduler, recordName, channel, publisher } = input;
   const codec = input.codec ?? executionCodec;
@@ -490,7 +437,7 @@ function createChannelWriter(input) {
   function blank(agentId) {
     return {
       version: RADAR_PUBLICATION_VERSION,
-      agent_id: agentId,
+      registration_id: agentId,
       channel,
       publisher,
       sequence: 0
@@ -498,7 +445,7 @@ function createChannelWriter(input) {
   }
   function loadRecord() {
     const value = store.read(recordName);
-    const agentId = textAt(value, "agent_id");
+    const agentId = textAt(value, "registration_id");
     const storedPublisher = recordAt(value, "publisher");
     if (numberAt(value, "version") !== RADAR_PUBLICATION_VERSION || agentId === void 0 || !isUuid(agentId) || textAt(value, "channel") !== channel || textAt(storedPublisher, "source") !== publisher.source || textAt(storedPublisher, "incarnation") !== publisher.incarnation || textAt(storedPublisher, "reporting_owner") !== publisher.reporting_owner)
       return blank("");
@@ -513,7 +460,7 @@ function createChannelWriter(input) {
     const sentAt = numberAt(acceptedValue, "sent_at");
     return {
       version: RADAR_PUBLICATION_VERSION,
-      agent_id: agentId,
+      registration_id: agentId,
       channel,
       publisher,
       ...handle !== void 0 && generation !== void 0 ? { writer: { handle, generation } } : {},
@@ -554,12 +501,12 @@ function createChannelWriter(input) {
     if (record.writer !== void 0) return true;
     const agentId = await input.subject(recovering);
     if (agentId === void 0) return false;
-    if (record.agent_id !== agentId) {
+    if (record.registration_id !== agentId) {
       record = blank(agentId);
       save();
     }
     const answer = await client.acquire({
-      agent_id: agentId,
+      registration_id: agentId,
       channel,
       publisher
     });
@@ -589,7 +536,7 @@ function createChannelWriter(input) {
     const writer = record.writer;
     if (writer === void 0) return;
     const answer = await client.publish({
-      agent_id: record.agent_id,
+      registration_id: record.registration_id,
       channel,
       writer_handle: writer.handle,
       sequence: pending.sequence,
@@ -683,9 +630,9 @@ function createChannelWriter(input) {
       stopPump();
       const writer = record.writer;
       if (writer === void 0) return;
-      const agentId = record.agent_id;
+      const agentId = record.registration_id;
       try {
-        void client.retire({ agent_id: agentId, channel, writer_handle: writer.handle }).then((answer) => {
+        void client.retire({ registration_id: agentId, channel, writer_handle: writer.handle }).then((answer) => {
           if (answer.ok === true) {
             try {
               record.retired_at = new Date(scheduler.now()).toISOString();
@@ -708,214 +655,127 @@ function createChannelWriter(input) {
     diagnostic: () => record.diagnostic
   };
 }
-function createContextWriter(input) {
-  const { store, client, scheduler, recordName, publisher } = input;
-  let record = loadRecord();
-  let desired;
-  let desiredMarker;
-  let running = false;
-  let again = false;
-  let recovering = false;
-  let stopped = false;
-  let fenced = false;
-  let pump;
-  function blank(agentId) {
-    return {
-      version: RADAR_PUBLICATION_VERSION,
-      agent_id: agentId,
-      publisher,
-      sequence: 0
-    };
-  }
-  function loadRecord() {
-    const value = store.read(recordName);
-    const agentId = textAt(value, "agent_id");
-    const storedPublisher = recordAt(value, "publisher");
-    if (numberAt(value, "version") !== RADAR_PUBLICATION_VERSION || agentId === void 0 || !isUuid(agentId) && agentId !== "" || textAt(storedPublisher, "source") !== publisher.source || textAt(storedPublisher, "incarnation") !== publisher.incarnation || textAt(storedPublisher, "reporting_owner") !== publisher.reporting_owner)
-      return blank("");
-    const writer = recordAt(value, "writer");
-    const handle = textAt(writer, "handle");
-    const generation = numberAt(writer, "generation");
-    if (writer !== void 0 && (!exactKeys(writer, WRITER_KEYS) || !isUuid(handle) || generation === void 0))
-      return blank(agentId);
-    const pending = contextReportAt(
-      recordAt(value, "pending"),
-      CONTEXT_PENDING_KEYS,
-      CONTEXT_PENDING_MARKED_KEYS
-    );
-    const acceptedValue = recordAt(value, "accepted");
-    const accepted = contextReportAt(
-      acceptedValue,
-      CONTEXT_ACCEPTED_KEYS,
-      CONTEXT_ACCEPTED_MARKED_KEYS
-    );
-    const sentAt = numberAt(acceptedValue, "sent_at");
-    return {
-      version: RADAR_PUBLICATION_VERSION,
-      agent_id: agentId,
-      publisher,
-      ...handle !== void 0 && generation !== void 0 ? { writer: { handle, generation } } : {},
-      sequence: numberAt(value, "sequence") ?? 0,
-      ...pending !== void 0 ? { pending } : {},
-      ...accepted !== void 0 && sentAt !== void 0 ? { accepted: { ...accepted, sent_at: sentAt } } : {},
-      ...textAt(value, "diagnostic") !== void 0 ? { diagnostic: textAt(value, "diagnostic") } : {}
-    };
-  }
-  function note(message) {
-    if (record.diagnostic !== void 0) return;
-    record.diagnostic = message.slice(0, 256);
-    save();
+function createPresenceReporter(input) {
+  const { store, client, scheduler, recordName } = input;
+  let state;
+  let standing;
+  let diagnostic;
+  try {
+    const saved = store.read(recordName);
+    if (saved?.version === 2 && isUuid(saved.claim_id) && isUuid(saved.session) && Array.isArray(saved.releases))
+      state = saved;
+  } catch (error) {
+    diagnostic = `presence storage unavailable: ${String(error)}`;
   }
+  let timer;
+  let stopped = false;
+  let running;
   function save() {
-    store.write(recordName, record);
-  }
-  function fence(message) {
-    fenced = true;
-    stopPump();
-    note(`context stopped: ${message}`);
-  }
-  function startPump() {
-    if (pump !== void 0 || stopped || fenced) return;
-    pump = scheduler.setInterval(() => kick(), input.heartbeatMs);
-    pump.unref?.();
-  }
-  function stopPump() {
-    if (pump === void 0) return;
-    scheduler.clearInterval(pump);
-    pump = void 0;
+    try {
+      if (state) store.write(recordName, state);
+      return true;
+    } catch (error) {
+      diagnostic = `presence storage unavailable: ${String(error)}`;
+      return false;
+    }
   }
-  async function ensureSubject() {
-    if (record.writer !== void 0) return true;
-    const agentId = await input.subject(recovering);
-    if (agentId === void 0) return false;
-    if (record.agent_id !== agentId) {
-      record = blank(agentId);
+  async function releasePending() {
+    if (!state) return;
+    const registration = await input.registration();
+    if (!registration?.process) return;
+    for (const release of [...state.releases]) {
+      const answer = await client.releasePresence({ ...release, process: registration.process });
+      if (!answer.ok) return;
+      state.releases = state.releases.filter((r) => r.claim_id !== release.claim_id);
       save();
     }
-    return true;
   }
-  function heartbeatDue() {
-    return record.accepted !== void 0 && scheduler.now() - record.accepted.sent_at >= input.heartbeatMs;
+  function schedule() {
+    if (stopped || timer) return;
+    timer = scheduler.setTimeout(() => {
+      timer = void 0;
+      void ensure();
+    }, input.heartbeatMs);
+    timer.unref?.();
   }
-  async function send(pending) {
-    const writer = record.writer;
-    const answer = await client.context({
-      agent_id: record.agent_id,
-      publisher,
-      // A first publish presents no handle: the daemon binds the writer the
-      // publisher already is, which is the binding this writer then keeps.
-      ...writer !== void 0 ? { writer_handle: writer.handle } : {},
-      sequence: pending.sequence,
-      lease_ms: pending.lease_ms,
-      observed_at: pending.observed_at,
-      context: {
-        session: pending.session,
-        ...pending.launch_identity !== void 0 ? { launch_identity: pending.launch_identity } : {}
+  async function ensure() {
+    if (running) return running;
+    if (stopped || !state) return void 0;
+    const claim = state;
+    if (!save()) return void 0;
+    running = (async () => {
+      await releasePending();
+      const registration = await input.registration();
+      if (!registration?.process || state !== claim || stopped) return void 0;
+      const answer = await client.presence({
+        ...registration,
+        process: registration.process,
+        session_id: claim.session,
+        claim_id: claim.claim_id,
+        ...claim.registration_id ? { registration_id: claim.registration_id } : {},
+        ...claim.subject_id ? { subject_id: claim.subject_id } : {}
+      });
+      if (state !== claim) return void 0;
+      if (!answer.ok) {
+        if (!["absent", "timeout", "transport"].includes(answer.code)) diagnostic = answer.message;
+        return void 0;
       }
-    });
-    if (answer.ok === true) {
-      recovering = false;
-      record.writer = {
-        handle: answer.value.writer.handle,
-        generation: answer.value.writer.generation
-      };
-      record.sequence = Math.max(record.sequence, answer.value.writer.sequence);
-      record.accepted = {
-        ...pending,
-        sent_at: answer.value.warning === void 0 ? scheduler.now() : record.accepted?.sent_at ?? scheduler.now()
-      };
-      record.pending = void 0;
-      save();
-      return;
-    }
-    if (answer.code === "refused" || answer.code === "bad_params" || // A daemon that speaks the registry but does not serve this record would
-    // refuse every retry the same way; one diagnostic beats a silent retry
-    // loop once per heartbeat.
-    answer.code === "unknown_method") {
-      fence(answer.message);
-      return;
-    }
-    if (answer.code === "not_found") {
-      record = blank("");
-      recovering = true;
+      claim.registration_id = answer.value.registration_id;
+      claim.subject_id = answer.value.standing === "granted" ? answer.value.subject_id ?? void 0 : void 0;
+      standing = answer.value.standing === "granted" ? { state: "managed", subject_id: claim.subject_id } : answer.value.standing === "duplicate" ? { state: "duplicate" } : answer.value.standing === "pending" ? { state: "pending" } : { state: "unmanaged" };
+      diagnostic = answer.value.standing === "duplicate" ? DUPLICATE_SESSION_DIAGNOSTIC : void 0;
       save();
-      return;
-    }
-  }
-  async function stage(session, launchIdentity) {
-    const pending = {
-      sequence: record.sequence + 1,
-      session,
-      lease_ms: input.leaseMs,
-      observed_at: new Date(scheduler.now()).toISOString(),
-      ...launchIdentity !== void 0 ? { launch_identity: launchIdentity } : {}
-    };
-    record.pending = pending;
-    save();
-    await send(pending);
-  }
-  async function drainOnce() {
-    if (fenced) return;
-    if (record.pending !== void 0) {
-      await send(record.pending);
-      return;
-    }
-    if (desired === void 0) return;
-    if (!await ensureSubject()) return;
-    if (fenced) return;
-    if (record.writer === void 0 || record.accepted === void 0 || record.accepted.session !== desired || !sameLaunchIdentity(record.accepted.launch_identity, desiredMarker)) {
-      await stage(desired, desiredMarker);
-      return;
-    }
-    if (heartbeatDue()) await stage(record.accepted.session, desiredMarker);
-  }
-  async function drain() {
-    if (running || stopped || fenced) return;
-    running = true;
+      return claim.registration_id;
+    })();
     try {
-      await drainOnce();
+      return await running;
     } catch (error) {
-      fenced = true;
-      stopPump();
-      try {
-        note(`context storage failure: ${String(error).slice(0, 180)}`);
-      } catch {
-      }
+      diagnostic = `presence unavailable: ${String(error)}`;
+      return void 0;
     } finally {
-      running = false;
-      if (again && !stopped && !fenced) {
-        again = false;
-        kick();
-      }
+      running = void 0;
+      if (!stopped && state !== claim) void ensure();
+      else schedule();
     }
   }
-  function kick() {
-    if (stopped || fenced) return;
-    startPump();
-    if (running) {
-      again = true;
-      return;
-    }
-    void drain().catch(() => void 0);
-  }
   return {
-    update(session, launchIdentity) {
-      if (fenced || session === desired && sameLaunchIdentity(desiredMarker, launchIdentity))
-        return;
-      desired = session;
-      desiredMarker = launchIdentity;
-      if (stopped) return;
-      kick();
+    report(session) {
+      const releases = [...state?.releases ?? []];
+      if (state?.registration_id && !releases.some((release) => release.claim_id === state.claim_id)) {
+        releases.push({ registration_id: state.registration_id, claim_id: state.claim_id });
+      }
+      standing = void 0;
+      state = { version: 2, session, claim_id: randomUUID(), releases };
+      save();
+      stopped = false;
+      void ensure();
+    },
+    ensure,
+    async release() {
+      const releasing = state;
+      standing = void 0;
+      stopped = true;
+      if (timer) scheduler.clearTimeout(timer);
+      timer = void 0;
+      if (running) await running;
+      if (state === releasing) standing = void 0;
+      if (releasing?.registration_id && !releasing.releases.some((r) => r.claim_id === releasing.claim_id)) {
+        releasing.releases.push({ registration_id: releasing.registration_id, claim_id: releasing.claim_id });
+        if (!save()) return;
+      }
+      await releasePending();
     },
     stop() {
       stopped = true;
-      stopPump();
+      if (timer) scheduler.clearTimeout(timer);
+      timer = void 0;
     },
     reopen() {
       stopped = false;
-      if (desired !== void 0 || record.pending !== void 0) kick();
+      void ensure();
     },
-    diagnostic: () => record.diagnostic
+    management: () => standing,
+    diagnostic: () => diagnostic
   };
 }
 var STORE_IDENTITY = /* @__PURE__ */ new WeakMap();
@@ -944,10 +804,13 @@ function unavailablePublication(error) {
   };
   return {
     execution: writer,
-    context: {
-      update: () => void 0,
+    presence: {
+      report: () => void 0,
+      ensure: async () => void 0,
+      release: async () => void 0,
       stop: () => void 0,
       reopen: () => void 0,
+      management: () => void 0,
       diagnostic: () => diagnostic
     },
     facts: { ...writer, update: () => void 0 },
@@ -974,33 +837,29 @@ function createRadarPublicationInner(options) {
     cached.reopen();
     return cached;
   }
-  const subjectName = `subjects/${createHash("sha256").update(`${options.registration.source}\0${incarnation}`).digest("hex").slice(0, 32)}.json`;
+  const registrationName = `registrations/${createHash("sha256").update(`${options.registration.source}\0${incarnation}`).digest("hex").slice(0, 32)}.json`;
   const channelRecord = (channel, target) => `channels/${createHash("sha256").update(`${channel}\0${incarnation}\0${target ?? ""}`).digest("hex").slice(0, 32)}.json`;
-  const contextRecord = `context/${createHash("sha256").update(`context\0${incarnation}`).digest("hex").slice(0, 32)}.json`;
-  function readSubject() {
-    const value = store.read(subjectName);
+  const presenceRecord = `presence/${createHash("sha256").update(`presence\0${incarnation}`).digest("hex").slice(0, 32)}.json`;
+  function readRegistration() {
+    const value = store.read(registrationName);
     const registration = recordAt(value, "registration");
     if (numberAt(value, "version") !== RADAR_PUBLICATION_VERSION || textAt(registration, "source") !== options.registration.source || textAt(registration, "incarnation") !== incarnation)
       return void 0;
-    const storedAgentId = textAt(value, "agent_id");
+    const storedAgentId = textAt(value, "registration_id");
     return {
       version: RADAR_PUBLICATION_VERSION,
       registration,
-      ...storedAgentId !== void 0 && isUuid(storedAgentId) ? { agent_id: storedAgentId } : {}
+      ...storedAgentId !== void 0 && isUuid(storedAgentId) ? { registration_id: storedAgentId } : {}
     };
   }
-  const stored = readSubject();
-  let subject = stored;
+  const stored = readRegistration();
+  let processRecord = stored;
   let registrationDiagnostic;
   let registrationRecord;
   async function ensureRegistration() {
-    if (subject !== void 0) return subject;
+    if (processRecord !== void 0) return processRecord;
     registrationRecord ??= (async () => {
       const resolution = options.location ? await options.location() : { state: "absent", reason: "this process publishes no location" };
-      if (resolution.state === "pending") {
-        registrationDiagnostic = `location bootstrap pending: ${resolution.reason}`.slice(0, 256);
-        return void 0;
-      }
       const built = {
         version: RADAR_PUBLICATION_VERSION,
         registration: {
@@ -1011,13 +870,13 @@ function createRadarPublicationInner(options) {
         }
       };
       try {
-        store.write(subjectName, built);
+        store.write(registrationName, built);
       } catch (error) {
         registrationDiagnostic ??= `private storage unavailable: ${String(error)}`.slice(0, 256);
         return void 0;
       }
       registrationDiagnostic = void 0;
-      subject = built;
+      processRecord = built;
       return built;
     })();
     try {
@@ -1026,11 +885,10 @@ function createRadarPublicationInner(options) {
       registrationRecord = void 0;
     }
   }
-  let agentId = stored?.agent_id;
+  let agentId = stored?.registration_id;
   let subjectReady;
   async function ensureSubject(recheck) {
-    if (recheck) agentId = void 0;
-    if (agentId !== void 0) return agentId;
+    if (!recheck && agentId !== void 0) return agentId;
     subjectReady ??= (async () => {
       const ready = await client.ping();
       if (ready.ok === false) {
@@ -1040,18 +898,11 @@ function createRadarPublicationInner(options) {
       }
       const record = await ensureRegistration();
       if (record === void 0) return void 0;
-      const answer = await client.register({
-        ...record.registration,
-        ...spawnToken !== void 0 ? { spawn_token: spawnToken } : {}
-      });
-      if (answer.ok === false) {
-        if (answer.code !== "absent" && answer.code !== "timeout" && answer.code !== "transport")
-          registrationDiagnostic ??= `subject registration refused: ${answer.message}`.slice(0, 256);
-        return void 0;
-      }
-      agentId = answer.value.agent_id;
-      subject = { ...record, agent_id: agentId };
-      store.write(subjectName, subject);
+      const registered = await presence.ensure();
+      if (registered === void 0) return void 0;
+      agentId = registered;
+      processRecord = { ...record, registration_id: agentId };
+      store.write(registrationName, processRecord);
       if (options.binding !== void 0) writeBinding(options.binding);
       return agentId;
     })();
@@ -1065,7 +916,7 @@ function createRadarPublicationInner(options) {
     if (agentId === void 0) return;
     store.write(`bindings/${binding.key}.json`, {
       version: RADAR_PUBLICATION_VERSION,
-      agent_id: agentId,
+      registration_id: agentId,
       incarnation,
       run: binding.run,
       owner: binding.owner,
@@ -1089,14 +940,22 @@ function createRadarPublicationInner(options) {
     leaseMs: options.leaseMs ?? RADAR_LEASE_MS,
     heartbeatMs: options.heartbeatMs ?? RADAR_HEARTBEAT_MS
   });
-  const context = createContextWriter({
+  const presence = createPresenceReporter({
     store,
     client,
     scheduler,
-    recordName: contextRecord,
-    publisher: publisher("herdsman-pi"),
-    subject: ensureSubject,
-    leaseMs: options.leaseMs ?? RADAR_LEASE_MS,
+    recordName: presenceRecord,
+    registration: async () => {
+      const record = await ensureRegistration();
+      if (!record) return void 0;
+      const location = await options.location?.();
+      const { location: _initialLocation, ...identity } = record.registration;
+      return {
+        ...identity,
+        ...location?.state === "resolved" ? { location: location.location } : {},
+        ...spawnToken ? { spawn_token: spawnToken } : {}
+      };
+    },
     heartbeatMs: options.heartbeatMs ?? RADAR_HEARTBEAT_MS
   });
   const facts = createChannelWriter({
@@ -1114,7 +973,7 @@ function createRadarPublicationInner(options) {
   const assignmentWriters = /* @__PURE__ */ new Map();
   const publication = {
     execution,
-    context,
+    presence,
     facts,
     assignment(target, reportingOwner) {
       const existing = assignmentWriters.get(target);
@@ -1129,7 +988,7 @@ function createRadarPublicationInner(options) {
           publisher: publisher("herdsman-owner", reportingOwner),
           codec: assignmentCodec,
           // The owner publishes about a subject it did not register: the exact
-          // agent_id from the child's sidecar is the whole correlation.
+          // registration_id from the child's sidecar is the whole correlation.
           subject: async () => target,
           leaseMs: options.leaseMs ?? RADAR_LEASE_MS,
           heartbeatMs: options.heartbeatMs ?? RADAR_HEARTBEAT_MS
@@ -1149,7 +1008,7 @@ function createRadarPublicationInner(options) {
         registrationDiagnostic ??= `Radar binding unavailable: ${String(error).slice(0, 180)}`;
         return void 0;
       }
-      const bound = textAt(value, "agent_id");
+      const bound = textAt(value, "registration_id");
       const boundIncarnation = textAt(value, "incarnation");
       const run = textAt(value, "run");
       const owner = textAt(value, "owner");
@@ -1159,7 +1018,7 @@ function createRadarPublicationInner(options) {
         return void 0;
       return {
         version: RADAR_PUBLICATION_VERSION,
-        agent_id: bound,
+        registration_id: bound,
         incarnation: boundIncarnation,
         run,
         owner,
@@ -1175,23 +1034,27 @@ function createRadarPublicationInner(options) {
       if (agentId2 === void 0) return void 0;
       const record = await ensureRegistration();
       if (record === void 0) return void 0;
-      const location = record.registration.location;
+      const currentLocation = await options.location?.();
+      const location = currentLocation?.state === "resolved" ? currentLocation.location : void 0;
+      const standing = presence.management();
+      const subjectId = standing?.state === "managed" ? standing.subject_id : void 0;
       return {
-        agent_id: agentId2,
+        registration_id: agentId2,
+        ...subjectId !== void 0 ? { subject_id: subjectId } : {},
         ...location !== void 0 ? { location } : {}
       };
     },
-    diagnostic: () => registrationDiagnostic ?? execution.diagnostic() ?? context.diagnostic() ?? facts.diagnostic(),
+    diagnostic: () => registrationDiagnostic ?? execution.diagnostic() ?? presence.diagnostic() ?? facts.diagnostic(),
     stop() {
       for (const writer of assignmentWriters.values()) writer.stop();
       execution.stop();
-      context.stop();
+      presence.stop();
       facts.stop();
     },
     reopen() {
       for (const writer of assignmentWriters.values()) writer.reopen();
       execution.reopen();
-      context.reopen();
+      presence.reopen();
       facts.reopen();
     }
   };