@scp-dev/core 0.1.5 → 0.1.6

package/dist/index.d.ts

@@ -1109,6 +1109,10 @@ interface EndpointRow {
     linked: number | null;
     /** how the session that holds the endpoint wakes it: a {@link Wake} other than none, or null */
     wake: string | null;
+    /** the live connections that set the wake */
+    wakers: number;
+    /** when the last hook connection that set the wake closed */
+    waker_left: number | null;
 }
 interface MessageRow {
     id: string;
@@ -1171,6 +1175,8 @@ declare class RelayCore {
     constructor(sql: Sql, options: CoreOptions);
     /** a `machine` label naming this host by its hostname, as clients default it, names it by its machine name when one is set */
     private machineLabel;
+    /** this host's own agent rows labelled with another machine (its name before a rename, or its hostname) take its machine name */
+    relabelMachine(): number;
     migrate(): void;
     /** every stored list that is exactly `tree:self`, the tree preset's old list, narrows once to the preset's list */
     private migrateTreePreset;
@@ -1256,6 +1262,8 @@ declare class RelayCore {
      * whether a claim placed under `parent` restarts `row`: it lands where `row` sits (under `row`'s parent, or a root with no placement), or on
      * `row` itself from `row`'s own process; never under `row` or elsewhere in its tree
      */
+    /** a local row held only by connections whose harness process exited, as a shim that outlived its harness leaves it */
+    private outlived;
     private restarts;
     /**
      * whether the claim re-claims `row` with the grant `row` spent: from `row`'s own process or one of its ancestors, or with no lineage from
@@ -1344,6 +1352,13 @@ declare class RelayCore {
         transient?: boolean;
         process?: string;
     }): boolean;
+    /**
+     * a connection that set the endpoint's wake starts (`live`) or stops counting as its waker. A hook's (`grace`) still counts for
+     * LIMITS.restartGraceS after it closes, while its harness starts the next one
+     */
+    waker(endpoint: string, live: boolean, options?: {
+        grace?: boolean;
+    }): void;
     /**
      * a title for the caller's in-process subagent `id` from the description its parent gave it; the subagent's endpoint id when it changed one.
      * It fills only a title nobody set, as an inferred one, and waits for the subagent's claim when it has no endpoint yet

package/dist/index.js

@@ -1306,6 +1306,19 @@ var RelayCore = class {
     if (this.namedMachine !== null && labels.machine !== void 0 && labels.machine === this.hostname) labels.machine = this.namedMachine;
     return labels;
   }
+  /** this host's own agent rows labelled with another machine (its name before a rename, or its hostname) take its machine name */
+  relabelMachine() {
+    const machine = this.namedMachine;
+    if (machine === null) return 0;
+    let changed = 0;
+    for (const row of this.sql.all(`SELECT * FROM endpoints WHERE kind = 'agent' AND labels LIKE '%"machine"%'`)) {
+      const labels = json(row.labels, {});
+      if (labels.machine === void 0 || labels.machine === machine || !this.localRow(row)) continue;
+      this.sql.all(`UPDATE endpoints SET labels = ? WHERE id = ?`, JSON.stringify({ ...labels, machine }), row.id);
+      changed++;
+    }
+    return changed;
+  }
   migrate() {
     for (const statement of MIGRATION) this.sql.all(statement);
     const columns = this.sql.all(`PRAGMA table_info(idempotency)`).map((c) => c.name);
@@ -1344,7 +1357,9 @@ var RelayCore = class {
       ["tldr_turn", "INTEGER"],
       ["named", "INTEGER"],
       ["linked", "INTEGER"],
-      ["wake", "TEXT"]
+      ["wake", "TEXT"],
+      ["wakers", "INTEGER NOT NULL DEFAULT 0"],
+      ["waker_left", "INTEGER"]
     ]) {
       if (!endpointColumns.includes(column)) this.sql.all(`ALTER TABLE endpoints ADD COLUMN ${column} ${type}`);
     }
@@ -1621,7 +1636,7 @@ var RelayCore = class {
     if (row && presenceOf(row, now) === "offline") {
       this.sql.all(`UPDATE endpoints SET session = NULL WHERE id = ?`, row.id);
       row = void 0;
-    } else if (row && !transient && !sameProcess(row, fields.process)) {
+    } else if (row && !transient && !sameProcess(row, fields.process) && !(row.handle === wanted && reclaims(row, fields.process))) {
       row = void 0;
       session = null;
     } else if (row && !transient && row.token_hash === null && row.named === null && row.handle !== wanted && !row.handle.startsWith(`${wanted.slice(0, 58)}-`)) {
@@ -1663,7 +1678,7 @@ var RelayCore = class {
         this.sql.all(`INSERT INTO endpoints (id, handle, kind, harness, labels, created_at) VALUES (?, ?, 'agent', ?, '{}', ?)`, id, handle, harness, now);
         row = this.byId(id);
         created = true;
-      } else if (held.kind === "agent" && held.connections === 0 && presenceOf(held, now) === "offline" && harnessFits(held.harness, harness) && held.id !== scope.subagent?.root && !(scope.subagent && held.session?.startsWith("sub:") && held.session !== fields.session)) {
+      } else if (held.kind === "agent" && (held.connections === 0 && presenceOf(held, now) === "offline" || !transient && this.outlived(held)) && harnessFits(held.harness, harness) && held.id !== scope.subagent?.root && !(scope.subagent && held.session?.startsWith("sub:") && held.session !== fields.session)) {
         own = transient && held.process !== null && fields.process !== null && sameHarness(held.process, fields.process);
         const ended = held.hook_ended !== null || (held.last_seen ?? held.created_at) < now - LIMITS.restartGraceS * 1e3;
         if ((!transient || own || ended) && (this.restarts(held, this.placement(scope, now).parent, fields.process) || this.redeems(held, scope, { harness, ...fields })))
@@ -1872,6 +1887,11 @@ var RelayCore = class {
    * whether a claim placed under `parent` restarts `row`: it lands where `row` sits (under `row`'s parent, or a root with no placement), or on
    * `row` itself from `row`'s own process; never under `row` or elsewhere in its tree
    */
+  /** a local row held only by connections whose harness process exited, as a shim that outlived its harness leaves it */
+  outlived(row) {
+    const pid = Number(/^pid:(\d+):/.exec(row.process ?? "")?.[1]);
+    return row.connections > 0 && pid > 0 && this.localRow(row) && !this.alive(pid);
+  }
   restarts(row, parent, process) {
     if (parent?.id === row.id) return process !== null && row.process !== null && sameHarness(row.process, process);
     return (parent?.id ?? null) === row.parent_ep || parent === null && row.linked !== null;
@@ -2036,7 +2056,7 @@ var RelayCore = class {
       endpoint
     );
     const row = this.mustEndpoint(endpoint);
-    if (!options.settle || presenceOf(row, now) !== "offline" || row.status_state !== "working" && row.status_state !== "waiting") return false;
+    if (!options.settle || shownPresence(row, now) !== "offline" || row.status_state !== "working" && row.status_state !== "waiting") return false;
     this.sql.all(`UPDATE endpoints SET status_state = NULL, status_note = NULL WHERE id = ?`, endpoint);
     return true;
   }
@@ -2051,6 +2071,7 @@ var RelayCore = class {
       `UPDATE endpoints SET connections = 0, hook_seen = CASE WHEN kind = 'agent' AND hook_ended IS NULL THEN MAX(COALESCE(hook_seen, 0), ?) ELSE hook_seen END WHERE connections > 0`,
       this.now() - (LIMITS.hookIdleS - LIMITS.restartGraceS) * 1e3
     );
+    this.sql.all(`UPDATE endpoints SET wakers = 0, waker_left = ? WHERE wakers > 0`, this.now());
   }
   whoami(endpoint) {
     return this.view(this.mustEndpoint(endpoint));
@@ -2068,7 +2089,7 @@ var RelayCore = class {
     const viewer = filters.viewer === void 0 ? void 0 : this.mustEndpoint(filters.viewer);
     const shown = viewer ? new Set(this.visibleRows(viewer).map((row) => row.id)) : void 0;
     const peeker = viewer ?? (filters.peekable === true ? this.byHandle(HUMAN_HANDLE) : void 0);
-    return this.listed().filter((row) => filters.all || row.connections > 0 || row.kind === "human" || (row.last_seen ?? 0) >= cutoff).filter((row) => !filters.harness || row.harness === filters.harness).filter((row) => !filters.kind || row.kind === filters.kind).filter((row) => !viewer || row.id === viewer.id || this.mayMessage(viewer, row, viewer.kind === "human")).map((row) => {
+    return this.listed().filter((row) => filters.all || row.connections > 0 || row.kind === "human" || (row.last_seen ?? 0) >= cutoff || waking(row, now)).filter((row) => !filters.harness || row.harness === filters.harness).filter((row) => !filters.kind || row.kind === filters.kind).filter((row) => !viewer || row.id === viewer.id || this.mayMessage(viewer, row, viewer.kind === "human")).map((row) => {
       const view = this.view(row, shown);
       return peeker && this.peekableBy(peeker, row, viewer?.kind === "human") ? { ...view, peekable: row.peek } : view;
     }).filter((view) => !filters.presence || view.presence === filters.presence);
@@ -2168,6 +2189,20 @@ var RelayCore = class {
     this.sql.all(`UPDATE endpoints SET wake = ? WHERE id = ?`, wake, endpoint);
     return true;
   }
+  /**
+   * a connection that set the endpoint's wake starts (`live`) or stops counting as its waker. A hook's (`grace`) still counts for
+   * LIMITS.restartGraceS after it closes, while its harness starts the next one
+   */
+  waker(endpoint, live, options = {}) {
+    if (live) this.sql.all(`UPDATE endpoints SET wakers = wakers + 1 WHERE id = ?`, endpoint);
+    else
+      this.sql.all(
+        `UPDATE endpoints SET wakers = MAX(wakers - 1, 0), waker_left = CASE WHEN ? THEN ? ELSE waker_left END WHERE id = ?`,
+        options.grace ? 1 : 0,
+        this.now(),
+        endpoint
+      );
+  }
   /**
    * a title for the caller's in-process subagent `id` from the description its parent gave it; the subagent's endpoint id when it changed one.
    * It fills only a title nobody set, as an inferred one, and waits for the subagent's claim when it has no endpoint yet
@@ -2469,7 +2504,7 @@ var RelayCore = class {
     const recipients = [...new Map(resolved.map((row) => [row.id, row])).values()];
     if (params.live !== void 0 && typeof params.live !== "boolean") throw new RelayError("invalid_params", "live must be true or false");
     const dark = recipients.filter(
-      (r) => r.kind === "agent" && presenceOf(r, now) === "offline" && (now - Math.max(r.last_seen ?? 0, r.hook_seen ?? 0) >= ASK_ENDED_GRACE_MS || r.session === null && r.token_hash === null && r.hook_ended !== null) && !this.unjoinedSpawn(sender, r.handle, now)
+      (r) => r.kind === "agent" && shownPresence(r, now) === "offline" && (now - Math.max(r.last_seen ?? 0, r.hook_seen ?? 0) >= ASK_ENDED_GRACE_MS || r.session === null && r.token_hash === null && r.hook_ended !== null) && !this.unjoinedSpawn(sender, r.handle, now)
     );
     if (params.live === true && dark.length)
       throw new RelayError("not_live", `no live session holds ${dark.map((r) => this.address(r)).join(", ")}: nothing was queued`);
@@ -2714,7 +2749,7 @@ var RelayCore = class {
   reach(sender, recipient, offline, now) {
     if (recipient.kind !== "agent" || !this.localRow(recipient)) return void 0;
     const done = recipient.status_state === "done";
-    if ((done || presenceOf(recipient, now) === "offline") && this.unjoinedSpawn(sender, recipient.handle, now)) return "starting";
+    if ((done || shownPresence(recipient, now) === "offline") && this.unjoinedSpawn(sender, recipient.handle, now)) return "starting";
     if (done) return "ended";
     return offline ? "offline" : "running";
   }
@@ -3113,7 +3148,7 @@ var RelayCore = class {
         continue;
       }
       const row = this.byId(grant.used_by);
-      if (!row || row.status_state === "done" || presenceOf(row, now) === "offline" && (grant.handback !== null || !pid || !this.alive(pid))) continue;
+      if (!row || row.status_state === "done" || shownPresence(row, now) === "offline" && (grant.handback !== null || !pid || !this.alive(pid))) continue;
       workers.set(row.id, row);
       if (grant.pushed_at !== null && grant.pushed_at > now - LIMITS.pushGapS * 1e3) paced.add(row.id);
     }
@@ -3476,9 +3511,9 @@ var RelayCore = class {
       request,
       endpoint
     ).filter(
-      (row) => present ? present.includes(row.id) : presenceOf(row, now) !== "offline" || Math.max(row.last_seen ?? 0, row.hook_seen ?? 0, row.hook_ended ?? 0) >= asked.created_at
+      (row) => present ? present.includes(row.id) : shownPresence(row, now) !== "offline" || Math.max(row.last_seen ?? 0, row.hook_seen ?? 0, row.hook_ended ?? 0) >= asked.created_at
     );
-    const gone = (row) => presenceOf(row, now) === "offline" && ((row.hook_ended ?? 0) >= asked.created_at || row.status_state === "done" || now - Math.max(row.last_seen ?? 0, row.hook_seen ?? 0) >= ASK_ENDED_GRACE_MS);
+    const gone = (row) => shownPresence(row, now) === "offline" && ((row.hook_ended ?? 0) >= asked.created_at || row.status_state === "done" || now - Math.max(row.last_seen ?? 0, row.hook_seen ?? 0) >= ASK_ENDED_GRACE_MS);
     if (!rows.length || !rows.every(gone)) return null;
     return rows.map((row) => ({ address: this.address(row), state: row.status_state }));
   }
@@ -3573,7 +3608,7 @@ var RelayCore = class {
     for (const row of this.sql.all(
       `SELECT * FROM endpoints WHERE kind = 'agent' AND connections = 0 AND status_state IN ('working', 'waiting')`
     )) {
-      if (this.localRow(row) && presenceOf(row, now) === "offline")
+      if (this.localRow(row) && shownPresence(row, now) === "offline")
         this.sql.all(`UPDATE endpoints SET status_state = NULL, status_note = NULL WHERE id = ?`, row.id);
     }
   }
@@ -5382,7 +5417,7 @@ ${stderr}` : "";
   }
   /** with `shown`, the ids a viewer sees: a parent outside it is null */
   view(row, shown) {
-    const presence = presenceOf(row, this.now());
+    const presence = shownPresence(row, this.now());
     return {
       id: row.id,
       address: this.address(row),
@@ -5575,6 +5610,9 @@ function unreachable(address) {
 var PROCESS_KEY = /^pid:\d+:[A-Za-z0-9:-]{1,64}$/;
 var BARE_PID_KEY = /^pid:\d+$/;
 var ANY_PROCESS_KEY = /^pid:\d+(:[A-Za-z0-9:-]{1,64})?$/;
+function reclaims(row, key) {
+  return row.connections > 0 && key !== null && row.process === key && PROCESS_KEY.test(key);
+}
 function sameProcess(row, key) {
   if (row.connections > 0 || key === null || row.process === null) return false;
   return row.token_hash === null ? sameHarness(row.process, key) : row.process === key && PROCESS_KEY.test(key);
@@ -5615,6 +5653,13 @@ function presenceOf(row, now) {
   if (row.hook_seen >= now - LIMITS.hookOnlineS * 1e3) return "online";
   return row.hook_seen >= now - LIMITS.hookIdleS * 1e3 ? "idle" : "offline";
 }
+function waking(row, now) {
+  return wakeOf(row) !== null && (row.wakers > 0 || (row.waker_left ?? 0) >= now - LIMITS.restartGraceS * 1e3);
+}
+function shownPresence(row, now) {
+  const presence = presenceOf(row, now);
+  return presence === "offline" && waking(row, now) ? "idle" : presence;
+}
 function pairKey(a, b) {
   return a < b ? `${a}|${b}` : `${b}|${a}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scp-dev/core",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Swarm Communication Protocol core: wire types, framing, scopes, policy, judge and the relay core.",
   "license": "Apache-2.0",
   "homepage": "https://scp.dev",

package/src/core.ts

@@ -267,6 +267,10 @@ export interface EndpointRow {
   linked: number | null
   /** how the session that holds the endpoint wakes it: a {@link Wake} other than none, or null */
   wake: string | null
+  /** the live connections that set the wake */
+  wakers: number
+  /** when the last hook connection that set the wake closed */
+  waker_left: number | null
 }
 
 export interface MessageRow {
@@ -496,6 +500,20 @@ export class RelayCore {
     return labels
   }
 
+  /** this host's own agent rows labelled with another machine (its name before a rename, or its hostname) take its machine name */
+  relabelMachine(): number {
+    const machine = this.namedMachine
+    if (machine === null) return 0
+    let changed = 0
+    for (const row of this.sql.all<EndpointRow>(`SELECT * FROM endpoints WHERE kind = 'agent' AND labels LIKE '%"machine"%'`)) {
+      const labels = json<Record<string, string>>(row.labels, {})
+      if (labels.machine === undefined || labels.machine === machine || !this.localRow(row)) continue
+      this.sql.all(`UPDATE endpoints SET labels = ? WHERE id = ?`, JSON.stringify({ ...labels, machine }), row.id)
+      changed++
+    }
+    return changed
+  }
+
   migrate(): void {
     for (const statement of MIGRATION) this.sql.all(statement)
     const columns = this.sql.all<{ name: string }>(`PRAGMA table_info(idempotency)`).map((c) => c.name)
@@ -535,6 +553,8 @@ export class RelayCore {
       ["named", "INTEGER"],
       ["linked", "INTEGER"],
       ["wake", "TEXT"],
+      ["wakers", "INTEGER NOT NULL DEFAULT 0"],
+      ["waker_left", "INTEGER"],
     ] as const) {
       if (!endpointColumns.includes(column)) this.sql.all(`ALTER TABLE endpoints ADD COLUMN ${column} ${type}`)
     }
@@ -834,7 +854,7 @@ export class RelayCore {
     if (row && presenceOf(row, now) === "offline") {
       this.sql.all(`UPDATE endpoints SET session = NULL WHERE id = ?`, row.id)
       row = undefined
-    } else if (row && !transient && !sameProcess(row, fields.process)) {
+    } else if (row && !transient && !sameProcess(row, fields.process) && !(row.handle === wanted && reclaims(row, fields.process))) {
       row = undefined
       session = null
     } else if (
@@ -884,8 +904,7 @@ export class RelayCore {
         created = true
       } else if (
         held.kind === "agent" &&
-        held.connections === 0 &&
-        presenceOf(held, now) === "offline" &&
+        ((held.connections === 0 && presenceOf(held, now) === "offline") || (!transient && this.outlived(held))) &&
         harnessFits(held.harness, harness) &&
         held.id !== scope.subagent?.root &&
         !(scope.subagent && held.session?.startsWith("sub:") && held.session !== fields.session)
@@ -1124,6 +1143,12 @@ export class RelayCore {
    * whether a claim placed under `parent` restarts `row`: it lands where `row` sits (under `row`'s parent, or a root with no placement), or on
    * `row` itself from `row`'s own process; never under `row` or elsewhere in its tree
    */
+  /** a local row held only by connections whose harness process exited, as a shim that outlived its harness leaves it */
+  private outlived(row: EndpointRow): boolean {
+    const pid = Number(/^pid:(\d+):/.exec(row.process ?? "")?.[1])
+    return row.connections > 0 && pid > 0 && this.localRow(row) && !this.alive(pid)
+  }
+
   private restarts(row: EndpointRow, parent: EndpointRow | null, process: string | null): boolean {
     if (parent?.id === row.id) return process !== null && row.process !== null && sameHarness(row.process, process)
     return (parent?.id ?? null) === row.parent_ep || (parent === null && row.linked !== null)
@@ -1305,7 +1330,7 @@ export class RelayCore {
       endpoint,
     )
     const row = this.mustEndpoint(endpoint)
-    if (!options.settle || presenceOf(row, now) !== "offline" || (row.status_state !== "working" && row.status_state !== "waiting")) return false
+    if (!options.settle || shownPresence(row, now) !== "offline" || (row.status_state !== "working" && row.status_state !== "waiting")) return false
     this.sql.all(`UPDATE endpoints SET status_state = NULL, status_note = NULL WHERE id = ?`, endpoint)
     return true
   }
@@ -1322,6 +1347,7 @@ export class RelayCore {
       `UPDATE endpoints SET connections = 0, hook_seen = CASE WHEN kind = 'agent' AND hook_ended IS NULL THEN MAX(COALESCE(hook_seen, 0), ?) ELSE hook_seen END WHERE connections > 0`,
       this.now() - (LIMITS.hookIdleS - LIMITS.restartGraceS) * 1000,
     )
+    this.sql.all(`UPDATE endpoints SET wakers = 0, waker_left = ? WHERE wakers > 0`, this.now())
   }
 
   whoami(endpoint: string): EndpointView {
@@ -1351,7 +1377,7 @@ export class RelayCore {
     const shown = viewer ? new Set(this.visibleRows(viewer).map((row) => row.id)) : undefined
     const peeker = viewer ?? (filters.peekable === true ? this.byHandle(HUMAN_HANDLE)! : undefined)
     return this.listed()
-      .filter((row) => filters.all || row.connections > 0 || row.kind === "human" || (row.last_seen ?? 0) >= cutoff)
+      .filter((row) => filters.all || row.connections > 0 || row.kind === "human" || (row.last_seen ?? 0) >= cutoff || waking(row, now))
       .filter((row) => !filters.harness || row.harness === filters.harness)
       .filter((row) => !filters.kind || row.kind === filters.kind)
       .filter((row) => !viewer || row.id === viewer.id || this.mayMessage(viewer, row, viewer.kind === "human"))
@@ -1468,6 +1494,21 @@ export class RelayCore {
     return true
   }
 
+  /**
+   * a connection that set the endpoint's wake starts (`live`) or stops counting as its waker. A hook's (`grace`) still counts for
+   * LIMITS.restartGraceS after it closes, while its harness starts the next one
+   */
+  waker(endpoint: string, live: boolean, options: { grace?: boolean } = {}): void {
+    if (live) this.sql.all(`UPDATE endpoints SET wakers = wakers + 1 WHERE id = ?`, endpoint)
+    else
+      this.sql.all(
+        `UPDATE endpoints SET wakers = MAX(wakers - 1, 0), waker_left = CASE WHEN ? THEN ? ELSE waker_left END WHERE id = ?`,
+        options.grace ? 1 : 0,
+        this.now(),
+        endpoint,
+      )
+  }
+
   /**
    * a title for the caller's in-process subagent `id` from the description its parent gave it; the subagent's endpoint id when it changed one.
    * It fills only a title nobody set, as an inferred one, and waits for the subagent's claim when it has no endpoint yet
@@ -1787,7 +1828,7 @@ export class RelayCore {
     const dark = recipients.filter(
       (r) =>
         r.kind === "agent" &&
-        presenceOf(r, now) === "offline" &&
+        shownPresence(r, now) === "offline" &&
         (now - Math.max(r.last_seen ?? 0, r.hook_seen ?? 0) >= ASK_ENDED_GRACE_MS || (r.session === null && r.token_hash === null && r.hook_ended !== null)) &&
         !this.unjoinedSpawn(sender, r.handle, now),
     )
@@ -2047,7 +2088,7 @@ export class RelayCore {
   private reach(sender: EndpointRow, recipient: EndpointRow, offline: boolean, now: number): Reach | undefined {
     if (recipient.kind !== "agent" || !this.localRow(recipient)) return undefined
     const done = recipient.status_state === "done"
-    if ((done || presenceOf(recipient, now) === "offline") && this.unjoinedSpawn(sender, recipient.handle, now)) return "starting"
+    if ((done || shownPresence(recipient, now) === "offline") && this.unjoinedSpawn(sender, recipient.handle, now)) return "starting"
     if (done) return "ended"
     return offline ? "offline" : "running"
   }
@@ -2500,7 +2541,7 @@ export class RelayCore {
         continue
       }
       const row = this.byId(grant.used_by)
-      if (!row || row.status_state === "done" || (presenceOf(row, now) === "offline" && (grant.handback !== null || !pid || !this.alive(pid)))) continue
+      if (!row || row.status_state === "done" || (shownPresence(row, now) === "offline" && (grant.handback !== null || !pid || !this.alive(pid)))) continue
       workers.set(row.id, row)
       if (grant.pushed_at !== null && grant.pushed_at > now - LIMITS.pushGapS * 1000) paced.add(row.id)
     }
@@ -2902,10 +2943,10 @@ export class RelayCore {
       .filter((row) =>
         present
           ? present.includes(row.id)
-          : presenceOf(row, now) !== "offline" || Math.max(row.last_seen ?? 0, row.hook_seen ?? 0, row.hook_ended ?? 0) >= asked.created_at,
+          : shownPresence(row, now) !== "offline" || Math.max(row.last_seen ?? 0, row.hook_seen ?? 0, row.hook_ended ?? 0) >= asked.created_at,
       )
     const gone = (row: EndpointRow): boolean =>
-      presenceOf(row, now) === "offline" &&
+      shownPresence(row, now) === "offline" &&
       ((row.hook_ended ?? 0) >= asked.created_at || row.status_state === "done" || now - Math.max(row.last_seen ?? 0, row.hook_seen ?? 0) >= ASK_ENDED_GRACE_MS)
     if (!rows.length || !rows.every(gone)) return null
     return rows.map((row) => ({ address: this.address(row), state: row.status_state as StatusState | null }))
@@ -3019,7 +3060,7 @@ export class RelayCore {
     for (const row of this.sql.all<EndpointRow>(
       `SELECT * FROM endpoints WHERE kind = 'agent' AND connections = 0 AND status_state IN ('working', 'waiting')`,
     )) {
-      if (this.localRow(row) && presenceOf(row, now) === "offline")
+      if (this.localRow(row) && shownPresence(row, now) === "offline")
         this.sql.all(`UPDATE endpoints SET status_state = NULL, status_note = NULL WHERE id = ?`, row.id)
     }
   }
@@ -5079,7 +5120,7 @@ export class RelayCore {
 
   /** with `shown`, the ids a viewer sees: a parent outside it is null */
   protected view(row: EndpointRow, shown?: Set<string>): EndpointView {
-    const presence = presenceOf(row, this.now())
+    const presence = shownPresence(row, this.now())
     return {
       id: row.id,
       address: this.address(row),
@@ -5315,6 +5356,11 @@ const ANY_PROCESS_KEY = /^pid:\d+(:[A-Za-z0-9:-]{1,64})?$/
  * whether a connecting claim from the harness process `key` may join a session endpoint: no connection holds it, the harness process that last
  * claimed it claims again, and, once a connection held it (a token was handed out), with the same full key, which a recycled pid cannot match
  */
+/** a claim from the very harness process that holds the live `row`, such as a session it restarted in process */
+function reclaims(row: EndpointRow, key: string | null): boolean {
+  return row.connections > 0 && key !== null && row.process === key && PROCESS_KEY.test(key)
+}
+
 function sameProcess(row: EndpointRow, key: string | null): boolean {
   if (row.connections > 0 || key === null || row.process === null) return false
   return row.token_hash === null ? sameHarness(row.process, key) : row.process === key && PROCESS_KEY.test(key)
@@ -5379,6 +5425,17 @@ function presenceOf(row: EndpointRow, now: number): Presence {
   return row.hook_seen >= now - LIMITS.hookIdleS * 1000 ? "idle" : "offline"
 }
 
+/** a wake with a live waker, or a hook waker that left within LIMITS.restartGraceS */
+function waking(row: EndpointRow, now: number): boolean {
+  return wakeOf(row) !== null && (row.wakers > 0 || (row.waker_left ?? 0) >= now - LIMITS.restartGraceS * 1000)
+}
+
+/** the presence an endpoint shows: one its waker can wake is at least idle, though its session's own presence decayed */
+function shownPresence(row: EndpointRow, now: number): Presence {
+  const presence = presenceOf(row, now)
+  return presence === "offline" && waking(row, now) ? "idle" : presence
+}
+
 function pairKey(a: string, b: string): string {
   return a < b ? `${a}|${b}` : `${b}|${a}`
 }